android添加银行插件
diff --git a/pages/sub_mine/accountSafe/index.vue b/pages/sub_mine/accountSafe.vue
similarity index 87%
rename from pages/sub_mine/accountSafe/index.vue
rename to pages/sub_mine/accountSafe.vue
index 8a536bd..84cfdb3 100644
--- a/pages/sub_mine/accountSafe/index.vue
+++ b/pages/sub_mine/accountSafe.vue
@@ -19,14 +19,15 @@
 				style:{},
 				titleStyle:{'font-family':'PingFang-SC-Medium','fontSize':'28rpx','marginLeft':'30rpx'},
 				list:[
-					{name:"签约绑卡",icon:"sign",path:"/pages/sub_mine/bindBankCard/index"},
-					{name:"指纹/手势/人脸登录",icon:"login",path:"/pages/sub_mine/otherLogin/index"},
-					{name:"修改登录密码",icon:"phone",path:"/pages/sub_mine/changeLoginPwd/index"},
-					{name:"设置支付密码",icon:"pay",path:"/pages/sub_mine/changePayPwd/index"},
-					{name:"支付(指纹)",icon:"finger",path:"/pages/sub_mine/otherPay/index"},
-					{name:"挂失",icon:"gs",path:"/pages/sub_mine/reportheLoss/index"},
-					{name:"设置邮箱",icon:"email",path:"/pages/sub_mine/bindEmail/index"},
-					{name:"设置密保",icon:"mibao",path:"/pages/sub_mine/question/index"},
+					{name:"签约绑卡",icon:"sign",path:"/pages/sub_mine/bindBankCard"},
+					{name:"签约商户管理",icon:"shop",path:"/pages/sub_mine/shop"},
+					{name:"指纹/手势/人脸登录",icon:"login",path:"/pages/sub_mine/otherLogin"},
+					{name:"修改登录密码",icon:"phone",path:"/pages/sub_mine/changeLoginPwd"},
+					{name:"设置支付密码",icon:"pay",path:"/pages/sub_mine/changePayPwd"},
+					{name:"支付(指纹)",icon:"finger",path:"/pages/sub_mine/otherPay"},
+					{name:"挂失",icon:"gs",path:"/pages/sub_mine/reportheLoss"},
+					{name:"设置邮箱",icon:"email",path:"/pages/sub_mine/bindEmail"},
+					{name:"设置密保",icon:"mibao",path:"/pages/sub_mine/question"},
 				]
 			}
 		},
@@ -39,11 +40,11 @@
 				let that = this
 				if(signed == "yes"){
 					uni.navigateTo({
-						url:'/pages/sub_mine/unbindBankCard/index'
+						url:'/pages/sub_mine/unbindBankCard'
 					})
 				}else{
 					uni.navigateTo({
-						url:'/pages/sub_mine/bindBankCard/index'
+						url:'/pages/sub_mine/bindBankCard'
 					})
 				}
 			}
diff --git a/pages/sub_mine/agreement/index.vue b/pages/sub_mine/agreement.vue
similarity index 100%
rename from pages/sub_mine/agreement/index.vue
rename to pages/sub_mine/agreement.vue
diff --git a/pages/sub_mine/agreementSign/index.vue b/pages/sub_mine/agreementSign.vue
similarity index 100%
rename from pages/sub_mine/agreementSign/index.vue
rename to pages/sub_mine/agreementSign.vue
diff --git a/pages/sub_mine/billsDetails/index.vue b/pages/sub_mine/billsDetails.vue
similarity index 100%
rename from pages/sub_mine/billsDetails/index.vue
rename to pages/sub_mine/billsDetails.vue
diff --git a/pages/sub_mine/bindBankCard/index.vue b/pages/sub_mine/bindBankCard.vue
similarity index 77%
rename from pages/sub_mine/bindBankCard/index.vue
rename to pages/sub_mine/bindBankCard.vue
index 515d7fd..0525ae3 100644
--- a/pages/sub_mine/bindBankCard/index.vue
+++ b/pages/sub_mine/bindBankCard.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="bindBankCard">
 		<view class="bindBankCard-list">
