feat: 运营-用户功能四大需求完整实现
1. 客资中心:Dashboard 聚合 CKB 线索+提交记录,联表用户信息 2. @置顶:Person 三端(后端+管理端+小程序)置顶功能,首页优先展示 3. 存客宝场景:一键检查并自动启用所有场景获客计划 4. 去重增强:后端聚合 dupCount,管理端展示重复标记和统计 5. 首页文案:"最新更新"→"推荐","开始阅读"→"点击阅读" Made-with: Cursor
This commit is contained in:
@@ -1 +1,8 @@
|
||||
/bin/bash: /Users/karuo/Documents/开发/3、自营项目/一场soul的创业实验-永平/.cursor/scripts/gitea-sync.sh: Operation not permitted
|
||||
/bin/bash: /Users/karuo/Documents/开发/3、自营项目/一场soul的创业实验-永平/.cursor/scripts/gitea-sync.sh: Operation not permitted
|
||||
/bin/bash: /Users/karuo/Documents/开发/3、自营项目/一场soul的创业实验-永平/.cursor/scripts/gitea-sync.sh: Operation not permitted
|
||||
/bin/bash: /Users/karuo/Documents/开发/3、自营项目/一场soul的创业实验-永平/.cursor/scripts/gitea-sync.sh: Operation not permitted
|
||||
/bin/bash: /Users/karuo/Documents/开发/3、自营项目/一场soul的创业实验-永平/.cursor/scripts/gitea-sync.sh: Operation not permitted
|
||||
/bin/bash: /Users/karuo/Documents/开发/3、自营项目/一场soul的创业实验-永平/.cursor/scripts/gitea-sync.sh: Operation not permitted
|
||||
/bin/bash: /Users/karuo/Documents/开发/3、自营项目/一场soul的创业实验-永平/.cursor/scripts/gitea-sync.sh: Operation not permitted
|
||||
/bin/bash: /Users/karuo/Documents/开发/3、自营项目/一场soul的创业实验-永平/.cursor/scripts/gitea-sync.sh: Operation not permitted
|
||||
|
||||
@@ -4,3 +4,45 @@ From http://192.168.1.201:3000/fnvtk/soul-yongping
|
||||
* [new branch] main -> gitea-local/main
|
||||
error: cannot pull with rebase: You have unstaged changes.
|
||||
error: Please commit or stash them.
|
||||
[devlop 28a69cbc] sync: 2026-03-19 14:54
|
||||
Committer: 卡若 <karuo@MacBook-Pro.local>
|
||||
Your name and email address were configured automatically based
|
||||
on your username and hostname. Please check that they are accurate.
|
||||
You can suppress this message by setting them explicitly:
|
||||
|
||||
git config --global user.name "Your Name"
|
||||
git config --global user.email you@example.com
|
||||
|
||||
After doing this, you may fix the identity used for this commit with:
|
||||
|
||||
git commit --amend --reset-author
|
||||
|
||||
26 files changed, 164 insertions(+), 2133 deletions(-)
|
||||
create mode 100644 .cursor/scripts/README-gitea-sync.md
|
||||
create mode 100644 .cursor/scripts/gitea-sync-launchd.err.log
|
||||
create mode 100644 .cursor/scripts/gitea-sync-launchd.log
|
||||
create mode 100644 .cursor/scripts/gitea-sync.log
|
||||
create mode 100755 .cursor/scripts/gitea-sync.sh
|
||||
create mode 100644 project.config.json
|
||||
delete mode 100644 开发文档/1、需求/文章详情-阅读页线框图.md
|
||||
delete mode 100644 开发文档/1、需求/链接人与事-所有同步需求.md
|
||||
delete mode 100644 开发文档/代付功能-美团式方案与场景清单.md
|
||||
delete mode 100644 开发文档/全站测试报告_20260315.md
|
||||
delete mode 100644 开发文档/存客宝对接逻辑图.md
|
||||
delete mode 100644 开发文档/小程序管理/scripts/reports/体验版二维码_soul-party_20260315_2344.png
|
||||
delete mode 100644 开发文档/小程序管理/scripts/reports/体验版二维码_soul-party_20260316_0221.png
|
||||
delete mode 100644 开发文档/小程序管理/scripts/reports/体验版二维码_soul-party_20260316_1804.png
|
||||
delete mode 100644 开发文档/找朋友代付-流程与配置.md
|
||||
delete mode 100644 开发文档/新版管理端迁移到稳定版-需求评估.md
|
||||
delete mode 100644 开发文档/新版迁移-开发方案与清单.md
|
||||
delete mode 100644 开发文档/稳定版-小程序与API对比.md
|
||||
delete mode 100644 开发文档/稳定版-源码质量分析报告.md
|
||||
delete mode 100644 开发文档/稳定版-管理端与小程序对接分析.md
|
||||
delete mode 100644 开发文档/稳定版适配新界面-调整清单.md
|
||||
delete mode 100644 开发文档/管理端两版界面差异-新需求参考.md
|
||||
delete mode 100644 开发文档/管理端迁移分析-基于小程序功能.md
|
||||
delete mode 100644 开发文档/规则引擎迁移-影响分析.md
|
||||
delete mode 100644 开发文档/迁移完成度与待办清单.md
|
||||
remote: Failed to authenticate user
|
||||
fatal: Authentication failed for 'http://192.168.1.201:3000/fnvtk/soul-yongping.git/'
|
||||
[2026-03-19 14:54:02] --- sync end ---
|
||||
|
||||
@@ -14,13 +14,16 @@ log() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*" | tee -a "$LOG_FILE"; }
|
||||
|
||||
log "--- sync start (branch=$BRANCH, remote=$REMOTE) ---"
|
||||
|
||||
# 1. 拉取远程更新(若远程无此分支则仅 fetch)
|
||||
# 1. 拉取远程更新(若有未提交变更则先 stash,pull 后再 pop)
|
||||
STASHED=""
|
||||
if [ -n "$(git status -s)" ]; then
|
||||
git stash push -u -m "gitea-sync $(date +%s)" 2>/dev/null && STASHED=1 || true
|
||||
fi
|
||||
git fetch "$REMOTE" 2>&1 | tee -a "$LOG_FILE" || true
|
||||
if git ls-remote --exit-code --heads "$REMOTE" "$BRANCH" &>/dev/null; then
|
||||
git pull "$REMOTE" "$BRANCH" --no-edit 2>&1 | tee -a "$LOG_FILE" || log "pull 失败或冲突,继续尝试推送本地变更"
|
||||
else
|
||||
log "远程无 $REMOTE/$BRANCH,仅 fetch"
|
||||
fi
|
||||
[ -n "$STASHED" ] && git stash pop 2>/dev/null || true
|
||||
|
||||
# 2. 若有本地未提交变更,则提交并推送
|
||||
STATUS=$(git status -s)
|
||||
|
||||
Reference in New Issue
Block a user