问题修复

src/assets/style/public.scss

@@ -33,6 +33,7 @@ body {
 .el-input__wrapper{
   box-shadow: none;
   padding: 0px;
+  width: 100%;
 }
 
 .fill.el-button {

src/request/config.js

@@ -18,6 +18,11 @@ export const getFolerTreeList = '/back/scene/findListTree'
 // 新建文件夹
 export const insertFoler = '/back/scene/folderSave'
 
+// 新建文件夹
+export const textGetlnfo = '/back/sceneRecommend/getInfo'
+
+// 新建文件夹
+export const textUpdate = '/back/sceneRecommend/addOrUpdate'
 
 // 更新文件夹
 export const updateFoler = '/back/scene/folderUpdate'

src/views/brand/index.vue

@@ -7,13 +7,11 @@
         <!-- <el-input placeholder="關鍵詞" suffix-icon="el-icon-search" class="search-scene" v-model="search.state.searchKey" style="width: auto" /> -->
         <el-button
           type="primary"
-          icon="el-icon-plus"
           @click="exportFile"
           >导出品牌</el-button
         >
         <el-button
           type="primary"
-          icon="el-icon-plus"
           @click="UpdateBrand"
           >更新品牌信息</el-button
         >

src/views/category/index.vue

@@ -7,7 +7,6 @@
         <!-- <el-input placeholder="關鍵詞" suffix-icon="el-icon-search" class="search-scene" v-model="search.state.searchKey" style="width: auto" /> -->
         <el-button
           type="primary"
-          icon="el-icon-plus"
           @click="oper.readyInsert"
           >添加分類</el-button
         >

src/views/hotspot/index.vue

@@ -8,13 +8,11 @@
         <div class="table-ctrl-right">
           <el-button
             type="primary"
-            icon="el-icon-plus"
             @click="changAddshow"
             >添加外框</el-button
           >          
           <el-button
             type="primary"
-            icon="el-icon-plus"
             @click="handleDowmFile(active)"
             >下载导入模板</el-button
           >      
@@ -72,9 +70,10 @@
     </div>
     <div v-else class="other">
         <div class="setFile">
+            <p>{{ titleObj[active] }}</p>
             <div class="down">
                 <p>1、下载模板，请按示例填写。</p>
-                <el-button type="primary" @click="exporFileinfo.show = true">下载导入模板</el-button>
+                <el-button type="primary" @click="exporFileinfo.show = true" :icon="false" bg>下载导入模板</el-button>
                 <p>注：导入模板中包含此场景全部热点信息</p>
             </div>
             <div class="upload">
@@ -237,9 +236,9 @@ export default {
       { name: "品牌推荐设置", value: 3 },
     ]);
     const titleObj = reactive({
-        2:'瀑布流商品导入',
-        3:'精选推荐热点导入设置',
-        4:'品牌推荐热点导入设置',
+        1:'瀑布流商品导入',
+        2:'精选推荐设置',
+        3:'品牌推荐设置',
     })
     const setBorderData = ref({
       outlineName:'',
@@ -530,7 +529,7 @@ export default {
           return this.$alert(this.exporFileinfo.tips);
         }else{//自动提交
           this.exporFileinfo.filePath = file.data
-          this.handleUpload()
+          //this.handleUpload()
         }
       }).catch(() => {
         this.exporFileinfo.fileList = []
@@ -607,6 +606,12 @@ export default {
         .upload{
             margin-top: 20px;
         }
+        button{
+          margin: 20px 0;
+        }
+        p{
+          margin-bottom:20px
+        }
     }
 }
 .upload-demo{

src/views/scene/index.vue

@@ -78,7 +78,7 @@
       <el-table-column label="創建時間" v-slot:default="{ row }">
         <span>{{ row.isFolder == 1 ? row.createTimeStr : row.createTime }}</span>
       </el-table-column>
-      <el-table-column label="操作" v-slot:default="{ row }">
+      <el-table-column label="操作" v-slot:default="{ row }" width="288px">
         <template v-if="row.isFolder">
           <span class="oper-span" @click="addOrUpdateFold(row)">重命名</span>
           <span class="oper-span" @click="gotoLink(row)">查看</span>
@@ -86,6 +86,7 @@
           <span class="oper-span" @click="deleteFoler(row)">刪除</span>
         </template>
         <template v-else>
+          <span v-if="(row.status === 1 || row.status === -2) && row.payStatus === 1" class="oper-span" @click="setText(row)">活动文案</span>
           <span v-if="(row.status === 1 || row.status === -2) && row.payStatus === 1" class="oper-span" @click="editModel(row)">編輯</span>
           <span v-if="row.payStatus === 1" class="oper-span" @click="moverFold(row)">移動</span>
           <span v-if="row.status === 1 || row.status === -2" class="oper-span" @click="gotoLink(row)">查看</span>
@@ -103,6 +104,7 @@
           @gotoLink="gotoLink(item)"
           @move="moverFold"
           @rename="addOrUpdateFold(item)"
+          @setText="setText(item)"
           @deletefold="deleteFoler(item)"
           @delete="(data) => dataList.delete(data)"
           @update="(data) => editModel(data)"
@@ -147,6 +149,19 @@
         </el-form>
       </div>
     </com-dialog>
+
+    <com-dialog title="活动文案" @submit="handleActivity" v-model:show="activityText.show">
+      <div class="folderContent">
+        <el-form label-width="100px">
+          <el-form-item label="精选推荐：">
+            <el-input v-model="activityText.selectionMsg" placeholder="精选推荐" maxlength="30" show-word-limit></el-input>
+          </el-form-item>
+          <el-form-item label="品牌推荐：">
+            <el-input v-model="activityText.brandMsg" placeholder="品牌推荐" maxlength="30" show-word-limit></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+    </com-dialog>
   </div>
 </template>
 
@@ -161,7 +176,7 @@ import ModelItem from "./item";
 import comPagination from "@/components/pagination";
 import { SCENE_TYPE, getName } from "@/constant";
 import { dateFormat } from "@/util";
-import { getSceneList, deleteScene, getFolerTreeList, moveFoler, updateFoler, insertFoler, deleteFoler } from "@/request/config";
+import { textUpdate, textGetlnfo, getSceneList, deleteScene, getFolerTreeList, moveFoler, updateFoler, insertFoler, deleteFoler } from "@/request/config";
 import axios from "axios";
 
 const analysis = (data, level) => {
@@ -196,7 +211,12 @@ export default {
       name: "",
     });
     const loading = "";
-
+    const activityText = ref({
+      show:false,
+      sceneNum:'',
+      brandMsg:'',
+      selectionMsg:'',
+    })
     const time = ref(null);
     const pathFolder = ref([
       {
@@ -240,7 +260,7 @@ export default {
       () => (headList.value[0].name = "我的場景（" + state.pag.value.state.total + "）")
     );
 
-    return { ...state,folderPathShow,userInfo, loading, folderTree, headList, addFolder, currModel, currItem, time, shareItem, auth, editCompany, moveFolder, pathFolder };
+    return { ...state,activityText,folderPathShow,userInfo, loading, folderTree, headList, addFolder, currModel, currItem, time, shareItem, auth, editCompany, moveFolder, pathFolder };
   },
 
   methods: {
@@ -309,7 +329,11 @@ export default {
       this.addFolder.show = false;
       this.search.submit();
     },
-
+    async handleActivity(){
+      await axios.post(textUpdate, this.activityText);
+      this.activityText.show = false
+      this.$alert("更新成功");
+    },
     async deleteFoler(item) {
       if (await this.$confirm("此操作將刪除當前文件夾及其子文件夾所有場景，是否確認？", "提示")) {
         await axios.post(deleteFoler, {
@@ -328,7 +352,19 @@ export default {
       const link = process.env.VUE_APP_PREFIX + "/sceneQRcode/" + item.num + ".png";
       return link;
     },
-
+    async setText(item){//修改活动文案
+      this.activityText.sceneNum = item.sceneNum
+      let res = await axios.post(textGetlnfo, {
+        sceneNum: item.num,
+      }) || {};
+      let data = res.data || {}
+      this.activityText = {
+        show:true,
+        sceneNum:item.num,
+        brandMsg:data.brandMsg,
+        selectionMsg:data.selectionMsg,
+      }
+    },
     getShowModelUrl(item) {
       let link = "/spc.html?m=" + item.num;
       // 1 計算成功並可以外網訪問，不能編輯 2計算成功只能內網，能編輯

src/views/scene/item.vue

@@ -37,6 +37,7 @@
             <el-dropdown-item command="deletefold" >刪除</el-dropdown-item>
           </el-dropdown-menu>
           <el-dropdown-menu v-else class="menu-items-vrmodel">
+            <el-dropdown-item v-if="(data.status === 1||data.status === -2)&&data.payStatus === 1"  command="setText" >活动文案</el-dropdown-item>
             <el-dropdown-item v-if="(data.status === 1||data.status === -2)&&data.payStatus === 1" command="update">編輯</el-dropdown-item>
             <el-dropdown-item v-if="data.payStatus === 1" command="move">移動</el-dropdown-item>
             <el-dropdown-item command="delete">刪除</el-dropdown-item>