Merge commit 'a52f048a' into dev

@@ -31,7 +31,7 @@
         </el-row>
         </el-row>
 
 
         <div style="display: flex">
         <div style="display: flex">
-          <div style="min-width: 130px" class="title">{{language.value==0?'工作室简介:':'Studio profile:'}}</div>
+          <div style="min-width: 130px" class="title">{{language==0?'工作室简介:':'Studio profile:'}}</div>
           <div v-html="form.introduction"></div>
           <div v-html="form.introduction"></div>
         </div>
         </div>
       </el-card>
       </el-card>

@@ -30,7 +30,7 @@
          {{form.remarks}}
          {{form.remarks}}
         </el-row>
         </el-row>
         <div style="display: flex">
         <div style="display: flex">
-          <div style="min-width: 130px" class="title">{{language.value==0?'工作室简介:':'Studio profile:'}}</div>
+          <div style="min-width: 130px" class="title">{{language==0?'工作室简介:':'Studio profile:'}}</div>
           <div v-html="form.introduction"></div>
           <div v-html="form.introduction"></div>
         </div>
         </div>
       </el-card>
       </el-card>

@@ -109,12 +109,23 @@ function popRemark(type) {
     building()
     building()
     return
     return
   }
   }
+  // if ((form.value.isJdView == 0 && type == '1')
+  //     || (form.value.isCarView == 0 && type == '2')
+  //     || (form.value.isFoodView == 0 && type == '3')
+  //     || (form.value.isMealView == 0 && type == '4')
+  //     || (form.value.isPhotoView == 0 && type == '5')
+  // ) {
+  //   building()
+  //   return
+  // }
   if ((form.value.isJdView == 0 && type == '1')
   if ((form.value.isJdView == 0 && type == '1')
-      || (form.value.isCarView == 0 && type == '2')
-      || (form.value.isFoodView == 0 && type == '3')
-      || (form.value.isMealView == 0 && type == '4')
-      || (form.value.isPhotoView == 0 && type == '5')
-  ) {
+    || (type == '2')
+    || ( type == '3')
+    || (form.value.isMealView == 0 && type == '4')
+    || (type == '5')
+    // || (type == '0')
+  )
+  {
     building()
     building()
     return
     return
   }
   }

@@ -100,7 +100,7 @@ const props = defineProps({
     default: '0'
     default: '0'
   }
   }
 })
 })
-const form = ref({})
+const form = ref()
 onMounted(() => {
 onMounted(() => {
   getBaseInfoByActiveId(props.matchId).then(res => {
   getBaseInfoByActiveId(props.matchId).then(res => {
     form.value = res.data || null
     form.value = res.data || null
@@ -121,12 +121,23 @@ function popRemark(type) {
     return
     return
   }
   }
 
 
+  // if ((form.value.isJdView == 0 && type == '1')
+  //     || (form.value.isCarView == 0 && type == '2')
+  //     || (form.value.isFoodView == 0 && type == '3')
+  //     || (form.value.isMealView == 0 && type == '4')
+  //     || (type == '5' && form.value.isPhotoView == 0)
+  //     || (type == '0')) {
+  //   building()
+  //   return
+  // }
   if ((form.value.isJdView == 0 && type == '1')
   if ((form.value.isJdView == 0 && type == '1')
-      || (form.value.isCarView == 0 && type == '2')
-      || (form.value.isFoodView == 0 && type == '3')
-      || (form.value.isMealView == 0 && type == '4')
-      || (type == '5' && form.value.isPhotoView == 0)
-      || (type == '0')) {
+    || (type == '2')
+    || ( type == '3')
+    || (form.value.isMealView == 0 && type == '4')
+    || (type == '5')
+    // || (type == '0')
+     )
+  {
     building()
     building()
     return
     return
   }
   }
@@ -144,7 +155,6 @@ function goBooking(n) {
   switch (n) {
   switch (n) {
     case 0:
     case 0:
       // 票务
       // 票务
-      building()
       router.push({path: `/booking/ticket/${props.matchId}`})
       router.push({path: `/booking/ticket/${props.matchId}`})
       break;
       break;
     case 1:
     case 1:

@@ -8,7 +8,7 @@ import { ElMessage } from "element-plus";
 import { useStorage } from "@vueuse/core/index";
 import { useStorage } from "@vueuse/core/index";
 const language = useStorage("language", 0);
 const language = useStorage("language", 0);
 
 
-const baseURL = "https://jijin.wtwuxicenter.com/ticket"; //"http://book.xiaojinyu.games"; // 这里填入你的基础 API URL
+const baseURL = "https://ticketh5.wdsfwuxicenter.com/ticket"; //"http://book.xiaojinyu.games"; // 这里填入你的基础 API URL
 const timeout = 15000; // 请求超时时间
 const timeout = 15000; // 请求超时时间
 
 
 const http = axios.create({
 const http = axios.create({