代码更新 缴费

app/app.vue

@@ -21,10 +21,7 @@ const keepAliveRouteNames = computed(() => {
 </template>
 
 <style>
-@font-face {
-  font-family: pingfang;
-  src: url('./static/PingFangSC-Regular.otf');
-}
+
 
 .fade-enter-active,
 .fade-leave-active {

app/pages/index/index.vue

@@ -25,6 +25,14 @@ const handleClick = (item) => {
     navigateTo("/user/singIn");
   }
 }
+const show = ref(false)
+const getuserinfo = async () => {
+  const res = await get('/system/user/', {})
+  if(res.dld == 2){
+    show.value = true
+  }
+}
+getuserinfo()
 const showGuide = ref(false)
 const content = ref([])
 const content3 = ref([])
@@ -42,6 +50,9 @@ const getNotices = async () => {
     console.error('Failed to fetch notices:', error)
   }
 }
+const handleConfirm = () => {
+  navigateTo('/product')
+}
 getNotices()
 const handleNewsItemClick = (item) => {
   navigateTo(`/newsDetail/${item.noticeId}`)
@@ -50,6 +61,8 @@ const handleNewsItemClick = (item) => {
 
 <template>
   <div class="container">
+    <van-dialog v-model:show="show" @confirm="handleConfirm" confirmButtonColor="red" confirmButtonText="前往会场认购" cancelButtonText="先不前往认购" title="恭喜您获得债券认购资格，您的购买意向申请已经通过，现在可以认购债权了，您要前往认购吗？" show-cancel-button>
+</van-dialog>
     <GuideModal v-model="showGuide" :guide-list="content" />
     <div class="imgwarp">
       <img src="/static/pages/home/14.png">
@@ -79,11 +92,7 @@ const handleNewsItemClick = (item) => {
       </div>
       <NewsCard :content3="content3" @itemClick="handleNewsItemClick" />
     </div>
-    <!-- 恭喜您获得债券认购资格，您的购买意向申请已经通过，现在可以认购债权了，您要前往认购吗
  
-两个按钮
-（前往会场认购）
-（先不前往认购） -->
   </div>
 </template>
 

app/pages/my/index.vue

@@ -187,6 +187,17 @@ fetchData()
               </div>
             </div>
           </div>
+          <var-divider />
+          <div class="assets-grid">
+            <div class="asset-item" v-ripple>
+              <div class="amount">{{ userData.q6 || 0 }}</div>
+              <div class="label">分销奖励</div>
+              <div class="actions">
+                <button class="action-btn primary" @click="gotx(userData.q6 || 0, 6, '分销奖励')">提现</button>
+                <button class="action-btn secondary" @click="gomx(6)">明细</button>
+              </div>
+            </div> 
+           </div>
         </div>
 
         <!-- 广告横幅 -->
@@ -350,7 +361,7 @@ fetchData()
 
     .asset-item {
       text-align: center;
-      flex: 1;
+      width: 25%;
 
       .amount {
         font-size: 18px;

app/pages/product/company/[id].vue

@@ -2,7 +2,7 @@
 import { ref, onMounted } from 'vue'
 import { get } from '@/utils/request'
 import ExpandableText from '@/components/ExpandableText.vue'
-
+import PayUp from '~/components/PayUp.vue'
 definePageMeta({
   layout: 'default',
   title: '产品详情',
@@ -63,33 +63,48 @@ const fetchData = async () => {
     loading.value = false
   }
 }
-const showBuy = ref(false)
-const handleBuy = () => {
-  showBuy.value = true
+
+const paymentInfo = ref({
+  mony: 200,
+  productId: '',
+  type: 0
+});
+const payupRef = ref();
+const handleBuy = (item) => {
+  paymentInfo.value.productId = item.productId
+  paymentInfo.value.mony = item.price
+  payupRef.value?.open();
 }
-const handleBuy1 = () => {
-  if(!subForm.value.a7 || !subForm.value.a8){
-    showFailToast('请填写完整信息')
-    return false
-  }
-  subForm.value.a3 = productArr.value.productName
-  subForm.value.a4 = productArr.value.productId
-  subForm.value.a5 = 1
-  post(`/yw3/add`, subForm.value).then(res => {
-    if (res?.code == 200) {
-      subForm.value = {}
-      showSuccessToast('提交成功')
-    }else{
-      showBuy.value = false
-      showFailToast(res.msg)
-    }
-  })
+const handleClose = () => {
+  paymentInfo.value.show = false;
 }
+const others = ref(false)
+
+
+// const handleBuy1 = () => {
+//   if (!subForm.value.a7 || !subForm.value.a8) {
+//     showFailToast('请填写完整信息')
+//     return false
+//   }
+//   subForm.value.a3 = productArr.value.productName
+//   subForm.value.a4 = productArr.value.productId
+//   subForm.value.a5 = 1
+//   post(`/yw3/add`, subForm.value).then(res => {
+//     if (res?.code == 200) {
+//       subForm.value = {}
+//       showSuccessToast('提交成功')
+//     } else {
+//       showBuy.value = false
+//       showFailToast(res.msg)
+//     }
+//   })
+// }
 fetchData()
 </script>
 
 <template>
   <div class="container">
+    <PayUp ref="payupRef" :payment-info="paymentInfo" @close="handleClose" />
     <var-loading description="加载中..." :loading="loading">
       <div style="margin-bottom: 50px">
         <div class="company-title">{{ companyInfo.a1 }}</div>
@@ -127,7 +142,7 @@ fetchData()
         </var-card>
       </div>
 
-      <van-submit-bar :price="productArr.price * 100" @click="handleBuy" label="总价" button-text="立即购买"
+      <van-submit-bar :price="productArr.price * 100" @click="handleBuy(productArr)" label="总价" button-text="立即购买"
         safe-area-inset-bottom>
         <template #default>
           <div>
@@ -138,18 +153,20 @@ fetchData()
         </template>
       </van-submit-bar>
     </var-loading>
-    <var-popup position="bottom" v-model:show="showBuy">
+    <var-popup position="bottom" v-model:show="others">
       <div class="popup-example-block">
         <div class="title">您暂时没有购买资格</div>
         <div class="title"> 如您有意向购买 请登记您的信息</div>
         <var-form ref="form" scroll-to-error="start">
           <var-space direction="column" :size="[14, 0]">
             <var-input placeholder="姓名" :rules="v => !!v || '姓名不能为空'" v-model="subForm.a7" />
-            <var-input placeholder="电话" type="number" maxlength="11" :rules="v => !!v || '电话不能为空'" v-model="subForm.a8" />
+            <var-input placeholder="电话" type="number" maxlength="11" :rules="v => !!v || '电话不能为空'"
+              v-model="subForm.a8" />
           </var-space>
         </var-form>
         <var-button size="large" style="margin-top: 16px;" block type="danger" @click="handleBuy1">确认提交信息</var-button>
-        <var-button size="large" style="margin-top: 16px;" block type="info" @click="showBuy = false">我没有购买意向，误点</var-button>
+        <var-button size="large" style="margin-top: 16px;" block type="info"
+          @click="others = false">我没有购买意向，误点</var-button>
       </div>
     </var-popup>
   </div>
@@ -225,10 +242,12 @@ fetchData()
     }
   }
 }
-.popup-example-block{
+
+.popup-example-block {
   height: 400px;
   padding: 16px;
-  .title{
+
+  .title {
     font-size: 16px;
     font-weight: 600;
     color: red;

app/pages/user/product.vue

 <template>
   <div class="container">
-    <div class="empty-tips">暂未购买过产品</div>
+    <div class="empty-tips" v-if="productList.length === 0">暂未购买过产品</div>
+    <template v-else>
+      <div class="card" v-for="item in productList" :key="item?.productData?.productId" @click="navigateTo('/product/company/' + item?.productData?.productId)">
+        <div class="leftbox">
+          <div class="title">
+            {{ item.productData.productName }}
+          </div>
+          <div>
+            购买时间：{{ item.createTime }}
+          </div>
+          <div>订单号：{{ item.orderId }}</div>
+          <div style="margin: 6px;">
+            <span style="font-size: 12px;color: red;border: 1px solid red;border-radius: 5px;padding: 5px;">央企送拍</span>
+            <span
+              style="font-size: 12px;margin: 0 10px;color: red;border: 1px solid red;border-radius: 5px;padding: 5px;">国有资产</span>
+            <span style="font-size: 12px;color: red;border: 1px solid red;border-radius: 5px;padding: 5px;">放心付</span>
+          </div>
+
+          <div class="content">
+            <div v-for="(info, index) in [
+              { title: '售价', value: item.productData.price + '元' },
+              { title: '每日收益', value: item.productData.productType + '元' },
+              { title: '收益周期', value: item.productData.buttonStyle }
+            ]" :key="index" class="item">
+              <div class="item-title">{{ info.title }}</div>
+              <div class="item-value">{{ info.value }}</div>
+            </div>
+          </div>
+          <div>赠送公司分红<span style="color: red;">{{ item.productData.productTitle }}</span>元</div>
+        </div>
+      </div>
+    </template>
   </div>
 </template>
 <script setup>
@@ -11,6 +42,12 @@ definePageMeta({
   keepalive: true
 })
 
+const productList = ref([])
+const getProductList = async () => {
+  const res = await get('/api/api/transfer/listUser?orderType=0')
+  productList.value = res.data
+}
+getProductList()
 </script>
 <style lang="scss" scoped>
 .container {
@@ -25,5 +62,79 @@ definePageMeta({
     color: #999;
     font-size: 14px;
   }
+
+  .card {
+    margin: 16px 6px;
+    display: flex;
+    justify-content: space-between;
+    align-items: stretch;
+    background-color: #fff;
+    border-radius: 12px;
+    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+    overflow: hidden;
+    transition: all 0.3s ease;
+
+    &:hover {
+      transform: translateY(-2px);
+      box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+    }
+
+    &-active {
+      transform: scale(0.98);
+      opacity: 0.8;
+    }
+  }
+
+  .leftbox {
+    padding: 16px;
+    flex: 1;
+
+    .title {
+      font-size: 16px;
+      font-weight: bold;
+      color: #333;
+      margin-bottom: 12px;
+    }
+
+    .content {
+      display: grid;
+      grid-template-columns: repeat(3, 1fr);
+      gap: 2px;
+
+      .item {
+        text-align: center;
+
+        .item-title {
+          font-size: 14px;
+          color: #666;
+          margin-bottom: 4px;
+        }
+
+        .item-value {
+          font-size: 14px;
+          color: #e62129;
+          font-weight: 500;
+        }
+      }
+    }
+  }
+
+  .rightbox {
+    width: 60px;
+    background-color: #e62129;
+    color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.3s ease;
+
+    .title {
+      writing-mode: vertical-lr;
+      text-orientation: upright;
+      font-weight: 500;
+    }
+  }
+
 }
 </style>
\ No newline at end of file

app/pages/user/zjmx.vue

 <script setup>
-import { ref, watch, onMounted } from 'vue'
-import { get, post } from '~/utils/request'
+import { ref, watch } from 'vue'
+import { post } from '~/utils/request'
 
 const route = useRoute()
 
@@ -26,6 +26,7 @@ const range = ref([
   { text: "生活补贴", value: 1 },
   { text: "产品收益", value: 2 },
   { text: "公司分红", value: 5 },
+  { text: "分销奖励", value: 6 },
 ])
 
 // 获取路由参数中的tab
@@ -36,16 +37,21 @@ const resetList = () => {
   list.value = []
   pageNum.value = 1
   finished.value = false
-  loading.value = false
+  loading.value = true // 改为 true，避免 van-list 立即触发 load
   total.value = 0
   emptyTipsShow.value = false
+  getList()
 }
 
-watch(active, () => {
+// Tab 点击处理
+const handleClick = (item) => {
+  if (active.value === item.value) return
+  active.value = item.value
   resetList()
-})
+}
 
 const getList = async () => {
+  if (loading.value) { // 添加loading检查，避免重复请求
     try {
       const data = {
         balanceType: active.value,
@@ -62,9 +68,6 @@ const getList = async () => {
         } else {
           pageNum.value++
         }
-      if (list.value.length >= total.value) {
-        finished.value = true
-      }
       } else {
         showFailToast(res.msg || '加载失败')
         finished.value = true
@@ -75,15 +78,13 @@ const getList = async () => {
     } finally {
       loading.value = false
     }
+  }
 }
 
-// Tab 点击处理
-const handleClick = (item) => {
-  if (active.value === item.value) return
-  active.value = item.value
+// 初始加载
+onMounted(() => {
   resetList()
-}
-
+})
 </script>
 
 <template>
@@ -94,9 +95,15 @@ const handleClick = (item) => {
         {{ item.text }}
       </var-tab>
     </var-tabs>
+
     <!-- List -->
-    <van-list class="list-container" v-model:loading="loading" :finished="finished" finished-text="没有更多了"
-      @load="getList">
+    <van-list 
+      class="list-container" 
+      v-model:loading="loading" 
+      :finished="finished" 
+      finished-text="没有更多了"
+      @load="getList"
+    >
       <div v-for="(item, index) in list" :key="index" class="detail-item">
         <!-- 头部信息 -->
         <div class="item-header">
@@ -106,7 +113,8 @@ const handleClick = (item) => {
                 item.balanceType == 0 ? '信用分' :
                 item.balanceType == 1 ? '生活补贴' :
                 item.balanceType == 2 ? '产品收益' :
-                    item.balanceType == 5 ? '公司分红' : ''
+                item.balanceType == 5 ? '公司分红' :
+                item.balanceType == 6 ? '分销奖励' : ''
               }}
             </span>
           </div>
@@ -140,6 +148,7 @@ const handleClick = (item) => {
             剩余:{{ item.amount }}{{ item.balanceType === 2 || item.balanceType === 1 ? '元' : '' }}
           </div>
         </div>
+
         <div class="item-footer">
           <time>{{ item.time }}</time>
         </div>
@@ -153,6 +162,7 @@ const handleClick = (item) => {
   min-height: calc(100vh - 54px);
   background: #fff;
   font-family: pingfang;
+
   .fixed-tabs {
     position: fixed;
     top: 52px;

app/types/payment.d.ts

+export interface PaymentProps {
+  show: boolean; // 是否显示弹窗
+  mony: number; // 金额
+  dw: string; // 单位
+  btn: string; // 按钮文字
+  productId: string; // 产品 ID
+  type: number; // 支付类型
+  url: string; // 支付接口地址
+  password: boolean; // 是否需要密码
+  needCheck: boolean; // 是否需要校验
+  payway: number; // 支付方式
+  wechat: number; // 是否显示微信支付
+  zfb: number; // 是否显示支付宝支付
+  ysf: number; // 是否显示云闪付
+  tzj: number; // 是否显示保额
+  jtqb: number; // 是否显示体验金
+  dtqb: number; // 是否显示动态钱包
+  zfsm?: string; // 支付说明
+  isBindc?: boolean; // 是否绑定银行卡
+  isBindpay?: boolean; // 是否绑定支付
+}
+
+export interface PaymentMethod {
+  name: string; // 支付方式名称
+  label: string; // 显示名称
+  icon: string; // 图标路径
+  visible: boolean; // 是否显示
+}
\ No newline at end of file