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 000000000..b5196400b Binary files /dev/null and b/fuintCashierWeb/src/views/cashier/NewComponents/imgs/r-j.png differ diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index 10ff5c1bb..ef8a1b414 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
- -
活动优惠 @@ -53,19 +58,13 @@
-
-
-
储值卡(账户余额:0元)
-
+ 储值卡(账户余额:0元) +
¥0.00
-
-
-
囤油卡(账户余额:1000元)
-
+ 囤油卡(账户余额:1000元) +
-¥220.00
@@ -86,7 +85,7 @@
-
{{ item.name }}
+
{{ item.name }}
@@ -106,7 +105,7 @@
-
+
汽油 92#
1号枪
@@ -158,9 +157,13 @@
非油商品
-
- -
+
商品
库存
@@ -189,8 +192,8 @@ 重置
-
取单
-
挂单
+
取单
+
挂单
@@ -210,7 +213,6 @@ 打印二维码 - - 取 消 + 取 消 确 定 @@ -338,7 +340,20 @@ 确认充值 - + +
+ +
+ + 取 消 + 确 定 + +
@@ -346,9 +361,13 @@ 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 { + restaurants: [], + state: '', + timeout: null, boxShow: true, boxShow1: true, boxShow2: true, @@ -414,6 +433,8 @@ export default { id: '4' }, ], + userInfo:true,//判断登录状态 + ruleIndex:0, tabIndex: 0, newMember: false, ScanCodePayment: false, @@ -430,20 +451,37 @@ export default { {min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur'} ], }, + refuelingAmount: false, hangingAnOrder: false, paymentResults: false, pickUpTheOrder: false, accountPending: false, - memberRecharge: true, + memberRecharge: false, } }, components:{ pickUp, accountPending, - memberRecharge + memberRecharge, + refuelingAmount + }, + mounted() { + this.restaurants = this.loadAll(); }, methods: { + invokePickUpTheOrder(){ + this.pickUpTheOrder = true + }, + invokeHangingAnOrder(){ + this.hangingAnOrder = true + }, + addVip(){ + this.newMember = true + }, + addMemberRecharge(){ + this.memberRecharge = true + }, changeBox() { this.boxShow = !this.boxShow }, @@ -455,6 +493,81 @@ export default { }, setTabindex(index) { this.tabIndex = index + }, + setindex(index){ + this.ruleIndex = index + }, + setRefuelingAmount(){ + this.refuelingAmount = true + }, + 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); } } } @@ -792,6 +905,7 @@ input { overflow: hidden; margin-right: 1%; margin-bottom: 1%; + cursor: pointer; } .card0 { @@ -803,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; @@ -825,6 +939,7 @@ input { overflow: hidden; margin-right: 1%; margin-bottom: 1%; + cursor: pointer; } .card95 { @@ -841,6 +956,7 @@ input { overflow: hidden; margin-right: 1%; margin-bottom: 1%; + cursor: pointer; } .card-title { @@ -1009,4 +1125,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; +} 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; +} 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..730235441 --- /dev/null +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/refuelingAmount.vue @@ -0,0 +1,139 @@ + + + + +