cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

拼团显示、秒杀时间、运费模块bug修改

Browse Source
This commit is contained in:
Aaron
2021-07-12 19:23:03 +08:00
parent f2596c53a3
commit 79305d7497
5 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/index.js
View File

@ -1,5 +1,6 @@
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // 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://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://192.168.31.223:8008/api'
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';

13
manifest.json
View File

@ -164,7 +164,18 @@
"h5" : { "h5" : {
"title" : "yshop", "title" : "yshop",
"devServer" : { "devServer" : {
"disableHostCheck" : true "disableHostCheck" : true,
"proxy": {
"/h5api": {
// 需要被代理的后台地址
"target": "http://itxzz.top",
"changeOrigin": true,
"secure": false,
"pathRewrite": {
"^/h5api": "/api"
}
}
}
}, },
"router" : { "router" : {
"mode" : "history" "mode" : "history"

7
pages/activity/GoodsGroup/index.vue
View File

@ -9,7 +9,8 @@
</view> </view>
<view class="group-box"> <view class="group-box">
<view class="goods-item" v-for="(groupon, index) in grouponList" :key="groupon.id"> <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"> <block slot="tag">
<view class="tag" v-if="index < 3">TOP{{ index + 1 }}</view> <view class="tag" v-if="index < 3">TOP{{ index + 1 }}</view>
</block> </block>
@ -22,7 +23,9 @@
<text class="group-num">{{ groupon.people || 0 }}人团</text> <text class="group-num">{{ groupon.people || 0 }}人团</text>
</view> </view>
</block> </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> </activity-card>
</view> </view>
</view> </view>

5
pages/activity/GoodsSeckill/index.vue
View File

@ -3,6 +3,7 @@
<view class="tui-bg__box"> <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> <image :src="`${$VUE_APP_RESOURCES_URL}/images/bg_seckill.png`" class="tui-bg__img" mode="widthFix" :style="{ opacity: opacity }"></image>
</view> </view>
<view class="tui-header__bg"> <view class="tui-header__bg">
<image :src="`${$VUE_APP_RESOURCES_URL}/images/bg_seckill.png`" class="tui-bg__img" mode="widthFix"></image> <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> <scroll-view class="tui-time-slot" scroll-x>
@ -212,7 +213,7 @@ export default {
height: 210rpx; height: 210rpx;
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 80rpx;
z-index: 1; z-index: 1;
} }
@ -221,7 +222,7 @@ export default {
height: 120rpx; height: 120rpx;
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 80rpx;
z-index: 3; z-index: 3;
overflow: hidden; overflow: hidden;
} }

2
pages/user/address/AddAddress/index.vue
View File

@ -97,7 +97,7 @@ export default {
getAddress(that.id).then(res => { getAddress(that.id).then(res => {
that.userAddress = res.data; that.userAddress = res.data;
that.addressText = 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.province = res.data.province;
that.address.city = res.data.city; that.address.city = res.data.city;
that.address.district = res.data.district; that.address.district = res.data.district;