From 25f19576a32a828419a7e34efe8422329121fcab Mon Sep 17 00:00:00 2001
From: mactj <tottimctj@163.com>
Date: Fri, 22 Jan 2021 15:11:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy_frontend.sh                            |  8 +++++++-
 ruoyi-ui/src/views/goods/goods_main/index.vue | 15 ++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/deploy_frontend.sh b/deploy_frontend.sh
index 55467285d..f1ff467dd 100644
--- a/deploy_frontend.sh
+++ b/deploy_frontend.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
 
+path="/data/mall/"
+
 echo "==========打包========="
 cd ruoyi-ui
 npm run build:prod
+echo "==========删除旧静态页面目录========="
+ssh -t root@62.234.115.161 rm -rf $path
+echo "==========创建目录========="
+ssh -t root@62.234.115.161 mkdir $path
 echo "==========上传服务器========="
-scp -r dist/* root@62.234.115.161:/data/mall/
+scp -r dist/* root@62.234.115.161:$path
 echo "==========部署完成========="
diff --git a/ruoyi-ui/src/views/goods/goods_main/index.vue b/ruoyi-ui/src/views/goods/goods_main/index.vue
index d3c88a68a..dcdf1fcf6 100644
--- a/ruoyi-ui/src/views/goods/goods_main/index.vue
+++ b/ruoyi-ui/src/views/goods/goods_main/index.vue
@@ -2,13 +2,13 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
 
-      <el-form-item label="商品类型" prop="goodsType">
-        <el-select v-model="queryParams.deptId" placeholder="请选择商品商户" clearable size="small">
+      <el-form-item label="商户" prop="goodsType">
+        <el-select v-model="queryParams.deptId" placeholder="请选择商户" clearable size="small">
           <el-option
-            v-for="dict in goodsTypeOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in deptOptions"
+            :key="dict.deptId"
+            :label="dict.deptName"
+            :value="dict.deptId"
           />
         </el-select>
       </el-form-item>
@@ -371,10 +371,7 @@ export default {
       if (this.deptOptions.length < 1) {
         return ''
       }
-
       const dept = this.deptOptions.filter(x => x.deptId === row.deptId)[0]
-
-
       return dept.deptName
     },
     /** 查询商品信息列表 */