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

Merge pull request 'gdpaomg1' (#153 ) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/153
2020-08-11 14:20:12 +08:00 · 2020-08-11 11:13:04 +08:00 · 2020-08-11 11:12:32 +08:00 · 2020-08-11 10:45:10 +08:00 · 2020-08-11 10:36:48 +08:00 · 2020-08-11 10:36:18 +08:00
38 changed files with 838 additions and 123 deletions
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -339,7 +339,11 @@ export default {
 					page,
 					name_search: name_search
 				})
-			}
+			},
+			// 是否弹出新人优惠券
+			isNewmembervoucher() {
+				return vm.$u.post('Coupon/isNewmembervoucher')
+			},
        }
    }
    
--- a/common/http.interceptor.js
+++ b/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: "您还未登录，请立即登录",
--- a/components/index/video-item/index.vue
+++ b/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");
 				}
 			})
 		},
--- a/components/informations/notice/notice.vue
+++ b/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>
--- a/components/remaining/remaining.vue
+++ b/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;
--- a/pageA/register/register.vue
+++ b/pageA/register/register.vue
@@ -152,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'
                        })
                    }
 				})
--- a/pageB/components/userinfo/index.vue
+++ b/pageB/components/userinfo/index.vue
@@ -46,8 +46,8 @@
        /* #ifndef APP-PLUS-NVUE */
        display: flex;
        /* #endif */
-        position: relative;
        align-items: center;
+        padding-bottom: 20rpx;
    }

    .avatar {
@@ -60,6 +60,7 @@
    }

    .follow {
+        z-index: 100;
        position: absolute;
        top: 90rpx;
        left: 40rpx;
@@ -67,7 +68,7 @@
        height: 36rpx;
        text-align: center;
        line-height: 36rpx;
-        font-size: 36rpx;
+        font-size: 34rpx;
        border-radius: 50%;
        color: #fff;
        background-color: #FF780F;
@@ -148,7 +149,7 @@
                            this.is_follow = !this.is_follow;
                            console.log(this.is_follow);
                            uni.showToast({
-                                title: res.data.data.message,
+                                title: res.data.message,
                                icon: "none"
                            })
                        }
--- a/pageB/coupon/details.vue
+++ b/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>
--- a/pageB/follow/index.vue
+++ b/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'
 			})
 		},
 	},
--- a/pageB/photo/index.vue
+++ b/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">
@@ -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;
@@ -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,
--- a/pageB/sdetails/index.vue
+++ b/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>
@@ -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>
@@ -273,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)=>{
@@ -347,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;
+						}
+					}
 				})
 			})
 		},
@@ -378,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;
@@ -495,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({
@@ -502,6 +520,7 @@ export default {
 					})
 				} else {
 					this.debounce = true;
+                    this.$u.toast(res.message);
 				}
 			})
 		},
@@ -536,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];
 		},
--- a/pageB/search/out.vue
+++ b/pageB/search/out.vue
@@ -80,11 +80,11 @@ export default {
 		this.value = option.value;
 		this.setViewHeight();
 		this.ShopSearch()
-		this.setNavSearchInput();
+		this.setNavSearchInput(this.value);
 	},
 	onNavigationBarSearchInputConfirmed(value) {
 		this.value = value.text
-		console.log(this.value)
+		// console.log(this.value)
 		this.ShopSearch()
 	},
 	methods: {
--- a/pageB/video/video.nvue
+++ b/pageB/video/video.nvue
@@ -1,14 +1,14 @@
 <template>
    <view>
-        <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>
+        <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-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">
+        <cover-view class="info-box" @click="stopClick">>
            <view class="video-info-box">
                <image class="image-play" src="../../static/videoIcon.png" mode=""></image>
                <text class="video-slip">视频</text>
@@ -29,11 +29,46 @@
                </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
@@ -46,13 +81,17 @@
                cart_type: false, // 显示购物车
                is_comment: false, // 显示评论
                comment_num: 0, // 评论数
+                page: 0,
+                commentList: [], // 评论列表
                src: "",
                is_play: true,
                time_count: 0,
                linear: null,
+                loadinging: false,
            };
        },
        onLoad(option) {
+            this.article_id = option.id;
            this.getVideoInfo(option.id);
            this.getInfo();
        },
