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

src/assets/styles/common.css

@@ -15,7 +15,7 @@ page {
 
 @font-face {
 	font-family: "pingfangr";
-	src: url("https://im.oytour.com/tripfont/PingFangR.ttf") format("truetype");
+	src: url("https://im.oytour.com/tripfont/a5cf6c61491d0b1aed95c0f9d0737140.woff2") format("woff2");
 	font-display: swap;
 }
 .el-table.tableHBEbeef5 th.el-table__cell {

src/store/user.ts

@@ -72,7 +72,7 @@ export const useUserStore = defineStore('user', {
                     if(!this.userInfo.photo || (!this.userInfo.photo.includes('http://')&& !this.userInfo.photo.includes('https://'))){
                         this.userInfo.photo = USER_DEFAULT_HEADER
                     }
-                    if(!this.userInfo.logo || (!this.userInfo.logo.includes('http://')&& !this.userInfo.logo.includes('https://'))){
+                    if(!this.userInfo.logo || (!this.userInfo.logo.includes('http://') && !this.userInfo.logo.includes('https://'))){
                         this.userInfo.logo = ENTERPRISE_DEFAULT_HEADER
                     }
                     return { isSuccess:true, message:''}
@@ -116,10 +116,10 @@ export const useUserStore = defineStore('user', {
                     if(!Array.isArray(response.data.data)) {
                         this.token = response.data.data.token
                         this.userInfo = response.data.data.userinfo
-                        if(!this.userInfo.photo || !this.userInfo.photo.includes('http://')|| !this.userInfo.photo.includes('https://')){
+                        if(!this.userInfo.photo || (!this.userInfo.photo.includes('http://')&& !this.userInfo.photo.includes('https://'))){
                             this.userInfo.photo = USER_DEFAULT_HEADER
                         }
-                        if(!this.userInfo.logo || !this.userInfo.logo.includes('http://')|| !this.userInfo.logo.includes('https://')){
+                        if(!this.userInfo.logo || (!this.userInfo.logo.includes('http://')&& !this.userInfo.logo.includes('https://'))){
                             this.userInfo.logo = ENTERPRISE_DEFAULT_HEADER
                         }
                         return { status:'SUCCESS',verify:false  } as UserLoginResult

src/views/Editor/CanvasTool/UploadPicture.vue

@@ -5,7 +5,7 @@
                 <div class="text-title">选择、上传图片</div>
             </div>
             <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-                <el-tab-pane label="ERP资料库" name="1">
+                <el-tab-pane label="平台资料库" name="1">
                     <template v-if="userInfo.iv||userInfo.it">
                         <el-row class="q-mb-md">
                             <el-col :span="6">

src/views/UserCenter/Index.vue

@@ -29,8 +29,10 @@
           <span class="text-dark q-ml-md cursor-pointer" @click="goSpace">{{TravelDesign.tripCount}}个行程</span>
           <IconRight :size="20"></IconRight>
           <div class="col"></div>
-          <span class="text-grey-8">还可创建：</span>
-          <span class="text-dark q-ml-md">0个行程</span>
+          <template v-if="!userInfo.iv && !userInfo.it">
+            <span class="text-grey-8">还可创建：</span>
+            <span class="text-dark q-ml-md">{{1-TravelDesign.tripCount<0?0:(1-TravelDesign.tripCount)}}个行程</span>
+          </template>
         </div>
       </el-card>
       <el-card class="user-card" shadow="never">
@@ -43,7 +45,7 @@
         </div>
         <div style="font-size: 14px;" class="row items-center q-mt-lg">
           <span class="text-grey-8">当前模板可用范围：</span>
-          <span class="text-dark q-ml-md cursor-pointer">免费模板</span>
+          <span class="text-dark q-ml-md cursor-pointer">{{ !userInfo.iv && !userInfo.it?'免费模板':'全部平台模板' }}</span>
         </div>
       </el-card>
     </div>