xg

pages.json

@@ -53,7 +53,7 @@
 			"pages": [{
 					"path": "Behaviorpoints/Behaviorpoints",
 					"style": {
-						"navigationBarTitleText": "行为积分",
+						"navigationBarTitleText": "积分兑换",
 						"enablePullDownRefresh": false
 					}
 				}, {
@@ -370,8 +370,7 @@
 						"navigationBarTitleText": "取消订单",
 						"enablePullDownRefresh": false
 					}
-				},
+				},{
-				{
 					"path": "PointsMall/PointsMall",
 					"style": {
 						"navigationBarTitleText": "积分商城",

pagesB/Behaviorpoints/Behaviorpoints.scss

@@ -9,33 +9,35 @@
 		margin: 0 auto;
 		.content {
 			position: relative;
-
+			margin-bottom: 50rpx;
 			image {
 				width: 100%;
-				height: 319rpx;
+				height: 500rpx;
 			}
 
 			.Exchangerecords {
 				width: 180rpx;
 				height: 54rpx;
-				background: #FFFFFF;
+				background: #00785C;
 				border-radius: 24rpx;
 				position: absolute;
-				top: 60%;
+				bottom: 0%;
-				left: 57%;
+				right: 15%;
-				color: #26A888;
+				color: #fff;
 				text-align: center;
+				border: 2rpx solid #00785C;
 				line-height: 54rpx;
 			}
 			.PointsMall {
 				width: 180rpx;
 				height: 54rpx;
-				background: #FFFFFF;
+				border: 2rpx solid #00785C;
+				background: #00785C;
 				border-radius: 24rpx;
 				position: absolute;
-				top: 60%;
+				bottom: 0%;
-				left: 19%;
+				left: 15%;
-				color: #26A888;
+				color: #fff;
 				text-align: center;
 				line-height: 54rpx;
 			}
@@ -58,7 +60,7 @@
 				color: #FFFFFF;
 				position: absolute;
 			    left: 50%;
-			    top: 25%;
+			    top: 58%;
 				transform: translateX(-50%);
 				text-overflow: ellipsis;
 				white-space: nowrap;

pagesB/Behaviorpoints/Behaviorpoints.vue

@@ -2,15 +2,17 @@
 	<view class="app">
 		<view class="background">
 			<view class="content">
-				<image src="@/static/pagesB/Behave.png" mode=""></image>
+				<image mode="" :src="require('../images/jifen.png')" v-if='region==2'></image>
-				<view class="name">我的积分
+				<image src="@/static/pagesB/Behave.png" mode="" v-if='region!=2' :style="region!=2?'height:350rpx':''">
+				</image>
+				<view class="name" v-if='region!=2'>我的积分
 				</view>
-				<view class="number">{{score?score:0}}
+				<view class="number" :style="region!=2?'top:35%':''">{{score?score:0}}
 				</view>
-				<view class="PointsMall" @tap='gointegral'>
+				<view class="PointsMall" @tap='gointegral' :style="region!=2?'bottom:15%':''">
 					积分商城
 				</view>
-				<view class="Exchangerecords" @tap="goexchange">
+				<view class="Exchangerecords" @tap="goexchange" :style="region!=2?'bottom:15%':''">
 					兑换记录
 				</view>
 			</view>
@@ -55,6 +57,7 @@
 					pageNum: 1,
 					pageSize: 10,
 				},
+				region: uni.getStorageSync('region'),
 				list: null,
 				total: 0,
 				score: 0,
@@ -64,6 +67,17 @@
 			this.info();
 			this.scoretotalinfo();
 		},
+		onReady() { //更改导航栏文字
+			if (uni.getStorageSync('region') == 2) {
+				uni.setNavigationBarTitle({
+					title: '东营健康银行'
+				});
+			} else {
+				uni.setNavigationBarTitle({
+					title: '积分兑换'
+				});
+			}
+		},
 		methods: {
 			scoretotalinfo() {
 				scoretotal(this.query.identity).then(res => {

pagesB/PointsMall/PointsMall.vue

@@ -38,7 +38,17 @@
 				total: 0,
 			};
 		},
-
+		onReady() { //更改导航栏文字
+			if (uni.getStorageSync('region') == 2) {
+				uni.setNavigationBarTitle({
+					title: '东营健康银行'
+				});
+			} else {
+				uni.setNavigationBarTitle({
+					title: '积分兑换'
+				});
+			}
+		},
 		methods: {
 			goexchange(item) {
 				var obj = {
@@ -93,9 +103,10 @@
 
 <style lang="scss">
 	.app {
-		::v-deep .u-empty{
+		::v-deep .u-empty {
 			margin-top: 25vh !important;
 		}
+
 		.contents {
 			padding-top: 10rpx;
 			display: flex;

pagesB/location/location.vue

@@ -53,7 +53,7 @@
 		},
 		onLoad() {
 			this.address = uni.getStorageSync('location')
-			this.address()
+			this.getAddress()
 		},
 		methods: {
 			searchChange(value) {