Merge branch 'master' of http://git.dgtis.com/zhangningning/ali_ai_learn_web

src/locales/en.js

@@ -156,6 +156,7 @@ export default {
     ren: 'People',
     yue: 'Balance',
     shenqingtixian: 'Apply for Withdrawal',
-    zhuanghuanmibi: 'Convert Mibit'
+    zhuanghuanmibi: 'Convert Mibit',
+    zhuanhuanbaomibi:'Convert Boom Mibit'
   }
 }

src/locales/zh-CN.js

@@ -159,7 +159,8 @@ export default {
     ren: '人',
     yue: '余额',
     shenqingtixian: '申请提现',
-    zhuanghuanmibi: '转换米币'
+    zhuanghuanmibi: '转换米币',
+    zhuanhuanbaomibi:'转换暴米币'
   }
 
 }

src/pages/Personal/Orders.vue

@@ -9,9 +9,9 @@
                 <el-tag :type="index == 0 ? 'primary' : index == 1 ? 'success' : 'danger'">{{ index == 0 ?
                   $t('personalCenter.daifukuan') : index == 1 ? $t('personalCenter.yiwancheng') :
                     $t('personalCenter.yiquxiao') }}</el-tag>
-                <div class="">{{ $t('personalCenter.dingdanhao') }}: 3056207306143088789</div>
+                <div class="">{{ $t('personalCenter.dingdanhao') }}: {{ item.orderNo }}</div>
               </div>
-              <div class="order-list-top-r">{{ $t('common.orderTime') }}: 2025-11-11 12:00:00</div>
+              <div class="order-list-top-r">{{ $t('common.orderTime') }}: {{ item.createTime }}</div>
             </div>
             <div class="order-list-main flex">
               <img class="image"

src/pages/Personal/Wallet.vue

@@ -4,16 +4,17 @@
       <li class="gradient flex-center-between" v-for="(item, index) in 2" :key="index">
         <div class="wallet-list-li-left">
           <div class="">{{ index == 0 ? $t('common.mibi') : $t('common.baomibi') }}{{ $t('personalCenter.yue') }}</div>
-          <div class="">5000</div>
+          <div class="">{{ index == 0 ? 12 || 0 : userInfo.baoMiBalance || 0 }}</div>
         </div>
         <div class="wallet-list-li-right flex-align-center">
-          <div class="flex-align-center btn">
+          <div class="flex-align-center btn" v-if="index == 1">
             <img src="/src/assets/imgs/my/tixian@2x.png" alt="">
             <div class="">{{ $t('personalCenter.shenqingtixian') }}</div>
           </div>
-          <div v-if="index == 1" class="flex-align-center btn">
+          <div @click="changeTransformation(index)" class="flex-align-center btn">
             <img src="/src/assets/imgs/my/zhuanhuan@2x.png" alt="">
-            <div class="">{{ $t('personalCenter.zhuanghuanmibi') }}</div>
+            <div class="">{{ index == 0 ? $t('personalCenter.zhuanhuanbaomibi') : $t('personalCenter.zhuanghuanmibi') }}
+            </div>
           </div>
         </div>
       </li>
@@ -21,7 +22,8 @@
     <el-tabs v-model="form.activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane :label="$t(tab.label)" v-for="tab in tabs" :key="tab.name" :name="tab.name">
         <div class="tabs flex-align-center">
-          <div :class="{active:index == 0}" class="tab" v-for="(item, index) in 2">{{ index == 0 ? '米币' : '暴米币' }}明细</div>
+          <div :class="{ active: index == 0 }" class="tab" v-for="(item, index) in 2">{{ index == 0 ? '米币' : '暴米币' }}明细
+          </div>
         </div>
         <ul class="wallet-page-list">
           <li v-for="(item, index) in list" :key="index">
@@ -39,6 +41,44 @@
         @page-change="handlePageChange" />
     </template>
     <el-empty v-else :description="$t('common.empty')" />
+
+    <el-dialog v-model="dialogVisible" title="Tips" width="784" :before-close="handleClose">
+      <el-form :model="walletForm" label-width="auto" label-position="top">
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="Activity name">
+              <el-input v-model="walletForm.name" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="Activity name">
+              <el-input v-model="walletForm.name" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="Activity name">
+              <el-input v-model="walletForm.name" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="Activity name">
+              <el-input v-model="walletForm.name" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">Cancel</el-button>
+          <el-button type="primary" @click="dialogVisible = false">
+            Confirm
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+
   </div>
 </template>
 <script lang="ts" setup>
@@ -46,6 +86,9 @@ import { ref, onMounted } from 'vue'
 
 import type { TabsPaneContext } from 'element-plus'
 import Pagination from '@/components/Pagination.vue'
+import { getUserInfo } from '@/api/auth'
+
+import { payConfigDearch,calRate } from '@/api/order'
 
 const activeName = ref('first')
 const tabs = ref([
@@ -60,6 +103,23 @@ const form = ref({
   total: 0,
 })
 
+const walletForm = ref({
+
+})
+
+const userInfo = ref({})//用户信息
+
+const dialogVisible = ref(false);
+
+// 米币暴米币转换
+const changeTransformation = () => {
+  calRate({
+    orderType:'exchange_mi',
+    orderNum:100
+  })
+  dialogVisible.value = true;
+}
+
 const handleClick = (tab: TabsPaneContext) => {
   list.value = []
   form.value.pageNum = 1;
@@ -75,7 +135,15 @@ const handlePageChange = (newPage: number) => {
   form.value.pageNum = page;
   getList()
 }
+// 获取用户信息
+const getInfo = async () => {
+  let res = await getUserInfo();
+  userInfo.value = res.user;
+  let result = await payConfigDearch({id:'03'})
+}
+
 onMounted(() => {
+  getInfo()
   getList()
 })
 </script>
@@ -95,9 +163,10 @@ onMounted(() => {
       border-radius: 4px;
       margin-right: 16px;
     }
+
     .active {
       color: #FFFFFF;
-      background: linear-gradient( 90deg, #0055FE 0%, #C832FA 100%);
+      background: linear-gradient(90deg, #0055FE 0%, #C832FA 100%);
     }
   }
 

src/pages/PersonalCenter.vue

@@ -20,7 +20,7 @@
             </div>
             <div class="personal-user-line"></div>
             <div class="personal-user-li">
-              <span>0</span>
+              <span>{{ userInfo.baoMiBalance }}</span>
               <span>{{ $t('common.baomibi') }}</span>
             </div>
             <div class="personal-user-line"></div>