From 99708d9743733160a50c2dc9f1c5ccade5980aaa Mon Sep 17 00:00:00 2001
From: "1020109007@qq.com" <1020109007@qq.com>
Date: Fri, 31 Dec 2021 17:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=ADgit=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E5=92=8C=E5=AF=BC=E8=88=AA=EF=BC=8C=E5=AE=8C=E5=96=84=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=87=E7=AD=BE=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=9B=BE=E7=89=87=E7=9A=84url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue                |  4 ++--
 src/views/segchk/segchk_keyword_lable/index.vue |  1 +
 src/views/segchk/segchk_lable_mgt/index.vue     | 15 +++++++++++++--
 vue.config.js                                   |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index dcc6788..74d19f1 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -23,13 +23,13 @@
 
         <search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
diff --git a/src/views/segchk/segchk_keyword_lable/index.vue b/src/views/segchk/segchk_keyword_lable/index.vue
index 4ec2485..9b06318 100644
--- a/src/views/segchk/segchk_keyword_lable/index.vue
+++ b/src/views/segchk/segchk_keyword_lable/index.vue
@@ -238,6 +238,7 @@ export default {
       segchk_providerList: [],
       lableStatus: [],
       baseUrl: '',
+      keyword: 'keyword',
       // baseUrl: process.env.VUE_APP_BASE_API,
       // 表单参数
       form: {},
diff --git a/src/views/segchk/segchk_lable_mgt/index.vue b/src/views/segchk/segchk_lable_mgt/index.vue
index a519e08..363915c 100644
--- a/src/views/segchk/segchk_lable_mgt/index.vue
+++ b/src/views/segchk/segchk_lable_mgt/index.vue
@@ -223,7 +223,7 @@
           <el-tooltip content="会员充值卡、关键字、优惠" placement="top">
             <i class="el-icon-question"></i>
           </el-tooltip>
-          <el-select v-model="form.lableFlag" placeholder="标签来源" >
+          <el-select v-model="form.lableFlag" placeholder="标签来源">
             <el-option
               v-for="dict in this.typeSelectOptions"
               :key="parseInt(dict.typeId)"
@@ -279,13 +279,16 @@
           <el-input-number v-model="form.sortId" controls-position="right" :min="0" placeholder="展示序号" :value="lableSort"/>
         </el-form-item>
         <el-form-item label="标签图标路径">
-          <ImageUpload v-model="form.iconUrl" :limit=1 :file-size=1 />
+          <ImageUpload v-model="form.iconUrl" :limit=1 :file-size=1  :uploadUrl="getLableUrl(form.lableFlag)"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+      <!-- <div>
+        {{lableurl}}
+      </div> -->
     </el-dialog>
   </div>
 </template>
@@ -305,6 +308,7 @@ export default {
   data() {
     return {
       baseUrl: '',
+      lableurl: 'card_lable',
       // baseUrl: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
@@ -397,6 +401,13 @@ export default {
   },
 
   computed:{
+    getLableUrl() {
+      return function (fromLableId) {
+        let uploadurl = (fromLableId === 0 ? 'card_lable' : (fromLableId === 1 ? 'keyword' : (fromLableId === 2 ? 'preference' : 'card_lable')))
+        this.lableurl = uploadurl
+        return uploadurl
+      }
+    },
     lableSort(row) {
       // console.log("lableSort --- " + row.providerId)
       if(row.providerId == null){
diff --git a/vue.config.js b/vue.config.js
index 7949d5c..d07bdd8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,7 +18,7 @@ module.exports = {
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'dist',
+  outputDir: 'segchk_vue',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
   assetsDir: 'static',
   // 是否开启eslint保存检测，有效值：ture | false | 'error'