zhangqi
/
kuailelunwen_new_houtai
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of gitea.intra.yunpaper.com:zhangqi/kuailelunwen_new_houtai into zq-nodeTest

zq-nodeTest
zq 1 month ago
parent
08b0e48b96 38faf3a0f3
commit
19a80d9275
3 changed files with 14 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/components/site/addSiteStep/step2.vue
  2. 4
      src/views/agent/home.vue
  3. 12
      src/views/agent/siteBaseSetting.vue

10
src/components/site/addSiteStep/step2.vue
View File

@ -28,7 +28,7 @@
:options="taobaoList" :options_null="!taobaoList.length"> :options="taobaoList" :options_null="!taobaoList.length">
<template #trigger> <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-if="!taobaoList.length">暂无收款账号，稍后配置</span>
<span v-else>未绑定店铺</span> <span v-else>未绑定店铺</span>
</template> </template>
@ -74,7 +74,7 @@
:options="wxpayList" :options_null="!wxpayList.length"> :options="wxpayList" :options_null="!wxpayList.length">
<!-- 选择后显示数据 --> <!-- 选择后显示数据 -->
<template #trigger> <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-if="wxpayList.length === 0">暂无收款账号，稍后配置</span>
<span v-else>未绑定微信收款</span> <span v-else>未绑定微信收款</span>
</template> </template>
@ -119,7 +119,7 @@
:options="alipayList" :options_null="!alipayList.length"> :options="alipayList" :options_null="!alipayList.length">
<template #trigger> <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-if="alipayList.length === 0">暂无收款账号，稍后配置</span>
<span v-else>未绑定支付宝收款</span> <span v-else>未绑定支付宝收款</span>
</template> </template>
@ -176,7 +176,7 @@
:options="pddList" :options_null="!pddList.length"> :options="pddList" :options_null="!pddList.length">
<template #trigger> <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-if="pddList.length === 0">暂无收款账号，稍后配置</span>
<span v-else>未绑定拼多多店铺</span> <span v-else>未绑定拼多多店铺</span>
</template> </template>
@ -235,7 +235,7 @@
:options="jdList" :options_null="!jdList.length"> :options="jdList" :options_null="!jdList.length">
<template #trigger> <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-if="jdList.length === 0">暂无收款账号，稍后配置</span>
<span v-else>未绑定京东店铺</span> <span v-else>未绑定京东店铺</span>
</template> </template>

4
src/views/agent/home.vue
View File

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

12
src/views/agent/siteBaseSetting.vue
View File

@ -83,7 +83,7 @@
@change="changeSelectWeixin"> @change="changeSelectWeixin">
<!-- 选择后显示数据 --> <!-- 选择后显示数据 -->
<template #trigger> <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-if="wxpayList.length === 0">暂无收款账号，稍后配置</span>
<span v-else>未绑定微信收款</span> <span v-else>未绑定微信收款</span>
</template> </template>
@ -124,7 +124,7 @@
<CustomDropdown slot="formDom" width="100%" <CustomDropdown slot="formDom" width="100%"
:options="alipayList" :options_null="!alipayList.length" @change="changeSelectAlipay"> :options="alipayList" :options_null="!alipayList.length" @change="changeSelectAlipay">
<template #trigger> <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-if="alipayList.length === 0">暂无收款账号，稍后配置</span>
<span v-else>未绑定支付宝收款</span> <span v-else>未绑定支付宝收款</span>
</template> </template>
@ -166,7 +166,7 @@
@change="changeSelectJindong" > @change="changeSelectJindong" >
<!-- 选择后显示数据 --> <!-- 选择后显示数据 -->
<template #trigger> <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-if="jdList.length === 0">暂无收款账号，稍后配置</span>
<span v-else>未绑定京东店铺</span> <span v-else>未绑定京东店铺</span>
</template> </template>
@ -211,7 +211,7 @@
@change="changeSelectTaobao" > @change="changeSelectTaobao" >
<!-- 选择后显示数据 --> <!-- 选择后显示数据 -->
<template #trigger> <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-if="!taobaoList.length">暂无收款账号，稍后配置</span>
<span v-else>未绑定店铺</span> <span v-else>未绑定店铺</span>
</template> </template>
@ -253,7 +253,7 @@
@change="changeSelectPdd" > @change="changeSelectPdd" >
<!-- 选择后显示数据 --> <!-- 选择后显示数据 -->
<template #trigger> <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-if="pddList.length === 0">暂无收款账号，稍后配置</span>
<span v-else>未绑定拼多多店铺</span> <span v-else>未绑定拼多多店铺</span>
</template> </template>
@ -634,6 +634,8 @@ export default {
this.selectJd = item; this.selectJd = item;
}, },
changeSelectPdd(item) { changeSelectPdd(item) {
console.log(item)
console.log(this.bindPddId)
if(this.bindPddId === item.payid){ if(this.bindPddId === item.payid){
this.bindPddId = 0 this.bindPddId = 0
this.selectPdd = null this.selectPdd = null

Write Preview
Loading…
Cancel
Save