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

common/api/user.js

@@ -392,6 +392,10 @@ export default {
 			sendCommentList() {
 				return vm.$u.post('member/sendCommentList');
 			},
+			// 发现收藏列表
+			articleCollectList() {
+				return vm.$u.post('article/articleCollectList');
+			},
         }
     }
 }

common/store/index.js

@@ -47,6 +47,9 @@ const store = new Vuex.Store({
 			uni.removeStorage({
 				key: "token"
 			})
+			uni.removeStorage({
+				key: "user_info"
+			})
 		},
 		setOrderType(state, type) {
 			state.orderType = type;

components/index/video-item/index.vue

@@ -233,7 +233,6 @@ export default {
 			 uni.navigateTo({
 				url: '/pageB/photo/index?id=' + id
 			});
-
 		},
 	},
 }

components/mine/address-active/index.vue

@@ -49,6 +49,7 @@ export default {
 			area: '', // 详细地址
 			area_id: '', // 地区id 省
 			city_id: '', // 城市id
+			debounce: true,
 		}
 	},
 	props: {
@@ -78,18 +79,20 @@ export default {
 		},
 		//　判断是不是编辑页面 调用接口
 		confirmBtn() {
+			if(!this.debounce) return;
+			this.debounce = false;
 			this.info ? this.editAddress() : this.addAddress();
 		},
-		chooseArea() {
+		// chooseArea() {
-			uni.chooseLocation({
+		// 	uni.chooseLocation({
-				success: function (res) {
+		// 		success: function (res) {
-					console.log('位置名称：' + res.name);
+		// 			console.log('位置名称：' + res.name);
-					console.log('详细地址：' + res.address);
+		// 			console.log('详细地址：' + res.address);
-					console.log('纬度：' + res.latitude);
+		// 			console.log('纬度：' + res.latitude);
-					console.log('经度：' + res.longitude);
+		// 			console.log('经度：' + res.longitude);
-				}
+		// 		}
-			});
+		// 	});
-		},
+		// },
 		// 验证
 		validateValue() {
 			if(this.$u.test.isEmpty(this.name)) {
@@ -134,6 +137,7 @@ export default {
 						back: true,
 					})
 				} else {
+					this.debounce = true;
 					this.showToast(res.message, 'warning');
 				}
 			})
@@ -153,20 +157,13 @@ export default {
 				// latitude,
 			}).then((res)=>{
 				if (res.errCode == 0) {
-					uni.redirectTo({
+					this.$refs.uToast.show({
-						url: '/pageE/more/Address'
+						title: res.message,
-					});
+						type: 'success',
-					// this.$refs.uToast.show({
+						back: true,
-					// 	title: res.message,
+					})
-					// 	type: 'success',
-					// 	// url: '/pageE/more/Address',
-					// 	callback() {
-					// 		uni.redirectTo({
-					// 			url: '/pageE/more/Address'
-					// 		});
-					// 	}
-					// })
 				} else {
+					this.debounce = true;
 					this.showToast(res.message, 'warning');
 				}
 			})

pageA/login/login.vue

@@ -182,10 +182,7 @@
 							console.log(123)
 							me.loginIn(res.data.token); //存储一个字符传值
 							// 缓存用户的信息
-							uni.setStorageSync({ 
+							uni.setStorageSync('user_info',res.data);
-								key: 'user_info',
-								data: res.data
-							});
 							
 							if (res.data.member.has_labels) {
 								uni.switchTab({
@@ -196,7 +193,6 @@
 									url: '/pageA/topick/topick'
 								})
 							}
-							
 						}
 
 						// 存储接口请求所需token

pageB/components/userinfo/index.vue

@@ -98,7 +98,7 @@ export default {
 			this.is_cart = newValue;
 		},
 		comment(newValue,old) {
-			console.log(newValue,old);
+			// console.log(newValue,old);
 			this.is_content = newValue;
 		},
 		deep: true

pageB/photo/index.vue

@@ -22,21 +22,41 @@
 			</view>
         </view>
 		<!-- 用户操作 -->
-        <userinfo class="userinfo" :list="list" :cart="cart_type" :comment="is_comment" @openCart="openCart"></userinfo>
+        <userinfo class="userinfo" :list="list" :cart="cart_type" :comment="is_comment" @openCart="openPopup"></userinfo>
 		<!-- 评论 -->
 		<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="close"></u-icon>
