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

Merge branch 'main' of https://gitea.lihaink.cn/mkm/shop-applet

This commit is contained in:
weipengfei 2024-03-06 11:18:04 +08:00
parent 65ee60fd4c 6609db102c
commit fd04b4e93c
1 changed files with 92 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,37 +20,37 @@
<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'>
<block v-if="merInfo.is_company"> <block v-if="merInfo.is_company">
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view class='name'>公司名称</view> <view class='name'>公司名称</view>
<view class='input'> <view class='input'>
<text class='Bank'>{{mode.mer_name}}</text> <text class='Bank'>{{mode.mer_name}}</text>
<text class='iconfont icon-qiepian38'></text> <text class='iconfont icon-qiepian38'></text>
</view> </view>
</view> </view>
<view class='item acea-row row-between-wrapper'> <view 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.bank_code" type='number' placeholder='请填写对公账号'
placeholder-class='placeholder' name="bank_code"></input></view> placeholder-class='placeholder' name="bank_code"></input></view>
</view> </view>
</block> </block>
<block v-else> <block v-else>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view class='name'>持卡人</view> <view class='name'>持卡人</view>
<view class='input'><input v-model="mode.mer_name" placeholder='请输入持卡人姓名' <view class='input'><input v-model="mode.mer_name" placeholder='请输入持卡人姓名'
placeholder-class='placeholder' name="mer_name"></input></view> placeholder-class='placeholder' name="mer_name"></input></view>
</view> </view>
<view class='item acea-row row-between-wrapper'> <view 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.bank_code" type='number' placeholder='请填写银行卡号'
placeholder-class='placeholder' name="bank_code"></input></view> placeholder-class='placeholder' name="bank_code"></input></view>
</view> </view>
</block> </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'>
<input placeholder='请输入开户银行' v-model="mode.bank_name" <input placeholder='请输入开户银行' v-model="mode.bank_name" placeholder-class='placeholder'
placeholder-class='placeholder' name="bank_address"></input> name="bank_address"></input>
<!-- <picker @change="bindPickerChange" :value="index" :range="array" range-key="name"> <!-- <picker @change="bindPickerChange" :value="index" :range="array" range-key="name">
<text class='Bank'>{{array[index]["name"]}}</text> <text class='Bank'>{{array[index]["name"]}}</text>
<text class='iconfont icon-qiepian38'></text> <text class='iconfont icon-qiepian38'></text>
@ -68,15 +68,14 @@
name="extract_price" type='digit' v-model="extract_price"></input></view> name="extract_price" type='digit' v-model="extract_price"></input></view>
</view> </view>
<view class='tip mt25'> <view class='tip mt25'>
当前可提现金额: <text 当前可提现金额: <text class="price">￥{{extract_money}}</text>, 暂存金额: ￥{{lock_money}}
class="price">￥{{extract_money}}</text>, 冻结金额: ￥{{lock_money}}
</view> </view>
<view class='tip'>
当前押金: ￥{{ot_margin}}
</view>
<view class='tip'> <view class='tip'>
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/> 当前押金: ￥{{ot_margin}}
提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/> </view>
<view class='tip'>
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br />
提货付款订单完成后，该笔订单金额暂存时间为20分钟<br />
</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>
@ -113,15 +112,14 @@
</view> </view>
<view class='tip mt25'> <view class='tip mt25'>
当前可提现金额: <text 当前可提现金额: <text class="price">￥{{extract_money}},</text>暂存金额: ￥{{lock_money}}
class="price">￥{{extract_money}},</text>冻结金额: ￥{{lock_money}}
</view> </view>
<view class='tip'>
当前押金: ￥{{ot_margin}}
</view>
<view class='tip'> <view class='tip'>
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/> 当前押金: ￥{{ot_margin}}
提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/> </view>
<view class='tip'>
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br />
提货付款订单完成后，该笔订单金额暂存时间为20分钟<br />
</view> </view>
<button formType="submit" class='bnt b-color'>提现</button> <button formType="submit" class='bnt b-color'>提现</button>
</view> </view>
@ -166,16 +164,15 @@
</view> </view>
</view> </view>
<view class='tip mb25'> <view class='tip mb25'>
当前可提现金额: <text 当前可提现金额: <text class="price">￥{{extract_money}}</text>, 暂存金额: ￥{{lock_money}}
class="price">￥{{extract_money}}</text>, 冻结金额: ￥{{lock_money}} </view>
</view> <view class='tip'>
<view class='tip'> 当前押金: ￥{{ot_margin}}
当前押金: ￥{{ot_margin}} </view>
</view> <view class='tip'>
<view class='tip'> 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br />
说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额<br/> 提货付款订单完成后，该笔订单金额暂存时间为20分钟<br />
提货付款订单完成后，该笔订单金额冻结时间为20分钟<br/> </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>
</view> </view>
@ -197,7 +194,7 @@
getLisApplyAPI, getLisApplyAPI,
getAccountApplyAPI, getAccountApplyAPI,
postAccountApplyAPI, postAccountApplyAPI,
} from '@/api/user.js' } from '@/api/user.js'
import { import {
extractCash, extractCash,
@ -223,10 +220,10 @@
}, },
data() { data() {
return { return {
extract_money:"", extract_money: "",
lock_money: "", lock_money: "",
ot_margin: "", ot_margin: "",
lock_time: "", lock_time: "",
mode: { mode: {
bank_address: "", bank_address: "",
bank_code: "", bank_code: "",
@ -263,7 +260,7 @@
array: [], //提现银行 array: [], //提现银行
minPrice: 0.00, //最低提现金额 minPrice: 0.00, //最低提现金额
userInfo: [], userInfo: [],
merInfo: {}, //商户信息 merInfo: {}, //商户信息
isClone: false, isClone: false,
isAuto: false, //没有授权的不会自动授权 isAuto: false, //没有授权的不会自动授权
isShowAuth: false, //是否隐藏授权 isShowAuth: false, //是否隐藏授权
@ -294,9 +291,9 @@
onLoad(options) { onLoad(options) {
this.merId = options.mer_id this.merId = options.mer_id
this.source = options.source; this.source = options.source;
let data = this.$store.state.app.userInfo; let data = this.$store.state.app.userInfo;
if(typeof data == 'string') data = JSON.parse(data); if (typeof data == 'string') data = JSON.parse(data);
this.merInfo = data.mer_info; this.merInfo = data.mer_info;
this.getApply() this.getApply()
if (this.isLogin) { if (this.isLogin) {
this.getUserInfo(); this.getUserInfo();
@ -312,16 +309,16 @@
try { try {
const res = await getAdminApplyAPI(this.merId) const res = await getAdminApplyAPI(this.merId)
// this.mode.real_name = res.data.financial_bank_name // this.mode.real_name = res.data.financial_bank_name
this.mode.real_name = res.data.financial_bank_name this.mode.real_name = res.data.financial_bank_name
this.mode.bank_code = res.data.financial_bank_code this.mode.bank_code = res.data.financial_bank_code
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; 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
this.lock_time = res.data.lock_time this.lock_time = res.data.lock_time
// console.log(this.extract_money) // console.log(this.extract_money)
} catch (err) { } catch (err) {
//TODO handle the exception //TODO handle the exception
@ -428,17 +425,17 @@
if (value.bank_code.length == 0) return this.$util.Tips({ if (value.bank_code.length == 0) return this.$util.Tips({
title: '请填写对公账号' title: '请填写对公账号'
}); });
if (!this.mode.bank_name) return this.$util.Tips({ if (!this.mode.bank_name) return this.$util.Tips({
title: '请填写开户银行' title: '请填写开户银行'
}); });
if (!this.mode.bank_address) return this.$util.Tips({ if (!this.mode.bank_address) return this.$util.Tips({
title: '请填写开户网点' title: '请填写开户网点'
}); });
// if (that.index == 0) return this.$util.Tips({ // if (that.index == 0) return this.$util.Tips({
// title: "请选择银行" // title: "请选择银行"
// }); // });
value.extract_type = 'bank'; value.extract_type = 'bank';
value.bank_name = this.mode.bank_name; value.bank_name = this.mode.bank_name;
// value.bank_name = (that.array && that.array.length) ? that.array[that.index].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';
@ -484,24 +481,26 @@
financial_bank_branch: this.mode.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)
Toast(res.message) Toast(res.message)
setTimeout(()=>{ setTimeout(() => {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
})}, 1000) })
}, 1000)
console.log(res); console.log(res);
}).catch(err => { }).catch(err => {
Toast(err) Toast(err)
setTimeout(()=>{ setTimeout(() => {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
})}, 1000) })
}, 1000)
}) })
}, },
async postCreate(price) { async postCreate(price) {
@ -803,18 +802,18 @@
uni-toast.uni-mask { uni-toast.uni-mask {
background-color: rgba(0, 0, 0, 0.5) !important; background-color: rgba(0, 0, 0, 0.5) !important;
} }
.saomaCode { .saomaCode {
z-index: 1; z-index: 1;
position: fixed; position: fixed;
bottom: 175.44rpx; bottom: 175.44rpx;
right: 28.07rpx; right: 28.07rpx;
width: 87.72rpx; width: 87.72rpx;
height: 87.72rpx; height: 87.72rpx;
border-radius: 175.44rpx; border-radius: 175.44rpx;
background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%); background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%);
color: #fff; color: #fff;
text-align: center; text-align: center;
line-height: 87.72rpx; line-height: 87.72rpx;
} }
</style> </style>