fix: 合并冲突

README.md

@@ -11,4 +11,5 @@ https://ybpc.hzinsights.com
 2. mac PC小程序尺寸 1024*720
 3. 微信扫码登录文档：https://developers.weixin.qq.com/doc/oplatform/Website_App/WeChat_Login/Wechat_Login.html
 4. 向小程序发送的数据 {path:小程序对应页面路径,params:小程序页面所需要的参数,title:分享的标题,shareImg:分享的图片}
-5. 如果需要重写url可使用 history.replaceState
+5. 如果需要重写url可使用 history.replaceState
+6. 我这边首次运行时报错No known conditions for "./lib/locale/lang/zh-cn" entry in "element-plus" package，说是版本原因所以把App.vue的zhCn路径改为了"element-plus/es/locale/lang/zh-cn"，如果你们有同样报错的话改回来就好

src/App.vue

@@ -1,5 +1,5 @@
 <script setup>
-import zhCn from 'element-plus/lib/locale/lang/zh-cn'
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
 </script>
 
 <template>

src/components/LoginPop.vue

@@ -43,10 +43,14 @@ const typeChange=(e)=>{
     form.mobile=''
     form.code=''
     form.email=''
+    remainingTime.value = 0
     clearTimeout(sendCodeInterval)
     isSendCode.value=false
 }
 
+// 登录验证码增加倒计时
+let remainingTime = ref(0); // 剩余时间，单位为秒
+
 //发送验证码
 
 let isSendCode=ref(false)//是否已发送验证码
@@ -70,11 +74,18 @@ const handleSendCode=async (type)=>{
         res=await apiGetEmailCode({email: form.email})
     }
     if(res.code===200){
-        isSendCode.value=true
-        ElMessage.success('验证码已发送')
-        sendCodeInterval=setTimeout(() => {
-            isSendCode.value=false
-        }, 60000);
+        isSendCode.value = true;
+        remainingTime.value = 60; // 设置初始倒计时为60秒
+        const timer = setInterval(() => {
+            if (remainingTime.value > 1) {
+                remainingTime.value--;
+            } else {
+                clearInterval(timer);
+                isSendCode.value = false;
+                remainingTime.value = 0; // 重置剩余时间
+            }
+        }, 1000); // 每秒减少一次剩余时间
+        ElMessage.success('验证码已发送');
     }
 }
 
@@ -98,11 +109,18 @@ const handlePCSendCode=async (type)=>{
         res=await apiGetPCEmailCode({email: form.email})
     }
     if(res.code===200){
-        isSendCode.value=true
-        ElMessage.success('验证码已发送')
-        sendCodeInterval=setTimeout(() => {
-            isSendCode.value=false
-        }, 60000);
+        isSendCode.value = true;
+        remainingTime.value = 60; // 设置初始倒计时为60秒
+        const timer = setInterval(() => {
+            if (remainingTime.value > 1) {
+                remainingTime.value--;
+            } else {
+                clearInterval(timer);
+                isSendCode.value = false;
+                remainingTime.value = 0; // 重置剩余时间
+            }
+        }, 1000); // 每秒减少一次剩余时间
+        ElMessage.success('验证码已发送');
     }
 }
 
@@ -231,7 +249,9 @@ onMounted(()=>{
                     </div>
                     <div class="input-item">
                         <input v-model="form.code" placeholder="请输入验证码" />
-                        <span :class="['send-code-btn',isSendCode&&'send-code-disabled']" @click="handlePCSendCode('phone')">{{isSendCode?'已发送':'发送验证码'}}</span>
+                        <span :class="['send-code-btn',isSendCode&&'send-code-disabled']" @click="handlePCSendCode('phone')">
+                            {{ isSendCode ? `${remainingTime}秒后重新发送` : '发送验证码' }}
+                        </span>
                     </div>
                     <div class="global-main-btn login-btn" @click="handleLogin('phone')">登录</div>
                     <div style="display:flex;justify-content: space-around;">
@@ -253,7 +273,9 @@ onMounted(()=>{
                     </div>
                     <div class="input-item">
                         <input v-model="form.code" placeholder="请输入验证码" />
-                        <span :class="['send-code-btn',isSendCode&&'send-code-disabled']" @click="handlePCSendCode('email')">{{isSendCode?'已发送':'发送验证码'}}</span>
+                        <span :class="['send-code-btn',isSendCode&&'send-code-disabled']" @click="handlePCSendCode('email')">
+                            {{ isSendCode ? `${remainingTime}秒后重新发送` : '发送验证码' }}
+                        </span>
                     </div>
                     <div class="global-main-btn login-btn" @click="handleLogin('email')">登录</div>
 
@@ -302,7 +324,9 @@ onMounted(()=>{
                 </div>
                 <div class="input-item">
                     <input v-model="form.code" placeholder="请输入验证码" />
-                    <span :class="['send-code-btn',isSendCode&&'send-code-disabled']" @click="handleSendCode('phone')">{{isSendCode?'已发送':'发送验证码'}}</span>
+                    <span :class="['send-code-btn',isSendCode&&'send-code-disabled']" @click="handleSendCode('phone')">
+                        {{ isSendCode ? `${remainingTime}秒后重新发送` : '发送验证码' }}
+                    </span>
                 </div>
                 <div class="global-main-btn login-btn" @click="handleBind('phone')">登录</div>
                 <div class="bot-img">
@@ -318,7 +342,9 @@ onMounted(()=>{
                 </div>
                 <div class="input-item">
                     <input v-model="form.code" placeholder="请输入验证码" />
-                    <span :class="['send-code-btn',isSendCode&&'send-code-disabled']" @click="handleSendCode('email')">{{isSendCode?'已发送':'发送验证码'}}</span>
+                    <span :class="['send-code-btn',isSendCode&&'send-code-disabled']" @click="handleSendCode('email')">
+                        {{ isSendCode ? `${remainingTime}秒后重新发送` : '发送验证码' }}
+                    </span>
                 </div>
                 <div class="global-main-btn login-btn" @click="handleBind('email')">登录</div>
                 <div class="bot-img">

src/views/report/ChapterDetail.vue

@@ -26,11 +26,8 @@ import collectSIcon from '@/assets/collect2-s.png'
 import {useWaterMark} from '@/hooks/waterMark.js'
 import {addTokenToIframe} from '@/utils/common.js'
 import ReportContent from './components/ReportContent.vue'
-<<<<<<< HEAD
 import reportCancel from './components/reportCancel.vue'
-=======
 import Disclaimer from '@/components/Disclaimer.vue'
->>>>>>> yh238
 
 const route=useRoute()
 const router=useRouter()

src/views/report/Detail.vue

@@ -20,11 +20,7 @@ import {addTokenToIframe} from '@/utils/common.js'
 import ReportContent from './components/ReportContent.vue'
 import { onClickOutside } from '@vueuse/core'
 import reportCancel from './components/reportCancel.vue'
-<<<<<<< HEAD
-=======
-import ReportContent from './components/ReportContent.vue'
 import Disclaimer from '@/components/Disclaimer.vue'
->>>>>>> yh238
 moment.locale('zh-cn')
 
 const route=useRoute()

src/views/report/Index.vue

@@ -742,12 +742,12 @@ onActivated(()=>{
             margin-top: 10px;
             color: #666666;
             font-size: 14px;
+            word-wrap: break-word;
+            word-break: break-all;
             :deep(div){
               word-wrap: break-word;
               word-break: break-all;
             }
-            word-wrap: break-word;
-            word-break: break-all;
           }
 
           .tags {