high-unionPay/pages/tabBar/home/home.vue

@@ -5,12 +5,9 @@
 			<lottie  :options="defaultOptions" :height="200" :width="200"
 				@animCreated="handleAnimation" />
 		</view> -->
-		<!-- <view class="status"></view> -->
+		<!-- <view class="status"></view> -->
-		<view v-if="isdisplay == 1">
+		<view v-if="isdisplay">
-			<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
+			<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
-		</view>
-		<view v-if="isdisplay == 2">
-			<image :src="imagewxUrl+imgadres6" class="width90 mart110" mode="widthFix"></image>
 		</view>
 		<view v-for="(item,index) in homeCateList" :key="index">
 			<view class="height90 backcorltop" v-if="item.type == 1">
@@ -166,11 +163,10 @@
 				imgadres: '/home/home1.png',
 				imgadres1: '/home/home2.png',
 				imgadres2: 'jt.png',
-				// imgadres5: 'unionarea.png',
+				// imgadres5: 'unionarea.png',
 				imgadres5: 'loading.gif',
 				imgadres3: '',
 				imgadres4: 'cusservice.png',
-				imgadres6: 'notOpened.png',
 				webUrl: '',
 				//猜你喜欢列表
 				productList: [],
@@ -183,7 +179,7 @@
 				homeCateList: [],
 				//切换状态
 				jumpType: '',
-				isdisplay: 1 //是否展示
+				isdisplay: true //是否展示
 			};
 		},
 		onShow() {
@@ -202,8 +198,8 @@
 				}
 			})
 		},
-		onLoad() {
+		onLoad() {
-			this.hqaddress();
+			this.hqaddress();
 		},
 		methods: {
 			//等待加载
@@ -248,15 +244,15 @@
 				})
 			},
 			test(item) {
-				let datas = [];
+				let datas = [];
-				for (var i = 0; i < this.homeCateList.length; i++) {
+				for (var i = 0; i < this.homeCateList.length; i++) {
-					if (this.homeCateList[i].type == 3) {
+					if (this.homeCateList[i].type == 3) {
-						datas.push(this.homeCateList[i])
+						datas.push(this.homeCateList[i])
-					}
+					}
-				}
+				}
-				let jumpid = datas[0].childDate[item].type;
+				let jumpid = datas[0].childDate[item].type;
-				uni.navigateTo({
+				uni.navigateTo({
-					url: '../../user/news/news?id=' + jumpid
+					url: '../../user/news/news?id=' + jumpid
 				})
 			},
 			//定位信息
@@ -304,7 +300,7 @@
 						app.globalData.cityId = res.return_data.regionId;
 						// app.globalData.cityId = '520000';
 						app.globalData.companyId = res.return_data.companyId;
-						this.getCmsContentcmsContent();
+						this.getCmsContentcmsContent();
 						this.getCmsAactibity();
 					}
 				});
@@ -317,11 +313,9 @@
 					categoryCode: 'CMS_HOME'
 				}
 				getCmsContent(params).then(res => {
-					if (res.return_code == '000000' && res.return_data != null) {
+					this.isdisplay = false;
+					if (res.return_code == '000000') {
 						this.homeCateList = res.return_data;
-						this.isdisplay = 3;
-					} else {
-						this.isdisplay = 2;
 					}
 				});
 			},
@@ -389,12 +383,12 @@
 				})
 			},
 			//商品跳转
-			toGoods(e, id) {
+			toGoods(e, id) {
-				uni.navigateTo({
+				uni.navigateTo({
-					url: e + id
+					url: e + id
-				});
+				});
 			},
-
+			
 			//拨打客服电话
 			playPhone() {
 				uni.showModal({
@@ -701,4 +695,4 @@
 			border-radius: 50%;
 		}
 	}
-</style>
+</style>

high-unionPay/pages/tabBar/user/user.vue

@@ -259,20 +259,16 @@
 						url: '../../login/updatePas/updatePas',
 						text: '支付密码',
 						img: '../../../static/img/user/user11.png'
+					}, {
+						url: '',
+						text: '退出登录',
+						img: '../../../static/img/user/user12.png'
 					}, {
 						url: '',
 						text: '客服',
 						img: '../../../static/img/user/user13.png'
 					}
 				]
-				if (app.globalData.userInfo) {
-					let menus = {
-						url: '',
-						text: '退出登录',
-						img: '../../../static/img/user/user12.png'
-					}
-					this.czList.push(menus);
-				}
 				return;
 			}
 			this.czList = [{
@@ -284,21 +280,17 @@
 					url: '../../login/updatePas/resetPas',
 					text: '支付密码',
 					img: '../../../static/img/user/user11.png'
-				}, 
+				}, {
+					url: '',
+					text: '退出登录',
+					img: '../../../static/img/user/user12.png'
+				},
 				{
 					url: '',
 					text: '客服',
 					img: '../../../static/img/user/user13.png'
 				}
 			]
-			if (app.globalData.userInfo) {
-				let menus = {
-					url: '',
-					text: '退出登录',
-					img: '../../../static/img/user/user12.png'
-				}
-				this.czList.push(menus);
-			}
 		},
 		methods: {
 			findUser() {