Merge branch 'yongxu-dev' into devlop

# Conflicts: # miniprogram/app.js # miniprogram/app.json # miniprogram/pages/chapters/chapters.js # miniprogram/pages/chapters/chapters.wxml # miniprogram/pages/chapters/chapters.wxss # miniprogram/pages/index/index.js # miniprogram/pages/index/index.wxml # miniprogram/pages/match/match.js # miniprogram/pages/my/my.js # miniprogram/pages/my/my.wxml # miniprogram/pages/read/read.js # miniprogram/pages/read/read.wxml # miniprogram/pages/read/read.wxss # miniprogram/pages/referral/referral.js # miniprogram/pages/search/search.js # miniprogram/pages/vip/vip.js # miniprogram/pages/wallet/wallet.wxml # miniprogram/project.private.config.json # soul-admin/dist/index.html # soul-admin/src/pages/dashboard/DashboardPage.tsx # soul-admin/src/pages/settings/SettingsPage.tsx # soul-api/go.mod # soul-api/internal/handler/admin_dashboard.go # soul-api/internal/handler/db.go # soul-api/wechat/info.log # 开发文档/10、项目管理/运营与变更.md # 开发文档/README.md
2026-03-18 17:55:34 +08:00
parent 34f7c7bbdc 0f3933fabd
commit 3d7a0d58a4
125 changed files with 46439 additions and 2916 deletions
--- a/miniprogram/pages/vip/vip.js
+++ b/miniprogram/pages/vip/vip.js
@@ -1,7 +1,6 @@
-const accessManager = require('../../utils/chapterAccessManager')
+import accessManager from '../../utils/chapterAccessManager'
 const app = getApp()
 const { trackClick } = require('../../utils/trackClick')
