Merge branch 'dev_lqs' into 'master'

Dev lqs

See merge request !104

H5/src/components/BaseRefreshScroll.vue

@@ -34,7 +34,7 @@ export default {
         up: {
           offset: 50,
           isAuto: true,
-          contentnomore: '没有数据了~',
+          contentnomore: "没有数据了~",
           toTop: {
             isEnable: false
           },

H5/src/views/bank.vue

@@ -112,7 +112,7 @@ export default {
           });
       } else {
         const addParams = params;
-        addParams.userId =JSON.parase(localStorage.getItem('user')).userId;
+        addParams.userId = JSON.parase(localStorage.getItem("user")).userId;
         addUserBankInfo(params)
           .then(res => {
             if (res.code === 0) {
@@ -131,7 +131,7 @@ export default {
     },
     getBankInfo() {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       getUserBankInfo(params).then(res => {
         if (res.code === 0 && res.data) {

H5/src/views/canCashOut.vue

@@ -59,7 +59,7 @@ export default {
   methods: {
     getWithdrawal() {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       getWithdrawalAmount(params).then(res => {
         if (res.code === 0) {

H5/src/views/cashOut/cash-out-record.vue

@@ -74,7 +74,7 @@ export default {
     },
     getRecordList(yearMonth) {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId,
+        userId: JSON.parase(localStorage.getItem("user")).userId,
         yearMonth: yearMonth
       };
       getWithdrawalRecord(params).then(res => {

H5/src/views/cashOut/cash-out.vue

@@ -96,7 +96,7 @@ export default {
   name: "CashOut",
   data() {
     return {
-      userPhone:JSON.parase(localStorage.getItem('user')).userId,
+      userPhone: JSON.parase(localStorage.getItem("user")).userId,
       bank: "",
       money: null,
       account: 0,
@@ -128,7 +128,7 @@ export default {
     },
     canCashOut() {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       getWithdrawalAmount(params).then(res => {
         if (res.code === 0) {
@@ -158,7 +158,7 @@ export default {
         return;
       }
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       sendSms(params).then();
       this.validCode = null;
@@ -176,7 +176,7 @@ export default {
     },
     getUserInfo() {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       getUserBankInfo(params).then(res => {
         if (res.code === 0) {

H5/src/views/customer-service.vue

@@ -52,7 +52,7 @@ export default {
     },
     getCustomerData() {
       let params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       getCustomer(params).then(res => {
         if (res.code === 0) {

H5/src/views/grade.vue

@@ -115,7 +115,7 @@ export default {
       this.$router.push({ name: urlName });
     },
     getstatus() {
-      const userId =JSON.parase(localStorage.getItem('user')).userId;
+      const userId = JSON.parase(localStorage.getItem("user")).userId;
       console.log(userId);
       const _this = this;
       getForestStatus(userId).then(res => {

H5/src/views/income/allIncome.vue

@@ -28,7 +28,7 @@ export default {
   methods: {
     getAllRecord() {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       showIncomeRecord(params).then(res => {
         if (res.code === 0) {

H5/src/views/income/income-detail.vue

@@ -231,7 +231,7 @@ export default {
     },
     getDetail() {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       queryIncomeDetail(params).then(res => {
         if (res.code === 0) {
@@ -259,7 +259,7 @@ export default {
           });
           this.pieOption.legend = legend;
           if (!res.data.totalIncome) {
-            this.pieOption.graphic.children[1].style.text="暂无数据~"
+            this.pieOption.graphic.children[1].style.text = "暂无数据~";
           }
         }
       });

H5/src/views/income/wallet.vue

@@ -2,9 +2,7 @@
   <div class="wallet">
     <div class="content">
       <img class="balance-img" src="@/assets/images/余额.png" alt />
-      <p class="currentprofitlabel">
-        当月收益
-      </p>
+      <p class="currentprofitlabel">当月收益</p>
       <div class="currentprofit" @click="jumpToIncomeDetail">
         <span class="month-income">{{ walletInfo.moneyIncome }}</span>
         <img src="@/assets/images/右箭头.png" alt class="month-income-arrow" />
@@ -75,7 +73,7 @@ export default {
     // 获取用户钱包展示信息
     getWalletInfo() {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       getMoneyPackage(params)
         .then(res => {

H5/src/views/modefyAvatar.vue

@@ -50,7 +50,7 @@ export default {
       this.canSubmit = false;
       const params = {
         headImage: this.imageUrl,
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       setAvatar(params).then(res => {
         if (res.code === 0) {

H5/src/views/moments/moments.vue

@@ -20,7 +20,7 @@ export default {
   methods: {
     getMoment() {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       findByUserId(params).then(res => {
         console.log(res);

H5/src/views/moments/publish.vue

@@ -51,7 +51,7 @@ export default {
         fd.append("files", file.file);
       });
       fd.append("zxField", this.message);
-      fd.append("userId",JSON.parase(localStorage.getItem('user')).userId);
+      fd.append("userId", JSON.parase(localStorage.getItem("user")).userId);
       uploadImage(fd).then();
     },
     openPopup() {

H5/src/views/my/myStatus.vue

@@ -88,7 +88,7 @@ export default {
   },
   data() {
     return {
-      avatar: '',
+      avatar: "",
       inviteeArr: [],
       userRecommendInfo: {},
       activeTab: "",
@@ -149,8 +149,8 @@ export default {
     this.getRecommendDetail(0);
   },
   mounted() {
-    const userAvatar = JSON.parse(localStorage.getItem('user')).headImage;
-    this.avatar = process.env.VUE_APP_BASE_URL + userAvatar
+    const userAvatar = JSON.parse(localStorage.getItem("user")).headImage;
+    this.avatar = process.env.VUE_APP_BASE_URL + userAvatar;
   },
   methods: {
     changeTab(name) {
@@ -164,7 +164,7 @@ export default {
     },
     getRecommendInfo() {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       recomendInfo(params).then(res => {
         if (res.code === 0) {
@@ -181,7 +181,7 @@ export default {
     },
     getRecommendDetail(level) {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId,
+        userId: JSON.parase(localStorage.getItem("user")).userId,
         userlevel: level
       };
       recommendDetail(params).then(res => {

H5/src/views/register.vue

@@ -78,7 +78,7 @@ export default {
   data() {
     return {
       form: {
-        userId:JSON.parase(localStorage.getItem('user')).userId,
+        userId: JSON.parase(localStorage.getItem("user")).userId,
         sms: "",
         beInvitedCode: ""
       },

H5/src/views/rewards/compoments/rankItem.vue

@@ -4,7 +4,11 @@
       {{ RankIndex > 9 ? RankIndex : "0" + RankIndex }}
     </span>
     <div style="flex:1">
-      <img class="avatar" :src="imgBaseUrl + prizeVos.headImage" alt="用户头像" />
+      <img
+        class="avatar"
+        :src="imgBaseUrl + prizeVos.headImage"
+        alt="用户头像"
+      />
     </div>
     <span class="userName" style="flex:2;text-align:center">{{
       prizeVos.userId
@@ -30,10 +34,10 @@ export default {
   data() {
     return {
       imgBaseUrl: ""
-    }
+    };
   },
   created() {
-    this.imgBaseUrl = process.env.VUE_APP_BASE_URL
+    this.imgBaseUrl = process.env.VUE_APP_BASE_URL;
   }
 };
 </script>

H5/src/views/rewards/fastest-progress.vue

@@ -3,7 +3,9 @@
     <div class="bg">
       <van-icon name="arrow-left" @click="handlerBack" />
       <span class="title">本月进步最大奖励池</span>
-      <span class="award"><span v-if="growthTotal > 0">￥</span>{{ growthTotal }}</span>
+      <span class="award"
+        ><span v-if="growthTotal > 0">￥</span>{{ growthTotal }}</span
+      >
     </div>
     <div class="rank">
       <div class="header rank-flex">

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

@@ -61,7 +61,7 @@
         </div>
       </div>
       <div class="my">
-        <p>￥{{ awardInfo.userMonthAward }}</p>
+        <p>￥{{ awardInfo.userMonthAward || 0 }}</p>
         <div class="bottom">
           <img src="@/assets/images/我的份额.png" alt />
           <span>我的份额</span>
@@ -120,7 +120,7 @@ export default {
     },
     getData() {
       const params = {
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       monthRewards(params).then(res => {
         if (res.code === 0) {

H5/src/views/settings.vue

@@ -71,7 +71,7 @@ export default {
   methods: {
     getUser() {
       const params = {
-        userId: JSON.parse(localStorage.getItem('user')).userId
+        userId: JSON.parse(localStorage.getItem("user")).userId
       };
       console.log("setting-userId", params);
       getUserInfo2(params).then(res => {
@@ -79,7 +79,8 @@ export default {
           localStorage.setItem("user", JSON.stringify(res));
           this.$nextTick(() => {
             this.userName = res.userId;
-            this.inviteeCode = res.beInvitedCode == 1 ? '请填写推荐人邀请码' : res.beInvitedCode;
+            this.inviteeCode =
+              res.beInvitedCode == 1 ? "请填写推荐人邀请码" : res.beInvitedCode;
             this.avatar = res.headImage;
           });
         }
@@ -124,12 +125,15 @@ export default {
       this.inviteeCode = this.fillCode;
       const params = {
         inviteCode: this.fillCode,
-        userId:JSON.parase(localStorage.getItem('user')).userId
+        userId: JSON.parase(localStorage.getItem("user")).userId
       };
       fillInviteCode(params).then();
     },
     fillInviterCode() {
-      if (this.inviteeCode === "请填写推荐人邀请码" || this.inviteeCode == "1") {
+      if (
+        this.inviteeCode === "请填写推荐人邀请码" ||
+        this.inviteeCode == "1"
+      ) {
         this.inviteeCodeDialog = true;
         this.fillCode = "";
       }