添加设置密保、密保改密、版本提示 更新版本v2.2.0 版本号android 10 ios 11
diff --git a/pages/sub_tabbar/index.vue b/pages/sub_tabbar/index.vue
index 0851a76..7264790 100644
--- a/pages/sub_tabbar/index.vue
+++ b/pages/sub_tabbar/index.vue
@@ -14,7 +14,7 @@
<view class="img-box" @click="toPath('/pages/sub_index/qrcode/index')">
<u-image src="/static/images/index/money.png" width="40rpx" height="40rpx" mode="aspectFit"></u-image>
</view>
- <view class="img-box" @click="toPath('/pages/sub_medical/appointment')">
+ <view class="img-box" @click="toPath('')">
<u-image src="/static/images/index/square.png" width="40rpx" height="40rpx" mode="aspectFit"></u-image>
</view>
</view>
@@ -57,7 +57,7 @@
<text class="wrap-active-con-item-desc-desc">签到即可领积分</text>
</view>
</view>
- <view class="wrap-active-con-item" @click="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/index?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>
@@ -105,6 +105,7 @@
</template>
<script>
+ const app = getApp()
export default {
data() {
return {
@@ -141,8 +142,26 @@
}, ]
}
},
- onShow() {},
methods: {
+ get_prompt() {
+ //提示更新或通告
+ let vername = app.globalData.vername
+ let verno = app.globalData.verno
+ let params = {
+ vername,
+ verno
+ }
+ this.$u.get('/i/app/prompt', params).then(res => {
+ let is_have_content = res.prompt
+ if (!!is_have_content) {
+ uni.showModal({
+ title: '提示',
+ content: is_have_content
+ })
+ }
+
+ })
+ },
search(e) {
uni.showToast({
icon: "none",
@@ -175,46 +194,14 @@
}
//console.log(param.url)
that.$u.get('/v1/qrcode/auth', param).then(ret => {
- //console.log(ret.data.url)
+ // console.log(ret.data)
if (ret.data.permit) {
if (ret.data.action == 'water') {
- // setTimeout(() => {
- // uni.navigateTo({
- // url: "/pages/sub_index/scanView/index?url=" + ret.data.url
- // })
- // }, 1500)
- let userid = uni.getStorageSync("userid")
- let url = ret.data.url
- if (url.indexOf("?") > 0) {
- url = url + "&userid=" + userid
- } else {
- url = url + "?userid=" + userid
- }
- let wv = plus.webview.create(url, 'webview_water', {
- backButtonAutoControl: 'close',
- popGesture: 'close'
- })
setTimeout(() => {
- wv.show()
+ uni.navigateTo({
+ url: "/pages/sub_index/scanView/index?url=" + ret.data.url
+ })
}, 1500)
- wv.drag({
- direction: 'right',
- moveMode: 'followFinger'
- }, {
- view: 'webview_water',
- moveMode: 'follow'
- }, function(e) {
- wv.close()
- });
- wv.drag({
- direction: 'left',
- moveMode: 'followFinger'
- }, {
- view: 'webview_water',
- moveMode: 'follow'
- }, function(e) {
- wv.close()
- });
} else if (ret.data.action == 'dlsmkh5') {
let token = uni.getStorageSync('token')
let wv = plus.webview.create(ret.data.url, 'webview_pay', {
@@ -241,75 +228,6 @@
// #endif
},
-
- // scan() {
- // let that = this
- // // #ifndef H5
- // // 只允许通过相机扫码
- // uni.scanCode({
- // success: function(res) {
- // let url = res.result
- // console.log(url)
- // 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.url)
- // if (ret.data.permit) {
- // if (ret.data.action == 'water') {
- // setTimeout(() => {
- // uni.navigateTo({
- // url: "/pages/sub_index/scanView/index?url=" + ret.data.url
- // })
- // }, 1500)
- // } else if (ret.data.action == 'dlsmkh5') {
- // // #ifdef APP-PLUS
- // 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)
- // // #endif
- // // #ifndef APP-PLUS
- // uni.showToast({
- // icon: "none",
- // title: "只支持app端",
- // duration: 1500
- // })
- // // #endif
- // }
- // } else {
- // uni.showToast({
- // icon: "none",
- // title: "暂不支持此二维码",
- // duration: 1500
- // })
- // }
- // })
- // }
- // })
- // }
- // });
- // // #endif
- // // #ifdef H5
- // uni.showToast({
- // icon: "none",
- // title: "H5不支持此功能",
- // duration: 1500
- // })
- // // #endif
- // },
getActivityList() {
let that = this
let param = [{
@@ -356,6 +274,10 @@
},
onLoad() {
this.getBannarList()
+ setTimeout(() => {
+ this.get_prompt()
+ }, 5 * 1000)
+ this.getActivityList()
// #ifdef APP-PLUS
//引入插件
const KJJPush = uni.requireNativePlugin('KJ-JPush');