lilei пре 9 месеци
родитељ
комит
d348d91730

+ 4 - 4
pages/index/index.vue

@@ -679,14 +679,14 @@
 								this.getCurrUserInfo()
 								// 显示促销模块
 								this.showPromoTab()
+								// 保证金查询
+								this.getShelfBWPayRecord()
+								// 获取订单信息
+								this.shelfGetTotalWaitQty()
 							}
 							
 							// 获取价格权限配置
 							this.getPriceCofig()
-							// 保证金查询
-							this.getShelfBWPayRecord()
-							// 获取订单信息
-							this.shelfGetTotalWaitQty()
 							// 获取轮播数据,包括促销活动
 							this.getCarousel()
 						}else{

+ 19 - 12
pages/videos/index.vue

@@ -7,7 +7,7 @@
 				</view>
 				<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
 					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, indexs) in tabList" :key="indexs">
-						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
+						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom" v-if="swiperCurrent==indexs">
 							<view  
 							class="check-order-list" 
 							v-for="(item,index) in list" 
@@ -23,7 +23,7 @@
 											<u-icon size="30" color="#fff" name="eye-fill"></u-icon>
 											{{item.viewNum}}
 										</view>
-										<u-image :src="item.imageSet[0]" height="200px" width="100%"></u-image>
+										<u-image :src="item.images" height="200px" width="100%"></u-image>
 									</view>
 									<view class="ellipsis-two">{{item.titile}}</view>
 								</view>
@@ -56,7 +56,7 @@
 				swiperCurrent: 0,
 				// 查询条件
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 5,
 				list: [],
 				total: 0,
 				videoObj:null
