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({
{
name:'今天'
},
// {
// name:'明天'
// }
{
name:'明天'
}
],
dayidx:0,
timehidden:true,
... ... @@ -40,7 +40,7 @@ Component({
let timelist=[];
if(this.data.config.lunch_time){
timelist=timelist.concat(this.getdurlist(this.data.config.lunch_time));
console.log(timelist,'hhhhhh')
}
if(this.data.config.dinner_time){
timelist=timelist.concat(this.getdurlist(this.data.config.dinner_time));
... ... @@ -48,18 +48,19 @@ Component({
this.setData({
timelist:timelist
})
console.log(timelist)
console.log(timelist,'uuuuuuuuuu')
},
getdurlist(durtime){
let arr=durtime.split("-");
let starttime,endtime,timelist=[];
arr.forEach((v,i)=>{
let timearr=v.split(/[: ： \s+]/);
console.log('6666666',timearr)
if(i==0){
if(timearr[1]!='00' && (timearr[1]>0 && timearr[1]<30)){
starttime=Number(timearr[0][0]==0 ? timearr[0][1] : timearr[0])+0.5
}
if(timearr[1]!='00' && (timearr[1]>30 && timearr[1]<=59)){
if(timearr[1]!='00' && (timearr[1]>=30 && timearr[1]<=59)){
starttime=Number(timearr[0][0]==0 ? timearr[0][1] : timearr[0])+1
}
if(timearr[1]=='00'){
... ... @@ -67,7 +68,7 @@ Component({
}
}
if(i==1){
if(timearr[1]!='00' && (timearr[1]>0 && timearr[1]<30)){
if(timearr[1]!='00' && (timearr[1]>0 && timearr[1]<=30)){
endtime=timearr[0][0]==0 ? timearr[0][1] : timearr[0]
}
if(timearr[1]!='00' && (timearr[1]>30 && timearr[1]<=59)){
... ... @@ -87,7 +88,8 @@ Component({
etime:nextval%1==0 ? (nextval<10 ? '0'+Math.floor(nextval)+':00' : nextval+':00') : (nextval<10 ? '0'+Math.floor(nextval)+':30' : Math.floor(nextval)+':30'),
})
}
console.log(starttime,endtime,len,timelist,'uuuuuu');
this.timelist=timelist;
console.log(durtime,starttime,endtime,len,timelist,'uuuuuu');
return timelist;
},
selectday(e){
... ...
... ... @@ -83,7 +83,7 @@ Page({
})
},
getaddress(){
getOpenidAddress({id:this.opt.id}).then((json)=>{
App.User.getOpenidAddress({id:this.opt.id}).then((json)=>{
if(json.ret==200){
this.setData({
user:json.data
... ...
... ... @@ -20,7 +20,7 @@
"compileHotReLoad": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": false,
"useApiHostProcess": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
... ...
{
"condition": {
"plugin": {
"list": []
},
"game": {
"list": []
},
"gamePlugin": {
"list": []
},
"miniprogram": {
"list": [
{
"id": 0,
"name": "菜品分类",
"pathName": "pages/cooktype/ct_list",
"query": ""
},
{
"id": -1,
"name": "菜品首页",
"pathName": "pages/cookbook/cb_list",
"query": ""
},
{
"id": -1,
"name": "添加菜品",
"pathName": "pages/cookbook/cb_sadd",
"query": ""
},
{
"id": -1,
"name": "桌位管理",
"pathName": "pages/deskno/d_list",
"query": ""
},
{
"id": -1,
"name": "估清管理",
"pathName": "pages/cookclear/cc_list",
"query": ""
},
{
"id": 5,
"name": "营销菜品",
"pathName": "pages/marketing/mk_list",
"query": ""
},
{
"id": 6,
"name": "打印机管理",
"pathName": "pages/print/p_list",
"query": ""
},
{
"id": -1,
"name": "票据管理",
"pathName": "pages/bill/b_list",
"query": ""
},
{
"id": -1,
"name": "点餐相关",
"pathName": "pages/manage/d_list",
"query": ""
},
{
"id": -1,
"name": "菜品相关",
"pathName": "pages/manage/s_list",
"query": ""
},
{
"id": -1,
"name": "收银方式",
"pathName": "pages/manage/y_list",
"query": ""
},
{
"id": 11,
"name": "订单列表",
"pathName": "pages/order/o_list",
"query": ""
},
{
"id": 12,
"name": "收款方式",
"pathName": "pages/manage/y_list",
"query": ""
},
{
"id": -1,
"name": "收银与打印设置",
"pathName": "pages/print/p_setting",
"query": ""
},
{
"id": -1,
"name": "点餐管理",
"pathName": "pages/manage/s_list",
"query": ""
},
{
"id": -1,
"name": "点餐设置",
"pathName": "pages/manage/y_list",
"query": ""
},
{
"name": "门店管理",
"pathName": "pages/me/s_index",
"query": "id=1001",
"scene": null
},
{
"id": -1,
"name": "标签库",
"pathName": "pages/cookbook/cb_label",
"query": ""
},
{
"id": -1,
"name": "所有菜品",
"pathName": "pages/cookbook/cb_alllist",
"query": ""
},
{
"id": 19,
"name": "注册",
"pathName": "pages/login/l_login",
"query": "",
"scene": null
},
{
"id": 20,
"name": "注册页面",
"pathName": "pages/login/l_info",
"query": "",
"scene": null
},
{
"id": 21,
"name": "店铺设置",
"pathName": "pages/currency/c_setting",
"query": ""
},
{
"id": -1,
"name": "店铺设置",
"pathName": "pages/setting/s_store",
"query": ""
},
{
"id": 23,
"name": "开通店员",
"pathName": "pages/store/s_confirm",
"query": "sellerid=1"
},
{
"id": -1,
"name": "开通成功",
"pathName": "pages/store/s_complete",
"query": ""
},
{
"id": -1,
"name": "练习",
"pathName": "pages/cooktags/ct_list",
"query": ""
},
{
"id": -1,
"name": "发票",
"pathName": "pages/order/invoice",
"query": ""
},
{
"id": 27,
"name": "开通小饕支付",
"pathName": "pages/copy/c_copy",
"query": "sellerid=69"
},
{
"id": -1,
"name": "优势",
"pathName": "pages/setting/s_open",
"query": ""
},
{
"id": -1,
"name": "开通店员失效",
"pathName": "pages/store/reminder",
"query": "sellerid=1"
},
{
"id": -1,
"name": "堂食拼单设置",
"pathName": "pages/manage/s_list",
"query": ""
},
{
"id": 31,
"name": "适用桌位",
"pathName": "pages/collage/c_desk",
"query": ""
},
{
"id": -1,
"name": "适用菜单",
"pathName": "pages/collage/c_cook",
"query": ""
},
{
"id": 33,
"name": "新建菜单",
"pathName": "pages/collage/c_cooklist",
"query": ""
},
{
"id": -1,
"name": "付款顺序设置",
"pathName": "pages/collage/c_pay",
"query": ""
},
{
"id": -1,
"name": "通用设置",
"pathName": "pages/collage/c_common",
"query": ""
},
{
"id": -1,
"name": "顾客操作设置",
"pathName": "pages/collage/c_action",
"query": ""
},
{
"id": -1,
"name": "消息通知设置",
"pathName": "pages/collage/c_message",
"query": ""
},
{
"id": -1,
"name": "预定本",
"pathName": "pages/book/b_index",
"query": ""
},
{
"id": -1,
"name": "pages/manage/reserve 在线预定",
"pathName": "pages/manage/reserve",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/manage/reserve/list 包间类型",
"pathName": "pages/manage/reserve/list",
"query": "",
"scene": null
},
{
"id": 41,
"name": "pages/manage/reserve/update",
"pathName": "pages/manage/reserve/update",
"query": "id=3",
"scene": null
},
{
"id": 42,
"name": "pages/manage/reserve/d_desk",
"pathName": "pages/manage/reserve/d_desk",
"query": "id=3&checked_ids=",
"scene": null
},
{
"id": -1,
"name": "pages/login/agreement",
"pathName": "pages/login/agreement",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/message/mould",
"pathName": "pages/message/mould",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/login/promise",
"pathName": "pages/login/promise",
"query": "",
"scene": null
},
{
"name": "pages/me/s_index",
"pathName": "pages/me/s_index",
"query": "sellerid=1",
"scene": null
},
{
"name": "pages/custom/seller/menu",
"pathName": "pages/custom/seller/menu",
"query": "id=4",
"scene": null
},
{
"name": "pages/custom/seller/detail",
"pathName": "pages/custom/seller/detail",
"query": "id=65&sellerid=1&totalprice=0.01",
"scene": null
},
{
"name": "pages/custom/me/list",
"pathName": "pages/custom/me/list",
"query": "",
"scene": null
},
{
"name": "pages/custom/me/index",
"pathName": "pages/custom/me/index",
"query": "",
"scene": null
},
{
"name": "pages/store/s_confirm",
"pathName": "pages/store/s_confirm",
"query": "sellerid=1",
"scene": null
},
{
"name": "pages/login/promise",
"pathName": "pages/login/promise",
"query": "",
"scene": null
}
]
}
}
}
\ No newline at end of file
... ...