xt / xcx-book · Commits

Go to a project

Commit b6c96dcac3a9dac45126d6a55053d1e67078077a

Authored by yiren
1 parent d1e747d2
build: skipped

券和充值

Inline Side-by-side
Showing 9 changed files with 26 additions and 10 deletions
@@ -6,10 +6,10 @@ @@ -6,10 +6,10 @@
6 支付剩余时间 {{countdown}} 6 支付剩余时间 {{countdown}}
7 </view> 7 </view>
8 <view class="money_text"> 8 <view class="money_text">
9 - {{opt.totalize}} 9 + ￥{{opt.totalize}}
10 </view> 10 </view>
11 <view class="nameText font24r"> 11 <view class="nameText font24r">
12 - {{opt.detail.totalize}} 12 + {{opt.detail.aname}}
13 </view> 13 </view>
14 <view class="nameText font24r"> 14 <view class="nameText font24r">
15 {{opt.detail.name}} 15 {{opt.detail.name}}
@@ -100,6 +100,12 @@ Page({ @@ -100,6 +100,12 @@ Page({
100 } 100 }
101 }) 101 })
102 }, 102 },
  103 + // 关注公众号
  104 + wananchi() {
  105 + wx.navigateTo({
  106 + url: '/pages/me/wananchi'
  107 + })
  108 + },
103 // 轮询查询是否核销 109 // 轮询查询是否核销
104 myUpdate() { 110 myUpdate() {
105 var is_time = this.data.is_time //是否继续执行 111 var is_time = this.data.is_time //是否继续执行
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 <view class="font24r">1、到店消费时，请您向餐厅出示该二维码。</view> 96 <view class="font24r">1、到店消费时，请您向餐厅出示该二维码。</view>
97 <view class="font24r">2、从<text class="bold_box">周到安排</text>微信小程序，我的-优惠券，可以找到您的卡券。</view> 97 <view class="font24r">2、从<text class="bold_box">周到安排</text>微信小程序，我的-优惠券，可以找到您的卡券。</view>
98 <view class="font24r">3、您也可以关注<text class="bold_box">周到安排</text>公众号，获取优惠券更多信息。</view> 98 <view class="font24r">3、您也可以关注<text class="bold_box">周到安排</text>公众号，获取优惠券更多信息。</view>
99 - <view class="font28r publicity">关注<text class="bold_box">周到安排</text>公众号，及时获取更多优惠券动态<view class="more" style="margin-left: 20rpx;"></view> 99 + <view class="font28r publicity" bindtap="wananchi">关注<text class="bold_box">周到安排</text>公众号，及时获取更多优惠券动态<view class="more" style="margin-left: 20rpx;"></view>
100 </view> 100 </view>
101 </view> 101 </view>
102 </view> 102 </view>
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 height: 100rpx; 41 height: 100rpx;
42 position: absolute !important; 42 position: absolute !important;
43 right: 12%; 43 right: 12%;
44 - top: -22rpx; 44 + top: -30rpx;
45 } 45 }
46 46
47 .shop_name { 47 .shop_name {
@@ -141,7 +141,6 @@ @@ -141,7 +141,6 @@
141 width: 100%; 141 width: 100%;
142 display: flex; 142 display: flex;
143 align-items: center; 143 align-items: center;
144 - justify-content: space-between;  
145 padding: 30rpx 20rpx; 144 padding: 30rpx 20rpx;
146 box-sizing: border-box; 145 box-sizing: border-box;
147 } 146 }
@@ -149,6 +148,7 @@ @@ -149,6 +148,7 @@
149 .canteen_box image { 148 .canteen_box image {
150 height: 160rpx; 149 height: 160rpx;
151 border-radius: 10rpx; 150 border-radius: 10rpx;
  151 + margin-right: 20rpx;
152 } 152 }
153 153
154 .info_right .font24r { 154 .info_right .font24r {
@@ -175,10 +175,11 @@ @@ -175,10 +175,11 @@
175 } 175 }
176 176
177 .publicity { 177 .publicity {
178 - margin-top: 34rpx; 178 + margin-top: 14rpx;
179 display: flex; 179 display: flex;
180 align-items: center; 180 align-items: center;
181 justify-content: center; 181 justify-content: center;
  182 + padding: 20rpx 0;
182 } 183 }
183 184
184 .week { 185 .week {
@@ -219,5 +220,6 @@ @@ -219,5 +220,6 @@
219 padding-bottom: 24rpx; 220 padding-bottom: 24rpx;
220 position: relative; 221 position: relative;
221 top: -10rpx; 222 top: -10rpx;
222 - letter-spacing:2rpx; 223 + letter-spacing:4rpx;
  224 + justify-content: flex-end;
223 } 225 }
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 51
52 52
53 .text_info { 53 .text_info {
54 - color: #000; 54 + color: #8f99a7;
55 font-family: PingFang SC; 55 font-family: PingFang SC;
56 } 56 }
57 57
@@ -92,6 +92,6 @@ @@ -92,6 +92,6 @@
92 <view class="explain_news">{{detail.explain}}</view> 92 <view class="explain_news">{{detail.explain}}</view>
93 </view> 93 </view>
94 <view class="fixed_box"> 94 <view class="fixed_box">
95 - <button class="font32r btns" bindtap="submitOrder">提交订单 95 + <button class="font32r btns" bindtap="submitOrder">提交充值
96 </button> 96 </button>
97 </view> 97 </view>
@@ -88,6 +88,7 @@ page { @@ -88,6 +88,7 @@ page {
88 align-items: center; 88 align-items: center;
89 justify-content: space-between; 89 justify-content: space-between;
90 margin-bottom: 24rpx; 90 margin-bottom: 24rpx;
  91 + margin-left: 32rpx;
91 } 92 }
92 93
93 .bundle_left { 94 .bundle_left {
@@ -106,6 +107,7 @@ page { @@ -106,6 +107,7 @@ page {
106 align-items: center; 107 align-items: center;
107 flex-wrap: wrap; 108 flex-wrap: wrap;
108 border-bottom: 2rpx solid #dbdbdb; 109 border-bottom: 2rpx solid #dbdbdb;
  110 + padding-left: 32rpx;
109 } 111 }
110 112
111 .item { 113 .item {
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <!-- is_comment 1已评论 is_examine 1已核销 is_expire 1已过期--> 20 <!-- is_comment 1已评论 is_examine 1已核销 is_expire 1已过期-->
21 <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> 21 <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>
22 <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> 22 <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>
23 - <view class="font24r texts smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}} 至 {{util.unixtoTime(item.etime,'YYYY-MM-DD')}}</view> 23 + <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>
24 </view> 24 </view>
25 </block> 25 </block>
26 <block wx:if="{{list.length=='0' && isShow}}"> 26 <block wx:if="{{list.length=='0' && isShow}}">
@@ -157,8 +157,14 @@ @@ -157,8 +157,14 @@
157 bottom: 0; 157 bottom: 0;
158 left: 0; 158 left: 0;
159 color: #fff; 159 color: #fff;
  160 +}
  161 +
  162 +.texts1{
160 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 163 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
161 } 164 }
  165 +.texts2{
  166 + background:#DBDBDB;
  167 +}
162 .imgs1{ 168 .imgs1{
163 position: absolute !important; 169 position: absolute !important;
164 right: 30%; 170 right: 30%;