xt / xcx-book · Commits

Go to a project

Commit 87b5cebba4415117fb1827ea9e614ff477ef9cfd

Authored by yiren
1 parent 14df66da
build: skipped

提前点餐 分享页面新增功能

Inline Side-by-side
Showing 5 changed files with 196 additions and 69 deletions
@@ -4,19 +4,17 @@ @@ -4,19 +4,17 @@
4 <scroll-view style="background: rgba({{themeColor}});" class="content" scroll-into-view="{{toView}}" scroll-y="true" scroll-with-animation="true"> 4 <scroll-view style="background: rgba({{themeColor}});" class="content" scroll-into-view="{{toView}}" scroll-y="true" scroll-with-animation="true">
5 <block wx:for="{{cookbooklist}}" wx:key="cookbooklist-key" wx:for-index="indexs"> 5 <block wx:for="{{cookbooklist}}" wx:key="cookbooklist-key" wx:for-index="indexs">
6 <view class="dishWrap" id="{{ 'inToView'+item.id}}"> 6 <view class="dishWrap" id="{{ 'inToView'+item.id}}">
7 - <block>  
8 - <view class="heand flex-vc flex-cc">  
9 - <view class="style_round flex-vc flex-cc">  
10 - <view class="round"></view>  
11 - <view class="line"></view>  
12 - </view>  
13 - <view class="title" style="color:rgba({{navColor}})">{{item.class_name}}</view>  
14 - <view class="style_round flex-vc flex-cc">  
15 - <view class="line"></view>  
16 - <view class="round"></view>  
17 - </view> 7 + <view class="heand flex-vc flex-cc">
  8 + <view class="style_round flex-vc flex-cc">
  9 + <view class="round"></view>
  10 + <view class="line"></view>
18 </view> 11 </view>
19 - </block> 12 + <view class="title" style="color:rgba({{navColor}})">{{item.class_name}}</view>
  13 + <view class="style_round flex-vc flex-cc">
  14 + <view class="line"></view>
  15 + <view class="round"></view>
  16 + </view>
  17 + </view>
