From e2ab2a57717829acd68b6a83e914f13f8b02b42f Mon Sep 17 00:00:00 2001
From: rainbro <33367671@qq.com>
Date: Tue, 22 Jul 2025 18:28:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?walletList=3F.pub=3F.forzen=5Fmoney=20?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=20&&?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/agent/home.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/agent/home.vue b/src/views/agent/home.vue
index da5e55c..9115e8b 100644
--- a/src/views/agent/home.vue
+++ b/src/views/agent/home.vue
@@ -83,9 +83,9 @@
       </div>
       <div class="home-main-right">
         <div class="accountBalance common-area">
-          <div class="mb-16 red" v-if="walletList?.pub?.forzen_money>0">含冻结金额 {{ walletList?.pub?.forzen_money }} 元</div>
+          <div class="mb-16 red" v-if="walletList && walletList.pub && walletList.pub.forzen_money > 0">含冻结金额 {{ walletList.pub.forzen_money }} 元</div>
           <div class="flex-between">
-            <span>账户余额&nbsp; <b>{{ walletList?.pub?.remain }}</b>&nbsp;元</span>
+            <span>账户余额&nbsp; <b>{{ walletList.pub.remain }}</b>&nbsp;元</span>
             <span class="hoverCommon" @click="isShowSpec = !isShowSpec">{{ isShowSpec ? '收起' : '展开' }}</span>
           </div>
           <div v-show="isShowSpec" class="mt-24" style="border-top: 1px solid #ebebeb;" v-if="walletList && walletList.spec && walletList.spec.length > 0">

From 38faf3a0f37a552dbd77710437b9641e532bfdaa Mon Sep 17 00:00:00 2001
From: pengda <1111@qq.com>
Date: Wed, 23 Jul 2025 10:26:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/site/addSiteStep/step2.vue | 10 +++++-----
 src/views/agent/siteBaseSetting.vue       | 12 +++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/site/addSiteStep/step2.vue b/src/components/site/addSiteStep/step2.vue
index 16da867..4ca1355 100644
--- a/src/components/site/addSiteStep/step2.vue
+++ b/src/components/site/addSiteStep/step2.vue
@@ -28,7 +28,7 @@
                                                     :options="taobaoList" :options_null="!taobaoList.length">
 
                                         <template #trigger>
-                                            <span v-if="selectTaobao.short_name || selectTaobao.account">{{ selectTaobao.short_name }} {{ selectTaobao.account }}</span>
+                                            <span v-if="selectTaobao && (selectTaobao.short_name || selectTaobao.account)">{{ selectTaobao.short_name }} {{ selectTaobao.account }}</span>
                                             <span v-else-if="!taobaoList.length">暂无收款账号，稍后配置</span>
                                             <span v-else>未绑定店铺</span>
                                         </template>
@@ -74,7 +74,7 @@
                                                     :options="wxpayList" :options_null="!wxpayList.length">
                                         <!-- 选择后显示数据 -->
                                         <template #trigger>
-                                            <span v-if="selectWxpay">{{ selectWxpay.short_name }} {{ selectWxpay.account }}</span>
+                                            <span v-if="selectWxpay && (selectWxpay.short_name || selectWxpay.account)">{{ selectWxpay.short_name }} {{ selectWxpay.account }}</span>
                                             <span v-else-if="wxpayList.length === 0">暂无收款账号，稍后配置</span>
                                             <span v-else>未绑定微信收款</span>
                                         </template>
@@ -119,7 +119,7 @@
                                                     :options="alipayList" :options_null="!alipayList.length">
 
                                         <template #trigger>
-                                            <span v-if="selectAlipay">{{ selectAlipay.short_name }} {{ selectAlipay.account }}</span>
+                                            <span v-if="selectAlipay && (selectAlipay.short_name || selectAlipay.account)">{{ selectAlipay.short_name }} {{ selectAlipay.account }}</span>
                                             <span v-else-if="alipayList.length === 0">暂无收款账号，稍后配置</span>
                                             <span v-else>未绑定支付宝收款</span>
                                         </template>
@@ -176,7 +176,7 @@
                                                     :options="pddList" :options_null="!pddList.length">
 
                                         <template #trigger>
-                                            <span v-if="selectPdd.short_name || selectPdd.account">{{ selectPdd.short_name }} {{ selectPdd.account }}</span>
+                                            <span v-if="selectPdd && (selectPdd.short_name || selectPdd.account)">{{ selectPdd.short_name }} {{ selectPdd.account }}</span>
                                             <span v-else-if="pddList.length === 0">暂无收款账号，稍后配置</span>
                                             <span v-else>未绑定拼多多店铺</span>
                                         </template>
