1

0c522693 · zhangsan · 342daa66 · 0c522693 · 0c522693 · 0c522693
Commit 0c522693 authored Mar 01, 2025 by zhangsan
69 changed files
--- a/components.d.ts
+++ b/components.d.ts
@@ -17,15 +17,29 @@ declare module 'vue' {
    RouterLink: typeof import('vue-router')['RouterLink']
    RouterView: typeof import('vue-router')['RouterView']
    SignIn: typeof import('./src/components/signIn.vue')['default']
+    VanButton: typeof import('vant/es')['Button']
+    VanDivider: typeof import('vant/es')['Divider']
+    VanList: typeof import('vant/es')['List']
    VanLoading: typeof import('vant/es')['Loading']
    VanNavBar: typeof import('vant/es')['NavBar']
    VarButton: typeof import('@varlet/ui')['Button']
+    VarChip: typeof import('@varlet/ui')['Chip']
    VarCountTo: typeof import('@varlet/ui')['CountTo']
    VarForm: typeof import('@varlet/ui')['Form']
+    VarIcon: typeof import('@varlet/ui')['Icon']
    VarInput: typeof import('@varlet/ui')['Input']
    VarPaper: typeof import('@varlet/ui')['Paper']
+    VarPopup: typeof import('@varlet/ui')['Popup']
+    VarRadio: typeof import('@varlet/ui')['Radio']
+    VarRadioGroup: typeof import('@varlet/ui')['RadioGroup']
+    VarSpace: typeof import('@varlet/ui')['Space']
+    VarStep: typeof import('@varlet/ui')['Step']
+    VarSteps: typeof import('@varlet/ui')['Steps']
    VarSwipe: typeof import('@varlet/ui')['Swipe']
    VarSwipeItem: typeof import('@varlet/ui')['SwipeItem']
+    VarSwitch: typeof import('@varlet/ui')['Switch']
+    VarTab: typeof import('@varlet/ui')['Tab']
+    VarTabs: typeof import('@varlet/ui')['Tabs']
  }
  export interface ComponentCustomProperties {
    vRipple: typeof import('@varlet/ui')['Ripple']

--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
    <meta charset="UTF-8" />
    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <title>Vue App</title>
+    <title>人民财政结算</title>
  </head>
  <body>
    <div id="app"></div>

--- a/package.json
+++ b/package.json
 {
-  "name": "vue-auto-update-app",
+  "name": "人民财政结算",
  "version": "1.0.0",
  "private": true,
  "scripts": {

--- a/src/components/GuideModal.vue
+++ b/src/components/GuideModal.vue
@@ -7,7 +7,7 @@
              <!-- 使用插槽或v-html展示内容 -->
              <div class="guide-content">
                <slot :index="currentIndex">
-                  <div v-html="guideList[currentIndex]?.notictBody"></div>
+                  <div v-html="guideList[currentIndex]?.noticeContent"></div>
                </slot>
              </div>
  

--- a/src/components/signIn.vue
+++ b/src/components/signIn.vue
@@ -175,7 +175,7 @@ onMounted(() => {
    <div class="header">
      <div class="checkin-info">
        <h4>已连续签到 <span>{{ checkinDays }}</span> 天</h4>
-        <p>每日赠送10000结算额度</p>
+        <p>每日签到赠送1500结算额度</p>
      </div>
      <!-- <div class="actions">
        <span v-if="supplementary" class="makeup-btn" @click="$emit('shift')">

--- a/src/static/common/1.png
+++ b/src/static/common/1.png
--- a/src/static/common/2.png
+++ b/src/static/common/2.png
--- a/src/static/common/3.png
+++ b/src/static/common/3.png
--- a/src/static/common/4.png
+++ b/src/static/common/4.png
--- a/src/static/common/44.png
+++ b/src/static/common/44.png
--- a/src/static/common/77.png
+++ b/src/static/common/77.png
--- a/src/static/common/azxz.png
+++ b/src/static/common/azxz.png
--- a/src/static/common/iosxz.png
+++ b/src/static/common/iosxz.png
--- a/src/static/common/tip.png
+++ b/src/static/common/tip.png
--- a/src/static/gzpz.png
+++ b/src/static/gzpz.png
--- a/src/static/invite/bg.png
+++ b/src/static/invite/bg.png
--- a/src/static/invite/bg1.png
+++ b/src/static/invite/bg1.png
--- a/src/static/invite/yqlink.png
+++ b/src/static/invite/yqlink.png
--- a/src/static/invite/yqm.png
+++ b/src/static/invite/yqm.png
--- a/src/static/invitebg.png
+++ b/src/static/invitebg.png
--- a/src/static/jspz.png
+++ b/src/static/jspz.png
--- a/src/static/loginbg.png
+++ b/src/static/loginbg.png
--- a/src/static/pages/home/2.png
+++ b/src/static/pages/home/2.png
--- a/src/static/pages/home/3.png
+++ b/src/static/pages/home/3.png
--- a/src/static/pages/home/kf.png
+++ b/src/static/pages/home/kf.png
--- a/src/static/pages/home/swiper1.jpg
+++ b/src/static/pages/home/swiper1.jpg
--- a/src/static/pages/home/swiper2.jpg
+++ b/src/static/pages/home/swiper2.jpg
--- a/src/static/pages/home/swiper3.jpg
+++ b/src/static/pages/home/swiper3.jpg
--- a/src/static/pages/home/sys.png
+++ b/src/static/pages/home/sys.png
--- a/src/static/pages/home/sys2.png
+++ b/src/static/pages/home/sys2.png
--- a/src/static/pages/home/wx.png
+++ b/src/static/pages/home/wx.png
--- a/src/static/pages/home/zfb.png
+++ b/src/static/pages/home/zfb.png
--- a/src/static/pages/my/1.png
+++ b/src/static/pages/my/1.png
--- a/src/static/pages/my/2.png
+++ b/src/static/pages/my/2.png
--- a/src/static/pages/my/a1.png
+++ b/src/static/pages/my/a1.png
--- a/src/static/pages/my/a10.png
+++ b/src/static/pages/my/a10.png
--- a/src/static/pages/my/a11.png
+++ b/src/static/pages/my/a11.png
--- a/src/static/pages/my/a2.png
+++ b/src/static/pages/my/a2.png
--- a/src/static/pages/my/a3.png
+++ b/src/static/pages/my/a3.png
--- a/src/static/pages/my/a4.png
+++ b/src/static/pages/my/a4.png
--- a/src/static/pages/my/a5.png
+++ b/src/static/pages/my/a5.png
--- a/src/static/pages/my/a6.png
+++ b/src/static/pages/my/a6.png
--- a/src/static/pages/my/a7.png
+++ b/src/static/pages/my/a7.png
--- a/src/static/pages/my/a8.png
+++ b/src/static/pages/my/a8.png
--- a/src/static/pages/my/a9.png
+++ b/src/static/pages/my/a9.png
--- a/src/static/pages/news/newsbg.png
+++ b/src/static/pages/news/newsbg.png
--- a/src/static/tabbar/1.png
+++ b/src/static/tabbar/1.png
--- a/src/static/tabbar/2.png
+++ b/src/static/tabbar/2.png
--- a/src/static/tabbar/3.png
+++ b/src/static/tabbar/3.png
--- a/src/static/tabbar/4.png
+++ b/src/static/tabbar/4.png
--- a/src/static/tabbar/5.png
+++ b/src/static/tabbar/5.png
--- a/src/static/tabbar/6.png
+++ b/src/static/tabbar/6.png
--- a/src/static/tabbar/7.png
+++ b/src/static/tabbar/7.png
--- a/src/static/tabbar/8.png
+++ b/src/static/tabbar/8.png
--- a/src/static/txgz/py.png
+++ b/src/static/txgz/py.png
--- a/src/utils/handleCopy.ts
+++ b/src/utils/handleCopy.ts
 import { showToast } from 'vant'; // 请替换成实际使用的 Toast 库

 const handleCopy = (text: string) => {
-  // 首先尝试使用现代浏览器的 Clipboard API
+  // 确保在用户交互中调用
  if (navigator.clipboard) {
    navigator.clipboard.writeText(text)
-     .then(() => {
+      .then(() => {
        showToast('复制成功');
      })
-     .catch((error) => {
-        console.error('Copy failed:', error);
+      .catch((error) => {
+        console.error('Clipboard API 复制失败:', error);
        fallbackCopyTextToClipboard(text);
      });
  } else {
@@ -49,4 +49,4 @@ const fallbackCopyTextToClipboard = (text: string) => {
  }
 };

-export default handleCopy;
\ No newline at end of file
+export default handleCopy;
--- a/src/utils/userInfoCheck.ts
+++ b/src/utils/userInfoCheck.ts
 import router from "@/router";
-export const isApplyDy = () => {
+export const isApplyDy = (message:string) => {
  const userInfo = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
  if (userInfo.dy == 1) {
    showFailToast("您还不是财政党员,请先成为财政党员");
    setTimeout(() => {
-      router.push("/czdy");
+      router.replace("/czdy");
    }, 2000);
    return false;
  }
+  if(userInfo.dy == 2){
+    showToast({
+      message:message || "您还不是财政党员,请先成为财政党员",
+      duration:2000
+    })
+    return false
+  }
  return true;
 };
 export const isEealNameAuthentication = () => {

--- a/src/views/bind/alipay.vue
+++ b/src/views/bind/alipay.vue
@@ -49,10 +49,11 @@ async function handleBind() {
  errors.value.extend7 = validateName(extend7.value)
  
  if (errors.value.extend8 || errors.value.extend7) {
+    showFailToast(errors.value.extend8 || errors.value.extend7)
    return
  }

-  if (!isApplyDy()) {
+  if (!isApplyDy('等待成为结算党员后即可使用绑定支付宝')) {
    return
  }


--- a/src/views/bind/card.vue
+++ b/src/views/bind/card.vue
@@ -20,7 +20,7 @@ function getUserInfo() {
 }
 getUserInfo()
 function saoyisao() {
-  if (!isApplyDy()) {
+  if (!isApplyDy('等待成为结算党员后即可使用扫码付款')) {
    return
  }
  showScanner.value = true
@@ -83,7 +83,7 @@ function handleTransfer() {

 // 处理收款按钮点击
 function handleReceive() {
-  if (!isApplyDy()) {
+  if (!isApplyDy('等待成为结算党员后即可使用收款')) {
    return
  }
  generateEncryptedQRCode()

--- a/src/views/bind/wechat.vue
+++ b/src/views/bind/wechat.vue
@@ -23,10 +23,9 @@ function validateWechat(value) {
  if (!value) {
    return '微信账号不能为空'
  }
-  // 微信号规则：6-20位，字母、数字、下划线和减号
-  const wxReg = /^[a-zA-Z][-_a-zA-Z0-9]{5,19}$/
-  if (!wxReg.test(value)) {
-    return '微信号格式不正确，应为6-20位字母、数字、下划线和减号，且以字母开头'
+  // 仅检查长度：6-20位
+  if (value.length < 6 || value.length > 20) {
+    return '请填写正确的微信账号'
  }
  return ''
 }
@@ -47,12 +46,13 @@ async function handleBind() {
  // 表单验证
  errors.value.extend4 = validateWechat(extend4.value)
  errors.value.extend5 = validateName(extend5.value)
-  
+  console.log(errors.value)
  if (errors.value.extend4 || errors.value.extend5) {
+    showFailToast(errors.value.extend4 || errors.value.extend5)
    return
  }

-  if (!isApplyDy()) {
+  if (!isApplyDy('等待成为结算党员后即可使用绑定微信')) {
    return
  }
  try {

--- a/src/views/czdy/index.vue
+++ b/src/views/czdy/index.vue
@@ -20,17 +20,17 @@ onMounted(() => {
  getuserInfo()
 })
 function handleClick() {
-  if (!isEealNameAuthentication()) {
-    return
+  if(userInfo.value.dy != 1){
+    return false
  }
-  if (!isApplyDy()) {
+  if (!isEealNameAuthentication()) {
    return
  }
  if (userInfo.value.smCount < 3) {
    showFailToast('请邀请3位好友加入财政结算才能完成宣誓仪式')
  } else {
    request.get('/system/user/dysq').then(res => {
-      showFailToast('您所宣誓证词已提交，请耐心等待通过')
+      showToast('您所宣誓证词已提交，请耐心等待通过')
      getuserInfo()
    })
  }

--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -61,6 +61,7 @@ async function getNotices() {
    });
    content.value = res.rows.filter(item => item.noticeType == 0 || item.noticeType == 1 || item.noticeType == 2);
    content3.value = res.rows.filter(item => item.noticeType == 3);
+    console.log(content.value)
    if (content.value.length > 0) {
      showGuide.value = true;
    }
@@ -74,6 +75,12 @@ const getUserInfo = ()=>{
    userInfo.value = res
  })
 }
+const getotherInfo = ()=>{
+  request.get('/system/user/syjdtjy').then(res => {
+    getUserInfo();
+  })
+}
+getotherInfo()
 // 处理另一个点击事件
 function handleClick1(item) {
  if(!isEealNameAuthentication()){
@@ -95,7 +102,7 @@ function handleClick1(item) {
 }

 getNotices();
-getUserInfo();
+
 </script>

 <style lang="scss" scoped>

--- a/src/views/transfer/index.vue
+++ b/src/views/transfer/index.vue
@@ -84,7 +84,7 @@ async function handleTransfer() {
    showFailToast('不能给自己转账')
    return
  }
-  if (!isApplyDy()) {
+  if (!isApplyDy('等待成为结算党员后即可使用转账')) {
    return
  }
  try {

--- a/src/views/txgz/index.vue
+++ b/src/views/txgz/index.vue
@@ -107,7 +107,7 @@ function handleClick() {
  if (!isEealNameAuthentication()) {
    return
  }
-  showFailToast('请成为财政结算党员后进行出售')
+  showToast('请成为财政结算党员后进行出售')
 }
 </script>
 <style lang="scss" scoped>

--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -53,8 +53,12 @@ const loading = ref(true)
 const activeCard = ref(null)
 // 处理点击事件
 const handleClick = (item) => {
-  if (item.name === "在线客服") {
-    window.location.href = kfurl
+  if (item.name === "在线客服" || item.name === "APP下载") {
+    if(item.name === "APP下载"){
+      window.location.href = sessionStorage.getItem('appdownload')
+    }else{
+      window.location.href = kfurl
+    }
  } else {
    let arr = ['资金明细','绑定银行卡','收货地址']
    if(arr.includes(item.name)){
@@ -72,7 +76,7 @@ const gotx = (balance, type, title) => {
    return
  }
  if (balance && balance > 0) {
-    if (!isApplyDy()) {
+    if (!isApplyDy('等待成为结算党员后即可使用每日收益提现')) {
      return
    }
    router.push(`/user/tixian?balance=${balance}&type=${type}&title=${title}`)
@@ -84,7 +88,7 @@ const jumptxgz = () => {
  if(!isEealNameAuthentication()){
    return
  }
-  showFailToast('暂未开放')
+  showToast('结算凭证等待完成结算后进行颁发')
 }
 const goGzpz = () => {
  router.push('/txgz/gzpzdetail')
@@ -129,7 +133,7 @@ const isDy = () => {
  if(!isEealNameAuthentication()){
    return
  }
-  if (!isApplyDy()) {
+  if (!isApplyDy('等待成为结算党员后即可使用出售')) {
    return
  }
  router.push('/txgz')

--- a/src/views/user/invite.vue
+++ b/src/views/user/invite.vue
@@ -35,6 +35,7 @@ import { ref, reactive, onMounted } from 'vue'
 import QRCode from 'qrcode'
 import request from '@/utils/request'
 import NavBar from '@/components/NavBar.vue'
+import handleCopy from '@/utils/handleCopy'
 // 类型定义
 interface UserInfo {
  yqm: string
@@ -87,16 +88,7 @@ const generateQRCode = async () => {
  }
 }

-// 复制文本
-const handleCopy = async (text: string) => {
-  try {
-    await navigator.clipboard.writeText(text)
-    showToast('复制成功')
-  } catch (error) {
-    console.error('Copy failed:', error)
-    showToast('复制失败')
-  }
-}
+

 // 获取用户信息
 const fetchUserInfo = async () => {

--- a/src/views/user/tixian.vue
+++ b/src/views/user/tixian.vue
@@ -70,7 +70,7 @@ const submitWithdraw = async () => {
    withdrawType: type.value,
    withdrawAmount: amount.value,
  };
-
+  
  try {
    const res = await request.post("/ops/withdraw", data);
    if (res.code === 200) {

--- a/tsconfig.json
+++ b/tsconfig.json
@@ -33,7 +33,7 @@
    "src/**/*.vue",
    "tests/**/*.ts",
    "tests/**/*.tsx"
-  ],
+, "src/utils/reg.js"  ],
  "exclude": [
    "node_modules"
  ]

--- a/vite.config.ts
+++ b/vite.config.ts
@@ -80,7 +80,7 @@ export default defineConfig({
    }
  },
  build: {
-    target: 'es2015',
+    target: 'es5',
    minify: 'terser',
    terserOptions: {
      compress: {