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

config/request.js

@@ -19,7 +19,7 @@ module.exports = vm => {
 
     //#ifdef DEV_SERVER
     console.log('DEV_SERVER')
-    config.baseURL = 'https://t-app.beida666.com/prod-api'
+    config.baseURL = 'http://192.168.0.86:8080'
     //#endif
 
     //#ifdef QA_SERVER
@@ -57,7 +57,6 @@ module.exports = vm => {
   // 响应拦截
   uni.$u.http.interceptors.response.use(
     response => {
-      console.log(response, '......response')
       const data = response.data
       // uni.$u.toast(data.msg)
       // if (data.code == 200) {

pages/other/index.vue

@@ -64,6 +64,7 @@
               v-model="form.upgradeMemberCode"
               :disabled="isSpace"
               border="none"
+              @blur="upgradeMemberCodeHandleCb"
             />
           </u-form-item>
           <u-form-item
@@ -537,13 +538,13 @@ export default {
       isLoading: false,
       centerCodeId: '',
       rules: {
-        // upgradeMemberCode: [
+        upgradeMemberCode: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     validator: this.upgradeMemberCodePass,
+            validator: this.upgradeMemberCodePass,
-        //     trigger: ['blur'],
+            trigger: ['blur'],
-        //   },
+          },
-        // ],
+        ],
 
         recName: [
           {
@@ -703,21 +704,30 @@ export default {
       }
     },
     getMember() {
-      let deleteList = []
+      return new Promise((resolve, reject) => {
-      this.shoppingArr.forEach(item => {
+        let deleteList = []
-        deleteList.push({
+        this.shoppingArr.forEach(item => {
-          shoppingId: item,
+          deleteList.push({
+            shoppingId: item,
+          })
         })
-      })
+        this.allGoodsData.deleteList = deleteList
-      this.allGoodsData.deleteList = deleteList
+        this.allGoodsData.upgradeMemberCode = this.form.upgradeMemberCode
-      this.allGoodsData.upgradeMemberCode = this.form.upgradeMemberCode
 
-      api.memLevel(this.allGoodsData).then(res => {
+        api
-        if (res.data.isEnough) {
+          .memLevel(this.allGoodsData)
-          this.form.pkGradeVal = res.data.pkGradeVal
+          .then(res => {
-        } else {
+            if (res.data.isEnough) {
-          this.isLoading.close()
+              this.form.pkGradeVal = res.data.pkGradeVal
-        }
+              resolve()
+            } else {
+              this.isLoading.close()
+              reject()
+            }
+          })
+          .catch(err => {
+            reject(err)
+          })
       })
     },
     addAdress() {
@@ -835,36 +845,59 @@ export default {
     },
     // 升级编号获取name
     upgradeMemberCodePass(rule, value, callback) {
-      console.log('asdasd?')
       if (!value) {
-        callback(new Error('请输入会员编号'))
+        return callback(new Error('请输入会员编号'))
-      } else {
+      }
+      callback()
+      // else {
+
+      //   api
+      //     .upgRel({
+      //       upgradeMemberCode: value,
+      //     })
+      //     .then(res => {
+      //       if (res.code == 200) {
+      //         this.form.upgradeMemberName = res.data.upgradeMemberName
+      //         if (
+      //           this.specialArea == 2 ||
+      //           this.specialArea == 25 ||
+      //           this.specialArea == 27
+      //         ) {
+      //           this.getMember()
+      //         }
+      //         this.$forceUpdate()
+      //         callback()
+      //       } else {
+      //         callback(new Error(res.msg))
+      //       }
+      //     })
+      //     .catch(err => {
+      //       callback(new Error(err))
+      //     })
+      // }
+    },
+    getMemberName(val) {
+      return new Promise((resolve, reject) => {
         api
           .upgRel({
-            upgradeMemberCode: value,
+            upgradeMemberCode: val || this.form.upgradeMemberCode,
           })
           .then(res => {
             if (res.code == 200) {
+              reslove()
               this.form.upgradeMemberName = res.data.upgradeMemberName
-              if (
-                this.specialArea == 2 ||
-                this.specialArea == 25 ||
-                this.specialArea == 27
-              ) {
-                this.getMember()
-              }
               this.$forceUpdate()
-              callback()
             } else {
-              callback(new Error(res.msg))
+              reject()
             }
           })
-          .catch(err => {
+      })
-            callback(new Error(err))
+    },
-          })
+    upgradeMemberCodeHandleCb(val) {
-      }
+      this.getMemberName(val).then(() => {
+        this.getMember()
+      })
     },
-
     sureCk(e) {
       const { value } = e
       this.form.pkStorehouse = value[0].id
@@ -1027,16 +1060,8 @@ export default {
         uni.setStorageSync('mToken', res.msg)
       })
     },
-    goBuy() {
+    async goBuy() {
-      this.$refs.uForm.validate().then(res => {
+      this.$refs.uForm.validate().then(async res => {
-        if (this.agreementShow.length == 0) {
-          uni.showToast({
-            title: '请阅读并同意购买协议',
-            icon: 'none',
-            duration: 1500,
-          })
-          return
-        }
         if (this.specialArea == 31) {
           if (this.totalAmont < 1000) {
             uni.showToast({
@@ -1048,6 +1073,14 @@ export default {
           }
         }
         this.isLoading = true
+        try {
+          await this.getMemberName()
+          await this.getMember()
+        } catch (err) {
+          this.isLoading = false
+          return
+        }
+
         let deleteList = []
         this.shoppingArr.forEach(item => {
           deleteList.push({