@@ -63,7 +102,7 @@
            // 获取信息
            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
@@ -89,6 +128,52 @@
                    }
                })
            },
+            // 获取评论
+            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"	
+                            })	
+                        }	
+                    }	
+                })	
+            },
            // 获取手机信息
            getInfo() {
                uni.getSystemInfo({
@@ -103,8 +188,7 @@
            // 播放
            playing(e) {
                // console.log(e);
-                if (e.type == "play") {
-                }
+                if (e.type == "play") {}
            },
            // 暂停
            stoping() {
@@ -125,6 +209,32 @@
                // 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({
                    delta: 1
@@ -180,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;
@@ -235,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>
--- a/pageC/cart/ConfirmOrder.vue
+++ b/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);
 			}
--- a/pageC/merchant/goods.vue
+++ b/pageC/merchant/goods.vue
@@ -109,7 +109,7 @@ 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() {
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -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,43 @@ 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', {
--- a/pageE/mine/EditUserInfo.vue
+++ b/pageE/mine/EditUserInfo.vue
@@ -98,7 +98,7 @@ export default {
 	},
 	onNavigationBarButtonTap(e) {
 		if( e.index == 0 ) uni.navigateBack();
-		if( e.index == 1 ) this.customers();
+		// if( e.index == 1 ) this.customers();
 	},
 	methods: {
 		customers(){
--- a/pageE/mine/Integral.vue
+++ b/pageE/mine/Integral.vue
@@ -46,7 +46,7 @@ export default {
 			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);
 				}
 			})
 		},
--- a/pageE/mine/MineConcerns.vue
+++ b/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({
--- a/pageE/order/Details.vue
+++ b/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;
--- a/pageE/tool/WashOrder.vue
+++ b/pageE/tool/WashOrder.vue
@@ -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 => {
@@ -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;
--- a/pages.json
+++ b/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": {
--- a/pages/index/index.vue
+++ b/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,11 +27,11 @@
 							<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 class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
@@ -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,42 @@
        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>
@@ -237,7 +286,10 @@
                    loadmore: '轻轻上拉',
                    loading: '努力加载中',
                    nomore: '实在没有了'
-                }
+				},
+				showCoupon: false,
+				newMemberCoupon: {},
+				exchangestate:false
 			}
 		},
 		components: {
@@ -247,6 +299,10 @@
 			darenItem
 		},
 		onShow() {
+			// 页面返回,页面登陆的情况下检查是否显示领取优惠卷优惠券弹窗
+			if(this.exchangestate==true){
+				this.isNewmembervoucher()
+			}
            this.articleList = [];
            this.page = 0;
 			this.getArticlelist();
@@ -254,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)
@@ -296,7 +353,6 @@
 				this.$u.api.attentionMember({
 					member_id: member_id
 				}).then((res) => {
-					console.log(res);
                    this.follow_page = 0;
 					this.getRecommendList(); // 关注列表
                    this.getFollowList(); // 刷新发现的列表
@@ -312,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";
@@ -328,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(); // 推荐达人
+                    }
                }
 			},
            // 发现别表
@@ -359,6 +418,12 @@
                    }
 				})
 			},
+            // 屏蔽更新列表
+            updateList() {
+                console.log(111);
+                this.page = 0;
+                this.getArticlelist();
+            },
            // 发现下拉加载
            swiperBottom(e) {
                this.getArticlelist();
@@ -384,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 {
@@ -445,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
+				});
 			}
 		},
 	}
--- a/pages/information/information.vue
+++ b/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",
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -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')">
@@ -250,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;
 				}
@@ -275,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;
@@ -290,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;
@@ -329,6 +334,7 @@ export default {
 				}
 			}
 			.content {
+                align-items: center;
 				justify-content: space-between;
 				> view {
 					display: flex;
@@ -337,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);
 				}
 			}
 		} 
--- a/pages/zhibo/index.nvue
+++ b/pages/zhibo/index.nvue
@@ -24,7 +24,7 @@
    <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">{{$store.state.hasLogin ？ '想说点什么' : '请先登录'}}</text>
+      <text style="font-size:26rpx;color:#fff;margin-left:20rpx">{{ $store.state.hasLogin ? '想说点什么' : '请先登录'}}</text>
    </view>
    <image class="liketap" src="../../static/like.png" @click="">

