xt / xcx-book · Commits

Go to a project

Commit 697968feca6862cf45309cafc0352210f9cc7c5d

Authored by yiren
1 parent 16f943ab
build: skipped

提前点餐旧版价格显示

Inline Side-by-side
Showing 3 changed files with 7 additions and 7 deletions
@@ -212,8 +212,8 @@ Page({ @@ -212,8 +212,8 @@ Page({
212 cook.name_type = cook_style && cook_style.name_type ? cook_style.name_type : '3'; //1左侧,2右侧,3顶部分开 默认分开 212 cook.name_type = cook_style && cook_style.name_type ? cook_style.name_type : '3'; //1左侧,2右侧,3顶部分开 默认分开
213 cook.check1 = cook.practice.length > 0 ? cook.practice[0].id : ''; 213 cook.check1 = cook.practice.length > 0 ? cook.practice[0].id : '';
214 cook.check2 = cook.specArr.length > 0 ? cook.specArr[0].id : ''; 214 cook.check2 = cook.specArr.length > 0 ? cook.specArr[0].id : '';
215 - cook.price = cook.specArr.length > 0 ? cook.specArr[0].price : '';  
216 - cook.member_price = cook.specArr.length > 0 ? cook.specArr[0].member_price : ''; 215 + cook.price = cook.specArr.length > 0 ? cook.specArr[0].price : cook.price;
  216 + cook.member_price = cook.specArr.length > 0 ? cook.specArr[0].member_price : cook.member_price;
217 if (item_clear_num == 0) { 217 if (item_clear_num == 0) {
218 flag = false; 218 flag = false;
219 } 219 }
@@ -359,8 +359,8 @@ Page({ @@ -359,8 +359,8 @@ Page({
359 cook.name_type = cook_style && cook_style.name_type ? cook_style.name_type : '3'; //1左侧,2右侧,3顶部分开 默认分开 359 cook.name_type = cook_style && cook_style.name_type ? cook_style.name_type : '3'; //1左侧,2右侧,3顶部分开 默认分开
360 cook.check1 = cook.practice.length > 0 ? cook.practice[0].id : ''; 360 cook.check1 = cook.practice.length > 0 ? cook.practice[0].id : '';
361 cook.check2 = cook.specArr.length > 0 ? cook.specArr[0].id : ''; 361 cook.check2 = cook.specArr.length > 0 ? cook.specArr[0].id : '';
362 - cook.price = cook.specArr.length > 0 ? cook.specArr[0].price : '';  
363 - cook.member_price = cook.specArr.length > 0 ? cook.specArr[0].member_price : ''; 362 + cook.price = cook.specArr.length > 0 ? cook.specArr[0].price : cook.price;
  363 + cook.member_price = cook.specArr.length > 0 ? cook.specArr[0].member_price : cook.member_price;
364 if (item_clear_num == 0) { 364 if (item_clear_num == 0) {
365 flag = false; 365 flag = false;
366 } 366 }
@@ -476,7 +476,7 @@ Page({ @@ -476,7 +476,7 @@ Page({
476 sid: this.data.options.sid 476 sid: this.data.options.sid
477 }).then(res => { 477 }).then(res => {
478 let themeColor, textColor, navColor; 478 let themeColor, textColor, navColor;
479 - if (res.data.cook_style) { 479 + if (res.data) {
480 let style = util.determine(res.data.cook_style) 480 let style = util.determine(res.data.cook_style)
481 if (style && style.red && style.green && style.blue && style.alpha) { 481 if (style && style.red && style.green && style.blue && style.alpha) {
482 themeColor = style.red + ',' + style.green + ',' + style.blue + ',' + Math.floor(style.alpha) 482 themeColor = style.red + ',' + style.green + ',' + style.blue + ',' + Math.floor(style.alpha)
@@ -163,8 +163,8 @@ Page({ @@ -163,8 +163,8 @@ Page({
163 cook.name_type = cook_style && cook_style.name_type ? cook_style.name_type : '3'; //1左侧,2右侧,3顶部分开 默认分开 163 cook.name_type = cook_style && cook_style.name_type ? cook_style.name_type : '3'; //1左侧,2右侧,3顶部分开 默认分开
164 cook.check1 = cook.practice.length > 0 ? cook.practice[0].id : ''; 164 cook.check1 = cook.practice.length > 0 ? cook.practice[0].id : '';
165 cook.check2 = cook.specArr.length > 0 ? cook.specArr[0].id : ''; 165 cook.check2 = cook.specArr.length > 0 ? cook.specArr[0].id : '';
166 - cook.price = cook.specArr.length > 0 ? cook.specArr[0].price : '';  
167 - cook.member_price = cook.specArr.length > 0 ? cook.specArr[0].member_price : ''; 166 + cook.price = cook.specArr.length > 0 ? cook.specArr[0].price : cook.price;
  167 + cook.member_price = cook.specArr.length > 0 ? cook.specArr[0].member_price : cook.member_price;
168 if (item_clear_num == 0) { 168 if (item_clear_num == 0) {
169 flag = false; 169 flag = false;
170 } 170 }