This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-03-07 15:15:20 +08:00
parent 8ae4863ce9
commit 1596d913de

View File

@ -39,7 +39,8 @@
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle"> <view class="uni-list-cell-db acea-row row-middle">
<text class="item-name">商户分类</text> <text class="item-name">商户分类</text>
<picker @change="bindPickerChange" @columnchange="columnchange" mode="selector" :value="index" :range="array" range-key="category_name"> <picker @change="bindPickerChange" @columnchange="columnchange" mode="selector"
:value="index" :range="array" range-key="category_name">
<input placeholder="请选择商户分类" type="text" readonly disabled <input placeholder="请选择商户分类" type="text" readonly disabled
v-model="mer_classification"> v-model="mer_classification">
<view class='iconfont icon-jiantou'></view> <view class='iconfont icon-jiantou'></view>
@ -103,13 +104,13 @@
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle"> <view class="uni-list-cell-db acea-row row-middle">
<text class="item-name">公司性质</text> <text class="item-name">公司性质</text>
<picker @change="natureBusinessChange" mode="selector" :value="index" :range="companyTypeList"> <picker @change="natureBusinessChange" mode="selector" :value="index"
<input v-if="nature_business==1" placeholder="请选择公司性质" type="text" readonly disabled :range="companyTypeList">
value="对公户"> <input v-if="nature_business==1" placeholder="请选择公司性质" type="text" readonly
<input v-else-if="nature_business==2" placeholder="请选择公司性质" type="text" readonly disabled disabled value="对公户">
value="个体户"> <input v-else-if="nature_business==2" placeholder="请选择公司性质" type="text"
<input v-else placeholder="请选择公司性质" type="text" readonly disabled readonly disabled value="个体户">
value=""> <input v-else placeholder="请选择公司性质" type="text" readonly disabled value="">
<view class='iconfont icon-jiantou'></view> <view class='iconfont icon-jiantou'></view>
</picker> </picker>
</view> </view>
@ -124,7 +125,8 @@
<view v-if="business_license" class='pictrue' @click='uploadpicText'> <view v-if="business_license" class='pictrue' @click='uploadpicText'>
<image :src='business_license'></image> <image :src='business_license'></image>
</view> </view>
<view v-else class='pictrue acea-row row-center-wrapper row-column' @click='uploadpicText'> <view v-else class='pictrue acea-row row-center-wrapper row-column'
@click='uploadpicText'>
<text class='iconfont icon-icon25201'></text> <text class='iconfont icon-icon25201'></text>
<view>上传图片</view> <view>上传图片</view>
</view> </view>
@ -220,15 +222,16 @@
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">开户银行</text> <text class="item-name">开户银行</text>
<input type="text" maxlength="30" placeholder="请输入开户银行名称" v-model="merchantData.bank_username" <input type="text" maxlength="30" placeholder="请输入开户银行名称"
@input="validateBtn" placeholder-class='placeholder' /> v-model="merchantData.bank_username" @input="validateBtn"
placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name">开户网点</text> <text class="item-name">开户网点</text>
<input type="text" placeholder="请输入开户网点" v-model="merchantData.bank_opening" @input="validateBtn" <input type="text" placeholder="请输入开户网点" v-model="merchantData.bank_opening"
placeholder-class='placeholder' /> @input="validateBtn" placeholder-class='placeholder' />
</view> </view>
</view> </view>
<view class="item" v-if="nature_business==2"> <view class="item" v-if="nature_business==2">
@ -246,7 +249,8 @@
<view v-if="bank_front" class='pictrue' @click='uploadpicBack'> <view v-if="bank_front" class='pictrue' @click='uploadpicBack'>
<image :src='bank_front'></image> <image :src='bank_front'></image>
</view> </view>
<view v-else class='pictrue acea-row row-center-wrapper row-column' @click='uploadpicBack'> <view v-else class='pictrue acea-row row-center-wrapper row-column'
@click='uploadpicBack'>
<text class='iconfont icon-icon25201'></text> <text class='iconfont icon-icon25201'></text>
<view>上传图片</view> <view>上传图片</view>
</view> </view>
@ -298,11 +302,12 @@
</form> </form>
<view class="settlementAgreement" v-if="showProtocol"> <view class="settlementAgreement" v-if="showProtocol">
<view class="setAgCount" style="width: 656rpx;height: 458px;"> <view class="setAgCount" style="width: 656rpx;height: 458px;">
<i class="icon iconfont icon-cha" @click="showProtocol = false"></i> <view class="close" @click="showProtocol = false">
<u-icon name="close-circle-fill" color="#B4B1B4" size="24"></u-icon>
</view>
<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div> <div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
<view class="content"> <view class="content">
<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser> <jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
<!-- <view v-html="protocol"></view> -->
</view> </view>
</view> </view>
</view> </view>
@ -333,7 +338,8 @@
<!-- <button class="setAgCountbtna" @click="refuse"> <!-- <button class="setAgCountbtna" @click="refuse">
拒绝 拒绝
</button> --> </button> -->
<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0" @click="agree"> <button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0"
@click="agree">
<text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text> <text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text>
<text v-else>同意本协议</text> <text v-else>同意本协议</text>
</button> </button>
@ -407,7 +413,9 @@
import { import {
HTTP_REQUEST_URL HTTP_REQUEST_URL
} from '@/config/app'; } from '@/config/app';
import { Toast } from '../../../libs/uniApi'; import {
Toast
} from '../../../libs/uniApi';
const app = getApp(); const app = getApp();
export default { export default {
components: { components: {
@ -443,7 +451,7 @@ import { Toast } from '../../../libs/uniApi';
address: '', address: '',
invitation_code: '', invitation_code: '',
}, },
business_license: '',// business_license: '', //
bank_front: '', // bank_front: '', //
validate: false, validate: false,
successful: false, successful: false,
@ -521,8 +529,7 @@ import { Toast } from '../../../libs/uniApi';
this.$nextTick(function() { this.$nextTick(function() {
this.getGoodsDetails(options.mer_i_id) this.getGoodsDetails(options.mer_i_id)
}) })
} } else this.getArea()
else this.getArea()
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45; this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
}, },
onShow() { onShow() {
@ -605,10 +612,10 @@ import { Toast } from '../../../libs/uniApi';
street_code: e street_code: e
}).then(res => { }).then(res => {
self.$set(self.business, 2, res.data); self.$set(self.business, 2, res.data);
if(self.mer_i_id&&!this.business_name){ if (self.mer_i_id && !this.business_name) {
let area = self.business[0].find(item=>item.code==self.area_id)?.name; let area = self.business[0].find(item => item.code == self.area_id)?.name;
let street = self.business[1].find(item=>item.code==self.street_id)?.name; let street = self.business[1].find(item => item.code == self.street_id)?.name;
let village = self.business[2].find(item=>item.id==self.village_id)?.name; let village = self.business[2].find(item => item.id == self.village_id)?.name;
this.business_name = `${area} ${street} ${village}`; this.business_name = `${area} ${street} ${village}`;
this.getArea(); this.getArea();
} }
@ -621,11 +628,11 @@ import { Toast } from '../../../libs/uniApi';
area_code: e area_code: e
}).then(res => { }).then(res => {
self.$set(self.business, 1, res.data) self.$set(self.business, 1, res.data)
self.getVillage(street?street:self.business[1][0].code) self.getVillage(street ? street : self.business[1][0].code)
}) })
}, },
// //
getArea(code=null, street=null) { getArea(code = null, street = null) {
getArea({ getArea({
city_code: 510500 city_code: 510500
}).then(res => { }).then(res => {
@ -693,9 +700,9 @@ import { Toast } from '../../../libs/uniApi';
this.mer_storeType = this.getStoreTypeName(resData.mer_type_id, this.storeTypeArr) this.mer_storeType = this.getStoreTypeName(resData.mer_type_id, this.storeTypeArr)
this.business_name = ''; this.business_name = '';
this.getArea(this.area_id, this.street_id); this.getArea(this.area_id, this.street_id);
if(resData.mer_type_id!=12){ if (resData.mer_type_id != 12) {
this.shoplist('mer_services_agree') this.shoplist('mer_services_agree')
}else{ } else {
this.shoplist('mer_supply_agree') this.shoplist('mer_supply_agree')
} }
uni.hideLoading(); uni.hideLoading();
@ -718,8 +725,8 @@ import { Toast } from '../../../libs/uniApi';
} }
}, },
// //
natureBusinessChange(e){ natureBusinessChange(e) {
this.nature_business = this.companyTypeList[e.detail.value]=='个体户'?2:1; this.nature_business = this.companyTypeList[e.detail.value] == '个体户' ? 2 : 1;
}, },
bindPickerChange: function(e) { bindPickerChange: function(e) {
// console.log(e.detail); // console.log(e.detail);
@ -732,9 +739,9 @@ import { Toast } from '../../../libs/uniApi';
// this.mer_classification = this.bindPickerChangeidx[idx]['cate_name'] // this.mer_classification = this.bindPickerChangeidx[idx]['cate_name']
this.validateBtn() this.validateBtn()
}, },
columnchange(e){ columnchange(e) {
// console.log(e.detail); // console.log(e.detail);
if(e.detail.column==0){ if (e.detail.column == 0) {
this.bindPickerChangeidx = this.array[e.detail.value].children; this.bindPickerChangeidx = this.array[e.detail.value].children;
} }
}, },
@ -745,9 +752,9 @@ import { Toast } from '../../../libs/uniApi';
this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id'] this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
this.mer_storeType = this.storeTypeArr[idx]['type_name'] this.mer_storeType = this.storeTypeArr[idx]['type_name']
// console.log(this.merchantData.mer_type) // console.log(this.merchantData.mer_type)
if(this.storeTypeArr[idx]['type_code']== 'TypeStore'&&this.merchantData.mer_type){ if (this.storeTypeArr[idx]['type_code'] == 'TypeStore' && this.merchantData.mer_type) {
this.shoplist('mer_services_agree') this.shoplist('mer_services_agree')
}else{ } else {
this.shoplist('mer_supply_agree') this.shoplist('mer_supply_agree')
} }
this.validateBtn() this.validateBtn()
@ -761,7 +768,7 @@ import { Toast } from '../../../libs/uniApi';
this.area_id = this.business[0][this.index2[0]].code this.area_id = this.business[0][this.index2[0]].code
this.street_id = this.business[1][this.index2[1]].code this.street_id = this.business[1][this.index2[1]].code
this.village_id = this.business[2][this.index2[2]].id this.village_id = this.business[2][this.index2[2]].id
if(this.merchantData.mer_type==12) return ; // if (this.merchantData.mer_type == 12) return; //
merstreet({ merstreet({
street_code: this.street_id street_code: this.street_id
}).then((res) => { }).then((res) => {
@ -889,14 +896,14 @@ import { Toast } from '../../../libs/uniApi';
}) })
merchantLicenseIdentify({ merchantLicenseIdentify({
image: res.data.path image: res.data.path
}).then(res=>{ }).then(res => {
that.merchantData.address = res.data.address; that.merchantData.address = res.data.address;
that.merchantData.user_name = res.data.legal_person; that.merchantData.user_name = res.data.legal_person;
that.merchantData.social_credit_code = res.data.register_number; that.merchantData.social_credit_code = res.data.register_number;
that.merchantData.company_name = res.data.name; that.merchantData.company_name = res.data.name;
// that.$set('merchantData', that.merchantData); // that.$set('merchantData', that.merchantData);
uni.hideLoading(); uni.hideLoading();
}).catch((e)=>{ }).catch((e) => {
uni.hideLoading(); uni.hideLoading();
Toast(e) Toast(e)
}) })
@ -1009,7 +1016,7 @@ import { Toast } from '../../../libs/uniApi';
social_credit_code: that.merchantData.social_credit_code, social_credit_code: that.merchantData.social_credit_code,
merchant_category_id: that.merchantData.classification, merchant_category_id: that.merchantData.classification,
merchant_category_name: that.mer_classification, merchant_category_name: that.mer_classification,
is_company: that.nature_business==1?1:0, // , 1, 0 is_company: that.nature_business == 1 ? 1 : 0, // , 1, 0
mer_type_id: that.merchantData.mer_type, mer_type_id: that.merchantData.mer_type,
mer_storeType: this.mer_storeType, mer_storeType: this.mer_storeType,
area_id: this.area_id, area_id: this.area_id,
@ -1017,12 +1024,13 @@ import { Toast } from '../../../libs/uniApi';
village_id: this.village_id, village_id: this.village_id,
is_nmsc: this.isnum, is_nmsc: this.isnum,
images: [this.business_license, ...that.pics], images: [this.business_license, ...that.pics],
financial_bank:{ financial_bank: {
// //
bank_code: this.merchantData.bank_code, bank_code: this.merchantData.bank_code,
bank: this.merchantData.bank_username, bank: this.merchantData.bank_username,
bank_branch: this.merchantData.bank_opening, bank_branch: this.merchantData.bank_opening,
name: this.nature_business == 1 ? that.merchantData.company_name : this.merchantData.bank_card_username, name: this.nature_business == 1 ? that.merchantData.company_name : this.merchantData
.bank_card_username,
bank_front: [this.bank_front] bank_front: [this.bank_front]
} }
} }
@ -1633,6 +1641,12 @@ import { Toast } from '../../../libs/uniApi';
} }
} }
.settlementAgreement .setAgCount .close {
position: absolute;
top: 15rpx;
right: 15rpx;
}
.settlementAgreement .setAgCount .icon { .settlementAgreement .setAgCount .icon {
font-size: 42rpx; font-size: 42rpx;
color: #b4b1b4; color: #b4b1b4;
@ -1649,19 +1663,16 @@ import { Toast } from '../../../libs/uniApi';
} }
.settlementAgreement .setAgCount .content { .settlementAgreement .setAgCount .content {
color: #333; color: #333;
font-size: 26rpx; font-size: 26rpx;
line-height: 22px; line-height: 22px;
text-align: justify; text-align: justify;
text-justify: distribute-all-lines; text-justify: distribute-all-lines;
overflow-y: scroll; overflow-y: scroll;
padding-bottom: 20rpx;
} }
.settlementAgreement .setAgCount .contenta { .settlementAgreement .setAgCount .contenta {
color: #333; color: #333;
font-size: 26rpx; font-size: 26rpx;
line-height: 22px; line-height: 22px;
@ -1669,8 +1680,6 @@ import { Toast } from '../../../libs/uniApi';
text-justify: distribute-all-lines; text-justify: distribute-all-lines;
height: 75%; height: 75%;
overflow-y: scroll; overflow-y: scroll;
} }
.setAgCountbtn { .setAgCountbtn {
@ -1728,17 +1737,18 @@ import { Toast } from '../../../libs/uniApi';
} }
.border{ .border {
position: absolute; position: absolute;
top: 0; top: 0;
left: -28rpx; left: -28rpx;
width: 100vw; width: 100vw;
height: 100%; height: 100%;
border-radius: 40rpx 40rpx 0 0; 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; width: 694rpx;
font-weight: bold; font-weight: bold;
font-size: 34rpx; font-size: 34rpx;