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

2 years ago · 8b3314f433
11 changed files with 57 additions and 22 deletions
--- 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
 	});
--- 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;
--- 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
--- a/pages/activity/DargainGoodsDetails/index.vue
+++ b/pages/activity/DargainGoodsDetails/index.vue
@ -114,9 +114,11 @@
 		<!-- 词条弹框 -->
 		<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
 			<view class="entry-box">
+				<scroll-view scroll-y="true" style="height: 310rpx;">
 				<view class="entry">
 					{{entryInfo.entryInfo}}
 				</view>
+				</scroll-view>
 			</view>
 		</view>
 	</view>
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@ -266,9 +266,11 @@
 		<!-- 词条弹框 -->
 		<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
 			<view class="entry-box">
+				<scroll-view scroll-y="true" style="height: 310rpx;">
 				<view class="entry">
 					{{entryInfo.entryInfo}}
 				</view>
+				</scroll-view>
 			</view>
 		</view>
    <!-- 商品信息弹窗 -->
@ -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]);
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@ -200,9 +200,11 @@
 		<!-- 词条弹框 -->
 		<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
 			<view class="entry-box">
+				<scroll-view scroll-y="true" style="height: 310rpx;">
 				<view class="entry">
 					{{entryInfo.entryInfo}}
 				</view>
+				</scroll-view>
 			</view>
 		</view>
 		
--- 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;
 					})
 				}
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@ -67,7 +67,7 @@
 				</view>
 				<view class="right acea-row row-between row-column">
 					<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">
 								<view class="top acea-row">
 									<image class="img" :src="bar.image" mode="aspectFill"></image>
@ -86,7 +86,7 @@
 						</swiper>
 					</view>
 					<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">
 								<view class="top acea-row">
 									<image class="img" :src="item.image" mode="aspectFill"></image>
@ -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{
--- a/pages/shop/HotNewGoods/index.vue
+++ b/pages/shop/HotNewGoods/index.vue
@ -38,7 +38,7 @@
 			
 			<scroll-view class="nav-scroll" scroll-x="true">
 				<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">
 						<view class="nav-name">{{form.mouth}}</view>
 						<view class="jiantou-down"></view>
@ -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();
 		},
--- a/pages/shop/IntegralGoodsCon/index.vue
+++ b/pages/shop/IntegralGoodsCon/index.vue
@ -101,9 +101,11 @@
 			<!-- 词条弹框 -->
 			<view class="entry-mask" v-show="showEntry" @touchmove.stop.prevent @click="closeEntry">
 				<view class="entry-box">
+					<scroll-view scroll-y="true" style="height: 310rpx;">
 					<view class="entry">
 						{{entryInfo.entryInfo}}
 					</view>
+					</scroll-view>
 				</view>
 			</view>
      <!-- 商品规格弹窗 -->
--- 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) {