commit -m 优惠券

components/cm-module/cart-components/index.vue

@@ -122,11 +122,9 @@
 						
 							<view class="sum">
 								<view class="sum-price" :class="isDiscount ? '' : 'none'">
-									总价:<text class="money-sign">￥</text><text class="money">{{allPrice | NumFormat}}</text>
+									总价:<text class="money-sign">￥</text><text class="money">{{(allPrice - couponPrice) | NumFormat}}</text>
 								</view>
 								<view class="sum-none"  v-if="isDiscount">
-									<!-- <text class="money-sign">￥</text> -->
-									<!-- <text class="money">{{ totalOriginalPrice | NumFormat }}</text> -->
 									<text class="money-reduced">共减<text>￥{{ totalDiscountAmount | NumFormat}}</text></text>
 									<text class="money-popup" @click="showPopup(1)">优惠明细<text class="iconfont icon-xiangshangjiantou"></text></text>
 								</view>
@@ -150,11 +148,9 @@
 							</view>
 							<view class="sum">
 								<view class="sum-price" :class="isDiscount ? '' : 'none'">
-									总价:<text class="money-sign">￥</text><text class="money">{{allPrice | NumFormat}}</text>
+									总价:<text class="money-sign">￥</text><text class="money">{{(allPrice - couponPrice) | NumFormat}}</text>
 								</view>
 								<view class="sum-none" v-if="isDiscount">
-									<!-- <text class="money-sign">￥</text> -->
-									<!-- <text class="money">{{ totalOriginalPrice | NumFormat }}</text> -->
 									<text class="money-reduced">共减<text>￥{{ totalDiscountAmount | NumFormat}}</text></text>
 									<text class="money-popup" @click="showPopup(1)">优惠明细<text class="iconfont icon-xiangshangjiantou"></text></text>
 								</view>
@@ -238,7 +234,7 @@
 											</view>
 										</view>
 									</view>
-									<view class="list-cell-time">{{ coupon.endDate }}</view>
+									<view class="list-cell-time">{{ coupon.startDate }} - {{ coupon.endDate }}</view>
 								</view>
 							</view>
 						</template>
@@ -272,7 +268,7 @@
 							<view class="tui-popup-text right bold red">-￥{{ totalDiscountAmount | NumFormat }}</view>
 						</view>
 						<view class="tui-popup-h1">
-							<view class="tui-popup-text left bold">总计</view>
+							<view class="tui-popup-text left bold">总价</view>
 							<view class="tui-popup-text right bold">￥{{ (allPrice - totalDiscountAmount) | NumFormat }}</view>
 						</view>
 					</view>

components/cm-module/creatOrder/coupon.vue

@@ -44,7 +44,7 @@
 									<view class="list-cell-btn">
 										<view class="list-cell-checkbox">
 											<view class="checkbox iconfont"											 
-												  :class="[coupon.ischecked ?'icon-yixuanze':'icon-weixuanze']"
+												  :class="[ coupon.ischecked ? 'icon-yixuanze' : 'icon-weixuanze' ]"
 											>
 											</view>
 										</view>
