diff --git a/src/main/resources/views/mobile/welfare/list/receive.html b/src/main/resources/views/mobile/welfare/list/receive.html index 51290e3..63d0f47 100644 --- a/src/main/resources/views/mobile/welfare/list/receive.html +++ b/src/main/resources/views/mobile/welfare/list/receive.html @@ -386,18 +386,24 @@ layout("/mobile/platform.html"){
-
+
{{item.address}} + v-for="item in offlineStoresOption" + > + {{item.address}} + +
+
+
@@ -434,6 +440,7 @@ layout("/mobile/platform.html"){ offlineStoresOption: [], shoppingAddress: "", optionIndex: null, + optionData: {}, } }, computed: { @@ -501,13 +508,23 @@ layout("/mobile/platform.html"){ this.$set(this.projectInfo.welfareProjectSubjects[0].options[this.optionIndex], 'receiveAddress', address) this.shoppingPopup = false }, - onSearchShoppingAddress() { + async onSearchShoppingAddress() { + const data = await this.getShoppingType() + const shopping = data.find(d => d.id === this.optionData.shoppingId) + if (this.shoppingAddress) { + this.offlineStoresOption = shopping.offlineStores.filter(s => s.address.includes(this.shoppingAddress)) + } else { + this.offlineStoresOption = shopping.offlineStores + } + }, openShoppingPopup(item, optionIndex) { + this.optionData = item const shopping = this.shoppingTypeOptions.find(v => v.id === item.shoppingId) this.offlineStoresOption = shopping.offlineStores this.optionIndex = optionIndex + this.shoppingAddress = "" this.shoppingPopup = true }, //数量更改 @@ -597,7 +614,7 @@ layout("/mobile/platform.html"){ selectNum: v.selectNum } }) - if (notReceiveAddress.length > 0){ + if (notReceiveAddress.length > 0) { this.$modal.msg("请填写收货门店:" + notReceiveAddress.join(",")) return } @@ -680,15 +697,16 @@ layout("/mobile/platform.html"){ }, async getShoppingType() { const resp = await $.get("/platform/shoppingType/apply/getShoppingType") - this.shoppingTypeOptions = resp.data + return resp.data + }, }, - created() { + async created() { const id = GetQueryString("projectId") if (!id) return this.projectId = id this.getProjectInfo() - this.getShoppingType() + this.shoppingTypeOptions = await this.getShoppingType() // this.getChoice() getEnumOptions("WelfareProvideMode").then(res => { this.welfareProvideMode = res