fix bug: 门店定位信息补 dist(地区)

hdApp/src/admin/shop/add.vue

@@ -151,6 +151,7 @@ export default {
 				shopName: '',
 				province: '',
 				city: '',
+				dist: '',
 				address: '',
 				showAddress:'',
 				floor: '',
@@ -281,13 +282,16 @@ export default {
 		},
 		changeAreaFn(e) {
 			this.form.address = e.name
-
 			let locationStr = e.location
 			let fruits = locationStr.split(",").map(fruit => fruit.trim())
-
 			this.region.lat = fruits[1]
 			this.region.long = fruits[0]
 			this.form.showAddress = e.address
+
+			// 提取地区信息，按遇到第一个"市"字后，把"市"后面的字符串作为地区
+			const districtStr = e.district || '';
+			const cityIndex = districtStr.indexOf('市');
+			this.form.dist = cityIndex !== -1 ? districtStr.substring(cityIndex + 1) : districtStr;
 		},
 		// 省市联动
 		openAddres() {

hdApp/src/pagesStore/me/expressSet.vue

@@ -108,17 +108,17 @@
               <view class="express-company-options">
                 <view 
                   class="express-option" 
-                  :class="{ active: expressCompany === 'SFTC' }"
-                  @click="selectExpressCompany('SFTC')"
+                  :class="{ active: expressCompany === 'DADA' }"
+                  @click="selectExpressCompany('DADA')"
                 >
-                  <text class="express-option-text">顺丰</text>
+                  <text class="express-option-text">达达</text>
                 </view>
                 <view 
                   class="express-option" 
-                  :class="{ active: expressCompany === 'DADA' }"
-                  @click="selectExpressCompany('DADA')"
+                  :class="{ active: expressCompany === 'SFTC' }"
+                  @click="selectExpressCompany('SFTC')"
                 >
-                  <text class="express-option-text">达达</text>
+                  <text class="express-option-text">顺丰</text>
                 </view>
               </view>
             </view>
@@ -199,7 +199,7 @@ export default {
       dadaBalance: 0.00, // 达达余额
       showModal: false, // 是否显示充值弹窗
       rechargeAmount: '', // 充值金额
-      expressCompany: 'SFTC', // 快递公司，默认顺丰
+      expressCompany: 'DADA', // 快递公司，默认达达
       quickAmounts: [50, 100, 200, 500], // 快捷金额选项
       rechargeRecords: [], // 充值记录
       shopAddress: null, // 门店地址信息
@@ -289,7 +289,7 @@ export default {
           console.log(this.shopAddress);
         }
       } catch (error) {
-        console.error('获取门店地址失败:', error);
+        // console.error('获取门店地址失败:', error);
         // 如果接口不存在或失败，设置为null
         this.shopAddress = null;
       }
@@ -324,10 +324,15 @@ export default {
           // 刷新门店信息
           await this.getShopAddressInfo();
         } else {
-          uni.showToast({
-            title: result.message || '创建失败',
-            icon: 'none'
-          });
+          if(result.msg && result.msg.includes('address_info.house is empty')){
+            this.$msg('门店的门牌号未填写')
+          } else {
+            console.log(result.message);
+            uni.showToast({
+              title: '创建失败',
+              icon: 'none'
+            });
+          }
         }
       } catch (error) {
         uni.hideLoading();
@@ -391,7 +396,8 @@ export default {
         this.sfBalance = result.data.sf_balance || 0;
         this.dadaBalance = result.data.dada_balance || 0;
       } catch (error) {
-        console.error('获取余额失败:', error);
+        console.log(error);
+        // console.error('获取余额失败:', error);
       }
     },
 
@@ -426,7 +432,7 @@ export default {
     showRechargeModal() {
       this.showModal = true;
       this.rechargeAmount = '';
-      this.expressCompany = 'SFTC'; // 默认选择顺丰
+      this.expressCompany = 'DADA'; // 默认选择顺丰
     },
 
     // 隐藏充值弹窗