xt / xcx-book · Commits

Go to a project

Commit a8941617cc15c85ef05771c3491fcbbd1cb1c208

Authored by pengye
1 parent fdf2d94c
build: skipped

回退样式修改前

Inline Side-by-side
Showing 68 changed files with 1021 additions and 2012 deletions
@@ -64,14 +64,7 @@ @@ -64,14 +64,7 @@
64 "pages/customer/detail_owner_invitation_new", 64 "pages/customer/detail_owner_invitation_new",
65 "pages/me/invitation", 65 "pages/me/invitation",
66 "pages/reserve/index_new", 66 "pages/reserve/index_new",
67 - "pages/reserve/sellerGift",  
68 - "pages/reserveNew/collect",  
69 - "pages/reserveNew/index",  
70 - "pages/reserveNew/my",  
71 - "pages/reserveNew/itinerary",  
72 - "pages/reserveNew/personInfo",  
73 - "pages/reserveNew/verifyPhone",  
74 - "pages/reserveNew/coupon_sellerList" 67 + "pages/reserve/sellerGift"
75 ], 68 ],
76 "requiredPrivateInfos": [ 69 "requiredPrivateInfos": [
77 "getLocation", 70 "getLocation",
@@ -184,36 +177,6 @@ @@ -184,36 +177,6 @@
184 "navigationBarTitleText": "周到安排", 177 "navigationBarTitleText": "周到安排",
185 "navigationBarTextStyle": "black" 178 "navigationBarTextStyle": "black"
186 }, 179 },
187 - "tabBar": {  
188 - "color": "#696969",  
189 - "selectedColor": "#ff5a0b",  
190 - "list": [  
191 - {  
192 - "pagePath": "pages/reserveNew/index",  
193 - "iconPath": "./pages/image/shop.png",  
194 - "selectedIconPath": "./pages/image/shopActive.png",  
195 - "text": "找店"  
196 - },  
197 - {  
198 - "pagePath": "pages/reserveNew/collect",  
199 - "iconPath": "./pages/image/collect.png",  
200 - "selectedIconPath": "./pages/image/collectActive.png",  
201 - "text": "收藏"  
202 - },  
203 - {  
204 - "pagePath": "pages/reserveNew/itinerary",  
205 - "iconPath": "./pages/image/itinerary.png",  
206 - "selectedIconPath": "./pages/image/itineraryActive.png",  
207 - "text": "行程"  
208 - },  
209 - {  
210 - "pagePath": "pages/reserveNew/my",  
211 - "iconPath": "./pages/image/my.png",  
212 - "selectedIconPath": "./pages/image/myActive.png",  
213 - "text": "我的"  
214 - }  
215 - ]  
216 - },  
217 "networkTimeout": { 180 "networkTimeout": {
218 "request": 10000, 181 "request": 10000,
219 "downloadFile": 10000 182 "downloadFile": 10000
@@ -5,23 +5,23 @@ @@ -5,23 +5,23 @@
5 <view class="view round margin-right-sm" 5 <view class="view round margin-right-sm"
6 style="width: 60rpx;height: 60rpx; background-image: url('{{seller.seller_image}}');"> 6 style="width: 60rpx;height: 60rpx; background-image: url('{{seller.seller_image}}');">
7 </view> 7 </view>
8 - <view class="view text-cut flex-treble text-bold">  
9 - <view class="view text-lg text-cut Medium text-bold">{{seller.sellername}}</view> 8 + <view class="view text-cut flex-treble">
  9 + <view class="view text-lg text-cut Medium">{{seller.sellername}}</view>
10 </view> 10 </view>
11 - <!-- <view class="view margin-left-sm text-blue text-lg Medium"> 11 + <view class="view margin-left-sm text-blue text-lg Medium">
12 <image src="http://nosqn.colorcun.com/detail/x%20%2815%29.png" style="width:28rpx;height: 30rpx;"></image> 12 <image src="http://nosqn.colorcun.com/detail/x%20%2815%29.png" style="width:28rpx;height: 30rpx;"></image>
13 - </view> --> 13 + </view>
14 </view> 14 </view>
15 <view class="view margin-top"> 15 <view class="view margin-top">
16 <view class="view flex align-center" style="margin-bottom: 44rpx;"> 16 <view class="view flex align-center" style="margin-bottom: 44rpx;">
17 - <view class="view flex-sub bg-white Medium text-df">预订时间</view>  
18 - <view class="view flex-treble text-bold">  
19 - <view class="value text-df">{{reserve.ddateStr}}，{{ddate_Str}}</view> 17 + <view class="view flex-sub bg-white Medium">预订时间</view>
  18 + <view class="view flex-treble text-bold" style="font-size: 36rpx;">
  19 + <view class="value">{{reserve.ddateStr}}，{{ddate_Str}}</view>
20 </view> 20 </view>
21 </view> 21 </view>
22 <view class="view flex align-center"> 22 <view class="view flex align-center">
23 - <view class="view flex-sub bg-white Medium text-df" style="min-width: 140rpx;">包间类型</view>  
24 - <view class="view flex-treble text-bold text-cut text-df"> 23 + <view class="view flex-sub bg-white Medium" style="min-width: 140rpx;">包间类型</view>
  24 + <view class="view flex-treble text-bold text-cut" style="font-size: 36rpx;">
25 {{util.replace(reserve.tables,',','，')}} 25 {{util.replace(reserve.tables,',','，')}}
26 </view> 26 </view>
27 </view> 27 </view>
@@ -129,7 +129,7 @@ Component({ @@ -129,7 +129,7 @@ Component({
129 if(action.type=="tap"){ 129 if(action.type=="tap"){
130 if(res.data==0){ 130 if(res.data==0){
131 wx.navigateTo({ 131 wx.navigateTo({
132 - url:'/pages/pinglun/createOpinion?sellid='+this.data.reserve.seller.id+'&oid='+this.data.reserve.id+'&sellerName='+this.data.reserve.seller.sellername+'&types=1' 132 + url:'/pages/pinglun/create?sid='+this.data.reserve.seller.id+'&oid='+this.data.reserve.id+'&sellername='+this.data.reserve.seller.sellername
133 }) 133 })
134 }else{ 134 }else{
135 wx.showToast({ 135 wx.showToast({
1 <!--components/2.0/reserve/card.wxml--> 1 <!--components/2.0/reserve/card.wxml-->
2 <wxs src="../../../../utils/util.wxs" module="util" /> 2 <wxs src="../../../../utils/util.wxs" module="util" />
3 -<view class="view margin-lr-lg margin-top-lg solid padding padding-bottom-lg backF"> 3 +<view class="view margin-lr-lg margin-top-lg solid radius padding padding-bottom-lg" style="box-shadow: 0px 0px 20rpx 0px #EEF0F2;">
4 <view class="view flex padding-bottom solid-bottom align-start"> 4 <view class="view flex padding-bottom solid-bottom align-start">
5 <view class="view round margin-right-sm" 5 <view class="view round margin-right-sm"
6 style="width: 60rpx;height: 60rpx; background-image: url('{{reserve.seller.seller_image}}');"> 6 style="width: 60rpx;height: 60rpx; background-image: url('{{reserve.seller.seller_image}}');">
7 </view> 7 </view>
8 <view class="view text-cut flex-treble"> 8 <view class="view text-cut flex-treble">
9 - <view class="view text-lg text-cut text-bold" style="margin-bottom: 16rpx;">{{reserve.seller.sellername}}</view> 9 + <view class="view text-lg text-cut Medium" style="margin-bottom: 16rpx;">{{reserve.seller.sellername}}</view>
10 <view class="view text-df bg-white text-cut">{{reserve.seller.map_address}}</view> 10 <view class="view text-df bg-white text-cut">{{reserve.seller.map_address}}</view>
11 </view> 11 </view>
12 <view class="view margin-left-sm text-blue text-lg Medium flex justify-end" 12 <view class="view margin-left-sm text-blue text-lg Medium flex justify-end"
13 bindtap="asPhone" 13 bindtap="asPhone"
14 style="min-width: 100rpx;"> 14 style="min-width: 100rpx;">
15 - <image src="https://qn.colorcun.com/phoneIcon.png" style="width: 52rpx;height: 52rpx;"></image> 15 + <image src="http://nosqn.colorcun.com/detail/x%20%2811%29.png" style="width: 40rpx;height: 40rpx;"></image>
16 </view> 16 </view>
17 </view> 17 </view>
18 <view class="view"> 18 <view class="view">
19 <view class="view flex align-center margin-top"> 19 <view class="view flex align-center margin-top">
20 - <view class="view flex-sub bg-white Medium texts">预订时间</view>  
21 - <view class="view flex-treble text-bold text-df heiView"> 20 + <view class="view flex-sub bg-white Medium" style="min-width: 172rpx;">预订时间</view>
  21 + <view class="view flex-treble text-bold text-lg">
22 <view class="value" wx:if="{{reserve.hasOnlineReserve || reserve.hasUpdateDate || reserve.type==0}}"> 22 <view class="value" wx:if="{{reserve.hasOnlineReserve || reserve.hasUpdateDate || reserve.type==0}}">
23 - <text wx:if="{{reserve.ddate>0}}" class="font28r">{{util.unixtoTime(reserve.ddate||'','MM月DD日')}}　{{ddate_Str}}</text> 23 + <text wx:if="{{reserve.ddate>0}}">{{util.unixtoTime(reserve.ddate||'','MM月DD日')}}　{{ddate_Str}}</text>
24 </view> 24 </view>
25 <view class="value" wx:else="">{{reserve.rdateStr}}</view> 25 <view class="value" wx:else="">{{reserve.rdateStr}}</view>
26 </view> 26 </view>
27 </view> 27 </view>
28 <view class="view flex align-center margin-top"> 28 <view class="view flex align-center margin-top">
29 - <view class="view flex-sub bg-white Medium texts">包间类型</view>  
30 - <view class="view flex-treble text-bold text-cut text-df heiView font28r"> 29 + <view class="view flex-sub bg-white Medium" style="min-width: 172rpx;">包间类型</view>
  30 + <view class="view flex-treble text-bold text-cut text-lg">
31 {{reserve.tableFirst||util.getRoomName(reserve.room_demand)}} 31 {{reserve.tableFirst||util.getRoomName(reserve.room_demand)}}
32 </view> 32 </view>
33 </view> 33 </view>
34 <view class="view flex align-center margin-top"> 34 <view class="view flex align-center margin-top">
35 - <view class="view flex-sub bg-white Medium texts">预订人</view>  
36 - <view class="view flex-treble text-cut text-df heiView font28r text1"> 35 + <view class="view flex-sub bg-white Medium" style="min-width: 172rpx;">预订人</view>
  36 + <view class="view flex-treble text-cut text-lg">
37 {{reserve.rname}} 37 {{reserve.rname}}
38 </view> 38 </view>
39 </view> 39 </view>
40 <view class="view flex align-center margin-top"> 40 <view class="view flex align-center margin-top">
41 - <view class="view flex-sub bg-white Medium texts">电话</view>  
42 - <view class="view flex-treble text-cut text-df heiView font28r text1"> 41 + <view class="view flex-sub bg-white Medium" style="min-width: 172rpx;">联系电话</view>
  42 + <view class="view flex-treble text-cut text-lg">
43 {{reserve.phone?reserve.phoneMask:''}} 43 {{reserve.phone?reserve.phoneMask:''}}
44 </view> 44 </view>
45 </view> 45 </view>
46 <view class="view flex align-center margin-top" wx:if="{{reserve.cusdem}}"> 46 <view class="view flex align-center margin-top" wx:if="{{reserve.cusdem}}">
47 - <view class="view flex-sub bg-white Medium texts">备注</view>  
48 - <view class="view flex-treble text-cut text-df heiView font28r text1"> 47 + <view class="view flex-sub bg-white Medium" style="min-width: 172rpx;">备注信息</view>
  48 + <view class="view flex-treble text-cut text-lg">
49 {{reserve.cusdem}} 49 {{reserve.cusdem}}
50 </view> 50 </view>
51 </view> 51 </view>
1 /* components/2.0/reserve/card.wxss */ 1 /* components/2.0/reserve/card.wxss */
2 @import "/colorui/main.wxss"; 2 @import "/colorui/main.wxss";
3 -  
4 -.backF {  
5 - background: #fff;  
6 - margin: 12rpx;  
7 - border-radius: 10rpx;  
8 -}  
9 -  
10 -.texts {  
11 - width: 112rpx;  
12 - text-align: justify;  
13 - height: 76rpx;  
14 - line-height: 76rpx;  
15 - margin-right: 40rpx;  
16 -}  
17 -  
18 -.heiView,.heiView view {  
19 - height: 76rpx;  
20 - line-height: 76rpx;  
21 -}  
22 -  
23 -.texts:after {  
24 - content: '';  
25 - display: inline-block;  
26 - width: 100%;  
27 -}  
28 -  
29 -.text1 {  
30 - color: #696969;  
31 -}  
@@ -2,43 +2,43 @@ @@ -2,43 +2,43 @@
2 const STATUS=[ 2 const STATUS=[
3 //'待确认',//0：待确认 3 //'待确认',//0：待确认
4 { 4 {
5 - icon:'https://qn.colorcun.com/processingIcon.png', 5 + icon:'http://nosqn.colorcun.com/detail/s%20%281%29.png',//http://nosqn.colorcun.com/detail/s%20%284%29.png
6 title:'提交成功，商家处理中',//商家休息中 6 title:'提交成功，商家处理中',//商家休息中
7 msg:'预计10分钟左右短信或微信告知您结果',//预计{rec_stime}左右营业并告知您结果 7 msg:'预计10分钟左右短信或微信告知您结果',//预计{rec_stime}左右营业并告知您结果
8 }, 8 },
9 //'已预订',//1：已定座 9 //'已预订',//1：已定座
10 { 10 {
11 - icon:'https://qn.colorcun.com/bookSuccess.png', 11 + icon:'http://nosqn.colorcun.com/detail/s%20%283%29.png',
12 title:'订座成功', 12 title:'订座成功',
13 msg:'选择通知好友将订座信息分享给朋友', 13 msg:'选择通知好友将订座信息分享给朋友',
14 }, 14 },
15 //'已完成',//2：确认到店（到店） 15 //'已完成',//2：确认到店（到店）
16 { 16 {
17 - icon:'https://qn.colorcun.com/bookSuccess.png', 17 + icon:'http://nosqn.colorcun.com/detail/s%20%283%29.png',
18 title:'订座成功', 18 title:'订座成功',
19 msg:'选择通知好友将订座信息分享给朋友', 19 msg:'选择通知好友将订座信息分享给朋友',
20 }, 20 },
21 //'已完成',//3：用餐完成（离店） 21 //'已完成',//3：用餐完成（离店）
22 { 22 {
23 - icon:'https://qn.colorcun.com/bookSuccess.png', 23 + icon:'http://nosqn.colorcun.com/detail/s%20%283%29.png',
24 title:'已完成', 24 title:'已完成',
25 msg:'您的订单已完成', 25 msg:'您的订单已完成',
26 }, 26 },
27 //'已取消',//4：取消预定 27 //'已取消',//4：取消预定
28 { 28 {
29 - icon:'https://qn.colorcun.com/bookCancel.png', 29 + icon:'http://nosqn.colorcun.com/detail/s%20%282%29.png',
30 title:'已取消', 30 title:'已取消',
31 msg:'订单已取消，如有需要请重新预订', 31 msg:'订单已取消，如有需要请重新预订',
32 }, 32 },
33 //'已预订',//5：C端在线预定（分配包间） 33 //'已预订',//5：C端在线预定（分配包间）
34 { 34 {
35 - icon:'https://qn.colorcun.com/bookSuccess.png', 35 + icon:'http://nosqn.colorcun.com/detail/s%20%283%29.png',
36 title:'订座成功', 36 title:'订座成功',
37 msg:'选择通知好友将订座信息分享给朋友', 37 msg:'选择通知好友将订座信息分享给朋友',
38 }, 38 },
39 //'已拒绝'//6：拒单 39 //'已拒绝'//6：拒单
40 { 40 {
41 - icon:'https://qn.colorcun.com/detail/bookCancel.png', 41 + icon:'http://nosqn.colorcun.com/detail/s%20%282%29.png',
42 title:'包间已订满', 42 title:'包间已订满',
43 msg:'周到安排可帮您抢订，并推荐更多优质餐厅', 43 msg:'周到安排可帮您抢订，并推荐更多优质餐厅',
44 }, 44 },
1 <!--components/2.0/reserve/detail/status.wxml--> 1 <!--components/2.0/reserve/detail/status.wxml-->
2 -<view class="view padding-lg flex align-center backF"> 2 +<view class="view padding-lg flex align-center">
3 <image src="{{icon}}" style="width:88rpx;height: 88rpx;"></image> 3 <image src="{{icon}}" style="width:88rpx;height: 88rpx;"></image>
4 <view class="view flex-treble margin-left"> 4 <view class="view flex-treble margin-left">
5 <view class="txt-44-h text-bold">{{title}}</view> 5 <view class="txt-44-h text-bold">{{title}}</view>
1 /* components/2.0/reserve/detail/status.wxss */ 1 /* components/2.0/reserve/detail/status.wxss */
2 -@import "/colorui/main.wxss";  
3 -  
4 -.backF {  
5 - background: #fff;  
6 - margin: 12rpx;  
7 - border-radius: 10rpx;  
8 -}  
  2 +@import "/colorui/main.wxss";
@@ -12,6 +12,4 @@ @@ -12,6 +12,4 @@
12 -webkit-tap-highlight-color: transparent; 12 -webkit-tap-highlight-color: transparent;
13 color: inherit; 13 color: inherit;
14 width: 100%; 14 width: 100%;
15 - position: relative;  
16 - top: -20rpx;  
17 } 15 }
@@ -42,19 +42,19 @@ Component({ @@ -42,19 +42,19 @@ Component({
42 type: String, 42 type: String,
43 value: '', 43 value: '',
44 }, 44 },
45 - modalTop: { 45 + top: {
46 type: String, 46 type: String,
47 value: '' 47 value: ''
48 }, 48 },
49 - modalBottom: { 49 + bottom: {
50 type: String, 50 type: String,
51 value: '' 51 value: ''
52 }, 52 },
53 - modaLeft: { 53 + left: {
54 type: String, 54 type: String,
55 value: '' 55 value: ''
56 }, 56 },
57 - modalRight: { 57 + right: {
58 type: String, 58 type: String,
59 value: '' 59 value: ''
60 }, 60 },
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!--遮罩层--> 2 <!--遮罩层-->
3 <view class='mask' wx:if="{{showModalStatus}}" style="opacity:{{opacity}}"></view> 3 <view class='mask' wx:if="{{showModalStatus}}" style="opacity:{{opacity}}"></view>
4 <!--弹出模态框--> 4 <!--弹出模态框-->
5 -<view class='mymodal' wx:if="{{showModalStatus}}" style="width:{{width}};height:{{height}};top:{{modalTop}};bottom:{{modalBottom}};left:{{modaLeft}};right:{{modalRight}}"> 5 +<view class='mymodal' wx:if="{{showModalStatus}}" style='width:{{width}};height:{{height}};top:{{top}};bottom:{{bottom}};left:{{left}};right:{{right}}'>
6 <!-- 模态框title --> 6 <!-- 模态框title -->
7 <view class='mymodal-title'> 7 <view class='mymodal-title'>
8 <slot name="modalName"></slot> 8 <slot name="modalName"></slot>
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <block wx:for="{{daylist}}" wx:for-item="itemlist" wx:for-index="indexlist" wx:key="{{indexlist}}"> 21 <block wx:for="{{daylist}}" wx:for-item="itemlist" wx:for-index="indexlist" wx:key="{{indexlist}}">
22 <view class="calendar-week-day flex-lr"> 22 <view class="calendar-week-day flex-lr">
23 <block wx:for="{{itemlist.list}}" wx:key="{{index}}"> 23 <block wx:for="{{itemlist.list}}" wx:key="{{index}}">
24 - <view class="{{item.overdate ? 'txt-e5e5e5' : ('font-font color-'+(index%6))}} calendar-day flex-cc font30r {{item.istoday ? 'today' : ''}} {{item.isselected ? 'backColor white-font' : ''}}" data-date="{{item.date}}" catchtap="{{item.overdate ? '' : 'selectdate'}}">{{item.mark ? item.mark : item.day}}</view> 24 + <view class="{{item.overdate ? 'txt-e5e5e5' : ('font-font color-'+(index%6))}} calendar-day flex-cc font30r {{item.istoday ? 'today' : ''}} {{item.isselected ? 'bg-yellow white-font' : ''}}" data-date="{{item.date}}" catchtap="{{item.overdate ? '' : 'selectdate'}}">{{item.mark ? item.mark : item.day}}</view>
25 </block> 25 </block>
26 </view> 26 </view>
27 </block> 27 </block>
@@ -58,19 +58,13 @@ @@ -58,19 +58,13 @@
58 box-sizing: border-box; 58 box-sizing: border-box;
59 } 59 }
60 .calendar-day.today{ 60 .calendar-day.today{
61 - border:2rpx solid #fe6806; 61 + border:2rpx solid #42A5FF;
62 } 62 }
63 .calendar-day.bg-yellow{ 63 .calendar-day.bg-yellow{
64 background: linear-gradient(180deg, #3BBFF5 0%, #57A0FF 100%); 64 background: linear-gradient(180deg, #3BBFF5 0%, #57A0FF 100%);
65 border-width:0; 65 border-width:0;
66 color: #ffffff!important; 66 color: #ffffff!important;
67 } 67 }
68 -  
69 -.calendar-day.backColor {  
70 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
71 - border-width:0;  
72 - color: #ffffff!important;  
73 -}  
74 -.color-0 {  
75 - color:#fe6806; 68 +.color-0{
  69 + color:#42A5FF;
76 } 70 }
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <block wx:for="{{roomlist}}" wx:key="{{index}}"> 2 <block wx:for="{{roomlist}}" wx:key="{{index}}">
3 <block wx:if="{{item.status==1}}"> 3 <block wx:if="{{item.status==1}}">
4 <view class="room-item black-font {{((item.isFull && item.isFull==1) || (item.isorderFull && item.isorderFull==1)) && false ? 'bg-gray' : 'bg-yellow'}} {{item.selectnum>0?'border-yellow':''}} flex-vl" style="justify-content:center;" data-id="{{item.id}}" data-index="{{index}}" data-selectnum="{{item.selectnum ? item.selectnum : 0}}" data-fid="{{item.fid ? item.fid : null}}" catchtap="selectroom"> 4 <view class="room-item black-font {{((item.isFull && item.isFull==1) || (item.isorderFull && item.isorderFull==1)) && false ? 'bg-gray' : 'bg-yellow'}} {{item.selectnum>0?'border-yellow':''}} flex-vl" style="justify-content:center;" data-id="{{item.id}}" data-index="{{index}}" data-selectnum="{{item.selectnum ? item.selectnum : 0}}" data-fid="{{item.fid ? item.fid : null}}" catchtap="selectroom">
5 - <view class="font28r font-bold" style="text-align: center;width:100%;padding-right:62rpx;box-sizing:border-box; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item.name}}</view> 5 + <view class="font30r font-bold" style="width:100%;padding-right:62rpx;box-sizing:border-box; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item.name}}</view>
6 <block wx:if="{{item.max && item.max!=0}}"> 6 <block wx:if="{{item.max && item.max!=0}}">
7 <view class="font24r room-more">最多可坐{{item.max}}人</view> 7 <view class="font24r room-more">最多可坐{{item.max}}人</view>
8 </block> 8 </block>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 border:2rpx solid #cccccc; 18 border:2rpx solid #cccccc;
19 } 19 }
20 .border-yellow{ 20 .border-yellow{
21 - border:2rpx solid #fe6806; 21 + border:2rpx solid #42A5FF;
22 } 22 }
23 .bg-yellow{ 23 .bg-yellow{
24 background: #ffffff; 24 background: #ffffff;
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 background: #F5F5F5; 30 background: #F5F5F5;
31 } 31 }
32 .room-more{ 32 .room-more{
33 - margin-top: 10rpx; 33 + margin-top: 10rpx;
34 } 34 }
35 .room-consume{ 35 .room-consume{
36 margin-top:6rpx; 36 margin-top:6rpx;
@@ -51,15 +51,16 @@ @@ -51,15 +51,16 @@
51 min-width:92rpx; 51 min-width:92rpx;
52 height:40rpx; 52 height:40rpx;
53 position: absolute; 53 position: absolute;
54 - right:8rpx;  
55 - top:8rpx;  
56 - border-radius: 10rpx; 54 + right:0;
  55 + top:0;
  56 + border-bottom-left-radius: 10rpx;
57 padding:0 4rpx; 57 padding:0 4rpx;
58 box-sizing: border-box; 58 box-sizing: border-box;
59 } 59 }
60 .room-select.yellow { 60 .room-select.yellow {
61 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
62 - color: #fff; 61 + background: #F4FAFF;
  62 + border: 2rpx solid #42A5FF;
  63 + color: #42A5FF;
63 font-weight: bold; 64 font-weight: bold;
64 } 65 }
65 .room-select.gray{ 66 .room-select.gray{
1 <view class="section flex-lr"> 1 <view class="section flex-lr">
2 <block wx:for="{{sectionlist}}" wx:key="{{index}}"> 2 <block wx:for="{{sectionlist}}" wx:key="{{index}}">
3 <view class="flex-vc section-single {{item.isselected ? 'bg-yellow' : ''}}" style="width:{{690/sectionlist.length}}rpx;" data-section="{{item.section}}" data-index="{{index}}" catchtap="{{item.overdate ? '' : 'selectsection'}}"> 3 <view class="flex-vc section-single {{item.isselected ? 'bg-yellow' : ''}}" style="width:{{690/sectionlist.length}}rpx;" data-section="{{item.section}}" data-index="{{index}}" catchtap="{{item.overdate ? '' : 'selectsection'}}">
4 - <view class="{{item.overdate ? 'gray-font' : (item.isselected ? 'checkView' : '')}} font28r Semibold">{{item.showmark}}</view>  
5 - <view class="{{item.overdate ? 'gray-font' : (item.isselected ? 'checkView' : '')}} font28r" style="line-height:34rpx;">{{item.sectiondur}}</view> 4 + <view class="{{item.overdate ? 'gray-font' : (item.isselected ? 'blue-font' : '')}} font30r Semibold">{{item.showmark}}</view>
  5 + <view class="{{item.overdate ? 'gray-font' : (item.isselected ? 'blue-font' : '')}} font24r" style="line-height:34rpx;">{{item.sectiondur}}</view>
6 </view> 6 </view>
7 </block> 7 </block>
8 </view> 8 </view>
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
14 box-sizing: border-box; 14 box-sizing: border-box;
15 } 15 }
16 .section-single.bg-yellow{ 16 .section-single.bg-yellow{
17 - background: #FFF7F5;  
18 - border: 2rpx solid #fe6806; 17 + background: #F4FAFF;
  18 + border: 2rpx solid #42A5FF;
19 } 19 }
20 .Semibold { 20 .Semibold {
21 overflow: hidden; 21 overflow: hidden;
@@ -28,12 +28,6 @@ @@ -28,12 +28,6 @@
28 height: 40rpx; 28 height: 40rpx;
29 } 29 }
30 30
31 -.checkView {  
32 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
33 - -webkit-background-clip: text;  
34 - -webkit-text-fill-color: transparent;  
35 -}  
36 -  
37 .blue-font { 31 .blue-font {
38 overflow: hidden; 32 overflow: hidden;
39 word-break: break-all; 33 word-break: break-all;
1 <view class="select-rooms flex-rs"> 1 <view class="select-rooms flex-rs">
2 - <view class="select-rooms-title black-font font-bold font28r flex-ll">已选包间</view> 2 + <view class="select-rooms-title black-font font-bold font36r flex-ll">已选包间</view>
3 <block wx:for="{{seletroomlist}}" wx:key="{{index}}"> 3 <block wx:for="{{seletroomlist}}" wx:key="{{index}}">
4 <view class="select-rooms-item flex-vc" data-index="{{index}}" data-id="{{item.id}}" catchtap="cancelroom"> 4 <view class="select-rooms-item flex-vc" data-index="{{index}}" data-id="{{item.id}}" catchtap="cancelroom">
5 - <view class="font-bold font28r selectRoom" style="width:100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;text-align:center;">{{item.name}}</view> 5 + <view class="font-bold font30r" style="width:100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;text-align:center; color:#42A5FF;">{{item.name}}</view>
6 <image src="http://nosqn.colorcun.com/detail/x%20%2814%29.png" class="select-rooms-close"></image> 6 <image src="http://nosqn.colorcun.com/detail/x%20%2814%29.png" class="select-rooms-close"></image>
7 </view> 7 </view>
8 </block> 8 </block>
@@ -13,18 +13,14 @@ @@ -13,18 +13,14 @@
13 width:150rpx; 13 width:150rpx;
14 height:70rpx; 14 height:70rpx;
15 margin-right:20rpx; 15 margin-right:20rpx;
16 - background: #FFF7F5;  
17 - border: 2rpx solid #fe6806; 16 + background: #F4FAFF;
  17 + border: 2rpx solid #42A5FF;
18 border-radius:10rpx; 18 border-radius:10rpx;
19 position: relative; 19 position: relative;
20 margin-bottom:20rpx; 20 margin-bottom:20rpx;
21 padding:0 12rpx; 21 padding:0 12rpx;
22 box-sizing: border-box; 22 box-sizing: border-box;
23 } 23 }
24 -.selectRoom {  
25 - background-color: #FFF7F5;  
26 - color: #fe6806;  
27 -}  
28 .select-rooms-close{ 24 .select-rooms-close{
29 width:36rpx; 25 width:36rpx;
30 height:36rpx; 26 height:36rpx;
1 <wxs src="../../../utils/util.wxs" module="util" /> 1 <wxs src="../../../utils/util.wxs" module="util" />
2 <view class="padding-lr-lg padding-top-lg"> 2 <view class="padding-lr-lg padding-top-lg">
3 <view class="flex justify-between align-center margin-bottom" catchtap="clickmore"> 3 <view class="flex justify-between align-center margin-bottom" catchtap="clickmore">
4 - <view class="txt-28-h text-bold">预订日期</view> 4 + <view class="txt-36-h text-bold">预订日期</view>
5 <view class="flex align-center txt-24-h"> 5 <view class="flex align-center txt-24-h">
6 更多 6 更多
7 <view class="more margin-left-xs"></view> 7 <view class="more margin-left-xs"></view>
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 height:100rpx; 7 height:100rpx;
8 line-height: 100rpx; 8 line-height: 100rpx;
9 border-radius:10rpx; 9 border-radius:10rpx;
10 - border:2rpx solid #fff; 10 + border:2rpx solid #fffff;
11 font-size:28rpx; 11 font-size:28rpx;
12 font-weight:400; 12 font-weight:400;
13 color:#353535; 13 color:#353535;
@@ -17,10 +17,8 @@ @@ -17,10 +17,8 @@
17 .tabs .item.active{ 17 .tabs .item.active{
18 background: #F4FAFF; 18 background: #F4FAFF;
19 border-radius: 10rpx; 19 border-radius: 10rpx;
20 - border: 2rpx solid #fe6806;  
21 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
22 - -webkit-background-clip: text;  
23 - -webkit-text-fill-color: transparent; 20 + border: 2rpx solid #42A5FF;
  21 + color:#42A5FF;
24 font-weight: bold; 22 font-weight: bold;
25 } 23 }
26 .date .item{ 24 .date .item{
@@ -29,7 +27,7 @@ @@ -29,7 +27,7 @@
29 } 27 }
30 .item .name{ 28 .item .name{
31 height: 36rpx; 29 height: 36rpx;
32 - font-size: 28rpx; 30 + font-size: 26rpx;
33 line-height: 36rpx; 31 line-height: 36rpx;
34 } 32 }
35 .item .mmdd{ 33 .item .mmdd{
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 总计：<text>￥{{totalize}}</text>元 107 总计：<text>￥{{totalize}}</text>元
108 </view> 108 </view>
109 <button 109 <button
110 - class="font32r {{(dataStr>(detail.etime*1) || detail.grant_last=='0' || (detail.grant_last && (detail.grant_last*1)<(num*1)))?'btns btnsDisabled':'btns'}}" 110 + class="font32r {{(dataStr>(detail.etime*1) || detail.grant_last=='0' || (this.data.detail.grant_last && (detail.grant_last*1)<(num*1)))?'btns btnsDisabled':'btns'}}"
111 bindtap="submitOrder">提交订单 111 bindtap="submitOrder">提交订单
112 </button> 112 </button>
113 </view> 113 </view>
@@ -121,16 +121,14 @@ Page({ @@ -121,16 +121,14 @@ Page({
121 let list = res.data; 121 let list = res.data;
122 let couponArr = []; 122 let couponArr = [];
123 list.forEach(item => { 123 list.forEach(item => {
124 - item.aexpiration = item.aexpiration ? util.determine(item.aexpiration) : '';  
125 // 如果送券的数量大于剩余券的数量，设置送券的数量=剩余券的数量 124 // 如果送券的数量大于剩余券的数量，设置送券的数量=剩余券的数量
126 if (type == '1' && amount > item.grant_last && item.grant_last > 0) { 125 if (type == '1' && amount > item.grant_last && item.grant_last > 0) {
127 item.amountA = item.grant_last 126 item.amountA = item.grant_last
128 } else { 127 } else {
129 item.amountA = amount 128 item.amountA = amount
130 } 129 }
131 - console.log('券信息---',{...item});  
132 // 只留下开启状态 && 在券的有效期内 && 可领取数量大于0的 130 // 只留下开启状态 && 在券的有效期内 && 可领取数量大于0的
133 - if (item.is_open == '1' && (this.data.dataStr < item.etime * 1 || item.aexpiration.valid_forever == '1') && ((type == '1' && item.grant_last >= item.amountA) || (type == '2' && item.grant_last > 0))) { 131 + if (item.is_open == '1' && this.data.dataStr < item.etime * 1 && ((type == '1' && item.grant_last >= item.amountA) || (type == '2' && item.grant_last > 0))) {
134 console.log('可领取的券', item.aname, { 132 console.log('可领取的券', item.aname, {
135 ...item 133 ...item
136 }); 134 });
@@ -17,45 +17,45 @@ @@ -17,45 +17,45 @@
17 </view> 17 </view>
18 <view wx:if="{{type=='2'}}" class="coupon"> 18 <view wx:if="{{type=='2'}}" class="coupon">
19 <form catchsubmit="formSubmit"> 19 <form catchsubmit="formSubmit">
20 - <view class="page-section text1">  
21 - <view class="page-section-title font28r">您的姓名</view> 20 + <view class="page-section">
  21 + <view class="page-section-title font32r">您的姓名</view>
22 <view class="weui-cells weui-cell__bd" style="margin: 30rpx 0"> 22 <view class="weui-cells weui-cell__bd" style="margin: 30rpx 0">
23 - <input class="weui-input name-input" value="{{name}}" data-params="name" placeholder="点击输入您的姓名" placeholder-style="color:#CBCBCB;" bindinput="bindKeyNameInput"/> 23 + <input class="weui-input name-input" value="{{name}}" data-params="name" placeholder="点击输入您的姓名" placeholder-style="color:#999;" bindinput="bindKeyNameInput"/>
24 </view> 24 </view>
25 <picker mode="selector" value="{{indexs}}" range-key="sex" data-sex='{{sexList[indexs].sex}}' range="{{sexList}}" bindchange="bind_Changesex" class="pickerSex"> 25 <picker mode="selector" value="{{indexs}}" range-key="sex" data-sex='{{sexList[indexs].sex}}' range="{{sexList}}" bindchange="bind_Changesex" class="pickerSex">
26 <text class="sexText">{{sexList[indexs].sex}}</text> 26 <text class="sexText">{{sexList[indexs].sex}}</text>
27 - <image src="https://qn.colorcun.com/arrowBottom.png" mode="" class="imgs"/> 27 + <image src="https://qn.colorcun.com/WechatIMG695.png" mode="" class="imgs"/>
28 </picker> 28 </picker>
29 </view> 29 </view>
30 <view class="page-section"> 30 <view class="page-section">
31 - <view class="page-section-title font28r">联系电话</view> 31 + <view class="page-section-title font32r">联系电话</view>
32 <view class="weui-cells weui-cell__bd" style="margin: 30rpx 0"> 32 <view class="weui-cells weui-cell__bd" style="margin: 30rpx 0">
33 - <input class="weui-input" type="number" name="phone" value="{{phone}}" data-params="phone" maxlength="11" placeholder="点击输入您的电话" placeholder-style="color:#CBCBCB;" bindinput="bindKeyPhoneInput" style="color: #000" /> 33 + <input class="weui-input" type="number" name="phone" value="{{phone}}" data-params="phone" maxlength="11" placeholder="点击输入您的电话" placeholder-style="color:#999;" bindinput="bindKeyPhoneInput" style="color: #999" />
34 </view> 34 </view>
35 </view> 35 </view>
36 <view class="page-section page-section1"> 36 <view class="page-section page-section1">
37 - <view class="page-section-title font28r">您的生日</view>  
38 - <view class="weui-cells weui-cell__bd text2"> 37 + <view class="page-section-title font32r">您的生日</view>
  38 + <view class="weui-cells weui-cell__bd">
39 <picker mode="date" value="{{date}}" bindchange="bind_ChangeDate" class="pickerBox"> 39 <picker mode="date" value="{{date}}" bindchange="bind_ChangeDate" class="pickerBox">
40 - <view class="{{date ? 'colorSty' : 'color1'}} font28r">{{date?date:'点击输入您的生日'}}</view> 40 + <view class="colorSty">{{date?date:'点击输入您的生日'}}</view>
41 </picker> 41 </picker>
42 - <view class="more"></view>  
43 </view> 42 </view>
  43 + <view class="more"></view>
44 </view> 44 </view>
45 <view class="page-section"> 45 <view class="page-section">
46 - <view class="page-section-title font28r">充值金额</view> 46 + <view class="page-section-title font32r">充值金额</view>
47 <view class="weui-cells weui-cell__bd sum colorSty"> 47 <view class="weui-cells weui-cell__bd sum colorSty">
48 {{opt.detail.recharge_money}}元 48 {{opt.detail.recharge_money}}元
49 </view> 49 </view>
50 </view> 50 </view>
51 <view class="page-section"> 51 <view class="page-section">
52 - <view class="page-section-title font28r">支付剩余时间 </view> 52 + <view class="page-section-title font32r">支付剩余时间 </view>
53 <view class="weui-cells weui-cell__bd sum colorSty"> 53 <view class="weui-cells weui-cell__bd sum colorSty">
54 {{countdown}} 54 {{countdown}}
55 </view> 55 </view>
56 </view> 56 </view>
57 <view wx:if="{{type=='2'}}" class="fixed_box"> 57 <view wx:if="{{type=='2'}}" class="fixed_box">
58 - <button class="font28r btns" formType="submit">确认支付 58 + <button class="font32r btns" formType="submit">确认支付
59 </button> 59 </button>
60 </view> 60 </view>
61 </form> 61 </form>
1 /* pack-activity/pack/confirmPayment.wxss */ 1 /* pack-activity/pack/confirmPayment.wxss */
2 -  
3 -page {  
4 - background: #F5F5F5;  
5 -}  
6 -  
7 .box_wrap { 2 .box_wrap {
8 width: 100%; 3 width: 100%;
9 display: flex; 4 display: flex;
10 align-items: center; 5 align-items: center;
11 - justify-content: center;  
12 - background: #fff;  
13 - border-radius: 10rpx;  
14 - margin: 12rpx; 6 + justify-content: center;
15 } 7 }
16 8
17 .box { 9 .box {
@@ -68,10 +60,8 @@ page { @@ -68,10 +60,8 @@ page {
68 width: 100%; 60 width: 100%;
69 margin: 0; 61 margin: 0;
70 border-radius: 42rpx; 62 border-radius: 42rpx;
71 - color: #fff;  
72 - height: 72rpx;  
73 - line-height: 72rpx;  
74 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 63 + color: #fff;
  64 + background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
75 } 65 }
76 66
77 #payModal { 67 #payModal {
@@ -100,10 +90,8 @@ page { @@ -100,10 +90,8 @@ page {
100 90
101 .coupon { 91 .coupon {
102 width: 100%; 92 width: 100%;
103 - box-sizing: border-box;  
104 - padding: 0 40rpx;  
105 - border-radius: 10rpx;  
106 - background: #fff; 93 + padding-left: 32rpx;
  94 + box-sizing: border-box;
107 } 95 }
108 96
109 .page-section { 97 .page-section {
@@ -114,19 +102,15 @@ page { @@ -114,19 +102,15 @@ page {
114 } 102 }
115 103
116 .page-section1 .more { 104 .page-section1 .more {
117 - margin-right: 32rpx;  
118 - margin-top: 8rpx; 105 + margin-right: 32rpx;
119 } 106 }
120 107
121 .weui-cells { 108 .weui-cells {
122 - flex: 1;  
123 - display: flex;  
124 - justify-content: flex-end;  
125 - align-items: center; 109 + flex: 1;
126 } 110 }
127 111
128 .page-section-title { 112 .page-section-title {
129 - color: #000; 113 + color: #515151;
130 font-family: PingFang SC; 114 font-family: PingFang SC;
131 margin-right: 32rpx; 115 margin-right: 32rpx;
132 } 116 }
@@ -134,12 +118,11 @@ page { @@ -134,12 +118,11 @@ page {
134 .weui-input { 118 .weui-input {
135 text-align: right; 119 text-align: right;
136 margin-right: 30rpx; 120 margin-right: 30rpx;
137 - font-size: 28rpx; 121 + font-size: 32rpx;
138 } 122 }
139 .name-input{ 123 .name-input{
140 margin-right: 0; 124 margin-right: 0;
141 - text-align: left;  
142 - flex: 1; 125 + text-align: left;
143 } 126 }
144 127
145 128
@@ -168,16 +151,14 @@ page { @@ -168,16 +151,14 @@ page {
168 } 151 }
169 152
170 .colorSty{ 153 .colorSty{
171 - color: #000;  
172 -}  
173 -  
174 -.color1 {  
175 - color: #CBCBCB; 154 + color: #999999;
  155 + font-size: 32rpx;
176 } 156 }
177 157
178 .pickerSex image{ 158 .pickerSex image{
179 - width: 24rpx;  
180 - height: 24rpx; 159 + width: 48rpx;
  160 + height: 48rpx;
  161 + margin-right: 30rpx;
181 } 162 }
182 .sexText{ 163 .sexText{
183 position: relative; 164 position: relative;
@@ -207,10 +188,4 @@ page { @@ -207,10 +188,4 @@ page {
207 display: flex; 188 display: flex;
208 align-items: center; 189 align-items: center;
209 padding: 20rpx 0; 190 padding: 20rpx 0;
210 -}  
211 -  
212 -.text1 picker {  
213 - display: flex;  
214 - align-items: center;  
215 - padding-top: 20rpx;  
216 } 191 }
@@ -11,12 +11,9 @@ Page({ @@ -11,12 +11,9 @@ Page({
11 dataStr: Date.now() * 1 / 1000, 11 dataStr: Date.now() * 1 / 1000,
12 detail: {}, 12 detail: {},
13 exp_date: {}, 13 exp_date: {},
14 - couponType:'',//1代金券 2折扣券 3菜品券  
15 resultCoupon: '', //0未领取 1已领取 14 resultCoupon: '', //0未领取 1已领取
16 seller: {}, 15 seller: {},
17 distance: '', 16 distance: '',
18 - num: 1,  
19 - totalize: '',  
20 }, 17 },
21 myModal: '', 18 myModal: '',
22 myToast:'', 19 myToast:'',
@@ -42,7 +39,7 @@ Page({ @@ -42,7 +39,7 @@ Page({
42 id: options.id || obj.id, 39 id: options.id || obj.id,
43 sid: options.sid || obj.sid, 40 sid: options.sid || obj.sid,
44 oid: options.oid, 41 oid: options.oid,
45 - types: options.types || obj.types, //1是邀请函过来的（邀请函的券或者点击意见反馈买券） 2是提前点餐 3是商家APP分享的或者短信的链接 4好友赠送的券 5充值赠送的券，不显示按钮 42 + types: options.types || obj.types, //1是邀请函过来的（邀请函的券或者点击意见反馈买券） 2是提前点餐 3是商家APP分享的或者短信的链接 4好友赠送的券
46 rid: options.rid ? options.rid : '', 43 rid: options.rid ? options.rid : '',
47 activity_id:options.activity_id || '', 44 activity_id:options.activity_id || '',
48 } 45 }
@@ -135,12 +132,9 @@ Page({ @@ -135,12 +132,9 @@ Page({
135 id: this.data.opt.id 132 id: this.data.opt.id
136 }).then(res => { 133 }).then(res => {
137 if (res.data.length > 0) { 134 if (res.data.length > 0) {
138 - let couponType = '';  
139 let detail = res.data[0]; 135 let detail = res.data[0];
140 let exp_date = util.determine(detail.exp_date); 136 let exp_date = util.determine(detail.exp_date);
141 detail.arule = detail.arule ? util.determine(detail.arule) : ''; 137 detail.arule = detail.arule ? util.determine(detail.arule) : '';
142 - detail.use = detail.use ? util.determine(detail.use) : '';  
143 - detail.exp_date = exp_date;  
144 detail.expiration_date = detail.expiration_date ? util.determine(detail.expiration_date) : ''; 138 detail.expiration_date = detail.expiration_date ? util.determine(detail.expiration_date) : '';
145 detail.aexpiration = detail.aexpiration ? util.determine(detail.aexpiration) : ''; 139 detail.aexpiration = detail.aexpiration ? util.determine(detail.aexpiration) : '';
146 detail.cdate = detail.cdate * 1; 140 detail.cdate = detail.cdate * 1;
@@ -181,54 +175,16 @@ Page({ @@ -181,54 +175,16 @@ Page({
181 detail.noonText = noon; 175 detail.noonText = noon;
182 detail.nigText = nig; 176 detail.nigText = nig;
183 } 177 }
184 - if(detail.is_type!='3'){  
185 - detail.useStime = util.unixtoTime(detail.etime, 'YYYY-MM-DD');  
186 - detail.useEtime = util.unixtoTime(detail.etime, 'YYYY-MM-DD');  
187 - }  
188 - // is_cash 代金券 is_discount折扣券 is_dish菜品券 只有代金券有几折显示  
189 - if(detail.use){  
190 - couponType = detail.use.is_cash=='1'?'1':detail.use.is_discount=='1'?'2':detail.use.is_dish=='1'?'3':'1';  
191 - detail.use.images = detail.use.images ? util.determine(detail.use.images) : '';  
192 - }else{  
193 - couponType = '1'  
194 - }  
195 if (detail.arule && detail.arule.is_share_lose == '0') { 178 if (detail.arule && detail.arule.is_share_lose == '0') {
196 wx.hideShareMenu() 179 wx.hideShareMenu()
197 } 180 }
198 - let price = detail.price * 1;  
199 - let num = this.data.num * 1;  
200 this.setData({ 181 this.setData({
201 detail, 182 detail,
202 exp_date, 183 exp_date,
203 - totalize: (price * num).toFixed(2),  
204 - couponType,  
205 }) 184 })
206 } 185 }
207 }) 186 })
208 }, 187 },
209 - // 点击减号  
210 - subtraction() {  
211 - let price = this.data.detail.price * 1;  
212 - let num = this.data.num * 1;  
213 - let num1 = num - 1  
214 - if (num == '1') {  
215 - return false  
216 - }  
217 - this.setData({  
218 - num: num1,  
219 - totalize: (price * num1).toFixed(2)  
220 - })  
221 - },  
222 - // 点击加号  
223 - addition() {  
224 - let price = this.data.detail.price * 1;  
225 - let num = this.data.num * 1;  
226 - let num1 = num + 1  
227 - this.setData({  
228 - num: num1,  
229 - totalize: (price * num1).toFixed(2)  
230 - })  
231 - },  
232 // 获取店铺名称 188 // 获取店铺名称
233 getSellerDetail() { 189 getSellerDetail() {
234 let that = this; 190 let that = this;
1 <!--pack-activity/pack/receiveCoupon.wxml--> 1 <!--pack-activity/pack/receiveCoupon.wxml-->
2 <wxs src="../../utils/util.wxs" module="util" /> 2 <wxs src="../../utils/util.wxs" module="util" />
3 -<nav>优惠券详情</nav> 3 +<nav>代金券详情</nav>
4 <view class="top_box"> 4 <view class="top_box">
5 - <image src="https://qn.colorcun.com/{{couponType=='1'?'voucherIcon1':couponType=='2'?'coupon2':'coupon3'}}.png" mode="" />  
6 - <view class="texts" wx:if="{{detail.is_type == '3'}}"> 5 + <image src="https://qn.colorcun.com/voucherIcon1.png" mode="" />
  6 + <view class="texts">
7 <view class="font32r textName">{{detail.aname}}</view> 7 <view class="font32r textName">{{detail.aname}}</view>
8 <view class="font24r threshold">￥<text class="priceText">{{detail.price}}</text><text class="font28r" wx:if="{{detail.desc!='0'}}">满{{detail.desc}}元可用</text></view> 8 <view class="font24r threshold">￥<text class="priceText">{{detail.price}}</text><text class="font28r" wx:if="{{detail.desc!='0'}}">满{{detail.desc}}元可用</text></view>
9 </view> 9 </view>
10 - <view class="texts texts{{couponType}}" wx:if="{{detail.is_type != '3'}}">  
11 - <view class="flex-lr">  
12 - <view class="font28r textName">{{detail.aname}}</view>  
13 - <view class="font20r">￥<text class="font32r">{{detail.price}}</text></view>  
14 - </view>  
15 - <view class="flex-lr">  
16 - <view class="font20r threshold">  
17 - <text class="priceText font36r" wx:if="{{detail.use.discount}}">{{detail.use.discount}}折</text>  
18 - <text class="font20r" wx:else>￥<text class="priceText font36r">{{detail.price}}</text></text>  
19 - {{detail.desc}}  
20 - </view>  
21 - <view class="operation" wx:if="{{opt.types!='5'}}">  
22 - <image class="countimgs" src="https://qn.colorcun.com/WechatIMG699.png" bindtap="subtraction" />  
23 - <input type="number" model:value="{{num}}" bindinput="bindKeyNameInput" />  
24 - <image class="countimgs" src="https://qn.colorcun.com/WechatIMG698.png" bindtap="addition" mode="" />  
25 - </view>  
26 - </view>  
27 - </view>  
28 <view class="font28r receive" wx:if="{{resultCoupon == '1'}}">已领取</view> 10 <view class="font28r receive" wx:if="{{resultCoupon == '1'}}">已领取</view>
29 </view> 11 </view>
30 <view class="center_box"> 12 <view class="center_box">
31 - <view class="centerMain dishMain" wx:if="{{couponType == '3' && detail.use}}">  
32 - <view class="title">  
33 - <image src="https://qn.colorcun.com/voucherUnion_6.png" mode="" />  
34 - <text class="font32r">菜品</text>  
35 - </view>  
36 - <text space="nbsp" class="info font28r">{{detail.use.dish}}</text>  
37 - <image wx:for="{{detail.use.images}}" src="{{item}}" mode="widthFix"/>  
38 - </view>  
39 <view class="centerMain"> 13 <view class="centerMain">
40 <view class="title"> 14 <view class="title">
41 <image src="https://qn.colorcun.com/voucherUnion_1.png" mode="" /> 15 <image src="https://qn.colorcun.com/voucherUnion_1.png" mode="" />
42 <text class="font32r">有效期</text> 16 <text class="font32r">有效期</text>
43 </view> 17 </view>
44 - <block wx:if="{{detail.is_type == '3'}}">  
45 - <view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '0' && detail.useStime && detail.useEtime}}"><text>券有效期：</text>{{detail.useStime}} <text> 至 </text> {{detail.useEtime}}</view>  
46 - <view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '1'}}"><text>券有效期：</text> 永久有效</view>  
47 - </block>  
48 - <block wx:else>  
49 - <view class="info font28r" wx:if="{{detail.useStime && detail.useEtime}}"><text>活动期限：</text>{{detail.useStime}} <text> 至 </text> {{detail.useEtime}}</view>  
50 - </block> 18 + <view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '0' && detail.useStime && detail.useEtime}}"><text>券有效期：</text>{{detail.useStime}} <text> 至 </text> {{detail.useEtime}}</view>
  19 + <view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '1'}}"><text>券有效期：</text> 永久有效</view>
51 </view> 20 </view>
52 - <view class="centerMain" wx:if="{{detail.morText || detail.noonText || detail.nigText}}">  
53 - <view class="title"> 21 + <view class="centerMain">
  22 + <view class="title" wx:if="{{detail.morText || detail.noonText || detail.nigText}}">
54 <image src="https://qn.colorcun.com/voucherUnion_2.png" mode="" /> 23 <image src="https://qn.colorcun.com/voucherUnion_2.png" mode="" />
55 - <text class="font32r">{{detail.is_type=='3'?'不':''}}可用日期</text> 24 + <text class="font32r">不可用日期</text>
56 </view> 25 </view>
57 <view wx:if="{{detail.morText}}" class="info font28r">{{detail.morText}}</view> 26 <view wx:if="{{detail.morText}}" class="info font28r">{{detail.morText}}</view>
58 <view wx:if="{{detail.noonText}}" class="info font28r">{{detail.noonText}}</view> 27 <view wx:if="{{detail.noonText}}" class="info font28r">{{detail.noonText}}</view>
59 <view wx:if="{{detail.nigText}}" class="info font28r">{{detail.nigText}}</view> 28 <view wx:if="{{detail.nigText}}" class="info font28r">{{detail.nigText}}</view>
60 </view> 29 </view>
61 - <view class="centerMain" wx:if="{{detail.is_type!='3' && exp_date.is_none=='1'}}">  
62 - <view class="title">  
63 - <image src="https://qn.colorcun.com/voucherUnion_1.png" mode="" />  
64 - <text class="font32r">可用日期</text>  
65 - </view>  
66 - <view wx:if="{{exp_date.is_none=='1'}}" class="info font28r" >  
67 - 无限制  
68 - </view>  
69 - </view>  
70 - <view class="centerMain centerMain3" wx:if="{{detail.aexpiration && detail.is_type == '3'}}"> 30 + <view class="centerMain centerMain3" wx:if="{{detail.aexpiration}}">
71 <view class="title"> 31 <view class="title">
72 <image src="https://qn.colorcun.com/voucherUnion_3.png" mode="" /> 32 <image src="https://qn.colorcun.com/voucherUnion_3.png" mode="" />
73 <text class="font32r">使用规则</text> 33 <text class="font32r">使用规则</text>
@@ -88,16 +48,7 @@ @@ -88,16 +48,7 @@
88 <view class="drop"></view>{{detail.arule.is_appointment == '1' ? '需要提前预约' : '不需要提前预约'}} 48 <view class="drop"></view>{{detail.arule.is_appointment == '1' ? '需要提前预约' : '不需要提前预约'}}
89 </view> 49 </view>
90 </view> 50 </view>
91 - <view class="centerMain centerMain3" wx:if="{{exp_date && exp_date.is_birthday=='1' && detail.is_type != '3'}}">  
92 - <view class="title">  
93 - <image src="https://qn.colorcun.com/voucherUnion_3.png" mode="" />  
94 - <text class="font32r">使用限制</text>  
95 - </view>  
96 - <view class="info font28r">  
97 - 顾客生日当天可用  
98 - </view>  
99 - </view>  
100 - <view class="centerMain" wx:if="{{detail.is_type == '3'}}"> 51 + <view class="centerMain">
101 <view class="title"> 52 <view class="title">
102 <image src="https://qn.colorcun.com/voucherUnion_4.png" mode="" /> 53 <image src="https://qn.colorcun.com/voucherUnion_4.png" mode="" />
103 <text class="font32r">分享规则</text> 54 <text class="font32r">分享规则</text>
@@ -147,30 +98,20 @@ @@ -147,30 +98,20 @@
147 </view> 98 </view>
148 </view> 99 </view>
149 </view> 100 </view>
150 -<view class="sharewidth {{detail.is_type != '3'?'sharewidth1':''}}" wx:if="{{opt.types!='5' && (resultCoupon == '0' || detail.arule.is_share_lose == '1')}}">  
151 - <block wx:if="{{detail.is_type == '3'}}">  
152 - <button wx:if="{{detail.arule.is_share_lose == '1'}}" class="shareBtn" open-type="share">  
153 - <image src="https://qn.colorcun.com/voucherIcon2.png" mode="" />  
154 - <text class="font24r">分享</text>  
155 - </button>  
156 - <view class="btns">  
157 - <view class="btn1 font36r" wx:if="{{seller.is_online_reserve == '1'}}">  
158 - <navigator url="/pages/reserve/reserve?id={{opt.sid}}&activeTab=reserve" class="book-item-font second-book-button flex-cc font30r" style="position: relative;">预订包间</navigator>  
159 - </view>  
160 - <view class="btn font36r" wx:if="{{seller.is_online_reserve == '0' && seller.phone}}">  
161 - <view bindtap="callPhone">预订包间</view>  
162 - </view>  
163 - <view wx:if="{{resultCoupon == '0' && detail.grant_last>0}}" class="btn font36r" bindtap="submitOrder">领取到卡包</view>  
164 - </view>  
165 - </block>  
166 - <block wx:else>  
167 - <view class="leftBox">  
168 - <view class="news font24r">  
169 - 合计<text class="font28r">￥<text class="priceInfo">{{totalize}}</text></text>  
170 - </view>  
171 - </view>  
172 - <button bindtap="submitOrder" class="font32r {{(dataStr>(detail.etime*1) || detail.grant_last=='0' || (detail.grant_last && (detail.grant_last*1)<(num*1)))?'submitBtns btnsDisabled':'submitBtns'}}">提交订单</button>  
173 - </block> 101 +<view class="sharewidth" wx:if="{{resultCoupon == '0' || detail.arule.is_share_lose == '1'}}">
  102 + <button wx:if="{{detail.arule.is_share_lose == '1'}}" class="shareBtn" open-type="share">
  103 + <image src="https://qn.colorcun.com/voucherIcon2.png" mode="" />
  104 + <text class="font24r">分享</text>
  105 + </button>
  106 + <view class="btns">
  107 + <view class="btn1 font36r" wx:if="{{seller.is_online_reserve == '1'}}">
  108 + <navigator url="/pages/reserve/reserve?id={{opt.sid}}&activeTab=reserve" class="book-item-font second-book-button flex-cc font30r" style="position: relative;">预订包间</navigator>
  109 + </view>
  110 + <view class="btn font36r" wx:if="{{seller.is_online_reserve == '0' && seller.phone}}">
  111 + <view bindtap="callPhone">预订包间</view>
  112 + </view>
  113 + <view wx:if="{{resultCoupon == '0' && detail.grant_last>0}}" class="btn font36r" bindtap="submitOrder">领取到卡包</view>
  114 + </view>
174 </view> 115 </view>
175 <toast id="myToast"></toast> 116 <toast id="myToast"></toast>
176 <my-modal id="myModal" fadeStyle="slideUp" height="240px"> 117 <my-modal id="myModal" fadeStyle="slideUp" height="240px">
@@ -26,10 +26,6 @@ page { @@ -26,10 +26,6 @@ page {
26 margin-right: 12rpx; 26 margin-right: 12rpx;
27 } 27 }
28 28
29 -.texts2 .priceText {  
30 - font-size: 36rpx;  
31 -}  
32 -  
33 .top_box .texts { 29 .top_box .texts {
34 flex: 1; 30 flex: 1;
35 margin-left: 32rpx; 31 margin-left: 32rpx;
@@ -74,7 +70,7 @@ page { @@ -74,7 +70,7 @@ page {
74 } 70 }
75 71
76 .centerMain { 72 .centerMain {
77 - margin-bottom: 30rpx; 73 + margin-bottom: 40rpx;
78 } 74 }
79 75
80 .centerMain .drop { 76 .centerMain .drop {
@@ -194,15 +190,15 @@ page { @@ -194,15 +190,15 @@ page {
194 } 190 }
195 191
196 #myModal .titleModal2 { 192 #myModal .titleModal2 {
197 - margin-top: 80%; 193 + margin-top: 80%;
198 } 194 }
199 195
200 #myModal .titleModal3 { 196 #myModal .titleModal3 {
201 - margin-top: 60%; 197 + margin-top: 60%;
202 } 198 }
203 199
204 #myModal .titleModal4 { 200 #myModal .titleModal4 {
205 - margin-top: 30%; 201 + margin-top: 30%;
206 } 202 }
207 203
208 #myModal .mymodal { 204 #myModal .mymodal {
@@ -223,7 +219,7 @@ page { @@ -223,7 +219,7 @@ page {
223 219
224 .modalText1 { 220 .modalText1 {
225 color: #dfdfdf; 221 color: #dfdfdf;
226 - font-family: PingFang SC; 222 + font-family: PingFang SC;
227 font-weight: 600; 223 font-weight: 600;
228 font-size: 52rpx; 224 font-size: 52rpx;
229 text-align: center; 225 text-align: center;
@@ -231,7 +227,7 @@ page { @@ -231,7 +227,7 @@ page {
231 227
232 .modalText2 { 228 .modalText2 {
233 color: #dfdfdf; 229 color: #dfdfdf;
234 - font-family: PingFang SC; 230 + font-family: PingFang SC;
235 font-weight: 500; 231 font-weight: 500;
236 text-align: center; 232 text-align: center;
237 margin: 0 40rpx; 233 margin: 0 40rpx;
@@ -241,12 +237,12 @@ page { @@ -241,12 +237,12 @@ page {
241 width: 80%; 237 width: 80%;
242 margin: 0 auto; 238 margin: 0 auto;
243 border-radius: 42rpx; 239 border-radius: 42rpx;
244 - background: linear-gradient(90.98deg, #f41919 0.25%, #ff7426 120.07%); 240 + background: linear-gradient(90.98deg, #f41919 0.25%, #ff7426 120.07%);
245 font-weight: 400; 241 font-weight: 400;
246 color: #fff; 242 color: #fff;
247 text-align: center; 243 text-align: center;
248 border: 4rpx solid #fff; 244 border: 4rpx solid #fff;
249 - padding: 12rpx 0; 245 + padding: 12rpx 0;
250 margin: 80rpx auto 20rpx auto; 246 margin: 80rpx auto 20rpx auto;
251 } 247 }
252 248
@@ -310,11 +306,11 @@ page { @@ -310,11 +306,11 @@ page {
310 .info_name { 306 .info_name {
311 color: #000; 307 color: #000;
312 overflow: hidden; 308 overflow: hidden;
313 - word-break: break-all;  
314 - text-overflow: ellipsis;  
315 - display: -webkit-box;  
316 - -webkit-box-orient: vertical;  
317 - -webkit-line-clamp: 1; 309 + word-break: break-all;
  310 + text-overflow: ellipsis;
  311 + display: -webkit-box;
  312 + -webkit-box-orient: vertical;
  313 + -webkit-line-clamp: 1;
318 font-weight: 600; 314 font-weight: 600;
319 } 315 }
320 316
@@ -330,79 +326,4 @@ page { @@ -330,79 +326,4 @@ page {
330 background: #FFE8D7; 326 background: #FFE8D7;
331 color: #fb4e21; 327 color: #fb4e21;
332 border-radius: 4rpx; 328 border-radius: 4rpx;
333 -}  
334 -  
335 -.operation {  
336 - display: flex;  
337 - align-items: center;  
338 - border: 2rpx solid #CBCBCB;  
339 - border-radius: 198rpx;  
340 - height: 52rpx;  
341 -}  
342 -  
343 -.operation input {  
344 - width: 64rpx;  
345 - border-left: 2rpx solid #CBCBCB;  
346 - border-right: 2rpx solid #CBCBCB;  
347 - border-radius: 10rpx;  
348 - text-align: center;  
349 - height: 52rpx;  
350 -}  
351 -  
352 -.top_box .countimgs {  
353 - width: 32rpx;  
354 - height: 32rpx;  
355 - padding: 16rpx;  
356 -}  
357 -  
358 -.dishMain .info {  
359 - display: flex;  
360 - flex-wrap: wrap;  
361 - justify-content: flex-start;  
362 -}  
363 -  
364 -.dishMain image {  
365 - margin-bottom: 12rpx;  
366 - width: 100%;  
367 -}  
368 -  
369 -.dishMain .title image {  
370 - width: 26rpx;  
371 -}  
372 -  
373 -.leftBox {  
374 - display: flex;  
375 - align-items: center;  
376 - justify-content: space-between;  
377 - font-family: PingFang SC;  
378 -}  
379 -  
380 -.news {  
381 - color: #000;  
382 -}  
383 -  
384 -.news text {  
385 - color: #FD4D59;  
386 -}  
387 -  
388 -.priceInfo {  
389 - font-weight: 600;  
390 - font-size: 60rpx;  
391 -}  
392 -  
393 -.submitBtns {  
394 - margin: 0;  
395 - border-radius: 42rpx;  
396 - padding: 0 56rpx;  
397 - color: #fff;  
398 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
399 -}  
400 -  
401 -.btnsDisabled {  
402 - background: #999999 !important;  
403 - color: #fff !important;  
404 -}  
405 -  
406 -.sharewidth1 {  
407 - justify-content: space-between;  
408 } 329 }
@@ -80,7 +80,7 @@ Page({ @@ -80,7 +80,7 @@ Page({
80 getCouponDetail(e){ 80 getCouponDetail(e){
81 const item= e.currentTarget.dataset['item']; 81 const item= e.currentTarget.dataset['item'];
82 wx.navigateTo({ 82 wx.navigateTo({
83 - url: `./receiveCoupon?id=${item.id}&name=${this.data.opt.name}&types=5&sid=${this.data.opt.sid}`, 83 + url: `./seeRecharge?id=${item.id}&name=${this.data.opt.name}`,
84 }) 84 })
85 }, 85 },
86 submitOrder(){ 86 submitOrder(){
@@ -3,15 +3,15 @@ @@ -3,15 +3,15 @@
3 <nav>{{opt.name}}</nav> 3 <nav>{{opt.name}}</nav>
4 <view class="wrapBox"> 4 <view class="wrapBox">
5 <view class="info"> 5 <view class="info">
6 - <view class="info_left font28r"> 6 + <view class="info_left font32r">
7 活动名称 7 活动名称
8 </view> 8 </view>
9 - <view class="info_right text_info font28r"> 9 + <view class="info_right text_info font32r">
10 {{detail.rname}} 10 {{detail.rname}}
11 </view> 11 </view>
12 </view> 12 </view>
13 - <view class="info text1">  
14 - <view class="info_left font28r"> 13 + <view class="info">
  14 + <view class="info_left font32r">
15 充值满 15 充值满
16 </view> 16 </view>
17 <view class="info_right text_info font32r"> 17 <view class="info_right text_info font32r">
@@ -19,90 +19,90 @@ @@ -19,90 +19,90 @@
19 </view> 19 </view>
20 </view> 20 </view>
21 <view class="favourable_box"> 21 <view class="favourable_box">
22 - <view class="about font28r"> 22 + <view class="about font32r">
23 优惠活动 23 优惠活动
24 </view> 24 </view>
25 <view class="bundle" wx:if="{{recharge_list.is_price=='1'}}"> 25 <view class="bundle" wx:if="{{recharge_list.is_price=='1'}}">
26 - <view class="bundle_left font28r"> 26 + <view class="bundle_left font30r">
27 赠送 27 赠送
28 </view> 28 </view>
29 - <view class="bundle_right font28r"> 29 + <view class="bundle_right font30r">
30 {{recharge_list.price+'元余额'}} 30 {{recharge_list.price+'元余额'}}
31 </view> 31 </view>
32 </view> 32 </view>
33 <view class="bundle" wx:if="{{recharge_list.is_score=='1'}}"> 33 <view class="bundle" wx:if="{{recharge_list.is_score=='1'}}">
34 - <view class="bundle_left font28r"> 34 + <view class="bundle_left font30r">
35 赠送 35 赠送
36 </view> 36 </view>
37 - <view class="bundle_right font28r"> 37 + <view class="bundle_right font30r">
38 {{recharge_list.score+'积分'}} 38 {{recharge_list.score+'积分'}}
39 </view> 39 </view>
40 </view> 40 </view>
41 <view class="bundle" wx:if="{{recharge_list.is_coupons=='1'}}"> 41 <view class="bundle" wx:if="{{recharge_list.is_coupons=='1'}}">
42 - <view class="bundle_left font28r"> 42 + <view class="bundle_left font30r">
43 赠送 43 赠送
44 </view> 44 </view>
45 - <view class="bundle_right font28r"> 45 + <view class="bundle_right font30r">
46 优惠券 46 优惠券
47 </view> 47 </view>
48 </view> 48 </view>
49 </view> 49 </view>
50 <view class="list"> 50 <view class="list">
51 - <view class="item font28r" wx:for="{{recharge_list.coupons}}" wx:key="{{item.id}}" bindtap="getCouponDetail" data-item="{{item}}"> 51 + <view class="item font32r" wx:for="{{recharge_list.coupons}}" wx:key="{{item.id}}" bindtap="getCouponDetail" data-item="{{item}}">
52 {{item.aname}} 52 {{item.aname}}
53 </view> 53 </view>
54 </view> 54 </view>
55 <view class="week" wx:if="{{exp_date.is_week=='1' || exp_date.is_week===true}}"> 55 <view class="week" wx:if="{{exp_date.is_week=='1' || exp_date.is_week===true}}">
56 <view class="week_top"> 56 <view class="week_top">
57 - <view class="week_left font28r"> 57 + <view class="week_left font32r">
58 充值日期限制： 58 充值日期限制：
59 </view> 59 </view>
60 - <view class="texts font28r"> 60 + <view class="texts font32r">
61 每周指定日期可用 61 每周指定日期可用
62 </view> 62 </view>
63 </view> 63 </view>
64 - <view class="dateList texts font28r"> 64 + <view class="dateList texts font32r">
65 {{exp_date.week_date_show}} 65 {{exp_date.week_date_show}}
66 </view> 66 </view>
67 </view> 67 </view>
68 <view class="week" wx:if="{{exp_date.is_birthday=='1' || exp_date.is_birthday===true}}"> 68 <view class="week" wx:if="{{exp_date.is_birthday=='1' || exp_date.is_birthday===true}}">
69 <view class="week_top"> 69 <view class="week_top">
70 - <view class="week_left font28r"> 70 + <view class="week_left font32r">
71 充值日期限制： 71 充值日期限制：
72 </view> 72 </view>
73 - <view class="texts font28r"> 73 + <view class="texts font32r">
74 会员生日当天 74 会员生日当天
75 </view> 75 </view>
76 </view> 76 </view>
77 </view> 77 </view>
78 <view class="week" wx:if="{{exp_date.is_fix=='1' || exp_date.is_fix===true}}"> 78 <view class="week" wx:if="{{exp_date.is_fix=='1' || exp_date.is_fix===true}}">
79 <view class="week_top"> 79 <view class="week_top">
80 - <view class="week_left font28r"> 80 + <view class="week_left font32r">
81 充值日期限制： 81 充值日期限制：
82 </view> 82 </view>
83 - <view class="texts font28r"> 83 + <view class="texts font32r">
84 无 84 无
85 </view> 85 </view>
86 </view> 86 </view>
87 </view> 87 </view>
88 <view class="week" wx:if="{{exp_date.is_fix=='1' || exp_date.is_fix===true}}"> 88 <view class="week" wx:if="{{exp_date.is_fix=='1' || exp_date.is_fix===true}}">
89 <view class="week_top"> 89 <view class="week_top">
90 - <view class="week_left font28r"> 90 + <view class="week_left font32r">
91 有效期： 91 有效期：
92 </view> 92 </view>
93 - <view class="texts font28r"> 93 + <view class="texts font32r">
94 {{util.unixtoTime(detail.stime,'YYYY-MM-DD')+'至'+util.unixtoTime(detail.etime,'YYYY-MM-DD')}} 94 {{util.unixtoTime(detail.stime,'YYYY-MM-DD')+'至'+util.unixtoTime(detail.etime,'YYYY-MM-DD')}}
95 </view> 95 </view>
96 </view> 96 </view>
97 </view> 97 </view>
98 - <view class="info text2">  
99 - <view class="info_left font28r"> 98 + <view class="info">
  99 + <view class="info_left font32r">
100 备注 100 备注
101 </view> 101 </view>
102 </view> 102 </view>
103 <text class="explain_news">{{detail.explain}}</text> 103 <text class="explain_news">{{detail.explain}}</text>
104 </view> 104 </view>
105 <view class="fixed_box"> 105 <view class="fixed_box">
106 - <button class="font28r btns" bindtap="submitOrder">提交充值 106 + <button class="font32r btns" bindtap="submitOrder">提交充值
107 </button> 107 </button>
108 </view> 108 </view>
1 /* pack-activity/pack/vipRecharge.wxss */ 1 /* pack-activity/pack/vipRecharge.wxss */
2 page { 2 page {
3 - background-color: #F5F5F5; 3 + background-color: #fff;
4 } 4 }
5 5
6 .wrapBox{ 6 .wrapBox{
7 - background: #fff;  
8 - margin: 12rpx;  
9 - border-radius: 10rpx; 7 + padding-bottom: 180rpx;
10 } 8 }
11 9
12 .info { 10 .info {
13 - margin: 0 40rpx;  
14 - padding: 28rpx 0; 11 + padding: 28rpx 32rpx 28rpx 0;
15 box-sizing: border-box; 12 box-sizing: border-box;
16 display: flex; 13 display: flex;
17 justify-content: space-between; 14 justify-content: space-between;
18 - border-bottom: 2rpx solid #F7F7F7;  
19 -}  
20 -  
21 -.text1 {  
22 - align-items: center;  
23 -}  
24 -  
25 -.text2 {  
26 - border: none;  
27 -}  
28 -  
29 -.text1 .text_info {  
30 - padding: 10rpx 0; 15 + margin-left: 32rpx;
  16 + border-bottom: 2rpx solid #E7E7E7;
31 } 17 }
32 18
33 .info1 { 19 .info1 {
@@ -40,7 +26,7 @@ page { @@ -40,7 +26,7 @@ page {
40 .info_left { 26 .info_left {
41 flex-shrink: 0; 27 flex-shrink: 0;
42 margin-right: 20rpx; 28 margin-right: 20rpx;
43 - color: #696969; 29 + color: #515151;
44 font-family: PingFang SC; 30 font-family: PingFang SC;
45 } 31 }
46 32
@@ -53,12 +39,11 @@ page { @@ -53,12 +39,11 @@ page {
53 39
54 .text_info { 40 .text_info {
55 color: #000; 41 color: #000;
56 - font-family: PingFang SC;  
57 - font-weight: 600; 42 + font-family: PingFang SC;
58 } 43 }
59 44
60 .explain_news { 45 .explain_news {
61 - padding: 24rpx 40rpx; 46 + padding: 24rpx 32rpx;
62 color: #999999; 47 color: #999999;
63 font-family: PingFang SC; 48 font-family: PingFang SC;
64 font-size: 24rpx; 49 font-size: 24rpx;
@@ -89,10 +74,8 @@ page { @@ -89,10 +74,8 @@ page {
89 margin: 0; 74 margin: 0;
90 border-radius: 42rpx; 75 border-radius: 42rpx;
91 width: 100%; 76 width: 100%;
92 - color: #fff;  
93 - height: 72rpx;  
94 - line-height: 72rpx;  
95 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 77 + color: #fff;
  78 + background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
96 } 79 }
97 80
98 .favourable_box { 81 .favourable_box {
@@ -100,7 +83,7 @@ page { @@ -100,7 +83,7 @@ page {
100 } 83 }
101 84
102 .about { 85 .about {
103 - color: #696969; 86 + color: #515151;
104 font-family: PingFang SC; 87 font-family: PingFang SC;
105 line-height: 48rpx; 88 line-height: 48rpx;
106 height: 48rpx; 89 height: 48rpx;
@@ -116,14 +99,13 @@ page { @@ -116,14 +99,13 @@ page {
116 } 99 }
117 100
118 .bundle_left { 101 .bundle_left {
119 - color: #696969; 102 + color: #515151;
120 font-family: PingFang SC; 103 font-family: PingFang SC;
121 } 104 }
122 105
123 .bundle_right { 106 .bundle_right {
124 - color: #000;  
125 - font-family: PingFang SC;  
126 - font-weight: 600; 107 + color: #999;
  108 + font-family: PingFang SC;
127 } 109 }
128 110
129 .list { 111 .list {
@@ -132,21 +114,18 @@ page { @@ -132,21 +114,18 @@ page {
132 align-items: center; 114 align-items: center;
133 flex-wrap: wrap; 115 flex-wrap: wrap;
134 border-bottom: 2rpx solid #dbdbdb; 116 border-bottom: 2rpx solid #dbdbdb;
135 - padding-left: 32rpx;  
136 - justify-content: flex-end; 117 + padding-left: 32rpx;
137 } 118 }
138 119
139 .item { 120 .item {
140 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
141 - -webkit-background-clip: text;  
142 - -webkit-text-fill-color: transparent; 121 + color: #0143a3;
143 font-family: PingFang SC; 122 font-family: PingFang SC;
144 margin-right: 18rpx; 123 margin-right: 18rpx;
145 padding-bottom: 24rpx; 124 padding-bottom: 24rpx;
146 } 125 }
147 126
148 .week { 127 .week {
149 - margin: 0 40rpx; 128 + padding: 0 32rpx;
150 border-bottom: 2rpx solid #E7E7E7; 129 border-bottom: 2rpx solid #E7E7E7;
151 } 130 }
152 131
@@ -163,9 +142,8 @@ page { @@ -163,9 +142,8 @@ page {
163 } 142 }
164 143
165 .texts { 144 .texts {
166 - color: #000;  
167 - font-family: PingFang SC;  
168 - font-weight: 600; 145 + color: #999;
  146 + font-family: PingFang SC;
169 } 147 }
170 148
171 .dateList { 149 .dateList {
@@ -4,21 +4,21 @@ @@ -4,21 +4,21 @@
4 <view class="box" wx:if="{{list.length>0}}"> 4 <view class="box" wx:if="{{list.length>0}}">
5 <view wx:for="{{list}}" class="single" bindtap="gogoSingle" data-id="{{item.id}}"> 5 <view wx:for="{{list}}" class="single" bindtap="gogoSingle" data-id="{{item.id}}">
6 <view class="topBox"> 6 <view class="topBox">
7 - <view class="name font20r">  
8 - ￥<text>{{item.recharge_money}}</text> 7 + <view class="name font32r">
  8 + {{item.rname}}
9 </view> 9 </view>
10 - <view class="mainBox">  
11 - <view class="texts info font24r" wx:if="{{item.priceInfo}}">  
12 - {{item.priceInfo}}{{(item.recharge_lists.is_coupons=='0' && item.recharge_lists.is_score=='0')?'。':';'}}  
13 - </view>  
14 - <view class="texts info font24r" wx:if="{{item.scoreInfo}}">  
15 - {{item.scoreInfo}}{{item.recharge_lists.is_coupons=='0'?'。':';'}}  
16 - </view>  
17 - <view class="texts info font24r" wx:if="{{item.recharge_lists.is_coupons=='1'}}">  
18 - {{item.recharge_lists.is_coupons=='1'?'会员充值满'+item.recharge_money+'元赠送'+item.certificate:''}}。  
19 - </view>  
20 - </view>  
21 - <view class="btn font24r">充值</view> 10 + <view class="texts info font24r" wx:if="{{item.priceInfo}}">
  11 + {{item.priceInfo}}{{(item.recharge_lists.is_coupons=='0' && item.recharge_lists.is_score=='0')?'。':';'}}
  12 + </view>
  13 + <view class="texts info font24r" wx:if="{{item.scoreInfo}}">
  14 + {{item.scoreInfo}}{{item.recharge_lists.is_coupons=='0'?'。':';'}}
  15 + </view>
  16 + <view class="texts info font24r" wx:if="{{item.recharge_lists.is_coupons=='1'}}">
  17 + {{item.recharge_lists.is_coupons=='1'?'会员充值满'+item.recharge_money+'元赠送'+item.certificate:''}}。
  18 + </view>
  19 + </view>
  20 + <view class="texts time font24r">
  21 + 有效期限：{{util.unixtoTime(item.stime,'YYYY-MM-DD')}}至{{util.unixtoTime(item.etime,'YYYY-MM-DD')}}
22 </view> 22 </view>
23 </view> 23 </view>
24 </view> 24 </view>
@@ -3,55 +3,42 @@ page{ @@ -3,55 +3,42 @@ page{
3 background: #F3F3F3; 3 background: #F3F3F3;
4 } 4 }
5 .box{ 5 .box{
6 - padding: 32rpx 40rpx; 6 + padding: 32rpx 40rpx;
7 } 7 }
8 .single{ 8 .single{
9 width: 100%; 9 width: 100%;
10 border-radius: 16rpx; 10 border-radius: 16rpx;
11 - background: linear-gradient(180deg, #ffefd0 0%, #ffdc9b 100%); 11 + background-color: #FFFFFF;
  12 + box-shadow: 0rpx 8rpx 8rpx #00000040;
12 margin-bottom: 32rpx; 13 margin-bottom: 32rpx;
13 } 14 }
14 .topBox{ 15 .topBox{
15 width: 100%; 16 width: 100%;
16 - display: flex;  
17 - align-items: center;  
18 - justify-content: space-between;  
19 - padding: 20rpx 0; 17 + display: flex;
  18 + flex-direction: column;
  19 + justify-content: space-between;
20 } 20 }
21 .name{ 21 .name{
  22 + background-color: #0143A3;
22 height: 37%; 23 height: 37%;
23 line-height: 60rpx; 24 line-height: 60rpx;
24 - padding-left: 12rpx;  
25 - color: #F6231B; 25 + padding-left: 40rpx;
  26 + color: #ffffff;
26 font-family: PingFang SC; 27 font-family: PingFang SC;
27 font-weight: 500; 28 font-weight: 500;
28 border-top-left-radius: 10rpx; 29 border-top-left-radius: 10rpx;
29 border-top-right-radius: 10rpx; 30 border-top-right-radius: 10rpx;
30 } 31 }
31 -  
32 -.name text {  
33 - font-size: 48rpx;  
34 - font-weight: 600;  
35 -}  
36 -  
37 -.mainBox {  
38 - border-left: 2rpx dashed #f6231b;  
39 - padding-left: 18rpx;  
40 - margin-left: 18rpx; 32 +.texts{
  33 + padding-left: 40rpx;
  34 + color: #999999;
  35 + font-family: PingFang SC;
  36 + line-height: 50rpx;
41 } 37 }
42 -  
43 -.btn {  
44 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
45 - border-radius: 198rpx;  
46 - width: 120rpx;  
47 - height: 40rpx;  
48 - line-height: 40rpx;  
49 - color: #fff;  
50 - flex-shrink: 0;  
51 - text-align: center;  
52 - margin: 0 24rpx 0 10rpx; 38 +.topBox{
  39 + height: 68%;
  40 + border-bottom: 2rpx dashed #bfc4d4;
53 } 41 }
54 -  
55 -.texts {  
56 - color: #C36607; 42 +.time{
  43 + line-height: 70rpx;
57 } 44 }
1 <!--pages/customer/cancel.wxml--> 1 <!--pages/customer/cancel.wxml-->
2 -<nav hasHome>取消预订</nav>  
3 -<view class="pages">  
4 - <view class="flex align-center justify-center">  
5 - <image src="https://qn.colorcun.com/bookCancel.png" style="width: 72rpx;height: 72rpx;"></image> 2 +<nav hasHome>取消订座</nav>
  3 +<view class="pages" style="padding-bottom: {{paddingBottom+70}}px;">
  4 + <view class="flex align-center">
  5 + <image src="http://nosqn.colorcun.com/jiujiajingicon08%403x.png" style="width: 82rpx;height: 72rpx;"></image>
6 <view class="margin-left-lg text-bold text-black"> 6 <view class="margin-left-lg text-bold text-black">
7 - <view class="txt-40-h">请告知取消原因</view>  
8 - <view class="txt-24-h">以便为您提供更好的服务</view> 7 + <view class="txt-32-h">请告知取消原因</view>
  8 + <view class="txt-32-h">以便为您提供更好的服务</view>
9 </view> 9 </view>
10 </view> 10 </view>
11 - <view class="reasons-title">请选择取消原因（必选）</view> 11 + <view class="reasons-title">取消原因（必选）</view>
12 <radio-group class="radio-group reasons-group" bindchange="radioChange"> 12 <radio-group class="radio-group reasons-group" bindchange="radioChange">
13 - <!-- <block wx:for="{{reasons}}" wx:key="reasons">  
14 -  
15 - <radio class="reasons-radio"  
16 - value="{{index}}" checked="{{index==radioIndex}}">  
17 - <text class="reasons-radio-text">{{item}}</text>  
18 - </radio>  
19 - </block> -->  
20 - <label class="reasons-radio" wx:for="{{reasons}}" wx:key="{{item}}">  
21 - <view class="reasons-radio-text">{{item}}</view>  
22 - <radio class="reasons-radio" value="{{index}}" checked="{{index==radioIndex}}"/>  
23 - </label> 13 + <radio class="reasons-radio"
  14 + wx:for="{{reasons}}" wx:key="reasons" value="{{index}}" checked="{{index==radioIndex}}">
  15 + <text class="reasons-radio-text">{{item}}</text>
  16 + </radio>
24 </radio-group> 17 </radio-group>
25 <textarea class="cancel-input" placeholder="请输入其他原因（不超过30字）" hidden="{{!inputFouce}}" 18 <textarea class="cancel-input" placeholder="请输入其他原因（不超过30字）" hidden="{{!inputFouce}}"
26 bindinput="cancelInput" focus="{{inputFouce}}" 19 bindinput="cancelInput" focus="{{inputFouce}}"
@@ -32,9 +25,7 @@ @@ -32,9 +25,7 @@
32 adjust-position="{{false}}" bindfocus="textareaFocus" 25 adjust-position="{{false}}" bindfocus="textareaFocus"
33 bindinput="textareaInput" 26 bindinput="textareaInput"
34 placeholder-class="input-pl" maxlength="30"></textarea> 27 placeholder-class="input-pl" maxlength="30"></textarea>
35 - <view class="btns">  
36 - <view class="cancel-button round" 28 + <view class="cancel-button round bg-blue-blue"
37 bindtap="cancelSubmit" 29 bindtap="cancelSubmit"
38 style="bottom:{{paddingBottom}}px;">申请取消</view> 30 style="bottom:{{paddingBottom}}px;">申请取消</view>
39 - </view>  
40 </view> 31 </view>
1 /* pages/customer/cancel.wxss */ 1 /* pages/customer/cancel.wxss */
2 @import "/colorui/icon.wxss"; 2 @import "/colorui/icon.wxss";
3 @import "/colorui/main.wxss"; 3 @import "/colorui/main.wxss";
4 -page{  
5 - background: #F5F5F5;  
6 -}  
7 .pages{ 4 .pages{
8 - margin: 20rpx;  
9 - box-sizing: border-box;  
10 - padding: 40rpx; 5 + width: calc(100% - 80rpx);
  6 + padding-left: 40rpx;
11 font-size:28rpx; 7 font-size:28rpx;
12 color:rgba(153,153,153,1); 8 color:rgba(153,153,153,1);
13 - background: #fff;  
14 - border-radius: 10rpx; 9 + padding-top: 60rpx;
15 } 10 }
16 .cancel-button{ 11 .cancel-button{
17 - height:72rpx;  
18 - line-height: 72rpx;  
19 - box-sizing: border-box; 12 + height:84rpx;
  13 + line-height: 84rpx;
20 width: calc(100% - 80rpx); 14 width: calc(100% - 80rpx);
21 text-align: center; 15 text-align: center;
22 font-size:36rpx; 16 font-size:36rpx;
23 font-weight:600; 17 font-weight:600;
24 color:rgba(254,254,254,1); 18 color:rgba(254,254,254,1);
25 margin: 0 auto; 19 margin: 0 auto;
26 - position: relative;  
27 - top: -20rpx;  
28 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
29 - -webkit-background-clip: text;  
30 - -webkit-text-fill-color: transparent;  
31 - border: 2rpx solid #fe6806; 20 + position: fixed;
  21 + bottom: 20rpx;
32 22
33 } 23 }
34 .cancel-input{ 24 .cancel-input{
35 - border: 2rpx solid #CBCBCB; 25 + border: 2rpx solid #F5F5F5;
36 height: 208rpx; 26 height: 208rpx;
37 width: 100%; 27 width: 100%;
38 box-sizing: border-box; 28 box-sizing: border-box;
@@ -43,25 +33,25 @@ page{ @@ -43,25 +33,25 @@ page{
43 .reasons-title{ 33 .reasons-title{
44 height:40rpx; 34 height:40rpx;
45 font-size:28rpx; 35 font-size:28rpx;
46 - color:#000; 36 + font-weight:500;
  37 + color:rgba(153,153,153,1);
47 line-height:40rpx; 38 line-height:40rpx;
48 - margin: 40rpx 0;  
49 - font-weight: 600; 39 + margin-top: 60rpx;
  40 + margin-bottom: 60rpx;
50 } 41 }
51 .reasons-group{ 42 .reasons-group{
52 font-size: 30rpx; 43 font-size: 30rpx;
53 - width: 100%;  
54 } 44 }
55 45
56 .reasons-radio{ 46 .reasons-radio{
57 - height: 90rpx;  
58 - line-height: 90rpx;  
59 - font-size:28rpx; 47 + height: 102rpx;
  48 + line-height: 102rpx;
  49 + font-size:30rpx;
60 font-weight:500; 50 font-weight:500;
61 color:rgba(53,53,53,1); 51 color:rgba(53,53,53,1);
  52 + width: 100%;
  53 + border-top: 2rpx solid #F5F5F5;
62 box-sizing: border-box; 54 box-sizing: border-box;
63 - display: flex;  
64 - justify-content: space-between;  
65 } 55 }
66 radio::before 56 radio::before
67 { 57 {
@@ -85,29 +75,10 @@ radio.radio[checked]::after { @@ -85,29 +75,10 @@ radio.radio[checked]::after {
85 } 75 }
86 radio.reasons-radio[checked] .wx-radio-input { 76 radio.reasons-radio[checked] .wx-radio-input {
87 border-color: transparent !important; 77 border-color: transparent !important;
88 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 78 + background: linear-gradient(180deg, #3BBFF5 0%, #57A0FF 100%);
89 color: var(--white) !important; 79 color: var(--white) !important;
90 } 80 }
91 81
92 .reasons-radio-text{ 82 .reasons-radio-text{
93 padding-left: 20rpx; 83 padding-left: 20rpx;
94 - flex: 1;  
95 - color: #000;  
96 - font-weight: 400;  
97 - font-size: 28rpx;  
98 } 84 }
99 -  
100 -  
101 -.btns {  
102 - position: fixed;  
103 - bottom: 0;  
104 - left: 0;  
105 - width: 100%;  
106 - background: #fff;  
107 - height: 200rpx;  
108 - display: flex;  
109 - justify-content: space-between;  
110 - align-items: center;  
111 - padding: 0 40rpx;  
112 - box-sizing: border-box;  
113 -}  
@@ -2,12 +2,11 @@ @@ -2,12 +2,11 @@
2 <nav bindNavEvent="backFun" class="navhome" place="{{true}}">店铺信息</nav> 2 <nav bindNavEvent="backFun" class="navhome" place="{{true}}">店铺信息</nav>
3 <view class="main"> 3 <view class="main">
4 <view class="imgs"> 4 <view class="imgs">
5 - <image src="https://qn.colorcun.com/bookSuccess.png" mode="" />  
6 - <text class="font32r">提交成功</text> 5 + <image src="https://qn.colorcun.com/collectSeller.png" mode="" />
7 </view> 6 </view>
8 - <view class="texts font28r">  
9 - <text>感谢您的信任！我们已经记录了您的信息。</text>  
10 - <text>客服人员会在第一时间联系您，处理相关事宜。</text> 7 + <view class="texts">
  8 + <text>感谢您的信任！</text>
  9 + <text>我们已经记录了您的信息。客服人员会在第一时间联系您，处理相关事宜。</text>
11 </view> 10 </view>
12 <view class="btnBox"> 11 <view class="btnBox">
13 <button class="btn" bindtap="backFun">朕知道了</button> 12 <button class="btn" bindtap="backFun">朕知道了</button>
1 /* pages/customer/collectSeller.wxss */ 1 /* pages/customer/collectSeller.wxss */
2 -page {  
3 - background: #F5F5F5;  
4 -}  
5 -  
6 .main { 2 .main {
7 display: flex; 3 display: flex;
8 flex-direction: column; 4 flex-direction: column;
9 - align-items: center;  
10 - background: #fff;  
11 - border-radius: 10rpx;  
12 - margin: 12rpx;  
13 - padding: 120rpx 0; 5 + align-items: center;
14 } 6 }
15 7
16 .imgs { 8 .imgs {
17 - margin-bottom: 20rpx; 9 + margin: 120rpx 0 20rpx 0;
  10 + border: 4rpx solid #0143a3;
18 border-radius: 50%; 11 border-radius: 50%;
19 - display: flex;  
20 - flex-direction: column; 12 + width: 140rpx;
  13 + height: 140rpx;
  14 + display: flex;
21 align-items: center; 15 align-items: center;
22 justify-content: center; 16 justify-content: center;
23 } 17 }
24 18
25 .imgs image { 19 .imgs image {
26 - width: 88rpx;  
27 - height: 88rpx;  
28 -}  
29 -  
30 -.imgs text {  
31 - font-weight: 600;  
32 - margin: 16rpx 0 32rpx 0;  
33 - color: #000; 20 + width: 140rpx;
  21 + height: 140rpx;
34 } 22 }
35 23
36 .texts { 24 .texts {
@@ -39,29 +27,20 @@ page { @@ -39,29 +27,20 @@ page {
39 margin: 0 40rpx; 27 margin: 0 40rpx;
40 color: #000000; 28 color: #000000;
41 font-family: PingFang SC; 29 font-family: PingFang SC;
  30 + font-size: 32rpx;
42 } 31 }
43 32
44 .btnBox { 33 .btnBox {
45 - position: fixed;  
46 - bottom: 0;  
47 - left: 0;  
48 - width: 100%;  
49 - background: #fff;  
50 - height: 200rpx;  
51 - display: flex;  
52 - justify-content: space-between;  
53 - align-items: center;  
54 - padding: 0 40rpx;  
55 - box-sizing: border-box; 34 + width: 100%;
  35 + margin-top: 120rpx;
  36 + background: #FAFAFA;
  37 + padding: 24rpx 0 50rpx 0;
56 } 38 }
57 39
58 .btn { 40 .btn {
59 - width: 90%; 41 + width: 75%;
60 color: #fff; 42 color: #fff;
61 - border-radius: 40rpx;  
62 - height: 72rpx;  
63 - line-height: 72rpx;  
64 - position: relative;  
65 - top: -20rpx;  
66 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 43 + font-size: 32rpx;
  44 + border-radius: 40rpx;
  45 + background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
67 } 46 }
@@ -24,36 +24,36 @@ @@ -24,36 +24,36 @@
24 24
25 <detail-status detail="{{detail}}" ></detail-status> 25 <detail-status detail="{{detail}}" ></detail-status>
26 <detail-card detail="{{detail}}"></detail-card> 26 <detail-card detail="{{detail}}"></detail-card>
27 - <view class="flex justify-end align-center margin-top text-black btns">  
28 - <block wx:if="{{customerCancel && customerCancel == '1'}}">  
29 - <navigator url="./cancel?id={{detail.id}}"  
30 - wx:if="{{(detail.hasRunning || detail.status==0) && checkout.status!=3}}"  
31 - class="split btnBox">  
32 - <view class="min-but flex align-center justify-center txt-30-h btn1">取消预订</view>  
33 - </navigator>  
34 - </block>  
35 - <service id="service" class="split view btnBox">  
36 - <view class="min-but flex align-center justify-center txt-30-h btn1 {{(detail.status=='4' || detail.status=='2' || detail.status=='3')?'':'btn2'}}">联系客服</view> 27 + <view class="flex padding justify-end align-center margin-top text-black">
  28 + <service id="service" class="split view">
  29 + <view class="min-but flex align-center justify-center txt-30-h solid">联系客服</view>
37 </service> 30 </service>
38 <block wx:if="{{detail.seller.is_online_reserve == '1'}}"> 31 <block wx:if="{{detail.seller.is_online_reserve == '1'}}">
39 <navigator url="/pages/reserve/reserve?id={{detail.sid}}&activeTab=reserve" 32 <navigator url="/pages/reserve/reserve?id={{detail.sid}}&activeTab=reserve"
40 wx:if="{{detail.hasCancel || detail.status==6}}" 33 wx:if="{{detail.hasCancel || detail.status==6}}"
41 - class="split btnBox">  
42 - <view class="min-but flex align-center justify-center txt-30-h btn1 btn2">再次预订</view> 34 + class="split">
  35 + <view class="min-but flex align-center justify-center txt-30-h solid">再次预订</view>
43 </navigator> 36 </navigator>
44 </block> 37 </block>
45 - <block>  
46 - <view bindtap="gotoInvitation"  
47 - wx:if="{{detail.hasRunning}}"  
48 - class="split btnBox">  
49 - <view class="min-but flex align-center justify-center txt-30-h line-blue">通知好友</view>  
50 - </view> 38 + <block wx:if="{{customerCancel && customerCancel == '1'}}">
  39 + <navigator url="./cancel?id={{detail.id}}"
  40 + wx:if="{{(detail.hasRunning || detail.status==0) && checkout.status!=3}}"
  41 + class="split">
  42 + <view class="min-but flex align-center justify-center txt-30-h solid">取消预订</view>
  43 + </navigator>
51 </block> 44 </block>
  45 + <block>
  46 + <view bindtap="gotoInvitation"
  47 + wx:if="{{detail.hasRunning}}"
  48 + class="split">
  49 + <view class="min-but flex align-center justify-center txt-30-h solid line-blue">通知好友</view>
  50 + </view>
  51 + </block>
52 52
53 - <navigator url="/pages/pinglun/createOpinion?sellid={{detail.seller.id}}&oid={{detail.id}}&sellerName={{detail.seller.sellername}}&types=1" 53 + <navigator url="/pages/pinglun/create?sid={{detail.seller.id}}&oid={{detail.id}}&sellername={{detail.seller.sellername}}"
54 wx:if="{{detail.hasFinished && hasComment}}" 54 wx:if="{{detail.hasFinished && hasComment}}"
55 - class="split btnBox">  
56 - <view class="min-but flex align-center justify-center txt-30-h line-blue btn1 btn2">评价</view> 55 + class="split">
  56 + <view class="min-but flex align-center justify-center txt-30-h solid line-blue">评价</view>
57 </navigator> 57 </navigator>
58 </view> 58 </view>
59 <view class="margin-lr-lg padding-tb-lg view solid-top" wx:if="{{detail.customers.length>1}}"> 59 <view class="margin-lr-lg padding-tb-lg view solid-top" wx:if="{{detail.customers.length>1}}">
@@ -71,22 +71,21 @@ @@ -71,22 +71,21 @@
71 </view> 71 </view>
72 <view class="fixed-buttons flex justify-between align-center padding-lg view bg-white"> 72 <view class="fixed-buttons flex justify-between align-center padding-lg view bg-white">
73 <view wx:if="{{detail.hasRunning && detail.seller.is_open_order==1}}" 73 <view wx:if="{{detail.hasRunning && detail.seller.is_open_order==1}}"
74 - class="view flex-treble big-but flex align-center justify-center txt-34-h line-blue round btnBox"> 74 + class="view flex-treble big-but flex align-center justify-center txt-34-h solid line-blue round">
75 <userinfo 75 <userinfo
76 binduserinfo="cookbook" 76 binduserinfo="cookbook"
77 bindshare="share" 77 bindshare="share"
78 share="{{detail}}" 78 share="{{detail}}"
79 - share-act="invitation"  
80 - >  
81 - <view wx:if="{{detail.order && detail.order.cookbooklist.length>0}}" class="btn1"> 79 + share-act="invitation">
  80 + <view wx:if="{{detail.order && detail.order.cookbooklist.length>0}}">
82 查看菜品 81 查看菜品
83 </view> 82 </view>
84 - <view wx:else="" class="btn1">提前点餐</view> 83 + <view wx:else="">提前点餐</view>
85 </userinfo> 84 </userinfo>
86 </view> 85 </view>
87 <block wx:if="{{detail.status==6}}"> 86 <block wx:if="{{detail.status==6}}">
88 <view bindtap="gotoList" 87 <view bindtap="gotoList"
89 - class="view flex-treble big-but flex align-center justify-center txt-34-h line-blue round btn1 btn2"> 88 + class="view flex-treble big-but flex align-center justify-center txt-34-h solid line-blue round">
90 帮我推荐餐厅 89 帮我推荐餐厅
91 </view> 90 </view>
92 <!-- <chatbot class="big-but view flex-treble align-center justify-center" params="{{chatbotParams}}"> 91 <!-- <chatbot class="big-but view flex-treble align-center justify-center" params="{{chatbotParams}}">
@@ -99,13 +98,13 @@ @@ -99,13 +98,13 @@
99 </chatbot> --> 98 </chatbot> -->
100 </block> 99 </block>
101 100
102 - <view class="view flex-treble big-but flex align-center justify-center txt-34-h line-blue round btnBox" 101 + <view class="view flex-treble big-but flex align-center justify-center txt-34-h solid line-blue round"
103 wx:if="{{detail.hasRunning && detail.seller.isopen_md==1}}"> 102 wx:if="{{detail.hasRunning && detail.seller.isopen_md==1}}">
104 <userinfo 103 <userinfo
105 binduserinfo="checkout" 104 binduserinfo="checkout"
106 share="{{detail}}" 105 share="{{detail}}"
107 share-act="invitation"> 106 share-act="invitation">
108 - <view style="position: relative;" class="btn1 btn2"> 107 + <view style="position: relative;">
109 在线买单 108 在线买单
110 <seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}" 109 <seller-discount id="seller-discount" seller="{{detail.seller}}" wx:if="{{detail.seller}}"
111 cla="money-tips detail_owner"></seller-discount> 110 cla="money-tips detail_owner"></seller-discount>
1 /* pages/customer/detail_owner.wxss */ 1 /* pages/customer/detail_owner.wxss */
2 @import "../../colorui/main.wxss"; 2 @import "../../colorui/main.wxss";
3 -page {  
4 - background: #F5F5F5;  
5 -}  
6 -  
7 .fixed-buttons{ 3 .fixed-buttons{
8 position: fixed; 4 position: fixed;
9 bottom: 0; 5 bottom: 0;
@@ -22,10 +18,7 @@ page { @@ -22,10 +18,7 @@ page {
22 border-radius: 20rpx; 18 border-radius: 20rpx;
23 } 19 }
24 .split+.split{ 20 .split+.split{
25 - width: 45%;  
26 margin-left: 40rpx; 21 margin-left: 40rpx;
27 - position: relative;  
28 - top: -20rpx;  
29 } 22 }
30 .big-but{ 23 .big-but{
31 height: 84rpx; 24 height: 84rpx;
@@ -372,48 +365,4 @@ page { @@ -372,48 +365,4 @@ page {
372 height: 48rpx; 365 height: 48rpx;
373 margin-right: 6rpx; 366 margin-right: 6rpx;
374 margin-left: 6rpx; 367 margin-left: 6rpx;
375 -}  
376 -  
377 -.btns {  
378 - position: fixed;  
379 - bottom: 0;  
380 - left: 0;  
381 - width: 100%;  
382 - background: #fff;  
383 - height: 200rpx;  
384 - display: flex;  
385 - justify-content: space-between;  
386 - align-items: center;  
387 - padding: 0 40rpx;  
388 - box-sizing: border-box;  
389 -}  
390 -  
391 -.btn1 {  
392 - height: 72rpx;  
393 - box-sizing: border-box;  
394 - line-height: 72rpx;  
395 - border-radius: 198rpx !important;  
396 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
397 - -webkit-background-clip: text;  
398 - -webkit-text-fill-color: transparent;  
399 - border: 2rpx solid #fe6806;  
400 - text-align: center;  
401 -}  
402 -  
403 -.btn2 {  
404 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
405 - color: #fff;  
406 - -webkit-text-fill-color: #fff;  
407 - text-align: center;  
408 -}  
409 -  
410 -.btnBox {  
411 - width: 45%;  
412 - position: relative;  
413 - top: -20rpx;  
414 - border-radius: 198rpx;  
415 -}  
416 -  
417 -userinfo {  
418 - width: 100%;  
419 } 368 }
1 <!--pages/customer/joinSeller.wxml--> 1 <!--pages/customer/joinSeller.wxml-->
2 <nav class="navhome" place="{{true}}">店铺信息</nav> 2 <nav class="navhome" place="{{true}}">店铺信息</nav>
3 <view class="main"> 3 <view class="main">
4 - <view class="topBox font28r">在开始之前，请告诉我们关于您的一些信息，以方便专属客服给您提供周到的服务。</view> 4 + <view class="topBox">在开始之前，请告诉我们关于您的一些信息，以方便专属客服给您提供周到的服务。</view>
5 <view class="items"> 5 <view class="items">
6 - <view class="left font28r">店铺名称</view>  
7 - <input type="text" class="right font28r" model:value="{{sellername}}" placeholder="请输入您的店铺名称" /> 6 + <view class="left">店铺名称：</view>
  7 + <input type="text" class="right" model:value="{{sellername}}" placeholder="点击输入店铺名称" />
8 </view> 8 </view>
9 <view class="items"> 9 <view class="items">
10 - <view class="left font28r">城市选择</view>  
11 - <picker mode="region font28r" bindchange="bindRegionChange" value="{{region}}" style="flex:1;"> 10 + <view class="left">城市选择：</view>
  11 + <picker mode="region" bindchange="bindRegionChange" value="{{region}}" style="flex:1;">
12 <view class="picker {{region.length>0 ? 'black-font' : 'gray-font'}}"> {{region.length>0?region[0]+region[1]+region[2]:'请选择城市'}}</view> 12 <view class="picker {{region.length>0 ? 'black-font' : 'gray-font'}}"> {{region.length>0?region[0]+region[1]+region[2]:'请选择城市'}}</view>
13 </picker> 13 </picker>
14 </view> 14 </view>
15 <view class="items"> 15 <view class="items">
16 - <view class="left font28r">店铺地址</view>  
17 - <view type="text" value="{{map_address}}" class="infoInput {{map_address=='' ? 'gray-font' : 'black-font'}} smooth font28r" bindtap="chooselocation" name="map_address" placeholder="点击设置您的地址">{{map_address==''?'点击选择店铺位置' : map_address}}</view> 16 + <view class="left">店铺地址：</view>
  17 + <view type="text" value="{{map_address}}" class="infoInput {{map_address=='' ? 'gray-font' : 'black-font'}} smooth" bindtap="chooselocation" name="map_address" placeholder="点击设置您的地址">{{map_address==''?'点这里，选择店铺地图位置' : map_address}}</view>
18 </view> 18 </view>
19 <view class="items"> 19 <view class="items">
20 - <view class="left font28r">联系电话</view>  
21 - <input type="text" class="right font28r" model:value="{{phone}}" placeholder="请输入您的手机号码" /> 20 + <view class="left">联系电话：</view>
  21 + <input type="text" class="right" model:value="{{phone}}" placeholder="点击输入您的电话号码" />
22 </view> 22 </view>
23 <view class="items"> 23 <view class="items">
24 - <view class="left font28r">验证码</view>  
25 - <input type="text" class="right font28r" model:value="{{verifyCode}}" placeholder="点击输入验证码" />  
26 - <button class="verifyBox font28r" bindtap='deliver' wx:if="{{ verifySend }}">获取验证码</button>  
27 - <button class='verifyBox verifyBoxDis font28r' wx:else>{{ countDown }}</button> 24 + <view class="left">验证码：</view>
  25 + <input type="text" class="right" model:value="{{verifyCode}}" placeholder="点击输入验证码" />
  26 + <button class="verifyBox" bindtap='deliver' wx:if="{{ verifySend }}">获取验证码</button>
  27 + <button class='verifyBox verifyBoxDis' wx:else>重新获取({{ countDown }})</button>
28 </view> 28 </view>
29 <view class="items"> 29 <view class="items">
30 - <view class="left font28r">联系人</view>  
31 - <input class="right font28r" type="text" model:value="{{rname}}" placeholder="请输入您的姓名" /> 30 + <view class="left">联系人：</view>
  31 + <input class="right" type="text" model:value="{{rname}}" placeholder="点击输入您的姓名" />
32 </view> 32 </view>
33 <view class="info"> 33 <view class="info">
34 <view class="font28r">注：</view> 34 <view class="font28r">注：</view>
@@ -36,6 +36,6 @@ @@ -36,6 +36,6 @@
36 <view class="font28r">2、如果您需要预订餐厅包间，请直接联系商家。</view> 36 <view class="font28r">2、如果您需要预订餐厅包间，请直接联系商家。</view>
37 </view> 37 </view>
38 <view class="btnBox"> 38 <view class="btnBox">
39 - <button class="btn font28r" bindtap="submitInfo">提交店铺注册信息</button> 39 + <button class="btn" bindtap="submitInfo">提交店铺注册信息</button>
40 </view> 40 </view>
41 </view> 41 </view>
1 /* pages/customer/joinSeller.wxss */ 1 /* pages/customer/joinSeller.wxss */
2 -page {  
3 - background: #F5F5F5;  
4 -}  
5 -  
6 -.main {  
7 - background: #fff;  
8 - border-radius: 10rpx;  
9 - margin: 12rpx;  
10 - padding: 40rpx;  
11 -}  
12 -  
13 .topBox { 2 .topBox {
14 - color: #000000;  
15 - margin-bottom: 40rpx; 3 + margin: 40rpx 80rpx 40rpx 40rpx;
  4 + color: #000000;
16 font-family: PingFang SC; 5 font-family: PingFang SC;
  6 + font-size: 32rpx;
17 } 7 }
18 8
19 .items { 9 .items {
20 display: flex; 10 display: flex;
21 justify-content: space-between; 11 justify-content: space-between;
  12 + margin-left: 32rpx;
22 border-bottom: 2rpx solid #E7E7E7; 13 border-bottom: 2rpx solid #E7E7E7;
23 - padding: 32rpx 0; 14 + padding: 24rpx 32rpx 24rpx 0;
24 align-items: center; 15 align-items: center;
25 } 16 }
26 17
@@ -47,37 +38,23 @@ input::-webkit-input-placeholder { @@ -47,37 +38,23 @@ input::-webkit-input-placeholder {
47 } 38 }
48 39
49 .info { 40 .info {
50 - margin-top: 40rpx; 41 + margin-top: 100rpx;
  42 + padding: 0 40rpx;
51 line-height: 48rpx; 43 line-height: 48rpx;
52 } 44 }
53 45
54 -.info text {  
55 - font-weight: 400;  
56 -}  
57 -  
58 .btnBox { 46 .btnBox {
59 - position: fixed;  
60 - bottom: 0;  
61 - left: 0;  
62 - width: 100%;  
63 - background: #fff;  
64 - height: 200rpx;  
65 - display: flex;  
66 - justify-content: space-between;  
67 - align-items: center;  
68 - padding: 0 40rpx;  
69 - box-sizing: border-box; 47 + margin: 0 40rpx;
  48 + background: #FAFAFA;
  49 + padding: 24rpx 0 50rpx 0;
70 } 50 }
71 51
72 .btn { 52 .btn {
73 - width: 90%; 53 + width: 75%;
74 color: #fff; 54 color: #fff;
75 - border-radius: 40rpx;  
76 - height: 72rpx;  
77 - line-height: 72rpx;  
78 - position: relative;  
79 - top: -20rpx;  
80 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 55 + font-size: 32rpx;
  56 + border-radius: 40rpx;
  57 + background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
81 } 58 }
82 59
83 .picker { 60 .picker {
@@ -88,16 +65,12 @@ input::-webkit-input-placeholder { @@ -88,16 +65,12 @@ input::-webkit-input-placeholder {
88 margin-left: 10rpx; 65 margin-left: 10rpx;
89 height: 50rpx; 66 height: 50rpx;
90 line-height: 50rpx; 67 line-height: 50rpx;
91 - border-radius: 198rpx; 68 + border-radius: 6rpx;
  69 + color: #fff;
92 font-size: 24rpx; 70 font-size: 24rpx;
93 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
94 - -webkit-background-clip: text;  
95 - -webkit-text-fill-color: transparent;  
96 - border: 2rpx solid #fe6806; 71 + background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
97 } 72 }
98 73
99 .verifyBoxDis{ 74 .verifyBoxDis{
100 - border: 2rpx solid #CBCBCB;  
101 - color: #CBCBCB;  
102 - -webkit-text-fill-color:#CBCBCB; 75 + background: #999;
103 } 76 }
@@ -2,15 +2,13 @@ import util from '../../utils/util'; @@ -2,15 +2,13 @@ import util from '../../utils/util';
2 import App from '../../utils/api'; 2 import App from '../../utils/api';
3 Page({ 3 Page({
4 data:{ 4 data:{
5 - loading:0,  
6 - activeId:'', 5 + loading:0,
7 }, 6 },
8 onLoad(opt){ 7 onLoad(opt){
9 console.log(opt) 8 console.log(opt)
10 this.action=opt.action ? opt.action : null, 9 this.action=opt.action ? opt.action : null,
11 this.setData({ 10 this.setData({
12 - action:this.action,  
13 - activeId:opt.activeId || '', 11 + action:this.action
14 }) 12 })
15 console.log('新用户openid',wx.getStorageSync('customer_openid')) 13 console.log('新用户openid',wx.getStorageSync('customer_openid'))
16 }, 14 },
@@ -23,7 +21,7 @@ Page({ @@ -23,7 +21,7 @@ Page({
23 if(json.ret==200){ 21 if(json.ret==200){
24 this.setData({ 22 this.setData({
25 concatlist:json.data, 23 concatlist:json.data,
26 - loading:1, 24 + loading:1,
27 }) 25 })
28 } 26 }
29 }) 27 })
@@ -35,9 +33,7 @@ Page({ @@ -35,9 +33,7 @@ Page({
35 let pages = getCurrentPages(); 33 let pages = getCurrentPages();
36 this.data.concatlist[index].remark=''; 34 this.data.concatlist[index].remark='';
37 pages[pages.length-2].setData({ 35 pages[pages.length-2].setData({
38 - user:this.data.concatlist[index],  
39 - activeSex:this.data.concatlist[index].sex*1-1,  
40 - activeId:this.data.concatlist[index].id 36 + user:this.data.concatlist[index]
41 }) 37 })
42 pages[pages.length-2].user=this.data.concatlist[index]; 38 pages[pages.length-2].user=this.data.concatlist[index];
43 wx.navigateBack(); 39 wx.navigateBack();
@@ -5,12 +5,11 @@ @@ -5,12 +5,11 @@
5 <view class="flex item font30r black-font margin-bottom-sm justify-between align-center padding-left padding-right-lg" data-index="{{index}}" catchtap="edit"> 5 <view class="flex item font30r black-font margin-bottom-sm justify-between align-center padding-left padding-right-lg" data-index="{{index}}" catchtap="edit">
6 <view> 6 <view>
7 <view class="flex align-center"> 7 <view class="flex align-center">
8 - <viwe class="txt-32-h text-bold">{{item.name}}</viwe> 8 + <viwe class="txt-38-h text-bold">{{item.name}}</viwe>
9 <viwe wx:if="{{item.is_default==1}}" class="default margin-left-sm">默认</viwe> 9 <viwe wx:if="{{item.is_default==1}}" class="default margin-left-sm">默认</viwe>
10 </view> 10 </view>
11 - <view class="txt-32-h" style="margin-top: 16rpx;">{{item.phone}}</view> 11 + <view class="txt-38-h" style="margin-top: 16rpx;">{{item.phone}}</view>
12 </view> 12 </view>
13 - <image wx:if="{{action && activeId == item.id}}" class="imgs" src="https://qn.colorcun.com/checkImgIcon.png" mode=""/>  
14 <image src="http://nosqn.colorcun.com/detail/x%20%2815%29.png" 13 <image src="http://nosqn.colorcun.com/detail/x%20%2815%29.png"
15 wx:if="{{!action}}" 14 wx:if="{{!action}}"
16 style="width: 28rpx;height: 30rpx;"></image> 15 style="width: 28rpx;height: 30rpx;"></image>
@@ -23,7 +22,7 @@ @@ -23,7 +22,7 @@
23 <view class="txt-28-h margin-top-lg">暂无常用预订人哦</view> 22 <view class="txt-28-h margin-top-lg">暂无常用预订人哦</view>
24 </view> 23 </view>
25 <view class="add-cover flex-cc"> 24 <view class="add-cover flex-cc">
26 - <view class="white-font font36r text-bold add-button flex-cc btn round" catchtap="add">新建预订人</view> 25 + <view class="white-font font36r text-bold add-button flex-cc bg-blue-blue round" catchtap="add">新建联系人</view>
27 </view> 26 </view>
28 <menu></menu> 27 <menu></menu>
29 <service></service> 28 <service></service>
1 @import "../../colorui/main.wxss"; 1 @import "../../colorui/main.wxss";
2 -page {  
3 - background: #F5F5F5;  
4 -}  
5 -  
6 .concat-list{ 2 .concat-list{
7 width:100%; 3 width:100%;
8 - padding:12rpx 12rpx 150rpx;  
9 - box-sizing: border-box; 4 + padding:40rpx 40rpx 150rpx;
  5 + box-sizing: border-box;
10 } 6 }
11 .item{ 7 .item{
12 width: 100%; 8 width: 100%;
13 - height: 188rpx; 9 + height: 204rpx;
14 background: #FFFFFF; 10 background: #FFFFFF;
15 - border-radius: 10rpx; 11 + box-shadow: 0px 0px 20rpx 0px #EEF0F2;
  12 + border-radius: 20rpx;
16 box-sizing: border-box; 13 box-sizing: border-box;
17 } 14 }
18 .add-cover{ 15 .add-cover{
@@ -30,25 +27,16 @@ page { @@ -30,25 +27,16 @@ page {
30 margin:0 auto; 27 margin:0 auto;
31 } 28 }
32 .default{ 29 .default{
33 - width: 64rpx;  
34 - height: 34rpx;  
35 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 30 + width: 96rpx;
  31 + height: 60rpx;
  32 + background: #F8F8F8;
36 border-radius: 10rpx; 33 border-radius: 10rpx;
37 - font-size: 24rpx;  
38 - font-family: PingFangSC-Regular, PingFang SC;  
39 - font-weight: 400;  
40 - color: #fff;  
41 - line-height: 34rpx;  
42 - text-align: center;  
43 -}  
44 34
45 -.btn {  
46 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
47 - height: 72rpx;  
48 - line-height: 72rpx;  
49 -}  
50 35
51 -.imgs {  
52 - width: 42rpx;  
53 - height: 42rpx; 36 + font-size: 28rpx;
  37 + font-family: PingFangSC-Regular, PingFang SC;
  38 + font-weight: 400;
  39 + color: #666666;
  40 + line-height: 60rpx;
  41 + text-align: center;
54 } 42 }
@@ -5,12 +5,17 @@ @@ -5,12 +5,17 @@
5 <block wx:if="{{list.length>0}}"> 5 <block wx:if="{{list.length>0}}">
6 <view wx:for="{{list}}" bindtap="todetail" data-item="{{item}}" wx:if="{{item.recharge_name || item.aname}}" class="preferentialItems {{item.noShow == '0' ? 'noStyle':''}}"> 6 <view wx:for="{{list}}" bindtap="todetail" data-item="{{item}}" wx:if="{{item.recharge_name || item.aname}}" class="preferentialItems {{item.noShow == '0' ? 'noStyle':''}}">
7 <view class="itemLeft"> 7 <view class="itemLeft">
8 - <image src="https://qn.colorcun.com/{{item.couponType=='1'?'voucherIcon1':item.couponType=='2'?'coupon2':'coupon3'}}.png" mode="" /> 8 + <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
  9 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
  10 + <view class="priceText" wx:if="{{item.price}}">
  11 + <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
  12 + </view>
  13 + <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
9 </view> 14 </view>
  15 + <view class="couponLine"></view>
10 <view class="itemRight"> 16 <view class="itemRight">
11 <view class="btns"> 17 <view class="btns">
12 - <text class="font28r">{{item.recharge_name || item.aname}}</text>  
13 - <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 18 + <text class="font40r">{{item.recharge_name || item.aname}}</text>
14 <block wx:if="{{item.is_type == '1' || item.is_type == '2' || item.type == '1' || item.type == '2'}}"> 19 <block wx:if="{{item.is_type == '1' || item.is_type == '2' || item.type == '1' || item.type == '2'}}">
15 <view wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</view> 20 <view wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</view>
16 <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r"> 21 <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
@@ -31,12 +36,7 @@ @@ -31,12 +36,7 @@
31 </block> 36 </block>
32 </view> 37 </view>
33 <view class="btnBox"> 38 <view class="btnBox">
34 - <view class="priceText" wx:if="{{item.price}}">  
35 - <view class="icons font24r">￥</view><text>{{item.price}}</text>  
36 - </view>  
37 - <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">满{{item.desc}}元可用</view>  
38 <view class="font24r orderingFood" wx:if="{{item.is_type!='3'&&item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'}}">去核销</view> 39 <view class="font24r orderingFood" wx:if="{{item.is_type!='3'&&item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'}}">去核销</view>
39 - <view class="font24r orderingFood" wx:if="{{item.is_type=='3'&&item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'}}">去使用</view>  
40 <view class="font24r orderingFood" wx:if="{{item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1'}}">去评价</view> 40 <view class="font24r orderingFood" wx:if="{{item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1'}}">去评价</view>
41 <view class="font24r orderingFood" wx:if="{{!(item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1') && item.noShowTetxt}}">{{item.noShowTetxt}}</view> 41 <view class="font24r orderingFood" wx:if="{{!(item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1') && item.noShowTetxt}}">{{item.noShowTetxt}}</view>
42 </view> 42 </view>
1 /* pages/me/coupon_news.wxss */ 1 /* pages/me/coupon_news.wxss */
2 @import "../../app.wxss"; 2 @import "../../app.wxss";
3 -page {  
4 - background: #F5F5F5;  
5 -}  
6 3
7 .font-siny { 4 .font-siny {
8 color: #0143a3; 5 color: #0143a3;
@@ -186,25 +183,20 @@ page { @@ -186,25 +183,20 @@ page {
186 183
187 .preferentialItems { 184 .preferentialItems {
188 display: flex; 185 display: flex;
189 - background: #fff; 186 + background: linear-gradient(180deg, #ffefd0 0%, #ffdc9b 100%);
190 min-height: 160rpx; 187 min-height: 160rpx;
191 padding-bottom: 10rpx; 188 padding-bottom: 10rpx;
192 border-radius: 20rpx; 189 border-radius: 20rpx;
193 - margin: 12rpx; 190 + margin: 0 40rpx 20rpx;
194 } 191 }
195 192
196 .itemLeft { 193 .itemLeft {
  194 + width: 27%;
197 display: flex; 195 display: flex;
198 flex-direction: column; 196 flex-direction: column;
199 justify-content: center; 197 justify-content: center;
200 position: relative; 198 position: relative;
201 align-items: center; 199 align-items: center;
202 - margin-left: 24rpx;  
203 -}  
204 -  
205 -.itemLeft image {  
206 - width: 140rpx;  
207 - height: 140rpx;  
208 } 200 }
209 201
210 .discountText { 202 .discountText {
@@ -220,6 +212,28 @@ page { @@ -220,6 +212,28 @@ page {
220 top: 12rpx; 212 top: 12rpx;
221 } 213 }
222 214
  215 +.discountText1 {
  216 + text-align: center;
  217 + border-radius: 6rpx;
  218 + font-family: PingFang SC;
  219 + background: transparent;
  220 + width: max-content;
  221 + padding: 2rpx 8rpx;
  222 + position: absolute;
  223 + left: 16rpx;
  224 + top: 12rpx;
  225 +}
  226 +
  227 +.discountText2 {
  228 + background: #FD4D59;
  229 + color: #fff;
  230 +}
  231 +
  232 +.discountText3 {
  233 + color: #FD4D59;
  234 + border: 2rpx solid #FD4D59;
  235 +}
  236 +
223 .priceText { 237 .priceText {
224 display: flex; 238 display: flex;
225 align-items: baseline; 239 align-items: baseline;
@@ -235,10 +249,6 @@ page { @@ -235,10 +249,6 @@ page {
235 color: #F6231B; 249 color: #F6231B;
236 } 250 }
237 251
238 -.icons text {  
239 - font-size: 56rpx;  
240 -}  
241 -  
242 .priceText .icons { 252 .priceText .icons {
243 color: #FD4D59; 253 color: #FD4D59;
244 } 254 }
@@ -251,9 +261,14 @@ page { @@ -251,9 +261,14 @@ page {
251 padding-left: 20rpx; 261 padding-left: 20rpx;
252 } 262 }
253 263
  264 +.couponLine {
  265 + margin: 24rpx 0;
  266 + border-right: 2rpx dashed #f6231b;
  267 +}
  268 +
254 .itemRight { 269 .itemRight {
255 padding-right: 10rpx; 270 padding-right: 10rpx;
256 - margin-left: 16rpx; 271 + margin-left: 14rpx;
257 width: 74%; 272 width: 74%;
258 display: flex; 273 display: flex;
259 align-items: center; 274 align-items: center;
@@ -276,8 +291,9 @@ page { @@ -276,8 +291,9 @@ page {
276 height: 44rpx; 291 height: 44rpx;
277 width: max-content; 292 width: max-content;
278 flex-shrink: 0; 293 flex-shrink: 0;
279 - color: #fff;  
280 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 294 + border: 2rpx solid #fa4b20;
  295 + background: transparent;
  296 + color: #fa4b20;
281 } 297 }
282 298
283 .btns { 299 .btns {
@@ -297,7 +313,7 @@ page { @@ -297,7 +313,7 @@ page {
297 .bottom { 313 .bottom {
298 margin-top: 4rpx; 314 margin-top: 4rpx;
299 width: 100%; 315 width: 100%;
300 - color: #696969; 316 + color: #C36607;
301 font-family: PingFang SC; 317 font-family: PingFang SC;
302 font-weight: 500; 318 font-weight: 500;
303 display: -webkit-box; 319 display: -webkit-box;
@@ -17,9 +17,7 @@ Page({ @@ -17,9 +17,7 @@ Page({
17 */ 17 */
18 user: _u, 18 user: _u,
19 data: { 19 data: {
20 - user: _u,  
21 - array:['先生','女士','公司'],  
22 - activeSex:0, 20 + user: _u
23 }, 21 },
24 /** 22 /**
25 * 生命周期函数--监听页面加载 23 * 生命周期函数--监听页面加载
@@ -90,18 +88,16 @@ Page({ @@ -90,18 +88,16 @@ Page({
90 console.log(e) 88 console.log(e)
91 let key = util.attr(e, 'key'); 89 let key = util.attr(e, 'key');
92 let val = '' 90 let val = ''
93 - if (key == 'sex') {  
94 - val = e.detail.value*1+1;  
95 - } else if (key == 'is_default'){  
96 - val = util.attr(e, 'val');  
97 - }else{  
98 - val = util.val(e); 91 + if (key == 'sex' || key == 'is_default') {
  92 + val = util.attr(e, 'val');
  93 + console.log(val)
  94 + } else {
  95 + val = util.val(e);
99 } 96 }
100 this.user[key] = val; 97 this.user[key] = val;
101 if (key == 'sex' || key == 'is_default') { 98 if (key == 'sex' || key == 'is_default') {
102 this.setData({ 99 this.setData({
103 - user: this.user,  
104 - activeSex:e.detail.value, 100 + user: this.user
105 }) 101 })
106 } 102 }
107 }, 103 },
1 <!--pages/me/setting.wxml--> 1 <!--pages/me/setting.wxml-->
2 <nav hasHome>{{user.id ? '编辑联系人' : '新建联系人'}}</nav> 2 <nav hasHome>{{user.id ? '编辑联系人' : '新建联系人'}}</nav>
3 -<view class="page padding-top-xs">  
4 - <view class="padding-lr-lg backF">  
5 - <view class="view flex align-center justify-between solid-bottom" style="height: 100rpx;">  
6 - <image src="https://qn.colorcun.com/detail/bookPeople.png" style="width: 32rpx;height: 32rpx;"></image>  
7 - <view class="view flex-treble flex align-center margin-left-sm" style="height: 100rpx;"> 3 +<view class="page padding-top">
  4 + <view class="padding-lr-lg">
  5 + <view class="view flex align-center justify-between " style="height: 100rpx;">
  6 + <image src="http://nosqn.colorcun.com/detail/x%20%2816%29.png" style="width: 40rpx;height: 40rpx;"></image>
  7 + <view class="view flex-treble flex align-center margin-left-sm solid-bottom" style="height: 100rpx;">
8 <input class="name flex-treble" placeholder="请填写预订人姓名" 8 <input class="name flex-treble" placeholder="请填写预订人姓名"
9 bindinput="changeInput" 9 bindinput="changeInput"
10 data-key="name" 10 data-key="name"
@@ -12,13 +12,7 @@ @@ -12,13 +12,7 @@
12 bindkeyboardheightchange="keyboardheightchange" 12 bindkeyboardheightchange="keyboardheightchange"
13 adjust-position="{{false}}" 13 adjust-position="{{false}}"
14 placeholder-class="input-pl" maxlength="10"/> 14 placeholder-class="input-pl" maxlength="10"/>
15 - <picker bindchange="changeInput" data-key="sex" value="{{activeSex}}" range="{{array}}">  
16 - <view class="pickerBox font28r">  
17 - {{array[activeSex]}}  
18 - <image src="https://qn.colorcun.com/arrowBottom.png" mode=""/>  
19 - </view>  
20 - </picker>  
21 - <!-- <view class="flex text-30 sex"> 15 + <view class="flex text-30 sex">
22 <view bindtap="changeInput" 16 <view bindtap="changeInput"
23 data-key="sex" 17 data-key="sex"
24 data-val="1" 18 data-val="1"
@@ -31,12 +25,12 @@ @@ -31,12 +25,12 @@
31 data-key="sex" 25 data-key="sex"
32 data-val="3" 26 data-val="3"
33 class="text-bold margin-left-sm {{user.sex==3?'checked':''}}">公司</view> 27 class="text-bold margin-left-sm {{user.sex==3?'checked':''}}">公司</view>
34 - </view> --> 28 + </view>
35 </view> 29 </view>
36 </view> 30 </view>
37 - <view class="view flex align-center justify-between solid-bottom" style="height: 100rpx;">  
38 - <image src="https://qn.colorcun.com/detail/bookPhoneIcon.png" style="width: 32rpx;height: 32rpx;"></image>  
39 - <view class="view flex-treble flex align-center margin-left-sm" style="height: 100rpx;"> 31 + <view class="view flex align-center justify-between " style="height: 100rpx;">
  32 + <image src="http://nosqn.colorcun.com/detail/x%20%2817%29.png" style="width: 40rpx;height: 40rpx;"></image>
  33 + <view class="view flex-treble flex align-center margin-left-sm solid-bottom" style="height: 100rpx;">
40 <input class="phone flex-treble" placeholder="请填写联系方式" 34 <input class="phone flex-treble" placeholder="请填写联系方式"
41 bindinput="changeInput" 35 bindinput="changeInput"
42 data-key="phone" 36 data-key="phone"
@@ -44,28 +38,26 @@ @@ -44,28 +38,26 @@
44 value="{{user.phone}}" 38 value="{{user.phone}}"
45 adjust-position="{{false}}" 39 adjust-position="{{false}}"
46 placeholder-class="input-pl" maxlength="11"/> 40 placeholder-class="input-pl" maxlength="11"/>
47 - <!-- <phone bindgetphone="getphone"> 41 + <phone bindgetphone="getphone">
48 <view class="txt-28-h text-blue">一键录入</view> 42 <view class="txt-28-h text-blue">一键录入</view>
49 - </phone> --> 43 + </phone>
50 </view> 44 </view>
51 </view> 45 </view>
52 <view class="flex align-center justify-between" style="height: 108rpx;"> 46 <view class="flex align-center justify-between" style="height: 108rpx;">
53 - <view class="txt-28-h text-bold">设置默认联系人</view>  
54 - <switch color="#fe6806" 47 + <view class="txt-34-h text-bold">设置默认联系人</view>
  48 + <switch color="#42A5FF"
55 checked="{{user.is_default==1 ? true : false}}" 49 checked="{{user.is_default==1 ? true : false}}"
56 data-key="is_default" 50 data-key="is_default"
57 data-val="{{user.is_default==1 ? 0 : 1}}" 51 data-val="{{user.is_default==1 ? 0 : 1}}"
58 bindchange="changeInput"/> 52 bindchange="changeInput"/>
59 </view> 53 </view>
60 - <view class="gray-font font24r margin-bottom" style="line-height:40rpx;padding-bottom: 30rpx;">提醒：每次预订时，自动将默认联系人作为预订联系人，如有需要，商家将联系预订联系人</view> 54 + <view class="gray-font font28r margin-bottom" style="line-height:40rpx;">提醒：每次预订时，自动将默认联系人作为预订联系人，如有需要，商家将联系预订联系人</view>
61 <view class="txt-30-h text-red padding-top" 55 <view class="txt-30-h text-red padding-top"
62 wx:if="{{user.id}}" bindtap="confirm">删除联系人</view> 56 wx:if="{{user.id}}" bindtap="confirm">删除联系人</view>
63 </view> 57 </view>
64 - <view class="btns">  
65 - <view class="save-button round" bindtap="saved">  
66 - <view class="share-but text-bold">保存</view>  
67 - </view>  
68 - </view> 58 + <view class="save-button round bg-blue-blue" bindtap="saved">
  59 + <view class="share-but text-bold">保存</view>
  60 + </view>
69 </view> 61 </view>
70 <confirm id="confirm" cancelText="取消" cancelColor="#42A5FF" 62 <confirm id="confirm" cancelText="取消" cancelColor="#42A5FF"
71 confirmText="删除" confirmColor="#FFFFFF" 63 confirmText="删除" confirmColor="#FFFFFF"
1 /* pages/me/setting.wxss */ 1 /* pages/me/setting.wxss */
2 @import "../../colorui/main.wxss"; 2 @import "../../colorui/main.wxss";
3 -page {  
4 - background: #F5F5F5;  
5 -}  
6 .sex .checked{ 3 .sex .checked{
7 position: relative; 4 position: relative;
8 color:var(--blue); 5 color:var(--blue);
@@ -17,6 +14,11 @@ page { @@ -17,6 +14,11 @@ page {
17 bottom:-18rpx; 14 bottom:-18rpx;
18 left:calc(50% - 12rpx); 15 left:calc(50% - 12rpx);
19 } 16 }
  17 +
  18 +.page{
  19 + width: 100%;
  20 + color:#353535;
  21 +}
20 .tip{ 22 .tip{
21 margin-top: 62rpx; 23 margin-top: 62rpx;
22 font-size: 26rpx; 24 font-size: 26rpx;
@@ -69,32 +71,19 @@ input.input{ @@ -69,32 +71,19 @@ input.input{
69 background-color:#C0A369; 71 background-color:#C0A369;
70 color: #FEFEFE; 72 color: #FEFEFE;
71 } 73 }
72 -.btns {  
73 - position: fixed;  
74 - bottom: 0;  
75 - left: 0;  
76 - width: 100%;  
77 - background: #fff;  
78 - height: 200rpx;  
79 - display: flex;  
80 - justify-content: space-between;  
81 - align-items: center;  
82 - padding: 0 40rpx;  
83 - box-sizing: border-box;  
84 -}  
85 -.save-button { 74 +.save-button{
86 width:calc(100% - 80rpx); 75 width:calc(100% - 80rpx);
87 - height: 72rpx;  
88 - margin:0 auto;  
89 - position: relative;  
90 - top: -20rpx;  
91 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 76 + height:84rpx;
  77 + position: fixed;
  78 + left:0;
  79 + right:0;
  80 + bottom:40rpx;
  81 + margin:0 auto;
92 } 82 }
93 .share-but{ 83 .share-but{
94 - color:#fff; 84 + color:#FEFEFE;
95 width: 100%; 85 width: 100%;
96 - line-height: 72rpx;  
97 - height: 72rpx; 86 + line-height: 84rpx;
98 font-size: 36rpx; 87 font-size: 36rpx;
99 text-align: center; 88 text-align: center;
100 } 89 }
@@ -107,26 +96,4 @@ input.input{ @@ -107,26 +96,4 @@ input.input{
107 .userinfo-setting{ 96 .userinfo-setting{
108 padding: 60rpx 0 30rpx 0; 97 padding: 60rpx 0 30rpx 0;
109 border-bottom: 2rpx solid #F5F5F5; 98 border-bottom: 2rpx solid #F5F5F5;
110 -}  
111 -  
112 -.pickerBox {  
113 - display: flex;  
114 - align-items: center;  
115 - font-family: PingFang SC;  
116 - font-weight: 400;  
117 -}  
118 -  
119 -.pickerBox image {  
120 - width: 24rpx;  
121 - height: 24rpx;  
122 -}  
123 -  
124 -.wx-switch-input {  
125 - zoom: .8;  
126 -}  
127 -  
128 -.backF {  
129 - background: #fff;  
130 - margin: 12rpx;  
131 - border-radius: 10rpx;  
132 } 99 }
@@ -14,6 +14,7 @@ Page({ @@ -14,6 +14,7 @@ Page({
14 tablesText:'', 14 tablesText:'',
15 detail:{}, 15 detail:{},
16 tableNum:'', 16 tableNum:'',
  17 + cusdem:'',
17 coupon:'', 18 coupon:'',
18 couponId:'', 19 couponId:'',
19 price:'', 20 price:'',
@@ -21,8 +22,7 @@ Page({ @@ -21,8 +22,7 @@ Page({
21 is_user_comments:'', 22 is_user_comments:'',
22 showLoading:false, 23 showLoading:false,
23 couponData: '', //评价赠送优惠券数据 24 couponData: '', //评价赠送优惠券数据
24 - dataStr: Date.now() * 1 / 1000,  
25 - seller:{}, 25 + dataStr: Date.now() * 1 / 1000,
26 }, 26 },
27 text: '', 27 text: '',
28 /** 28 /**
@@ -36,11 +36,12 @@ Page({ @@ -36,11 +36,12 @@ Page({
36 console.log('options', { 36 console.log('options', {
37 ...options 37 ...options
38 }); 38 });
39 - this.getDetailFun() 39 + this.getDetail()
40 } 40 }
41 }, 41 },
42 - getDetailFun() { 42 + getDetail() {
43 App.Reserve.Detail({ 43 App.Reserve.Detail({
  44 + openid: getApp().openid,
44 rid: this.data.options.oid 45 rid: this.data.options.oid
45 }).then(res => { 46 }).then(res => {
46 let tablesText = '', //桌子信息 47 let tablesText = '', //桌子信息
@@ -50,34 +51,21 @@ Page({ @@ -50,34 +51,21 @@ Page({
50 tablesText+=t.rname+t.name+(i==(res.data.tables.length-1)?'':'、'); 51 tablesText+=t.rname+t.name+(i==(res.data.tables.length-1)?'':'、');
51 }) 52 })
52 let reserev = RS.reserve(res.data) 53 let reserev = RS.reserve(res.data)
53 - let dateSmart = util.unixtoTime(reserev.ddate, 'YYYY年MM月DD日 星期WW HH:II'); 54 + let dateSmart = util.unixtoTime(reserev.ddate, 'YYYY/MM/DD 星期WW HH:II');
54 this.setData({ 55 this.setData({
55 dateSmart, 56 dateSmart,
56 tablesText, 57 tablesText,
57 is_user_comments:res.data.is_user_comments, 58 is_user_comments:res.data.is_user_comments,
58 tableNum:res.data.actual_pum?res.data.actual_pum:tableNum, 59 tableNum:res.data.actual_pum?res.data.actual_pum:tableNum,
  60 + cusdem:res.data.cusdem,
59 }) 61 })
60 setTimeout(() => { 62 setTimeout(() => {
61 - this.getSellerTemplateConfFun(reserev.sid);  
62 - this.getDetail(reserev.sid) 63 + this.getSellerTemplateConfFun(reserev.sid);
63 }, 0); 64 }, 0);
64 }).catch(res=>{ 65 }).catch(res=>{
65 console.log(res,'详情请求失败'); 66 console.log(res,'详情请求失败');
66 }) 67 })
67 - },  
68 - getDetail(sid){  
69 - App.Customer.GetSellerDetail({  
70 - openid: getApp().openid,  
71 - sid  
72 - }).then(res => {  
73 - this.setData({  
74 - seller:{  
75 - img:res.data.share_image || '',  
76 - sellername:res.data.sellername,  
77 - }  
78 - })  
79 - })  
80 - }, 68 + },
81 getSellerTemplateConfFun(sid) { 69 getSellerTemplateConfFun(sid) {
82 console.log('sidsidsidsid',sid); 70 console.log('sidsidsidsid',sid);
83 App.Seller.GetSellerTemplateConf({ 71 App.Seller.GetSellerTemplateConf({
@@ -172,7 +160,7 @@ Page({ @@ -172,7 +160,7 @@ Page({
172 // 有券 160 // 有券
173 if (this.data.coupon == '1' && this.data.couponData.showCoupon == '1') { 161 if (this.data.coupon == '1' && this.data.couponData.showCoupon == '1') {
174 url = util.http_build_query({ 162 url = util.http_build_query({
175 - sellerName: this.data.seller.sellername, 163 + sellerName: options.sellerName,
176 coupon: '1', 164 coupon: '1',
177 couponId: this.data.couponId, 165 couponId: this.data.couponId,
178 price: this.data.price, 166 price: this.data.price,
@@ -182,7 +170,7 @@ Page({ @@ -182,7 +170,7 @@ Page({
182 }, './opinionSuccess') 170 }, './opinionSuccess')
183 } else { //没券 171 } else { //没券
184 url = util.http_build_query({ 172 url = util.http_build_query({
185 - sellerName: this.data.seller.sellername, 173 + sellerName: options.sellerName,
186 coupon: '0', //1有券 0没有券 174 coupon: '0', //1有券 0没有券
187 couponId: this.data.couponId || '', 175 couponId: this.data.couponId || '',
188 sellid: options.sellerid, 176 sellid: options.sellerid,
1 <!--pages/pinglun/createOpinion.wxml 填写意见反馈页面--> 1 <!--pages/pinglun/createOpinion.wxml 填写意见反馈页面-->
2 -<nav color="#515151" hasHome="{{options.previousPage!='1'}}">意见反馈</nav> 2 +<nav color="#515151" hasHome="{{options.previousPage!='1'}}">{{options.sellerName}}</nav>
3 <view class="box"> 3 <view class="box">
4 - <view class="sellerBox">  
5 - <image src="{{seller.img}}" mode="aspectFill"/>  
6 - <view class="text1 font32r">{{seller.sellername}}</view>  
7 - </view>  
8 <view class="info"> 4 <view class="info">
9 - <view class="texts font28r">就餐时间</view> 5 + <view class="texts font28r">就餐时间：</view>
10 <view class="texts_right font28r">{{dateSmart}}</view> 6 <view class="texts_right font28r">{{dateSmart}}</view>
11 </view> 7 </view>
12 <view class="info"> 8 <view class="info">
13 - <view class="texts font28r">桌位台号</view> 9 + <view class="texts font28r">桌位台号：</view>
14 <view class="texts_right font28r">{{tablesText}}</view> 10 <view class="texts_right font28r">{{tablesText}}</view>
15 </view> 11 </view>
16 <view class="info"> 12 <view class="info">
17 - <view class="texts font28r">就餐人数</view> 13 + <view class="texts font28r">就餐人数：</view>
18 <view class="texts_right font28r">{{tableNum}}</view> 14 <view class="texts_right font28r">{{tableNum}}</view>
19 </view> 15 </view>
20 - <textarea class="margin-top-lg text-df textarea" bindinput="textareaInput" cols="30" rows="10" placeholder="请填写您的意见和建议，帮助我们持续改进" placeholder-style="color:#999999;font-size:30rpx;"></textarea>  
21 - <view class="uploadBox">  
22 - <tpupload bind:tpupload="tpupload" tpNum='6'></tpupload>  
23 - </view> 16 + <view class="info">
  17 + <view class="texts font28r">备注信息：</view>
  18 + <view wx:if="{{cusdem}}" class="texts_right font28r">{{cusdem}}</view>
  19 + </view>
24 </view> 20 </view>
25 -<view class="btns">  
26 - <button class="btn" bindtap="submit" disabled="{{is_user_comments}}">{{is_user_comments?'该订单已提交！':'提交'}}</button> 21 +<view class="main">
  22 + <textarea class="margin-top-lg text-df textarea" bindinput="textareaInput" cols="30" rows="10" placeholder="麻烦点这里输入您的意见反馈。\n\n\n可以帮助我们持续改进，给您带来更好的服务品质，谢谢啦！" placeholder-style="color:#999999;font-size:30rpx;"></textarea>
  23 + <tpupload bind:tpupload="tpupload" tpNum='6'></tpupload>
27 </view> 24 </view>
  25 +<button class="btn" bindtap="submit" disabled="{{is_user_comments}}">{{is_user_comments?'该订单已提交！':'提交'}}</button>
28 <view class="loading-container" wx:if="{{showLoading}}"> 26 <view class="loading-container" wx:if="{{showLoading}}">
29 <view class="loading-mask"></view> 27 <view class="loading-mask"></view>
30 <view class="loading-content"> 28 <view class="loading-content">
1 /* pages/pinglun/createOpinion.wxss */ 1 /* pages/pinglun/createOpinion.wxss */
2 -page {  
3 - background: #F5F5F5;  
4 -}  
5 -  
6 .box { 2 .box {
7 - background: #fff;  
8 - margin: 12rpx;  
9 - padding: 40rpx;  
10 - border-radius: 10rpx; 3 + padding: 24rpx 0 30rpx 0;
  4 + margin: 0 40rpx;
  5 + border-bottom: 2rpx solid #515151;
11 } 6 }
12 7
13 .info { 8 .info {
14 margin-bottom: 16rpx; 9 margin-bottom: 16rpx;
15 - display: flex;  
16 - padding-bottom: 20rpx; 10 + display: flex;
  11 + justify-content: space-between;
17 } 12 }
18 13
19 .texts { 14 .texts {
20 - font-weight: 400;  
21 - color: #696969;  
22 - font-family: PingFang SC; 15 + font-weight: 500;
23 } 16 }
24 17
25 .texts_right { 18 .texts_right {
26 - font-family: PingFang SC;  
27 - font-weight: 600; 19 + font-weight: 500;
  20 + text-align: right;
  21 + width: 79%;
28 display: flex; 22 display: flex;
29 flex-wrap: wrap; 23 flex-wrap: wrap;
30 - word-break: break-all;  
31 - margin-left: 40rpx;  
32 - flex: 1; 24 + justify-content: flex-end;
  25 + word-break: break-all;
33 } 26 }
34 27
35 .textarea { 28 .textarea {
36 width: 100%; 29 width: 100%;
37 - height: 240rpx; 30 + height: 370rpx;
38 font-size: 30rpx; 31 font-size: 30rpx;
39 line-height: 42rpx; 32 line-height: 42rpx;
40 margin-top: 36rpx 0 20rpx 0; 33 margin-top: 36rpx 0 20rpx 0;
41 word-wrap: break-word; 34 word-wrap: break-word;
42 - white-space: pre-line;  
43 - border-radius: 10rpx;  
44 - border: 2rpx solid #cbcbcb;  
45 - box-sizing: border-box;  
46 - padding: 40rpx;  
47 - margin-bottom: 40rpx; 35 + white-space: pre-line
48 } 36 }
49 37
50 .textarea-placeholder { 38 .textarea-placeholder {
@@ -55,19 +43,18 @@ page { @@ -55,19 +43,18 @@ page {
55 line-height: 42rpx; 43 line-height: 42rpx;
56 } 44 }
57 45
  46 +.main {
  47 + padding: 0 40rpx;
  48 + margin: 36rpx 0 42rpx 0;
  49 +}
  50 +
58 .btn { 51 .btn {
59 - height: 72rpx;  
60 - line-height: 72rpx;  
61 - box-sizing: border-box;  
62 margin: 0 40rpx; 52 margin: 0 40rpx;
63 font-weight: 500; 53 font-weight: 500;
64 font-size: 32rpx; 54 font-size: 32rpx;
65 color: #f8f9fd; 55 color: #f8f9fd;
66 - border-radius: 42rpx;  
67 - width: 100%;  
68 - position: relative;  
69 - top: -20rpx;  
70 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 56 + border-radius: 42rpx;
  57 + background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
71 } 58 }
72 button[disabled]:not([type]) { 59 button[disabled]:not([type]) {
73 color: #fff !important; 60 color: #fff !important;
@@ -117,42 +104,4 @@ button[disabled]:not([type]) { @@ -117,42 +104,4 @@ button[disabled]:not([type]) {
117 margin-top: 10rpx; 104 margin-top: 10rpx;
118 font-size: 28rpx; 105 font-size: 28rpx;
119 color: #333; 106 color: #333;
120 - }  
121 -  
122 - .sellerBox {  
123 - display: flex;  
124 - align-items: center;  
125 - padding-bottom: 40rpx;  
126 - margin-bottom: 40rpx;  
127 - border-bottom: 2rpx solid #F7F7F7;  
128 - }  
129 -  
130 - .sellerBox image {  
131 - width: 80rpx;  
132 - height: 80rpx;  
133 - border-radius: 50%;  
134 - margin-right: 20rpx;  
135 - }  
136 -  
137 - .btns {  
138 - position: fixed;  
139 - bottom: 0;  
140 - left: 0;  
141 - width: 100%;  
142 - background: #fff;  
143 - height: 200rpx;  
144 - display: flex;  
145 - justify-content: space-between;  
146 - align-items: center;  
147 - padding: 0 40rpx;  
148 - box-sizing: border-box;  
149 - }  
150 -  
151 - .uploadBox {  
152 - position: relative;  
153 - left: -20rpx;  
154 - }  
155 -  
156 - .text1 {  
157 - font-weight: 600;  
158 } 107 }
@@ -20,7 +20,6 @@ Page({ @@ -20,7 +20,6 @@ Page({
20 }, 20 },
21 selectlabel(e){ 21 selectlabel(e){
22 let name=e.currentTarget.dataset.name; 22 let name=e.currentTarget.dataset.name;
23 - let idx=e.currentTarget.dataset.idx;  
24 if(this.remark!=''){ 23 if(this.remark!=''){
25 let str=this.remark+','+name 24 let str=this.remark+','+name
26 if(str.length>25){ 25 if(str.length>25){
@@ -32,13 +31,11 @@ Page({ @@ -32,13 +31,11 @@ Page({
32 duration:1500 31 duration:1500
33 }) 32 })
34 } 33 }
35 - }  
36 - let labellist = this.data.labellist;  
37 - labellist[idx].check = true; 34 +
  35 + }
38 this.setData({ 36 this.setData({
39 - remark:this.remark=='' ? name : this.remark+'，'+name,  
40 - labellist,  
41 - }) 37 + remark:this.remark=='' ? name : this.remark+'，'+name
  38 + })
42 this.remark=this.remark=='' ? name : this.remark+'，'+name 39 this.remark=this.remark=='' ? name : this.remark+'，'+name
43 console.log(this.remark,this.remark.length) 40 console.log(this.remark,this.remark.length)
44 }, 41 },
@@ -2,21 +2,19 @@ @@ -2,21 +2,19 @@
2 <nav>备注</nav> 2 <nav>备注</nav>
3 <view class="contain" style="height: minheight+'px';overflow-y: scroll;"> 3 <view class="contain" style="height: minheight+'px';overflow-y: scroll;">
4 <view class="bg_white textarea-cover"> 4 <view class="bg_white textarea-cover">
5 - <textarea placeholder="请输入您的要求，我们会尽量安排" placeholder-class="gray-font font28r" class="black-font font24r" value="{{remark}}" maxlength="25" show-confirm-bar="{{false}}" auto-focus bindinput="inputremark" bindblur="inputblur" adjust-position cursor-spacing="130" bindkeyboardheightchange="getboardheight"></textarea> 5 + <textarea placeholder="请输入您的要求，我们会尽量安排" placeholder-class="gray-font font28r" class="black-font font28r" value="{{remark}}" maxlength="25" show-confirm-bar="{{false}}" auto-focus bindinput="inputremark" bindblur="inputblur" adjust-position cursor-spacing="130" bindkeyboardheightchange="getboardheight"></textarea>
6 <view class="gray-font font28r flex-rr" style="padding-top: 20rpx;">{{remark.length}}/25</view> 6 <view class="gray-font font28r flex-rr" style="padding-top: 20rpx;">{{remark.length}}/25</view>
7 </view> 7 </view>
8 <view class="label"> 8 <view class="label">
9 <view class="gray-font font30r">快捷标签</view> 9 <view class="gray-font font30r">快捷标签</view>
10 <view class="label-list flex-rs"> 10 <view class="label-list flex-rs">
11 <block wx:for="{{labellist}}"> 11 <block wx:for="{{labellist}}">
12 - <view class="font24r label-single bg-gray {{item.check ? 'checkItem' : ''}}" data-idx="{{index}}" data-name="{{item.remark}}" bindtap="selectlabel">{{item.remark}}</view> 12 + <view class="black-font font28r label-single bg-gray" data-name="{{item.remark}}" bindtap="selectlabel">{{item.remark}}</view>
13 </block> 13 </block>
14 </view> 14 </view>
15 </view> 15 </view>
16 </view> 16 </view>
17 - <view class="btns">  
18 - <view class="save-button white-font flex-cc font32r Semibold" bindtap="save" style="bottom:{{buttonbottom}}px;">保存</view>  
19 - </view> 17 + <view class="save-button white-font flex-cc font32r Semibold" bindtap="save" style="bottom:{{buttonbottom}}px;">保存</view>
20 </page> 18 </page>
21 <menu></menu> 19 <menu></menu>
22 <service></service> 20 <service></service>
1 page{ 1 page{
2 - background: #F5F5F5; 2 + background: #F9F9F9;
3 } 3 }
4 .contain{ 4 .contain{
5 - padding:10rpx 0 20rpx;  
6 - background: #fff;  
7 - margin: 12rpx;  
8 - border-radius: 10rpx; 5 + width:100%;
  6 + padding:10rpx 0 180rpx;
9 } 7 }
10 .textarea-cover{ 8 .textarea-cover{
11 width: calc(100% - 80rpx); 9 width: calc(100% - 80rpx);
@@ -13,14 +11,12 @@ page{ @@ -13,14 +11,12 @@ page{
13 box-sizing: border-box; 11 box-sizing: border-box;
14 border-radius: 16rpx; 12 border-radius: 16rpx;
15 overflow: hidden; 13 overflow: hidden;
16 - margin: 40rpx auto;  
17 - border: 2rpx solid #cbcbcb; 14 + margin: 0 auto 60rpx;
18 } 15 }
19 textarea,input{ 16 textarea,input{
20 width: 100%; 17 width: 100%;
21 height: 120rpx; 18 height: 120rpx;
22 - line-height: 40rpx;  
23 - font-weight: 400; 19 + line-height: 40rpx;
24 } 20 }
25 input{ 21 input{
26 display: block; 22 display: block;
@@ -34,42 +30,23 @@ input{ @@ -34,42 +30,23 @@ input{
34 margin-top: 40rpx; 30 margin-top: 40rpx;
35 } 31 }
36 .label-single{ 32 .label-single{
37 - height: 42rpx; 33 + height: 64rpx;
38 background: #F1F1F1; 34 background: #F1F1F1;
39 border-radius: 32rpx; 35 border-radius: 32rpx;
40 - line-height: 42rpx; 36 + line-height: 64rpx;
41 margin-right: 30rpx; 37 margin-right: 30rpx;
42 margin-bottom: 20rpx; 38 margin-bottom: 20rpx;
43 - padding: 0 30rpx;  
44 - color: #696969; 39 + padding: 0 30rpx;
45 } 40 }
46 .save-button{ 41 .save-button{
47 width: calc(100% - 80rpx); 42 width: calc(100% - 80rpx);
48 - height: 72rpx;  
49 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 43 + height: 84rpx;
  44 + background: linear-gradient(90deg, #3BBFF5 0%, #57A0FF 100%);
50 border-radius: 42rpx; 45 border-radius: 42rpx;
51 margin: 0 auto; 46 margin: 0 auto;
52 - position: relative;  
53 - top: -20rpx;  
54 -}  
55 -  
56 -.checkItem {  
57 - background: #FFF7F5;  
58 - color: #fe6806;  
59 - border: 2rpx solid #fe6806;  
60 - box-sizing: border-box;  
61 -}  
62 -  
63 -.btns {  
64 - position: fixed;  
65 - bottom: 0;  
66 - left: 0;  
67 - width: 100%;  
68 - background: #fff;  
69 - height: 200rpx;  
70 - display: flex;  
71 - justify-content: space-between;  
72 - align-items: center;  
73 - padding: 0 40rpx;  
74 - box-sizing: border-box; 47 + position: fixed;
  48 + left:0;
  49 + right:0;
  50 + bottom:40rpx;
  51 +/* transition: bottom .05s ease; */
75 } 52 }
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 </view> 8 </view>
9 <view class="padding-lr-lg" > 9 <view class="padding-lr-lg" >
10 <view class="flex justify-between align-center margin-bottom margin-top"> 10 <view class="flex justify-between align-center margin-bottom margin-top">
11 - <view class="txt-28-h text-bold">预订时段</view> 11 + <view class="txt-36-h text-bold">预订时段</view>
12 </view> 12 </view>
13 <view> 13 <view>
14 <section seller="{{seller}}" date="{{reserveDate}}" bind:selectsection="selectsection" section="{{reserveSection}}"></section> 14 <section seller="{{seller}}" date="{{reserveDate}}" bind:selectsection="selectsection" section="{{reserveSection}}"></section>
@@ -32,10 +32,8 @@ @@ -32,10 +32,8 @@
32 </view> 32 </view>
33 </view> 33 </view>
34 --> 34 -->
35 - <view class="btns">  
36 - <view class="reserve-button-cover {{seletroomlist.length>0?'colorBtn':'bg-cccccc'}} flex justify-center align-center round" catchtap="complete">  
37 - <view class="reserve-button txt-36-h">选好了</view>  
38 - </view> 35 + <view class="reserve-button-cover {{seletroomlist.length>0?'bg-blue-blue':'bg-cccccc'}} flex justify-center align-center round" catchtap="complete">
  36 + <view class="reserve-button txt-36-h">选好了</view>
39 </view> 37 </view>
40 </page> 38 </page>
41 <menu></menu> 39 <menu></menu>
@@ -11,23 +11,7 @@ @@ -11,23 +11,7 @@
11 .reserve-button-cover{ 11 .reserve-button-cover{
12 width:calc(100% - 80rpx); 12 width:calc(100% - 80rpx);
13 height:84rpx; 13 height:84rpx;
14 - position: relative;  
15 - top: -20rpx;  
16 -}  
17 -  
18 -.colorBtn {  
19 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
20 - color: #fff;  
21 -}  
22 -  
23 -.btns {  
24 - background: #fff;  
25 - height: 200rpx;  
26 position: fixed; 14 position: fixed;
27 - bottom: 0;  
28 - left: 0;  
29 - width: 100%;  
30 - display: flex;  
31 - align-items: center;  
32 - justify-content: center; 15 + left:40rpx;
  16 + bottom:40rpx;
33 } 17 }
1 <!--pages/reserve/home.wxml--> 1 <!--pages/reserve/home.wxml-->
2 <nav backgroundColor="{{navborder ? '#ffffff' : 'transparent'}}" place="{{false}}"></nav> 2 <nav backgroundColor="{{navborder ? '#ffffff' : 'transparent'}}" place="{{false}}"></nav>
3 <view class="view header"> 3 <view class="view header">
4 - <image src="https://qn.colorcun.com/processingIcon.png" 4 + <image src="http://nosqn.colorcun.com/search/s%20%281%29.png"
5 style="z-index: 1" 5 style="z-index: 1"
6 mode="widthFix" class="bg-img"></image> 6 mode="widthFix" class="bg-img"></image>
7 <taocan-notice pos="{{taocanpos}}"></taocan-notice> 7 <taocan-notice pos="{{taocanpos}}"></taocan-notice>
@@ -164,93 +164,19 @@ Page({ @@ -164,93 +164,19 @@ Page({
164 id 164 id
165 }).then(res => { 165 }).then(res => {
166 if (res.data.length > 0) { 166 if (res.data.length > 0) {
167 - let detail = res.data[0]  
168 - let data = detail.expiration_date ? util.determine(detail.expiration_date) : '';  
169 - detail.use = detail.use ? util.determine(detail.use) : '';  
170 - detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';  
171 - if ((detail.use && (!detail.use.is_cash || detail.use.is_cash == '1'))) {  
172 - let cash = detail.use.cash * 1;  
173 - let price = detail.price * 1;  
174 - detail.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';  
175 - }  
176 - detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';  
177 - detail.arule = detail.arule ? util.determine(detail.arule) : '';  
178 - detail.expiration_date = detail.expiration_date ? util.determine(detail.expiration_date) : '';  
179 - detail.aexpiration = detail.aexpiration ? util.determine(detail.aexpiration) : '';  
180 - if ((detail.use && (!detail.use.is_cash || detail.use.is_cash == '1'))) {  
181 - let cash = detail.use.cash * 1;  
182 - let price = detail.price * 1;  
183 - detail.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';  
184 - }  
185 - let num = detail.grant_num*1-detail.grant_last*1;  
186 - if (num > 0) {  
187 - detail.receiveNumText = ''  
188 - if (num >= 0 && num <= 100) {  
189 - detail.receiveNumText = num.toString();  
190 - } else if (num >= 101 && num <= 199) {  
191 - detail.receiveNumText = '100+';  
192 - } else if (num >= 200 && num <= 299) {  
193 - detail.receiveNumText = '200+';  
194 - } else {  
195 - detail.receiveNumText = Math.floor(num / 100) * 100 + '+';  
196 - }  
197 - }  
198 - if(num == 0){  
199 - let str = detail.grant_num*1  
200 - detail.receiveNumText = ''  
201 - if (str >= 0 && str <= 100) {  
202 - detail.receiveNumText = str.toString();  
203 - } else if (str >= 101 && str <= 199) {  
204 - detail.receiveNumText = '100+';  
205 - } else if (str >= 200 && str <= 299) {  
206 - detail.receiveNumText = '200+';  
207 - } else {  
208 - detail.receiveNumText = Math.floor(str / 100) * 100 + '+';  
209 - }  
210 - }  
211 - if (detail.exp_date && detail.exp_date.week_data) {  
212 - let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
213 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')  
214 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')  
215 - if (mor) mor = '早餐：' + mor  
216 - if (noon) noon = '午餐：' + noon  
217 - if (nig) nig = '晚餐：' + nig  
218 - detail.morText = mor;  
219 - detail.noonText = noon;  
220 - detail.nigText = nig;  
221 - }  
222 - detail.resultCoupon = '1'; // 显示已领取  
223 - detail.cdate = detail.cdate * 1;  
224 - detail.useStime = '';  
225 - detail.useEtime = '';  
226 - let condition = detail.aexpiration  
227 - if (condition.valid_forever === '0' && condition.stime && condition.etime) {  
228 - detail.useStime = util.unixtoTime(condition.stime, 'YYYY-MM-DD');  
229 - detail.useEtime = util.unixtoTime(condition.etime, 'YYYY-MM-DD');  
230 - }  
231 - if (condition.valid_forever === '1') {  
232 - detail.foreverText = '永久有效';  
233 - }  
234 - if (condition.valid_forever === '0' && condition.today) {  
235 - let obj = this.setTimeRange(detail.cdate, 0, parseInt(condition.today) - 1);  
236 - detail.useStime = obj.useStime;  
237 - detail.useEtime = obj.useEtime;  
238 - }  
239 - if (condition.valid_forever === '0' && condition.tomorrow) {  
240 - let obj = this.setTimeRange(detail.cdate, 1, condition.tomorrow * 1);  
241 - detail.useStime = obj.useStime;  
242 - detail.useEtime = obj.useEtime;  
243 - }  
244 - if (condition.valid_forever === '0' && condition.sday && condition.eday) {  
245 - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1);  
246 - detail.useStime = obj.useStime;  
247 - detail.useEtime = obj.useEtime; 167 + let couponData = res.data[0]
  168 + couponData.use = couponData.use ? util.determine(couponData.use) : '';
  169 + couponData.exp_date = couponData.exp_date ? util.determine(couponData.exp_date) : '';
  170 + if ((couponData.use && (!couponData.use.is_cash || couponData.use.is_cash == '1'))) {
  171 + let cash = couponData.use.cash * 1;
  172 + let price = couponData.price * 1;
  173 + couponData.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
248 } 174 }
249 // showCoupon 代表赠送的券没过有效期 && 是开启状态 175 // showCoupon 代表赠送的券没过有效期 && 是开启状态
250 - detail.showCoupon = (((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && detail.is_open == '1') ? '1' : '0';  
251 - console.log('邀请函--------------------评价赠送的优惠券',detail); 176 + couponData.showCoupon = (this.data.dataStr<(couponData.etime*1) && couponData.is_open=='1') ? '1' : '0';
  177 + console.log('邀请函--------------------评价赠送的优惠券',couponData);
252 this.setData({ 178 this.setData({
253 - couponData:detail 179 + couponData:res.data[0]
254 }) 180 })
255 } 181 }
256 }) 182 })
@@ -3,134 +3,110 @@ @@ -3,134 +3,110 @@
3 <nav id='nav'>商家有礼</nav> 3 <nav id='nav'>商家有礼</nav>
4 <view class="box" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}"> 4 <view class="box" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}">
5 <view class="title" wx:if="{{options.form == '1'}}"> 5 <view class="title" wx:if="{{options.form == '1'}}">
6 - <view class="sign"></view><text class="font28r">专属优惠券</text> 6 + <view class="sign"></view><text class="font32r">专属优惠券</text>
7 </view> 7 </view>
8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
9 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 9 <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
10 <view class="couponWrap"> 10 <view class="couponWrap">
11 - <view class="itemLeft">  
12 - <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>  
13 - <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>  
14 - <view class="priceText" wx:if="{{item.price}}">  
15 - <view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text> 11 + <view class="itemLeft">
  12 + <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
  13 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
  14 + <view class="priceText" wx:if="{{item.price}}">
  15 + <view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
  16 + </view>
  17 + <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
16 </view> 18 </view>
17 - <view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>  
18 - </view>  
19 - <view class="couponLine"></view>  
20 - <view class="itemRight">  
21 - <view class="btns">  
22 - <text class="font32r anameText">{{item.aname}}</text>  
23 - <block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">  
24 - <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>  
25 - <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">  
26 - 无限制{{item.desc?'，'+item.desc+'。':'。'}}  
27 - </view>  
28 - <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">  
29 - 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}} 19 + <view class="couponLine"></view>
  20 + <view class="itemRight">
  21 + <view class="btns">
  22 + <text class="font32r anameText">{{item.aname}}</text>
  23 + <block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
  24 + <text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
  25 + <view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
  26 + 无限制{{item.desc?'，'+item.desc+'。':'。'}}
  27 + </view>
  28 + <view wx:if="{{item.exp_date.is_birthday=='1' || item.exp_date.is_birthday===true}}" class="bottom font24r">
  29 + 会员生日当天可用{{item.desc?'，'+item.desc+'。':'。'}}
  30 + </view>
  31 + </block>
  32 + <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
  33 + <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="bottom font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>
  34 + <view wx:if="{{item.useStime && item.useEtime}}" class="bottom font24r nodate">{{item.useStime}} 至 {{item.useEtime}}</view>
  35 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  36 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
  37 + <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
  38 + <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
  39 + <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
  40 + <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>
  41 + </block>
  42 + </view>
  43 + <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
  44 + <view class="font24r orderingFood orderingFood1">已领取</view>
  45 + <view class="grantNum" wx:if="{{item.receiveNumText}}">
  46 + <view class="font24r">已被领取</view>
  47 + <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
30 </view> 48 </view>
31 - </block>  
32 - <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">  
33 - <view wx:if="{{(item.useStime && item.useEtime) || item.foreverText}}" class="bottom font24r">有效期：{{item.foreverText?item.foreverText : ''}}</view>  
34 - <view wx:if="{{item.useStime && item.useEtime}}" class="bottom font24r nodate">{{item.useStime}} 至 {{item.useEtime}}</view>  
35 - <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>  
36 - <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>  
37 - <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>  
38 - <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>  
39 - <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>  
40 - <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>  
41 - </block>  
42 - </view>  
43 - <view class="btnBox" wx:if="{{item.is_type == '3'}}" >  
44 - <view class="font24r orderingFood orderingFood1">已领取</view>  
45 - <view class="grantNum" wx:if="{{item.receiveNumText}}">  
46 - <view class="font24r">已被领取</view>  
47 - <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>  
48 </view> 49 </view>
49 - </view>  
50 - <view wx:if="{{item.is_type != '3'}}" class="font24r orderingFood orderingFood2">  
51 - 抢购 50 + <view wx:if="{{item.is_type != '3'}}" class="font24r orderingFood">
  51 + 立即抢购
  52 + </view>
52 </view> 53 </view>
53 </view> 54 </view>
54 - </view>  
55 </navigator> 55 </navigator>
56 </block> 56 </block>
57 </view> 57 </view>
58 <view class="box" wx:if="{{options.form == '1' && hasValueRecharge && recharge_data && recharge_data.id}}"> 58 <view class="box" wx:if="{{options.form == '1' && hasValueRecharge && recharge_data && recharge_data.id}}">
59 <view class="title"> 59 <view class="title">
60 - <view class="sign"></view><text class="font28r">会员充值优惠</text> 60 + <view class="sign"></view><text class="font32r">会员充值优惠</text>
61 </view> 61 </view>
62 <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 62 <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
63 - <view class="couponWrap"> 63 + <view class="rechargeItems">
64 <view class="itemLeft"> 64 <view class="itemLeft">
65 - <view class="priceText" wx:if="{{recharge_data.recharge_money}}">  
66 - <view class="icons font24r">￥</view><text class="font48r">{{recharge_data.recharge_money}}</text> 65 + <view class="itemTop font36r">
  66 + {{recharge_data.rname}}
67 </view> 67 </view>
68 - </view>  
69 - <view class="couponLine"></view>  
70 - <view class="itemRight">  
71 - <view class="btns">  
72 - <view class="bottom font24r" wx:if="{{priceInfo}}">  
73 - {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}  
74 - </view>  
75 - <view class="bottom font24r" wx:if="{{scoreInfo}}">  
76 - {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}  
77 - </view>  
78 - <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">  
79 - {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。  
80 - </view> 68 + <view class="itemBottom font24r" wx:if="{{priceInfo}}">
  69 + {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}
  70 + </view>
  71 + <view class="bottom font24r" wx:if="{{scoreInfo}}">
  72 + {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}
81 </view> 73 </view>
82 - <view class="font24r orderingFood orderingFood2">  
83 - 充值 74 + <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">
  75 + {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。
84 </view> 76 </view>
85 </view> 77 </view>
  78 + <view class="font24r orderingFood">
  79 + 充值
  80 + </view>
86 </view> 81 </view>
87 </navigator> 82 </navigator>
88 </view> 83 </view>
89 <!-- 启用评价 && 是否评价过 && 评价赠送优惠券 && 赠送的优惠券有数据--> 84 <!-- 启用评价 && 是否评价过 && 评价赠送优惠券 && 赠送的优惠券有数据-->
90 <view class="box" wx:if="{{options.form == '1' && is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1' && couponData && couponData.showCoupon =='1'}}"> 85 <view class="box" wx:if="{{options.form == '1' && is_comments=='1' && !is_user_comments && marketing.is_comments_coupon=='1' && couponData && couponData.showCoupon =='1'}}">
91 <view class="title"> 86 <view class="title">
92 - <view class="sign"></view><text class="font28r">反馈有礼</text> 87 + <view class="sign"></view><text class="font32r">反馈有礼</text>
93 </view> 88 </view>
94 - <view class="couponWrap" bindtap="evaluateFun"> 89 + <view class="preferentialItems" bindtap="evaluateFun">
95 <view class="itemLeft"> 90 <view class="itemLeft">
96 <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text> 91 <text wx:if="{{couponData.discount!='0.00' && (couponData.use.is_cash=='1' || couponData.use.is_cash) && couponData.discount}}" class="discountText font24r">{{couponData.discount}}折</text>
97 - <view class="discountText1 font20r {{couponData.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{couponData.is_type == '3'}}">{{couponData.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>  
98 <view class="priceText" wx:if="{{couponData.price}}"> 92 <view class="priceText" wx:if="{{couponData.price}}">
99 - <view class="icons font24r">￥</view><text class="font48r">{{couponData.price}}</text> 93 + <text class="icons font40r">￥</text><text>{{couponData.price}}</text>
100 </view> 94 </view>
101 - <view class="icons font20r" wx:if="{{couponData.is_type == '3' && couponData.desc!='0'}}">消费满{{couponData.desc}}元可用</view>  
102 </view> 95 </view>
103 - <view class="couponLine"></view>  
104 <view class="itemRight"> 96 <view class="itemRight">
105 <view class="btns"> 97 <view class="btns">
106 - <text class="font32r anameText">{{couponData.aname}}</text>  
107 - <block wx:if="{{couponData.is_type == '1' || couponData.is_type == '2'}}">  
108 - <text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="bottom font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}{{couponData.desc?'，'+couponData.desc+'。':'。'}}</text>  
109 - <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="bottom font24r">  
110 - 无限制{{couponData.desc?'，'+couponData.desc+'。':'。'}}  
111 - </view>  
112 - <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="bottom font24r">  
113 - 会员生日当天可用{{couponData.desc?'，'+couponData.desc+'。':'。'}}  
114 - </view>  
115 - </block>  
116 - <block wx:if="{{couponData.is_type == '3' || couponData.is_type == '4'}}">  
117 - <view wx:if="{{(couponData.useStime && couponData.useEtime) || couponData.foreverText}}" class="bottom font24r">有效期：{{couponData.foreverText?couponData.foreverText : ''}}</view>  
118 - <view wx:if="{{couponData.useStime && couponData.useEtime}}" class="bottom font24r nodate">{{couponData.useStime}} 至 {{couponData.useEtime}}</view>  
119 - <view wx:if="{{couponData.morText || couponData.noonText || couponData.noonText}}" class="bottom font24r">不可用日期：</view>  
120 - <view wx:if="{{couponData.morText}}" class="bottom font24r nodate">{{couponData.morText}}</view>  
121 - <view wx:if="{{couponData.noonText}}" class="bottom font24r nodate">{{couponData.noonText}}</view>  
122 - <view wx:if="{{couponData.nigText}}" class="bottom font24r nodate">{{couponData.nigText}}</view>  
123 - <view wx:if="{{couponData.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>  
124 - <view wx:if="{{couponData.is_type == '4' && couponData.desc!='0'}}" class="bottom font24r">消费满{{couponData.desc}}元可用</view>  
125 - </block>  
126 - </view>  
127 - <view class="btnBox" wx:if="{{couponData.is_type == '3'}}" >  
128 - <view class="font24r orderingFood">免费领取</view>  
129 - <view class="grantNum" wx:if="{{couponData.receiveNumText}}">  
130 - <view class="font24r">已被领取</view>  
131 - <view class="font24r"><text>{{couponData.receiveNumText}}</text>张</view> 98 + <text class="font40r">{{couponData.aname}}</text>
  99 + <view class="font24r orderingFood">
  100 + 领取
132 </view> 101 </view>
133 </view> 102 </view>
  103 + <text wx:if="{{couponData.exp_date.is_week=='1' || couponData.exp_date.is_week===true}}" class="bottom font24r">{{couponData.exp_date.week_show?couponData.exp_date.week_show+'可用':''}}{{couponData.desc?'，'+couponData.desc+'。':'。'}}</text>
  104 + <view wx:if="{{couponData.exp_date.is_none=='1' || couponData.exp_date.is_none===true}}" class="bottom font24r">
  105 + 无限制{{couponData.desc?'，'+couponData.desc+'。':'。'}}
  106 + </view>
  107 + <view wx:if="{{couponData.exp_date.is_birthday=='1' || couponData.exp_date.is_birthday===true}}" class="bottom font24r">
  108 + 会员生日当天可用{{couponData.desc?'，'+couponData.desc+'。':'。'}}
  109 + </view>
134 </view> 110 </view>
135 </view> 111 </view>
136 </view> 112 </view>
@@ -4,32 +4,31 @@ page { @@ -4,32 +4,31 @@ page {
4 } 4 }
5 5
6 .box { 6 .box {
7 - margin: 12rpx; 7 + margin: 24rpx;
8 border-radius: 10rpx; 8 border-radius: 10rpx;
9 background: #fff; 9 background: #fff;
10 - padding: 12rpx; 10 + padding: 40rpx 20rpx;
11 margin-bottom: 24rpx; 11 margin-bottom: 24rpx;
12 } 12 }
13 13
14 .title { 14 .title {
15 display: flex; 15 display: flex;
16 align-items: center; 16 align-items: center;
  17 + border-bottom: 2rpx solid #dbdbdb;
17 padding: 0 0 12rpx 24rpx; 18 padding: 0 0 12rpx 24rpx;
  19 + margin-bottom: 30rpx;
18 } 20 }
19 21
20 .sign { 22 .sign {
21 width: 6rpx; 23 width: 6rpx;
22 height: 30rpx; 24 height: 30rpx;
23 border-radius: 16rpx; 25 border-radius: 16rpx;
24 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 26 + background: #0143a3;
25 } 27 }
26 28
27 .title text { 29 .title text {
28 margin-left: 10rpx; 30 margin-left: 10rpx;
29 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
30 - -webkit-background-clip: text;  
31 - -webkit-text-fill-color: transparent;  
32 - font-weight: 600; 31 + color: #000;
33 } 32 }
34 33
35 .couponWrap .nodate{ 34 .couponWrap .nodate{
@@ -51,6 +50,7 @@ page { @@ -51,6 +50,7 @@ page {
51 min-height: 160rpx; 50 min-height: 160rpx;
52 padding-bottom: 10rpx; 51 padding-bottom: 10rpx;
53 border-radius: 20rpx; 52 border-radius: 20rpx;
  53 + border: 2rpx solid #ff7e06;
54 } 54 }
55 55
56 56
@@ -93,10 +93,7 @@ page { @@ -93,10 +93,7 @@ page {
93 height: 44rpx; 93 height: 44rpx;
94 width: max-content; 94 width: max-content;
95 flex-shrink: 0; 95 flex-shrink: 0;
96 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
97 -}  
98 -.orderingFood2 {  
99 - width: 74rpx !important; 96 + background: linear-gradient(94.4deg, #f41919 2.72%, #ff7426 122.17%);
100 } 97 }
101 .couponWrap .icons { 98 .couponWrap .icons {
102 color: #F6231B !important; 99 color: #F6231B !important;
@@ -255,7 +252,7 @@ page { @@ -255,7 +252,7 @@ page {
255 border-radius: 20rpx; 252 border-radius: 20rpx;
256 line-height: 44rpx; 253 line-height: 44rpx;
257 height: 44rpx; 254 height: 44rpx;
258 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 255 + background: linear-gradient(95.61deg, #2186e2 0.55%, #054baa 130.76%);
259 width: max-content; 256 width: max-content;
260 flex-shrink: 0; 257 flex-shrink: 0;
261 } 258 }
@@ -37,7 +37,6 @@ Page({ @@ -37,7 +37,6 @@ Page({
37 StyleType:'', 37 StyleType:'',
38 couponArr: [],//待领取的优惠券列表 38 couponArr: [],//待领取的优惠券列表
39 couponList:[],//优惠券列表 39 couponList:[],//优惠券列表
40 - distance: '',  
41 }, 40 },
42 couponModal: '', 41 couponModal: '',
43 /** 42 /**
@@ -74,56 +73,22 @@ Page({ @@ -74,56 +73,22 @@ Page({
74 }, 73 },
75 // 获取店铺详情 74 // 获取店铺详情
76 getDetail(sid) { 75 getDetail(sid) {
77 - let that = this;  
78 App.Customer.GetSellerDetail({ 76 App.Customer.GetSellerDetail({
79 openid: getApp().openid, 77 openid: getApp().openid,
80 sid 78 sid
81 }).then(res => { 79 }).then(res => {
82 let reserev = res.data; 80 let reserev = res.data;
83 - let cate = [];  
84 - let latitude = '';  
85 - let longitude = '';  
86 - let distance = '';  
87 - if(reserev.cate && reserev.cate.length>0){  
88 - cate = reserev.cate.join(' | ')  
89 - }  
90 this.setData({ 81 this.setData({
91 seller: { 82 seller: {
92 sellName: reserev.sellername, 83 sellName: reserev.sellername,
93 - daily: reserev.daily.morning + ' ' + reserev.daily.noon + ' ' + reserev.daily.night,  
94 - seller_tel: reserev.phone, 84 + date: reserev.daily.morning + ' ' + reserev.daily.night + ' ' + reserev.daily.noon,
  85 + seller_tel: reserev.seller_tel.split(','),
95 address: reserev.map_address, 86 address: reserev.map_address,
96 lat: reserev.lat, 87 lat: reserev.lat,
97 long: reserev.long, 88 long: reserev.long,
98 is_online_reserve: reserev.is_online_reserve, 89 is_online_reserve: reserev.is_online_reserve,
99 - is_parking:reserev.is_parking,  
100 - cate,  
101 - average:reserev.average,  
102 } 90 }
103 }) 91 })
104 - wx.getLocation({  
105 - type: 'wgs84', // 返回可以用于 wx.openLocation 的经纬度  
106 - success: function (res) {  
107 - latitude = res.latitude; // 纬度  
108 - longitude = res.longitude; // 经度  
109 - console.log(`当前的纬度: ${latitude}, 当前的经度: ${longitude}`);  
110 - if (latitude && longitude) {  
111 - distance = that.getDistance(latitude, longitude, reserev.lat, reserev.long);  
112 - distance = parseInt(distance)  
113 - if (distance > 1000) {  
114 - distance = (distance / 1000).toFixed(2) + 'km'  
115 - } else {  
116 - distance += 'm';  
117 - }  
118 - that.setData({  
119 - distance  
120 - })  
121 - }  
122 - },  
123 - fail: function (err) {  
124 - console.error('获取位置失败:', err);  
125 - }  
126 - });  
127 console.log('sellerseller', { 92 console.log('sellerseller', {
128 ...this.data.seller 93 ...this.data.seller
129 }); 94 });
@@ -134,22 +99,6 @@ Page({ @@ -134,22 +99,6 @@ Page({
134 console.log(res, '详情请求失败'); 99 console.log(res, '详情请求失败');
135 }) 100 })
136 }, 101 },
137 - // 计算2点之间的距离  
138 - getDistance(lat1, lon1, lat2, lon2) {  
139 - const R = 6371e3; // 地球半径（米）  
140 - // 将经纬度转换为弧度  
141 - const φ1 = lat1 * Math.PI / 180; // 纬度1  
142 - const φ2 = lat2 * Math.PI / 180; // 纬度2  
143 - const Δφ = (lat2 - lat1) * Math.PI / 180; // 纬度差  
144 - const Δλ = (lon2 - lon1) * Math.PI / 180; // 经度差  
145 - // Haversine 公式  
146 - const a = Math.sin(Δφ / 2) * Math.sin(Δφ / 2) +  
147 - Math.cos(φ1) * Math.cos(φ2) *  
148 - Math.sin(Δλ / 2) * Math.sin(Δλ / 2);  
149 - const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));  
150 - const distance = R * c; // 计算距离（米）  
151 - return distance; // 返回距离  
152 - },  
153 // 获取商家版本，不是超能版或者没有开通对应模块，不显示 102 // 获取商家版本，不是超能版或者没有开通对应模块，不显示
154 getSellerVersionFun(sellerid) { 103 getSellerVersionFun(sellerid) {
155 App.SellerVersion.GetSellerVersion({ 104 App.SellerVersion.GetSellerVersion({
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 "navigationBarTitleText": "", 4 "navigationBarTitleText": "",
5 "usingComponents": { 5 "usingComponents": {
6 "nav": "/components/nav/nav", 6 "nav": "/components/nav/nav",
  7 + "titleStyle":"/components/titleStyle/titleStyle",
7 "my-modal": "/components/modal/modal", 8 "my-modal": "/components/modal/modal",
8 "scroll-number": "/components/scroll-number/index" 9 "scroll-number": "/components/scroll-number/index"
9 } 10 }
1 <!--pages/reserve/shopHome.wxml--> 1 <!--pages/reserve/shopHome.wxml-->
2 <nav hasHome class="navhome" backgroundColor="#0143a3" color="#fff" place="{{true}}">{{seller.sellName}}</nav> 2 <nav hasHome class="navhome" backgroundColor="#0143a3" color="#fff" place="{{true}}">{{seller.sellName}}</nav>
3 <view> 3 <view>
4 - <view class="flex-vc {{home.image?'sellBox':'sellBox sellBox1'}}">  
5 - <image wx:if="{{home.image}}" class="imgs" src="{{home.image}}" mode="widthFix" />  
6 - <view class="info flex-vl" style="background:#fff;">  
7 - <view class="flex-lr">  
8 - <view class="colorText font32r">{{seller.sellName}}</view>  
9 - <view class="park font20r" wx:if="{{seller.is_parking == '1'}}">可停车</view>  
10 - </view>  
11 - <view class="flex-lr distanceMar">  
12 - <view class="flex-lr">  
13 - <view class="news font24r">{{seller.cate}}</view>  
14 - <view class="news font24r" wx:if="{{seller.average && seller.average>0}}">人均{{seller.average}}</view>  
15 - </view>  
16 - <view class="font24r news">{{distance}}</view>  
17 - </view>  
18 - <view class="bottom_btns">  
19 - <view class="book font24r">订过</view>  
20 - <view class="book font24r">去过</view>  
21 - <view class="book font24r">好友订过</view>  
22 - <view class="book font24r">我有券</view>  
23 - </view>  
24 - <view class="bottom_btns font24r">  
25 - 营业时间：{{seller.daily}}  
26 - </view>  
27 - <view class="colorFive font28r flex-lr">  
28 - <text class="font28r">{{seller.address}}</text>  
29 - <view class="">  
30 - <image class="img2" bindtap="call" data-info="{{seller.seller_tel}}" src="https://qn.colorcun.com/phoneIcon.png" />  
31 - <image class="img2" bindtap="looklocation" src="https://qn.colorcun.com/navigationIcon.png" />  
32 - </view>  
33 - </view>  
34 - </view>  
35 - </view>  
36 - <view class="preferential" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">  
37 - <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">  
38 - <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/receiveCoupon?id={{item.id}}&name={{seller.sellName}}&use={{item.stringifyUse}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover"> 4 + <view class="flex-vc {{home.image?'sellBox':'sellBox sellBox1'}}">
  5 + <image wx:if="{{home.image}}" class="imgs" src="{{home.image}}" mode="widthFix" />
  6 + <view class="info flex-vl" style="background:#fff;">
  7 + <view class="flex-lr">
  8 + <view class="colorText font32r">{{seller.sellName}}</view>
  9 + <image bindtap="follow" wx:if="{{IsCollectionSeller}}" class="img1" src="https://qn.colorcun.com/heartFilledBlue.png" />
  10 + <image bindtap="follow" wx:else class="img1" src="https://qn.colorcun.com/heartBlue.png" />
  11 + </view>
  12 + <view class="colorFive text1 font28r">营业时间：{{seller.date}}</view>
  13 + <view class="colorFive text2 font28r">
  14 + 电话：<text class="colorText" wx:for="{{seller.seller_tel}}" bindtap="call" data-info="{{item}}">{{item}}{{(seller.seller_tel.length-1)!=index?'，':''}}</text>
  15 + </view>
  16 + <view class="colorFive font28r" bindtap="looklocation">
  17 + <text>地址：{{seller.address}}</text>
  18 + <image class="img2" src="https://qn.colorcun.com/address.png" />
  19 + </view>
  20 + </view>
  21 + </view>
  22 + <view class="preferential" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
  23 + <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
  24 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.sellName}}&use={{item.stringifyUse}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover">
39 <view class="couponWrap"> 25 <view class="couponWrap">
40 <view class="itemLeft"> 26 <view class="itemLeft">
41 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 27 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
@@ -69,7 +55,7 @@ @@ -69,7 +55,7 @@
69 <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view> 55 <view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>
70 </block> 56 </block>
71 </view> 57 </view>
72 - <view class="btnBox" wx:if="{{item.is_type == '3'}}"> 58 + <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
73 <view class="font24r orderingFood orderingFood1">已领取</view> 59 <view class="font24r orderingFood orderingFood1">已领取</view>
74 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 60 <view class="grantNum" wx:if="{{item.receiveNumText}}">
75 <view class="font24r">已被领取</view> 61 <view class="font24r">已被领取</view>
@@ -82,152 +68,169 @@ @@ -82,152 +68,169 @@
82 </view> 68 </view>
83 </view> 69 </view>
84 </navigator> 70 </navigator>
85 - </block>  
86 - </view>  
87 - <!-- 餐厅介绍 -->  
88 - <block wx:if="{{marketing.logo || home.image || ((store.introduce && (!store.is_introduce || store.is_introduce!='0')) || (store.images.length>0 && (!store.is_images || store.is_images!='0')) || (store.content && store.content.length>0))}}">  
89 - <view class="introduceBox">  
90 - <block wx:if="{{(marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) || (store.introduce && (!store.is_introduce || store.is_introduce!='0')) || (home.image && (!home.id_first_image || home.id_first_image!='0'))}}">  
91 - <view class="chefText font28r">  
92 - <text></text>{{store.title ? store.title : '餐厅介绍'}}  
93 - </view>  
94 - <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />  
95 - <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>  
96 - <view class="labelBox" wx:if="{{!store.content && store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">  
97 - <text space="nbsp" class="texts">{{store.introduce}}</text>  
98 - </view>  
99 - <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">  
100 - <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
101 - <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />  
102 - </block>  
103 - </block>  
104 - <view class="contentBox" wx:if="{{store.content && store.content.length>0}}">  
105 - <block wx:for="{{store.content}}">  
106 - <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />  
107 - <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font24r">{{item.content}}</text>  
108 - <view wx:if="{{item.type == '3'}}" class="videoBox">  
109 - <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>  
110 - </view>  
111 - </block>  
112 - </view>  
113 - </block>  
114 - </view>  
115 - </block>  
116 - <!-- 主厨介绍 -->  
117 - <block wx:if="{{chef && ((chef.introduce && (!chef.is_introduce || chef.is_introduce!='0')) || (chef.image && (!chef.is_images || chef.is_images!='0')) || (chef.content && chef.content.length>0))}}">  
118 - <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">  
119 - <view class="chefText font28r">  
120 - <text></text>{{chef.title ? chef.title : '主厨介绍'}}  
121 - </view>  
122 - <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">  
123 - <text space="nbsp" class="texts">{{chef.introduce}}</text>  
124 - </view>  
125 - <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}" bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />  
126 - <view class="contentBox" wx:if="{{chef.content && chef.content.length>0}}">  
127 - <block wx:for="{{chef.content}}">  
128 - <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />  
129 - <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font24r">{{item.content}}</text>  
130 - <view wx:if="{{item.type == '3'}}" class="videoBox">  
131 - <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>  
132 - </view>  
133 - </block>  
134 - </view>  
135 - </view>  
136 - </block>  
137 - <!-- 特色菜品 -->  
138 - <view class="introduceBox vegetableBox" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}">  
139 - <view class="chefText font28r">  
140 - <text></text>{{signboard.title ? signboard.title : '主厨介绍'}}  
141 - </view>  
142 - <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
143 - <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" mode="widthFix" />  
144 - </block>  
145 - <view class="contentBox" wx:if="{{signboard.content && signboard.content.length>0}}">  
146 - <block wx:for="{{signboard.content}}">  
147 - <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />  
148 - <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font24r">{{item.content}}</text>  
149 - <view wx:if="{{item.type == '3'}}" class="videoBox">  
150 - <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>  
151 - </view>  
152 - </block>  
153 - </view>  
154 - </view>  
155 - <!-- 停车指引 -->  
156 - <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">  
157 - <view class="chefText font28r">  
158 - <text></text>{{reserve.title ? reserve.title : '主厨介绍'}}  
159 - </view>  
160 - <view class="labelBox" wx:if="{{reserve.park_info}}">  
161 - <text space="nbsp" class="texts">{{reserve.park_info}}</text>  
162 - </view>  
163 - <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">  
164 - <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}" />  
165 - </block>  
166 - <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">  
167 - <block wx:for="{{reserve.content}}">  
168 - <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />  
169 - <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font24r">{{item.content}}</text>  
170 - <view wx:if="{{item.type == '3'}}" class="videoBox">  
171 - <video object-fit="contain" autoplay="{{true}}" loop="{{true}}" muted="{{true}}" show-mute-btn="{{true}}" vslide-gesture-in-fullscreen="{{true}}" src="{{item.content}}"></video>  
172 - </view>  
173 - </block>  
174 - </view>  
175 - </view>  
176 - <view class="vipRechargeBox" wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && recharge_data.id}}">  
177 - <view class="chefText font28r">  
178 - <text></text>会员招募  
179 - </view> 71 + </block>
  72 + </view>
  73 + <!-- 餐厅介绍 -->
  74 + <block wx:if="{{marketing.logo || home.image || ((store.introduce && (!store.is_introduce || store.is_introduce!='0')) || (store.images.length>0 && (!store.is_images || store.is_images!='0')) || (store.content && store.content.length>0))}}">
  75 + <view class="introduceBox">
  76 + <block wx:if="{{(marketing && marketing.logo && (!marketing.is_logo || marketing.is_logo!='0')) || (store.introduce && (!store.is_introduce || store.is_introduce!='0')) || (home.image && (!home.id_first_image || home.id_first_image!='0'))}}">
  77 + <view wx:if="{{titleType}}" class="chefText font36r">
  78 + <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="{{store.title ? store.title : '餐厅介绍'}}"></titleStyle>
  79 + </view>
  80 + <image wx:if="{{marketing.logo}}" src="{{marketing.logo}}" bindtap="lookImgs" data-url="{{marketing.logo}}" mode="widthFix" />
  81 + <image wx:if="{{home.image}}" src="{{home.image}}" bindtap="lookImgs" data-url="{{home.image}}" class="homeImage" mode="widthFix"></image>
  82 + <view class="labelBox" wx:if="{{!store.content && store.introduce && (!store.is_introduce || store.is_introduce!='0')}}">
  83 + <text space="nbsp" class="texts">{{store.introduce}}</text>
  84 + </view>
  85 + <block wx:if="{{store.images.length>0 && (!store.is_images || store.is_images!='0')}}">
  86 + <block wx:for="{{store.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  87 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{store.images}}" mode="widthFix" />
  88 + </block>
  89 + </block>
  90 + <view class="contentBox" wx:if="{{store.content && store.content.length>0}}">
  91 + <block wx:for="{{store.content}}">
  92 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  93 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  94 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  95 + <video
  96 + object-fit="contain"
  97 + autoplay="{{true}}"
  98 + loop="{{true}}"
  99 + muted="{{true}}"
  100 + show-mute-btn="{{true}}"
  101 + vslide-gesture-in-fullscreen="{{true}}"
  102 + src="{{item.content}}"
  103 + ></video>
  104 + </view>
  105 + </block>
  106 + </view>
  107 + </block>
  108 + </view>
  109 + </block>
  110 + <!-- 主厨介绍 -->
  111 + <block wx:if="{{chef && ((chef.introduce && (!chef.is_introduce || chef.is_introduce!='0')) || (chef.image && (!chef.is_images || chef.is_images!='0')) || (chef.content && chef.content.length>0))}}">
  112 + <view class="introduceBox famousChefBox" wx:if="{{chef && ((!chef.is_introduce || chef.is_introduce!='0') || (!chef.is_images || chef.is_images!='0'))}}">
  113 + <view wx:if="{{titleType}}" class="chefText font36r">
  114 + <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="{{chef.title ? chef.title : '主厨介绍'}}"></titleStyle>
  115 + </view>
  116 + <view class="labelBox" wx:if="{{(chef.introduce && (!chef.is_introduce || chef.is_introduce!='0'))}}">
  117 + <text space="nbsp" class="texts">{{chef.introduce}}</text>
  118 + </view>
  119 + <image wx:if="{{(!chef.is_images || chef.is_images!='0') && chef.image}}" src="{{chef.image}}"bindtap="lookImgs" data-url="{{chef.image}}" mode="widthFix" />
  120 + <view class="contentBox" wx:if="{{chef.content && chef.content.length>0}}">
  121 + <block wx:for="{{chef.content}}">
  122 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  123 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  124 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  125 + <video
  126 + object-fit="contain"
  127 + autoplay="{{true}}"
  128 + loop="{{true}}"
  129 + muted="{{true}}"
  130 + show-mute-btn="{{true}}"
  131 + vslide-gesture-in-fullscreen="{{true}}"
  132 + src="{{item.content}}"
  133 + ></video>
  134 + </view>
  135 + </block>
  136 + </view>
  137 + </view>
  138 + </block>
  139 + <!-- 特色菜品 -->
  140 + <view class="introduceBox vegetableBox" wx:if="{{signboard && ((signboard.swich=='1' && signboard.images && signboard.images.length>0) || (signboard.content && signboard.content.length>0))}}">
  141 + <view wx:if="{{titleType}}" class="chefText font36r">
  142 + <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="{{signboard.title ? signboard.title : '特色菜品'}}"></titleStyle>
  143 + </view>
  144 + <block wx:for="{{signboard.images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  145 + <image src="{{item}}" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{signboard.images}}" mode="widthFix" />
  146 + </block>
  147 + <view class="contentBox" wx:if="{{signboard.content && signboard.content.length>0}}">
  148 + <block wx:for="{{signboard.content}}">
  149 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  150 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  151 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  152 + <video
  153 + object-fit="contain"
  154 + autoplay="{{true}}"
  155 + loop="{{true}}"
  156 + muted="{{true}}"
  157 + show-mute-btn="{{true}}"
  158 + vslide-gesture-in-fullscreen="{{true}}"
  159 + src="{{item.content}}"
  160 + ></video>
  161 + </view>
  162 + </block>
  163 + </view>
  164 + </view>
  165 + <!-- 停车指引 -->
  166 + <view class="introduceBox stopBox" wx:if="{{reserve && (reserve.swich_park=='1' && (reserve.park_info || reserve.park_info_images) || (reserve.content && reserve.content.length>0))}}">
  167 + <view wx:if="{{titleType}}" class="chefText font36r">
  168 + <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="{{reserve.title ? reserve.title : '停车指引'}}"></titleStyle>
  169 + </view>
  170 + <view class="labelBox" wx:if="{{reserve.park_info}}">
  171 + <text space="nbsp" class="texts">{{reserve.park_info}}</text>
  172 + </view>
  173 + <block wx:for="{{reserve.park_info_images}}" wx:key="arryIndex" wx:for-index="arryIndex">
  174 + <image src="{{item}}" mode="widthFix" bindtap="lookImgs" data-url="{{item}}" data-imgs="{{reserve.park_info_images}}"/>
  175 + </block>
  176 + <view class="contentBox" wx:if="{{reserve.content && reserve.content.length>0}}">
  177 + <block wx:for="{{reserve.content}}">
  178 + <image wx:if="{{item.type == '1'}}" bindtap="lookImgs" src="{{item.content}}" data-url="{{item.content}}" mode="widthFix" />
  179 + <text wx:if="{{item.type == '2'}}" space="nbsp" class="texts font32r">{{item.content}}</text>
  180 + <view wx:if="{{item.type == '3'}}" class="videoBox">
  181 + <video
  182 + object-fit="contain"
  183 + autoplay="{{true}}"
  184 + loop="{{true}}"
  185 + muted="{{true}}"
  186 + show-mute-btn="{{true}}"
  187 + vslide-gesture-in-fullscreen="{{true}}"
  188 + src="{{item.content}}"
  189 + ></video>
  190 + </view>
  191 + </block>
  192 + </view>
  193 + </view>
  194 + <view class="preferential" wx:if="{{hasValueRecharge && marketing && marketing.is_recharge=='1' && recharge_data && recharge_data.id}}">
  195 + <view wx:if="{{titleType}}" class="chefText font36r">
  196 + <titleStyle isWhite="pearlWhite" titleStyleType="{{titleType}}" titleText="会员招募"></titleStyle>
  197 + </view>
180 <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.sellName}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover"> 198 <navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.sellName}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover">
181 - <view class="couponWrap">  
182 - <view class="itemLeft font20r">  
183 - <view class="priceText"><view class="icons font24r">￥</view><text class="font48r">{{recharge_data.recharge_money}}</text></view>  
184 - </view>  
185 - <view class="couponLine"></view>  
186 - <view class="itemRight">  
187 - <view class="btns">  
188 - <view class="bottom font24r" wx:if="{{priceInfo}}">  
189 - {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}  
190 - </view>  
191 - <view class="bottom font24r" wx:if="{{scoreInfo}}">  
192 - {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}  
193 - </view>  
194 - <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">  
195 - {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。  
196 - </view> 199 + <view class="preferentialItems">
  200 + <view class="itemLeft">
  201 + <view class="itemTop font28r">
  202 + <text>{{recharge_data.rname}}</text>
197 </view> 203 </view>
198 - <view class="btnBox">  
199 - <view class="font24r orderingFood">  
200 - 充值  
201 - </view> 204 + <view class="font24r" wx:if="{{priceInfo}}">
  205 + {{priceInfo}}{{(recharge_data.recharge_list.is_coupons=='0' && recharge_data.recharge_list.is_score=='0')?'。':';'}}
  206 + </view>
  207 + <view class="bottom font24r" wx:if="{{scoreInfo}}">
  208 + {{scoreInfo}}{{recharge_data.recharge_list.is_coupons=='0'?'。':';'}}
202 </view> 209 </view>
  210 + <view class="bottom font24r" wx:if="{{recharge_data.recharge_list.is_coupons=='1'}}">
  211 + {{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+recharge_data.recharge_money+'元赠送'+certificate:''}}。
  212 + </view>
  213 + </view>
  214 + <view class="font24r orderingFood">
  215 + 抢购
203 </view> 216 </view>
204 </view> 217 </view>
205 </navigator> 218 </navigator>
206 - </view>  
207 - <view class="vips">  
208 - <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">  
209 - 点击了解更多会员优惠政策  
210 - </view>  
211 - <text class="businessBox">  
212 - 周到安排提供技术支持<text bindtap="callPhone" data-phone="4000009690">4000009690</text>，餐厅入驻请点击<text bindtap="gotoJoinSeller" style="text-decoration: underline;">这里</text>  
213 - </text>  
214 - </view>  
215 - <view class="all-button flex-lr between">  
216 - <view class="leftBtn">  
217 - <button class="btn1" bindtap="follow">  
218 - <image wx:if="{{IsCollectionSeller}}" class="img1" src="https://qn.colorcun.com/collect.png" />  
219 - <image wx:else class="img1" src="https://qn.colorcun.com/collectSelect.png" />  
220 - <view class="font24r">收藏</view>  
221 - </button>  
222 - <button class="shareItem btn1" open-type="share">  
223 - <image src="https://qn.colorcun.com/voucherIcon2.png" mode="" />  
224 - <view class="font24r">分享</view>  
225 - </button>  
226 - </view> 219 + </view>
  220 + <view class="vips">
  221 + <view wx:if="{{hasValueRecharge && marketing.is_link=='1'}}" class="font24r favouredPolicy" bindtap="gotoFavourableList">
  222 + 点击了解更多会员优惠政策
  223 + </view>
  224 + <text class="businessBox">
  225 + 周到安排提供技术支持<text bindtap="callPhone" data-phone="4000009690">4000009690</text>，餐厅入驻请点击<text bindtap="gotoJoinSeller" style="text-decoration: underline;">这里</text>
  226 + </text>
  227 + </view>
  228 + <view class="all-button flex-lr between">
  229 + <button class="book-item-font flex-cc font30r shareItem" open-type="share">转发给朋友</button>
227 <block wx:if="{{seller.is_online_reserve == '1'}}"> 230 <block wx:if="{{seller.is_online_reserve == '1'}}">
228 <navigator url="/pages/reserve/reserve?id={{sid}}&activeTab=reserve" class="book-item-font second-book-button flex-cc font30r" style="position: relative;">预订包间</navigator> 231 <navigator url="/pages/reserve/reserve?id={{sid}}&activeTab=reserve" class="book-item-font second-book-button flex-cc font30r" style="position: relative;">预订包间</navigator>
229 </block> 232 </block>
230 - </view> 233 + </view>
231 </view> 234 </view>
232 <my-modal id="couponModal" fadeStyle="slideUp" height="240px"> 235 <my-modal id="couponModal" fadeStyle="slideUp" height="240px">
233 <view slot="modalName" class="titleModal"> 236 <view slot="modalName" class="titleModal">
@@ -239,7 +242,7 @@ @@ -239,7 +242,7 @@
239 <text class="counterText1">元</text>代金券 242 <text class="counterText1">元</text>代金券
240 </view> 243 </view>
241 </view> 244 </view>
242 - <view slot="modalContent"> 245 + <view slot="modalContent">
243 <!-- <view class="couponBox"> 246 <!-- <view class="couponBox">
244 <view wx:for="{{couponArr}}" class="couponItems"> 247 <view wx:for="{{couponArr}}" class="couponItems">
245 <view class="couponNum font20r">×{{item.number}}</view> 248 <view class="couponNum font20r">×{{item.number}}</view>
@@ -251,5 +254,5 @@ @@ -251,5 +254,5 @@
251 </view> --> 254 </view> -->
252 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view> 255 <view class="couponInfo font24r">您到店扫码支付即可自动使用</view>
253 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view> 256 <view bindtap="closeCouponModal" class="couponBtn font36r">我知道了</view>
254 - </view> 257 + </view>
255 </my-modal> 258 </my-modal>
1 /* pages/reserve/shopHome.wxss */ 1 /* pages/reserve/shopHome.wxss */
2 -page {  
3 - background: #F5F5F5;  
4 -}  
5 -  
6 .imgs { 2 .imgs {
7 - width: 100%;  
8 - position: absolute;  
9 - left: 0;  
10 - top: 0; 3 + width: 100%;
  4 + position: absolute;
  5 + left: 0;
  6 + top: 0;
11 } 7 }
12 8
13 .my_canvas { 9 .my_canvas {
14 - position: relative;  
15 - padding-bottom: 200rpx; 10 + position: relative;
  11 + padding-bottom: 200rpx;
16 } 12 }
17 13
18 .sellBox { 14 .sellBox {
19 - width: 100%;  
20 - position: relative;  
21 - height: 562rpx;  
22 - margin-bottom: 200rpx; 15 + width: 100%;
  16 + position: relative;
  17 + height: 562rpx;
  18 + margin-bottom: 200rpx;
23 } 19 }
24 20
25 -.sellBox1 {  
26 - min-height: 210rpx;  
27 - height: auto;  
28 - margin-bottom: 140rpx; 21 +.sellBox1{
  22 + min-height: 330rpx;
  23 + height: auto;
  24 + margin-bottom: 130rpx;
29 } 25 }
30 26
31 .info { 27 .info {
32 - width: 100%;  
33 - padding: 24rpx;  
34 - position: absolute;  
35 - bottom: -60%;  
36 - box-sizing: border-box;  
37 - background: #fff;  
38 - background-color: #fff;  
39 - border-radius: 40rpx 40rpx 0 0; 28 + width: 90%;
  29 + padding: 44rpx 26rpx 26rpx 20rpx;
  30 + position: absolute;
  31 + bottom: -30%;
  32 + box-sizing: border-box;
  33 + background: #fff;
  34 + background-color: #fff;
  35 + border-radius: 16rpx;
  36 + border: 2rpx solid #0143A3;
40 } 37 }
41 38
42 .img1 { 39 .img1 {
43 - width: 40rpx;  
44 - height: 40rpx; 40 + width: 50rpx;
  41 + height: 50rpx;
45 } 42 }
46 43
47 .img2 { 44 .img2 {
48 - width: 30rpx;  
49 - height: 38rpx;  
50 - margin-left: 10rpx;  
51 - position: relative; 45 + width: 30rpx;
  46 + height: 38rpx;
  47 + margin-left: 10rpx;
  48 + position: relative;
52 top: 8rpx; 49 top: 8rpx;
53 flex-shrink: 0; 50 flex-shrink: 0;
54 } 51 }
55 52
56 .colorText { 53 .colorText {
57 - color: #000;  
58 - font-family: PingFang SC;  
59 - font-weight: 600; 54 + color: #0143A3;
60 } 55 }
61 56
62 -.colorFive {  
63 - display: flex;  
64 - align-items: baseline;  
65 - padding: 10rpx 0; 57 +.text1 {
  58 + margin: 40rpx 0 10rpx 0;
66 } 59 }
67 60
68 -.colorFive {  
69 - color: #000;  
70 - font-family: PingFang SC;  
71 - font-weight: 600; 61 +.text2 {
  62 + margin-bottom: 10rpx;
72 } 63 }
73 64
74 -.img2 {  
75 - width: 52rpx;  
76 - height: 52rpx; 65 +.colorFive {
  66 + color: #515151;
  67 + display: flex;
  68 + align-items: baseline;
77 } 69 }
78 70
79 .colorFive text { 71 .colorFive text {
@@ -83,315 +75,256 @@ page { @@ -83,315 +75,256 @@ page {
83 } 75 }
84 76
85 .introduce { 77 .introduce {
86 - box-sizing: border-box; 78 + box-sizing: border-box;
87 } 79 }
88 80
89 .imgMask { 81 .imgMask {
90 - margin: 0 40rpx; 82 + margin: 0 40rpx;
91 } 83 }
92 84
93 .lines { 85 .lines {
94 - height: 2rpx;  
95 - margin: 20rpx 20rpx 20rpx 0;  
96 - background-color: #0143A3; 86 + height: 2rpx;
  87 + margin: 20rpx 20rpx 20rpx 0;
  88 + background-color: #0143A3;
97 } 89 }
98 90
99 .mtnone { 91 .mtnone {
100 - margin-top: 0; 92 + margin-top: 0;
101 } 93 }
102 94
103 .famousChefBox .labelBox { 95 .famousChefBox .labelBox {
104 - border-bottom: none; 96 + border-bottom: none;
105 } 97 }
106 98
107 .labelBox { 99 .labelBox {
108 - margin: 20rpx 20rpx 0 20rpx;  
109 - display: flex;  
110 - position: relative;  
111 - padding-bottom: 20rpx; 100 + margin: 20rpx 20rpx 0 20rpx;
  101 + display: flex;
  102 + position: relative;
  103 + padding-bottom: 20rpx;
112 } 104 }
113 105
114 .labelBox .texts { 106 .labelBox .texts {
115 - width: 100%;  
116 - line-height: 40rpx;  
117 - color: #515151;  
118 - font-family: PingFang SC;  
119 - font-size: 32rpx;  
120 - font-weight: 500; 107 + width: 100%;
  108 + line-height: 40rpx;
  109 + color: #515151;
  110 + font-family: PingFang SC;
  111 + font-size: 32rpx;
  112 + font-weight: 500;
121 } 113 }
122 114
123 .contentBox { 115 .contentBox {
124 - width: 100%;  
125 - margin-top: 20rpx; 116 + width: 100%;
  117 + margin-top: 20rpx;
126 } 118 }
127 119
128 .contentBox .texts { 120 .contentBox .texts {
129 - line-height: 40rpx;  
130 - margin: 0 24rpx 24rpx 24rpx;  
131 - color: #000;  
132 - font-family: PingFang SC;  
133 - font-weight: 500;  
134 - display: block; 121 + line-height: 40rpx;
  122 + margin: 0 20rpx;
  123 + color: #515151;
  124 + font-family: PingFang SC;
  125 + font-weight: 500;
  126 + display: block;
135 } 127 }
136 128
137 -.introduceBox {  
138 - background: #fff;  
139 - padding-bottom: 20rpx; 129 +.contentBox view,.contentBox text,.contentBox image{
  130 + margin-bottom: 20rpx !important;
140 } 131 }
141 132
142 .introduceBox image { 133 .introduceBox image {
143 - width: 100%;  
144 - margin-bottom: 20rpx;  
145 - display: block !important;  
146 - vertical-align: top;  
147 - padding: 0 24rpx;  
148 - box-sizing: border-box;  
149 - border-radius: 10rpx; 134 + width: 100%;
  135 + margin-bottom: 20rpx;
  136 + display: block !important;
  137 + vertical-align: top;
  138 + padding: 0 20rpx;
  139 + box-sizing: border-box;
150 } 140 }
151 141
152 .labelBox .line1 { 142 .labelBox .line1 {
153 - margin: 0 0 0 16rpx; 143 + margin: 0 0 0 16rpx;
154 } 144 }
155 145
156 .imgMask image { 146 .imgMask image {
157 - width: 100%;  
158 - display: block;  
159 - margin-bottom: 20rpx; 147 + width: 100%;
  148 + display: block;
  149 + margin-bottom: 20rpx;
160 } 150 }
161 151
162 .famousChefBox, 152 .famousChefBox,
163 .vegetableBox { 153 .vegetableBox {
164 - position: relative;  
165 - margin-top: 20rpx; 154 + position: relative;
  155 + margin-top: 20rpx;
166 } 156 }
167 157
168 -.chefText {  
169 - font-family: PingFang SC;  
170 - margin: 20rpx 20rpx 20rpx 0;  
171 - font-weight: 500;  
172 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
173 - -webkit-background-clip: text;  
174 - -webkit-text-fill-color: transparent;  
175 - display: flex;  
176 - align-items: center;  
177 - font-family: PingFang SC;  
178 - padding: 24rpx 0 12rpx 24rpx; 158 +.vegetableBox .chefText {
  159 + margin-top: 0;
179 } 160 }
180 161
181 -.chefText text {  
182 - display: block;  
183 - width: 8rpx;  
184 - height: 32rpx;  
185 - margin-right: 16rpx;  
186 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 162 +.chefText {
  163 + font-family: PingFang SC;
  164 + margin: 20rpx 20rpx 20rpx 0;
  165 + font-weight: 500;
  166 + color: #0143A3;
187 } 167 }
188 168
189 .between { 169 .between {
190 - justify-content: space-between; 170 + justify-content: space-between;
191 } 171 }
192 172
193 .all-button { 173 .all-button {
194 - background: #fff;  
195 - height: 160rpx;  
196 - padding: 0 40rpx;  
197 - box-sizing: border-box;  
198 - z-index: 100;  
199 - justify-content: space-between;  
200 - position: fixed;  
201 - left: 0;  
202 - bottom: 0;  
203 - width: 100%; 174 + background: #FAFAFA;
  175 + height: 160rpx;
  176 + padding: 0 40rpx;
  177 + box-sizing: border-box;
  178 + z-index: 100;
  179 + justify-content: flex-end;
  180 + position: fixed;
  181 + left: 0;
  182 + bottom: 0;
  183 + width: 100%;
204 } 184 }
205 185
206 .book-item-font { 186 .book-item-font {
207 - width: 40%;  
208 - height: 46%;  
209 - border-radius: 42rpx;  
210 - font-weight: 600; 187 + width: 100%;
  188 + height: 46%;
  189 + border-radius: 42rpx;
  190 + font-weight: 600;
211 } 191 }
212 192
213 .second-book-button { 193 .second-book-button {
214 - margin-left: 20rpx;  
215 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
216 - color: #fff; 194 + margin-left: 20rpx;
  195 + background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
  196 + color: #fff;
217 } 197 }
218 198
219 -.leftBtn {  
220 - display: flex;  
221 - justify-content: space-between;  
222 - background: #fff;  
223 -}  
224 -  
225 -.leftBtn button {  
226 - background: #fff;  
227 -}  
228 -  
229 -.btn1 {  
230 - margin: 0;  
231 - display: flex;  
232 - align-items: center;  
233 - flex-direction: column;  
234 -}  
235 -  
236 -.btn1 view {  
237 - margin-top: -10%;  
238 -}  
239 -  
240 -.shareItem image {  
241 - width: 40rpx;  
242 - height: 40rpx; 199 +.shareItem {
  200 + width: 46%;
  201 + margin: 0;
  202 + border: 2rpx solid #0143A3;
  203 + color: #0143A3;
243 } 204 }
244 205
245 .preferential { 206 .preferential {
246 - margin-top: 48%;  
247 - background: #fff;  
248 - padding: 24rpx;  
249 -}  
250 -  
251 -.vipRechargeBox {  
252 - background: #fff;  
253 - padding: 0 24rpx 24rpx 24rpx;  
254 - margin-top: 24rpx;  
255 -}  
256 -  
257 -.vipRechargeBox .couponWrap .itemLeft {  
258 - width: 22%;  
259 -}  
260 -  
261 -.vipRechargeBox .couponWrap .itemLeft {  
262 - padding: 0 30rpx;  
263 -}  
264 -  
265 -.vipRechargeBox .couponWrap .orderingFood {  
266 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%); 207 + margin-top: 28rpx;
267 } 208 }
268 209
269 .rubric1 { 210 .rubric1 {
270 - margin-bottom: 20rpx; 211 + margin-bottom: 20rpx;
271 } 212 }
272 213
273 -.couponWrap .nodate { 214 +.couponWrap .nodate{
274 padding-left: 20rpx; 215 padding-left: 20rpx;
275 } 216 }
276 217
277 .preferentialItems { 218 .preferentialItems {
278 - min-height: 160rpx;  
279 - padding-bottom: 10rpx;  
280 - border-right: 20rpx;  
281 - display: flex;  
282 - justify-content: space-between;  
283 - align-items: center;  
284 - background: linear-gradient(180deg, #ffefd0 0%, #ffdc9b 100%);  
285 - background-size: 100% 100%;  
286 - margin: 0 20rpx 20rpx 20rpx; 219 + padding: 20rpx 30rpx 20rpx 20rpx;
  220 + display: flex;
  221 + justify-content: space-between;
  222 + align-items: center;
  223 + background: url('https://qn.colorcun.com/certificateBj.png') no-repeat;
  224 + background-size: 100% 100%;
  225 + margin: 0 20rpx 20rpx 20rpx;
287 } 226 }
288 227
289 .itemLeft { 228 .itemLeft {
290 - width: 75%; 229 + width: 75%;
291 } 230 }
292 231
293 .itemTop { 232 .itemTop {
294 - height: 100%;  
295 - display: flex;  
296 - align-items: center;  
297 - margin-bottom: 20rpx;  
298 - color: #F6231B;  
299 - border-right: 2rpx dashed #f6231b; 233 + display: flex;
  234 + width: 100%;
  235 + align-items: center;
  236 + margin-bottom: 20rpx;
300 } 237 }
301 238
302 .itemBottom { 239 .itemBottom {
303 - color: #515151;  
304 - font-family: PingFang SC;  
305 - font-weight: 500;  
306 - display: -webkit-box;  
307 - word-break: break-all;  
308 - word-wrap: break-word;  
309 - overflow: hidden;  
310 - text-align: left; 240 + color: #515151;
  241 + font-family: PingFang SC;
  242 + font-weight: 500;
  243 + display: -webkit-box;
  244 + word-break: break-all;
  245 + word-wrap: break-word;
  246 + overflow: hidden;
  247 + text-align: left;
311 } 248 }
312 249
313 .itemTop text:nth-of-type(1) { 250 .itemTop text:nth-of-type(1) {
314 - max-width: 65%;  
315 - font-weight: 600;  
316 - color: #515151; 251 + max-width: 65%;
  252 + font-weight: 600;
  253 + color: #515151;
317 } 254 }
318 255
319 .itemTop .discountText { 256 .itemTop .discountText {
320 - text-align: center;  
321 - color: #E34D59;  
322 - border: 2rpx solid #E34D59;  
323 - border-radius: 6rpx;  
324 - margin: 0 10rpx 0 20rpx;  
325 - font-family: PingFang SC;  
326 - padding: 0 10rpx; 257 + text-align: center;
  258 + color: #E34D59;
  259 + border: 2rpx solid #E34D59;
  260 + border-radius: 6rpx;
  261 + margin: 0 10rpx 0 20rpx;
  262 + font-family: PingFang SC;
  263 + padding: 0 10rpx;
327 } 264 }
328 265
329 .itemTop .priceText { 266 .itemTop .priceText {
330 - color: #E34D59;  
331 - font-weight: 500; 267 + color: #E34D59;
  268 + font-weight: 500;
332 } 269 }
333 270
334 .priceText { 271 .priceText {
335 - display: flex;  
336 - align-items: center;  
337 - justify-content: center; 272 + display: flex;
  273 + align-items: center;
  274 + justify-content: center;
338 } 275 }
339 276
340 .priceText .icons { 277 .priceText .icons {
341 - margin-left: 18rpx;  
342 - color: #E34D59;  
343 - font-size: 20rpx; 278 + margin-left: 18rpx;
  279 + color: #E34D59;
  280 + font-size: 20rpx;
344 } 281 }
345 282
346 .orderingFood { 283 .orderingFood {
347 - padding: 0 26rpx;  
348 - border-radius: 22rpx;  
349 - text-align: center;  
350 - color: #fff;  
351 - border-radius: 32rpx;  
352 - margin: 10rpx 0;  
353 - line-height: 44rpx;  
354 - height: 44rpx;  
355 - background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 284 + padding: 0 26rpx;
  285 + border-radius: 22rpx;
  286 + text-align: center;
  287 + color: #fff;
  288 + border-radius: 32rpx;
  289 + margin: 10rpx 0;
  290 + line-height: 44rpx;
  291 + height: 44rpx;
  292 + background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
356 width: max-content; 293 width: max-content;
357 flex-shrink: 0; 294 flex-shrink: 0;
358 } 295 }
359 296
360 .vips { 297 .vips {
361 - display: flex;  
362 - flex-direction: column;  
363 - justify-content: center;  
364 - align-items: center;  
365 - padding-bottom: 240rpx;  
366 - margin-top: 20rpx; 298 + display: flex;
  299 + flex-direction: column;
  300 + justify-content: center;
  301 + align-items: center;
  302 + padding-bottom: 240rpx;
  303 + margin-top: 20rpx;
367 } 304 }
368 305
369 .businessBox { 306 .businessBox {
370 - color: #515151;  
371 - font-size: 24rpx;  
372 - font-family: PingFang SC; 307 + color: #515151;
  308 + font-size: 24rpx;
  309 + font-family: PingFang SC;
373 } 310 }
374 311
375 .businessBox text { 312 .businessBox text {
376 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
377 - -webkit-background-clip: text;  
378 - -webkit-text-fill-color: transparent; 313 + color: #0143A3;
379 } 314 }
380 315
381 .favouredPolicy { 316 .favouredPolicy {
382 - width: 45%;  
383 - font-family: PingFang SC;  
384 - font-weight: 500;  
385 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
386 - -webkit-background-clip: text;  
387 - -webkit-text-fill-color: transparent;  
388 - border: 2rpx solid #fe6806;  
389 - border-radius: 22rpx;  
390 - text-align: center;  
391 - padding: 10rpx; 317 + width: 45%;
  318 + color: #5C95D7;
  319 + font-family: PingFang SC;
  320 + font-weight: 500;
  321 + border: 2rpx solid #5C95D7;
  322 + border-radius: 22rpx;
  323 + text-align: center;
  324 + padding: 10rpx;
392 } 325 }
393 326
394 -.videoBox { 327 +.videoBox{
395 display: flex; 328 display: flex;
396 flex-wrap: wrap; 329 flex-wrap: wrap;
397 align-items: center; 330 align-items: center;
@@ -399,40 +332,41 @@ page { @@ -399,40 +332,41 @@ page {
399 margin: 0 20rpx; 332 margin: 0 20rpx;
400 } 333 }
401 334
402 -.videoBox video { 335 +.videoBox video{
403 width: 100%; 336 width: 100%;
404 box-sizing: border-box; 337 box-sizing: border-box;
405 } 338 }
406 339
407 .couponWrap { 340 .couponWrap {
408 display: flex; 341 display: flex;
409 - background: linear-gradient(180deg, #ffefd0 0%, #ffdc9b 100%);  
410 - min-height: 160rpx;  
411 - padding-bottom: 10rpx; 342 + background: linear-gradient(180deg, #ffefd0 0%, #ffdc9b 100%);
  343 + min-height: 160rpx;
  344 + padding-bottom: 10rpx;
412 border-radius: 20rpx; 345 border-radius: 20rpx;
413 - margin-bottom: 16rpx; 346 + border: 2rpx solid #ff7e06;
  347 + margin: 0 20rpx 20rpx 20rpx;
414 } 348 }
415 349
416 .couponWrap .itemRight { 350 .couponWrap .itemRight {
417 width: 74%; 351 width: 74%;
418 display: flex; 352 display: flex;
419 align-items: center; 353 align-items: center;
420 - flex-direction: row; 354 + flex-direction:row;
421 padding-right: 10rpx; 355 padding-right: 10rpx;
422 margin-left: 18rpx; 356 margin-left: 18rpx;
423 } 357 }
424 358
425 .couponWrap .bottom { 359 .couponWrap .bottom {
426 - margin-top: 4rpx;  
427 - width: 100%;  
428 - color: #C36607;  
429 - font-family: PingFang SC;  
430 - font-weight: 500;  
431 - display: -webkit-box;  
432 - word-break: break-all;  
433 - word-wrap: break-word;  
434 - overflow: hidden;  
435 - text-align: left; 360 + margin-top: 4rpx;
  361 + width: 100%;
  362 + color: #C36607;
  363 + font-family: PingFang SC;
  364 + font-weight: 500;
  365 + display: -webkit-box;
  366 + word-break: break-all;
  367 + word-wrap: break-word;
  368 + overflow: hidden;
  369 + text-align: left;
436 } 370 }
437 371
438 .couponWrap .itemLeft { 372 .couponWrap .itemLeft {
@@ -445,7 +379,7 @@ page { @@ -445,7 +379,7 @@ page {
445 border-bottom-left-radius: 20rpx; 379 border-bottom-left-radius: 20rpx;
446 } 380 }
447 381
448 -.couponWrap .couponLine { 382 +.couponWrap .couponLine{
449 margin: 24rpx 0 4rpx 0; 383 margin: 24rpx 0 4rpx 0;
450 border-right: 2rpx dashed #f6231b; 384 border-right: 2rpx dashed #f6231b;
451 } 385 }
@@ -462,7 +396,6 @@ page { @@ -462,7 +396,6 @@ page {
462 flex-shrink: 0; 396 flex-shrink: 0;
463 background: linear-gradient(94.4deg, #f41919 2.72%, #ff7426 122.17%); 397 background: linear-gradient(94.4deg, #f41919 2.72%, #ff7426 122.17%);
464 } 398 }
465 -  
466 .couponWrap .icons { 399 .couponWrap .icons {
467 color: #F6231B !important; 400 color: #F6231B !important;
468 text-align: center; 401 text-align: center;
@@ -485,14 +418,13 @@ page { @@ -485,14 +418,13 @@ page {
485 418
486 .couponWrap .btns { 419 .couponWrap .btns {
487 flex: 1; 420 flex: 1;
488 - margin: 24rpx 20rpx 0 0;  
489 - display: flex;  
490 - justify-content: space-evenly;  
491 - align-items: baseline; 421 + margin: 24rpx 20rpx 0 0;
  422 + display: flex;
  423 + justify-content: space-evenly;
  424 + align-items: baseline;
492 flex-direction: column; 425 flex-direction: column;
493 height: 90%; 426 height: 90%;
494 } 427 }
495 -  
496 .couponWrap .btnBox { 428 .couponWrap .btnBox {
497 display: flex; 429 display: flex;
498 flex-direction: column; 430 flex-direction: column;
@@ -523,55 +455,55 @@ page { @@ -523,55 +455,55 @@ page {
523 455
524 .couponWrap .discountText { 456 .couponWrap .discountText {
525 background: #F6231B; 457 background: #F6231B;
526 - text-align: center;  
527 - color: #FFEFC5;  
528 - border-radius: 6rpx;  
529 - font-family: PingFang SC;  
530 - background: #FD4D59;  
531 - width: max-content;  
532 - padding: 6rpx;  
533 - position: absolute;  
534 - left: 16rpx;  
535 - top: 12rpx;  
536 -}  
537 -  
538 -.couponWrap .discountText1 {  
539 - text-align: center;  
540 - border-radius: 6rpx;  
541 - font-family: PingFang SC;  
542 - width: max-content;  
543 - padding: 2rpx 8rpx;  
544 - position: absolute;  
545 - left: 16rpx;  
546 - top: 12rpx;  
547 -}  
548 -  
549 -.discountText2 { 458 + text-align: center;
  459 + color: #FFEFC5;
  460 + border-radius: 6rpx;
  461 + font-family: PingFang SC;
  462 + background: #FD4D59;
  463 + width: max-content;
  464 + padding: 6rpx;
  465 + position: absolute;
  466 + left: 16rpx;
  467 + top: 12rpx;
  468 +}
  469 +
  470 +.couponWrap .discountText1{
  471 + text-align: center;
  472 + border-radius: 6rpx;
  473 + font-family: PingFang SC;
  474 + width: max-content;
  475 + padding: 2rpx 8rpx;
  476 + position: absolute;
  477 + left: 16rpx;
  478 + top: 12rpx;
  479 +}
  480 +
  481 +.discountText2{
550 background: #FD4D59; 482 background: #FD4D59;
551 color: #fff; 483 color: #fff;
552 } 484 }
553 485
554 -.discountText3 { 486 +.discountText3{
555 color: #FD4D59; 487 color: #FD4D59;
556 border: 2rpx solid #FD4D59; 488 border: 2rpx solid #FD4D59;
557 } 489 }
558 490
559 #couponModal .titleModal { 491 #couponModal .titleModal {
560 - margin-top: 60%; 492 + margin-top: 60%;
561 position: relative; 493 position: relative;
562 width: 100%; 494 width: 100%;
563 } 495 }
564 496
565 #couponModal .titleModal2 { 497 #couponModal .titleModal2 {
566 - margin: 80% auto 0 auto; 498 + margin: 80% auto 0 auto;
567 } 499 }
568 500
569 #couponModal .titleModal3 { 501 #couponModal .titleModal3 {
570 - margin-top: 60%; 502 + margin-top: 60%;
571 } 503 }
572 504
573 #couponModal .titleModal4 { 505 #couponModal .titleModal4 {
574 - margin-top: 30%; 506 + margin-top: 30%;
575 } 507 }
576 508
577 #couponModal .mymodal { 509 #couponModal .mymodal {
@@ -583,7 +515,7 @@ page { @@ -583,7 +515,7 @@ page {
583 } 515 }
584 516
585 .nameInfo { 517 .nameInfo {
586 - font-family: PingFang SC; 518 + font-family: PingFang SC;
587 font-weight: 400; 519 font-weight: 400;
588 font-size: 52rpx; 520 font-size: 52rpx;
589 line-height: 56rpx; 521 line-height: 56rpx;
@@ -595,7 +527,7 @@ page { @@ -595,7 +527,7 @@ page {
595 527
596 .couponTotal { 528 .couponTotal {
597 color: #dfdfdf; 529 color: #dfdfdf;
598 - font-family: PingFang SC; 530 + font-family: PingFang SC;
599 font-weight: 400; 531 font-weight: 400;
600 font-size: 40rpx; 532 font-size: 40rpx;
601 line-height: 48rpx; 533 line-height: 48rpx;
@@ -656,7 +588,7 @@ page { @@ -656,7 +588,7 @@ page {
656 font-weight: 500; 588 font-weight: 500;
657 } 589 }
658 590
659 -.couponLines { 591 +.couponLines{
660 width: 80%; 592 width: 80%;
661 margin: 0 auto; 593 margin: 0 auto;
662 height: 2rpx; 594 height: 2rpx;
@@ -681,12 +613,12 @@ page { @@ -681,12 +613,12 @@ page {
681 width: 80%; 613 width: 80%;
682 margin: 0 auto; 614 margin: 0 auto;
683 border-radius: 42rpx; 615 border-radius: 42rpx;
684 - background: linear-gradient(90.98deg, #f41919 0.25%, #ff7426 120.07%); 616 + background: linear-gradient(90.98deg, #f41919 0.25%, #ff7426 120.07%);
685 font-weight: 400; 617 font-weight: 400;
686 color: #fff; 618 color: #fff;
687 text-align: center; 619 text-align: center;
688 border: 4rpx solid #fff; 620 border: 4rpx solid #fff;
689 - padding: 12rpx 0; 621 + padding: 12rpx 0;
690 margin: 16rpx auto 20rpx auto; 622 margin: 16rpx auto 20rpx auto;
691 } 623 }
692 624
@@ -702,41 +634,4 @@ page { @@ -702,41 +634,4 @@ page {
702 position: absolute; 634 position: absolute;
703 right: 5%; 635 right: 5%;
704 top: -10%; 636 top: -10%;
705 -}  
706 -  
707 -.park {  
708 - background: #FFEEDF;  
709 - color: #B56737;  
710 - padding: 8rpx 12rpx 0 12rpx;  
711 - border-radius: 4rpx;  
712 - height: 30rpx;  
713 - line-height: 30rpx;  
714 - flex-shrink: 0;  
715 -}  
716 -  
717 -.distanceMar {  
718 - margin: 10rpx 0;  
719 -}  
720 -  
721 -.news {  
722 - color: #696969;  
723 - font-family: PingFang SC;  
724 - font-weight: 400;  
725 -}  
726 -  
727 -.bottom_btns {  
728 - display: flex;  
729 - padding: 12rpx 0;  
730 - border-bottom: 2rpx solid #F7F7F7;  
731 - color: #696969;  
732 -}  
733 -  
734 -.book {  
735 - margin-right: 8rpx;  
736 - padding: 4rpx 12rpx;  
737 - background: #FFF7F5;  
738 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
739 - -webkit-background-clip: text;  
740 - -webkit-text-fill-color: transparent;  
741 - border-radius: 4rpx;  
742 } 637 }
@@ -19,9 +19,6 @@ Page({ @@ -19,9 +19,6 @@ Page({
19 detail:null, 19 detail:null,
20 user:_u, 20 user:_u,
21 loading:0, 21 loading:0,
22 - array:['先生','女士','公司'],  
23 - activeSex:0,  
24 - activeId:'',//选中预订人的id  
25 }, 22 },
26 hasSubmit:true, 23 hasSubmit:true,
27 /** 24 /**
@@ -40,10 +37,8 @@ Page({ @@ -40,10 +37,8 @@ Page({
40 if(v.is_default==1){ 37 if(v.is_default==1){
41 this.user = v 38 this.user = v
42 v.remark=wx.getStorageSync('remark') ? wx.getStorageSync('remark') : ''; 39 v.remark=wx.getStorageSync('remark') ? wx.getStorageSync('remark') : '';
43 - this.setData({ 40 + this.setData({
44 user: v, 41 user: v,
45 - activeSex:this.user.sex*1-1,  
46 - activeId:v.id,  
47 }) 42 })
48 return; 43 return;
49 } 44 }
@@ -112,22 +107,21 @@ Page({ @@ -112,22 +107,21 @@ Page({
112 }, 107 },
113 selectconcat(){ 108 selectconcat(){
114 wx.navigateTo({ 109 wx.navigateTo({
115 - url:'/pages/me/concat?action=select&activeId='+this.data.activeId 110 + url:'/pages/me/concat?action=select'
116 }) 111 })
117 }, 112 },
118 changeInput(e) { 113 changeInput(e) {
119 let key = util.attr(e, 'key'); 114 let key = util.attr(e, 'key');
120 let val = '' 115 let val = ''
121 if (key == 'sex') { 116 if (key == 'sex') {
122 - val = e.detail.value*1+1; 117 + val = util.attr(e, 'val');
123 } else { 118 } else {
124 - val = util.val(e); 119 + val = util.val(e);
125 } 120 }
126 this.user[key] = val; 121 this.user[key] = val;
127 if (key == 'sex') { 122 if (key == 'sex') {
128 this.setData({ 123 this.setData({
129 - user: this.user,  
130 - activeSex:e.detail.value, 124 + user: this.user
131 }) 125 })
132 } 126 }
133 }, 127 },
1 <!--pages/reserve/submit.wxml--> 1 <!--pages/reserve/submit.wxml-->
2 <page loading="{{loading}}"> 2 <page loading="{{loading}}">
3 <nav hasBack>预订详情</nav> 3 <nav hasBack>预订详情</nav>
4 - <view> 4 + <view bindtap="editorReserve">
5 <card seller="{{seller}}" detail="{{detail}}"></card> 5 <card seller="{{seller}}" detail="{{detail}}"></card>
6 </view> 6 </view>
7 7
8 <view class="view margin bg-white padding-lr text-df text-666666 userinfo"> 8 <view class="view margin bg-white padding-lr text-df text-666666 userinfo">
9 <view class="view flex align-center justify-between solid-bottom" style="height: 100rpx;"> 9 <view class="view flex align-center justify-between solid-bottom" style="height: 100rpx;">
10 - <view class="font28r">填写信息</view>  
11 - <view class="textColor" catchtap="selectconcat">  
12 - <image src="https://qn.colorcun.com/liaisonIcon.png" mode=""/>  
13 - 选择预订人</view> 10 + <view>填写信息</view>
  11 + <view class="text-blue" catchtap="selectconcat">选择预订人</view>
14 </view> 12 </view>
15 - <view class="view flex align-center justify-between solid-bottom" style="height: 100rpx;">  
16 - <view class="title font28r">预订人</view>  
17 - <view class="view flex-treble flex align-center margin-left-lg" style="height: 100rpx;"> 13 + <view class="view flex align-center justify-between " style="height: 100rpx;">
  14 + <image src="http://nosqn.colorcun.com/detail/x%20%2816%29.png" style="width: 40rpx;height: 40rpx;"></image>
  15 + <view class="view flex-treble flex align-center margin-left-sm solid-bottom" style="height: 100rpx;">
18 <input class="name flex-treble" placeholder="请填写预订人姓名" 16 <input class="name flex-treble" placeholder="请填写预订人姓名"
19 bindinput="changeInput" 17 bindinput="changeInput"
20 data-key="name" 18 data-key="name"
@@ -22,13 +20,7 @@ @@ -22,13 +20,7 @@
22 bindkeyboardheightchange="keyboardheightchange" 20 bindkeyboardheightchange="keyboardheightchange"
23 adjust-position="{{false}}" 21 adjust-position="{{false}}"
24 placeholder-class="input-pl" maxlength="10"/> 22 placeholder-class="input-pl" maxlength="10"/>
25 - <picker bindchange="changeInput" data-key="sex" value="{{activeSex}}" range="{{array}}">  
26 - <view class="pickerBox font28r">  
27 - {{array[activeSex]}}  
28 - <image src="https://qn.colorcun.com/arrowBottom.png" mode=""/>  
29 - </view>  
30 - </picker>  
31 - <!-- <view class="flex text-30 sex"> 23 + <view class="flex text-30 sex">
32 <view bindtap="changeInput" 24 <view bindtap="changeInput"
33 data-key="sex" 25 data-key="sex"
34 data-val="1" 26 data-val="1"
@@ -41,12 +33,12 @@ @@ -41,12 +33,12 @@
41 data-key="sex" 33 data-key="sex"
42 data-val="3" 34 data-val="3"
43 class="text-bold margin-left-sm {{user.sex==3?'checked':''}}">公司</view> 35 class="text-bold margin-left-sm {{user.sex==3?'checked':''}}">公司</view>
44 - </view> --> 36 + </view>
45 </view> 37 </view>
46 </view> 38 </view>
47 - <view class="view flex align-center justify-between solid-bottom" style="height: 100rpx;">  
48 - <view class="title font28r">电话</view>  
49 - <view class="view flex-treble flex align-center margin-left-lg" style="height: 100rpx;"> 39 + <view class="view flex align-center justify-between " style="height: 100rpx;">
  40 + <image src="http://nosqn.colorcun.com/detail/x%20%2817%29.png" style="width: 40rpx;height: 40rpx;"></image>
  41 + <view class="view flex-treble flex align-center margin-left-sm solid-bottom" style="height: 100rpx;">
50 <input class="phone flex-treble" placeholder="请填写联系方式" 42 <input class="phone flex-treble" placeholder="请填写联系方式"
51 bindinput="changeInput" 43 bindinput="changeInput"
52 data-key="phone" 44 data-key="phone"
@@ -63,21 +55,18 @@ @@ -63,21 +55,18 @@
63 </view> 55 </view>
64 </view> 56 </view>
65 </view> 57 </view>
66 - <view class="view flex align-start justify-between" style="height: 100rpx;">  
67 - <view class="title font28r">备注</view>  
68 - <view bindtap="toremark" class="view flex-treble flex align-center margin-left-lg {{user.remark?'text-black':''}}" style="height: 100rpx;"> 58 + <view class="view flex align-start justify-between padding-tb">
  59 + <image src="http://nosqn.colorcun.com/detail/x%20%2818%29.png" style="width: 40rpx;height: 40rpx;"></image>
  60 + <view bindtap="toremark" class="view flex-treble flex align-center margin-left-sm {{user.remark?'text-black':''}}">
69 {{user.remark && user.remark!='' ? user.remark : '您的备注，我们会尽量安排'}} 61 {{user.remark && user.remark!='' ? user.remark : '您的备注，我们会尽量安排'}}
70 </view> 62 </view>
71 </view> 63 </view>
72 </view> 64 </view>
73 - <view class="btns share-but">  
74 - <view class="checkBtn text-bold font28r" bindtap="editorReserve">重新选择</view>  
75 - <view class="view round margin-lr-lg flex align-center justify-center">  
76 - <subscribe ids="{{[0,1]}}" bindevent="saved">  
77 - <view class="txt-36-h text-bold font28r">提交预订</view>  
78 - </subscribe>  
79 - </view>  
80 - </view> 65 + <subscribe ids="{{[0,1]}}" bindevent="saved">
  66 + <view class="view share-but bg-blue-blue round margin-lr-lg flex align-center justify-center">
  67 + <view class="txt-36-h text-bold">提交预订</view>
  68 + </view>
  69 + </subscribe>
81 </page> 70 </page>
82 <menu></menu> 71 <menu></menu>
83 <service></service> 72 <service></service>
@@ -10,9 +10,7 @@ page{ @@ -10,9 +10,7 @@ page{
10 } 10 }
11 .sex .checked{ 11 .sex .checked{
12 position: relative; 12 position: relative;
13 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
14 - -webkit-background-clip: text;  
15 - -webkit-text-fill-color: transparent; 13 + color:var(--blue);
16 } 14 }
17 .sex .checked:after{ 15 .sex .checked:after{
18 width: 24rpx; 16 width: 24rpx;
@@ -30,94 +28,6 @@ page{ @@ -30,94 +28,6 @@ page{
30 height: 84rpx; 28 height: 84rpx;
31 width: calc(100% - 80rpx); 29 width: calc(100% - 80rpx);
32 } 30 }
33 -  
34 -.textColor {  
35 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
36 - -webkit-background-clip: text;  
37 - -webkit-text-fill-color: transparent;  
38 - display: flex;  
39 - align-items: center;  
40 - justify-content: center;  
41 - font-size: 28rpx;  
42 -}  
43 -  
44 -.textColor image {  
45 - width: 40rpx;  
46 - height: 40rpx;  
47 - margin-right: 8rpx;  
48 -}  
49 -  
50 -.btns {  
51 - display: flex;  
52 - align-items: center;  
53 - justify-content: space-between;  
54 - background: #fff;  
55 - padding: 34rpx 40rpx 20rpx 40rpx;  
56 -}  
57 -  
58 -.checkBtn {  
59 - width: 43%;  
60 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
61 - -webkit-background-clip: text;  
62 - -webkit-text-fill-color: transparent;  
63 - border: 2rpx solid #fe6806;  
64 - height: 70rpx;  
65 - line-height: 70rpx;  
66 - border-radius: 198rpx;  
67 - display: flex;  
68 - align-items: center;  
69 - justify-content: center;  
70 - font-weight: 600;  
71 -}  
72 -  
73 -.round {  
74 - background: linear-gradient(90deg, #ff4d11 0%, #fe7600 100%);  
75 - color: #fff;  
76 - width: 43%;  
77 - height: 72rpx;  
78 - line-height: 72rpx;  
79 - border-radius: 198rpx;  
80 - display: flex;  
81 - align-items: center;  
82 - justify-content: center;  
83 - margin: 0;  
84 -}  
85 -  
86 -.round view {  
87 - width: 100%;  
88 - height: 70rpx;  
89 - line-height: 70rpx;  
90 - border-radius: 198rpx;  
91 - display: flex;  
92 - align-items: center;  
93 - justify-content: center;  
94 - margin: 0;  
95 -}  
96 -  
97 -.title {  
98 - width: 112rpx;  
99 - text-align: justify;  
100 - height: 100rpx;  
101 - line-height: 100rpx;  
102 -}  
103 -  
104 -.title:after {  
105 - content: '';  
106 - display: inline-block;  
107 - width: 100%;  
108 -}  
109 -  
110 -.pickerBox {  
111 - display: flex;  
112 - align-items: center;  
113 - font-family: PingFang SC;  
114 - font-weight: 400;  
115 -}  
116 -  
117 -.pickerBox image {  
118 - width: 24rpx;  
119 - height: 24rpx;  
120 -}  
121 /* 31 /*
122 .pages{ 32 .pages{
123 padding: 30rpx; 33 padding: 30rpx;