Merge branch 'dev_lqs' into 'master'

修改

See merge request !93

H5/src/router/index.js

@@ -156,7 +156,6 @@ const routes = [
   }
 ];
 
-
 const router = new VueRouter({
   mode: "history",
   base: process.env.BASE_URL,

H5/src/utils/bridgeToAppFun.js

@@ -56,7 +56,7 @@ class bridgeToAppFun {
       console.log("an");
       window.android.logout();
     } else {
-      console.log('ios');
+      console.log("ios");
       jsBridge.callhandler("logout");
     }
   }
@@ -66,15 +66,15 @@ class bridgeToAppFun {
       console.log("an");
       try {
         const referrer = document.referrer;
-        if (referrer !== '') {
-          console.log('reffer不为空', referrer);
+        if (referrer !== "") {
+          console.log("reffer不为空", referrer);
           // location.href = referrer;
         } else {
-          console.log('调用navigateBack');
+          console.log("调用navigateBack");
           window.android.navigateBack();
         }
       } catch {
-        console.log('返回调用失败，都不行');
+        console.log("返回调用失败，都不行");
       }
     } else {
       jsBridge.callhandler("navigateBack");

H5/src/views/airDropPool.vue

@@ -63,7 +63,7 @@ export default {
     queryData() {
       const _this = this;
       queryAerialDelivery().then(res => {
-        console.log('空投池', res);
+        console.log("空投池", res);
         if (res.code === 0) {
           _this.total = res.data.total;
           _this.userPoolVos = res.data.userPoolVos;

H5/src/views/canCashOut.vue

@@ -43,13 +43,14 @@ export default {
     return {
       preNum: "125",
       currentNum: "325",
-      rules:
-        "提现规则：" ,
-        rulesMent:'1、结算：所有购买及推广产生的佣金实时结算，月度肥料及进步奖每月1号结算上个月收益，在APP我的收益页面可随时查询收益情况。',
-        rulesWith:'2、提现：可提现部分为结算后已通过平台审核的佣金，佣金审核周期为1-15个工作日，审核通过后可实时提现。',
-        rulesPoundage:'3、手续费：提现无需手续费。',
-        rulesTax:'4、税费：提现时系统自动扣除2%个人所得税，剩余税费由平台替缴。',
-        rulesAttribution:'此规则最终解释权归西田森市场运营部所有',
+      rules: "提现规则：",
+      rulesMent:
+        "1、结算：所有购买及推广产生的佣金实时结算，月度肥料及进步奖每月1号结算上个月收益，在APP我的收益页面可随时查询收益情况。",
+      rulesWith:
+        "2、提现：可提现部分为结算后已通过平台审核的佣金，佣金审核周期为1-15个工作日，审核通过后可实时提现。",
+      rulesPoundage: "3、手续费：提现无需手续费。",
+      rulesTax: "4、税费：提现时系统自动扣除2%个人所得税，剩余税费由平台替缴。",
+      rulesAttribution: "此规则最终解释权归西田森市场运营部所有"
     };
   },
   mounted() {

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

@@ -39,7 +39,7 @@ export default {
   name: "CashOutRecord",
   data() {
     return {
-      maxDate:'',
+      maxDate: "",
       show: false,
       options: [{ text: "2021年3月", value: 0 }],
       selected: "",
@@ -48,9 +48,9 @@ export default {
     };
   },
   mounted() {
-    this.maxDate = new Date(),
-    this.selected = `${this.currentDate.getFullYear()}年${this.currentDate.getMonth() +
-      1}月`;
+    (this.maxDate = new Date()),
+      (this.selected = `${this.currentDate.getFullYear()}年${this.currentDate.getMonth() +
+        1}月`);
     const time = this.currentDate.toLocaleDateString().replace(/\//g, "-");
     this.getRecordList(time);
   },

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

@@ -22,11 +22,11 @@
       <div class="real">
         <p class="real-item">
           <span>实际到账</span>
-          <span>{{account}}</span>
+          <span>{{ account }}</span>
         </p>
         <p class="real-item">
           <span>税款</span>
-          <span>{{rate}}</span>
+          <span>{{ rate }}</span>
         </p>
         <p class="explain">
           <span>扣税说明</span>
@@ -95,8 +95,8 @@ export default {
       userPhone: this.$userId,
       bank: "",
       money: null,
-      account:0,
-      rate:0,
+      account: 0,
+      rate: 0,
       remainMoney: 100,
       resultDialogTitle: "",
       resultDialogTip: "",
@@ -117,10 +117,10 @@ export default {
         return false;
       }
     },
-      inputClick(){
-          this.rate = this.money * 0.02
-          this.account = this.money - this.rate
-      },
+    inputClick() {
+      this.rate = this.money * 0.02;
+      this.account = this.money - this.rate;
+    },
     canCashOut() {
       const params = {
         userId: this.$userId
@@ -173,9 +173,9 @@ export default {
         }
       });
     },
-      onCloseDialog(){
-          this.validCodeDialogShow = false;
-      },
+    onCloseDialog() {
+      this.validCodeDialogShow = false;
+    },
     onSubmit() {
       this.validCodeDialogShow = false;
       const params = {

H5/src/views/instructions.vue

@@ -71,16 +71,18 @@
         </span>
       </p>
       <p style="text-align: left">
+        <span class="paragraph">（a）用户授权本APP透露这些信息。&nbsp;</span>
         <span class="paragraph"
-          >（a）用户授权本APP透露这些信息。&nbsp;</span>
-          <span class="paragraph">（b）相应的法律及程序要求本APP提供用户的个人资料。如果用户提供的资料包含有不正确的信息，本APP保留结束用户使用本APP信息服务资格的权利。&nbsp;&nbsp;&nbsp;&nbsp;
+          >（b）相应的法律及程序要求本APP提供用户的个人资料。如果用户提供的资料包含有不正确的信息，本APP保留结束用户使用本APP信息服务资格的权利。&nbsp;&nbsp;&nbsp;&nbsp;
         </span>
       </p>
       <p style="text-align: left">
         <span class="paragraph"
           >四、&nbsp;用户在注册时应当选择常用的手机号码，且同意接受并阅读本APP发往用户的各类短信。如用户未及时从自己的手机接受短信或因用户手机或用户短信接收及阅读程序本身的问题使短信无法正常接收或阅读的，只要本APP成功发送了手机短信，应当视为用户已经接收到相关的短信。&nbsp;
-          用户在注册时应当填写正确、有效的手机号码，此手机号码用以获取验证码，如因用户未填写正确、有效的手机号码而导致验证码无法查收，无法正确登陆本APP造成用户本人损失的，本APP不承担相关责任。</span>
-          <span class="paragraph">五、&nbsp;服务条款的修改&nbsp;
+          用户在注册时应当填写正确、有效的手机号码，此手机号码用以获取验证码，如因用户未填写正确、有效的手机号码而导致验证码无法查收，无法正确登陆本APP造成用户本人损失的，本APP不承担相关责任。</span
+        >
+        <span class="paragraph"
+          >五、&nbsp;服务条款的修改&nbsp;
           本APP有权在必要时修改服务条款，本APP服务条款一旦发生变动，将会在重要页面上提示修改内容。如果不同意所改动的内容，用户可以主动取消获得的本APP信息服务。如果用户继续享用本APP信息服务，则视为接受服务条款的变动。本APP保留随时修改或中断服务而不需通知用户的权利。本APP行使修改或中断服务的权利，不需对用户或第三方负责。&nbsp;
         </span>
       </p>

H5/src/views/modefyAvatar.vue

@@ -60,25 +60,27 @@ export default {
       });
     },
     onRead(file) {
-      if (!localStorage.getItem('user').inviteCode) {
-        this.$toast.fail('当前用户没有邀请码');
-        return
+      if (!localStorage.getItem("user").inviteCode) {
+        this.$toast.fail("当前用户没有邀请码");
+        return;
       }
-      const inviteCode = JSON.parse(localStorage.getItem('user').inviteCode);
+      const inviteCode = JSON.parse(localStorage.getItem("user").inviteCode);
       const params = {
         inviteCode: inviteCode
       };
       const fd = new FormData();
       fd.append("files", file.file);
-      uploadImage(params, fd).then(res => {
-        console.log(res);
-        this.avatar = file.content;
-        this.imageUrl = res.zxUrl;
-        this.canSubmit = true;
-      }).catch(err => {
-        console.log('上传图像', err);
-        this.$toast.fail('图片上传失败,请重新选择');
-      });
+      uploadImage(params, fd)
+        .then(res => {
+          console.log(res);
+          this.avatar = file.content;
+          this.imageUrl = res.zxUrl;
+          this.canSubmit = true;
+        })
+        .catch(err => {
+          console.log("上传图像", err);
+          this.$toast.fail("图片上传失败,请重新选择");
+        });
     },
     onDeleteAvatar(file, detail) {
       return new Promise((resolve, reject) => {

H5/src/views/register.vue

@@ -129,7 +129,7 @@ export default {
       }
       _this.time = 60;
       _this.disabled = true;
-       _this.handelSendSmsApi();
+      _this.handelSendSmsApi();
       _this.timer = setInterval(() => {
         if (_this.time === 0) {
           clearInterval(_this.timer);
@@ -169,7 +169,7 @@ export default {
         this.$toast.clear();
         _this.registerBtnDisabled = false;
         if (res.code === 0) {
-            this.$toast("注册成功");
+          this.$toast("注册成功");
           //_this.$toast.sucess(res.msg);
         } else {
           _this.show = true;

H5/src/views/settings.vue

@@ -84,13 +84,15 @@ export default {
       });
     },
     logout() {
-      logout().then(res => {
-        if (res.code == 0) {
-          localStorage.clear()
-        }
-      }).catch(err => {
-        console.log(err);
-      });
+      logout()
+        .then(res => {
+          if (res.code == 0) {
+            localStorage.clear();
+          }
+        })
+        .catch(err => {
+          console.log(err);
+        });
       this.$bridgeToAppFun.logoutToApp();
     },
     jumpToInstructions() {
@@ -109,11 +111,11 @@ export default {
     },
     onFillInviteeCode() {
       if (!this.fillCode) {
-        this.$toast.fail('请填写推荐人邀请码')
+        this.$toast.fail("请填写推荐人邀请码");
         return;
       }
       if (!/^[A-z|\d]{6}$/.test(this.fillCode)) {
-        this.$toast.fail('邀请码只支持6位数字+字母的组合')
+        this.$toast.fail("邀请码只支持6位数字+字母的组合");
         return;
       }
       this.inviteeCodeDialog = false;
@@ -125,7 +127,7 @@ export default {
       fillInviteCode(params).then();
     },
     fillInviterCode() {
-      if (this.inviteeCode === "未填写" || this.inviteeCode == '1') {
+      if (this.inviteeCode === "未填写" || this.inviteeCode == "1") {
         this.inviteeCodeDialog = true;
         this.fillCode = "";
       }
@@ -138,8 +140,8 @@ export default {
 .settings {
   box-sizing: border-box;
   padding: 10px 16px;
-  .van-less{
-    .van-cell__right-icon{
+  .van-less {
+    .van-cell__right-icon {
       display: none;
     }
   }