diff --git a/config/api.js b/config/api.js
index cf3473b..96131ba 100644
--- a/config/api.js
+++ b/config/api.js
@@ -9,8 +9,6 @@ const dev = {
};
// 生产环境
const prod = {
- // common: 'http://192.168.0.109:8890',
- // buyer: 'http://192.168.0.109:8888',
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
};
diff --git a/pages/mine/distribution/home.vue b/pages/mine/distribution/home.vue
index b071321..468ff01 100644
--- a/pages/mine/distribution/home.vue
+++ b/pages/mine/distribution/home.vue
@@ -40,10 +40,7 @@
提现
-
-
- 选品库
-
+
diff --git a/pages/mine/distribution/list.vue b/pages/mine/distribution/list.vue
index 8c668e2..72c7de5 100644
--- a/pages/mine/distribution/list.vue
+++ b/pages/mine/distribution/list.vue
@@ -176,7 +176,7 @@ export default {
icon: "none",
});
let page = `pages/product/goods`;
- let scene = `${goods.skuId},${goods.id},${this.routers.id}`;
+ let scene = `${goods.skuId},${goods.goodsId},${this.routers.id}`;
let result = await getMpCode({ page, scene });
if (result.data.success) {
let callback = result.data.result;
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 2a76976..ebb1de2 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -514,9 +514,7 @@ export default {
let response = await getGoods(id, goodsId);
if (!response.data.success) {
- uni.navigateBack({
- delta: 2,
- });
+ uni.navigateBack();
return false;
}
diff --git a/pages/promotion/lives.vue b/pages/promotion/lives.vue
index 07b0c89..9598f30 100644
--- a/pages/promotion/lives.vue
+++ b/pages/promotion/lives.vue
@@ -41,7 +41,7 @@
-
+
@@ -101,7 +101,10 @@ export default {
};
},
onShow() {
+ this.params[this.current].pageNumber = 1;
+ this.liveList = [];
this.getLives();
+
this.getRecommendLives();
},
onReachBottom() {
@@ -137,7 +140,7 @@ export default {
* 点击顶部推荐直播间
*/
clickSwiper(val) {
- console.log(this.swiperImg[val])
+ console.log(this.swiperImg[val]);
this.handleLivePlayer(this.swiperImg[val]);
},
@@ -145,6 +148,7 @@ export default {
* 搜索直播间
*/
searchLive(val) {
+ this.params[this.current].pageNumber = 1;
this.params[this.current].name = val;
this.init();
},
@@ -264,6 +268,9 @@ export default {
.live-cover-img {
position: relative;
}
+.swiper {
+ margin: 20rpx 0;
+}
.live-goods {
position: relative;