diff --git a/colorui/main.css b/colorui/main.css index fade3b2..93949fc 100644 --- a/colorui/main.css +++ b/colorui/main.css @@ -3910,3 +3910,14 @@ scroll-view.cu-steps .cu-item { .lines-white { color: #ffffff; } + + +.custom-radio .checklist-text { + font-size: 15px!important; + font-weight: 500!important; +} + +.uni-date__x-input { + height: 64rpx!important; + line-height: 64rpx!important; +} \ No newline at end of file diff --git a/common/js/request.js b/common/js/request.js index f77f557..f6952d7 100644 --- a/common/js/request.js +++ b/common/js/request.js @@ -1,7 +1,8 @@ import globalData from '@/common/js/globalData.js'; export default { - address: 'https://www.opsoul.com:8881', + // address: 'https://www.opsoul.com:8881',https://gmhl.opsoul.com + address: 'https://gmhl.opsoul.com', // 异步接口拦截 addInterceptor() { uni.addInterceptor('request', { @@ -11,7 +12,7 @@ export default { title: '加载中' }) // request 触发前拼接 url - args.url = 'https://www.opsoul.com:8881' + args.url; + args.url = 'https://gmhl.opsoul.com' + args.url; // args.url = 'http://192.168.2.54:80' + args.url; // args.url = 'http://127.0.0.1:80' + args.url; if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') { @@ -707,5 +708,14 @@ export default { data: params }) return res[1].data; + }, + // 添加急报记录 + async addWarnRecord(params = {}) { + let res = await uni.request({ + url: '/warn/record/app/add', + method: 'POST', + data: params + }) + return res[1].data; } } diff --git a/components/goods-card/product-picked.vue b/components/goods-card/product-picked.vue index 458f426..4aa936d 100644 --- a/components/goods-card/product-picked.vue +++ b/components/goods-card/product-picked.vue @@ -5,7 +5,7 @@ {{columnTitleArr[0]}} - {{title}} + {{title}} @@ -17,7 +17,7 @@ - {{valCol.value}} @@ -46,11 +46,11 @@ }, pickedList: { type: Array, - default: [] + default: () => [] }, columnTitleArr: { type: Array, - default: [] + default: () => [] }, showToServNum: { type: Boolean, diff --git a/pages/my/components/modal/urge_order.vue b/pages/my/components/modal/urge_order.vue new file mode 100644 index 0000000..ab8a4ef --- /dev/null +++ b/pages/my/components/modal/urge_order.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/pages/my/edit-address.vue b/pages/my/edit-address.vue index 93e5c67..4dbf767 100644 --- a/pages/my/edit-address.vue +++ b/pages/my/edit-address.vue @@ -21,7 +21,7 @@ 地址选择 - {{formData.area && formData.area.length ? formData.area[0].areaName + '-' + formData.area[1].areaName + '-' + formData.area[2].areaName : '请选择'}} + {{formData.area && formData.area.length ? formData.area[0].areaName + '-' + formData.area[1].areaName + '-' + formData.area[2].areaName + '-' + formData.area[3].areaName : '请选择'}} @@ -83,9 +83,13 @@ let col2Code = idArr ? idArr[1] : subAreaList[0].areaCode; let subSubAreaList = await this.$request.areaListByStep({ parentCode: col2Code }); subSubAreaList = subSubAreaList.data; + let col3Code = idArr ? idArr[2] : subSubAreaList[0].areaCode; + let subSub2AreaList = await this.$request.areaListByStep({ parentCode: col3Code }); + subSub2AreaList = subSub2AreaList.data; this.areaList.push(areaList); this.areaList.push(subAreaList); this.areaList.push(subSubAreaList); + this.areaList.push(subSub2AreaList); }, regionChange(e) { this.multiIndex = e.detail.value; @@ -97,30 +101,45 @@ this.formData.provinceId = chosenArea[0].areaId; this.formData.cityId = chosenArea[1].areaId; this.formData.countryId = chosenArea[2].areaId; + this.formData.streetId = chosenArea[3].areaId; }, async regionColChange(e) { let colObj = e.detail; if (colObj.column == 0) { - let subSubAreaList = []; + let subSubAreaList = [], subSub2AreaList = []; // 通过一级查询二级，通过二级查三级 let subAreaList = await this.$request.areaListByStep({parentCode: this.areaList[0][colObj.value].areaCode}); subAreaList = subAreaList.data; if (subAreaList && subAreaList.length) { subSubAreaList = await this.$request.areaListByStep({parentCode: subAreaList[0].areaCode}); subSubAreaList = subSubAreaList.data; + if(subSubAreaList && subSubAreaList.length) { + subSub2AreaList = await this.$request.areaListByStep({parentCode: subSubAreaList[0].areaCode}); + subSub2AreaList = subSub2AreaList.data; + } } - this.areaList.pop(); - this.areaList.pop(); - this.areaList.push(subAreaList); - this.areaList.push(subSubAreaList); - this.multiIndex = [colObj.value, 0, 0]; + this.areaList[1] = subAreaList + this.areaList[2] = subSubAreaList + this.areaList[3] = subSub2AreaList + this.multiIndex = [colObj.value, 0, 0, 0]; } else if (colObj.column == 1) { + let subSub2AreaList = [] // 通过二级查三级 let subSubAreaList = await this.$request.areaListByStep({parentCode: this.areaList[1][colObj.value].areaCode}); subSubAreaList = subSubAreaList.data; - this.areaList.pop(); - this.areaList.push(subSubAreaList); - this.multiIndex = [this.multiIndex[0], colObj.value, 0]; + if (subSubAreaList && subSubAreaList.length) { + subSub2AreaList = await this.$request.areaListByStep({parentCode: subSubAreaList[0].areaCode}); + subSub2AreaList = subSub2AreaList.data; + } + this.areaList[2] = subSubAreaList + this.areaList[3] = subSub2AreaList + this.multiIndex = [this.multiIndex[0], colObj.value, 0, 0]; + } else if (colObj.column == 2) { + // 通过二级查三级 + let subSubAreaList = await this.$request.areaListByStep({parentCode: this.areaList[2][colObj.value].areaCode}); + subSubAreaList = subSubAreaList.data; + this.areaList[3] = subSubAreaList; + this.multiIndex = [this.multiIndex[0], this.multiIndex[1], colObj.value, 0]; } }, isDefaultChange(e) { diff --git a/pages/my/my-address.vue b/pages/my/my-address.vue index 69abe12..e992702 100644 --- a/pages/my/my-address.vue +++ b/pages/my/my-address.vue @@ -7,13 +7,14 @@ - + 默认 {{item.provinceName}} {{item.cityName}} {{item.countryName}} + {{item.streetName || ''}} {{item.address}} diff --git a/pages/my/my-cart.vue b/pages/my/my-cart.vue index 6536d81..1238ac8 100644 --- a/pages/my/my-cart.vue +++ b/pages/my/my-cart.vue @@ -8,7 +8,7 @@ - + @@ -21,7 +21,8 @@ - diff --git a/pages/my/my-money-bag.vue b/pages/my/my-money-bag.vue index e3f0dfc..a6a23bd 100644 --- a/pages/my/my-money-bag.vue +++ b/pages/my/my-money-bag.vue @@ -16,7 +16,7 @@ - + diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue index 5207153..265352d 100644 --- a/pages/my/serv-detail.vue +++ b/pages/my/serv-detail.vue @@ -351,12 +351,16 @@ 退单退款 + + + 催单约单 - + + @@ -367,13 +371,15 @@