-			<u-field v-model="name" label="姓名" placeholder="请输入您的真实姓名" placeholder-style="color:#999999;font-family:PingFang-SC-Regular" clear-size="40"></u-field>
+			<u-field v-model="name" label="姓名" placeholder="请输入您的真实姓名" placeholder-style="color:#999999;font-family:PingFang-SC-Regular"
+			 clear-size="40"></u-field>
 			<u-field @click="showPicker" v-model="cardtype" :disabled="true" label="证件类型" clear-size="40"></u-field>
 			<u-field v-model="idno" label="证件号" placeholder="请输入您的证件号" placeholder-style="color:#999999" clear-size="40"></u-field>
 			<u-field v-model="cardno" label="银行卡号" placeholder="请输入市民卡对应的银行卡号" placeholder-style="color:#999999" clear-size="40"></u-field>
@@ -25,10 +26,10 @@
 				isShowPicker: false,
 				checked: false,
 				arr: [],
-				idtype:"",
-				disabled:false,
-				signed:"",
-				bindBankCardBtn:{
+				idtype: "",
+				disabled: false,
+				signed: "",
+				bindBankCardBtn: {
 					width: '600rpx',
 					backgroundColor: '#2FA8E1',
 					color: '#FFFFFF',
@@ -45,16 +46,23 @@
 		onLoad() {
 			this.getType()
 			let signed = wx.getStorageSync("signed")
-			if(signed=="no"){
+			if (signed == "no") {
 				this.signed = false
-			}else{
+			} else {
 				this.signed = true
 			}
 		},
 		methods: {
-			bindBackCard(){
-				let that =this
-				let {cardno,idtype,name,idno,checked,code} =that
+			bindBackCard() {
+				let that = this
+				let {
+					cardno,
+					idtype,
+					name,
+					idno,
+					checked,
+					code
+				} = that
 				if (name == "") {
 					uni.showToast({
 						title: "请填写您的姓名",
@@ -96,13 +104,14 @@
 					return false
 				}
 				var param = {
-				    "cardno": cardno.trim(),
-				    "idtype": idtype,
-				    "name": name,
-				    "idno": idno.trim()
+					"cardno": cardno.trim(),
+					"idtype": idtype,
+					"name": name,
+					"idno": idno.trim()
 				}
-				that.$u.post("/v1/bindcard",param).then((res)=>{
-					uni.setStorageSync("name",name)
+				that.$u.post("/v1/bindcard", param).then((res) => {
+					let isBind = res.signed
+					uni.setStorageSync("name", name)
 					uni.setStorageSync("cardno", cardno.trim())
 					uni.setStorageSync("idtype", idtype)
 					uni.setStorageSync("idno", idno.trim())
@@ -111,29 +120,45 @@
 					uni.setStorageSync("userid", res.personid)
 					uni.setStorageSync("signed", res.signed)
 					uni.setStorageSync("paypwdset", res.paypwdset)
-					uni.showToast({
-						title: "绑定成功",
-						icon: "none",
-						duration: 800,
-						complete(res) {
-							setTimeout(() => {
-								uni.navigateTo({
-									url:"/pages/sub_mine/bindSxy/index"
-								})
-							}, 1500)
-						}
-					})
+					if (isBind == 'yes') {
+						uni.showToast({
+							title: '账户已绑定',
+							icon: 'none',
+							duration: 800,
+							success(res) {
+								setTimeout(() => {
+									uni.navigateBack({
+										delta: 1
+									})
+								}, 1500)
+							}
+						})
+					} else {
+						uni.showToast({
+							title: "绑定成功",
+							icon: "none",
+							duration: 800,
+							complete(res) {
+								setTimeout(() => {
+									uni.navigateTo({
+										url: "/pages/sub_mine/bindSxy"
+									})
+								}, 1500)
+							}
+						})
+					}
+
 				})
 			},
 			getType() {
 				let that = this
 				that.$u.post("/v1/idtypes", {}).then((res) => {
 					let arr = []
-					let arr1 =[]
+					let arr1 = []
 					for (let i in res.idtypes) {
 						let obj = {
-							name:i,
-							value:res.idtypes[i]
+							name: i,
+							value: res.idtypes[i]
 						}
 						arr.push(obj)
 						arr1.push(res.idtypes[i])
@@ -163,7 +188,8 @@
 		background-color: #F3F3F3;
 		overflow: hidden;
 		padding-bottom: 30rpx;
-		&-toast{
+
+		&-toast {
 			display: flex;
 			padding: 20rpx 30rpx;
 			font-family: "PingFang-SC-Medium";
diff --git a/pages/sub_mine/bindEmail/index.vue b/pages/sub_mine/bindEmail.vue
similarity index 100%
rename from pages/sub_mine/bindEmail/index.vue
rename to pages/sub_mine/bindEmail.vue
diff --git a/pages/sub_mine/bindSxy/index.vue b/pages/sub_mine/bindSxy.vue
similarity index 96%
rename from pages/sub_mine/bindSxy/index.vue
rename to pages/sub_mine/bindSxy.vue
index c473f69..31a1c68 100644
--- a/pages/sub_mine/bindSxy/index.vue
+++ b/pages/sub_mine/bindSxy.vue
@@ -6,7 +6,7 @@
 			</u-field>
 		</view>
 		<view class="bindSxy-lay">
-			<u-checkbox v-model="checked" shape="circle" label-size="24">我已同意<text class="bindSxy-lay-text" @click="toPath('/pages/sub_mine/agreementSign/index')">《市民卡免密代扣签约协议》</text></u-checkbox>
+			<u-checkbox v-model="checked" shape="circle" label-size="24">我已同意<text class="bindSxy-lay-text" @click="toPath('/pages/sub_mine/agreementSign')">《市民卡免密代扣签约协议》</text></u-checkbox>
 		</view>
 		<u-button :custom-style="bindSxyBtn"  @click="bindSxy">提交</u-button>
 	</view>
diff --git a/pages/sub_mine/cashFlow/index.vue b/pages/sub_mine/cashFlow.vue
similarity index 97%
rename from pages/sub_mine/cashFlow/index.vue
rename to pages/sub_mine/cashFlow.vue
index 6a66219..f175e83 100644
--- a/pages/sub_mine/cashFlow/index.vue
+++ b/pages/sub_mine/cashFlow.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-	import RingChart from '../z_component/stan-ucharts/RingChart.vue';
+	import RingChart from './components/stan-ucharts/RingChart.vue';
 	// import vtabs from '@/components/v-tabs/v-tabs.vue';
 	export default {
 		components: {
@@ -190,7 +190,7 @@
 			toDetails(e) {
 				let data = JSON.stringify(e)
 				uni.navigateTo({
-					url: "/pages/sub_mine/billsDetails/index?data=" + data
+					url: "/pages/sub_mine/billsDetails?data=" + data
 				})
 			},
 			getSrcollViewHeight() {
diff --git a/pages/sub_mine/changeLoginPwd/index.vue b/pages/sub_mine/changeLoginPwd.vue
similarity index 100%
rename from pages/sub_mine/changeLoginPwd/index.vue
rename to pages/sub_mine/changeLoginPwd.vue
diff --git a/pages/sub_mine/changePayPwd/index.vue b/pages/sub_mine/changePayPwd.vue
similarity index 97%
rename from pages/sub_mine/changePayPwd/index.vue
rename to pages/sub_mine/changePayPwd.vue
index 5fda242..6831b9e 100644
--- a/pages/sub_mine/changePayPwd/index.vue
+++ b/pages/sub_mine/changePayPwd.vue
@@ -34,7 +34,7 @@
 		methods: {
 			toForgetPwd() {
 				uni.navigateTo({
-					url: "/pages/sub_mine/findPayPwd/index"
+					url: "/pages/sub_mine/findPayPwd"
 				})
 			},
 			changePayPwd() {
diff --git a/pages/sub_mine/z_component/mpvueGestureLock/gestureLock.js b/pages/sub_mine/components/mpvueGestureLock/gestureLock.js
similarity index 100%
rename from pages/sub_mine/z_component/mpvueGestureLock/gestureLock.js
rename to pages/sub_mine/components/mpvueGestureLock/gestureLock.js
diff --git a/pages/sub_mine/z_component/mpvueGestureLock/index.vue b/pages/sub_mine/components/mpvueGestureLock/index.vue
similarity index 100%
rename from pages/sub_mine/z_component/mpvueGestureLock/index.vue
rename to pages/sub_mine/components/mpvueGestureLock/index.vue
diff --git a/pages/sub_mine/z_component/stan-ucharts/RingChart.vue b/pages/sub_mine/components/stan-ucharts/RingChart.vue
similarity index 100%
rename from pages/sub_mine/z_component/stan-ucharts/RingChart.vue
rename to pages/sub_mine/components/stan-ucharts/RingChart.vue
diff --git a/pages/sub_mine/z_component/stan-ucharts/u-charts.min.js b/pages/sub_mine/components/stan-ucharts/u-charts.min.js
similarity index 100%
rename from pages/sub_mine/z_component/stan-ucharts/u-charts.min.js
rename to pages/sub_mine/components/stan-ucharts/u-charts.min.js
diff --git a/pages/sub_mine/findPayPwd/index.vue b/pages/sub_mine/findPayPwd.vue
similarity index 100%
rename from pages/sub_mine/findPayPwd/index.vue
rename to pages/sub_mine/findPayPwd.vue
diff --git a/pages/sub_mine/images/integral/bannar.png b/pages/sub_mine/images/integral/bannar.png
new file mode 100644
index 0000000..4207c21
--- /dev/null
+++ b/pages/sub_mine/images/integral/bannar.png
Binary files differ
diff --git a/pages/sub_mine/integral/index.vue b/pages/sub_mine/integral.vue
similarity index 98%
rename from pages/sub_mine/integral/index.vue
rename to pages/sub_mine/integral.vue
index 9047c76..716a2a1 100644
--- a/pages/sub_mine/integral/index.vue
+++ b/pages/sub_mine/integral.vue
@@ -5,7 +5,7 @@
 				<text>您当前共有</text>
 				<text class="integral-bannar-left-num"><text class="big">{{value}}</text>积分</text>
 			</view>
-			<view class="integral-bannar-btn" @click="toPath('/pages/sub_mine/integralQuery/index')">
+			<view class="integral-bannar-btn" @click="toPath('/pages/sub_mine/integralQuery')">
 				积分查询
 			</view>
 		</view>
@@ -29,9 +29,7 @@
 		</view>
 		<view class="integral-toast">
 			<view class="integral-toast-title">活动规则:</view>
-			<view>1.积分使用期限为1年,若1年内未兑换,将自动清空</view>
-			<view>2.积分不得转让或买卖</view>
-			<view>3.请正确合理使用积分</view>
+			<u-parse :html="text" :lazy-load="true" style="white-space: pre-wrap;"></u-parse>
 		</view>
 	</view>
 </template>
@@ -79,7 +77,8 @@
 						isFinish: false,
 						taskname: "首次兑换积分"
 					},
-				]
+				],
+				text:''
 			}
 		},
 		methods: {
@@ -154,13 +153,20 @@
 				that.$u.get("/v1/point/total", {}).then(res => {
 					that.value = res.data
 				})
+			},
+			get_rule() {
+				let that = this
+				that.$u.get('/i/prompt/get/pointRules',).then(res => {
+					let content = res.prompt
+					that.text = content.replace(/\n/g,"<br/>")
+				})
 			}
-
 		},
 		onLoad() {
 			let that = this
 			that.getIntegralStatus()
 			that.getIntegralTotals()
+			that.get_rule()
 		}
 	}
 </script>
@@ -174,7 +180,7 @@
 		font-family: "PingFang-SC-Medium";
 
 		&-bannar {
-			background-image: url(/static/images/integral/bannar.png);
+			background-image: url(./images/integral/bannar.png);
 			background-position: top;
 			background-repeat: no-repeat;
 			background-size: cover;
diff --git a/pages/sub_mine/integralQuery/index.vue b/pages/sub_mine/integralQuery.vue
similarity index 100%
rename from pages/sub_mine/integralQuery/index.vue
rename to pages/sub_mine/integralQuery.vue
diff --git a/pages/sub_mine/leaveMsg/index.vue b/pages/sub_mine/leaveMsg.vue
similarity index 100%
rename from pages/sub_mine/leaveMsg/index.vue
rename to pages/sub_mine/leaveMsg.vue
diff --git a/pages/sub_mine/leaveMsgDetail/index.vue b/pages/sub_mine/leaveMsgDetail.vue
similarity index 97%
rename from pages/sub_mine/leaveMsgDetail/index.vue
rename to pages/sub_mine/leaveMsgDetail.vue
index 58bf971..624fbf3 100644
--- a/pages/sub_mine/leaveMsgDetail/index.vue
+++ b/pages/sub_mine/leaveMsgDetail.vue
@@ -19,7 +19,7 @@
 		<view class="leaveMsgDetail-items"  v-if="leaveMsgDate.replystatus == '1'">
 			<view class="leaveMsgDetail-items-desc">
 				<view class="leaveMsgDetail-items-desc-left">
-					<u-avatar src="/static/images/login/logo.png" size="112"></u-avatar>
+					<u-avatar src="/pages/sub_basic/images/login/logo.png" size="112"></u-avatar>
 				</view>
 				<view class="leaveMsgDetail-items-desc-right">
 					<view class="leaveMsgDetail-items-desc-right-author">
diff --git a/pages/sub_mine/lock/index.vue b/pages/sub_mine/lock.vue
similarity index 95%
rename from pages/sub_mine/lock/index.vue
rename to pages/sub_mine/lock.vue
index 547e5b0..72aa6f8 100644
--- a/pages/sub_mine/lock/index.vue
+++ b/pages/sub_mine/lock.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-	import mpvueGestureLock from '../z_component/mpvueGestureLock/index.vue';
+	import mpvueGestureLock from './components/mpvueGestureLock/index.vue';
 	const app = getApp()
 	export default {
 		components: {
@@ -25,6 +25,9 @@
 			}
 		},
 		onLoad() {
+			//#ifdef MP-WEIXIN
+			 wx.hideHomeButton();
+			 //#endif
 			let pwd = wx.getStorageSync("hands")
 			if (pwd) {
 				this.password = pwd
@@ -81,7 +84,7 @@
 					uni.setStorageSync("email", res.email)
 					if(res.needcheck){
 						uni.navigateTo({
-							url:'/pages/sub_basic/verification/index?data=' + JSON.stringify(params)
+							url:'/pages/sub_basic/verification?data=' + JSON.stringify(params)
 						})
 						return false
 					}
diff --git a/pages/sub_mine/message/index.vue b/pages/sub_mine/message.vue
similarity index 64%
rename from pages/sub_mine/message/index.vue
rename to pages/sub_mine/message.vue
index 6eba995..e764ad8 100644
--- a/pages/sub_mine/message/index.vue
+++ b/pages/sub_mine/message.vue
@@ -11,7 +11,7 @@
 				<scroll-view :scroll-y="true" class="scrollView" @scrolltolower="getMoreLeaveList">
 					<u-swipe-action :show="v.show" :index="i"
 					 v-for="(v, i) in leaveMsg" :key="v.fbid"
-					 @content-click="toPath('/pages/sub_mine/leaveMsgDetail/index?id='+v.fbid)"
+					 @content-click="toPath('/pages/sub_mine/leaveMsgDetail?id='+v.fbid)"
 					 @click="click"
 					 @open="open"
 					 @close="close"
@@ -28,7 +28,23 @@
 					<u-loadmore :status="status" :icon-type="iconType" :load-text="loadText" margin-top="30" />
 				</scroll-view>
 			</view>
-			<u-empty text="暂无消息" mode="message" margin-top="300" v-if="current !=1"></u-empty>
+			<view v-if="current==0">
+				<scroll-view :scroll-y="true" class="scrollView" @scrolltolower="getMoreSystemList">
+					<u-swipe-action  :index="i"
+					 v-for="(v, i) in system_list" :key="v.fbid"
+					 @content-click="toPath('/pages/sub_mine/billsDetails?data='+JSON.stringify(v))">
+						<view class="item u-border-bottom">
+							<view class="title-wrap">
+								<u-cell-group :border="false">
+									<u-cell-item :title="v.content" :arrow="true" :label="v.date" value="查看详情" :center="true"></u-cell-item>
+								</u-cell-group>
+							</view>
+						</view>
+					</u-swipe-action>
+					<u-loadmore :status="status_system" :icon-type="iconType" :load-text="loadText" margin-top="30" />
+				</scroll-view>
+			</view>
+			<u-empty text="暂无消息" mode="message" margin-top="300" v-if="current ==2 "></u-empty>
 		</view>
 
 	</view>
@@ -53,9 +69,12 @@
 					nomore: '暂无更多'
 				},
 				status: "loadmore",
+				status_system:'nomore',
 				iconType: 'circle',
-				pageno: 1,
+				pageno_system: 1,
+				pageno:1,
 				leaveMsg: [],
+				system_list:[],
 				options: [{
 					text: '删除',
 					style: {
@@ -71,6 +90,9 @@
 				that.leaveMsg.forEach(item => {
 					item.show = false
 				})
+				if(index==0 && that.system_list.length ==0){
+					this.getSystemMsgList(this.pageno_system)
+				}
 			},
 			open(index) {
 				let that = this
@@ -146,12 +168,58 @@
 
 				})
 			},
+			getSystemMsgList(no) {
+				let that = this
+				let params = {
+					pageno: no,
+					pagesize: 10
+				}
+				that.$u.get("/v1/pushmsg/list", params).then(res => {
+					let list = res.data.data
+					let total = res.data.totalCount
+					let page = res.data.totalPages
+					if (no > page) {
+						that.status_system = "nomore"
+						return false
+					}
+					console.log(total,list.length)
+					if (list.length) {
+						if (list.length >= total) {
+							that.status_system = "nomore"
+						} else {
+							that.status_system = "loadmore"
+							that.pageno_system += 1
+						}
+						list.forEach(item => {
+							item.status = 'success'
+							item.date = item.lastupdate.substr(0, 4) + "-" + item.lastupdate.substr(4, 2) + "-" + item.lastupdate.substr(6, 2) +
+								" " + item.lastupdate.substr(8, 2) + ":" + item.lastupdate.substr(10, 2) + ":" + item.lastupdate.substr(12, 2);
+							item.show = false
+						})
+						that.system_list = that.system_list.concat(list)
+						//console.log(list)
+					} else {
+						that.system_list = that.system_list.concat(list)
+						that.status_system = "nomore"
+					}
+			
+				}).catch(res=>{
+					that.system_list = []
+				})
+			},
 			getMoreLeaveList() {
 				let that = this
 				let pageno = that.pageno
 				if (that.status != "nomore") {
 					that.getLeaveMsgList(pageno)
 				}
+			},
+			getMoreSystemList() {
+				let that = this
+				let pageno = that.pageno_system
+				if (that.status_system != "nomore") {
+					that.getSystemMsgList(pageno)
+				}
 			}
 		},
 		onLoad() {
diff --git a/pages/sub_mine/otherLogin/index.vue b/pages/sub_mine/otherLogin.vue
similarity index 86%
rename from pages/sub_mine/otherLogin/index.vue
rename to pages/sub_mine/otherLogin.vue
index b3508ab..b290497 100644
--- a/pages/sub_mine/otherLogin/index.vue
+++ b/pages/sub_mine/otherLogin.vue
@@ -51,14 +51,12 @@
 									title:'开启指纹解锁成功',
 									icon:'none'
 								})
-								//plus.nativeUI.toast("开启指纹解锁成功");
 								that.fingerprint = true
 							} else {
 								uni.showToast({
 									title:'该设备不支持指纹解锁',
 									icon:'none'
 								})
-								//plus.nativeUI.toast("该设备不支持指纹解锁");
 								that.fingerprint = false
 							}
 						},
@@ -67,7 +65,6 @@
 								title:'开启指纹解锁失败',
 								icon:'none'
 							})
-							//plus.nativeUI.toast("开启指纹解锁失败");
 							that.fingerprint = false
 						}
 					})
@@ -88,7 +85,6 @@
 									title:'该设备不支持面容解锁',
 									icon:'none'
 								})
-								//plus.nativeUI.toast("该设备不支持面容解锁");
 								that.face = false
 							} else {
 								uni.showToast({
@@ -97,7 +93,6 @@
 								})
 								uni.setStorageSync("face", true)
 								that.face = true
-								//plus.nativeUI.toast("开启棉柔解锁成功");
 							}
 						},
 						fail(res) {
@@ -105,7 +100,6 @@
 								title:'开启面容识别失败',
 								icon:'none'
 							})
-							//plus.nativeUI.toast("开启面容识别失败");
 							that.face = false
 						}
 					})
