Merge branch 'yongpxu-soul' of https://github.com/fnvtk/Mycontent into yongpxu-soul

# Conflicts: # .cursorrules resolved by yongpxu-soul version # miniprogram/app.json resolved by yongpxu-soul version # miniprogram/pages/index/index.js resolved by yongpxu-soul version # miniprogram/pages/index/index.wxml resolved by yongpxu-soul version # miniprogram/pages/my/my.js resolved by yongpxu-soul version # miniprogram/pages/my/my.wxml resolved by yongpxu-soul version # miniprogram/pages/my/my.wxss resolved by yongpxu-soul version # miniprogram/pages/settings/settings.js resolved by yongpxu-soul version # miniprogram/pages/settings/settings.wxml resolved by yongpxu-soul version # miniprogram/上传小程序.py resolved by yongpxu-soul version # next-project/app/admin/error.tsx resolved by yongpxu-soul version # next-project/app/admin/page.tsx resolved by yongpxu-soul version # next-project/app/api/book/all-chapters/route.ts resolved by yongpxu-soul version # next-project/lib/admin-auth.ts resolved by yongpxu-soul version # next-project/lib/db.ts resolved by yongpxu-soul version # next-project/lib/password.ts resolved by yongpxu-soul version # next-project/package.json resolved by yongpxu-soul version # next-project/scripts/.env.feishu.example resolved by yongpxu-soul version # next-project/scripts/fix_souladmin_login.sh resolved by yongpxu-soul version # next-project/scripts/send_poster_to_feishu.py resolved by yongpxu-soul version # next-project/scripts/upload_soul_article.sh resolved by yongpxu-soul version # soul-admin/dist/assets/index-CbOmKBRd.js resolved by yongpxu-soul version # soul-admin/dist/index.html resolved by yongpxu-soul version # 开发文档/10、项目管理/产研团队第21场 20260129 许永平.txt resolved by yongpxu-soul version # 开发文档/5、接口/配置清单-完整版.md resolved by yongpxu-soul version # 开发文档/服务器管理/references/端口配置表.md resolved by yongpxu-soul version
2026-02-24 09:42:34 +08:00
parent bb62e887b3 afc2376e96
commit df723b7eda
46 changed files with 3486 additions and 110 deletions
--- a/miniprogram/pages/index/index.wxss
+++ b/miniprogram/pages/index/index.wxss
@@ -498,6 +498,80 @@
  color: rgba(255, 255, 255, 0.6);
 }

