Merge branch 'new' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into new
This commit is contained in:
commit
6db2890d6e
@ -39,11 +39,12 @@
|
|||||||
<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"
|
||||||
<input placeholder="请选择商户分类" type="text" readonly disabled
|
:value="index" :range="array" range-key="category_name">
|
||||||
v-model="mer_classification">
|
<input placeholder="请选择商户分类" type="text" readonly disabled
|
||||||
<view class='iconfont icon-jiantou'></view>
|
v-model="mer_classification">
|
||||||
</picker>
|
<view class='iconfont icon-jiantou'></view>
|
||||||
|
</picker>
|
||||||
<!-- <picker @change="bindPickerChange" @columnchange="columnchange" mode="multiSelector" :value="index" :range="[array, bindPickerChangeidx]" range-key="cate_name">
|
<!-- <picker @change="bindPickerChange" @columnchange="columnchange" mode="multiSelector" :value="index" :range="[array, bindPickerChangeidx]" range-key="cate_name">
|
||||||
<input placeholder="请选择商户分类" type="text" readonly disabled
|
<input placeholder="请选择商户分类" type="text" readonly disabled
|
||||||
v-model="mer_classification">
|
v-model="mer_classification">
|
||||||
@ -86,7 +87,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- <view class="item">
|
<!-- <view class="item">
|
||||||
<view class="uni-list">
|
<view class="uni-list">
|
||||||
<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">
|
||||||
@ -98,39 +99,40 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view> -->
|
</view> -->
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<view class="uni-list">
|
<view class="uni-list">
|
||||||
<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>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="item no-border">
|
<view class="item no-border">
|
||||||
<view class='acea-row row-middle'>
|
<view class='acea-row row-middle'>
|
||||||
<text class="item-title" style="margin-right: 20rpx;">请上传营业执照</text>
|
<text class="item-title" style="margin-right: 20rpx;">请上传营业执照</text>
|
||||||
<text class="item-desc">(图片格式支持JPG、PNG、JPEG)</text>
|
<text class="item-desc">(图片格式支持JPG、PNG、JPEG)</text>
|
||||||
<view class="upload">
|
<view class="upload">
|
||||||
<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'
|
||||||
<text class='iconfont icon-icon25201'></text>
|
@click='uploadpicText'>
|
||||||
<view>上传图片</view>
|
<text class='iconfont icon-icon25201'></text>
|
||||||
</view>
|
<view>上传图片</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</view>
|
||||||
<view class="item">
|
<view class="item">
|
||||||
<view class="uni-list">
|
<view class="uni-list">
|
||||||
<view class="uni-list-cell">
|
<view class="uni-list-cell">
|
||||||
@ -298,11 +300,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>
|
||||||
@ -325,15 +328,16 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="contenta" v-else>
|
<view class="contenta" v-else>
|
||||||
<jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
|
<jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="setAgCountbtn">
|
<view class="setAgCountbtn">
|
||||||
<view class="border"></view>
|
<view class="border"></view>
|
||||||
<!-- <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>
|
||||||
@ -375,12 +379,12 @@
|
|||||||
create,
|
create,
|
||||||
verify,
|
verify,
|
||||||
merClassifly,
|
merClassifly,
|
||||||
getCategoryList,
|
getCategoryList,
|
||||||
getGoodsDetails,
|
getGoodsDetails,
|
||||||
updateGoodsRecord,
|
updateGoodsRecord,
|
||||||
getStoreTypeApi,
|
getStoreTypeApi,
|
||||||
agreeiness,
|
agreeiness,
|
||||||
merchantLicenseIdentify
|
merchantLicenseIdentify
|
||||||
} from '@/api/store.js';
|
} from '@/api/store.js';
|
||||||
import {
|
import {
|
||||||
getCaptcha,
|
getCaptcha,
|
||||||
@ -407,7 +411,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: {
|
||||||
@ -441,10 +447,10 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
social_credit_code: '',
|
social_credit_code: '',
|
||||||
company_name: '',
|
company_name: '',
|
||||||
address: '',
|
address: '',
|
||||||
invitation_code: '',
|
invitation_code: '',
|
||||||
},
|
},
|
||||||
business_license: '',//营业执照
|
business_license: '', //营业执照
|
||||||
bank_front: '', //银行卡照片
|
bank_front: '', //银行卡照片
|
||||||
validate: false,
|
validate: false,
|
||||||
successful: false,
|
successful: false,
|
||||||
keyCode: "",
|
keyCode: "",
|
||||||
@ -455,13 +461,13 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
index1: 0,
|
index1: 0,
|
||||||
index2: [0, 0, 0],
|
index2: [0, 0, 0],
|
||||||
mer_classification: "",
|
mer_classification: "",
|
||||||
nature_business: 0,
|
nature_business: 0,
|
||||||
array: [{
|
array: [{
|
||||||
category_name: '',
|
category_name: '',
|
||||||
merchant_category_id: ''
|
merchant_category_id: ''
|
||||||
}],
|
}],
|
||||||
companyTypeList: ['对公户', '个体户'],
|
companyTypeList: ['对公户', '个体户'],
|
||||||
bindPickerChangeidx: [],
|
bindPickerChangeidx: [],
|
||||||
storeTypeArr: [{
|
storeTypeArr: [{
|
||||||
type_name: '',
|
type_name: '',
|
||||||
mer_type_id: ''
|
mer_type_id: ''
|
||||||
@ -521,8 +527,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() {
|
||||||
@ -585,7 +590,7 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
|
|
||||||
//获取商户入驻申请协议
|
//获取商户入驻申请协议
|
||||||
shoplist(val) {
|
shoplist(val) {
|
||||||
|
|
||||||
agreeiness({
|
agreeiness({
|
||||||
type: val
|
type: val
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
@ -605,13 +610,13 @@ 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 +626,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 => {
|
||||||
@ -678,7 +683,7 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
this.merchantData.social_credit_code = resData.social_credit_code
|
this.merchantData.social_credit_code = resData.social_credit_code
|
||||||
this.merchantData.company_name = resData.company_name
|
this.merchantData.company_name = resData.company_name
|
||||||
this.merchantData.address = resData.address
|
this.merchantData.address = resData.address
|
||||||
this.merchantData.invitation_code = resData.invitation_code
|
this.merchantData.invitation_code = resData.invitation_code
|
||||||
this.merchantData.classification = resData.merchant_category_id
|
this.merchantData.classification = resData.merchant_category_id
|
||||||
this.merchantData.mer_type = resData.mer_type_id
|
this.merchantData.mer_type = resData.mer_type_id
|
||||||
this.area_id = resData.area_id
|
this.area_id = resData.area_id
|
||||||
@ -686,18 +691,18 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
this.mer_storeType = resData.mer_storeType
|
this.mer_storeType = resData.mer_storeType
|
||||||
this.village_id = resData.village_id
|
this.village_id = resData.village_id
|
||||||
})
|
})
|
||||||
this.business_license = resData.images[0];
|
this.business_license = resData.images[0];
|
||||||
resData.images.shift();
|
resData.images.shift();
|
||||||
this.pics = resData.images;
|
this.pics = resData.images;
|
||||||
this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
|
this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
|
||||||
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();
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@ -717,37 +722,37 @@ 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);
|
||||||
// this.index = e.target.value[1];
|
// this.index = e.target.value[1];
|
||||||
let idx = e.target.value;
|
let idx = e.target.value;
|
||||||
// let idx = e.target.value[1];
|
// let idx = e.target.value[1];
|
||||||
this.merchantData.classification = this.array[idx]['merchant_category_id']
|
this.merchantData.classification = this.array[idx]['merchant_category_id']
|
||||||
this.mer_classification = this.array[idx]['category_name']
|
this.mer_classification = this.array[idx]['category_name']
|
||||||
// this.merchantData.classification = this.bindPickerChangeidx[idx]['store_category_id']
|
// this.merchantData.classification = this.bindPickerChangeidx[idx]['store_category_id']
|
||||||
// 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;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
bindPickerChange1: function(e) {
|
bindPickerChange1: function(e) {
|
||||||
|
|
||||||
this.index1 = e.target.value
|
this.index1 = e.target.value
|
||||||
let idx = e.target.value
|
let idx = e.target.value
|
||||||
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()
|
||||||
@ -760,8 +765,8 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
`${this.business[0][this.index2[0]].name} ${this.business[1][this.index2[1]].name} ${this.business[2][this.index2[2]].name}`
|
`${this.business[0][this.index2[0]].name} ${this.business[1][this.index2[1]].name} ${this.business[2][this.index2[2]].name}`
|
||||||
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) => {
|
||||||
@ -793,21 +798,21 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
title: res
|
title: res
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
// getCategoryList()
|
// getCategoryList()
|
||||||
// .then(res => {
|
// .then(res => {
|
||||||
// // console.log(res);
|
// // console.log(res);
|
||||||
// res.data.list.forEach(item=>{
|
// res.data.list.forEach(item=>{
|
||||||
// item.category_name = item.cate_name;
|
// item.category_name = item.cate_name;
|
||||||
// item.merchant_category_id = item.store_category_id;
|
// item.merchant_category_id = item.store_category_id;
|
||||||
// })
|
// })
|
||||||
// this.array = res.data.list;
|
// this.array = res.data.list;
|
||||||
// this.bindPickerChangeidx = this.array[0].children;
|
// this.bindPickerChangeidx = this.array[0].children;
|
||||||
// })
|
// })
|
||||||
// .catch(res => {
|
// .catch(res => {
|
||||||
// this.$util.Tips({
|
// this.$util.Tips({
|
||||||
// title: res
|
// title: res
|
||||||
// });
|
// });
|
||||||
// });
|
// });
|
||||||
},
|
},
|
||||||
// 获取店铺类型
|
// 获取店铺类型
|
||||||
getStoreType: function() {
|
getStoreType: function() {
|
||||||
@ -870,38 +875,38 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
that.$set(that, 'pics', that.pics);
|
that.$set(that, 'pics', that.pics);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
uploadpicBack: function() {
|
uploadpicBack: function() {
|
||||||
let that = this;
|
let that = this;
|
||||||
that.$util.uploadImageOne('upload/image', function(res) {
|
that.$util.uploadImageOne('upload/image', function(res) {
|
||||||
that.bank_front = res.data.path;
|
that.bank_front = res.data.path;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* 上传图片识别文字
|
* 上传图片识别文字
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
uploadpicText: function() {
|
uploadpicText: function() {
|
||||||
let that = this;
|
let that = this;
|
||||||
that.$util.uploadImageOne('upload/image', function(res) {
|
that.$util.uploadImageOne('upload/image', function(res) {
|
||||||
that.business_license = res.data.path;
|
that.business_license = res.data.path;
|
||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
title: '识别中'
|
title: '识别中'
|
||||||
})
|
})
|
||||||
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)
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* 删除图片
|
* 删除图片
|
||||||
*
|
*
|
||||||
@ -1005,11 +1010,11 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
code: that.merchantData.yanzhengma,
|
code: that.merchantData.yanzhengma,
|
||||||
company_name: that.merchantData.company_name,
|
company_name: that.merchantData.company_name,
|
||||||
address: that.merchantData.address,
|
address: that.merchantData.address,
|
||||||
invitation_code: that.merchantData.invitation_code,
|
invitation_code: that.merchantData.invitation_code,
|
||||||
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,14 +1022,15 @@ 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_front: [this.bank_front]
|
.bank_card_username,
|
||||||
}
|
bank_front: [this.bank_front]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
that.validate = false;
|
that.validate = false;
|
||||||
if (that.mer_i_id) {
|
if (that.mer_i_id) {
|
||||||
@ -1065,7 +1071,7 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
},
|
},
|
||||||
formSubmit() {
|
formSubmit() {
|
||||||
if (this.validateForm() && this.validate) {
|
if (this.validateForm() && this.validate) {
|
||||||
if (this.merchantData.mer_type == '12') return this.agree();
|
if (this.merchantData.mer_type == '12') return this.agree();
|
||||||
if (this.codenote.length == 0) {
|
if (this.codenote.length == 0) {
|
||||||
this.isshow = true
|
this.isshow = true
|
||||||
this.countDown()
|
this.countDown()
|
||||||
@ -1197,9 +1203,9 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
if (!this.mer_classification) return that.$util.Tips({
|
if (!this.mer_classification) return that.$util.Tips({
|
||||||
title: '请选择商户分类'
|
title: '请选择商户分类'
|
||||||
});
|
});
|
||||||
if (!this.nature_business) return that.$util.Tips({
|
if (!this.nature_business) return that.$util.Tips({
|
||||||
title: '请选择公司性质'
|
title: '请选择公司性质'
|
||||||
})
|
})
|
||||||
if (!this.mer_storeType) return that.$util.Tips({
|
if (!this.mer_storeType) return that.$util.Tips({
|
||||||
title: '请选择店铺类型'
|
title: '请选择店铺类型'
|
||||||
})
|
})
|
||||||
@ -1212,9 +1218,9 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
if (that.isShowCode && !that.codeVal) return that.$util.Tips({
|
if (that.isShowCode && !that.codeVal) return that.$util.Tips({
|
||||||
title: '请填写图片验证码'
|
title: '请填写图片验证码'
|
||||||
});
|
});
|
||||||
if (!that.business_license) return that.$util.Tips({
|
if (!that.business_license) return that.$util.Tips({
|
||||||
title: '请上传营业执照'
|
title: '请上传营业执照'
|
||||||
});
|
});
|
||||||
// if (that.pics.length == 0) return that.$util.Tips({
|
// if (that.pics.length == 0) return that.$util.Tips({
|
||||||
// title: '请上传一张或者多张图片'
|
// title: '请上传一张或者多张图片'
|
||||||
// });
|
// });
|
||||||
@ -1256,7 +1262,7 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
background-color: var(--view-theme) !important;
|
background-color: var(--view-theme) !important;
|
||||||
color: #fff !important;
|
color: #fff !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.conten-top {
|
.conten-top {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -1297,7 +1303,7 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
}
|
}
|
||||||
|
|
||||||
.merchantsSettled {
|
.merchantsSettled {
|
||||||
background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
|
background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
|
||||||
min-height: 3200rpx;
|
min-height: 3200rpx;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
@ -1633,6 +1639,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 +1661,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,14 +1678,12 @@ 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 {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-around;
|
justify-content: space-around;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
.setAgCountbtna {
|
.setAgCountbtna {
|
||||||
margin-top: 40rpx;
|
margin-top: 40rpx;
|
||||||
@ -1727,22 +1734,23 @@ import { Toast } from '../../../libs/uniApi';
|
|||||||
color: #fff;
|
color: #fff;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.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{
|
|
||||||
width: 694rpx;
|
.btn {
|
||||||
font-weight: bold;
|
width: 694rpx;
|
||||||
font-size: 34rpx;
|
font-weight: bold;
|
||||||
}
|
font-size: 34rpx;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.settledSuccessMain {
|
.settledSuccessMain {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user