diff --git a/config/request.js b/config/request.js index 4b3290c..8a68a49 100644 --- a/config/request.js +++ b/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) { diff --git a/pages/other/index.vue b/pages/other/index.vue index 50013e7..78a5d55 100644 --- a/pages/other/index.vue +++ b/pages/other/index.vue @@ -64,6 +64,7 @@ v-model="form.upgradeMemberCode" :disabled="isSpace" border="none" + @blur="upgradeMemberCodeHandleCb" /> { - deleteList.push({ - shoppingId: item, + return new Promise((resolve, reject) => { + let deleteList = [] + this.shoppingArr.forEach(item => { + deleteList.push({ + shoppingId: item, + }) }) - }) - this.allGoodsData.deleteList = deleteList - this.allGoodsData.upgradeMemberCode = this.form.upgradeMemberCode + this.allGoodsData.deleteList = deleteList + this.allGoodsData.upgradeMemberCode = this.form.upgradeMemberCode - api.memLevel(this.allGoodsData).then(res => { - if (res.data.isEnough) { - this.form.pkGradeVal = res.data.pkGradeVal - } else { - this.isLoading.close() - } + api + .memLevel(this.allGoodsData) + .then(res => { + if (res.data.isEnough) { + 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('请输入会员编号')) - } else { + return callback(new Error('请输入会员编号')) + } + 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() { - this.$refs.uForm.validate().then(res => { - if (this.agreementShow.length == 0) { - uni.showToast({ - title: '请阅读并同意购买协议', - icon: 'none', - duration: 1500, - }) - return - } + async goBuy() { + this.$refs.uForm.validate().then(async res => { 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({