优惠券展示调整

pagesA/activityTask/activityTask.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="pad-x180">
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'活动任务'" :statusTitle="true"></status-nav>
 		<view :style="{paddingTop: statusHeight+'px'}" class="pad-zy32 pad-x20">

pagesA/coupon/coupon.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="pad-x180">
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'优惠券'" :statusTitle="true"></status-nav>
 		<view id="daoh" class="bacf pad-zy40 pad-sx20 isTopf fon28 col3 disjbac" :style="{top:statusHeight+'px'}">
@@ -14,7 +14,7 @@
 							<image v-if="item.statusNum!=0 && item.statusNum!=2" class="posia quan-img" src="/static/public/quan-left-two.png" mode=""></image>
 							<image v-else class="posia quan-img" src="/static/public/quan-left.png" mode=""></image>
 							<view class="posir disjcac fc" style="z-index: 1;">
-								<view class="fon28 mar-s20 mar-x36"><span v-if="!item.isTiyan && !item.isZhek">￥</span><span class="bold" style="font-size: 56rpx;">{{item.num}}</span></view>
+								<view class="fon28 mar-s20 mar-x36"><span v-if="item.type == 'taste'">￥</span><span class="bold" style="font-size: 56rpx;">{{item.num}}</span><span v-if="item.type == 'discount'">折</span></view>
 								<view v-if="item.statusNum==0 || item.statusNum==2" @tap="useEv(index)" class="fon24 quan-btn">{{item.statusNum==2?'立即领取':'立即使用'}}</view>
 							</view>
 						</view>
@@ -126,7 +126,8 @@
 									endTime:item.end_at.slice(0,10),
 									isTiyan:leix,
 									isZhek:false,
-									statusNum:index
+									statusNum:index,
+									type:item.type
 								}
 								this.dataList.push(obj);//渲染的列表
 								this.zcList.push(obj);//暂存的列表

pagesA/makeAnPppointment/makeAnPppointment.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="pad-x180">
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'自主预约'" :statusTitle="true"></status-nav>
 		<!-- 自定义二级分类 -->

pagesA/member/member.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="pad-x180">
 		<!-- 状态栏 -->
 		<status-nav :backgroudColor="publicColor" :tabcolor="publicColor"  :statusTitle="true" :backColor="1"></status-nav>
 		<image src="/static/public/member-head.png" style="position: absolute;top: 0;left: 0;right: 0;height: 436rpx;width: 100%;"></image>

pagesA/my-diary/my-diary.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="pad-x180">
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'我的日记'" :statusTitle="true"></status-nav>
 		<view :style="{paddingTop: statusHeight+'px'}" class="pad-zy30" style="padding-bottom: 160rpx;">

pagesA/myAddress/myAddress.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="pad-x180">
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'地址管理'" :statusTitle="true"></status-nav>
 		<view :style="{paddingTop:statusHeight+'px'}" class="mar-sx20 pad-zy32" style="padding-bottom: 150rpx;">

pagesA/signIn/signIn.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="pad-x180">
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'签到管理'" :statusTitle="true"></status-nav>
 		<view v-if="loading" :style="{paddingTop: statusHeight+'px'}" class=" fon28 col3">

pagesB/couponGroup/couponGroup.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="pad-x180">
+	<view class="pad-x180" style="padding-bottom: 240rpx;">
 		<!-- 状态栏 -->
 		<status-nav :titleVal="title" :statusTitle="true"></status-nav>
 		<!-- 列表 -->
@@ -14,7 +14,7 @@
 							<image v-if="item.get" class="posia quan-img" src="/static/public/quan-left-two.png" mode=""></image>
 							<image v-else class="posia quan-img" src="/static/public/quan-left.png" mode=""></image>
 							<view class="posir disjcac fc" style="z-index: 1;">
-								<view class="fon28 mar-s20 mar-x36"><span>￥</span><span class="bold" style="font-size: 56rpx;">{{item.num}}</span></view>
+								<view class="fon28 mar-s20 mar-x36"><span v-if="item.type == 'taste'">￥</span><span class="bold" style="font-size: 56rpx;">{{item.num}}</span><span v-if="item.type == 'discount'">折</span></view>
 								<view @tap="useEv(item.id)" class="fon24 quan-btn" :style="{color: item.get ? '#b3b3b3' : '#3875F6'}">{{['立即领取','已领取'][item.get]}}</view>
 							</view>
 						</view>
@@ -26,7 +26,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="posixzy bacf pad-sx25">
+			<view class="posixzy bacf pad-sx25" style="background: none; bottom: 150rpx;">
 				<view @tap="allReceive" class="fon30 radius20 tc colf bold" style="margin: 0 83rpx;height: 90rpx;line-height: 90rpx;" :style="{background:publicColor}">{{['一键领取','立即使用'][dataList[0].get]}}</view>
 			</view>
 		</view>
@@ -108,6 +108,7 @@
 			},
 			checkAllList(group_id){//查询所有优惠券列表
 				this.$requst.post('user/get-coupon-group-info',{group_id}).then(res=>{
+					console.log(res,'优惠券列表')
 					if(res.code==0){
 						this.groupId = res.data.id;
 						this.title = res.data.title;
@@ -124,7 +125,8 @@
 									manPrice:item.condition/100,
 									startTime:item.begin_at.slice(0,10),
 									endTime:item.end_at.slice(0,10),
-									get:item.get
+									get:item.get,
+									type:item.type
 								}
 								this.dataList.push(obj);//渲染的列表
 								this.zcList.push(obj);//暂存的列表

pagesB/messagecenter/messagecenter.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="pad-x180">
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'消息'" :whereCome="comeNum" :statusTitle="true"></status-nav>
 		<view id="daoh" class="bacf pad-zy30 pad-sx20 isTopf fon28 col3 disja" :style="{top:statusHeight+'px'}">

pagesB/myCollection/myCollection.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="pad-x180">
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'收藏'" :statusTitle="true"></status-nav>
 		<!-- 自定义二级分类 -->