20 <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index"> 18 <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index">
21 <!-- name_type 1左侧,2右侧,3顶部分开 image_type 1大图,2小图 --> 19 <!-- name_type 1左侧,2右侧,3顶部分开 image_type 1大图,2小图 -->
22 <view wx:if="{{item.image_type=='1'}}" class="oneBox" data-idx="{{item.image_type}}" data-nameType="{{item.name_type}}"> 20 <view wx:if="{{item.image_type=='1'}}" class="oneBox" data-idx="{{item.image_type}}" data-nameType="{{item.name_type}}">
@@ -13,12 +13,6 @@ page { @@ -13,12 +13,6 @@ page {
13 padding: 0 0 30rpx 0; 13 padding: 0 0 30rpx 0;
14 } 14 }
15 15
16 -.wrapIine {  
17 - height: 4rpx;  
18 - width: 100%;  
19 - background-color: #dbdbdb;  
20 -}  
21 -  
22 .heand { 16 .heand {
23 width: 100%; 17 width: 100%;
24 border-top: 4rpx solid #dbdbdb; 18 border-top: 4rpx solid #dbdbdb;
@@ -16,6 +16,33 @@ Page({ @@ -16,6 +16,33 @@ Page({
16 seller: {}, 16 seller: {},
17 options: {}, 17 options: {},
18 rechargeList:[], 18 rechargeList:[],
  19 + textsInfoColor:'',
  20 + themeColor:'',
  21 + textColor:'',
  22 + navColor:'',
  23 + height:wx.getSystemInfoSync().windowWidth*1,
  24 + },
  25 + imageLoad(e) {
  26 + const index = e.currentTarget.dataset['index'];
  27 + const indexs = e.currentTarget.dataset['indexs'];
  28 + const idx = e.currentTarget.dataset['idx'];
  29 + //获取图片的原始宽度和高度
  30 + let originalWidth = e.detail.width;
  31 + let originalHeight = e.detail.height;
  32 + let imageSize = util.imageZoomHeightUtil(originalWidth,originalHeight);
  33 + let imageHeight = `cookbooklist[${indexs}].cookbooklist[0][${index}].norms[${idx}].imageHeight`;
  34 + let height=(imageSize && imageSize.imageHeight)?imageSize.imageHeight.toFixed(0):'';
  35 + this.setData({
  36 + [imageHeight]:height,
  37 + })
  38 + },
  39 + preview(event){
  40 + const item = event.currentTarget.dataset['item'];
  41 + let currentUrl = item.image
  42 + wx.previewImage({
  43 + current: currentUrl, // 当前显示图片的http链接
  44 + urls: [currentUrl] // 需要预览的图片http链接列表
  45 + })
19 }, 46 },
20 /** 47 /**
21 * 生命周期函数--监听页面加载 48 * 生命周期函数--监听页面加载
@@ -152,6 +179,7 @@ Page({ @@ -152,6 +179,7 @@ Page({
152 image_type: '1', 179 image_type: '1',
153 name_type: '' 180 name_type: ''
154 }; //判断是不是json，是json在转换为对象 181 }; //判断是不是json，是json在转换为对象
  182 + cook.imageHeight=''
155 cook.cook_style = cook_style; 183 cook.cook_style = cook_style;
156 cook.image_type = cook_style && cook_style.image_type ? cook_style.image_type : '1'; //1大图,2小图 默认大图 184 cook.image_type = cook_style && cook_style.image_type ? cook_style.image_type : '1'; //1大图,2小图 默认大图
157 cook.name_type = cook_style && cook_style.name_type ? cook_style.name_type : '3'; //1左侧,2右侧,3顶部分开 默认分开 185 cook.name_type = cook_style && cook_style.name_type ? cook_style.name_type : '3'; //1左侧,2右侧,3顶部分开 默认分开
@@ -237,6 +265,8 @@ Page({ @@ -237,6 +265,8 @@ Page({
237 n.cookName = j.name; 265 n.cookName = j.name;
238 n.check1 = j.check1; 266 n.check1 = j.check1;
239 n.unit = j.unit; 267 n.unit = j.unit;
  268 + n.image = j.image;
  269 + n.specArr = j.specArr;
240 let list = j.specArr.filter(i => { 270 let list = j.specArr.filter(i => {
241 return i.id == n.specid 271 return i.id == n.specid
242 }) 272 })
@@ -275,9 +305,7 @@ Page({ @@ -275,9 +305,7 @@ Page({
275 this.setData({ 305 this.setData({
276 cookbooklist 306 cookbooklist
277 }) 307 })
278 - setTimeout(() => {  
279 - this.getNewRechargeListfFun();  
280 - }, 0); 308 + this.getNewRechargeListfFun();
281 }) 309 })
282 this.GetDzSellerConfFun() 310 this.GetDzSellerConfFun()
283 }, 311 },
@@ -286,25 +314,31 @@ Page({ @@ -286,25 +314,31 @@ Page({
286 App.Seller.GetDzSellerConf({ 314 App.Seller.GetDzSellerConf({
287 sid: this.data.options.sid 315 sid: this.data.options.sid
288 }).then(res => { 316 }).then(res => {
289 - let themeColor, textColor, navColor; 317 + let themeColor, textColor, navColor,textsInfoColor;
290 if (res.data.cook_style) { 318 if (res.data.cook_style) {
291 let style = util.determine(res.data.cook_style) 319 let style = util.determine(res.data.cook_style)
292 if (style && style.red && style.green && style.blue && style.alpha) { 320 if (style && style.red && style.green && style.blue && style.alpha) {
293 themeColor = style.red + ',' + style.green + ',' + style.blue + ',' + Math.floor(style.alpha) 321 themeColor = style.red + ',' + style.green + ',' + style.blue + ',' + Math.floor(style.alpha)
294 } else { 322 } else {
295 themeColor = '77,78,80,1'; //未设置 为灰色 323 themeColor = '77,78,80,1'; //未设置 为灰色
  324 + navColor = "255,255,255,1"
  325 + textColor = '251,246,241,1'
  326 + textsInfoColor='153, 153, 153,1'
296 } 327 }
297 if (themeColor == '251,246,241,1') { 328 if (themeColor == '251,246,241,1') {
298 textColor = '0,0,0,1' 329 textColor = '0,0,0,1'
299 navColor='0,0,0,1' 330 navColor='0,0,0,1'
  331 + textsInfoColor='0,0,0,1'
300 } else { 332 } else {
301 navColor = "255,255,255,1" 333 navColor = "255,255,255,1"
302 textColor = '251,246,241,1' 334 textColor = '251,246,241,1'
  335 + textsInfoColor='153, 153, 153,1'
303 } 336 }
304 this.setData({ 337 this.setData({
305 themeColor, 338 themeColor,
306 textColor, 339 textColor,
307 - navColor 340 + navColor,
  341 + textsInfoColor
308 }) 342 })
309 } 343 }
310 }).catch(res => { 344 }).catch(res => {
@@ -401,10 +435,8 @@ Page({ @@ -401,10 +435,8 @@ Page({
401 let item=this.findClosest(list,this.data.probablyPrice) 435 let item=this.findClosest(list,this.data.probablyPrice)
402 let rechargeList=[]; 436 let rechargeList=[];
403 item?rechargeList.push(item):''; 437 item?rechargeList.push(item):'';
404 - wx.nextTick(()=>{  
405 - this.setData({  
406 - rechargeList,  
407 - }) 438 + this.setData({
  439 + rechargeList,
408 }) 440 })
409 }).catch(res => { 441 }).catch(res => {
410 console.log('GetSellerTemplateConf请求失败'); 442 console.log('GetSellerTemplateConf请求失败');
1 <!--pack-cookbook/pages/success_new.wxml--> 1 <!--pack-cookbook/pages/success_new.wxml-->
2 -<view style="background: rgba({{themeColor}});height: 100%;"> 2 +<view style="background: rgba({{themeColor}});">
3 <nav back="none" bindNavEvent="navEvent" backgroundColor="rgba({{themeColor}})" color="rgba({{navColor}})">{{options.sellerName}}</nav> 3 <nav back="none" bindNavEvent="navEvent" backgroundColor="rgba({{themeColor}})" color="rgba({{navColor}})">{{options.sellerName}}</nav>
4 <scroll-view class="main" style="background: rgba({{themeColor}});"> 4 <scroll-view class="main" style="background: rgba({{themeColor}});">
5 <view class="box"> 5 <view class="box">
@@ -21,23 +21,44 @@ @@ -21,23 +21,44 @@
21 </view> 21 </view>
22 <image class="imgs" src="https://qn.colorcun.com/001.png" mode="" /> 22 <image class="imgs" src="https://qn.colorcun.com/001.png" mode="" />
23 </view> 23 </view>
24 - <view class="line"></view>  
25 <view class="checkMenu"> 24 <view class="checkMenu">
26 <block wx:for="{{cookbooklist}}" wx:key="{{item.id}}" wx:for-index="indexs"> 25 <block wx:for="{{cookbooklist}}" wx:key="{{item.id}}" wx:for-index="indexs">
27 - <view wx:if="{{item.is_show}}" class="title flex-lr">  
28 - <view class="leftTitle">{{item.class_name}}</view>  
29 - <view class="rightTitle">{{item.normsLen}}道</view> 26 + <view class="heand flex-cc" wx:if="{{item.is_show}}">
  27 + <view class="style_round flex-cc">
  28 + <view class="round"></view>
  29 + <view class="line"></view>
  30 + </view>
  31 + <view class="title" style="color:rgba({{textColor}})">{{item.class_name}} <view>{{item.normsLen}}道</view></view>
  32 + <view class="style_round flex-cc">
  33 + <view class="line"></view>
  34 + <view class="round"></view>
  35 + </view>
30 </view> 36 </view>
31 - <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index"> 37 + <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index" wx:key="{{item.id}}" >
32 <block wx:if="{{item.norms.length>0}}"> 38 <block wx:if="{{item.norms.length>0}}">
33 - <view wx:for="{{item.norms}}" wx:for-index="idx" class="content flex-lr">  
34 - <view class="single">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view>  
35 - <view class="price">{{item.price}}元{{item.specs?'/'+item.specs:item.unit?'/'+item.unit:''}}</view>  
36 - {{item.count}} 39 + <view wx:for="{{item.norms}}" wx:for-index="idx" wx:key="{{item.id}}" class="normsBox">
  40 + <view class="content">
  41 + <view class="single" style="color: rgba({{textColor}});">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view>
  42 + <view class="onwBoxWrap">
  43 + <view class="oneBox" style="color: rgba({{textColor}});" wx:for="{{item.specArr}}" wx:key="{{item.id}}">
  44 + <view wx:if="{{item.str}}">{{item.str}}</view>
  45 + <view wx:if="{{item.member_str}}">{{item.member_str}}</view>
  46 + </view>
  47 + </view>
  48 + </view>
  49 + <view class="dishTexts" style="color:rgba({{textColor}})">
  50 + <text wx:if="{{item.taste}}" class="texts">味型：{{item.taste}}</text>
  51 + <text wx:if="{{item.cooks}}">烹调：{{item.cooks}}</text>
  52 + </view>
  53 + <view class="imgOneBox">
  54 + <image wx:if="{{item.image}}" catch:tap="preview" style="height: {{item.imageHeight>height?height+'px':item.imageHeight+'px'}};width: {{item.imageHeight>height?'':item.imageHeight==height?'100%':'100%'}}" mode="{{(item.imageHeight>height || item.imageHeight==height)?'aspectFit':''}}" src="{{item.image}}" bindload="imageLoad" data-item="{{item}}" data-index="{{index}}" data-indexs="{{indexs}}" data-idx="{{idx}}" />
  55 + </view>
37 </view> 56 </view>
38 </block> 57 </block>
39 </block> 58 </block>
40 </block> 59 </block>
  60 + </view>
  61 + <view style="background-color: #fff;margin:0 20rpx;padding-top: 20rpx;">
41 <view class="probably flex-ll"> 62 <view class="probably flex-ll">
42 <view class="tariff font24r">菜单价：<text class="font32r">{{probablyPrice}}</text>元</view> 63 <view class="tariff font24r">菜单价：<text class="font32r">{{probablyPrice}}</text>元</view>
43 <view class="tariff font24r">会员价：<text class="font32r">{{vipProbablyPrice}}</text>元</view> 64 <view class="tariff font24r">会员价：<text class="font32r">{{vipProbablyPrice}}</text>元</view>
@@ -46,7 +67,7 @@ @@ -46,7 +67,7 @@
46 <view class="poop font24r">根据您选择的菜品，我们推荐您参加以下活动，本次消费可用，预计可以节约大笔开销！</view> 67 <view class="poop font24r">根据您选择的菜品，我们推荐您参加以下活动，本次消费可用，预计可以节约大笔开销！</view>
47 <view class="preferential" wx:if="{{rechargeList.length>0}}"> 68 <view class="preferential" wx:if="{{rechargeList.length>0}}">
48 <!-- 当前日期要大于限制结束日期 --> 69 <!-- 当前日期要大于限制结束日期 -->
49 - <view class="preferentialItems" wx:for="{{rechargeList}}" data-id="{{item.id}}"> 70 + <view class="preferentialItems" wx:for="{{rechargeList}}" wx:key="{{item.id}}">
50 <view class="left"> 71 <view class="left">
51 <view class="top"> 72 <view class="top">
52 <text>{{item.rname}}</text> 73 <text>{{item.rname}}</text>
@@ -74,6 +95,9 @@ @@ -74,6 +95,9 @@
74 </view> 95 </view>
75 </view> 96 </view>
76 </view> 97 </view>
  98 + <view class="textsInfo font28r" style="color: rgba({{textsInfoColor}});">
  99 + 周到安排提供技术支持 400-000-9690
  100 + </view>
77 </scroll-view> 101 </scroll-view>
78 <view class="btns flex-cc" wx:if="{{options.hasSuccess==1}}"> 102 <view class="btns flex-cc" wx:if="{{options.hasSuccess==1}}">
79 <button class="font32r continue flex-cc" style="background: rgba({{themeColor}});color: rgba({{textColor}});" bindtap="continueOrdering">菜品更换</button> 103 <button class="font32r continue flex-cc" style="background: rgba({{themeColor}});color: rgba({{textColor}});" bindtap="continueOrdering">菜品更换</button>
1 /* pack-cookbook/pages/success_new.wxss */ 1 /* pack-cookbook/pages/success_new.wxss */
2 .main { 2 .main {
3 - padding: 0 20rpx 148rpx 20rpx;  
4 font-family: PingFang SC; 3 font-family: PingFang SC;
5 width: 100%; 4 width: 100%;
6 box-sizing: border-box; 5 box-sizing: border-box;
  6 + padding-bottom: 136rpx;
7 } 7 }
8 8
9 .info { 9 .info {
@@ -30,39 +30,21 @@ @@ -30,39 +30,21 @@
30 font-size: 28rpx; 30 font-size: 28rpx;
31 } 31 }
32 32
33 -.line {  
34 - margin-bottom: 8rpx;  
35 - height: 2rpx;  
36 - background: #999999;  
37 -}  
38 -  
39 .checkMenu { 33 .checkMenu {
40 - padding-bottom: 34rpx;  
41 border-radius: 10rpx; 34 border-radius: 10rpx;
42 - background: #ffffff; 35 + border-bottom: 4rpx solid #dbdbdb;
  36 + margin: 0 20rpx 0 20rpx;
  37 + font-family: PingFang SC;
43 } 38 }
44 39
45 .title { 40 .title {
46 padding: 36rpx 0 4rpx 0; 41 padding: 36rpx 0 4rpx 0;
47 margin: 0 40rpx; 42 margin: 0 40rpx;
48 - border-bottom: 2rpx solid #DBDBDB;  
49 } 43 }
50 44
51 -.leftTitle {  
52 - color: #515151;  
53 - font-family: PingFang SC;  
54 - font-weight: 600;  
55 - font-size: 32rpx;  
56 -}  
57 -  
58 -.rightTitle {  
59 - color: #515151;  
60 - font-family: PingFang SC;  
61 - font-size: 28rpx;  
62 -}  
63 -  
64 -.content {  
65 - padding: 20rpx 40rpx; 45 +.title view{
  46 + display: inline-block;
  47 + margin-left: 20px;
66 } 48 }
67 49
68 .count text { 50 .count text {
@@ -82,8 +64,10 @@ @@ -82,8 +64,10 @@
82 64
83 .probably { 65 .probably {
84 color: #000; 66 color: #000;
  67 + background: #fff;
85 font-family: PingFang SC; 68 font-family: PingFang SC;
86 padding: 30rpx 40rpx 52rpx 40rpx; 69 padding: 30rpx 40rpx 52rpx 40rpx;
  70 + margin: 0 20rpx;
87 } 71 }
88 72
89 .tariff { 73 .tariff {
@@ -107,9 +91,11 @@ @@ -107,9 +91,11 @@
107 } 91 }
108 92
109 .information { 93 .information {
  94 + background: #fff;
110 color: #515151; 95 color: #515151;
111 font-weight: 500; 96 font-weight: 500;
112 - margin: 0 40rpx; 97 + padding: 0 40rpx;
  98 + margin: 0 20rpx;
113 } 99 }
114 100
115 .continue { 101 .continue {
@@ -119,11 +105,17 @@ @@ -119,11 +105,17 @@
119 105
120 .box { 106 .box {
121 position: relative; 107 position: relative;
  108 + padding: 0 20rpx 0 20rpx;
  109 + font-family: PingFang SC;
  110 + width: 100%;
  111 + box-sizing: border-box;
122 } 112 }
123 113
124 .poop { 114 .poop {
125 - margin: 20rpx 40rpx; 115 + background: #fff;
  116 + padding: 20rpx 40rpx;
126 text-indent: 50rpx; 117 text-indent: 50rpx;
  118 + margin: 0 20rpx;
127 } 119 }
128 120
129 .imgs { 121 .imgs {
@@ -151,7 +143,9 @@ @@ -151,7 +143,9 @@
151 } 143 }
152 144
153 .preferential { 145 .preferential {
154 - margin: 16rpx 40rpx; 146 + padding: 40rpx;
  147 + background-color: #fff;
  148 + margin: 0 20rpx;
155 } 149 }
156 150
157 .preferentialItems { 151 .preferentialItems {
@@ -177,7 +171,6 @@ @@ -177,7 +171,6 @@
177 171
178 .bottom { 172 .bottom {
179 margin-top: 20rpx; 173 margin-top: 20rpx;
180 - color: #515151;  
181 font-family: PingFang SC; 174 font-family: PingFang SC;
182 font-weight: 500; 175 font-weight: 500;
183 font-size: 20rpx; 176 font-size: 20rpx;
@@ -211,18 +204,104 @@ @@ -211,18 +204,104 @@
211 } 204 }
212 205
213 .favouredPolicy{ 206 .favouredPolicy{
  207 + background: #fff;
214 display: flex; 208 display: flex;
215 justify-content: flex-end; 209 justify-content: flex-end;
216 - margin-right: 60rpx; 210 + padding: 0 60rpx 116rpx 0;
  211 + margin: 0 20rpx;
  212 +}
  213 +.textsInfo{
  214 + width: 100%;
  215 + height: 68rpx;
  216 + line-height: 68rpx;
  217 + display: flex;
  218 + align-items: center;
  219 + justify-content: center;
217 } 220 }
218 221
219 .policy{ 222 .policy{
220 width: 50%; 223 width: 50%;
221 - color: #999999;  
222 font-family: PingFang SC; 224 font-family: PingFang SC;
223 font-weight: 500; 225 font-weight: 500;
224 border: 2rpx solid #0244a4; 226 border: 2rpx solid #0244a4;
225 border-radius: 22rpx; 227 border-radius: 22rpx;
226 text-align: center; 228 text-align: center;
227 padding: 10rpx; 229 padding: 10rpx;
  230 +}
  231 +
  232 +.heand {
  233 + width: 100%;
  234 + border: 4rpx solid #dbdbdb;
  235 + box-sizing: border-box;
  236 +}
  237 +
  238 +.heand .style_round {
  239 + width: 160rpx;
  240 +}
  241 +
  242 +.style_round .round {
  243 + width: 8rpx;
  244 + height: 8rpx;
  245 + background: #dbdbdb;
  246 + border-radius: 50%;
  247 +}
  248 +
  249 +.heand .title {
  250 + color: #fff;
  251 + padding: 10rpx 0;
  252 +}
  253 +
  254 +.style_round .line {
  255 + width: 100rpx;
  256 + height: 2rpx;
  257 + background: #dbdbdb;
  258 +}
  259 +
  260 +.imgOneBox{
  261 + width: 100%;
  262 + display: flex;
  263 + justify-content: center;
  264 +}
  265 +
  266 +.normsBox{
  267 + display: flex;
  268 + flex-direction: column;
  269 + border-left: 4rpx solid #dbdbdb;
  270 + border-right: 4rpx solid #dbdbdb;
  271 + padding-bottom: 20rpx;
  272 +}
  273 +
  274 +.single {
  275 + padding: 0 20rpx 0 0;
  276 + font-family: PingFang SC;
  277 + font-weight: 500;
  278 + font-size: 36rpx;
  279 +}
  280 +.onwBoxWrap{
  281 + display: flex;
  282 + flex-direction: column;
  283 +}
  284 +.oneBox {
  285 + display: flex;
  286 + margin-right: 20rpx;
  287 +}
  288 +.content {
  289 + padding: 40rpx 0 20rpx 20rpx;
  290 + display: flex;
  291 + justify-content: space-between;
  292 +}
  293 +
  294 +.dishTexts {
  295 + padding: 0 40rpx 30rpx 20rpx;
  296 + color: #000;
  297 + font-family: PingFang SC;
  298 + font-weight: 500;
  299 + font-size: 40rpx;
  300 + width: 100%;
  301 + font-family: PingFang SC;
  302 + font-weight: 500;
  303 + font-size: 28rpx;
  304 +}
  305 +.dishTexts .texts {
  306 + margin-right: 30rpx;
228 } 307 }