diff --git a/components/popups/index.vue b/components/popups/index.vue
index 4b9b696..1c18754 100644
--- a/components/popups/index.vue
+++ b/components/popups/index.vue
@@ -6,7 +6,7 @@
 				<view class="paybox" v-if="isPay">
 					<view class="paybox-title">
 						<view class="paybox-title-left"></view>
-						<view class="paybox-title-middle">请输入支付密码</view>
+						<view class="paybox-title-middle">{{title}}</view>
 						<view class="paybox-titler-right" @click="handleClose">
 							<u-icon name="close" size="18" color="#666" />
 						</view>
@@ -56,7 +56,11 @@
 			isPay: { //区分支付密码还是输入数字
 				type: Boolean,
 				default: false
-			}
+			},
+      title: {
+        type: String,
+        default: '请输入支付密码'
+      }
 		},
 		data() {
 			return {
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index ff6e302..d775b70 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -255,7 +255,7 @@
 						<view class="item rel">
 							<view class="acea-row row-middle">
 								<text class="item-name">验证码</text>
-								<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
+								<input type="number" maxlength="4" placeholder="填写验证码" v-model="merchantData.yanzhengma"
 									@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
@@ -266,7 +266,7 @@
 						<view class="item" v-if="isShowCode">
 							<view class="acea-row row-middle">
 								<text class="item-name">验证码</text>
-								<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
+								<input type="number" maxlength="4" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
 									@input="validateBtn" placeholder-class='placeholder' />
 								<view class="imageCode" @click="again">
 									<image :src="codeUrl" />
@@ -306,8 +306,8 @@
 					</view>
 
 					<div class="title">{{detail.title}}</div>
-					<view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
-					<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view>
+					<!-- <view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
+					<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view> -->
 
 					<view class="contenta" v-if="detail.mer_services_agree">
 						<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
@@ -521,6 +521,7 @@
 					this.getGoodsDetails(options.mer_i_id)
 				})
 			} else this.getCity();
+      this.shoplist('mer_services_agree');
 			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
 		},
 
@@ -667,7 +668,7 @@
 				this.isType = false;
 				this.showProtocol = true;
 				// 获取配置
-				this.protocol = this.sys_intention_agree
+				this.protocol = this.sys_intention_agree;
 			},
 
 			/*获取发票说明*/
@@ -765,11 +766,12 @@
 				let idx = e.target.value
 				this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
 				this.mer_storeType = this.storeTypeArr[idx]['type_name']
-				if (this.storeTypeArr[idx]['type_code'] == 'TypeStore' && this.merchantData.mer_type) {
-					this.shoplist('mer_services_agree')
-				} else {
-					this.shoplist('mer_supply_agree')
-				}
+        this.shoplist('mer_services_agree')
+				// if (this.storeTypeArr[idx]['type_code'] == 'TypeStore' && this.merchantData.mer_type) {
+				// 	this.shoplist('mer_services_agree')
+				// } else {
+				// 	this.shoplist('mer_supply_agree')
+				// }
 				this.validateBtn()
 			},
 
@@ -1612,8 +1614,8 @@
 		position: fixed;
 		top: 0;
 		left: 0;
+    z-index: 12;
 		background: rgba(0, 0, 0, .5);
-		z-index: 10;
 	}
 
 	.settlementAgreement .setAgCount {
@@ -1682,7 +1684,7 @@
 		line-height: 22px;
 		text-align: justify;
 		text-justify: distribute-all-lines;
-		height: 75%;
+		height: 85%;
 		overflow-y: scroll;
 	}
 
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 88f63cd..4315e36 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -433,21 +433,32 @@
 					value: 'alipay',
 					title: '支付宝支付',
 					payStatus: this.$store.getters.globalData.alipay_open
-				}, {
+				}, 
+        {
 					name: "余额支付",
 					icon: "icon-yuezhifu",
 					value: 'balance',
 					title: '可用余额:',
 					number: 0,
 					payStatus: this.$store.getters.globalData.yue_pay_status
-				}, {
-					name: "对公转账",
-					icon: "icon-yuezhifu",
-					value: 'public',
-					title: '对公转账:',
-					number: 0,
-					payStatus: this.$store.getters.globalData.yue_pay_status
-				}],
+				}, 
+        {
+        	name: "商户余额",
+        	icon: "icon-yue2",
+        	value: 'merBalance',
+        	title: '可用余额:',
+        	number: 0,
+        	payStatus: 2
+        }, 
+    //     {
+				// 	name: "对公转账",
+				// 	icon: "icon-yinhangqia",
+				// 	value: 'public',
+				// 	title: '对公转账:',
+				// 	number: 0,
+				// 	payStatus: this.$store.getters.globalData.yue_pay_status
+				// },
+        ],
 				pay_close: false,
 				pay_order_id: '',
 				invoice_order_id: '',
