From c135169cdbd6f1965673f6f8ef0c6b6592909602 Mon Sep 17 00:00:00 2001
From: yangsanTT <812952667@qq.com>
Date: Fri, 23 Apr 2021 01:00:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E4=BB=A3=E7=90=86=E5=95=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/HM-search/HM-search.vue           |  4 +-
 .../coupons-info-details.vue                  | 16 ++---
 pages/goods/externalCoupon/externalCoupon.vue |  4 +-
 pages/goods/goods-list/goods-list.vue         |  4 +-
 pages/goods/goods.vue                         |  4 +-
 pages/login/login.vue                         | 31 ++++++++--
 pages/tabBar/home/home.vue                    |  4 +-
 pages/user/agentCoupons/agentCoupons.vue      | 62 ++++++++++++++-----
 pages/user/mineCoupons/mineCoupons.vue        |  4 +-
 .../mineCouponsDestails.vue                   |  4 +-
 pages/user/minePromotion/minePromotion.vue    | 55 ++++++++--------
 11 files changed, 123 insertions(+), 69 deletions(-)

diff --git a/pages/goods/HM-search/HM-search.vue b/pages/goods/HM-search/HM-search.vue
index 4b8e021..2caf104 100644
--- a/pages/goods/HM-search/HM-search.vue
+++ b/pages/goods/HM-search/HM-search.vue
@@ -279,10 +279,10 @@
 
 			.name {
 				width: 92%;
-				padding: 10upx 4%;
+				padding: 8upx 4%;
 				display: -webkit-box;
 				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
+				-webkit-line-clamp: 1;
 				text-align: justify;
 				overflow: hidden;
 				font-size: 30upx;
diff --git a/pages/goods/coupons-info-details/coupons-info-details.vue b/pages/goods/coupons-info-details/coupons-info-details.vue
index 78d8372..54f2a2f 100644
--- a/pages/goods/coupons-info-details/coupons-info-details.vue
+++ b/pages/goods/coupons-info-details/coupons-info-details.vue
@@ -1,10 +1,10 @@
 <template>
 	<view>
-		<view class="width100 fotct coupon-status font20 fcorred" v-if="couponDesInfo.highUserCoupon.status == 2">已使用
+		<view class="width100 fotct coupon-status font20 fcorred" v-if="couponDesInfo.couponAgentCode.status == 2">待使用
 		</view>
-		<view class="width100 fotct coupon-status font20 fcor41c" v-if="couponDesInfo.highUserCoupon.status == 1">未使用
+		<view class="width100 fotct coupon-status font20 fcor41c" v-if="couponDesInfo.couponAgentCode.status == 1">待销售
 		</view>
-		<view class="width100 fotct coupon-status font20 fcor41c" v-if="couponDesInfo.highUserCoupon.status  == 0">已过期
+		<view class="width100 fotct coupon-status font20 fcor41c" v-if="couponDesInfo.couponAgentCode.status  == 3">已使用
 		</view>
 		<view class="line1"></view>
 		<view class="coupon-cont width90">
@@ -24,7 +24,7 @@
 		<view class="line1 mart15"></view>
 		<view class="width90 mart10 fcor666" v-if="couponDesInfo.highUserCoupon.status  != 0">核销码(商户扫客户)</view>
 		<view class="width90 mart20 fotct" v-if="couponDesInfo.highUserCoupon.status  != 0">
-			<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg"></image>
+			<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.couponCode.ext1"></image>
 		</view>
 
 		<!-- 	<view class="width90 mart20" style="height: 80px;" v-for="(store,i) in storeList" :key="i">
@@ -107,10 +107,10 @@
 				}
 				getCodeById(params).then(res => {
 					if (res.return_code == '000000') {
-						// this.couponDesInfo = res.return_data;
-						// this.oneTime = res.return_data.highUserCoupon.createTime;
-						// this.twoTime = res.return_data.highUserCoupon.useEndTime;
-						// this.threeTime = res.return_data.highUserCoupon.consumeTime;
+						this.couponDesInfo = res.return_data;
+						this.oneTime = res.return_data.couponCode.receiveTime;
+						this.twoTime = res.return_data.couponCode.useEndTime;
+						this.threeTime = res.return_data.couponCode.consumeTime;
 						uni.hideLoading()
 					} else {
 						uni.hideLoading()
diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue
index 5749e39..3a2664c 100644
--- a/pages/goods/externalCoupon/externalCoupon.vue
+++ b/pages/goods/externalCoupon/externalCoupon.vue
@@ -295,10 +295,10 @@
 
 			.name {
 				width: 92%;
-				padding: 10upx 4%;
+				padding: 8upx 4%;
 				display: -webkit-box;
 				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
+				-webkit-line-clamp: 1;
 				text-align: justify;
 				overflow: hidden;
 				font-size: 30upx;
diff --git a/pages/goods/goods-list/goods-list.vue b/pages/goods/goods-list/goods-list.vue
index 58a8d87..c6236cd 100644
--- a/pages/goods/goods-list/goods-list.vue
+++ b/pages/goods/goods-list/goods-list.vue
@@ -216,10 +216,10 @@
 				}
 				.name{
 					width: 92%;
-					padding: 10upx 4%;
+					padding: 8upx 4%;
 					display: -webkit-box;
 					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
+					-webkit-line-clamp: 1;
 					text-align: justify;
 					overflow: hidden;
 					font-size: 30upx;
diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue
index 6545316..8464247 100644
--- a/pages/goods/goods.vue
+++ b/pages/goods/goods.vue
@@ -519,10 +519,10 @@
 
 			.name {
 				width: 92%;
-				padding: 10upx 4%;
+				padding: 8upx 4%;
 				display: -webkit-box;
 				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
+				-webkit-line-clamp: 1;
 				text-align: justify;
 				overflow: hidden;
 				font-size: 30upx;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 58bb5d4..8b01e08 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -60,8 +60,9 @@
 
 		},
 		onLoad(options) {
-			this.typeId = options.id;
-			if(this.typeId == 1){
+			let that = this;
+			that.typeId = options.id;
+			if(that.typeId == 1){
 				uni.setNavigationBarTitle({
 					title:'门店登录'
 				})
@@ -70,12 +71,24 @@
 					title:'代理商登录'
 				})
 			}
+			uni.getStorage({
+				key: 'phoneNum',
+				success(e) {
+					that.phoneNumber = e.data;
+				}
+			})
+			uni.getStorage({
+				key: 'pasNum',
+				success(e) {
+					that.passwd = e.data;
+				}
+			})
 			
 			//APP显示第三方登录
 			// #ifdef APP-PLUS
-			this.isShowOauth = true;
+			that.isShowOauth = true;
 			// #endif
-			this.getProvider();
+			that.getProvider();
 
 		},
 		methods: {
@@ -174,7 +187,15 @@
 					"password": this.passwd
 				}
 				userLogin(datas).then(res => {
-					if (res.return_code == '000000') {
+					if (res.return_code == '000000') {
+						uni.setStorage({
+							key: "phoneNum",
+							data: this.phoneNumber
+						})
+						uni.setStorage({
+							key: "pasNum",
+							data: this.passwd
+						})
 						uni.hideLoading();
 						if(this.typeId == 1){
 							uni.navigateTo({
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 397962a..c495d5e 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -744,10 +744,10 @@
 
 				.name {
 					width: 92%;
-					padding: 10upx 4%;
+					padding: 8upx 4%;
 					display: -webkit-box;
 					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
+					-webkit-line-clamp: 1;
 					text-align: justify;
 					overflow: hidden;
 					font-size: 30upx;
diff --git a/pages/user/agentCoupons/agentCoupons.vue b/pages/user/agentCoupons/agentCoupons.vue
index c28baba..aece553 100644
--- a/pages/user/agentCoupons/agentCoupons.vue
+++ b/pages/user/agentCoupons/agentCoupons.vue
@@ -3,19 +3,20 @@
 		<view class="onorder width90" v-if="agentCouponList.length==0">
 			<image src="../../../static/img/noorder.png"></image>
 			<view class="text">
-				暂无数据...
+				暂无数据
 			</view>
 		</view>
 		<view class="width90 height120 backcorfff mart15" v-for="(agent,index) in agentCouponList" :key="index">
-			<image class="flleft agent_img margle mart10" src='../../../static/img/logo.png'></image>
+			<image class="flleft agent_img margle mart10" v-if="agent.merchantLogo == null" src='../../../static/img/logo.png'></image>
+				<image class="flleft agent_img margle mart10" v-else :src="image_url+agent.merchantLogo"></image>
 			<view class="agent_title paddtop13">
-				<view class="font18 fcor333 width100">重庆中石化码商券</view>
+				<view class="font18 fcor333 width100">{{agent.highCoupon.couponName}}</view>
 				<view class="width100 mart5 font14 fcor333 height22">
-					<view class="agent_left_num flleft">
-						42342424234234
+					<view class="agent_left_num flleft text1">
+						{{agent.highCouponCode.salesCode}}
 					</view>
 					<view class="agent_right_num flright fotrt">
-						300.00
+						{{agent.highCoupon.salesPrice}}.00
 					</view>
 				</view>
 			</view>
@@ -25,7 +26,8 @@
 					v-if="typeId == 1">生成油码</button>
 				<button class="flright backcorf06 fcorfff font15 agent_btn mart10" @click="jumpCouponDes(agent.id)"
 					v-if="typeId == 2">查看详情</button>
-				<view class="agent_ts font15 fcor333 fotrt">出售时间:2021.4.13 23:14</view>
+				<view class="agent_ts font15 fcor333 fotrt" v-if="typeId == 2">
+					出售时间:{{agent.highCouponCode.receiveTime | formatDate('-')}}</view>
 			</view>
 		</view>
 	</view>
@@ -36,6 +38,7 @@
 		getCodeListByAgentCoupon,
 		generateCode
 	} from "../../../Utils/Api.js";
+	let app =getApp();
 	export default {
 		data() {
 			return {
@@ -44,12 +47,32 @@
 				agentCouponList: [],
 				isNoMoreData: false,
 				typeId: '',
-				reFreshs: ""
+				reFreshs: '',
+				couponId: '',
+				image_url : app.globalData.imgUrl
+			}
+		},
+		filters: {
+			//过滤器 用于格式化时间
+			formatDate: function(value, spe = '/') {
+				let data = new Date(value);
+				let year = data.getFullYear();
+				let month = data.getMonth() + 1;
+				let day = data.getDate();
+				let h = data.getHours();
+				let mm = data.getMinutes();
+				let s = data.getSeconds();
+				month = month > 10 ? month : "0" + month;
+				day = day > 10 ? day : "0" + day;
+				h = h > 10 ? h : "0" + h;
+				mm = mm > 10 ? mm : "0" + mm;
+				s = s > 10 ? s : "0" + s;
+				return `${year}${spe}${month}${spe}${day}`;
 			}
 		},
-
 		onLoad(option) {
 			this.typeId = option.id;
+			this.couponId = option.couponsId;
 		},
 		onShow() {
 			this.getCodeListByAgentCoupon();
@@ -74,12 +97,23 @@
 					return false;
 				}
 				let pagenum = this.pageNum;
-				let params = {
-					pageNum: pagenum,
-					couponId: 23423529,
-					status: this.typeId,
-					pageSize: this.pageSize
+				let params;
+				if (this.typeId == 1) {
+					params = {
+						pageNum: pagenum,
+						couponId: this.couponId,
+						status: 1,
+						pageSize: this.pageSize
+					}
+				} else if(this.typeId == 2){
+					params = {
+						pageNum: pagenum,
+						couponId: this.couponId,
+						status: '2,3',
+						pageSize: this.pageSize
+					}
 				}
+
 				getCodeListByAgentCoupon(params).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
diff --git a/pages/user/mineCoupons/mineCoupons.vue b/pages/user/mineCoupons/mineCoupons.vue
index 60ec0e7..1b01ae8 100644
--- a/pages/user/mineCoupons/mineCoupons.vue
+++ b/pages/user/mineCoupons/mineCoupons.vue
@@ -195,10 +195,10 @@
 
 			.name {
 				width: 92%;
-				padding: 10upx 4%;
+				padding: 8upx 4%;
 				display: -webkit-box;
 				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
+				-webkit-line-clamp: 1;
 				text-align: justify;
 				overflow: hidden;
 				font-size: 30upx;
diff --git a/pages/user/mineCouponsDestails/mineCouponsDestails.vue b/pages/user/mineCouponsDestails/mineCouponsDestails.vue
index a26e2e4..ae3eda2 100644
--- a/pages/user/mineCouponsDestails/mineCouponsDestails.vue
+++ b/pages/user/mineCouponsDestails/mineCouponsDestails.vue
@@ -165,10 +165,10 @@
 
 			.name {
 				width: 92%;
-				padding: 10upx 4%;
+				padding: 8upx 4%;
 				display: -webkit-box;
 				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
+				-webkit-line-clamp: 1;
 				text-align: justify;
 				overflow: hidden;
 				font-size: 30upx;
diff --git a/pages/user/minePromotion/minePromotion.vue b/pages/user/minePromotion/minePromotion.vue
index 11f526d..047588e 100644
--- a/pages/user/minePromotion/minePromotion.vue
+++ b/pages/user/minePromotion/minePromotion.vue
@@ -10,8 +10,8 @@
 				<view class="promotion_xg flleft" style="margin-left: -6px;"></view>
 			</view>
 			<view class="width90 mart5 height22">
-				<view class="width50 flleft font18 fcor333 fontwig6 fotlt">7</view>
-				<view class="width50 flright font18 fcor333 fontwig6 fotrt">5300.00</view>
+				<view class="width50 flleft font18 fcor333 fontwig6 fotlt">{{agentList.orderCount}}</view>
+				<view class="width50 flright font18 fcor333 fontwig6 fotrt">{{agentList.turnoverPrice}}</view>
 			</view>
 			<view class="width90 mart10">
 				<view class="width50 flleft font15 fcor666 fontwig6 fotlt">今日订单</view>
@@ -33,22 +33,23 @@
 			</image>
 			<view class="pro_cont paddtop15">
 				<view class="flleft font16 fcor333 fontwig6  pro_title">
-					剩余库存(24)
+					剩余库存({{agentList.laveStockCount}})
 				</view>
 				<view class="pro_price fotrt  fcor333 font15 fontwig6">
-					总计 9500.00
+					总计 {{agentList.surplusCountPrice}}
 				</view>
 			</view>
 			<!-- //循环:class="[index==0?'colorfe':'']" -->
-			<view v-for="(mers,index) in minepros" :key="mers.id" class="pro_mok marb10 colore7" @click="jumpAgent(1)">
+			<view v-if="minepros == ''">暂无数据</view>
+			<view v-for="(mers,index) in minepros" :key="mers.id" class="pro_mok marb10 colore7" @click="jumpAgent(1,mers.couponId)">
 				<view class="width100 font14 fcor333 fontwig6 fotct paddtop10">
-					面额100
+					面额{{mers.salesPrice}}
 				</view>
 				<view class="width100 font14 fcor999 fotct mart10">
-					13张
+					{{mers.stockCount}}张
 				</view>
 				<view class="width100 font15 fcor333 fontwig6 fotct mart10">
-					1300
+					{{mers.salesPrice*mers.stockCount}}
 				</view>
 			</view>
 		</view>
@@ -67,22 +68,23 @@
 			</image>
 			<view class="pro_cont paddtop15">
 				<view class="flleft font16 fcor333 fontwig6  pro_title">
-					已销售(24)
+					已销售({{agentList.soldCount}})
 				</view>
 				<view class="pro_price fotrt  fcor333 font15 fontwig6">
-					总计 1129500.00
+					总计  {{agentList.salesCountPrice}}
 				</view>
 			</view>
+				<view v-if="minepros == ''">暂无数据</view>
 			<!-- //循环 -->
-			<view v-for="(mers,index) in minepros" :key="mers.id" class="pro_mok marb10 colore9" @click="jumpAgent(2)">
+			<view v-for="(mers,index) in minepros" :key="mers.id" class="pro_mok marb10 colore9" @click="jumpAgent(2,mers.couponId)">
 				<view class="width100 font14 fcor333 fontwig6 fotct paddtop10">
-					面额100
+					面额{{mers.salesPrice}}
 				</view>
 				<view class="width100 font14 fcor999 fotct mart10">
-					13张
+					{{mers.salesCount}}张
 				</view>
 				<view class="width100 font15 fcor333 fontwig6 fotct mart10">
-					1300
+					{{mers.salesPrice*mers.salesCount}}
 				</view>
 			</view>
 		</view>
@@ -96,26 +98,23 @@
 	export default {
 		data() {
 			return {
-				minepros: [{
-						id: 1
-					},
-					{
-						id: 1
-					},
-					{
-						id: 1
-					}
-				]
+				minepros: [],
+				agentList :[]
 			}
 		},
-		onLoad() {
+		
+		onShow(){
 			this.getAgentCount();
 		},
 		methods: {
 			//查询代理商信息
 			getAgentCount() {
 				getAgentCount().then(res => {
-					if (res.return_code == '000000') {} else {
+					if (res.return_code == '000000') {
+						this.agentList = res.return_data;
+						this.minepros = res.return_data.list
+					} else {
+						
 						uni.showToast({
 							title: res.return_msg,
 							icon: "none"
@@ -124,9 +123,9 @@
 				})
 			},
 			//跳转代理商卡券
-			jumpAgent(item) {
+			jumpAgent(item,items) {
 				uni.navigateTo({
-					url: '../agentCoupons/agentCoupons?id='+item
+					url: '../agentCoupons/agentCoupons?id='+item +'&couponsId='+ items
 				})
 			}
 		}