Merge branch 'master' into dev

project.config.json

@@ -71,5 +71,5 @@
       }
     ]
   },
-  "appid": "wxf9ce8010f1ad24aa"
+  "appid": "wx71ac9c27c3c3e3f4"
 }

src/app.ts

@@ -16,15 +16,15 @@ App<IAppOption>({
     // 测试号 wx2b0bb13edf717c1d
     // dev
     // appid:wxf9ce8010f1ad24aa
-    url: 'https://m.xd.hbraas.com',
-    upFileUrl: 'https://m.xd.hbraas.com/',
-    imageUrl: 'https://m.xd.hbraas.com/xd/',
+    // url: 'https://m.xd.hbraas.com',
+    // upFileUrl: 'https://m.xd.hbraas.com/',
+    // imageUrl: 'https://m.xd.hbraas.com/xd/',
 
     // pro
     // appid:wx71ac9c27c3c3e3f4
-    // url: 'https://m.xd.hbsaas.com',
-    // upFileUrl: 'https://m.xd.hbsaas.com/',
-    // imageUrl: 'https://m.xd.hbsaas.com/api/xd/',
+    url: 'https://m.xd.hbsaas.com',
+    upFileUrl: 'https://m.xd.hbsaas.com/',
+    imageUrl: 'https://m.xd.hbsaas.com/api/xd/',
 
     loginState: '',
     isLogin: 0,

src/pages/home/index.ts

@@ -234,6 +234,7 @@ Page({
     const { id, index } = e.currentTarget.dataset;
     const params = this.data.list[index];
     if (params.ContentType === '5' && params.FileList[0]) {
+      app.mpBehavior({ PositionId: '1', OperateType: '1', OperateId: id as string });
       this.handleFile(params.FileList[0]);
     } else {
       wx.navigateTo({

src/pages/information/index.ts

@@ -10,6 +10,15 @@ Page({
       pages: 1,
       count: 1,
     },
+    fileLabelIcon: {
+      pdf: 'file-label1',
+      doc: 'file-label2',
+      docx: 'file-label3',
+      pptx: 'file-label4',
+      xls: 'file-label5',
+      xlsx: 'file-label6',
+      ppt: 'file-label7',
+    },
   },
   onShow() {
     app.waitLogin({ type: 2 }).then(() => {
@@ -51,6 +60,7 @@ Page({
     const { id, index } = e.currentTarget.dataset;
     const params = this.data.list[index];
     if (params.ContentType === '5' && params.FileList[0]) {
+      app.mpBehavior({ PositionId: '1', OperateType: '1', OperateId: id as string });
       this.handleFile(params.FileList[0]);
     } else {
       wx.navigateTo({

src/pages/informationDetail/index.ts

@@ -13,6 +13,7 @@ Page({
     pageShow: false,
     empty1: false,
     empty2: false,
+    empty3: false,
     errorMsg: '',
 
     Timestamp: '',
@@ -57,7 +58,7 @@ Page({
           wx.hideShareMenu();
           wx.offCopyUrl();
           wx.setNavigationBarTitle({
-            title: '通知详情',
+            title: '通知详情页',
           });
         }
         this.setData({
@@ -70,7 +71,6 @@ Page({
         });
       })
       .catch((err) => {
-        console.log(err);
         const { errorCode, errorMsg } = err.data.data;
         const empty1 = errorCode === '1';
         const empty2 = errorCode === '2';
@@ -79,6 +79,7 @@ Page({
           errorMsg,
           empty1,
           empty2,
+          empty3: !empty1 && !empty2,
         });
       });
   },

src/pages/informationDetail/index.wxml

@@ -39,7 +39,7 @@
   <view class="tip">内容不存在</view>
   <view class="back-home" bind:tap="handleBackHome">回首页</view>
 </view>
-<view class="empty2" wx:elif="{{!pageShow}}">
+<view class="empty2" wx:elif="{{empty3}}">
   <image class="empty" src="{{imageUrl}}empty2.png?t={{Timestamp}}"></image>
   <view class="tip">{{errorMsg}}</view>
   <view class="back-home" bind:tap="handleBackHome">回首页</view>