From e17b1dce4779b561d23e9b9a516227b612fe4304 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Wed, 22 Mar 2023 17:40:33 +0800
Subject: [PATCH] 2023-3-22

---
 mallplusui-uniapp-app/common/api.js                       | 4 ++--
 .../components/coolc-coupon/coolc-coupon.vue              | 5 ++---
 mallplusui-uniapp-app/pages/index/index.vue               | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/mallplusui-uniapp-app/common/api.js b/mallplusui-uniapp-app/common/api.js
index 7db1d22..e4a5762 100644
--- a/mallplusui-uniapp-app/common/api.js
+++ b/mallplusui-uniapp-app/common/api.js
@@ -2,8 +2,8 @@ import store from '../store/index';
 export default {
 	// qq 237524947 wx15d4269d3210863d
 	// BASEURI: 'http://je4r5e.natappfree.cc/api/',
-	// BASEURI: 'http://mall.yyundong.com/portalapi/api/',
-	BASEURI: 'http://192.168.3.9:8083/api/',
+	BASEURI: 'http://mall.yyundong.com/portalapi/api/',
+	// BASEURI: 'http://192.168.3.9:8083/api/',
 	ADMINURI: 'http://mall.yyundong.com/adminapi/',
 	ESURI: 'http://www.yyundong.com:8081/',
 	h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId  暂时测试用
diff --git a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
index b58b19d..0ca883e 100644
--- a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
+++ b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
@@ -4,7 +4,7 @@
 			<view class="nick">{{item.name}}</view>
 
 			<view style="display: flex;flex-direction: row;
-				align-items: center; margin-top: 10px;">
+				align-items: center; margin-top: 5px;">
 				<view class="layof" :style="{color:theme}">￥{{item.amount}}</view>
 				<view style="display: flex;flex-direction: column;flex: 1;" >
 
@@ -142,7 +142,7 @@
 		background: -webkit-linear-gradient(left, hsla(134, 66%, 66%, 0.5), hsla(53, 98%, 50%, 0.5), tomato) no-repeat;
 
 		.coupon-money {
-			padding: 15px;
+			padding:10px 15px;
 			width: 73.5%;
 			height: auto;
 			display: flex;
@@ -158,7 +158,6 @@
 				/*文本不换行*/
 				text-overflow: ellipsis;
 				/*ellipsis:文本溢出显示省略号（...）；clip：不显示省略标记（...），而是简单的裁切*/
-				line-height: 30upx;
 				font-size: $font-sm;
 				color: #ffaa00;
 				font-size: 18px;
diff --git a/mallplusui-uniapp-app/pages/index/index.vue b/mallplusui-uniapp-app/pages/index/index.vue
index e8569bb..566daaf 100644
--- a/mallplusui-uniapp-app/pages/index/index.vue
+++ b/mallplusui-uniapp-app/pages/index/index.vue
@@ -117,14 +117,14 @@
 		<view v-if='couponList && couponList.length>0' class="f-header m-t" @click="allAcceptCoupon">
 			<image src="/static/youhuiquan.png"></image>
 			<view class="tit-box">
-				<text class="tit">有可领取优惠券</text>
+				<text class="tit">{{ couponList.length}}张可领取优惠券</text>
 			</view>
 			<text class="get-btn">全部领取</text>
 		</view>
 
-		<coupon v-for="(item, index) in couponList" :key="index" v-bind:item="item" theme="#EB331E" ref="SubComponent"
+			<!-- <coupon v-for="(item, index) in couponList" :key="index" v-bind:item="item" theme="#EB331E" ref="SubComponent"
 			@callParentMethod="callParentMethod"></coupon>
-
+ -->
 		<!-- 	团购楼层
 		<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/groupList')"
 			v-if="groupHotGoodsList.length > 0">
@@ -1194,7 +1194,7 @@
 		}
 
 		.get-btn {
-				width: 80px;
+			width: 80px;
 			line-height: 45upx;
 			margin-right: 10px;
 			text-align: center;