diff --git a/other/程序演示视频_美食自由_莫松霖.mp4 b/other/程序演示视频_美食自由_莫松霖.mp4 new file mode 100644 index 0000000..95a0027 Binary files /dev/null and b/other/程序演示视频_美食自由_莫松霖.mp4 differ diff --git a/src/myweb3/admin.py b/src/myweb3/admin.py index 4bfbcee..461c07f 100644 --- a/src/myweb3/admin.py +++ b/src/myweb3/admin.py @@ -308,7 +308,8 @@ class admin:#管理员主界面 saytext+="{}桌的客人点餐:".format(i) for jj in (data[i]): for j in jj: - saytext+=j + + saytext+=","+j print(fl) if fl==1:saysay(saytext) diff --git a/src/myweb3/bill.json b/src/myweb3/bill.json index 10ab85a..a60da05 100644 --- a/src/myweb3/bill.json +++ b/src/myweb3/bill.json @@ -12,6 +12,57 @@ { "汉堡": 20 } + ], + [ + { + "烤牛排": 30 + }, + { + "烤牛排": 30 + }, + { + "烤牛排": 30 + }, + { + "汉堡": 20 + } + ], + [ + { + "虾": 50 + }, + { + "卷饼": 10 + } + ], + [ + { + "烤牛排": 30 + } + ], + [ + { + "烤牛排": 30 + }, + { + "墨西哥卷饼": 10 + } + ], + [ + { + "烤牛排": 30 + }, + { + "汉堡王": 30 + } + ], + [ + { + "汉堡王": 30 + }, + { + "水果": 20 + } ] ] } \ No newline at end of file diff --git a/src/myweb3/customerconfig.json b/src/myweb3/customerconfig.json index 5f12a18..2f4ee7b 100644 --- a/src/myweb3/customerconfig.json +++ b/src/myweb3/customerconfig.json @@ -1,23 +1,7 @@ { - "123": [ + "12": [ { "烤牛排": 30 - }, - { - "烤牛排": 30 - } - ], - "31": [ - { - "烤牛排": 30 - } - ], - "35": [ - { - "水果": 50 - }, - { - "水果": 50 } ] } \ No newline at end of file diff --git a/src/myweb3/demo.pcm b/src/myweb3/demo.pcm index 4362ec7..c6fd638 100644 Binary files a/src/myweb3/demo.pcm and b/src/myweb3/demo.pcm differ diff --git a/src/myweb3/foodconfig.json b/src/myweb3/foodconfig.json index 6ac13d9..cd08195 100644 --- a/src/myweb3/foodconfig.json +++ b/src/myweb3/foodconfig.json @@ -7,6 +7,11 @@ { "img": "static/images/123.jpg", "name": "水果", - "price": 50 + "price": 20 + }, + { + "img": "static/images/th.jpg", + "name": "汉堡王", + "price": 30 } ] \ No newline at end of file diff --git a/src/myweb3/img/qrcode.png b/src/myweb3/img/qrcode.png new file mode 100644 index 0000000..9f880a6 Binary files /dev/null and b/src/myweb3/img/qrcode.png differ diff --git a/src/myweb3/pwd.json b/src/myweb3/pwd.json index 8145f00..18c74ed 100644 --- a/src/myweb3/pwd.json +++ b/src/myweb3/pwd.json @@ -1,3 +1,3 @@ { - "pwd": "a123456" + "pwd": "abc" } \ No newline at end of file diff --git a/src/myweb3/static/images/6.jpg b/src/myweb3/static/images/6.jpg new file mode 100644 index 0000000..cc6a7bf Binary files /dev/null and b/src/myweb3/static/images/6.jpg differ