Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-h5 into bd-test

pages/other/index.vue

@@ -20,7 +20,12 @@
             <u-icon name="arrow-down"></u-icon>
           </view>
         </u-form-item> -->
-        <view v-if="(specialArea != 2 && specialArea != 25 && specialArea != 27) || newShareMember">
+        <view
+          v-if="
+            (specialArea != 2 && specialArea != 25 && specialArea != 27) ||
+            newShareMember
+          "
+        >
           <u-form-item
             :label="'会员编号'"
             required
@@ -43,7 +48,12 @@
           </u-form-item>
         </view>
 
-        <view v-if="(specialArea == 2 || specialArea == 25 || specialArea == 27) && !newShareMember">
+        <view
+          v-if="
+            (specialArea == 2 || specialArea == 25 || specialArea == 27) &&
+            !newShareMember
+          "
+        >
           <u-form-item
             :label="'升级编号'"
             required
@@ -527,13 +537,13 @@ export default {
       isLoading: false,
       centerCodeId: '',
       rules: {
-        upgradeMemberCode: [
-          {
-            required: true,
-            validator: this.upgradeMemberCodePass,
-            trigger: ['blur'],
-          },
-        ],
+        // upgradeMemberCode: [
+        //   {
+        //     required: true,
+        //     validator: this.upgradeMemberCodePass,
+        //     trigger: ['blur'],
+        //   },
+        // ],
 
         recName: [
           {
@@ -672,7 +682,7 @@ export default {
     // 获取地址
     this.getAddressList()
     this.newShareMember = uni.getStorageSync('User')?.loginType !== 0
-    if(this.newShareMember){
+    if (this.newShareMember) {
       uni.setNavigationBarTitle({
         title: '会员专区',
       })
@@ -704,7 +714,6 @@ export default {
 
       api.memLevel(this.allGoodsData).then(res => {
         if (res.data.isEnough) {
-          console.log(res.data, 'res.data...memLevel')
           this.form.pkGradeVal = res.data.pkGradeVal
         } else {
           this.isLoading.close()
@@ -826,6 +835,7 @@ export default {
     },
     // 升级编号获取name
     upgradeMemberCodePass(rule, value, callback) {
+      console.log('asdasd?')
       if (!value) {
         callback(new Error('请输入会员编号'))
       } else {