+				<u-icon name="arrow-down" color="#333" size="28" @click="is_comment=false"></u-icon>
 			</view>
 			<scroll-view class="scroll-box" scroll-y="true" >
-				<view></view>
+				<block v-for="(item,index) in commentList" :key="index" v-if="commentList.length">
+					<view class="box">
+						<image :src="item.member_avatar" mode=""></image>
+						<view class="info">
+							<text>{{ item.member_nickname }}</text>
+							<text class="time">{{ item.create_time }}</text>
+						</view>
+						<text class="reply" @click="openKeyInput(item)">回复</text>
+					</view>
+					<view class="content">
+						{{ item.content }}
+					</view>
+				</block>
+				<view class="no-data" v-else>111</view>
 			</scroll-view>
-			<view class="editing">
+			<view class="editing" @click="openKeyInput()">
-				<input type="text" value="" />
+				<input type="text" value="" :placeholder="edit_text" disabled="disabled" />
 				<text>发送</text>
 			</view>
 		</u-popup>
+		<!-- 评论box -->
+		<u-popup v-model="is_edit" mode="bottom" border-radius="10" height="100rpx">
+			<view class="edit-box">
+				<input type="text" :placeholder="edit_text" :focus="is_focus" @focus="focus" v-model="send_value">
+				<text @click="sendComment">发送</text>
+			</view>
+		</u-popup>
 		<!-- 购物车 -->
 		<u-popup v-if="cart_len > 1" class="cart" v-model="cart_type" mode="bottom" length="782" border-radius="20">
 			<view class="top">
@@ -95,6 +115,7 @@
         .item{
             display: flex;
             align-items: center;
+			width: 50%;
             padding: 8rpx 16rpx;
             font-size: 24rpx;
             color: #fff;
@@ -147,6 +168,7 @@
     }
 	.pl {
 		.top {
+			z-index: 1000;
 			position: fixed;
 			top: 0;
 			width: 100%;
@@ -162,8 +184,45 @@
 			}
 		}
 		.scroll-box {
-			margin: 88rpx 0 100rpx 0;
+			z-index: 99;
+			margin: 88rpx 0 150rpx 0;
 			height: 100%;
+			.box {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 20rpx;
+				& > image {
+					width: 60rpx;
+					height: 60rpx;
+					border-radius: 50%;
+					margin-right: 10rpx;
+				}
+				.info {
+					flex: 1;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					height: 60rpx;
+					font-size: 26rpx;
+					color: #333;
+					.time {
+						font-size: 22rpx;
+						color: #999;
+					}
+				}
+				.reply {
+					font-size: 26rpx;
+					color: #333;
+				}
+			}
+			.content {
+				padding: 0 20rpx 10rpx 90rpx;
+				border-bottom: 1px solid #ececec;
+			}
+		}
+		.no-data {
+			margin-top: 100rpx;
 		}
 		.editing {
 			position: fixed;
@@ -172,18 +231,30 @@
 			align-items: center;
 			justify-content: space-between;
 			width: 100%;
-			height: 90rpx;
+			height: 88rpx;
 			padding: 0 30rpx;
-			background-color: #ECECEC;
+			border-top: 1px solid #ececec;
+			background-color: #fff;
 			& > input {
 				width: 80%;
-				height: 60rpx;
+				height: 50rpx;
 				padding: 0 20rpx;
-				border-radius: 30rpx;
+				border-radius: 20rpx;
 				background-color: #fff;
 			}
 		}
 	}
