diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index c1869e9..3c2e675 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -272,39 +272,42 @@ }, // 积分兑换 count() { - if (!this.userinfo) { - this.gologin(); - } else { - if (this.region == 3) { - this.family() - } else { - if (this.region == 1 || this.region == 2) { - if (this.checkSign == "0") { - uni.navigateTo({ - url: `/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`, - }) - // this.$refs.uToast.show({ - // title: '未签约,请先签约', - // type: 'error', - // duration:'1500', - // url: "/pagesC/Onlinesigning/Onlinesigning" - // }) - } else if (this.checkSign == "01") { - this.$refs.uToast.show({ - title: this.infotitle, - type: 'error', - duration: '1500', - }) - } else { - uni.navigateTo({ - url: '/pagesB/Behaviorpoints/Behaviorpoints' - }) - } - } else { - this.family() - } - } - } + uni.navigateTo({ + url: '/pagesB/Behaviorpoints/Behaviorpoints' + }) + // if (!this.userinfo) { + // this.gologin(); + // } else { + // if (this.region == 3) { + // this.family() + // } else { + // if (this.region == 1 || this.region == 2) { + // if (this.checkSign == "0") { + // uni.navigateTo({ + // url: `/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`, + // }) + // // this.$refs.uToast.show({ + // // title: '未签约,请先签约', + // // type: 'error', + // // duration:'1500', + // // url: "/pagesC/Onlinesigning/Onlinesigning" + // // }) + // } else if (this.checkSign == "01") { + // this.$refs.uToast.show({ + // title: this.infotitle, + // type: 'error', + // duration: '1500', + // }) + // } else { + // uni.navigateTo({ + // url: '/pagesB/Behaviorpoints/Behaviorpoints' + // }) + // } + // } else { + // this.family() + // } + // } + // } }, // 健康档案 goHealthrecords() { diff --git a/pagesB/Behaviorpoints/Behaviorpoints.scss b/pagesB/Behaviorpoints/Behaviorpoints.scss index 01ca2b9..8f5686b 100644 --- a/pagesB/Behaviorpoints/Behaviorpoints.scss +++ b/pagesB/Behaviorpoints/Behaviorpoints.scss @@ -1,7 +1,7 @@ .app { background-color: #F7F5F5; height: 100vh; - padding-top: 20rpx; + // padding-top: 20rpx; .flex { width: 100%; @@ -15,26 +15,16 @@ .background { height: 100%; background-color: #fff; - width: 95%; + width: 100%; margin: 0 auto; .content { position: relative; - margin-bottom: 80rpx; - padding-bottom: 50rpx; - - .title { - position: absolute; - left: 40rpx; - top: 10rpx; - font-weight: 600; - color: #26A888; - padding-left: 20rpx; - } image { width: 100%; - height: 450rpx; + padding-left: 7rpx; + height: 480rpx; } .item { @@ -70,6 +60,7 @@ transform: translateX(-50%); text-overflow: ellipsis; white-space: nowrap; + color:#AD7600; } } diff --git a/pagesB/Behaviorpoints/Behaviorpoints.vue b/pagesB/Behaviorpoints/Behaviorpoints.vue index 9196a73..3ea4676 100644 --- a/pagesB/Behaviorpoints/Behaviorpoints.vue +++ b/pagesB/Behaviorpoints/Behaviorpoints.vue @@ -2,31 +2,54 @@ - - {{title}} - - + + + + + 我的积分 - {{score?score:0}} + + + {{score?score:0}} + - + 积分商城 兑换记录 + + 微信运动 + - + + + + + 积分商城 + + + 兑换记录 + 微信运动 + + 健康行为 + + 参考兑换 + + + @@ -77,7 +100,6 @@ list: [], total: 0, score: 0, - title: '', orgNo: '', }; }, @@ -91,7 +113,6 @@ if (uni.getStorageSync('region') == 2) { detail(this.query.identity).then(res => { let name = res.data.countyName.split('区')[0].split('县') - this.title = '东营健康银行' + name + '分行' this.orgNo = res.data.orgNo uni.setNavigationBarTitle({ title: '东营健康银行' + name + '分行' diff --git a/pagesB/images/bojinka.png b/pagesB/images/bojinka.png new file mode 100644 index 0000000..b7aba27 Binary files /dev/null and b/pagesB/images/bojinka.png differ diff --git a/pagesB/images/jinka.png b/pagesB/images/jinka.png new file mode 100644 index 0000000..4840208 Binary files /dev/null and b/pagesB/images/jinka.png differ diff --git a/pagesB/images/putongka.png b/pagesB/images/putongka.png new file mode 100644 index 0000000..54b2b5b Binary files /dev/null and b/pagesB/images/putongka.png differ diff --git a/pagesB/images/yinka.png b/pagesB/images/yinka.png new file mode 100644 index 0000000..05cefe2 Binary files /dev/null and b/pagesB/images/yinka.png differ diff --git a/pagesB/images/zuanshika.png b/pagesB/images/zuanshika.png new file mode 100644 index 0000000..46bba72 Binary files /dev/null and b/pagesB/images/zuanshika.png differ