diff --git a/api/user.js b/api/user.js
index 64d347a..c2d3b9a 100644
--- a/api/user.js
+++ b/api/user.js
@@ -760,4 +760,20 @@ export function registrateRecordDetail(id) {
  */
 export function systemFormData(id) {
 	return request.get(`system/form/info/${id}`, {}, {noAuth: true})
+}
+/**
+ * 查询身份证信息
+ * @param object data
+ * 
+ */
+export function queryIdCard(data) {
+	return request.post('intention/idcard', data, {noAuth: true})
+}
+/**
+ * 查询营业执照信息
+ * @param object data
+ * 
+ */
+export function queryCheck(data) {
+	return request.post('intention/check', data, {noAuth: true})
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 6335667..742346a 100644
--- a/pages.json
+++ b/pages.json
@@ -626,6 +626,12 @@
 						"navigationBarTitleText": "商家入驻"
 					}
 				},
+				{
+					"path": "settled/step3",
+					"style": {
+						"navigationBarTitleText": "商家入驻"
+					}
+				},
 				{
 					"path": "applicationRecord/index",
 					"style": {
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 3bffd00..cccba87 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -16,10 +16,10 @@
 			  	<block>
 			  		<swiper-item :class="{ active: 0 == swiperCur }">
 			  			<view class="slide-navigator">
-			  				<view class="item" hover-class='none' @click="jumpAddGoods">
+			  				<!-- <view class="item" hover-class='none' @click="jumpAddGoods">
 			  					<image mode='widthFix' class="image" src="../static/images/product_add.png"></image>
 			  					<text class="text">添加商品</text>
-			  				</view>
+			  				</view> -->
 			  				<navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=1`" hover-class='none'>
 			  				  <image mode='widthFix' class="image" src="../static/images/product_sales.png"></image>
 			  				  <text class="text">在售商品</text>
@@ -36,14 +36,15 @@
 			  				  <image mode='widthFix' class="image" src="../static/images/product_cate.png"></image>
 			  				  <text class="text">店铺分类</text>
 			  				</navigator>		
+							<navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`" hover-class='none'>
+							  <image mode='widthFix' class="image" src="../static/images/product_freight.png"></image>
+							  <text class="text">运费模板</text>
+							</navigator>
 			  			</view>
 					</swiper-item>
 			  		<swiper-item :class="{ active: 1 == swiperCur }">
 			  			<view class="slide-navigator">
-			  				<navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`" hover-class='none'>
-			  				  <image mode='widthFix' class="image" src="../static/images/product_freight.png"></image>
-			  				  <text class="text">运费模板</text>
-			  				</navigator>
+			  				
 			  				<navigator class="item" :url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`" hover-class='none'>
 			  				  <image mode='widthFix' class="image" src="../static/images/product_specification.png"></image>
 			  				  <text class="text">规格模板</text>
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index d5b2c59..21dda96 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -15,9 +15,9 @@
 						<view class='iconfont'>3</view>
 					</view>
 					<view class='navCon acea-row row-between-wrapper'>
-						<view style="margin-left: 20px;" class="on">基本信息</view>
-						<view style="margin-left: 20px;">企业资料文件</view>
-						<view style="margin-left: 10px;">开票及结算信息</view>
+						<view  class="on">基本信息</view>
+						<view >企业资料文件</view>
+						<view >结算信息</view>
 					</view>
 				</view>
 				<!-- <view class="application-record" @click="jumpToList">
@@ -30,13 +30,11 @@
 							<text class="item-name required" >商户名称</text>
 							<input type="text" style="text-align: right;" maxlength="30" placeholder="请输入" v-model="shopInfo.shopName" @input="validateBtn" placeholder-class='placeholder' />
 						</view>
-					</view>
-					<view class="item">
 						<view class="acea-row row-middle">
-							<text class="item-name required">商家对接编号</text>
-							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.shopId" @input="validateBtn" placeholder-class='placeholder' />
+							<text class="tips-text">(需与营业执照企业名称一致)</text>
 						</view>
 					</view>
+					
 					<view class="item">
 						<view class="uni-list">
 							<view class="uni-list-cell">
@@ -78,7 +76,13 @@
 						</view>
 					</view>
 				</view>	
-				<view class='list'>	
+				<view class='list'>
+					<view class="item">
+						<view class="acea-row row-middle">
+							<text class="item-name required">企业名称</text>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.EnterpriseName" @input="validateBtn"  placeholder-class='placeholder' />
+						</view>
+					</view>
 					<view class="item">
 						<view class="uni-list">
 							<view class="uni-list-cell">
@@ -113,14 +117,92 @@
 					</view>
 					<view class="item">
 						<view class="acea-row row-middle">
-							<text class="item-name required">企业邮箱</text>
-							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.EnterpriseEmail" @input="validateBtn" placeholder-class='placeholder' />
+							<text class="item-name required">企业对接人姓名</text>
+							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.EnterpriseJoinName" @input="validateBtn" placeholder-class='placeholder' />
 						</view>
 					</view>
 					<view class="item">
 						<view class="acea-row row-middle">
-							<text class="item-name required">企业对接人姓名</text>
-							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.EnterpriseName" @input="validateBtn" placeholder-class='placeholder' />
+							<text class="item-name required">企业对接人联系电话</text>
+							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.EnterprisePhone" @input="validateBtn" placeholder-class='placeholder' />
+						</view>
+					</view>
+					<view class="item">
+						<view class="acea-row row-middle">
+							<text class="item-name required">企业对接人编号</text>
+							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.EnterpriseId" @input="validateBtn" placeholder-class='placeholder' />
+						</view>
+					</view>
+					<!-- <view class="item">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name required">对接人企业授权</text>
+									<view class="down-style">
+										<text class="iconfont icon-tan"></text>
+										下载模版
+									</view>
+									<view style="font-size: 12px;">
+										{{shopInfo.EnterpriseRooter.length}}/1
+									</view>
+								</view>
+								<view class="acea-row row-middle" style="justify-content: flex-start;">
+									<view class='pictrue' v-for="(item,index) in shopInfo.EnterpriseRooter" :key="index" :data-index="index" @click="getPhotoClickIdx(item,index)">
+										<image :src='item'></image>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(shopInfo.EnterpriseRooter,index)'></text>
+									</view>
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.EnterpriseRooter)' v-if="shopInfo.EnterpriseRooter.length < 1">
+										<text class='iconfont icon-icon25201' style="top: 25px;left: 25px;"></text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view> -->
+					<view class="item">
+						<view class="acea-row row-middle">
+							<text class="item-name required">发起人姓名</text>
+							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.userName" @input="validateBtn" placeholder-class='placeholder' />
+						</view>
+					</view>
+					<view class="item">
+						<view class="acea-row row-middle">
+							<text class="item-name required">发起人联系电话</text>
+							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.userPhone" @input="validateBtn" placeholder-class='placeholder' />
+						</view>
+					</view>
+					<view class="item">
+						<view class="acea-row row-middle">
+							<text class="item-name required">发起人编号</text>
+							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.userId" @input="validateBtn" placeholder-class='placeholder' />
+						</view>
+					</view>
+					<view class="item">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name required">发起人手持介绍信照片</text>
+									<view class="down-style" @click="downTemplate">
+										<text class="iconfont icon-tan"></text>
+										下载模版
+									</view>
+									<view class="down-style" @click="perviewTemplate">
+										<text class="iconfont icon-tan"></text>
+										示例模版
+									</view>
+									<view style="font-size: 12px;">
+										{{shopInfo.userPhoto.length}}/1
+									</view>
+								</view>
+								<view class="acea-row row-middle" style="justify-content: flex-start;">
+									<view class='pictrue' v-for="(item,index) in shopInfo.userPhoto" :key="index" :data-index="index" @click="getPhotoClickIdx(shopInfo.userPhoto,index)">
+										<image :src='item'></image>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(shopInfo.userPhoto,index)'></text>
+									</view>
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.userPhoto)' v-if="shopInfo.userPhoto.length < 1">
+										<text class='iconfont icon-icon25201' style="top: 25px;left: 25px;"></text>
+									</view>
+								</view>
+							</view>
 						</view>
 					</view>
 					<view class="item">