@@ -235,7 +235,7 @@
                                                     :options="jdList" :options_null="!jdList.length">
 
                                         <template #trigger>
-                                            <span v-if="selectJd.short_name || selectJd.account">{{ selectJd.short_name }} {{ selectJd.account }}</span>
+                                            <span v-if="selectJd && (selectJd.short_name || selectJd.account)">{{ selectJd.short_name }} {{ selectJd.account }}</span>
                                             <span v-else-if="jdList.length === 0">暂无收款账号，稍后配置</span>
                                             <span v-else>未绑定京东店铺</span>
                                         </template>
diff --git a/src/views/agent/siteBaseSetting.vue b/src/views/agent/siteBaseSetting.vue
index be9e2d6..4cdf1a6 100644
--- a/src/views/agent/siteBaseSetting.vue
+++ b/src/views/agent/siteBaseSetting.vue
@@ -83,7 +83,7 @@
                                     @change="changeSelectWeixin">
                                     <!-- 选择后显示数据 -->
                                     <template #trigger>
-                                        <span v-if="selectWxpay">{{ selectWxpay.short_name }} {{ selectWxpay.account }}</span>
+                                        <span v-if="selectWxpay && (selectWxpay.short_name || selectWxpay.account)">{{ selectWxpay.short_name }} {{ selectWxpay.account }}</span>
                                         <span v-else-if="wxpayList.length === 0">暂无收款账号，稍后配置</span>
                                         <span v-else>未绑定微信收款</span>
                                     </template>
@@ -124,7 +124,7 @@
                                 <CustomDropdown slot="formDom" width="100%"
                                     :options="alipayList" :options_null="!alipayList.length" @change="changeSelectAlipay">
                                     <template #trigger>
-                                        <span v-if="selectAlipay">{{ selectAlipay.short_name }} {{ selectAlipay.account }}</span>
+                                        <span v-if="selectAlipay && (selectAlipay.short_name || selectAlipay.account)">{{ selectAlipay.short_name }} {{ selectAlipay.account }}</span>
                                         <span v-else-if="alipayList.length === 0">暂无收款账号，稍后配置</span>
                                         <span v-else>未绑定支付宝收款</span>
                                     </template>
@@ -166,7 +166,7 @@
                                     @change="changeSelectJindong" >
                                     <!-- 选择后显示数据 -->
                                     <template #trigger>
-                                        <span v-if="selectJd">{{ selectJd.short_name }} {{ selectJd.account }}</span>
+                                        <span v-if="selectJd && (selectJd.short_name || selectJd.account)">{{ selectJd.short_name }} {{ selectJd.account }}</span>
                                         <span v-else-if="jdList.length === 0">暂无收款账号，稍后配置</span>
                                         <span v-else>未绑定京东店铺</span>
                                     </template>
@@ -211,7 +211,7 @@
                                     @change="changeSelectTaobao" >
                                     <!-- 选择后显示数据 -->
                                     <template #trigger>
-                                        <span v-if="selectTaobao">{{ selectTaobao.short_name }} {{ selectTaobao.account }}</span>
+                                        <span v-if="selectTaobao && (selectTaobao.short_name || selectTaobao.account)">{{ selectTaobao.short_name }} {{ selectTaobao.account }}</span>
                                         <span v-else-if="!taobaoList.length">暂无收款账号，稍后配置</span>
                                         <span v-else>未绑定店铺</span>
                                     </template>
@@ -253,7 +253,7 @@
                                     @change="changeSelectPdd" >
                                     <!-- 选择后显示数据 -->
                                     <template #trigger>
-                                        <span v-if="selectPdd">{{ selectPdd.short_name }} {{ selectPdd.account }}</span>
+                                        <span v-if="selectPdd && (selectPdd.short_name || selectPdd.account)">{{ selectPdd.short_name }} {{ selectPdd.account }}</span>
                                         <span v-else-if="pddList.length === 0">暂无收款账号，稍后配置</span>
                                         <span v-else>未绑定拼多多店铺</span>
                                     </template>
@@ -634,6 +634,8 @@ export default {
             this.selectJd = item;
         },
         changeSelectPdd(item) {
+            console.log(item)
+            console.log(this.bindPddId)
             if(this.bindPddId === item.payid){
                 this.bindPddId = 0
                 this.selectPdd = null