mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
zmj 2024-02-22 10:27:29 +08:00
parent b728bf6a4f
commit e6e328dfd5
3 changed files with 200 additions and 168 deletions
api
activity.js
pages
helpPeople
formTable.vue
store/settled
unit.vue

24
api/activity.js

@ -202,7 +202,7 @@ export function getTopicList(id, data) {
* 活动专题详情 * 活动专题详情
*/ */
export function getTopicDetail(id) { export function getTopicDetail(id) {
return request.get(`activity/info/${id}`,{}, { return request.get(`activity/info/${id}`, {}, {
noAuth: true noAuth: true
}); });
} }
@ -210,7 +210,7 @@ export function getTopicDetail(id) {
* 活动专题商品 * 活动专题商品
*/ */
export function getTopicProLst(data) { export function getTopicProLst(data) {
return request.get(`product/spu/labels`,data, { return request.get(`product/spu/labels`, data, {
noAuth: true noAuth: true
}); });
} }
@ -218,7 +218,7 @@ export function getTopicProLst(data) {
* 获取本地服务商户列表 * 获取本地服务商户列表
*/ */
export function getMerchantServiceLst(data) { export function getMerchantServiceLst(data) {
return request.get(`store/merchant/local`,data, { return request.get(`store/merchant/local`, data, {
noAuth: true noAuth: true
}); });
} }
@ -226,7 +226,7 @@ export function getMerchantServiceLst(data) {
* 获取优惠券列表 * 获取优惠券列表
*/ */
export function getCouponLst(data) { export function getCouponLst(data) {
return request.get(`coupon/getlst`,data, { return request.get(`coupon/getlst`, data, {
noAuth: true noAuth: true
}); });
} }
@ -234,7 +234,7 @@ export function getCouponLst(data) {
* 获取优惠券列表 * 获取优惠券列表
*/ */
export function getNewPeopleCouponLst(data) { export function getNewPeopleCouponLst(data) {
return request.get(`coupon/new_people`,data, { return request.get(`coupon/new_people`, data, {
noAuth: true noAuth: true
}); });
} }
@ -242,7 +242,7 @@ export function getNewPeopleCouponLst(data) {
* 获取热卖排行列表 * 获取热卖排行列表
*/ */
export function hotRankingApi(data) { export function hotRankingApi(data) {
return request.get(`product/spu/get_hot_ranking`,data, { return request.get(`product/spu/get_hot_ranking`, data, {
noAuth: true noAuth: true
}); });
} }
@ -299,8 +299,8 @@ export function storeActivityTotal(data) {
// 活动商品专区 // 活动商品专区
export function storeActivityProduct(data) { export function storeActivityProduct(data) {
return request.get(`storeActivity/product`, data, { return request.get(`storeActivity/product`, data, {
noAuth: true noAuth: true
}); });
} }
// 活动区域列表 // 活动区域列表
@ -310,7 +310,7 @@ export function storeActivityDistrict(data) {
//邀请好友列表 //邀请好友列表
export function qrcode(data) { export function qrcode(data) {
return request.get(`qrcode`, data); return request.get(`qrcode`, data);
} }
@ -318,3 +318,9 @@ export function qrcode(data) {
export function merchantRecord(data) { export function merchantRecord(data) {
return request.get(`merchantRecord`, data); return request.get(`merchantRecord`, data);
} }
// 生成二维码
export function mer_services_agree() {
return request.get(`agreement/mer_services_agree`);
}

10
pages/helpPeople/formTable.vue

@ -70,7 +70,7 @@
</view> </view>
</view> </view>
<!-- :style="{height:isOpen[0]?'0':getFormHeight('#formheight')+'px',padding: isOpen[0]?'0':'20rpx' } " --> <!-- :style="{height:isOpen[0]?'0':getFormHeight('#formheight')+'px',padding: isOpen[0]?'0':'20rpx' } " -->
<view class="card-content" :style="{height:isOpen[0]?'0':domHeight[0],padding: isOpen[0]?'0':'20rpx' } " <view class="card-content" :style="{height:isOpen[0]?'0':'auto',padding: isOpen[0]?'0':'20rpx' } "
style="height: 0;padding: 0;"> style="height: 0;padding: 0;">
<view id="formheight1"> <view id="formheight1">
<view class="form-tit"> <view class="form-tit">
@ -160,7 +160,7 @@
</view> </view>
</view> </view>
<view class="card-content" :style="{height:isOpen[1]?'0':domHeight[1],padding: isOpen[1]?'0':'20rpx' } " <view class="card-content" :style="{height:isOpen[1]?'0':'auto',padding: isOpen[1]?'0':'20rpx' } "
style="height: 0;padding: 0;"> style="height: 0;padding: 0;">
<view id="formheight2"> <view id="formheight2">
<view class="form-tit"> <view class="form-tit">
@ -275,7 +275,7 @@
</view> </view>
</view> </view>
<view class="card-content" :style="{height:isOpen[2]?'0':domHeight[2],padding: isOpen[2]?'0':'20rpx' } " <view class="card-content" :style="{height:isOpen[2]?'0':'auto',padding: isOpen[2]?'0':'20rpx' } "
style="height: 0;padding: 0;"> style="height: 0;padding: 0;">
<view id='formheight3'> <view id='formheight3'>
<view class="form-tit"> <view class="form-tit">
@ -463,7 +463,7 @@
</view> </view>
</view> </view>
<view class="card-content" :style="{height:isOpen[3]?'0':domHeight[3],padding: isOpen[3]?'0':'20rpx' } " <view class="card-content" :style="{height:isOpen[3]?'0':'auto',padding: isOpen[3]?'0':'20rpx' } "
style="height: 0;padding: 0;"> style="height: 0;padding: 0;">
<view id='formheight4'> <view id='formheight4'>
<view class="form-tit"> <view class="form-tit">
@ -553,7 +553,7 @@
</view> </view>
</view> </view>
<view class="card-content" :style="{height:isOpen[4]?'0':domHeight[4],padding: isOpen[4]?'0':'20rpx' } " <view class="card-content" :style="{height:isOpen[4]?'0':'auto',padding: isOpen[4]?'0':'20rpx' } "
style="height: 0;padding: 0;"> style="height: 0;padding: 0;">
<view id='formheight5'> <view id='formheight5'>
<view class="form-tit"> <view class="form-tit">

322
pages/store/settled/unit.vue

@ -17,8 +17,8 @@
<form report-submit='true'> <form report-submit='true'>
<view class='merchantsSettled'> <view class='merchantsSettled'>
<view class="merchantBgCount"> <view class="merchantBgCount">
<image mode="widthFix" class="merchantBg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d8208202401171727545921.png" <image mode="widthFix" class="merchantBg"
alt=""> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d8208202401171727545921.png" alt="">
</view> </view>
<view class="application-record" @click="jumpToList" v-if="!mer_i_id"> <view class="application-record" @click="jumpToList" v-if="!mer_i_id">
申请记录 申请记录
@ -33,14 +33,13 @@
placeholder-class='placeholder' /> 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" maxlength="30" placeholder="请输入姓名" <input type="text" maxlength="30" placeholder="请输入姓名" v-model="merchantData.user_name"
v-model="merchantData.user_name" @input="validateBtn" @input="validateBtn" placeholder-class='placeholder' />
placeholder-class='placeholder' /> </view>
</view> </view>
</view>
<view class="item"> <view class="item">
@ -113,28 +112,36 @@
</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 no-border"> <!-- <view class="item no-border">
<checkbox-group @change='ChangeIsAgree'> <checkbox-group @change='ChangeIsAgree'>
<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意 <checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
</checkbox-group> </checkbox-group>
<button class="settleAgree" @click="getConfig">《入驻协议》</button> <button class="settleAgree" @click="getConfig">《入驻协议》</button>
</view> --> </view> -->
<view class="item no-border">
<checkbox-group @change='ChangeIsAgree'>
<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
</checkbox-group>
<button class="settleAgree" @click="getConfig(0)">《入驻协议》 </button>
<button class="settleAgree" @click="getConfig(1)">《商户服务协议》 </button>
</view>
<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit"> <button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
提交申请 提交申请
</button> </button>
@ -144,7 +151,8 @@
<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> <i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div> <div class="title" v-if='titFlag'>{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
<div class="title" v-else></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 v-html="protocol"></view> -->
@ -174,11 +182,12 @@
</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>
@ -220,12 +229,12 @@
personalStore, personalStore,
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,
@ -252,7 +261,12 @@
import { import {
HTTP_REQUEST_URL HTTP_REQUEST_URL
} from '@/config/app'; } from '@/config/app';
import { Toast } from '../../../libs/uniApi'; import {
Toast
} from '../../../libs/uniApi';
import {
mer_services_agree
} from "@/api/activity.js"
const app = getApp(); const app = getApp();
export default { export default {
components: { components: {
@ -262,6 +276,7 @@ import { Toast } from '../../../libs/uniApi';
}, },
data() { data() {
return { return {
titFlag: true,
company: '', company: '',
organization_code: '', organization_code: '',
domain: HTTP_REQUEST_URL, domain: HTTP_REQUEST_URL,
@ -286,9 +301,9 @@ 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: '', //营业执照
validate: false, validate: false,
successful: false, successful: false,
keyCode: "", keyCode: "",
@ -299,13 +314,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: ''
@ -365,8 +380,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() {
@ -449,13 +463,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();
} }
}) })
}, },
//获取镇 //获取镇
@ -465,11 +479,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 => {
@ -493,16 +507,27 @@ import { Toast } from '../../../libs/uniApi';
this.index2[2] = e.detail.value this.index2[2] = e.detail.value
} }
}, },
getConfig() { getConfig(type) {
this.isType = false; this.isType = false;
this.showProtocol = true; this.showProtocol = true;
if (type == 0) {
this.titFlag = true
this.protocol = this.sys_intention_agree
} else {
this.titFlag = false
mer_services_agree().then(res => {
this.protocol = res.data.mer_services_agree
})
}
// 获取配置 // 获取配置
this.protocol = this.sys_intention_agree // this.protocol = this.sys_intention_agree
}, },
/*获取发票说明*/ /*获取发票说明*/
getAgreement() { getAgreement() {
let that = this let that = this
that.showProtocol = true; that.showProtocol = true;
that.titFlag = true
that.isType = true that.isType = true
getAgreementApi('sys_merchant_type').then(res => { getAgreementApi('sys_merchant_type').then(res => {
that.protocol = res.data.sys_merchant_type that.protocol = res.data.sys_merchant_type
@ -522,7 +547,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
@ -530,18 +555,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();
}) })
}, },
@ -561,37 +586,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()
@ -604,9 +629,9 @@ 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
return ; // 个人入驻也不需要 return; // 个人入驻也不需要
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) => {
@ -638,21 +663,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() {
@ -715,32 +740,32 @@ import { Toast } from '../../../libs/uniApi';
that.$set(that, 'pics', that.pics); that.$set(that, 'pics', that.pics);
}); });
}, },
/** /**
* 上传图片识别文字 * 上传图片识别文字
* *
*/ */
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)
// }) // })
}); });
}, },
/** /**
* 删除图片 * 删除图片
* *
@ -840,16 +865,16 @@ import { Toast } from '../../../libs/uniApi';
let requestData = { let requestData = {
phone: that.merchantData.phone, phone: that.merchantData.phone,
// mer_name: that.merchantData.enterprise_name, // mer_name: that.merchantData.enterprise_name,
mer_name: that.merchantData.user_name+'的个人店铺', mer_name: that.merchantData.user_name + '的个人店铺',
name: that.merchantData.user_name, name: that.merchantData.user_name,
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,
@ -897,8 +922,8 @@ import { Toast } from '../../../libs/uniApi';
}, },
formSubmit() { formSubmit() {
if (this.validateForm() && this.validate) { if (this.validateForm() && this.validate) {
return this.agree(); return this.agree();
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()
@ -962,9 +987,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: '请选择店铺类型'
// }) // })
@ -980,9 +1005,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: '请上传一张或者多张图片'
// }); // });
@ -1065,7 +1090,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: 100vh; min-height: 100vh;
position: relative; position: relative;
} }
@ -1444,7 +1469,7 @@ import { Toast } from '../../../libs/uniApi';
.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;
@ -1496,21 +1521,22 @@ 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;
} }
} }
.settledSuccessMain { .settledSuccessMain {