From 79305d7497102611861d1a2e932f15fa4b0ba3c4 Mon Sep 17 00:00:00 2001
From: Aaron <578780649@qq.com>
Date: Mon, 12 Jul 2021 19:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E6=98=BE=E7=A4=BA=E3=80=81?=
 =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=97=B6=E9=97=B4=E3=80=81=E8=BF=90=E8=B4=B9?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                         |  3 ++-
 manifest.json                           | 13 ++++++++++++-
 pages/activity/GoodsGroup/index.vue     |  7 +++++--
 pages/activity/GoodsSeckill/index.vue   |  5 +++--
 pages/user/address/AddAddress/index.vue |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/config/index.js b/config/index.js
index d4da139..efe7fa5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,5 +1,6 @@
 // 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://wxapi.yixiang.co/api'
+export const VUE_APP_API_URL = '/h5api'
 // export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api'
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api'
 //  export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
diff --git a/manifest.json b/manifest.json
index 4335985..deaf0b9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -164,7 +164,18 @@
     "h5" : {
         "title" : "yshop",
         "devServer" : {
-            "disableHostCheck" : true
+            "disableHostCheck" : true,
+			"proxy": {
+				"/h5api": {
+					// 需要被代理的后台地址
+					"target": "http://itxzz.top",
+					"changeOrigin": true,
+					"secure": false,
+					"pathRewrite": {
+						"^/h5api": "/api"
+					}
+			    }
+		    }
         },
         "router" : {
             "mode" : "history"
diff --git a/pages/activity/GoodsGroup/index.vue b/pages/activity/GoodsGroup/index.vue
index dac8abb..5cbeddc 100644
--- a/pages/activity/GoodsGroup/index.vue
+++ b/pages/activity/GoodsGroup/index.vue
@@ -9,7 +9,8 @@
           </view>
           <view class="group-box">
             <view class="goods-item" v-for="(groupon, index) in grouponList" :key="groupon.id">
-              <activity-card :cid="groupon.id" :title="groupon.title" :info="groupon.info" :img="groupon.image" :price="groupon.price" :productPrice="groupon.productPrice">
+              <activity-card
+			  :cid="groupon.id" :title="groupon.title" :info="groupon.info" :img="groupon.image" :price="groupon.price" :productPrice="groupon.productPrice">
                 <block slot="tag">
                   <view class="tag" v-if="index < 3">TOP{{ index + 1 }}</view>
                 </block>
@@ -22,7 +23,9 @@
                     <text class="group-num">{{ groupon.people || 0 }}人团</text>
                   </view>
                 </block>
-                <block slot="btn"><button class="cu-btn buy-btn" @tap.stop="jump('/pages/activity/GroupDetails/index', { id: groupon.id })">马上拼</button></block>
+                <block slot="btn">
+					<button class="cu-btn buy-btn"
+				@tap.stop="jump('/pages/activity/GroupDetails/index', { id: groupon.id })">马上拼</button></block>
               </activity-card>
             </view>
           </view>
diff --git a/pages/activity/GoodsSeckill/index.vue b/pages/activity/GoodsSeckill/index.vue
index 7652ea2..8a3360b 100644
--- a/pages/activity/GoodsSeckill/index.vue
+++ b/pages/activity/GoodsSeckill/index.vue
@@ -3,6 +3,7 @@
     <view class="tui-bg__box">
       <image :src="`${$VUE_APP_RESOURCES_URL}/images/bg_seckill.png`" class="tui-bg__img" mode="widthFix" :style="{ opacity: opacity }"></image>
     </view>
+	
     <view class="tui-header__bg">
       <image :src="`${$VUE_APP_RESOURCES_URL}/images/bg_seckill.png`" class="tui-bg__img" mode="widthFix"></image>
       <scroll-view class="tui-time-slot" scroll-x>
@@ -212,7 +213,7 @@ export default {
   height: 210rpx;
   position: fixed;
   left: 0;
-  top: 0;
+  top: 80rpx;
   z-index: 1;
 }
 
@@ -221,7 +222,7 @@ export default {
   height: 120rpx;
   position: fixed;
   left: 0;
-  top: 0;
+  top: 80rpx;
   z-index: 3;
   overflow: hidden;
 }
diff --git a/pages/user/address/AddAddress/index.vue b/pages/user/address/AddAddress/index.vue
index 5cea9f8..21df40c 100644
--- a/pages/user/address/AddAddress/index.vue
+++ b/pages/user/address/AddAddress/index.vue
@@ -97,7 +97,7 @@ export default {
       getAddress(that.id).then(res => {
         that.userAddress = res.data;
         that.addressText =
-          res.data.province + " " + res.data.city + " " + res.data.district;
+        res.data.province + " " + res.data.city + " " + res.data.district;
         that.address.province = res.data.province;
         that.address.city = res.data.city;
         that.address.district = res.data.district;