From 4b3103e172fc4bb8e476643c11f2f3d3106dbacb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 13 Jun 2026 15:45:31 +0800
Subject: [PATCH] style(frontend): 注释掉多个页面中的冗余表单元素和功能模块
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java | 4
src/main/resources/templates/febs/views/modules/news/newsInfoList.html | 10
src/main/resources/templates/febs/views/modules/order/orderDetail.html | 14
src/main/resources/templates/febs/views/modules/product/categoryAdd.html | 50 ++--
src/main/resources/templates/febs/views/modules/product/categoryUpdate.html | 50 ++--
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 2
src/main/resources/templates/febs/views/modules/news/newsInfoAdd.html | 40 ++--
src/main/resources/templates/febs/views/modules/product/categoryList.html | 10
src/main/resources/templates/febs/views/modules/news/newsInfoUpdate.html | 42 ++--
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 88 ++++----
src/main/resources/templates/febs/views/index.html | 46 ++--
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 66 +++---
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 68 +++---
src/main/resources/templates/febs/views/modules/order/orderList.html | 17 +
14 files changed, 253 insertions(+), 254 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
index e844133..ac5839b 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java
@@ -78,14 +78,10 @@
@RequiresPermissions("deliverGoods:update")
public String deliverGoods(@PathVariable long id, Model model) {
AdminMallOrderVo data = adminMallOrderService.getMallOrderInfoById(id);
- data.setExpressCom("百世快递");
MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id);
if(ObjectUtil.isNotEmpty(mallExpressInfo)){
data.setExpressNo(mallExpressInfo.getExpressNo());
data.setExpressCom(mallExpressInfo.getExpressCom());
- }else{
- data.setExpressCom("百世快递");
-// data.setExpressNo("JT");
}
model.addAttribute("deliverInfo", data);
return FebsUtil.view("modules/order/deliverGoods");
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 9e7f9e6..a0a38d9 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -54,7 +54,7 @@
<select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
select a.*,
- b.name memberName,
+ b.email memberName,
b.bind_phone memberBindPhone,
b.phone memberPhone,
(select member.name from mall_member member where member.invite_id = b.referrer_id) refererName
diff --git a/src/main/resources/templates/febs/views/index.html b/src/main/resources/templates/febs/views/index.html
index f89ff7e..e0b5754 100644
--- a/src/main/resources/templates/febs/views/index.html
+++ b/src/main/resources/templates/febs/views/index.html
@@ -133,29 +133,29 @@
</div>
</div>
- <div class="layui-card-body layui-anim layui-anim-fadein">
- <div class="layui-row">
- <div class="m-title">订单付款</div>
- <div class="layui-row layui-col-space15">
- <div class="layui-col-md3">
- <div class="layui-panel">
- <div class="box">
- <p class="name">微信支付</p>
- <p class="num"><span id="wechatPay"></span></p>
- </div>
- </div>
- </div>
- <div class="layui-col-md3">
- <div class="layui-panel">
- <div class="box">
- <p class="name">余额支付</p>
- <p class="num"><span id="balancePay"></span></p>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
+<!-- <div class="layui-card-body layui-anim layui-anim-fadein">-->
+<!-- <div class="layui-row">-->
+<!-- <div class="m-title">订单付款</div>-->
+<!-- <div class="layui-row layui-col-space15">-->
+<!-- <div class="layui-col-md3">-->
+<!-- <div class="layui-panel">-->
+<!-- <div class="box">-->
+<!-- <p class="name">微信支付</p>-->
+<!-- <p class="num"><span id="wechatPay"></span></p>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-col-md3">-->
+<!-- <div class="layui-panel">-->
+<!-- <div class="box">-->
+<!-- <p class="name">余额支付</p>-->
+<!-- <p class="num"><span id="balancePay"></span></p>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-card-body layui-anim layui-anim-fadein">
<div class="layui-row">
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index 3419a77..a258d79 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -104,20 +104,20 @@
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">推销员返积分比例(%)</label>
- <div class="layui-input-block">
- <input type="text" name="staticMulti" placeholder="请输入推销员返积分比例" autocomplete="off" class="layui-input">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">推销员返积分比例(%)</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticMulti" placeholder="请输入推销员返积分比例" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态占比(%)</label>
- <div class="layui-input-block">
- <input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态占比(%)</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-tab-item">
@@ -244,12 +244,12 @@
<div class="layui-form-item">
<label class="layui-form-label">运费：</label>
<div class="layui-input-block">
- <input type="radio" name="carriageType" value="1" title="固定运费" lay-filter="hasCarriage" />
- <input type="radio" name="carriageType" value="2" title="使用邮费模板" lay-filter="hasCarriage" checked/>
+ <input type="radio" name="carriageType" value="1" title="固定运费" lay-filter="hasCarriage" checked/>
+<!-- <input type="radio" name="carriageType" value="2" title="使用邮费模板" lay-filter="hasCarriage" checked/>-->
</div>
</div>
- <div class="layui-form-item carriage-input febs-hide">
+ <div class="layui-form-item carriage-input">
<div class="layui-col-lg6">
<label class="layui-form-label">固定运费：</label>
<div class="layui-input-block">
@@ -259,24 +259,24 @@
</div>
</div>
- <div class="layui-form-item carriage-rule">
- <div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">邮费模板：</label>
- <div class="layui-input-block">
- <div id="carriage-rule"></div>
- </div>
- </div>
- </div>
+<!-- <div class="layui-form-item carriage-rule">-->
+<!-- <div class="layui-col-lg6">-->
+<!-- <label class="layui-form-label febs-form-item-require">邮费模板：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <div id="carriage-rule"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
- <blockquote class="layui-elem-quote blue-border">优惠卷设置</blockquote>
- <div class="layui-form-item coupon-rule">
- <div class="layui-col-lg6">
- <label class="layui-form-label">优惠卷：</label>
- <div class="layui-input-block">
- <div id="coupon-rule"></div>
- </div>
- </div>
- </div>
+<!-- <blockquote class="layui-elem-quote blue-border">优惠卷设置</blockquote>-->
+<!-- <div class="layui-form-item coupon-rule">-->
+<!-- <div class="layui-col-lg6">-->
+<!-- <label class="layui-form-label">优惠卷：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <div id="coupon-rule"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<blockquote class="layui-elem-quote blue-border">多规格设置</blockquote>
<div class="layui-col-lg6">
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index b169697..8526f9a 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -112,21 +112,21 @@
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">推销员返积分比例(%)</label>
- <div class="layui-input-block">
- <input type="text" name="staticMulti" placeholder="请输入推销员返积分比例" autocomplete="off" class="layui-input">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">推销员返积分比例(%)</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticMulti" placeholder="请输入推销员返积分比例" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item febs-hide tc-set">
- <label class="layui-form-label">静态占比(%)</label>
- <div class="layui-input-block">
- <input type="text" name="staticProp" placeholder="请输入静态占比"
- autoComplete="off" class="layui-input">
- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
- </div>
- </div>
+<!-- <div class="layui-form-item febs-hide tc-set">-->
+<!-- <label class="layui-form-label">静态占比(%)</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="staticProp" placeholder="请输入静态占比"-->
+<!-- autoComplete="off" class="layui-input">-->
+<!-- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-tab-item">
@@ -267,12 +267,12 @@
<div class="layui-form-item">
<label class="layui-form-label">运费：</label>
<div class="layui-input-block">
- <input type="radio" name="carriageType" value="1" title="固定运费" lay-filter="hasCarriage" />
- <input type="radio" name="carriageType" value="2" title="使用邮费模板" lay-filter="hasCarriage" checked/>
+ <input type="radio" name="carriageType" value="1" title="固定运费" lay-filter="hasCarriage" checked/>
+<!-- <input type="radio" name="carriageType" value="2" title="使用邮费模板" lay-filter="hasCarriage" checked/>-->
</div>
</div>
- <div class="layui-form-item carriage-input febs-hide">
+ <div class="layui-form-item carriage-input">
<div class="layui-col-lg6">
<label class="layui-form-label">固定运费：</label>
<div class="layui-input-block">
@@ -282,24 +282,24 @@
</div>
</div>
- <div class="layui-form-item carriage-rule">
- <div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">邮费模板：</label>
- <div class="layui-input-block">
- <div id="carriage-rule"></div>
- </div>
- </div>
- </div>
+<!-- <div class="layui-form-item carriage-rule">-->
+<!-- <div class="layui-col-lg6">-->
+<!-- <label class="layui-form-label febs-form-item-require">邮费模板：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <div id="carriage-rule"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
- <blockquote class="layui-elem-quote blue-border">优惠卷设置</blockquote>
- <div class="layui-form-item coupon-rule">
- <div class="layui-col-lg6">
- <label class="layui-form-label">优惠卷：</label>
- <div class="layui-input-block">
- <div id="coupon-rule"></div>
- </div>
- </div>
- </div>
+<!-- <blockquote class="layui-elem-quote blue-border">优惠卷设置</blockquote>-->
+<!-- <div class="layui-form-item coupon-rule">-->
+<!-- <div class="layui-col-lg6">-->
+<!-- <label class="layui-form-label">优惠卷：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <div id="coupon-rule"></div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<blockquote class="layui-elem-quote blue-border">多规格设置</blockquote>
<div class="layui-col-lg6">
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 7513d12..b9b5c4b 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -13,29 +13,29 @@
<input type="text" placeholder="用户昵称" name="name" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">手机号码</label>
- <div class="layui-input-inline">
- <input type="text" placeholder="手机号码" name="account" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">会员类型</label>
- <div class="layui-input-inline">
- <select name="level">
- <option value="">请选择</option>
- <option value="ZERO_LEVEL">普通用户</option>
- <option value="FIRST_LEVEL">城市合伙人</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">会员生日</label>
- <div class="layui-input-inline">
- <input type="text" name="birthday" id="febs-member-benefits-list-birthday-start" lay-verify="date"
- placeholder="MM-dd" autocomplete="off" class="layui-input">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label layui-form-label-sm">手机号码</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input type="text" placeholder="手机号码" name="account" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label layui-form-label-sm">会员类型</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="level">-->
+<!-- <option value="">请选择</option>-->
+<!-- <option value="ZERO_LEVEL">普通用户</option>-->
+<!-- <option value="FIRST_LEVEL">城市合伙人</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label layui-form-label-sm">会员生日</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input type="text" name="birthday" id="febs-member-benefits-list-birthday-start" lay-verify="date"-->
+<!-- placeholder="MM-dd" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -104,12 +104,12 @@
</style>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">余额充值</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">积分充值</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">登录密码重置</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateReferer">修改推荐人</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateVipLevel">修改会员等级</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="addCoupon">优惠券派送</button>
+<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">余额充值</button>-->
+<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">积分充值</button>-->
+<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">登录密码重置</button>-->
+<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateReferer">修改推荐人</button>-->
+<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateVipLevel">修改会员等级</button>-->
+<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="addCoupon">优惠券派送</button>-->
</div>
</script>
<!-- 表格操作栏 end -->
@@ -287,18 +287,18 @@
defaultToolbar:[],
cols: [[
{type: 'checkbox'},
- {field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
+ {field: 'email', title: '账号', minWidth: 150,align:'left'},
{field: 'name', title: '用户昵称', minWidth: 100,align:'left'},
- {field: 'birthday', title: '会员生日', minWidth: 100,align:'left'},
- {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
- {field: 'balance', title: '余额', minWidth: 100,align:'left'},
+ // {field: 'birthday', title: '会员生日', minWidth: 100,align:'left'},
+ // {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
+ // {field: 'balance', title: '余额', minWidth: 100,align:'left'},
// {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
- {field: 'prizeScore', title: '积分', minWidth: 100,align:'left'},
+ // {field: 'prizeScore', title: '积分', minWidth: 100,align:'left'},
// {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
- {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
- {field: 'levelName', title: '会员等级', minWidth: 100,align:'left'},
// {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
- {field: 'isSalesman', title: '推销员设置', templet: '#isSalesmanSwitch', minWidth: 100,align:'center'},
+ // {field: 'levelName', title: '会员等级', minWidth: 100,align:'left'},
+ // {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
+ // {field: 'isSalesman', title: '推销员设置', templet: '#isSalesmanSwitch', minWidth: 100,align:'center'},
// {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
// {field: 'accountType', title: '账号类型',
// templet: function (d) {
@@ -324,13 +324,13 @@
// }, minWidth: 100,align:'center'},
// {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'center'},
{field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
- {title: '操作',
- templet: function (d) {
- return ''
- +'<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="memberOut" shiro:hasPermission="user:update">注销</button>'
- // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'
-
- },minWidth: 200,align:'center'}
+ // {title: '操作',
+ // templet: function (d) {
+ // return ''
+ // +'<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="memberOut" shiro:hasPermission="user:update">注销</button>'
+ // // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'
+ //
+ // },minWidth: 200,align:'center'}
]]
});
}
diff --git a/src/main/resources/templates/febs/views/modules/news/newsInfoAdd.html b/src/main/resources/templates/febs/views/modules/news/newsInfoAdd.html
index 8c361ee..d9e5ace 100644
--- a/src/main/resources/templates/febs/views/modules/news/newsInfoAdd.html
+++ b/src/main/resources/templates/febs/views/modules/news/newsInfoAdd.html
@@ -37,27 +37,27 @@
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">视频：</label>
- <div class="layui-input-block">
- <button type="button" class="layui-btn upload" id="upload" style="background-color: #009688; margin-bottom: 2px">上传文件</button>
- <input type="text" name="videoUrl" autocomplete="off" value="" id="videoUrl" class="layui-input" readonly>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">视频：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <button type="button" class="layui-btn upload" id="upload" style="background-color: #009688; margin-bottom: 2px">上传文件</button>-->
+<!-- <input type="text" name="videoUrl" autocomplete="off" value="" id="videoUrl" class="layui-input" readonly>-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item">
- <label class="layui-form-label">缩略图：</label>
- <div class="layui-input-block">
- <button type="button" class="layui-btn" id="imageUpload" style="background-color: #009688; margin-bottom: 2px">图片上传</button>
- <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
- <div class=" layui-upload-list view-images" id="thumbImage">
- </div>
- </blockquote>
- <div class="febs-hide">
- <input type="text" id="thumb" name="thumb" autocomplete="off" class="layui-input" readonly>
- </div>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">缩略图：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <button type="button" class="layui-btn" id="imageUpload" style="background-color: #009688; margin-bottom: 2px">图片上传</button>-->
+<!-- <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">-->
+<!-- <div class=" layui-upload-list view-images" id="thumbImage">-->
+<!-- </div>-->
+<!-- </blockquote>-->
+<!-- <div class="febs-hide">-->
+<!-- <input type="text" id="thumb" name="thumb" autocomplete="off" class="layui-input" readonly>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">内容：</label>
diff --git a/src/main/resources/templates/febs/views/modules/news/newsInfoList.html b/src/main/resources/templates/febs/views/modules/news/newsInfoList.html
index 4d6d8b7..153a982 100644
--- a/src/main/resources/templates/febs/views/modules/news/newsInfoList.html
+++ b/src/main/resources/templates/febs/views/modules/news/newsInfoList.html
@@ -130,11 +130,11 @@
cols: [[
{field: 'title', title: '标题', minWidth: 120,align:'center'},
{field: 'categoryName', title: '分类', minWidth: 120,align:'center'},
- {field: 'thumb', title: '缩略图',
- templet: function (d) {
- return '<a lay-event="seeImgThumb"><img id="seeImgThumb'+d.id+'" src="'+d.thumb+'" alt=""></a>';
- }, minWidth: 150,align:'center'},
- {templet: '#isTopSwitch', title: '是否首页显示', minWidth: 120,align:'center'},
+ // {field: 'thumb', title: '缩略图',
+ // templet: function (d) {
+ // return '<a lay-event="seeImgThumb"><img id="seeImgThumb'+d.id+'" src="'+d.thumb+'" alt=""></a>';
+ // }, minWidth: 150,align:'center'},
+ // {templet: '#isTopSwitch', title: '是否首页显示', minWidth: 120,align:'center'},
{field: 'createdTime', title: '创建时间', minWidth: 120,align:'center'},
{title: '操作',
templet: function (d) {
diff --git a/src/main/resources/templates/febs/views/modules/news/newsInfoUpdate.html b/src/main/resources/templates/febs/views/modules/news/newsInfoUpdate.html
index 4261a16..31befb4 100644
--- a/src/main/resources/templates/febs/views/modules/news/newsInfoUpdate.html
+++ b/src/main/resources/templates/febs/views/modules/news/newsInfoUpdate.html
@@ -43,28 +43,28 @@
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">视频：</label>
- <div class="layui-input-block">
- <button type="button" class="layui-btn upload" id="upload" style="background-color: #009688; margin-bottom: 2px">上传文件</button>
- <button type="button" class="layui-btn layui-btn-danger" id="uploadDel" style="margin-bottom: 2px">删除</button>
- <input type="text" name="videoUrl" autocomplete="off" value="" id="videoUrl" class="layui-input" readonly>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">视频：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <button type="button" class="layui-btn upload" id="upload" style="background-color: #009688; margin-bottom: 2px">上传文件</button>-->
+<!-- <button type="button" class="layui-btn layui-btn-danger" id="uploadDel" style="margin-bottom: 2px">删除</button>-->
+<!-- <input type="text" name="videoUrl" autocomplete="off" value="" id="videoUrl" class="layui-input" readonly>-->
+<!-- </div>-->
+<!-- </div>-->
- <div class="layui-form-item">
- <label class="layui-form-label">缩略图：</label>
- <div class="layui-input-block">
- <button type="button" class="layui-btn" id="imageUpload" style="background-color: #009688; margin-bottom: 2px">图片上传</button>
- <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
- <div class="layui-upload-list" id="thumbImage"></div>
- </blockquote>
- <div class="layui-word-aux">双击图片删除</div>
- <div class="febs-hide">
- <input type="text" id="thumb" name="thumb" autocomplete="off" class="layui-input" readonly>
- </div>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">缩略图：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <button type="button" class="layui-btn" id="imageUpload" style="background-color: #009688; margin-bottom: 2px">图片上传</button>-->
+<!-- <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">-->
+<!-- <div class="layui-upload-list" id="thumbImage"></div>-->
+<!-- </blockquote>-->
+<!-- <div class="layui-word-aux">双击图片删除</div>-->
+<!-- <div class="febs-hide">-->
+<!-- <input type="text" id="thumb" name="thumb" autocomplete="off" class="layui-input" readonly>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">内容：</label>
diff --git a/src/main/resources/templates/febs/views/modules/order/orderDetail.html b/src/main/resources/templates/febs/views/modules/order/orderDetail.html
index a65cd5b..0a32be7 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderDetail.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderDetail.html
@@ -46,13 +46,13 @@
autocomplete="off" class="layui-input" readonly>
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">地址：</label>
- <div class="layui-input-block">
- <input type="text" name="addressInfo"
- autocomplete="off" class="layui-input" readonly>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">地址：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="addressInfo"-->
+<!-- autocomplete="off" class="layui-input" readonly>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">支付订单号：</label>-->
<!-- <div class="layui-input-block">-->
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index c8c8b7c..a9be387 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -125,8 +125,8 @@
<button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="printSelect">自定义打印</button>
<button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="goodsStatistics">统计商品份数</button>
<!-- <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain">自定义打印</button>-->
- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverTwo">导出未发货订单（快递）</button>
- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button>
+<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverTwo">导出未发货订单（快递）</button>-->
+<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button>-->
</div>
</script>
<!-- 表格操作栏 end -->
@@ -638,9 +638,9 @@
{field: 'orderNo', title: '订单编号', minWidth: 200,align:'left' ,totalRowText:"合计"},
{field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
- {field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
+ // {field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
- {field: 'remark', title: '备注', minWidth: 160,align:'left'},
+ // {field: 'remark', title: '备注', minWidth: 160,align:'left'},
{field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
{field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
{field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true},
@@ -677,15 +677,18 @@
// return ''
// }
// }, minWidth: 80,align:'center'},
- {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
+ // {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
{field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
// {field: 'wxOrderNo', title: '支付订单号', minWidth: 120,align:'left'},
{title: '操作',
templet: function (d) {
if(d.status === 2){
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverPdfGoods" shiro:hasPermission="user:update">一键发货</button>'
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
+ // +''
+ // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverPdfGoods" shiro:hasPermission="user:update">一键发货</button>'
+ // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+ // // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
}else if(d.status === 3){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="cancelDeliver" shiro:hasPermission="user:update">取消发货</button>'
diff --git a/src/main/resources/templates/febs/views/modules/product/categoryAdd.html b/src/main/resources/templates/febs/views/modules/product/categoryAdd.html
index 9ab63c7..4ddaeff 100644
--- a/src/main/resources/templates/febs/views/modules/product/categoryAdd.html
+++ b/src/main/resources/templates/febs/views/modules/product/categoryAdd.html
@@ -30,31 +30,31 @@
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">父类：</label>
- <div class="layui-input-inline">
- <select name="parentId" class="categary-add-category">
- <option value="">请选择</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">图片：</label>
- <div class="layui-upload">
- <button type="button" class="layui-btn" id="test1">上传图片</button>
- <div class="layui-input-block">
- <div class="layui-upload-list">
- <img class="layui-upload-img" id="imageUrls" width="100%" >
- </div>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label ">图片链接：</label>
- <div class="layui-input-block">
- <input type="text" id="imageUrl" lay-verify="required" name="image" class="layui-input" readonly>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">父类：</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="parentId" class="categary-add-category">-->
+<!-- <option value="">请选择</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label febs-form-item-require">图片：</label>-->
+<!-- <div class="layui-upload">-->
+<!-- <button type="button" class="layui-btn" id="test1">上传图片</button>-->
+<!-- <div class="layui-input-block">-->
+<!-- <div class="layui-upload-list">-->
+<!-- <img class="layui-upload-img" id="imageUrls" width="100%" >-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label ">图片链接：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" id="imageUrl" lay-verify="required" name="image" class="layui-input" readonly>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label ">父类：</label>-->
<!-- <div class="layui-input-block">-->
diff --git a/src/main/resources/templates/febs/views/modules/product/categoryList.html b/src/main/resources/templates/febs/views/modules/product/categoryList.html
index 6be61b3..bf9dbe2 100644
--- a/src/main/resources/templates/febs/views/modules/product/categoryList.html
+++ b/src/main/resources/templates/febs/views/modules/product/categoryList.html
@@ -154,11 +154,11 @@
url: ctx + 'admin/goodsCategory/categoryList',
cols: [[
{field: 'name', title: '名称', minWidth: 150,align:'left'},
- {field: 'parentName', title: '父级名称', minWidth: 150,align:'left'},
- {field: 'image', title: '图片',
- templet: function (d) {
- return '<a lay-event="seeImges"><img id="seeImges'+d.id+'" src="'+d.image+'" alt=""></a>';
- }, minWidth: 100,align:'center'},
+ // {field: 'parentName', title: '父级名称', minWidth: 150,align:'left'},
+ // {field: 'image', title: '图片',
+ // templet: function (d) {
+ // return '<a lay-event="seeImges"><img id="seeImges'+d.id+'" src="'+d.image+'" alt=""></a>';
+ // }, minWidth: 100,align:'center'},
{field: 'indexNum', title: '排序', minWidth: 150,align:'left'},
{title: '操作',
templet: function (d) {
diff --git a/src/main/resources/templates/febs/views/modules/product/categoryUpdate.html b/src/main/resources/templates/febs/views/modules/product/categoryUpdate.html
index ead3a7c..f9b1d73 100644
--- a/src/main/resources/templates/febs/views/modules/product/categoryUpdate.html
+++ b/src/main/resources/templates/febs/views/modules/product/categoryUpdate.html
@@ -36,31 +36,31 @@
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">父类：</label>
- <div class="layui-input-inline">
- <select name="parentId" class="categary-update-category" id="categarySelect">
- <option value="">请选择</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">图片：</label>
- <div class="layui-upload">
- <button type="button" class="layui-btn" id="test1">上传图片</button>
- <div class="layui-input-block">
- <div class="layui-upload-list">
- <img class="layui-upload-img" id="imageUrls" width="100%" >
- </div>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">图片链接：</label>
- <div class="layui-input-block">
- <input type="text" id="imageUrl" name="image" class="layui-input" readonly>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">父类：</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="parentId" class="categary-update-category" id="categarySelect">-->
+<!-- <option value="">请选择</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">图片：</label>-->
+<!-- <div class="layui-upload">-->
+<!-- <button type="button" class="layui-btn" id="test1">上传图片</button>-->
+<!-- <div class="layui-input-block">-->
+<!-- <div class="layui-upload-list">-->
+<!-- <img class="layui-upload-img" id="imageUrls" width="100%" >-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">图片链接：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" id="imageUrl" name="image" class="layui-input" readonly>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">是否推荐：</label>
<div class="layui-input-block">
--
Gitblit v1.9.1