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

1

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-04-01 11:36:40 +08:00
parent 34a21b8fb0
commit fde2ed3eee
7 changed files with 262 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pages/admin/orderList/index.vue
View File

@ -11,6 +11,9 @@
<view> <view>
<scroll-view class="nav acea-row" scroll-x="true" style="white-space: nowrap; display: flex;" <scroll-view class="nav acea-row" scroll-x="true" style="white-space: nowrap; display: flex;"
scroll-with-animation show-scrollbar="true"> scroll-with-animation show-scrollbar="true">
<view class="item" :class="where.status == '' ? 'on' : ''" @click="changeStatus('')">
全部
</view>
<view class="item" :class="where.status == 1 ? 'on' : ''" @click="changeStatus(1)"> <view class="item" :class="where.status == 1 ? 'on' : ''" @click="changeStatus(1)">
待付款 待付款
</view> </view>
@ -36,7 +39,7 @@
</view> </view>
</view> </view>
<view v-if="where.status == 6" class="list"> <view v-if="(where.status == 6)" class="list">
<view class="item" v-for="(item, index) in list" :key="index"> <view class="item" v-for="(item, index) in list" :key="index">
<view class="order-num acea-row row-middle"> <view class="order-num acea-row row-middle">
<text v-if="item.order && item.order.activity_type != 0" class="activity_type"> <text v-if="item.order && item.order.activity_type != 0" class="activity_type">
@ -181,11 +184,11 @@
@click="toPostage(item)">去发货 @click="toPostage(item)">去发货
</view> </view>
<view class="bnt bnt_color" <view class="bnt bnt_color"
v-if="where.status == 2 && item.order_type == 0&& item.order_type !=1 &&item.activity_type==0" v-if="(where.status == 2 || (item.order_type === 0 && item.status === 0 && item.paid == 1)) && item.order_type == 0 && item.order_type !=1 && item.activity_type==0"
@click="toPostagequ(item)">去发货 @click="toPostagequ(item)">去发货
</view> </view>
<view class="bnt bnt_color" <view class="bnt bnt_color"
v-if="(where.status == 2 && item.order_type == 1) || where.is_verify == 1" v-if="((item.order_type == 1 && item.status === 0 && item.paid == 1) && item.order_type == 1) || where.is_verify == 1"
@click="toDetail(item)">去核销</view> @click="toDetail(item)">去核销</view>
</view> </view>
</view> </view>

67
pages/index/index.vue
View File

