zhaoxiaohai 3 years ago
parent
commit
ac7e643a27
48 changed files with 102 additions and 21 deletions
  1. 1 0
      app.json
  2. 1 1
      components/My_LiveList/live.wxml
  3. 1 1
      components/My_SupplyAndDemandList/imges.js
  4. 0 1
      components/My_SupplyAndDemandList/index.js
  5. 1 1
      custom-tab-bar/index.js
  6. 3 2
      pages/annunciate/details.wxml
  7. 2 2
      pages/annunciate/index.wxml
  8. 3 3
      pages/chatRoom/dialogbox.wxml
  9. 4 4
      pages/chatRoom/index.wxml
  10. 68 0
      pages/portal/index.js
  11. 0 0
      pages/portal/index.wxml
  12. 4 4
      pages/tabbar-pages/home/index.js
  13. 6 1
      pages/tabbar-pages/user/index.js
  14. 1 1
      pages/tradeShow/index.wxml
  15. 7 0
      project.private.config.json
  16. BIN
      static/annunciate/cover.png
  17. BIN
      static/annunciate/icon-downLoad.png
  18. BIN
      static/annunciate/icon-file.png
  19. BIN
      static/chatRoom/group-of-people-ac.png
  20. BIN
      static/chatRoom/group-of-people.png
  21. BIN
      static/chatRoom/icon-01.png
  22. BIN
      static/chatRoom/icon-02.png
  23. BIN
      static/chatRoom/icon-03.png
  24. BIN
      static/chatRoom/one-to-one-ac.png
  25. BIN
      static/chatRoom/one-to-one.png
  26. BIN
      static/home-grid/icon-01.png
  27. BIN
      static/home-grid/icon-02.png
  28. BIN
      static/home-grid/icon-03.png
  29. BIN
      static/home-grid/icon-05.png
  30. BIN
      static/live.gif
  31. BIN
      static/portal/bg.png
  32. BIN
      static/portal/icon-0.png
  33. BIN
      static/portal/icon-1.png
  34. BIN
      static/portal/icon-2.png
  35. BIN
      static/portal/icon-3.png
  36. BIN
      static/portal/icon-4.png
  37. BIN
      static/portal/icon-5.png
  38. BIN
      static/portal/icon-6.png
  39. BIN
      static/portal/icon-7.png
  40. BIN
      static/portal/icon-8.png
  41. BIN
      static/portal/icon-9.png
  42. BIN
      static/supplyAndDemand/all-c.png
  43. BIN
      static/supplyAndDemand/all.png
  44. BIN
      static/supplyAndDemand/default.jpg
  45. BIN
      static/tacitly-approve/MRlogo.png
  46. BIN
      static/tacitly-approve/MRproduct.png
  47. BIN
      static/tacitly-approve/MRuserImg.png
  48. BIN
      static/zhanhui.png

+ 1 - 0
app.json

@@ -54,6 +54,7 @@
         "pages/chatRoom/create",
         "pages/chatRoom/stats",
         "pages/scanQRCodes/register",
+        "pages/portal/index",
         "pages/tabbar-pages/home/sdDetalis",
         "pages/tabbar-pages/liveBroadcast/index",
         "pages/tabbar-pages/home/analysis/index",

+ 1 - 1
components/My_LiveList/live.wxml

@@ -5,7 +5,7 @@
                 <van-image width="322rpx" height="240rpx" src="{{item.channelcoverimageurl}}" lazy-load  />
                 <view class="livestatus" wx:if="{{item.livestatus=='live'}}">
                     直播中
-                    <image src="/static/live.gif"></image>
+                    <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/live.gif" />
                 </view>
                 <view wx:else class="livestatus" style="background: linear-gradient(180deg, #E6E6E6 0%, #B0B0B0 100%);justify-content: center;" >
                     直播回放

+ 1 - 1
components/My_SupplyAndDemandList/imges.js

