From a5c67e27c22831e54e0a4b9eb22166368d446673 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 18 Mar 2021 15:27:03 +0800
Subject: [PATCH] 积分商城1

---
 zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-list.html |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 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 a7e7d16..e07f5e5 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
@@ -35,10 +35,18 @@
                 <input autocomplete="off" id="search-text" name="title" placeholder="输入查询关键词"
                        type="text" class="form-control">
             </div>
-
+            <div class="form-group">
+                <label class="control-label">上架卖场</label>
+                <select style="width:100px;" class="form-control select2" size="1"
+                        name="mallType" >
+                    <option value="">请选择</option>
+                    <option value="1">微商城</option>
+                    <option value="2">积分商城</option>
+                </select>
+            </div>
             <div class="form-group">
                 <label class="control-label">是否上架</label>
-                <select style="width:200px;" class="form-control select2" size="1"
+                <select style="width:100px;" class="form-control select2" size="1"
                         name="status"
                         id="status">
                     <option value="">请选择</option>
@@ -47,10 +55,10 @@
                 </select>
             </div>
             <div class="form-group">
-                <label class="control-label">是否为服务</label>
-                <select style="width:200px;" class="form-control select2" size="1"
-                        name="isService"
-                        id="isService">
+                <label class="control-label">是否可分销</label>
+                <select style="width:100px;" class="form-control select2" size="1"
+                        name="ableSales"
+                        id="ableSales">
                     <option value="">请选择</option>
                     <option value="1">是</option>
                     <option value="2">否</option>
@@ -114,12 +122,12 @@
                 <tr>
                     <th data-checkbox="true"></th>
                     <th data-formatter="MGrid.indexfn" data-align="center">序号</th>
-                    <th data-field="id" data-align="center">产品ID</th>
+                    <th data-field="mallType" data-align="center" data-formatter="mallType">上架卖场</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>
                     <th data-field="price" data-align="center">价格</th>
-                    <th data-field="score" data-align="center">积分</th>
+                    <th data-field="scorePrice" data-align="center">兑换所需积分</th>
                     <th data-field="status" data-align="center" data-formatter="isStatus">是否上架</th>
                     <th data-field="rsVolume" data-align="center">真实销量</th>
 
@@ -275,7 +283,7 @@
     //初始化属性下拉选
     function initAttrsSeclect(seler, def) {
         console.log(1);
-        $.AjaxProxy().invoke(basePath + "/admin/shopProductAttribute/showSonAttribute?attrCode=cpfl",
+        $.AjaxProxy().invoke(basePath + "/admin/shopProductAttribute/showSonAttribute?attrCode=productColumn",
             function (loj) {
                 $(seler).createSelectTree(
                     loj.attr("result").rows,
@@ -290,6 +298,16 @@
             });
     }
 
+    function mallType(value, row, index) {
+        var html = "";
+        if (value ==1) {
+          html="微商城"
+        }else{
+            html="积分商城"
+        }
+        return html;
+    }
+
     /**
      * 格式化属性
      */

--
Gitblit v1.9.1