zhb hai 1 mes
pai
achega
f24e602556

+ 8 - 16
components/cwg-link.vue

@@ -1,23 +1,13 @@
 <template>
   <!-- #ifdef H5 -->
   <!-- H5 端:支持普通跳转 / PDF预览 / 文件下载 -->
-  <a
-    v-if="isDownload"
-    class="pdf-link"
-    :href="url"
-    :download="downloadName"
-    target="_blank"
-  >
+  <a v-if="isDownload" class="pdf-link" :href="url" :download="downloadName" target="_blank">
     <slot v-if="slots['default']"></slot>
-    <view v-else>{{ t(title) || title }}</view>
+    <view v-else>{{ t(props.title) || props.title }}</view>
   </a>
-  <view
-    v-else
-    class="pdf-link"
-    @click="handleClick"
-  >
+  <view v-else class="pdf-link" @click="handleClick">
     <slot v-if="slots['default']"></slot>
-    <view v-else>{{ t(title) || title }}</view>
+    <view v-else>{{ t(props.title) || props.title }}</view>
   </view>
   <!-- #endif -->
 
@@ -25,7 +15,7 @@
   <!-- APP 端:统一点击处理 -->
   <view class="pdf-link" @click="handleClick">
     <slot v-if="slots['default']"></slot>
-    <view v-else>{{ t(title) || title }}</view>
+    <view v-else>{{ t(props.title) || props.title }}</view>
   </view>
   <!-- #endif -->
 </template>
@@ -50,7 +40,7 @@ const props = defineProps({
   // 下载文件名(下载时必填)
   downloadName: String
 })
-
+    console.log(props, 1111);
 // 判断是否是下载类型
 const isDownload = props.type === 'download'
 
@@ -65,6 +55,8 @@ const handleClick = () => {
 
   // PDF 预览
   if (props.type == 'pdf' || props.type == 'pdf1') {
+
+
     openLocalPdf(props.url, props.title, props.type)
   }
 

+ 2 - 0
components/cwg-page-wrapper.vue

@@ -228,6 +228,7 @@ const pushRes = (data: any) => {
 
 //获取推送列表
 const searchPush = async () => {
+  if(!userToken.value) return
   let res = await customApi.PushMessageList({ type: null });
   if (res.code == 200) {
     if (res.data == null) {
@@ -241,6 +242,7 @@ const searchPush = async () => {
 }
 //获取原因列表
 const searchReasons = async () => {
+  if(!userToken.value) return
   let res = await customApi.reasonsRefusalList({ type: null });
   if (res.code == 200) {
     if (res.data == null) {

+ 1 - 1
pages/common/chat.vue

@@ -18,7 +18,7 @@ import Config from '@/config/index'
 const { Host80 } = Config
 import getWebBase from '@/utils/webBase'
 const webBase = getWebBase()
-const fileUrl = `${Host80}${webBase}iframe/livechat.html`
+const fileUrl = `${Host80}/iframe/livechat.html`
 const statusBarHeight = computed(() => globalStore.statusBarHeight)
 
 const webviewStyles = computed(() => ({

+ 1 - 1
pages/common/webview.vue

@@ -33,7 +33,7 @@ const webviewStyles = computed(() => ({
   progress: {
     color: '#ea002a'
   },
-  top: statusBarHeight.value +  + 'px',
+  top: statusBarHeight.value  + 'px',
   bounce: 'none',
   scrollIndicator: 'none'
 }))

+ 10 - 5
pages/login/regist.vue

@@ -179,11 +179,14 @@
             </view>
             <view class="des-bottom">
               <text v-t="'signup.agreemnet1'"></text>
-              <a @click="openUrl('pdf/Client_Agreement.pdf')" target="_blank" v-t="'signup.agreemnet2'"></a>
+              <cwg-link type="pdf" url='pdf/Client_Agreement.pdf' target="_blank" :title="'signup.agreemnet2'"
+                class="desc-link" />
               <text v-t="'signup.agreemnet3'"></text>
-              <a @click="openUrl('pdf/Terms&Conditions.pdf')" target="_blank" v-t="'signup.agreemnet4'"></a>
+              <cwg-link type="pdf" url='pdf/Terms&Conditions.pdf' target="_blank" :title="'signup.agreemnet4'"
+                class="desc-link" />
               <text v-t="'signup.agreemnet5'"></text>
-              <a @click="openUrl('pdf/Privacy_Policy.pdf')" target="_blank" v-t="'signup.agreemnet6'"></a>
+              <cwg-link type="pdf" url='pdf/Privacy_Policy.pdf' target="_blank" :title="'signup.agreemnet6'"
+                class="desc-link" />
               <text v-t="'signup.agreemnet7'"></text>
             </view>
           </view>
@@ -841,7 +844,7 @@ onMounted(() => {
         }
 
         .doc-link {
-          color: var(--color-error);
+          color: #e61f1e;
           text-decoration: underline;
           margin: 0 px2rpx(4);
         }
@@ -1147,8 +1150,10 @@ onMounted(() => {
   color: #000;
   font-size: 12px;
 
-  a {
+  .desc-link {
+    display: inline-block;
     color: #e61f1e;
+    text-decoration: underline;
   }
 }