商品页面展示修改

platform-admin/src/main/java/com/platform/entity/TbCfStationItemEntity.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * 表名 tb_cf_station_item
  *
  * @author lipengjun
- * @date 2019-10-23 10:35:45
+ * @date 2019-12-23 10:20:34
  */
 public class TbCfStationItemEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -27,7 +27,7 @@ public class TbCfStationItemEntity implements Serializable {
      */
     private String itemName;
     /**
-     * 商品标题简介
+     * 商品标题
      */
     private String itemBrief;
     /**
@@ -46,10 +46,26 @@ public class TbCfStationItemEntity implements Serializable {
      * 商品图片
      */
     private String itemImg;
+    /**
+     * 商品标签
+     */
+    private String itemTags;
     /**
      * 浏览人数
      */
     private Long itemNum;
+    /**
+     * 商品库存
+     */
+    private Long itemCount;
+    /**
+     * 商品规格
+     */
+    private String itemSku;
+    /**
+     * 是否置顶 Y:是 N:否
+     */
+    private String itemTop;
     /**
      * 所属平台
      */
@@ -59,7 +75,7 @@ public class TbCfStationItemEntity implements Serializable {
      */
     private String platformName;
     /**
-     * 启用状态
+     * 状态 0、删除 1、上架 2、下架
      */
     private Integer enableFlag;
     /**
@@ -115,14 +131,14 @@ public class TbCfStationItemEntity implements Serializable {
         return itemName;
     }
     /**
-     * 设置：商品标题简介
+     * 设置：商品标题
      */
     public void setItemBrief(String itemBrief) {
         this.itemBrief = itemBrief;
     }
 
     /**
-     * 获取：商品标题简介
+     * 获取：商品标题
      */
     public String getItemBrief() {
         return itemBrief;
@@ -179,6 +195,19 @@ public class TbCfStationItemEntity implements Serializable {
     public String getItemImg() {
         return itemImg;
     }
+    /**
+     * 设置：商品标签
+     */
+    public void setItemTags(String itemTags) {
+        this.itemTags = itemTags;
+    }
+
+    /**
+     * 获取：商品标签
+     */
+    public String getItemTags() {
+        return itemTags;
+    }
     /**
      * 设置：浏览人数
      */
@@ -192,6 +221,45 @@ public class TbCfStationItemEntity implements Serializable {
     public Long getItemNum() {
         return itemNum;
     }
+    /**
+     * 设置：商品库存
+     */
+    public void setItemCount(Long itemCount) {
+        this.itemCount = itemCount;
+    }
+
+    /**
+     * 获取：商品库存
+     */
+    public Long getItemCount() {
+        return itemCount;
+    }
+    /**
+     * 设置：商品规格
+     */
+    public void setItemSku(String itemSku) {
+        this.itemSku = itemSku;
+    }
+
+    /**
+     * 获取：商品规格
+     */
+    public String getItemSku() {
+        return itemSku;
+    }
+    /**
+     * 设置：是否置顶 Y:是 N:否
+     */
+    public void setItemTop(String itemTop) {
+        this.itemTop = itemTop;
+    }
+
+    /**
+     * 获取：是否置顶 Y:是 N:否
+     */
+    public String getItemTop() {
+        return itemTop;
+    }
     /**
      * 设置：所属平台
      */
@@ -219,14 +287,14 @@ public class TbCfStationItemEntity implements Serializable {
         return platformName;
     }
     /**
-     * 设置：启用状态
+     * 设置：状态 0、删除 1、上架 2、下架
      */
     public void setEnableFlag(Integer enableFlag) {
         this.enableFlag = enableFlag;
     }
 
     /**
-     * 获取：启用状态
+     * 获取：状态 0、删除 1、上架 2、下架
      */
     public Integer getEnableFlag() {
         return enableFlag;

platform-admin/src/main/resources/com/platform/dao/TbCfStationItemDao.xml

@@ -12,7 +12,11 @@
         <result property="itemPrice" column="item_price"/>
         <result property="itemUrl" column="item_url"/>
         <result property="itemImg" column="item_img"/>
-        <result column="item_num" property="itemNum"/>
+        <result property="itemTags" column="item_tags"/>
+        <result property="itemNum" column="item_num"/>
+        <result property="itemCount" column="item_count"/>
+        <result property="itemSku" column="item_sku"/>
+        <result property="itemTop" column="item_top"/>
         <result property="platformCode" column="platform_code"/>
         <result property="platformName" column="platform_name"/>
         <result property="enableFlag" column="enable_flag"/>
@@ -31,7 +35,11 @@
 			`item_price`,
 			`item_url`,
 			`item_img`,
+			`item_tags`,
 			`item_num`,
+			`item_count`,
+			`item_sku`,
+			`item_top`,
 			`platform_code`,
 			`platform_name`,
 			`enable_flag`,
@@ -52,6 +60,7 @@
         i.item_price,
         i.item_url,
         i.item_img,
+		i.item_count,
         i.item_num,
         i.platform_code,
         i.platform_name,
@@ -59,6 +68,7 @@
         i.create_time,
         i.item_categorytwo,
         i.item_descrition_id,
+        i.item_top,
         d.descripition_name dname,
         t.goodstwotype_title title,
         o.goodstype_title goodtype
@@ -108,11 +118,12 @@
 			`item_brief`,
 			`item_category`,
 			`item_price`,
-			`item_url`,
 			`item_img`,
+			`item_tags`,
 			`item_num`,
-			`platform_code`,
-			`platform_name`,
+			`item_count`,
+			`item_sku`,
+			`item_top`,
 			`enable_flag`,
 			`create_time`,
 			`item_categorytwo`,
@@ -124,11 +135,12 @@
 			#{itemBrief},
 			#{itemCategory},
 			#{itemPrice},
-			#{itemUrl},
 			#{itemImg},
+			#{itemTags},
 			#{itemNum},
-			#{platformCode},
-			#{platformName},
+			#{itemCount},
+			#{itemSku},
+			#{itemTop},
 			#{enableFlag},
 			#{createTime},
 			#{itemCategorytwo},
@@ -143,11 +155,11 @@
             <if test="itemBrief != null">`item_brief` = #{itemBrief},</if>
             <if test="itemCategory != null">`item_category` = #{itemCategory},</if>
             <if test="itemPrice != null">`item_price` = #{itemPrice},</if>
-            <if test="itemUrl != null">`item_url` = #{itemUrl},</if>
             <if test="itemImg != null">`item_img` = #{itemImg},</if>
-            <if test="itemNum != null">item_num=#{itemNum},</if>
-            <if test="platformCode != null">`platform_code` = #{platformCode},</if>
-            <if test="platformName != null">`platform_name` = #{platformName},</if>
+            <if test="itemTags != null">`item_tags` = #{itemTags},</if>
+            <if test="itemCount != null">`item_count` = #{itemCount},</if>
+            <if test="itemSku != null">`item_sku` = #{itemSku},</if>
+            <if test="itemTop != null">`item_top` = #{itemTop},</if>
             <if test="enableFlag != null">`enable_flag` = #{enableFlag},</if>
             <if test="createTime != null">`create_time` = #{createTime},</if>
             <if test="itemCategorytwo != null">`item_categorytwo` = #{itemCategorytwo},</if>

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html

@@ -7,21 +7,32 @@
         .ui-jqgrid .ui-jqgrid-bdiv {
             height: auto !important;
         }
+
+        .ivu-row {
+            margin: 5px;
+            position: relative;
+            margin-left: 0;
+            margin-right: 0;
+            height: auto;
+            zoom: 1;
+            display: block;
+            padding: 8px 0;
+        }
     </style>
 </head>
 <body>
-<div id="rrapp" v-cloak>
+<div id="rrapp" v-cloak >
     <div v-show="showList">
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
                     <i-input v-model="q.code" @on-enter="query" placeholder="商品编号">
-                        <span slot="prepend">商品编号:</span>
+                        <span slot="prepend">商品编号：</span>
                     </i-input>
                 </i-col>
                 <i-col span="4">
                     <i-input v-model="q.name" @on-enter="query" placeholder="商品名称">
-                        <span slot="prepend">商品名称:</span>
+                        <span slot="prepend">商品名称：</span>
                     </i-input>
                 </i-col>
                 <i-button @click="query" type="primary"><i class="fa fa-search"></i>查询</i-button>
@@ -35,11 +46,11 @@
                 <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
                 #end
                 #if($shiro.hasPermission("tbcfstationitem:changeItemStatus"))
-                <i-button type="success" @click="changeItemStatus(1)"><i class="fa fa-chevron-up"></i>&nbsp;上架
+                <i-button type="success" @click="changeItemStatus(1)"><i class="fa fa-arrow-up"></i>&nbsp;上架
                 </i-button>
                 #end
                 #if($shiro.hasPermission("tbcfstationitem:changeItemStatus"))
-                <i-button type="warning" @click="changeItemStatus(2)"><i class="fa fa-chevron-down"></i>&nbsp;下架
+                <i-button type="warning" @click="changeItemStatus(2)"><i class="fa fa-arrow-down"></i>&nbsp;下架
                 </i-button>
                 #end
                 #if($shiro.hasPermission("tbcfstationitem:delete"))
@@ -49,7 +60,6 @@
         </Row>
         <table id="jqGrid"></table>
     </div>
-
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
         <i-form ref="formValidate" :model="tbCfStationItem" :rules="ruleValidate" :label-width="80">

platform-admin/src/main/webapp/js/common.js

@@ -712,11 +712,11 @@ yesOrNoFormat = function (cellvalue) {
 itemStatusFormat = function (cellvalue) {
     var returnStr;
     if (cellvalue == '1') {
-        returnStr = "已上架";
+        returnStr = "<i-button class=\"ivu-btn ivu-btn-info\"  style='border-radius:25px;' type=\"info\">在线销售</i-button>";
     } else if (cellvalue == '2') {
-        returnStr = "已下架";
+        returnStr = "<i-button class=\"ivu-btn ivu-btn-warning\"  style='border-radius:25px;' type=\"warning\">已下架</i-button>";
     } else if (cellvalue == '0') {
-        returnStr = "已删除";
+        returnStr = "<i-button class=\"ivu-btn ivu-btn-error\"  style='border-radius:25px;' type=\"error\">已删除</i-button>";
     }
     return returnStr;
 }

platform-admin/src/main/webapp/js/sys/tbcfstationitem.js

@@ -5,18 +5,20 @@ $(function () {
             {label: 'itemId', name: 'itemId', index: 'item_id', key: true, hidden: true},
             {label: '商品图片', name: 'itemImg', index: 'item_img', width: 35, formatter: imageFormat},
             {label: '商品编号', name: 'itemCode', index: 'item_code', width: 60},
-            {label: '商品名字', name: 'itemName', index: 'item_name', width: 120},
-            {label: '商品标题', name: 'itemBrief', index: 'item_brief', width: 120},
+            {label: '商品名称', name: 'itemName', index: 'item_name', width: 160},
+           /* {label: '商品标题', name: 'itemBrief', index: 'item_brief', width: 120},*/
             /*{label: '商品链接', name: 'itemUrl', index: 'item_url', width: 80,formatter:linkFormat},*/
-            {label: '商品价格', name: 'itemPrice', index: 'item_price', width: 60},
-            {label: '点击量', name: 'itemNum', index: 'item_num', width: 60},
+            {label: '商品价格', name: 'itemPrice', index: 'item_price', width: 45},
+            {label: '库存', name: 'itemCount', index: 'item_count', width: 45},
+            {label: '点击量', name: 'itemNum', index: 'item_num', width: 45},
             /*{label: '所属平台', name: 'platformCode', index: 'platform_code', width: 80},
             {label: '平台名', name: 'platformName', index: 'platform_name', width: 80},*/
-            {label: '状态', name: 'enableFlag', index: 'enable_flag', width: 60, formatter: itemStatusFormat},
-            {label: '创建日期', name: 'createTime', index: 'create_time', width: 80},
             {label: '商品一级分类', name: 'goodtype', index: 'goodtype', width: 80},
             {label: '商品二级分类', name: 'title', index: 'title', width: 80},
-            {label: '商品品名', name: 'dname', index: 'itemDescritionId', width: 80}]
+            {label: '商品品名', name: 'dname', index: 'itemDescritionId', width: 80},
+			{label: '状态', name: 'enableFlag', index: 'enable_flag', width: 60, formatter: itemStatusFormat},
+			{label: '创建日期', name: 'createTime', index: 'create_time', width: 80}
+		]
     });
 });
 
@@ -163,7 +165,8 @@ let vm = new Vue({
         },
         reloadSearch: function () {
             vm.q = {
-                name: ''
+                name: '',
+				code: ''
             };
             vm.reload();
         },