From 620a327c158dff80e4a565a92731433c92a89c39 Mon Sep 17 00:00:00 2001
From: dd3s_206 <zhaoxinyu0716@gmail.com>
Date: Tue, 2 Jun 2026 19:58:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E5=B7=A5=E7=A6=8F=E5=88=A9-=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E9=80=89=E6=8B=A9=EF=BC=9A=E9=99=90=E5=88=B6=E6=94=B6?=
 =?UTF-8?q?=E8=8E=B7=E5=9C=B0=E5=9D=80=E5=9C=A8=E5=93=88=E5=B0=94=E6=BB=A8?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E7=9A=84=E8=BE=96=E5=8C=BA=EF=BC=88=E7=9C=81?=
 =?UTF-8?q?=E5=B8=82=E5=8C=BA=E4=B8=8B=E6=8B=89=E6=A1=86=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8=E5=B8=82=E5=A4=96=E7=9A=84=E7=9C=81?=
 =?UTF-8?q?=E4=BB=BD=EF=BC=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile/welfare/mine/address_edit.html     | 42 +++++++++-
 .../views/platform/welfare/addressManage.html | 60 +++++++++++++--
 .../views/platform/welfare/userChoose.html    | 77 +++++++++++--------
 3 files changed, 140 insertions(+), 39 deletions(-)

