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

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'
+		// }
 	])
 
 	/**

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(() => {
+        // 取消数据迁移
       })
     }
   })

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>