+/* ===== 创业老板排行 ===== */
+.members-grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20rpx;
+  padding: 0 8rpx;
+}
+.member-cell {
+  width: calc(25% - 15rpx);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 16rpx 0;
+}
+.member-avatar-wrap {
+  position: relative;
+  width: 100rpx;
+  height: 100rpx;
+  margin-bottom: 10rpx;
+}
+.member-avatar {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+  border: 3rpx solid #FFD700;
+}
+.member-avatar-placeholder {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+  background: linear-gradient(135deg, #1c1c1e, #2c2c2e);
+  border: 3rpx solid #FFD700;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 36rpx;
+  color: #FFD700;
+}
+.member-vip-dot {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  width: 30rpx;
+  height: 30rpx;
+  border-radius: 50%;
+  background: linear-gradient(135deg, #FFD700, #FFA500);
+  color: #000;
+  font-size: 16rpx;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: 2rpx solid #000;
+}
+.member-name {
+  font-size: 24rpx;
+  color: rgba(255,255,255,0.9);
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 140rpx;
+}
+.member-project {
+  font-size: 20rpx;
+  color: rgba(255,255,255,0.4);
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 140rpx;
+  margin-top: 4rpx;
+}
+
 /* ===== 底部留白 ===== */
 .bottom-space {
  height: 40rpx;
--- a/miniprogram/pages/member-detail/member-detail.js
+++ b/miniprogram/pages/member-detail/member-detail.js
@@ -0,0 +1,37 @@
+const app = getApp()
+
+Page({
+  data: {
+    statusBarHeight: 44,
+    member: null,
+    loading: true
+  },
+
+  onLoad(options) {
+    this.setData({ statusBarHeight: app.globalData.statusBarHeight })
+    if (options.id) this.loadMember(options.id)
+  },
+
+  async loadMember(id) {
+    try {
+      const res = await app.request(`/api/vip/members?id=${id}`)
+      if (res?.success) {
+        this.setData({ member: res.data, loading: false })
+      } else {
+        this.setData({ loading: false })
+        wx.showToast({ title: '会员不存在', icon: 'none' })
+      }
+    } catch (e) {
+      this.setData({ loading: false })
+      wx.showToast({ title: '加载失败', icon: 'none' })
+    }
+  },
+
+  copyContact() {
+    const contact = this.data.member?.contact
+    if (!contact) { wx.showToast({ title: '暂无联系方式', icon: 'none' }); return }
+    wx.setClipboardData({ data: contact, success: () => wx.showToast({ title: '已复制', icon: 'success' }) })
+  },
+
+  goBack() { wx.navigateBack() }
+})
--- a/miniprogram/pages/member-detail/member-detail.json
+++ b/miniprogram/pages/member-detail/member-detail.json
@@ -0,0 +1 @@
+{ "usingComponents": {}, "navigationStyle": "custom" }
--- a/miniprogram/pages/member-detail/member-detail.wxml
+++ b/miniprogram/pages/member-detail/member-detail.wxml
@@ -0,0 +1,38 @@
+<!--会员详情-->
+<view class="page">
+  <view class="nav-bar" style="padding-top: {{statusBarHeight}}px;">
+    <view class="nav-back" bindtap="goBack"><text class="back-icon">‹</text></view>
+    <text class="nav-title">创业伙伴</text>
+    <view class="nav-placeholder-r"></view>
+  </view>
+  <view style="height: {{statusBarHeight + 44}}px;"></view>
+
+  <view class="detail-content" wx:if="{{member}}">
+    <view class="detail-hero">
+      <view class="detail-avatar-wrap">
+        <image class="detail-avatar" wx:if="{{member.avatar}}" src="{{member.avatar}}" mode="aspectFill"/>
+        <view class="detail-avatar-ph" wx:else><text>{{member.name[0] || '创'}}</text></view>
+        <view class="detail-vip-badge">VIP</view>
+      </view>
+      <text class="detail-name">{{member.name}}</text>
+      <text class="detail-project" wx:if="{{member.project}}">{{member.project}}</text>
+    </view>
+
+    <view class="detail-card" wx:if="{{member.bio}}">
+      <text class="detail-card-title">简介</text>
+      <text class="detail-card-text">{{member.bio}}</text>
+    </view>
+
+    <view class="detail-card" wx:if="{{member.contact}}">
+      <text class="detail-card-title">联系方式</text>
+      <view class="detail-contact-row">
+        <text class="detail-card-text">{{member.contact}}</text>
+        <view class="copy-btn" bindtap="copyContact">复制</view>
+      </view>
+    </view>
+  </view>
+
+  <view class="loading-state" wx:if="{{loading}}">
+    <text class="loading-text">加载中...</text>
+  </view>
+</view>
--- a/miniprogram/pages/member-detail/member-detail.wxss
+++ b/miniprogram/pages/member-detail/member-detail.wxss
@@ -0,0 +1,24 @@
+.page { background: #000; min-height: 100vh; color: #fff; }
+.nav-bar { position: fixed; top: 0; left: 0; right: 0; z-index: 100; display: flex; align-items: center; justify-content: space-between; height: 44px; padding: 0 24rpx; background: rgba(0,0,0,0.9); }
+.nav-back { width: 60rpx; height: 60rpx; display: flex; align-items: center; justify-content: center; }
+.back-icon { font-size: 44rpx; color: #fff; }
+.nav-title { font-size: 34rpx; font-weight: 600; color: #fff; }
+.nav-placeholder-r { width: 60rpx; }
+
+.detail-content { padding: 24rpx; }
+.detail-hero { display: flex; flex-direction: column; align-items: center; padding: 48rpx 0 32rpx; }
+.detail-avatar-wrap { position: relative; margin-bottom: 20rpx; }
+.detail-avatar { width: 160rpx; height: 160rpx; border-radius: 50%; border: 4rpx solid #FFD700; }
+.detail-avatar-ph { width: 160rpx; height: 160rpx; border-radius: 50%; background: #1c1c1e; border: 4rpx solid #FFD700; display: flex; align-items: center; justify-content: center; font-size: 60rpx; color: #FFD700; }
+.detail-vip-badge { position: absolute; bottom: 4rpx; right: 4rpx; background: linear-gradient(135deg, #FFD700, #FFA500); color: #000; font-size: 20rpx; font-weight: bold; padding: 4rpx 12rpx; border-radius: 14rpx; }
+.detail-name { font-size: 40rpx; font-weight: bold; color: #fff; }
+.detail-project { font-size: 26rpx; color: rgba(255,255,255,0.5); margin-top: 8rpx; }
+
+.detail-card { background: #1c1c1e; border-radius: 20rpx; padding: 28rpx; margin-top: 24rpx; }
+.detail-card-title { font-size: 24rpx; color: rgba(255,255,255,0.5); display: block; margin-bottom: 12rpx; }
+.detail-card-text { font-size: 30rpx; color: rgba(255,255,255,0.9); }
+.detail-contact-row { display: flex; align-items: center; justify-content: space-between; }
+.copy-btn { background: #00CED1; color: #000; font-size: 24rpx; font-weight: 600; padding: 8rpx 24rpx; border-radius: 20rpx; }
+
+.loading-state { display: flex; justify-content: center; padding: 100rpx 0; }
+.loading-text { color: rgba(255,255,255,0.4); font-size: 28rpx; }
--- a/miniprogram/pages/vip/vip.js
+++ b/miniprogram/pages/vip/vip.js
@@ -0,0 +1,107 @@
+const app = getApp()
+
+Page({
+  data: {
+    statusBarHeight: 44,
+    isVip: false,
+    daysRemaining: 0,
+    expireDateStr: '',
+    price: 1980,
+    rights: [],
+    profile: { name: '', project: '', contact: '', bio: '' },
+    purchasing: false
+  },
+
+  onLoad() {
+    this.setData({ statusBarHeight: app.globalData.statusBarHeight })
+    this.loadVipInfo()
+  },
+
+  async loadVipInfo() {
+    const userId = app.globalData.userInfo?.id
+    if (!userId) return
+    try {
+      const res = await app.request(`/api/vip/status?userId=${userId}`)
+      if (res?.success) {
+        const d = res.data
+        let expStr = ''
+        if (d.expireDate) {
+          const dt = new Date(d.expireDate)
+          expStr = `${dt.getFullYear()}-${String(dt.getMonth()+1).padStart(2,'0')}-${String(dt.getDate()).padStart(2,'0')}`
+        }
+        this.setData({
+          isVip: d.isVip,
+          daysRemaining: d.daysRemaining,
+          expireDateStr: expStr,
+          price: d.price || 1980,
+          rights: d.rights || ['解锁全部章节内容（365天）','匹配所有创业伙伴','创业老板排行榜展示','专属VIP标识']
+        })
+        if (d.isVip) this.loadProfile(userId)
+      }
+    } catch (e) {
+      console.log('[VIP] 加载失败', e)
+      this.setData({ rights: ['解锁全部章节内容（365天）','匹配所有创业伙伴','创业老板排行榜展示','专属VIP标识'] })
+    }
+  },
+
+  async loadProfile(userId) {
+    try {
+      const res = await app.request(`/api/vip/profile?userId=${userId}`)
+      if (res?.success) this.setData({ profile: res.data })
+    } catch (e) { console.log('[VIP] 资料加载失败', e) }
+  },
+
+  async handlePurchase() {
+    const userId = app.globalData.userInfo?.id
+    if (!userId) { wx.showToast({ title: '请先登录', icon: 'none' }); return }
+    this.setData({ purchasing: true })
+    try {
+      const res = await app.request('/api/vip/purchase', { method: 'POST', data: { userId } })
+      if (res?.success) {
+        // 调用微信支付
+        const payRes = await app.request('/api/miniprogram/pay', {
+          method: 'POST',
+          data: { orderSn: res.data.orderSn, openId: app.globalData.openId }
+        })
+        if (payRes?.success && payRes.payParams) {
+          wx.requestPayment({
+            ...payRes.payParams,
+            success: () => {
+              wx.showToast({ title: 'VIP开通成功', icon: 'success' })
+              this.loadVipInfo()
+            },
+            fail: () => wx.showToast({ title: '支付取消', icon: 'none' })
+          })
+        } else {
+          wx.showToast({ title: '支付参数获取失败', icon: 'none' })
+        }
+      } else {
+        wx.showToast({ title: res?.error || '创建订单失败', icon: 'none' })
+      }
+    } catch (e) {
+      console.error('[VIP] 购买失败', e)
+      wx.showToast({ title: '购买失败', icon: 'none' })
+    } finally { this.setData({ purchasing: false }) }
+  },
+
+  onNameInput(e) { this.setData({ 'profile.name': e.detail.value }) },
+  onProjectInput(e) { this.setData({ 'profile.project': e.detail.value }) },
+  onContactInput(e) { this.setData({ 'profile.contact': e.detail.value }) },
+  onBioInput(e) { this.setData({ 'profile.bio': e.detail.value }) },
+
+  async saveProfile() {
+    const userId = app.globalData.userInfo?.id
+    if (!userId) return
+    const p = this.data.profile
+    try {
+      const res = await app.request('/api/vip/profile', {
+        method: 'POST',
+        data: { userId, name: p.name, project: p.project, contact: p.contact, bio: p.bio }
+      })
+      if (res?.success) wx.showToast({ title: '资料已保存', icon: 'success' })
+      else wx.showToast({ title: res?.error || '保存失败', icon: 'none' })
+    } catch (e) { wx.showToast({ title: '保存失败', icon: 'none' }) }
+  },
+
+  goBack() { wx.navigateBack() }
+})
--- a/miniprogram/pages/vip/vip.json
+++ b/miniprogram/pages/vip/vip.json
@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationStyle": "custom"
+}
--- a/miniprogram/pages/vip/vip.wxml
+++ b/miniprogram/pages/vip/vip.wxml
@@ -0,0 +1,60 @@
+<!--VIP会员页-->
+<view class="page">
+  <view class="nav-bar" style="padding-top: {{statusBarHeight}}px;">
+    <view class="nav-back" bindtap="goBack"><text class="back-icon">‹</text></view>
+    <text class="nav-title">VIP会员</text>
+    <view class="nav-placeholder-r"></view>
+  </view>
+  <view style="height: {{statusBarHeight + 44}}px;"></view>
+
+  <!-- VIP状态卡片 -->
+  <view class="vip-hero {{isVip ? 'vip-hero-active' : ''}}">
+    <view class="vip-hero-icon">👑</view>
+    <text class="vip-hero-title" wx:if="{{!isVip}}">开通VIP年度会员</text>
+    <text class="vip-hero-title gold" wx:else>VIP会员</text>
+    <text class="vip-hero-sub" wx:if="{{isVip}}">有效期至 {{expireDateStr}}（剩余{{daysRemaining}}天）</text>
+    <text class="vip-hero-sub" wx:else>¥{{price}}/年 · 365天全部权益</text>
+  </view>
+
+  <!-- 权益列表 -->
+  <view class="rights-card">
+    <text class="rights-title">会员权益</text>
+    <view class="rights-list">
+      <view class="rights-item" wx:for="{{rights}}" wx:key="*this">
+        <text class="rights-check">✓</text>
+        <text class="rights-text">{{item}}</text>
+      </view>
+    </view>
+  </view>
+
+  <!-- 购买按钮 -->
+  <view class="buy-section" wx:if="{{!isVip}}">
+    <button class="buy-btn" bindtap="handlePurchase" disabled="{{purchasing}}">
+      {{purchasing ? '处理中...' : '立即开通 ¥' + price}}
+    </button>
+  </view>
+
+  <!-- VIP资料填写（仅VIP可见） -->
+  <view class="profile-card" wx:if="{{isVip}}">
+    <text class="profile-title">会员资料（展示在创业老板排行）</text>
+    <view class="form-group">
+      <text class="form-label">姓名</text>
+      <input class="form-input" placeholder="您的真实姓名" value="{{profile.name}}" bindinput="onNameInput"/>
+    </view>
+    <view class="form-group">
+      <text class="form-label">项目名称</text>
+      <input class="form-input" placeholder="您的项目/公司名称" value="{{profile.project}}" bindinput="onProjectInput"/>
+    </view>
+    <view class="form-group">
+      <text class="form-label">联系方式</text>
+      <input class="form-input" placeholder="微信号或手机号" value="{{profile.contact}}" bindinput="onContactInput"/>
+    </view>
+    <view class="form-group">
+      <text class="form-label">一句话简介</text>
+      <input class="form-input" placeholder="简要描述您的业务" value="{{profile.bio}}" bindinput="onBioInput"/>
+    </view>
+    <button class="save-btn" bindtap="saveProfile">保存资料</button>
+  </view>
+
+  <view class="bottom-space"></view>
+</view>
--- a/miniprogram/pages/vip/vip.wxss
+++ b/miniprogram/pages/vip/vip.wxss
@@ -0,0 +1,38 @@
+.page { background: #000; min-height: 100vh; color: #fff; }
+.nav-bar { position: fixed; top: 0; left: 0; right: 0; z-index: 100; display: flex; align-items: center; justify-content: space-between; height: 44px; padding: 0 24rpx; background: rgba(0,0,0,0.9); }
+.nav-back { width: 60rpx; height: 60rpx; display: flex; align-items: center; justify-content: center; }
+.back-icon { font-size: 44rpx; color: #fff; }
+.nav-title { font-size: 34rpx; font-weight: 600; color: #fff; }
+.nav-placeholder-r { width: 60rpx; }
+
+.vip-hero {
+  margin: 24rpx; padding: 48rpx 32rpx; text-align: center;
+  background: linear-gradient(135deg, rgba(255,215,0,0.1), rgba(255,165,0,0.06));
+  border: 1rpx solid rgba(255,215,0,0.2); border-radius: 24rpx;
+}
+.vip-hero-active { border-color: rgba(255,215,0,0.5); background: linear-gradient(135deg, rgba(255,215,0,0.18), rgba(255,165,0,0.1)); }
+.vip-hero-icon { font-size: 80rpx; }
+.vip-hero-title { display: block; font-size: 40rpx; font-weight: bold; color: #fff; margin-top: 16rpx; }
+.vip-hero-title.gold { color: #FFD700; }
+.vip-hero-sub { display: block; font-size: 26rpx; color: rgba(255,255,255,0.5); margin-top: 12rpx; }
+
+.rights-card { margin: 24rpx; padding: 28rpx; background: #1c1c1e; border-radius: 20rpx; }
+.rights-title { font-size: 30rpx; font-weight: 600; color: rgba(255,255,255,0.9); }
+.rights-list { margin-top: 20rpx; }
+.rights-item { display: flex; align-items: center; gap: 16rpx; padding: 16rpx 0; border-bottom: 1rpx solid rgba(255,255,255,0.06); }
+.rights-item:last-child { border-bottom: none; }
+.rights-check { color: #00CED1; font-size: 28rpx; font-weight: bold; }
+.rights-text { font-size: 28rpx; color: rgba(255,255,255,0.8); }
+
+.buy-section { padding: 32rpx 24rpx; }
+.buy-btn { width: 100%; height: 88rpx; line-height: 88rpx; background: linear-gradient(135deg, #FFD700, #FFA500); color: #000; font-size: 32rpx; font-weight: bold; border-radius: 44rpx; border: none; }
+.buy-btn[disabled] { opacity: 0.5; }
+
+.profile-card { margin: 24rpx; padding: 28rpx; background: #1c1c1e; border-radius: 20rpx; }
+.profile-title { font-size: 30rpx; font-weight: 600; color: rgba(255,255,255,0.9); display: block; margin-bottom: 24rpx; }
+.form-group { margin-bottom: 20rpx; }
+.form-label { font-size: 24rpx; color: rgba(255,255,255,0.5); display: block; margin-bottom: 8rpx; }
+.form-input { background: rgba(255,255,255,0.06); border: 1rpx solid rgba(255,255,255,0.1); border-radius: 12rpx; padding: 16rpx 20rpx; font-size: 28rpx; color: #fff; }
+.save-btn { margin-top: 24rpx; width: 100%; height: 80rpx; line-height: 80rpx; background: #00CED1; color: #000; font-size: 30rpx; font-weight: 600; border-radius: 40rpx; border: none; }
+
+.bottom-space { height: 120rpx; }
				`@@ -0,0 +1 @@`
				`{ "usingComponents": {}, "navigationStyle": "custom" }`