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

components/index/video-item/index.vue

@@ -6,7 +6,7 @@
                 <u-icon name="play-circle-fill" color="#ffffff" size="20"></u-icon>
                 <text>视频</text>
             </view>
-			<image class="head" :src="item.article_pic"></image>
+			<image class="head" :src="item.article_pic"  mode="aspectFill"></image>
 		</view>
         <view class="title" v-if="">{{ item.article_title }}</view>
         <view class="jianjie">{{ item.article_content }}</view>
@@ -103,7 +103,7 @@
             }
         }
         >image{
-            width: 37rpx;
+            width: 35rpx;
             height: 8rpx;
             padding: 20rpx;
         }

components/informations/notice/notice.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="notice">
+	<view class="notice" :style="{height : height  + 'px'}">
 		<view v-for="(item,index) in notice" :key="index"  @click="gotoInfo(index)">
 			<view class="time_notice">{{ item.addtime }}</view>
 			<view class="notice_view">
@@ -36,6 +36,7 @@
 			margin: 0 auto;
 			text-align: left;
 			line-height: 40rpx;
+			letter-spacing: 2rpx;
 		}
 		.notice_view > view:nth-child(3){
 			height: 84rpx;
@@ -77,7 +78,8 @@
         props: ['list'],
 		data() {
 			return {
-				notice : []
+				notice : [],
+				height : ''
 			};
 		},
         watch: {
@@ -86,6 +88,8 @@
                 this.notice = newVal;
             }
         },
+		onLoad() {
+		},
         methods: {
             gotoInfo(index) {
                 console.log(index);

components/shop/group/index.vue

@@ -13,7 +13,7 @@
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 340rpx;">
 			<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
 				<!-- 最多显示3个 -->
-				<view v-if="groupList[i]">
+				<view v-if="groupList[i]" class="group-container">
 					<sitem :info="info" v-for="(info, index) in groupList[i].slice(0, 3)" :key="index"></sitem>
 				</view>
 				<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList[i] || !groupList[i].length" style="margin: 0 auto;"></u-empty>
@@ -61,7 +61,7 @@ export default {
 				gc_id: id,
 			}).then(res => {
 				this.groupList[this.current] = res.data;
-				// console.log(this.groupList);
+				console.log(this.groupList);
 				this.$forceUpdate();
 			})
 		},
@@ -105,6 +105,7 @@ export default {
     .list {
 		box-sizing: border-box;
 		padding: 0 30rpx;
+		.group-container {
 			display: flex;
 			> view {
 				&:not(:nth-child(3n)) {
@@ -113,4 +114,5 @@ export default {
 			}
 		}
     }
+}
 </style>

components/shop/special-shop/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="special">
 		<view v-if="type == 'spike'" @click="spikeGoods">
-			<image :src="item.groupbuy_image1"></image>
+			<image :src="item.groupbuy_image1" mode="aspectFill"></image>
 			<view class="right">
 				<view class="name u-line-1">{{ item.goods_name }}</view>
 				<view class="price">

pageB/components/userinfo/index.vue

@@ -75,7 +75,7 @@
         /* #endif */
         align-items: center;
         flex-direction: column;
-        padding: 0 30rpx;
+        // padding: 0 30rpx;
     }
 
     .operat-span {

pageB/photo/index.vue

@@ -158,13 +158,16 @@
 			display: flex;
 			flex-wrap: wrap;
 			.label {
-				padding: 6rpx 10rpx;
+				height: 40rpx;
-				margin: 0 10rpx 10rpx 0;
+				padding: 4rpx 14rpx;
-				font-size: 24rpx;
+				margin-right: 10rpx;
+				margin-bottom: 10rpx;
+				font-size: 26rpx;
+				text-align: center;
+				line-height: 38rpx;
 				color: #fff;
-				border-radius: 6rpx;
+				border-radius: 10rpx;
-				background-color: #000000;
+				background-color: rgba(0, 0, 0, .6);
-				opacity: 0.5;
 			}
 		}
     }

pageB/video/video.nvue

@@ -631,6 +631,7 @@
         font-size: 28rpx;
         color: #333;
         lines: 2;
