From 0f64a74ee3b818bb42b7b9c9b01a9d33c279781b Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期一, 14 八月 2023 18:31:21 +0800
Subject: [PATCH] 管理后台:修复积分商品列表的数据展示

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods.html |   72 +++++++++++++++++++++++------------
 1 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods.html
index 8bea802..d3d1667 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods.html
@@ -12,33 +12,62 @@
                         <div class="row">
 
                             <div class="col-sm-3">
-                                <#NameCon id="name" name="优惠券名称" />
+                                <#NameCon id="name" name="商品名称" />
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="type" name="优惠券类型">
+                                <#SelectCon id="type" name="商品类型">
                                 <option value="">全部</option>
-                                <option value="1">满减券</option>
-                                <option value="2">体验券</option>
-                                <option value="3">代金券</option>
+                                <option value="1">实体商品</option>
+                                <option value="2">课包商品</option>
+                                <option value="3">门票商品</option>
+                                <option value="4">优惠券</option>
                             </#SelectCon>
-                        </div>
-                            <div class="col-sm-3">
-                                <#NameCon id="phone" name="管理员手机号" />
                             </div>
                     <div class="col-sm-3">
-                        <#button name="搜索" icon="fa-search" clickFun="TCompetition.search()"/>
-                        <#button name="重置" icon="fa-trash" clickFun="TCompetition.resetSearch()" space="true"/>
+                        <#SelectCon id="redemptionMethod" name="兑换方式">
+                        <option value="">全部</option>
+                        <option value="1">积分</option>
+                        <option value="2">现金+积分</option>
+                        <option value="3">现金</option>
+                    </#SelectCon>
+                </div>
+                    <div class="col-sm-3">
+                        <#SelectCon id="userPopulation" name="用户人群">
+                        <option value="">全部</option>
+                        <option value="1">全部用户</option>
+                        <option value="2">年度会员</option>
+                        <option value="3">已有学员用户</option>
+                    </#SelectCon>
+                </div>
+                    <div class="col-sm-3">
+                        <#SelectCon id="activeStatus" name="活动状态">
+                        <option value="">全部</option>
+                        <option value="1">未开始</option>
+                        <option value="2">已开始</option>
+                        <option value="3">已结束</option>
+                    </#SelectCon>
+                    </div>
+            <div class="col-sm-3">
+                <#SelectCon id="state" name="可售状态">
+                <option value="">全部</option>
+                <option value="1">上架</option>
+                <option value="2">下架</option>
+            </#SelectCon>
+            </div>
+                    <div class="col-sm-3">
+                        <#button name="搜索" icon="fa-search" clickFun="TPointProducts.search()"/>
+                        <#button name="重置" icon="fa-trash" clickFun="TPointProducts.resetSearch()" space="true"/>
                     </div>
                 </div>
-                <div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
-                    <#button name="添加" icon="fa-plus" clickFun="TCompetition.openAddTCompetition()"/>
-                    <#button name="编辑" icon="fa-edit" clickFun="TCompetition.openTCompetitionDetail()" space="true"/>
-                    <#button name="冻结" icon="fa-remove" clickFun="TCompetition.freeze()" space="true"/>
-                    <#button name="解冻" icon="fa-remove" clickFun="TCompetition.unfreeze()" space="true"/>
-                    <#button name="重置密码" icon="fa-remove" clickFun="TCompetition.reload()" space="true"/>
-
+                <div class="hidden-xs" id="TPointProductsTableToolbar" role="group">
+                    <#button name="添加" icon="fa-plus" clickFun="TPointProducts.openAddTPointProducts()"/>
+                    <#button name="编辑" icon="fa-edit" clickFun="TPointProducts.openEditPage()" space="true"/>
+                    <#button name="上架" icon="fa-remove" clickFun="TPointProducts.grounding(1)" space="true"/>
+                    <#button name="下架" icon="fa-remove" clickFun="TPointProducts.grounding(2)" space="true"/>
+                    <#button name="查看详情" icon="fa-remove" clickFun="TPointProducts.detail()" space="true"/>
+                    <#button name="购买详情" icon="fa-remove" clickFun="TPointProducts.payDetail()" space="true"/>
                 </div>
-                <#table id="TCompetitionTable"/>
+                <#table id="TPointProductsTable"/>
             </div>
         </div>
     </div>
@@ -46,11 +75,4 @@
 </div>
 </div>
 <script src="${ctxPath}/modular/system/tGoods/tGoods.js"></script>
-<script>
-    laydate.render({
-        elem: '#createTime'
-        ,range: true
-        ,lang:"en"
-    });
-</script>
 @}

--
Gitblit v1.7.1