no message

src/App.vue

@@ -48,7 +48,7 @@ const userLoginHandler = async ()=>{
   let ConfigId = 9117
   let model = 1
   if(param.uid) userId=parseInt(param.uid)
-  if(ConfigId) ConfigIdStore.setMarket(ConfigId)
+  if(ConfigId) ConfigIdStore.setConfigId(ConfigId)
   if(model) modelStore.setModel(model)
   try {
      await userStore().setUserLoginAsync(userId)

src/store/screen.ts

@@ -5,14 +5,17 @@ export interface ScreenState {
   screening: boolean,
   market:boolean,
   model:number,
-  ConfigId:number
+  isModel: boolean,
+  ConfigId:number,
+
 }
 
 export const useScreenStore = defineStore('screen', {
   state: (): ScreenState => ({
     screening: false, // 是否进入放映状态
     market: true,
-    model: 0, //是否有新增模版权限
+    model: 0, //是否有新增修改模版权限
+    isModel: false,//该团是否存在模版
     ConfigId: 0,
   }),
 
@@ -23,14 +26,16 @@ export const useScreenStore = defineStore('screen', {
         this.market = false
       }
     },
-    setMarket(market: boolean){
+    setMarket(market: boolean) {
       this.market = market
     },
-    setModel(model: number){
-      console.log(model,'=====')
+    setModel(model: number) {
       this.model = model
     },
-    setConfigId(ConfigId: number){
+    setIsModel(isModel: boolean) {
+      this.isModel = isModel
+    },
+    setConfigId(ConfigId: number) {
       this.ConfigId = ConfigId
     }
   },

src/utils/common.ts

@@ -26,4 +26,17 @@ export const query = (url?:string)=>{
     json[item[0]] = item[1]
   }
   return json
+}
+
+/**
+ * 提取字符串中的文字
+ */
+export const getHtmlPlainText = (html_str:string) => {
+  let re = new RegExp('<[^<>]+>', 'g')
+  if (html_str) {
+    let text = html_str.replace(re, '')
+    return text
+  } else {
+    return ''
+  }
 }
\ No newline at end of file

src/views/Editor/EditorHeader/index.vue

@@ -139,13 +139,14 @@ const UploadPsd = () => {
 
 }
 
-// 保存
+
 // 新增修改模版
 const SetTripTemplateSlide = async () => {
   try {
+    console.log(queryObj.value,'新增修改模版---')
       let TemplateRes = await ConfigService.SetTripTemplateSlide(queryObj.value);
       if (TemplateRes.data.resultCode == 1) {
-          
+        
       }
       datas.loading = false
   } catch (error) {
@@ -157,12 +158,14 @@ const SetTripTemplateSlide = async () => {
 const SetTripTemplateConfig = async () => {
   try {
       let queryMsg = {
-        ConfigId: ConfigId,
+        ConfigId: ConfigId.value,
         TempId: queryObj.value.TempId,
+        TempData: queryObj.value.TempData
       }
+      console.log(queryMsg,'新增修改团数据---')
       let TemplateRes = await ConfigService.SetSetTripConfig(queryMsg);
       if (TemplateRes.data.resultCode == 1) {
-          
+        
       }
       datas.loading = false
   } catch (error) {
@@ -170,9 +173,9 @@ const SetTripTemplateConfig = async () => {
       console.log("TemplateGetTripFiled", error);
   }
 }
+// 保存
 const setTemplate = async () =>{
   // console.log(JSON.stringify(slides.value),'----保存接口',queryObj.value)
-  console.log(slides.value,'-------')
   if(queryObj.value.Title==''||!queryObj.value.LineId||!queryObj.value.LtId
   // ||queryObj.value.CoverImg==''
   ||queryObj.value.CountryName==''||queryObj.value.SeasonName==''
@@ -206,9 +209,9 @@ const setTemplate = async () =>{
   }
   queryObj.value.TempData = JSON.stringify(slides.value)
   datas.loading = true
-  if(model&&userInfo.IsEditTripTemplate==1){
+  if(!ConfigId&&model&&userInfo.IsEditTripTemplate==1){
     await SetTripTemplateSlide()
-  }else{
+  }else if(ConfigId){
     await SetTripTemplateConfig()
   }
 }

src/views/Editor/Thumbnails/index.vue

@@ -58,12 +58,12 @@ import useScreening from '@/hooks/useScreening'
 import useLoadSlides from '@/hooks/useLoadSlides'
 import { injectKeyDataSource, injectKeyTemplate } from '@/types/injectKey'
 import ConfigService from '@/services/ConfigService'
+import { getHtmlPlainText } from '@/utils/common'
 
 import ThumbnailSlide from '@/views/components/ThumbnailSlide/index.vue'
 import LayoutPool from './LayoutPool.vue'
 import Popover from '@/components/Popover.vue'
 import Draggable from 'vuedraggable'
-
 const mainStore = useMainStore()
 const slidesStore = useSlidesStore()
 const keyboardStore = useKeyboardStore()
@@ -126,16 +126,6 @@ watch(() => slideIndex.value, () => {
   })
 })
 
-//提取字符串中的文字
-const getHtmlPlainText = (html_str) => {
-  let re = new RegExp('<[^<>]+>', 'g')
-  if (html_str) {
-  let text = html_str.replace(re, '')
-      return text
-    } else {
-      return ''
-    }
-}
 queryObj.value = inject(injectKeyDataSource).queryObj
 
 

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -92,6 +92,7 @@
   import LineService from '@/services/LineService'
   import ConfigService from '@/services/ConfigService'
   import { injectKeyDataSource } from '@/types/injectKey'
+  import { getHtmlPlainText } from '@/utils/common'
 
     const datas = reactive({
         DataSource:{},
@@ -125,17 +126,6 @@
         queryObj.value.ColorName = obj.ColorName
     }
 
-    //提取字符串中的文字
-    const getHtmlPlainText = (html_str) => {
-    let re = new RegExp('<[^<>]+>', 'g')
-    if (html_str) {
-    let text = html_str.replace(re, '')
-        return text
-        } else {
-        return ''
-        }
-    }
-
     let pageObj = slides.value.find((slide,indexs) => {
             return slideIndex.value==indexs
     })

src/views/Market/Index.vue

@@ -13,7 +13,7 @@
                     </el-input>
                 </el-col>
                 <el-col :span="6" style="text-align: right;">
-                    <el-button v-if="userInfo.IsEditTripTemplate==1" v-tooltip="'添加模版'" type="danger" 
+                    <el-button v-if="userInfo.IsEditTripTemplate==1&&model" v-tooltip="'添加模版'" type="danger" 
                     size="small" icon="Plus"
                     @click="addTemplate()" style="color: #ffff;"></el-button>
                 </el-col>
@@ -129,7 +129,8 @@
     const searchData = ref({} as any)
     searchData.value = inject(injectKeyTemplate)
     const marketStore = useScreenStore()
-    const { screening, market, model, ConfigId} = storeToRefs(useScreenStore())
+    const isModelStore = useScreenStore()
+    const { screening, market, model, isModel, ConfigId} = storeToRefs(useScreenStore())
     
     const addTemplate = () => {
         marketStore.setMarket(!market)
@@ -140,7 +141,7 @@
      */
      const GetTripConfig = async () =>{
         try {
-            if(!ConfigId) return
+            if(!ConfigId||isModel) return
             let queryMsg = {
                 ConfigId: ConfigId
             }
@@ -148,6 +149,7 @@
             if (datasRes.data.resultCode == 1) {
                 if(datasRes.data.data&&datasRes.data.data.length>0&&datasRes.data.data[0].TempId){
                     searchData.value.TempId = datasRes.data.data[0].TempId
+                    isModelStore.setIsModel(true)
                     marketStore.setMarket(!market)
                 }
             }
@@ -161,6 +163,7 @@
      * 页面跳转
      */
     const goToTemplate = (item: any) => {
+        if(!ConfigId||!model) return
         searchData.value.TempId = item.TempId
         marketStore.setMarket(!market)
         // console.log("item", item.TempId);