From 8c8668538804f9ea32e161f49e0c4633f53c23c2 Mon Sep 17 00:00:00 2001
From: zhh <zh@thinkerx.com>
Date: Tue, 13 Nov 2018 11:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=93=81=E3=80=81=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E3=80=81=E6=8E=A8=E8=8D=90=E4=B8=93=E9=A2=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/homeSubject.js          |  40 +++
 src/api/hotProduct.js           |  40 +++
 src/api/newProduct.js           |  40 +++
 src/views/sms/hot/index.vue     | 425 +++++++++++++++++++++++++++++++-
 src/views/sms/new/index.vue     | 425 +++++++++++++++++++++++++++++++-
 src/views/sms/subject/index.vue | 425 +++++++++++++++++++++++++++++++-
 6 files changed, 1383 insertions(+), 12 deletions(-)
 create mode 100644 src/api/homeSubject.js
 create mode 100644 src/api/hotProduct.js
 create mode 100644 src/api/newProduct.js

diff --git a/src/api/homeSubject.js b/src/api/homeSubject.js
new file mode 100644
index 0000000..7588922
--- /dev/null
+++ b/src/api/homeSubject.js
@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+export function fetchList(params) {
+  return request({
+    url:'/home/recommendSubject/list',
+    method:'get',
+    params:params
+  })
+}
+
+export function updateRecommendStatus(data) {
+  return request({
+    url:'/home/recommendSubject/update/recommendStatus',
+    method:'post',
+    data:data
+  })
+}
+
+export function deleteHomeSubject(data) {
+  return request({
+    url:'/home/recommendSubject/delete',
+    method:'post',
+    data:data
+  })
+}
+
+export function createHomeSubject(data) {
+  return request({
+    url:'/home/recommendSubject/create',
+    method:'post',
+    data:data
+  })
+}
+
+export function updateHomeSubjectSort(params) {
+  return request({
+    url:'/home/recommendSubject/update/sort/'+params.id,
+    method:'post',
+    params:params
+  })
+}
diff --git a/src/api/hotProduct.js b/src/api/hotProduct.js
new file mode 100644
index 0000000..4b5cead
--- /dev/null
+++ b/src/api/hotProduct.js
@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+export function fetchList(params) {
+  return request({
+    url:'/home/recommendProduct/list',
+    method:'get',
+    params:params
+  })
+}
+
+export function updateRecommendStatus(data) {
+  return request({
+    url:'/home/recommendProduct/update/recommendStatus',
+    method:'post',
+    data:data
+  })
+}
+
+export function deleteHotProduct(data) {
+  return request({
+    url:'/home/recommendProduct/delete',
+    method:'post',
+    data:data
+  })
+}
+
+export function createHotProduct(data) {
+  return request({
+    url:'/home/recommendProduct/create',
+    method:'post',
+    data:data
+  })
+}
+
+export function updateHotProductSort(params) {
+  return request({
+    url:'/home/recommendProduct/update/sort/'+params.id,
+    method:'post',
+    params:params
+  })
+}
diff --git a/src/api/newProduct.js b/src/api/newProduct.js
new file mode 100644
index 0000000..e823745
--- /dev/null
+++ b/src/api/newProduct.js
@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+export function fetchList(params) {
+  return request({
+    url:'/home/newProduct/list',
+    method:'get',
+    params:params
+  })
+}
+
+export function updateRecommendStatus(data) {
+  return request({
+    url:'/home/newProduct/update/recommendStatus',
+    method:'post',
+    data:data
+  })
+}
+
+export function deleteNewProduct(data) {
+  return request({
+    url:'/home/newProduct/delete',
+    method:'post',
+    data:data
+  })
+}
+
+export function createNewProduct(data) {
+  return request({
+    url:'/home/newProduct/create',
+    method:'post',
+    data:data
+  })
+}
+
+export function updateNewProductSort(params) {
+  return request({
+    url:'/home/newProduct/update/sort/'+params.id,
+    method:'post',
+    params:params
+  })
+}
diff --git a/src/views/sms/hot/index.vue b/src/views/sms/hot/index.vue
index 72a72a7..ef2a3a1 100644
--- a/src/views/sms/hot/index.vue
+++ b/src/views/sms/hot/index.vue
@@ -1,13 +1,430 @@
 <template> 
