From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-list.html | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-list.html b/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-list.html
index e07f5e5..6f7468a 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-list.html
@@ -36,12 +36,12 @@
type="text" class="form-control">
</div>
<div class="form-group">
- <label class="control-label">上架卖场</label>
+ <label class="control-label">积分抵扣</label>
<select style="width:100px;" class="form-control select2" size="1"
- name="mallType" >
+ name="ableScorePay" >
<option value="">请选择</option>
- <option value="1">微商城</option>
- <option value="2">积分商城</option>
+ <option value="1">可抵扣</option>
+ <option value="2">不可抵扣</option>
</select>
</div>
<div class="form-group">
@@ -122,7 +122,8 @@
<tr>
<th data-checkbox="true"></th>
<th data-formatter="MGrid.indexfn" data-align="center">序号</th>
- <th data-field="mallType" data-align="center" data-formatter="mallType">上架卖场</th>
+ <th data-field="id" data-align="center" >ID</th>
+ <th data-field="ableScorePay" data-align="center" data-formatter="ableScorePay">积分抵扣</th>
<th data-field="title" data-align="center">产品名称</th>
<th data-field="imgMobile" data-align="center" data-formatter="MGrid.getImage">产品图片</th>
<th data-field="attrValues" data-align="center" data-formatter="formatAttr">产品属性</th>
@@ -298,12 +299,12 @@
});
}
- function mallType(value, row, index) {
+ function ableScorePay(value, row, index) {
var html = "";
if (value ==1) {
- html="微商城"
+ html="可抵扣"
}else{
- html="积分商城"
+ html="不可抵扣"
}
return html;
}
--
Gitblit v1.9.1