Loki
/
zsw-farm-bxg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

热门榜单增加全部选项，评价图片文字非必选，首页活动轮播，秒杀修改

home_hotList^2
ld0104 2 years ago
parent
77464009ee
commit
8b3314f433
11 changed files with 57 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      api/store.js
  2. 4
      assets/css/style.css
  3. 8
      config/index.js
  4. 2
      pages/activity/DargainGoodsDetails/index.vue
  5. 3
      pages/activity/GroupDetails/index.vue
  6. 2
      pages/activity/SeckillDetails/index.vue
  7. 19
      pages/activity/activity/index.vue
  8. 8
      pages/home/index.vue
  9. 26
      pages/shop/HotNewGoods/index.vue
  10. 2
      pages/shop/IntegralGoodsCon/index.vue
  11. 4
      pages/user/coupon/UserCoupon/index.vue

1
api/store.js
Unescape View File

@ -181,6 +181,7 @@ export function postOrderProduct(unique) {
* 提交评价页面； * 提交评价页面；
*/ */
export function postOrderComment(data) { export function postOrderComment(data) {
console.log(11111);
return request.post("/order/comment", data, { return request.post("/order/comment", data, {
login: true login: true
}); });

4
assets/css/style.css
Unescape View File

@ -1595,8 +1595,8 @@ page {
padding: 32rpx; padding: 32rpx;
} }
.product-con .entry-mask .entry-box .entry { .product-con .entry-mask .entry-box .entry {
height: 100%; /* height: 100%; */
overflow: scroll; /* overflow: scroll; */
font-size: 26rpx; font-size: 26rpx;
font-family: SourceHanSansSCVF; font-family: SourceHanSansSCVF;
font-weight: 500; font-weight: 500;

8
config/index.js
Unescape View File

@ -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.129:48080/bxgApp'
// export const VUE_APP_API_URL = 'http://192.168.10.113: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 = 'https://farm.lotus-wallet.com/bxgApp'
// export const VUE_APP_API_URL = 'https://xiaohui.shop.cyjyyjy.com/xiaohuiapp' // 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 VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static'
export const BXG_TENANT_ID = 129 // export const BXG_TENANT_ID = 129
// export const BXG_TENANT_ID = 138 export const BXG_TENANT_ID = 138
// export const BXG_TENANT_ID = 128 // export const BXG_TENANT_ID = 128

2
pages/activity/DargainGoodsDetails/index.vue
Unescape View File

@ -114,9 +114,11 @@
<!-- 词条弹框 --> <!-- 词条弹框 -->
<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry"> <view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
<view class="entry-box"> <view class="entry-box">
<scroll-view scroll-y="true" style="height: 310rpx;">
<view class="entry"> <view class="entry">
{{entryInfo.entryInfo}} {{entryInfo.entryInfo}}
</view> </view>
</scroll-view>
</view> </view>
</view> </view>
</view> </view>

3
pages/activity/GroupDetails/index.vue
Unescape View File

@ -266,9 +266,11 @@
<!-- 词条弹框 --> <!-- 词条弹框 -->
<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry"> <view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
<view class="entry-box"> <view class="entry-box">
<scroll-view scroll-y="true" style="height: 310rpx;">
<view class="entry"> <view class="entry">
{{entryInfo.entryInfo}} {{entryInfo.entryInfo}}
</view> </view>
</scroll-view>
</view> </view>
</view> </view>
<!-- 商品信息弹窗 --> <!-- 商品信息弹窗 -->
@ -436,7 +438,6 @@ export default {
that.posterData.price = that.storeInfo.pinkPrice that.posterData.price = that.storeInfo.pinkPrice
that.posterData.code = that.storeInfo.code_base that.posterData.code = that.storeInfo.code_base
that.domStatus = true that.domStatus = true
console.log(this.storeInfo,77777777777777)
that.DefaultSelect() that.DefaultSelect()
for(let i in that.productValue) { for(let i in that.productValue) {
that.attrImages.push(that.productValue[i]); that.attrImages.push(that.productValue[i]);

2
pages/activity/SeckillDetails/index.vue
Unescape View File

@ -200,9 +200,11 @@
<!-- 词条弹框 --> <!-- 词条弹框 -->
<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry"> <view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
<view class="entry-box"> <view class="entry-box">
<scroll-view scroll-y="true" style="height: 310rpx;">
<view class="entry"> <view class="entry">
{{entryInfo.entryInfo}} {{entryInfo.entryInfo}}
</view> </view>
</scroll-view>
</view> </view>
</view> </view>

19
pages/activity/activity/index.vue
Unescape View File

@ -210,6 +210,8 @@
this.goodsList=[] this.goodsList=[]
// this.tabType = 0; // this.tabType = 0;
if(i === 0) { if(i === 0) {
this.seckillList=[]
this.seckillForm.page=1
this.setTime(0); this.setTime(0);
// this.goodsList = this.seckillList; // this.goodsList = this.seckillList;
} else if(i === 1) { } else if(i === 1) {
@ -230,6 +232,9 @@
// this.goodsList=[] // this.goodsList=[]
this.tabType = i; this.tabType = i;
if(this.activityType == 0) { if(this.activityType == 0) {
this.seckillList=[]
this.goodsList=[]
this.seckillForm.page=1
this.setTime(i); this.setTime(i);
}else if(this.activityType == 1){ }else if(this.activityType == 1){
this.groupForm.page=1 this.groupForm.page=1
@ -292,12 +297,16 @@
}) })
}, },
setTime(i) { setTime(i) {
if(i == 0) { if(i == 0 && this.tabType==0) {
console.log(1111111111111); console.log(1111111111111);
this.seckillActive = this.seckillTimeIndex; this.seckillActive = this.seckillTimeIndex;
} else { } else {
if(this.seckillTimeIndex == this.timeList.length-1) { if(this.seckillTimeIndex == this.timeList.length-1) {
this.seckillActive = 0; // this.seckillActive = 0;
this.seckillList=[]
this.goodsList=[]
this.seckillForm.page=1
return
} else { } else {
this.seckillActive = this.seckillTimeIndex+1; this.seckillActive = this.seckillTimeIndex+1;
} }
@ -325,19 +334,19 @@
}) })
}, },
getGrouponList() { getGrouponList() {
// if (this.groupLoaded) return if (this.groupLoaded) return
if(this.activityType === 1 && this.tabType===0){ if(this.activityType === 1 && this.tabType===0){
getCombinationList(this.groupForm).then(res => { getCombinationList(this.groupForm).then(res => {
this.grouponList = this.grouponList.concat(res.data.storeCombinationQueryVos) this.grouponList = this.grouponList.concat(res.data.storeCombinationQueryVos)
this.groupForm.page++; 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; this.goodsList = this.grouponList;
}) })
}else{ }else{
getUserCombinationList(this.groupForm).then(res => { getUserCombinationList(this.groupForm).then(res => {
this.grouponList = this.grouponList.concat(res.data.storeCombinationQueryVos) this.grouponList = this.grouponList.concat(res.data.storeCombinationQueryVos)
this.groupForm.page++; 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; this.goodsList = this.grouponList;
}) })
} }

8
pages/home/index.vue
Unescape View File

@ -67,7 +67,7 @@
</view> </view>
<view class="right acea-row row-between row-column"> <view class="right acea-row row-between row-column">
<view class="swiper-box"> <view class="swiper-box">
<swiper style="width: 100%; height: 168rpx;"> <swiper style="width: 100%; height: 168rpx;" autoplay="true" circular="true">
<swiper-item style="border-radius: 16rpx;" v-for="(bar,bargainListIndex) in bargainList" :key="bargainListIndex"> <swiper-item style="border-radius: 16rpx;" v-for="(bar,bargainListIndex) in bargainList" :key="bargainListIndex">
<view class="top acea-row"> <view class="top acea-row">
<image class="img" :src="bar.image" mode="aspectFill"></image> <image class="img" :src="bar.image" mode="aspectFill"></image>
@ -86,7 +86,7 @@
</swiper> </swiper>
</view> </view>
<view class="swiper-box"> <view class="swiper-box">
<swiper style="width: 100%; height: 168rpx;"> <swiper style="width: 100%; height: 168rpx;" autoplay="true" circular="true">
<swiper-item style="border-radius: 16rpx;" v-for="(item,combinationListIndex) in combinationList" :key="combinationListIndex"> <swiper-item style="border-radius: 16rpx;" v-for="(item,combinationListIndex) in combinationList" :key="combinationListIndex">
<view class="top acea-row"> <view class="top acea-row">
<image class="img" :src="item.image" mode="aspectFill"></image> <image class="img" :src="item.image" mode="aspectFill"></image>
@ -1094,7 +1094,7 @@
} }
.img{ .img{
width: 213rpx; width: 213rpx;
height: 242rpx; height: 236rpx;
margin-left: 18rpx; margin-left: 18rpx;
margin-top: 15rpx; margin-top: 15rpx;
} }
@ -1278,7 +1278,7 @@
font-size: 34rpx; font-size: 34rpx;
position: absolute; position: absolute;
top: 90rpx; top: 90rpx;
left: 21rpx; left: 22rpx;
} }
} }
.hot-right{ .hot-right{

26
pages/shop/HotNewGoods/index.vue
Unescape View File

@ -38,7 +38,7 @@
<scroll-view class="nav-scroll" scroll-x="true"> <scroll-view class="nav-scroll" scroll-x="true">
<view class="nav-box"> <view class="nav-box">
<view class="item on">全部</view> <!-- <view class="item on">全部</view> -->
<picker class="item" @change="bindPickerChange" :value="mouthIndex" :range="mouthList" v-if="mouthList.length"> <picker class="item" @change="bindPickerChange" :value="mouthIndex" :range="mouthList" v-if="mouthList.length">
<view class="nav-name">{{form.mouth}}</view> <view class="nav-name">{{form.mouth}}</view>
<view class="jiantou-down"></view> <view class="jiantou-down"></view>
@ -157,6 +157,8 @@ export default {
// observer: true, // observer: true,
// observeParents: true // observeParents: true
// } // }
// isShow:false,
isShowBind:false
}; };
}, },
mounted: function() { mounted: function() {
@ -185,6 +187,10 @@ export default {
// this.form.hotListId = this.classifyList[this.classifyType].id; // this.form.hotListId = this.classifyList[this.classifyType].id;
this.form.hotListId = ''; this.form.hotListId = '';
this.subclassList = this.classifyList[this.classifyType].cateDtos; this.subclassList = this.classifyList[this.classifyType].cateDtos;
this.subclassList.unshift({
cateId:'',
cateName:'全部',
})
this.subclass = this.subclassList[0]; this.subclass = this.subclassList[0];
// this.form.cateId = this.subclass.cateId; // this.form.cateId = this.subclass.cateId;
this.form.cateId = ' '; this.form.cateId = ' ';
@ -193,7 +199,7 @@ export default {
}, },
// 月份 // 月份
bindPickerChange(e) { bindPickerChange(e) {
if(this.mouthIndex == e.detail.value) return; // if(this.mouthIndex == e.detail.value) return;
this.mouthIndex = e.detail.value; this.mouthIndex = e.detail.value;
this.form.mouth = this.mouthList[this.mouthIndex]; this.form.mouth = this.mouthList[this.mouthIndex];
this.goodsList = []; this.goodsList = [];
@ -216,10 +222,22 @@ export default {
}, },
// 子分类 // 子分类
bindPickerSubclassChange(e) { 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.subclassIndex = e.detail.value;
this.subclass = this.subclassList[this.subclassIndex]; this.subclass = this.subclassList[this.subclassIndex];
this.form.cateId = this.subclass.cateId; // this.form.cateId = this.subclass.cateId;
this.goodsList = []; this.goodsList = [];
this.getHotList(); this.getHotList();
}, },

2
pages/shop/IntegralGoodsCon/index.vue
Unescape View File

@ -101,9 +101,11 @@
<!-- 词条弹框 --> <!-- 词条弹框 -->
<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry"> <view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
<view class="entry-box"> <view class="entry-box">
<scroll-view scroll-y="true" style="height: 310rpx;">
<view class="entry"> <view class="entry">
{{entryInfo.entryInfo}} {{entryInfo.entryInfo}}
</view> </view>
</scroll-view>
</view> </view>
</view> </view>
<!-- 商品规格弹窗 --> <!-- 商品规格弹窗 -->

4
pages/user/coupon/UserCoupon/index.vue
Unescape View File

@ -113,7 +113,7 @@
data: function() { data: function() {
return { return {
CustomBar: this.CustomBar, CustomBar: this.CustomBar,
navType: 0, navType: 1,
couponsList: [], couponsList: [],
loading: false, loading: false,
page: 1, page: 1,
@ -129,7 +129,7 @@
}, },
}, },
mounted: function() { mounted: function() {
this.getUseCoupons(0) this.getUseCoupons(1)
}, },
methods: { methods: {
setType(i) { setType(i) {

Write Preview
Loading…
Cancel
Save