@@ -128,7 +210,7 @@
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db acea-row row-middle">
 									<text class="item-name required">店铺类型</text>
-									<text class="iconfont wenhao" @click="getAgreement">?</text>
+									<!-- <text class="iconfont wenhao" @click="getAgreement">?</text> -->
 									<picker @change="changeStore" :value="shopInfo.shopType" :range="storeTypeArr" range-key="type_name">
 										<input style="pointer-events:none;text-align: right;" placeholder="请选择店铺类型" type="text" disabled readonly v-model="shopInfo.shopType">
 										<view class='iconfont icon-jiantou'></view>
@@ -137,30 +219,72 @@
 							</view>
 						</view>
 					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name required">是否退伍军人</text>
-									<radio-group @change="" >
-										<label  class="label" v-for="(itm,idx) in isFalse" :key="idx">
-											<radio style="margin:0 10px;" :value="idx.toString()" :checked="shopInfo.isVeteran==idx">{{itm}}</radio>
-										</label>
-									</radio-group>
-								</view>
-							</view>
-						</view>
-					</view>
+					
 					<view class="item">
 						<view class="uni-list">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db acea-row row-middle">
 									<text class="item-name required">是否惠美乡村店铺</text>
-									<radio-group @change="" >
-										<label  class="label" v-for="(itm,idx) in isFalse" :key="idx">
-											<radio style="margin:0 10px;" :value="idx.toString()" :checked="shopInfo.isFlagshipStore==idx">{{itm}}</radio>
-										</label>
-									</radio-group>
+									<switch :checked="shopInfo.isVeteran"  style="transform:scale(0.6)" @change="viteran" />
+								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text" style="color: #0ca6cb;">如果为惠美乡村店铺需上传惠美乡村红头文件</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="item" v-show="shopInfo.isVeteran">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name required">惠美乡村红头文件</text>
+									<view style="font-size: 12px;">
+										{{pics.length}}/1
+									</view>
+								</view>
+								<view class="acea-row row-middle" style="justify-content: flex-start;">
+									<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index" @click="getPhotoClickIdx(item,index)">
+										<image :src='item'></image>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
+									</view>
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic' v-if="pics.length < 1">
+										<text class='iconfont icon-icon25201' style="top: 25px;left: 25px;"></text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					
+					<view class="item">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name required">是否退伍军人</text>
+									<switch :checked="shopInfo.isFlagshipStore"  style="transform:scale(0.6)" @change="flagShipStore" />
+								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text" style="color: #0ca6cb;">如果为退伍军人则需要上传证件照</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="item" v-show="shopInfo.isFlagshipStore">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name required">退伍军人证件照</text>
+									<view style="font-size: 12px;">
+										{{pics.length}}/1
+									</view>
+								</view>
+								<view class="acea-row row-middle" style="justify-content: flex-start;">
+									<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index" @click="getPhotoClickIdx(item,index)">
+										<image :src='item'></image>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
+									</view>
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic' v-if="pics.length < 1">
+										<text class='iconfont icon-icon25201' style="top: 25px;left: 25px;"></text>
+									</view>
 								</view>
 							</view>
 						</view>
@@ -189,22 +313,9 @@
 </template>
 <script>
 	 import areaWindow from '@/components/areaWindow';
-	import {
-		create,
-		verify,
-		merClassifly,
-		getGoodsDetails,
-		updateGoodsRecord,
-		getStoreTypeApi
-	} from '@/api/store.js';
-	import {
-		getCaptcha,
-		getAgreementApi
-	} from "@/api/user";
 	import { mapGetters } from "vuex";
 	import parser from "@/components/jyf-parser/jyf-parser";
 	import { toLogin } from '@/libs/login.js';
-	import { HTTP_REQUEST_URL } from '@/config/app';
 	const app = getApp();
 	export default {
 		components: {
@@ -223,22 +334,36 @@
 					registerAddressDetail:'',
 					businessAddress:'',
 					businessAddressDetail:'',
+					
 					EnterpriseIndustry:'',
 					EnterpriseType:'',
 					EnterpriseServicePhone:'',
-					EnterpriseEmail:'',
 					EnterpriseName:'',
+					EnterpriseJoinName:'',
+					EnterprisePhone:'',
+					EnterpriseId:'',
+					EnterpriseRooter:[],
+					
+					userName:'',
+					userPhone:'',
+					userId:'',
+					userPhoto:[],
+					
+					
 					shopType:'',
-					isVeteran:0,
-					isFlagshipStore:0,
+					isVeteran:false,
+					isVeteranPhoto:[],
+					isFlagshipStore:false,
+					isFlagshipStorePhoto:[],
 				},
 				cityArray:[],
 				businessArray:['制造业','农业','金融业','计算机业','其他'],
-				enterpriseArray:['国企','民营企业','外企','其他'],
-				storeTypeArr: ['旗舰店','自营店','进口店'],
+				enterpriseArray:['生产型','销售型'],
+				storeTypeArr: ['旗舰店','非旗舰店'],
 				successful: false,
 				isType: false,
 				showProtocol: false,
+				pics:[],
 			};
 		},
 		onLoad(options) {
@@ -297,10 +422,9 @@
 					EnterpriseIndustry,
 					EnterpriseType,
 					EnterpriseServicePhone,
-					EnterpriseEmail,
 					EnterpriseName,
 					shopType}=this.shopInfo;
-				if(shopName&&shopId&&registerAddress&&registerAddressDetail&&businessAddress&&businessAddressDetail&&EnterpriseIndustry&&EnterpriseType&&EnterpriseServicePhone&&EnterpriseEmail&&EnterpriseName&&shopType){
+				if(shopName&&shopId&&registerAddress&&registerAddressDetail&&businessAddress&&businessAddressDetail&&EnterpriseIndustry&&EnterpriseType&&EnterpriseServicePhone&&EnterpriseName&&shopType){
 					this.validate=true;
 				}
 			},
@@ -320,6 +444,72 @@
 				uni.navigateTo({
 					url:'/pages/store/settled/step2'
 				})
