Merge remote-tracking branch 'origin/dev' into dev

pages/medicalservice/medicalservice.vue

@@ -221,7 +221,7 @@
 			//跳转item
 			gohealthitem(item) {
 				uni.navigateTo({
-					url: `/pages/Healthitem/Healthitem?item=${encodeURIComponent(JSON.stringify(item))}`
+					url: `/pagesB/Healthitem/Healthitem?item=${encodeURIComponent(JSON.stringify(item))}`
 				})
 			},
 			//齐鲁名医
@@ -284,13 +284,13 @@
 			//齐鲁名医
 			gomedicine() {
 				uni.navigateTo({
-					url: '/pages/medicine/medicine'
+					url: '/pagesB/medicine/medicine'
 				})
 			},
 			//跳转客服
 			gocustomerservice() {
 				uni.navigateTo({
-					url: '/pages/customerservice/customerservice'
+					url: '/pagesB/customerservice/customerservice'
 				})
 			},
 			//跳转护理站页面
@@ -298,14 +298,14 @@
 				this.openPopup();
 				setTimeout(e => {
 					uni.navigateTo({
-						url: '/pages/site/site'
+						url: '/pagesB/site/site'
 					})
 				}, 0)
 			},
 			//健康常识
 			gohealth() {
 				uni.navigateTo({
-					url: '/pages/Healthknowledge/Healthknowledge'
+					url: '/pagesB/Healthknowledge/Healthknowledge'
 				})
 			},
 			//新人福利
@@ -317,7 +317,7 @@
 				this.openPopup();
 				setTimeout(e => {
 					uni.navigateTo({
-						url: '/pages/materialbenefits/materialbenefits'
+						url: '/pagesB/materialbenefits/materialbenefits'
 					})
 				}, 0)
 			},
@@ -326,7 +326,7 @@
 				this.openPopup();
 				setTimeout(e => {
 					uni.navigateTo({
-						url: '/pages/shopping/shopping'
+						url: '/pagesB/shopping/shopping'
 					})
 				}, 0)
 			},
@@ -356,19 +356,19 @@
 			//跳转管家
 			goguanjia() {
 				uni.navigateTo({
-					url: '/pages/Industrialbutler/Industrialbutler'
+					url: '/pagesB/Industrialbutler/Industrialbutler'
 				})
 			},
 			//跳转
 			gopzyh() {
 				uni.navigateTo({
-					url: `/pages/nursestation/nursestation?nurseStationId=${13}`
+					url: `/pagesB/nursestation/nursestation?nurseStationId=${13}`
 				})
 			},
 			//跳转贴心智养
 			gonight() {
 				uni.navigateTo({
-					url: '/pages/night/night'
+					url: '/pagesB/night/night'
 				})
 			},
 		},

pagesB/Behaviorpoints/Behaviorpoints.vue

@@ -7,7 +7,7 @@
 				</view>
 				<view class="number">1000
 				</view>
-				<view class="PointsMall" @tap="gomodify">
+				<view class="PointsMall" >
 					积分商城
 				</view>
 				<view class="Exchangerecords">
@@ -50,11 +50,7 @@
 			};
 		},
 		methods: {
-			gomodify() {
-				uni.navigateTo({
-					url: '/pagesB/modify/modify'
-				})
-			},
+
 		},
 	}
 </script>

pagesB/nursestation/nursestation.vue

@@ -256,7 +256,7 @@
 				this.swiperImglink.forEach(e => {
 					e.image = baseurl + e.posterPictureUrl
 					if (e.image == item) {
-						if (e.jumpLink == '/pages/homepage/homepage' || e.jumpLink == '/pages/Personal/Personal') {
+						if (e.jumpLink == '/pageB/homepage/homepage' || e.jumpLink == '/pageB/Personal/Personal') {
 							uni.switchTab({
 								url: e.jumpLink
 							})