diff --git a/config/request.js b/config/request.js index a7de8a3..88a4d28 100644 --- a/config/request.js +++ b/config/request.js @@ -15,12 +15,11 @@ module.exports = vm => { // 初始化请求配置 uni.$u.http.setConfig(config => { - // config.baseURL = 'https://p1.hzs413.com/inter-api'; // 192.168.0.100:8080 //#ifdef DEV_SERVER console.log('DEV_SERVER') - config.baseURL = 'http://192.168.0.86:8080' + config.baseURL = 'http://t-bl.beida777.com/prod-api' //#endif //#ifdef QA_SERVER diff --git a/pages/regiest/index.vue b/pages/regiest/index.vue index d9aa7c2..521620c 100644 --- a/pages/regiest/index.vue +++ b/pages/regiest/index.vue @@ -11,8 +11,9 @@ /> + + + + {{ regionAddress.map(item => item.name).join('-') }} + + 请选择区域 + + + + + @@ -343,12 +372,16 @@ import { REPURCHASE_AREA, REISSUE_AREA, } from '@/util/specialAreaMap' +import regionSelect from '@/pages/commonMixins/regionSelect' +import RegionAddress from '@/components/region-address.vue' export default { components: { 'v-address': address, mustAgreeMent, agreement, + RegionAddress, }, + mixins: [regionSelect], data() { return { isDeliveryWay: true, @@ -406,6 +439,7 @@ export default { orderItemsParams: [], isLoading: false, centerCodeId: '', + regionAddress: [], rules: { parent: [ { @@ -488,6 +522,8 @@ export default { }, delId: '', selTable: [], + regionAddress: [], + gradeValue: '', } }, onLoad(options) { @@ -538,6 +574,12 @@ export default { this.getAddressList() }, methods: { + regionSelectHandle() { + this.$refs.regionAddress.setShow(this.provinceList[0].pkId) + }, + setRegionAddress(area) { + this.regionAddress = area + }, setPageTitle(areaId) { const areaList = [ REGIEST_AREA, @@ -677,6 +719,10 @@ export default { console.log(res.data, 'res.data.memLevel') if (res.data.isEnough) { this.form.pkGradeVal = res.data.pkGradeVal + if ([60, 70, 80].includes(res.data.gradeValue)) { + this.gradeValue = res.data.gradeValue + this.getRegionAreaList(res.data.gradeValue) + } } else { this.form.pkGradeVal = '' uni.showToast({ @@ -958,6 +1004,19 @@ export default { }) }, goBuy() { + const extParams = {} + if ([60, 70, 80].includes(this.gradeValue) && this.provinceList?.length) { + if (!this.regionAddress.length) { + uni.showToast({ + title: '请选择会员区域', + icon: 'none', + }) + return + } + extParams.regionProvince = this.regionAddress[0]?.pkId || -1 + extParams.regionCity = this.regionAddress[1]?.pkId || -1 + extParams.regionCounty = this.regionAddress[2]?.pkId || -1 + } this.$refs.uForm.validate().then(res => { this.isLoading = true let deleteList = [] @@ -967,7 +1026,7 @@ export default { }) }) upgradeOrder( - Object.assign({}, this.form, this.allGoodsData, { + Object.assign({}, this.form, extParams, this.allGoodsData, { deleteList: deleteList, shopList: deleteList, parentCode: this.form.parent,