+			},
+			viteran(e){
+				// console.log('e: ',e);
+				this.shopInfo.isVeteran=e.detail.value;
+			},
+			flagShipStore(e){
+				this.shopInfo.isFlagshipStore=e.detail.value;
+			},
+			/**
+			 * 上传文件
+			 *
+			 */
+			uploadpic: function(item) {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					item.push(res.data.path);
+					// that.$set(that, 'pics', that.pics);
+				});
+			},
+			/**
+			 * 删除图片
+			 *
+			 */
+			DelPic: function(item,index) {
+				let that = this,
+					pic = item[index];
+				item.splice(index, 1);
+				// that.$set(that, 'pics', that.pics);
+			},
+			// 图片预览
+			// 获得相册 idx
+			getPhotoClickIdx(item,index) {
+				let _this = this;
+				let idx = index;
+				_this.imgPreview(item, idx);
+			},
+			// 图片预览
+			imgPreview: function(list, idx) {
+				// list：图片 url 数组
+				if (list && list.length > 0) {
+					uni.previewImage({
+						current: list[idx], //  传 Number H5端出现不兼容
+						urls: list
+					});
+				}
+			},
+			downTemplate(){
+				
+				uni.showModal({
+					title:'是否下载示例模版',
+					success(res) {
+						if (res.confirm) {
+							location.href='https://plus.hwms.shop/uploads/file/letter_introduction.docx'
+						} else if (res.cancel) {
+							return
+						}
+					}
+				})
+				
+			},
+			perviewTemplate(){
+				let url=['https://plus.hwms.shop/uploads/file/mer_template.jpg'];
+				uni.previewImage({
+					current: url[0], //  传 Number H5端出现不兼容
+					urls: url
+				});
 			}
 		}
 	}
@@ -348,7 +538,7 @@
 		color: #B2B2B2;
 	}
 	.item-name{
-		width: 240rpx;
+		width: 340rpx;
 	}
 	.uni-list-cell {
 		position: relative;
@@ -380,7 +570,7 @@
 		padding: 25rpx 0;
 	}
 	.merchantsSettled  .nav .navCon {
-		padding: 0 50rpx;
+		padding: 0 86rpx;
 		text-align: center;
 		view{
 			text-align: center;
@@ -480,6 +670,11 @@
 	.upload {
 		margin-top: 20rpx;
 	}
+	.acea-row .tips-text{
+		color: #e40000;
+		font-size:20rpx;
+		padding: 12rpx 12rpx 0 12rpx;
+	}
 	.acea-row.row-middle {
 		-webkit-box-align: center;
 		-moz-box-align: center;
@@ -491,6 +686,17 @@
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
+		flex: 1;
+		input{
+			flex: 1;
+		}
+		picker{
+			flex: 1;
+		}
+	}
+	.row-middle .down-style{
+		color: #00aaff;
+		font-size: 20rpx;
 	}
 	.acea-row.row-column {
 		-webkit-box-orient: vertical;
diff --git a/pages/store/settled/step2.vue b/pages/store/settled/step2.vue
index 34dd942..270e36a 100644
--- a/pages/store/settled/step2.vue
+++ b/pages/store/settled/step2.vue
@@ -15,9 +15,9 @@
 						<view class='iconfont'>3</view>
 					</view>
 					<view class='navCon acea-row row-between-wrapper'>
-						<view style="margin-left: 20px;" class="on">基本信息</view>
-						<view style="margin-left: 20px;">企业资料文件</view>
-						<view style="margin-left: 10px;">开票及结算信息</view>
+						<view class="on">基本信息</view>
+						<view >企业资料文件</view>
+						<view >结算信息</view>
 					</view>
 				</view>
 				<!-- <view class="application-record" @click="jumpToList">
@@ -25,19 +25,51 @@
 					<text class="iconfont icon-xiangyou"></text>
 				</view> -->
 				<view class='list'>
+					<view class="item">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name required">身份证正反面上传</text>
+									<view class="">
+										{{pics.length}}/2
+									</view>
+								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text" style="color: #0ca6cb;">提示：上传完该项,下面几项会自动填写</text>
+								</view>
+								<view class="acea-row row-middle" style="justify-content: flex-start;">
+									<view class='pictrue' v-for="(item,index) in shopInfo.idCardPhoto" :key="index" :data-index="index" @click="getPhotoClickIdx(shopInfo.idCardPhoto,index)">
+										<image :src='item'></image>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(shopInfo.idCardPhoto,index)'></text>
+									</view>
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.idCardPhoto)' v-if="shopInfo.idCardPhoto.length < 1">
+										<text class='iconfont icon-icon25201' style="left: 25px;top: 10px;"></text>
+										<view>身份证正面</view>
+									</view>
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.idCardPhoto)' v-else-if="shopInfo.idCardPhoto.length <2">
+										<text class='iconfont icon-icon25201' style="left: 25px;top: 10px;"></text>
+										<view>身份证反面</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
 					<view class="item">
 						<view class="acea-row row-middle">
 							<text class="item-name required" >法人名称</text>
-							<input type="text" style="text-align: right;" maxlength="30" placeholder="请输入" v-model="shopInfo.shopName" @input="validateBtn" placeholder-class='placeholder' />
+							<input type="text" style="text-align: right;flex:1;" maxlength="30" placeholder="请输入" v-model="shopInfo.idCardName" @input="validateBtn" placeholder-class='placeholder' />
 						</view>
 						<view class="acea-row row-middle">
-							<text class="tips-text" >法人名称</text>
+							<text class="tips-text" >提示：请核验信息是否正确</text>
 						</view>
 					</view>
 					<view class="item">
 						<view class="acea-row row-middle">
 							<text class="item-name required">法人身份证号</text>
-							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.shopId" @input="validateBtn" placeholder-class='placeholder' />
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.idCardNumber" @input="validateBtn" placeholder-class='placeholder' />
+						</view>
+						<view class="acea-row row-middle">
+							<text class="tips-text" >提示：请核验信息是否正确</text>
 						</view>
 					</view>
 					<view class="item">
@@ -47,9 +79,12 @@
 									<text class="item-name required">法人身份证有效期开始</text>
 									<view class="acea-row row-middle">
 										
-										<input style="pointer-events:none;text-align: right;" placeholder="请选择" type="text" readonly  v-model="shopInfo.registerAddress">
+										<input style="text-align: right;" placeholder="请输入" type="text"   v-model="shopInfo.idCardStartTime">
 									</view>
 								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text" >请检查格式是否为：20190101</text>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -60,9 +95,12 @@
 									<text class="item-name required">法人身份证有效期结束</text>
 									<view class="acea-row row-middle" >
 										
-										<input style="pointer-events:none;text-align: right;" placeholder="请选择" type="text" readonly  v-model="shopInfo.businessAddress">
+										<input style="text-align: right;" placeholder="请输入" type="text"   v-model="shopInfo.idCardEndTime">
 									</view>
 								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text" >请检查格式是否为：20190101</text>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -72,88 +110,60 @@
 						<view class="uni-list">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name required">企业行业</text>
-									<picker @change="changeBusiness" :value="shopInfo.EnterpriseIndustry" :range="businessArray" range-key="category_name">
-										<input style="pointer-events:none;text-align: right;" placeholder="请选择" type="text" readonly disabled v-model="shopInfo.EnterpriseIndustry">
-										<view class='iconfont icon-jiantou'></view>
-									</picker>
+									<text class="item-name required">营业执照</text>
+									<view class="">
+										{{pics.length}}/1
+									</view>
+								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text" style="color: #0ca6cb;">提示：上传完该项,下面几项会自动填写</text>
+								</view>
+								<view class="acea-row row-middle" style="justify-content: flex-start;">
+									<view class='pictrue' v-for="(item,index) in shopInfo.businessLicense" :key="index" :data-index="index" @click="getPhotoClickIdx(shopInfo.businessLicense,index)">
+										<image :src='item'></image>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(shopInfo.businessLicense,index)'></text>
+									</view>
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.businessLicense)' v-if="pics.length < 1">
+										<text class='iconfont icon-icon25201' style="left: 25px;top: 25px;"></text>
+										<!-- <view>上传图片</view> -->
+									</view>
 								</view>
 							</view>
 						</view>
 					</view>
