Merge branch 'dev_lqs' into 'master'

Dev lqs

See merge request !133

H5/.env.production

 # 生产环境 部署生产环境放开这个
-# VUE_APP_BASE_URL = " http://8.140.108.250"
+VUE_APP_BASE_URL = "http://app.xitiansen.com"
 
 # 测试环境 部署测试环境放开这个
-VUE_APP_BASE_URL = "http://8.131.244.76:81"
\ No newline at end of file
+# VUE_APP_BASE_URL = "http://8.131.244.76:81"
\ No newline at end of file

H5/src/main.js

@@ -7,13 +7,13 @@ import "minirefresh/dist/debug/minirefresh.css";
 import "amfe-flexible";
 import "@/plugins/vant-ui.js";
 import "@/plugins/echarts-plugins.js";
-import Vconsole from "vconsole";
+// import Vconsole from "vconsole";
 
 import bridgeToAppFun from "@/utils/bridgeToAppFun";
 Vue.prototype.$bridgeToAppFun = new bridgeToAppFun();
 
 /*生产环境请注释掉 */
-Vue.prototype.$vConsole = new Vconsole();
+// Vue.prototype.$vConsole = new Vconsole();
 
 Vue.use(MiniRefreshTools);
 Vue.config.productionTip = false;

H5/src/views/airDropPool.vue

@@ -31,7 +31,7 @@
       <div class="air-panel-num-content">
         <img src="@/assets/images/parachute.png" alt="" />
         <p>
-          本月<span>{{ total }}</span> 人在池
+          本月<span>{{ total || 0 }}</span> 人在池
         </p>
       </div>
     </div>
@@ -89,15 +89,12 @@ export default {
     queryData() {
       const _this = this;
       queryAerialDelivery().then(res => {
-        console.log("空投池", res);
         if (res.code === 0) {
           _this.total = res.data.total;
           _this.userPoolVos = res.data.userPoolVos.map(item => {
             const temp = item;
             temp.userId =
-              item.userId.substring(0, 3) +
-              "****" +
-              item.userId.substring(8, 11);
+              item.userId.substring(0, 3) + "****" + item.userId.substring(7);
             return temp;
           });
           _this.$nextTick(() => {
@@ -124,9 +121,7 @@ export default {
         if (box.scrollTop % box.offsetHeight == 0) {
           clearInterval(_this.timer);
           box.scrollTop = 0;
-          setTimeout(() => {
-            _this.timer = setInterval(_this.autoScrollLine, 500);
-          }, 0);
+          _this.timer = setInterval(_this.autoScrollLine, 300);
         }
       }
     }

H5/src/views/rewards/month-award.vue

@@ -47,7 +47,7 @@
         :endVal="awardInfo.monthAwardTotal"
         :duration="3000"
         style="font-weight: bold"
-        decimals="2"
+        :decimals="2"
       ></countTo>
       <p v-if="awardInfo" style="font-size: 14px;color:#333333">
         历史累计奖金：￥{{ awardInfo.awardTotal || 0 }}
@@ -100,6 +100,8 @@ export default {
   data() {
     return {
       awardInfo: {
+        lastToatal: 0,
+        monthAwardTotal: 0,
         goldAward: 0,
         farmerAward: 0,
         forestStartAward: 0,

H5/vue.config.js

@@ -5,8 +5,7 @@ module.exports = {
   devServer: {
     proxy: {
       '/shop-mall': {
-        // target: "http://8.131.244.76:81/",
-        target: "http://8.140.108.250/",
+        target: "http://8.131.244.76:81/",
         changeOrigin: true
       }
     }