mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

This commit is contained in:
weipengfei 2024-03-05 17:42:44 +08:00
parent cd95a0bcfd
commit a960151c3f
8 changed files with 51 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农商户平台", "name" : "惠农商户平台",
"appid" : "__UNI__1EE148C", "appid" : "__UNI__1EE148C",
"description" : "", "description" : "",
"versionName" : "1.2.4", "versionName" : "1.2.9",
"versionCode" : 124, "versionCode" : 129,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

12
pages/index/index.vue
View File

@ -312,9 +312,8 @@
<view class="item" v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company"> <view class="item" v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company">
<view class="acea-row row-middle" style="display: flex;align-items: flex-start;"> <view class="acea-row row-middle" style="display: flex;align-items: flex-start;">
<text class="item-name" style="flex-shrink: 0;">公司名称:</text> <text class="item-name" style="flex-shrink: 0;">公司名称:</text>
<view style="font-size: 31rpx;flex: 1;"> <input style="font-size: 31rpx;" placeholder="请输入公司名称" v-model="merchantData.company_name" @input="validateBtn"
{{merchantData.company_name}} placeholder-class='placeholder' />
</view>
</view> </view>
</view> </view>
<view class="item" v-else> <view class="item" v-else>
@ -862,7 +861,7 @@ import { Toast } from '../../libs/uniApi';
that.validate = true; that.validate = true;
this.num = 15 this.num = 15
this.isFshow = false; this.isFshow = false;
this.$refs.popup.close() this.$refs.popup.close();
that.$util.Tips({ that.$util.Tips({
title: res title: res
}); });
@ -1230,12 +1229,13 @@ import { Toast } from '../../libs/uniApi';
if (this.userid) { 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); // 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"){ if(this.$store.state.app.userInfo.mer_info.type_code=="TypeSupplyChain"&&this.$store.state.app.userInfo.mer_info.type_code=="PersonalStore"){
this.agree() this.agree()
// this.countDown() // this.countDown()
} else if (this.codenote.length == 0) { }
else if (this.codenote.length == 0) {
this.isFshow = true this.isFshow = true
this.countDown() this.countDown()
} else { } else {

4
pages/nongKe/cloud_entrepot/index.vue
View File

@ -222,9 +222,9 @@
<view class=""> <view class="">
￥{{totalMoney}} ￥{{totalMoney}}
</view> </view>
<view class=""> <!-- <view class="">
支持配送 售后无忧 支持配送 售后无忧
</view> </view> -->
</view> </view>
</view> </view>
<view class="right"> <view class="right">

2
pages/nongKe/cloud_entrepot/indexOther.vue
View File

@ -137,7 +137,7 @@
￥{{totalMoney}} ￥{{totalMoney}}
</view> </view>
<view class=""> <view class="">
{{tips||'支持配送 售后无忧'}} {{tips}}
</view> </view>
</view> </view>
</view> </view>

4
pages/nongKe/cloud_entrepot/indexa.vue
View File

@ -179,9 +179,9 @@
<view class=""> <view class="">
￥{{totalMoney}} ￥{{totalMoney}}
</view> </view>
<view class=""> <!-- <view class="">
支持配送 售后无忧 支持配送 售后无忧
</view> </view> -->
</view> </view>
</view> </view>
<view class="right"> <view class="right">

4
pages/nongKe/cloud_entrepot/indexb.vue
View File

@ -136,9 +136,9 @@
<view class=""> <view class="">
￥{{totalMoney}} ￥{{totalMoney}}
</view> </view>
<view class=""> <!-- <view class="">
支持配送 售后无忧 支持配送 售后无忧
</view> </view> -->
</view> </view>
</view> </view>
<view class="right"> <view class="right">

56
pages/users/embody/embody.vue
View File

@ -20,23 +20,32 @@
<view class='wrapper'> <view class='wrapper'>
<view :hidden='currentTab != 0' class='list'> <view :hidden='currentTab != 0' class='list'>
<form @submit="subCash" report-submit='true'> <form @submit="subCash" report-submit='true'>
<view v-if="merInfo.is_company" class='item acea-row row-between-wrapper'> <block v-if="merInfo.is_company">
<view class='name'>公司名称</view> <view class='item acea-row row-between-wrapper'>
<view class='input'> <view class='name'>公司名称</view>
<text class='Bank'>{{mode.mer_name}}</text> <view class='input'>
<text class='iconfont icon-qiepian38'></text> <text class='Bank'>{{mode.mer_name}}</text>
<text class='iconfont icon-qiepian38'></text>
</view>
</view> </view>
</view> <view class='item acea-row row-between-wrapper'>
<view v-else class='item acea-row row-between-wrapper'> <view class='name'>对公账号</view>
<view class='name'>持卡人</view> <view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写对公账号'
<view class='input'><input v-model="mode.mer_name" placeholder='请输入持卡人姓名' placeholder-class='placeholder' name="bank_code"></input></view>
placeholder-class='placeholder' name="mer_name"></input></view> </view>
</view> </block>
<view class='item acea-row row-between-wrapper'> <block v-else>
<view class='name'>对公账号</view> <view class='item acea-row row-between-wrapper'>
<view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写对公账号' <view class='name'>持卡人</view>
placeholder-class='placeholder' name="bank_code"></input></view> <view class='input'><input v-model="mode.mer_name" placeholder='请输入持卡人姓名'
</view> placeholder-class='placeholder' name="mer_name"></input></view>
</view>
<view class='item acea-row row-between-wrapper'>
<view class='name'>银行卡号</view>
<view class='input'><input v-model="mode.bank_code" type='number' placeholder='请填写银行卡号'
placeholder-class='placeholder' name="bank_code"></input></view>
</view>
</block>
<view class='item acea-row row-between-wrapper' v-if="array.length>0"> <view class='item acea-row row-between-wrapper' v-if="array.length>0">
<view class='name'>开户银行</view> <view class='name'>开户银行</view>
<view class='input'> <view class='input'>
@ -68,7 +77,6 @@
<view class='tip'> <view class='tip'>
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/> 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/> 提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/>
因第三方平台收取0.6%的手续费，提现手续费在商户入驻后前三个月暂由平台垫付，由平台垫付的手续费后续在押金中扣除
</view> </view>
<view class="btn-submit"> <view class="btn-submit">
<button formType="submit" class='bnt b-color'>提现</button> <button formType="submit" class='bnt b-color'>提现</button>
@ -114,7 +122,6 @@
<view class='tip'> <view class='tip'>
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/> 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/> 提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/>
因第三方平台收取0.6%的手续费，提现手续费在商户入驻后前三个月暂由平台垫付，由平台垫付的手续费后续在押金中扣除
</view> </view>
<button formType="submit" class='bnt b-color'>提现</button> <button formType="submit" class='bnt b-color'>提现</button>
</view> </view>
@ -168,7 +175,6 @@
<view class='tip'> <view class='tip'>
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/> 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/>
提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/> 提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/>
因第三方平台收取0.6%的手续费，提现手续费在商户入驻后前三个月暂由平台垫付，由平台垫付的手续费后续在押金中扣除
</view> </view>
<view class="btn-submit"> <view class="btn-submit">
<button formType="submit" class='bnt b-color'>提现</button> <button formType="submit" class='bnt b-color'>提现</button>
@ -311,6 +317,7 @@
this.mode.bank_name = res.data.financial_bank_bank this.mode.bank_name = res.data.financial_bank_bank
this.mode.bank_address = res.data.financial_bank_branch this.mode.bank_address = res.data.financial_bank_branch
this.mode.mer_name = res.data.financial_bank_name 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.extract_money=res.data.extract_money
this.lock_money = res.data.lock_money this.lock_money = res.data.lock_money
this.ot_margin = res.data.ot_margin this.ot_margin = res.data.ot_margin
@ -431,7 +438,8 @@
// title: "请选择银行" // title: "请选择银行"
// }); // });
value.extract_type = 'bank'; 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) { //微信 } else if (that.currentTab == 1) { //微信
value.extract_type = 'weixin'; value.extract_type = 'weixin';
if (!this.sys_extension_type) { if (!this.sys_extension_type) {
@ -470,13 +478,13 @@
// 提交提现方式 // 提交提现方式
const mode = { const mode = {
financial_bank_name: this.mode.mer_name, financial_bank_name: this.mode.mer_name,
financial_bank_bank: value.bank_name, financial_bank_bank: this.mode.bank_name,
financial_bank_code: value.bank_code, financial_bank_code: this.mode.bank_code,
extract_money: value.extract_price, extract_money: value.extract_price,
financial_bank_branch: value.bank_address, financial_bank_branch: this.mode.bank_address,
financial_type: 1 financial_type: 1
} }
console.log(mode); console.log(mode);
postCreateApplyAPI(this.merId, mode).then(res => { postCreateApplyAPI(this.merId, mode).then(res => {
// 提现申请 // 提现申请
// that.postCreate(e.detail.value.extract_price) // that.postCreate(e.detail.value.extract_price)

6
pages/users/supply_procurement/index.vue
View File

@ -63,12 +63,14 @@
} }
if(item.name=='线上支付'){ if(item.name=='线上支付'){
item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f4521202312151148087081.png'; 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"; item.icon = "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0a377202312251014023667.png";
} }
if(item.name=='线下支付'){ if(item.name=='线下支付'){
item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/899a4202312151148319478.png'; 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"; item.icon = "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/6a23e202312251014183019.png";
} }
}) })