From 9eeb9eae3901ce446908b97720c3347df19a567a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 13 Jan 2021 18:41:53 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/static/images/pay/cash.png                               |    0 
 zq-erp/src/main/resources/static/images/pay/tuan.png                               |    0 
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html      |   11 +++++++++--
 zq-erp/src/main/resources/static/images/pay/wechat.png                             |    0 
 zq-erp/src/main/resources/static/images/pay/yinlian.png                            |    0 
 zq-erp/src/main/resources/static/images/pay/card.png                               |    0 
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html |   14 ++++++++++----
 zq-erp/src/main/resources/static/images/pay/zhifubao.png                           |    0 
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html   |   13 ++++++++++---
 zq-erp/src/main/resources/static/images/pay/qian.png                               |    0 
 10 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/zq-erp/src/main/resources/static/images/pay/card.png b/zq-erp/src/main/resources/static/images/pay/card.png
new file mode 100644
index 0000000..5265578
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/pay/card.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/pay/cash.png b/zq-erp/src/main/resources/static/images/pay/cash.png
new file mode 100644
index 0000000..26b92e5
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/pay/cash.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/pay/qian.png b/zq-erp/src/main/resources/static/images/pay/qian.png
new file mode 100644
index 0000000..ab49f33
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/pay/qian.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/pay/tuan.png b/zq-erp/src/main/resources/static/images/pay/tuan.png
new file mode 100644
index 0000000..d4eb1c5
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/pay/tuan.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/pay/wechat.png b/zq-erp/src/main/resources/static/images/pay/wechat.png
new file mode 100644
index 0000000..e7930a7
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/pay/wechat.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/pay/yinlian.png b/zq-erp/src/main/resources/static/images/pay/yinlian.png
new file mode 100644
index 0000000..9a16785
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/pay/yinlian.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/pay/zhifubao.png b/zq-erp/src/main/resources/static/images/pay/zhifubao.png
new file mode 100644
index 0000000..02ce6dd
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/pay/zhifubao.png
Binary files differ
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
index 432cd98..9e84d99 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
@@ -86,7 +86,7 @@
 										 @check="(click, checked,$item)=>{handleCheckChange(click, checked,$item)}"
 										 :props="defaultProps">
                                 </el-tree>
-                                <li :class="{active : item.isActive}" v-if="item.value != '欠款'" slot="reference" @click="payMethodSelect(item, index)">{{item.value}}</li>
+                                <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)"><div style="line-height: 30px;"><img style="width: 25px; height: 25px;" :src="item.img"><span style="line-height: 30px; margin-left: 5px;">{{item.value}}</span></div></li>
                             </el-popover>
                         </span>
 					</ul>
@@ -129,30 +129,37 @@
 			order : "",
 			payMethods: [{
 				value: '现金支付',
+				img: '/images/pay/cash.png',
 				isActive: false,
 				type: '现金支付'
 			}, {
 				value: '微信',
+				img: '/images/pay/wechat.png',
 				isActive: false,
 				type: '微信'
 			}, {
 				value: '支付宝',
+				img: '/images/pay/zhifubao.png',
 				isActive: false,
 				type: '支付宝'
 			}, {
 				value: '银行卡',
+				img: '/images/pay/yinlian.png',
 				isActive: false,
 				type: '银行卡'
 			}, {
 				value: '团购',
+				img: '/images/pay/tuan.png',
 				isActive: false,
 				type: '团购'
 			}, {
 				value: '储值卡',
+				img: '/images/pay/card.png',
 				isActive: false,
 				type: '储值卡'
-			}, {
+			},{
 				value: '欠款',
+				img: '/images/pay/qian.png',
 				isActive: false,
 				type: '欠款'
 			},],
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index f48645d..00ca519 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -482,7 +482,7 @@
 
         <el-row type="flex" align="middle" style="padding: 10px 0;">
             <el-col :span="5" style="text-align: center;">收款方式</el-col>
-            <el-col class="paymethod" :span="15">
+            <el-col class="paymethod" :span="18">
                 <el-row>
                     <ul>
                         <span v-for="(item, index) in payMethods">
