Merge pull request 'paixu' (#239) from xbx into master

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

common/api/user.js

@@ -421,7 +421,7 @@ export default {
 			couponGoodsList({ voucher_id, page, order }) {
 				return vm.$u.post('Coupon/couponGoodsList', { 
 					page: page,
-					voucher_id: voucher_id,
+					vouchertemplate_id: voucher_id,
 					order: order,
 				});
 			},

components/comment/index.vue

@@ -9,7 +9,7 @@
 			<view class="text">{{ content.geval_content }}</view>
 		</view>
 		<view class="image-container">
-			<image :src="src" v-for="(src, index) in content.geval_image" :key="index"></image>
+			<image :src="src" v-for="(src, index) in content.geval_image" :key="index" @click="previewImage(content.geval_image)"></image>
 		</view>
 		<view class="reply" v-if="reply && content.geval_explain">
 			<view class="title">掌柜回复：</view>
@@ -39,6 +39,14 @@ export default {
 	},
 	created() {
 		if(this.content.hasOwnProperty('scores_two')) this.rate = this.content.scores_two;
+	},
+	methods: {
+		previewImage(urls) {
+			console.log(urls);
+			// uni.previewImage({
+			// 	urls: urls,
+			// });
+		},
 	}
 };
 </script>

components/index/video-item/index.vue

@@ -1,9 +1,12 @@
 <template>
     <view class="video-item" v-if="item" @click="toDetailsPage(item.article_id,item.video_path)">
         <image class="head" :src="item.article_pic" v-if="item.type == 1" ></image>
-		<view class="header_fist"  v-else>
+		<view class="header_fist" v-else>
-			<view class="backes"></view>
+			<view class="backes">
-			<image class="head" :src="item.article_pic" ></image>
+                <u-icon name="play-circle-fill" color="#ffffff" size="20"></u-icon>
+                <text>视频</text>
+            </view>
+			<image class="head" :src="item.article_pic"></image>
 		</view>
         <view class="title" v-if="">{{ item.article_title }}</view>
         <view class="jianjie">{{ item.article_content }}</view>
@@ -172,11 +175,22 @@
 	.header_fist{
 		position: relative;
 		.backes{
+            z-index: 99;
 			position: absolute;
-			top: 0;
+            display: flex;
-			width: 100%;
+            align-items: center;
-			height: 100%;
+            justify-content: space-around;
-			color: #fff;
+			top: 10rpx;
+            left: 10rpx;
+			width: 80rpx;
+			height: 30rpx;
+            padding: 0 10rpx;
+            border-radius: 30rpx;
+			background-color: rgba(0,0,0,0.5);
+            & > text {
+                color: #fff;
+                font-size: 18rpx;
+            }
 		}
 		
 	}
@@ -197,7 +211,7 @@ export default {
 	},
     watch: {
         item(newVal, old) {
-            // console.log(newVal);
+            console.log(newVal);
             this.item = newVal;
         },
         deep: true

components/shop/group/index.vue

@@ -8,7 +8,6 @@
 			</view>
         </view>
         <view class="label">
-            <!-- <u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper> -->
 			<u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24"  inactive-color="#333333"></u-tabs>
         </view>
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 340rpx;">

components/shop/list/index.vue

@@ -2,7 +2,6 @@
     <view class="list">
         <view class="top">商品推荐</view>
 		<view>
-			<!-- <u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="26" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper> -->
 			<u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24"  inactive-color="#333333"></u-tabs>
 		</view>
 		<swiper class="swiper-box" :current="swiperCurrent" @animationfinish="animationfinish" :style="{height: swiperHeight}">
@@ -49,7 +48,7 @@ export default {
 		this.getGoodsClassRecommend();
 	},
 	methods: {
-		loadMore(page) {
+		loadMore() {
 			if(!this.timer) return false;
 			this.loadStatus = "loading";
 			this.page++;
@@ -85,8 +84,6 @@ export default {
 				page: page,
 				gc_id: gc_id,
 			})
-				console.log(res)
-
 			// this.swiperCurrent = this.current;
 			if (res.errCode == 0) {
 				this.timer = true;
@@ -100,7 +97,7 @@ export default {
 		},
 		setSwiperHeight() {
 			// height: 480rpx, margin-bottom: 26rpx
-			const height = Math.ceil(this.goodsList[this.current].length / 2) * (480 + 26);
+			const height = Math.ceil(this.goodsList[this.current].length / 2) * (450 + 26);
 			this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
 			// console.log(this.swiperHeight);
 		},

components/shop/list/item.vue

@@ -44,14 +44,14 @@ export default {
 <style lang="scss" scoped>
 .item{
     width: 330rpx;
-	height: 480rpx;
+	height: 450rpx;
     margin-bottom: 26rpx;
     background-color: #f8f8f8;
     border-radius: 10rpx 10rpx 0rpx 0rpx;
     .img{
 		width: 330rpx;
 		height: 300rpx;
-		background: rgba(245,245,245,1);
+		background: rgb(114, 110, 110);
 		border-radius: 10rpx 10rpx 0rpx 0rpx;
 		margin-bottom: 24rpx;
     }

components/shop/recommend/pintuan.vue

@@ -10,8 +10,8 @@
         <view class="connect">
             <view class="user">
                 <view class="avatar">
-					<image :src="info.member_avatar[0]"></image>
+					<image src="/static/image/common/32.png"></image>
-					<image :src="info.member_avatar[1]"></image>
+					<image src="/static/image/common/31.png"></image>
 				</view>
 				<view class="num">{{ info.pintuan_limit_number }}人团</view>
             </view>
@@ -91,7 +91,7 @@ export default {
 		}
     }
     .connect{
-		padding:10rpx 30rpx 30rpx;
+		padding:10rpx 0 30rpx;
         display: flex;
 		align-items: center;
         .user {

components/shop/seckill/index.vue

@@ -19,7 +19,7 @@
             </view>
 			<view class="next" @click="viewMore">
 				<text>查看更多</text>
-				<u-icon name="arrow-right" color="#999" size="18"></u-icon>
+				<u-icon name="arrow-right" color="#999" size="22"></u-icon>
 			</view>
         </view>
         <view class="list">
@@ -82,7 +82,7 @@ export default {
                     background-color: #000;
                 }
                 .mah {
-                    vertical-align: text-top;
+                   color: #999999;
                 }
             }
         }

components/shop/youhq/index.vue

@@ -2,11 +2,12 @@
 	<view class="coupon-swiper">
 		<view class="top">
 			<view class="title">全部优惠券</view>
-			<view class="view-more" @click="toCouponPage">查看更多></view>
+			<view class="view-more" @click="toCouponPage">
+				<text>查看更多</text>
+				<u-icon name="arrow-right" color="#999" size="22"></u-icon>
+			</view>
 		</view>
-		<!-- <u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="60" ></u-tabs-swiper> -->
 		<u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24"  inactive-color="#333333"></u-tabs>
-		 <!-- :style="{ height: swiperHeight }" -->
 		<swiper class="box" :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
 				<!-- 最多显示四个 -->
@@ -114,6 +115,8 @@ export default {
 		.view-more {
 			font-size: 20rpx;
 			color: rgba(153,153,153,1);
+			display: flex;
+			align-items: center;
 		}
 	}
     .box {

pageA/bindinges/bindinges.vue

@@ -133,8 +133,8 @@
                             title: res.message,
                             type: 'success',
                         })
-                        uni.switchTab({
+                        uni.navigateTo({
-                             url: '/pages/index/index'
+                             url: '/pageA/topick/topick'
                         });
                     } else {
                         this.$refs.uToast.show({

pageA/login/login.vue

@@ -237,11 +237,11 @@
                                                     console.log(res.data.member.member_mobilebind);
 													if(res.data.member.member_mobilebind) {
 														uni.switchTab({
-																url: "/pages/index/index"
+															url: "/pages/index/index"
 														});
 													} else {
 														uni.navigateTo({
-															 url: '/pageA/bindinges/bindinges'
+															url: '/pageA/bindinges/bindinges'
 														});
 													}
 												}
@@ -275,11 +275,11 @@
                                                     console.log(res.data.member.member_mobilebind);
 													if(res.data.member.member_mobilebind) {
 														uni.switchTab({
-																url: "/pages/index/index"
+															url: "/pages/index/index"
 														});
 													} else {
 														uni.navigateTo({
-															 url: '/pageA/bindinges/bindinges'
+															url: '/pageA/bindinges/bindinges'
 														});
 													}
 												}

pageA/pactList/pactList.vue

@@ -73,11 +73,11 @@ export default {
 		width: 90%;
 		margin: 0 auto;
 		padding: 16upx 0;
-		font-size: 26upx;
+		font-size: 30upx;
 		color: #333;
 	}
 	.rict_type {
 		text-indent: 1rem;
-		line-height: 1.2;
+		line-height: 1.4;
 	}
 </style>

pageB/comment/index.vue

@@ -86,7 +86,7 @@ export default {
 				this.evalueList = [];
 			}
 			return res.data.length;
-		}
+		},
 	}
 };
 </script>

pageB/components/userinfo/index.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="userinfo" @click="stopClick()">
         <view class="userhead">
-            <image class="avatar" :src="item.member_avatar" @click="gotoInfo(item.member_id)"></image>
+            <image class="avatar" :src="item.member_avatar" @click="gotoInfo(item.role,item.member_id,item.store_id)"></image>
             <!-- <text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text> -->
             <image class="follow" :src=" !is_follow ? '../../static/image/userinfo/follow.png' : '../../static/image/userinfo/followed.png' " mode="" @click="following(item.member_id)"></image>
         </view>
@@ -24,7 +24,7 @@
             <text class="operat-span">{{ comment_num }}</text>
         </view>
         <!-- 购物车 -->
-        <view class="operat gouwu">
+        <view class="operat gouwu" v-if="cart_num">
             <image class="operat-img" :src=" is_cart ? '../../static/image/userinfo/gouwuche1.png' : '../../static/image/userinfo/gouwuche.png' "
                 mode="" @click="carting()"></image>
         </view>
@@ -100,18 +100,20 @@
                 is_collect: this.list.is_collect || false,
                 is_content: false,
                 is_cart: false,
+                cart_num: 0,
                 comment_num: this.list.comment_num || 0,
-                item: this.list || {}
+                item: this.list || {},
             }
         },
         watch: {
             list(newValue, old) {
-                // console.log(newValue);
+                // console.log(newValue.goods.length);
                 this.item = newValue || {};
                 this.is_follow = this.list.is_attention || false;
                 this.is_like = this.list.is_like || false;
                 this.is_collect = this.list.is_collect || false;
                 this.comment_num = this.list.comment_num || 0;
+                this.cart_num = newValue.goods.length;
             },
             cart(newValue, old) {
                 // console.log(newValue);
@@ -238,11 +240,16 @@
                     cart: this.is_cart
                 });
             },