+					
 					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name required">企业类型</text>
-									<picker @change="changeEnterprise" :value="shopInfo.EnterpriseType" :range="enterpriseArray" range-key="category_name">
-										<input style="pointer-events:none;text-align: right;" placeholder="请选择" type="text" readonly disabled v-model="shopInfo.EnterpriseType">
-										<view class='iconfont icon-jiantou'></view>
-									</picker>
-								</view>
-							</view>
+						<view class="acea-row row-middle">
+							<text class="item-name required">统一社会信用码</text>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.countId" @input="validateBtn"  placeholder-class='placeholder' />
 						</view>
 					</view>
 					<view class="item">
 						<view class="acea-row row-middle">
-							<text class="item-name required">企业客服电话</text>
-							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.EnterpriseServicePhone" @input="validateBtn" placeholder-class='placeholder' />
+							<text class="item-name required">统一社会信用证开始日期</text>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.countStartTime" @input="validateBtn"  placeholder-class='placeholder' />
+						</view>
+						<view class="acea-row row-middle">
+							<text class="tips-text" >请检查格式是否为：x年x月x日</text>
 						</view>
 					</view>
 					<view class="item">
 						<view class="acea-row row-middle">
-							<text class="item-name required">企业邮箱</text>
-							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.EnterpriseEmail" @input="validateBtn" placeholder-class='placeholder' />
+							<text class="item-name required">统一社会信用证截止日期</text>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.countEndTime" @input="validateBtn"  placeholder-class='placeholder' />
+						</view>
+						<view class="acea-row row-middle">
+							<text class="tips-text" >请检查格式是否为：x年x月x日</text>
 						</view>
 					</view>
+					
 					<view class="item">
 						<view class="acea-row row-middle">
-							<text class="item-name required">企业对接人姓名</text>
-							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.EnterpriseName" @input="validateBtn" placeholder-class='placeholder' />
-						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name required">店铺类型</text>
-									<text class="iconfont wenhao" @click="getAgreement">?</text>
-									<picker @change="changeStore" :value="shopInfo.shopType" :range="storeTypeArr" range-key="type_name">
-										<input style="pointer-events:none;text-align: right;" placeholder="请选择店铺类型" type="text" disabled readonly v-model="shopInfo.shopType">
-										<view class='iconfont icon-jiantou'></view>
-									</picker>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name required">是否退伍军人</text>
-									<radio-group @change="" >
-										<label  class="label" v-for="(itm,idx) in isFalse" :key="idx">
-											<radio style="margin:0 10px;" :value="idx.toString()" :checked="shopInfo.isVeteran==idx">{{itm}}</radio>
-										</label>
-									</radio-group>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="item">
-						<view class="uni-list">
-							<view class="uni-list-cell">
-								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name required">是否惠美乡村店铺</text>
-									<radio-group @change="" >
-										<label  class="label" v-for="(itm,idx) in isFalse" :key="idx">
-											<radio style="margin:0 10px;" :value="idx.toString()" :checked="shopInfo.isFlagshipStore==idx">{{itm}}</radio>
-										</label>
-									</radio-group>
-								</view>
-							</view>
+							<text class="item-name required">经营范围</text>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.businessScope" @input="validateBtn"  placeholder-class='placeholder' />
 						</view>
 					</view>
+					
 					<button class='submitBtn' :disabled="!validate" :class="validate === true ? 'on':''" @click="nextStep">下一步</button>
 				</view>
 			</view>
@@ -178,22 +188,10 @@
 </template>
 <script>
 	 import areaWindow from '@/components/areaWindow';
-	import {
-		create,
-		verify,
-		merClassifly,
-		getGoodsDetails,
-		updateGoodsRecord,
-		getStoreTypeApi
-	} from '@/api/store.js';
-	import {
-		getCaptcha,
-		getAgreementApi
-	} from "@/api/user";
 	import { mapGetters } from "vuex";
 	import parser from "@/components/jyf-parser/jyf-parser";
 	import { toLogin } from '@/libs/login.js';
-	import { HTTP_REQUEST_URL } from '@/config/app';
+	import {queryIdCard,queryCheck} from '@/api/user.js'
 	const app = getApp();
 	export default {
 		components: {
@@ -201,33 +199,26 @@
 		},
 		data() {
 			return {
-				isFalse:['是','否'],
 				validate: false,
 				display: false,
 				display2: false,
 				shopInfo:{
-					shopName:'',
-					shopId:'',
-					registerAddress:'',
-					registerAddressDetail:'',
-					businessAddress:'',
-					businessAddressDetail:'',
-					EnterpriseIndustry:'',
-					EnterpriseType:'',
-					EnterpriseServicePhone:'',
-					EnterpriseEmail:'',
-					EnterpriseName:'',
-					shopType:'',
-					isVeteran:0,
-					isFlagshipStore:0,
+					idCardPhoto:[],
+					idCardName:'',
+					idCardNumber:'',
+					idCardStartTime:'',
+					idCardEndTime:'',
+					
+					businessLicense:[],
+					countId:'',
+					countStartTime:'',
+					countEndTime:'',
+					businessScope:'',
 				},
-				cityArray:[],
-				businessArray:['制造业','农业','金融业','计算机业','其他'],
-				enterpriseArray:['国企','民营企业','外企','其他'],
-				storeTypeArr: ['旗舰店','自营店','进口店'],
 				successful: false,
 				isType: false,
 				showProtocol: false,
+				pics:[],
 			};
 		},
 		onLoad(options) {
@@ -244,8 +235,48 @@
 				return this.shopInfo.registerAddress.map(v=>v.name).join('/');
 			}
 		},
