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

2

This commit is contained in:
SK-20231103YIXF\Administrator 2024-04-08 16:42:44 +08:00
parent 20834e3d99
commit 7ce2829aa5
5 changed files with 595 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1067
pages/activeCode/subsidy.vue
View File

File diff suppressed because it is too large Load Diff

3
pages/product/addGood/addGood.vue
View File

@ -651,6 +651,9 @@
let userInfo = this.$store.state.app.userInfo;
if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo);
let showFlag = '';
console.log(postData);
postData.attrValue.forEach(t => {
if (userInfo.mer_info.wholesale && (!t.wholesale_price || +t.wholesale_price <= 0)) {
showFlag = '批发价不能小于0'

5
pages/product/components/selectForm.vue
View File

@ -104,10 +104,9 @@
form: {
handler(val) {
this.formData = val;
// 需求方要求为空 直接输入 不需要默认值
this.formData.price = '';
this.formData.stock = '';
if (!this.formData.price || this.formData.price == '0.00') this.formData.price = '';
if (!this.formData.stock) this.formData.stock = '';
},
deep: true
}

30
pages/withdrawal/add.vue
View File

@ -82,7 +82,7 @@
</view>
<!-- 相关凭证 -->
<view class="withdrawal-envidence">
<view class="withdrawal-envidence" v-if="isCompany == 1">
<view class="withdrawal-envidence">
<text class="withdrawal-envidence-main">请上传相关凭证</text>
<text class="withdrawal-envidence-sub">(图片格式支持JPG、PNG、JPEG)</text>
@ -164,8 +164,19 @@
</view>
<!-- 提现账户 -->
<u-action-sheet title="请选择提现账户" :actions="list" :show="show" round="15" @select="handleSelected"
@close="show = false" :safeAreaInsetBottom='true'></u-action-sheet>
<u-action-sheet title="请选择提现账户" :show="show" round="15" @close="show = false">
<view class="actions" style="padding-bottom: 0;">
<view class="actions-wrap">
<block v-for="(item ,indx) in list" :key="indx">
<view class="actions-item" @click="handleSelected(item)">
<text :class="{'textactive':bindForm.bank == item.name}">{{item.name}}</text>
</view>
</block>
</view>
</view>
<!-- 底部安全范围 -->
<u-safe-bottom></u-safe-bottom>
</u-action-sheet>
<!-- 银行 -->
<u-action-sheet title="请选择银行" :show="bankShow" round="15" @close="bankShow = false">
@ -214,7 +225,8 @@
id: 0,
icon: ''
},
mer_id: ''
mer_id: '',
isCompany: ''
}
},
@ -230,7 +242,7 @@
name: '对公账户'
}];
this.bindForm.is_own = 1;
//获取法人真实姓名
//获取公司名称
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.company_name;
} else if (opt.hasOwnProperty('isOwn') && opt.isOwn == 1) {
this.list = [{
@ -241,8 +253,8 @@
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name;
} else {
this.bindForm.is_own = 1;
//获取法人真实姓名
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name;
//获取公司名称
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.company_name;
this.list = [{
name: '对公账户'
}, {
@ -252,6 +264,7 @@
//如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户 is_company =0 个体户
const isCompany = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.is_company;
this.isCompany = isCompany;
if (isCompany != 1) {
this.bindForm.is_own = 0;
this.list = [{
@ -372,7 +385,8 @@
}).catch(err => {
uni.showToast({
title: err,
duration: 3000
duration: 3000,
icon: "none"
})
})
},

2
pages/withdrawal/index.vue
View File

@ -104,7 +104,7 @@
<!-- 协议 -->
<view class="withdrawal-pro">
<text class="withdrawal-pro-progress" @click="viewProgress">查看审核进度</text>
<text class="withdrawal-pro-progress" @click="viewProgress">账户开通审核进度</text>
</view>
<!-- 提示 -->