@ -443,7 +443,8 @@
import { import {
merstreet, merstreet,
getUserInfo, getUserInfo,
getAdminApplyAPI getAdminApplyAPI,
progressBankList
} from '@/api/user.js'; } from '@/api/user.js';
import { import {
business, business,
@ -901,7 +902,7 @@
if (index == 4) return; if (index == 4) return;
let url; let url;
if (index == 0) url = "/pages/users/embody/embody?mer_id=" + this.userInfoData.service.mer_id; if (index == 0) url = "/pages/users/embody/embody?mer_id=" + this.userInfoData.service.mer_id;
if (index == 2) url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=2`; if (index == 2) url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=`;
if (index == 3) url = "/pages/activeCode/subsidy"; if (index == 3) url = "/pages/activeCode/subsidy";
uni.navigateTo({ uni.navigateTo({
@ -956,21 +957,18 @@
uni.navigateTo({ uni.navigateTo({
url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id + url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
'&types=' + item.type '&types=' + item.type
}) })
break; break;
case 6: case 6:
uni.navigateTo({ uni.navigateTo({
url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id + url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
'&types=' + item.type '&types=' + item.type
}) })
break; break;
case 99: case 99:
uni.navigateTo({ uni.navigateTo({
url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id + url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
'&types=' + item.type '&types=' + item.type
}) })
break; break;
} }
@ -1015,12 +1013,9 @@
case 6: case 6:
uni.navigateTo({ uni.navigateTo({
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service
.mer_id + .mer_id + '&types=' + item.type
'&types=' + item.type
}) })
break; break;
} }
} else { } else {
this.isAuto = true; this.isAuto = true;
@ -1275,27 +1270,24 @@
const data = { const data = {
product_type: this.where1.product_type product_type: this.where1.product_type
} }
orderStatistics(this.userInfoData.service.mer_id, data).then( orderStatistics(this.userInfoData.service.mer_id, data).then(res => {
res => { this.order[0].value = res.data.order.unpaid;
this.order[0].value = res.data.order.unpaid; this.order[1].value = res.data.order.verify;
this.order[1].value = res.data.order.verify;
this.order[2].value = res.data.order.unshipped this.order[2].value = res.data.order.unshipped
this.order[3].value = res.data.order.untake this.order[3].value = res.data.order.untake
// this.order[4].value = res.data.order.unevaluate // this.order[4].value = res.data.order.unevaluate
this.order[4].value = res.data.order.refund this.order[4].value = res.data.order.refund
this.list[2].value = res.data.data.month.orderNum this.list[2].value = res.data.data.month.orderNum
this.list[5].value = res.data.data.today.orderNum this.list[5].value = res.data.data.today.orderNum
}, }, err => {
err => { this.$util.Tips({
that.$util.Tips({ title: err.msg
title: err.msg })
}) });
}
);
// otherOrderStatistics(this.userInfoData.service.mer_id, data).then( // otherOrderStatistics(this.userInfoData.service.mer_id, data).then(
// res => { // res => {
// this.other_order[0].value = res.data.order.unshipped // this.other_order[0].value = res.data.order.unshipped
@ -1487,10 +1479,25 @@
}) })
break; break;
case 5: case 5:
//提现管理 // 是否有一个银行卡在申请 或者两个银行卡在申请
uni.navigateTo({ progressBankList(this.userInfoData.service.mer_id).then(res => {
// url: '/pages/users/embody/embody?mer_id=' + this.userInfoData.service.mer_id const data = res.data.list || [];
url: '/pages/withdrawal/index?mer_id=' + this.userInfoData.service.mer_id
console.log(data.length == 1 && data[0].is_check === 0)
if ((data.length == 1 && data[0].is_check === 0) || (data.length == 2 && data[
0].is_check === 0 && data[1].is_check === 0)) {
uni.navigateTo({
url: '/pages/withdrawal/progress?mer_id=' + this.userInfoData
.service.mer_id
})
} else {
uni.navigateTo({
// url: '/pages/users/embody/embody?mer_id=' + this.userInfoData.service.mer_id
url: '/pages/withdrawal/index?mer_id=' + this.userInfoData
.service.mer_id
})
}
}) })
break; break;
case 6: case 6:

15
pages/payment/payment_detail.vue
View File

