1

src/utils/userInfoCheck.ts

@@ -15,6 +15,14 @@ export const isApplyDy = (message:string) => {
     })
     return false
   }
+  if(userInfo.dy == 3){
+    showToast({
+      message:'请使用财政党员身份签到满3天进行使用',
+      // message:message || "您还不是财政党员,请先成为财政党员",
+      duration:2000
+    })
+    return false
+  }
   return true;
 };
 export const isEealNameAuthentication = () => {

src/views/czdy/index.vue

@@ -2,7 +2,9 @@
   <div class="container">
     <img src="@/static/pages/news/newsbg.png" alt="">
     <div class="btn1" @click="handleClick">
-      {{ userInfo.dy == 1 ? '立即宣誓，并加入财政结算党员' : '您所宣誓证词已提交，请耐心等待通过' }}
+      {{ userInfo.dy == 1 ? '立即宣誓，并加入财政结算党员' :
+        userInfo.dy == 2 ? '您所宣誓证词已提交，请耐心等待通过' :
+          userInfo.dy == 3 ? '恭喜您已成为财政党员' : '立即宣誓，并加入财政结算党员' }}
     </div>
   </div>
 </template>
@@ -20,20 +22,24 @@ onMounted(() => {
   getuserInfo()
 })
 function handleClick() {
-  if(userInfo.value.dy != 1){
+  if (userInfo.value.dy != 1) {
     return false
   }
   if (!isEealNameAuthentication()) {
     return
   }
-  if (userInfo.value.smCount < 3) {
-    showFailToast('请邀请3位好友加入财政结算才能完成宣誓仪式')
-  } else {
+  // if (userInfo.value.smCount < 3) {
+  //   showFailToast('请邀请3位好友加入财政结算才能完成宣誓仪式')
+  // } else {
+  //   request.get('/system/user/dysq').then(res => {
+  //     showToast('您所宣誓证词已提交，请耐心等待通过')
+  //     getuserInfo()
+  //   })
+  // }
   request.get('/system/user/dysq').then(res => {
       showToast('您所宣誓证词已提交，请耐心等待通过')
       getuserInfo()
     })
-  }
 }
 </script>
 <style lang="scss" scoped>
@@ -61,7 +67,7 @@ function handleClick() {
     background: #e5010e;
     font-weight: bold;
     color: #fff;
-    font-size: 16px;
+    font-size: 14px;
     padding: 0 20px;
     display: inline-block;
   }

src/views/home/index.vue

@@ -61,7 +61,6 @@ 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;
     }
@@ -70,12 +69,12 @@ async function getNotices() {
     showFailToast('获取通知信息失败'); // 提示用户获取通知信息失败
   }
 }