@@ -39,7 +39,7 @@ Component({
                         obj.fobsurl = `${url}icon-03.png`
                         break;
                     default:
-                        obj.fobsurl = `https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/tacitly-approve/MRproduct.png`
+                        obj.fobsurl = `${url}default.jpg`
                         break;
                 }
                 this.setData({

+ 0 - 1
components/My_SupplyAndDemandList/index.js

@@ -35,7 +35,6 @@ Component({
     methods: {
         /* 跳转详情页 */
         toDetailPage(e) {
-            if (!queryLogin()) return;
             const {
                 item
             } = e.currentTarget.dataset;

+ 1 - 1
custom-tab-bar/index.js

@@ -62,7 +62,7 @@ Component({
     methods: {
         /* tabbar */
         onChange(event) {
-            if (event.currentTarget.dataset.index > 3 && !queryLogin()) return;
+            if (event.currentTarget.dataset.index > 2 && !queryLogin()) return;
             if (this.data.phoneNumber == '') this.setData({
                 phoneNumber: wx.getStorageSync('servicehotline')
             });

+ 3 - 2
pages/annunciate/details.wxml

@@ -27,9 +27,10 @@
             <view class="filesList">
                 <navigator url="#" class="files-item" wx:for="{{defaultFiles}}" data-index="{{index}}" catchtap="downLoadFiles">
                     <view class="files-item-img">
-                        <image src="/static/annunciate/icon-file.png"></image>
+                        <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/annunciate/icon-file.png"></image>
                     </view>
-                    <view class="files-item-name u-line-1">{{item.postfix}}附件<image src="/static/annunciate/icon-downLoad.png"></image>
+                    <view class="files-item-name u-line-1">{{item.postfix}}附件
+                        <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/annunciate/icon-downLoad.png" />
                     </view>
                 </navigator>
             </view>

+ 2 - 2
pages/annunciate/index.wxml

@@ -13,8 +13,8 @@
     <!-- 列表展示区 -->
     <view class="ann-box" wx:for="{{annunciateList}}" data-index="{{index}}" catchtap="toDetails">
         <view class="ann-img">
-            <image wx:if="{{item.attinfos[0].fobsurl}}" src="{{item.attinfos[0].fobsurl}}" mode="aspectFill"></image>
-            <image src="/static/annunciate/cover.png" mode="aspectFill"></image>
+            <image wx:if="{{item.attinfos[0].fobsurl}}" src="{{item.attinfos[0].fobsurl}}" mode="aspectFill" />
+            <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/annunciate/cover.png" mode="aspectFill" />
         </view>
         <view class="ann-text ls">
             <view class="ann-text-title  u-line-1">{{item.ftitle}}</view>

+ 3 - 3
pages/chatRoom/dialogbox.wxml

@@ -44,9 +44,9 @@
     </block>
     </textarea>
     <view class="functionalZone" catchtap="selectionFunction">
-        <image data-name='表情' mode="heightFix" src="/static/chatRoom/icon-01.png" />
-        <image data-name='图片' mode="heightFix" src="/static/chatRoom/icon-02.png" />
-        <image data-name='历史' mode="heightFix" src="/static/chatRoom/icon-03.png" />
+        <image data-name='表情' mode="heightFix" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/chatRoom/icon-01.png" />
+        <image data-name='图片' mode="heightFix" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/chatRoom/icon-02.png" />
+        <image data-name='历史' mode="heightFix" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/chatRoom/icon-03.png" />
     </view>
     <!-- 安全距离 -->
     <view style="height: {{iosX?'34':'0'}}rpx;"></view>

+ 4 - 4
pages/chatRoom/index.wxml

@@ -63,13 +63,13 @@
 <view class="footer">
     <view style="display: flex;justify-content: space-around;">
         <view class="option-item" data-index="0" catchtap="footerOption">
-            <image hidden="{{optionItem!=0}}" mode="heightFix" src="/static/chatRoom/one-to-one-ac.png"></image>
-            <image hidden="{{optionItem==0}}" mode="heightFix" src="/static/chatRoom/one-to-one.png"></image>
+            <image hidden="{{optionItem!=0}}" mode="heightFix" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/chatRoom/one-to-one-ac.png"></image>
+            <image hidden="{{optionItem==0}}" mode="heightFix" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/chatRoom/one-to-one.png"></image>
             <view class="item-text" style="color:{{optionItem==0?'#4DC2D4':''}};">个聊</view>
         </view>
         <view class="option-item" data-index="1" catchtap="footerOption">
-            <image hidden="{{optionItem!=1}}" mode="heightFix" src="/static/chatRoom/group-of-people-ac.png"></image>
-            <image hidden="{{optionItem==1}}" mode="heightFix" src="/static/chatRoom/group-of-people.png"></image>
+            <image hidden="{{optionItem!=1}}" mode="heightFix" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/chatRoom/group-of-people-ac.png"></image>
+            <image hidden="{{optionItem==1}}" mode="heightFix" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/chatRoom/group-of-people.png"></image>
             <view class="item-text" style="color:{{optionItem==1?'#4DC2D4':''}};">群聊</view>
         </view>
     </view>

+ 68 - 0
pages/portal/index.js

@@ -0,0 +1,68 @@
+// pages/portal/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        wx.redirectTo({
+          url: '/pages/tabbar-pages/home/index',
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

+ 0 - 0
pages/portal/index.wxml


+ 4 - 4
pages/tabbar-pages/home/index.js

@@ -18,16 +18,16 @@ Page({
         /* 宫格列表 */
         gridList: [{
             text: '参展入口',
-            icon: '/static/home-grid/icon-05.png'
+            icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/home-grid/icon-05.png'
         }, {
             text: '数据查询',
-            icon: '/static/home-grid/icon-01.png'
+            icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/home-grid/icon-01.png'
         }, {
             text: '我要直播',
-            icon: '/static/home-grid/icon-02.png'
+            icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/home-grid/icon-02.png'
         }, {
             text: '通知公告',
-            icon: '/static/home-grid/icon-03.png'
+            icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/home-grid/icon-03.png'
         }],
         /* 圆角按钮tabs列表 */
         codeMsg: {}, //二维码信息

+ 6 - 1
pages/tabbar-pages/user/index.js

@@ -110,7 +110,12 @@ Page({
                 wx.showToast({
                     title: '退出成功',
                 })
-
+                wx.removeStorage({
+                    key: 'account_list',
+                })
+                wx.removeStorage({
+                    key: 'userData',
+                })
                 setTimeout(() => {
                     wx.reLaunch({
                         url: '/pages/login/index',

+ 1 - 1
pages/tradeShow/index.wxml

@@ -43,7 +43,7 @@
     <scroll-view wx:if="{{liveList.length}}" scroll-y class="live-scroll-view" bindscrolltolower='scrolltolower'>
         <liveList list="{{liveList}}" isShow='{{true}}' />
     </scroll-view>
-    <van-empty wx:else class="custom-image" image="/static/zhanhui.png" description="暂未开放,敬请期待!" />
+    <van-empty wx:else class="custom-image" image="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/zhanhui.png" description="暂未开放,敬请期待!" />
     <!-- <view wx:else style="width: 100%; display: flex; justify-content: center; flex-direction: column; align-items: center;">
         <image style="height: 454rpx; width:480rpx;" src="/static/zhanh.png"></image>
         <view style="padding:15rpx 0 ; opacity: 0.6;">暂未开发,敬请期待!</view>

+ 7 - 0
project.private.config.json

@@ -51,6 +51,13 @@
                     "query": "",
                     "launchMode": "default",
                     "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/portal/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }

BIN
static/annunciate/cover.png


BIN
static/annunciate/icon-downLoad.png


BIN
static/annunciate/icon-file.png


BIN
static/chatRoom/group-of-people-ac.png


BIN
static/chatRoom/group-of-people.png


BIN
static/chatRoom/icon-01.png


BIN
static/chatRoom/icon-02.png


BIN
static/chatRoom/icon-03.png


BIN
static/chatRoom/one-to-one-ac.png


BIN
static/chatRoom/one-to-one.png


BIN
static/home-grid/icon-01.png


BIN
static/home-grid/icon-02.png


BIN
static/home-grid/icon-03.png


BIN
static/home-grid/icon-05.png


BIN
static/live.gif


BIN
static/portal/bg.png


BIN
static/portal/icon-0.png


BIN
static/portal/icon-1.png


BIN
static/portal/icon-2.png


BIN
static/portal/icon-3.png


BIN
static/portal/icon-4.png


BIN
static/portal/icon-5.png


BIN
static/portal/icon-6.png


BIN
static/portal/icon-7.png


BIN
static/portal/icon-8.png


BIN
static/portal/icon-9.png


BIN
static/supplyAndDemand/all-c.png


BIN
static/supplyAndDemand/all.png


BIN
static/supplyAndDemand/default.jpg


BIN
static/tacitly-approve/MRlogo.png


BIN
static/tacitly-approve/MRproduct.png


BIN
static/tacitly-approve/MRuserImg.png


BIN
static/zhanhui.png