@@ -92,12 +92,14 @@
 			},
 			// tabs通知swiper切换
 			tabsChange(index) {
+				this.list = []
+				this.status = "loading"
 				this.swiperCurrent = index;
 			},
 			swiperChange(event){
-				console.log(event.detail)
 				this.list = []
 				this.status = "loading"
+				this.swiperCurrent = event.detail.current;
 			},
 			// swiper-item左右移动,通知tabs的滑块跟随移动
 			transition(e) {
@@ -137,16 +139,21 @@
 			  params.category = this.tabList ? this.tabList[this.swiperCurrent].code : ''
 			  this.status = "loading"
 			  getVideoList(params).then(res => {
-				if (res.code == 200 || res.status == 204 || res.status == 200) {
+				if (res.status == 200) {
 				  const list = res.data.list || []
-				  list.map(item => {
-					  item.showVideo = false
+				  const ret = []
+				  list.forEach(item => {
+					  ret.push({
+						  id: item.id,
+						  showVideo: false,
+						  contentType: item.contentType,
+						  titile: item.titile,
+						  viewNum: item.viewNum,
+						  images: item.images,
+						  content: item.content
+					  })
 				  })
-				  if(_this.pageNo>1){
-					  _this.list = _this.list.concat(list)
-				  }else{
-					  _this.list = list
-				  }
+				  _this.list = _this.list.concat(ret)
 				  _this.total = res.data.count || 0
 				} else {
 				  _this.list = []

+ 4 - 2
pagesA/digitalShelf/orderList.vue

@@ -7,7 +7,7 @@
 				</view>
 				<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
 					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, indexs) in tabList" :key="indexs">
-						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
+						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom" v-if="swiperCurrent == indexs">
 							<view  
 							class="check-order-list" 
 							v-for="(item,index) in list" 
@@ -144,12 +144,14 @@
 			},
 			// tabs通知swiper切换
 			tabsChange(index) {
+				this.list = []
+				this.status = "loading"
 				this.swiperCurrent = index;
 			},
 			swiperChange(event){
-				console.log(event.detail)
 				this.list = []
 				this.status = "loading"
+				this.swiperCurrent = event.detail.current
 			},
 			// swiper-item左右移动,通知tabs的滑块跟随移动
 			transition(e) {

+ 5 - 3
pagesA/digitalShelf/stockPut.vue

@@ -7,7 +7,7 @@
 				</view>
 				<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
 					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, indexs) in tabList" :key="indexs">
-						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
+						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom" v-if="swiperCurrent == indexs">
 							<view style="height: 20rpx;" ></view>
 							<view  
 							class="check-order-list" 
@@ -126,12 +126,14 @@
 			},
 			// tabs通知swiper切换
 			tabsChange(index) {
-				this.swiperCurrent = index;
+				this.list = []
+				this.status = "loading"
+				this.swiperCurrent = index
 			},
 			swiperChange(event){
-				console.log(event.detail)
 				this.list = []
 				this.status = "loading"
+				this.swiperCurrent = event.detail.current
 			},
 			// swiper-item左右移动,通知tabs的滑块跟随移动
 			transition(e) {

+ 4 - 2
pagesA/digitalShelf/tempOrderList/tempOrderList.vue

@@ -7,7 +7,7 @@
 				</view>
 				<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
 					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, indexs) in tabList" :key="indexs">
-						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
+						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom" v-if="swiperCurrent == indexs">
 							<view  
 							class="check-order-list" 
 							v-for="(item,index) in list" 
@@ -128,12 +128,14 @@
 			},
 			// tabs通知swiper切换
 			tabsChange(index) {
+				this.list = []
+				this.status = "loading"
 				this.swiperCurrent = index;
 			},
 			swiperChange(event){
-				console.log(event.detail)
 				this.list = []
 				this.status = "loading"
+				this.swiperCurrent = event.detail.current
 			},
 			// swiper-item左右移动,通知tabs的滑块跟随移动
 			transition(e) {

+ 5 - 3
pagesB/cart/productitem.vue

@@ -11,12 +11,14 @@
 				 <view class="choose-product-item-img">
 					<image mode="aspectFit" :src="item.productImage+'?x-oss-process=image/resize,p_30'" style="width: 100%;height: 180rpx;"></image>
 					<!-- <view class="back-price" v-if="item.promoRuleValue">返<text>{{item.promoRuleValue}}</text>元</view> -->
-					<view class="choose-product-item-left-info-code ellipsis-one">{{item.productCode}}</view>
+					<view class="choose-product-item-left-info-code">
+						<text max-lines="1" overflow="ellipsis">{{item.productCode}}</text>
+					</view>
 				 </view>
 				 <view class="choose-product-item-info">
-					<view class="choose-product-item-left-info-name ellipsis-two">{{item.productName}}</view>
+					<view class="choose-product-item-left-info-name">{{item.productName}}</view>
 					<view class="choose-product-item-left-info-guige">
-						<text class="ellipsis-two" max-lines="2" overflow="ellipsis">{{item.productOrigCode}}</text>
+						<text max-lines="2" overflow="ellipsis">{{item.productOrigCode}}</text>
 					</view>
 					<view class="choose-product-item-left-info-price">
 						<view class="price-txt">¥<text>{{item.cost}}</text></view>

+ 4 - 1
pagesB/coupon.vue

@@ -7,7 +7,7 @@
 				</view>
 				<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
 					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, indexs) in tabList" :key="indexs">
-						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
+						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom" v-if="swiperCurrent==indexs">
 							<view  
 							class="check-order-list" 
 							v-for="(item,index) in list" 
@@ -114,11 +114,14 @@
 			},
 			// tabs通知swiper切换
 			tabsChange(index) {
+				this.list = []
+				this.status = "loading"
 				this.swiperCurrent = index;
 			},
 			swiperChange(event){
 				this.list = []
 				this.status = "loading"
+				this.swiperCurrent = event.detail.current
 			},
 			// swiper-item左右移动,通知tabs的滑块跟随移动
 			transition(e) {

+ 4 - 1
pagesB/procureOrderList.vue

@@ -7,7 +7,7 @@
 				</view>
 				<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
 					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, indexs) in tabList" :key="indexs">
-						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
+						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom" v-if="swiperCurrent == indexs">
 							<view  
 							class="check-order-list" 
 							v-for="(item,index) in list" 
@@ -102,11 +102,14 @@
 			},
 			// tabs通知swiper切换
 			tabsChange(index) {
+				this.list = []
+				this.status = "loading"
 				this.swiperCurrent = index;
 			},
 			swiperChange(event){
 				this.list = []
 				this.status = "loading"
+				this.swiperCurrent = event.detail.current
 			},
 			// swiper-item左右移动,通知tabs的滑块跟随移动
 			transition(e) {

+ 1 - 1
pagesB/shopiing/productDetail.vue

@@ -387,7 +387,7 @@
 					.popu-content-num{
 						font-size: 12px;
 						color: #999999;
-						margin-top: 5px;
+						padding: 0 10px;
 					}
 				}
 				.popu-content-btn{

+ 20 - 14
pagesB/videos/index.vue

@@ -6,8 +6,8 @@
 					 swiperWidth="750"></u-tabs-swiper>
 				</view>
 				<swiper class="check-list" :current="swiperCurrent" @transition="transition" @change="swiperChange" @animationfinish="animationfinish">
-					<swiper-item class="swiper-item" style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, indexs) in tabList" :key="indexs">
-						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom">
+					<swiper-item style="height: 100%;width: 100%;overflow: hidden;" v-for="(tabs, indexs) in tabList" :key="indexs">
+						<scroll-view scroll-y style="height: 100%;width: 100%;overflow: auto;" @scrolltolower="onreachBottom" v-if="swiperCurrent==indexs">
 							<view  
 							class="check-order-list" 
 							v-for="(item,index) in list" 
@@ -23,7 +23,7 @@
 											<u-icon size="30" color="#fff" name="eye-fill"></u-icon>
 											{{item.viewNum}}
 										</view>
-										<u-image :src="item.imageSet[0]" height="200px" width="100%"></u-image>
+										<u-image :src="item.images" height="200px" width="100%"></u-image>
 									</view>
 									<view class="ellipsis-two">{{item.titile}}</view>
 								</view>
@@ -55,7 +55,7 @@
 				swiperCurrent: 0,
 				// 查询条件
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 5,
 				list: [],
 				total: 0,
 				videoObj:null
@@ -91,12 +91,14 @@
 			},
 			// tabs通知swiper切换
 			tabsChange(index) {
+				this.list = []
+				this.status = "loading"
 				this.swiperCurrent = index;
 			},
 			swiperChange(event){
-				console.log(event.detail)
 				this.list = []
 				this.status = "loading"
+				this.swiperCurrent = event.detail.current;
 			},
 			// swiper-item左右移动,通知tabs的滑块跟随移动
 			transition(e) {
@@ -116,7 +118,6 @@
 			},
 			// scroll-view到底部加载更多
 			onreachBottom() {
-				console.log(this.list.length, this.total)
 				if(this.list.length < this.total){
 					this.pageNo += 1
 					this.getRow()
@@ -137,16 +138,21 @@
 			  params.category = this.tabList ? this.tabList[this.swiperCurrent].code : ''
 			  this.status = "loading"
 			  getVideoList(params).then(res => {
-				if (res.code == 200 || res.status == 204 || res.status == 200) {
+				if (res.status == 200) {
 				  const list = res.data.list || []
+				  const ret = []
 				  list.map(item => {
-					  item.showVideo = false
+					  ret.push({
+						  id: item.id,
+						  showVideo: false,
+						  contentType: item.contentType,
+						  titile: item.titile,
+						  viewNum: item.viewNum,
+						  images: item.images,
+						  content: item.content
+					  })
 				  })
-				  if(_this.pageNo>1){
-					  _this.list = _this.list.concat(list)
-				  }else{
-					  _this.list = list
-				  }
+				  _this.list = _this.list.concat(ret)
 				  _this.total = res.data.count || 0
 				} else {
 				  _this.list = []
@@ -188,7 +194,7 @@
 		flex-direction: column;
 		.tab-body{
 			.check-list{
-				height: calc(100vh - 126px);
+				height: calc(100vh - 42px);
 			}
 			.check-order-list{
 				background: #ffffff;