@ -27,7 +27,8 @@
<block v-for="(item,indx) in paymentData" :key="indx"> <block v-for="(item,indx) in paymentData" :key="indx">
<view class="payment-detail-con-item"> <view class="payment-detail-con-item">
<view class="item-desc"> <view class="item-desc">
<text class="item-desc-name">{{item.come_msg}}</text> <text class="item-desc-name line1" style="width:280rpx;">{{item.come_msg}}</text>
<text style="width:180rpx;">{{item.pay_type_name}}</text>
<text class="item-desc-price" <text class="item-desc-price"
:style="{'color':item.msg=='收入'?'#EEC102':''}"><text>{{item.msg == '支出'?'-':'+'}}</text>{{item.pay_price}}</text> :style="{'color':item.msg=='收入'?'#EEC102':''}"><text>{{item.msg == '支出'?'-':'+'}}</text>{{item.pay_price}}</text>
</view> </view>
@ -131,12 +132,12 @@
pickerConfirm(e) { pickerConfirm(e) {
const date = new Date(e.value).format('yyyy-MM-dd'); const date = new Date(e.value).format('yyyy-MM-dd');
if (this.pickStartShow) { if (this.pickStartShow) {
this.searchParams.section_startTime = date; this.searchParams.section_startTime = date;
this.searchParams.page = 1; this.searchParams.page = 1;
this.paymentData = []; this.paymentData = [];
this.loadend = false; this.loadend = false;
this.getData(); this.getData();
} }
if (this.pickEndShow) { if (this.pickEndShow) {
if (!this.searchParams.section_startTime) if (!this.searchParams.section_startTime)
this.searchParams.section_startTime = date; this.searchParams.section_startTime = date;

93
pages/users/user_modify_pwd/index.vue
View File

@ -8,33 +8,33 @@
<text class="phone">{{userInfo.phone}}</text> <text class="phone">{{userInfo.phone}}</text>
</view> </view>
<view class="item acea-row row-between-wrapper codeVal"> <view class="item acea-row row-between-wrapper codeVal">
<input type='number' maxlength="4" placeholder='验证码' placeholder-class='placeholder' class="codeIput" <input type='number' maxlength="4" placeholder='验证码' placeholder-class='placeholder'
v-model="captcha"></input> class="codeIput" v-model="captcha"></input>
<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled' <button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
@click="handleVerify"> @click="handleVerify">
{{ text }} {{ text }}
</button> </button>
</view> </view>
<view class="border"></view> <view class="border"></view>
<block v-if="type == 'payPwd'"> <block v-if="type == 'payPwd'">
<view class="item" @click="showPopup(1)"> <view class="item" @click="showPopup(1)">
<input style="pointer-events: none;" type='password' placeholder="请设置支付密码" <input style="pointer-events: none;" type='password' placeholder="请设置支付密码"
placeholder-class='placeholder' v-model="password" autocomplete="off"></input> placeholder-class='placeholder' v-model="password" autocomplete="off"></input>
</view> </view>
<view class="item" @click="showPopup(2)"> <view class="item" @click="showPopup(2)">
<input style="pointer-events: none;" type='password' placeholder="请再次设置支付密码" <input style="pointer-events: none;" type='password' placeholder="请再次设置支付密码"
placeholder-class='placeholder' v-model="repassword" autocomplete="off"></input> placeholder-class='placeholder' v-model="repassword" autocomplete="off"></input>
</view> </view>
</block> </block>
<block v-else> <block v-else>
<view class="item"> <view class="item">
<input type='password' placeholder="请设置密码" <input type='password' placeholder="请设置密码" placeholder-class='placeholder'
placeholder-class='placeholder' v-model="password" autocomplete="off"></input> v-model="password" autocomplete="off"></input>
</view> </view>
<view class="item"> <view class="item">
<input type='password' placeholder="请再次设置密码" <input type='password' placeholder="请再次设置密码" placeholder-class='placeholder'
placeholder-class='placeholder' v-model="repassword" autocomplete="off"></input> v-model="repassword" autocomplete="off"></input>
</view> </view>
</block> </block>
</view> </view>
</view> </view>
@ -43,7 +43,8 @@
</form> </form>
<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" <Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
ref="verify"></Verify> ref="verify"></Verify>
<popups ref="popups" isPay title="请设置支付密码" @confirm="handleConfirm" @clear="handleClear" @change="handleChange"></popups> <popups ref="popups" isPay title="请设置支付密码" @confirm="handleConfirm" @clear="handleClear" @change="handleChange">
</popups>
</view> </view>
</template> </template>
@ -77,12 +78,12 @@
toLogin toLogin
} from '@/libs/login.js'; } from '@/libs/login.js';
import Verify from '@/components/verify/verify.vue'; import Verify from '@/components/verify/verify.vue';
import popups from "@/components/popups/index.vue"; import popups from "@/components/popups/index.vue";
export default { export default {
mixins: [sendVerifyCode], mixins: [sendVerifyCode],
components: { components: {
Verify, Verify,
popups popups
}, },
data() { data() {
return { return {
@ -95,7 +96,7 @@
codeVal: '', codeVal: '',
disabled: false, disabled: false,
type: '', type: '',
set_type: '', set_type: '',
}; };
}, },
computed: mapGetters(['isLogin', 'viewColor']), computed: mapGetters(['isLogin', 'viewColor']),
@ -129,18 +130,18 @@
that.userInfo = res.data that.userInfo = res.data
}); });
}, },
showPopup(type){ showPopup(type) {
this.set_type = type; this.set_type = type;
this.$refs.popups.handleOpen(); this.$refs.popups.handleOpen();
}, },
// 输入密码回调 // 输入密码回调
handleConfirm(e) { handleConfirm(e) {
if(this.set_type==1)this.password = e; if (this.set_type == 1) this.password = e;
else this.repassword = e; else this.repassword = e;
}, },
handleClear() {}, handleClear() {},
handleChange() {}, handleChange() {},
confirmSubmit: function() { confirmSubmit: function() {
let that = this; let that = this;
@ -161,15 +162,19 @@
setPayPwd({ setPayPwd({
password: that.password, password: that.password,
repassword: that.repassword, repassword: that.repassword,
sms_code: that.captcha sms_code: that.captcha,
}).then(res => { }).then(res => {
that.$util.Tips({ that.$util.Tips({
title: '修改成功！', title: '修改成功！',
icon: 'success' icon: 'success'
}) }, () => {
this.$nextTick((res=>{ uni.navigateBack();
uni.navigateBack(); });
})) }).catch(err => {
that.$util.Tips({
title: err,
icon: 'none'
})
}) })
} else { // 登录密码 } else { // 登录密码
modifyPassword({ modifyPassword({
@ -204,7 +209,7 @@
await registerVerify({ await registerVerify({
phone: that.userInfo.phone, phone: that.userInfo.phone,
code: that.captcha, code: that.captcha,
type: 'change_pwd', type: this.type == 'payPwd' ? 'pay_pwd' : 'change_pwd',
captchaType: 'blockPuzzle', captchaType: 'blockPuzzle',
captchaVerification: data.captchaVerification captchaVerification: data.captchaVerification
}).then(res => { }).then(res => {

140
pages/withdrawal/add.vue
View File

@ -5,7 +5,7 @@
<view style="height: var(--status-bar-height);"></view> <view style="height: var(--status-bar-height);"></view>
<view class="shop-type-navbar"> <view class="shop-type-navbar">
<u-icon name="arrow-left" size="18" color="#fff" @click="handleBack" /> <u-icon name="arrow-left" size="18" color="#fff" @click="handleBack" />
<text class="shop-type-navbar-title">{{bindForm.id?'修改银行卡绑定':'添加银行卡'}}</text> <text class="shop-type-navbar-title">{{bindForm.id?'修改账户':'添加账户'}}</text>
<text></text> <text></text>
</view> </view>
</view> </view>
@ -30,7 +30,10 @@
<view class="withdrawal-form"> <view class="withdrawal-form">
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">开户银行</view> <view class="withdrawal-form-item-label">开户银行</view>
<view class="withdrawal-form-item-val">{{bindForm.bank?bindForm.bank:'请选择开户银行'}}</view> <view class="withdrawal-form-item-val">
<image :src="bindForm.icon" v-if="bindForm.icon"></image>
<text> {{bindForm.bank?bindForm.bank:'请选择开户银行'}}</text>
</view>
<view class="withdrawal-change" @click="changeBank"> <view class="withdrawal-change" @click="changeBank">
<text class="withdrawal-right-add">{{bindForm.bank?'更换':'选择'}}银行</text> <text class="withdrawal-right-add">{{bindForm.bank?'更换':'选择'}}银行</text>
@ -41,7 +44,7 @@
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">持卡人</view> <view class="withdrawal-form-item-label">持卡人</view>
<view class="withdrawal-form-item-val"> <view class="withdrawal-form-item-val">
<input v-model="bindForm.name" type="text" placeholder="请输入持卡人" <input v-model="bindForm.name" type="text" placeholder="请输入持卡人姓名"
placeholder-class="placeholderClass"> placeholder-class="placeholderClass">
</view> </view>
</view> </view>
@ -49,15 +52,15 @@
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">身份证</view> <view class="withdrawal-form-item-label">身份证</view>
<view class="withdrawal-form-item-val"> <view class="withdrawal-form-item-val">
<input v-model="bindForm.id_card" type="text" placeholder="请输入身份证" <input v-model="bindForm.id_card" type="text" placeholder="请输入持卡人身份证号"
placeholder-class="placeholderClass"> placeholder-class="placeholderClass">
</view> </view>
</view> </view>
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">银行账户</view> <view class="withdrawal-form-item-label">银行帐号</view>
<view class="withdrawal-form-item-val"> <view class="withdrawal-form-item-val">
<input v-model="bindForm.bank_code" type="text" placeholder="请输入银行账户" <input v-model="bindForm.bank_code" type="text" placeholder="请输入银行账号"
placeholder-class="placeholderClass"> placeholder-class="placeholderClass">
</view> </view>
</view> </view>
@ -65,7 +68,7 @@
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">开户网点</view> <view class="withdrawal-form-item-label">开户网点</view>
<view class="withdrawal-form-item-val"> <view class="withdrawal-form-item-val">
<input v-model="bindForm.bank_branch" type="text" placeholder="请输入银行账户" <input v-model="bindForm.bank_branch" type="text" placeholder="请输入开户网点"
placeholder-class="placeholderClass"> placeholder-class="placeholderClass">
</view> </view>
</view> </view>
@ -100,6 +103,9 @@
</view> </view>
</view> </view>
</view> </view>
<view style="color: #FE2121;font-size:24rpx;margin-top: 20rpx;">
锁定规则为连续输入超过3次后或当日总次数超过10次后锁定。恢复规则分为12时后恢复和次日0时恢复。锁定期间建议不要重复提交绑定，否则锁定时间会相应延长。
</view>
</view> </view>
<!-- 提现信息 对公账户--> <!-- 提现信息 对公账户-->
@ -107,8 +113,10 @@
<view class="withdrawal-form"> <view class="withdrawal-form">
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">开户银行</view> <view class="withdrawal-form-item-label">开户银行</view>
<view class="withdrawal-form-item-val">{{bindForm.bank?bindForm.bank:'请选择开户银行'}}</view> <view class="withdrawal-form-item-val">
<image :src="bindForm.icon" v-if="bindForm.icon"></image>
<text> {{bindForm.bank?bindForm.bank:'请选择开户银行'}}</text>
</view>
<view class="withdrawal-change" @click="changeBank"> <view class="withdrawal-change" @click="changeBank">
<text class="withdrawal-right-add">{{bindForm.bank?'更换':'选择'}}银行</text> <text class="withdrawal-right-add">{{bindForm.bank?'更换':'选择'}}银行</text>
<u-icon name="arrow-right" size="14" color="#40AE36"></u-icon> <u-icon name="arrow-right" size="14" color="#40AE36"></u-icon>
@ -124,9 +132,9 @@
</view> </view>
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">银行账户</view> <view class="withdrawal-form-item-label">银行账号</view>
<view class="withdrawal-form-item-val"> <view class="withdrawal-form-item-val">
<input v-model="bindForm.bank_code" type="text" placeholder="请输入银行账户" <input v-model="bindForm.bank_code" type="text" placeholder="请输入银行账号"
placeholder-class="placeholderClass"> placeholder-class="placeholderClass">
</view> </view>
</view> </view>
@ -139,6 +147,9 @@
</view> </view>
</view> </view>
</view> </view>
<view style="color: #FE2121;font-size:24rpx;margin-top: 20rpx;">
锁定规则为连续输入超过3次后或当日总次数超过10次后锁定。恢复规则分为12时后恢复和次日0时恢复。锁定期间建议不要重复提交绑定，否则锁定时间会相应延长。
</view>
</view> </view>
</view> </view>
@ -154,8 +165,21 @@
@close="show = false"></u-action-sheet> @close="show = false"></u-action-sheet>
<!-- 银行 --> <!-- 银行 -->
<u-action-sheet title="请选择银行" :actions="bankList" :show="bankShow" round="15" @select="handleSelectedBank" <u-action-sheet title="请选择银行" :show="bankShow" round="15" @close="bankShow = false">
@close="bankShow = false"></u-action-sheet> <view class="actions">
<view class="actions-wrap">
<block v-for="(item ,indx) in bankList" :key="indx">
<view class="actions-item" @click="handleSelectedBank(item)">
<image :src="item.img"></image>
<text :class="{'textactive':bindForm.bank == item.name}">{{item.name}}</text>
</view>
</block>
</view>
<view class="actions-btn" @click="bankShow = false">
<text>确认</text>
</view>
</view>
</u-action-sheet>
</view> </view>
</template> </template>
@ -183,7 +207,8 @@
phone: '', //手机号 phone: '', //手机号
is_own: '', //转账类型(0个人，1对公) is_own: '', //转账类型(0个人，1对公)
temp: [], temp: [],
id: 0 id: 0,
icon: ''
}, },
mer_id: '' mer_id: ''
} }
@ -196,15 +221,18 @@
} }
if (opt.mer_id) { if (opt.mer_id) {
this.mer_id = opt.mer_id; this.mer_id = opt.mer_id;
if (opt.hasOwnProperty('isOwn') && opt.isOwn === 0) { if (opt.hasOwnProperty('isOwn') && (opt.isOwn === 0 || opt.isOwn == '0')) {
this.list = [{ this.list = [{
name: '对公账户' name: '对公账户'
}] }];
} else if (opt.hasOwnProperty('isOwn') && opt.isOwn === 1) { this.bindForm.is_own = 1;
} else if (opt.hasOwnProperty('isOwn') && opt.isOwn == 1) {
this.list = [{ this.list = [{
name: '法人账户' name: '法人账户'
}] }];
this.bindForm.is_own = 0;
} else { } else {
this.bindForm.is_own = 0;
this.list = [{ this.list = [{
name: '对公账户' name: '对公账户'
}, { }, {
@ -251,7 +279,7 @@
// 选择银行卡 // 选择银行卡
handleSelectedBank(e) { handleSelectedBank(e) {
this.bindForm.bank = e.name; this.bindForm.bank = e.name;
this.bankShow = false; this.bindForm.icon = e.img;
}, },
// 获取银行卡 // 获取银行卡
@ -269,15 +297,15 @@
// 绑定账号 // 绑定账号
handleBind() { handleBind() {
if (!this.bindForm.name) return this.$util.Tips({ if (!this.bindForm.name) return this.$util.Tips({
title: this.bindForm.is_own === 0 ? '法人姓名不能为空！' : '账户名称不能为空！' title: this.bindForm.is_own === 0 ? '请输入法人姓名！' : '请输入账户名称！'
}); });
if (!this.bindForm.bank) return this.$util.Tips({ if (!this.bindForm.bank) return this.$util.Tips({
title: '请选择开户银行！' title: '请选择开户银行！'
}); });
if (!this.bindForm.bank) return this.$util.Tips({ if (!this.bindForm.bank_code) return this.$util.Tips({
title: '请输入银行账户！' title: this.bindForm.is_own === 0 ? '请输入银行帐号！' : '请输入银行账号！'
}); });
if (!this.bindForm.bank_branch) return this.$util.Tips({ if (!this.bindForm.bank_branch) return this.$util.Tips({
@ -305,11 +333,13 @@
this.$util.Tips({ this.$util.Tips({
title: '提交成功,请等待后台审核！' title: '提交成功,请等待后台审核！'
}, () => { }, () => {
uni.navigateBack(); uni.redirectTo({
url: "/pages/withdrawal/progress?mer_id=" + this.mer_id
})
}); });
}).catch(err => { }).catch(err => {
this.$util.Tips({ this.$util.Tips({
title: 'err' title: err
}); });
}) })
}, },
@ -415,12 +445,20 @@
} }
.withdrawal-form-item-val { .withdrawal-form-item-val {
color: #666666; display: flex;
align-items: center;
color: #333;
font-size: 30rpx; font-size: 30rpx;
image {
width: 40rpx;
height: 40rpx;
margin-right: 10rpx;
}
/deep/.uni-input-placeholder, /deep/.uni-input-placeholder,
.placeholderClass { .placeholderClass {
font-size: 28rpx; font-size: 30rpx;
color: #999; color: #999;
} }
@ -536,4 +574,54 @@
} }
} }
} }
.actions {
padding-bottom: 30rpx;
.actions-btn {
width: 650rpx;
height: 88rpx;
line-height: 88rpx;
background: linear-gradient(359deg, #72BE53 0%, #46B03A 100%);
border-radius: 88rpx;
margin: 0 auto;
text-align: center;
text {
font-weight: 600;
font-size: 30rpx;
color: #FFFFFF;
}
}
.actions-wrap {
max-height: 50vh;
overflow: auto;
margin-bottom: 30rpx;
.actions-item {
display: flex;
align-items: center;
justify-content: center;
height: 104rpx;
border-bottom: 2rpx solid #eeefef;
image {
width: 40rpx;
height: 40rpx;
margin-right: 12rpx;
}
text {
font-size: 32rpx;
color: #333;
}
}
.textactive {
font-weight: 600;
color: #40AE36 !important;
}
}
}
</style> </style>

32
pages/withdrawal/index.vue
View File

@ -39,7 +39,7 @@
<view class="withdrawal-form-item-val">{{bankInfo.financial_account.id_card}}</view> <view class="withdrawal-form-item-val">{{bankInfo.financial_account.id_card}}</view>
</view> </view>
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">银行账户</view> <view class="withdrawal-form-item-label">银行账号</view>
<view class="withdrawal-form-item-val">{{bankInfo.financial_account.bank_code}}</view> <view class="withdrawal-form-item-val">{{bankInfo.financial_account.bank_code}}</view>
</view> </view>
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
@ -57,7 +57,7 @@
<!-- 协议 --> <!-- 协议 -->
<view class="withdrawal-pro"> <view class="withdrawal-pro">
<text class="withdrawal-pro-txt">《企业授权法人提现书》</text> <text class="withdrawal-pro-txt" @click="handlePreview">《企业授权法人提现书》</text>
<text class="withdrawal-pro-progress" @click="viewProgress">查看审核进度</text> <text class="withdrawal-pro-progress" @click="viewProgress">查看审核进度</text>
</view> </view>
@ -78,7 +78,7 @@
<view class="withdrawal-form-item-val">{{bankInfo.financial_account.name}}</view> <view class="withdrawal-form-item-val">{{bankInfo.financial_account.name}}</view>
</view> </view>
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
<view class="withdrawal-form-item-label">银行账户</view> <view class="withdrawal-form-item-label">银行账号</view>
<view class="withdrawal-form-item-val">{{bankInfo.financial_account.bank_code}}</view> <view class="withdrawal-form-item-val">{{bankInfo.financial_account.bank_code}}</view>
</view> </view>
<view class="withdrawal-form-item"> <view class="withdrawal-form-item">
@ -100,7 +100,6 @@
<!-- 协议 --> <!-- 协议 -->
<view class="withdrawal-pro"> <view class="withdrawal-pro">
<!-- <text class="withdrawal-pro-txt">《企业授权法人提现书》</text> -->
<text class="withdrawal-pro-progress" @click="viewProgress">查看审核进度</text> <text class="withdrawal-pro-progress" @click="viewProgress">查看审核进度</text>
</view> </view>
@ -112,8 +111,12 @@
提货付款订单在完成后次日18:00才可提现</view> 提货付款订单在完成后次日18:00才可提现</view>
</view> </view>
</view> </view>
</view>
<!-- 暂未添加银行卡 -->
<u-empty v-if="!bankInfo || (bankInfo.is_own !== 1 && bankInfo.is_own !== 0)" text='您尚未绑定提现账户,\n点击右上角"添加账户"'
mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
</u-empty>
</view>
<!-- 提现btn --> <!-- 提现btn -->
<view class="withdrawal-btn tapActive" @click="handleSubmit"> <view class="withdrawal-btn tapActive" @click="handleSubmit">
@ -180,9 +183,21 @@
}, },
methods: { methods: {
// 图片预览
handlePreview() {
let that = this;
if (this.bankInfo && this.bankInfo.financial_account.financial_img) {
uni.previewImage({
urls: that.bankInfo.financial_account.financial_img.split(','),
current: 0
})
}
},
// 添加账户
handleToAdd() { handleToAdd() {
let strUrl = "?mer_id=" + this.mer_id; let strUrl = "?mer_id=" + this.mer_id;
if (this.bankInfo && this.bankInfo.is_own) strUrl += "&isOwn=" + this.bankInfo.is_own if (this.bankInfo) strUrl += "&isOwn=" + this.bankInfo.is_own
uni.navigateTo({ uni.navigateTo({
url: "/pages/withdrawal/add" + strUrl url: "/pages/withdrawal/add" + strUrl
}) })
@ -254,11 +269,10 @@
title: '请输入提现金额' title: '请输入提现金额'
}); });
if (!Number(this.payForm.extract_money) < 0) return this.$util.Tips({ if (Number(this.payForm.extract_money) < 0) return this.$util.Tips({
title: '请输入正确的提现金额' title: '请输入正确的提现金额'
}); });
// 是否输入密码 // 是否输入密码
const result = await this.$util.checkPassword(); const result = await this.$util.checkPassword();
if (result.data.code == 101) { //未设置支付密码 if (result.data.code == 101) { //未设置支付密码
@ -460,7 +474,7 @@
.withdrawal-form-item-val { .withdrawal-form-item-val {
font-size: 30rpx; font-size: 30rpx;
color: #666666; color: #333;
input {} input {}

30
pages/withdrawal/progress.vue
View File

@ -21,8 +21,9 @@
</view> </view>
<view class="dot"></view> <view class="dot"></view>
<view class="dot"></view> <view class="dot"></view>
<!-- #ifndef H5 -->
<view class="dot"></view> <view class="dot"></view>
<view class="dot"></view> <!-- #endif -->
<view class="dot"></view> <view class="dot"></view>
<view class="dot"></view> <view class="dot"></view>
<view class="shop-type-con-progress-left-item"> <view class="shop-type-con-progress-left-item">
@ -32,8 +33,7 @@
</view> </view>
</view> </view>
<view class="shop-type-con-progress-right"> <view class="shop-type-con-progress-right">
<view <view class="apply">
style="display:flex;margin-bottom: 46rpx;justify-content: space-between;align-items: center;">
<view class="shop-type-con-progress-right-name">申请已提交</view> <view class="shop-type-con-progress-right-name">申请已提交</view>
<view class="shop-type-con-progress-right-time">{{item.create_time}}</view> <view class="shop-type-con-progress-right-time">{{item.create_time}}</view>
</view> </view>
@ -162,8 +162,8 @@
align-items: center; align-items: center;
.dot { .dot {
width: 4rpx; width: 6rpx;
height: 4rpx; height: 6rpx;
border-radius: 50%; border-radius: 50%;
background-color: #ccc; background-color: #ccc;
margin-bottom: 4rpx; margin-bottom: 4rpx;
@ -184,6 +184,26 @@
margin-bottom: 0; margin-bottom: 0;
} }
// #ifndef H5
.apply {
display: flex;
margin-bottom: 38rpx;
justify-content: space-between;
align-items: center;
}
// #endif
// #ifdef H5
.apply {
display: flex;
margin-bottom: 36rpx;
justify-content: space-between;
align-items: center;
}
// #endif
.shop-type-con-progress-right-name { .shop-type-con-progress-right-name {
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 28rpx;