-		
+		watch:{
+			deep:true,
+			'shopInfo.idCardPhoto':{
+				handler:function(newVal, oldVal){
+					if(newVal.length==1){
+						this.verifyIDcard(0)
+					}else if(newVal.length==2){
+						this.verifyIDcard(1)
+					}
+				}
+			},
+			'shopInfo.businessLicense':{
+				handler:function(newVal, oldVal){
+					this.verifyBusinessLicense();
+				}
+			}
+		},
 		methods: {
+			verifyIDcard(index){
+				let img={image:this.shopInfo.idCardPhoto[index],type:index+2};
+				queryIdCard(img).then((res)=>{
+					if(res.status==200){
+						let i=res.data.result;
+						if(index==0){
+							this.shopInfo.idCardName=i.name;
+							this.shopInfo.idCardNumber=i.number;
+							
+						}else if(index==1){
+							this.shopInfo.idCardStartTime=i.startdate;
+							this.shopInfo.idCardEndTime=i.enddate;
+						}
+					}
+				})
+			},
+			verifyBusinessLicense(){
+				queryCheck({image:this.shopInfo.businessLicense[0]}).then((res)=>{
+					console.log('res: ',res);
+					this.shopInfo.countId=res.data.result.creditno;
+					this.shopInfo.countStartTime=res.data.result.startdate;
+					this.shopInfo.countEndTime=res.data.result.enddate;
+				})
+			},
 			getAgreement() {
 				let that = this
 				that.showProtocol = true;
@@ -277,19 +308,26 @@
 				this.shopInfo.businessAddress = address.map(v=>v.name).join('/');
 			},
 			validateBtn(){
-				let {shopName,
-					shopId,
-					registerAddress,
-					registerAddressDetail,
-					businessAddress,
-					businessAddressDetail,
-					EnterpriseIndustry,
-					EnterpriseType,
-					EnterpriseServicePhone,
-					EnterpriseEmail,
-					EnterpriseName,
-					shopType}=this.shopInfo;
-				if(shopName&&shopId&&registerAddress&&registerAddressDetail&&businessAddress&&businessAddressDetail&&EnterpriseIndustry&&EnterpriseType&&EnterpriseServicePhone&&EnterpriseEmail&&EnterpriseName&&shopType){
+				let {idCardPhoto,
+					idCardName,
+					idCardNumber,
+					idCardStartTime,
+					idCardEndTime,
+					businessLicense,
+					countId,
+					countStartTime,
+					countEndTime,
+					businessScope,}=this.shopInfo;
+				if(idCardPhoto&&
+					idCardName&&
+					idCardNumber&&
+					idCardStartTime&&
+					idCardEndTime&&
+					businessLicense&&
+					countId&&
+					countStartTime&&
+					countEndTime&&
+					businessScope){
 					this.validate=true;
 				}
 			},
@@ -307,9 +345,47 @@
 			},
 			nextStep(){
 				uni.navigateTo({
-					url:'/pages/store/settled/step2'
+					url:'/pages/store/settled/step3'
 				})
-			}
+			},
+			/**
+			 * 上传文件
+			 *
+			 */
+			uploadpic: function(item) {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					item.push(res.data.path);
+					// that.$set(that, 'pics', that.pics);
+				});
+			},
+			/**
+			 * 删除图片
+			 *
+			 */
+			DelPic: function(item,index) {
+				let that = this,
+					pic = item[index];
+				item.splice(index, 1);
+				// that.$set(that, 'pics', that.pics);
+			},
+			// 图片预览
+			// 获得相册 idx
+			getPhotoClickIdx(item,index) {
+				let _this = this;
+				let idx = index;
+				_this.imgPreview(item, idx);
+			},
+			// 图片预览
+			imgPreview: function(list, idx) {
+				// list：图片 url 数组
+				if (list && list.length > 0) {
+					uni.previewImage({
+						current: list[idx], //  传 Number H5端出现不兼容
+						urls: list
+					});
+				}
+			},
 		}
 	}
 </script>