--- a/static/image/common/21.png
+++ b/static/image/common/21.png
--- a/static/image/common/22.png
+++ b/static/image/common/22.png
--- a/static/image/common/23.png
+++ b/static/image/common/23.png
--- a/static/image/common/24.png
+++ b/static/image/common/24.png
--- a/static/image/common/25.png
+++ b/static/image/common/25.png
--- a/static/image/common/26.png
+++ b/static/image/common/26.png
--- a/static/image/common/27.png
+++ b/static/image/common/27.png
--- a/static/image/common/28.png
+++ b/static/image/common/28.png
--- a/static/image/common/29.png
+++ b/static/image/common/29.png
--- a/static/image/common/30.png
+++ b/static/image/common/30.png
--- a/static/image/mine/38.png
+++ b/static/image/mine/38.png
--- a/static/imservice.js
+++ b/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){
@@ -537,7 +538,9 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
                friend.text = message
                let time = new Date()
                friend.date = time.getTime()
-                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){
@@ -561,7 +564,9 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
        friend.text = message
        let time = new Date()
        friend.date = time.getTime()
-        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){
Author	SHA1	Message	Date
cmxdd	5e0162e3ea	Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into cmx	2020-08-11 14:20:12 +08:00
gyh	20259ddf00	Merge pull request 'gdpaomg1' (#153 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/153	2020-08-11 11:13:04 +08:00
Gdpao	703689d272	gdpaomg1	2020-08-11 11:12:32 +08:00
cmxdd	282502a8d6	优惠券弹窗不关闭	2020-08-11 10:45:10 +08:00
gyh	6c724d4f4c	Merge pull request 'gdpaoup' (#152 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/152	2020-08-11 10:36:48 +08:00
Gdpao	b3a7b2d032	Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into gyh	2020-08-11 10:36:18 +08:00
Gdpao	b34ac35821	gdpaoup	2020-08-11 10:35:01 +08:00
luyuan	def8f0cf1b	Merge pull request 'xbx' (#151 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/151	2020-08-11 10:26:19 +08:00
luyuan	6984ea9374	消息	2020-08-11 10:25:41 +08:00
hansu	39b2749ac9	Merge pull request 'zhy' (#150 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/150	2020-08-11 10:23:43 +08:00
ghusermoon	c01470b52d	fixing bug 8.11	2020-08-11 10:23:04 +08:00
ghusermoon	6e900dcd3b	Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy	2020-08-11 10:10:13 +08:00
ghusermoon	7956517c4a	solve bug 8.11	2020-08-11 10:06:51 +08:00
gyh	43e15cc4a7	Merge pull request 'gdpao' (#149 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/149	2020-08-11 10:04:46 +08:00
Gdpao	e1c908152a	gdpao	2020-08-11 10:04:25 +08:00
Gdpao	aad2bca5c6	gdpao	2020-08-11 10:00:06 +08:00
hansu	f79db4aa62	Merge pull request 'fixed bug 8.11' (#147 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/147	2020-08-11 09:46:49 +08:00
ghusermoon	4739ef71a9	fixed bug 8.11	2020-08-11 09:46:05 +08:00
luyuan	a22b3fba71	图片	2020-08-11 09:36:03 +08:00
gyh	003bc07c6b	Merge pull request 'gdpao' (#146 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/146	2020-08-10 19:19:54 +08:00
Gdpao	e6f73f01cd	gdpao	2020-08-10 19:19:29 +08:00
gyh	52bce327cc	Merge pull request 'gdpaoup' (#145 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/145	2020-08-10 19:08:19 +08:00
Gdpao	74fcc50696	gdpaoup	2020-08-10 19:06:47 +08:00
hansu	33b0137c06	Merge pull request 'zhy' (#144 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/144	2020-08-10 17:47:31 +08:00
ghusermoon	7c05459daf	send wash 8.9	2020-08-10 17:46:57 +08:00
luyuan	610d012e67	Merge pull request 'xbx' (#143 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/143	2020-08-10 17:39:14 +08:00
ghusermoon	8c3121d5ed	new member 8.9	2020-08-10 17:38:54 +08:00