Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into cmx

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

App.vue

@@ -43,6 +43,12 @@
     .status_bar {
     	width: 100%;
     	height: var(--status-bar-height);
+    }
+    /* 自定义下拉 */
+    .load-size {
+        ::v-deep.u-more-text {
+            font-size: 20rpx !important;
+        }
     }
 	/* #endif */
 </style>

common/api/shop.js

@@ -339,7 +339,11 @@ export default {
 					page,
 					name_search: name_search
 				})
-			}
+			},
+			// 是否弹出新人优惠券
+			isNewmembervoucher() {
+				return vm.$u.post('Coupon/isNewmembervoucher')
+			},
         }
     }
     

common/http.interceptor.js

@@ -46,7 +46,7 @@ const install = (Vue, vm) => {
         } else if(res.data.errCode == 401) {
             // 假设201为token失效，这里跳转登录
             // vm.$u.toast('您还没有登录哦，请先去登录！');
-            if (res.data.action != "memberinfo") {
+            if (res.data.data.action != "memberinfo") {
                 uni.showModal({
                     title: "温馨提示",
                     content: "您还未登录，请立即登录",

components/index/video-item/index.vue

@@ -174,7 +174,6 @@
 		.backes{
 			position: absolute;
 			top: 0;
-			background: rgba(0,0,0,0.6);
 			width: 100%;
 			height: 100%;
 			color: #fff;
@@ -233,6 +232,7 @@ export default {
 				}
 			})
 		},
+        // 屏蔽
 		articleAddShield() {
 			this.$u.api.articleAddShield({
 				article_id: this.item.article_id,
@@ -241,7 +241,7 @@ export default {
 				// console.log(res)
 				if(res.errCode == 0) {
                     this.$u.toast(res.message);
-					this.$emit("getArticlelist");
+					this.$emit("updateList");
 				}
 			})
 		},

components/informations/notice/notice.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="notice">
-		<view v-for="(item,index) in notice" :key="index">
+		<view v-for="(item,index) in notice" :key="index"  @click="gotoInfo(index)">
 			<view class="time_notice">{{ item.addtime }}</view>
 			<view class="notice_view">
 				<image :src="item.picture" mode="aspectFill" ></image>
 				<view class="text_view u-line-2">{{ item.content }}</view>
-				<view class="notice_list" @click="gotoInfo(index)">
+				<view class="notice_list">
 					<text>查看详情</text>
 					<u-icon name="arrow-right" color="#666"></u-icon>
 				</view>

components/remaining/remaining.vue

@@ -205,7 +205,7 @@
         z-index: 1000;
         position: absolute;
         bottom: 100rpx;
-        right: 30%;
+        right: 230rpx;
         width: 300rpx;
         height: 80rpx;
         line-height: 80rpx;

pageA/login/login.vue

@@ -181,7 +181,6 @@
 							me.loginIn(res.data.token); //存储一个字符传值
 							// 缓存用户的信息
 							uni.setStorageSync('user_info',res.data);
-							
 							if (res.data.member.has_labels) {
 								uni.switchTab({
 									url: '/pages/index/index'

pageA/register/register.vue

@@ -71,7 +71,7 @@
 				value: '',
 				login: '注册',
 				show: false,
-                is_check: null,
+                is_check: true,
 				member_mobile: '', //手机号
 				smslog_type : '1',//状态
 				sms_code : '', //验证码
@@ -104,6 +104,7 @@
 			},
 			// 用户注册
 			loginIns(){
+                console.log(this.is_check);
                 let me = this;
 				let type_phone = this.$u.test.mobile(this.member_mobile)
 				if(this.member_mobile == ''){
@@ -124,7 +125,7 @@
 					})
 					return false;
 				}
-                if (this.is_check) {
+                if (!this.is_check) {
                     this.$refs.uToast.show({
                     	title: '请同意协议！',
                     })
@@ -151,16 +152,9 @@
 						// 	type: 'success',
 						// 	url: '/pageA/topick/topick'
 						// })
-					} else if(res.errCode == 2){
-						this.$refs.uToast.show({
-							title: res.message,
-							type: 'primary',
-							url: '/pageA/login/login'
-						})
 					} else {
                         this.$refs.uToast.show({
                         	title: res.message,
-                        	type: 'primary'
                         })
                     }
 				})
@@ -446,10 +440,6 @@
 	.pact {
 		position: relative;
 		padding-left: 40rpx;
-		overflow: hidden;
-		// overflow: hidden; //超出的文本隐藏
-		// text-overflow: ellipsis; //溢出用省略号显示
-		// white-space: nowrap; //溢出不换行
 	}
 	.phones{
 		margin-bottom: 90rpx!important;

pageB/components/nuserinfo/nuserinfo.nvue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pageB/components/userinfo/index.vue

@@ -1,28 +1,31 @@
 <template>
     <view class="userinfo">
         <view class="userhead">
-            <image :src="item.member_avatar"></image>
-            <text class="follow" v-if="!is_follow" @click="following(item.member_id)">+</text>
-			<u-icon v-else name="checkmark" color="#ffffff" :size="28" class="follow"  @click="following(item.member_id)"></u-icon>
+            <image class="avatar" :src="item.member_avatar"></image>
+            <text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text>
         </view>
         <!-- 点赞 -->
         <view class="operat zan">
-            <u-icon name="thumb-up-fill" :color=" is_like ? '#FF7807' : '#ffffff' " :size="50" @click="likeType(item.article_id)"></u-icon>
-            <text>{{item.like_num}}</text>
+            <image class="operat-img" :src=" is_like ? '../../static/image/userinfo/dianzan1.png' : '../../static/image/userinfo/dianzan.png' "
+                mode="" @click="likeType(item.article_id)"></image>
+            <text class="operat-span">{{item.like_num}}</text>
         </view>
         <!-- 收藏 -->
         <view class="operat shoucang">
-            <u-icon name="star-fill" :color=" is_collect ? '#FF7807' : '#ffffff' " :size="50" @click="collecting(item.article_id)"></u-icon>
-            <text>{{item.collect_num}}</text>
+            <image class="operat-img" :src=" is_collect ? '../../static/image/userinfo/shoucang1.png' : '../../static/image/userinfo/shoucang.png' "
+                mode="" @click="collecting(item.article_id)"></image>
+            <text class="operat-span">{{item.collect_num}}</text>
         </view>
         <!-- 评论 -->
         <view class="operat pinglun">
-            <u-icon name="more-circle-fill" :color=" is_content ? '#FF7807' : '#ffffff' " :size="50" @click="editing()"></u-icon>
-            <text>{{ comment_num }}</text>
+            <image class="operat-img" :src=" is_content ? '../../static/image/userinfo/pinglun1.png' : '../../static/image/userinfo/pinglun.png' "
+                mode="" @click="editing(item.article_id)"></image>
+            <text class="operat-span">{{ comment_num }}</text>
         </view>
         <!-- 购物车 -->
         <view class="operat gouwu">
-           <u-icon name="shopping-cart-fill" :color=" is_cart ? '#FF7807' : '#ffffff' " :size="50" @click="carting()"></u-icon>
+            <image class="operat-img" :src=" is_cart ? '../../static/image/userinfo/gouwuche1.png' : '../../static/image/userinfo/gouwuche.png' "
+                mode="" @click="carting()"></image>
         </view>
     </view>
 </template>
@@ -30,45 +33,64 @@
     .userinfo {
         width: 110rpx;
         height: 570rpx;
+        /* #ifndef APP-PLUS-NVUE */
         display: flex;
+        /* #endif */
         flex-direction: column;
         justify-content: space-between;
         align-items: center;
+    }
+
     .userhead {
         position: relative;
+        /* #ifndef APP-PLUS-NVUE */
         display: flex;
-        position: relative;
+        /* #endif */
         align-items: center;
-		&>image{
+        padding-bottom: 20rpx;
+    }
+
+    .avatar {
         width: 110rpx;
         height: 110rpx;
         border-radius: 50%;
+        /* #ifndef APP-PLUS-NVUE */
         border: 2rpx solid #fff;
+        /* #endif */
     }
+
     .follow {
+        z-index: 100;
         position: absolute;
         top: 90rpx;
-			left: 35%;
+        left: 40rpx;
         width: 36rpx;
         height: 36rpx;
         text-align: center;
         line-height: 36rpx;
-			font-size: 36rpx;
+        font-size: 34rpx;
         border-radius: 50%;
         color: #fff;
         background-color: #FF780F;
     }
-    }
+
     .operat {
+        /* #ifndef APP-PLUS-NVUE */
         display: flex;
+        /* #endif */
         align-items: center;
         flex-direction: column;
-		& > text {
+    }
+
+    .operat-span {
         margin-top: 10rpx;
         font-size: 28rpx;
         color: #fff;
     }
-	}
+
+    .operat-img {
+        width: 50rpx;
+        height: 50rpx;
     }
 </style>
 <script>
@@ -88,7 +110,7 @@ export default {
         },
         watch: {
             list(newValue, old) {
-			// console.log(newValue,old);
+                console.log(newValue);
                 this.item = newValue || {};
                 this.is_follow = this.list.is_attention || false;
                 this.is_like = this.list.is_like || false;
@@ -113,35 +135,77 @@ export default {
         methods: {
             // 关注
             following(id) {
-			this.$u.api.attentionMember({member_id: id}).then(res => {
-				if (res.errCode == 0) {
+                uni.request({
+                    url: "https://dmmall.sdbairui.com/api/member/attentionMember",
+                    method: "POST",
+                    data: {
+                        member_id: id
+                    },
+                    header: {
+                    	Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+                    },
+                    success: (res) => {
+                        if (res.data.errCode == 0) {
                             this.is_follow = !this.is_follow;
-					this.$u.toast(res.message);
+                            console.log(this.is_follow);
+                            uni.showToast({
+                                title: res.data.message,
+                                icon: "none"
+                            })
+                        }
                     }
                 })
             },
             // 点赞
             likeType(id) {
                 // console.log(id);
-			this.$u.post("article/articleLike",{article_id: id}).then(res => {
-				if (res.errCode == 0) {
+                uni.request({
+                    url: "https://dmmall.sdbairui.com/api/article/articleLike",
+                    method: "POST",
+                    data: {
+                        article_id: id
+                    },
+                    header: {
+                    	Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+                    },
+                    success: (res) => {
+                        console.log(res);
+                        if (res.data.errCode == 0) {
                             // console.log(res);
                             this.is_like = !this.is_like;
-					this.list.like_num = res.data.num;
+                            this.list.like_num = res.data.data.num;
                         } else {
-					this.$u.toast(res.message);
+                            uni.showToast({
+                                title: res.data.message,
+                                icon: "none"
+                            })
+                        }
                     }
                 })
             },
             // 收藏
             collecting(id) {
-			this.$u.post("article/articleCollect",{article_id: id}).then(res => {
-				if (res.errCode == 0) {
-					// console.log(res);
+                uni.request({
+                    url: "https://dmmall.sdbairui.com/api/article/articleCollect",
+                    method: "POST",
+                    data: {
+                        article_id: id
+                    },
+                    header: {
+                    	Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+                    },
+                    success: (res) => {
+                        console.log(res);
+                        if (res.data.errCode == 0) {
+                            console.log(res.data.num);
                             this.is_collect = !this.is_collect;
-					this.list.collect_num = res.data.num;
+                            this.list.collect_num = res.data.data.num;
                         } else {
-					this.$u.toast(res.message);
+                            uni.showToast({
+                                title: res.data.message,
+                                icon: "none"
+                            })
+                        }
                     }
                 })
             },
@@ -149,13 +213,19 @@ export default {
             editing() {
                 this.is_content = !this.is_content;
                 // console.log(this.is_content);
-			this.$emit("openCart",{ comment: this.is_content, cart: this.is_cart});
+                this.$emit("openCart", {
+                    comment: this.is_content,
+                    cart: this.is_cart
+                });
             },
             // 购物车
             carting() {
                 this.is_cart = !this.is_cart;
                 // console.log(this.is_cart);
-			this.$emit("openCart",{ comment: this.is_content, cart: this.is_cart});
+                this.$emit("openCart", {
+                    comment: this.is_content,
+                    cart: this.is_cart
+                });
             },
         }
     }

pageB/coupon/details.vue

@@ -0,0 +1,253 @@
+<template>
+	<view class="coupon-details">
+		<view class="coupon-container">
+			<view class="title">新人专享好礼</view>
+			<view class="coupon-main">
+				<image src="/static/image/common/29.png" class="bg"></image>
+				<view class="left">
+					<view class="price"><text class="sign">￥</text><text class="value">{{ price }}</text></view>
+					<view class="label">专属优惠券</view>
+				</view>
+				<view class="btn" @click="exchangeCoupon">立即领取</view>
+			</view>
+			<view class="tag">
+				<view>
+					<image src="/static/image/common/25.png"></image>
+					<text>全场包邮</text>
+				</view>
+				<view>
+					<image src="/static/image/common/26.png"></image>
+					<text>延误必赔</text>
+				</view>
+				<view>
+					<image src="/static/image/common/27.png"></image>
+					<text>免费上门取件</text>
+				</view>
+				<view>
+					<image src="/static/image/common/28.png"></image>
+					<text>退货免运费</text>
+				</view>
+			</view>
+		</view>
+		<view class="title-container">
+			<image src="/static/image/common/22.png" class="bg"></image>
+			<view class="title">首席搭配师</view>
+		</view>
+		<view class="content-container">
+			<image src="/static/image/common/23.png" class="people"></image>
+			<view class="tag">
+				<view class="">双十一成交破亿</view>
+				<view class="">单场千万级大咖</view>
+				<view class="">品牌特卖TOP1</view>
+			</view>
+			<view class="btn">
+				<view class="bg-view"></view>
+				<view>我们有万能穿搭公式</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+			price: 0
+		}
+	},
+	onLoad(option) {
+		this.price = option.price;
+		// this.isNewmembervoucher();
+	},
+	methods: {
+		// 是否显示新人优惠券
+		isNewmembervoucher() {
+			this.$u.api.isNewmembervoucher().then(res => {
+				if(res.errCode == 0) {
+					this.price = res.data.price;
+				}
+			})
+		},
+		exchangeCoupon() {
+			this.$u.api.getCoupon({ id: 1 }).then(res => {
+				this.$u.toast(res.message);
+				if(res.errCode == 0) {}
+			})
+		},
+	}
+};
+</script>
+<style lang="scss" scoped>
+.coupon-details {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #FFDFAC;
+	padding-top: 30rpx;
+	.coupon-container {
+		width: 690rpx;
+		height: 368rpx;
+		background: linear-gradient(-87deg, rgba(247,162,30,1), rgba(255,120,15,1));
+		box-shadow: 0rpx 4rpx 2rpx 0rpx rgba(102,102,102,0.2);
+		border-radius: 20rpx;
+		margin: 0 auto 70rpx;
+		padding: 22rpx {
+			top: 40rpx
+		};
+		.title {
+			font-size: 48rpx;
+			font-weight: bold;
+			color: rgba(255,255,255,1);
+			line-height: 34rpx;
+			text-shadow: 0rpx 4rpx 2rpx rgba(102,102,102,0.2);
+			text-align: center;
+		}
+		.coupon-main {
+			margin: 26rpx auto 20rpx;
+			width: 665rpx;
+			height: 194rpx;
+			position: relative;
+			.bg {
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 665rpx;
+				height: 194rpx;
+				z-index: 1;
+			}
+			.left {
+				z-index: 2;
+				position: absolute;
+				top: 40rpx;
+				left: 122rpx;
+				.price {
+					margin-bottom: 16rpx;
+					display: flex;
+					align-items: flex-end;
+					line-height: 80rpx;
+					> text {
+						font-weight: bold;
+						color: rgba(255,120,15,1);
+					}
+					.sign {
+						font-size: 54rpx;
+					}
+					.value {
+						font-size: 102rpx;
+					}
+				}
+				.label {
+					font-size: 32rpx;
+					font-weight: 500;
+					color: rgba(255,120,15,1);
+				}
+			}
+			.btn {
+				z-index: 2;
+				position: absolute;
+				top: 62rpx;
+				right: 60rpx;
+				width: 192rpx;
+				height: 70rpx;
+				background: linear-gradient(-87deg, rgba(247,162,30,1), rgba(255,120,15,1));
+				border-radius: 20rpx;
+				line-height: 70rpx;
+				text-align: center;
+				font-size: 27rpx;
+				font-weight: bold;
+				color: rgba(255,255,255,1);
+			}
+		}
+		.tag {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			font-size: 20rpx;
+			font-weight: 500;
+			color: rgba(255,255,255,1);
+			> view {
+				> image {
+					width: 20rpx;
+					height: 20rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+	}
+	.title-container {
+		position: relative;
+		height: 124rpx;
+		.bg {
+			position: absolute;
+			width: 504rpx;
+			height: 124rpx;
+			z-index: 1;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -75%);
+		}
+		.title {
+			position: absolute;
+			z-index: 2;
+			width: 750rpx;
+			height: 59rpx;
+			background: rgba(255,255,255,0.27);
+			font-size: 60rpx;
+			font-weight: 800;
+			color: rgba(255,122,16,1);
+			text-align: center;
+			top: 0;
+			left: 0;
+		}
+	}
+	.content-container {
+		height: 684rpx;
+		position: relative;
+		.people {
+			width: 348rpx;
+			height: 684rpx;
+			position: absolute;
+			top: 0;
+			left: 50%;
+			transform: translate(-50%, 0%);
+		}
+		.tag {
+			> view {
+				position: absolute;
+				height: 48rpx;
+				background: rgba(229,0,79,0.36);
+				border-radius: 20rpx;
+				font-size: 24rpx;
+				font-weight: bold;
+				color: rgba(255,255,255,1);
+				line-height: 48rpx;
+				padding: 0 24rpx;
+				&:nth-child(1) {
+					top: 104rpx;
+					right: 71rpx;
+				}
+				&:nth-child(2) {
+					top: 271rpx;
+					left: 30rpx;
+				}
+				&:nth-child(3) {
+					top: 373rpx;
+					right: 33rpx;
+				}
+			}
+		}
+		.btn {
+			position: absolute;
+			top: 459rpx;
+			left: 50%;
+			transform: translate(-50%, 0%);
+			width: 581rpx;
+			height: 86rpx;
+			background: linear-gradient(-87deg,rgba(247,162,30,1),rgba(255,120,15,1));
+			border-radius: 20rpx;
+			font-size: 40rpx;
+			font-weight: bold;
+			color: rgba(255,255,255,1);
+			line-height: 86rpx;
+			text-align: center;
+		}
+	}
+}
+</style>

pageB/follow/index.vue

@@ -4,8 +4,8 @@
             <image src="/static/image/common/10.png"></image>
             <text>输入达人名称</text>
         </view>
-        <view class="list">
-            <darenItem style="margin-top:20rpx;" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType"></darenItem>
+        <view class="list" style="margin-left:-20rpx">
+            <darenItem style="margin-top:20rpx;margin-left:20rpx;" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType"></darenItem>
         </view>
     </view>
 </template>
@@ -76,7 +76,7 @@ export default {
 		},
 		searchValue() {
 			uni.navigateTo({
-				url: '/pageB/search/index?type=1'
+				url: '/pageB/search/index?type=2'
 			})
 		},
 	},

pageB/photo/index.vue

@@ -27,7 +27,7 @@
 		<u-popup v-model="is_comment" class="pl" mode="bottom" border-radius="10" height="700rpx">
 			<view class="top">
 				<text>评论</text>
-				<u-icon name="arrow-down" color="#333" size="28" @click="is_comment=false"></u-icon>
+				<u-icon name="close" color="#333" size="28" @click="is_comment=false"></u-icon>
 			</view>
 			<scroll-view class="scroll-box" scroll-y="true" lower-threshold="50" @scrolltolower="scrollBottom">
 				<block v-for="(item,index) in commentList" :key="index">
@@ -56,7 +56,7 @@
                     </view>
 				</block>
                 <view class="no-data" v-if="!commentList.length">还没有评论，快来评论吧！</view>
-				<u-loadmore v-else :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
+				<u-loadmore v-else class="load-size" :status="status" size="20" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
 			</scroll-view>
 			<view class="editing" @touchend.prevent="openKeyInput">
 				<input type="text" value="" :placeholder="edit_text" disabled="disabled" />
@@ -66,7 +66,7 @@
 		<!-- 评论box -->
 		<u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx">
 			<view class="edit-box">
-				<input type="text" :focus="is_focus" :placeholder="edit_text_other" @focus="focus" v-model="send_value">
+				<input type="text" focus :placeholder="edit_text_other" @focus="focus" v-model="send_value">
 				<text @click="sendComment">发送</text>
 			</view>
 		</u-popup>
@@ -180,13 +180,15 @@
 			z-index: 1000;
 			position: fixed;
 			top: 0;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
 			width: 100%;
 			height: 88rpx;
 			padding: 0 20rpx;
 			line-height: 88rpx;
 			background-color: #ECECEC;
 			& > text {
-				margin-right: 280rpx;
 				color: #333;
 				font-size: 30rpx;
 				font-weight: 500;
@@ -392,7 +394,7 @@
 </style>
 <script>
 import userinfo from "../components/userinfo/index" // 点赞组件
-import contentBox from "../components/shpoone/index" // 评论
+// import contentBox from "../components/shpoone/index" // 评论
 // import shoplist from "../components/shoplist/index" // 商品列表
 
 export default {
@@ -514,6 +516,10 @@ export default {
 		},
 		// 发布评论
 		sendComment() {
+             if (this.send_value.length == 0) {
+                this.$u.toast("内容不能为空！");
+                return;
+            }
 			this.$u.post("article/articleAddComment",{
 				article_id: this.article_id,
 				content: this.send_value,

pageB/sdetails/index.vue

@@ -4,10 +4,10 @@
 		<view class="spike-view" v-if="type == 3">
 			<view class="left">
 				<view class="price">
-					<view class="now-price">￥{{ groupbuyInfo.groupbuy_price }}</view>
-					<view class="origin-price">￥{{ groupbuyInfo.goods_price }}</view>
+					<view class="now-price">￥{{ groupbuyInfo.groupbuy_price || '0.00' }}</view>
+					<view class="origin-price">￥{{ groupbuyInfo.goods_price || '0.00' }}</view>
 				</view>
-				<view class="num">剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity }}件</view>
+				<view class="num">剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity || '0' }}件</view>
 			</view>
 			<view class="right" v-if="!isSrartSpike || !isEndSpike">
 				<view class="title">{{ isSrartSpike ? '结束倒计时' : '秒杀倒计时' }}</view>
@@ -24,8 +24,8 @@
             </view>
             <view class="price-collect">
 				<view class="pic" v-if="type != 3">
-					<text>￥{{ goodsInfo.goods_price }}</text>
-					<s>￥{{ goodsInfo.goods_marketprice }}</s>
+					<text>￥{{ goodsInfo.pintuan_price || '0.00' }}</text>
+					<s>￥{{ goodsInfo.goods_price || '0.00' }}</s>
 				</view>
 				<view class="collect" @click="switchCollect(goodsInfo.goods_collect)">
 					<u-icon name="star" color="#474747" size="28" v-if="!goodsInfo.goods_collect"></u-icon>
@@ -98,7 +98,7 @@
 				<image class="close" src="/static/image/common/17.png" @click="showGroupUser=false"></image>
 			</view>
 		</u-popup>
-		<u-popup v-model="showInvolvementUser" mode="center">
+		<u-popup v-model="showInvolvementUser" mode="center" z-index="10078">
 			<view class="involvement-container" v-if="involvemenGroupInfo.length">
 				<view class="title u-line-1">参与{{ involvemenGroupInfo[0].member_nickname }}的拼团</view>
 				<view class="involvement-view">
@@ -127,13 +127,15 @@
 						<image class="image" :src="goodsInfo.goods_image"></image>
 						<view class="info">
 							<text class="u-line-2">{{goodsInfo.goods_name}}</text>
-							<text>￥{{goodsInfo.goods_price}}</text>
+							<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>
 						</view>
 					</view>
 					<guige @sel="self" ref="guige" v-for="(item,index) in goodsInfo.spec_value" :key="index" :title="goodsInfo.spec_name[index]" :item="item"></guige>
 					<view class="num">
 						<text>购买数量</text>
-						<u-number-box v-model="goodsNumber"></u-number-box>
+						<u-number-box v-model="goodsNumber" :min="1"></u-number-box>
 					</view>
 					<view style="height:100rpx"></view>
 				</view>
@@ -256,6 +258,13 @@ export default {
 	},
 	methods: {
 		customers(){
+			console.log(this.$store.state.hasLogin)
+			if(!this.$store.state.hasLogin){
+				this.$refs.uToast.show({
+					title: "请先登录",
+					type: 'warning'
+				})
+			}else{
 				function Friend(uuid, name, avatar,time = "", text = "",date = "") {
 					this.uuid = uuid;
 					this.name = name;
@@ -266,7 +275,7 @@ export default {
 					this.time = time;
 					this.date = date
 				}
-			console.log(123)
+				// console.log(123)
 				this.$u.api.getAtwillUserInfo({
 					id:this.storeid
 				}).then((res)=>{
@@ -282,6 +291,8 @@ export default {
 				}).catch((err)=>{
 					console.log(err)
 				})
+			}
+			
 		},
 		setSwiperList(list) {
 			let img = [];
@@ -338,13 +349,28 @@ export default {
 				this.showSpec = true;
 				return false;
 			}
+			// 如果没有规格设规格已全选
+			if(this.goodsInfo.spec_value == null) {
+				this.quanxuan = true;
+			}
+			if(!this.quanxuan) {
+				this.$refs.uToast.show({
+					title: '请选择规格'
+				})
+				return false;
+			}
 			this.$u.api.addCart({
 				goods_id: this.id,
 				quantity: this.goodsNumber,
 			}).then(res => {
 				this.$refs.uToast.show({
 					title: res.message,
-					type: res.errCode == 0 ? 'success' : 'warning',
+					duration: 1000,
+					callback: () => {
+						if(res.errCode == 0) {
+							this.showSpec = false;
+						}
+					}
 				})
 			})
 		},
@@ -369,7 +395,7 @@ export default {
 		// 普通商品详情
 		ordinaryDetails(id) {
 			this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
-				console.log(res)
+				// console.log(res)
 				if (res.errCode == 0) {
 					this.evaluate = res.data.goods_evaluate_info;
 					this.goodsInfo = res.data.goods;
@@ -486,6 +512,7 @@ export default {
 			}
 			this.$u.api.settlementOrder(params).then(res => {
 				if(res.errCode == 0) {
+					// console.log('type' + this.type);
 					this.$store.commit('setOrderType', this.type);
 					this.$store.commit('updateOrderInfo', res.data)
 					this.$u.route({
@@ -493,6 +520,7 @@ export default {
 					})
 				} else {
 					this.debounce = true;
+                    this.$u.toast(res.message);
 				}
 			})
 		},
@@ -527,7 +555,7 @@ export default {
         xuanze(id){
 			// console.log(id)
 			// 选择完规格后设商品type = 1
-			this.type = 1;
+			// this.type = 1;
             this.getGoodsDetails(this.glist[id])
 			this.id = this.glist[id];
 		},
@@ -609,7 +637,7 @@ export default {
 	background-color: #EEEBEE;
 	.spike-view {
 		position: absolute;
-		top: 396rpx;
+		top: 400rpx;
 		left: 0;
 		width: 100%;
 		height: 104rpx;
@@ -1027,13 +1055,13 @@ export default {
 		}
 	}
 	.spike-tool {
+		z-index: 10076;
+		display: flex;
 		position: fixed;
 		bottom: 0;
 		left: 0;
 		width: 100%;
-		height: 98rpx;
-		display: flex;
-		z-index: 10076;
+		height: 100rpx;
 		background-color: #FFFFFF;
 		.left {
 			width: 190rpx;
@@ -1056,8 +1084,8 @@ export default {
 		}
 		.btn {
 			flex: 1;
-			height: 98rpx;
-			line-height: 98rpx;
+			height: 104rpx;
+			line-height: 104rpx;
 			text-align: center;
 			font-size: 32rpx;
 			color: rgba(255,255,255,1);

pageB/search/out.vue

@@ -77,17 +77,37 @@ export default {
 		}
 	},
 	onLoad(option) {
-		this.value = option.value
+		this.value = option.value;
 		this.setViewHeight();
 		this.ShopSearch()
+		this.setNavSearchInput(this.value);
 	},
 	onNavigationBarSearchInputConfirmed(value) {
 		this.value = value.text
-		console.log(this.value)
+		// console.log(this.value)
 		this.ShopSearch()
-
 	},
 	methods: {
+		// 动态设置导航栏搜索框内容
+		setNavSearchInput(keyword) {
+			// #ifdef APP-PLUS
+			let webView = this.$mp.page.$getAppWebview();
+			webView.setTitleNViewSearchInputText(keyword);
+			// #endif
+			// #ifdef H5
+			let inputSearch=document.querySelector('.uni-input-input[type=search]');
+			var evt = new InputEvent('input', {
+				inputType: 'insertText',
+				data: keyword,
+				dataTransfer: null,
+				isComposing: false
+			});
+			if(inputSearch){
+				inputSearch.value = keyword;
+				inputSearch.dispatchEvent(evt);
+			}
+			// #endif
+		},
 		changeType(member_id){
 			console.log(member_id);
 			this.$emit("pChangeType")

pageB/search/searchGoods.vue

@@ -58,9 +58,28 @@ export default {
 	onNavigationBarSearchInputConfirmed(value) {
 		this.value = value.text
 		this.ShopSearch()
-
 	},
 	methods: {
+		setNavSearchInput(keyword) {
+			console.log(keyword);
+			// #ifdef APP-PLUS
+			let webView = this.$mp.page.$getAppWebview();
+			webView.setTitleNViewSearchInputText(keyword);
+			// #endif
+			// #ifdef H5
+			let inputSearch=document.querySelector('.uni-input-input[type=search]');
+			const evt = new InputEvent('input', {
+				inputType: 'insertText',
+				data: keyword,
+				dataTransfer: null,
+				isComposing: false
+			});
+			if(inputSearch){
+				inputSearch.value = keyword;
+				inputSearch.dispatchEvent(evt);
+			}
+			// #endif
+		},
 		setOrderSort() {
 			let sort = '';
 			if(this.current == 0) {
@@ -75,6 +94,8 @@ export default {
 		},
 		// 排序方式 goods_salenum：销量　evaluation_count：评价　goods_price_asc：价格从低到高　goods_price_desc：价格从高到低
 		async ShopSearch({ load = 'reload' } = {}) {
+			console.log(this.value);
+			this.setNavSearchInput(this.value);
 			const sort = this.setOrderSort();
 			const res = await this.$u.api.ShopSearch({ 
 				keyword: this.value, 

pageB/video/video.nvue

@@ -1,16 +1,18 @@
 <template>
     <view>
-        <video id="videoId" :style="videoSize" :src="src" autoplay="true" :loop="true" :show-fullscreen-btn="false" @play="playing"
-            :show-play-btn="false" controls="false" @click="stoping" :enable-progress-gesture="false"></video>
+        <video id="videoId" :style="videoSize" :src="src" autoplay="true" :show-fullscreen-btn="false" @play="playing"
+            @timeupdate="timeupdate" :show-play-btn="false" controls="false" @click="stoping" :enable-progress-gesture="false"></video>
         <cover-image class="close" @click="goBack" src="../../static/close.png">
         </cover-image>
-        <cover-view class="" src="../../static/videoPlay.png">
-        </cover-view>
-        <cover-view class="info-box">
+        <cover-image class="pause" @click="stoping" src="../../static/videoPlay.png" v-if="!is_play">
+        </cover-image>
+        <!-- 用户操作 -->
+        <userinfo class="user-info" :list="list" :cart="cart_type" :comment="is_comment" :num="comment_num" @openCart="openPopup"></userinfo>
+        <cover-view class="info-box" @click="stopClick">>
             <view class="video-info-box">
-                <image class="image-play" src="../../static/videoPlay.png" mode=""></image>
+                <image class="image-play" src="../../static/videoIcon.png" mode=""></image>
                 <text class="video-slip">视频</text>
-                <text class="time">{{ time_count }}s</text>
+                <text class="time">{{ time_count == 1 ? 0 : time_count }}s</text>
             </view>
             <view>
                 <text class="name">@{{ list.member_nickname }}</text>
@@ -23,30 +25,75 @@
             </view>
             <view class="label-box">
                 <block v-for="(item,index) in list.label" :key="index">
-                    <text class="label" :style="{ width: item.name.length * 40 + 'rpx' }">{{ item.name }}</text>
+                    <text class="label" :style="{ width: labelLen[index] * 40 + 'rpx' }">{{ item.name }}</text>
                 </block>
             </view>
         </cover-view>
+        <cover-view class="content-box" v-if="is_comment">
+            <view class="content-title">
+                <text class="tips">评论</text>
+                <text class="close-down" @click="closeComment">×</text>
+            </view>
+            <scroller class="comment-list">
+                <view class="" v-for="(item,index) in commentList" :key="index">
+                    <view class="comment-list-box">
+                        <view class="comment-list-header">
+                            <image class="avatar" :src="item.member_avatar" mode=""></image>
+                            <view>
+                                <text class="comment-title">{{ item.member_nickname }}</text>
+                                <text class="comment-time">{{ item.create_time }}</text>
+                            </view>
+                        </view>
+                        <text class="reply">回复</text>
+                    </view>
+                    <view class="content-main">
+                        <text class="content-style">{{ item.content }}</text>
+                    </view>
+                </view>
+                <view class="send-box">
+                    <input class="send-val" type="text" value="" />
+                    <text class="btn-send">发送</text>
+                </view>
+                <loading class="loading" @loading="onloading" :display="loadinging ? 'show' : 'hide'">
+                    <loading-indicator class="indicator"></loading-indicator>
+                    <text class="indicator-text">努力加载中</text>
+                </loading>
+            </scroller>
+        </cover-view>
+        <list class="cart-box">
+            <cell></cell>
+        </list>
     </view>
 </template>
 
 <script>
+    import userinfo from "../components/userinfo/index" // 点赞组件
+    const temp_url = "https://dmmall.sdbairui.com/api/";
     export default {
+        components: {
+            userinfo
+        },
         data() {
             return {
                 videoSize: {},
                 list: {},
+                labelLen: [],
+                cart_type: false, // 显示购物车
+                is_comment: false, // 显示评论
+                comment_num: 0, // 评论数
+                page: 0,
+                commentList: [], // 评论列表
                 src: "",
                 is_play: true,
-                timer: null,
-                alltime: 7,
-                time_count: 7,
+                time_count: 0,
+                linear: null,
+                loadinging: false,
             };
         },
         onLoad(option) {
+            this.article_id = option.id;
             this.getVideoInfo(option.id);
             this.getInfo();
-            this.aaa();
         },
         onReady() {
             this.videoBox = uni.createVideoContext("videoId", this);
@@ -55,14 +102,75 @@
             // 获取信息
             getVideoInfo(article_id) {
                 uni.request({
-                    url: "https://dmmall.sdbairui.com/api/article/articleInfo",
+                    url: temp_url + "article/articleInfo",
                     method: "POST",
                     data: {
                         article_id: article_id
                     },
+                    header: {
+                        Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+                    },
                     success: (res) => {
                         this.list = res.data.data.info;
                         this.src = res.data.data.info.video_path;
+                        let item = res.data.data.info.label;
+                        let arr = [];
+                        item.forEach(data => {
+                            let str = escape(data.name);
+                            if (str.indexOf('%u')) {
+                                // console.log(data.name);
+                                arr.push(Math.floor(data.name.length / 2));
+                            } else {
+                                arr.push(data.name.length);
+                            }
+                        })
+                        this.labelLen = arr;
+                    }
+                })
+            },
+            // 获取评论
+            getComment() {
+                uni.request({
+                    url: temp_url + "article/articleCommentList",
+                    method: "POST",
+                    data: {
+                        article_id: this.article_id,
+                        page: this.page,
+                    },
+                    success: (res) => {
+                        if (res.data.errCode == 0) {
+                            console.log(res.data);
+                            this.commentList = res.data.data;
+                        }
+                    }
+                })
+            },
+            // 发布评论	
+            sendComment() {	
+                if (this.send_value.length == 0) {	
+                    this.$u.toast("内容不能为空！");	
+                    return;	
+                }	
+                uni.request({	
+                    url: temp_url + "article/articleAddComment",	
+                    method: "POST",	
+                    data: {	
+                        article_id: this.article_id,	
+                        content: this.send_value,	
+                        pid: this.pid,	
+                        reply_id: this.reply_id,	
+                    },	
+                    success: (res) => {	
+                        if (res.data.errCode == 0) {	
+                            this.send_value = "";	
+                            this.comment_num = res.data.num;	
+                            console.log(res.data);	
+                        } else {	
+                            uni.showToast({	
+                                title: res.data.message,	
+                                icon: "none"	
+                            })	
+                        }	
                     }	
                 })	
             },
@@ -79,36 +187,53 @@
             },
             // 播放
             playing(e) {
-                console.log(e);
-                if (e.type == "play") {
-                    this.alltime = 7;
-                    this.time_count = 7;
-                    this.aaa();
-                }
+                // console.log(e);
+                if (e.type == "play") {}
             },
             // 暂停
             stoping() {
                 this.is_play = !this.is_play;
                 if (this.is_play) {
                     this.videoBox.play();
-                    this.aaa();
                 } else {
                     this.videoBox.pause();
-                     clearInterval(this.timer);
-                     this.temp_time = this.time_count;
-                     console.log(this.temp_time);
                 }
             },
-            // 倒计时
-            aaa() {
-                this.timer = setInterval(() => {
-                    if (this.time_count > 0 && this.time_count <= this.alltime) {
-                        this.time_count--;
-                    } else {
-                        clearInterval(this.timer);
-                        this.timer = null;
+            // 监听视频
+            timeupdate(e) {
+                this.time_count = parseInt(e.detail.duration) - parseInt(e.detail.currentTime);
+                if (e.detail.duration == e.detail.currentTime) {
+                    this.is_play = false;
                 }
-                }, 1000);
+                // let num = parseInt((e.detail.currentTime/e.detail.duration)*100);
+                // this.linear = num + "%";
+                // console.log(this.time_count);
+            },
+            // 打开弹窗
+            openPopup(data) {
+                console.log(data);
+                this.cart_type = data.cart;
+                this.is_comment = data.comment;
+                if (this.is_comment) {
+                    this.page = 0;
+                    this.getComment();
+                }
+            },
+            // 关闭评论
+            closeComment() {
+                this.is_comment = false;
+            },
+            // 下拉加载
+            onloading(e) {
+                console.log(e);
+                this.loadinging = true;
+                setTimeout(() => {
+                    this.loadinging = false;
+                }, 2000)
+            },
+            // stop
+            stopClick(event) {
+                event.stopPropagation();
             },
             goBack() {
                 uni.navigateBack({
@@ -129,6 +254,22 @@
         height: 30rpx;
     }
 
+    /* 暂停 */
+    .pause {
+        position: fixed;
+        top: 600rpx;
+        left: 330rpx;
+        width: 100rpx;
+        height: 100rpx;
+    }
+
+    /* 用户操作 */
+    .user-info {
+        position: fixed;
+        top: 360rpx;
+        right: 30rpx;
+    }
+
     /* 底部信息 */
     .info-box {
         position: fixed;
@@ -149,6 +290,109 @@
         background-color: rgba(255, 255, 255, .6);
     }
 
+    .content-box {
+        z-index: 99;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 750rpx;
+        height: 700rpx;
+        margin-bottom: 88rpx;
+        background-color: #fff;
+    }
+
+    .content-title {
+        justify-content: space-between;
+        flex-direction: row;
+        align-items: center;
+        height: 88rpx;
+        padding: 0 20rpx;
+        background-color: #ECECEC;
+    }
+
+    .comment-list {
+        margin-bottom: 50rpx;
+    }
+
+    .comment-list-box {
+        padding: 30rpx;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+    }
+    
+    .content-main {
+        flex-direction: row;
+        padding-left: 100rpx;
+    }
+    
+    .content-style {
+        width: 600rpx;
+        font-size: 26rpx;
+        color: #333;
+        lines: 2;
+    }
+    
+    .comment-list-header {
+        flex-direction: row;
+    }
+
+    .avatar {
+        width: 60rpx;
+        height: 60rpx;
+        margin-right: 20rpx;
+        border-radius: 50%;
+    }
+
+    .comment-title {
+        font-size: 26rpx;
+        color: #333;
+    }
+
+    .comment-time,
+    .reply {
+        font-size: 22rpx;
+        color: #999;
+    }
+
+    .tips {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: #333;
+    }
+    .send-box {
+        z-index: 10000;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        width: 750rpx;
+        height: 88rpx;
+        padding: 10rpx 30rpx;
+        border-top-width: 1rpx;
+        border-color: #ececec;
+        background-color: #fff;
+    }
+    
+    .send-val {
+        width: 600rpx;
+        height: 88rpx;
+        font-size: 36rpx;
+    }
+    
+    .btn-send {
+        font-size: 30rpx;
+        color: #303133;
+    }
+    
+    .close-down {
+        font-size: 50rpx;
+        text-align: center;
+        color: #333;
+    }
+
     .image-play {
         width: 22rpx;
         height: 20rpx;
@@ -204,4 +448,23 @@
         border-radius: 10rpx;
         background-color: rgba(255, 255, 255, .6);
     }
+
+    .loading {
+        width: 750rpx;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+    }
+
+    .indicator-text {
+        font-size: 20rpx;
+        text-align: center;
+        color: #999;
+    }
+
+    .indicator {
+        width: 30rpx;
+        height: 30rpx;
+        color: #999;
+    }
 </style>

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_price }}</view>
+									<view class="price">￥{{ goods.goods_total }}</view>
 									<view>×{{ goods.goods_num }}</view>
 								</view>
 							</view>
@@ -148,7 +148,7 @@ export default {
 	onLoad(option) {
 		this.orderType = this.$store.state.orderType;
 		this.orderInfo = this.$store.state.orderInfo;
-		// console.log(this.orderType);
+		console.log('orderType' + this.orderType);
 		// console.log(this.orderInfo);
 		this.getGoodsClass();
 		this.setTotalPrice();
@@ -204,6 +204,8 @@ export default {
 				this.withImmediate();
 			} else if(this.orderType == 1) {
 				this.sendOrder(0);
+			}  else if(this.orderType == 3) {
+				this.sendOrder(0);
 			} else {
 				this.sendOrder(1);
 			}

pageC/classify/goods.vue

@@ -106,7 +106,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.scrollHeight = res.windowHeight - (90 / 2) + 'px';
+			this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
 		},
 		setTitle(title) {
 			uni.setNavigationBarTitle({

pageC/components/merchant/image-top.vue

@@ -1,16 +1,17 @@
 <template>
     <view class="imageTop">
-        <image :src="url" mode="aspectFit"></image>
+        <image :src="url" mode="widthFix"></image>
     </view>
 </template>
 <style lang="scss" scoped>
 .imageTop{
     width: 100%;
     height: 500rpx;
-    margin-bottom: 20rpx;
+	overflow: hidden;
     >image{
         width: 100%;
         height: 100%;
+    	margin-bottom: 20rpx;
     }
 }
 </style>
@@ -21,6 +22,6 @@ export default {
         return {
         }
     },
-    props:['url']
+	props:['url'],
 }
 </script>

pageC/components/merchant/list-item.vue

@@ -1,17 +1,18 @@
 <template>
     <view class="listItem">
         <video v-if="type == '2'" :src="url" :show-fullscreen-btn="true"></video>
-        <image v-else :src="url" mode="aspectFit"></image>
+        <image v-else :src="url" mode="aspectFill"></image>
     </view>
 </template>
 <style lang="scss" scoped>
 .listItem{
     width: 365rpx;
     height: 500rpx;
-    margin-bottom: 20rpx;
+	overflow: hidden;
     >image,video{
         width: 100%;
         height: 100%;
+		margin-bottom: 20rpx;
     }
 }
 </style>

pageC/groupBuy/index.vue

@@ -104,7 +104,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+			this.swiperHeight = res.windowHeight - (res.windowWidth / 750) * 88 + 'px';
 		},
 	}
 };

pageC/merchant/classifyGoods.vue

@@ -125,7 +125,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.scrollHeight = res.windowHeight - 90 / 2 + 'px';
+			this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * 90 + 'px';
 			// console.log(this.scrollHeight);
 		},
 		toDetailsPage(id) {

pageC/merchant/goods.vue

@@ -109,13 +109,13 @@ export default {
 			})
 		},
 		switchCurrent(current) {
-			if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc;
+			if(current == 3 && this.current == 3) this.priceOrderAsc = !this.priceOrderAsc;
 			this.current = current;
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
 			const otherHeight = 347 + 140 + 20 + 98;
-			this.scrollHeight = res.windowHeight - otherHeight / 2 + 'px';
+			this.scrollHeight = res.windowHeight - (res.windowWidth / 750) * otherHeight + 'px';
 			// console.log(this.scrollHeight);
 		},
 		toDetailsPage(id) {

pageC/merchant/index.vue

@@ -38,12 +38,12 @@
 		</view>
 		<view class="main">
 			<scroll-view class="video-image" scroll-y v-if="cur==0 && indextop.length" :style="{ height: scrollHeiht }">
-				<view v-for="item in indextop" :key="item.id">
-					<videoTop :url="item.article_pic" v-if="item.type == 2"></videoTop>
-					<imageTop v-else :url="item.article_pic"></imageTop>
+				<view v-for="item in indextop" :key="item.id" class="container-top">
+					<videoTop :url="item.article_pic" v-if="item.type == 2" @click.native="toDetailsPage(item.article_id)"></videoTop>
+					<imageTop v-else :url="item.article_pic" @click.native="toDetailsPage(item.article_id)"></imageTop>
 				</view>
-				<view style="display: flex;flex-wrap: wrap;" v-if="indexlist.length">
-					<listitem :style="{'margin-left': index%2 == 1 ? '20rpx':'0'}" v-for="(item,index) in indexlist" :key="item.id" :type="item.type" :url="item.article_pic"></listitem>
+				<view v-if="indexlist.length" class="container-bottom">
+					<listitem v-for="item in indexlist" :key="item.id" :type="item.type" :url="item.article_pic" class="bottom-item" @click.native="toDetailsPage(item.article_id)"></listitem>
 				</view>
 			</scroll-view>
 			<view class="item" v-if="cur==1">
@@ -64,7 +64,7 @@
 				<image src="/static/image/shop/11.png"></image>
 				<view>店铺信息</view>
 			</view>
-			<view @click="switchCurrent(3)">
+			<view @click="customers()">
 				<image src="/static/image/shop/12.png"></image>
 				<view>联系客服</view>
 			</view>
@@ -109,6 +109,49 @@ export default {
 		// if(e.index == 0) this.show = true;
 	},
 	methods: {
+		customers(){
+			console.log(this.$store.state.hasLogin)
+			if(!this.$store.state.hasLogin){
+				this.$refs.uToast.show({
+					title: "请先登录",
+					type: 'warning'
+				})
+			}else{
+				function Friend(uuid, name, avatar,time = "", text = "",date = "") {
+					this.uuid = uuid;
+					this.name = name;
+					this.avatar = avatar;
+					this.online = false;
+					this.unReadMessage = 0;
+					this.text = text;
+					this.time = time;
+					this.date = date
+				}
+				console.log(123)
+				this.$u.api.getAtwillUserInfo({
+					id:this.sid
+				}).then((res)=>{
+					console.log(res)
+					let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+					this.$u.route({
+						url:"/pageD/privateChat/privateChat",
+						params:{
+							id:JSON.stringify(user)
+						}
+						
+					})
+				}).catch((err)=>{
+					console.log(err)
+				})
+			}
+			
+		},
+		toDetailsPage(id) {
+			// console.log(11);
+			this.$u.route('pageB/photo/index', {
+				id: id
+			});
+		},
 		switchCurrent(current) {
 			this.cur = current;
 			if(current == 0) {
@@ -123,15 +166,15 @@ export default {
 				uni.stopPullDownRefresh();
 			})
 		},
-		getStoreImgVideoList() {
-			this.$u.api.getStoreImgVideoList({ id: this.sid }).then((res)=>{
-				if(res.data.length) {
-					this.indextop = [res.data[0], res.data[1]];
-					this.indexlist = res.data.slice(2,);
-				}
-				uni.stopPullDownRefresh();
-			})
-		},
+		// getStoreImgVideoList() {
+		// 	this.$u.api.getStoreImgVideoList({ id: this.sid }).then((res)=>{
+		// 		if(res.data.length) {
+		// 			this.indextop = [res.data[0], res.data[1]];
+		// 			this.indexlist = res.data.slice(2,);
+		// 		}
+		// 		uni.stopPullDownRefresh();
+		// 	})
+		// },
 		attentionMember() {
 			this.$u.api.attentionMember({ member_id: this.info.member_id }).then(res => {
 				if(res.errCode == 0) {
@@ -149,15 +192,17 @@ export default {
 				uni.stopPullDownRefresh();
 				if (res.errCode == 0) {
 					// this.articleList = res.data.list;
+					if(JSON.stringify(res.data) != '[]') {
 						if(res.data.list.length > 0) {
 							this.indextop = [res.data.list[0]]
-						this.indextop = [res.data.list[0], res.data.list[1]];
+							// this.indextop = [res.data.list[0], res.data.list[1]];
 						}
 						if(res.data.list.length > 1) {
 							this.indextop.push(res.data.list[1]);
 							this.indexlist.push(...res.data.list.slice(2,));
 						}
 					}
+				}
 			})
 		},
 		setViewHeight() {
@@ -288,10 +333,24 @@ export default {
 		.video-image {
 			padding-bottom: 98rpx;
 		}
+		.container-top {
 			> view {
-			margin-top: 20rpx;
+				margin-bottom: 10rpx;
 			}
 		}
+		.container-bottom {
+			margin-top: 20rpx; 
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			.bottom-item {
+				margin-bottom: 10rpx;
+			}
+		}
+		// > view {
+		// 	margin-top: 20rpx;
+		// }
+	}
 	.tabbar {
 		border-top: 1rpx #DBDADA solid;
 		width: 100%;

pageD/attention/attention.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="attention">
-		<view class="attention_box" v-for="(item,index) in attention" :key="index">
+		<view class="attention_box" v-for="(item,index) in attention" :key="index" @click="navto(item.friend_tomid)">
 			<view>
 				<image :src="item.friend_tomavatar" mode="aspectFill"></image>
 			</view>
@@ -40,6 +40,15 @@
 				this.$u.api.snsfriendList({}).then((res)=>{
 					this.attention = res.data;
 				})
+			},
+			navto(id){
+				// /pageB/details/index
+				this.$u.route({
+					url:"/pageB/details/index",
+					params:{
+						id
+					}
+				})
 			}
 		},
 		components: {

pageE/mine/EditUserInfo.vue

@@ -98,8 +98,37 @@ export default {
 	},
 	onNavigationBarButtonTap(e) {
 		if( e.index == 0 ) uni.navigateBack();
+		// if( e.index == 1 ) this.customers();
 	},
 	methods: {
+		customers(){
+			function Friend(uuid, name, avatar,time = "", text = "",date = "") {
+				this.uuid = uuid;
+				this.name = name;
+				this.avatar = avatar;
+				this.online = false;
+				this.unReadMessage = 0;
+				this.text = text;
+				this.time = time;
+				this.date = date
+			}
+			// console.log(123)
+			this.$u.api.getAtwillUserInfo({
+				id: 1 // 平台店铺 id
+			}).then((res)=>{
+				// console.log(res)
+				let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+				this.$u.route({
+					url:"/pageD/privateChat/privateChat",
+					params:{
+						id:JSON.stringify(user)
+					}
+					
+				})
+			}).catch((err)=>{
+				console.log(err)
+			})
+		},
 		changeAvatar() {
 			const url = this.$u.http.config.baseUrl + '/Upload/uploadfile';
 			uni.chooseImage({

pageE/mine/Integral.vue

@@ -40,13 +40,13 @@ export default {
 		setIntegralHeight() {
 			const res = uni.getSystemInfoSync();
 			// console.log(res.windowHeight);
-			this.integralHeight = res.windowHeight - 251 / 2 + 'px';
+			this.integralHeight = res.windowHeight - (res.windowWidth / 750) * 251 + 'px';
 		},
 		getMemberPointsStat() {
 			this.$u.api.getMemberPointsStat().then((res)=>{
 				if (res.errCode == 0) {
 					this.memberInfo = res.data;
-					this.nodes = common.unescapeHTML(this.memberInfo.points_rule);
+					this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
 				}
 			})
 		},

pageE/mine/MedalIntroduction.vue

@@ -3,7 +3,7 @@
 		<scroll-view scroll-y class="medal-article">
 			<view class="medal-title">
 				<image src="../static/mine/29.png"></image>
-				<view>了解勋章</view>
+				<view>{{ title }}</view>
 				<image src="../static/mine/30.png"></image>
 			</view>
 			<view class="medal-content">
@@ -18,6 +18,7 @@ export default {
 	data() {
 		return {
 			nodes: '',
+			title: '',
 		}
 	}, 
 	created() {
@@ -27,7 +28,8 @@ export default {
 		getMemberPointsStat() {
 			this.$u.api.getMemberPointsStat().then((res)=>{
 				if (res.errCode == 0) {
-					const nodes = res.data.grade_rule;
+					this.title = res.data.grade_rule.document_title;
+					const nodes = res.data.grade_rule.document_content;
 					this.nodes = common.unescapeHTML(nodes);
 				}
 			})

pageE/mine/MemberServe.vue

@@ -117,9 +117,9 @@ export default {
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
 			// console.log(res.windowHeight);
-			this.richHeight = res.windowHeight - (88 + 250) / 2 + 'px';
+			this.richHeight = res.windowHeight - (88 + 250) * (res.windowWidth / 750) + 'px';
 			// console.log(this.richHeight);
-			this.swiperHeight = res.windowHeight - 88 / 2 + 'px';
+			this.swiperHeight = res.windowHeight - (res.windowWidth / 750) * 88 + 'px';
 		},
 		viewProgress() {
 			this.$u.route({

pageE/mine/MemberServeCoupon.vue

@@ -7,11 +7,11 @@
 		<swiper :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{ height: swiperHeight }">
 			<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
 				<scroll-view scroll-y style="height: 100%;" @scrolltolower="onreachBottom" class="coupon-scroll">
-					<view v-for="(coupon, index) in couponList" :key="index" class="coupon-item">
+					<view v-for="(coupon, index) in couponList[i]" :key="index" class="coupon-item">
 						<Coupon :couponInfo="coupon" :status='0' :type="0" @exchange="exchangeCoupon($event)"></Coupon>
 					</view>
-					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="couponList.length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
-					<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList.length"></u-empty>
+					<u-empty text="暂无优惠券" mode="coupon" color="#000" v-if="!couponList[i] || !couponList[i].length"></u-empty>
+					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-bottom="60" v-if="!couponList[i] || couponList[i].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -49,7 +49,7 @@ export default {
 	},
 	watch: {
 		couponCurrent(index) {
-			this.couponList = [];
+			// this.couponList = [];
 			const id = this.couponGroupList[index].gc_id;
 			this.getCouponList({ gc_id: id, load: 'reload' });
 		},
@@ -89,9 +89,10 @@ export default {
 			})
 			this.timer = true;
 			if(res.errCode == 0) {
-				if(load == 'reload') this.couponList = res.data;
-				else if(load == 'loadmore') this.couponList.push(...res.data);
+				if(load == 'reload') this.couponList[this.couponCurrent] = res.data;
+				else if(load == 'loadmore') this.couponList[this.couponCurrent].push(...res.data);
 			}
+			this.$forceUpdate();
 			return res.data.length;
 		},
 		exchangeCoupon(id) {
@@ -109,7 +110,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.swiperHeight = res.windowHeight - ((88 + 10 + 88) / 2) + 'px';
+			this.swiperHeight = res.windowHeight - ((88 + 10 + 88) * (res.windowWidth / 750)) + 'px';
 		},
 	},
 };

pageE/mine/MineConcerns.vue

@@ -3,8 +3,8 @@
 		<view class="concerns-container">
 			<view v-for="(info, index) in list" :key="index">
 				<view class="daren-item">
-					<image class="head" :src="info.friend_tomavatar"></image>
-					<text class="name">{{ info.friend_tomname || '' }}</text>
+					<image class="head" :src="info.friend_tomavatar" @click="viewDetails(info.friend_tomid)"></image>
+					<text class="name" @click="viewDetails(info.friend_tomid)">{{ info.friend_tomname || '' }}</text>
 					<view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view>
 				</view>
 			</view>
@@ -37,6 +37,11 @@ export default {
 				}
 			})
 		},
+		viewDetails(id) {
+			this.$u.route('pageB/details/index', {
+				id: id
+			});
+		},
 		changeType(id) {
 				console.log(id);
 				this.$u.api.attentionMember({

pageE/mine/MineProgress.vue

@@ -13,7 +13,7 @@
 			<view class="distance">距离下一级还需要 {{ memberInfo.next_member_level_exppoints_diff }} 经验值</view>
 		</view>
 		<view class="body">
-			<view class="title">
+			<view class="title" v-if="memberInfo.level_rule">
 				<image src="/static/image/mine/34.png"></image>
 				<text>{{ memberInfo.level_rule.document_title }}</text>
 			</view>
@@ -121,7 +121,7 @@ export default {
 		}
 	}
 	.body {
-		margin-top: 60rpx;
+		margin-top: 20rpx;
 		.title {
 			height: 88rpx;
 			display: flex;
@@ -131,7 +131,7 @@ export default {
 			font-weight: 500;
 			color: rgba(51,51,51,1);
 			// border-bottom: #ECECEC 1rpx solid;
-			margin-bottom: 30rpx;
+			margin-bottom: 20rpx;
 			> image {
 				width: 29rpx;
 				height: 36rpx;

pageE/order/Details.vue

@@ -154,6 +154,9 @@ export default {
 				case 4:
 					state = '2';
 					break;
+				case 5:
+					state = '3';
+					break;
 				case 6:
 					state = '7';
 					break;

pageE/setting/Index.vue

@@ -33,11 +33,12 @@
 					fontSize: 24
 				},
 				sheetStatus: false,
-				list: [{
-						text: '换个账号登录',
-						color: '#FF780F',
-						fontSize: 28
-					},
+				list: [
+                    // {
+					// 	text: '换个账号登录',
+					// 	color: '#FF780F',
+					// 	fontSize: 28
+					// },
 					{
 						text: '退出登录',
 						color: '#FF780F',
@@ -78,7 +79,7 @@
 			// 退出登录选择 0：切换账号 | 1：退出登录
 			choiceOption(index) {
 				console.log(index);
-				if (index == 1) {
+				if (index == 0) {
 					this.show = true;
 				}
 			},

pageE/tool/Manicure.vue

@@ -90,7 +90,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+			this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
 		},
 		tabsChange(index) {
 			this.swiperCurrent = index;

pageE/tool/MineCoupon.vue

@@ -6,7 +6,7 @@
 				<scroll-view scroll-y class="scroll-coupon">
 					<view v-if="couponList[index]">
 						<view class="coupon-item" v-for="(coupon, c_index) in couponList[index]" :key="c_index">
-							<Coupon :couponInfo="coupon" :status='index' :type="1" @use="useCoupon($event)" :goodsClass="goodsClass"></Coupon>
+							<Coupon :couponInfo="coupon" :status='index' @use="useCoupon($event)" :goodsClass="goodsClass"></Coupon>
 						</view>
 					</view>
 					<u-empty text="暂无优惠券" mode="coupon" v-if="!couponList[index] || !couponList[index].length"></u-empty>
@@ -68,12 +68,22 @@ export default {
 				this.$forceUpdate();
 			})
 		},
-		useCoupon(id) {
-			console.log(id);
+		useCoupon(coupon) {
+			// console.log(coupon);
+			if(coupon.type == 1) {
+				this.$u.route({
+					type: 'switchTab',
+					url: 'pages/shop/index',
+				})
+			} else if(coupon.type == 2) {
+				this.$u.route('pageC/merchant/index', {
+					id: coupon.voucher_store_id,
+				});
+			}
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.swiperHeight = res.windowHeight - (88 / 2 + 11 / 2) + 'px';
+			this.swiperHeight = res.windowHeight - (100 * (res.windowWidth / 750)) + 'px';
 		},
 		tabsChange(index) {
 			this.swiperCurrent = index;

pageE/tool/MineHistory.vue

@@ -4,12 +4,12 @@
 			<view class="item-box">
 				<!-- 需求：只显示最近五十条数据　后台未作限制 -->
 				<view v-for="(item, index) in historyList.slice(0, 50)" :key="index" class="history-item">
-					<view class="item-title">
+					<view class="item-title" @click="viewStoreDetails(item.store_id)">
 						<image :src="item.store_avatar"></image>
-						<view>{{ item.store_name }}</view>
+						<view class="u-line-2">{{ item.store_name }}</view>
 					</view>
-					<image :src="item.goods_image" class="item-image"></image>
-					<view class="item-info">
+					<image :src="item.goods_image" class="item-image" @click="viewGoodsDetails(item.goods_id)"></image>
+					<view class="item-info" @click="viewGoodsDetails(item.goods_id)">
 						<view class="info-name u-line-1">{{ item.goods_name }}</view>
 					</view>
 				</view>
@@ -34,6 +34,22 @@ export default {
 		this.getBrowseList();
 	},
     methods: {
+		viewStoreDetails(sid) {
+			this.$u.route({
+				url: 'pageC/merchant/index',
+				params: {
+					id: sid,
+				}
+			})
+		},
+		viewGoodsDetails(id) {
+			this.$u.route({
+				url: 'pageB/sdetails/index',
+				params: {
+					id: id,
+				}
+			})
+		},
 		async getBrowseList () {
 			const res = await this.$u.api.getBrowseList({ page: this.page });
 			this.timer = false;

pageE/tool/SendWash.vue

@@ -44,7 +44,7 @@
 							<view class="btn" v-if="item.order_status == 20" @click="sendLaundryOrderConfirm(item.laundry_id)">
 								确认完成
 							</view>
-							<view class="btn" v-if="item.order_status == 50" @click="toComment(item.laundry_id)">
+							<view class="btn" v-if="item.order_status == 50 && !item.comment" @click="toComment(item.laundry_id)">
 								去评价
 							</view>
 						</view>
@@ -192,7 +192,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
+			this.swiperHeight = res.windowHeight - (88 * (res.windowWidth / 750)) + 'px';
 		},
 		toComment(id) {
 			this.$u.route('/pageE/tool/washComment', {

pageE/tool/WashOrder.vue

@@ -3,7 +3,7 @@
 		<view>
 			<u-tabs-swiper ref="tabs" :list="list" :is-scroll="false" active-color="#FF780F" :current="current" font-size="32" :show-bar="false" @change="tabsChange" height="88"></u-tabs-swiper>
 		</view>
-		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{ minHeight: swiperHeight }">
+		<swiper :current="swiperCurrent" @animationfinish="animationfinish" class="aaa" :style="{ minHeight: swiperHeight }">
 			<swiper-item class="swiper-item">
 				<scroll-view scroll-y="true" style="height: 100%;">
 					<view class="order-info">
@@ -175,7 +175,7 @@
 							<view class="checkd">
 								<label class="radio-view" v-for="(item, index) in items.extend_order_goods" :key="index">
 									<view class="radio">
-										<u-radio color="#F0AD4E" :name="items.order_id + ' ' + item.goods_id" active-color="#FF780F" icon-size="34" shape="circle"></u-radio>
+										<u-radio color="#F0AD4E" :name="items.order_id + ' ' + item.goods_id" active-color="#FF780F" icon-size="24" shape="circle"></u-radio>
 									</view>
 									<view class="store_info">
 										<view class="info_img">
@@ -259,6 +259,16 @@ export default {
 		this.getAreaData();
 		this.getClothesTypeList();
 	},
+	watch: {
+		swiperCurrent() {
+			this.goodsStatus = '';
+			this.type = {};
+			this.name = '';
+			this.phone = '';
+			this.area = '';
+			this.address = '';
+		}
+	},
 	methods: {
 		getClothesTypeList() {
 			this.$u.api.getClothesTypeList().then(res => {
@@ -267,7 +277,7 @@ export default {
 				} else {
 					this.typeList = [];
 				}
-				console.log(this.typeList);
+				// console.log(this.typeList);
 			})
 		},
 		confirmType(e) {
@@ -388,7 +398,7 @@ export default {
 		},
 		radioChange(e){
 			const ids = e.split(" ");
-			console.log(ids)
+			// console.log(ids)
 			let checkedGoods = {};
 			this.orderList.forEach(order => {
 				if(order.order_id == ids[0]) {
@@ -424,12 +434,6 @@ export default {
 			})
 		},
 		animationfinish(e) {
-			this.goodsStatus = '';
-			this.type = {};
-			this.name = '';
-			this.phone = '';
-			this.area = '';
-			this.address = '';
 			// 可重新提交订单
 			this.debounce = true;
 			let current = e.detail.current;
@@ -438,8 +442,7 @@ export default {
 		},
 		setViewHeight() {
 			const res = uni.getSystemInfoSync();
-			// this.swiperHeight = res.windowHeight - (88 / 2) + 'px';
-			this.swiperHeight = res.windowHeight + 'px';
+			this.swiperHeight = res.windowHeight - (res.windowWidth / 750) * 88 + 'px';
 		},
 		confirm(e){
 			this.showPopup = false;
@@ -467,6 +470,9 @@ export default {
 		flex: 1;
 		// height: 95vh;
 	}
+    .aaa {
+        overflow-y: scroll;
+    }
 	.order-info {
 		.choose-info{
 			display: flex;flex-wrap: wrap;

pages.json

@@ -237,6 +237,18 @@
 							"softinputMode": "adjustResize"
 						}
 					}
+				},
+				{
+					"path": "coupon/details",
+					"style": {
+						"navigationBarTitleText": "优惠券介绍",
+						"app-plus": {
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
 				}
 			]
 		},
@@ -869,14 +881,14 @@
 										"text":"取消",
 										"float":"left",
 										"fontSize":"14"
-									},
-									{
-										"type":"none",
-										"text":"\ue62d",
-										"float":"right",
-										"fontSrc": "/static/fonts/customer.ttf",
-										"fontSize":"20"
 									}
+									// {
+									// 	"type":"none",
+									// 	"text":"\ue62d",
+									// 	"float":"right",
+									// 	"fontSrc": "/static/fonts/customer.ttf",
+									// 	"fontSize":"20"
+									// }
 								]
 							}
 						}
@@ -1017,6 +1029,12 @@
 		}	
 	],
 	"pages": [
+        // {
+        //     "path" : "pageA/start/start",
+        //     "style": {
+        //         "navigationStyle": "custom"
+        //     }
+        // },
 		{
 			"path": "pageA/welcome/welcome",
 			"style": {
@@ -1077,10 +1095,6 @@
 				}
 			}
 		}
-        ,{
-            "path" : "pageB/components/nuserinfo/nuserinfo",
-            "style" : {}
-        }
     ],
 	"tabBar": {
 		"color": "#999999",

pages/index/index.vue

@@ -14,7 +14,7 @@
 					 inactive-color="#333" :active-item-style="{
                     'color':'#333'
                 }" :bold="false"
-					 @change="dianji"></u-tabs>
+					 @change="dianji($event)"></u-tabs>
 				</view>
 				<view class="sosuo"></view>
 			</view>
@@ -27,14 +27,14 @@
 							<view class="list">
 								<view>
 									<videoItem v-for="(item,id) in articleList.filter((_, index) => !(index&1))" :key="id" :item="item"
-									 @getArticlelist="getArticlelist"></videoItem>
+									 @updateList="updateList"></videoItem>
 								</view>
 								<view style="margin-left:20rpx">
 									<videoItem v-for="(item,id) in articleList.filter((_, index) => index&1)" :key="id" :item="item"
-									 @getArticlelist="getArticlelist"></videoItem>
+									 @updateList="updateList"></videoItem>
 								</view>
 							</view>
-                            <u-loadmore :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
+                            <u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
 						</view>
 					</scroll-view>
 				</swiper-item>
@@ -79,7 +79,7 @@
                                         <videoItem isguanzhu="true" v-for="(item,id) in fansList" :key="id" :item="item"></videoItem>
                                     </view>
                                      <view class="no-data" v-if="!fansList.length">您还没有关注哦，赶紧去点点关注！</view>
-                                     <u-loadmore v-else :status="status_1" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
+                                     <u-loadmore class="load-size" v-else :status="status_1" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
 								</view>
 							</view>
 						</view>
@@ -87,6 +87,13 @@
 				</swiper-item>
 			</swiper>
 		</view>
+		<u-popup v-model="showCoupon" mode="center" class="u-coupon-popup">
+			<view class="coupon">
+				<view class="price">{{ newMemberCoupon.price }}</view>
+				<image src="/static/image/common/30.png" class="coupon-image" @click="viewCoupon"></image>
+				<image src="/static/image/common/24.png" class="close-image" @click="showCoupon=false"></image>
+			</view>
+		</u-popup>
 	</view>
 
 </template>
@@ -96,6 +103,10 @@
 		display: flex;
 		flex-direction: column;
 		height: 100vh;
+        /* #ifdef APP-PLUS */
+        padding-bottom: 100rpx;
+        /* #endif */
+        overflow: hidden;
 
 		.top {
 			display: flex;
@@ -113,6 +124,7 @@
 
 			.tabs {
 				width: 334rpx;
+                // pointer-events: none;
                 
 				/deep/ .u-tab-item {
 					font-weight: bold;
@@ -123,6 +135,7 @@
 		.card {
 			height: 100%;
 			width: 100%;
+            // pointer-events: none;
 
 			.box {
 				width: 100%;
@@ -198,6 +211,43 @@
         margin: 200rpx auto 0;
         text-align: center;
     }
+	.u-coupon-popup {
+		/deep/ .u-mode-center-box {
+			background-color: transparent;
+		}
+		.coupon {
+			width: 750rpx;
+			height: 583rpx;
+			position: relative;
+			.price {
+				z-index: 3;
+				color: #EBB36E;
+				position: absolute;
+				font-size: 108rpx;
+				font-weight: bold;
+				top: 200rpx;
+				left: 50%;
+				transform: translate(-68%, 0);
+			}
+			.coupon-image {
+				width: 568rpx;
+				height: 583rpx;
+				position: absolute;
+				top: 0;
+				left: 50%;
+				transform: translate(-60%, 0);
+			}
+			.close-image {
+				position: absolute;
+				top: 0; 
+				right: 155rpx;
+				width: 60rpx;
+				height: 60rpx;
+			}
+		}
+	}
+	
+    
 </style>
 <script>
     import { mapState } from 'vuex'
@@ -236,7 +286,10 @@
                     loadmore: '轻轻上拉',
                     loading: '努力加载中',
                     nomore: '实在没有了'
-                }
+				},
+				showCoupon: false,
+				newMemberCoupon: {},
+				exchangestate:false
 			}
 		},
 		components: {
@@ -246,6 +299,10 @@
 			darenItem
 		},
 		onShow() {
+			// 页面返回,页面登陆的情况下检查是否显示领取优惠卷优惠券弹窗
+			if(this.exchangestate==true){
+				this.isNewmembervoucher()
+			}
             this.articleList = [];
             this.page = 0;
 			this.getArticlelist();
@@ -253,6 +310,7 @@
 		},
 		onLoad(){
 			if(this.$store.state.hasLogin){
+				this.exchangestate = true
 				const user = uni.getStorageSync('user_info');
 				console.log(user)
 				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
@@ -295,7 +353,6 @@
 				this.$u.api.attentionMember({
 					member_id: member_id
 				}).then((res) => {
-					console.log(res);
                     this.follow_page = 0;
 					this.getRecommendList(); // 关注列表
                     this.getFollowList(); // 刷新发现的列表
@@ -311,12 +368,14 @@
             // 切换导航
 			dianji(a) {
                 // console.log(a);
-				if (typeof a == "object") {
+                if (a.type == "change") {
                     this.num = a.detail.current
                 } else {
-					this.num = a
+                    this.num = a;
                 }
+                // console.log(this.num);
                 // 状态请求
+                if (a.type == "change") { // 强制请求一次
                     if (this.num == 0) {
                         this.page = 0;
                         this.status = "loadmore";
@@ -327,11 +386,12 @@
                         this.tabLiveList();
                     } else if (this.num == 2) {
                         this.follow_page = 0;
-                    this.status = "loadmore";
+                        this.fansList = [];
                         if (this.hasLogin) {
                             this.getFollowList(); // 关注列表
                         }
                         this.getRecommendList(); // 推荐达人
+                    }
                 }
 			},
             // 发现别表
@@ -358,6 +418,12 @@
                     }
 				})
 			},
+            // 屏蔽更新列表
+            updateList() {
+                console.log(111);
+                this.page = 0;
+                this.getArticlelist();
+            },
             // 发现下拉加载
             swiperBottom(e) {
                 this.getArticlelist();
@@ -383,11 +449,14 @@
                 }).then(res => {
                     this.status_1 = "loading";
                     if (res.errCode == 0) {
+                        if (this.fansList.length < 4) {
+                            this.status_1 = "nomore";
+                        }
                         // uni.stopPullDownRefresh();
                         // console.log('37647744ghj', res)
                         if (this.follow_page == 0) {
                             this.fansList = res.data.list;
-                            this.status_1 = "loadmore";
+                            // this.status_1 = "loadmore";
                         } else if (res.data.list.length == 0 && this.follow_page > 0) {
                             this.status_1 = "nomore";
                         } else {
@@ -444,6 +513,22 @@
                 this.$u.route("/pageB/search/index", {
 					type: 2,
 				});
+			},
+			// 是否显示新人优惠券
+			isNewmembervoucher() {
+				this.$u.api.isNewmembervoucher().then(res => {
+					if(res.errCode == 0) {
+						this.newMemberCoupon = res.data;
+						this.showCoupon = true;
+					} else {
+						this.showCoupon = false;
+					}
+				})
+			},
+			viewCoupon() {
+				this.$u.route('/pageB/coupon/details', {
+					price: this.newMemberCoupon.price
+				});
 			}
 		},
 	}

pages/information/information.vue

@@ -3,14 +3,14 @@
 		<u-navbar :is-back="false" :title-size="36" title="消息">
 			<view class="slot-wrap">
 				<image src="../../static/pageD/info(3).png" @click="delMessage()"></image>
-				<image src="../../static/pageD/info(2).png"></image>
+				<image src="../../static/pageD/info(2).png" @click="kefu()"></image>
 			</view>
 		</u-navbar>
 		<view class="content">
 			<!-- 正文内容 -->
 		</view>
 		<!-- <view class="sousuo"></view> -->
-		<view class="backes">
+		<view class="backes" style="border-bottom: 1px #ececec solid;">
 			<titles :information="information_dles"></titles>
 		</view>
 		<!-- 消息通知 -->
@@ -105,6 +105,49 @@
 			
 		},
 		methods: {
+			kefu(){
+				if(!this.$store.state.hasLogin){
+					this.$refs.uToast.show({
+						title: "请先登录",
+						type: 'warning'
+					})
+				}else{
+					function Friend(uuid, name, avatar,time = "", text = "",date = "") {
+						this.uuid = uuid;
+						this.name = name;
+						this.avatar = avatar;
+						this.online = false;
+						this.unReadMessage = 0;
+						this.text = text;
+						this.time = time;
+						this.date = date
+					}
+					const token = uni.getStorageSync('token');
+					let that = this
+					uni.request({
+						url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+						data:{
+							userId: 1
+						},
+						method:"POST",
+						header:{
+							"Authorization" : 'Bearer' + " " + token
+						},
+						success(res){
+							console.log(res)
+							res = res.data
+							let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+							that.$u.route({
+								url:"/pageD/privateChat/privateChat",
+								params:{
+									id:JSON.stringify(user)
+								}
+							})
+						}
+					})
+				}
+			
+			},
 			gochat(id){
 				this.$u.route({
 					url:"/pageD/privateChat/privateChat",

pages/mine/index.vue

@@ -5,7 +5,7 @@
 				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + new Date().getTime()" :size="110"></u-avatar>
 				<view class="user-info">
 					<view class="info-left">
-						<view class="user-nickname">{{ userInfo.member_nickname }}</view>
+						<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
 						<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
 							<image src="/static/image/mine/13.png"></image>
 							<view class="rank-title">{{ userInfo.member_grade_name }}</view>
@@ -46,7 +46,7 @@
 				<view class="title">
 					<view class="title-text">我的订单</view>
 					<view class="more" @click="toOtherPage('/order/Index')">
-						<view class="title-text">查看全部订单</view>
+						<view class="title-text-more">查看全部订单</view>
 						<image src="/static/image/mine/21.png"></image>
 					</view>
 				</view>
@@ -71,14 +71,14 @@
 						<image src="/static/image/mine/37.png"></image>
 						<view>拼团中</view>
 					</view>
-					<view @click="toOtherPage('/order/Index?current=6')">
-						<image src="/static/image/mine/9.png"></image>
-						<view>售后</view>
-					</view>
 					<view @click="toOtherPage('/order/Index?current=7')">
 						<image src="/static/image/mine/3.png"></image>
 						<view>待评价</view>
 					</view>
+                    <view @click="toOtherPage('/order/Index?current=6')">
+                    	<image src="/static/image/mine/9.png"></image>
+                    	<view>售后</view>
+                    </view>
 				</view>
 			</view>
 			<view class="tool">
@@ -110,7 +110,7 @@
 						<view>收货地址</view>
 					</view>
 					<view @click="toOtherPage('/more/AfterSalesHelp')">
-						<image src="/static/image/mine/9.png"></image>
+						<image src="/static/image/mine/38.png"></image>
 						<view>售后政策</view>
 					</view>
 					<view @click="toOtherPage('/more/MineHelp')">
@@ -192,13 +192,14 @@ export default {
 				.info-left {
 					margin-right: 15rpx;
 					.user-nickname {
+						width: 100rpx;
 						font-size: 30rpx;
 						color: rgba(51,51,51,1);
 						margin-bottom: 19rpx;
 					}
 					.user-medal {
 						display: flex;
-						width: 110rpx;
+						// width: 110rpx;
 						// height: 25rpx;
 						background: linear-gradient(269deg,rgba(175,175,175,1) 0%,rgba(224,224,224,1) 100%);
 						border-radius: 13rpx;
@@ -249,8 +250,9 @@ export default {
 			> view {
 				margin-right: 80rpx;
 				text-align: center;
-				font-size: 24rpx;
-				color:rgba(51,51,51,1);
+				font-size: 26rpx;
+                font-weight: 500;
+				color: #333;
 				> view:first-child {
 					margin-bottom: 10rpx;
 				}
@@ -274,7 +276,7 @@ export default {
 			.title {
 				height: 76rpx;
 				font-size: 28rpx;
-				color: rgba(51,51,51,1);
+				color: #666;
 				position: relative;
 				display: flex;
 				align-items: center;
@@ -289,6 +291,10 @@ export default {
     				transform: translate(-50%,0);
 				}
 			}
+            .title-text-more {	
+                font-size: 24rpx;
+                color: #999;
+            }
 			.content {
 				padding: $content-padding-top 0 $content-padding-bottom;
 				display: flex;
@@ -328,6 +334,7 @@ export default {
 				}
 			}
 			.content {
+                align-items: center;
 				justify-content: space-between;
 				> view {
 					display: flex;
@@ -336,22 +343,22 @@ export default {
 					justify-content: space-between;
 				}
 				> view:nth-child(1){
-					@include image-size($image-width: 33rpx, $image-height: 36rpx);
+					@include image-size($image-width: 36rpx, $image-height: 34rpx);
 				}
 				> view:nth-child(2){
-					@include image-size($image-width: 38rpx, $image-height: 32rpx);
+					@include image-size($image-width: 38rpx, $image-height: 36rpx);
 				}
 				> view:nth-child(3){
-					@include image-size($image-width: 41rpx, $image-height: 33rpx);
+					@include image-size($image-width: 40rpx, $image-height: 36rpx);
 				}
 				> view:nth-child(4){
-					@include image-size($image-width: 40rpx, $image-height: 35rpx);
+					@include image-size($image-width: 38rpx, $image-height: 38rpx);
 				}
 				> view:nth-child(5){
-					@include image-size($image-width: 37rpx, $image-height: 37rpx);
+					@include image-size($image-width: 36rpx, $image-height: 40rpx);
 				}
 				> view:nth-child(6){
-					@include image-size($image-width: 33rpx, $image-height: 35rpx);
+					@include image-size($image-width: 36rpx, $image-height: 40rpx);
 				}
 			}
 		} 

pages/zhibo/index.nvue

@@ -21,10 +21,10 @@
     <image class="cart" src="../../static/cart.png" @click="show = true">
 
     </image>
-    <view class="danmufasongbox" @click="danmu = true">
+    <view class="danmufasongbox" @click="danmu = $store.state.hasLogin">
       <view class="danmufasongboxback"></view>
       <image src="../../static/danmu.png" class="danmubianji"></image>
-      <text style="font-size:26rpx;color:#fff;margin-left:20rpx">想说点什么</text>
+      <text style="font-size:26rpx;color:#fff;margin-left:20rpx">{{ $store.state.hasLogin ? '想说点什么' : '请先登录'}}</text>
     </view>
     <image class="liketap" src="../../static/like.png" @click="">
 

static/imservice.js

@@ -297,7 +297,8 @@ IMService.prototype.initialIMListeners = function () {
                         friend.text = message.type != "text" ? "其他消息" : message.payload.text
                         let time = new Date(message.timestamp)
                         friend.date = message.timestamp
-                        friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+                        
                         console.log(that.friends)
                         that.friendsarr = []
                         for(let i in that.friends){
@@ -322,7 +323,7 @@ IMService.prototype.initialIMListeners = function () {
                 friend.text = message.type != "text" ? "其他消息" : message.payload.text
                 let time = new Date(message.timestamp)
                 friend.date = message.timestamp
-                friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
                 console.log(this.friends)  
                 that.friendsarr = []
                 for(let i in this.friends){
@@ -458,6 +459,8 @@ IMService.prototype.sendPrivateTextMessage = function (friendId, text) {
         text: text
     });
     this.sendPrivateMessage(friendId, textMessage);
+    this.sendMessagesSetStorage(friendId, text)
+
 };
 
 //私聊图片消息
@@ -469,6 +472,7 @@ IMService.prototype.sendPrivateImageMessage = function (friendId, imageFile) {
         }
     });
     this.sendPrivateMessage(friendId, imageMessage);
+    this.sendMessagesSetStorage(friendId, '其他消息')
 };
 
 //私聊视频消息
@@ -480,6 +484,8 @@ IMService.prototype.sendPrivateVideoMessage = function (friendId, videoFile) {
         }
     });
     this.sendPrivateMessage(friendId, videoMessage);
+    this.sendMessagesSetStorage(friendId, '其他消息')
+
 };
 
 IMService.prototype.sendPrivateAudioMessage = function (friendId, audiofile) {
@@ -491,8 +497,92 @@ IMService.prototype.sendPrivateAudioMessage = function (friendId, audiofile) {
     });
 
     this.sendPrivateMessage(friendId, audioMessage);
-};
+    this.sendMessagesSetStorage(friendId, '其他消息')
 
+};
+IMService.prototype.sendMessagesSetStorage = function (friendId,message){
+    let friend = this.friends[friendId];
+    console.log(friend)
+    // return ;
+    let sorts = function (friends){
+        let paixu = function (a,b){
+            if(a.date > b.date){
+                return 0;
+            }else{
+                return 1;
+            }
+
+        }
+        friends.sort(paixu)
+       
+    }
+    
+    let that = this
+    if(!friend && friend == undefined){
+        const token = uni.getStorageSync('token');
+        console.log(token)
+        uni.request({
+            url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+            data:{
+                userId:friendId
+            },
+            method:"POST",
+            header:{
+                "Authorization" : 'Bearer' + " " + token
+            },
+            success(res){
+                console.log(res)
+                that.friends[friendId] = new Friend(res.data.data.member_id, res.data.data.member_nickname, res.data.data.member_avatar);
+                friend = that.friends[friendId];
+                console.log(friend)
+                friend.text = message
+                let time = new Date()
+                friend.date = time.getTime()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+               
+
+                console.log(that.friends)
+                that.friendsarr = []
+                for(let i in that.friends){
+                    console.log(i)
+                    that.friendsarr.push(that.friends[i])
+                }
+                sorts(that.friendsarr)
+                let arr = []
+                for(let i in that.friends){
+                    arr.push([that.friends[i].uuid,that.friends[i].time,that.friends[i].text,that.friends[i].date,0])
+                }
+                console.log(arr)
+                uni.setStorageSync('imlist',JSON.stringify(arr))
+
+                that.onFriendListChange(that.friends);
+
+            }
+        })
+    }else{
+        console.log(friend)
+        friend.text = message
+        let time = new Date()
+        friend.date = time.getTime()
+        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+        
+
+        console.log(this.friends)  
+        that.friendsarr = []
+        for(let i in this.friends){
+            that.friendsarr.push(this.friends[i])
+        }
+        sorts(that.friendsarr)
+        let arr = []
+        for(let i in that.friends){
+            arr.push([that.friends[i].uuid,that.friends[i].time,that.friends[i].text,that.friends[i].date,0])
+        }
+        console.log(arr)
+        uni.setStorageSync('imlist',JSON.stringify(arr))
+        this.onFriendListChange(this.friends);
+
+    }
+}
 //发送私聊消息
 IMService.prototype.sendPrivateMessage = function (friendId, message) {