-  <div> {{msg}}</div>
+  <div class="app-container">
+    <el-card class="filter-container" shadow="never">
+      <div>
+        <i class="el-icon-search"></i>
+        <span>筛选搜索</span>
+        <el-button
+          style="float:right"
+          type="primary"
+          @click="handleSearchList()"
+          size="small">
+          查询搜索
+        </el-button>
+        <el-button
+          style="float:right;margin-right: 15px"
+          @click="handleResetSearch()"
+          size="small">
+          重置
+        </el-button>
+      </div>
+      <div style="margin-top: 15px">
+        <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
+          <el-form-item label="商品名称：">
+            <el-input v-model="listQuery.productName" class="input-width" placeholder="商品名称"></el-input>
+          </el-form-item>
+          <el-form-item label="推荐状态：">
+            <el-select v-model="listQuery.recommendStatus" placeholder="全部" clearable class="input-width">
+              <el-option v-for="item in recommendOptions"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
+    <el-card class="operate-container" shadow="never">
+      <i class="el-icon-tickets"></i>
+      <span>数据列表</span>
+      <el-button size="mini" class="btn-add" @click="handleSelectProduct()">选择商品</el-button>
+    </el-card>
+    <div class="table-container">
+      <el-table ref="newProductTable"
+                :data="list"
+                style="width: 100%;"
+                @selection-change="handleSelectionChange"
+                v-loading="listLoading" border>
+        <el-table-column type="selection" width="60" align="center"></el-table-column>
+        <el-table-column label="编号" width="120" align="center">
+          <template slot-scope="scope">{{scope.row.id}}</template>
+        </el-table-column>
+        <el-table-column label="商品名称" align="center">
+          <template slot-scope="scope">{{scope.row.productName}}</template>
+        </el-table-column>
+        <el-table-column label="是否推荐" width="200" align="center">
+          <template slot-scope="scope">
+            <el-switch
+              @change="handleRecommendStatusStatusChange(scope.$index, scope.row)"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.recommendStatus">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序" width="160" align="center">
+          <template slot-scope="scope">{{scope.row.sort}}</template>
+        </el-table-column>
+        <el-table-column label="状态" width="160" align="center">
+          <template slot-scope="scope">{{scope.row.recommendStatus | formatRecommendStatus}}</template>
+        </el-table-column>
+        <el-table-column label="操作" width="180" align="center">
+          <template slot-scope="scope">
+            <el-button size="mini"
+                       type="text"
+                       @click="handleEditSort(scope.$index, scope.row)">设置排序
+            </el-button>
+            <el-button size="mini"
+                       type="text"
+                       @click="handleDelete(scope.$index, scope.row)">删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="batch-operate-container">
+      <el-select
+        size="small"
+        v-model="operateType" placeholder="批量操作">
+        <el-option
+          v-for="item in operates"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-button
+        style="margin-left: 20px"
+        class="search-button"
+        @click="handleBatchOperate()"
+        type="primary"
+        size="small">
+        确定
+      </el-button>
+    </div>
+    <div class="pagination-container">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        layout="total, sizes,prev, pager, next,jumper"
+        :page-size="listQuery.pageSize"
+        :page-sizes="[5,10,15]"
+        :current-page.sync="listQuery.pageNum"
+        :total="total">
+      </el-pagination>
+    </div>
+    <el-dialog title="选择商品" :visible.sync="selectDialogVisible" width="50%">
+      <el-input v-model="dialogData.listQuery.keyword"
+                style="width: 250px;margin-bottom: 20px"
+                size="small"
+                placeholder="商品名称搜索">
+        <el-button slot="append" icon="el-icon-search" @click="handleSelectSearch()"></el-button>
+      </el-input>
+      <el-table :data="dialogData.list"
+                @selection-change="handleDialogSelectionChange" border>
+        <el-table-column type="selection" width="60" align="center"></el-table-column>
+        <el-table-column label="商品名称" align="center">
+          <template slot-scope="scope">{{scope.row.name}}</template>
+        </el-table-column>
+        <el-table-column label="货号" width="160" align="center">
+          <template slot-scope="scope">NO.{{scope.row.productSn}}</template>
+        </el-table-column>
+        <el-table-column label="价格" width="120" align="center">
+          <template slot-scope="scope">￥{{scope.row.price}}</template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination-container">
+        <el-pagination
+          background
+          @size-change="handleDialogSizeChange"
+          @current-change="handleDialogCurrentChange"
+          layout="prev, pager, next"
+          :current-page.sync="dialogData.listQuery.pageNum"
+          :page-size="dialogData.listQuery.pageSize"
+          :page-sizes="[5,10,15]"
+          :total="dialogData.total">
+        </el-pagination>
+      </div>
+      <div style="clear: both;"></div>
+      <div slot="footer">
+        <el-button  size="small" @click="selectDialogVisible = false">取 消</el-button>
+        <el-button  size="small" type="primary" @click="handleSelectDialogConfirm()">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="设置排序"
+               :visible.sync="sortDialogVisible"
+               width="40%">
+      <el-form :model="sortDialogData"
+               label-width="150px">
+        <el-form-item label="排序：">
+          <el-input v-model="sortDialogData.sort" style="width: 200px"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer">
+        <el-button @click="sortDialogVisible = false" size="small">取 消</el-button>
+        <el-button type="primary" @click="handleUpdateSort" size="small">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 <script>
+  import {fetchList,updateRecommendStatus,deleteHotProduct,createHotProduct,updateHotProductSort} from '@/api/hotProduct';
+  import {fetchList as fetchProductList} from '@/api/product';
+
+  const defaultListQuery = {
+    pageNum: 1,
+    pageSize: 5,
+    productName: null,
+    recommendStatus: null
+  };
+  const defaultRecommendOptions = [
+    {
+      label: '未推荐',
+      value: 0
+    },
+    {
+      label: '推荐中',
+      value: 1
+    }
+  ];
   export default {
+    name: 'hotProductList',
     data() {
-      return {msg: '首页人气推荐'}
+      return {
+        listQuery: Object.assign({}, defaultListQuery),
+        recommendOptions: Object.assign({}, defaultRecommendOptions),
+        list: null,
+        total: null,
+        listLoading: false,
+        multipleSelection: [],
+        operates: [
+          {
+            label: "设为推荐",
+            value: 0
+          },
+          {
+            label: "取消推荐",
+            value: 1
+          },
+          {
+            label: "删除",
+            value: 2
+          }
+        ],
+        operateType: null,
+        selectDialogVisible:false,
+        dialogData:{
+          list: null,
+          total: null,
+          multipleSelection:[],
+          listQuery:{
+            keyword: null,
+            pageNum: 1,
+            pageSize: 5
+          }
+        },
+        sortDialogVisible:false,
+        sortDialogData:{sort:0,id:null}
+      }
+    },
+    created() {
+      this.getList();
+      this.getDialogList();
+    },
+    filters:{
+      formatRecommendStatus(status){
+        if(status===1){
+          return '推荐中';
+        }else{
+          return '未推荐';
+        }
+      }
+    },
+    methods: {
+      handleResetSearch() {
+        this.listQuery = Object.assign({}, defaultListQuery);
+      },
+      handleSearchList() {
+        this.listQuery.pageNum = 1;
+        this.getList();
+      },
+      handleSelectionChange(val){
+        this.multipleSelection = val;
+      },
+      handleSizeChange(val) {
+        this.listQuery.pageNum = 1;
+        this.listQuery.pageSize = val;
+        this.getList();
+      },
+      handleCurrentChange(val) {
+        this.listQuery.pageNum = val;
+        this.getList();
+      },
+      handleRecommendStatusStatusChange(index,row){
+        this.updateRecommendStatusStatus(row.id,row.recommendStatus);
+      },
+      handleDelete(index,row){
+        this.deleteProduct(row.id);
+      },
+      handleBatchOperate(){
+        if (this.multipleSelection < 1) {
+          this.$message({
+            message: '请选择一条记录',
+            type: 'warning',
+            duration: 1000
+          });
+          return;
+        }
+        let ids = [];
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          ids.push(this.multipleSelection[i].id);
+        }
+        if (this.operateType === 0) {
+          //设为推荐
+          this.updateRecommendStatusStatus(ids,1);
+        } else if (this.operateType === 1) {
+          //取消推荐
+          this.updateRecommendStatusStatus(ids,0);
+        } else if(this.operateType===2){
+          //删除
+          this.deleteProduct(ids);
+        }else {
+          this.$message({
+            message: '请选择批量操作类型',
+            type: 'warning',
+            duration: 1000
+          });
+        }
+      },
+      handleSelectProduct(){
+        this.selectDialogVisible=true;
+      },
+      handleSelectSearch(){
+        this.getDialogList();
+      },
+      handleDialogSizeChange(val) {
+        this.dialogData.listQuery.pageNum = 1;
+        this.dialogData.listQuery.pageSize = val;
+        this.getDialogList();
+      },
+      handleDialogCurrentChange(val) {
+        this.dialogData.listQuery.pageNum = val;
+        this.getDialogList();
+      },
+      handleDialogSelectionChange(val){
+        this.dialogData.multipleSelection = val;
+      },
+      handleSelectDialogConfirm(){
+        if (this.dialogData.multipleSelection < 1) {
+          this.$message({
+            message: '请选择一条记录',
+            type: 'warning',
+            duration: 1000
+          });
+          return;
+        }
+        let selectProducts = [];
+        for (let i = 0; i < this.dialogData.multipleSelection.length; i++) {
+          selectProducts.push({
+            productId:this.dialogData.multipleSelection[i].id,
+            productName:this.dialogData.multipleSelection[i].name
+          });
+        }
+        this.$confirm('使用要进行添加操作?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          createHotProduct(selectProducts).then(response=>{
+            this.selectDialogVisible=false;
+            this.dialogData.multipleSelection=[];
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '添加成功!'
+            });
+          });
+        });
+      },
+      handleEditSort(index,row){
+        this.sortDialogVisible=true;
+        this.sortDialogData.sort=row.sort;
+        this.sortDialogData.id=row.id;
+      },
+      handleUpdateSort(){
+        this.$confirm('是否要修改排序?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          updateHotProductSort(this.sortDialogData).then(response=>{
+            this.sortDialogVisible=false;
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+          });
+        })
+      },
+      getList() {
+        this.listLoading = true;
+        fetchList(this.listQuery).then(response => {
+          this.listLoading = false;
+          this.list = response.data.list;
+          this.total = response.data.total;
+        })
+      },
+      updateRecommendStatusStatus(ids,status){
+        this.$confirm('是否要修改推荐状态?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params=new URLSearchParams();
+          params.append("ids",ids);
+          params.append("recommendStatus",status);
+          updateRecommendStatus(params).then(response=>{
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '修改成功!'
+            });
+          });
+        }).catch(() => {
+          this.$message({
+            type: 'success',
+            message: '已取消操作!'
+          });
+          this.getList();
+        });
+      },
+      deleteProduct(ids){
+        this.$confirm('是否要删除该推荐?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params=new URLSearchParams();
+          params.append("ids",ids);
+          deleteHotProduct(params).then(response=>{
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+          });
+        })
+      },
+      getDialogList(){
+        fetchProductList(this.dialogData.listQuery).then(response=>{
+          this.dialogData.list=response.data.list;
+          this.dialogData.total=response.data.total;
+        })
+      }
     }
   }
 </script>
 <style></style>
