From 7a3a4f8012a72f80d8dd62064a76655c803da864 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 29 五月 2024 12:42:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/index.html | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/index.html
index 46a408c..a1cdb74 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/baifenbingfa/corecmsproducts/index.html
@@ -29,9 +29,8 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" for="category">鍟嗗搧鍒嗙被</label>
- <div class="layui-input-inline">
-
- <div id="sel_category_ptindes555" class="ew-xmselect-tree" lay-reqText="璇烽�夋嫨鍟嗗搧鍒嗙被"></div>
+ <div class="layui-input-inline" style="width: 200px;">
+ <div id="sel_category_ptindes555" class="ew-xmselect-tree" lay-reqText="璇烽�夋嫨鍟嗗搧鍒嗙被"></div>
</div>
</div>
<div class="layui-inline">
@@ -80,6 +79,9 @@
</select>
</div>
</div>
+
+
+
<!-- <div class="layui-inline">
<label class="layui-form-label" for="pointsDeduction">绉垎鍙姷鎵ｉ噾棰�</label>
<div class="layui-input-inline">
@@ -161,6 +163,16 @@
</div>
</div> -->
<div class="layui-inline">
+ <label class="layui-form-label" for="isCustomizable">鏄惁鏀寔瀹氬埗</label>
+ <div class="layui-input-inline">
+ <select name="isCustomizable">
+ <option value="">璇烽�夋嫨</option>
+ <option value="True">鏄�</option>
+ <option value="False">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-CoreCmsbaifenProducts-search"><i class="layui-icon layui-icon-search"></i>绛涢��</button>
</div>
</div>
@@ -187,7 +199,7 @@
<i class="layui-icon layui-icon-help"></i>
纭畾瑕佸垹闄ゅ悧锛�
</div>
- <div class="dropdown-popconfirm-btn">
+ <div class="dropdown-popconfirm-btn" >
<a class="layui-btn layui-btn-primary cursor" btn-cancel>鍙栨秷</a>
<a class="layui-btn layui-btn-normal cursor" lay-event="del">纭畾</a>
</div>
@@ -279,7 +291,15 @@
// { field: 'isDefalut', title: '鏄惁榛樿璐у搧', width: 95, templet: '#switch_isDefalut', sort: false , unresize: true},
// { field: 'isDel', title: '鏄惁鍒犻櫎', width: 95, templet: '#switch_isDel', sort: false , unresize: true},
-
+ { field: 'isCustomizable', title: '鏄惁鏀寔瀹氬埗', width: 100, sort: false,
+ templet: function (d) {
+ if (d.isCustomizable==true) {
+ return '<span style="color: red;">鏄�</span>';
+ } else {
+ return '<span>鍚�</span>';
+ }
+ }
+ },
{ width: 162, align: 'center', title:'鎿嶄綔', fixed: 'right', toolbar: '#LAY-app-CoreCmsbaifenProducts-tableBox-bar' }
]
]
@@ -412,9 +432,17 @@
function(data) {
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
- field.marketable = field.marketable == 'on';
- field.isDefalut = field.isDefalut == 'on';
- field.isDel = field.isDel == 'on';
+ // field.marketable = field.marketable == 'on';
+ // field.isDefalut = field.isDefalut == 'on';
+ // field.isDel = field.isDel == 'on';
+ if(field.isCustomizable=='on')
+ {
+ field.isCustomizable=true
+ }
+ else
+ {
+ field.isCustomizable=false
+ }
if (debug) { console.log(field); } //寮�鍚皟璇曡繑鍥炴暟鎹�
//鎻愪氦 Ajax 鎴愬姛鍚庯紝鍏抽棴褰撳墠寮瑰眰骞堕噸杞借〃鏍�
--
Gitblit v1.9.1