@@ -77,7 +77,7 @@
 			return{
 				popupShow:false,
 				isIphoneX:this.$store.state.isIphoneX,
-				checkedIndex:null,
+				checkedIndex:0,
 				dataList:[],
 				coupon:{
 					couponAmount:0,
@@ -120,6 +120,8 @@
 				data.forEach((el,index) => {
 					this.dataList.push(Object.assign({},el,{ischecked:false}))
 				})
+				this.coupon.couponAmount = data[0].couponAmount
+				this.dataList[0].ischecked = true
 			},
 			checkedCoupon(idx){// 选择优惠券
 				this.checkedIndex = idx;

components/cm-module/creatOrder/sellerCoupon.vue

@@ -120,6 +120,8 @@
 				data.forEach((el,index) => {
 					this.dataList.push(Object.assign({},el,{ischecked:false}))
 				})
+				this.coupon.couponAmount = data[0].couponAmount
+				this.dataList[0].ischecked = true
 			},
 			checkedCoupon(idx){// 选择优惠券
 				this.checkedIndex = idx;

components/cm-module/listTemplate/classifyProductList.vue

@@ -11,16 +11,17 @@
 					<view class="list-details-specs" v-if="item.productCode!=''&&item.productCode!=null">商品编码：{{item.productCode}}</view>
 					<view class="list-details-price">
 						<template v-if="userIdentity == 3">
-							<view class="floor-item-act">
+							<view class="floor-item-act" v-if="item.actStatus==1">>
 								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
-								<template v-if="item.actStatus==1">
+								<template>
 									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-										{{item.promotions.name}}<text v-if="item.price1TextFlag != '1' && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
+										{{item.promotions.name}}
+										<text v-if="item.price1TextFlag != '1' && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
 									</view>
 									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 								</template>
 							</view>
-							<view class="floor-item-act">
+							<view class="floor-item-act" v-if="item.actStatus ==0">
 								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 								<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 							</view>
@@ -28,13 +29,17 @@
 						<template v-else>
 							<view class="floor-item-act" v-if="item.actStatus==1">
 								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
-								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-									{{item.promotions.name}}<text v-if="hasLogin && item.price1TextFlag != '1'">:￥{{ item.price | NumFormat }}</text>
-								</view>
-								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+								<template>
+									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+										{{item.promotions.name}}
+										<text v-if="hasLogin && userIdentity == 2 && item.price1TextFlag != '1'">:￥{{ item.price | NumFormat }}</text>
+									</view>
+									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+								</template>
 							</view>
-							<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-								<view class="floor-tags">阶梯价格</view>	
+							<view class="floor-item-act" v-if="item.actStatus ==0">
+								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
+								<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 							</view>
 						</template>
 						<view v-if="hasLogin" class="list-price">

components/cm-module/listTemplate/commodityList.vue

@@ -1,480 +0,0 @@
-<!-- 分类商品模块 -->
-<template>
-	<view class="container commodity-list-wrapper" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
-		<list-skeleton v-if="showSkeleton" :listType='0'></list-skeleton>
-		<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="toLower" scroll-y v-if="listData.length > 0">
-			<view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)">
-				<image mode='widthFix' :src="item.p_image"  class="list-img" alt="list-img"></image>
-				<view class="list-details-info">
-					<text class="list-details-title">{{item.p_name}}</text>
-					<text class="list-details-specs">规格：{{item.p_unit}}</text>
-					<view class="list-details-specs" v-if="item.p_code!=''&& item.p_code!=null">商品编码：{{item.p_code}}</view>
-					<view class="list-details-price">
-						<template v-if="userIdentity == 3">
-							<view class="floor-item-act">
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
-								<template v-if="item.actStatus==1">
-									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-										{{item.promotions.name}}<text v-if="item.p_price_flag != '1' && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
-									</view>
-									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-								</template>
-							</view>
-							<view class="floor-item-act">
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
-								<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
-							</view>
-						</template>
-						<template v-else>
-							<view class="floor-item-act">
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
-								<template v-if="item.actStatus==1">
-									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-										{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{ item.price | NumFormat }}</text>
-									</view>
-									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-								</template>
-							</view>
-							<view class="floor-item-act">
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
-								<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
-							</view>
-						</template>
-						<view v-if="hasLogin" class="list-price">
-							<template v-if="userIdentity == 1">
-								<text v-if="priceLoading" class="price-larger small">正在获取价格...</text>
-								<template v-else>
-									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-									</text>
-								</template>
-							</template>	
-							<template v-if="userIdentity == 4">
-								<view class="price-larger" v-if="item.p_price_flag == '1'">
-									<text class="txt">￥未公开价格</text>
-								</view>
-								<view class="price-larger" v-if="item.p_price_flag == '2'">
-									<text class="txt">￥价格仅会员可见</text>
-								</view>
-								<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
-								<template v-else>
-									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-									</text>
-								</template>
-							</template>
-							<template v-if="userIdentity == 3">
-								<template v-if="item.supplierId === shopId">
-									<view class="price-larger" v-if="item.p_price_flag == '1'">
-										<text class="txt">￥未公开价格</text>
-									</view>
-									<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
-									<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-									</text>
-								</template>
-								<template v-else>
-									<view  class="list-login-now">
-										<text class="p-no">￥</text>
-										<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
-									</view>
-								</template>
-							</template>
-							<template v-if="userIdentity == 2">
-								<view class="price-larger" v-if="item.p_price_flag == '1'">
-									<text class="txt">￥未公开价格</text>
-								</view>
-								<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
-								<template v-else>
-									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
-									</text>
-								</template>
-							</template>
-						</view>	
-						<view  v-else class="list-login-now">
-							<text class="p-no">￥</text>
-							<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view v-if="showLoading && listData.length > 4">
-				<view class="loading-wrapper loading-wrapper-now" v-if="loadingNow">{{loadingText}}<text v-if="loadingText === '已至底部'">‧ ‧ ‧</text></view>
-				<view class="loading-wrapper loading-wrapper-btm" v-else>———<text class="btm-text">已至底部</text>———</view>
-			</view>
-		</scroll-view>
-		<view class="empty-container" v-if="showEmpty">
-			<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"></image>
-			<text class="error-text">{{emptyText}}</text>
-		</view>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='isModallayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import listSkeleton from '@/components/cm-module/listTemplate/listSkeleton'
-	import modalLayer from "@/components/modal-layer"
-	import uniGrader from '@/components/uni-grade/uni-grade.vue'
-	import { searchQueryTinyType} from "@/services/public.js"
-	import { mapState,mapMutations } from 'vuex';
-	export default{
-		name:'CommodityList',
-		components:{
-			listSkeleton,
-			modalLayer,
-			uniGrader
-		},
-		props: {
-			emptyText: {
-				type: String
-			},
-			serverUrl: {
-				type: String
-			},
-			typeId: {
-				type:Number
-			}
-		},
-		data(){
-			return{
-				clubStatus:'',
-				isModallayer:false,
-				windowHeight: '',
-				showSkeleton: true,
-				showEmpty: false,
-				userID:0,
-				shopId:0,
-				userIdentity:'',
-				priceLoading:true,
-				scrollHeight: '',
-				listData: [],
-				showLoading: false,
-				loadingNow: true,
-				loadingText: '上拉加载更多',
-				pageSize: 20,
-				pageNum: 1,
-				totalPage: 1,
-				pullFlag: true,
-				cartNum: 0,
-			}
-		},
-		created() {		
-			// console.log(this.typeId)
-			this.setScrollHeight();		
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.clubStatus = resolve.clubStatus
-				this.userID = resolve.userId ? resolve.userId : 0;
-				this.shopId = resolve.shopId ? resolve.shopId : 0;
-				this.userIdentity = resolve.userIdentity
-				this.getListFromServer();
-			}).catch(error =>{
-				this.getListFromServer();
-			})
-		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			},
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity'])
-		},
-		methods:{
-			toLower() {
-				if(this.totalPage>this.listData.length && this.pullFlag) {
-					this.getListFromServer(true);
-				}
-			},
-			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
-			},
-			getListFromServer(loadMore) {
-				this.getQueryGoodslist(loadMore)
-			},
-			getQueryGoodslist(loadMore){
-				this.showLoading = true;
-				this.loadingNow = true;
-				this.loadingText = '加载中';
-				if(loadMore) { this.pageNum += 1; }
-				let params ={
-						id:this.typeId,
-						identity:this.identity,
-						pageNum:this.pageNum,
-						pageSize:this.pageSize,
-						sortField:'',
-						sortType:''
-				}
-				searchQueryTinyType(this.serverUrl,params).then(response=>{
-					const resData = JSON.parse(response.data);
-					const resList = resData.items;
-					if(resList && resList.length > 0){
-						this.showEmpty = false
-						this.totalPage = resData.total;
-						if(loadMore) {
-							this.listData = [...this.listData,...resList];
-							this.getProductPrice()
-							this.showSkeleton = false
-						} else {
-							this.listData = [...resList];
-							this.getProductPrice()
-							this.showSkeleton = false
-						}
-						// 防上拉暴滑
-						this.pullFlag = false;
-						setTimeout(()=>{ this.pullFlag = true; },500)
-						// 底部提示文案
-						if(this.totalPage>this.listData.length) {
-							this.loadingText = '上拉加载更多';
-						} else {
-							this.showLoading = true;
-							this.loadingNow = false;
-						}
-					} else {
-						if(!loadMore) { this.showEmpty = true; }
-					}
-					
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			getProductPrice(){//获取价格
-				let productIdArr = [];
-				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
-					productIdArr.push(item.p_id)
-				})
-				this.productIds = productIdArr.join(",");
-				this.ProductService.querySearchProductPrice(
-					{
-						userId: this.userID,
-						productIds:this.productIds,
-						source: 2
-					}
-				).then(response =>{
-					if (response.data) {
-						this.listData = this.ReturnNewProducts(this.listData,response.data);
-					}
-					this.priceLoading = false;
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			ReturnNewProducts(Array,list){//处理对应商品ID的商品价格
-				let NewArray = []
-				Array.map(item=>{
-					for (let i = 0; i < list.length; i++) {
-						if( item.p_id == list[i].productId ){
-							NewArray.push(Object.assign(item,list[i])) 
-						}
-					}
-				});
-				return NewArray
-			},
-			navToDetailPage(id) {
-				this.isModallayer = true;
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`);
-				this.isModallayer = false;
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.commodity-list-wrapper {
-		scroll-view {
-			height: 100%;
-			border-top: 2rpx solid rgba(0,0,0,0.07);
-		}
-		.empty-container-image {
-			margin-top: -300rpx;
-		}
-		.toIndexPage {
-			bottom: 390rpx;
-		}
-		.show-more-btn {
-			width: 276rpx;
-			height: 52rpx;
-			line-height: 52rpx;
-			border: 2rpx solid #D8D8D8;
-			background: #F7F7F7;
-			font-size: 26rpx;
-			margin: 26rpx 0;
-			position: absolute;
-			left: 50%;
-			margin-left: -138rpx;
-		}
-	}
-	.all-type-list-content {
-		height: 216rpx;
-		padding: 24rpx;
-		background: #fff;
-		margin-bottom: 2rpx;
-		display: flex;
-		flex-direction: row;
-		box-sizing: content-box;
-		.list-img {
-			width: 210rpx;
-			height: 218rpx !important;
-			margin-right: 26rpx;
-			border-radius: 10rpx;
-			border: 2rpx solid #f3f3f3;
-		}
-	}
-	.list-details-info {
-		width: 466rpx;
-		display: flex;
-		flex-direction: column;
-		font-size: 26rpx;
-		position: relative;
-		.list-details-title {
-			line-height: 36rpx;
-			text-overflow: ellipsis;
-			overflow: hidden;
-			display: -webkit-box;
-			-webkit-line-clamp: 2;
-			line-clamp: 2;
-			-webkit-box-orient: vertical;
-		}
-		.list-details-specs {
-			margin-top: 8rpx;
-			color: #666666;
-		}
-		.list-details-miniQuantity {
-			margin-top: 7rpx;
-		}
-	}
-	.list-details-price {
-		width: 100%;
-		height: 54rpx;
-		line-height: 54rpx;
-		.floor-item-act{
-			height: 54rpx;
-			text-align: center;
-			box-sizing: border-box;
-			float: right;
-			padding: 11rpx 0;
-			.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;
-			}
-		}
-		.price-icon {
-			width: 22rpx;
-			height: 28rpx;
-			vertical-align: middle;
-			margin-right: 10rpx;
-		}
-		.price-icon + text {
-			font-size: 25rpx;
-			vertical-align: middle;
-		}
-		.list-login-now {
-			color: #F8C499;
-			float: left;
-			line-height: 54rpx;
-			.p-no{
-				float: left;
-				font-size: $font-size-24;
-				color: $text-color;
-			}
-		}
-		.login-now {
-			padding: 10rpx 10rpx 10rpx 0;
-		}
-		.list-price {
-			color: #FF2A2A;
-			height: 44rpx;
-			float: left;
-			.price-larger {
-				width: 100%;
-				height: 44rpx;
-				font-size: 32rpx;
-				&.none{
-					text-decoration: line-through;
-					color: #999999;
-				}
-				&.small{
-					font-size: $font-size-24;
-				}
-				.txt{
-					font-size: $font-size-24;
-					display: inline-block;
-					line-height: 44rpx;
-					text-align: left;
-					float: left;
-				}
-			}
-		}
-		.add-cart-btn {
-			width: 156rpx;
-			height: 64rpx;
-			line-height: 64rpx;
-			border-radius: 32rpx;
-			color: #fff;
-			font-size: 26rpx;
-			margin-right: 0;
-			background:linear-gradient(45deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);
-		}
-	}
-	.cart-icon {
-		width: 92rpx;
-		height: 92rpx;
-		border-radius: 50%;
-		background: rgba(255, 147, 0, 0.5);
-		position: fixed;
-		right: 24rpx;
-		bottom: 30%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		cursor: pointer;
-		image {
-			width: 58rpx;
-			height: 58rpx;
-		}
-		text {
-			font-size: 28rpx;
-			position: absolute;
-			top: -10rpx;
-			right: 0;
-		}
-	}
-</style>

components/cm-module/listTemplate/productList.vue

@@ -31,7 +31,8 @@
 								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 								<template v-if="item.actStatus==0">
 									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-										{{item.promotions.name}}<text v-if="item.priceFlag != 1">:￥{{ item.price | NumFormat }}</text>
+										{{item.promotions.name}}
+										<text v-if="item.priceFlag != 1">:￥{{ item.price | NumFormat }}</text>
 									</view>
 									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 								</template>

components/cm-module/pageFloorTemplate/templateA.vue

@@ -78,7 +78,7 @@
 								<view class="title-none"  v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
-								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === 0" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
 									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>

components/cm-module/pageFloorTemplate/templateC.vue

@@ -90,7 +90,7 @@
 								<view class="title-none"  v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
-								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === 0" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
 									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>

pages.json

@@ -78,13 +78,6 @@
 						"navigationStyle":"custom"
 					}
 				},
-				{
-					"path": "goods",
-					"style": {
-						"navigationBarTitleText": "商品列表",
-						"enablePullDownRefresh":true
-					}
-				},
 				{
 					"path": "goods-instrument",
 					"style": {

pages/goods/cart-index.vue

@@ -1,6 +1,6 @@
 <template>
-	<view class="container cart clearfix" v-if="hasLogin" :style="{paddingTop:CustomBar+'px'}"> 	
-		<custom :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :page='1'></custom>
+	<view class="container cart clearfix" :style="{paddingTop:CustomBar+'px'}"> 	
+		<custom :systeminfo='systeminfo'  :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :page='1'></custom>
 		<cart ref="cart" :pathType='pathType'></cart>
 	</view>
 </template>

pages/goods/goods-classify.vue

@@ -53,28 +53,33 @@
 							<view class="list-details-price">
 								<template v-if="userIdentity == 3">
 									<view class="floor-item-act" v-if="item.actStatus==1">
-										<view class="coupon-tags">优惠券</view>
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}<text v-if="item.priceFlag != 1 && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
-										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										<view class="coupon-tags" v-if="item.couponsLogo">>优惠券</view>
+										<template>
+											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+												{{item.promotions.name}}<text v-if="item.priceFlag != 1 && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
+											</view>
+											<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										</template>
 									</view>
-									<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-										<view class="coupon-tags">优惠券</view>
-										<view class="floor-tags">阶梯价格</view>	
+									<view class="floor-item-act" v-if="item.actStatus ==0">
+										<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
+										<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 									</view>
 								</template>
 								<template v-else>
 									<view class="floor-item-act" v-if="item.actStatus==1">
-										<view class="coupon-tags">优惠券</view>
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{ item.price | NumFormat }}</text>
-										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
+										<template>
+											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+												{{item.promotions.name}}
+												<text v-if="hasLogin && userIdentity == 2 && item.priceFlag != 1">:￥{{ item.price | NumFormat }}</text>
+											</view>
+											<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										</template>
 									</view>
-									<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-										<view class="coupon-tags">优惠券</view>
-										<view class="floor-tags">阶梯价格</view>	
+									<view class="floor-item-act" v-if="item.actStatus ==0">
+										<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
+										<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 									</view>
 								</template>
 								<view v-if="hasLogin" class="list-price">
@@ -90,12 +95,12 @@
 										<view class="price-larger" v-if="item.priceFlag == 1">
 											<text class="txt">￥未公开价格</text>
 										</view>
-										<view class="price-larger" v-if="item.priceFlag == 1">
-											<text class="txt">￥价格仅会员可见</text>
-										</view>
 										<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
 										<template v-else>
-											<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+											<view class="price-larger" v-if="item.priceFlag == 2">
+												<text class="txt">￥价格仅会员可见</text>
+											</view>
+											<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 												￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
 											</text>
 										</template>

pages/goods/goods.vue

@@ -1,93 +0,0 @@
-<template>
-	<view class="container all-type-list-wrapper">
-		<commodity-list ref="childList" :empty-text="emptyText" :serverUrl="serverUrl" :typeId="typeId" v-if="isRequest"></commodity-list>
-	</view>
-</template>
-
-<script>
-	import commodityList from '@/components/cm-module/listTemplate/commodityList'
-	
-	export default{
-		components:{
-			commodityList
-		},
-		data(){
-			return{
-				serverUrl: '',
-				emptyText: '',
-				lastPageType: '',
-				lastPageVal: '',
-				isRequest:false,
-				typeId:null
-			}
-		},		
-		onLoad(option) {
-			this.setServerUrl(option);
-		},
-		methods:{
-			setServerUrl(option) {
-				let self = this;
-				const {type, from: value} = option;
-				this.lastPageType = type;
-				this.lastPageVal = value;
-				uni.setNavigationBarTitle({title:value});
-				uni.getStorage({
-					key: 'commodity_id',
-					success: function (res) {
-						const emptyTxt = '正在上架中，敬请期待~';
-						/**
-						 *@商品分类列表传参类型
-						 *@type  首页分类：0，首页商品模块1：1,首页商品模块2：2,首页商品模块3：3，底部导航分类：4
-						 **/
-						switch(type){
-							case '0':
-								console.log(res)
-								self.typeId = res.data;
-								self.serverUrl = '/home/classify';
-								self.emptyText = '该分类暂时还没有商品哟，去逛逛别的吧~';
-								break;
-							case '1':	
-								self.typeId = 1;
-								self.serverUrl = '/search/query/product/preferred';
-								self.emptyText = `${self.lastPageVal}商品${emptyTxt}`;
-								break;
-							case '2':
-								self.typeId = 10;
-								self.serverUrl = '/search/query/product/preferred';
-								self.emptyText = `${self.lastPageVal}商品${emptyTxt}`;
-								break;
-							case '3':
-								self.typeId = 100;
-								self.serverUrl = '/search/query/product/preferred';
-								self.emptyText = `${self.lastPageVal}${emptyTxt}`;
-								break;
-							case '4':
-								self.typeId = res.data;
-								self.serverUrl = '/search/query/product/tinyType';
-								self.emptyText = '该分类暂时还没有商品哟，去逛逛别的吧~';
-								break;
-						}
-						self.isRequest = true
-					}
-				})
-			}
-		},
-		onShow() {
-			let pages = getCurrentPages(),
-				thisPage = pages[pages.length - 1];
-			if(thisPage.refresh) {
-				this.setServerUrl(thisPage.listData);
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background: $sub-bg-color;
-		.all-type-list-wrapper {
-			display: flex;
-			flex-direction: column;
-		}
-	}
-</style>

pages/goods/product.vue

@@ -109,7 +109,7 @@
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
 					<!-- 优惠券 -->
-					<view class="product-parameter coupon" @click="showPopup(2)">
+					<view class="product-parameter coupon" v-if="isShowButton" @click="showPopup(2)">
 						<text class="title">优惠券：</text>
 						<view class="coupon">
 							<text class="tags"  v-for="(coupon, index) in productCoupon.slice(0,3)" :key="index"> 
@@ -272,7 +272,7 @@
 													</view>
 												</view>
 											</view>
-											<view class="list-cell-time">{{ coupon.endDate }}</view>
+											<view class="list-cell-time">{{ coupon.startDate }} - {{ coupon.endDate }}</view>
 										</view>
 									</view>
 								</template>

pages/search/search.vue

@@ -68,30 +68,30 @@
 						</view>
 						<view class="list-details-price">
 							<template v-if="userIdentity == 3">
-								<view class="floor-item-act" >
+								<view class="floor-item-act" v-if="item.actStatus==1">
 									<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 									<template v-if="item.actStatus==1">
 										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)"></view>
 										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 									</template>
 								</view>
-								<view class="floor-item-act">
-									<view class="coupon-tags"v-if="item.couponsLogo">优惠券</view>
+								<view class="floor-item-act" v-if="item.actStatus ==0">
+									<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 									<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 								</view>
 							</template>
 							<template v-else>
-								
 								<view class="floor-item-act" v-if="item.actStatus==1">
 									<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 									<template v-if="item.actStatus==1">
 										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{ item.price | NumFormat }}</text>
+											{{item.promotions.name}}
+											<text v-if="hasLogin && userIdentity == 2 && item.priceFlag != 1">:￥{{ item.price | NumFormat }}</text>
 										</view>
 										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 									</template>	
 								</view>
-								<view class="floor-item-act">
+								<view class="floor-item-act" v-if="item.actStatus ==0">
 									<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
 									<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
 								</view>
@@ -108,14 +108,14 @@
 										<text class="txt">￥未公开价格</text>
 									</view>
 									<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
-									<view v-else>
+									<template v-else>
 										<view class="price-larger" v-if="item.priceFlag == 2">
 											<text class="txt">￥价格仅会员可见</text>
 										</view>
 										<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 											￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat}}
 										</text>
-									</view>
+									</template>
 								</template>
 								<template v-if="userIdentity == 3">
 									<template v-if="item.supplierId == shopId">

pages/seller/order/create-order.vue

@@ -156,7 +156,6 @@
 				submitState:'',  		  // 提交状态
 				balanceDeductionFlag:2,   // 勾选余额的状态(1使用，2不使用)
 				allCount:1,				  // 订单提交总数量
-				totalOriginalPrice:0,	  // 订单总原价(划线部分)
 				reducedPrice:0,			  // 满减金额
 				couponAmount:0,	  		  // 优惠券金额
 				totalDiscountAmount:0,	  // 共减金额
@@ -260,14 +259,17 @@
 						this.isRequest = true
 						this.goodsData = data.shopList
 						this.userMoney = data.userMoney
-						this.reducedPrice = data.reducedPrice
-						this.totalOriginalPrice = data.reducedPrice + data.totalAmount
-						this.rechargeGoods = data.rechargeGoods
 						this.couponList = data.couponList
+						this.reducedPrice = data.reducedPrice
+						this.allPrice = data.totalAmount
 						if(this.couponList.length>0){
 							this.isCouponShow = true
+							this.couponAmount = data.couponList[0].couponAmount
+							this.clubCouponId = data.couponList[0].clubCouponId 
+							this.payAllPrice = this.allPrice - this.couponAmount
 						}
-						this.allPrice = this.payAllPrice = data.totalAmount
+						this.totalDiscountAmount = this.reducedPrice + this.couponAmount
+						this.rechargeGoods = data.rechargeGoods
 						this.regulationsData = data.clauseList
 						this.goodsData.forEach(item =>{
 							this.productsList = item.productsList

pages/tabBar/cart/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container cart clearfix" v-if="hasLogin"> 	
+	<view class="container cart clearfix"> 	
 		<cart ref="cart" :pathType='pathType'></cart>
 	</view>
 </template>

pages/tabBar/home/index.vue

@@ -151,12 +151,13 @@
 				})
 			},
 			GetHomeFloorInfo(){//初始化首页楼层数据
-				this.isRequest = false;
 				this.CommonService.GetHomeDataInfo({userId:this.userID,soure:2}).then(response =>{
 					let data = response.data;
 					this.pageList = data.homePageFloor;
 					this.supplierObj = data.supplierImage;
-					this.isRequest = true;
+					setTimeout(()=>{
+						this.isRequest = true;
+					},500)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})

pages/user/coupon/coupon-collection.vue

@@ -76,6 +76,7 @@
 				loadding: false,
 				pullUpOn: true,
 				pullFlag: true,
+				isReceiveLoading:false, //领券操作状态
 			}
 		},
 		onLoad() {
@@ -107,6 +108,8 @@
 		},
 		methods: {
 			QueryCouponList() {// 初始化查询优惠券列表
+				this.coupinList = []
+				this.listQuery.pageNum = 1
 				this.ProductService.QueryCouponCollarList(this.listQuery).then(response =>{
 					let data = response.data
 					if(data.list&&data.list.length > 0){
@@ -161,6 +164,7 @@
 			},
 			receiveCoupon(coupon){// 点击优惠券领取按钮
 				if(this.hasLogin){
+					if(this.isReceiveLoading){return;}
 					this.ProductService.ReceiveCoupon(
 						{
 							userId:this.listQuery.userId,
@@ -168,9 +172,11 @@
 							source:2
 						}) 
 					.then(response =>{
+						this.isMobileDisabled = true;
 						this.$util.msg('领取成功',1500,true,'success')
 						setTimeout(()=>{
 							coupon.couponBtnType = 1;
+							this.isMobileDisabled = false;
 						},1500)
 					})
 					.catch(error =>{
@@ -216,8 +222,6 @@
 		},
 		onPullDownRefresh() {
 			setTimeout(() => {
-				this.coupinList = []
-				this.listQuery.pageNum = 1
 				this.QueryCouponList()
 				uni.stopPullDownRefresh()
 			}, 200)

pages/user/coupon/coupon-product.vue

@@ -7,7 +7,7 @@
 				<image class="item-img-gg" :src="appletsBanner"></image>
 			</view>
 			<view class="section_page_main clearfix">
-				<view class="floor-item clearfix" v-for="(pros, idx) in productList" :key="idx" @click.stop="navToDetailPage(pros)">
+				<view class="floor-item clearfix" v-for="(pros, idx) in productList" :key="idx" @click.stop="navToDetailPage(pros.productId)">
 					<image class="item-img tui-skeleton-fillet" :src="pros.image" mode="aspectFill"></image>
 					<view class="floor-item-content">
 						<view class="title tui-skeleton-rect">
@@ -158,6 +158,9 @@
 				}
 				return false
 			},
+			navToDetailPage(productId) {//跳转商品详情页
+				this.$api.navigateTo(`/pages/goods/product?id=${productId}`)
+			}
 		},
 		onPullDownRefresh() {
 			setTimeout(() => {

pages/user/coupon/coupon.vue

@@ -152,12 +152,14 @@
 				this.scrollHeight = windowHeight - 1;
 			},
 			QueryCouponList() {// 获取优惠券列表
+				this.coupinList = []
+				this.listQuery.pageNum = 1
 				this.ProductService.QueryCouponCenter(this.listQuery).then(response =>{
 					let data = response.data
 					if(data.list&&data.list.length > 0){
 						this.showEmpty = false
-						this.hasNextPage = response.data.hasNextPage
-						this.coupinList =data.list
+						this.hasNextPage = data.hasNextPage
+						this.coupinList = data.list
 						this.pullFlag = false;
 						setTimeout(()=>{this.pullFlag = true;},500)
 						if(this.hasNextPage){
@@ -278,8 +280,6 @@
 		},
 		onPullDownRefresh() {
 			setTimeout(() => {
-				this.coupinList = []
-				this.listQuery.pageNum = 1
 				this.QueryCouponList()
 				uni.stopPullDownRefresh()
 			}, 200)
@@ -291,7 +291,7 @@
 				this.getOnReachBottomData()
 			}	
 		},
-		onShow(){
+		onShow(){		
 			this.setScrollHeight();
 			this.$api.getComStorage('userInfo').then((resolve) =>{
 				this.listQuery.userId = resolve.userId ? resolve.userId : 0;

pages/user/order/create-order.vue

@@ -139,7 +139,6 @@
 				submitState:'',  		  // 提交状态
 				balanceDeductionFlag:2,   // 勾选余额的状态(1使用，2不使用)
 				allCount:1,				  // 订单提交总数量
-				totalOriginalPrice:0,	  // 订单总原价(划线部分)
 				reducedPrice:0,			  // 满减金额
 				couponAmount:0,	  		  // 优惠券金额
 				totalDiscountAmount:0,	  // 共减金额
@@ -205,18 +204,21 @@
 					unionId:uni.getStorageSync('unionId')
 				})
 				.then(response =>{
-					let resData = response.data
+					let data = response.data
 					this.isRequest = true
-					this.goodsData = resData.list
-					this.couponList = resData.couponList
-					this.userMoney = resData.userMoney
-					this.totalDiscountAmount = this.reducedPrice = resData.reducedPrice
-					this.allPrice = this.payAllPrice = resData.totalPrice
-					this.totalOriginalPrice = resData.totalOriginalPrice
-					this.rechargeGoods = resData.rechargeGoods
+					this.goodsData = data.list
+					this.couponList = data.couponList
+					this.userMoney = data.userMoney
+					this.reducedPrice = data.reducedPrice
+					this.allPrice = data.totalPrice
+					this.rechargeGoods = data.rechargeGoods
 					if(this.couponList.length>0){
 						this.isCouponShow = true
+						this.couponAmount = data.couponList[0].couponAmount
+						this.clubCouponId = data.couponList[0].clubCouponId 
+						this.payAllPrice = this.allPrice - this.couponAmount
 					}
+					this.totalDiscountAmount = this.reducedPrice + this.couponAmount
 				})
 				.catch(error =>{
 					this.$util.msg(error.msg,2000)