+	// 弹出输入框
+	.edit-box {
+		display: flex;
+		align-items: center;
+		height: 90rpx;
+		& > input {
+			width: 80%;
+			padding: 4rpx 20rpx;
+			border-radius: 20rpx;
+		}
+	}
 	.cart {
 		.top{
 			z-index: 1000;
@@ -293,15 +364,20 @@ export default {
         return {
             list:{},
 			swiper_id: "",
-			cart_type: false,
+			cart_type: false, // 显示购物车
-			is_comment: false,
+			is_comment: false, // 显示评论
+			is_focus: false, // 聚焦
+			is_edit: false, // 输入框
+			send_value: "", // 输入的值
 			cartList: [],
 			cart_len: 0,
+			edit_text: "有爱评论，说点好听的 ~",
+			commentList: [], // 评论
         }
     },
-	onLoad(o){
+	onLoad(option){
-	    this.id = o.id;
+	    this.article_id = option.id;
-	    this.articleInfo(this.id);
+	    this.articleInfo(this.article_id);
 	},
     methods:{
 		// 发现详情
@@ -317,17 +393,47 @@ export default {
 			this.swiper_id = e.detail.current; // 储存swiper id
 		},
 		// 更改购物车状态
-		openCart(data) {
+		openPopup(data) {
-			console.log(data);
-			this.cart_type = data.cart;
-			this.is_comment = data.comment;
-		},
-		hideCart(data) {
 			// console.log(data);
 			this.cart_type = data.cart;
+			this.is_comment = data.comment;
+			if (this.is_comment) {
+				this.getComment(this.article_id,0);
+			}
 		},
-		close() {
+		// 获取评论
-			this.is_comment = false;
+		getComment(id,page) {
+			this.$u.post("article/articleCommentList",{
+				article_id: id,
+				page: page,
+			}).then(res => {
+				console.log(res);
+				if (res.errCode == 0) {
+					this.commentList = res.data;
+				}
+			})
+		},
+		// 打开评论输入
+		openKeyInput(data) {
+			console.log(data);
+			this.is_edit = true;
+			this.is_focus = true;
+		},
+		// 发布评论
+		sendComment(data) {
+			this.$u.post("article/articleAddComment",{
+				article_id: this.article_id,
+				content: this.send_value,
+				pid: data.id,
+				reply_id: data.member_id,
+			}).then(res => {
+				console.log(res);
+				if (res.errCode == 0) {
+					this.is_edit = false;
+				} else {
+					this.$u.toast(res.message);
+				}
+			})
 		},
 		// 预览图片
 		viewImage(e) {
@@ -351,6 +457,11 @@ export default {
 			uni.navigateBack({
 				delta: 1
 			})
+		},
+		focus() {
+			setTimeout(function(){
+				uni.showSoftKeybord;
+			}, 200)
 		}
     },
 }

pageB/triedDress/index.vue

@@ -12,10 +12,10 @@
 			<view class="area" @click="show=true">
 				<label for="address">省市区:</label>
 				<input type="text" id="address" placeholder="" v-model="address" disabled />
-				<view>
+				<!-- <view>
 					<image src="/static/image/mine/24.png"></image>
 					<text>定位</text>
-				</view>
+				</view> -->
 			</view>
 			<view>
 				<label for="area">详细地址:</label>
@@ -78,6 +78,7 @@ export default {
 				minute: true,
 				second: false
 			},
+			debounce: true,
 		}
 	},
 	mounted() {
@@ -127,7 +128,9 @@ export default {
 			this.time = time;
 		},
 		confirmBtn() {
+			if(!this.debounce) return;
 			if(!this.verification()) return false;
+			this.debounce = false;
 			this.$u.api.saveGoodsTry({
 				member_name: this.name,
 				member_mobile: this.phone,
@@ -139,7 +142,6 @@ export default {
 				appointment_time: new Date(this.time),
 			}).then(res => {
 				if (res.errCode == 0) {
-					// this.$u.route({ type: 'navigateBack' });
 					this.$refs.uToast.show({
 						title: res.message,
 						back: true,
@@ -149,6 +151,7 @@ export default {
 						title: res.message,
 						type: 'error',
 					})
+					this.debounce = true;
 				}
 			})
 		},

pageC/cart/index.vue

@@ -54,6 +54,7 @@ export default {
 			checkedAll: false,
 			checkedGoods: [],
 			totalPrice: '0.00',
+			debounce: true,
 		}
 	},
 	watch: {
@@ -74,9 +75,11 @@ export default {
 		}
 	},
 	onPullDownRefresh() {
+		this.debounce = true;
 		this.getCartList();
 	},
 	onShow() {
+		this.debounce = true;
 		this.getCartList();
 	},
 	methods: {
@@ -91,6 +94,8 @@ export default {
 		},
 		// 结算
 		settlementOrder() {
+			if(!this.debounce) return;
+			this.debounce = false;
 			if(!this.checkedGoods.length) return false;
 			// 拼接后端需要的数据形式
 			let id = [], temp = '';
@@ -108,6 +113,9 @@ export default {
 					this.$u.route({
 						url: '/pageC/cart/ConfirmOrder'
 					})
+				} else {
+					this.$u.toast(res.message);
+					this.debounce = true;
 				}
 			})
 		},

pageE/mine/ImageTextCollection.vue

@@ -1,18 +1,78 @@
 <template>
 	<view class="collection">
-		<view class="item-box" v-for="(item, index) in 5" :key="index">
+		<view class="item-box" v-for="(item, index) in articleList" :key="index">
-			<videoItem></videoItem>
+			 <view class="video-item" v-if="item">
+				<image class="head" :src="item.article_pic" v-if="item.type == 1"></image>
+				<view class="header_fist" v-else>
+					<view class="backes"></view>
+					<image class="head" :src="item.article_pic" @click="toDetailsPage(item.article_id)"></image>
+				</view>
+				<view class="title">{{ item.article_title }}</view>
+				<view class="jianjie">{{ item.article_content }}</view>
+				<view class="user">
+					<view class="info">
+						<image :src="item.member_avatar"></image>
+						<text>{{ item.member_nickname }}</text>
+					</view>
+				 	<u-icon name="trash" color="#333" size="36" @click="delArticle(item.article_id)"></u-icon>
+					<!-- <image src="/static/image/common/4.png" @click.stop="showAction(item)"></image> -->
+					<!-- <view class="action" v-if="show == item.article_id">
+						<view class="bubble">
+							<view @click.stop="delArticle(item.article_id)">
+								<image src="/static/image/common/8.png"></image>
+								<text>删除</text>
+							</view>
+						</view>
+					</view> -->
+					<view class="layer" v-if="show == item.article_id" @click.stop="show=-1"></view>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
 <script>
-import videoItem from "@/components/index/video-item/index" 
 export default {
 	data() {
-		return {}
+		return {
+			show: -1,
+			articleList: [],
+		}
+	},
+	onShow() {
+		this.articleCollectList();
+	},
+	// 下拉刷新
+	onPullDownRefresh() {
+       this.articleCollectList();
+    },
+	methods: {
+		showAction(item) {
+			this.show = this.show > 0 ? -1 : item.article_id;
+		},
+		articleCollectList() {
+			this.$u.api.articleCollectList().then(res => {
+				uni.stopPullDownRefresh();
+				if(res.errCode == 0) {
+					this.articleList = res.data;
+				} else {
+					this.articleList = [];
+				}
+			})
+		},
+		delArticle(id) {
+			this.$u.api.articleCollect({ article_id: id }).then(res => {
+				if(res.errCode == 0) {
+					this.articleCollectList();
+				} else {
+					this.$u.toast(res.message);
+				}
+			})
+		},
+		toDetailsPage(id) {
+			 uni.navigateTo({
+				url: '/pageB/photo/index?id=' + id
+			});
 		},
-	components: {
-		videoItem
 	}
 };
 </script>
@@ -26,6 +86,152 @@ export default {
 		&:not(:nth-child(2n)) {
 			margin-right: 20rpx;
 		}
+		.video-item{
+			height: 540rpx;
+			margin-top: 20rpx;
+			width: 335rpx;
+			box-shadow:0 3rpx 7rpx 0 rgba(153, 153, 153, 0.35);
+			padding-bottom: 20rpx;
+			border-radius: 20rpx;
+			overflow: hidden;
+			.head{
+				width: 100%;
+				height: 334rpx;
+			}
+			.title{
+				margin:0 auto;
+				margin-top: 20rpx;
+				font-size: 22rpx;
+				color: #333;
+				font-weight: 500;
+				line-height: 30rpx;
+				width: 300rpx;
+				overflow:hidden; 
+				text-overflow:ellipsis;
+				display:-webkit-box; 
+				-webkit-box-orient:vertical;
+				-webkit-line-clamp:2; 
+			}
+			.jianjie{
+				height: 60rpx;
+				margin:0 auto;
+				margin-top: 20rpx;
+				font-size: 22rpx;
+				color: #666;
+				line-height: 30rpx;
+				width: 300rpx;
+				margin-left: 18rpx;
+				overflow:hidden; 
+				text-overflow:ellipsis;
+				display:-webkit-box; 
+				-webkit-box-orient:vertical;
+				-webkit-line-clamp:2; 
+			}
+			.user{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin:0 auto;
+				margin-top: 20rpx;
+				width: 300rpx;
+				position: relative;
+				.info {
+					display: flex;
+					align-items: center;
+					>image{
+						width: 38rpx;
+						height: 38rpx;
+						border-radius: 50%;
+
+					}
+					>text{
+						font-size: 20rpx;
+						color:#333;
+						margin-left: 9rpx;
+					}
+				}
+				>image{
+					width: 37rpx;
+					height: 8rpx;
+				}
+				.action {
+					z-index: 19;
+					position: absolute;
+					right: 0rpx;
+					bottom: 55rpx;
+					// width: 234rpx;
+					background: rgba(255,255,255,1);
+					box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
+					border-radius: 6rpx;
+					.bubble {
+						position: relative;
+						background-color: #fff;
+						&::after {
+							position: absolute;
+							right: 10rpx;
+							bottom: 0;
+							content: '';
+							width: 60rpx; 
+							height: 40rpx;
+							background-color: inherit;
+							transform: rotate(45deg);
+							margin-top: -10rpx;
+							z-index: -1;
+							box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
+						}
+						> view {
+							padding: 9rpx 12rpx;
+							display: flex;
+							align-items: center;
+							&:not(:last-child) {
+								border-bottom: 2rpx #ECECEC solid;
+							}
+							@mixin image-class($width, $height, $right) {
+								width: $width;
+								height: $height;
+								margin-right: $right;
+							}
+							> image {
+								&:first-child {
+									@include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
+								}
+								&:nth-child(2) {
+									@include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx);
+								}
+								&:last-child {
+									@include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx);
+								}
+							}
+							> text {
+								font-size: 20rpx;
+								color: rgba(51,51,51,1);
+							}
+						}
+					}
+				}
+				.layer {
+					position: fixed;
+					top: 0;
+					left: 0;
+					width: 100%;
+					height: 100%;
+					z-index: 9;
+					background-color: transparent;
+				}
+			}
+			.header_fist{
+				position: relative;
+				.backes{
+					position: absolute;
+					top: 0;
+					background: rgba(0,0,0,0.6);
+					width: 100%;
+					height: 100%;
+					color: #fff;
+				}
+				
+			}
+		}
 	}
 }
 </style>

pageE/more/AfterSalesHelp.vue

@@ -17,6 +17,9 @@ export default {
 	},
 	onLoad() {
 		this.getPolicyList();
+	},
+	onPullDownRefresh() {
+        this.getPolicyList();
     },
 	methods: {
 		getPolicyList () {
@@ -24,6 +27,7 @@ export default {
 			    page: this.page,
 			    tid: 2 // 1:使用帮助列表 2: 售后政策列表
 			}).then((res)=>{
+				uni.stopPullDownRefresh();
 				if (res.errCode == 0) {
 					this.policyList = res.data.helpList;
 				}

pageE/tool/Manicure.vue

@@ -96,7 +96,7 @@ export default {
 		},
 		tabsChange(index) {
 			this.swiperCurrent = index;
-			this.toApplyPage(index);
+			// this.toApplyPage(index);
 		},
 		animationfinish(e) {
 			let current = e.detail.current;

pages.json

@@ -109,16 +109,7 @@
 						"navigationBarTitleText": "商品详情",
 						"app-plus":{
 							"titleNView":{
-								"backgroundColor":"#ffffff",
+								"backgroundColor":"#ffffff"
-								"buttons": [
-									{
-										"type":"none",
-										"text":"\ue636",
-										"float":"right",
-										"fontSize":"18",
-										"fontSrc": "/static/fonts/cart.ttf"
-									}
-								]
 							}
 						}
 					}
@@ -140,16 +131,7 @@
 						"navigationBarTitleText": "商品评价",
 						"app-plus":{
 							"titleNView":{
-								"backgroundColor":"#ffffff",
+								"backgroundColor":"#ffffff"
-								"buttons": [
-									{
-										"type":"none",
-										"text":"\ue636",
-										"float":"right",
-										"fontSize":"18",
-										"fontSrc": "/static/fonts/cart.ttf"
-									}
-								]
 							}
 						}
 					}
@@ -214,8 +196,10 @@
 					"path": "photo/index",
 					"style": {
 						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
+						"navigationStyle": "custom",
-						
+						"app-plus": {
+							"softinputMode": "adjustResize"
+						}
 					}
 				}
 			]
@@ -253,7 +237,6 @@
 				{
 					"path": "cart/index",
 					"style": {
-						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "购物车",
 						"app-plus": {
 							"titleSize": "36px",
@@ -621,7 +604,6 @@
 				{
 					"path": "tool/Manicure",
 					"style": {
-						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "美甲",
 						"app-plus": {
 							"titleSize": "36px",
@@ -658,19 +640,6 @@
 						}
 					}
 				},
-				{
-					"path": "tool/washComment",
-					"style": {
-						"navigationBarTitleText": "送洗评价",
-						"app-plus": {
-							"titleSize": "36px",
-							"titleNView": {
-								"titleColor": "#333333",
-								"backgroundColor": "#FFFFFF"
-							}
-						}
-					}
-				},
 				{
 					"path": "tool/WashOrder",
 					"style": {
@@ -700,6 +669,7 @@
 				{
 					"path": "mine/ImageTextCollection",
 					"style": {
+						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "图文收藏",
 						"app-plus": {
 							"titleSize": "36px",
@@ -863,7 +833,6 @@
 				{
 					"path": "order/Index",
 					"style": {
-						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "我的订单",
 						"app-plus": {
 							"titleSize": "36px",
@@ -877,7 +846,6 @@
 				{
 					"path": "order/Details",
 					"style": {
-						"enablePullDownRefresh": true,
 						"navigationBarTitleText": "订单详情",
 						"app-plus": {
 							"titleSize": "36px",
@@ -937,7 +905,6 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -961,7 +928,6 @@
 		{
 			"path": "pages/mine/index",
 			"style": {
-				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "我的",
 				"app-plus": {
 					"titleSize": "36px",

pages/index/index.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="status_bar"></view>
 		<view class="index">
-			<navigator url="/pageB/photo/index?id=28">qqq</navigator>
+			<navigator url="/pageB/photo/index?id=28">bbb</navigator>
 			<view class="top">
 				<view class="sosuo"></view>
 				<view class="tabs">
@@ -34,7 +34,6 @@
 								</view>
 							</view>
 						</view>
-					</view>
 					</scroll-view>
 				</swiper-item>
 				<swiper-item>
@@ -43,13 +42,15 @@
 							<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
 							<view class="list">
 								<view>
-								<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :rid="item.chatroom_id" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
+									<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :rid="item.chatroom_id"
+									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
 								</view>
 								<view style="margin-left:20rpx">
-								<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :zid="item.live_id" :rid="item.chatroom_id" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
+									<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :zid="item.live_id" :rid="item.chatroom_id"
+									 :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
+								</view>
 							</view>
 						</view>
-
 					</scroll-view>
 				</swiper-item>
 				<swiper-item>
@@ -293,20 +294,33 @@
 			clickFImage(index) {
 				const item = this.indexImageSwiper[index];
 				console.log(item);
-				this.activityLink({ type: item.url_type, id: item.info_id });
+				this.activityLink({
+					type: item.url_type,
+					id: item.info_id
+				});
 			},
 			clickSImage(index) {
 				const item = this.zhiboImageSwiper[index];
 				console.log(item);
-				this.activityLink({ type: item.url_type, id: item.info_id });
+				this.activityLink({
+					type: item.url_type,
+					id: item.info_id
+				});
 			},
-			activityLink({ type, id }) {
+			activityLink({
+				type,
+				id
+			}) {
 				if (type == 0) return false;
 				// type 1 商品详情页, 2 店铺详情页
 				const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
-				let params = { id: id };
+				let params = {
+					id: id
+				};
 				// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
-				if(type == 1) Object.assign(params, { type: 1 });
+				if (type == 1) Object.assign(params, {
+					type: 1
+				});
 				this.$u.route({
 					url: url,
 					params: params

pages/mine/index.vue

@@ -158,10 +158,10 @@ export default {
     methods: {
 		getUserInfo() {
 			this.$u.api.getMemberInfo().then(res => {
+				uni.stopPullDownRefresh();
 				if (res.errCode == 0) {
 					// this.userInfo = res.data.MemberArray;
 					this.$set(this, 'userInfo', res.data.MemberArray);
-					uni.stopPullDownRefresh();
 				}
 			})
 		},

static/js/common.js

@@ -66,6 +66,6 @@ const common = {
 		if(format) result = hours + format + minutes + format + seconds;
 		else result = hours + ':' + minutes + ':' + seconds;
 		return result;
-	}
+	},
 }
 export default common