diff --git a/api/user.js b/api/user.js
index c2d3b9a..f6ddd45 100644
--- a/api/user.js
+++ b/api/user.js
@@ -776,4 +776,20 @@ export function queryIdCard(data) {
  */
 export function queryCheck(data) {
 	return request.post('intention/check', data, {noAuth: true})
+}
+/**
+ * 查询银行卡信息
+ * @param object data
+ * 
+ */
+export function queryBankCard(data) {
+	return request.post('intention/bank', data, {noAuth: true})
+}
+/**
+ * 查询联行号
+ * @param object data
+ * 
+ */
+export function queryCNAPS(data) {
+	return request.post('intention/interbank', data, {noAuth: true})
 }
\ No newline at end of file
diff --git a/libs/uniApi.js b/libs/uniApi.js
index 3e4f7bd..b8e9cbe 100644
--- a/libs/uniApi.js
+++ b/libs/uniApi.js
@@ -219,9 +219,12 @@ export function throttle(fn, delay) {
 	var delay = delay || 200;
 	return function(...args) {
 		lastArgs = args;
+		console.log('没进来');
 		if(!timer){
+			console.log('进来了');
 			timer = setTimeout(()=>{
 				timer = null;
+				console.log('节----');
 				fn.apply(this, lastArgs);
 			}, delay);
 		}
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 21dda96..6e24984 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -6,7 +6,7 @@
 					<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>
@@ -15,54 +15,84 @@
 						<view class='iconfont'>3</view>
 					</view>
 					<view class='navCon acea-row row-between-wrapper'>
-						<view  class="on">基本信息</view>
-						<view >企业资料文件</view>
-						<view >结算信息</view>
+						<view class="on">基本信息</view>
+						<view>企业资料文件</view>
+						<view>结算信息</view>
 					</view>
 				</view>
-				<!-- <view class="application-record" @click="jumpToList">
+				<view class="application-record" @click="jumpToList">
 					申请记录
 					<text class="iconfont icon-xiangyou"></text>
-				</view> -->
+				</view>
 				<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;" maxlength="30" placeholder="请输入" v-model="shopInfo.shopName" @input="validateBtn" placeholder-class='placeholder' />
+							<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 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>
+									<picker style="text-align: right;" @change="bindPickerChange" :value="shopInfo.mer_classification" :range="array" range-key="category_name">
+										<input style="pointer-events:none" placeholder="请选择商户分类" type="text" readonly disabled v-model="shopInfo.mer_classification">
+										<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>
+									<picker style="text-align: right;" @change="bindPickerChange" :value="shopInfo.mer_storeType" :range="storeTypeArr2" range-key="category_name">
+										<input style="pointer-events:none" placeholder="请选择商户分类" type="text" readonly disabled v-model="shopInfo.mer_storeType">
+										<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>
 									<view class="acea-row row-middle" @click="changeRegion">
-										
-										<input style="pointer-events:none;text-align: right;" placeholder="请选择" type="text" readonly disabled v-model="shopInfo.registerAddress">
+
+										<input style="pointer-events:none;text-align: right;" placeholder="请选择"
+											type="text" readonly disabled v-model="shopInfo.registerAddress">
 										<view class='iconfont icon-jiantou'></view>
 									</view>
 								</view>
 							</view>
 						</view>
-					</view>
-					<view class="item">
+					</view> -->
+					<!-- <view class="item">
 						<view class="acea-row row-middle">
 							<text class="item-name"></text>
-							<input type="text" style="text-align: right;" placeholder="请输入详细地址" v-model="shopInfo.registerAddressDetail" @input="validateBtn" placeholder-class='placeholder' />
+							<input type="text" style="text-align: right;" placeholder="请输入详细地址"
+								v-model="shopInfo.registerAddressDetail" @input="validateBtn"
+								placeholder-class='placeholder' />
 						</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" @click="changeRegion2">
-										
-										<input style="pointer-events:none;text-align: right;" placeholder="请选择" type="text" readonly disabled v-model="shopInfo.businessAddress">
+
+										<input style="pointer-events:none;text-align: right;" placeholder="请选择"
+											type="text" readonly disabled v-model="shopInfo.businessAddress">
 										<view class='iconfont icon-jiantou'></view>
 									</view>
 								</view>
@@ -72,28 +102,19 @@
 					<view class="item">
 						<view class="acea-row row-middle">
 							<text class="item-name"></text>
-							<input type="text" style="text-align: right;" placeholder="请输入详细地址" v-model="shopInfo.businessAddressDetail" @input="validateBtn" placeholder-class='placeholder' />
+							<input type="text" style="text-align: right;" placeholder="请输入详细地址"
+								v-model="shopInfo.businessAddressDetail" @input="validateBtn"
+								placeholder-class='placeholder' />
 						</view>
 					</view>
-				</view>	
+				</view>
 				<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">
-								<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>
-								</view>
-							</view>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入"
+								v-model="shopInfo.EnterpriseName" @input="validateBtn"
+								placeholder-class='placeholder' />
 						</view>
 					</view>
 					<view class="item">
@@ -101,8 +122,10 @@
 							<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">
+									<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>
@@ -112,68 +135,53 @@
 					<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' />
+							<input type="text" style="text-align: right;" placeholder="请输入"
+								v-model="shopInfo.EnterpriseServicePhone" @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.EnterpriseJoinName" @input="validateBtn" placeholder-class='placeholder' />
+							<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.EnterprisePhone" @input="validateBtn" placeholder-class='placeholder' />
+							<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' />
+							<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' />
+							<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' />
+							<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' />
+							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.userId"
+								@input="validateBtn" placeholder-class='placeholder' />
 						</view>
 					</view>
 					<view class="item">
@@ -182,23 +190,28 @@
 								<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>
+										<text class="haiyuefont haiyue-zhuyi"
+											style="font-size: 10px;margin: 2px;"></text>
 										下载模版
 									</view>
 									<view class="down-style" @click="perviewTemplate">
-										<text class="iconfont icon-tan"></text>
+										<text class="haiyuefont haiyue-zhuyi"
+											style="font-size: 10px;margin: 2px;"></text>
 										示例模版
 									</view>
-									<view style="font-size: 12px;">
+									<view style="font-size: 12px;margin-left: 4px;">
 										{{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)">
+									<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>
+										<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">
+									<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>
@@ -210,22 +223,24 @@
 							<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">
+									<picker style="text-align: right;" @change="bindPickerChange1" :value="shopInfo.mer_type" :range="storeTypeArr"
+										range-key="type_name">
+										<input style="pointer-events:none;text-align: right;" placeholder="请选择店铺类型"
+											type="text" disabled readonly v-model="shopInfo.mer_storeType">
 										<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>
-									<switch :checked="shopInfo.isVeteran"  style="transform:scale(0.6)" @change="viteran" />
+									<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>
@@ -239,28 +254,31 @@
 								<view class="uni-list-cell-db acea-row row-middle">
 									<text class="item-name required">惠美乡村红头文件</text>
 									<view style="font-size: 12px;">
-										{{pics.length}}/1
+										{{shopInfo.isVeteranPhoto.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)">
+									<view class='pictrue' v-for="(item,index) in shopInfo.isVeteranPhoto" :key="index" :data-index="index"
+										@click="getPhotoClickIdx(shopInfo.isVeteranPhoto,index)">
 										<image :src='item'></image>
-										<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(shopInfo.isVeteranPhoto,index)'></text>
 									</view>
-									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic' v-if="pics.length < 1">
+									<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.isVeteranPhoto)'
+										v-if="shopInfo.isVeteranPhoto.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" />
+									<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>
@@ -274,26 +292,29 @@
 								<view class="uni-list-cell-db acea-row row-middle">
 									<text class="item-name required">退伍军人证件照</text>
 									<view style="font-size: 12px;">
-										{{pics.length}}/1
+										{{shopInfo.isFlagshipStorePhoto.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)">
+									<view class='pictrue' v-for="(item,index) in shopInfo.isFlagshipStorePhoto" :key="index" :data-index="index"
+										@click="getPhotoClickIdx(shopInfo.isFlagshipStorePhoto,index)">
 										<image :src='item'></image>
-										<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(shopInfo.isFlagshipStorePhoto,index)'></text>
 									</view>
-									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic' v-if="pics.length < 1">
+									<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.isFlagshipStorePhoto)'
+										v-if="shopInfo.isFlagshipStorePhoto.length < 1">
 										<text class='iconfont icon-icon25201' style="top: 25px;left: 25px;"></text>
 									</view>
 								</view>
 							</view>
 						</view>
 					</view>
-					<button class='submitBtn' :disabled="!validate" :class="validate === true ? 'on':''" @click="nextStep">下一步</button>
+					<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>
@@ -304,18 +325,27 @@
 				</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>
+
+		<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 areaWindow from '@/components/areaWindow';
+	import {
+		mapGetters
+	} from "vuex";
 	import parser from "@/components/jyf-parser/jyf-parser";
-	import { toLogin } from '@/libs/login.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		merClassifly,
+		getStoreTypeApi
+	} from '@/api/store.js';
+	import {getGoodsDetails} from '@/api/store.js';
 	const app = getApp();
 	export default {
 		components: {
@@ -323,65 +353,100 @@
 		},
 		data() {
 			return {
-				isFalse:['是','否'],
+				isFalse: ['是', '否'],
 				validate: false,
 				display: false,
 				display2: false,
-				shopInfo:{
-					shopName:'',
-					shopId:'',
-					registerAddress:'',
-					registerAddressDetail:'',
-					businessAddress:'',
-					businessAddressDetail:'',
+				shopInfo: {
+					shopName: '',
+					mer_classification:'',
+					classification:'',
+					// registerAddress: '',
+					// registerAddressDetail: '',
+					businessAddress: '',
+					businessAddressDetail: '',
+					EnterpriseType: '',
+					EnterpriseServicePhone: '',
+					EnterpriseName: '',
+					EnterpriseJoinName: '',
+					EnterprisePhone: '',
+					EnterpriseId: '',
+					EnterpriseRooter: [],
+
+					userName: '',
+					userPhone: '',
+					userId: '',
+					userPhoto: [],
 					
-					EnterpriseIndustry:'',
-					EnterpriseType:'',
-					EnterpriseServicePhone:'',
-					EnterpriseName:'',
-					EnterpriseJoinName:'',
-					EnterprisePhone:'',
-					EnterpriseId:'',
-					EnterpriseRooter:[],
+					mer_type:'',
+					mer_storeType:'',
+					isVeteran: false,
+					isVeteranPhoto: [],
+					isFlagshipStore: false,
+					isFlagshipStorePhoto: [],
 					
-					userName:'',
-					userPhone:'',
-					userId:'',
-					userPhoto:[],
-					
-					
-					shopType:'',
-					isVeteran:false,
-					isVeteranPhoto:[],
-					isFlagshipStore:false,
-					isFlagshipStorePhoto:[],
 				},
-				cityArray:[],
-				businessArray:['制造业','农业','金融业','计算机业','其他'],
-				enterpriseArray:['生产型','销售型'],
-				storeTypeArr: ['旗舰店','非旗舰店'],
+				cityArray: [],
+				storeTypeArr2: [{
+					type_name: '',
+					mer_type_id: ''
+				}],
+				enterpriseArray: ["生产型企业", "销售型企业"],
+				storeTypeArr: ['旗舰店', '非旗舰店'],
+				array: [{
+					category_name: '',
+					merchant_category_id: ''
+				}],
 				successful: false,
 				isType: false,
 				showProtocol: false,
-				pics:[],
+				pics: [],
 			};
 		},
 		onLoad(options) {
 			if (this.isLogin) {
-				
+				this.getClassfication();
+				this.getStoreType();
 			} else {
 				toLogin()
 			}
-		},
-		onShow() {},
-		computed: {
-			...mapGetters(['isLogin','viewColor']),
-			addressText(){
-				return this.shopInfo.registerAddress.map(v=>v.name).join('/');
+			if (options.mer_i_id) {
+				this.mer_i_id = options.mer_i_id
+				uni.showLoading({
+					title: '获取数据中',
+				});
+				this.$nextTick(function() {
+					this.getGoodsDetails(options.mer_i_id)
+				})
 			}
 		},
-		
+		onShow() {
+			
+		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor']),
+		},
+
 		methods: {
+			// 获取历史提交数据详情
+			getGoodsDetails(id) {
+				getGoodsDetails(id).then(res => {
+					let arr = Object.keys(this.shopInfo)
+					let resData = res.data;
+					let {
+						shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseServicePhone,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType
+					} = this.shopInfo;
+					console.log('resData: ',resData);
+					let com=resData.com;
+					let biz=resData.biz;
+					mer_classification=this.array[resData.mer_type_id]['category_name'],
+					userPhone=resData.phone,EnterpriseName=resData.mer_name,userName=resData.name,mer_type=resData.merchant_category_id,classification=resData.mer_type_id,EnterpriseType=com.type,EnterpriseServicePhone=com.service,EnterpriseName=com.contact,EnterpriseJoinName=com.mobile,EnterpriseId=com.number,userName=com.initiator,userPhone=com.inti_mobile,userId=com.inti_number,userPhoto=com.init_image,isVeteran=com.is_huimei,isVeteranPhoto=com.image_huimei,isFlagshipStore=com.is_soldier,isFlagshipStorePhoto=com.image_soldier,businessAddress=biz.province+'/'+biz.city,businessAddressDetail=biz.address_true;
+					this.shopInfo={
+						shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseServicePhone,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType
+					}
+					uni.hideLoading();
+				})
+			},
 			getAgreement() {
 				let that = this
 				that.showProtocol = true;
@@ -390,73 +455,130 @@
 					that.protocol = res.data.sys_merchant_type
 				})
 			},
-			changeRegion(){
+			changeRegion() {
 				this.display = true;
 			},
 			// 关闭地址弹窗；
 			changeClose() {
 				this.display = false;
 			},
-			changeRegion2(){
+			changeRegion2() {
 				this.display2 = true;
 			},
 			// 关闭地址弹窗；
 			changeClose2() {
 				this.display2 = false;
 			},
-			OnChangeAddress(address){
-				
-				this.shopInfo.registerAddress = address.map(v=>v.name).join('/');
+			OnChangeAddress(address) {
+
+				this.shopInfo.registerAddress = address.map(v => v.name).join('/');
 			},
-			OnChangeAddress2(address){
-				
-				this.shopInfo.businessAddress = address.map(v=>v.name).join('/');
+			OnChangeAddress2(address) {
+
+				this.shopInfo.businessAddress = address.map(v => v.name).join('/');
 			},
-			validateBtn(){
-				let {shopName,
-					shopId,
-					registerAddress,
-					registerAddressDetail,
-					businessAddress,
-					businessAddressDetail,
-					EnterpriseIndustry,
-					EnterpriseType,
-					EnterpriseServicePhone,
-					EnterpriseName,
-					shopType}=this.shopInfo;
-				if(shopName&&shopId&&registerAddress&&registerAddressDetail&&businessAddress&&businessAddressDetail&&EnterpriseIndustry&&EnterpriseType&&EnterpriseServicePhone&&EnterpriseName&&shopType){
-					this.validate=true;
+			validateBtn() {
+				let {
+					shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseServicePhone,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType
+				} = this.shopInfo;
+				
+				
+				
+				if (shopName&&mer_classification&&classification&&businessAddress&&businessAddressDetail&&EnterpriseType&&EnterpriseServicePhone&&EnterpriseName&&EnterpriseJoinName&&EnterprisePhone&&EnterpriseId&&EnterpriseRooter&&userName&&userPhone&&userId&&userPhoto&&mer_type&&mer_storeType ) {
+					if(isVeteran&&!isVeteranPhoto){
+						return 
+					}else if (isFlagshipStore&&!isFlagshipStorePhoto){
+						return 
+					}
+					let date2 = {
+						phone: userPhone,
+						mer_name:shopName,
+						name:userName,
+						merchant_category_id:mer_type,
+						mer_type_id:classification,
+						com:{
+							type:EnterpriseType,
+							service:EnterpriseServicePhone,
+							contact:EnterpriseName,
+							mobile:EnterpriseJoinName,
+							number:EnterpriseId,
+							initiator:userName,
+							inti_mobile:userPhone,
+							inti_number:userId,
+							init_image:userPhoto,
+							is_huimei:isVeteran,
+							image_huimei:isVeteranPhoto,
+							is_soldier:isFlagshipStore,
+							image_soldier:isFlagshipStorePhoto,
+						},
+						biz:{
+							province:businessAddress.split('/')[0],
+							city:businessAddress.split('/')[1],
+							address_true:businessAddressDetail,
+						}
+					}
+					uni.setStorageSync('shopInfo', date2)
+					this.validate = true;
 				}
 			},
-			changeBusiness(e){
-				this.shopInfo.EnterpriseIndustry=this.businessArray[e.target.value];
+			// 获取商户分类
+			getClassfication() {
+				merClassifly()
+					.then(res => {
+						this.array = res.data
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			// 获取店铺类型
+			getStoreType() {
+				getStoreTypeApi()
+					.then(res => {
+						this.storeTypeArr = res.data
+					})
+					.catch(res => {
+						this.$util.Tips({
+							title: res
+						});
+					});
+			},
+			bindPickerChange(e) {
+				let idx = e.target.value
+				this.shopInfo.classification = this.array[idx]['merchant_category_id']
+				this.shopInfo.mer_classification = this.array[idx]['category_name']
+				this.validateBtn()
+			},
+			bindPickerChange1(e) {
+				let idx = e.target.value
+				this.shopInfo.mer_type = this.storeTypeArr[idx]['mer_type_id']
+				this.shopInfo.mer_storeType = this.storeTypeArr[idx]['type_name']
+				this.validateBtn()
+			},
+			changeEnterprise(e) {
+				this.shopInfo.EnterpriseType = this.enterpriseArray[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(){
+			nextStep() {
+
 				uni.navigateTo({
-					url:'/pages/store/settled/step2'
+					url: '/pages/store/settled/step2'
 				})
 			},
-			viteran(e){
+			viteran(e) {
 				// console.log('e: ',e);
-				this.shopInfo.isVeteran=e.detail.value;
+				this.shopInfo.isVeteran = e.detail.value;
 			},
-			flagShipStore(e){
-				this.shopInfo.isFlagshipStore=e.detail.value;
+			flagShipStore(e) {
+				this.shopInfo.isFlagshipStore = e.detail.value;
 			},
 			/**
 			 * 上传文件
 			 *
 			 */
-			uploadpic: function(item) {
+			uploadpic(item) {
 				let that = this;
 				that.$util.uploadImageOne('upload/image', function(res) {
 					item.push(res.data.path);
@@ -467,7 +589,7 @@
 			 * 删除图片
 			 *
 			 */
-			DelPic: function(item,index) {
+			DelPic(item, index) {
 				let that = this,
 					pic = item[index];
 				item.splice(index, 1);
@@ -475,13 +597,13 @@
 			},
 			// 图片预览
 			// 获得相册 idx
-			getPhotoClickIdx(item,index) {
+			getPhotoClickIdx(item, index) {
 				let _this = this;
 				let idx = index;
 				_this.imgPreview(item, idx);
 			},
 			// 图片预览
-			imgPreview: function(list, idx) {
+			imgPreview(list, idx) {
 				// list：图片 url 数组
 				if (list && list.length > 0) {
 					uni.previewImage({
@@ -490,58 +612,69 @@
 					});
 				}
 			},
-			downTemplate(){
-				
+			downTemplate() {
+
 				uni.showModal({
-					title:'是否下载示例模版',
+					title: '是否下载示例模版',
 					success(res) {
 						if (res.confirm) {
-							location.href='https://plus.hwms.shop/uploads/file/letter_introduction.docx'
+							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'];
+			perviewTemplate() {
+				let url = ['https://plus.hwms.shop/uploads/file/mer_template.jpg'];
 				uni.previewImage({
 					current: url[0], //  传 Number H5端出现不兼容
 					urls: url
 				});
-			}
+			},
+			jumpToList() {
+				uni.navigateTo({
+					url: "/pages/store/applicationRecord/index"
+				})
+			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-	.required{
+	.required {
 		position: relative;
 		display: flex;
 		width: 28rpx;
 		height: 28rpx;
-		&::before{
+
+		&::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;
+		border: 1px solid var(--view-theme) !important;
+		background-color: var(--view-theme) !important;
+		color: #fff !important;
 	}
+
 	.uni-input-placeholder {
 		color: #B2B2B2;
 	}
-	.item-name{
+
+	.item-name {
 		width: 340rpx;
 	}
+
 	.uni-list-cell {
 		position: relative;
+
 		.iconfont {
 			font-size: 14px;
 			color: #7a7a7a;
@@ -549,13 +682,16 @@
 			right: -16px;
 			top: 7rpx;
 		}
-		.icon-guanbi2{
+
+		.icon-guanbi2 {
 			right: 35px;
 		}
 	}
-	.merchantBgCount{
+
+	.merchantBgCount {
 		line-height: 0;
 	}
+
 	.merchantsSettled {
 		// background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
 		display: flex;
@@ -563,30 +699,35 @@
 		grid-gap: 32rpx;
 		padding-bottom: 40rpx;
 	}
+
 	.merchantsSettled .nav {
 		// background-color: #fff;
 		font-size: 26rpx;
 		color: #282828;
 		padding: 25rpx 0;
 	}
-	.merchantsSettled  .nav .navCon {
+
+	.merchantsSettled .nav .navCon {
 		padding: 0 86rpx;
 		text-align: center;
-		view{
+
+		view {
 			text-align: center;
 		}
 	}
-	
+
 	.merchantsSettled .nav .progress {
 		padding: 0 120rpx;
 		margin-top: 10rpx;
 	}
+
 	.merchantsSettled .nav .progress .line {
 		width: 160rpx;
-		height:8rpx;
+		height: 8rpx;
 		background-color: #d1e1fb;
 		border-radius: 4rpx;
 	}
+
 	.merchantsSettled .nav .progress .iconfont {
 		font-size: 25rpx;
 		color: white;
@@ -596,19 +737,21 @@
 		text-align: center;
 		border-radius: 50%;
 		background-color: #5d6371;
-		&.t-color{
+
+		&.t-color {
 			background-color: #0294f8;
 			width: 24rpx;
 			height: 24rpx;
 			border-radius: 50%;
-			box-shadow:0rpx 0rpx 8rpx 8rpx #b9e1fe;
+			box-shadow: 0rpx 0rpx 8rpx 8rpx #b9e1fe;
 		}
 	}
-	
+
 	.merchantsSettled .merchantBg {
 		width: 750rpx;
 		width: 100%;
 	}
+
 	.merchantsSettled .list {
 		background-color: #fff;
 		border-radius: 12px;
@@ -617,13 +760,14 @@
 		// position: absolute;
 		// top: 160rpx;
 		width: calc(100% - 30px);
-		
+
 	}
+
 	.application-record {
 		position: absolute;
 		display: flex;
 		align-items: center;
-		top: 162rpx;
+		top: 122rpx;
 		right: 0;
 		color: #fff;
 		font-size: 22rpx;
@@ -631,21 +775,25 @@
 		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;
@@ -654,7 +802,9 @@
 			line-height: 36rpx;
 		}
 	}
-	.acea-row,.upload {
+
+	.acea-row,
+	.upload {
 		display: -webkit-box;
 		display: -moz-box;
 		display: -webkit-flex;
@@ -667,14 +817,17 @@
 		-ms-flex-wrap: wrap;
 		flex-wrap: wrap;
 	}
+
 	.upload {
 		margin-top: 20rpx;
 	}
-	.acea-row .tips-text{
+
+	.acea-row .tips-text {
 		color: #e40000;
-		font-size:20rpx;
+		font-size: 20rpx;
 		padding: 12rpx 12rpx 0 12rpx;
 	}
+
 	.acea-row.row-middle {
 		-webkit-box-align: center;
 		-moz-box-align: center;
@@ -687,17 +840,21 @@
 		flex-direction: row;
 		justify-content: space-between;
 		flex: 1;
-		input{
+
+		input {
 			flex: 1;
 		}
-		picker{
+
+		picker {
 			flex: 1;
 		}
 	}
-	.row-middle .down-style{
+
+	.row-middle .down-style {
 		color: #00aaff;
 		font-size: 20rpx;
 	}
+
 	.acea-row.row-column {
 		-webkit-box-orient: vertical;
 		-moz-box-orient: vertical;
@@ -706,6 +863,7 @@
 		-ms-flex-direction: column;
 		flex-direction: column;
 	}
+
 	.acea-row.row-center-wrapper {
 		-webkit-box-align: center;
 		-moz-box-align: center;
@@ -720,6 +878,7 @@
 		-webkit-justify-content: center;
 		justify-content: center;
 	}
+
 	.merchantsSettled .list .item .pictrue {
 		width: 130rpx;
 		height: 130rpx;
@@ -727,18 +886,22 @@
 		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;
@@ -752,6 +915,7 @@
 				height: 100%;
 			}
 		}
+
 		.icon-guanbi1 {
 			font-size: 33rpx;
 			position: absolute;
@@ -759,10 +923,12 @@
 			right: -10px;
 		}
 	}
-	.uni-list-cell-db{
+
+	.uni-list-cell-db {
 		position: relative;
 	}
-	.wenhao{
+
+	.wenhao {
 		width: 34rpx;
 		height: 34rpx;
 		display: flex;
@@ -771,44 +937,53 @@
 		font-size: 28rpx;
 		border-radius: 50%;
 		background: #E3E3E3;
-		color: #ffffff!important;
+		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%;
@@ -824,6 +999,7 @@
 		text-transform: inherit;
 		text-shadow: inherit;
 	}
+
 	.merchantsSettled .list .item .code {
 		position: absolute;
 		width: 93px;
@@ -836,11 +1012,13 @@
 		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;
@@ -854,30 +1032,36 @@
 		margin-top: 25px;
 		pointer-events: none;
 	}
+
 	.merchantsSettled .submitBtn.on {
 		background: var(--view-theme);
-			pointer-events: all;
+		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%;
@@ -887,6 +1071,7 @@
 		background: rgba(0, 0, 0, .5);
 		z-index: 10;
 	}
+
 	.settlementAgreement .setAgCount {
 		background: #fff;
 		width: 656rpx;
@@ -901,18 +1086,22 @@
 		-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;
@@ -920,12 +1109,14 @@
 		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;
@@ -936,12 +1127,14 @@
 		height: 756rpx;
 		overflow-y: scroll;
 	}
+
 	.settledSuccessMain {
 		height: 100vh;
 		display: flex;
 		flex-direction: column;
 		background: #fff;
 	}
+
 	.settledSuccessful {
 		flex: 1;
 		width: 100%;
@@ -950,22 +1143,26 @@
 		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;
@@ -974,14 +1171,17 @@
 		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;
@@ -989,24 +1189,29 @@
 		top: 0;
 		left: 0;
 	}
+
 	.icon-xiangyou {
 		font-size: 22rpx;
 	}
+
 	// #ifdef MP
 	checkbox-group {
 		display: inline-block;
 	}
+
 	// #endif
-	.setAgCount{
-		/deep/ table{
-			border:  1px solid #DDD;
+	.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;
+
+		/deep/ td,
+		th {
+			padding: 5rpx 10rpx;
+			border-bottom: 1px solid #DDD;
+			border-right: 1px solid #DDD;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/store/settled/index - 副本.vue b/pages/store/settled/index备份.vue
similarity index 100%
rename from pages/store/settled/index - 副本.vue
rename to pages/store/settled/index备份.vue
diff --git a/pages/store/settled/step2.vue b/pages/store/settled/step2.vue
index 270e36a..1642b5a 100644
--- a/pages/store/settled/step2.vue
+++ b/pages/store/settled/step2.vue
@@ -31,7 +31,7 @@
 								<view class="uni-list-cell-db acea-row row-middle">
 									<text class="item-name required">身份证正反面上传</text>
 									<view class="">
-										{{pics.length}}/2
+										{{shopInfo.idCardPhoto.length}}/2
 									</view>
 								</view>
 								<view class="acea-row row-middle">
@@ -112,7 +112,7 @@
 								<view class="uni-list-cell-db acea-row row-middle">
 									<text class="item-name required">营业执照</text>
 									<view class="">
-										{{pics.length}}/1
+										{{shopInfo.businessLicense.length}}/1
 									</view>
 								</view>
 								<view class="acea-row row-middle">
@@ -123,7 +123,7 @@
 										<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">
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.businessLicense)' v-if="shopInfo.businessLicense.length < 1">
 										<text class='iconfont icon-icon25201' style="left: 25px;top: 25px;"></text>
 										<!-- <view>上传图片</view> -->
 									</view>
@@ -156,7 +156,12 @@
 							<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.registerAddressDetail" @input="validateBtn"  placeholder-class='placeholder' />
+						</view>
+					</view>
 					<view class="item">
 						<view class="acea-row row-middle">
 							<text class="item-name required">经营范围</text>
@@ -214,11 +219,11 @@
 					countStartTime:'',
 					countEndTime:'',
 					businessScope:'',
+					registerAddressDetail:'',
 				},
 				successful: false,
 				isType: false,
 				showProtocol: false,
-				pics:[],
 			};
 		},
 		onLoad(options) {
@@ -271,10 +276,9 @@
 			},
 			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;
+					this.shopInfo.countStartTime=res.data.result.start;
+					this.shopInfo.countEndTime=res.data.result.end;
 				})
 			},
 			getAgreement() {
@@ -308,26 +312,27 @@
 				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){
+					let data2=uni.getStorageSync('shopInfo');
+					console.log('data2: ',data2);
+				let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo;
+				if(idCardPhoto&&idCardName&&idCardNumber&&idCardStartTime&&idCardEndTime&&businessLicense&&countId&&countStartTime&&countEndTime&&businessScope&&registerAddressDetail){
+					let idcard={
+						image1:idCardPhoto[0],
+						image2:idCardPhoto[1],
+						name:idCardName,
+						number:idCardNumber,
+						start:idCardStartTime,
+						end:idCardEndTime,
+					}
+					let biz=data2.biz;
+					biz.image=businessLicense;
+					biz.number=countId;
+					biz.start=countStartTime;
+					biz.end=countEndTime;
+					biz.address=registerAddressDetail;
+					data2.idcard=idcard;
+					uni.setStorageSync('shopInfo',data2);
+					console.log('data2: ',data2);
 					this.validate=true;
 				}
 			},
@@ -356,7 +361,6 @@
 				let that = this;
 				that.$util.uploadImageOne('upload/image', function(res) {
 					item.push(res.data.path);
-					// that.$set(that, 'pics', that.pics);
 				});
 			},
 			/**
@@ -367,7 +371,6 @@
 				let that = this,
 					pic = item[index];
 				item.splice(index, 1);
-				// that.$set(that, 'pics', that.pics);
 			},
 			// 图片预览
 			// 获得相册 idx
diff --git a/pages/store/settled/step3.vue b/pages/store/settled/step3.vue
index b615261..6055963 100644
--- a/pages/store/settled/step3.vue
+++ b/pages/store/settled/step3.vue
@@ -1,5 +1,5 @@
 <template>
-	<view v-if="!successful" :style="viewColor">
+	<view v-if="!successful" :style="viewColor" @click="hiddenSerachList">
 		<form report-submit='true'>
 			<view class='merchantsSettled'>
 				<!-- <view class="merchantBgCount">
@@ -29,26 +29,22 @@
 						<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="item-name required">银行卡正反面上传</text>
 									<view class="">
-										{{pics.length}}/2
+										{{shopInfo.bankCardImg.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.idCardPhoto" :key="index" :data-index="index" @click="getPhotoClickIdx(shopInfo.idCardPhoto,index)">
+									<view class='pictrue' v-for="(item,index) in shopInfo.bankCardImg" :key="index" :data-index="index" @click="getPhotoClickIdx(shopInfo.bankCardImg,index)">
 										<image :src='item'></image>
-										<text class='iconfont icon-guanbi1' @click.stop='DelPic(shopInfo.idCardPhoto,index)'></text>
+										<text class='iconfont icon-guanbi1' @click.stop='DelPic(shopInfo.bankCardImg,index)'></text>
 									</view>
-									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.idCardPhoto)' v-if="shopInfo.idCardPhoto.length < 1">
+									<view  class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(shopInfo.bankCardImg)' v-if="shopInfo.bankCardImg.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>
@@ -56,8 +52,18 @@
 					</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' />
+							<text class="item-name required">户名</text>
+							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.bankCardUserName" @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.bankCard" @input="validateBtn" placeholder-class='placeholder' />
 						</view>
 						<view class="acea-row row-middle">
 							<text class="tips-text" >提示：请核验信息是否正确</text>
@@ -65,107 +71,48 @@
 					</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' />
+							<text class="item-name required" >银行名称</text>
+							<input type="text" style="text-align: right;flex:1;" maxlength="30" placeholder="请输入" v-model="shopInfo.bankName" @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 class="acea-row row-middle">
+							<text class="item-name required" >支行名称</text>
+							<input type="text" style="text-align: right;flex:1;" maxlength="30" @mousedown="searchBranch" placeholder="请输入" v-model="shopInfo.bankBranchName" @input="validateBtn" placeholder-class='placeholder' />
+							<view class="search-list" v-show="searchFlag">
+								<view class="search-tips" v-for="(item,index) in searchList" @click="selectSearch(item)">
+									<text>{{item.lname}}</text>
+									<text style="color: #999;font-size: 10px;">{{item.addr}}</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 class="acea-row row-middle">
+							<text class="tips-text" >提示：请核验信息是否正确</text>
 						</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 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.CNAPS" @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.countId" @input="validateBtn"  placeholder-class='placeholder' />
-						</view>
+					<view class="item no-border">
+						<checkbox-group @change='ChangeIsAgree'>
+							<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意</checkbox-group>
+						<button class="settleAgree" @click="getConfig">《入驻协议》</button>
 					</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>	
 			</view>
 		</form>
 		
@@ -191,7 +138,9 @@
 	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'
+	import {queryBankCard,queryCNAPS} from '@/api/user.js';
+	import { configMap,throttle } from "@/utils";
+	import {updateGoodsRecord,create,getGoodsDetails} from '@/api/store.js';
 	const app = getApp();
 	export default {
 		components: {
@@ -203,22 +152,28 @@
 				display: false,
 				display2: false,
 				shopInfo:{
-					idCardPhoto:[],
-					idCardName:'',
-					idCardNumber:'',
-					idCardStartTime:'',
-					idCardEndTime:'',
-					
-					businessLicense:[],
-					countId:'',
-					countStartTime:'',
-					countEndTime:'',
-					businessScope:'',
+					bankCardImg:[],
+					bankCardUserName:'',
+					bankCard:'',
+					bankName:'',
+					bankBranchName:'',
+					CNAPS:'',
+					bankProvince:'',
+					bankCity:'',
 				},
 				successful: false,
 				isType: false,
 				showProtocol: false,
+				isAgree:false,
+				searchFlag:false,
+				searchList:[],
 				pics:[],
+				protocol: this.sys_intention_agree,
+				tagStyle: {
+					img: 'width:100%;display:block;'
+				},
+				dataInfo:{},
+				mer_i_id:'',
 			};
 		},
 		onLoad(options) {
@@ -227,54 +182,61 @@
 			} else {
 				toLogin()
 			}
+			if (options.mer_i_id) {
+				this.mer_i_id = options.mer_i_id
+				
+			}
 		},
 		onShow() {},
-		computed: {
-			...mapGetters(['isLogin','viewColor']),
-			addressText(){
-				return this.shopInfo.registerAddress.map(v=>v.name).join('/');
-			}
-		},
+		computed: configMap({sys_intention_agree:''},mapGetters(['isLogin','viewColor'])),
 		watch:{
 			deep:true,
-			'shopInfo.idCardPhoto':{
+			'shopInfo.bankCardImg':{
 				handler:function(newVal, oldVal){
-					if(newVal.length==1){
-						this.verifyIDcard(0)
-					}else if(newVal.length==2){
-						this.verifyIDcard(1)
-					}
+						this.verifyBankCard()
 				}
 			},
-			'shopInfo.businessLicense':{
+			'shopInfo.bankBranchName':{
 				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;
+			searchBranch(){
+				let val=this.shopInfo;
+				
+				if(val.bankCard&&val.bankName){
+					throttle(()=>{
+						let data1={
+							bankcard:val.bankCard,
+							bank:val.bankName,
+							province:val.bankProvince,
+							city:val.bankCity,
+							keyword:val.bankBranchName,
 						}
-					}
-				})
+						queryCNAPS(data1).then((res)=>{
+							let d=res.data.result.data;
+							if(d.record.length){
+								this.searchFlag=true;
+								this.searchList=d.record;
+							}
+						})
+					},2000)
+				}
 			},
-			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;
+			getConfig() {
+				this.showProtocol = true;
+				// 获取配置
+				this.protocol = this.sys_intention_agree
+			},
+			verifyBankCard(){
+				queryBankCard({image:this.shopInfo.bankCardImg[0]}).then((res)=>{
+					if(res){
+						let b=res.data.result;
+						this.shopInfo.bankCard=b.bankcard;
+						this.shopInfo.bankName=b.bankname;
+					}
 				})
 			},
 			getAgreement() {
@@ -308,28 +270,15 @@
 				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){
+				let data2=uni.getStorageSync('shopInfo')
+				let {bankCardImg,bankCardUserName,bankCard,bankName,bankBranchName,CNAPS}=this.shopInfo;
+				if(bankCardImg&&bankCardUserName&&bankCard&&bankName&&bankBranchName&&CNAPS){
 					this.validate=true;
+					let bank={bankCardImg,bankCardUserName,bankCard,bankName,bankBranchName,CNAPS}
+					data2.bank=bank;
+					this.dataInfo=data2;
 				}
+				
 			},
 			changeBusiness(e){
 				this.shopInfo.EnterpriseIndustry=this.businessArray[e.target.value];
@@ -344,15 +293,48 @@
 				this.validateBtn();
 			},
 			nextStep(){
-				uni.navigateTo({
-					url:'/pages/store/settled/step3'
-				})
+				let that=this;
+				if (that.mer_i_id) {
+					updateGoodsRecord(that.mer_i_id, that.dataInfo).then(res => {
+						if (res.status == 200) {
+							title: '提交成功',
+							that.loading = true;
+							that.timer = setTimeout(() => {
+								that.successful = true;
+								that.validate = true;
+							}, 1000)
+						}
+					}).catch(res => {
+						that.validate = true;
+						that.$util.Tips({
+							title: res
+						});
+					})
+				} else {
+					create(that.dataInfo).then(data => {
+						if (data.status == 200) {
+							title: '提交成功',
+							that.loading = true;
+							this.timer = setTimeout(() => {
+								that.successful = true;
+									that.validate = true;
+							}, 1000)
+						}
+				
+					}).catch(res => {
+						that.validate = true;
+						that.$util.Tips({
+							title: res
+						});
+					})
+				}
+				
 			},
 			/**
 			 * 上传文件
 			 *
 			 */
-			uploadpic: function(item) {
+			uploadpic(item) {
 				let that = this;
 				that.$util.uploadImageOne('upload/image', function(res) {
 					item.push(res.data.path);
@@ -363,7 +345,7 @@
 			 * 删除图片
 			 *
 			 */
-			DelPic: function(item,index) {
+			DelPic(item,index) {
 				let that = this,
 					pic = item[index];
 				item.splice(index, 1);
@@ -377,7 +359,7 @@
 				_this.imgPreview(item, idx);
 			},
 			// 图片预览
-			imgPreview: function(list, idx) {
+			imgPreview(list, idx) {
 				// list：图片 url 数组
 				if (list && list.length > 0) {
 					uni.previewImage({
@@ -386,6 +368,18 @@
 					});
 				}
 			},
+			ChangeIsAgree(e) {
+				this.isAgree = !this.isAgree;
+				this.validateBtn();
+			},
+			selectSearch(i){
+				this.shopInfo.bankBranchName=i.lname;
+				this.shopInfo.CNAPS=i.bankCode;
+				this.hiddenSerachList();
+			},
+			hiddenSerachList(){
+				this.searchFlag=false;
+			},
 		}
 	}
 </script>
@@ -558,6 +552,30 @@
 		justify-content: space-between;
 		flex: 1;
 	}
+	.search-list{
+		width: 100%;
+		position: absolute;
+		top: -48rpx;
+		background-color: white;
+		z-index: 1000;
+		border-radius: 12rpx;
+		padding: 12rpx;
+		border: solid 1px #999;
+		overflow: scroll;
+		height: 400rpx;
+		.search-tips{
+				padding: 8rpx 0;
+				display: flex;
+				flex-direction: column;
+			text{
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				color: #666;
+			}
+		}
+	}
+	
 	.acea-row .tips-text{
 		color: #e40000;
 		font-size:20rpx;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 710daa0..581f941 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -192,7 +192,7 @@
 			</view>
 			<view v-else class="copy-right">
 				<view class="iconfont icon- "></view>
-				<view class="text">©️海悦版权所有</view>
+				<view class="text">©️铸源版权所有</view>
 			</view>
 			<view style="height: 50rpx;"></view>
 			<!-- #ifndef H5 -->
diff --git a/static/iconfont/iconfont.css b/static/iconfont/iconfont.css
index 51611b7..5695ab1 100644
--- a/static/iconfont/iconfont.css
+++ b/static/iconfont/iconfont.css
@@ -27,8 +27,11 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+.haiyue-zhuyi:before {
+  content: "\e904";
+}
 
-.haiyueqiehuan:before {
+.haiyue-qiehuan:before {
   content: "\e903";
 }
 
diff --git a/static/iconfont/iconfont.js b/static/iconfont/iconfont.js
index 87898e0..d9d3189 100644
--- a/static/iconfont/iconfont.js
+++ b/static/iconfont/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4480899='<svg><symbol id="haiyueqiehuan" viewBox="0 0 1024 1024"><path d="M890.321455 420.049455a47.476364 47.476364 0 0 0 33.559272-81.012364l-217.297454-217.274182a18.408727 18.408727 0 0 0-26.042182 0l-41.076364 41.076364a18.408727 18.408727 0 0 0 0 26.042182l136.285091 136.261818H88.017455a18.199273 18.199273 0 0 0-18.199273 18.199272v58.53091a18.199273 18.199273 0 0 0 18.199273 18.199272h802.304z m36.70109 171.333818H124.951273a47.476364 47.476364 0 0 0-33.559273 81.012363l217.297455 217.297455a18.408727 18.408727 0 0 0 26.042181 0l41.076364-41.076364a18.408727 18.408727 0 0 0 0-26.042182l-136.285091-136.378181h687.499636a18.408727 18.408727 0 0 0 18.408728-18.408728v-58.181818a18.408727 18.408727 0 0 0-18.408728-18.199273z" fill="#1372F5" ></path></symbol><symbol id="haiyue-info" viewBox="0 0 1024 1024"><path d="M732.136727 203.892364a48.267636 48.267636 0 0 0 49.268364-43.799273v-93.090909A44.706909 44.706909 0 0 0 732.136727 23.202909a47.080727 47.080727 0 0 0-43.799272 43.799273v93.090909c-5.469091 21.922909 16.500364 43.799273 43.799272 43.799273z m-443.368727 0a48.267636 48.267636 0 0 0 49.268364-43.799273v-93.090909A44.706909 44.706909 0 0 0 288.768 23.202909a47.080727 47.080727 0 0 0-43.799273 43.799273v93.090909a43.170909 43.170909 0 0 0 43.799273 43.799273z" fill="#2C93F5" ></path><path d="M896.349091 110.848h-76.637091v43.799273a95.930182 95.930182 0 0 1-93.090909 93.090909 92.253091 92.253091 0 0 1-93.090909-93.090909V110.848H381.812364v43.799273a95.930182 95.930182 0 0 1-93.090909 93.090909 89.088 89.088 0 0 1-93.09091-93.090909V110.848H113.524364a77.800727 77.800727 0 0 0-32.837819 10.938182 77.800727 77.800727 0 0 0-10.938181 32.837818v793.6a47.313455 47.313455 0 0 0 16.430545 32.837818 19.991273 19.991273 0 0 0 27.368727 10.938182h782.731637a77.800727 77.800727 0 0 0 32.837818-10.938182 47.313455 47.313455 0 0 0 16.430545-32.837818v-793.6a47.313455 47.313455 0 0 0-16.430545-32.837818 58.693818 58.693818 0 0 0-32.768-10.938182z m-202.542546 733.556364H316.136727a47.313455 47.313455 0 0 1-32.837818-16.430546 34.909091 34.909091 0 0 1 0-32.837818 39.563636 39.563636 0 0 1 32.837818-21.899636h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430545 34.909091 34.909091 0 0 1 0 32.837818 39.563636 39.563636 0 0 1-32.861091 21.899637z m0-180.619637H316.136727a47.313455 47.313455 0 0 1-32.837818-16.430545 34.909091 34.909091 0 0 1 0-32.837818 33.093818 33.093818 0 0 1 32.837818-16.430546h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430546 34.909091 34.909091 0 0 1 0 32.837818 47.313455 47.313455 0 0 1-32.861091 16.337454z m0-175.150545H316.136727a30.091636 30.091636 0 0 1-27.368727-16.430546 34.909091 34.909091 0 0 1 0-32.837818 33.093818 33.093818 0 0 1 32.837818-16.430545h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430545 34.909091 34.909091 0 0 1 0 32.837818 72.773818 72.773818 0 0 1-38.330182 16.337455z" fill="#2C93F5" ></path></symbol><symbol id="haiyue-shoukuang" viewBox="0 0 1024 1024"><path d="M373.853091 255.697455h240.151273c76.8 0 134.469818-163.281455 134.469818-163.281455-0.093091-48.058182-4.747636-86.458182-86.458182-86.458182-81.640727-4.794182-100.864 52.829091-163.281455 52.829091S407.482182 10.752 330.635636 1.140364c-72.145455-9.611636-86.458182 43.217455-86.458181 91.252363 0.023273 0 57.646545 163.304727 129.675636 163.304728z m259.351273 48.011636H373.853091C90.484364 303.709091 23.249455 860.811636 23.249455 860.811636c0 76.8 57.623273 148.945455 134.469818 148.945455h696.413091c72.145455 0 134.469818-72.145455 134.469818-148.945455-4.794182 0-72.029091-557.102545-355.397818-557.102545z m28.811636 432.244364a28.811636 28.811636 0 0 1 0 57.623272h-124.858182v81.640728a28.811636 28.811636 0 1 1-57.623273 0V793.6h-134.49309a28.811636 28.811636 0 1 1 0-57.623273h124.858181v-38.446545h-124.858181a28.811636 28.811636 0 0 1 0-57.623273h86.458181l-86.458181-163.281454a31.301818 31.301818 0 0 1 52.82909-33.629091l105.658182 187.298909h4.794182l105.658182-187.298909a31.301818 31.301818 0 1 1 52.829091 33.629091l-86.458182 153.6h81.640727a28.811636 28.811636 0 0 1 0 57.623272h-124.834909v38.493091h124.858182z m0 0" fill="#2C93F5" ></path></symbol></svg>',function(a){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var n,i,o,l,d,c=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}n=function(){var t,e=document.createElement("div");e.innerHTML=a._iconfont_svg_string_4480899,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?c(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(n,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),n()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=n,l=a.document,d=!1,h(),l.onreadystatechange=function(){"complete"==l.readyState&&(l.onreadystatechange=null,s())})}function s(){d||(d=!0,o())}function h(){try{l.documentElement.doScroll("left")}catch(t){return void setTimeout(h,50)}s()}}(window);
\ No newline at end of file
+window._iconfont_svg_string_4480899='<svg><symbol id="haiyue-zhuyi" viewBox="0 0 1024 1024"><path d="M512 0a512 512 0 1 0 512 512A512 512 0 0 0 512 0z m0 938.682182A426.682182 426.682182 0 1 1 938.635636 512 427.124364 427.124364 0 0 1 512 938.682182z m0-730.135273a48.104727 48.104727 0 0 0-47.965091 48.011636v327.447273a47.965091 47.965091 0 1 0 95.930182 0v-327.447273A48.174545 48.174545 0 0 0 512 208.546909z m0 475.927273a48.104727 48.104727 0 0 0-47.965091 48.011636v34.909091a47.965091 47.965091 0 1 0 95.930182 0v-34.909091A48.104727 48.104727 0 0 0 512 684.497455z"  ></path></symbol><symbol id="haiyue-qiehuan" viewBox="0 0 1024 1024"><path d="M890.321455 420.049455a47.476364 47.476364 0 0 0 33.559272-81.012364l-217.297454-217.274182a18.408727 18.408727 0 0 0-26.042182 0l-41.076364 41.076364a18.408727 18.408727 0 0 0 0 26.042182l136.285091 136.261818H88.017455a18.199273 18.199273 0 0 0-18.199273 18.199272v58.53091a18.199273 18.199273 0 0 0 18.199273 18.199272h802.304z m36.70109 171.333818H124.951273a47.476364 47.476364 0 0 0-33.559273 81.012363l217.297455 217.297455a18.408727 18.408727 0 0 0 26.042181 0l41.076364-41.076364a18.408727 18.408727 0 0 0 0-26.042182l-136.285091-136.378181h687.499636a18.408727 18.408727 0 0 0 18.408728-18.408728v-58.181818a18.408727 18.408727 0 0 0-18.408728-18.199273z" fill="#1372F5" ></path></symbol><symbol id="haiyue-info" viewBox="0 0 1024 1024"><path d="M732.136727 203.892364a48.267636 48.267636 0 0 0 49.268364-43.799273v-93.090909A44.706909 44.706909 0 0 0 732.136727 23.202909a47.080727 47.080727 0 0 0-43.799272 43.799273v93.090909c-5.469091 21.922909 16.500364 43.799273 43.799272 43.799273z m-443.368727 0a48.267636 48.267636 0 0 0 49.268364-43.799273v-93.090909A44.706909 44.706909 0 0 0 288.768 23.202909a47.080727 47.080727 0 0 0-43.799273 43.799273v93.090909a43.170909 43.170909 0 0 0 43.799273 43.799273z" fill="#2C93F5" ></path><path d="M896.349091 110.848h-76.637091v43.799273a95.930182 95.930182 0 0 1-93.090909 93.090909 92.253091 92.253091 0 0 1-93.090909-93.090909V110.848H381.812364v43.799273a95.930182 95.930182 0 0 1-93.090909 93.090909 89.088 89.088 0 0 1-93.09091-93.090909V110.848H113.524364a77.800727 77.800727 0 0 0-32.837819 10.938182 77.800727 77.800727 0 0 0-10.938181 32.837818v793.6a47.313455 47.313455 0 0 0 16.430545 32.837818 19.991273 19.991273 0 0 0 27.368727 10.938182h782.731637a77.800727 77.800727 0 0 0 32.837818-10.938182 47.313455 47.313455 0 0 0 16.430545-32.837818v-793.6a47.313455 47.313455 0 0 0-16.430545-32.837818 58.693818 58.693818 0 0 0-32.768-10.938182z m-202.542546 733.556364H316.136727a47.313455 47.313455 0 0 1-32.837818-16.430546 34.909091 34.909091 0 0 1 0-32.837818 39.563636 39.563636 0 0 1 32.837818-21.899636h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430545 34.909091 34.909091 0 0 1 0 32.837818 39.563636 39.563636 0 0 1-32.861091 21.899637z m0-180.619637H316.136727a47.313455 47.313455 0 0 1-32.837818-16.430545 34.909091 34.909091 0 0 1 0-32.837818 33.093818 33.093818 0 0 1 32.837818-16.430546h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430546 34.909091 34.909091 0 0 1 0 32.837818 47.313455 47.313455 0 0 1-32.861091 16.337454z m0-175.150545H316.136727a30.091636 30.091636 0 0 1-27.368727-16.430546 34.909091 34.909091 0 0 1 0-32.837818 33.093818 33.093818 0 0 1 32.837818-16.430545h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430545 34.909091 34.909091 0 0 1 0 32.837818 72.773818 72.773818 0 0 1-38.330182 16.337455z" fill="#2C93F5" ></path></symbol><symbol id="haiyue-shoukuang" viewBox="0 0 1024 1024"><path d="M373.853091 255.697455h240.151273c76.8 0 134.469818-163.281455 134.469818-163.281455-0.093091-48.058182-4.747636-86.458182-86.458182-86.458182-81.640727-4.794182-100.864 52.829091-163.281455 52.829091S407.482182 10.752 330.635636 1.140364c-72.145455-9.611636-86.458182 43.217455-86.458181 91.252363 0.023273 0 57.646545 163.304727 129.675636 163.304728z m259.351273 48.011636H373.853091C90.484364 303.709091 23.249455 860.811636 23.249455 860.811636c0 76.8 57.623273 148.945455 134.469818 148.945455h696.413091c72.145455 0 134.469818-72.145455 134.469818-148.945455-4.794182 0-72.029091-557.102545-355.397818-557.102545z m28.811636 432.244364a28.811636 28.811636 0 0 1 0 57.623272h-124.858182v81.640728a28.811636 28.811636 0 1 1-57.623273 0V793.6h-134.49309a28.811636 28.811636 0 1 1 0-57.623273h124.858181v-38.446545h-124.858181a28.811636 28.811636 0 0 1 0-57.623273h86.458181l-86.458181-163.281454a31.301818 31.301818 0 0 1 52.82909-33.629091l105.658182 187.298909h4.794182l105.658182-187.298909a31.301818 31.301818 0 1 1 52.829091 33.629091l-86.458182 153.6h81.640727a28.811636 28.811636 0 0 1 0 57.623272h-124.834909v38.493091h124.858182z m0 0" fill="#2C93F5" ></path></symbol></svg>',function(a){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var n,i,o,l,d,s=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}n=function(){var t,e=document.createElement("div");e.innerHTML=a._iconfont_svg_string_4480899,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?s(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(n,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),n()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=n,l=a.document,d=!1,h(),l.onreadystatechange=function(){"complete"==l.readyState&&(l.onreadystatechange=null,c())})}function c(){d||(d=!0,o())}function h(){try{l.documentElement.doScroll("left")}catch(t){return void setTimeout(h,50)}c()}}(window);
\ No newline at end of file
diff --git a/static/iconfont/iconfont.json b/static/iconfont/iconfont.json
index fb6df57..95d67dc 100644
--- a/static/iconfont/iconfont.json
+++ b/static/iconfont/iconfont.json
@@ -5,10 +5,17 @@
   "css_prefix_text": "haiyue",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "39769738",
+      "name": "注意",
+      "font_class": "-zhuyi",
+      "unicode": "e904",
+      "unicode_decimal": 59652
+    },
     {
       "icon_id": "39724446",
       "name": "切换",
-      "font_class": "qiehuan",
+      "font_class": "-qiehuan",
       "unicode": "e903",
       "unicode_decimal": 59651
     },
diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf
index a110853..1ad66fe 100644
Binary files a/static/iconfont/iconfont.ttf and b/static/iconfont/iconfont.ttf differ
diff --git a/static/iconfont/iconfont.woff b/static/iconfont/iconfont.woff
index d18ba36..b4791cf 100644
Binary files a/static/iconfont/iconfont.woff and b/static/iconfont/iconfont.woff differ
diff --git a/static/iconfont/iconfont.woff2 b/static/iconfont/iconfont.woff2
index eee4c3a..13a8abb 100644
Binary files a/static/iconfont/iconfont.woff2 and b/static/iconfont/iconfont.woff2 differ
diff --git a/utils/index.js b/utils/index.js
index f647c9e..dbc5975 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -81,6 +81,17 @@ export function silenceBindingSpread() {
 	}
 }
 
+let lastCall = 0;
+export function throttle(fn,delay){
+	
+    const now = new Date().getTime();
+    if(now-lastCall<delay){
+        return
+    }
+    lastCall = now
+    fn.apply(this,arguments)
+  
+}
 export function isWeixin() {
 	return navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1;
 }