@@ -502,7 +502,7 @@
                                          @check="(click, checked,$item)=>{handleCheckChange(click, checked,$item)}"
                                          :props="defaultProps">
                                 </el-tree>
-                                <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)">{{item.value}}</li>
+                                <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)"><div style="line-height: 30px;"><img style="width: 25px; height: 25px;" :src="item.img"><span style="margin-left: 5px;">{{item.value}}</span></div></li>
                             </el-popover>
                         </span>
                     </ul>
@@ -575,30 +575,37 @@
             vipLoading: false,
             payMethods: [{
                 value: '现金支付',
+                img: '/images/pay/cash.png',
                 isActive: false,
                 type: '现金支付'
             }, {
                 value: '微信',
+                img: '/images/pay/wechat.png',
                 isActive: false,
                 type: '微信'
             }, {
                 value: '支付宝',
+                img: '/images/pay/zhifubao.png',
                 isActive: false,
                 type: '支付宝'
             }, {
                 value: '银行卡',
+                img: '/images/pay/yinlian.png',
                 isActive: false,
                 type: '银行卡'
             }, {
                 value: '团购',
+                img: '/images/pay/tuan.png',
                 isActive: false,
                 type: '团购'
             }, {
                 value: '储值卡',
+                img: '/images/pay/card.png',
                 isActive: false,
                 type: '储值卡'
-            }, {
+            },{
                 value: '欠款',
+                img: '/images/pay/qian.png',
                 isActive: false,
                 type: '欠款'
             },],
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
index a74d698..6b88037 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
@@ -410,7 +410,7 @@
 
         <el-row type="flex" align="middle" style="padding: 10px 0;">
             <el-col :span="5" style="text-align: center;">退款方式</el-col>
-            <el-col class="paymethod" :span="15">
+            <el-col class="paymethod" :span="18">
                 <el-row>
                     <ul>
                         <span v-for="(item, index) in payMethods">
@@ -430,7 +430,7 @@
                                          @check="(click, checked,$item)=>{handleCheckChange(click, checked,$item)}"
                                          :props="defaultProps">
                                 </el-tree>
-                                <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)">{{item.value}}</li>
+                                <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)"><div style="line-height: 30px;"><img style="width: 25px; height: 25px;" :src="item.img"><span style="line-height: 30px; margin-left: 5px;">{{item.value}}</span></div></li>
                             </el-popover>
                         </span>
                     </ul>
@@ -495,31 +495,37 @@
             isReturnAchieve : false,
             payMethods: [{
                 value: '现金支付',
+                img: '/images/pay/cash.png',
                 isActive: false,
                 type: '现金支付'
             }, {
                 value: '微信',
+                img: '/images/pay/wechat.png',
                 isActive: false,
                 type: '微信'
             }, {
                 value: '支付宝',
+                img: '/images/pay/zhifubao.png',
                 isActive: false,
                 type: '支付宝'
             }, {
                 value: '银行卡',
+                img: '/images/pay/yinlian.png',
                 isActive: false,
                 type: '银行卡'
             }, {
                 value: '团购',
+                img: '/images/pay/tuan.png',
                 isActive: false,
                 type: '团购'
             }, {
                 value: '储值卡',
+                img: '/images/pay/card.png',
                 isActive: false,
                 type: '储值卡'
             }, ],
 
-            dialogSettleVisible : false,
+            dialogSettleVisible : true,
             moneyCards: [],
             defaultProps: {
                 children: 'children',
@@ -552,7 +558,7 @@
                         _this.vipInfo = mapInfo.vipInfo;
                         _this.order = mapInfo.order;
                         _this.orderItems = mapInfo.orderItems;
-                        _this.payMethodItems = mapInfo.payMethodItems;
+                        _this.payMethodItems = mapInfo.payMethods;
                         _this.achieveItems = mapInfo.achieveList;
 
                         _this.flowItems = _this.order.flows;

--
Gitblit v1.9.1