@@ -116,7 +110,7 @@
 			openHands(e) {
 				if (e) {
 					uni.navigateTo({
-						url: "/pages/sub_mine/lock/index"
+						url: "/pages/sub_mine/lock"
 					})
 				} else {
 					uni.showModal({
@@ -125,7 +119,7 @@
 						success: (res) => {
 							if (res.confirm) {
 								uni.navigateTo({
-									url: "/pages/sub_mine/lock/index"
+									url: "/pages/sub_mine/lock"
 								})
 							} else if (res.cancel) {
 								this.hands = true
@@ -149,12 +143,10 @@
 	// 					this.fingerprint = true
 	// 				},
 	// 				fail(res) {
-	// 					plus.nativeUI.toast("使用指纹失败");
 	// 					this.fingerprint = false
 	// 				}
 	// 			})
 	// 		} else {
-	// 			plus.nativeUI.toast("没有录入指纹");
 	// 			this.fingerprint = false
 	// 		}
 	// 	},
diff --git a/pages/sub_mine/otherPay/index.vue b/pages/sub_mine/otherPay.vue
similarity index 100%
rename from pages/sub_mine/otherPay/index.vue
rename to pages/sub_mine/otherPay.vue
diff --git a/pages/sub_mine/personalMsg/index.vue b/pages/sub_mine/personalMsg.vue
similarity index 100%
rename from pages/sub_mine/personalMsg/index.vue
rename to pages/sub_mine/personalMsg.vue
diff --git a/pages/sub_mine/question/index.vue b/pages/sub_mine/question.vue
similarity index 95%
rename from pages/sub_mine/question/index.vue
rename to pages/sub_mine/question.vue
index 8fd7082..17b0ede 100644
--- a/pages/sub_mine/question/index.vue
+++ b/pages/sub_mine/question.vue
@@ -20,7 +20,7 @@
 			open(e) {
 				if (e) {
 					uni.navigateTo({
-						url: '/pages/sub_mine/setQuestion/index'
+						url: '/pages/sub_mine/setQuestion'
 					})
 				} else {
 					uni.showModal({
diff --git a/pages/sub_mine/reportheLoss/index.vue b/pages/sub_mine/reportheLoss.vue
similarity index 100%
rename from pages/sub_mine/reportheLoss/index.vue
rename to pages/sub_mine/reportheLoss.vue
diff --git a/pages/sub_mine/setQuestion/index.vue b/pages/sub_mine/setQuestion.vue
similarity index 81%
rename from pages/sub_mine/setQuestion/index.vue
rename to pages/sub_mine/setQuestion.vue
index c746443..d82ced2 100644
--- a/pages/sub_mine/setQuestion/index.vue
+++ b/pages/sub_mine/setQuestion.vue
@@ -6,7 +6,15 @@
 				 @click="choose_list(i,'confirm'+i)"></u-field>
 				<u-field :label="v.a_title" :field-style="field_style" v-model="v.a_value" input-align='right' placeholder="请输入您的答案"
 				 maxlength="20"></u-field>
-				<u-picker mode="selector" v-model="v.isShow" :default-selector="[i]" :range="list" range-key="question" @confirm="v.func"></u-picker>
+				 <!-- #ifdef APP-PLUS -->
+				 <u-picker mode="selector" v-model="v.isShow" :default-selector="[i]" :range="list" range-key="question" @confirm="v.func"></u-picker>
+				 <!-- #endif -->
+				 
+				 #<!-- #ifdef MP-WEIXIN -->
+				 <u-picker mode="selector" v-model="list_select[0].isShow" :default-selector="[i]" :range="list" range-key="question" @confirm="confirm0"></u-picker>
+				 <u-picker mode="selector" v-model="list_select[1].isShow" :default-selector="[i]" :range="list" range-key="question" @confirm="confirm1"></u-picker>
+				 <u-picker mode="selector" v-model="list_select[2].isShow" :default-selector="[i]" :range="list" range-key="question" @confirm="confirm2"></u-picker>
+				 <!-- #endif -->
 			</view>
 		</view>
 		<u-button @click="submit" :custom-style="submit_btn">保存密保</u-button>
@@ -38,7 +46,7 @@
 						a_value: '',
 						a_title: 'A1:',
 						isShow: false,
-						func: null
+						func: function(){}
 					},
 					{
 						q_title: 'Q2:',
@@ -46,7 +54,7 @@
 						a_value: '',
 						a_title: 'A2:',
 						isShow: false,
-						func: null
+						func: function(){}
 					},
 					{
 						q_title: 'Q3:',
@@ -54,7 +62,7 @@
 						a_value: '',
 						a_title: 'A3:',
 						isShow: false,
-						func: null
+						func: function(){}
 					},
 				],
 				answers: [{
@@ -91,14 +99,17 @@
 			confirm0(e) {
 				this.list_select[0].q_value = this.list[e[0]].question
 				this.list_select[0].ssid = this.list[e[0]].ssid
+				this.list_select[0].isShow = false
 			},
 			confirm1(e) {
 				this.list_select[1].q_value = this.list[e[0]].question
 				this.list_select[1].ssid = this.list[e[0]].ssid
+				this.list_select[1].isShow = false
 			},
 			confirm2(e) {
 				this.list_select[2].q_value = this.list[e[0]].question
 				this.list_select[2].ssid = this.list[e[0]].ssid
+				this.list_select[2].isShow = false
 			},
 			submit() {
 				let that = this
diff --git a/pages/sub_mine/setting.vue b/pages/sub_mine/setting.vue
new file mode 100644
index 0000000..b19ae8a
--- /dev/null
+++ b/pages/sub_mine/setting.vue
@@ -0,0 +1,36 @@
+<template>
+	<view class="setting">
+		<u-cell-group>
+			<u-cell-item title="通知功能" :arrow="false">
+				<u-icon slot="icon" size="32" name="notice"></u-icon>
+				<u-switch slot="right-icon" v-model="is_open" @change="notice"></u-switch>
+			</u-cell-item>
+		</u-cell-group>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				is_open: true,
+			}
+		},
+		onShow() {
+			let is_notice = uni.getStorageSync('is_notice')
+			this.is_open = is_notice
+		},
+		onLoad() {
+
+		},
+		methods: {
+			notice(e) {
+				uni.setStorageSync('is_notice', e)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/pages/sub_mine/shop.vue b/pages/sub_mine/shop.vue
new file mode 100644
index 0000000..f7b9f54
--- /dev/null
+++ b/pages/sub_mine/shop.vue
@@ -0,0 +1,98 @@
+<template>
+	<view class="shop">
+		<view class="shop-item" v-for="(v,i) in list" :key="i">
+			<view class="shop-item-detail">
+				<text class="shop-item-detail-shopname">{{v.shopname}}</text>
+				<text class="shop-item-detail-signtime">签约时间:{{v.sign_date}}</text>
+			</view>
+			<view class="shop-item-unsign" @click="unsign(v)">
+				<text>解约</text>
+			</view>
+		</view>
+		<u-empty text="暂无签约商户" mode="order" margin-top="300" :show="!!!list.length"></u-empty>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				list:[]
+			}
+		},
+		methods:{
+			get_shop_list(){
+				let that = this
+				that.$u.get('/medicalapi/user/hospital/list').then(res=>{
+					let list = res.data
+					if(!list.length) return
+					list.forEach(item=>{
+						item.sign_date = item.signtime.substr(0,4) + '-' +item.signtime.substr(4,2) + '-' +item.signtime.substr(6,2) + ' ' +item.signtime.substr(8,2) + ':' +item.signtime.substr(10,2) + ':' +item.signtime.substr(12,2)
+					})
+					that.list = list
+				})
+			},
+			unsign(data){
+				let bankcardno = data.bankcardno
+				let hospitalcode = data.hospitalcode
+				let params = {
+					hospitalcode,bankcardno
+				}
+				this.$u.post('/medicalapi/quickpay/signcancel',params).then(res=>{
+					uni.showToast({
+						title:'解约成功',
+						icon:'none',
+						complete(res) {
+							uni.navigateBack({
+								delta:1
+							})
+						}
+					})
+				})
+			},
+		},
+		onLoad(){
+			this.get_shop_list()
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.shop{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 30rpx;
+		&-item{
+			width: 650rpx;
+			display: flex;
+			align-items: center;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 30rpx;
+			justify-content: space-between;
+			margin-bottom: 30rpx;
+			&-detail{
+				display: flex;
+				flex-direction: column;
+				flex: 5;
+				&-shopname{
+					font-size: 40rpx;
+					margin-bottom: 50rpx;
+				}
+				&-signtime{
+					font-size: 26rpx;
+				}
+			}
+			&-unsign{
+				flex: 1;
+				font-size: 26rpx;
+				padding: 10rpx 40rpx;
+				background-color: red;
+				border-radius: 50rpx;
+				color: #FFFFFF;
+				text-align: center;
+			}
+		}
+	}
+</style>
diff --git a/pages/sub_mine/unbindBankCard/index.vue b/pages/sub_mine/unbindBankCard.vue
similarity index 100%
rename from pages/sub_mine/unbindBankCard/index.vue
rename to pages/sub_mine/unbindBankCard.vue
diff --git a/pages/sub_mine/voucher/index.vue b/pages/sub_mine/voucher.vue
similarity index 100%
rename from pages/sub_mine/voucher/index.vue
rename to pages/sub_mine/voucher.vue