From 98cc76570cc23a92d3755d016e0303254ae4ebf7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Thu, 12 Sep 2024 11:19:56 +0800 Subject: [PATCH 1/5] 9.9 --- .../views/cashier/NewComponents/imgs/r-j.png | Bin 0 -> 381 bytes .../newHomeComponents/memberRecharge.vue | 179 +++++++++++++++++- 2 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 fuintCashierWeb/src/views/cashier/NewComponents/imgs/r-j.png diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/imgs/r-j.png b/fuintCashierWeb/src/views/cashier/NewComponents/imgs/r-j.png new file mode 100644 index 0000000000000000000000000000000000000000..b5196400b2b217e2fe92797b456423966062af88 GIT binary patch literal 381 zcmYL@TPQ;T0EW+aplM!+NN!2Vi$q2g>xhF!bI7&P9_GP=H7$fiG$fZ~ES65qHMu+( zv6O|e<>b;{B#~Us3n6T5{f;LO|Ns5p+uvUz%@Ya3g#CWfkPew zwJc9UtgsOrFFhqibS_U!(9oAbUyjKN7^+~X2BQSi08=9t)L3rCdKWfyFb`mB5ZlAp z8HHsGdsDC)alqhc4#)GbFT%bAb`8!QI4!u`$CV8?C%C)7D~FF~e7xZ69qvzjf8oas z&o{h3@Ol7LMk%xSA3n`8X(^#KCoto@87MM`7CU;+Y=PFKVDij$9#rsTJS}tq3W20$ zB>6hh@qR6)mWrE()YEqnk78RotNNddZx5YJXzXgJPG8e!F=uJwVp;i2sUhamnK~BZ zo2{7G?a;i~LvDlGIl-V~ciG*ct(4YR44HH@9*;RJGhRlg$Te;3EX8da3!Pf8Lr!O~ ZDmLIg(T_{3b=~qO2`X1gu1M;-e*wG*&+Y&K literal 0 HcmV?d00001 diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue index 0c75d92aa..7a179c147 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue @@ -15,7 +15,42 @@ export default { name:'礼品卡兑换', num:2 } - ] + ], + kangList:[ + "充值5000元赠送500元", + "充值10000元赠送1500元" + ], + tabIndex:0, + kIndex:0, + ruleForm: { + text1:'', + text2:'', + text3:'', + text4:'', + name: '', + name1: '', + name2: '', + region: '', + date1: '', + date2: '', + delivery: false, + type: [], + resource: '', + desc: '' + }, + rules: { + price:[ + { required: true, message: '充值金额', trigger: 'change' } + ], + } + } + }, + methods:{ + setindex(index){ + this.tabIndex = index + }, + setIndex(index){ + this.kIndex = index } } } @@ -24,10 +59,116 @@ export default { @@ -37,6 +178,9 @@ export default { width: 100%; display: flex; align-items: center; + margin-bottom: 15px; + box-sizing: border-box; + padding-left: 30px; } .tab-dv{ width: 200px; @@ -52,4 +196,33 @@ export default { margin-right:10px ; cursor: pointer; } +.active{ + background:#FF9655 !important ; + color: #fff !important; +} +.d-s{ + display: flex; + align-items: center; + margin-bottom: 25px; + padding-left: 50px; +} +.k_kang{ + width: 200px; + height: 50px; + background: #FFFFFF; + border: 1px solid #FF9655; + display: flex; + align-items: center; + justify-content: center; + margin-right: 25px; + cursor: pointer; + position: relative; +} +.p-img{ + position: absolute; + width: 16px; + height: 16px; + right: 0px; + bottom: 0px; +} From dc2764b9908f9d10ea4add265ed3042acde3f6c8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Thu, 12 Sep 2024 11:28:21 +0800 Subject: [PATCH 2/5] 9.9 --- .../views/cashier/NewComponents/newHome.vue | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index 10ff5c1bb..b5c4f3d44 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue @@ -53,19 +53,13 @@
-
-
-
储值卡（账户余额:0元)
-
+ 储值卡（账户余额:0元) +
￥0.00
-
-
-
囤油卡（账户余额:1000元)
-
+ 囤油卡（账户余额:1000元) +
-￥220.00
@@ -86,7 +80,7 @@
-
{{ item.name }}
+
{{ item.name }}
@@ -210,7 +204,6 @@ 打印二维码 - Date: Thu, 12 Sep 2024 11:49:20 +0800 Subject: [PATCH 3/5] 9.12 --- .../views/cashier/NewComponents/newHome.vue | 120 ++++++++++++++++-- 1 file changed, 111 insertions(+), 9 deletions(-) diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index b5c4f3d44..aec20bce5 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue @@ -2,7 +2,7 @@
-
+
@@ -15,12 +15,19 @@
-
会员充值
+
会员充值
重置会员
赠送优惠券
- - +
+
+
+ + +
+
+
新增会员
+
油品:￥0.00
@@ -30,8 +37,6 @@
合计:￥0.00
- -
活动优惠 @@ -152,9 +157,13 @@
非油商品
-
- -
+
商品
库存
@@ -342,6 +351,9 @@ import memberRecharge from './newHomeComponents/memberRecharge.vue' export default { data() { return { + restaurants: [], + state: '', + timeout: null, boxShow: true, boxShow1: true, boxShow2: true, @@ -407,6 +419,7 @@ export default { id: '4' }, ], + userInfo:true, ruleIndex:0, tabIndex: 0, newMember: false, @@ -437,7 +450,16 @@ export default { accountPending, memberRecharge }, + mounted() { + this.restaurants = this.loadAll(); + }, methods: { + addVip(){ + this.newMember = true + }, + addMemberRecharge(){ + this.memberRecharge = true + }, changeBox() { this.boxShow = !this.boxShow }, @@ -452,6 +474,75 @@ export default { }, setindex(index){ this.ruleIndex = index + }, + loadAll() { + return [ + { "value": "三全鲜食（北新泾店）", "address": "长宁区新渔路144号" }, + { "value": "Hot honey 首尔炸鸡（仙霞路）", "address": "上海市长宁区淞虹路661号" }, + { "value": "新旺角茶餐厅", "address": "上海市普陀区真北路988号创邑金沙谷6号楼113" }, + { "value": "泷千家(天山西路店)", "address": "天山西路438号" }, + { "value": "胖仙女纸杯蛋糕（上海凌空店）", "address": "上海市长宁区金钟路968号1幢18号楼一层商铺18-101" }, + { "value": "贡茶", "address": "上海市长宁区金钟路633号" }, + { "value": "豪大大香鸡排超级奶爸", "address": "上海市嘉定区曹安公路曹安路1685号" }, + { "value": "茶芝兰（奶茶，手抓饼）", "address": "上海市普陀区同普路1435号" }, + { "value": "十二泷町", "address": "上海市北翟路1444弄81号B幢-107" }, + { "value": "星移浓缩咖啡", "address": "上海市嘉定区新郁路817号" }, + { "value": "阿姨奶茶/豪大大", "address": "嘉定区曹安路1611号" }, + { "value": "新麦甜四季甜品炸鸡", "address": "嘉定区曹安公路2383弄55号" }, + { "value": "Monica摩托主题咖啡店", "address": "嘉定区江桥镇曹安公路2409号1F，2383弄62号1F" }, + { "value": "浮生若茶（凌空soho店）", "address": "上海长宁区金钟路968号9号楼地下一层" }, + { "value": "NONO JUICE 鲜榨果汁", "address": "上海市长宁区天山西路119号" }, + { "value": "CoCo都可(北新泾店）", "address": "上海市长宁区仙霞西路" }, + { "value": "快乐柠檬（神州智慧店）", "address": "上海市长宁区天山西路567号1层R117号店铺" }, + { "value": "Merci Paul cafe", "address": "上海市普陀区光复西路丹巴路28弄6号楼819" }, + { "value": "猫山王（西郊百联店）", "address": "上海市长宁区仙霞西路88号第一层G05-F01-1-306" }, + { "value": "枪会山", "address": "上海市普陀区棕榈路" }, + { "value": "纵食", "address": "元丰天山花园(东门) 双流路267号" }, + { "value": "钱记", "address": "上海市长宁区天山西路" }, + { "value": "壹杯加", "address": "上海市长宁区通协路" }, + { "value": "唦哇嘀咖", "address": "上海市长宁区新泾镇金钟路999号2幢（B幢）第01层第1-02A单元" }, + { "value": "爱茜茜里(西郊百联)", "address": "长宁区仙霞西路88号1305室" }, + { "value": "爱茜茜里(近铁广场)", "address": "上海市普陀区真北路818号近铁城市广场北区地下二楼N-B2-O2-C商铺" }, + { "value": "鲜果榨汁（金沙江路和美广店）", "address": "普陀区金沙江路2239号金沙和美广场B1-10-6" }, + { "value": "开心丽果（缤谷店）", "address": "上海市长宁区威宁路天山路341号" }, + { "value": "超级鸡车（丰庄路店）", "address": "上海市嘉定区丰庄路240号" }, + { "value": "妙生活果园（北新泾店）", "address": "长宁区新渔路144号" }, + { "value": "香宜度麻辣香锅", "address": "长宁区淞虹路148号" }, + { "value": "凡仔汉堡（老真北路店）", "address": "上海市普陀区老真北路160号" }, + { "value": "港式小铺", "address": "上海市长宁区金钟路968号15楼15-105室" }, + { "value": "蜀香源麻辣香锅（剑河路店）", "address": "剑河路443-1" }, + { "value": "北京饺子馆", "address": "长宁区北新泾街道天山西路490-1号" }, + { "value": "饭典*新简餐（凌空SOHO店）", "address": "上海市长宁区金钟路968号9号楼地下一层9-83室" }, + { "value": "焦耳·川式快餐（金钟路店）", "address": "上海市金钟路633号地下一层甲部" }, + { "value": "动力鸡车", "address": "长宁区仙霞西路299弄3号101B" }, + { "value": "浏阳蒸菜", "address": "天山西路430号" }, + { "value": "四海游龙（天山西路店）", "address": "上海市长宁区天山西路" }, + { "value": "樱花食堂（凌空店）", "address": "上海市长宁区金钟路968号15楼15-105室" }, + { "value": "壹分米客家传统调制米粉(天山店)", "address": "天山西路428号" }, + { "value": "福荣祥烧腊（平溪路店）", "address": "上海市长宁区协和路福泉路255弄57-73号" }, + { "value": "速记黄焖鸡米饭", "address": "上海市长宁区北新泾街道金钟路180号1层01号摊位" }, + { "value": "红辣椒麻辣烫", "address": "上海市长宁区天山西路492号" }, + { "value": "(小杨生煎)西郊百联餐厅", "address": "长宁区仙霞西路88号百联2楼" }, + { "value": "阳阳麻辣烫", "address": "天山西路389号" }, + { "value": "南拳妈妈龙虾盖浇饭", "address": "普陀区金沙江路1699号鑫乐惠美食广场A13" } + ]; + }, + querySearchAsync(queryString, cb) { + var restaurants = this.restaurants; + var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants; + + clearTimeout(this.timeout); + this.timeout = setTimeout(() => { + cb(results); + }, 1000 * Math.random()); + }, + createStateFilter(queryString) { + return (state) => { + return (state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0); + }; + }, + handleSelect(item) { + console.log(item); } } } @@ -1006,4 +1097,15 @@ input { justify-content: space-between; margin: 15px auto; } +.left_input{ + width: 70%; + border: 1px solid #fff; + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + padding: 10px 5px; + border-radius: 8px; +} From 93d5e26b8c84245d007925c0c5345ac1f0e0067c Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Thu, 12 Sep 2024 12:03:37 +0800 Subject: [PATCH 4/5] 9.12 --- .../views/cashier/NewComponents/newHome.vue | 32 ++++++-- .../newHomeComponents/refuelingAmount.vue | 80 +++++++++++++++++++ 2 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/refuelingAmount.vue diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index aec20bce5..5e95ffb78 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue @@ -192,8 +192,8 @@ 重置
-
取单
-
挂单
+
取单
+
挂单
@@ -324,7 +324,7 @@ > - 取 消 + 取 消 确 定 @@ -340,7 +340,20 @@ 确认充值 - + +
+ +
+ + 取 消 + 确 定 + +
@@ -348,6 +361,7 @@ import pickUp from './newHomeComponents/pickUpTheOrder.vue' import accountPending from './newHomeComponents/accountPending.vue' import memberRecharge from './newHomeComponents/memberRecharge.vue' +import refuelingAmount from './newHomeComponents/refuelingAmount.vue' export default { data() { return { @@ -437,6 +451,7 @@ export default { {min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur'} ], }, + refuelingAmount: false, hangingAnOrder: false, paymentResults: false, pickUpTheOrder: false, @@ -448,12 +463,19 @@ export default { components:{ pickUp, accountPending, - memberRecharge + memberRecharge, + refuelingAmount }, mounted() { this.restaurants = this.loadAll(); }, methods: { + invokePickUpTheOrder(){ + this.pickUpTheOrder = true + }, + invokeHangingAnOrder(){ + this.hangingAnOrder = true + }, addVip(){ this.newMember = true }, diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/refuelingAmount.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/refuelingAmount.vue new file mode 100644 index 000000000..e658fe69a --- /dev/null +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/refuelingAmount.vue @@ -0,0 +1,80 @@ + + + + + From 9c4b6eba7f1d8ec9f47080f698436ce12b2df1da Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Thu, 12 Sep 2024 13:58:21 +0800 Subject: [PATCH 5/5] 9.12 --- .../views/cashier/NewComponents/newHome.vue | 12 ++- .../newHomeComponents/refuelingAmount.vue | 73 +++++++++++++++++-- 2 files changed, 75 insertions(+), 10 deletions(-) diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index 5e95ffb78..ef8a1b414 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue @@ -105,7 +105,7 @@
-
+
汽油 92#
1号枪
@@ -433,7 +433,7 @@ export default { id: '4' }, ], - userInfo:true, + userInfo:true,//判断登录状态 ruleIndex:0, tabIndex: 0, newMember: false, @@ -497,6 +497,9 @@ export default { setindex(index){ this.ruleIndex = index }, + setRefuelingAmount(){ + this.refuelingAmount = true + }, loadAll() { return [ { "value": "三全鲜食（北新泾店）", "address": "长宁区新渔路144号" }, @@ -902,6 +905,7 @@ input { overflow: hidden; margin-right: 1%; margin-bottom: 1%; + cursor: pointer; } .card0 { @@ -913,7 +917,7 @@ input { box-shadow: 0px 3px 6px 1px rgba(255, 255, 255, 0.4), inset 0px 3px 6px 1px rgba(255, 255, 255, 0.5); border-radius: 6px 6px 6px 6px; border: 1px solid #FFB519; - + cursor: pointer; font-size: 12px; color: #FFB519; overflow: hidden; @@ -935,6 +939,7 @@ input { overflow: hidden; margin-right: 1%; margin-bottom: 1%; + cursor: pointer; } .card95 { @@ -951,6 +956,7 @@ input { overflow: hidden; margin-right: 1%; margin-bottom: 1%; + cursor: pointer; } .card-title { diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/refuelingAmount.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/refuelingAmount.vue index e658fe69a..730235441 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/refuelingAmount.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/refuelingAmount.vue @@ -12,6 +12,13 @@ export default { resource: '', desc: '' }, + findex:0, + priceList:[ + "¥100", + "¥150", + "¥200", + "¥300", + ], rules: { name: [ { required: true, message: '请输入活动名称', trigger: 'blur' }, @@ -39,6 +46,9 @@ export default { }; }, methods: { + setIndex(index){ + this.findex = index + }, submitForm(formName) { this.$refs[formName].validate((valid) => { if (valid) { @@ -59,15 +69,26 @@ export default { @@ -77,4 +98,42 @@ export default { font-size: 12px; color: #999999; } +.input-box{ + width: 490px; + height: 36px; + border-radius: 4px; + border: 1px solid #eceff1; + box-sizing: border-box; + padding: 10px; + display: flex; + align-items: center; + justify-content: space-between; + margin: 30px auto; + font-size: 14px; + color: #FF9655; +} +.box-{ + width: 490px; + display: flex; + align-items: center; + justify-content: space-between; + margin: 25px auto; +} +.fo-box{ + width: 72px; + height: 36px; + background: #D8D8D8; + display: flex; + align-items: center; + justify-content: center; + border-radius: 4px; + font-size: 14px; + color: #333333; + + cursor: pointer; +} +.active{ + background: #FF9655 !important; + color: #fff !important; +}