页面调整

components/SimpleCity/index.vue

@@ -94,7 +94,8 @@ export default {
         this.offset = item.offset
         this.current = index
         this.filterList()
-        this.showOptions = true
+        // this.showOptions = true
+        this.showOptions = this.showOptions ? false : true
       } else {
         this.showOptions = false
       }

components/SimpleLogin/index.vue

@@ -236,14 +236,14 @@ export default {
         this.routePrefix,
         'club-register-link'
       )
-      if (clubRegisterLink) {
-        this.$removeStorage(this.routePrefix, 'club-register-link')
-        this.$setStorage(this.routePrefix, 'bind-flag', true)
-        this.$router.push(clubRegisterLink)
-      } else {
-        this.$router.push(this.routePrefix)
-      }
-
+      // if (clubRegisterLink) {
+      //   this.$removeStorage(this.routePrefix, 'club-register-link')
+      //   this.$setStorage(this.routePrefix, 'bind-flag', true)
+      //   this.$router.push(clubRegisterLink)
+      // } else {
+      //   this.$router.push(this.routePrefix)
+      // }
+      window.location.reload()
       // 重定向
       // const login_redicret = this.$getStorage(
       //   this.routePrefix,

components/SimpleRadio/index.vue

@@ -185,8 +185,8 @@ export default {
         position: relative;
         overflow: hidden;
 
-        &:nth-child(3n) {
-          margin-right: 0;
+        &:last-child {
+          margin-left: 0;
         }
 
         &.active {
@@ -225,7 +225,7 @@ export default {
         padding-left: 6vw;
         margin-right: 7.2vw;
 
-        &:nth-child(4n) {
+        &:last-child {
           margin-right: 0;
         }
 

pages/_template/app/approve/index.vue

@@ -4,7 +4,7 @@
       <img class="logo" :src="supplierInfo.logo" />
       <div
         class="name mt-2"
-        v-text="supplierInfo.shopName + '正品授权认证'"
+        v-text="supplierInfo.shopName + '正品授权'"
       ></div>
     </div>
     <div class="page-content">

pages/_template/app/form/components/form-club-device.vue

@@ -144,18 +144,13 @@ export default {
     }
 
     const paramListValidate = (rule, value, callback) => {
-      console.log(value)
-      const valid = value.some(
-        (item) =>
-          (item.paramName && !item.paramContent) ||
-          (!item.paramName && item.paramContent)
+      const notEmptyList = value.filter(
+        (item) => item.paramName.trim() && item.paramContent.trim()
       )
-
-      const isEmpty = value.every(
-        (item) => !item.paramName && !item.paramContent
-      )
-      if (valid || isEmpty) {
+      if (notEmptyList.length === 0) {
         callback(new Error('参数列表不能为空'))
+      } else if (notEmptyList.length < 4) {
+        callback(new Error('请填写至少4项参数'))
       } else {
         callback()
       }
@@ -405,6 +400,18 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.club-device {
+  ::v-deep {
+    .el-input.is-active .el-input__inner,
+    .el-input__inner:focus {
+      @include themify($themes) {
+        border-color: themed('color');
+      }
+    }
+  }
+}
+
+
 // pc端
 @media screen and (min-width: 768px) {
   .el-select {

pages/_template/app/form/components/form-club-info.vue

@@ -367,6 +367,18 @@ export default {
       provinceList: [],
     }
   },
+
+  watch: {
+    'formData.firstClubType': function (nVal, oVal) {
+      if (nVal === 1) {
+        this.formData.secondClubType = 1
+      } else if (nVal === 2) {
+        this.formData.secondClubType = 5
+      } else {
+        this.formData.secondClubType = ''
+      }
+    },
+  },
   computed: {
     lgnlatText() {
       return this.lnglat ? this.lnglat.join(',') : ''
@@ -581,6 +593,17 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.club-info {
+  ::v-deep {
+    .el-input.is-active .el-input__inner,
+    .el-input__inner:focus {
+      @include themify($themes) {
+        border-color: themed('color');
+      }
+    }
+  }
+}
+
 // pc端
 @media screen and (min-width: 768px) {
   .position-select {
@@ -681,8 +704,8 @@ export default {
         display: inline-block;
         width: 16px;
         height: 16px;
-        background: url(~assets/theme-images/common/icon-position.png)
-          no-repeat center;
+        background: url(~assets/theme-images/common/icon-position.png) no-repeat
+          center;
         background-size: 16px 16px;
       }
     }
@@ -796,8 +819,8 @@ export default {
         display: inline-block;
         width: 3.58vw;
         height: 3.58vw;
-        background: url(~assets/theme-images/common/icon-position.png)
-          no-repeat center;
+        background: url(~assets/theme-images/common/icon-position.png) no-repeat
+          center;
         background-size: 3.58vw;
       }
     }

pages/_template/app/form/components/form-club-register.vue

@@ -8,7 +8,6 @@
           placeholder="手机号"
           @blur="onMobileBlur"
           maxlength="11"
-          show-word-limit
           @input="handleMobileInput"
         ></el-input>
       </el-form-item>
@@ -18,7 +17,6 @@
             v-model="formData.verifyCode"
             placeholder="验证码"
             maxlength="6"
-            show-word-limit
             @input="handleVerifyCodeInput"
           ></el-input>
           <div class="send ml-8" @click="onSend">{{ sendCodeBtnText }}</div>
@@ -209,6 +207,17 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.club-register {
+  ::v-deep {
+    .el-input.is-active .el-input__inner,
+    .el-input__inner:focus {
+      @include themify($themes) {
+        border-color: themed('color');
+      }
+    }
+  }
+}
+
 .verifyCode {
   .send {
     cursor: pointer;