From bd01373e31834fced6fb0484129d842217cb6667 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 06 Jan 2021 19:57:35 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 44 ++++++++++----------------------------------
1 files changed, 10 insertions(+), 34 deletions(-)
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 2e32d03..fedb760 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
@@ -461,23 +461,24 @@
<el-col class="paymethod" :span="15">
<el-row>
<ul>
- <div v-for="(item, index) in payMethods">
+ <span v-for="(item, index) in payMethods">
<el-popover
:disabled="item.type != 1"
placement="bottom"
- width="200"
trigger="click">
+ <el-row><span>选择</span></el-row>
<el-tree :data="moneyCards"
show-checkbox
default-expand-all
node-key="id"
ref="tree"
- highlight-current
- :props="defaultProps">
+ check-strictly
+ highlight-current
+ :props="defaultProps">
</el-tree>
- <li :class="{active : item.isActive}" @click="payMethodSelect(item, index)" slot="reference">{{item.value}}</li>
+ <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)">{{item.value}}</li>
</el-popover>
- </div>
+ </span>
</ul>
</el-row>
</el-col>
@@ -579,26 +580,7 @@
},],
achieveList: [],
//会员可用的充值卡
- moneyCards: [
- {
- id: 1,
- label: '一级 1',
- children: [{
- id: 4,
- label: '二级 1-1',
- children: []
- }]
- },
- {
- id: 2,
- label: '一级 2',
- children: [{
- id: 3,
- label: '二级 2-1',
- children: []
- }]
- }
- ],
+ moneyCards: [],
//门店信息
shopInfo: {},
@@ -619,7 +601,7 @@
dialogSettleVisible : true,
defaultProps: {
children: 'children',
- label: 'label'
+ label: 'showLable'
}
},
@@ -698,7 +680,6 @@
}
});
-
},
methods: {
@@ -730,11 +711,6 @@
item.showLable = item.cardName + "-余额:" + (item.realMoney + item.giftMoney)
});
_this.moneyCards = data.rows;
- //启用会员卡支付方式
- _this.payMethods[5].disabled = false;
- } else {
- //禁用会员卡支付方式
- _this.payMethods[5].disabled = true;
}
}
@@ -1110,7 +1086,7 @@
callback: function (data) {
_this.currentVipInfo = data.rows[0];
_this.order.vipId = _this.currentVipInfo.id;
- // _this.getVipMoneyCards();
+ _this.getVipMoneyCards();
}
});
--
Gitblit v1.9.1