From dcf6c3719512b7f1472a8f2f2f8b81a7873ca467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=90=A6?= <liqiworkers@gmail.com>
Date: Mon, 15 Jun 2026 15:57:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=A4=84=E6=96=B9=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=AA=E9=80=9A=E8=BF=87=E6=88=96=E8=80=85=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=B8=AD=E4=BE=9D=E7=84=B6=E8=83=BD=E7=9C=8B=E5=88=B0=E8=8D=AF?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPackages/my/my-drug/drug-info.vue | 43 ++++++++++++++++++++++++----
 subPackages/my/my-drug/drug-list.vue |  2 +-
 utils/login.js                       | 12 ++++++++
 3 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/subPackages/my/my-drug/drug-info.vue b/subPackages/my/my-drug/drug-info.vue
index 3100819..e3ec2c0 100644
--- a/subPackages/my/my-drug/drug-info.vue
+++ b/subPackages/my/my-drug/drug-info.vue
@@ -20,8 +20,8 @@
                         :safe-area-inset-bottom="true" @click="chooseway"></u-action-sheet>
       </view>
     </view>
-    <!-- 收货地址 已添加地址 -->
-    <view class="head" v-if="isshow&&orderInfo.ProductOrder.status==0" @click="toChoose">
+    <!-- 收货地址（待支付，可编辑） -->
+    <view class="head" v-if="canEditAddress" @click="toChoose">
       <view class="state">
         <text>收货地址</text>
         <view class="qh">
@@ -32,16 +32,30 @@
         请先选择收货地址
       </view>
       <view class="name" @click="toChoose" v-if="orderInfo.ProductOrder.address">
-        {{JSON.parse(orderInfo.ProductOrder.address).name || '请先选择收货地址'}}
-        {{JSON.parse(orderInfo.ProductOrder.address).mobile || ''}}
+        {{ parsedAddress.name || '请先选择收货地址' }}
+        {{ parsedAddress.mobile || '' }}
       </view>
       <view class="choose_area" v-if="orderInfo.ProductOrder.address">
-        {{JSON.parse(orderInfo.ProductOrder.address).region || ''}}{{JSON.parse(orderInfo.ProductOrder.address).detail_address || ''}}
+        {{ parsedAddress.region || '' }}{{ parsedAddress.detail_address || '' }}
+      </view>
+    </view>
+
+    <!-- 收货地址（已支付，只读） -->
+    <view class="head" v-if="canViewAddressReadonly">
+      <view class="state">
+        <text>收货地址</text>
+      </view>
+      <view class="name">
+        {{ parsedAddress.name }}
+        {{ parsedAddress.mobile }}
+      </view>
+      <view class="choose_area">
+        {{ parsedAddress.region }}{{ parsedAddress.detail_address }}
       </view>
     </view>
 
     <!-- 到店自取 -->
-    <view class="head" v-if="isshowed">
+    <view class="head" v-if="isshowed && orderInfo.ProductOrder.delivery_method == 1">
       <view class="state">
         <text>到店自取</text>
       </view>
@@ -259,6 +273,23 @@ export default {
       prescriptionStatus: null,
     }
   },
+  computed: {
+    parsedAddress() {
+      try {
+        return JSON.parse(this.orderInfo.ProductOrder.address || '{}')
+      } catch (e) {
+        return {}
+      }
+    },
+    canEditAddress() {
+      const o = this.orderInfo.ProductOrder
+      return this.isshow && o.status == 0 && o.cancel_status == 0
+    },
+    canViewAddressReadonly() {
+      const o = this.orderInfo.ProductOrder
+      return o.delivery_method == 0 && o.status != 0 && o.address && o.cancel_status == 0
+    },
+  },
   onLoad(e) {
     this.p_id = e.id
     this.orderType = e.order_type
diff --git a/subPackages/my/my-drug/drug-list.vue b/subPackages/my/my-drug/drug-list.vue
index 96b02aa..aabd1c1 100644
--- a/subPackages/my/my-drug/drug-list.vue
+++ b/subPackages/my/my-drug/drug-list.vue
@@ -160,7 +160,7 @@
                 <view class="order_info" v-else-if="item.status>=4&& item.is_pay==1&&item.status<=5 && item.prescription_type==2">
                   {{item.status==5&&'退款中' || item.status==4&&'已退款' }}
                 </view>
-                <view class="order_info active" v-else-if="(item.status===2||item.status===6||item.status===7) && item.is_pay==1  && item.cancel_status==0 && item.delivery_method === 0" @tap.stop="toDevilty(item.id)">
+                <view class="order_info active" v-if="(item.status===2||item.status===6||item.status===7) && item.is_pay==1  && item.cancel_status==0 && item.delivery_method === 0" @tap.stop="toDevilty(item.id)">
                   查看物流
                 </view>
 
diff --git a/utils/login.js b/utils/login.js
index 9f51bfb..049d8dd 100644
--- a/utils/login.js
+++ b/utils/login.js
@@ -75,6 +75,18 @@ export async function performLogin(options = { silent: false, toastRef: null })
           console.error('绑定推广员失败:', err);
         });
       }
+      // 5.2 绑定推广员（如果存在）
+      const salId = uni.getStorageSync('sal_id');
+      if (salId) {
+        bindUserApi({
+          user_id: res.data.data.data.user.id,
+          salesperson_id: salId,
+        }).then((bindRes) => {
+          console.log(bindRes, 'bindUserApi', bindRes);
+        }).catch((err) => {
+          console.error('绑定推广员失败:', err);
+        });
+      }
 
       // 5.3 处理门店切换/设置
       const storeId = uni.getStorageSync('store_id');