czuser/zhuomi-hui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ship signup sheet, subscribe reminders, cover crop, and theme updates.

Browse Source 
Wire real WeChat app config, prefer activity cover over posters, and add admin cover cropping for the home banner.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Michelle Zan
2026-10-08 13:06:43 +08:00
co-authored by Cursor
parent cd05113755
commit 0ca2e87bf2
35 changed files with 968 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniprogram/app.json
+2 -2
View File
@@ -9,9 +9,9 @@
"pages/detail/detail"
],
"window": {
"navigationBarBackgroundColor": "#FFFFFF",
"navigationBarBackgroundColor": "#0D8B87",
"navigationBarTitleText": "卓米会",
"navigationBarTextStyle": "black",
"navigationBarTextStyle": "white",
"backgroundColor": "#F3F5F7",
"backgroundTextStyle": "dark"
},
miniprogram/components/activity-board/index.js
+1 -1
View File
@@ -20,7 +20,7 @@ Component({
activity(activity) {
const item = activity || {}
this.setData({
poster: media.absUrl(item.poster || item.cover),
poster: media.absUrl(item.cover || item.poster),
video: media.absUrl(item.video),
ended: item.status === 'past'
})
miniprogram/components/signup-sheet/index.js
+158
View File
@@ -0,0 +1,158 @@
const api = require('../../utils/api')
const authUtil = require('../../utils/auth')
const activityUtil = require('../../utils/activity')
function requestRemind(tmplIds) {
const ids = (tmplIds || []).filter(Boolean).slice(0, 3)
if (!ids.length) {
return Promise.resolve({ status: 'none', enabled: false })
}
return new Promise((resolve) => {
wx.requestSubscribeMessage({
tmplIds: ids,
success(res) {
// res[tmplId] === 'accept' | 'reject' | 'ban' | 'filter'
let status = 'reject'
for (let i = 0; i < ids.length; i += 1) {
if (res[ids[i]] === 'accept') {
status = 'accept'
break
}
if (res[ids[i]]) status = res[ids[i]]
}
resolve({ status: status, enabled: true })
},
fail() {
resolve({ status: 'reject', enabled: true })
}
})
})
}
Component({
properties: {
show: {
type: Boolean,
value: false
},
activityId: {
type: String,
value: ''
}
},
data: {
name: '',
phone: '',
company: '',
position: '',
submitting: false,
tmplIds: [],
remindReady: false
},
observers: {
show(visible) {
if (visible) {
wx.hideTabBar({ animation: false })
this.prefetch()
} else {
wx.showTabBar({ animation: false })
}
}
},
lifetimes: {
detached() {
wx.showTabBar({ animation: false })
}
},
methods: {
prefetch() {
api
.subscribeConfig()
.then((config) => {
this.setData({
tmplIds: (config && config.tmplIds) || [],
remindReady: !!(config && config.enabled)
})
})
.catch(() => this.setData({ tmplIds: [], remindReady: false }))
api
.profile()
.then((profile) => {
if (!profile) return
this.setData({
name: this.data.name || profile.name || '',
phone: this.data.phone || profile.phone || '',
company: this.data.company || profile.company || '',
position: this.data.position || profile.position || ''
})
})
.catch(() => {})
},
noop() {},
onInput(event) {
const field = event.currentTarget.dataset.field
const next = {}
next[field] = event.detail.value
this.setData(next)
},
onCancel() {
if (this.data.submitting) return
wx.showTabBar({ animation: false })
this.triggerEvent('close')
},
onSubmit() {
if (this.data.submitting) return
const name = (this.data.name || '').trim()
const phone = (this.data.phone || '').trim()
const company = (this.data.company || '').trim()
const position = (this.data.position || '').trim()
if (!name || !phone) {
wx.showToast({ title: '请填写姓名和手机号', icon: 'none' })
return
}
if (!/^1\d{10}$/.test(phone)) {
wx.showToast({ title: '请填写正确的手机号', icon: 'none' })
return
}
if (!this.data.activityId) {
wx.showToast({ title: '活动不存在', icon: 'none' })
return
}
this.setData({ submitting: true })
// Must run inside the tap gesture so WeChat can show the subscribe dialog.
requestRemind(this.data.tmplIds)
.then((remind) =>
api.signup({
activityId: this.data.activityId,
name: name,
phone: phone,
company: company,
position: position,
sourceSharer: authUtil.sourceSharer(),
remindStatus: remind.status
}).then((signup) => ({ signup: signup, remind: remind }))
)
.then((result) => {
const accepted = result.remind && result.remind.status === 'accept'
wx.showToast({
title: accepted ? '报名成功，已开启提醒' : '报名成功',
icon: 'success'
})
this.setData({ submitting: false })
wx.showTabBar({ animation: false })
this.triggerEvent('success')
this.triggerEvent('close')
})
.catch((error) => {
this.setData({ submitting: false })
activityUtil.toast(error)
})
}
}
})
miniprogram/components/signup-sheet/index.json
+3
View File
@@ -0,0 +1,3 @@
{
"component": true
}
miniprogram/components/signup-sheet/index.wxml
+77
View File
@@ -0,0 +1,77 @@
<view class="root {{show ? 'on' : ''}}" wx:if="{{show}}" catchtouchmove="noop">
<view class="mask" bindtap="onCancel"></view>
<view class="sheet" catchtap="noop">
<view class="handle"></view>
<text class="title">活动报名</text>
<text class="subtitle">填写信息提交后，将推送微信服务通知</text>
<view class="notice">
<text class="notice-icon">📣</text>
<text class="notice-text">{{remindReady ? '提交后将申请活动提醒授权，同意即可在活动开始前收到微信通知' : '提交即视为同意接收活动提醒（管理员需先在后台配置订阅消息模板）'}}</text>
</view>
<view class="field">
<view class="label-row">
<text class="label">姓名</text>
<text class="required">*</text>
</view>
<input
class="input"
placeholder="请输入姓名"
placeholder-class="placeholder"
value="{{name}}"
maxlength="20"
data-field="name"
bindinput="onInput"
/>
</view>
<view class="field">
<view class="label-row">
<text class="label">手机号码</text>
<text class="required">*</text>
</view>
<input
class="input"
type="number"
placeholder="请输入手机号"
placeholder-class="placeholder"
value="{{phone}}"
maxlength="11"
data-field="phone"
bindinput="onInput"
/>
</view>
<view class="field">
<text class="label">公司名称</text>
<input
class="input"
placeholder="选填"
placeholder-class="placeholder"
value="{{company}}"
maxlength="40"
data-field="company"
bindinput="onInput"
/>
</view>
<view class="field">
<text class="label">职位</text>
<input
class="input"
placeholder="选填"
placeholder-class="placeholder"
value="{{position}}"
maxlength="40"
data-field="position"
bindinput="onInput"
/>
</view>
<view class="btn primary {{submitting ? 'busy' : ''}}" bindtap="onSubmit">
{{submitting ? '提交中…' : '提交报名'}}
</view>
<view class="btn ghost" bindtap="onCancel">取消</view>
</view>
</view>
miniprogram/components/signup-sheet/index.wxss
+144
View File
@@ -0,0 +1,144 @@
.root {
position: fixed;
left: 0;
right: 0;
top: 0;
bottom: 0;
z-index: 1000;
}
.mask {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.45);
}
.sheet {
position: absolute;
left: 0;
right: 0;
bottom: 0;
max-height: 92vh;
padding: 16rpx 40rpx calc(40rpx + env(safe-area-inset-bottom));
box-sizing: border-box;
background: #ffffff;
border-radius: 32rpx 32rpx 0 0;
overflow-y: auto;
}
.handle {
width: 64rpx;
height: 8rpx;
margin: 0 auto 28rpx;
border-radius: 4rpx;
background: #e5e7eb;
}
.title {
display: block;
color: #111827;
font-size: 40rpx;
font-weight: 700;
line-height: 1.3;
}
.subtitle {
display: block;
margin-top: 12rpx;
color: #9ca3af;
font-size: 26rpx;
line-height: 1.5;
}
.notice {
display: flex;
align-items: flex-start;
gap: 12rpx;
margin-top: 28rpx;
padding: 20rpx 24rpx;
border-radius: 16rpx;
background: #e8f7f4;
}
.notice-icon {
flex-shrink: 0;
font-size: 28rpx;
line-height: 1.45;
}
.notice-text {
flex: 1;
color: #0d8b87;
font-size: 24rpx;
line-height: 1.55;
}
.field {
margin-top: 28rpx;
}
.label-row {
display: flex;
align-items: center;
gap: 4rpx;
}
.label {
display: block;
color: #374151;
font-size: 28rpx;
font-weight: 500;
}
.required {
color: #ef4444;
font-size: 28rpx;
line-height: 1;
}
.input {
height: 88rpx;
margin-top: 14rpx;
padding: 0 28rpx;
border: 2rpx solid #e5e7eb;
border-radius: 16rpx;
box-sizing: border-box;
font-size: 30rpx;
color: #111827;
background: #ffffff;
}
.placeholder {
color: #c4c9d1;
}
.btn {
height: 96rpx;
margin-top: 24rpx;
border-radius: 20rpx;
display: flex;
align-items: center;
justify-content: center;
font-size: 32rpx;
font-weight: 600;
box-sizing: border-box;
}
.btn.primary {
margin-top: 40rpx;
background: #0d8b87;
color: #ffffff;
}
.btn.primary.busy {
opacity: 0.7;
}
.btn.ghost {
background: #ffffff;
color: #0d8b87;
border: 2rpx solid #0d8b87;
}
miniprogram/config.js
+3 -3
View File
@@ -1,4 +1,4 @@
/** 后端地址。上线改为 HTTPS 域名，并加入小程序 request / downloadFile 合法域名。 */
const BASE = 'http://127.0.0.1:3000'
/** 后端地址。上线域名需加入小程序 request / uploadFile / downloadFile 合法域名。 */
const BASE = 'https://dev.zmh.zm.luckypay.cc'
module.exports = { BASE }
module.exports = { BASE: BASE }
miniprogram/pages/detail/detail.js
+9 -3
View File
@@ -5,7 +5,8 @@ const activityUtil = require('../../utils/activity')
Page({
data: {
activity: null,
failed: false
failed: false,
signupOpen: false
},
onLoad(query) {
@@ -36,8 +37,13 @@ Page({
activityUtil.openMap(this.data.activity)
},
goSignup() {
activityUtil.goSignup(this.data.activity)
openSignup() {
if (!this.data.activity || this.data.activity.status === 'past') return
this.setData({ signupOpen: true })
},
closeSignup() {
this.setData({ signupOpen: false })
},
goHome() {
miniprogram/pages/detail/detail.json
+2 -1
View File
@@ -1,6 +1,7 @@
{
"navigationBarTitleText": "卓米会",
"usingComponents": {
"activity-board": "/components/activity-board/index"
"activity-board": "/components/activity-board/index",
"signup-sheet": "/components/signup-sheet/index"
}
}
miniprogram/pages/detail/detail.wxml
+13 -7
View File
@@ -1,10 +1,16 @@
<activity-board
wx:if="{{activity}}"
activity="{{activity}}"
show-past="{{false}}"
bind:map="openMap"
bind:signup="goSignup"
/>
<block wx:if="{{activity}}">
<activity-board
activity="{{activity}}"
show-past="{{false}}"
bind:map="openMap"
bind:signup="openSignup"
/>
<signup-sheet
show="{{signupOpen}}"
activity-id="{{activity.id}}"
bind:close="closeSignup"
/>
</block>
<view wx:elif="{{failed}}" class="empty">
<text>活动不存在或已下线</text>
<view class="home" bindtap="goHome">回到首页</view>
miniprogram/pages/index/index.js
+10 -3
View File
@@ -5,7 +5,8 @@ const fallback = require('../../utils/fallback')
Page({
data: {
activity: fallback.CURRENT
activity: fallback.CURRENT,
signupOpen: false
},
onLoad(query) {
@@ -34,8 +35,14 @@ Page({
activityUtil.openMap(this.data.activity)
},
goSignup() {
activityUtil.goSignup(this.data.activity)
openSignup() {
if (!this.data.activity || !this.data.activity.id) return
if (this.data.activity.status === 'past') return
this.setData({ signupOpen: true })
},
closeSignup() {
this.setData({ signupOpen: false })
},
goPast() {
miniprogram/pages/index/index.json
+2 -1
View File
@@ -2,6 +2,7 @@
"navigationBarTitleText": "卓米会",
"enablePullDownRefresh": true,
"usingComponents": {
"activity-board": "/components/activity-board/index"
"activity-board": "/components/activity-board/index",
"signup-sheet": "/components/signup-sheet/index"
}
}
miniprogram/pages/index/index.wxml
+6 -1
View File
@@ -2,6 +2,11 @@
activity="{{activity}}"
show-past="{{true}}"
bind:map="openMap"
bind:signup="goSignup"
bind:signup="openSignup"
bind:past="goPast"
/>
<signup-sheet
show="{{signupOpen}}"
activity-id="{{activity.id}}"
bind:close="closeSignup"
/>
miniprogram/pages/past-edit/past-edit.js
+18
View File
@@ -12,12 +12,29 @@ function chooseOne(mediaType) {
success: (res) => {
const file = res.tempFiles && res.tempFiles[0]
if (file && file.tempFilePath) resolve(file.tempFilePath)
else reject(new Error('未选择文件'))
},
fail: reject
})
})
}
// Crop to a wide banner ratio before upload (closest built-in scale is 16:9).
function cropCover(filePath) {
return new Promise((resolve, reject) => {
if (!wx.cropImage) {
resolve(filePath)
return
}
wx.cropImage({
src: filePath,
cropScale: '16:9',
success: (res) => resolve(res.tempFilePath || filePath),
fail: () => resolve(filePath)
})
})
}
function uploadWithLoading(filePath) {
wx.showLoading({ title: '上传中', mask: true })
return api.uploadMedia(filePath).then(
@@ -71,6 +88,7 @@ Page({
pickCover() {
chooseOne('image')
.then(cropCover)
.then(uploadWithLoading)
.then((data) => this.setData({ cover: data.url, coverPreview: media.absUrl(data.url) }))
.catch((error) => {
miniprogram/pages/past/past.js
+3 -1
View File
@@ -4,7 +4,9 @@ const activityUtil = require('../../utils/activity')
function decorate(item) {
const cover = item.cover || item.poster || ''
return Object.assign({}, item, { coverUrl: cover ? media.absUrl(cover) : '' })
return Object.assign({}, item, {
coverUrl: cover ? media.absUrl(cover) : ''
})
}
Page({
miniprogram/pages/past/past.wxml
+5
View File
@@ -4,6 +4,11 @@
<view class="btn del {{deleting ? 'active' : ''}}" bindtap="onDelete">{{deleting ? '完成' : '删除'}}</view>
</view>
<view class="section-head">
<view class="section-bar"></view>
<text class="section-title">往期活动</text>
</view>
<view wx:if="{{loaded && !list.length}}" class="empty">还没有往期活动</view>
<view
miniprogram/pages/past/past.wxss
+23 -2
View File
@@ -5,7 +5,28 @@
.actions {
display: flex;
gap: 20rpx;
margin-bottom: 4rpx;
margin-bottom: 28rpx;
}
.section-head {
display: flex;
align-items: center;
gap: 14rpx;
margin-bottom: 8rpx;
}
.section-bar {
width: 8rpx;
height: 32rpx;
border-radius: 4rpx;
background: #0d8b87;
}
.section-title {
color: #111827;
font-size: 32rpx;
font-weight: 700;
line-height: 1.2;
}
.btn {
@@ -35,7 +56,7 @@
}
.empty {
margin-top: 160rpx;
margin-top: 120rpx;
text-align: center;
color: #9ca3af;
font-size: 28rpx;
miniprogram/pages/signup/signup.js
+5 -61
View File
@@ -1,71 +1,15 @@
const api = require('../../utils/api')
const authUtil = require('../../utils/auth')
const activityUtil = require('../../utils/activity')
Page({
data: {
name: '',
phone: '',
company: '',
submitting: false
activityId: ''
},
onLoad(query) {
this.activityId = (query && query.id) || ''
api
.profile()
.then((profile) => {
if (!profile) return
this.setData({
name: this.data.name || profile.name || '',
phone: this.data.phone || profile.phone || '',
company: this.data.company || profile.company || ''
})
})
.catch(() => {})
this.setData({ activityId: (query && query.id) || '' })
},
onName(event) {
this.setData({ name: event.detail.value })
onClose() {
wx.navigateBack({ fail: () => wx.switchTab({ url: '/pages/index/index' }) })
},
onPhone(event) {
this.setData({ phone: event.detail.value })
},
onCompany(event) {
this.setData({ company: event.detail.value })
},
submit() {
if (this.data.submitting) return
const name = this.data.name.trim()
const phone = this.data.phone.trim()
const company = this.data.company.trim()
if (!name || !phone) {
wx.showToast({ title: '请填写姓名和手机号', icon: 'none' })
return
}
if (!/^1\d{10}$/.test(phone)) {
wx.showToast({ title: '请填写正确的手机号', icon: 'none' })
return
}
this.setData({ submitting: true })
api
.signup({
activityId: this.activityId,
name: name,
phone: phone,
company: company,
sourceSharer: authUtil.sourceSharer()
})
.then(() => {
wx.showToast({ title: '报名成功', icon: 'success' })
setTimeout(() => wx.navigateBack(), 600)
})
.catch((error) => {
this.setData({ submitting: false })
activityUtil.toast(error)
})
}
onSuccess() {}
})
miniprogram/pages/signup/signup.json
+4 -1
View File
@@ -1,3 +1,6 @@
{
"navigationBarTitleText": "立即报名"
"navigationBarTitleText": "活动报名",
"usingComponents": {
"signup-sheet": "/components/signup-sheet/index"
}
}
miniprogram/pages/signup/signup.wxml
+6 -12
View File
@@ -1,12 +1,6 @@
<view class="page">
<view class="card">
<text class="label">姓名</text>
<input class="input" placeholder="怎么称呼你" placeholder-class="placeholder" value="{{name}}" maxlength="20" bindinput="onName" />
<text class="label">手机号</text>
<input class="input" type="number" placeholder="用于活动通知" placeholder-class="placeholder" value="{{phone}}" maxlength="11" bindinput="onPhone" />
<text class="label">公司 / 机构</text>
<input class="input" placeholder="选填" placeholder-class="placeholder" value="{{company}}" maxlength="40" bindinput="onCompany" />
</view>
<view class="save {{submitting ? 'busy' : ''}}" bindtap="submit">{{submitting ? '提交中…' : '提交报名'}}</view>
<text class="hint">手机号仅用于本次活动通知。</text>
</view>
<signup-sheet
show="{{true}}"
activity-id="{{activityId}}"
bind:close="onClose"
bind:success="onSuccess"
/>
miniprogram/pages/signup/signup.wxss
+2 -51
View File
@@ -1,52 +1,3 @@
.page {
padding: 28rpx 32rpx 48rpx;
}
.card {
padding: 12rpx 32rpx 28rpx;
background: #ffffff;
border-radius: 28rpx;
}
.label {
display: block;
margin-top: 28rpx;
color: #6b7280;
font-size: 26rpx;
}
.input {
height: 88rpx;
margin-top: 8rpx;
border-bottom: 1rpx solid #eef0f3;
font-size: 32rpx;
}
.placeholder {
color: #c4c9d1;
}
.save {
height: 96rpx;
margin-top: 36rpx;
border-radius: 20rpx;
background: #128a80;
color: #ffffff;
font-size: 32rpx;
font-weight: 600;
display: flex;
align-items: center;
justify-content: center;
}
.save.busy {
opacity: 0.7;
}
.hint {
display: block;
margin-top: 20rpx;
text-align: center;
color: #9ca3af;
font-size: 24rpx;
page {
background: transparent;
}
miniprogram/project.config.json
+3 -2
View File
@@ -45,12 +45,13 @@
},
"compileType": "miniprogram",
"libVersion": "3.8.10",
"appid": "wx5f75e1013b7b5a31",
"appid": "wxf84a8a74ac7c1a7d",
"projectname": "zhuomi-mp",
"condition": {},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 2
},
"simulatorPluginLibVersion": {}
"simulatorPluginLibVersion": {},
"isGameTourist": false
}
miniprogram/utils/activity.js
+1 -1
View File
@@ -23,7 +23,7 @@ function goSignup(activity) {
function shareMessage(activity, fallbackId) {
const item = activity || {}
const openid = wx.getStorageSync('openid') || ''
const cover = item.poster || item.cover
const cover = item.cover || item.poster
const message = {
title: item.title || '卓米会',
path: '/pages/detail/detail?id=' + (item.id || fallbackId || '') + '&sharer=' + openid
miniprogram/utils/api.js
+2 -1
View File
@@ -38,5 +38,6 @@ module.exports = {
signup: (data) => authed('/api/signup', 'POST', data),
mySignups: () => authed('/api/signup/mine'),
checkin: (data) => authed('/api/checkin/scan', 'POST', data)
checkin: (data) => authed('/api/checkin/scan', 'POST', data),
subscribeConfig: () => requestUtil.request({ url: '/api/subscribe/config' })
}