commit -m 优惠券

components/cm-module/creatOrder/coupon.vue

@@ -50,7 +50,7 @@
 										</view>
 									</view>
 								</view>
-								<view class="list-cell-time">{{ coupon.endDate }}</view>
+								<view class="list-cell-time">{{ coupon.startDate }} - {{ coupon.endDate }}</view>
 							</view>
 						</view>
 					</scroll-view>

components/cm-module/creatOrder/sellerCoupon.vue

@@ -50,7 +50,7 @@
 										</view>
 									</view>
 								</view>
-								<view class="list-cell-time">{{ coupon.endDate }}</view>
+								<view class="list-cell-time">{{ coupon.startDate }} - {{ coupon.endDate }}</view>
 							</view>
 						</view>
 					</scroll-view>

pages/login/bindOperator.vue

@@ -83,7 +83,7 @@
 	export default{
 		data() {
 			return{
-				wxUserInfo:'',			//储存用户微信信息
+				wxUserInfo:{},			//储存用户微信信息
 				bindLinkName:'',  		//用户姓名
 				bindMobile:'',  		//用户手机号
 				mobildeCode:'',  		//手机验证码

pages/seller/order/create-order.vue

@@ -111,7 +111,7 @@
 								<text v-if="ExchangeCouponData.couponType == 3">仅限购买店铺【{{ ExchangeCouponData.shopName }}】的商品</text>
 								<text v-if="ExchangeCouponData.couponType == 4 || ExchangeCouponData.couponType == 2">全商城商品通用</text>
 							</view>
-							<view class="list-cell-time">有效期：{{ ExchangeCouponData.endDate }}</view>
+							<view class="list-cell-time">有效期：{{ ExchangeCouponData.startDate  }} - {{ ExchangeCouponData.endDate }}</view>
 						</view>
 					</view>
 					<view class="coupon-btn" @click.stop="handleClickCancel">立即收下</view>

pages/supplier/user/my-shop.vue

@@ -45,6 +45,7 @@
 								<text class="mclap" :class="prop.beautyActFlag =='1' ? 'indent' : ''">{{ prop.name }}</text>
 							</view>
 							<view class="floor-item-act">
+								<view class="coupon-tags" v-if="prop.couponsLogo">优惠券</view>
 								<template v-if="userIdentity === 3">
 									<template v-if="prop.actStatus===1">
 										<view class="floor-tags" v-if="PromotionsFormat(prop.promotions)">
@@ -146,6 +147,7 @@
 								<text class="mclap" :class="prop.priceFlag =='1' ? 'indent' : ''">{{isInterceptHtmlFn(prop.name)}}</text>
 							</view>
 							<view class="floor-item-act">
+								<view class="coupon-tags" v-if="prop.couponsLogo">优惠券</view>
 								<template v-if="userIdentity === 3">
 									<template v-if="prop.actStatus===1">
 										<view class="floor-tags" v-if="PromotionsFormat(prop.promotions)">
@@ -375,9 +377,11 @@
 						productIds:productIds,
 						source: 2
 					}
-				).then(response =>{
+				)
+				.then(response =>{
 					this.recommendList = this.ReturnNewProducts(data,response.data);
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
@@ -388,10 +392,18 @@
 					productIdArr.push(item.productId)
 				})
 				productIds = productIdArr.join(",");
-				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:productIds}).then(response =>{
+				this.ProductService.querySearchProductPrice(
+					{
+						userId: this.userID,
+						productIds:productIds,
+						source: 2
+					}
+				)
+				.then(response =>{
 					this.productList = this.ReturnNewProducts(data,response.data);
 					console.log('合并价格后',this.productList)
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
@@ -690,19 +702,35 @@
 					box-sizing: border-box;
 					padding: 16rpx 0;
 					margin-top: 8rpx;
-				}
-				.floor-tags{
-					height: 28rpx;
-					border-radius: 6rpx;
-					background-color: #FFFFFF;
-					line-height: 28rpx;
-					color: $color-system;
-					text-align: center;
-					display: inline-block;
-					padding:0 16rpx;
-					font-size: $font-size-20;
-					border: 1px solid #E15616;
-					float: left;
+					.coupon-tags{
+						height: 32rpx;
+						box-sizing: border-box;
+						border-radius: 8rpx;
+						background-color: #fff1eb;
+						line-height: 28rpx;
+						color: #f94b4b;
+						text-align: center;
+						display: inline-block;
+						padding:0 10rpx;
+						font-size: $font-size-20;
+						border: 1px solid #f94b4b;
+						float: left;
+						margin-right: 12rpx;
+					}
+					.floor-tags{
+						height: 32rpx;
+						box-sizing: border-box;
+						border-radius: 8rpx;
+						background-color: #FFFFFF;
+						line-height: 28rpx;
+						color: $color-system;
+						text-align: center;
+						display: inline-block;
+						padding:0 16rpx;
+						font-size: $font-size-20;
+						border: 1px solid #E15616;
+						float: left;
+					}
 				}
 				.title-none{
 					font-size: $font-size-26;

pages/tabBar/user/user.vue

@@ -330,19 +330,20 @@
 			},
 			filtersMoney(param){
 				let moneyText;
-				if(param || param == 0 ){
+				if( param == 0 ){
 					moneyText = '0.00';
 				}else{
 					let i =  param.toString().lastIndexOf('.');
 					let money;
 					if(i==-1){
-						money = this.$api.FormatMoney(data.user.ableUserMoney); //会所剩余余额
+						money = this.$api.FormatMoney(param); //会所剩余余额
 						moneyText = money +'.00'
 					}else{
-						money = this.$api.FormatMoney(data.user.ableUserMoney); //会所剩余余额
+						money = this.$api.FormatMoney(param); //会所剩余余额
 						moneyText = money
 					}
 				}
+				console.log('moneyText',moneyText)
 				return moneyText;
 			},
 			handleBeanlClick(){//关闭采美豆弹窗

pages/user/coupon/coupon-collection.vue

@@ -40,7 +40,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="list-cell-time">{{ coupon.endDate }}</view>
+						<view class="list-cell-time">{{ coupon.startDate }} - {{ coupon.endDate }}</view>
 					</view>
 				</view>
 				<!--加载loadding-->

pages/user/coupon/coupon-exchange.vue

@@ -41,7 +41,7 @@
 								<text v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</text>
 								<text v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</text>
 							</view>
-							<view class="list-cell-time">有效期：{{ coupon.endDate }}</view>
+							<view class="list-cell-time">有效期：{{ coupon.startDate }} - {{ coupon.endDate }}</view>
 						</view>
 					</view>
 					<view class="coupon-btn" @click.stop="handleClickCancel">立即收下</view>

pages/user/coupon/coupon.vue

@@ -61,7 +61,7 @@
 									<view class="icon-invalid" v-if="coupon.useStatus == 3"></view>
 								</view>
 							</view>
-							<view class="list-cell-time">{{ coupon.endDate }}</view>
+							<view class="list-cell-time">{{ coupon.startDate }} - {{ coupon.endDate }}</view>
 						</view>
 					</view>
 					<!--加载loadding-->
@@ -71,9 +71,13 @@
 				</view>
 			</template>
 		</view>
-		<view class="button-bottom" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx',height:isIphoneX ?'168rpx' : '100rpx'}">
-			<view class="button-exchange" @click="navigator('/pages/user/coupon/coupon-exchange')">兑换优惠券</view>
-			<view class="button-receive" @click="navigator('/pages/user/coupon/coupon-collection')">领更多好券</view>
+		<view class="button-bottom" :style="{paddingBottom :isIphoneX ? '68rpx' : '20rpx'}">
+			<view class="button-exchange" @click="navigator('/pages/user/coupon/coupon-exchange')">
+				兑换优惠券
+			</view>
+			<view class="button-receive"  @click="navigator('/pages/user/coupon/coupon-collection')">
+				领更多好券
+			</view>
 		</view>
 	</view>
 </template>
@@ -482,22 +486,22 @@
 		z-index: 999;
 		.button-exchange{
 			width: 280rpx;
-			height: 100%;
+			height: 84rpx;
+			line-height: 84rpx;
 			background-color: #ffe6dc;
 			border-radius: 50rpx;
 			text-align: center;
-			line-height: 84rpx;
 			font-size: $font-size-30;
 			color: #e15616;
 			float: left;
 		}
 		.button-receive{
 			width: 408rpx;
-			height: 100%;
+			height: 84rpx;
+			line-height: 84rpx;
 			background: $btn-confirm;
 			border-radius: 50rpx;
 			text-align: center;
-			line-height: 84rpx;
 			font-size: $font-size-30;
 			color: #FFFFFF;
 			float: right;

pages/user/order/create-order.vue

@@ -98,7 +98,7 @@
 								<text v-if="ExchangeCouponData.couponType == 3">仅限购买店铺【{{ ExchangeCouponData.shopName }}】的商品</text>
 								<text v-if="ExchangeCouponData.couponType == 4 || ExchangeCouponData.couponType == 2">全商城商品通用</text>
 							</view>
-							<view class="list-cell-time">有效期：{{ ExchangeCouponData.endDate }}</view>
+							<view class="list-cell-time">有效期：{{ ExchangeCouponData.startDate }} - {{ ExchangeCouponData.endDate }}</view>
 						</view>
 					</view>
 					<view class="coupon-btn" @click.stop="handleClickCancel">立即收下</view>
@@ -107,7 +107,6 @@
 		</view>
 	</view>
 </template>
-
 <script>
 	import choiceAddress from '@/components/cm-module/creatOrder/choiceAddress'
 	import goodsList from '@/components/cm-module/creatOrder/goodsList'