feat: ui update

miniprogram/pages/upload/upload.ts

@@ -1,5 +1,6 @@
 import { request, uploadFile, NOT_LOGIN_CODE } from '../../utils/request'
 import { ProcessStatus } from '../../utils/config'
+import { navPageScroll } from '../../utils/nav'
 import { logger } from '../../utils/logger'
 
 // 日志模块名
@@ -12,17 +13,42 @@ Page({
     clothesUuid: '',
     failReason: '',
     step: 0,
+    // 滚动收缩：由 utils/nav.ts 的共享 handler 驱动
+    navScrolled: false,
+    // v2 玻璃弹层
+    srcVisible: false,
+    srcItems: [
+      { text: '拍照', value: 'camera' },
+      { text: '从相册选择', value: 'album' },
+    ],
+    doneVisible: false,
+    doneButtons: [
+      { text: '回到衣橱', value: 'back' },
+      { text: '继续上传', value: 'again', type: 'main' },
+    ],
+    quotaVisible: false,
+    quotaButtons: [
+      { text: '取消', value: '' },
+      { text: '去购买', value: 'ok', type: 'main' },
+    ],
   },
 
+  // 页面级滚动 → 导航收缩为玻璃小标题
+  onPageScroll: navPageScroll,
+
   onChoose() {
-    wx.showActionSheet({
-      itemList: ['拍照', '从相册选择'],
-      success: (res) => {
-        const sourceType: Array<'camera' | 'album'> = res.tapIndex === 0 ? ['camera'] : ['album']
-        this.chooseImage(sourceType)
-      },
-      fail: (e) => logger.debug(LOG, '取消选择图片, err=', e && e.errMsg),
-    })
+    this.setData({ srcVisible: true })
+  },
+
+  onSourceCancel() {
+    this.setData({ srcVisible: false })
+  },
+
+  onSourceSelect(e: WechatMiniprogram.CustomEvent) {
+    const value = e.detail.value as string
+    this.setData({ srcVisible: false })
+    if (value !== 'camera' && value !== 'album') return
+    this.chooseImage([value])
   },
 
   chooseImage(sourceType: Array<'camera' | 'album'>) {
@@ -66,33 +92,36 @@ Page({
     // 后台继续轮询，仅用于更新步骤进度（不再自动跳详情）
     this.pollStatus(this.data.clothesUuid)
     // 立即弹窗让用户选择下一步，避免干等
-    wx.showModal({
-      title: '衣物已上传',
-      content: 'AI 正在识别中，可在衣橱查看进度',
-      confirmText: '继续上传',
-      cancelText: '回到衣橱',
-      success: (res) => {
-        this.clearTimer()
-        if (res.confirm) {
-          logger.debug(LOG, '选择继续上传，重置状态')
-          this.setData({ state: 'idle', imagePath: '', clothesUuid: '', step: 0, failReason: '' })
-        } else {
-          wx.navigateBack({
-            delta: 1,
-            fail: (e) => {
-              logger.warn(LOG, 'navigateBack 失败，改跳衣橱, err=', e && e.errMsg)
-              wx.switchTab({
-                url: '/pages/wardrobe/wardrobe',
-                fail: (e2) => logger.warn(LOG, 'switchTab 衣橱失败, err=', e2 && e2.errMsg),
-              })
-            },
-          })
-        }
+    this.setData({ doneVisible: true })
+  },
+
+  onDoneCancel() {
+    // 回到衣橱
+    this.setData({ doneVisible: false })
+    this.clearTimer()
+    wx.navigateBack({
+      delta: 1,
+      fail: (e) => {
+        logger.warn(LOG, 'navigateBack 失败，改跳衣橱, err=', e && e.errMsg)
+        wx.switchTab({
+          url: '/pages/wardrobe/wardrobe',
+          fail: (e2) => logger.warn(LOG, 'switchTab 衣橱失败, err=', e2 && e2.errMsg),
+        })
       },
-      fail: (e) => logger.warn(LOG, '上传完成弹窗失败, err=', e && e.errMsg),
     })
   },
 
+  onDoneConfirm(e: WechatMiniprogram.CustomEvent) {
+    this.setData({ doneVisible: false })
+    this.clearTimer()
+    if (e.detail.value === 'again') {
+      logger.debug(LOG, '选择继续上传，重置状态')
+      this.setData({ state: 'idle', imagePath: '', clothesUuid: '', step: 0, failReason: '' })
+      return
+    }
+    this.onDoneCancel()
+  },
+
   pollStatus(uuid: string) {
     let count = 0
     ;(this as any).pollTimer = setInterval(() => {
@@ -139,20 +168,19 @@ Page({
   },
 
   showQuotaModal() {
-    wx.showModal({
-      title: '上传额度不足',
-      content: '当前剩余 0 次，购买额度包后可继续上传',
-      confirmText: '去购买',
-      cancelText: '取消',
-      success: (res) => {
-        if (res.confirm) {
-          wx.navigateTo({
-            url: '/pages/mall/mall',
-            fail: (e) => logger.warn(LOG, 'navigateTo 商城失败, err=', e && e.errMsg),
-          })
-        }
-      },
-      fail: (e) => logger.warn(LOG, '额度弹窗失败, err=', e && e.errMsg),
+    this.setData({ quotaVisible: true })
+  },
+
+  onQuotaCancel() {
+    this.setData({ quotaVisible: false })
+  },
+
+  onQuotaConfirm(e: WechatMiniprogram.CustomEvent) {
+    this.setData({ quotaVisible: false })
+    if (e.detail.value !== 'ok') return
+    wx.navigateTo({
+      url: '/pages/mall/mall',
+      fail: (err) => logger.warn(LOG, 'navigateTo 商城失败, err=', err && err.errMsg),
     })
   },