diff --git a/Utils/Api.js b/Utils/Api.js
index d39de96..beb3010 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -79,17 +79,18 @@ export const configStore = params => {
 	return POST('POST', `${base}/store/configStore`, params).then(res => res.data);
 }
 //门店添加设备
-export const configStoreDevice = params => {
-	return POST('POST', `${base}/storeDevice/configStoreDevice`, params).then(res => res.data);
+export const bindStoreDevice = params => {
+	return POST('POST', `${base}/device/bindStoreDevice`, params).then(res => res.data);
 }
-//门店删除设备
-export const delStoreDevice = params => {
-	return POST('POST', `${base}/storeDevice/delStoreDevice`, params).then(res => res.data);
+//业务员查询设备列表
+export const getSalesmanDeviceList = params => {
+	return POST('GET', `${base}/device/getSalesmanDeviceList`, params).then(res => res.data);
 }
-//门店查看设备列表
+//门店查询设备列表
 export const getStoreDeviceList = params => {
-	return POST('GET', `${base}/storeDevice/getStoreDeviceList`, params).then(res => res.data);
+	return POST('GET', `${base}/device/getStoreDeviceList`, params).then(res => res.data);
 }
+
 //业务员查询统计
 export const moveHomeCount = params => {
 	return POST('POST', `${base}/salesman/moveHomeCount`, params).then(res => res.data);
@@ -105,4 +106,4 @@ export const storemoveHomeCount = params => {
 // 查询交易订单列表
 export const getTradeOrderList = params => {
 	return POST('GET', `${base}/tradeOrder/getTradeOrderList`, params).then(res => res.data);
-}
\ No newline at end of file
+}
diff --git a/pages/index/addStore/addStore.vue b/pages/index/addStore/addStore.vue
index bf8e9ad..e07beb8 100644
--- a/pages/index/addStore/addStore.vue
+++ b/pages/index/addStore/addStore.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="width100 mart10 backcorfff">
-			<view class="titlename fcor666">营业执照</view>
+		<!-- 	<view class="titlename fcor666">营业执照</view>
 			<view class="width94 displ">
 				<image :src="imgsUrl+businimg" v-if="businimg" mode="widthFix" class="width45" style="margin-left: 3%;"
 					@click="upload(1)"></image>
@@ -48,7 +48,7 @@
 					<view class="date">{{end_date}}</view>
 				</picker>
 				<view class="width40 fotct fcor999" v-if="timetype == '2' ">长期有效</view>
-			</view>
+			</view> -->
 			<view class="username">
 				<view class="namecont">行业类目</view>
 				<input placeholder="请选择类目" v-model="industrycategory" style="width: 70%;" disabled="true"
@@ -70,11 +70,11 @@
 				<input placeholder="请精确到XX路XX号" v-model="detailsaddress" style="width: 70%;"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
 			</view>
-			<view class="username">
+		<!-- 	<view class="username">
 				<view class="namecont">门店账号</view>
 				<input placeholder="请输入门店账号" v-model="storeaccount" style="width: 70%;"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
-			</view>
+			</view> -->
 			<view class="username">
 				<view class="namecont">门店名称</view>
 				<input placeholder="请输入门店名称" v-model="storename" style="width: 70%;"
@@ -300,54 +300,54 @@
 			// 提交门店信息
 			configStore() {
 				let that = this;
-				if (!that.businimg) {
-					uni.showToast({
-						title: '请上传营业执照',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if (!that.businnum) {
-					uni.showToast({
-						title: '请填写营业执照号',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if (!that.regaddress) {
-					uni.showToast({
-						title: '请填写注册地址',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if (!that.start_date) {
-					uni.showToast({
-						title: '请填写营业执照开始时间',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if (!that.end_date) {
-					uni.showToast({
-						title: '请填写营业执照结束时间',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
-				if (!that.companyname) {
-					uni.showToast({
-						title: '请填写公司名称',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
+				// if (!that.businimg) {
+				// 	uni.showToast({
+				// 		title: '请上传营业执照',
+				// 		icon: "none",
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
+				// if (!that.businnum) {
+				// 	uni.showToast({
+				// 		title: '请填写营业执照号',
+				// 		icon: "none",
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
+				// if (!that.regaddress) {
+				// 	uni.showToast({
+				// 		title: '请填写注册地址',
+				// 		icon: "none",
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
+				// if (!that.start_date) {
+				// 	uni.showToast({
+				// 		title: '请填写营业执照开始时间',
+				// 		icon: "none",
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
+				// if (!that.end_date) {
+				// 	uni.showToast({
+				// 		title: '请填写营业执照结束时间',
+				// 		icon: "none",
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
+				// if (!that.companyname) {
+				// 	uni.showToast({
+				// 		title: '请填写公司名称',
+				// 		icon: "none",
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
 				if (!that.inducateid) {
 					uni.showToast({
 						title: '请选择行业类目',
@@ -372,14 +372,14 @@
 					});
 					return;
 				}
-				if (!that.storeaccount) {
-					uni.showToast({
-						title: '请填写门店账号',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
+				// if (!that.storeaccount) {
+				// 	uni.showToast({
+				// 		title: '请填写门店账号',
+				// 		icon: "none",
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
 				if (!that.storename) {
 					uni.showToast({
 						title: '请填写门店名称',
@@ -432,21 +432,21 @@
 								title: '提交中...'
 							})
 							let datas = {
-								"account": {
-									"loginName": that.storeaccount
-								},
+								// "account": {
+								// 	"loginName": that.storeaccount
+								// },
 								"name": that.storename,
 								"telephone": that.storephone,
 								"doorHeadImg": that.storeimg1,
 								"cashRegisterImg": that.storeimg2,
 								"internalImg": that.storeimg3,
-								"blisUrl": that.businimg,
-								"blisName": that.companyname,
-								"blisNo": that.businnum,
-								"blisPeriodStart": that.start_date,
-								"blisPeriodType": that.timetype, // 营业执照期限类型  1：有效期   2：长期
-								"blisPeriodEnd": that.end_date,
-								"blisRegAddress": that.regaddress,
+								// "blisUrl": that.businimg,
+								// "blisName": that.companyname,
+								// "blisNo": that.businnum,
+								// "blisPeriodStart": that.start_date,
+								// "blisPeriodType": that.timetype, // 营业执照期限类型  1：有效期   2：长期
+								// "blisPeriodEnd": that.end_date,
+								// "blisRegAddress": that.regaddress,
 								"merId": that.userInfo.mer.id,
 								"storeIndustry": {
 									"childId": that.inducateid
diff --git a/pages/index/collectNotes/collectNotes.vue b/pages/index/collectNotes/collectNotes.vue
index b7b603c..1082956 100644
--- a/pages/index/collectNotes/collectNotes.vue
+++ b/pages/index/collectNotes/collectNotes.vue
@@ -5,10 +5,12 @@
 		</view>
 		<view class="height90 width94 backcorfff mart20" v-for="(item,index) in notesList" :key="index">
 			<view class="font24 fcor333 paddtop10 padleft15">¥ <text
-					class="font306adb fontwig6 margle font28">{{item.tradeAmount}}</text>
-					<text class="stus font15 fcoreb5" v-if="item.status == 1 || item.status == 5 || item.status == 4 || item.status == 6">{{statusList[item.status]}}</text>
-					<text class="stus font15 fcor41c" v-if="item.status == 2 || item.status == 3">{{statusList[item.status]}}</text>
-					</view>
+					class="font306adb fontwig6 margle font28">{{item.tradeAmount}}</text>
+				<text class="stus font15 fcoreb5"
+					v-if="item.status == 1 || item.status == 5 || item.status == 4 || item.status == 6">{{statusList[item.status]}}</text>
+				<text class="stus font15 fcor41c"
+					v-if="item.status == 2 || item.status == 3">{{statusList[item.status]}}</text>
+			</view>
 			<view class="mart10 fcor666  padleft15 font15">{{item.createTime | timeFormat('yyyy-mm-dd')}}
 				{{item.createTime | timeFormat('hh:mm')}}
 			</view>
@@ -31,26 +33,44 @@
 					4: "支付失败",
 					5: "已取消",
 					6: "已退款"
-				}
+				},
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false, //是否加载中
 			}
 		},
 		onLoad() {
 			this.getTradeOrderList();
 		},
+		onReachBottom() {
+			this.getTradeOrderList();
+		},
 		methods: {
 			getTradeOrderList() {
 				uni.showLoading({
 					title: '加载中...'
 				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
 				let datas = {
-					pageNum: 1,
-					pageSize: 10
+					pageNum: pagenum,
+					pageSize: this.pageSize
 				}
+
 				getTradeOrderList(datas).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000' && res.return_data.pageInfo.list) {
-						this.notesList = res.return_data.pageInfo.list;
+						this.isNoMoreData = res.return_data.pageInfo.list.length == this.pageSize ? false : true;
+						this.notesList = this.notesList.concat(res.return_data.pageInfo.list);
+						if (res.return_data.pageInfo.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.pageInfo.list.length == this.pageSize ? ++pagenum : pagenum;
 					} else {
+						this.notesList = [];
 						uni.showToast({
 							title: res.return_msg,
 							duration: 2000,
@@ -70,9 +90,10 @@
 
 	.font306adb {
 		color: #306adb;
-	}
-	.stus{
-		float: right;
-		margin-right: 20px;
+	}
+
+	.stus {
+		float: right;
+		margin-right: 20px;
 	}
 </style>
diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue
index ac49878..01bbc62 100644
--- a/pages/index/merchant-details/merchant-details.vue
+++ b/pages/index/merchant-details/merchant-details.vue
@@ -74,7 +74,10 @@
 					<image src="../../../static/img/store/store10.png" mode="widthFix" class="iconw"></image>
 					<view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</view>
 				</view>
-				<button class="btns mart10" @click.stop="jumpService(item.id)">绑定设备</button>
+				<view class="height45 width100">
+					<button class="btns mart10 marRight20" @click.stop="jumpService(item.id,1)">绑定设备</button>
+					<button class="btns mart10 marRight20" @click.stop="jumpService(item.id,2)">设备列表</button>
+				</view>
 				<view class="lin10"></view>
 			</view>
 		</view>
@@ -165,9 +168,9 @@
 				})
 			},
 			//跳转设备管理
-			jumpService(item) {
+			jumpService(item, items) {
 				uni.navigateTo({
-					url: '../serviceBuild/serviceBuild?id=2&storeid=' + item
+					url: '../serviceBuild/serviceBuild?storeid=' + item + '&type=' + items
 				})
 			}
 		}
@@ -210,13 +213,14 @@
 
 	.btns {
 		width: 25%;
-		margin-left: 68%;
+		float: right;
 		height: 35px;
 		line-height: 35px;
 		background-color: #0083f5;
 		color: #FFFFFF;
 		font-weight: bold;
 		font-size: 14px;
+		padding: 0px;
 	}
 
 	.lin10 {
diff --git a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
index 628ecb8..726c732 100644
--- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
+++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
@@ -97,7 +97,7 @@
 			</view>
 			<view class="notes font13" style="color: #eb5823;border-bottom: 1px solid #f6f6f6;" v-if="merchantId == 1">
 				<image mode="widthFix" class="iconw" src="../../../static/img/gth.png"></image>
-				<text class="width90p">若营业执照上无名称，请填写“个体户XXX”(XXX为营业执照上经营者姓名)</text>
+				<text class="width90p">若营业执照上无名称，请填写“个体工商户XXX”(XXX为营业执照上经营者姓名)</text>
 			</view>
 			<view class="username" v-if="merchantId != 3">
 				<view class="namecont">营业执照号</view>
@@ -332,17 +332,19 @@
 				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
 			</view>
 			<!-- 非法人结算 -->
-			<!-- <view class="titlename fcor666">非法人结算授权书</view>
-			<view class="width94 displ">
-				<image src="../../../static/img/businesslic7.png" mode="widthFix" class="width45"
+			<view class="titlename fcor666" v-if="lementId == 3">非法人结算授权书</view>
+			<view class="width94 displ" v-if="lementId == 3">
+				<image :src="imgsUrl+uncorporsettelimg" v-if="uncorporsettelimg" @click="upload(10)" mode="widthFix" class="width45">
+				</image>
+				<image src="../../../static/img/businesslic7.png"  v-else  mode="widthFix" @click="upload(10)" class="width45"
 					style="margin-left: 3%;"></image>
 				<image src="../../../static/img/businesslic8.png" mode="widthFix" class="width45"
-					style="margin-left: 3%;" @click="perImage('../../../static/img/businesslic10.png')"></image>
+					style="margin-left: 3%;" @click="perImage('../../../static/img/businesslic8.png')"></image>
+			</view>
+			<view class="notes font13" style="color: #eb5823;border-bottom: 1px solid #f6f6f6;" v-if="lementId == 3">
+				<image mode="widthFix" class="iconw" src="../../../static/img/gth.png"></image>
+				<text class="width90p">请预览并保存授权书到本地，打印填写完整并签字后拍照上传；图片需清晰完整，以免审核失败</text>
 			</view>
-			<view class="notes font13" style="color: #eb5823;border-bottom: 1px solid #f6f6f6;">
-				<image mode="widthFix" class="iconw" src="../../../static/img/gth.png"></image> <text
-					class="width90p">请预览并保存授权书到本地，打印填写完整并签字后拍照上传；图片需清晰完整，以免审核失败</text>
-			</view> -->
 			<view class="notes font16" style="border-bottom: 0px;" v-if="lementId == 3">
 				<view class="width70 aliitem fcor666">
 					非法人身份证照片
@@ -427,11 +429,11 @@
 				<input placeholder="请输入开户行号" v-model="openingbankNo" style="width: 70%;"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
 			</view> -->
-			<view class="username">
+			<!-- <view class="username">
 				<view class="namecont">所属支行</view>
 				<input placeholder="请输入所属支行" v-model="belongbranch" style="width: 70%;"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
-			</view>
+			</view> -->
 			<view class="username">
 				<view class="namecont">银行卡号</view>
 				<input placeholder="请输入银行卡号" v-model="bankNo" style="width: 70%;"
@@ -452,10 +454,13 @@
 					电子协议
 				</view>
 			</view>
-			<view class="width94 displ mart5">
-				<image mode="widthFix" class="width100"
-					:src="imgsUrl+electronicProtocolimg" v-if="electronicProtocolimg" @click="upload(9)"></image>
-				<image src="../../../static/img/businesslic12.png" mode="widthFix" class="width100" v-else
+			<view class="width94 displ mart5" v-for="(item,index) in electronicProtocolimg">
+				<image class="chachaimg" mode="widthFix" src="../../../static/img/del.png" @click="listdeleteImg(index)"></image>
+				<image mode="widthFix" class="width100" 
+					:src="imgsUrl+item"></image>
+			</view>
+			<view class="width94 displ mart5" v-if="electronicProtocolimg.length < 5">
+				<image src="../../../static/img/businesslic12.png" mode="widthFix" class="width100"
 					@click="upload(9)"></image>
 			</view>
 		<!-- 	<view class="username">
@@ -546,11 +551,11 @@
 
 		<!--第四步 未录入门店信息 -->
 		<view class="width100 mart10 backcorfff" v-if="merchart == 4">
-			<view class="username">
+			<!-- <view class="username">
 				<view class="namecont">门店账号</view>
 				<input placeholder="请输入6-20位门店账号" maxlength="20" v-model="storeaccount" style="width: 70%;"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
-			</view>
+			</view> -->
 			<view class="username">
 				<view class="namecont">门店名称</view>
 				<input placeholder="请输入门店名称" v-model="storename" style="width: 70%;"
@@ -730,12 +735,12 @@
 				uncorporsettelimg: '', //非法人结算授权书
 				settleimg: '', //结算人银行卡照片
 				accopenperimg: '', //开户许可证图片
-				electronicProtocolimg:'', //商户电子协议
+				electronicProtocolimg: [], //商户电子协议
 				// openingbankNo: '', //开户行号
 				bankNo: '', // 银行卡号
 				bankName: '', // 银行卡持有人
 				belongbank: '', //所属银行
-				belongbranch: '', //所属支行
+				// belongbranch: '', //所属支行
 				// clearbankNo: '', //清算行号
 				storeaccount: '', //门店账号
 				storename: '', //门店名称
@@ -752,7 +757,8 @@
 				areaCode: '', //区级
 				mccno: '', //mcc编号
 				defaultRegion: ['北京市', '市辖区', '东城区'], //默认地区
-				defaultRegionCode: '110101', //区级编号
+				defaultRegionCode: '110101', //区级编号
+				regionName:'',
 				businessLicenselist: [], // 营业执照识别数据
 				bankCardlist: [], //银行卡识别数据
 				idCardzm: [], //身份证正面
@@ -772,12 +778,12 @@
 			endDate() {
 				return this.getDate('end');
 			},
-			//地区转换
-			regionName() {
-				// 转为字符串
-				this.areaCode = this.region.map(item => item.code)[2];
-				return this.region.map(item => item.name).join('-');
-			}
+			// //地区转换
+			// regionName() {
+			// 	// 转为字符串
+			// 	this.areaCode = this.region.map(item => item.code)[2];
+			// 	this.regionName =  this.region.map(item => item.name).join('-');
+			// }
 		},
 		onLoad(options) {
 			this.merId = options.id;
@@ -820,8 +826,10 @@
 				this.cardend_date = e.target.value;
 			},
 			//选择地区
-			handleGetRegion(region) {
-				this.region = region;
+			handleGetRegion(region) {
+				this.region = region;
+				this.areaCode = this.region.map(item => item.code)[2];
+				this.regionName =  this.region.map(item => item.name).join('-');
 			},
 			//选择行业
 			showjob() {
@@ -956,7 +964,7 @@
 			},
 			//上传图片
 			upload(item) {
-				let that = this;
+				let that = this;
 				uni.chooseImage({
 					count: 1,
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
@@ -1004,8 +1012,12 @@
 									that.storeimg3 = JSON.parse(uploadFileRes.data).return_data[0];
 								}
 								if (item == 9) {
-									that.electronicProtocolimg = JSON.parse(uploadFileRes.data).return_data[0];
+									that.electronicProtocolimg.push(JSON.parse(uploadFileRes.data).return_data[0]);
 								}
+								if (item == 10) {
+									that.uncorporsettelimg = JSON.parse(uploadFileRes.data).return_data[0];
+								}
+								
 							}
 						});
 					},
@@ -1013,7 +1025,11 @@
 						console.log(e);
 					}
 				});
-			},
+			},
+			//删除图片
+			listdeleteImg(e) {
+			    this.electronicProtocolimg.splice(e, 1);
+			  },
 			//营业执照识别
 			recognizeBusinessLicense(item) {
 				uni.showLoading({
@@ -1215,7 +1231,9 @@
 							this.businimg = res.return_data.blisUrl;
 							this.companyname = res.return_data.blisName;
 							this.businnum = res.return_data.blisNo
-							this.regaddress = res.return_data.blisRegAddress;
+							this.regaddress = res.return_data.blisRegAddress;
+							this.areaCode = res.return_data.merRegion.areaCode;
+							this.regionName = res.return_data.merRegion.provinceName+'-'+res.return_data.merRegion.cityName+'-'+res.return_data.merRegion.areaName;
 							if (res.return_data.blisPeriodStart) {
 								this.start_date = res.return_data.blisPeriodStart;
 							}
@@ -1257,13 +1275,15 @@
 							}
 							this.lementId = res.return_data.merSettleAcct.settleType;
 							this.settleimg = res.return_data.merSettleAcct.bankCardImg;
-							this.belongbranch = res.return_data.merSettleAcct.openningBankName;
+							// this.belongbranch = res.return_data.merSettleAcct.openningBankName;
 							this.bankNo = res.return_data.merSettleAcct.bankCardNo;
 							this.bankName = res.return_data.merSettleAcct.bankCardHolder;
 							this.openingbankNo = res.return_data.merSettleAcct.openningBankCode;
 							this.belongbank = res.return_data.merSettleAcct.bankName;
 							this.accopenperimg = res.return_data.merSettleAcct.openningBankLicenseUrl;
-							this.electronicProtocolimg = res.return_data.merSettleAcct.electronicPact
+							if(res.return_data.merSettleAcct.electronicPact){
+								this.electronicProtocolimg = res.return_data.merSettleAcct.electronicPact.split(';');
+							}
 							this.clearbankNo = res.return_data.merSettleAcct.clearingBankCode;
 							if (this.merchart == 3) {
 								this.idcardname = res.return_data.merSettleAcct.settleIdCardName;
@@ -1598,7 +1618,17 @@
 						});
 						return;
 					}
-				}
+				}
+				if (that.lementId == 3) {
+					if (!that.uncorporsettelimg) {
+						uni.showToast({
+							title: '请上授权书',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+				}
 				if (that.lementId == 3) {
 					if (!that.idcardposimg) {
 						uni.showToast({
@@ -1661,14 +1691,14 @@
 				// 	return;
 				// }
 
-				if (!that.belongbranch) {
-					uni.showToast({
-						title: '请填写所属支行',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
+				// if (!that.belongbranch) {
+				// 	uni.showToast({
+				// 		title: '请填写所属支行',
+				// 		icon: "none",
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
 				if (!that.bankNo) {
 					uni.showToast({
 						title: '请填写银行卡号',
@@ -1724,7 +1754,8 @@
 					if (that.idcardtime == 2) {
 						that.cardend_date = '长期有效'
 					}
-				}
+				}
+			let imgsqes = that.electronicProtocolimg.join(';');
 				uni.showLoading({
 					title: '提交中...'
 				})
@@ -1732,16 +1763,17 @@
 					"merId": that.merId,
 					"settleType": that.lementId, //结算类型 1：对公结算  2：对私法人结算  3：对私非法人结算,
 					"bankCardImg": that.settleimg, //"银行卡照片",
-					"openningBankName": that.belongbranch, //"银行名称",
+					// "openningBankName": that.belongbranch, //"银行名称",
 					"bankCardNo": that.bankNo, //"银行卡号",
 					"bankCardHolder": that.bankName, //"银行卡持有人",
 					// "openningBankCode": that.openingbankNo, //"开户行号",
 					"bankName": that.belongbank, //"开户行名称",
 					"openningBankLicenseUrl": that.accopenperimg, //"开户许可证照片",
-					"electronicPact":that.electronicProtocolimg, //电子协议
+					"electronicPact":imgsqes, //电子协议
 					// "clearingBankCode": that.clearbankNo, //"账户清算行号",
 					"settleIdCardName": that.idcardname, //身份证名字
-					"settleIdCardNo": that.idcard, //身份证号
+					"settleIdCardNo": that.idcard, //身份证号
+					"commissionImg":that.uncorporsettelimg, // 授权书
 					"settleIdPeriodType": that.idcardtime, //【对私非法人结算】结算人身份证有效期类型  1：有效期   2：长期,
 					"settleIdCardPortraitImg": that.idcardposimg, //"【对私非法人结算】结算人身份证人像面图片",
 					"settleIdCardNationalEmblemImg": that.idcardsideimg, //"【对私非法人结算】结算人身份证国徽面图片",
@@ -1775,14 +1807,14 @@
 			//提交门店进行审核
 			submitsotre() {
 				let that = this;
-				if (!that.storeaccount) {
-					uni.showToast({
-						title: '请填写门店账号',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
+				// if (!that.storeaccount) {
+				// 	uni.showToast({
+				// 		title: '请填写门店账号',
+				// 		icon: "none",
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
 				if (!that.storename) {
 					uni.showToast({
 						title: '请填写门店名称',
@@ -1833,9 +1865,9 @@
 							})
 							let datas = {
 								"merId": that.merId,
-								"account": {
-									"loginName": that.storeaccount
-								},
+								// "account": {
+								// 	"loginName": that.storeaccount
+								// },
 								"name": that.storename,
 								"telephone": that.storephone,
 								"doorHeadImg": that.storeimg1,
@@ -1904,7 +1936,12 @@
 			border: 1px solid #007AFF;
 		}
 	}
-
+
+	.chachaimg{
+		width: 20px;
+		float: right;
+	}
+	
 	.lineh {
 		width: 13.3%;
 		height: 1px;
diff --git a/pages/index/merchant-management/merchant-management.vue b/pages/index/merchant-management/merchant-management.vue
index 56d3335..2c47506 100644
--- a/pages/index/merchant-management/merchant-management.vue
+++ b/pages/index/merchant-management/merchant-management.vue
@@ -48,14 +48,14 @@
 		},
 		data() {
 			return {
-				tabs: ["正常", "编辑中", "审核中", "审核失败", "违规"],
+				tabs: ["编辑中", "审核中", "审核失败", "违规","正常"],
 				current: 0, // tabs默认值
 				merchantlist: [],
 				pageNum: 1,
 				pagesize: 10,
 				isLoadMore: false, //是否加载中
-				merstu: 1 //查询当前状态 1：正常   2：编辑中   4：审核中  5：审核失败  6：违规
-			}
+				merstu: 2 //查询当前状态   2：编辑中   3：审核中  4：审核失败  5：违规 1：正常 
+			} 
 		},
 		onLoad() {
 			this.getMerListBySalesman();
@@ -95,27 +95,41 @@
 			//筛选
 			change(index) {
 				this.$refs.tabs.setFinishCurrent(index);
-				this.current = index;
-				this.merstu = this.current + 1;
+				this.current = index;
+				if(index == 0){
+					this.merstu = 2;
+				}
+				if(index == 1){
+					this.merstu = 3;
+				}
+				if(index == 2){
+					this.merstu = 4;
+				}
+				if(index == 3){
+					this.merstu = 5;
+				}
+				if(index == 4){
+					this.merstu = 1;
+				}
 				this.merchantlist = [];
 				this.pageNum = 1;
 				this.getMerListBySalesman();
 			},
 			//跳转详情
 			jumpmerdes(ids) {
-				if (this.current == 1 || this.current == 3) {
+				if (this.merstu == 2 || this.merstu == 4) {
 					uni.navigateTo({
 						url: '../merchant-incoming-parts/merchant-incoming-parts?id=' + ids
 					})
 				}
-				if (this.current == 2) {
+				if (this.merstu == 3) {
 					uni.showToast({
 						title: '审核中',
 						duration: 2000,
 						icon: 'none'
 					})
 				}
-				if (this.current == 0 || this.current == 4) {
+				if (this.merstu == 1 || this.merstu == 5) {
 					uni.navigateTo({
 						url: '../merchant-details/merchant-details?id=' + ids
 					})
diff --git a/pages/index/serviceBuild/serviceBuild.vue b/pages/index/serviceBuild/serviceBuild.vue
index 2ebc1cd..07cb44d 100644
--- a/pages/index/serviceBuild/serviceBuild.vue
+++ b/pages/index/serviceBuild/serviceBuild.vue
@@ -1,23 +1,30 @@
 <template>
-	<view>
-		<view v-if="!serviceList" class="mart60 fotct font14 fcor666">
+	<view>
+		
+		<view class="input-box">
+			<view class="icon search"></view>
+			<input placeholder="输入设备SN号" v-model="deviceSn" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
+		</view>
+		
+		<view v-if="serviceList == ''" class="mart60 fotct font14 fcor666">
 			<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
 		</view>
 		<view class="height110 width94 backcorfff mart20" v-for="(item,index) in serviceList" :key="index">
 			<view class="font20 font306adb paddtop10 fontwig6 padleft15">{{item.deviceSn}}</view>
-			<view class="mart10 fcor666  padleft15 font14">绑定时间: {{item.createTime | timeFormat('yyyy-mm-dd')}}
-				{{item.createTime | timeFormat('hh:mm')}}
+			<view class="mart10 fcor666  padleft15 font14">绑定时间: {{item.storeBindTime | timeFormat('yyyy-mm-dd')}}
+				{{item.storeBindTime | timeFormat('hh:mm')}}
 			</view>
-			<button class="btns" @click="delStoreDevice(item.id)">删除设备</button>
+			<button class="btns" @click="bindStoreDevice(item.id)" v-if="typeId == 1">绑定设备</button>
 		</view>
-		<image src="../../../static/img/addser.png" mode="widthFix" class="xfimg" @click="jumpaddService"></image>
+		<!-- <image src="../../../static/img/addser.png" mode="widthFix" class="xfimg" @click="jumpaddService"></image> -->
 	</view>
 </template>
 
 <script>
 	import {
+		getSalesmanDeviceList,
 		getStoreDeviceList,
-		delStoreDevice
+		bindStoreDevice
 	} from '../../../Utils/Api.js';
 	let app = getApp();
 	export default {
@@ -27,72 +34,129 @@
 				pageNum: 1,
 				pagesize: 15,
 				isLoadMore: false, //是否加载中
-				userInfo: app.globalData.userInfo, //用户信息
-				typeId:''  ,//类型
-				storeId:'' //门店id
+				userInfo: app.globalData.userInfo, //用户信息
+				typeId: '', //类型
+				storeId: '', //门店id
+				deviceSn: '' // 设备编号
 			}
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 				this.isLoadMore = true
-				this.pageNum += 1
-				this.getStoreDeviceList()
+				this.pageNum += 1
+				if(this.typeId == 2){
+					this.getStoreDeviceList();
+				}else{
+					this.getSalesmanDeviceList();
+				}
 			}
-		},
-		onLoad(options){
-			this.typeId = options.id;
-			if(options.id == 1){
-				this.storeId = this.userInfo.store.id
-			}else{
-				this.storeId = options.storeid;
-			}
 		},
-		onShow() {
-			this.serviceList = [];
-			this.getStoreDeviceList();
+		onLoad(options) {
+			this.typeId = options.type;
+			this.storeId = options.storeid;
+			if (options.type == 2) {
+				this.getStoreDeviceList();
+			} else {
+				this.getSalesmanDeviceList();
+			}
 		},
 		methods: {
 			//跳转设备添加
-			jumpaddService() {
-				uni.navigateTo({
-					url: '../addService/addService?storeId='+this.storeId
-				})
+			// jumpaddService() {
+			// 	uni.navigateTo({
+			// 		url: '../addService/addService?storeId=' + this.storeId
+			// 	})
+			// },
+			toSearch() {
+				this.pageNum = 1;
+				this.pageSize = 10;
+				this.isNoMoreData = false;
+				this.serviceList = [];
+				if (this.typeId == 2) {
+					this.getStoreDeviceList();
+				} else {
+					this.getSalesmanDeviceList();
+				}
 			},
-			//查询列表
-			getStoreDeviceList() {
+			//门店查询设备列表
+			getStoreDeviceList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
 				let params = {
-					pageNum: this.pageNum,
+					pageNum: pagenum,
 					pageSize: this.pagesize,
+					deviceSn: this.deviceSn,
 					storeId: this.storeId
 				}
-				getStoreDeviceList(params).then(res => {
+				getStoreDeviceList(params).then(res => {
+					uni.hideLoading();
 					if (res.return_code == '000000' && res.return_data.list) {
-						this.serviceList = this.serviceList.concat(res.return_data.list);
-						if (res.return_data.pages == this.pageNum) {
-							this.isLoadMore = true;
-						} else {
-							this.isLoadMore = false
-						}
-					} else {
+						this.isLoadMore = res.return_data.list.length == this.pageSize ? false : true;
+						this.serviceList = this.serviceList.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isLoadMore = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.serviceList = [];
+						this.isLoadMore = true
+					}
+				});
+			},
+			//业务员查询设备列表
+			getSalesmanDeviceList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let datas = {
+					salesmanId: this.userInfo.salesman.id,
+					isAssignStore: false,
+					deviceSn: this.deviceSn,
+					pageNum: pagenum,
+					pageSize: this.pagesize,
+				}
+				getSalesmanDeviceList(datas).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000' && res.return_data.list) {
+						this.isLoadMore = res.return_data.list.length == this.pageSize ? false : true;
+						this.serviceList = this.serviceList.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isLoadMore = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.serviceList = [];
 						this.isLoadMore = true
 					}
 				});
 			},
-			//删除设备
-			delStoreDevice(item) {
+			//绑定设备
+			bindStoreDevice(item) {
 				let that = this;
 				uni.showModal({
-					title: '删除设备',
-					content: '是否删除当前设备呢。',
+					title: '绑定设备',
+					content: '是否绑定当前设备。',
 					success: (res) => {
 						if (res.confirm) {
 							uni.showLoading({
 								title: '提交中...'
 							})
 							let params = {
-								id: item
+								"deviceId": item,
+								"storeId": that.storeId
 							}
-							delStoreDevice(params).then(res => {
+							bindStoreDevice(params).then(res => {
 								uni.hideLoading();
 								if (res.return_code == '000000') {
 									uni.showToast({
@@ -101,10 +165,7 @@
 										duration: 2000,
 										success() {
 											setTimeout(() => {
-												that.serviceList = [];
-												that.pageNum = 1;
-												that.isLoadMore = false;
-												that.getStoreDeviceList();
+												uni.navigateBack({})
 											}, 1000);
 										}
 									})
@@ -121,7 +182,7 @@
 						}
 					}
 				});
-			}
+			},
 		}
 	}
 </script>
@@ -131,6 +192,37 @@
 		background-color: #f8f9f9;
 	}
 
+	.input-box {
+		width: 90%;
+		margin-left: 5%;
+		margin-top: 15px;
+		height: 70rpx;
+		background-color: #f5f5f5;
+		border-radius: 10rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+
+		.icon {
+			display: flex;
+			align-items: center;
+			position: absolute;
+			top: 2px;
+			left: 5px;
+			width: 60upx;
+			height: 60upx;
+			font-size: 34upx;
+			color: #c0c0c0;
+		}
+
+		input {
+			padding-left: 50upx;
+			height: 28upx;
+			font-size: 28upx;
+			width: 100%;
+		}
+	}
+
 	.font306adb {
 		color: #306adb;
 	}
@@ -151,5 +243,6 @@
 		color: #FFFFFF;
 		font-weight: bold;
 		font-size: 14px;
+		padding: 0px;
 	}
 </style>
diff --git a/pages/index/store-details/store-details.vue b/pages/index/store-details/store-details.vue
index 5c31d6b..63a8459 100644
--- a/pages/index/store-details/store-details.vue
+++ b/pages/index/store-details/store-details.vue
@@ -28,7 +28,7 @@
 				<view class="font14 fcor333 text2 width75 fotrt">{{storeDesInfo.storeIndustry.parentName}}-{{storeDesInfo.storeIndustry.childName}}
 				</view>
 			</view>
-			<view class="width100 line10"></view>
+			<!-- <view class="width100 line10"></view> -->
 			<view class="storelis">
 				<view class="namecont">创建时间</view>
 				<view class="font14 fcor333 text2 width75 fotrt">
@@ -36,7 +36,7 @@
 					{{storeDesInfo.updateTime | timeFormat('hh:mm')}}
 				</view>
 			</view>
-			<view class="storelis">
+			<!-- <view class="storelis">
 				<view class="namecont">公司名称</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{storeDesInfo.blisName}}</view>
 			</view>
@@ -47,7 +47,7 @@
 			<view class="storelis">
 				<view class="namecont">营业期限</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{storeDesInfo.blisPeriodEnd}}</view>
-			</view>
+			</view> -->
 			<view class="width100 line10"></view>
 			<view class="storelis" style="border-bottom: 0px;">
 				<view class="namecont">门店照片</view>
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 1f86ae8..fffa795 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -2,12 +2,20 @@
 	<view>
 		<image mode="widthFix" class="width100 headimg" src="../../../static/img/head.png"></image>
 		<view class="headcont fotct" @click="jumpuserdes('../../tabBar/user/user')">
-			<view class="width94 fcorfff font18 alijus">{{userInfo.secUser.userName}}
+			<view class="width94 fcorfff font18 alijus" v-if="userInfo.secUser.objectType ==  3">
+				{{userInfo.salesman.name}}
+				<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
+			</view>
+			<view class="width94 fcorfff font18 alijus" v-if="userInfo.secUser.objectType ==  4">
+				{{userInfo.mer.merAbbreviate}}
+				<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
+			</view>
+			<view class="width94 fcorfff font18 alijus" v-if="userInfo.secUser.objectType ==  5">{{userInfo.store.name}}
 				<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
 			</view>
 			<!-- 业务员 -->
-			<view class="font28 fcorfff mart20 width94" v-if="userInfo.secUser.objectType ==  3">总收益</view>
-			<view class="font28 fcorfff mart15 width94" v-if="userInfo.secUser.objectType ==  3">¥<text
+			<view class="font28 fcorfff mart20 width94" v-if="userInfo.secUser.objectType ==  3">总收益</view>
+			<view class="font28 fcorfff mart15 width94" v-if="userInfo.secUser.objectType ==  3">¥<text
 					class="margle font40">0.00</text></view>
 			<!-- 非业务员 -->
 			<view class="font15 height40 fcorfff mart20 width94" v-if="userInfo.secUser.objectType !=  3">今日总收入</view>
@@ -25,7 +33,7 @@
 				</view>
 			</view>
 			<!-- 非业务员 -->
-			<view class="width94 mart15" v-if="userInfo.secUser.objectType != 3">
+			<view class="width94 mart15" v-if="userInfo.secUser.objectType != 3" @click.stop="jumpaudt">
 				<view class="width50 fcorfff font14 flleft">
 					<view class="width100">收款笔数</view>
 					<view class="width100 mart15 font22">{{auditnum.tradeSum}}</view>
@@ -47,7 +55,7 @@
 		<!-- 菜单功能 -->
 		<view class="width100 line10"></view>
 		<view class="funcss" v-for="(item,index) in funcList" :key="index" @click="jumpdesfun(item)">
-			<image  :src="item.img" mode="widthFix" class="funicon"></image>
+			<image :src="item.img" mode="widthFix" class="funicon"></image>
 			<view class="width100 font14 mart5">{{item.title}}</view>
 		</view>
 		<view class="width100 height40p"></view>
@@ -71,7 +79,7 @@
 
 			};
 		},
-		onLoad() {
+		onLoad() {
 			//业务员
 			if (this.userInfo.secUser.objectType == 3) {
 				this.funcList = [{
@@ -86,38 +94,39 @@
 					}
 				]
 				return;
-			}
-			//商户
-			if (this.userInfo.secUser.objectType == 4) {
-				this.funcList = [{
-						title: '收款记录',
-						url: '../../index/collectNotes/collectNotes',
-						img: '../../../static/img/home1.png'
-					},
-					{
-						title: '门店管理',
-						url: '../../index/doorManage/doorManage',
-						img: '../../../static/img/home3.png'
-					}
-				]
-				return;
-			}
-			//门店
-			if (this.userInfo.secUser.objectType == 5) {
-				this.funcList = [{
-						title: '收款记录',
-						url: '../../index/collectNotes/collectNotes',
-						img: '../../../static/img/home1.png'
-					},
-					{
-						title: '绑定设备',
-						url: '../../index/serviceBuild/serviceBuild',
-						img: '../../../static/img/home2.png'
+			}
+			//商户
+			if (this.userInfo.secUser.objectType == 4) {
+				this.funcList = [{
+						title: '收款记录',
+						url: '../../index/collectNotes/collectNotes',
+						img: '../../../static/img/home1.png'
+					},
+					{
+						title: '门店管理',
+						url: '../../index/doorManage/doorManage',
+						img: '../../../static/img/home3.png'
+					}
+				]
+				return;
+			}
+			//门店
+			if (this.userInfo.secUser.objectType == 5) {
+				this.funcList = [{
+						title: '收款记录',
+						url: '../../index/collectNotes/collectNotes',
+						img: '../../../static/img/home1.png'
 					}
-				]
-				return;
-			}
-			
+					// ,
+					// {
+					// 	title: '绑定设备',
+					// 	url: '../../index/serviceBuild/serviceBuild',
+					// 	img: '../../../static/img/home2.png'
+					// }
+				]
+				return;
+			}
+
 		},
 		onShow() {
 			if (this.userInfo.secUser.objectType == 3) {
@@ -169,22 +178,28 @@
 			/**
 			 * 跳转功能
 			 */
-			jumpdesfun(item) {
-				if(item.title == '绑定设备'){
-					uni.navigateTo({
-						url: '../../index/serviceBuild/serviceBuild?id=1&storeid='
-					})
-				}else{
-					uni.navigateTo({
-						url: item.url
-					})
+			jumpdesfun(item) {
+				if (item.title == '绑定设备') {
+					uni.navigateTo({
+						url: '../../index/serviceBuild/serviceBuild?id=1&storeid='
+					})
+				} else {
+					uni.navigateTo({
+						url: item.url
+					})
 				}
-			},
-			//跳转我的资料
-			jumpuserdes(item){
-				uni.navigateTo({
-					url: item
-				})
+			},
+			//跳转我的资料
+			jumpuserdes(item) {
+				uni.navigateTo({
+					url: item
+				})
+			},
+			//跳转记录
+			jumpaudt() {
+				uni.navigateTo({
+					url: '../../index/collectNotes/collectNotes'
+				})
 			},
 			//跳转消息中心
 			jumpmescon() {
diff --git a/static/img/del.png b/static/img/del.png
new file mode 100644
index 0000000..0960e1f
Binary files /dev/null and b/static/img/del.png differ
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index 7f54334..d74e07e 100644
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>炫支付</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.5a385107.js></script><script src=/cweb/static/js/index.99c0918b.js></script></body></html>
\ No newline at end of file
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.5a385107.js></script><script src=/cweb/static/js/index.3ace2746.js></script></body></html>
\ No newline at end of file
diff --git a/unpackage/dist/build/h5/static/js/pages-index-addStore-addStore.e1c484c6.js b/unpackage/dist/build/h5/static/js/pages-index-addStore-addStore.e1c484c6.js
deleted file mode 100644
index 59bdb42..0000000
--- a/unpackage/dist/build/h5/static/js/pages-index-addStore-addStore.e1c484c6.js
+++ /dev/null
@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-addStore-addStore"],{3952:function(t,a,e){"use strict";e.r(a);var i=e("dd3c"),n=e("8d7b");for(var d in n)"default"!==d&&function(t){e.d(a,t,(function(){return n[t]}))}(d);e("fb3e");var o,s=e("f0c5"),c=Object(s["a"])(n["default"],i["b"],i["c"],!1,null,"25a0dbce",null,!1,i["a"],o);a["default"]=c.exports},"811d":function(t,a,e){var i=e("8957");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var n=e("4f06").default;n("60fb73cc",i,!0,{sourceMap:!1,shadowMode:!1})},8957:function(t,a,e){var i=e("24fb");a=i(!1),a.push([t.i,'@charset "UTF-8";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */\n/* 透明度 */\n/* 文章场景相关 */\n/* 字体大小 */.font11[data-v-25a0dbce]{font-size:11px}.font12[data-v-25a0dbce]{font-size:12px}.font13[data-v-25a0dbce]{font-size:13px}.fontlet[data-v-25a0dbce]{letter-spacing:2px}.font14[data-v-25a0dbce]{font-size:14px}.font15[data-v-25a0dbce]{font-size:15px}.font16[data-v-25a0dbce]{font-size:16px}.font18[data-v-25a0dbce]{font-size:18px}.font20[data-v-25a0dbce]{font-size:20px}.font22[data-v-25a0dbce]{font-size:22px}.font24[data-v-25a0dbce]{font-size:24px}.font28[data-v-25a0dbce]{font-size:28px}.font36[data-v-25a0dbce]{font-size:36px}.font40[data-v-25a0dbce]{font-size:40px}.fontwig6[data-v-25a0dbce]{font-weight:700}\n/* 字体间距 */.fontspec[data-v-25a0dbce]{letter-spacing:1px}.fontspec10[data-v-25a0dbce]{letter-spacing:10px}\n/* 字体行间距 */.linehet[data-v-25a0dbce]{line-height:20px}\n/* 字体位置 */.fotlt[data-v-25a0dbce]{text-align:left}.fotrt[data-v-25a0dbce]{text-align:right}.fotct[data-v-25a0dbce]{text-align:center}.margle[data-v-25a0dbce]{margin-left:6px}.margle10[data-v-25a0dbce]{margin-left:10px}.margle20[data-v-25a0dbce]{margin-left:20px}.marglerig[data-v-25a0dbce]{margin-right:5px}.marRight20[data-v-25a0dbce]{margin-right:20px}.verc[data-v-25a0dbce]{vertical-align:middle}.versub[data-v-25a0dbce]{vertical-align:sub}.text1[data-v-25a0dbce]{overflow:hidden;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical;text-overflow:ellipsis}.text2[data-v-25a0dbce]{overflow:hidden;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;text-overflow:ellipsis}\n/* 字体颜色 */.fcor333[data-v-25a0dbce]{color:#333}.fcorfff[data-v-25a0dbce]{color:#fff}.fcor666[data-v-25a0dbce]{color:#666}.fcor999[data-v-25a0dbce]{color:#b2b2b2}.fcor089[data-v-25a0dbce]{color:#089bf5}.fcorFD7[data-v-25a0dbce]{color:#fd786d}.fcoreb5[data-v-25a0dbce]{color:#eb5823}.fcorred[data-v-25a0dbce]{color:red}.fcor41c[data-v-25a0dbce]{color:#41cda2}\n/* 背景颜色 */.backcor6[data-v-25a0dbce]{background-color:#f6f6f6}.backcorlr[data-v-25a0dbce]{background:linear-gradient(90deg,#fe1a1a,#ff722e)}.backcor9[data-v-25a0dbce]{background-color:#f6f6f6}.backcorf06[data-v-25a0dbce]{background-color:#0083f5}.backcor008[data-v-25a0dbce]{background-color:#0083f5}.backcor89[data-v-25a0dbce]{background-color:#089bf5}.backcorfff[data-v-25a0dbce]{background-color:#fff}.backshare[data-v-25a0dbce]{background:transparent}\n/* 页面布局 */.width90[data-v-25a0dbce]{width:90%;margin-left:5%}.width90p[data-v-25a0dbce]{width:90%}.width10[data-v-25a0dbce]{width:10%}.width96[data-v-25a0dbce]{width:96%;margin-left:2%}.width94[data-v-25a0dbce]{width:94%;margin-left:3%}.width92[data-v-25a0dbce]{width:92%;margin-left:4%}.width80[data-v-25a0dbce]{width:80%;margin-left:10%}.width80p[data-v-25a0dbce]{width:80%}.width65[data-v-25a0dbce]{width:65%}.width70[data-v-25a0dbce]{width:70%}.width75[data-v-25a0dbce]{width:75%}.width85[data-v-25a0dbce]{width:85%}.width50[data-v-25a0dbce]{width:50%}.width45[data-v-25a0dbce]{width:45%}.width40[data-v-25a0dbce]{width:40%}.width60[data-v-25a0dbce]{width:60%}.width60w[data-v-25a0dbce]{width:60%;margin-left:20%}.width35[data-v-25a0dbce]{width:35%}.width30[data-v-25a0dbce]{width:30%}.width20[data-v-25a0dbce]{width:20%}.width25[data-v-25a0dbce]{width:25%}.width15[data-v-25a0dbce]{width:15%}.width8[data-v-25a0dbce]{width:8%}.width95[data-v-25a0dbce]{width:95%}.width100[data-v-25a0dbce]{width:100%}.bor-botm1[data-v-25a0dbce]{border-bottom:1px solid #f4f4f4}.bor-dot1[data-v-25a0dbce]{border-bottom:1px dotted #999}.bor-botm10[data-v-25a0dbce]{border-bottom:10px solid #f4f4f4}\n/* 高40px */.height40p[data-v-25a0dbce]{height:40px}.height45[data-v-25a0dbce]{height:45px}.height22[data-v-25a0dbce]{height:22px}.height100[data-v-25a0dbce]{height:100%}.height10[data-v-25a0dbce]{height:10px}.height60[data-v-25a0dbce]{height:60px}.height70[data-v-25a0dbce]{height:70px}.height80[data-v-25a0dbce]{height:80px}.height90[data-v-25a0dbce]{height:90px}.height100p[data-v-25a0dbce]{height:100px}.height110[data-v-25a0dbce]{height:110px}.height120[data-v-25a0dbce]{height:120px}.height150[data-v-25a0dbce]{height:150px}.height180[data-v-25a0dbce]{height:180px}.height30[data-v-25a0dbce]{height:30px;line-height:30px}.height40[data-v-25a0dbce]{height:40px;line-height:40px}.height45l[data-v-25a0dbce]{height:45px;line-height:45px}.heightl60[data-v-25a0dbce]{height:60px;line-height:60px}.height20[data-v-25a0dbce]{height:20px;line-height:20px}.height25[data-v-25a0dbce]{height:25px}.height20p[data-v-25a0dbce]{height:20px}.height50[data-v-25a0dbce]{height:50px;line-height:50px}.height50l[data-v-25a0dbce]{height:50px}\n/* 向上下外间距 */.margle10[data-v-25a0dbce]{margin-left:10px}.mart90[data-v-25a0dbce]{margin-top:90px}.mart80[data-v-25a0dbce]{margin-top:80px}.mart60[data-v-25a0dbce]{margin-top:60px}.mart50[data-v-25a0dbce]{margin-top:50px}.mart40[data-v-25a0dbce]{margin-top:40px}.mart30[data-v-25a0dbce]{margin-top:30px}.mart15[data-v-25a0dbce]{margin-top:15px}.mart20[data-v-25a0dbce]{margin-top:20px}.mart10[data-v-25a0dbce]{margin-top:10px}.mart5[data-v-25a0dbce]{margin-top:5px}.mart1[data-v-25a0dbce]{margin-top:1px}.marb65[data-v-25a0dbce]{margin-bottom:65px}.marb50[data-v-25a0dbce]{margin-bottom:50px}.marb40[data-v-25a0dbce]{margin-bottom:40px}.marb30[data-v-25a0dbce]{margin-bottom:30px}.marb20[data-v-25a0dbce]{margin-bottom:20px}.marb15[data-v-25a0dbce]{margin-bottom:15px}.marb10[data-v-25a0dbce]{margin-bottom:10px}.marb5[data-v-25a0dbce]{margin-bottom:5px}\n/* 向上下内间距 */.paddtop5[data-v-25a0dbce]{padding-top:5px}.paddtop10[data-v-25a0dbce]{padding-top:10px}.paading10[data-v-25a0dbce]{padding:10px}.paading20[data-v-25a0dbce]{padding:20px}.paddtop13[data-v-25a0dbce]{padding-top:13px}.paddtop15[data-v-25a0dbce]{padding-top:15px}.paddtop20[data-v-25a0dbce]{padding-top:20px}.paddtop25[data-v-25a0dbce]{padding-top:25px}.paddleft5[data-v-25a0dbce]{padding-left:5px}.paddleft10[data-v-25a0dbce]{padding-left:10px}.padleft15[data-v-25a0dbce]{padding-left:15px}.paddtright5[data-v-25a0dbce]{padding-right:5px}.paddtright10[data-v-25a0dbce]{padding-right:10px}.paddbotm5[data-v-25a0dbce]{padding-bottom:5px}.paddbotm10[data-v-25a0dbce]{padding-bottom:10px}\n/* 左悬浮 */.flleft[data-v-25a0dbce]{float:left}\n/* 右悬浮 */.flright[data-v-25a0dbce]{float:right}\n/**\n * 圆角\n */.border-r[data-v-25a0dbce]{border-radius:5px}.borderdot[data-v-25a0dbce]{border:1px dotted #999}\n/* button样式 */.btnw70[data-v-25a0dbce]{width:70%;color:#fff;margin-top:40px;background-color:#089bf5;border-radius:6px}.btnw50[data-v-25a0dbce]{width:50%;margin-left:25%;height:45px;line-height:45px;color:#fff;text-align:center;margin-top:40px;background-color:#0083f5;border-radius:6px}.btn92[data-v-25a0dbce]{width:92%;margin-left:4%;height:45px;line-height:45px;color:#fff;background-color:#089bf5;border-radius:22px;text-align:center;font-size:18px;font-weight:700}\n/* 下滑线 */.line1[data-v-25a0dbce]{height:1px;background-color:#f4f4f4}.line2[data-v-25a0dbce]{height:2px;background-color:#f4f4f4}.line10[data-v-25a0dbce]{height:10px;background-color:#f4f4f4}.line1089[data-v-25a0dbce]{height:10px;background-color:#089bf5}\n/* 展示样式 */.displ[data-v-25a0dbce]{display:inline-block}.aliitem[data-v-25a0dbce]{align-items:center;display:flex}.alijun[data-v-25a0dbce]{justify-content:flex-end;display:flex}.alijusstart[data-v-25a0dbce]{justify-content:flex-start;align-items:center;display:flex}.alijusend[data-v-25a0dbce]{justify-content:flex-end;align-items:center;display:flex}.alicntend[data-v-25a0dbce]{justify-content:end;align-items:center;display:flex}.alijus[data-v-25a0dbce]{justify-content:center;align-items:center;display:flex}.iconw[data-v-25a0dbce]{width:15px}.iconw25[data-v-25a0dbce]{width:25px}.iconw40[data-v-25a0dbce]{width:40px}.btn[data-v-25a0dbce]{color:#fff;background-color:#0083f5;width:90%;margin-left:5%;margin-top:%?80?%;margin-bottom:%?50?%;height:%?90?%;display:flex;justify-content:center;align-items:center;border-radius:%?10?%;font-size:%?40?%}.titlename[data-v-25a0dbce]{width:calc(100% - %?90?%);height:%?100?%;display:flex;align-items:center;background-color:hsla(0,0%,100%,.1);padding:0 %?45?%}.username[data-v-25a0dbce]{width:calc(100% - %?90?%);height:%?100?%;display:flex;align-items:center;background-color:hsla(0,0%,100%,.1);border-bottom:1px solid #f6f6f6;padding:%?8?% %?45?%}.username uni-input[data-v-25a0dbce]{width:50%;height:%?50?%;font-size:16px;color:#333;font-weight:blod}.username .get-code[data-v-25a0dbce]{position:absolute;display:flex;align-items:center;justify-content:center;right:7px;z-index:3;border:1px solid #bfbfbf;width:25%;padding:3px 5px;border-radius:22px}.username .get-code[data-v-25a0dbce]:after{content:" ";width:%?1?%;height:%?50?%;position:absolute;z-index:3;margin-right:100%;left:0;top:%?20?%}.username .namecont[data-v-25a0dbce]{color:#666;width:28%}.storename[data-v-25a0dbce]{width:calc(100% - %?40?%);height:%?100?%;display:flex;align-items:center;background-color:hsla(0,0%,100%,.1);border-bottom:1px solid #f6f6f6;padding:%?8?% %?20?%}.storename .namecont[data-v-25a0dbce]{color:#666;width:25%}.notes[data-v-25a0dbce]{width:calc(100% - %?90?%);display:flex;align-items:center;background-color:hsla(0,0%,100%,.1);border-bottom:1px solid #f6f6f6;padding:%?20?% %?45?%;color:#bfbfbf}',""]),t.exports=a},"8d7b":function(t,a,e){"use strict";e.r(a);var i=e("d788"),n=e.n(i);for(var d in i)"default"!==d&&function(t){e.d(a,t,(function(){return i[t]}))}(d);a["default"]=n.a},d788:function(t,a,e){"use strict";var i=e("4ea4");e("99af"),e("d81d"),e("ac1f"),e("1276"),Object.defineProperty(a,"__esModule",{value:!0}),a.default=void 0;var n=e("cf43"),d=i(e("4d97")),o=getApp(),s={components:{pickRegions:d.default},data:function(){return{reqUrl:o.globalData.url,imgsUrl:o.globalData.imgUrl,businessLicenselist:[],businimg:"",companyname:"",businnum:"",regaddress:"",industrycategory:"",inducateid:"",detailsaddress:"",timetype:"1",start_date:"开始时间",end_date:"结束时间",region:[],areaCode:"",defaultRegion:["北京市","市辖区","东城区"],defaultRegionCode:"110101",storeaccount:"",storename:"",storephone:"",storeimg1:"",storeimg2:"",storeimg3:"",userInfo:o.globalData.userInfo}},computed:{startDate:function(){return this.getDate("start")},endDate:function(){return this.getDate("end")},regionName:function(){return this.areaCode=this.region.map((function(t){return t.code}))[2],this.region.map((function(t){return t.name})).join("-")}},methods:{bindDateChange:function(t){this.start_date=t.target.value},bindDateChange2:function(t){this.end_date=t.target.value},getDate:function(t){var a=new Date,e=a.getFullYear(),i=a.getMonth()+1,n=a.getDate();return"start"===t?e-=60:"end"===t&&(e+=2),i=i>9?i:"0"+i,n=n>9?n:"0"+n,"".concat(e,"-").concat(i,"-").concat(n)},handleGetRegion:function(t){this.region=t},perImage:function(t){uni.previewImage({current:0,urls:[t]})},upload:function(t){var a=this;uni.chooseImage({count:1,sizeType:["original","compressed"],sourceType:["album","camera"],success:function(e){var i=e.tempFilePaths;uni.uploadFile({url:a.reqUrl+"/mer/uploadfile?merId="+a.userInfo.mer.id,filePath:i[0],header:{Authorization:o.globalData.token},name:"image",formData:{files:i[0]},success:function(e){1==t&&a.recognizeBusinessLicense(JSON.parse(e.data).return_data[0]),6==t&&(a.storeimg1=JSON.parse(e.data).return_data[0]),7==t&&(a.storeimg2=JSON.parse(e.data).return_data[0]),8==t&&(a.storeimg3=JSON.parse(e.data).return_data[0])}})},error:function(t){console.log(t)}})},onShow:function(){o.globalData.businessid&&(this.industrycategory=o.globalData.businessname,this.inducateid=o.globalData.businessid)},recognizeBusinessLicense:function(t){var a=this;uni.showLoading({title:"识别中..."});var e={url:this.imgsUrl+t};(0,n.recognizeBusinessLicense)(e).then((function(e){if(uni.hideLoading(),"000000"==e.return_code&&e.return_data){a.businimg=t,a.businessLicenselist=JSON.parse(e.return_data.data).data,a.companyname=a.businessLicenselist.companyName,a.detailsaddress=a.businessLicenselist.businessAddress,a.businnum=a.businessLicenselist.creditCode,a.regaddress=a.businessLicenselist.businessAddress,a.start_date=a.businessLicenselist.RegistrationDate;var i=a.businessLicenselist.validPeriod.split("至");"永久"==i[1]&&(a.timetype="2")}else uni.showToast({title:"请上传正确的营业执照",duration:2e3,icon:"none"})}))},showjob:function(){uni.navigateTo({url:"../business-category/business-category"})},configStore:function(){var t=this;t.businimg?t.businnum?t.regaddress?t.start_date?t.end_date?t.companyname?t.inducateid?t.areaCode?t.detailsaddress?t.storeaccount?t.storename?t.storephone?t.storeimg1?t.storeimg2?t.storeimg3?(2==t.timetype&&(t.end_date="长期有效"),uni.showModal({title:"提交门店",content:"确认信息是否正确。",success:function(a){if(a.confirm){uni.showLoading({title:"提交中..."});var e={account:{loginName:t.storeaccount},name:t.storename,telephone:t.storephone,doorHeadImg:t.storeimg1,cashRegisterImg:t.storeimg2,internalImg:t.storeimg3,blisUrl:t.businimg,blisName:t.companyname,blisNo:t.businnum,blisPeriodStart:t.start_date,blisPeriodType:t.timetype,blisPeriodEnd:t.end_date,blisRegAddress:t.regaddress,merId:t.userInfo.mer.id,storeIndustry:{childId:t.inducateid},storeRegion:{areaCode:t.areaCode,address:t.detailsaddress}};(0,n.configStore)(e).then((function(t){uni.hideLoading(),"000000"==t.return_code?uni.showToast({title:"提交成功",icon:"none",duration:2e3,success:function(){setTimeout((function(){uni.navigateBack({})}),1e3)}}):uni.showToast({title:t.return_msg,icon:"none",duration:2e3})}))}else a.cancel&&console.log("用户点击取消")}})):uni.showToast({title:"请上传室内照片",icon:"none",duration:2e3}):uni.showToast({title:"请上传收银台照片",icon:"none",duration:2e3}):uni.showToast({title:"请上传门头照片",icon:"none",duration:2e3}):uni.showToast({title:"请填写门店电话",icon:"none",duration:2e3}):uni.showToast({title:"请填写门店名称",icon:"none",duration:2e3}):uni.showToast({title:"请填写门店账号",icon:"none",duration:2e3}):uni.showToast({title:"请填写详情地址",icon:"none",duration:2e3}):uni.showToast({title:"请选择经营地区",icon:"none",duration:2e3}):uni.showToast({title:"请选择行业类目",icon:"none",duration:2e3}):uni.showToast({title:"请填写公司名称",icon:"none",duration:2e3}):uni.showToast({title:"请填写营业执照结束时间",icon:"none",duration:2e3}):uni.showToast({title:"请填写营业执照开始时间",icon:"none",duration:2e3}):uni.showToast({title:"请填写注册地址",icon:"none",duration:2e3}):uni.showToast({title:"请填写营业执照号",icon:"none",duration:2e3}):uni.showToast({title:"请上传营业执照",icon:"none",duration:2e3})}}};a.default=s},dd3c:function(t,a,e){"use strict";var i;e.d(a,"b",(function(){return n})),e.d(a,"c",(function(){return d})),e.d(a,"a",(function(){return i}));var n=function(){var t=this,a=t.$createElement,i=t._self._c||a;return i("v-uni-view",[i("v-uni-view",{staticClass:"width100 mart10 backcorfff"},[i("v-uni-view",{staticClass:"titlename fcor666"},[t._v("营业执照")]),i("v-uni-view",{staticClass:"width94 displ"},[t.businimg?i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:t.imgsUrl+t.businimg,mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.upload(1)}}}):i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:e("e0a0"),mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.upload(1)}}}),i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:e("12c1"),mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.perImage("../../../static/img/businesslic1.png")}}})],1),i("v-uni-view",{staticClass:"username",staticStyle:{"border-bottom":"0px"}},[i("v-uni-view",{staticClass:"namecont"},[t._v("公司名称")]),i("v-uni-input",{staticStyle:{width:"70%"},attrs:{placeholder:"请输入营业执照上的名称","placeholder-style":"color: #bfbfbf;font-size:14px;padding-top:2px;"},model:{value:t.companyname,callback:function(a){t.companyname=a},expression:"companyname"}})],1),i("v-uni-view",{staticClass:"notes font13",staticStyle:{color:"#eb5823","border-bottom":"1px solid #f6f6f6"}},[i("v-uni-image",{staticClass:"iconw",attrs:{mode:"widthFix",src:e("89f9")}}),t._v("公司名称应与营业执照一致")],1),i("v-uni-view",{staticClass:"username"},[i("v-uni-view",{staticClass:"namecont"},[t._v("营业执照号")]),i("v-uni-input",{staticStyle:{width:"70%"},attrs:{placeholder:"请输入营业执照号","placeholder-style":"color: #bfbfbf;font-size:14px;padding-top:2px;"},model:{value:t.businnum,callback:function(a){t.businnum=a},expression:"businnum"}})],1),i("v-uni-view",{staticClass:"username"},[i("v-uni-view",{staticClass:"namecont"},[t._v("注册地址")]),i("v-uni-input",{staticStyle:{width:"70%"},attrs:{placeholder:"请输入注册地址","placeholder-style":"color: #bfbfbf;font-size:14px;padding-top:2px;"},model:{value:t.regaddress,callback:function(a){t.regaddress=a},expression:"regaddress"}})],1),i("v-uni-view",{staticClass:"username",staticStyle:{"border-bottom":"0px"}},[i("v-uni-view",{staticClass:"namecont"},[t._v("营业期限")]),i("v-uni-view",{staticClass:"width30 aliitem",on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.timetype="1"}}},[i("v-uni-radio",{staticClass:"checbox",attrs:{checked:"1"==t.timetype,color:"#0083f5"}}),t._v("选择时间")],1),i("v-uni-view",{staticClass:"width30 aliitem",on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.timetype="2"}}},[i("v-uni-radio",{staticClass:"checbox",attrs:{checked:"2"==t.timetype,color:"#0083f5"}}),t._v("长期有效")],1)],1),i("v-uni-view",{staticClass:"username width80"},[i("v-uni-picker",{staticClass:"width40 fotct",attrs:{mode:"date",value:t.start_date,start:t.startDate,end:t.endDate},on:{change:function(a){arguments[0]=a=t.$handleEvent(a),t.bindDateChange.apply(void 0,arguments)}}},[i("v-uni-view",{staticClass:"date"},[t._v(t._s(t.start_date))])],1),i("v-uni-view",{staticClass:"width10 fotct"},[t._v("至")]),"1"==t.timetype?i("v-uni-picker",{staticClass:"width40 fotct",attrs:{mode:"date",value:t.end_date,start:t.startDate,end:t.endDate},on:{change:function(a){arguments[0]=a=t.$handleEvent(a),t.bindDateChange2.apply(void 0,arguments)}}},[i("v-uni-view",{staticClass:"date"},[t._v(t._s(t.end_date))])],1):t._e(),"2"==t.timetype?i("v-uni-view",{staticClass:"width40 fotct fcor999"},[t._v("长期有效")]):t._e()],1),i("v-uni-view",{staticClass:"username"},[i("v-uni-view",{staticClass:"namecont"},[t._v("行业类目")]),i("v-uni-input",{staticStyle:{width:"70%"},attrs:{placeholder:"请选择类目",disabled:"true","placeholder-style":"color: #bfbfbf;font-size:14px;padding-top:2px;"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.showjob()}},model:{value:t.industrycategory,callback:function(a){t.industrycategory=a},expression:"industrycategory"}}),i("v-uni-image",{staticClass:"iconw",attrs:{src:e("f208"),mode:"widthFix"}})],1),i("v-uni-view",{staticClass:"username"},[i("v-uni-view",{staticClass:"namecont"},[t._v("经营地区")]),i("pickRegions",{staticClass:"width70",attrs:{defaultRegion:t.defaultRegionCode},on:{getRegion:function(a){arguments[0]=a=t.$handleEvent(a),t.handleGetRegion.apply(void 0,arguments)}}},[t.regionName?i("v-uni-view",{staticStyle:{color:"#333333","font-size":"14px","padding-top":"2px"}},[t._v(t._s(t.regionName))]):i("v-uni-view",{staticStyle:{color:"#bfbfbf","font-size":"14px","padding-top":"2px"}},[t._v("请选择经营地区")])],1),i("v-uni-image",{staticClass:"iconw",attrs:{src:e("f208"),mode:"widthFix"}})],1),i("v-uni-view",{staticClass:"username"},[i("v-uni-view",{staticClass:"namecont"},[t._v("详情地址")]),i("v-uni-input",{staticStyle:{width:"70%"},attrs:{placeholder:"请精确到XX路XX号","placeholder-style":"color: #bfbfbf;font-size:14px;padding-top:2px;"},model:{value:t.detailsaddress,callback:function(a){t.detailsaddress=a},expression:"detailsaddress"}})],1),i("v-uni-view",{staticClass:"username"},[i("v-uni-view",{staticClass:"namecont"},[t._v("门店账号")]),i("v-uni-input",{staticStyle:{width:"70%"},attrs:{placeholder:"请输入门店账号","placeholder-style":"color: #bfbfbf;font-size:14px;padding-top:2px;"},model:{value:t.storeaccount,callback:function(a){t.storeaccount=a},expression:"storeaccount"}})],1),i("v-uni-view",{staticClass:"username"},[i("v-uni-view",{staticClass:"namecont"},[t._v("门店名称")]),i("v-uni-input",{staticStyle:{width:"70%"},attrs:{placeholder:"请输入门店名称","placeholder-style":"color: #bfbfbf;font-size:14px;padding-top:2px;"},model:{value:t.storename,callback:function(a){t.storename=a},expression:"storename"}})],1),i("v-uni-view",{staticClass:"username"},[i("v-uni-view",{staticClass:"namecont"},[t._v("门店电话")]),i("v-uni-input",{staticStyle:{width:"70%"},attrs:{placeholder:"请输入门店电话","placeholder-style":"color: #bfbfbf;font-size:14px;padding-top:2px;"},model:{value:t.storephone,callback:function(a){t.storephone=a},expression:"storephone"}})],1),i("v-uni-view",{staticClass:"notes font16",staticStyle:{"border-bottom":"0px"}},[i("v-uni-view",{staticClass:"width70 aliitem fcor666"},[t._v("门店照片")])],1),i("v-uni-view",{staticClass:"width94 displ mart5"},[t.storeimg1?i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:t.imgsUrl+t.storeimg1,mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.upload(6)}}}):i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:e("9340"),mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.upload(6)}}}),i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:e("f73c"),mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.perImage("../../../static/img/store/store2.png")}}})],1),i("v-uni-view",{staticClass:"width94 displ mart5"},[t.storeimg2?i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:t.imgsUrl+t.storeimg2,mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.upload(7)}}}):i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:e("204f"),mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.upload(7)}}}),i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:e("3870"),mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.perImage("../../../static/img/store/store4.png")}}})],1),i("v-uni-view",{staticClass:"width94 displ mart5 marb15"},[t.storeimg3?i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:t.imgsUrl+t.storeimg3,mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.upload(8)}}}):i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:e("9a4d"),mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.upload(8)}}}),i("v-uni-image",{staticClass:"width45",staticStyle:{"margin-left":"3%"},attrs:{src:e("f05d"),mode:"widthFix"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.perImage("../../../static/img/store/store6.png")}}})],1)],1),i("v-uni-view",{staticClass:"btn",on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.configStore.apply(void 0,arguments)}}},[t._v("提交")]),i("v-uni-view",{staticClass:"height60"})],1)},d=[]},fb3e:function(t,a,e){"use strict";var i=e("811d"),n=e.n(i);n.a}}]);
\ No newline at end of file
diff --git a/unpackage/dist/build/h5/归档.zip b/unpackage/dist/build/h5/归档.zip
index ed899af..8aab7bd 100644
Binary files a/unpackage/dist/build/h5/归档.zip and b/unpackage/dist/build/h5/归档.zip differ