diff --git a/src/main/resources/views/mobile/welfare/mine/address_edit.html b/src/main/resources/views/mobile/welfare/mine/address_edit.html
index 779be3d..fd2fef0 100644
--- a/src/main/resources/views/mobile/welfare/mine/address_edit.html
+++ b/src/main/resources/views/mobile/welfare/mine/address_edit.html
@@ -34,13 +34,52 @@ layout("/mobile/platform.html"){
 <script>
     <!--#include("/mobile/welfare/include/areaList.js"){};include("/mobile/welfare/include/mixins.js"){}#-->
 
+    const welfareReceiveAreaList = {
+        province_list: {
+            230000: "黑龙江省"
+        },
+        city_list: {
+            230100: "哈尔滨市"
+        },
+        county_list: {
+            230102: "道里区",
+            230103: "南岗区",
+            230104: "道外区",
+            230108: "平房区",
+            230109: "松北区",
+            230110: "香坊区",
+            230111: "呼兰区",
+            230112: "阿城区",
+            230113: "双城区"
+        }
+    }
+
+    function getAreaCodeByName(source, name) {
+        const entry = Object.entries(source).find(([, label]) => label === name)
+        return entry ? entry[0] : null
+    }
+
+    function ensureAddressAreaList(sourceAreaList, addressInfo) {
+        const provinceCode = getAreaCodeByName(areaList.province_list, addressInfo.province)
+        const cityCode = getAreaCodeByName(areaList.city_list, addressInfo.city)
+        const countyCode = getAreaCodeByName(areaList.county_list, addressInfo.county)
+        if (!provinceCode || !cityCode || !countyCode) {
+            return sourceAreaList
+        }
+        const nextAreaList = JSON.parse(JSON.stringify(sourceAreaList))
+        nextAreaList.province_list[provinceCode] = addressInfo.province
+        nextAreaList.city_list[cityCode] = addressInfo.city
+        nextAreaList.county_list[countyCode] = addressInfo.county
+        return nextAreaList
+    }
+
     const vue = new Vue({
         el: "#app",
         mixins: [mobileMixins, welfareMixins],
         data() {
             return {
                 projectId: GetQueryString("projectId"),
-                areaList: areaList,
+                areaList: welfareReceiveAreaList,
                 addressInfo: {},
                 addressId: null
             }
@@ -95,6 +134,7 @@ layout("/mobile/platform.html"){
                 const resp = await $.get("/mobile/welfare/mine/findOneUserAddress", { id: this.addressId })
                 if (resp.code === 0) {
                     this.addressInfo = resp.data
+                    this.areaList = ensureAddressAreaList(welfareReceiveAreaList, this.addressInfo)
                 }
                 this.closeLoading()
             } else {
diff --git a/src/main/resources/views/platform/welfare/addressManage.html b/src/main/resources/views/platform/welfare/addressManage.html
index ad18d52..bca3b68 100644
--- a/src/main/resources/views/platform/welfare/addressManage.html
+++ b/src/main/resources/views/platform/welfare/addressManage.html
@@ -115,12 +115,62 @@ layout("/layouts/platform.html"){
     </el-dialog>
 </div>
 <script>
+    const welfareReceiveAreaList = ["道里区", "南岗区", "道外区", "香坊区", "呼兰区", "松北区", "阿城区", "双城区", "平房区"]
+
+    function getWelfareReceiveDzOptions() {
+        const province = chengShiList.find((c) => c.label === "黑龙江省")
+        if (!province) {
+            return []
+        }
+        const city = province.children.find((c) => c.label === "哈尔滨市")
+        if (!city) {
+            return []
+        }
+        return [
+            {
+                ...province,
+                children: [
+                    {
+                        ...city,
+                        children: city.children.filter((county) => welfareReceiveAreaList.includes(county.label))
+                    }
+                ]
+            }
+        ]
+    }
+
+    function ensureAddressDzOption(options, row) {
+        const provinceTemplate = chengShiList.find((c) => c.label === row.province)
+        const cityTemplate = provinceTemplate?.children?.find((c) => c.label === row.city)
+        if (!provinceTemplate || !cityTemplate) {
+            return options
+        }
+        const nextOptions = JSON.parse(JSON.stringify(options))
+        let province = nextOptions.find((c) => c.label === row.province)
+        if (!province) {
+            province = {...provinceTemplate, children: []}
+            nextOptions.push(province)
+        }
+        let city = province.children.find((c) => c.label === row.city)
+        if (!city) {
+            city = {...cityTemplate, children: []}
+            province.children.push(city)
+        }
+        if (row.county) {
+            const countyTemplate = cityTemplate.children?.find((c) => c.label === row.county)
+            if (countyTemplate && !city.children.find((c) => c.label === row.county)) {
+                city.children.push(countyTemplate)
+            }
+        }
+        return nextOptions
+    }
+
     const vue = new Vue({
         el: "#app",
         mixins: [initTableMixins],
         data() {
             return {
-                dzOptions: chengShiList,
+                dzOptions: getWelfareReceiveDzOptions(),
                 dialogVisible: false,
                 tableColumns: [
                     { prop: "userName", label: "收货人" },
@@ -180,6 +230,7 @@ layout("/layouts/platform.html"){
                 }
             },
             openAddress() {
+                this.dzOptions = getWelfareReceiveDzOptions()
                 this.formData = {
                     userName: "${@shiro.getPrincipalProperty('username')}",
                     tel: "${@shiro.getPrincipalProperty('mobile')}"
@@ -223,16 +274,15 @@ layout("/layouts/platform.html"){
                 })
             },
             openEdit(row) {
+                this.dzOptions = ensureAddressDzOption(getWelfareReceiveDzOptions(), row)
                 row.addressList = []
-                const province = chengShiList.find((c) => c.label === row.province)
+                const province = this.dzOptions.find((c) => c.label === row.province)
                 row.addressList.push(province.value)
                 const city = province.children.find((p) => p.label === row.city)
                 row.addressList.push(city.value)
                 if (row.county) {
                     const county = city.children.find((p) => p.label === row.county)
-                    if (county) {
-                        row.addressList.push(county.value)
-                    }
+                    row.addressList.push(county.value)
                 }
 
                 this.formData = { ...row }
diff --git a/src/main/resources/views/platform/welfare/userChoose.html b/src/main/resources/views/platform/welfare/userChoose.html
index cd67513..11ec740 100644
--- a/src/main/resources/views/platform/welfare/userChoose.html
+++ b/src/main/resources/views/platform/welfare/userChoose.html
@@ -245,7 +245,7 @@ layout("/layouts/platform.html"){
                                                                 :max="option.maxNum"
                                                                 :min="0"
                                                                 @keydown.native="onKeydown"
-                                                                @change="numChange(option.selectNum, option, oidx)"
+                                                                @change="(value, oldValue)=>{numChange(value, oldValue, option, oidx)}"
                                                                 style="width: 150px; position: absolute; right: 0; bottom: 0"
                                                                 v-model="option.selectNum"
                                                         ></el-input-number>
@@ -257,6 +257,8 @@ layout("/layouts/platform.html"){
                                                 </div>
 
                                             </div>
+                                            <!-- 取货门店改为非必填，PC端暂不展示门店选择入口 -->
+                                            <!--
                                             <div style="margin-top: 17px">
                                                 <el-select
                                                         style="width: 100%"
@@ -274,6 +276,7 @@ layout("/layouts/platform.html"){
                                                     ></el-option>
                                                 </el-select>
                                             </div>
+                                            -->
                                         </div>
                                     </el-card>
                                 </el-col>
@@ -447,6 +450,30 @@ layout("/layouts/platform.html"){
     </el-dialog>
 </div>
 <script>
+    const welfareReceiveAreaList = ["道里区", "南岗区", "道外区", "香坊区", "呼兰区", "松北区", "阿城区", "双城区", "平房区"]
+
+    function getWelfareReceiveDzOptions() {
+        const province = chengShiList.find((c) => c.label === "黑龙江省")
+        if (!province) {
+            return []
+        }
+        const city = province.children.find((c) => c.label === "哈尔滨市")
+        if (!city) {
+            return []
+        }
+        return [
+            {
+                ...province,
+                children: [
+                    {
+                        ...city,
+                        children: city.children.filter((county) => welfareReceiveAreaList.includes(county.label))
+                    }
+                ]
+            }
+        ]
+    }
+
     const vue = new Vue({
         el: "#app",
         mixins: [initTableMixins],
@@ -457,13 +484,13 @@ layout("/layouts/platform.html"){
                 welfareSignMode: [],
                 userSelection: [],
                 userSign: "",
-                dzOptions: chengShiList,
+                dzOptions: getWelfareReceiveDzOptions(),
                 addressList: [],
                 descData: "",
                 descDialogVisible: false,
                 selectedAddressCity: null,
                 selectedAddressCounty: null,
-                receiveAddressAreaList: ["道里区", "南岗区", "道外区", "香坊区", "呼兰区", "松北区", "阿城区", "双城区", "平房区"],
+                receiveAddressAreaList: welfareReceiveAreaList,
 
                 projectInfo: {},
                 welfareSubject: {},
@@ -601,7 +628,7 @@ layout("/layouts/platform.html"){
                 })
             },
             //数量更改
-            numChange(value, option, optionIndex) {
+            numChange(value, oldValue, option, optionIndex) {
                 const {
                     isIntegralMode,
                     isCheckBox,
@@ -612,7 +639,15 @@ layout("/layouts/platform.html"){
                 if (isIntegralMode) {
                     this.calcTotalIntegral()
                 } else {
-                    if (isCheckBox === "checkBox") {
+                    if (isCheckBox !== "checkBox") {
+                        if (value > 0) {
+                            this.projectInfo.welfareProjectSubjects[0].options.forEach((v, index) => {
+                                if (index !== optionIndex) {
+                                    this.$set(v, "selectNum", 0)
+                                }
+                            })
+                        }
+                    } else {
                         //判断是否支持单个多选
                         if (!singleOptionSupportMultipleSelection && value > 1) {
                             this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], "selectNum", 1)
@@ -625,7 +660,7 @@ layout("/layouts/platform.html"){
                     const sum = selectNums.reduce((accumulator, currentValue) => accumulator + currentValue, 0)
 
                     if (sum > multiSelectNum) {
-                        this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], "selectNum", value - 1)
+                        this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], "selectNum", oldValue == null ? 0 : oldValue)
                         this.$message.warning("此次福利最多只能选择" + multiSelectNum + "份")
                     }
                 }
@@ -677,9 +712,8 @@ layout("/layouts/platform.html"){
                     if (valid) {
                         const {isCheckBox, multiSelectNum, singleOptionSupportMultipleSelection} = this.projectInfo
                         if (isCheckBox === "checkBox") {
-                            if (this.sumSelectNum < multiSelectNum) {
-                                //用户没有选择完
-                                this.$message.warning("一共可以选择" + multiSelectNum + "份,您目前只选择了" + this.sumSelectNum + "份，快去选择吧！")
+                            if (this.sumSelectNum === 0) {
+                                this.$message.warning("您还没有选择福利套餐，快去选择吧！")
                                 return
                             }
                         } else {
@@ -690,30 +724,6 @@ layout("/layouts/platform.html"){
                             }
                         }
 
-                        // 判断门店是否选择
-                        console.log(this.projectInfo.welfareProjectSubjects[0])
-                        const chooseOptions = this.projectInfo.welfareProjectSubjects[0].options
-                            .filter((v) => v.selectNum > 0 && v.shoppingId)
-                            .map((item) => {
-                                return {
-                                    optionName: item.optionName,
-                                    receiveAddressList: item.receiveAddressList,
-                                    selectNum: item.selectNum,
-                                    receiveAddress: item.receiveAddress
-                                }
-                            })
-                        let isReceiveAddress = true
-                        for (const item of chooseOptions) {
-                            if (!item.receiveAddress && item.receiveAddressList.length > 0) {
-                                this.$message.warning(item.optionName + "还没有选择收货门店哦")
-                                isReceiveAddress = false
-                                break
-                            }
-                        }
-                        if (!isReceiveAddress) {
-                            return
-                        }
-
                         if (this.projectInfo.provideMode == 3) {
                             if (this.formData.receiveAddress == null || this.formData.receiveAddress === "") {
                                 this.$message.warning("请填写收货地址")
@@ -740,6 +750,7 @@ layout("/layouts/platform.html"){
                                     receiveAddress: this.projectInfo.provideMode === 3 ? this.formData.receiveAddress : v.receiveAddress,
                                     userSign: this.formData.sign,
                                     selectNum: v.selectNum
+                                    // selectNum: Number(v.selectNum)
                                 }
                             })
                         const {code, msg, data} = await $.post("/platform/welfare/userChoose/confirmSelect", {