From 4dc1a09b37ec5b2f152e2028b9e0f320bf4ca95f Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 11 Jun 2025 11:24:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(shoppingCar):=20=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/region-select/index.vue | 16 ++++++++++++++++
 config/mine.js                     |  6 ++++++
 pages/other/index.vue              |  1 +
 pages/shoppingCar/index.vue        |  6 +++++-
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 components/region-select/index.vue

diff --git a/components/region-select/index.vue b/components/region-select/index.vue
new file mode 100644
index 0000000..a072446
--- /dev/null
+++ b/components/region-select/index.vue
@@ -0,0 +1,16 @@
+<template></template>
+
+<script>
+import { getRegionSelect } from '@/config/mine.js'
+export default {
+  name: 'region-select',
+  data() {
+    return {
+      regionInfo: {},
+    }
+  },
+  methods: {},
+}
+</script>
+
+<style></style>
diff --git a/config/mine.js b/config/mine.js
index 32dd650..aa0214d 100644
--- a/config/mine.js
+++ b/config/mine.js
@@ -23,3 +23,9 @@ export const yearAwards = params =>
 export const getRegionSelect = () => {
   return http.get('/retail-member/api/retail-member/get-region')
 }
+
+// 设置区域
+export const setRegion = params =>
+  http.get('/retail-member/api/retail-member/set-region', { params })
+
+// 获取可选择区域
diff --git a/pages/other/index.vue b/pages/other/index.vue
index a35096c..9de6b3b 100644
--- a/pages/other/index.vue
+++ b/pages/other/index.vue
@@ -948,6 +948,7 @@ export default {
           .confirmOthOrder(
             Object.assign({}, this.form, this.allGoodsData, {
               deleteList: deleteList,
+              shopList: deleteList,
               buyMemberCode: this.userInfo.memberCode,
             })
           )
diff --git a/pages/shoppingCar/index.vue b/pages/shoppingCar/index.vue
index 521c4bc..f30ac29 100644
--- a/pages/shoppingCar/index.vue
+++ b/pages/shoppingCar/index.vue
@@ -334,9 +334,13 @@ export default {
             shoppingId: item,
           })
         })
+        const area =
+          this.goodsCheck[0].specialArea == REGIEST_AREA.id
+            ? 'regiest'
+            : 'upgrade'
         uni.navigateTo({
           url:
-            '/pages/regiest/index?specialArea=' +
+            `/pages/${area}/index?specialArea=` +
             this.goodsCheck[0].specialArea +
             '&shoppArr=' +
             JSON.stringify(shoppArr),