+		letter-spacing: 2rpx;	
     }
 
     .more-content-box {
@@ -859,6 +860,7 @@
         margin-bottom: 20rpx;
         lines: 1;
         text-overflow: ellipsis;
+		letter-spacing: 2rpx;
     }
 
     .centent {

pageC/cart/ConfirmOrder.vue

@@ -309,17 +309,7 @@ export default {
 		},
 		setTotalPrice() {
 			const goods = this.orderInfo.store_goods_total;
-			// console.log(this.freight);
+			let [freight, price, minPrice] = [0, 0, 0];
-			let freight = 0, price = 0;
-			// 商品价格加上运费
-			// [goods, freight].forEach(object => {
-			// 	for (const key in object) {
-			// 		if (object.hasOwnProperty(key)) {
-			// 			const element = object[key];
-			// 			price += Number(element);
-			// 		}
-			// 	}
-			// })
 			// 运费
 			for (const key in this.freight) {
 				if (this.freight.hasOwnProperty(key)) {
@@ -327,28 +317,38 @@ export default {
 					freight += Number(element);
 				}
 			}
-			// 商品价格
+			// 商品价格减去优惠券
-			for (const key in goods) {
+			// 店铺
-				if (goods.hasOwnProperty(key)) {
+			for (const gid in goods) {
-					const element = goods[key];
+				if (goods.hasOwnProperty(gid)) {
-					price += Number(element);
+					// 计算最小价格
+					minPrice += 0.01;
+					// 每个店铺所有商品的价格
+					let sprice = Number(goods[gid]);
+					if(JSON.stringify(this.storeCoupon) != '{}') {
+						for (const cid in this.storeCoupon) {
+							if (this.storeCoupon.hasOwnProperty(cid)) {
+								const cprice = this.storeCoupon[cid];
+								// 商品减去优惠券价格
+								if(gid == cid) {
+									sprice -= cprice.voucher_price;
+									// 每个店铺最低付款 0.01
+									if(sprice <= 0) sprice = 0.01;
+								}
+							}
+						}
+					}
+					// 所有商品总价
+					price += sprice;
 				}
 			}
-			// 减去优惠券
 			// 平台
 			if(JSON.stringify(this.choiceCoupon) != '{}') price -= Number(this.choiceCoupon.voucher_price);
-			// 店铺
+			// 每个店铺最低付款 0.01
-			if(JSON.stringify(this.storeCoupon) != '{}') {
+			if(price <= minPrice) price = minPrice;
-				for (const key in this.storeCoupon) {
+			// console.log("minPrice" + minPrice);
-					if (this.storeCoupon.hasOwnProperty(key)) {
+			// console.log("freight:" + freight);
-						const element = this.storeCoupon[key];
+			// console.log("price:" + price);
-						price -= element.voucher_price;
-					}
-				}
-			}
-			// 最低付款 0.01
-			if(price <= 0) price = 0.01;
-			// console.log(price);
 			this.totalPrice = (price + freight).toFixed(2);
 		},
 		setDelivery(index) {

pageC/components/merchant/list-item.vue

@@ -3,6 +3,7 @@
         <!-- <video  :src="url" :show-fullscreen-btn="true"></video> -->
 		<view v-if="type == '2'" class="video-container">
 			<image :src="url" mode="aspectFill" class="video"></image>
+			<view class="backs"></view>
 			<image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
 		</view>
         <image v-else :src="url" mode="aspectFill"></image>
@@ -27,6 +28,15 @@
 			width: 100%;
         	height: 100%;
 		}
+		.backs {
+			width: 100%;
+        	height: 100%;
+			position: absolute;
+			top: 0;
+			right: 0;
+			background-color: rgba($color: #000000, $alpha: 0.35);
+			z-index: 9;
+		}
 		.play-video {
 			position: absolute;
 			width: 100rpx;

pageC/components/merchant/video-top.vue

@@ -1,6 +1,7 @@
 <template>
     <view class="videoTop">
 		  <image :src="url" mode="aspectFill" class="video"></image>
+		  <view class="backs"></view>
 		  <image src="/static/videoPlay.png" mode="aspectFill" class="play-video"></image>
     </view>
 </template>
@@ -15,6 +16,15 @@
         width: 100%;
         height: 100%;
 		z-index: 9;
+    }
+	.backs {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.35);
+		z-index: 9;
 	}
 	.play-video {
 		position: absolute;

pageD/activity/activity.vue

@@ -81,7 +81,7 @@
 		padding: 39rpx 0 30rpx;
 	}
 	.content{
-		width:630rpx;
+		width:94%;
 		padding: 30rpx;
 		background:rgba(255,255,255,1);
 		border-radius:20rpx;

pageD/notice/notice.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view id="viewes" :style="{height : height  + 'px'}">
 		<!-- 公告咨询 -->
 		<notice :list="list"></notice>
 	</view>
@@ -15,6 +15,13 @@
 		},
 		onLoad() {
 			this.informationList();
+			var _that = this
+			uni.getSystemInfo({
+			    success: function (res) {
+			        console.log(res.windowHeight);
+					_that.height = res.windowHeight
+			    }
+			});
 		},
 		methods: {
 			titletext() {},
@@ -36,7 +43,9 @@
 	page {
 		background-color: #ECECEC;
 	}
-
+	#viewes{
+		background: #ECECEC;
+	}
 	.sousuo {
 		height: 113rpx;
 		border: 1px #f00 solid;

pageD/privateChat/privateChat.vue

@@ -59,7 +59,7 @@
 				<div :class="[audio.visible ? 'record-icon record-open':'record-icon']" @click="switchAudioKeyboard"></div>
 				<div class="record-input" @longpress="onRecordStart" @touchend="onRecordEnd" v-if="audio.visible" >{{audio.recording ? '松开发送' : '按住录音'}}</div>
 				<div class="message-input" v-else>
-					<input type="text" placeholder="发送消息" v-model="content">
+					<input type="text" placeholder="发送消息" v-model="content" @click="bindtapInput">
 				</div>
 				<div class="file-icon img-video" @click="sendImage"></div>
 				<div class="file-icon" @click="sendVideo"></div>
@@ -84,6 +84,7 @@
 			return {
 				//聊天文本框
 				content: '',
+				bottom : '',
 				friend: null,
 				currentUser: null,
 				//已经接收到的消息
@@ -154,6 +155,11 @@
 			this.imService.resetFriendUnReadMessage(this.friend);
 		},
 		methods: {
+			bindtapInput(){
+				console.log("222")
+				var _that = this;
+				_that.bottom = 14
+			},
 			initialListeners () {
 				//传入监听器，收到一条私聊消息总是滚到到页面底部
 				this.imService.onNewPrivateMessageReceive =  (friendId, message)=> {

pageE/setting/version.vue

@@ -12,8 +12,8 @@
 			</view>
 			<view class="version-view">
 				<text class="title">版本更新</text>
-				<text class="tips" v-if="0">已是最新版本</text>
+				<text class="tips" v-if="1">已是最新版本</text>
-				<text class="tips" v-else @click="updateVersion">1.1.10</text>
+				<text class="tips" v-else @click="updateVersion">发现新版本</text>
 			</view>
 		</view>
 	</view>

pageE/tool/MineCoupon.vue

@@ -61,6 +61,7 @@ export default {
 			})
 		},
 		async getMemberCouponList({ load = 'reload' }) {
+			if(load == 'reload') this.page = 0;
 			const res = await this.$u.api.getMemberCouponList({
 				status: this.current + 1, // 代金券状态 1:未用 2:已用 3:过期 4:收回
 				page: this.page,

pages/mine/index.vue

@@ -54,7 +54,9 @@
 					<view v-for="(item, index) in orderList" :key="index" @click="toOtherPage(item.link)">
 						<image :src="item.img"></image>
 						<view>{{ item.title }}</view>
-						<view class="order-num" v-if="item.number">{{ item.number }}</view>
+						<view class="order-num" v-if="item.number">
+							<text>{{ item.number }}</text>
+						</view>
 					</view>
 					<!-- <view @click="toOtherPage('/order/Index?current=1')">
 						<image src="/static/image/mine/6.png"></image>
@@ -179,7 +181,7 @@ export default {
 				{
 					name: 'wait_evaluation',
 					title: '待评价',
-					img: '/static/image/mine/3.png',
+					img: '/static/image/mine/40.png',
 					link: '/order/Index?current=6',
 					number: '',
 				},
@@ -209,7 +211,7 @@ export default {
 		this.getOrderNumber();
 	},
 	onNavigationBarButtonTap(e) {
-		console.log(e);
+		// console.log(e);
 		if(e.index == 0) this.$u.route('/pageE/setting/Index');
 	},
     methods: {
@@ -237,7 +239,7 @@ export default {
 			})
 		},
 		toOtherPage(url) {
-			console.log(url);
+			// console.log(url);
 			uni.navigateTo({
 				url: '/pageE' + url
 			});
@@ -411,10 +413,14 @@ export default {
 					justify-content: space-between;
 					position: relative;
 					.order-num{
-						z-index: 9;
 						position: absolute;
 						top: -12rpx;
-						right: -16rpx;
+						right: -38rpx;
+						width: 50rpx;
+					}
+					.order-num > text {
+						z-index: 9;
+						float: left;
 						border: 1rpx solid #FF7807;
 						height: 24rpx;
 						border-radius: 12rpx;
@@ -441,7 +447,7 @@ export default {
 					@include image-size($image-width: 35rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(5){
-					@include image-size($image-width: 37rpx, $image-height: 37rpx);
+					@include image-size($image-width: 43rpx, $image-height: 35rpx);
 				}
 				> view:nth-child(6){
 					@include image-size($image-width: 33rpx, $image-height: 35rpx);