提现金额不一致修改
This commit is contained in:
parent
ac71784461
commit
0553b46afe
|
|
@ -4,8 +4,9 @@
|
|||
<view class="content-top">
|
||||
<view class="content-tops">
|
||||
<view class="content-top_img" v-if="Object.keys(userInfoData).length>0">
|
||||
<image :src="userInfoData.mer_info.mer_avatar" v-if="userInfoData.mer_info&&userInfoData.mer_info.mer_avatar"
|
||||
mode="aspectFill" @click="logout">
|
||||
<image :src="userInfoData.mer_info.mer_avatar"
|
||||
v-if="userInfoData.mer_info&&userInfoData.mer_info.mer_avatar" mode="aspectFill"
|
||||
@click="logout">
|
||||
</image>
|
||||
<image src="@/static/images/f.png" v-else mode="aspectFit" @click="logout"></image>
|
||||
</view>
|
||||
|
|
@ -69,12 +70,13 @@
|
|||
|
||||
</view>
|
||||
</view>
|
||||
<view class="content-tools" style="margin-top: 30rpx;" v-if="$store.state.app.userInfo&&$store.state.app.userInfo.mer_info&&$store.state.app.userInfo.mer_info.type_code=='TypeSupplyChain'">
|
||||
<view class="content-tools" style="margin-top: 30rpx;"
|
||||
v-if="$store.state.app.userInfo&&$store.state.app.userInfo.mer_info&&$store.state.app.userInfo.mer_info.type_code=='TypeSupplyChain'">
|
||||
<view class="tools-one" style="margin-bottom: 20rpx;">
|
||||
转账订单
|
||||
<view class=""></view>
|
||||
</view>
|
||||
<view class="content-order" >
|
||||
<view class="content-order">
|
||||
<view class="" v-for="(item,i) in other_order" :key='i' @click="other_shopporder(item)">
|
||||
<view class="content-order-two">
|
||||
{{item.value}}
|
||||
|
|
@ -94,7 +96,8 @@
|
|||
常用工具
|
||||
<view class=""></view>
|
||||
</view>
|
||||
<view class="tools-two" v-if="isgShow&&userInfoData.mer_info.setting_status==1&&userInfoData.mer_info.type_code=='TypeSupplyChain'">
|
||||
<view class="tools-two"
|
||||
v-if="isgShow&&userInfoData.mer_info.setting_status==1&&userInfoData.mer_info.type_code=='TypeSupplyChain'">
|
||||
<view class="" v-for="(item,k) in typelistSupplyChain" :key='k' @click="navation(item)">
|
||||
<view class="tools-two-img">
|
||||
<image :src="item.image" mode=""></image>
|
||||
|
|
@ -102,7 +105,8 @@
|
|||
<view class="tools-two-title"> {{item.name}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="tools-two" v-else-if="isgShow&&userInfoData.mer_info.setting_status==1&&userInfoData.mer_info.type_code=='PersonalStore'">
|
||||
<view class="tools-two"
|
||||
v-else-if="isgShow&&userInfoData.mer_info.setting_status==1&&userInfoData.mer_info.type_code=='PersonalStore'">
|
||||
<view class="" v-for="(item,k) in typePersonalStoreList" :key='k' @click="navation(item)">
|
||||
<view class="tools-two-img">
|
||||
<image :src="item.image" mode=""></image>
|
||||
|
|
@ -198,7 +202,9 @@
|
|||
<view class="title-img">
|
||||
<image src="@/static/images/zb.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="adress">{{item.real_name}} {{ item.user_phone}} <br/> {{item.user_address}} </view>
|
||||
<view class="adress">{{item.real_name}} {{ item.user_phone}} <br />
|
||||
{{item.user_address}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -269,7 +275,8 @@
|
|||
<view class="settlementAgreement" v-if="isFshow">
|
||||
<view class="setAgCount" style="width: 100%;height: 100%; padding-top: 160rpx;">
|
||||
<!-- <i class="icon iconfont icon-cha" @click="recuo"></i> -->
|
||||
<view class="" style="width: 90rpx;height: 90rpx; position: absolute;right: 10rpx; top:90rpx" @click="recuo">
|
||||
<view class="" style="width: 90rpx;height: 90rpx; position: absolute;right: 10rpx; top:90rpx"
|
||||
@click="recuo">
|
||||
<image src="@/static/images/close.png" mode="aspectFit" style="width: 90rpx;height: 90rpx;"></image>
|
||||
</view>
|
||||
<div class="title">{{detail.title}}</div>
|
||||
|
|
@ -284,12 +291,13 @@
|
|||
拒绝
|
||||
</button> -->
|
||||
|
||||
<button class="btn" :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0" @click="agree">
|
||||
<button class="btn" :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" :disabled="num!=0"
|
||||
@click="agree">
|
||||
<text v-if="num>0">请仔细阅读协议{{num}}S</text>
|
||||
<text v-else>同意本协议</text>
|
||||
</button>
|
||||
</view>
|
||||
<view ></view>
|
||||
<view></view>
|
||||
</view>
|
||||
</view>
|
||||
<uni-popup ref="popup" type="bottom" @change="changePopup">
|
||||
|
|
@ -312,42 +320,48 @@
|
|||
<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;">
|
||||
<text class="item-name" style="flex-shrink: 0;">公司名称:</text>
|
||||
<input style="font-size: 31rpx;" placeholder="请输入公司名称" v-model="merchantData.company_name" @input="validateBtn"
|
||||
<input style="font-size: 31rpx;" placeholder="请输入公司名称"
|
||||
v-model="merchantData.company_name" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
<view class="item" v-else>
|
||||
<view class="acea-row row-middle" style="display: flex;align-items: flex-start;">
|
||||
<text class="item-name" style="flex-shrink: 0;">持卡人:</text>
|
||||
<input style="font-size: 31rpx;" placeholder="请输入持卡人姓名" v-model="merchantData.company_name" @input="validateBtn"
|
||||
<input style="font-size: 31rpx;" placeholder="请输入持卡人姓名"
|
||||
v-model="merchantData.company_name" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
<view class="item" v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">对公账号:</text>
|
||||
<input style="font-size: 31rpx;" type="number" placeholder="请输入对公账号" v-model="merchantData.bank_code" @input="validateBtn"
|
||||
<input style="font-size: 31rpx;" type="number" placeholder="请输入对公账号"
|
||||
v-model="merchantData.bank_code" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
<view class="item" v-else>
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">银行卡号:</text>
|
||||
<input style="font-size: 31rpx;" type="number" placeholder="请输入银行卡号" v-model="merchantData.bank_code" @input="validateBtn"
|
||||
<input style="font-size: 31rpx;" type="number" placeholder="请输入银行卡号"
|
||||
v-model="merchantData.bank_code" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">开户银行:</text>
|
||||
<input style="font-size: 31rpx;" type="text" maxlength="30" placeholder="请输入开户银行名称" v-model="merchantData.bank_username"
|
||||
@input="validateBtn" placeholder-class='placeholder' />
|
||||
<input style="font-size: 31rpx;" type="text" maxlength="30" placeholder="请输入开户银行名称"
|
||||
v-model="merchantData.bank_username" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
<view class="item">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">开户网点:</text>
|
||||
<input style="font-size: 31rpx;" type="text" placeholder="请输入开户网点" v-model="merchantData.bank_opening" @input="validateBtn"
|
||||
<input style="font-size: 31rpx;" type="text" placeholder="请输入开户网点"
|
||||
v-model="merchantData.bank_opening" @input="validateBtn"
|
||||
placeholder-class='placeholder' />
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -374,11 +388,14 @@
|
|||
</view> -->
|
||||
<view class="item" v-if="userInfoData.mer_info && userInfoData.mer_info.is_company != 1">
|
||||
<view class="acea-row row-middle">
|
||||
<text class="item-name">{{userInfoData.mer_info&&userInfoData.mer_info.is_company?"开户凭证:":"银行卡图片:"}}</text>
|
||||
<text
|
||||
class="item-name">{{userInfoData.mer_info&&userInfoData.mer_info.is_company?"开户凭证:":"银行卡图片:"}}</text>
|
||||
</view>
|
||||
<view class="item-card">
|
||||
<view class="item-carda" @click='uploadpic({type:3})' v-if='merchantData.bank_front.length==0'>
|
||||
<image v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company" src="@/static/images/KHPZ.png" mode="aspectFit"></image>
|
||||
<view class="item-carda" @click='uploadpic({type:3})'
|
||||
v-if='merchantData.bank_front.length==0'>
|
||||
<image v-if="userInfoData.mer_info&&userInfoData.mer_info.is_company"
|
||||
src="@/static/images/KHPZ.png" mode="aspectFit"></image>
|
||||
<image v-else src="@/static/images/YHKZ.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="item-carda" @click='DelPic({type:3})' v-else>
|
||||
|
|
@ -417,7 +434,8 @@
|
|||
} from "@/api/admin";
|
||||
import {
|
||||
merstreet,
|
||||
getUserInfo
|
||||
getUserInfo,
|
||||
getAdminApplyAPI
|
||||
} from '@/api/user.js';
|
||||
import {
|
||||
business,
|
||||
|
|
@ -434,7 +452,9 @@
|
|||
import {
|
||||
ENV
|
||||
} from "@/config/app.js"
|
||||
import { Toast } from '../../libs/uniApi';
|
||||
import {
|
||||
Toast
|
||||
} from '../../libs/uniApi';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
|
|
@ -451,6 +471,9 @@ import { Toast } from '../../libs/uniApi';
|
|||
list: [{
|
||||
name: '账户总金额',
|
||||
value: 0
|
||||
}, {
|
||||
name: '暂存金额',
|
||||
value: 0
|
||||
}, {
|
||||
name: '本月订单数',
|
||||
value: 0
|
||||
|
|
@ -585,7 +608,8 @@ import { Toast } from '../../libs/uniApi';
|
|||
name: '全部',
|
||||
type: 8,
|
||||
image: require('@/static/images/index3.png')
|
||||
}],
|
||||
}
|
||||
],
|
||||
typePersonalStoreList: [{
|
||||
name: '商品管理',
|
||||
type: 1,
|
||||
|
|
@ -678,18 +702,17 @@ import { Toast } from '../../libs/uniApi';
|
|||
}
|
||||
},
|
||||
watch: {
|
||||
isFshow(n, o){
|
||||
if(n) {
|
||||
isFshow(n, o) {
|
||||
if (n) {
|
||||
uni.hideTabBar();
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
uni.showTabBar();
|
||||
}
|
||||
}
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
|
||||
this.getGoods(true).then(()=>{
|
||||
this.getGoods(true).then(() => {
|
||||
uni.stopPullDownRefresh()
|
||||
})
|
||||
},
|
||||
|
|
@ -700,7 +723,7 @@ import { Toast } from '../../libs/uniApi';
|
|||
this.list1();
|
||||
this.getUserInfo();
|
||||
this.codelist();
|
||||
this.$u.sleep(5000).then(()=>{
|
||||
this.$u.sleep(5000).then(() => {
|
||||
this.loadEndFlag = true;
|
||||
})
|
||||
},
|
||||
|
|
@ -720,7 +743,7 @@ import { Toast } from '../../libs/uniApi';
|
|||
|
||||
|
||||
onShow() {
|
||||
if(this.loadEndFlag){
|
||||
if (this.loadEndFlag) {
|
||||
this.getUserInfo();
|
||||
this.codelist();
|
||||
}
|
||||
|
|
@ -798,33 +821,38 @@ import { Toast } from '../../libs/uniApi';
|
|||
switch (item.type) {
|
||||
case 1:
|
||||
uni.navigateTo({
|
||||
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service.mer_id +
|
||||
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service
|
||||
.mer_id +
|
||||
'&types=' + item.type
|
||||
})
|
||||
break;
|
||||
case 2:
|
||||
|
||||
uni.navigateTo({
|
||||
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service.mer_id +
|
||||
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service
|
||||
.mer_id +
|
||||
'&types=' + item.type
|
||||
})
|
||||
break;
|
||||
case 3:
|
||||
uni.navigateTo({
|
||||
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service.mer_id +
|
||||
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service
|
||||
.mer_id +
|
||||
'&types=' + item.type
|
||||
})
|
||||
break;
|
||||
case 4:
|
||||
uni.navigateTo({
|
||||
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service.mer_id +
|
||||
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service
|
||||
.mer_id +
|
||||
'&types=' + item.type
|
||||
|
||||
})
|
||||
break;
|
||||
case 6:
|
||||
uni.navigateTo({
|
||||
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service.mer_id +
|
||||
url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service
|
||||
.mer_id +
|
||||
'&types=' + item.type
|
||||
|
||||
})
|
||||
|
|
@ -871,8 +899,8 @@ import { Toast } from '../../libs/uniApi';
|
|||
}
|
||||
|
||||
},
|
||||
changePopup(e){
|
||||
if(e.show)uni.hideTabBar();
|
||||
changePopup(e) {
|
||||
if (e.show) uni.hideTabBar();
|
||||
else uni.showTabBar();
|
||||
},
|
||||
//备注弹窗
|
||||
|
|
@ -960,7 +988,8 @@ import { Toast } from '../../libs/uniApi';
|
|||
title: '请输入开户网点'
|
||||
});
|
||||
|
||||
if (value.bank_front.length == 0 && that.userInfoData.mer_info.is_company != 1) return that.$util.Tips({
|
||||
if (value.bank_front.length == 0 && that.userInfoData.mer_info.is_company != 1) return that.$util
|
||||
.Tips({
|
||||
title: that.userInfoData.mer_info.is_company ? '请上传开户凭证' : '请上传银行卡正面图片'
|
||||
});
|
||||
|
||||
|
|
@ -1051,7 +1080,7 @@ import { Toast } from '../../libs/uniApi';
|
|||
this.$refs.popup1.open()
|
||||
// #endif
|
||||
// #ifndef H5
|
||||
if(ENV=='prod') this.byset()
|
||||
if (ENV == 'prod') this.byset()
|
||||
else this.$refs.popup1.open()
|
||||
// #endif
|
||||
},
|
||||
|
|
@ -1102,7 +1131,7 @@ import { Toast } from '../../libs/uniApi';
|
|||
this.order[2].value = res.data.order.untake
|
||||
this.order[3].value = res.data.order.unevaluate
|
||||
this.order[4].value = res.data.order.refund
|
||||
this.list[1].value = res.data.data.month.orderNum
|
||||
this.list[2].value = res.data.data.month.orderNum
|
||||
},
|
||||
err => {
|
||||
that.$util.Tips({
|
||||
|
|
@ -1141,13 +1170,15 @@ import { Toast } from '../../libs/uniApi';
|
|||
getUserInfo() {
|
||||
getUserInfo().then(res => {
|
||||
// console.log(res);
|
||||
res.data.mer_info.is_company?res.data.mer_info.is_company=1:res.data.mer_info.is_company=0
|
||||
res.data.mer_info.is_company ? res.data.mer_info.is_company = 1 : res.data.mer_info
|
||||
.is_company = 0
|
||||
this.userid = res.data.uid
|
||||
this.userInfoData = res.data;
|
||||
this.list[0].value = res.data.now_money;
|
||||
this.$store.commit('SET_USERINFO', res.data);
|
||||
this.merchantData.phone = res.data.phone;
|
||||
if(res.data.mer_info.is_company==0) !this.merchantData.company_name ? this.merchantData.company_name = "" : null;
|
||||
if (res.data.mer_info.is_company == 0) !this.merchantData.company_name ? this.merchantData
|
||||
.company_name = "" : null;
|
||||
else this.merchantData.company_name = res.data.mer_info.company_name;
|
||||
if (res.data.service == null) {
|
||||
// console.log('123');
|
||||
|
|
@ -1171,6 +1202,14 @@ import { Toast } from '../../libs/uniApi';
|
|||
} else {
|
||||
this.getindex()
|
||||
this.getGoods(true)
|
||||
|
||||
//获取账户金额以及冻结金额 重新调了一次接口
|
||||
getAdminApplyAPI(this.userInfoData.service.mer_id).then(res => {
|
||||
// 余额
|
||||
this.list[0].value = res.data.extract_money;
|
||||
// 暂存金额
|
||||
this.list[1].value = res.data.lock_money
|
||||
})
|
||||
}
|
||||
merstreet({
|
||||
street_code: res.data.mer_info.street_id
|
||||
|
|
@ -1229,13 +1268,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"){
|
||||
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 {
|
||||
|
|
@ -1342,7 +1381,7 @@ import { Toast } from '../../libs/uniApi';
|
|||
})
|
||||
break;
|
||||
case 14:
|
||||
if(this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
|
||||
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
|
||||
else uni.navigateTo({
|
||||
url: '/pages/margin/margin' + `?mer_id=` + this.userInfoData
|
||||
.service
|
||||
|
|
@ -1350,13 +1389,13 @@ import { Toast } from '../../libs/uniApi';
|
|||
})
|
||||
break;
|
||||
case 15:
|
||||
if(this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
|
||||
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
|
||||
else uni.navigateTo({
|
||||
url: '/pages/users/order_list/indexOther?status=-1&product_type=98&source=12'
|
||||
})
|
||||
break;
|
||||
case 16:
|
||||
if(this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
|
||||
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) Toast('暂无权限');
|
||||
else uni.navigateTo({
|
||||
url: '/pages/activeCode/subsidy'
|
||||
})
|
||||
|
|
@ -1648,7 +1687,8 @@ import { Toast } from '../../libs/uniApi';
|
|||
-webkit-align-items: center;
|
||||
align-items: center;
|
||||
padding-left: 2px;
|
||||
input{
|
||||
|
||||
input {
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -1873,17 +1913,18 @@ import { Toast } from '../../libs/uniApi';
|
|||
|
||||
}
|
||||
|
||||
.border{
|
||||
.border {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: -28rpx;
|
||||
width: 100vw;
|
||||
height: 100%;
|
||||
border-radius: 40rpx 40rpx 0 0;
|
||||
box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2); /* 在上边框添加阴影 */
|
||||
box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2);
|
||||
/* 在上边框添加阴影 */
|
||||
}
|
||||
|
||||
.btn{
|
||||
.btn {
|
||||
width: 694rpx;
|
||||
font-weight: bold;
|
||||
font-size: 34rpx;
|
||||
|
|
@ -2028,7 +2069,7 @@ import { Toast } from '../../libs/uniApi';
|
|||
font-weight: 500;
|
||||
color: #333333;
|
||||
|
||||
.top-titlea{
|
||||
.top-titlea {
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<span>商户收入(元)</span>
|
||||
<view class="pic">100.00</view>
|
||||
</li>
|
||||
<li class="kuang"><span>冻结金额(元)</span>
|
||||
<li class="kuang"><span>暂存金额(元)</span>
|
||||
<view class="pic">100.00</view>
|
||||
</li>
|
||||
<li><span>优惠券补贴(元)</span>
|
||||
|
|
|
|||
Loading…
Reference in New Issue