android添加银行插件
diff --git a/pages/sub_tabbar/index.vue b/pages/sub_tabbar/index.vue
index 7264790..ebd1fe7 100644
--- a/pages/sub_tabbar/index.vue
+++ b/pages/sub_tabbar/index.vue
@@ -11,10 +11,10 @@
 				</view>
 				<u-search placeholder="暂无服务可查询" v-model="searchVal" :show-action="false" bg-color="#F7F7F7" margin="0 15rpx"
 				 @search="search"></u-search>
-				<view class="img-box" @click="toPath('/pages/sub_index/qrcode/index')">
+				<view class="img-box" @click="toPath('/pages/sub_index/qrcode')">
 					<u-image src="/static/images/index/money.png" width="40rpx" height="40rpx" mode="aspectFit"></u-image>
 				</view>
-				<view class="img-box" @click="toPath('')">
+				<view class="img-box" @click="toPath('/pages/sub_medical/appointment')">
 					<u-image src="/static/images/index/square.png" width="40rpx" height="40rpx" mode="aspectFit"></u-image>
 				</view>
 			</view>
@@ -57,11 +57,11 @@
 						<text class="wrap-active-con-item-desc-desc">签到即可领积分</text>
 					</view>
 				</view>
-				<view class="wrap-active-con-item" @click="activity.length == 0?'':toUrl('/pages/sub_index/activeDetails/index?id='+ activity.articleno + '&type=' + activity.code)">
+				<view class="wrap-active-con-item" @click="activity.length == 0?'':toUrl('/pages/sub_index/activeDetails?id='+ activity.articleno + '&type=' + activity.code)">
 					<u-image src="/static/images/index/smkhd.png" width="70rpx" height="70rpx"></u-image>
 					<view class="wrap-active-con-item-desc">
-						<text class="wrap-active-con-item-desc-title">{{activity.title?activity.title:''}}</text>
-						<text class="wrap-active-con-item-desc-desc">{{activity.subtitle?activity.subtitle:'暂无'}}</text>
+						<text class="wrap-active-con-item-desc-title">{{activity.title?activity.title:'暂无'}}</text>
+						<text class="wrap-active-con-item-desc-desc">{{activity.subtitle?activity.subtitle:'热门活动'}}</text>
 					</view>
 				</view>
 				<view class="wrap-active-con-item" @click="toPath('/pages/sub_tabbar/active')">
@@ -76,21 +76,21 @@
 		<view class="wrap-service">
 			<text class="wrap-service-title">市民卡业务</text>
 			<view class="wrap-service-con">
-				<view class="wrap-service-con-exp" @click="toUrl('/pages/sub_index/introduce/index')">
+				<view class="wrap-service-con-exp" @click="toUrl('/pages/sub_index/introduce')">
 					<u-image src="/static/images/index/smkjj.png" width="100%" mode="widthFix"></u-image>
 					<text class="wrap-service-con-exp-desc">市民卡简介</text>
 				</view>
 				<view class="wrap-service-con-box">
 					<view class="wrap-service-con-box-bl">
 						<u-image src="/static/images/index/bl.png" width="100%" mode="widthFix"></u-image>
-						<view class="wrap-service-con-box-bl-over" @click="toPath('/pages/sub_index/getCityCard/index')">
+						<view class="wrap-service-con-box-bl-over" @click="toPath('/pages/sub_index/getCityCard')">
 							<text class="wrap-service-con-box-bl-over-up">办理</text>
 							<text class="wrap-service-con-box-bl-over-dowm">网络快速办理</text>
 						</view>
 					</view>
 					<view class="wrap-service-con-box-bl">
 						<u-image src="/static/images/index/zx.png" width="100%" mode="widthFix"></u-image>
-						<view class="wrap-service-con-box-bl-over" @click="toPath('/pages/sub_index/chat/index')">
+						<view class="wrap-service-con-box-bl-over" @click="toPath('/pages/sub_index/chat')">
 							<text class="wrap-service-con-box-bl-over-up">咨询</text>
 							<text class="wrap-service-con-box-bl-over-dowm">24小时在线咨询</text>
 						</view>