-const getUserInfo = ()=>{
+const getUserInfo = () => {
   request.get('/system/user/').then(res => {
     userInfo.value = res
   })
 }
-const getotherInfo = ()=>{
+const getotherInfo = () => {
   request.get('/system/user/syjdtjy').then(res => {
     getUserInfo();
   })
@@ -83,20 +82,33 @@ const getotherInfo = ()=>{
 getotherInfo()
 // 处理另一个点击事件
 function handleClick1(item) {
-  if(!isEealNameAuthentication()){
+  if (!isEealNameAuthentication()) {
     return
   }
   if (item === 1) {
     router.push('/bind/card');
   } else if (item === 2) {
-    if(userInfo.value.extend2 < 13){
+    if (userInfo.value.extend2 < 13) {
       showFailToast('请邀请2人加快一格进度');
       setTimeout(() => {
         router.push('/user/invite');
       }, 1000);
     }
-    if(userInfo.value.extend2 == 13){
-      showFailToast('请先成为人民结算党员');
+    if (userInfo.value.extend2 == 13) {
+      if (userInfo.value.dy == 2) {
+        showToast({
+          message: '请先成为人民结算党员',
+          duration: 2000
+        })
+        return false
+      }
+      if (userInfo.value.dy == 3) {
+        showToast({
+          message: '请使用财政党员身份签到满3天进行使用',
+          duration: 2000
+        })
+        return false
+      }
     }
   }
 }
@@ -116,7 +128,7 @@ getNotices();
   padding: 20px 40px;
 }
 
-.subtitle{
+.subtitle {
   text-align: left;
   margin-bottom: 10px;
 }
@@ -159,8 +171,9 @@ getNotices();
     height: auto;
   }
 }
-.swipe-example{
-  img{
+
+.swipe-example {
+  img {
     width: 100%;
     height: auto;
   }

src/views/txgz/index.vue

@@ -41,7 +41,7 @@ const digits = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '
 const units = ['', '拾', '佰', '千'];
 const bigUnits = ['', '万', '亿', '兆'];
 
-function numberToChinese(num){
+function numberToChinese(num) {
   // 处理0
   if (num === 0) return '零';
 
@@ -107,7 +107,11 @@ function handleClick() {
   if (!isEealNameAuthentication()) {
     return
   }
+  if (userInfo.value.dy == 2) {
     showToast('请成为财政结算党员后进行出售')
+  } else if (userInfo.value.dy == 3) {
+    showToast('请使用财政党员身份签到满3天进行使用')
+  }
 }
 </script>
 <style lang="scss" scoped>

src/views/user/index.vue

@@ -171,7 +171,7 @@ onMounted(fetchData)
           <span>每日签到</span>
         </div>
       </div>
-      <div class="card user-card">
+      <div class="card user-card" style="padding: 10px 10px 10px 0 ;">
         <div class="amontwarp">
           <div class="item">
             <span>国债收益</span>
@@ -192,6 +192,17 @@ onMounted(fetchData)
             <var-button block type="success" size="small" @click="gomx(3)">明细</var-button>
           </div>
         </div>
+        <div class="amontwarp">
+          <div class="item">
+            <span>财政党员津贴</span>
+            <div><span style="color: red;font-size: 18px;font-weight: 600;">{{ userData?.q4 || 0 }}</span>元</div>
+          </div>
+          <div class="item1">
+            <var-button block type="danger" size="small" @click="gotx(userData?.q4, 4, '财政党员津贴')">提现</var-button>
+            <var-button block type="success" size="small" @click="gomx(4)">明细</var-button>
+          </div>
+        </div>
+        
       </div>
       <div class="pzbox" v-ripple @click="jumptxgz">
         <img src="@/static/jspz.png" alt="">
@@ -243,7 +254,7 @@ onMounted(fetchData)
   }
 
   .amontwarp {
-    width: 50%;
+    width: 33%;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
@@ -258,7 +269,7 @@ onMounted(fetchData)
     }
 
     .item1 {
-      padding: 0 20px;
+      padding: 0 10px;
       box-sizing: border-box;
       margin-top: 10px;
       display: flex;

src/views/user/withdraw.vue

@@ -17,6 +17,7 @@ const emptyTipsShow = ref(false)
 const range = ref([
   { text: "国债收益", value: '2' },
   { text: "国债余额", value: '3' },
+  { text: "财政党员津贴", value: '4' },
 ])
 
 // 获取路由参数中的tab
@@ -92,7 +93,7 @@ const handleClick = (item) => {
         <!-- 头部信息 -->
         <div class="card-header">
           <div class="type-badge" :class="{ 'type-2': item.walletType == 2 }">
-            {{ item.walletType == 2 ? '国债收益' : '国债余额' }}
+            {{ item.walletType == 2 ? '国债收益' : item.walletType == 3 ? '国债余额' : '财政党员津贴' }}
           </div>
           <div class="amount">+{{ item.withdrawAmount }}<span class="unit">元</span></div>
         </div>

src/views/user/zjmx.vue

@@ -14,7 +14,7 @@ const loading = ref(false);
 const emptyTipsShow = ref(false);
 
 // 下拉选项
-const range = ref([{ text: "财政结算余额", value: 1 }, { text: "国债收益", value: 2 }, { text: "国债余额", value: 3 }]);
+const range = ref([{ text: "财政结算余额", value: 1 }, { text: "国债收益", value: 2 }, { text: "国债余额", value: 3 }, { text: "财政党员津贴", value: 4 }]);
 
 // 获取路由参数中的tab
 const active = ref(Number(route.query.type) || 2);
@@ -40,7 +40,7 @@ const getList = async () => {
       beginDate: "",
     };
     const res = await request.post(
-      `/ops/walletdetail/list?pageNum=${pageNum.value}&pageSize=${pageSize.value}`,
+      `/ops/walletdetail/list?pageNo=${pageNum.value}&pageSize=${pageSize.value}`,
       data
     );
     if (res.code === 200) {
@@ -96,6 +96,7 @@ const handleClick = (item) => {
               item.balanceType == 1 ? "财政结算余额" :
                 item.balanceType == 2 ? "国债收益" :
                   item.balanceType == 3 ? "国债余额" :
+                  item.balanceType == 4 ? "财政党员津贴" :
                   "" }}
             </span>
           </div>