Merge branch 'router' of http://gitlab.oytour.com/viitto/pptist into router

# Conflicts:
#	src/views/TemplateCenter/Index.vue
#	src/views/TemplateCenter/colour.vue
#	src/views/TemplateCenter/nation.vue

src/views/Editor/Thumbnails/index.vue

@@ -470,6 +470,7 @@ const GetTripTemplate = async () =>{
         queryObj.value.ColorStr = dataRes.data.data.ColorStr
         queryObj.value.TempType = dataRes.data.data.TempType
         queryObj.value.TemplateType = dataRes.data.data.TemplateType
+        queryObj.value.AuthType = dataRes.data.data.AuthType
         
         if(queryObj.value.Width){
           VIEWPORT_SIZE.Value = queryObj.value.Height

src/views/Editor/index.vue

@@ -125,6 +125,7 @@ const datas = reactive({
           Width: 0,
           Height: 0,
           ColorId: '',
+          AuthType: 0,//0-免费模版 1-vip模版 2-私有模版
         }
     },
 

src/views/TemplateCenter/Index.vue

@@ -37,10 +37,10 @@
         {{scope.row.reduceUrl}}
       </template>
     </el-table-column>
-    <el-table-column label="操作" width="150">
+    <el-table-column label="操作" width="160">
       <template #default="scope">
         <el-button type="primary" :icon="Edit" size="small" @click.stop="editDelete(scope.row)">编辑</el-button>
-        <el-button type="primary" :icon="Edit" size="small" @click.stop="editDelete(scope.row,scope.$index)">删除</el-button>
+        <el-button type="primary" :icon="Delete" size="small" @click.stop="editDelete(scope.row,scope.$index)">删除</el-button>
       </template>
     </el-table-column>
   </el-table>
@@ -100,6 +100,8 @@
   import { ENT_USER_THEME, VIP_USER_THEME } from "@/configs/customer";
   import { useUserStore, useFontStore } from "@/store";
   import { storeToRefs } from "pinia";
+  import { USER_DEFAULT_HEADER } from '@/configs/customer'
+  import { Edit,Delete } from '@element-plus/icons-vue';
   import { ElMessage, ElMessageBox } from 'element-plus'
   import { CustomerFonts } from '@/store/font'
   import {getFonts} from '@/utils/psdParser/index'

src/views/TemplateCenter/TemplateManagement.vue

@@ -102,11 +102,11 @@
             <span class="text-info">{{scope.row.CreateTime}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="190">
+        <el-table-column label="操作" width="240">
           <template #default="scope">
             <el-button type="primary" :icon="Edit" size="small" @click="goToTemplate(scope.row)">编辑</el-button>
-            <el-button type="primary" :icon="Edit" size="small" @click="getTemplate(scope.row)">详情</el-button>
-            <el-button type="primary" :icon="Edit" size="small" @click="deleteTemplate(scope.row)">删除</el-button>
+            <el-button type="primary" :icon="View" size="small" @click="getTemplate(scope.row)">详情</el-button>
+            <el-button type="primary" :icon="Delete" size="small" @click="deleteTemplate(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -128,7 +128,7 @@ import { ElLoading, ElMessage, ElMessageBox } from "element-plus";
 import { useRouter } from "vue-router";
 import UserCard from "@/components/User/UserCard.vue";
 import temDetails from "@/components/home/temDetails.vue";
-import { Delete,View,Search } from '@element-plus/icons-vue';
+import { Edit,Delete,View,Search } from '@element-plus/icons-vue';
 import { VIEWPORT_SIZE, VIEWPORT_VER_SIZE } from '@/configs/canvas'
 
 import { noDataImg } from "@/utils/common";

src/views/TemplateCenter/colour.vue

@@ -36,10 +36,10 @@
           {{scope.row.ColorValue}}
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="150">
+      <el-table-column label="操作" width="160">
         <template #default="scope">
           <el-button type="primary" :icon="Edit" size="small" @click.stop="editDelete(scope.row)">编辑</el-button>
-          <el-button type="primary" :icon="Edit" size="small" @click.stop="editDelete(scope.row,scope.$index)">删除</el-button>
+          <el-button type="primary" :icon="Delete" size="small" @click.stop="editDelete(scope.row,scope.$index)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -52,6 +52,21 @@
             <div class="text-title text-center fz16 PingFangSC">{{datas.params.id?'编辑':'新增'}}颜色</div>
         </template>
         <div class="addTemplateBox q-mb-lg fz14">
+          <div class="addTemplateInput q-mt-xs q-mb-lg row items-center">
+            <span class="q-pr-md shrink">主色：</span>
+            <el-select v-model="datas.params.ColorId" 
+              style="width: 260px;"
+              class="ml-1"
+              placeholder="主颜" clearable>
+                  <el-option key="" label="不限" value=""/>
+                  <el-option
+                      v-for="item in ColorList"
+                      :key="item.ColorName"
+                      :label="`${item.ColorName}`"
+                      :value="item.ColorName"
+                  />
+            </el-select>
+          </div>
           <div class="addTemplateInput q-mt-xs q-mb-lg row items-center">
               <span class="q-pr-md shrink">名称：</span>
               <el-input min="750" v-model="datas.params.ColorName"
@@ -85,6 +100,8 @@
     import { ENT_USER_THEME, VIP_USER_THEME } from "@/configs/customer";
     import { useUserStore, useFontStore } from "@/store";
     import { storeToRefs } from "pinia";
+    import { USER_DEFAULT_HEADER } from '@/configs/customer'
+    import { Edit,Delete } from '@element-plus/icons-vue';
     import { ElMessage, ElMessageBox } from 'element-plus'
     import { CustomerFonts } from '@/store/font'
     import {getFonts} from '@/utils/psdParser/index'
@@ -93,6 +110,7 @@
     import { reduceFont } from '@/utils/fonts/convertFont'
     import ConfigService from '@/services/ConfigService'
     import LineService from '@/services/LineService'
+    import { DominantColour } from '@/utils/common'
   
     const useUser = useUserStore()
     const { userInfo } = storeToRefs(useUser)
@@ -119,13 +137,16 @@
       params: {
         ID: 0,
         ColorName: '',
-        ColorValue: ''
+        ColorValue: '',
+        ColorId: ''
       }
     })
   
     const fonts = ref<{fontFamily:string,uploadType:number,selectedFont?:string}[]>()
     const uploadingIndex = ref(-1)
   
+    const ColorList = DominantColour()
+
     const close = () => {
         datas.params = {
             ID: 0,

src/views/TemplateCenter/nation.vue

@@ -21,10 +21,10 @@
           {{scope.row.CountryName}}
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="150">
+      <el-table-column label="操作" width="160">
         <template #default="scope">
           <el-button type="primary" :icon="Edit" size="small" @click.stop="editDelete(scope.row)">编辑</el-button>
-          <el-button type="primary" :icon="Edit" size="small" @click.stop="editDelete(scope.row,scope.$index)">删除</el-button>
+          <el-button type="primary" :icon="Delete" size="small" @click.stop="editDelete(scope.row,scope.$index)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -57,6 +57,8 @@
     import { ENT_USER_THEME, VIP_USER_THEME } from "@/configs/customer";
     import { useUserStore, useFontStore } from "@/store";
     import { storeToRefs } from "pinia";
+    import { USER_DEFAULT_HEADER } from '@/configs/customer'
+    import { Edit,Delete } from '@element-plus/icons-vue';
     import { ElMessage, ElMessageBox } from 'element-plus'
     import { CustomerFonts } from '@/store/font'
     import {getFonts} from '@/utils/psdParser/index'