-            gotoInfo(id) {
+            gotoInfo(type,id,s_id) {
-                console.log(id);
+                if (type == 2) {
-                uni.navigateTo({
+                    uni.navigateTo({
-                    url: "/pageB/details/index?id=" + id
+                        url: "/pageC/merchant/index?id=" + s_id
-                })
+                    })
+                } else {
+                    uni.navigateTo({
+                        url: "/pageB/details/index?id=" + id
+                    })
+                }
             },
             // 冒泡
             stopClick() {

pageB/details/index.vue

@@ -19,8 +19,8 @@
             <view class="box">
             	<videoItem v-for="item in listInfo" :key="item.article_id" :item="item"
             	 @getArticlelist="getArticlelist"></videoItem>
-                 <view class="no-data" v-show="!listInfo && page">暂无数据</view>
+                 <view class="no-data" v-if="!listInfo && page">暂无数据</view>
-                 <u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
+                 <u-loadmore v-else class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
             </view>
         </scroll-view>
     </view>
@@ -124,16 +124,12 @@ export default {
                     if (this.page == 1) {
                     	this.listInfo = res.data.list;
                         this.status = "loadmore";
-                    } else if (res.data.length == 0 && this.page > 1) {
+                    } else if (res.data.length == 0) {
                         this.status = "nomore";
                     } else {
                     	this.listInfo  = this.listInfo.concat(res.data.list);
-                    	console.log(this.listInfo)
-                    }
-                    if (res.data.length == 0 && this.page > 1) {
-                    } else {
-                        this.page++;
                     }
+                    this.page++;
                 } else {
                     console.log(res.message);
                 }

pageB/photo/index.vue

@@ -335,6 +335,7 @@
 					color: #333;
 					font-size: 28rpx;
 					.title {
+						line-height: 40rpx;
 					}
 					.name {
 						width: 500rpx;
@@ -345,6 +346,8 @@
 						display: -webkit-box;
 						-webkit-box-orient: vertical;
 						-webkit-line-clamp: 2;
+						margin:8rpx 0;
+						line-height:36rpx;
 					}
 					.price {
 						color: #FF3131;

pageB/sdetails/index.vue

@@ -129,7 +129,7 @@
 					<view class="head">
 						<image class="image" :src="goodsInfo.goods_image"></image>
 						<view class="info">
-							<text class="u-line-2">{{goodsInfo.goods_name}}</text>
+							<view class="goods-name u-line-2">{{goodsInfo.goods_name}}</view>
 							<text v-if="type == 1">￥{{ goodsInfo.goods_price }}</text>
 							<text v-else-if="type == 2">￥{{ goodsInfo.pintuan_price }}</text>
 							<text v-else-if="type == 3">￥{{ groupbuyInfo.groupbuy_price }}</text>
@@ -1206,11 +1206,13 @@ export default {
 				justify-content: space-between;
 				margin-left: 27rpx;
 				flex-direction: column;
-				>text:first-child{
+				.goods-name {
+					height: 76rpx;
+					line-height: 38rpx;
 					font-size: 28rpx;
 					color: #333;
 				}
-				>text:last-child{
+				> text:last-child {
 					font-size: 30rpx;
 					color: #ff3131;
 				}

pageB/video/video.nvue

@@ -177,6 +177,9 @@
         onReady() {
             this.videoBox = uni.createVideoContext("videoId", this);
         },
+        onHide() {
+            this.videoBox.pause();
+        },
         onBackPress() {
             if (this.cart_type) {
                 this.cart_type = !this.cart_type;

pageC/cart/ConfirmOrder.vue

@@ -26,7 +26,7 @@
 							<view class="info">
 								<view class="name u-line-2">{{ goods.goods_name }}</view>
 								<view class="cart-info">
-									<view class="price">￥{{ goods.goods_total }}</view>
+									<view class="price">￥{{ goods.goods_price }}</view>
 									<view>×{{ goods.goods_num }}</view>
 								</view>
 							</view>

pageC/merchant/goods.vue

@@ -18,7 +18,7 @@
 					<goodsItem :info="goods"></goodsItem>
 				</view>
 			</view>
-			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
+			<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-bottom="120" v-if="goodsList.length >= pageSize"></u-loadmore>
 			<u-empty mode="list" v-if="!goodsList.length"></u-empty>
 		</scroll-view>
 	</view>

pageC/merchant/index.vue

@@ -220,7 +220,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.scrollHeiht = res.windowHeight - (73 + 20 + 170) + 'px';
+			this.scrollHeiht = res.windowHeight - res.windowWidth / 750 * (350 + 140 + 20) + 'px';
             this.paddingTop = res.windowWidth / 750 * (90 + 50) + 'px';
             // console.log(this.paddingTop);
 		}
@@ -240,6 +240,7 @@ export default {
 	// min-height: 100vh;
 	background-color: #ECECEC;
 	padding-top: calc(350rpx - var(--window-top));
+	overflow: hidden;
 	.top {
 		position: fixed;
 		top: 0;
@@ -312,6 +313,7 @@ export default {
 		}
 	}
 	.follow {
+		height: 140rpx;
 		background-color: #ffffff;
 		width: 100%;
 		margin-bottom: 20rpx;
@@ -365,7 +367,8 @@ export default {
 	}
 	.main{
 		.video-image {
-			padding-bottom: 98rpx;
+			box-sizing: border-box;
+			padding-bottom: 100rpx;
 		}
 		.container-top {
 			> view {
@@ -381,9 +384,6 @@ export default {
 				margin-bottom: 10rpx;
 			}
 		}
-		// > view {
-		// 	margin-top: 20rpx;
-		// }
 	}
 	.tabbar {
 		border-top: 1rpx #DBDADA solid;

pageC/spike/index.vue

@@ -81,10 +81,14 @@ export default {
 				// box-sizing: content-box;
 				width: 26rpx;
 				// height: 25rpx;
-				background-color: #bfbfbf;
+				background-color: #000;
+				color: #ffffff;
 				margin: 0 10rpx;
 				padding: 2rpx;
 			}
+			.mah {
+				color: #999999;
+			}
 		}
 	}
 }

pageD/activity/activity.vue

@@ -56,6 +56,7 @@
 	}
 	#actives{
 			height: 100%;
+			background: #ECECEC;
             .time {
                 padding: 30rpx 0;
                 color: #666;
@@ -97,6 +98,7 @@
                 justify-content: center;
 				width: 100%;
 				height: 140rpx;
+				line-height: 36rpx;
                 padding: 20rpx;
 				background: rgba(241,241,241,1);
                 & > text {

pageD/notice/notice.vue

@@ -10,33 +10,33 @@
 	export default {
 		data() {
 			return {
-                list: [],
+				list: [],
 			};
 		},
-		onLoad(){
+		onLoad() {
 			this.informationList();
 		},
 		methods: {
-			titletext(){
+			titletext() {},
-			},
+			informationList() {
-			informationList(){
+				this.$u.api.informationList({}).then((res) => {
-				this.$u.api.informationList({}).then((res)=>{
+					if (res.errCode == 0) {
-                    if (res.errCode == 0) {
+						this.list = res.data;
-                        this.list = res.data;
+					}
-                    }
 				})
 			}
 		},
-		components:{
+		components: {
 			notice,
 		}
 	};
 </script>
 
 <style lang="scss" scoped>
-    page {
+	page {
-        background-color: #ECECEC;
+		background-color: #ECECEC;
-    }
+	}
+
 	.sousuo {
 		height: 113rpx;
 		border: 1px #f00 solid;

pageE/mine/ArticleDetails.vue

@@ -1,6 +1,26 @@
 <template>
-	<view class="article-details">
+	<view>
-		<rich-text :nodes="nodes"></rich-text>
+		<view class="header" v-if="type == 2">
+				<image src="../../pageD/images/file.png" class="tit-img" mode=""></image>
+				<view class="title">德铭阳光</view>
+				<view class="tit-info">版本:{{ version }} for {{ phone_type }}</view>
+		</view>
+		<rich-text :nodes="nodes" v-if="type != 2"></rich-text>
+		<view class="main" v-if="type == 2">
+			<view @click="show = true">
+				<text>产品介绍</text>
+				<u-icon name="arrow-right" color="#999"></u-icon>
+			</view>
+			<view>
+				<text>版本更新</text>
+				<text class="tips">已是最新版本</text>
+			</view>
+		</view>
+        <u-popup v-model="show" v-if="type == 2" mode="left" width="100%">
+            <view class="u-content">
+                <rich-text :nodes="nodes"></rich-text>
+            </view>
+        </u-popup>
 	</view>
 </template>
 <script>
@@ -8,7 +28,11 @@ import common from '@/static/js/common.js'
 export default {
 	data() {
 		return {
-			nodes: '',
+			type: 1,
+			nodes: "",
+			version: "",
+			show: false,
+			phone_type: "",
 		}
 	},
 	onLoad(option) {
@@ -17,6 +41,20 @@ export default {
 		if(option.id) this.getUseHelpInfo(option.id);
 		if(option.type == 1) this.certificateInfo();
 		if(option.type == 2) this.getAboutUsInfo();
+		this.type = option.type;
+		this.getVersion();
+		this.phone_type = this.$u.os();
+	},
+	onBackPress() {
+		if (this.show) {
+				this.show = !this.show;
+		} else {
+				return false;
+		}
+		return true;
+	},
+	onNavigationBarButtonTap(e) {
+		console.log(e);
 	},
 	methods: {
 		setTitle(title){
@@ -50,14 +88,64 @@ export default {
 				}
 			})
 		},
+		// 检查版本号
+		getVersion() {
+			this.$u.post("Specialci/checkVersion",{app_version: 1}).then(res => {
+				console.log(res);
+				this.version = res.data.app_version;
+			})
+		}
 	},
 }
 </script>
 <style lang="scss" scoped>
-.article-details {
+page {
-	min-height: calc(100vh - var(--window-top));
+	background-color: #f2f2f2;
-	background: #ECECEC;
+}
-	padding: 20rpx 35rpx 0;
+.header {
-	line-height: 45rpx;
+	width: 500rpx;
+	margin: 0 auto;
+	padding: 30rpx;
+	text-align: center;
+    .tit-img {
+			width: 200rpx;
+			height: 200rpx;
+		}
+		.title {
+			margin: 18rpx 0;
+			font-weight: bold;
+			font-size: 26rpx;
+			letter-spacing: 2rpx;
+		}
+		.tit-info {
+			font-size: 22rpx;
+			color: #666;
+		}
+}
+.main {
+	margin: 20rpx 0;
+	& > view {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		height: 100rpx;
+		padding: 0 20rpx;
+		line-height: 100rpx;
+		color: #333;
+		font-size: 30rpx;
+		background-color: #fff;
+		border-bottom: 1px solid #f2f2f2;
+	}
+	.tips {
+		color: #999;
+		font-size: 22rpx;
+	}
+}
+.u-content {
+    padding: 20rpx;
+    font-size: 30rpx;
+    text-indent: 1rem;
+    line-height: 1.2;
 }
 </style>

pageE/mine/MineConcerns.vue

@@ -117,7 +117,7 @@ export default {
 		display: flex;
 		flex-wrap: wrap;
 		margin-left: -20rpx;
-		.daren-item{
+		.daren-item {
 			width: 215rpx;
 			height: 282rpx;
 			display: flex;
@@ -128,6 +128,7 @@ export default {
 			overflow: hidden;
 			margin-left: 20rpx;
 			margin-bottom: 20rpx;
+			box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
 			.head{
 				width: 80rpx;
 				height: 80rpx;

pageE/mine/storeConcerns.vue

@@ -133,8 +133,10 @@ export default {
 </script>
 <style lang="scss" scoped>
 .collection-item {
+	width: 100%;
 	background-color: #ffffff;
 	.item {
+		width: 750rpx;
 		padding: 30rpx;
 		display: flex;
 		> image {
@@ -145,14 +147,17 @@ export default {
 			flex-shrink: 0;
 		}
 		.title-wrap {
+			overflow: hidden;
 			flex: 1;
 			.item-top {
+				width: 100%;
 				font-size: 30rpx;
 				color: rgba(51,51,51,1);
 				line-height: 44rpx;
 				margin-bottom: 54rpx;
 			}
 			.item-bottom {
+				width: 100%;
 				display: flex;
 				align-items: center;
 				justify-content: space-between;

pageE/more/Complaints.vue

@@ -5,7 +5,7 @@
 				<view class="suggestions">
 					<view class="text">{{ item.fb_content }}</view>
 					<view class="image">
-						<image v-for="(url, index) in item.fb_images" :key="index" :src="url"></image>
+						<image v-for="(url, index) in item.fb_images" :key="index" :src="url" mode="aspectFit" @click="previewImage(item.fb_images)"></image>
 					</view>
 				</view>
 				<view class="reply" v-if="item.is_reply">
@@ -13,7 +13,7 @@
 					<view class="reply-content u-line-4">{{ item.reply_content }}</view>
 				</view>
 				<view class="date">
-					<image src="../static/mine/26.png"></image>
+					<image src="../static/mine/26.png" mode="aspectFit"></image>
 					<view>{{ item.fb_time }}</view>
 				</view>
 			</view>
@@ -45,6 +45,12 @@ export default {
 				}
 			})
 		},
+		previewImage(urls) {
+			// console.log(urls);
+			uni.previewImage({
+				urls: urls,
+			});
+		},
 	},
 }
 </script>

pageE/tool/MineCoupon.vue

@@ -81,7 +81,7 @@ export default {
 			// 	});
 			// }
 			this.$u.route('pageE/useCoupon/index', {
-				cid: coupon.voucher_id,
+				cid: coupon.vouchertemplate_id,
 			});
 		},
 		setViewHeight() {

pageE/tool/MineHistory.vue

@@ -19,7 +19,7 @@
 			</view>
 			<u-action-sheet :list="actionList" v-model="showAction" :cancel-btn="true" @click="delHistory" border-radius="20"></u-action-sheet>
 			<u-empty text="暂无足迹" mode="list" color="#000" v-if="!historyList.length"></u-empty>
-			<u-loadmore :status="loadStatus" bgColor="#ECECEC" margin-top="20" margin-bottom="20" v-if="historyList.length > pageSize" @loadmore="reachBottom"></u-loadmore>
+			<u-loadmore class="load-size" :status="loadStatus" bgColor="#ECECEC" margin-top="20" margin-bottom="20" v-if="historyList.length > pageSize" @loadmore="reachBottom"></u-loadmore>
 		</scroll-view>
     </view>
 </template>

pageE/tool/WashOrder.vue

@@ -297,6 +297,7 @@ export default {
 			return res;
 		},
 		submitImage() {
+			console.log(this.debounce);
 			if(!this.debounce) return;
 			this.debounce = false;
 			this.current == 0 ? this.$refs.platform.upload() : this.$refs.physical.upload();
@@ -383,11 +384,10 @@ export default {
 			}
 			// console.log(params);
 			this.$u.api.sendLaundrySave(params).then(res => {
-				this.$u.toast(res.message);
+				// this.$u.toast(res.message);
 				if(res.errCode == 0) {
 					this.$refs.uToast.show({
 						title: res.message,
-						type: 'success',
 						back: true,
 					})
 				} else {

pageE/useCoupon/index.vue

@@ -78,10 +78,10 @@ export default {
 			})
 			this.timer = true;
 			if(res.errCode == 0) {
-				if(load == 'reload') this.goodsList = res.data.data;
+				if(load == 'reload') this.goodsList = res.data;
-				else if(load == 'loadmore') this.goodsList.push(...res.data.data);
+				else if(load == 'loadmore') this.goodsList.push(...res.data);
 			}
-			return res.data.data.length;
+			return res.data.length;
 		},
 		loadMore() {
 			if(this.goodsList.length < this.pageSize) return false;

pages.json

@@ -370,7 +370,7 @@
 								"searchInput": {
 									"align": "left",
 									"borderRadius": "15px",
-									"placeholder": "搜索您需要的商品",
+									"placeholder": "搜索您需要的本店铺商品",
 									"backgroundColor": "rgb(236,236,236)",
 									"disabled": true
 								}
@@ -610,7 +610,16 @@
 							"titleSize": "36px",
 							"titleNView": {
 								"titleColor": "#333333",
-								"backgroundColor": "#FFFFFF"
+								"backgroundColor": "#FFFFFF",
+                                "buttons": [
+                                	{
+                                        "width": "0",
+                                		"type":"none",
+                                		"text":"关闭",
+                                		"float":"right",
+                                		"fontSize":"14"
+                                	}
+                                ]
 							}
 						}
 					}

pages/index/index.vue

@@ -253,6 +253,7 @@
                 fansList: [], // 关注的发现列表
                 status: 'loadmore',
                 status_1: 'loadmore',
+                status_live: 'loadmore',
                 iconType: 'circle',
                 loadText: {
                     loadmore: '轻轻上拉',
@@ -358,18 +359,18 @@
                 })
 				this.$u.api.tabLiveList({page:this.live_page}).then((res) => {
 					 // uni.stopPullDownRefresh();
-					this.status = "loading";
+					this.status_live = "loading";
 					console.log(res)
                     if (res.errCode == 0) {
                         uni.hideLoading();
                         if (this.live_page == 1) {
                         	this.tabLiveLists = res.data.data;
-                            this.status = "loadmore";
+                            this.status_live = "loadmore";
-                            if (res.data.data.length < 6) {
+                            if (res.data.data.length < 4) {
-                                this.status = "nomore";
+                                this.status_live = "nomore";
                             }
                         } else if (res.data.data.length == 0 && this.live_page > 1) {
-                            this.status = "nomore";
+                            this.status_live = "nomore";
                         } else {
 							this.tabLiveLists  = this.tabLiveLists.concat(res.data.data);
 							console.log(this.tabLiveLists)
@@ -379,7 +380,7 @@
                             this.live_page++;
                         }
                     } else {
-                        this.status = "nomore"
+                        this.status_live = "nomore"
 					}
 					
 				})
@@ -444,11 +445,6 @@
 			},
             // 发现列表
 			getArticlelist() {
-                if (this.page > 1) {
-                    uni.showLoading({
-                        title: "loading..."
-                    })
-                }
 				this.$u.api.getArticlelist({
 					page: this.page,
 					is_video_img: 0, // 查询视频1 图文2 都查0
@@ -456,26 +452,17 @@
                     uni.stopPullDownRefresh();
                     this.status = "loading";
                     if (res.errCode == 0) {
-                        uni.hideLoading();
-                        console.log(this.page,res.data.list.length);
                         if (this.page == 1) {
-                        	this.articleList = res.data.list;
+                            this.articleList = res.data.list;
-                            this.status = "loadmore";
+                            if (!res.data.length) {
-                            if (res.data.list.length < 4) {
                                 this.status = "nomore";
                             }
-                        } else if (res.data.length == 0 && this.page > 1) {
+                        } else if (res.data.length == 0) {
                             this.status = "nomore";
                         } else {
                             this.articleList = this.articleList.concat(res.data.list);
                         }
-                        if (res.data.length == 0 && this.page > 1) {
+                        this.page++;
-                            console.log(111);
-                        } else {
-                            this.page++;
-                        }
-                    } else {
-                        this.status = "nomore"
                     }
 				})
 			},

pages/shop/index.vue

@@ -257,11 +257,10 @@
 </script>
 <style lang="scss" scoped>
 	.shop {
-		height: calc(100% - var(--window-top));
+		height: calc(100vh - var(--window-top));
 		box-sizing: border-box;
 		background-color: #F0EDF1;
         overflow-y: scroll;
-
 		.top {
 			padding: 0 30rpx;
 			background-color: #ffffff;