券和充值

@@ -6,10 +6,10 @@
 			支付剩余时间 {{countdown}}
 		</view>
 		<view class="money_text">
-			{{opt.totalize}}
+			￥{{opt.totalize}}
 		</view>
 		<view class="nameText font24r">
-			{{opt.detail.totalize}}
+			{{opt.detail.aname}}
 		</view>
 		<view class="nameText font24r">
 			{{opt.detail.name}}

@@ -100,6 +100,12 @@ Page({
             }
         })
     },
+	// 关注公众号
+	wananchi() {
+		wx.navigateTo({
+			url: '/pages/me/wananchi'
+		})
+	},
     // 轮询查询是否核销
     myUpdate() {
         var is_time = this.data.is_time //是否继续执行

@@ -96,7 +96,7 @@
 		<view class="font24r">1、到店消费时，请您向餐厅出示该二维码。</view>
 		<view class="font24r">2、从<text class="bold_box">周到安排</text>微信小程序，我的-优惠券，可以找到您的卡券。</view>
 		<view class="font24r">3、您也可以关注<text class="bold_box">周到安排</text>公众号，获取优惠券更多信息。</view>
-		<view class="font28r publicity">关注<text class="bold_box">周到安排</text>公众号，及时获取更多优惠券动态<view class="more" style="margin-left: 20rpx;"></view>
+		<view class="font28r publicity" bindtap="wananchi">关注<text class="bold_box">周到安排</text>公众号，及时获取更多优惠券动态<view class="more" style="margin-left: 20rpx;"></view>
 		</view>
 	</view>
 </view>
\ No newline at end of file

@@ -41,7 +41,7 @@
 	height: 100rpx;
 	position: absolute !important;
 	right: 12%;
-	top: -22rpx;
+	top: -30rpx;
 }
 
 .shop_name {
@@ -141,7 +141,6 @@
 	width: 100%;
 	display: flex;
 	align-items: center;
-	justify-content: space-between;
 	padding: 30rpx 20rpx;
 	box-sizing: border-box;
 }
@@ -149,6 +148,7 @@
 .canteen_box image {
 	height: 160rpx;
 	border-radius: 10rpx;
+	margin-right: 20rpx;
 }
 
 .info_right .font24r {
@@ -175,10 +175,11 @@
 }
 
 .publicity {
-	margin-top: 34rpx;
+	margin-top: 14rpx;
 	display: flex;
 	align-items: center;
 	justify-content: center;
+	padding: 20rpx 0;
 }
 
 .week {
@@ -219,5 +220,6 @@
 	padding-bottom: 24rpx;
 	position: relative;
 	top: -10rpx;
-	letter-spacing:2rpx;
+	letter-spacing:4rpx;
+	justify-content: flex-end;
 }
\ No newline at end of file

@@ -51,7 +51,7 @@
 
 
 .text_info {
-	color: #000;
+	color: #8f99a7;
 	font-family: PingFang SC;
 }
 

@@ -92,6 +92,6 @@
 	<view class="explain_news">{{detail.explain}}</view>
 </view>
 <view class="fixed_box">
-	<button class="font32r btns" bindtap="submitOrder">提交订单
+	<button class="font32r btns" bindtap="submitOrder">提交充值
 	</button>
 </view>
\ No newline at end of file

@@ -88,6 +88,7 @@ page {
 	align-items: center;
 	justify-content: space-between;
 	margin-bottom: 24rpx;
+	margin-left: 32rpx;
 }
 
 .bundle_left {
@@ -106,6 +107,7 @@ page {
 	align-items: center;
 	flex-wrap: wrap;
 	border-bottom: 2rpx solid #dbdbdb;
+	padding-left: 32rpx;
 }
 
 .item {

@@ -20,7 +20,7 @@
 			<!-- is_comment 1已评论   is_examine 1已核销   is_expire 1已过期-->
 			<button wx:if="{{item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'}}" bindtap="todetail" data-item="{{item}}" class="flex-cc card-info font30r font-bold smooth">去使用</button>
 			<button wx:if="{{item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1'}}" bindtap="todetail" data-item="{{item}}" class="flex-cc card-info font30r font-bold smooth">去评价</button>
-			<view class="font24r texts smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}} 至 {{util.unixtoTime(item.etime,'YYYY-MM-DD')}}</view>
+			<view class="font24r texts {{(item.is_examine=='1' || item.is_expire=='1' || item.status=='4' || item.status=='5')?'texts2':'texts1' }} smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}} 至 {{util.unixtoTime(item.etime,'YYYY-MM-DD')}}</view>
 		</view>
 	</block>
 	<block wx:if="{{list.length=='0' && isShow}}">

@@ -157,8 +157,14 @@
 	bottom: 0;
 	left: 0;
 	color: #fff;
+}
+
+.texts1{
 	background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
 }
+.texts2{
+	background:#DBDBDB;
+}
 .imgs1{
 	position: absolute !important;
 	right: 30%;