去除视频

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/290

components/mine/coupon/index.vue

@@ -2,8 +2,8 @@
 	<view class="c-coupon">
 		<view class="coupon-usable">
 			<view class="info-type" :style="{ backgroundImage: 'url(' + '/static/image/mine/30.png' + ')', backgroundSize:'contain', backgroundRepeat: 'no-repeat' }">
-				<div class="wrap_left_top"></div>
-				{{ couponInfo.type == 2 ? '店铺优惠券' : '平台优惠券' }}
+				<div class="wrap_left_top" v-if="couponInfo.type == 1">{{ couponInfo.vouchertemplate_id == 1 ? '新人专享' : '平台优惠券' }}</div>
+				<div class="wrap_left_top" v-else-if="couponInfo.type == 2">店铺优惠券</div>
 			</view>
 			<view class="coupon-info">
 				<view class="info-usable">

components/mine/coupon/mine.vue

@@ -2,8 +2,8 @@
 	<view class="c-coupon" v-if="goodsClass.length">
 		<view :class="couponInfo.voucher_state != 1 ? 'coupon-unable' : 'coupon-usable'">
 			<view class="info-type" :style="{ backgroundImage: 'url(' + (couponInfo.voucher_state == 1 ? '/static/image/mine/30.png' : '/static/image/mine/31.png') + ')', backgroundSize:'contain', backgroundRepeat: 'no-repeat' }">
-				<div class="wrap_left_top"></div>
-				{{ couponInfo.type == 2 ? '店铺优惠券' : '平台优惠券' }}
+				<div class="wrap_left_top" v-if="couponInfo.type == 1">{{ couponInfo.vouchertemplate_id == 1 ? '新人专享' : '平台优惠券' }}</div>
+				<div class="wrap_left_top" v-else-if="couponInfo.type == 2">店铺优惠券</div>
 			</view>
 			<view class="coupon-info">
 				<view class="info-usable">

components/remaining/remaining.vue

@@ -50,7 +50,7 @@
 		data() {
 			return {
 				remaining: 7,
-				type: true,
+				type: false,
 				banner: false,
 				protocol: false,
 				heightOut: '',
@@ -121,13 +121,13 @@
 					if (this.remaining <= 0) {
 						clearInterval(this.timer);
 						console.log("完了")
-						this.type = !this.type;
+						// this.type = !this.type;
 						this.banner = !this.banner;
 					}
 				}, 1000);
 			},
 			leap_over() {
-				this.type = !this.type
+				// this.type = !this.type
 				this.banner = !this.banner;
 				clearInterval(this.timer)
 					// 获取屏幕高度

pageB/video/video.nvue

@@ -71,12 +71,11 @@
                                 </view>
                                 <text class="child_content">{{ child.content }}</text>
                             </view>
-                            <view>
+                            <!-- <view> -->
                                 <text class="more-comment" @click="getReplyList(item.id)" v-if="item.reply_count">
                                     {{ child_end[item.id] ? "暂无更多回复" : "展开更多回复" }}
                                 </text>
-                                <text></text>
-                            </view>
+                            <!-- </view> -->
                         </view>
                     </view>
                     <view class="send-box" @click="openKeyInput">
@@ -678,14 +677,17 @@
     }
 
     .child_content {
-        padding: 4rpx 0;
+        width: 550rpx;
+        padding-top: 6rpx;
         margin-left: 40rpx;
         font-size: 26rpx;
     }
 
     .more-comment {
-        margin: 10rpx 0;
+        width: 150rpx;
+        height: 40rpx;
         font-size: 22rpx;
+        line-height: 4;
         color: #999;
     }
 

pageD/activity/activity.vue

@@ -15,6 +15,7 @@
                 </view>
             </view>
         </block>
+		<u-loadmore :status="loadStatus" bg-color="#ECECEC" margin-top="20" v-if="loadStatus=='nomore'" />
 	</view>
 </template>
 
@@ -23,9 +24,8 @@
 		data() {
 			return {
 				height:'600',
-				actives: [
-					
-				]
+				actives: [],
+				loadStatus: 'loadmore'
 			};
 		},
 		onLoad(){
@@ -46,6 +46,8 @@
 				this.$u.api.messageactivityList({}).then((res)=>{
                     if (res.errCode == 0) {
 						this.actives = res.data;
+						// 目前没有分页,只无数据提示用,他们建议这样做
+						if(!this.actives.length) this.loadStatus = 'nomore';
                     }
 				})
 			}

pageD/logistics/logistics.vue

@@ -18,6 +18,7 @@
 				</view>
 			</view>
 		</view>
+		<u-loadmore :status="loadStatus" bg-color="#ECECEC" margin-top="20" @loadmore="loadmore" />
 	</view>
 </template>
 
@@ -26,21 +27,46 @@
 		data() {
 			return {
 				actives: [],
-                page: 1
+				page: 1,
+				timer: true,
+				loadStatus: 'loadmore'
 			};
 		},
         onLoad() {
           this.getCartList();  
 		},
+		onReachBottom() {
+			this.loadmore();
+		},
 		methods: {
-            getCartList() {
-                this.$u.post("message/orderDeliveryList",{page: this.page}).then(res => {
-					console.log(res.data.data)
-                    if (res.errCode == 0) {
-                        this.actives = res.data.data;
+			loadmore() {
+				if(!this.timer) return false;
+				this.loadStatus = "loading";
+				this.page++;
+				this.getCartList({ load: 'loadmore' }).then(length => {
+					if(length == 0) {
+						this.page--;
+						this.loadStatus = 'nomore';
+					} else {
+						this.loadStatus = 'loading';
 					}
+				}).catch(() => {
+					this.loadStatus = "nomore";
+					this.page--;
 				})
 			},
+            async getCartList({ load = 'reload' } = {}) {
+                const res = await this.$u.post("message/orderDeliveryList",{ page: this.page })
+				this.timer = true;
+				if (res.errCode == 0) {
+					if(load == 'reload') {
+						this.actives = res.data.data;
+						if(res.data.data.length < 12) this.loadStatus = "nomore";
+					}
+					else if(load == 'loadmore') this.actives.push(...res.data.data);
+				}
+				return res.data.data.length;
+			},
 			viewLogistics(item) {
 				let url;
 				if(item.takeawayer_phone) {

pageD/notice/notice.vue

@@ -2,6 +2,7 @@
 	<view id="viewes" :style="{height : height  + 'px'}">
 		<!-- 公告咨询 -->
 		<notice :list="list"></notice>
+		<u-loadmore :status="loadStatus" bg-color="#ECECEC" margin-top="20" v-if="loadStatus=='nomore'" />
 	</view>
 </template>
 
@@ -11,6 +12,7 @@
 		data() {
 			return {
 				list: [],
+				loadStatus: 'loadmore'
 			};
 		},
 		onLoad() {
@@ -29,6 +31,8 @@
 				this.$u.api.informationList({}).then((res) => {
 					if (res.errCode == 0) {
 						this.list = res.data;
+						// 目前没有分页,只无数据提示用
+						if(!this.list.length) this.loadStatus = 'nomore';
 					}
 				})
 			}