From f26b59d3604eb1788715b0d5654d4dd4bad690e9 Mon Sep 17 00:00:00 2001
From: yangjie <812952667@qq.com>
Date: Sat, 18 Sep 2021 14:28:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E9=A6=96=E9=A1=B5=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                    | 16 +++++------
 pages/tabBar/home/home.vue | 55 ++++++++++++++++----------------------
 2 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/App.vue b/App.vue
index d744daa..4e1d136 100644
--- a/App.vue
+++ b/App.vue
@@ -5,15 +5,15 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			url: 'https://hsg.dctpay.com/crest',
-			imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			brestUrl : 'https://hsg.dctpay.com/brest',
-			imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+			// url: 'https://hsg.dctpay.com/crest',
+			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			// brestUrl : 'https://hsg.dctpay.com/brest',
+			// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
 			//测试
-			// url: 'https://hsgcs.dctpay.com/crest',
-			// brestUrl : 'https://hsgcs.dctpay.com/brest',
-			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			url: 'https://hsgcs.dctpay.com/crest',
+			brestUrl : 'https://hsgcs.dctpay.com/brest',
+			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",
 			brestUserInfo : '',
 			openId: '',
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 8afe1ed..4c2b069 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -49,9 +49,9 @@
 		<view class="category-list">
 			<view class="category" v-for="(row, index) in categoryList" :key="index" @tap="toCategory(row)">
 				<view class="img">
-					<image :src="imagewxUrl+row.img"></image>
+					<image :src="imageUrl+row.imgData"></image>
 				</view>
-				<view class="text">{{ row.name }}</view>
+				<view class="text">{{ row.title }}</view>
 			</view>
 		</view>
 		
@@ -253,29 +253,8 @@
 				pageNum: 1,
 				pageSize: 6,
 				// 分类菜单
-				categoryList: [{
-						id: 1,
-						name: '在线加油',
-						img: 'user/home1.png',
-						src: '/pages/goods/refuel/refuel'
-					},
-					{
-						id: 2,
-						name: '电影票',
-						img: 'user/home2.png',
-						src: '/pages/tabBar/order/order'
-					},
-					{
-						id: 3,
-						name: '肯德基',
-						img: 'user/home3.png',
-						src: '/pages/tabBar/order/order'
-					},
-					{
-						id: 4,
-						name: '话费充值',
-						img: 'user/home4.png'
-					}
+				categoryList: [
+					
 				],
 				//切换状态
 				cpStuats: 1
@@ -299,7 +278,7 @@
 				this.getCouponListArea();
 				this.getCouponListgold();
 				this.getCmsContent();
-				// this.getCmsAactibity();
+				this.getCmsContentcmshome();
 			}
 		},
 		onLoad() {
@@ -348,7 +327,18 @@
 			// #endif
 		},
 		methods: {
-			
+			//获取首页菜单
+			getCmsContentcmshome() {
+				let params = {
+					regionId: app.globalData.cityId,
+					categoryCode: 'CMS_HOME_NAV'
+				}
+				getCmsContent(params).then(res => {
+					if (res.return_code == '000000') {
+						this.categoryList = res.return_data;
+					}
+				});
+			},
 			//获取弹出或者弹窗
 			getCmsContent() {
 				let params = {
@@ -430,6 +420,7 @@
 								uni.hideLoading();
 								that.getCmsContent();
 								that.getCmsAactibity();
+								that.getCmsContentcmshome();
 							},
 							fail() {
 								uni.hideLoading()
@@ -685,11 +676,11 @@
 			},
 			//跳转菜单
 			toCategory(item) {
-				if (item.name == '在线加油') {
+				if (item.title == '在线加油') {
 					uni.navigateTo({
-						url: item.src
+						url: item.ext1
 					})
-				} else if (item.name == '肯德基') {
+				} else if (item.title == '肯德基') {
 					if (!app.globalData.userInfo) {
 						uni.navigateTo({
 							url:'../../userLogin/userLogin'
@@ -705,7 +696,7 @@
 					uni.navigateTo({
 						url: '/pages/tabBar/order/order?id=1'
 					})
-				} else if (item.name == '电影票') {
+				} else if (item.title == '电影票') {
 					if (!app.globalData.userInfo) {
 						uni.navigateTo({
 							url:'../../userLogin/userLogin'
@@ -721,7 +712,7 @@
 					uni.navigateTo({
 						url: '/pages/tabBar/order/order?id=2'
 					})
-				} else if (item.name == '话费充值') {
+				} else if (item.title == '话费充值') {
 					if (!app.globalData.userInfo) {
 						uni.navigateTo({
 							url:'../../userLogin/userLogin'