@@ -467,6 +478,10 @@
 		watch: {
 
 		},
+    onLoad() {
+      let user = this.$store.state.app.userInfo;
+      if(user.mer_info) this.initMerInfo(user);
+    },
 		onShow() {
 			if (this.isLogin) {
 				this.page = 1;
@@ -489,10 +504,20 @@
 					url: "/pages/order_addcart/order_addcart"
 				})
 			},
-
 			navBack() {
 				uni.navigateBack();
 			},
+      initMerInfo(user){
+        this.mer_info = user;
+        if(this.mer_info.mer_settlement_agree_status){
+          this.payMode.forEach(item=>{
+            if(item.value=='merBalance') {
+              item.payStatus = 1;
+              item.number = this.mer_info.mer_money;
+            }
+          })
+        }
+      },
 			changeSaleType(type = 1) {
 				if (type != this.sale_type) {
 					this.sale_type = type;
@@ -531,7 +556,7 @@
 				let that = this;
 				getUserInfo().then(res => {
 					that.payMode[2].number = res.data.now_money;
-					this.mer_info = res.data.mer_info;
+					if(res.data.mer_info) that.initMerInfo(res.data.mer_info);
 				});
 			},
 			/**
diff --git a/pages/users/user_modify_pwd/index.vue b/pages/users/user_modify_pwd/index.vue
index 19b309a..2e0ff8b 100644
--- a/pages/users/user_modify_pwd/index.vue
+++ b/pages/users/user_modify_pwd/index.vue
@@ -16,14 +16,26 @@
 							</button>
 						</view>
 						<view class="border"></view>
-						<view class="item">
-							<input type='password' :placeholder="type == 'payPwd'?'请设置支付密码':'新密码'"
-								placeholder-class='placeholder' v-model="password" autocomplete="off"></input>
-						</view>
-						<view class="item">
-							<input type='password' :placeholder="type == 'payPwd'?'请再次设置支付密码':'新密码'"
-								placeholder-class='placeholder' v-model="repassword" autocomplete="off"></input>
-						</view>
+            <block v-if="type == 'payPwd'">
+              <view class="item" @click="showPopup(1)">
+              	<input style="pointer-events: none;" type='password' placeholder="请设置支付密码"
+              		placeholder-class='placeholder' v-model="password" autocomplete="off"></input>
+              </view>
+              <view class="item" @click="showPopup(2)">
+              	<input style="pointer-events: none;" type='password' placeholder="请再次设置支付密码"
+              		placeholder-class='placeholder' v-model="repassword" autocomplete="off"></input>
+              </view>
+            </block>
+						<block v-else>
+						  <view class="item">
+						  	<input type='password' placeholder="请设置密码"
+						  		placeholder-class='placeholder' v-model="password" autocomplete="off"></input>
+						  </view>
+						  <view class="item">
+						  	<input type='password' placeholder="请再次设置密码"
+						  		placeholder-class='placeholder' v-model="repassword" autocomplete="off"></input>
+						  </view>
+						</block>
 					</view>
 				</view>
 				<button form-type="submit" @click="confirmSubmit" class="confirmBnt">确认</button>
@@ -31,6 +43,7 @@
 		</form>
 		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
 			ref="verify"></Verify>
+    <popups ref="popups" isPay title="请设置支付密码" @confirm="handleConfirm" @clear="handleClear" @change="handleChange"></popups>
 	</view>
 </template>
 
@@ -64,10 +77,12 @@
 		toLogin
 	} from '@/libs/login.js';
 	import Verify from '@/components/verify/verify.vue';
+  import popups from "@/components/popups/index.vue";
 	export default {
 		mixins: [sendVerifyCode],
 		components: {
-			Verify
+			Verify,
+      popups
 		},
 		data() {
 			return {
@@ -79,7 +94,8 @@
 				key: '',
 				codeVal: '',
 				disabled: false,
-				type: ''
+				type: '',
+        set_type: '',
 			};
 		},
 		computed: mapGetters(['isLogin', 'viewColor']),
@@ -113,6 +129,18 @@
 					that.userInfo = res.data
 				});
 			},
+      showPopup(type){
+        this.set_type = type;
+        this.$refs.popups.handleOpen();
+      },
+      // 输入密码回调
+      handleConfirm(e) {
+        if(this.set_type==1)this.password = e;
+        else this.repassword = e;
+      },
+      
+      handleClear() {},
+      handleChange() {},
 
 			confirmSubmit: function() {
 				let that = this;