Administrator / xcx-take · Commits

Go to a project

Commit 548b5ee86a6a62260b8adce42859599568d6d46b

Authored by Yolanda
1 parent 2d0e7c7d
build: skipped

no message

Inline Side-by-side
Showing 4 changed files with 356 additions and 10 deletions
@@ -8,9 +8,9 @@ Component({ @@ -8,9 +8,9 @@ Component({
8 { 8 {
9 name:'今天' 9 name:'今天'
10 }, 10 },
11 - // {  
12 - // name:'明天'  
13 - // } 11 + {
  12 + name:'明天'
  13 + }
14 ], 14 ],
15 dayidx:0, 15 dayidx:0,
16 timehidden:true, 16 timehidden:true,
@@ -40,7 +40,7 @@ Component({ @@ -40,7 +40,7 @@ Component({
40 let timelist=[]; 40 let timelist=[];
41 if(this.data.config.lunch_time){ 41 if(this.data.config.lunch_time){
42 timelist=timelist.concat(this.getdurlist(this.data.config.lunch_time)); 42 timelist=timelist.concat(this.getdurlist(this.data.config.lunch_time));
43 - 43 + console.log(timelist,'hhhhhh')
44 } 44 }
45 if(this.data.config.dinner_time){ 45 if(this.data.config.dinner_time){
46 timelist=timelist.concat(this.getdurlist(this.data.config.dinner_time)); 46 timelist=timelist.concat(this.getdurlist(this.data.config.dinner_time));
@@ -48,18 +48,19 @@ Component({ @@ -48,18 +48,19 @@ Component({
48 this.setData({ 48 this.setData({
49 timelist:timelist 49 timelist:timelist
50 }) 50 })
51 - console.log(timelist) 51 + console.log(timelist,'uuuuuuuuuu')
52 }, 52 },
53 getdurlist(durtime){ 53 getdurlist(durtime){
54 let arr=durtime.split("-"); 54 let arr=durtime.split("-");
55 let starttime,endtime,timelist=[]; 55 let starttime,endtime,timelist=[];
56 arr.forEach((v,i)=>{ 56 arr.forEach((v,i)=>{
57 let timearr=v.split(/[: ： \s+]/); 57 let timearr=v.split(/[: ： \s+]/);
  58 + console.log('6666666',timearr)
58 if(i==0){ 59 if(i==0){
59 if(timearr[1]!='00' && (timearr[1]>0 && timearr[1]<30)){ 60 if(timearr[1]!='00' && (timearr[1]>0 && timearr[1]<30)){
60 starttime=Number(timearr[0][0]==0 ? timearr[0][1] : timearr[0])+0.5 61 starttime=Number(timearr[0][0]==0 ? timearr[0][1] : timearr[0])+0.5
61 } 62 }
62 - if(timearr[1]!='00' && (timearr[1]>30 && timearr[1]<=59)){ 63 + if(timearr[1]!='00' && (timearr[1]>=30 && timearr[1]<=59)){
63 starttime=Number(timearr[0][0]==0 ? timearr[0][1] : timearr[0])+1 64 starttime=Number(timearr[0][0]==0 ? timearr[0][1] : timearr[0])+1
64 } 65 }
65 if(timearr[1]=='00'){ 66 if(timearr[1]=='00'){
@@ -67,7 +68,7 @@ Component({ @@ -67,7 +68,7 @@ Component({
67 } 68 }
68 } 69 }
69 if(i==1){ 70 if(i==1){
70 - if(timearr[1]!='00' && (timearr[1]>0 && timearr[1]<30)){ 71 + if(timearr[1]!='00' && (timearr[1]>0 && timearr[1]<=30)){
71 endtime=timearr[0][0]==0 ? timearr[0][1] : timearr[0] 72 endtime=timearr[0][0]==0 ? timearr[0][1] : timearr[0]
72 } 73 }
73 if(timearr[1]!='00' && (timearr[1]>30 && timearr[1]<=59)){ 74 if(timearr[1]!='00' && (timearr[1]>30 && timearr[1]<=59)){
@@ -87,7 +88,8 @@ Component({ @@ -87,7 +88,8 @@ Component({
87 etime:nextval%1==0 ? (nextval<10 ? '0'+Math.floor(nextval)+':00' : nextval+':00') : (nextval<10 ? '0'+Math.floor(nextval)+':30' : Math.floor(nextval)+':30'), 88 etime:nextval%1==0 ? (nextval<10 ? '0'+Math.floor(nextval)+':00' : nextval+':00') : (nextval<10 ? '0'+Math.floor(nextval)+':30' : Math.floor(nextval)+':30'),
88 }) 89 })
89 } 90 }
90 - console.log(starttime,endtime,len,timelist,'uuuuuu'); 91 + this.timelist=timelist;
  92 + console.log(durtime,starttime,endtime,len,timelist,'uuuuuu');
91 return timelist; 93 return timelist;
92 }, 94 },
93 selectday(e){ 95 selectday(e){
@@ -83,7 +83,7 @@ Page({ @@ -83,7 +83,7 @@ Page({
83 }) 83 })
84 }, 84 },
85 getaddress(){ 85 getaddress(){
86 - getOpenidAddress({id:this.opt.id}).then((json)=>{ 86 + App.User.getOpenidAddress({id:this.opt.id}).then((json)=>{
87 if(json.ret==200){ 87 if(json.ret==200){
88 this.setData({ 88 this.setData({
89 user:json.data 89 user:json.data
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 "compileHotReLoad": false, 20 "compileHotReLoad": false,
21 "useMultiFrameRuntime": true, 21 "useMultiFrameRuntime": true,
22 "useApiHook": true, 22 "useApiHook": true,
23 - "useApiHostProcess": false, 23 + "useApiHostProcess": true,
24 "babelSetting": { 24 "babelSetting": {
25 "ignore": [], 25 "ignore": [],
26 "disablePlugins": [], 26 "disablePlugins": [],
  1 +{
  2 + "condition": {
  3 + "plugin": {
  4 + "list": []
  5 + },
  6 + "game": {
  7 + "list": []
  8 + },
  9 + "gamePlugin": {
  10 + "list": []
  11 + },
  12 + "miniprogram": {
  13 + "list": [
  14 + {
  15 + "id": 0,
  16 + "name": "菜品分类",
  17 + "pathName": "pages/cooktype/ct_list",
  18 + "query": ""
  19 + },
  20 + {
  21 + "id": -1,
  22 + "name": "菜品首页",
  23 + "pathName": "pages/cookbook/cb_list",
  24 + "query": ""
  25 + },
  26 + {
  27 + "id": -1,
  28 + "name": "添加菜品",
  29 + "pathName": "pages/cookbook/cb_sadd",
  30 + "query": ""
  31 + },
  32 + {
  33 + "id": -1,
  34 + "name": "桌位管理",
  35 + "pathName": "pages/deskno/d_list",
  36 + "query": ""
  37 + },
  38 + {
  39 + "id": -1,
  40 + "name": "估清管理",
  41 + "pathName": "pages/cookclear/cc_list",
  42 + "query": ""
  43 + },
  44 + {
  45 + "id": 5,
  46 + "name": "营销菜品",
  47 + "pathName": "pages/marketing/mk_list",
  48 + "query": ""
  49 + },
  50 + {
  51 + "id": 6,
  52 + "name": "打印机管理",
  53 + "pathName": "pages/print/p_list",
  54 + "query": ""
  55 + },
  56 + {
  57 + "id": -1,
  58 + "name": "票据管理",
  59 + "pathName": "pages/bill/b_list",
  60 + "query": ""
  61 + },
  62 + {
  63 + "id": -1,
  64 + "name": "点餐相关",
  65 + "pathName": "pages/manage/d_list",
  66 + "query": ""
  67 + },
  68 + {
  69 + "id": -1,
  70 + "name": "菜品相关",
  71 + "pathName": "pages/manage/s_list",
  72 + "query": ""
  73 + },
  74 + {
  75 + "id": -1,
  76 + "name": "收银方式",
  77 + "pathName": "pages/manage/y_list",
  78 + "query": ""
  79 + },
  80 + {
  81 + "id": 11,
  82 + "name": "订单列表",
  83 + "pathName": "pages/order/o_list",
  84 + "query": ""
  85 + },
  86 + {
  87 + "id": 12,
  88 + "name": "收款方式",
  89 + "pathName": "pages/manage/y_list",
  90 + "query": ""
  91 + },
  92 + {
  93 + "id": -1,
  94 + "name": "收银与打印设置",
  95 + "pathName": "pages/print/p_setting",
  96 + "query": ""
  97 + },
  98 + {
  99 + "id": -1,
  100 + "name": "点餐管理",
  101 + "pathName": "pages/manage/s_list",
  102 + "query": ""
  103 + },
  104 + {
  105 + "id": -1,
  106 + "name": "点餐设置",
  107 + "pathName": "pages/manage/y_list",
  108 + "query": ""
  109 + },
  110 + {
  111 + "name": "门店管理",
  112 + "pathName": "pages/me/s_index",
  113 + "query": "id=1001",
  114 + "scene": null
  115 + },
  116 + {
  117 + "id": -1,
  118 + "name": "标签库",
  119 + "pathName": "pages/cookbook/cb_label",
  120 + "query": ""
  121 + },
  122 + {
  123 + "id": -1,
  124 + "name": "所有菜品",
  125 + "pathName": "pages/cookbook/cb_alllist",
  126 + "query": ""
  127 + },
  128 + {
  129 + "id": 19,
  130 + "name": "注册",
  131 + "pathName": "pages/login/l_login",
  132 + "query": "",
  133 + "scene": null
  134 + },
  135 + {
  136 + "id": 20,
  137 + "name": "注册页面",
  138 + "pathName": "pages/login/l_info",
  139 + "query": "",
  140 + "scene": null
  141 + },
  142 + {
  143 + "id": 21,
  144 + "name": "店铺设置",
  145 + "pathName": "pages/currency/c_setting",
  146 + "query": ""
  147 + },
  148 + {
  149 + "id": -1,
  150 + "name": "店铺设置",
  151 + "pathName": "pages/setting/s_store",
  152 + "query": ""
  153 + },
  154 + {
  155 + "id": 23,
  156 + "name": "开通店员",
  157 + "pathName": "pages/store/s_confirm",
  158 + "query": "sellerid=1"
  159 + },
  160 + {
  161 + "id": -1,
  162 + "name": "开通成功",
  163 + "pathName": "pages/store/s_complete",
  164 + "query": ""
  165 + },
  166 + {
  167 + "id": -1,
  168 + "name": "练习",
  169 + "pathName": "pages/cooktags/ct_list",
  170 + "query": ""
  171 + },
  172 + {
  173 + "id": -1,
  174 + "name": "发票",
  175 + "pathName": "pages/order/invoice",
  176 + "query": ""
  177 + },
  178 + {
  179 + "id": 27,
  180 + "name": "开通小饕支付",
  181 + "pathName": "pages/copy/c_copy",
  182 + "query": "sellerid=69"
  183 + },
  184 + {
  185 + "id": -1,
  186 + "name": "优势",
  187 + "pathName": "pages/setting/s_open",
  188 + "query": ""
  189 + },
  190 + {
  191 + "id": -1,
  192 + "name": "开通店员失效",
  193 + "pathName": "pages/store/reminder",
  194 + "query": "sellerid=1"
  195 + },
  196 + {
  197 + "id": -1,
  198 + "name": "堂食拼单设置",
  199 + "pathName": "pages/manage/s_list",
  200 + "query": ""
  201 + },
  202 + {
  203 + "id": 31,
  204 + "name": "适用桌位",
  205 + "pathName": "pages/collage/c_desk",
  206 + "query": ""
  207 + },
  208 + {
  209 + "id": -1,
  210 + "name": "适用菜单",
  211 + "pathName": "pages/collage/c_cook",
  212 + "query": ""
  213 + },
  214 + {
  215 + "id": 33,
  216 + "name": "新建菜单",
  217 + "pathName": "pages/collage/c_cooklist",
  218 + "query": ""
  219 + },
  220 + {
  221 + "id": -1,
  222 + "name": "付款顺序设置",
  223 + "pathName": "pages/collage/c_pay",
  224 + "query": ""
  225 + },
  226 + {
  227 + "id": -1,
  228 + "name": "通用设置",
  229 + "pathName": "pages/collage/c_common",
  230 + "query": ""
  231 + },
  232 + {
  233 + "id": -1,
  234 + "name": "顾客操作设置",
  235 + "pathName": "pages/collage/c_action",
  236 + "query": ""
  237 + },
  238 + {
  239 + "id": -1,
  240 + "name": "消息通知设置",
  241 + "pathName": "pages/collage/c_message",
  242 + "query": ""
  243 + },
  244 + {
  245 + "id": -1,
  246 + "name": "预定本",
  247 + "pathName": "pages/book/b_index",
  248 + "query": ""
  249 + },
  250 + {
  251 + "id": -1,
  252 + "name": "pages/manage/reserve 在线预定",
  253 + "pathName": "pages/manage/reserve",
  254 + "query": "",
  255 + "scene": null
  256 + },
  257 + {
  258 + "id": -1,
  259 + "name": "pages/manage/reserve/list 包间类型",
  260 + "pathName": "pages/manage/reserve/list",
  261 + "query": "",
  262 + "scene": null
  263 + },
  264 + {
  265 + "id": 41,
  266 + "name": "pages/manage/reserve/update",
  267 + "pathName": "pages/manage/reserve/update",
  268 + "query": "id=3",
  269 + "scene": null
  270 + },
  271 + {
  272 + "id": 42,
  273 + "name": "pages/manage/reserve/d_desk",
  274 + "pathName": "pages/manage/reserve/d_desk",
  275 + "query": "id=3&checked_ids=",
  276 + "scene": null
  277 + },
  278 + {
  279 + "id": -1,
  280 + "name": "pages/login/agreement",
  281 + "pathName": "pages/login/agreement",
  282 + "query": "",
  283 + "scene": null
  284 + },
  285 + {
  286 + "id": -1,
  287 + "name": "pages/message/mould",
  288 + "pathName": "pages/message/mould",
  289 + "query": "",
  290 + "scene": null
  291 + },
  292 + {
  293 + "id": -1,
  294 + "name": "pages/login/promise",
  295 + "pathName": "pages/login/promise",
  296 + "query": "",
  297 + "scene": null
  298 + },
  299 + {
  300 + "name": "pages/me/s_index",
  301 + "pathName": "pages/me/s_index",
  302 + "query": "sellerid=1",
  303 + "scene": null
  304 + },
  305 + {
  306 + "name": "pages/custom/seller/menu",
  307 + "pathName": "pages/custom/seller/menu",
  308 + "query": "id=4",
  309 + "scene": null
  310 + },
  311 + {
  312 + "name": "pages/custom/seller/detail",
  313 + "pathName": "pages/custom/seller/detail",
  314 + "query": "id=65&sellerid=1&totalprice=0.01",
  315 + "scene": null
  316 + },
  317 + {
  318 + "name": "pages/custom/me/list",
  319 + "pathName": "pages/custom/me/list",
  320 + "query": "",
  321 + "scene": null
  322 + },
  323 + {
  324 + "name": "pages/custom/me/index",
  325 + "pathName": "pages/custom/me/index",
  326 + "query": "",
  327 + "scene": null
  328 + },
  329 + {
  330 + "name": "pages/store/s_confirm",
  331 + "pathName": "pages/store/s_confirm",
  332 + "query": "sellerid=1",
  333 + "scene": null
  334 + },
  335 + {
  336 + "name": "pages/login/promise",
  337 + "pathName": "pages/login/promise",
  338 + "query": "",
  339 + "scene": null
  340 + }
  341 + ]
  342 + }
  343 + }
  344 +}