From 8b3314f433f6a064963a5c3dd74ed7ba0b301a20 Mon Sep 17 00:00:00 2001
From: ld0104 <3037885725@qq.com>
Date: Tue, 8 Nov 2022 19:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E9=97=A8=E6=A6=9C=E5=8D=95=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=85=A8=E9=83=A8=E9=80=89=E9=A1=B9=EF=BC=8C=E8=AF=84?=
=?UTF-8?q?=E4=BB=B7=E5=9B=BE=E7=89=87=E6=96=87=E5=AD=97=E9=9D=9E=E5=BF=85?=
=?UTF-8?q?=E9=80=89=EF=BC=8C=E9=A6=96=E9=A1=B5=E6=B4=BB=E5=8A=A8=E8=BD=AE?=
=?UTF-8?q?=E6=92=AD=EF=BC=8C=E7=A7=92=E6=9D=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/store.js | 1 +
assets/css/style.css | 4 +--
config/index.js | 8 +++---
pages/activity/DargainGoodsDetails/index.vue | 2 ++
pages/activity/GroupDetails/index.vue | 3 ++-
pages/activity/SeckillDetails/index.vue | 2 ++
pages/activity/activity/index.vue | 19 ++++++++++----
pages/home/index.vue | 8 +++---
pages/shop/HotNewGoods/index.vue | 26 +++++++++++++++++---
pages/shop/IntegralGoodsCon/index.vue | 2 ++
pages/user/coupon/UserCoupon/index.vue | 4 +--
11 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/api/store.js b/api/store.js
index 55b0222..93b71cb 100644
--- a/api/store.js
+++ b/api/store.js
@@ -181,6 +181,7 @@ export function postOrderProduct(unique) {
* 提交评价页面；
*/
export function postOrderComment(data) {
+ console.log(11111);
return request.post("/order/comment", data, {
login: true
});
diff --git a/assets/css/style.css b/assets/css/style.css
index c2ee1f2..f665d16 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1595,8 +1595,8 @@ page {
padding: 32rpx;
}
.product-con .entry-mask .entry-box .entry {
- height: 100%;
- overflow: scroll;
+ /* height: 100%; */
+ /* overflow: scroll; */
font-size: 26rpx;
font-family: SourceHanSansSCVF;
font-weight: 500;
diff --git a/config/index.js b/config/index.js
index abd68a5..c96dfd6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,8 +1,8 @@
// export const VUE_APP_API_URL = 'http://192.168.10.129:48080/bxgApp'
-// export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
-export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
+export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
+// export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
// export const VUE_APP_API_URL = 'https://xiaohui.shop.cyjyyjy.com/xiaohuiapp'
export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static'
-export const BXG_TENANT_ID = 129
-// export const BXG_TENANT_ID = 138
+// export const BXG_TENANT_ID = 129
+export const BXG_TENANT_ID = 138
// export const BXG_TENANT_ID = 128
diff --git a/pages/activity/DargainGoodsDetails/index.vue b/pages/activity/DargainGoodsDetails/index.vue
index 109b14d..f8728bd 100644
--- a/pages/activity/DargainGoodsDetails/index.vue
+++ b/pages/activity/DargainGoodsDetails/index.vue
@@ -114,9 +114,11 @@
+
{{entryInfo.entryInfo}}
+
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
index ce543f1..6e48e26 100644
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@@ -266,9 +266,11 @@
+
{{entryInfo.entryInfo}}
+
@@ -436,7 +438,6 @@ export default {
that.posterData.price = that.storeInfo.pinkPrice
that.posterData.code = that.storeInfo.code_base
that.domStatus = true
- console.log(this.storeInfo,77777777777777)
that.DefaultSelect()
for(let i in that.productValue) {
that.attrImages.push(that.productValue[i]);
diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue
index 758f114..3dc7f9b 100644
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@@ -200,9 +200,11 @@
+
{{entryInfo.entryInfo}}
+
diff --git a/pages/activity/activity/index.vue b/pages/activity/activity/index.vue
index 3136313..b168ddd 100644
--- a/pages/activity/activity/index.vue
+++ b/pages/activity/activity/index.vue
@@ -210,6 +210,8 @@
this.goodsList=[]
// this.tabType = 0;
if(i === 0) {
+ this.seckillList=[]
+ this.seckillForm.page=1
this.setTime(0);
// this.goodsList = this.seckillList;
} else if(i === 1) {
@@ -230,6 +232,9 @@
// this.goodsList=[]
this.tabType = i;
if(this.activityType == 0) {
+ this.seckillList=[]
+ this.goodsList=[]
+ this.seckillForm.page=1
this.setTime(i);
}else if(this.activityType == 1){
this.groupForm.page=1
@@ -292,12 +297,16 @@
})
},
setTime(i) {
- if(i == 0) {
+ if(i == 0 && this.tabType==0) {
console.log(1111111111111);
this.seckillActive = this.seckillTimeIndex;
} else {
if(this.seckillTimeIndex == this.timeList.length-1) {
- this.seckillActive = 0;
+ // this.seckillActive = 0;
+ this.seckillList=[]
+ this.goodsList=[]
+ this.seckillForm.page=1
+ return
} else {
this.seckillActive = this.seckillTimeIndex+1;
}
@@ -325,19 +334,19 @@
})
},
getGrouponList() {
- // if (this.groupLoaded) return
+ if (this.groupLoaded) return
if(this.activityType === 1 && this.tabType===0){
getCombinationList(this.groupForm).then(res => {
this.grouponList = this.grouponList.concat(res.data.storeCombinationQueryVos)
this.groupForm.page++;
- // this.groupLoaded = res.data.storeCombinationQueryVos.length < this.groupForm.limit;
+ this.groupLoaded = res.data.storeCombinationQueryVos.length < this.groupForm.limit;
this.goodsList = this.grouponList;
})
}else{
getUserCombinationList(this.groupForm).then(res => {
this.grouponList = this.grouponList.concat(res.data.storeCombinationQueryVos)
this.groupForm.page++;
- // this.groupLoaded = res.data.storeCombinationQueryVos.length < this.groupForm.limit;
+ this.groupLoaded = res.data.storeCombinationQueryVos.length < this.groupForm.limit;
this.goodsList = this.grouponList;
})
}
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 2488231..12a9754 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -67,7 +67,7 @@
-
+
@@ -86,7 +86,7 @@
-
+
@@ -1094,7 +1094,7 @@
}
.img{
width: 213rpx;
- height: 242rpx;
+ height: 236rpx;
margin-left: 18rpx;
margin-top: 15rpx;
}
@@ -1278,7 +1278,7 @@
font-size: 34rpx;
position: absolute;
top: 90rpx;
- left: 21rpx;
+ left: 22rpx;
}
}
.hot-right{
diff --git a/pages/shop/HotNewGoods/index.vue b/pages/shop/HotNewGoods/index.vue
index 65d9afa..ebebfc7 100644
--- a/pages/shop/HotNewGoods/index.vue
+++ b/pages/shop/HotNewGoods/index.vue
@@ -38,7 +38,7 @@
- 全部
+
{{form.mouth}}
@@ -157,6 +157,8 @@ export default {
// observer: true,
// observeParents: true
// }
+ // isShow:false,
+ isShowBind:false
};
},
mounted: function() {
@@ -185,6 +187,10 @@ export default {
// this.form.hotListId = this.classifyList[this.classifyType].id;
this.form.hotListId = '';
this.subclassList = this.classifyList[this.classifyType].cateDtos;
+ this.subclassList.unshift({
+ cateId:'',
+ cateName:'全部',
+ })
this.subclass = this.subclassList[0];
// this.form.cateId = this.subclass.cateId;
this.form.cateId = ' ';
@@ -193,7 +199,7 @@ export default {
},
// 月份
bindPickerChange(e) {
- if(this.mouthIndex == e.detail.value) return;
+ // if(this.mouthIndex == e.detail.value) return;
this.mouthIndex = e.detail.value;
this.form.mouth = this.mouthList[this.mouthIndex];
this.goodsList = [];
@@ -216,10 +222,22 @@ export default {
},
// 子分类
bindPickerSubclassChange(e) {
- if(this.subclassIndex == e.detail.value) return;
+ // if(this.subclassIndex == e.detail.value) return;
+ if(this.isShowBind && this.subclassIndex == e.detail.value) {
+ return;
+ }else{
+ if(e.detail.value=="0"){
+ this.form.hotListId=''
+ this.form.cateId=''
+ }else{
+ this.subclass = this.subclassList[e.detail.value];
+ this.form.cateId = this.subclass.cateId;
+ }
+ }
+ this.isShowBind=true
this.subclassIndex = e.detail.value;
this.subclass = this.subclassList[this.subclassIndex];
- this.form.cateId = this.subclass.cateId;
+ // this.form.cateId = this.subclass.cateId;
this.goodsList = [];
this.getHotList();
},
diff --git a/pages/shop/IntegralGoodsCon/index.vue b/pages/shop/IntegralGoodsCon/index.vue
index b8ca2ed..c9d57ed 100644
--- a/pages/shop/IntegralGoodsCon/index.vue
+++ b/pages/shop/IntegralGoodsCon/index.vue
@@ -101,9 +101,11 @@
+
{{entryInfo.entryInfo}}
+
diff --git a/pages/user/coupon/UserCoupon/index.vue b/pages/user/coupon/UserCoupon/index.vue
index 3618b5d..c9c6d46 100644
--- a/pages/user/coupon/UserCoupon/index.vue
+++ b/pages/user/coupon/UserCoupon/index.vue
@@ -113,7 +113,7 @@
data: function() {
return {
CustomBar: this.CustomBar,
- navType: 0,
+ navType: 1,
couponsList: [],
loading: false,
page: 1,
@@ -129,7 +129,7 @@
},
},
mounted: function() {
- this.getUseCoupons(0)
+ this.getUseCoupons(1)
},
methods: {
setType(i) {