@@ -337,7 +413,7 @@
 		color: #B2B2B2;
 	}
 	.item-name{
-		width: 240rpx;
+		width: 340rpx;
 	}
 	.uni-list-cell {
 		position: relative;
@@ -369,7 +445,7 @@
 		padding: 25rpx 0;
 	}
 	.merchantsSettled  .nav .navCon {
-		padding: 0 50rpx;
+		padding: 0 86rpx;
 		text-align: center;
 		view{
 			text-align: center;
@@ -480,6 +556,7 @@
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
+		flex: 1;
 	}
 	.acea-row .tips-text{
 		color: #e40000;
diff --git a/pages/store/settled/step3.vue b/pages/store/settled/step3.vue
new file mode 100644
index 0000000..b615261
--- /dev/null
+++ b/pages/store/settled/step3.vue
@@ -0,0 +1,877 @@
+<template>
+	<view v-if="!successful" :style="viewColor">
+		<form report-submit='true'>
+			<view class='merchantsSettled'>
+				<!-- <view class="merchantBgCount">
+					<image mode="widthFix" class="merchantBg" :src="domain+'/static/diy/merchantBg'+keyColor+'.jpg'" alt="">
+				</view> -->
+				<view class='nav'>
+					
+					<view class='progress acea-row row-between-wrapper'>
+						<view class='iconfont t-color'></view>
+						<view class='line'></view>
+						<view class='iconfont t-color'></view>
+						<view class='line'></view>
+						<view class='iconfont t-color'></view>
+					</view>
+					<view class='navCon acea-row row-between-wrapper'>
+						<view class="on">基本信息</view>
+						<view >企业资料文件</view>
+						<view >结算信息</view>
+					</view>
+				</view>
+				<!-- <view class="application-record" @click="jumpToList">
+					申请记录
+					<text class="iconfont icon-xiangyou"></text>
+				</view> -->
+				<view class='list'>
+					<view class="item">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name required">身份证正反面上传</text>
+									<view class="">
+										{{pics.length}}/2
+									</view>
+								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text" style="color: #0ca6cb;">提示：上传完该项,下面几项会自动填写</text>
+								</view>
+								<view class="acea-row row-middle" style="justify-content: flex-start;">
+									<view class='pictrue' v-for="(item,index) in shopInfo.idCardPhoto" :key="index" :data-index="index" @click="getPhotoClickIdx(shopInfo.idCardPhoto,index)">
+										<image :src='item'></image>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(shopInfo.idCardPhoto,index)'></text>
+									</view>
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.idCardPhoto)' v-if="shopInfo.idCardPhoto.length < 1">
+										<text class='iconfont icon-icon25201' style="left: 25px;top: 10px;"></text>
+										<view>身份证正面</view>
+									</view>
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.idCardPhoto)' v-else-if="shopInfo.idCardPhoto.length <2">
+										<text class='iconfont icon-icon25201' style="left: 25px;top: 10px;"></text>
+										<view>身份证反面</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="item">
+						<view class="acea-row row-middle">
+							<text class="item-name required" >法人名称</text>
+							<input type="text" style="text-align: right;flex:1;" maxlength="30" placeholder="请输入" v-model="shopInfo.idCardName" @input="validateBtn" placeholder-class='placeholder' />
+						</view>
+						<view class="acea-row row-middle">
+							<text class="tips-text" >提示：请核验信息是否正确</text>
+						</view>
+					</view>
+					<view class="item">
+						<view class="acea-row row-middle">
+							<text class="item-name required">法人身份证号</text>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.idCardNumber" @input="validateBtn" placeholder-class='placeholder' />
+						</view>
+						<view class="acea-row row-middle">
+							<text class="tips-text" >提示：请核验信息是否正确</text>
+						</view>
+					</view>
+					<view class="item">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name required">法人身份证有效期开始</text>
+									<view class="acea-row row-middle">
+										
+										<input style="text-align: right;" placeholder="请输入" type="text"   v-model="shopInfo.idCardStartTime">
+									</view>
+								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text" >请检查格式是否为：20190101</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="item">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name required">法人身份证有效期结束</text>
+									<view class="acea-row row-middle" >
+										
+										<input style="text-align: right;" placeholder="请输入" type="text"   v-model="shopInfo.idCardEndTime">
+									</view>
+								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text" >请检查格式是否为：20190101</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>	
+				<view class='list'>	
+					<view class="item">
+						<view class="uni-list">
+							<view class="uni-list-cell">
+								<view class="uni-list-cell-db acea-row row-middle">
+									<text class="item-name required">营业执照</text>
+									<view class="">
+										{{pics.length}}/1
+									</view>
+								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text" style="color: #0ca6cb;">提示：上传完该项,下面几项会自动填写</text>
+								</view>
+								<view class="acea-row row-middle" style="justify-content: flex-start;">
+									<view class='pictrue' v-for="(item,index) in shopInfo.businessLicense" :key="index" :data-index="index" @click="getPhotoClickIdx(shopInfo.businessLicense,index)">
+										<image :src='item'></image>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(shopInfo.businessLicense,index)'></text>
+									</view>
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.businessLicense)' v-if="pics.length < 1">
+										<text class='iconfont icon-icon25201' style="left: 25px;top: 25px;"></text>
+										<!-- <view>上传图片</view> -->
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					
+					<view class="item">
+						<view class="acea-row row-middle">
+							<text class="item-name required">统一社会信用码</text>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.countId" @input="validateBtn"  placeholder-class='placeholder' />
+						</view>
+					</view>
+					<view class="item">
+						<view class="acea-row row-middle">
+							<text class="item-name required">统一社会信用证开始日期</text>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.countStartTime" @input="validateBtn"  placeholder-class='placeholder' />
+						</view>
+						<view class="acea-row row-middle">
+							<text class="tips-text" >请检查格式是否为：x年x月x日</text>
+						</view>
+					</view>
+					<view class="item">
+						<view class="acea-row row-middle">
+							<text class="item-name required">统一社会信用证截止日期</text>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.countEndTime" @input="validateBtn"  placeholder-class='placeholder' />
+						</view>
+						<view class="acea-row row-middle">
+							<text class="tips-text" >请检查格式是否为：x年x月x日</text>
+						</view>
+					</view>
+					
+					<view class="item">
+						<view class="acea-row row-middle">
+							<text class="item-name required">经营范围</text>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.businessScope" @input="validateBtn"  placeholder-class='placeholder' />
+						</view>
+					</view>
+					
+					<button class='submitBtn' :disabled="!validate" :class="validate === true ? 'on':''" @click="nextStep">下一步</button>
+				</view>
+			</view>
+		</form>
+		
+		<view class="settlementAgreement" v-if="showProtocol">
+			<view class="setAgCount">
+				<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
+				<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
+				<view class="content">
+					<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
+					<!-- <view v-html="protocol"></view> -->
+				</view>
+			</view>
+		</view>
+		
+		<areaWindow ref="areaWindow" :display="display" :address="[]"
+			 @submit="OnChangeAddress" @changeClose="changeClose" :cityShow="1"></areaWindow>
+		 <areaWindow ref="areaWindow2" :display="display2" :address="[]"
+			 @submit="OnChangeAddress2" @changeClose="changeClose2" :cityShow="1"></areaWindow>
+	</view>
+</template>
+<script>
+	 import areaWindow from '@/components/areaWindow';
+	import { mapGetters } from "vuex";
+	import parser from "@/components/jyf-parser/jyf-parser";
+	import { toLogin } from '@/libs/login.js';
+	import {queryIdCard,queryCheck} from '@/api/user.js'
+	const app = getApp();
+	export default {
+		components: {
+			areaWindow,
+		},
+		data() {
+			return {
+				validate: false,
+				display: false,
+				display2: false,
+				shopInfo:{
+					idCardPhoto:[],
+					idCardName:'',
+					idCardNumber:'',
+					idCardStartTime:'',
+					idCardEndTime:'',
+					
+					businessLicense:[],
+					countId:'',
+					countStartTime:'',
+					countEndTime:'',
+					businessScope:'',
+				},
+				successful: false,
+				isType: false,
+				showProtocol: false,
+				pics:[],
+			};
+		},
+		onLoad(options) {
+			if (this.isLogin) {
+				
+			} else {
+				toLogin()
+			}
+		},
+		onShow() {},
+		computed: {
+			...mapGetters(['isLogin','viewColor']),
+			addressText(){
+				return this.shopInfo.registerAddress.map(v=>v.name).join('/');
+			}
+		},
+		watch:{
+			deep:true,
+			'shopInfo.idCardPhoto':{
+				handler:function(newVal, oldVal){
+					if(newVal.length==1){
+						this.verifyIDcard(0)
+					}else if(newVal.length==2){
+						this.verifyIDcard(1)
+					}
+				}
+			},
+			'shopInfo.businessLicense':{
+				handler:function(newVal, oldVal){
+					this.verifyBusinessLicense();
+				}
+			}
+		},
+		methods: {
+			verifyIDcard(index){
+				let img={image:this.shopInfo.idCardPhoto[index],type:index+2};
+				queryIdCard(img).then((res)=>{
+					if(res.status==200){
+						let i=res.data.result;
+						if(index==0){
+							this.shopInfo.idCardName=i.name;
+							this.shopInfo.idCardNumber=i.number;
+							
+						}else if(index==1){
+							this.shopInfo.idCardStartTime=i.startdate;
+							this.shopInfo.idCardEndTime=i.enddate;
+						}
+					}
+				})
+			},
+			verifyBusinessLicense(){
+				queryCheck({image:this.shopInfo.businessLicense[0]}).then((res)=>{
+					console.log('res: ',res);
+					this.shopInfo.countId=res.data.result.creditno;
+					this.shopInfo.countStartTime=res.data.result.startdate;
+					this.shopInfo.countEndTime=res.data.result.enddate;
+				})
+			},
+			getAgreement() {
+				let that = this
+				that.showProtocol = true;
+				that.isType = true
+				getAgreementApi('sys_merchant_type').then(res => {
+					that.protocol = res.data.sys_merchant_type
+				})
+			},
+			changeRegion(){
+				this.display = true;
+			},
+			// 关闭地址弹窗；
+			changeClose() {
+				this.display = false;
+			},
+			changeRegion2(){
+				this.display2 = true;
+			},
+			// 关闭地址弹窗；
+			changeClose2() {
+				this.display2 = false;
+			},
+			OnChangeAddress(address){
+				
+				this.shopInfo.registerAddress = address.map(v=>v.name).join('/');
+			},
+			OnChangeAddress2(address){
+				
+				this.shopInfo.businessAddress = address.map(v=>v.name).join('/');
+			},
+			validateBtn(){
+				let {idCardPhoto,
+					idCardName,
+					idCardNumber,
+					idCardStartTime,
+					idCardEndTime,
+					businessLicense,
+					countId,
+					countStartTime,
+					countEndTime,
+					businessScope,}=this.shopInfo;
+				if(idCardPhoto&&
+					idCardName&&
+					idCardNumber&&
+					idCardStartTime&&
+					idCardEndTime&&
+					businessLicense&&
+					countId&&
+					countStartTime&&
+					countEndTime&&
+					businessScope){
+					this.validate=true;
+				}
+			},
+			changeBusiness(e){
+				this.shopInfo.EnterpriseIndustry=this.businessArray[e.target.value];
+				this.validateBtn();
+			},
+			changeEnterprise(e){
+				this.shopInfo.EnterpriseType=this.enterpriseArray[e.target.value];
+				this.validateBtn();
+			},
+			changeStore(e){
+				this.shopInfo.shopType=this.storeTypeArr[e.target.value];
+				this.validateBtn();
+			},
+			nextStep(){
+				uni.navigateTo({
+					url:'/pages/store/settled/step3'
+				})
+			},
+			/**
+			 * 上传文件
+			 *
+			 */
+			uploadpic: function(item) {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					item.push(res.data.path);
+					// that.$set(that, 'pics', that.pics);
+				});
+			},
+			/**
+			 * 删除图片
+			 *
+			 */
+			DelPic: function(item,index) {
+				let that = this,
+					pic = item[index];
+				item.splice(index, 1);
+				// that.$set(that, 'pics', that.pics);
+			},
+			// 图片预览
+			// 获得相册 idx
+			getPhotoClickIdx(item,index) {
+				let _this = this;
+				let idx = index;
+				_this.imgPreview(item, idx);
+			},
+			// 图片预览
+			imgPreview: function(list, idx) {
+				// list：图片 url 数组
+				if (list && list.length > 0) {
+					uni.previewImage({
+						current: list[idx], //  传 Number H5端出现不兼容
+						urls: list
+					});
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.required{
+		position: relative;
+		display: flex;
+		width: 28rpx;
+		height: 28rpx;
+		&::before{
+			display: block;
+			content: '*';
+			color: red;
+			line-height: 48rpx;
+		}
+	}
+	/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
+	/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+	  border: 1px solid var(--view-theme)!important;
+	  background-color: var(--view-theme)!important;
+	  color: #fff!important;
+	}
+	.uni-input-placeholder {
+		color: #B2B2B2;
+	}
+	.item-name{
+		width: 340rpx;
+	}
+	.uni-list-cell {
+		position: relative;
+		.iconfont {
+			font-size: 14px;
+			color: #7a7a7a;
+			position: absolute;
+			right: -16px;
+			top: 7rpx;
+		}
+		.icon-guanbi2{
+			right: 35px;
+		}
+	}
+	.merchantBgCount{
+		line-height: 0;
+	}
+	.merchantsSettled {
+		// background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+		height: 125vh;
+		display: flex;
+		flex-direction: column;
+		grid-gap: 32rpx;
+	}
+	.merchantsSettled .nav {
+		// background-color: #fff;
+		font-size: 26rpx;
+		color: #282828;
+		padding: 25rpx 0;
+	}
+	.merchantsSettled  .nav .navCon {
+		padding: 0 86rpx;
+		text-align: center;
+		view{
+			text-align: center;
+		}
+	}
+	
+	.merchantsSettled .nav .progress {
+		padding: 0 120rpx;
+		margin-top: 10rpx;
+	}
+	.merchantsSettled .nav .progress .line {
+		width: 160rpx;
+		height:8rpx;
+		background-color: #d1e1fb;
+		border-radius: 4rpx;
+	}
+	.merchantsSettled .nav .progress .iconfont {
+		font-size: 25rpx;
+		color: white;
+		margin-top: -2rpx;
+		width: 36rpx;
+		height: 36rpx;
+		text-align: center;
+		border-radius: 50%;
+		background-color: #5d6371;
+		&.t-color{
+			background-color: #0294f8;
+			width: 24rpx;
+			height: 24rpx;
+			border-radius: 50%;
+			box-shadow:0rpx 0rpx 8rpx 8rpx #b9e1fe;
+		}
+	}
+	
+	.merchantsSettled .merchantBg {
+		width: 750rpx;
+		width: 100%;
+	}
+	.merchantsSettled .list {
+		background-color: #fff;
+		border-radius: 12px;
+		padding-bottom: 22px;
+		margin: 0 15px;
+		// position: absolute;
+		// top: 160rpx;
+		width: calc(100% - 30px);
+		
+	}
+	.application-record {
+		position: absolute;
+		display: flex;
+		align-items: center;
+		top: 162rpx;
+		right: 0;
+		color: #fff;
+		font-size: 22rpx;
+		background-color: rgba(0, 0, 0, 0.3);
+		padding: 8rpx 18rpx;
+		border-radius: 20px 0px 0px 20px;
+	}
+	.merchantsSettled .list .item {
+		padding: 50rpx 0 20rpx;
+		border-bottom: 1px solid #eee;
+		position: relative;
+		margin: 0 20px;
+		&.no-border {
+			border-bottom: none;
+			padding-left: 0;
+			padding-right: 0;
+		}
+		.item-title {
+			color: #666666;
+			font-size: 28rpx;
+			display: block;
+		}
+		.item-desc {
+			color: #B2B2B2;
+			font-size: 22rpx;
+			display: block;
+			margin-top: 9rpx;
+			line-height: 36rpx;
+		}
+	}
+	.acea-row,.upload {
+		display: -webkit-box;
+		display: -moz-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-lines: multiple;
+		-moz-box-lines: multiple;
+		-o-box-lines: multiple;
+		-webkit-flex-wrap: wrap;
+		-ms-flex-wrap: wrap;
+		flex-wrap: wrap;
+	}
+	.upload {
+		margin-top: 20rpx;
+	}
+	.acea-row.row-middle {
+		-webkit-box-align: center;
+		-moz-box-align: center;
+		-o-box-align: center;
+		-ms-flex-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding-left: 2px;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		flex: 1;
+	}
+	.acea-row .tips-text{
+		color: #e40000;
+		font-size:20rpx;
+		padding: 12rpx 12rpx 0 12rpx;
+	}
+	.acea-row.row-column {
+		-webkit-box-orient: vertical;
+		-moz-box-orient: vertical;
+		-o-box-orient: vertical;
+		-webkit-flex-direction: column;
+		-ms-flex-direction: column;
+		flex-direction: column;
+	}
+	.acea-row.row-center-wrapper {
+		-webkit-box-align: center;
+		-moz-box-align: center;
+		-o-box-align: center;
+		-ms-flex-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		-webkit-box-pack: center;
+		-moz-box-pack: center;
+		-o-box-pack: center;
+		-ms-flex-pack: center;
+		-webkit-justify-content: center;
+		justify-content: center;
+	}
+	.merchantsSettled .list .item .pictrue {
+		width: 130rpx;
+		height: 130rpx;
+		margin: 24rpx 22rpx 0 0;
+		position: relative;
+		font-size: 11px;
+		color: #bbb;
+		&:nth-child(4n) {
+			margin-right: 0;
+		}
+		&:nth-last-child(1) {
+			border: 0.5px solid #ddd;
+			box-sizing: border-box;
+		}
+		uni-image,
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 1px;
+			img {
+				-webkit-touch-callout: none;
+				-webkit-user-select: none;
+				-moz-user-select: none;
+				display: block;
+				position: absolute;
+				top: 0;
+				left: 0;
+				opacity: 0;
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.icon-guanbi1 {
+			font-size: 33rpx;
+			position: absolute;
+			top: -10px;
+			right: -10px;
+		}
+	}
+	.uni-list-cell-db{
+		position: relative;
+	}
+	.wenhao{
+		width: 34rpx;
+		height: 34rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 28rpx;
+		border-radius: 50%;
+		background: #E3E3E3;
+		color: #ffffff!important;
+		margin-left: 4rpx;
+		position: absolute;
+		left: 122rpx;
+	}
+	.merchantsSettled .list .item .imageCode {
+		position: absolute;
+		top: 7px;
+		right: 0;
+	}
+	.merchantsSettled .list .item .icon {
+		font-size: 40rpx;
+		color: #b4b1b4;
+	}
+	.merchantsSettled .list .item input {
+		// width: 400rpx;
+		font-size: 30rpx;
+	}
+	.merchantsSettled .list .item .placeholder {
+		color: #b2b2b2;
+	}
+	.merchantsSettled .default {
+		padding: 0 30rpx;
+		height: 90rpx;
+		background-color: #fff;
+		margin-top: 23rpx;
+	}
+	.merchantsSettled .default checkbox {
+		margin-right: 15rpx;
+	}
+	.merchantsSettled .acea-row uni-image {
+		width: 20px;
+		height: 20px;
+		display: block;
+	}
+	.merchantsSettled .list .item .codeIput {
+		width: 125px;
+	}
+	.uni-input-input {
+		display: block;
+		height: 100%;
+		background: none;
+		color: inherit;
+		opacity: 1;
+		-webkit-text-fill-color: currentcolor;
+		font: inherit;
+		line-height: inherit;
+		letter-spacing: inherit;
+		text-align: inherit;
+		text-indent: inherit;
+		text-transform: inherit;
+		text-shadow: inherit;
+	}
+	.merchantsSettled .list .item .code {
+		position: absolute;
+		width: 93px;
+		line-height: 27px;
+		border: 1px solid var(--view-theme);
+		border-radius: 15px;
+		color: var(--view-theme);
+		text-align: center;
+		bottom: 8px;
+		right: 0;
+		font-size: 12px;
+	}
+	.merchantsSettled .list .item .code.on {
+		background-color: #bbb;
+		color: #fff;
+		border-color: #bbb;
+	}
+	.merchantsSettled .submitBtn {
+		width: 588rpx;
+		margin: 0 auto;
+		height: 86rpx;
+		border-radius: 25px;
+		text-align: center;
+		line-height: 86rpx;
+		font-size: 15px;
+		color: #fff;
+		background: #E3E3E3;
+		margin-top: 25px;
+		pointer-events: none;
+	}
+	.merchantsSettled .submitBtn.on {
+		background: var(--view-theme);
+			pointer-events: all;
+	}
+	uni-checkbox-group,
+	.settleAgree {
+		display: inline-block;
+		font-size: 24rpx;
+	}
+	uni-checkbox-group {
+		color: #b2b2b2;
+	}
+	.settleAgree {
+		color: var(--view-theme);
+		position: relative;
+		top: 2px;
+		left: 8px;
+	}
+	.merchantsSettled uni-checkbox .uni-checkbox-wrapper {
+		width: 30rpx;
+		height: 30rpx;
+		border: 2rpx solid #C3C3C3;
+		border-radius: 15px;
+	}
+	.settlementAgreement {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: rgba(0, 0, 0, .5);
+		z-index: 10;
+	}
+	.settlementAgreement .setAgCount {
+		background: #fff;
+		width: 656rpx;
+		height: 458px;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		border-radius: 12rpx;
+		-webkit-border-radius: 12rpx;
+		padding: 52rpx;
+		-webkit-transform: translate(-50%, -50%);
+		-moz-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		overflow: hidden;
+		.content {
+			height: 900rpx;
+			overflow-y: scroll;
+			/deep/ p {
+				font-size: 13px;
+				line-height: 22px;
+			}
+			/deep/ img {
+				max-width: 100%;
+			}
+		}
+	}
+	.settlementAgreement .setAgCount .icon {
+		font-size: 42rpx;
+		color: #b4b1b4;
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
+	}
+	.settlementAgreement .setAgCount .title {
+		color: #333;
+		font-size: 32rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+	.settlementAgreement .setAgCount .content {
+		margin-top: 32rpx;
+		color: #333;
+		font-size: 26rpx;
+		line-height: 22px;
+		text-align: justify;
+		text-justify: distribute-all-lines;
+		height: 756rpx;
+		overflow-y: scroll;
+	}
+	.settledSuccessMain {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #fff;
+	}
+	.settledSuccessful {
+		flex: 1;
+		width: 100%;
+		padding: 0 56px;
+		height: auto;
+		background: #fff;
+		text-align: center;
+	}
+	.settledSuccessful .image {
+		width: 189px;
+		height: 157px;
+		margin-top: 66px;
+	}
+	.settledSuccessful .title {
+		color: #333333;
+		font-size: 16px;
+		font-weight: bold;
+		margin-top: 35px;
+	}
+	.settledSuccessful .info {
+		color: #A0A0A0;
+		font-size: 13px;
+		margin-top: 12px;
+	}
+	.settledSuccessful .goHome {
+		margin: 60px auto 0;
+		line-height: 43px;
+		color: #282828;
+		font-size: 15px;
+		border: 1px solid #B4B4B4;
+		border-radius: 60px;
+	}
+	/deep/ uni-checkbox .uni-checkbox-input {
+		width: 15px;
+		height: 15px;
+		position: relative;
+	}
+	/deep/ uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked:before {
+		font-size: 14px;
+	}
+	.loadingicon {
+		height: 100vh;
+		overflow: hidden;
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
+	.icon-xiangyou {
+		font-size: 22rpx;
+	}
+	// #ifdef MP
+	checkbox-group {
+		display: inline-block;
+	}
+	// #endif
+	.setAgCount{
+		/deep/ table{
+			border:  1px solid #DDD;
+			border-bottom: none;
+			border-right: none;
+		}
+		/deep/ td, th {
+		    padding: 5rpx 10rpx;
+		    border-bottom: 1px solid #DDD;
+			border-right:  1px solid #DDD;
+		}
+	}
+</style>
diff --git a/pages/users/refund/detail.vue b/pages/users/refund/detail.vue
index aaca5db..0ae255d 100644
--- a/pages/users/refund/detail.vue
+++ b/pages/users/refund/detail.vue
@@ -72,7 +72,7 @@
 		</view>
 		<view class="content">
 			<view class="item">
-				<view class="label">订单编号：</view>
+				<view class="label">退单编号：</view>
 				<view class="txt flex">
 					<text>{{detail.refund_order_sn}}</text>
 					<!-- #ifdef H5 -->