Merge branch 'main' of https://git.nuttyreading.com/zm/taimed-international-app

修复：内测问题修改
2025-12-03 14:10:30 +08:00 · 2025-12-03 14:10:27 +08:00
19 changed files with 172 additions and 163 deletions
--- a/components/order/Confirm.vue
+++ b/components/order/Confirm.vue
@@ -419,7 +419,7 @@ const createOrder = async (): Promise<string | null> => {

 <style lang="scss" scoped>
 .confirm-order-page {
-  min-height: 100vh;
+  min-height: calc(100vh - 60px - 40rpx);
  background-color: #f5f5f5;
  padding: 20rpx;
  padding-bottom: 60px;
--- a/components/video-player/composables/useVideoProgress.ts
+++ b/components/video-player/composables/useVideoProgress.ts
@@ -25,7 +25,9 @@ export function useVideoProgress() {
    const localPosition = videoStorage.getVideoPosition(videoInfo.id) || 0

    // 返回较大的值
-    let position = Math.max(serverPosition, localPosition)
+    // let position = Math.max(serverPosition, localPosition)
+    // 采用服务器记录的播放位置
+    let position = serverPosition

    // 如果播放位置接近视频结尾（最后5秒内），则从头开始
    const videoDuration = videoInfo.duration || 0
@@ -99,12 +101,12 @@ export function useVideoProgress() {
   */
  const saveNow = async (videoInfo: IVideoInfo) => {
    if (currentTime.value > 0) {
-      // 保存到本地
-      videoStorage.saveVideoPosition(
-        videoInfo.id,
-        Math.floor(currentTime.value),
-        videoInfo
-      )
+      // 保存到本地 注释掉: 不再保存到本地
+      // videoStorage.saveVideoPosition(
+      //   videoInfo.id,
+      //   Math.floor(currentTime.value),
+      //   videoInfo
+      // )

      // 保存到服务器
      await saveToServer(videoInfo.id, Math.floor(currentTime.value))
--- a/components/video-player/index.vue
+++ b/components/video-player/index.vue
@@ -134,7 +134,7 @@ onMounted(async () => {
    }
    
    // 开始保存进度
-    player.videoProgress.startSaving(videoInfo)
+    // player.videoProgress.startSaving(videoInfo) // 注释掉 不再保存到本地
  }
 })

@@ -142,12 +142,12 @@ onMounted(async () => {
 onHide(() => {
  console.log('Page hidden, saving progress...')
  if (player.currentVideoData.value && player.videoProgress.currentTime.value > 0) {
-    // 立即保存到本地
-    videoStorage.saveVideoPosition(
-      player.currentVideoData.value.id,
-      Math.floor(player.videoProgress.currentTime.value),
-      player.currentVideoData.value
-    )
+    // 立即保存到本地 注释掉: 不再保存到本地
+    // videoStorage.saveVideoPosition(
+    //   player.currentVideoData.value.id,
+    //   Math.floor(player.videoProgress.currentTime.value),
+    //   player.currentVideoData.value
+    // )
    // 保存到服务器
    player.videoProgress.saveToServer(
      player.currentVideoData.value.id,
@@ -164,12 +164,12 @@ onUnmounted(() => {

  // 立即保存当前播放进度（同步保存到本地，异步保存到服务器）
  if (player.currentVideoData.value && player.videoProgress.currentTime.value > 0) {
-    // 立即保存到本地
-    videoStorage.saveVideoPosition(
-      player.currentVideoData.value.id,
-      Math.floor(player.videoProgress.currentTime.value),
-      player.currentVideoData.value
-    )
+    // 立即保存到本地 注释掉: 不再保存到本地
+    // videoStorage.saveVideoPosition(
+    //   player.currentVideoData.value.id,
+    //   Math.floor(player.videoProgress.currentTime.value),
+    //   player.currentVideoData.value
+    // )
    // 保存到服务器（不等待完成）
    player.videoProgress.saveToServer(
      player.currentVideoData.value.id,
@@ -214,11 +214,13 @@ const pause = () => {
  
  // 暂停时保存进度
  if (player.currentVideoData.value && player.videoProgress.currentTime.value > 0) {
-    videoStorage.saveVideoPosition(
-      player.currentVideoData.value.id,
-      Math.floor(player.videoProgress.currentTime.value),
-      player.currentVideoData.value
-    )
+    // 保存进度到本地 注释掉: 不再保存到本地
+    // videoStorage.saveVideoPosition(
+    //   player.currentVideoData.value.id,
+    //   Math.floor(player.videoProgress.currentTime.value),
+    //   player.currentVideoData.value
+    // )
+    // 保存进度到服务器
    player.videoProgress.saveToServer(
      player.currentVideoData.value.id,
      Math.floor(player.videoProgress.currentTime.value)
@@ -342,7 +344,7 @@ const playNext = async () => {
    // 获取新视频的初始播放位置
    if (player.currentVideoData.value) {
      initialTime.value = player.videoProgress.getInitialPosition(player.currentVideoData.value)
-      player.videoProgress.startSaving(player.currentVideoData.value)
+      // player.videoProgress.startSaving(player.currentVideoData.value) // 注释掉 不再保存到本地
    }
  }
 }
--- a/locale/en.json
+++ b/locale/en.json
@@ -224,7 +224,7 @@
    "migrateWarning": "Migration is irreversible, please proceed with caution!",
    "migrateInstructions": "Migration Instructions",
    "instruction1": "Please obtain the migration code from your chinese account, get it by going to 【我的】-【数据迁移】-【获取迁移验证码】.",
-    "instruction2": "After data migration is complete, the chinese account data will be cleared, and all purchased Tianyi coins, points, courses, VIP and other data will be transferred to the current account",
+    "instruction2": "After data migration is complete, the chinese account data will be cleared, and all purchased Tianyi Coins, points, courses, E-book, VIP, certificate, and User Contribution will be transferred to the current account",
    "instruction3": "The migration process may take a few minutes, please be patient.",
    "instruction4": "If you encounter any issues, please contact customer service for assistance."
 		
@@ -237,7 +237,7 @@
    "comment": "Review",
    "choose": "Browse Books",
    "nullText": "No books yet, go shopping~",
-    "afterPurchase": "Available after purchase",
+    "afterPurchase": "Purchase to read",
    "contents": "Contents",
    "zjContents": "Chapter List",
    "set": "Settings",
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -224,8 +224,8 @@
    "migrateCodePlaceholder": "国内版账号获取的迁移验证码",
    "migrateWarning": "迁移后不可恢复，请谨慎操作！",
    "migrateInstructions": "迁移说明",
-    "instruction1": "请在吴门医述APP中获取迁移验证码，获取方式【我的】-【数据迁移】-【获取迁移验证码】。",
-    "instruction2": "数据迁移完成后，旧账号数据将被清空，已购买的天医币、积分、课程、VIP等数据将转移到当前账号。",
+    "instruction1": "请在吴门医述、心灵空间、众妙之门、疯子读书任意APP中获取迁移验证码，获取方式【我的】-【数据迁移】-【获取迁移验证码】。",
+    "instruction2": "数据迁移完成后，旧账号数据将被清空，已购买的天医币、积分、课程、电子书、VIP、证书、湖分将转移到当前账号。",
    "instruction3": "迁移过程可能需要几分钟时间，请耐心等待。",
    "instruction4": "如遇到问题，请联系客服获取帮助。"
  },
@@ -237,7 +237,7 @@
    "comment": "书评",
    "choose": "去选书",
    "nullText": "暂无书籍，快去选购吧~",
-    "afterPurchase": "购买后即可使用此功能",
+    "afterPurchase": "购买后即可阅读此章节",
    "contents": "目录",
    "zjContents": "章节目录",
    "set": "设置",
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
    "name" : "吴门国际",
    "appid" : "__UNI__1250B39",
    "description" : "吴门国际",
-    "versionName" : "0.1.1",
-    "versionCode" : 11,
+    "versionName" : "0.1.2",
+    "versionCode" : 12,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
--- a/pages/book/detail.vue
+++ b/pages/book/detail.vue
@@ -79,15 +79,15 @@
    
    <!-- 底部操作栏 -->
    <view class="action-bar">
-      <template v-if="bookInfo.isBuy">
+      <template v-if="bookInfo.isBuy || hasVip">
        <view class="action-btn read" @click="goToReader">
          <text>{{ $t('bookDetails.startReading') }}</text>
        </view>
-        <view class="action-btn purchased">
+        <!-- <view class="action-btn purchased">
          <wd-button disabled custom-class="purchased-btn">
            {{ $t('bookDetails.buttonText2') }}
          </wd-button>
-        </view>
+        </view> -->
        <view class="action-btn listen" @click="goToListen">
          <text>{{ $t('bookDetails.startListening') }}</text>
        </view>
@@ -120,19 +120,23 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
 import { onLoad, onShow } from '@dcloudio/uni-app'
-import { useI18n } from 'vue-i18n'
+import { t } from '@/utils/i18n'
 import { bookApi } from '@/api/modules/book'
+import { useUserStore } from '@/stores/user'
 import type { IBookDetail, IBook, IComment } from '@/types/book'
 import type { IGoods } from '@/types/order'
 import GoodsSelector from '@/components/order/GoodsSelector.vue'
 import CommentList from '@/components/book/CommentList.vue'

-const { t } = useI18n()
+const userStore = useUserStore()

 // 路由参数
 const bookId = ref(0)
 const pageFrom = ref('')

+// 会员状态
+const hasVip = computed(() => userStore.userInfo?.userEbookVip?.length > 0 || false)
+
 // 数据状态
 const bookInfo = ref<IBookDetail>({
  id: 0,
--- a/pages/book/index.vue
+++ b/pages/book/index.vue
@@ -172,10 +172,11 @@
 </template>

 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, computed } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import { homeApi } from '@/api/modules/book_home'
 import { getNotchHeight } from '@/utils/system'
+import { useUserStore } from '@/stores/user'
 import BookPrice from '@/components/book/BookPrice.vue'
 import type {
  IBook,
@@ -184,6 +185,8 @@ import type {
  IVipInfo
 } from '@/types/book'

+const userStore = useUserStore()
+
 // 状态定义
 const showMyBooks = ref(false)
 const showActivity = ref(false)
@@ -208,17 +211,7 @@ const currentLevel1Index = ref(0)
 const currentLevel2Index = ref(0)

 // VIP信息
-const vipInfo = ref<IVipInfo | null>(null)
-
-/**
- * 获取VIP信息
- */
-const getVipInfo = async () => {
-  const res = await homeApi.getVipInfo()
-  if (res.vipInfo) {
-    vipInfo.value = res.vipInfo
-  }
-}
+const vipInfo = computed(() => userStore.userInfo?.userEbookVip?.[0] || null)

 /**
 * 获取我的书单
@@ -388,7 +381,6 @@ onMounted(() => {
 */
 onShow(() => {
  // 刷新数据
-  getVipInfo()
  getMyBooks()
  getRecommendBooks()
  getActivityLabels()
--- a/pages/book/listen/index.vue
+++ b/pages/book/listen/index.vue
@@ -16,7 +16,7 @@
          <text class="author">{{ $t('bookDetails.authorName') }}{{ bookInfo.author?.authorName }}</text>
        </view>
        <wd-button 
-          v-if="!bookInfo.isBuy" 
+          v-if="!bookInfo.isBuy && !hasVip" 
          type="primary"
          size="small"
          @click="purchaseVisible = true"
@@ -63,18 +63,22 @@
 <script setup lang="ts">
 import { ref, computed } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
-import { useI18n } from 'vue-i18n'
+import { t } from '@/utils/i18n'
 import { bookApi } from '@/api/modules/book'
+import { useUserStore } from '@/stores/user'
 import type { IBookDetail, IChapter } from '@/types/book'
 import type { IGoods } from '@/types/order'
 import GoodsSelector from '@/components/order/GoodsSelector.vue'

-const { t } = useI18n()
+const userStore = useUserStore()

 // 路由参数
 const bookId = ref(0)
 const fromIndex = ref(-1)

+// 会员状态
+const hasVip = computed(() => userStore.userInfo?.userEbookVip?.length > 0 || false)
+
 // 数据状态
 const bookInfo = ref<IBookDetail>({
  id: 0,
@@ -163,7 +167,7 @@ async function loadChapterList() {

 // 判断章节是否锁定
 function isLocked(index: number): boolean {
-  return !bookInfo.value.isBuy && index + 1 > bookInfo.value.freeChapterCount
+  return !bookInfo.value.isBuy && index + 1 > bookInfo.value.freeChapterCount && !hasVip.value
 }

 // 播放章节
--- a/pages/book/listen/player.vue
+++ b/pages/book/listen/player.vue
@@ -80,7 +80,8 @@
            :class="{ 'chapter-item-active': currentChapterIndex === index }"
            @click="selectChapter(index)"
          >
-            <text class="chapter-title">{{ chapter.chapter }}</text>
+            <text class="chapter-title" :class="{ locked: isLocked(index) }">{{ chapter.chapter }}</text>
+            <wd-icon v-if="isLocked(index)" name="lock-on" size="20px" />
          </view>
        </scroll-view>
      </view>
@@ -92,10 +93,15 @@
 import { ref, computed, onMounted, onUnmounted } from 'vue'
 import { onLoad, onHide, onUnload } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
+import { useUserStore } from '@/stores/user'
 import { bookApi } from '@/api/modules/book'
 import type { IBookDetail, IChapter } from '@/types/book'

 const { t } = useI18n()
+const userStore = useUserStore()
+
+// 会员状态
+const hasVip = computed(() => userStore.userInfo?.userEbookVip?.length > 0 || false)

 // 路由参数
 const bookId = ref(0)
@@ -284,6 +290,11 @@ async function loadChapterList() {
  }
 }

+// 判断章节是否锁定
+function isLocked(index: number): boolean {
+  return !bookInfo.value.isBuy && index + 1 > bookInfo.value.freeChapterCount && !hasVip.value
+}
+
 // 加载章节内容（带音频时间点）
 async function loadChapterContent(chapterId: number) {
  try {    
@@ -375,7 +386,7 @@ function togglePlay() {

 // 上一章
 async function prevChapter() {
-  if (currentChapterIndex.value > 0) {
+  if (currentChapterIndex.value > 0 && !isLocked(currentChapterIndex.value - 1)) {
    currentChapterIndex.value--
    await loadChapterContent(chapterList.value[currentChapterIndex.value].id)
    playChapter(chapterList.value[currentChapterIndex.value])
@@ -390,19 +401,23 @@ async function prevChapter() {
 // 下一章
 async function nextChapter() {
  // 检查是否锁定
-  if (isBuy.value === '1' && currentChapterIndex.value + 1 >= count.value) {
-    uni.showModal({
-      title: t('common.limit_title'),
-      content: t('book.afterPurchase'),
-      confirmText: t('common.confirm_text'),
-      success: (res) => {
-        if (res.confirm) {
-          uni.navigateTo({
-            url: `/pages/book/order?id=${bookId.value}`
-          })
-        }
-      }
+  if (isLocked(currentChapterIndex.value + 1)) {
+    uni.showToast({
+      title: t('book.afterPurchase'),
+      icon: 'none'
    })
+    // uni.showModal({
+    //   title: t('common.limit_title'),
+    //   content: t('book.afterPurchase'),
+    //   confirmText: t('common.confirm_text'),
+    //   success: (res) => {
+    //     if (res.confirm) {
+    //       uni.navigateTo({
+    //         url: `/pages/book/order?id=${bookId.value}`
+    //       })
+    //     }
+    //   }
+    // })
    return
  }
  
@@ -491,7 +506,7 @@ async function selectChapter(index: number) {
  }
  
  // 检查是否锁定
-  if (isBuy.value === '1' && index >= count.value) {
+  if (isLocked(index)) {
    uni.showToast({
      title: t('book.afterPurchase'),
      icon: 'none'
@@ -698,6 +713,10 @@ function formatTime(seconds: number): string {
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
+
+  &.locked {
+    color: #999;
+  }
 }

 .chapter-item-active .chapter-title {
--- a/pages/book/reader.vue
+++ b/pages/book/reader.vue
@@ -102,6 +102,7 @@
        <text class="popup-title">{{ $t('book.zjContents') }}</text>
        <scroll-view scroll-y class="chapter-list">
          <view 
+            v-if="chapterList.length > 0"
            v-for="(chapter, index) in chapterList" 
            :key="chapter.id"
            class="chapter-item"
@@ -111,8 +112,9 @@
            <text class="chapter-text" :class="{ locked: isLocked(index) }">
              {{ chapter.chapter }}{{ chapter.content ? ' - ' + chapter.content : '' }}
            </text>
-            <wd-icon v-if="isLocked(index)" name="lock-on" size="20px" />
+            <wd-icon v-if="isLocked(index) && !hasVip" name="lock-on" size="20px" />
          </view>
+          <wd-status-tip v-else image="content" :tip="$t('global.dataNull')" />
        </scroll-view>
      </view>
    </wd-popup>
@@ -191,6 +193,7 @@
 import { ref, computed, onMounted } from 'vue'
 import { onLoad, onShow, onHide, onBackPress } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
+import { useUserStore } from '@/stores/user'
 import { useBookStore } from '@/stores/book'
 import { bookApi } from '@/api/modules/book'
 import type { IChapter, IChapterContent, IReadProgress } from '@/types/book'
@@ -198,6 +201,10 @@ import { onPageBack } from '@/utils/index'

 const { t } = useI18n()
 const bookStore = useBookStore()
+const userStore = useUserStore()
+
+// 会员状态
+const hasVip = computed(() => userStore.userInfo?.userEbookVip?.length > 0 || false)

 // 路由参数
 const bookId = ref(0)
@@ -430,7 +437,7 @@ async function switchChapter(chapter: IChapter, index: number) {

 // 判断章节是否锁定
 function isLocked(index: number): boolean {
-  return !isBuy.value && index + 1 > count.value
+  return !isBuy.value && index + 1 > count.value && !hasVip.value
 }

 // 判断是否是图片
@@ -604,10 +611,9 @@ function changeReadMode(mode: 'scroll' | 'page') {

 // 语言配置
 const bookLanguages = ref([])
-const currentLanguage = ref('')
+const currentLanguage = ref('中文')
 onMounted(() => {
  currentLanguage.value = uni.getStorageSync('currentBookLanguage') || '中文'
-  console.log('currentLanguage', currentLanguage.value)
 })
 const getBookLanguages = async () => {
  const res = await bookApi.getBookLanguages(bookId.value)
@@ -658,7 +664,7 @@ async function saveProgress() {
    position: fixed;
    left: 0;
    right: 0;
-    z-index: 999;
+    z-index: 90;
    background: inherit;
    display: flex;
    align-items: center;
--- a/pages/course/details/chapter.vue
+++ b/pages/course/details/chapter.vue
@@ -122,14 +122,6 @@ const loadChapterDetail = async () => {
  }
 }

-/**
- * 选择视频
- */
-const selectVideo = async (index: number) => {
-  if (index === currentVideoIndex.value) return
-  currentVideoIndex.value = index
-}
-
 /**
 * 预览图片
 */
--- a/pages/course/details/components/CatalogueList.vue
+++ b/pages/course/details/components/CatalogueList.vue
@@ -122,7 +122,7 @@
            </view>
            
            <!-- 锁定图标 -->
-            <view v-if="!canAccess(chapter)" class="lock-icon">
+            <view v-if="!canAccess(chapter) && currentCatalogue.type != 0" class="lock-icon">
              <wd-icon name="lock-on" size="24px" color="#258feb" />
            </view>
          </view>
@@ -252,7 +252,7 @@ const canAccess = (chapter: IChapter): boolean => {
  if (chapter.isAudition === 1) return true
  
  // 免费课程可以访问
-  if (currentCatalogue.value.type === 0) return true
+  // if (currentCatalogue.value.type === 0) return true
  
  return false
 }
@@ -261,18 +261,18 @@ const canAccess = (chapter: IChapter): boolean => {
 * 点击章节
 */
 const handleChapterClick = (chapter: IChapter, catalogue: ICatalogue) => {
-  if (!isPurchased.value && currentCatalogue.value.type === 0) {
-    uni.showToast({
-      title: '请先领取课程',
-      icon: 'none'
-    })
-    return
-  }
  if (!canAccess(chapter)) {
-    uni.showToast({
-      title: '请先购买课程',
-      icon: 'none'
-    })
+    if (currentCatalogue.value.type === 0) {
+      uni.showToast({
+        title: '请先领取课程',
+        icon: 'none'
+      })
+    } else {
+      uni.showToast({
+        title: '请先购买课程',
+        icon: 'none'
+      })
+    }
    return
  }
  
--- a/pages/news/details.vue
+++ b/pages/news/details.vue
@@ -3,7 +3,7 @@
    <!-- 自定义导航栏 -->
    <nav-bar :title="$t('news.newsDetail')" />

-    <web-view v-if="urlVisible" :webview-styles="{ progress: { color: '#55aaff' } }" :src="surl"></web-view>
+    <view v-if="urlVisible" class="web-view-container"><web-view :webview-styles="{ progress: { color: '#55aaff' } }" :src="surl"></web-view></view>
    <view v-else class="box">
 			<view class="title">{{ news.title }}</view>
 			<view 
@@ -32,28 +32,27 @@ onLoad((e: any) => {
 	source.value = e.source || ''
  if(type.value == 1 && surl.value != ''){
 		urlVisible.value = true
+		// APP 设置导航栏按钮
+		// #ifdef APP-PLUS
+		const pages = getCurrentPages()
+		const page = pages[pages.length - 1]
+		const currentWebview = page.$getAppWebview()
+
+		currentWebview.setStyle({
+			titleNView: {
+				buttons: [{
+					float: 'right',
+					type: 'close',
+					onclick: () => {
+						uni.navigateBack({ delta: 1 })
+					}
+				}]
+			}
+		})
+		// #endif
  } else {
 		getData()
  }
-
-	// APP 设置导航栏按钮
-	// #ifdef APP-PLUS
-	// const pages = getCurrentPages()
-	// const page = pages[pages.length - 1]
-	// const currentWebview = page.$getAppWebview()
-
-	// currentWebview.setStyle({
-	// 	titleNView: {
-	// 		buttons: [{
-	// 			float: 'right',
-	// 			type: 'close',
-	// 			onclick: () => {
-	// 				uni.navigateBack({ delta: 1 })
-	// 			}
-	// 		}]
-	// 	}
-	// })
-	// #endif
 })

 // 新闻详情
@@ -102,6 +101,9 @@ const formattedContent = computed(() => formatRichText(news.value.content))
 </script>

 <style lang="scss" scoped>
+.web-view-container {
+  padding-top: 60px;
+}
 .box {
 	background-color: #fff;		
 	padding: 10px;
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -133,13 +133,13 @@
 			url: '/pages/user/feedback/index',
 			type: 'pageJump'
 		},
-		{
-			id: 6,
-			name: t('user.dataMigrate'),
-			url: '/pages/user/migrate/index',
-			desc: t('user.migrateSubtitle'),
-			type: 'pageJump'
-		}
+		// {
+		// 	id: 6,
+		// 	name: t('user.dataMigrate'),
+		// 	url: '/pages/user/migrate/index',
+		// 	desc: t('user.migrateSubtitle'),
+		// 	type: 'pageJump'
+		// }
 	])

 	/**
--- a/pages/user/migrate/index.vue
+++ b/pages/user/migrate/index.vue
@@ -54,6 +54,8 @@
        </view>
      </view>
    </view>
+
+    <wd-message-box />
  </view>
 </template>

@@ -61,6 +63,9 @@
 import { ref } from 'vue'
 import { t } from '@/utils/i18n'
 import { migrateUserData } from '@/api/modules/user'
+import { useMessage } from '@/uni_modules/wot-design-uni'
+
+const message = useMessage()

 // 表单引用
 const migrateForm = ref()
@@ -85,14 +90,20 @@ const rules = ref({
 const handleSubmit = async () => {
  migrateForm.value.validate().then(({ valid, errors }: any) => {
    if (valid) {
-      uni.showModal({
+      message.confirm({
        title: t('global.tips'),
-        content: t('user.migrateWarning'),
-        success: (res: any) => {
-          if (res.confirm) {
-            submitMigrate()
-          }
-        }
+        msg: t('user.instruction2'),
+      }).then(() => {
+        message.confirm({
+          title: t('global.tips'),
+          msg: t('user.migrateWarning'),
+        }).then(() => {
+          submitMigrate()
+        }).catch(() => {
+          // 取消数据迁移
+        })
+      }).catch(() => {
+        // 取消数据迁移
      })
    }
  })
--- a/pages/user/order/index.vue
+++ b/pages/user/order/index.vue
@@ -27,7 +27,7 @@
        <ProductInfo v-if="order.orderType === 'vip'" :data="order.vipBuyConfigEntity" :type="order.orderType" />
        <ProductInfo v-if="order.orderType === 'abroadVip'" :data="order.ebookvipBuyConfig" :type="order.orderType" />
        <!-- 三种订单类型商品信息 end -->
-        <view class="order-item-total-price">实付款：{{ order.orderMoney }} {{ t('global.coin') }}</view>
+        <view class="order-item-total-price">实付款：{{ order.realMoney }} {{ t('global.coin') }}</view>

        <template #footer>
          <view>
--- a/style/tailwind.css
+++ b/style/tailwind.css
@@ -211,27 +211,15 @@
      max-width: 96rem;
    }
  }
-  .mb-2 {
-    margin-bottom: calc(var(--spacing) * 2);
-  }
  .mb-2\! {
    margin-bottom: calc(var(--spacing) * 2) !important;
  }
-  .mb-\[20rpx\] {
-    margin-bottom: 20rpx;
-  }
  .mb-\[20rpx\]\! {
    margin-bottom: 20rpx !important;
  }
-  .ml-1 {
-    margin-left: calc(var(--spacing) * 1);
-  }
  .ml-1\! {
    margin-left: calc(var(--spacing) * 1) !important;
  }
-  .ml-2 {
-    margin-left: calc(var(--spacing) * 2);
-  }
  .ml-2\.5\! {
    margin-left: calc(var(--spacing) * 2.5) !important;
  }
@@ -268,9 +256,6 @@
  .flex-shrink {
    flex-shrink: 1;
  }
-  .border-collapse {
-    border-collapse: collapse;
-  }
  .transform {
    transform: var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,);
  }
@@ -284,9 +269,6 @@
    border-style: var(--tw-border-style);
    border-width: 1px;
  }
-  .p-0 {
-    padding: calc(var(--spacing) * 0);
-  }
  .p-0\! {
    padding: calc(var(--spacing) * 0) !important;
  }
@@ -305,12 +287,6 @@
  .pt-\[10rpx\] {
    padding-top: 10rpx;
  }
-  .pt-\[20rpx\] {
-    padding-top: 20rpx;
-  }
-  .pb-0 {
-    padding-bottom: calc(var(--spacing) * 0);
-  }
  .pb-0\! {
    padding-bottom: calc(var(--spacing) * 0) !important;
  }
@@ -342,9 +318,6 @@
  .text-\[\#7dc1f0\] {
    color: #7dc1f0;
  }
-  .text-\[14rpx\] {
-    color: 14rpx;
-  }
  .text-\[cadetblue\] {
    color: cadetblue;
  }
@@ -364,9 +337,6 @@
    --tw-ordinal: ordinal;
    font-variant-numeric: var(--tw-ordinal,) var(--tw-slashed-zero,) var(--tw-numeric-figure,) var(--tw-numeric-spacing,) var(--tw-numeric-fraction,);
  }
-  .underline {
-    text-decoration-line: underline;
-  }
  .ring {
    --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
--- a/style/ui.scss
+++ b/style/ui.scss
@@ -145,3 +145,8 @@ uni-textarea {
 	border-radius: 4px !important;
 	padding: 2px 6px !important;
 }
+
+// 缺省
+.wd-status-tip__text {
+	margin: 0px auto 20px !important;
+}
Author	SHA1	Message	Date
chenghuan	385c28428e	Merge branch 'main' of https://git.nuttyreading.com/zm/taimed-international-app	2025-12-03 14:10:30 +08:00
chenghuan	677fe7436e	修复：内测问题修改	2025-12-03 14:10:27 +08:00