From 3289e30dadb734ae6c05ee54f90e08c4af916d90 Mon Sep 17 00:00:00 2001
From: Gaoxs <704041637@qq.com>
Date: Thu, 3 Sep 2020 11:43:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/PromotionGood.vue     | 3 ++-
 components/sh-activity-goods.vue | 9 ++++++---
 config/index.js                  | 4 ++--
 manifest.json                    | 3 ++-
 pages/home/index.vue             | 8 +++++---
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/components/PromotionGood.vue b/components/PromotionGood.vue
index f9ec5ca..4523fd9 100644
--- a/components/PromotionGood.vue
+++ b/components/PromotionGood.vue
@@ -3,7 +3,8 @@
 		<view class="sh-title-card mb10">
 		<view class="title-box">
 			<image class="title-bg" src="@/static/images/title1.png" mode="aspectFill"></image>
-			<view class="title-text" :style="{ color: detail.color }">为你推荐</view>
+			<view class="title-text">为你推荐</view>
+			<!-- <view class="title-text" :style="{ color: detail.color }">为你推荐</view> -->
 		</view>
 	</view>
 	<view class="hot-goods mx20 mb10" v-if="benefit.length">
diff --git a/components/sh-activity-goods.vue b/components/sh-activity-goods.vue
index d494640..7ac21b2 100644
--- a/components/sh-activity-goods.vue
+++ b/components/sh-activity-goods.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="min-goods" @tap="jump('/pages/goods/detail/index', { id: detail.id })">
+	<view class="min-goods" @tap="jump('/pages/activity/GroupDetails/index', { id: detail.id })">
 		<view class="img-box">
 			<view class="tag" >{{ detail.people}}人团</view>
 			<image class="img" :src="detail.image" mode="widthFix"></image>
@@ -26,8 +26,11 @@ export default {
 	computed: {},
 	methods: {
 		// 路由跳转
-		jump(path, parmas) {
-			this.$Router.push({ path: path, query: parmas });
+		jump(path, query) {
+			this.$yrouter.push({
+					path,
+					query
+				});
 		}
 	}
 };
diff --git a/config/index.js b/config/index.js
index 7031cd1..555847f 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,5 +1,5 @@
 
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
-export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
-// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
+// export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
+export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static';
diff --git a/manifest.json b/manifest.json
index 6bbb11d..6724313 100644
--- a/manifest.json
+++ b/manifest.json
@@ -164,6 +164,7 @@
                     "key" : ""
                 }
             }
-        }
+        },
+        "domain" : "h5.yixiang.co"
     }
 }
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 68b0cf4..4c61ab6 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -4,9 +4,9 @@
 		<view class="head_box " :style="{ background: bgcolor }" :class="{ active: bgcolor }">
 			<view class="cu-custom" :style="[{height:CustomBar+ 'px',}]">
 				<view class="cu-bar fixed" :style="customStyle"
-					:class="[bgImage!=''?'none-bg text-white bg-img':'',bgColor]">
+					:class="[bgcolor]">
 					<view class="action">
-						<text class="nav-title shopro-selector-rect">{{ info.name || '商城' }}</text>
+						<text class="nav-title shopro-selector-rect">{{ 'yshop商城' }}</text>
 					</view>
 					<view class="content" :style="[{top:StatusBar + 'px'}]">
 
@@ -98,6 +98,7 @@
 				categoryCurrent: 0,
 				menuNum: 5,
 				bgcolor: '',
+				bgColor: '',
 				swiperCurrent: 0, //轮播下标
 				webviewId: 0,
 				showCoupon: false,
@@ -172,7 +173,8 @@
 					slidesPerView: 'auto',
 					observer: true,
 					observeParents: true
-				}
+				},
+				bgImage:''
 			};
 		},
 		computed: {