-const { checkAndExecute } = require('../../utils/ruleEngine')

 Page({
  data: {
@@ -13,16 +12,16 @@ Page({
    originalPrice: 6980,
    /* 按 premium_membership_landing_v1 设计稿 */
    contentRights: [
-      { title: '解锁章节', desc: '全部章节365天畅读', icon: '📖' },
-      { title: '创业项目', desc: '查看最新创业项目', icon: '📚' },
-      { title: '每日纪要', desc: '专属团队每日总结', icon: '💡' },
-      { title: '文内链接', desc: '文章提到你可被链接', icon: '📁' }
+      { title: '解锁全部章节', desc: '365天全案精读', icon: 'book-open' },
+      { title: '案例库', desc: '100+创业实战案例', icon: 'book-open' },
+      { title: '智能纪要', desc: 'AI每日精华推送', icon: 'lightbulb' },
+      { title: '会议纪要库', desc: '往期完整沉淀', icon: 'folder' }
    ],
    socialRights: [
-      { title: '匹配伙伴', desc: '1980次创业伙伴匹配', icon: '👥' },
-      { title: '获得客资', desc: '加入创业伙伴获客资', icon: '🔗' },
-      { title: '老板排行', desc: '项目曝光超级个体', icon: '📊' },
-      { title: 'VIP标识', desc: '金色尊享光圈特权', icon: '✓' }
+      { title: '匹配创业伙伴', desc: '精准人脉匹配', icon: 'users' },
+      { title: '创业老板排行', desc: '项目曝光展示', icon: 'bar-chart' },
+      { title: '链接资源', desc: '深度私域资源池', icon: 'link' },
+      { title: '专属VIP标识', desc: '金色尊享光圈', icon: 'check' }
    ],
    purchasing: false
  },
@@ -66,7 +65,7 @@ Page({
  },

  async handlePurchase() {
-    trackClick('vip', 'btn_click', '购买VIP')
+    trackClick('vip', 'btn_click', '开通VIP')
    let userId = app.globalData.userInfo?.id
    let openId = app.globalData.openId || app.globalData.userInfo?.open_id
    if (!userId || !openId) {
@@ -87,7 +86,37 @@ Page({
      }
    }
    this.setData({ purchasing: true })
+    const amount = this.data.price
    try {
+      // 0. 尝试余额支付（若余额足够）
+      const referralCode = wx.getStorageSync('referral_code') || ''
+      try {
+        const balanceRes = await app.request({ url: `/api/miniprogram/balance?userId=${userId}`, silent: true })
+        const balance = balanceRes?.data?.balance || 0
+        if (balance >= amount) {
+          const consumeRes = await app.request({
+            url: '/api/miniprogram/balance/consume',
+            method: 'POST',
+            data: {
+              userId,
+              productType: 'vip',
+              productId: 'vip_annual',
+              amount,
+              referralCode: referralCode || undefined
+            }
+          })
+          if (consumeRes?.success) {
+            this.setData({ purchasing: false })
+            wx.showToast({ title: 'VIP开通成功', icon: 'success' })
+            await this._onVipPaymentSuccess()
+            return
+          }
+        }
+      } catch (e) {
+        console.warn('[VIP] 余额支付失败，改用微信支付:', e)
+      }
+
+      // 1. 微信支付
      const payRes = await app.request('/api/miniprogram/pay', {
        method: 'POST',
        data: {
@@ -95,7 +124,7 @@ Page({
          userId,
          productType: 'vip',
          productId: 'vip_annual',
-          amount: this.data.price,
+          amount,
          description: '卡若创业派对VIP年度会员（365天）'
        }
      })
@@ -129,17 +158,6 @@ Page({
        if (typeof p.initUserStatus === 'function') p.initUserStatus()
        else if (typeof p.updateUserStatus === 'function') p.updateUserStatus()
      })
-      // 记录购买行为到 user_tracks
-      const uid = app.globalData.userInfo?.id
-      if (uid) {
-        app.request('/api/miniprogram/track', {
-          method: 'POST',
-          data: { userId: uid, action: 'purchase', target: 'vip_annual', extraData: { amount: this.data.price } },
-          silent: true
-        }).catch(() => {})
-      }
-      // 购买后规则：引导填写完整信息
-      checkAndExecute('after_pay', this)
    } catch (e) {
      console.error('[VIP] 支付后同步失败:', e)
    }
--- a/miniprogram/pages/vip/vip.wxml
+++ b/miniprogram/pages/vip/vip.wxml
@@ -2,7 +2,7 @@
 <view class="page">
  <view class="nav-bar" style="padding-top: {{statusBarHeight}}px;">
    <view class="nav-back" bindtap="goBack">
-      <text class="back-icon">‹</text>
+      <icon name="chevron-left" size="44" color="#ffffff" customClass="back-icon"></icon>
    </view>
    <text class="nav-title">卡若创业派对VIP会员</text>
    <view class="nav-placeholder-r"></view>
@@ -22,7 +22,7 @@
        <text class="rights-col-title">会员权利</text>
      </view>
      <view class="benefit-card" wx:for="{{contentRights}}" wx:key="title">
-        <text class="benefit-icon">{{item.icon || '✓'}}</text>
+        <icon name="{{item.icon || 'check'}}" size="40" color="#00CED1" customClass="benefit-icon"></icon>
        <view class="benefit-info">
          <text class="benefit-title">{{item.title}}</text>
          <text class="benefit-desc">{{item.desc}}</text>
@@ -35,7 +35,7 @@
        <text class="rights-col-title rights-col-title-gold">派对权利</text>
      </view>
      <view class="benefit-card" wx:for="{{socialRights}}" wx:key="title">
-        <text class="benefit-icon benefit-icon-gold">{{item.icon || '✓'}}</text>
+        <icon name="{{item.icon || 'check'}}" size="40" color="#FFD700" customClass="benefit-icon benefit-icon-gold"></icon>
        <view class="benefit-info">
          <text class="benefit-title">{{item.title}}</text>
          <text class="benefit-desc">{{item.desc}}</text>