@@ -144,6 +144,8 @@
 		},
 		methods: {
 			get_prompt() {
+				let is_notice = uni.getStorageSync('is_notice')
+				if (!is_notice && is_notice != '') return false
 				//提示更新或通告
 				let vername = app.globalData.vername
 				let verno = app.globalData.verno
@@ -156,7 +158,19 @@
 					if (!!is_have_content) {
 						uni.showModal({
 							title: '提示',
-							content: is_have_content
+							content: is_have_content,
+							cancelText: '不再提醒',
+							confirmText: '我知道了',
+							success(res) {
+								if (res.cancel) {
+									uni.setStorageSync('is_notice', false)
+									uni.showModal({
+										title:"提示",
+										content:'您可以通过"我的->我的设置->通知功能"重新开启通知提示',
+										showCancel:false
+									})
+								}
+							}
 						})
 					}
 
@@ -168,9 +182,59 @@
 					title: "搜索服务功能暂未开通",
 					duration: 1500
 				})
+				this.searchVal =''
 			},
 
 			scan() {
+				// #ifdef MP-WEIXIN
+				uni.scanCode({
+					success(res) {
+						let url = res.result
+						uni.showToast({
+							title: "扫描成功",
+							icon: "none",
+							duration: 800,
+							complete() {
+								let param = {
+									url: url
+								}
+								//console.log(param.url)
+								that.$u.get('/v1/qrcode/auth', param).then(ret => {
+									// console.log(ret.data)
+									if (ret.data.permit) {
+										if (ret.data.action == 'water') {
+											setTimeout(() => {
+												uni.navigateTo({
+													url: "/pages/sub_index/scanView?url=" + ret.data.url
+												})
+											}, 1500)
+											// } else if (ret.data.action == 'dlsmkh5') {
+											// 	let token = uni.getStorageSync('token')
+											// 	let wv = plus.webview.create(ret.data.url, 'webview_pay', {
+											// 		backButtonAutoControl: 'close',
+											// 		additionalHttpHeaders: {
+											// 			Authorization: 'Bearer ' + token
+											// 		}
+											// 	})
+											// 	setTimeout(() => {
+											// 		wv.show()
+											// 	}, 1500)
+											// }
+										} else {
+											uni.showToast({
+												icon: "none",
+												title: "暂不支持此二维码",
+												duration: 1500
+											})
+										}
+									}
+								})
+							}
+						})
+					}
+				})
+				// #endif
+
 				// #ifdef APP-PLUS
 				let that = this
 				var ali = uni.requireNativePlugin("Mpaas-Scan-Module")
@@ -199,7 +263,7 @@
 										if (ret.data.action == 'water') {
 											setTimeout(() => {
 												uni.navigateTo({
-													url: "/pages/sub_index/scanView/index?url=" + ret.data.url
+													url: "/pages/sub_index/scanView?url=" + ret.data.url
 												})
 											}, 1500)
 										} else if (ret.data.action == 'dlsmkh5') {
@@ -247,7 +311,7 @@
 				let that = this
 				let obj = that.activeImgList[index]
 				uni.navigateTo({
-					url: '/pages/sub_index/activeDetails/index?id=' + obj.articleno
+					url: '/pages/sub_index/activeDetails?id=' + obj.articleno
 				})
 			},
 			getBannarList() {
@@ -274,11 +338,11 @@
 		},
 		onLoad() {
 			this.getBannarList()
+			this.getActivityList()
+			// #ifdef APP-PLUS
 			setTimeout(() => {
 				this.get_prompt()
 			}, 5 * 1000)
-			this.getActivityList()
-			// #ifdef APP-PLUS
 			//引入插件
 			const KJJPush = uni.requireNativePlugin('KJ-JPush');
 			let uid = uni.getStorageSync("uid")