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 @@ - + TOP{{ index + 1 }} @@ -22,7 +23,9 @@ {{ groupon.people || 0 }}人团 - + + 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 @@ + @@ -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;