-
-
diff --git a/src/views/sms/new/index.vue b/src/views/sms/new/index.vue
index 99876fb..ac39c6e 100644
--- a/src/views/sms/new/index.vue
+++ b/src/views/sms/new/index.vue
@@ -1,13 +1,430 @@
 <template> 
-  <div> {{msg}}</div>
+  <div class="app-container">
+    <el-card class="filter-container" shadow="never">
+      <div>
+        <i class="el-icon-search"></i>
+        <span>筛选搜索</span>
+        <el-button
+          style="float:right"
+          type="primary"
+          @click="handleSearchList()"
+          size="small">
+          查询搜索
+        </el-button>
+        <el-button
+          style="float:right;margin-right: 15px"
+          @click="handleResetSearch()"
+          size="small">
+          重置
+        </el-button>
+      </div>
+      <div style="margin-top: 15px">
+        <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
+          <el-form-item label="商品名称：">
+            <el-input v-model="listQuery.productName" class="input-width" placeholder="商品名称"></el-input>
+          </el-form-item>
+          <el-form-item label="推荐状态：">
+            <el-select v-model="listQuery.recommendStatus" placeholder="全部" clearable class="input-width">
+              <el-option v-for="item in recommendOptions"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
+    <el-card class="operate-container" shadow="never">
+      <i class="el-icon-tickets"></i>
+      <span>数据列表</span>
+      <el-button size="mini" class="btn-add" @click="handleSelectProduct()">选择商品</el-button>
+    </el-card>
+    <div class="table-container">
+      <el-table ref="newProductTable"
+                :data="list"
+                style="width: 100%;"
+                @selection-change="handleSelectionChange"
+                v-loading="listLoading" border>
+        <el-table-column type="selection" width="60" align="center"></el-table-column>
+        <el-table-column label="编号" width="120" align="center">
+          <template slot-scope="scope">{{scope.row.id}}</template>
+        </el-table-column>
+        <el-table-column label="商品名称" align="center">
+          <template slot-scope="scope">{{scope.row.productName}}</template>
+        </el-table-column>
+        <el-table-column label="是否推荐" width="200" align="center">
+          <template slot-scope="scope">
+            <el-switch
+              @change="handleRecommendStatusStatusChange(scope.$index, scope.row)"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.recommendStatus">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序" width="160" align="center">
+          <template slot-scope="scope">{{scope.row.sort}}</template>
+        </el-table-column>
+        <el-table-column label="状态" width="160" align="center">
+          <template slot-scope="scope">{{scope.row.recommendStatus | formatRecommendStatus}}</template>
+        </el-table-column>
+        <el-table-column label="操作" width="180" align="center">
+          <template slot-scope="scope">
+            <el-button size="mini"
+                       type="text"
+                       @click="handleEditSort(scope.$index, scope.row)">设置排序
+            </el-button>
+            <el-button size="mini"
+                       type="text"
+                       @click="handleDelete(scope.$index, scope.row)">删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="batch-operate-container">
+      <el-select
+        size="small"
+        v-model="operateType" placeholder="批量操作">
+        <el-option
+          v-for="item in operates"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-button
+        style="margin-left: 20px"
+        class="search-button"
+        @click="handleBatchOperate()"
+        type="primary"
+        size="small">
+        确定
+      </el-button>
+    </div>
+    <div class="pagination-container">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        layout="total, sizes,prev, pager, next,jumper"
+        :page-size="listQuery.pageSize"
+        :page-sizes="[5,10,15]"
+        :current-page.sync="listQuery.pageNum"
+        :total="total">
+      </el-pagination>
+    </div>
+    <el-dialog title="选择商品" :visible.sync="selectDialogVisible" width="50%">
+      <el-input v-model="dialogData.listQuery.keyword"
+                style="width: 250px;margin-bottom: 20px"
+                size="small"
+                placeholder="商品名称搜索">
+        <el-button slot="append" icon="el-icon-search" @click="handleSelectSearch()"></el-button>
+      </el-input>
+      <el-table :data="dialogData.list"
+                @selection-change="handleDialogSelectionChange" border>
+        <el-table-column type="selection" width="60" align="center"></el-table-column>
+        <el-table-column label="商品名称" align="center">
+          <template slot-scope="scope">{{scope.row.name}}</template>
+        </el-table-column>
+        <el-table-column label="货号" width="160" align="center">
+          <template slot-scope="scope">NO.{{scope.row.productSn}}</template>
+        </el-table-column>
+        <el-table-column label="价格" width="120" align="center">
+          <template slot-scope="scope">￥{{scope.row.price}}</template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination-container">
+        <el-pagination
+          background
+          @size-change="handleDialogSizeChange"
+          @current-change="handleDialogCurrentChange"
+          layout="prev, pager, next"
+          :current-page.sync="dialogData.listQuery.pageNum"
+          :page-size="dialogData.listQuery.pageSize"
+          :page-sizes="[5,10,15]"
+          :total="dialogData.total">
+        </el-pagination>
+      </div>
+      <div style="clear: both;"></div>
+      <div slot="footer">
+        <el-button  size="small" @click="selectDialogVisible = false">取 消</el-button>
+        <el-button  size="small" type="primary" @click="handleSelectDialogConfirm()">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="设置排序"
+               :visible.sync="sortDialogVisible"
+               width="40%">
+      <el-form :model="sortDialogData"
+               label-width="150px">
+        <el-form-item label="排序：">
+          <el-input v-model="sortDialogData.sort" style="width: 200px"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer">
+        <el-button @click="sortDialogVisible = false" size="small">取 消</el-button>
+        <el-button type="primary" @click="handleUpdateSort" size="small">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 <script>
+  import {fetchList,updateRecommendStatus,deleteNewProduct,createNewProduct,updateNewProductSort} from '@/api/newProduct';
+  import {fetchList as fetchProductList} from '@/api/product';
+
+  const defaultListQuery = {
+    pageNum: 1,
+    pageSize: 5,
+    productName: null,
+    recommendStatus: null
+  };
+  const defaultRecommendOptions = [
+    {
+      label: '未推荐',
+      value: 0
+    },
+    {
+      label: '推荐中',
+      value: 1
+    }
+  ];
   export default {
+    name: 'newProductList',
     data() {
-      return {msg: '首页新品推荐'}
+      return {
+        listQuery: Object.assign({}, defaultListQuery),
+        recommendOptions: Object.assign({}, defaultRecommendOptions),
+        list: null,
+        total: null,
+        listLoading: false,
+        multipleSelection: [],
+        operates: [
+          {
+            label: "设为推荐",
+            value: 0
+          },
+          {
+            label: "取消推荐",
+            value: 1
+          },
+          {
+            label: "删除",
+            value: 2
+          }
+        ],
+        operateType: null,
+        selectDialogVisible:false,
+        dialogData:{
+          list: null,
+          total: null,
+          multipleSelection:[],
+          listQuery:{
+            keyword: null,
+            pageNum: 1,
+            pageSize: 5
+          }
+        },
+        sortDialogVisible:false,
+        sortDialogData:{sort:0,id:null}
+      }
+    },
+    created() {
+      this.getList();
+      this.getDialogList();
+    },
+    filters:{
+      formatRecommendStatus(status){
+        if(status===1){
+          return '推荐中';
+        }else{
+          return '未推荐';
+        }
+      }
+    },
+    methods: {
+      handleResetSearch() {
+        this.listQuery = Object.assign({}, defaultListQuery);
+      },
+      handleSearchList() {
+        this.listQuery.pageNum = 1;
+        this.getList();
+      },
+      handleSelectionChange(val){
+        this.multipleSelection = val;
+      },
+      handleSizeChange(val) {
+        this.listQuery.pageNum = 1;
+        this.listQuery.pageSize = val;
+        this.getList();
+      },
+      handleCurrentChange(val) {
+        this.listQuery.pageNum = val;
+        this.getList();
+      },
+      handleRecommendStatusStatusChange(index,row){
+        this.updateRecommendStatusStatus(row.id,row.recommendStatus);
+      },
+      handleDelete(index,row){
+        this.deleteProduct(row.id);
+      },
+      handleBatchOperate(){
+        if (this.multipleSelection < 1) {
+          this.$message({
+            message: '请选择一条记录',
+            type: 'warning',
+            duration: 1000
+          });
+          return;
+        }
+        let ids = [];
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          ids.push(this.multipleSelection[i].id);
+        }
+        if (this.operateType === 0) {
+          //设为推荐
+          this.updateRecommendStatusStatus(ids,1);
+        } else if (this.operateType === 1) {
+          //取消推荐
+          this.updateRecommendStatusStatus(ids,0);
+        } else if(this.operateType===2){
+          //删除
+          this.deleteProduct(ids);
+        }else {
+          this.$message({
+            message: '请选择批量操作类型',
+            type: 'warning',
+            duration: 1000
+          });
+        }
+      },
+      handleSelectProduct(){
+        this.selectDialogVisible=true;
+      },
+      handleSelectSearch(){
+        this.getDialogList();
+      },
+      handleDialogSizeChange(val) {
+        this.dialogData.listQuery.pageNum = 1;
+        this.dialogData.listQuery.pageSize = val;
+        this.getDialogList();
+      },
+      handleDialogCurrentChange(val) {
+        this.dialogData.listQuery.pageNum = val;
+        this.getDialogList();
+      },
+      handleDialogSelectionChange(val){
+        this.dialogData.multipleSelection = val;
+      },
+      handleSelectDialogConfirm(){
+        if (this.dialogData.multipleSelection < 1) {
+          this.$message({
+            message: '请选择一条记录',
+            type: 'warning',
+            duration: 1000
+          });
+          return;
+        }
+        let selectProducts = [];
+        for (let i = 0; i < this.dialogData.multipleSelection.length; i++) {
+          selectProducts.push({
+            productId:this.dialogData.multipleSelection[i].id,
+            productName:this.dialogData.multipleSelection[i].name
+          });
+        }
+        this.$confirm('使用要进行添加操作?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          createNewProduct(selectProducts).then(response=>{
+            this.selectDialogVisible=false;
+            this.dialogData.multipleSelection=[];
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '添加成功!'
+            });
+          });
+        });
+      },
+      handleEditSort(index,row){
+        this.sortDialogVisible=true;
+        this.sortDialogData.sort=row.sort;
+        this.sortDialogData.id=row.id;
+      },
+      handleUpdateSort(){
+        this.$confirm('是否要修改排序?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          updateNewProductSort(this.sortDialogData).then(response=>{
+            this.sortDialogVisible=false;
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+          });
+        })
+      },
+      getList() {
+        this.listLoading = true;
+        fetchList(this.listQuery).then(response => {
+          this.listLoading = false;
+          this.list = response.data.list;
+          this.total = response.data.total;
+        })
+      },
+      updateRecommendStatusStatus(ids,status){
+        this.$confirm('是否要修改推荐状态?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params=new URLSearchParams();
+          params.append("ids",ids);
+          params.append("recommendStatus",status);
+          updateRecommendStatus(params).then(response=>{
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '修改成功!'
+            });
+          });
+        }).catch(() => {
+          this.$message({
+            type: 'success',
+            message: '已取消操作!'
+          });
+          this.getList();
+        });
+      },
+      deleteProduct(ids){
+        this.$confirm('是否要删除该推荐?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params=new URLSearchParams();
+          params.append("ids",ids);
+          deleteNewProduct(params).then(response=>{
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+          });
+        })
+      },
+      getDialogList(){
+        fetchProductList(this.dialogData.listQuery).then(response=>{
+          this.dialogData.list=response.data.list;
+          this.dialogData.total=response.data.total;
+        })
+      }
     }
   }
 </script>
 <style></style>
