Merge branch 'dev_1.1.2' of DeNet/de-net-official into master

pages/index.vue

@@ -336,15 +336,14 @@ export default {
                         postId: this.detail.postId,
                         srcContentId: this.detail.srcContentId,
                         senderId: this.detail.srcUserId,
-					},
-                    extParams: {
-                        status: '',
-                    }
+					}
 				}
 			})
 		},
 		clickOpenChrome() {
 			window.open('https://www.google.com/chrome')
+
+            let extParams = this.isMobile() ? {} : { status: this.reportStatus }
             Report.reportLog({
 				baseInfo: {
 					appVersionCode: this.appVersionCode,
@@ -361,9 +360,7 @@ export default {
                         srcContentId: this.detail.srcContentId,
                         senderId: this.detail.srcUserId,
 					},
-                    extParams: {
-                        status: '',
-                    }
+                    extParams: extParams
 				}
 			})
 		},
@@ -374,6 +371,7 @@ export default {
 		installExtension() {
 			let { extensionsInstallChannel, extensionsInstallUrl } = this.config;
 			let url = extensionsInstallUrl;
+            let extParams = this.isMobile() ? {} : { status: this.reportStatus }
 			Report.reportLog({
 				baseInfo: {
 					appVersionCode: this.appVersionCode,
@@ -390,9 +388,7 @@ export default {
                         srcContentId: this.detail.srcContentId,
                         senderId: this.detail.srcUserId,
 					},
-                    extParams: {
-                        status: '',
-                    }
+                    extParams: extParams,
 				}
 			})
 			switch (extensionsInstallChannel) {
@@ -661,9 +657,6 @@ export default {
                             postId: this.detail.postId,
                             srcContentId: this.detail.srcContentId,
                             senderId: this.detail.srcUserId,
-                        },
-                        extParams: {
-                            status: '',
                         }
                     }
                 })

pages/luckdraw.vue

@@ -205,7 +205,7 @@
 import axios from 'axios'
 import Cookies from 'js-cookie'
 import { Toast } from 'vant';
-import { isBrowser, appType, appVersionCode, formatSecondsAsTime } from '../utils/help.js'
+import { isBrowser, appType, appVersionCode, formatSecondsAsDaysOrTime } from '../utils/help.js'
 import FontAmount from '../components/FontAmount.vue'
 
 var moment = require('moment');
@@ -417,7 +417,7 @@ export default {
                 let endTime = moment(end_time + 5000)
                 let downTime = (endTime - time) || 0
                 if (downTime > 0) {
-                    this.validity = formatSecondsAsTime(downTime / 1000);
+                    this.validity = formatSecondsAsDaysOrTime(downTime / 1000);
                 } else {
                     this.validity = `00:00:00`
                     this.getDetail(() => {

utils/help.js

@@ -88,6 +88,22 @@ export function formatSecondsAsTime(secs) {
     return text
 }
 
+// 抽奖红包 left
+export function formatSecondsAsDaysOrTime(secs) {
+    if (secs <= 0) {
+      return '00:00:00'
+    }
+    let text = ''
+    var hr = Math.floor(secs / 3600)
+    if (hr >= 24) {
+      let day = parseInt(hr / 24)
+      text = `${day} days left`
+    } else {
+      text = formatSecondsAsTime(secs)
+    }
+    return text
+}
+
 export const appVersionCode = 12;
 
 export const appType = 1;