From a960151c3f046c236aad8ab4fb882c06a5092018 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Tue, 5 Mar 2024 17:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 +- pages/index/index.vue | 12 ++--- pages/nongKe/cloud_entrepot/index.vue | 4 +- pages/nongKe/cloud_entrepot/indexOther.vue | 2 +- pages/nongKe/cloud_entrepot/indexa.vue | 4 +- pages/nongKe/cloud_entrepot/indexb.vue | 4 +- pages/users/embody/embody.vue | 56 ++++++++++++---------- pages/users/supply_procurement/index.vue | 6 ++- 8 files changed, 51 insertions(+), 41 deletions(-) diff --git a/manifest.json b/manifest.json index 0278643..50c0a58 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农商户平台", "appid" : "__UNI__1EE148C", "description" : "", - "versionName" : "1.2.4", - "versionCode" : 124, + "versionName" : "1.2.9", + "versionCode" : 129, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/index/index.vue b/pages/index/index.vue index 1307631..a0cf429 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -312,9 +312,8 @@ 公司名称: - - {{merchantData.company_name}} - + @@ -862,7 +861,7 @@ import { Toast } from '../../libs/uniApi'; that.validate = true; this.num = 15 this.isFshow = false; - this.$refs.popup.close() + this.$refs.popup.close(); that.$util.Tips({ title: res }); @@ -1230,12 +1229,13 @@ import { Toast } from '../../libs/uniApi'; if (this.userid) { - if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { + if ( this.userInfoData.mer_info.mer_settlement_agree_status == 0) { // console.log(this.$store.state.app.userInfo.mer_info.type_code); if(this.$store.state.app.userInfo.mer_info.type_code=="TypeSupplyChain"&&this.$store.state.app.userInfo.mer_info.type_code=="PersonalStore"){ this.agree() // this.countDown() - } else if (this.codenote.length == 0) { + } + else if (this.codenote.length == 0) { this.isFshow = true this.countDown() } else { diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index 73c15ef..30fe663 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -222,9 +222,9 @@ ￥{{totalMoney}} - + diff --git a/pages/nongKe/cloud_entrepot/indexOther.vue b/pages/nongKe/cloud_entrepot/indexOther.vue index 592a741..92e635e 100644 --- a/pages/nongKe/cloud_entrepot/indexOther.vue +++ b/pages/nongKe/cloud_entrepot/indexOther.vue @@ -137,7 +137,7 @@ ￥{{totalMoney}} - {{tips||'支持配送 售后无忧'}} + {{tips}} diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue index 9d2cfa0..e44d811 100644 --- a/pages/nongKe/cloud_entrepot/indexa.vue +++ b/pages/nongKe/cloud_entrepot/indexa.vue @@ -179,9 +179,9 @@ ￥{{totalMoney}} - + diff --git a/pages/nongKe/cloud_entrepot/indexb.vue b/pages/nongKe/cloud_entrepot/indexb.vue index ec2e9fd..1b62a47 100644 --- a/pages/nongKe/cloud_entrepot/indexb.vue +++ b/pages/nongKe/cloud_entrepot/indexb.vue @@ -136,9 +136,9 @@ ￥{{totalMoney}} - + diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue index f1fb21d..de7703c 100644 --- a/pages/users/embody/embody.vue +++ b/pages/users/embody/embody.vue @@ -20,23 +20,32 @@
- - 公司名称 - - {{mode.mer_name}} - + + + 公司名称 + + {{mode.mer_name}} + + - - - 持卡人 - - - - 对公账号 - - + + 对公账号 + + + + + + 持卡人 + + + + 银行卡号 + + + 开户银行 @@ -68,7 +77,6 @@ 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
提货付款订单完成后，该笔订单金额冻结时间为20分钟
- 因第三方平台收取0.6%的手续费，提现手续费在商户入驻后前三个月暂由平台垫付，由平台垫付的手续费后续在押金中扣除 @@ -114,7 +122,6 @@ 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
提货付款订单完成后，该笔订单金额冻结时间为20分钟
- 因第三方平台收取0.6%的手续费，提现手续费在商户入驻后前三个月暂由平台垫付，由平台垫付的手续费后续在押金中扣除 @@ -168,7 +175,6 @@ 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额
提货付款订单完成后，该笔订单金额冻结时间为20分钟
- 因第三方平台收取0.6%的手续费，提现手续费在商户入驻后前三个月暂由平台垫付，由平台垫付的手续费后续在押金中扣除 @@ -311,6 +317,7 @@ this.mode.bank_name = res.data.financial_bank_bank this.mode.bank_address = res.data.financial_bank_branch this.mode.mer_name = res.data.financial_bank_name + if(this.merInfo.is_company && !this.mode.mer_name) this.mode.mer_name = this.merInfo.company_name; this.extract_money=res.data.extract_money this.lock_money = res.data.lock_money this.ot_margin = res.data.ot_margin @@ -431,7 +438,8 @@ // title: "请选择银行" // }); value.extract_type = 'bank'; - value.bank_name = (that.array && that.array.length) ? that.array[that.index].name : ''; + value.bank_name = this.mode.bank_name; + // value.bank_name = (that.array && that.array.length) ? that.array[that.index].name : ''; } else if (that.currentTab == 1) { //微信 value.extract_type = 'weixin'; if (!this.sys_extension_type) { @@ -470,13 +478,13 @@ // 提交提现方式 const mode = { financial_bank_name: this.mode.mer_name, - financial_bank_bank: value.bank_name, - financial_bank_code: value.bank_code, + financial_bank_bank: this.mode.bank_name, + financial_bank_code: this.mode.bank_code, extract_money: value.extract_price, - financial_bank_branch: value.bank_address, + financial_bank_branch: this.mode.bank_address, financial_type: 1 } - console.log(mode); + console.log(mode); postCreateApplyAPI(this.merId, mode).then(res => { // 提现申请 // that.postCreate(e.detail.value.extract_price) diff --git a/pages/users/supply_procurement/index.vue b/pages/users/supply_procurement/index.vue index 42e63bc..c0c6de8 100644 --- a/pages/users/supply_procurement/index.vue +++ b/pages/users/supply_procurement/index.vue @@ -63,12 +63,14 @@ } if(item.name=='线上支付'){ item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f4521202312151148087081.png'; - item.content = '手续费0.6%'; + // item.content = '手续费0.6%'; + item.content = ''; item.icon = "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0a377202312251014023667.png"; } if(item.name=='线下支付'){ item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/899a4202312151148319478.png'; - item.content = '手续费0'; + // item.content = '手续费0'; + item.content = ''; item.icon = "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/6a23e202312251014183019.png"; } })