-
-
diff --git a/src/views/sms/subject/index.vue b/src/views/sms/subject/index.vue
index ae39e00..f84b864 100644
--- a/src/views/sms/subject/index.vue
+++ b/src/views/sms/subject/index.vue
@@ -1,13 +1,430 @@
 <template> 
-  <div> {{msg}}</div>
+  <div class="app-container">
+    <el-card class="filter-container" shadow="never">
+      <div>
+        <i class="el-icon-search"></i>
+        <span>筛选搜索</span>
+        <el-button
+          style="float:right"
+          type="primary"
+          @click="handleSearchList()"
+          size="small">
+          查询搜索
+        </el-button>
+        <el-button
+          style="float:right;margin-right: 15px"
+          @click="handleResetSearch()"
+          size="small">
+          重置
+        </el-button>
+      </div>
+      <div style="margin-top: 15px">
+        <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
+          <el-form-item label="专题名称：">
+            <el-input v-model="listQuery.subjectName" class="input-width" placeholder="商品名称"></el-input>
+          </el-form-item>
+          <el-form-item label="推荐状态：">
+            <el-select v-model="listQuery.recommendStatus" placeholder="全部" clearable class="input-width">
+              <el-option v-for="item in recommendOptions"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
+    <el-card class="operate-container" shadow="never">
+      <i class="el-icon-tickets"></i>
+      <span>数据列表</span>
+      <el-button size="mini" class="btn-add" @click="handleSelectProduct()">选择专题</el-button>
+    </el-card>
+    <div class="table-container">
+      <el-table ref="newProductTable"
+                :data="list"
+                style="width: 100%;"
+                @selection-change="handleSelectionChange"
+                v-loading="listLoading" border>
+        <el-table-column type="selection" width="60" align="center"></el-table-column>
+        <el-table-column label="编号" width="120" align="center">
+          <template slot-scope="scope">{{scope.row.id}}</template>
+        </el-table-column>
+        <el-table-column label="专题名称" align="center">
+          <template slot-scope="scope">{{scope.row.subjectName}}</template>
+        </el-table-column>
+        <el-table-column label="是否推荐" width="200" align="center">
+          <template slot-scope="scope">
+            <el-switch
+              @change="handleRecommendStatusStatusChange(scope.$index, scope.row)"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.recommendStatus">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序" width="160" align="center">
+          <template slot-scope="scope">{{scope.row.sort}}</template>
+        </el-table-column>
+        <el-table-column label="状态" width="160" align="center">
+          <template slot-scope="scope">{{scope.row.recommendStatus | formatRecommendStatus}}</template>
+        </el-table-column>
+        <el-table-column label="操作" width="180" align="center">
+          <template slot-scope="scope">
+            <el-button size="mini"
+                       type="text"
+                       @click="handleEditSort(scope.$index, scope.row)">设置排序
+            </el-button>
+            <el-button size="mini"
+                       type="text"
+                       @click="handleDelete(scope.$index, scope.row)">删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="batch-operate-container">
+      <el-select
+        size="small"
+        v-model="operateType" placeholder="批量操作">
+        <el-option
+          v-for="item in operates"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-button
+        style="margin-left: 20px"
+        class="search-button"
+        @click="handleBatchOperate()"
+        type="primary"
+        size="small">
+        确定
+      </el-button>
+    </div>
+    <div class="pagination-container">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        layout="total, sizes,prev, pager, next,jumper"
+        :page-size="listQuery.pageSize"
+        :page-sizes="[5,10,15]"
+        :current-page.sync="listQuery.pageNum"
+        :total="total">
+      </el-pagination>
+    </div>
+    <el-dialog title="选择专题" :visible.sync="selectDialogVisible" width="50%">
+      <el-input v-model="dialogData.listQuery.keyword"
+                style="width: 250px;margin-bottom: 20px"
+                size="small"
+                placeholder="专题名称搜索">
+        <el-button slot="append" icon="el-icon-search" @click="handleSelectSearch()"></el-button>
+      </el-input>
+      <el-table :data="dialogData.list"
+                @selection-change="handleDialogSelectionChange" border>
+        <el-table-column type="selection" width="60" align="center"></el-table-column>
+        <el-table-column label="专题名称" align="center">
+          <template slot-scope="scope">{{scope.row.name}}</template>
+        </el-table-column>
+        <el-table-column label="货号" width="160" align="center">
+          <template slot-scope="scope">NO.{{scope.row.productSn}}</template>
+        </el-table-column>
+        <el-table-column label="价格" width="120" align="center">
+          <template slot-scope="scope">￥{{scope.row.price}}</template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination-container">
+        <el-pagination
+          background
+          @size-change="handleDialogSizeChange"
+          @current-change="handleDialogCurrentChange"
+          layout="prev, pager, next"
+          :current-page.sync="dialogData.listQuery.pageNum"
+          :page-size="dialogData.listQuery.pageSize"
+          :page-sizes="[5,10,15]"
+          :total="dialogData.total">
+        </el-pagination>
+      </div>
+      <div style="clear: both;"></div>
+      <div slot="footer">
+        <el-button  size="small" @click="selectDialogVisible = false">取 消</el-button>
+        <el-button  size="small" type="primary" @click="handleSelectDialogConfirm()">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="设置排序"
+               :visible.sync="sortDialogVisible"
+               width="40%">
+      <el-form :model="sortDialogData"
+               label-width="150px">
+        <el-form-item label="排序：">
+          <el-input v-model="sortDialogData.sort" style="width: 200px"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer">
+        <el-button @click="sortDialogVisible = false" size="small">取 消</el-button>
+        <el-button type="primary" @click="handleUpdateSort" size="small">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 <script>
+  import {fetchList,updateRecommendStatus,deleteHomeSubject,createHomeSubject,updateHomeSubjectSort} from '@/api/homeSubject';
+  import {fetchList as fetchProductList} from '@/api/product';
+
+  const defaultListQuery = {
+    pageNum: 1,
+    pageSize: 5,
+    subjectName: null,
+    recommendStatus: null
+  };
+  const defaultRecommendOptions = [
+    {
+      label: '未推荐',
+      value: 0
+    },
+    {
+      label: '推荐中',
+      value: 1
+    }
+  ];
   export default {
+    name: 'homeSubjectList',
     data() {
-      return {msg: '首页专题推荐'}
+      return {
+        listQuery: Object.assign({}, defaultListQuery),
+        recommendOptions: Object.assign({}, defaultRecommendOptions),
+        list: null,
+        total: null,
+        listLoading: false,
+        multipleSelection: [],
+        operates: [
+          {
+            label: "设为推荐",
+            value: 0
+          },
+          {
+            label: "取消推荐",
+            value: 1
+          },
+          {
+            label: "删除",
+            value: 2
+          }
+        ],
+        operateType: null,
+        selectDialogVisible:false,
+        dialogData:{
+          list: null,
+          total: null,
+          multipleSelection:[],
+          listQuery:{
+            keyword: null,
+            pageNum: 1,
+            pageSize: 5
+          }
+        },
+        sortDialogVisible:false,
+        sortDialogData:{sort:0,id:null}
+      }
+    },
+    created() {
+      this.getList();
+      this.getDialogList();
+    },
+    filters:{
+      formatRecommendStatus(status){
+        if(status===1){
+          return '推荐中';
+        }else{
+          return '未推荐';
+        }
+      }
+    },
+    methods: {
+      handleResetSearch() {
+        this.listQuery = Object.assign({}, defaultListQuery);
+      },
+      handleSearchList() {
+        this.listQuery.pageNum = 1;
+        this.getList();
+      },
+      handleSelectionChange(val){
+        this.multipleSelection = val;
+      },
+      handleSizeChange(val) {
+        this.listQuery.pageNum = 1;
+        this.listQuery.pageSize = val;
+        this.getList();
+      },
+      handleCurrentChange(val) {
+        this.listQuery.pageNum = val;
+        this.getList();
+      },
+      handleRecommendStatusStatusChange(index,row){
+        this.updateRecommendStatusStatus(row.id,row.recommendStatus);
+      },
+      handleDelete(index,row){
+        this.deleteProduct(row.id);
+      },
+      handleBatchOperate(){
+        if (this.multipleSelection < 1) {
+          this.$message({
+            message: '请选择一条记录',
+            type: 'warning',
+            duration: 1000
+          });
+          return;
+        }
+        let ids = [];
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          ids.push(this.multipleSelection[i].id);
+        }
+        if (this.operateType === 0) {
+          //设为推荐
+          this.updateRecommendStatusStatus(ids,1);
+        } else if (this.operateType === 1) {
+          //取消推荐
+          this.updateRecommendStatusStatus(ids,0);
+        } else if(this.operateType===2){
+          //删除
+          this.deleteProduct(ids);
+        }else {
+          this.$message({
+            message: '请选择批量操作类型',
+            type: 'warning',
+            duration: 1000
+          });
+        }
+      },
+      handleSelectProduct(){
+        this.selectDialogVisible=true;
+      },
+      handleSelectSearch(){
+        this.getDialogList();
+      },
+      handleDialogSizeChange(val) {
+        this.dialogData.listQuery.pageNum = 1;
+        this.dialogData.listQuery.pageSize = val;
+        this.getDialogList();
+      },
+      handleDialogCurrentChange(val) {
+        this.dialogData.listQuery.pageNum = val;
+        this.getDialogList();
+      },
+      handleDialogSelectionChange(val){
+        this.dialogData.multipleSelection = val;
+      },
+      handleSelectDialogConfirm(){
+        if (this.dialogData.multipleSelection < 1) {
+          this.$message({
+            message: '请选择一条记录',
+            type: 'warning',
+            duration: 1000
+          });
+          return;
+        }
+        let selectProducts = [];
+        for (let i = 0; i < this.dialogData.multipleSelection.length; i++) {
+          selectProducts.push({
+            productId:this.dialogData.multipleSelection[i].id,
+            productName:this.dialogData.multipleSelection[i].name
+          });
+        }
+        this.$confirm('使用要进行添加操作?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          createHomeSubject(selectProducts).then(response=>{
+            this.selectDialogVisible=false;
+            this.dialogData.multipleSelection=[];
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '添加成功!'
+            });
+          });
+        });
+      },
+      handleEditSort(index,row){
+        this.sortDialogVisible=true;
+        this.sortDialogData.sort=row.sort;
+        this.sortDialogData.id=row.id;
+      },
+      handleUpdateSort(){
+        this.$confirm('是否要修改排序?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          updateHomeSubjectSort(this.sortDialogData).then(response=>{
+            this.sortDialogVisible=false;
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+          });
+        })
+      },
+      getList() {
+        this.listLoading = true;
+        fetchList(this.listQuery).then(response => {
+          this.listLoading = false;
+          this.list = response.data.list;
+          this.total = response.data.total;
+        })
+      },
+      updateRecommendStatusStatus(ids,status){
+        this.$confirm('是否要修改推荐状态?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params=new URLSearchParams();
+          params.append("ids",ids);
+          params.append("recommendStatus",status);
+          updateRecommendStatus(params).then(response=>{
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '修改成功!'
+            });
+          });
+        }).catch(() => {
+          this.$message({
+            type: 'success',
+            message: '已取消操作!'
+          });
+          this.getList();
+        });
+      },
+      deleteProduct(ids){
+        this.$confirm('是否要删除该推荐?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params=new URLSearchParams();
+          params.append("ids",ids);
+          deleteHomeSubject(params).then(response=>{
+            this.getList();
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+          });
+        })
+      },
+      getDialogList(){
+        fetchProductList(this.dialogData.listQuery).then(response=>{
+          this.dialogData.list=response.data.list;
+          this.dialogData.total=response.data.total;
+        })
+      }
     }
   }
 </script>
 <style></style>
-
-