Merge branch 'master' of http://git.dgtis.com/zhangningning/ali_ai_learn_web into dev-yxk

.env.development

@@ -1,4 +1,5 @@
 # 乔功
+VITE_API_BASE_URL=http://192.168.100.134:8080/api
 # VITE_API_BASE_URL=http://192.168.100.134:8080/api
 # VITE_API_BASE_URL=http://192.168.101.12:8080/api
 # 高运甲

src/App.vue

@@ -6,7 +6,7 @@
         <div class="header-content">
           <div class="logo" @click="$router.push('/')">{{ $t('common.title') }}</div>
           <el-menu :default-active="activeIndex" mode="horizontal" :ellipsis="false" class="meauList">
-            <el-menu-item index="1" @click="$router.push('/')">AI{{ $t('common.gongzuoliu') }}</el-menu-item>
+            <el-menu-item index="1" @click="$router.push('/')">AI {{ $t('common.gongzuoliu') }}</el-menu-item>
             <!-- <el-menu-item index="2" @click="$router.push('/my-learning')">工作流交易</el-menu-item> -->
             <el-menu-item index="2" @click="goMyLearning">{{ $t('common.gongzuoliu_trade') }}</el-menu-item>
             <el-menu-item index="3" @click="$router.push('/learning-system')">{{ $t('route.learning_system') }}</el-menu-item>

src/locales/en.js

@@ -115,6 +115,9 @@ export default {
     bankTransferSuccess:"Bank Transfer Success, please wait for the administrator to confirm",
     submitSuccess:"Submit Success",
     qingxuanze:"Please Select",
+    registeredNum:"Registered Number",
+    remainingTime:"Remaining Time",
+    readAndAgree:"I have read and agree ",
   },
   login: {
     smsLogin: 'Captcha Login',
@@ -141,8 +144,8 @@ export default {
     gongzuoliu_trade_add: 'Publish Workflow Demand',
     WorkflowDetail: 'Workflow Detail',
     learning_system: 'Learning System',
-    recharge: 'Recharge',
-    mibiShop: 'Mibit Shop',
+    recharge: 'Recharge ',
+    mibiShop: 'MiBi Shop',
 
 
 
@@ -173,7 +176,7 @@ export default {
     paySetting:"Pay Setting",
     paySettingTip:"Pay (Users need to pay to use)",
     freeSettingTip:"Free (All users can use for free)",
-    placeholderPrice:"Please input boom mibit quantity",
+    placeholderPrice:"Please input boom MiBi quantity",
     placeholderWorkflowContent:"Please input workflow content",
   },
   workflowTradeAdd:{
@@ -211,6 +214,7 @@ export default {
     publishRules:"Publish Rules",
     pleaseInputRightBudgetLowerLimit:"Please input right budget lower limit (up to 2 decimal places)",
     pleaseInputRightBudgetUpperLimit:"Please input right budget upper limit (up to 2 decimal places)",
+    publishDemandNum:"Publish Number",
   },
   personalCenter:{
     personalCenter: 'Personal Center',
@@ -249,8 +253,8 @@ export default {
     ren: 'People',
     yue: 'Balance',
     shenqingtixian: 'Apply for Withdrawal',
-    zhuanghuanmibi: 'Convert Mibit',
-    zhuanhuanbaomibi:'Convert Boom Mibit',
+    zhuanghuanmibi: 'Convert MiBi',
+    zhuanhuanbaomibi:'Convert Boom MiBi',
     orderNumber: 'Order Number',
     details: ' Details',
     vipEndTime: 'VIP End Time',
@@ -287,5 +291,21 @@ export default {
     fenpeimibi:'Assign MiBi',
     qsryfpdmbsl:'Please Enter The Employee\'s MiBi Quantity',
     lookVoucher:'View Voucher',
+  },
+  orderConfirm:{
+    personalPay:'Personal Payment',
+    companyPay:'Company Payment',
+    alipayPay:'Alipay Payment',
+    wechatPay:'Wechat Payment',
+    unionPay:'Union Payment',
+    paypalPay:'PayPal Payment',
+    payVoucher:'Payment Voucher',
+    totalPrice:'Total Price',
+    payAmount:'Pay Amount',
+    serviceAgreement:'AI Learning Forum Service Agreement',
+    IntellectualAgreement:'AI Learning Forum Intellectual Property Protection Agreement',
+    pleaseAgreeAgreement:'Please agree to the agreement',
+    pleaseInputAmount:'Please input amount',
+    pleaseUploadVoucher:'Please upload payment voucher',
   }
 }

src/locales/zh-CN.js

@@ -121,6 +121,9 @@ export default {
     bankTransferSuccess:"凭证已上传成功，等待客服确认",
     submitSuccess:"提交成功",
     qingxuanze:'请选择',
+    registeredNum:"已报名人数",
+    remainingTime:"剩余时间",
+    readAndAgree:"我已阅读并同意",
   },
   login: {
     smsLogin: '验证码登录',
@@ -145,7 +148,7 @@ export default {
     home: '首页',
     gongzuoliu_trade_add: '发布工作流需求',
     WorkflowDetail: '工作流详情',
-    learning_system: '学习教程系统',
+    learning_system: '学习教程',
     recharge: '充值',
     mibiShop: '米币商城',
 
@@ -215,6 +218,7 @@ export default {
     publishRules:"发布规则",
     pleaseInputRightBudgetLowerLimit:"请输入正确的预算下限（最多两位小数）",
     pleaseInputRightBudgetUpperLimit:"请输入正确的预算上限（最多两位小数）",
+    publishDemandNum:"发布需求数",
   },
   personalCenter:{
     personalCenter: '个人中心',
@@ -291,6 +295,22 @@ export default {
     fenpeimibi:'分配米币',
     qsryfpdmbsl:'请输入要分配的米币数量',
     lookVoucher:'查看凭证'
+  },
+  orderConfirm:{
+    personalPay:'个人支付',
+    companyPay:'对公支付',
+    alipayPay:'支付宝支付',
+    wechatPay:'微信支付',
+    unionPay:'银联支付',
+    paypalPay:'PayPal支付',
+    payVoucher:'付款凭证',
+    totalPrice:'总价',
+    payAmount:'需付金额',
+    serviceAgreement:'AI学习论坛服务协议',
+    IntellectualAgreement:'AI学习论坛知识产权保护协议',
+    pleaseAgreeAgreement:'请先同意协议',
+    pleaseInputAmount:'请输入金额',
+    pleaseUploadVoucher:'请上传转账凭证',
   }
 
 }

src/pages/LearningSystem/LearningSystem.vue

@@ -114,7 +114,7 @@
               <div class="flex-center-between mt10">
                 <div class="gap5">
                   <img :src="viewIcon" alt="" style="width:16px;height:16px">
-                  <div>{{item.viewCount}}{{ $t('common.renkanguo') }}</div>
+                  <div>{{item.viewCount}} {{ $t('common.renkanguo') }}</div>
                 </div>
                 <div class="gap5 gradient border_radius_4 cursor-pointer xuexi" @click.stop.prevent="goDetail(item)">
                   <img :src="playIcon" alt="" style="width:13px;height:15px">
@@ -280,7 +280,7 @@
 .LearningSystem {
   .typeList{
     padding: 20px 0;
-    height: 71.75px;
+    height: 70px;
     overflow: hidden;
     &.isShow{
       height: auto;
@@ -294,7 +294,7 @@
       white-space: nowrap;
     }
     .typeItem{
-      margin: 0 8px;
+      margin: 4px 8px;
       cursor: pointer;
       padding: 4px 8px;
       &.active{

src/pages/order/orderConfirm.vue

@@ -37,11 +37,11 @@
               <div class="flex-column">
                 <div class="gap10 cursor-pointer" @click="orderInfo.orderType = 'bm_recharge';handleOrderAmtChange()">
                   <div class="checkType" :class="{'active': orderInfo.orderType === 'bm_recharge'}"></div>
-                  <div class="font_size16">充值{{$t('common.baomibi')}}</div>
+                  <div class="font_size16">{{$t('route.recharge')}}{{$t('common.baomibi')}}</div>
                 </div>
                 <div class="gap10 cursor-pointer mt20" @click="orderInfo.orderType = 'm_recharge';handleOrderAmtChange()">
                   <div class="checkType" :class="{'active': orderInfo.orderType === 'm_recharge'}"></div>
-                  <div class="font_size16">充值{{$t('common.mibi')}}</div>
+                  <div class="font_size16">{{$t('route.recharge')}}{{$t('common.mibi')}}</div>
                 </div>
               </div>
 
@@ -69,11 +69,11 @@
       <div class="gap10 mt20">
         <div class="gap10 cursor-pointer" @click="payType = 1;pageRedirectionData='';orderInfo.payMethod = 'alipay'">
           <div class="checkType" :class="{'active': payType === 1}"></div>
-          <div class="font_size16">个人支付</div>
+          <div class="font_size16">{{$t('orderConfirm.personalPay')}}</div>
         </div>
         <div class="gap10 cursor-pointer" @click="payType = 2;orderInfo.payMethod = 'bank_transfer';pageRedirectionData='';payConfigDearchFn();">
           <div class="checkType" :class="{'active': payType === 2}"></div>
-          <div class="font_size16">对公支付</div>
+          <div class="font_size16">{{$t('orderConfirm.companyPay')}}</div>
         </div>
       </div>
       <!-- 个人支付 -->
@@ -84,28 +84,28 @@
           @click="orderInfo.payMethod = 'alipay';pageRedirectionData=''">
             <div class="checkType"></div>
             <img :src="zhifubaoIcon" alt="" style="width: 40px; height: 40px;">
-            <div class="font_size16">支付宝支付</div>
+            <div class="font_size16">{{$t('orderConfirm.alipayPay')}}</div>
           </div>
           <div class="payway flex_1 gap5" 
           :class="{'active': orderInfo.payMethod === 'wechat_pay'}" 
           @click="orderInfo.payMethod = 'wechat_pay';pageRedirectionData=''">
             <div class="checkType"></div>
             <img :src="weixinIcon" alt="" style="width: 40px; height: 40px;">
-            <div class="font_size16">微信支付</div>
+            <div class="font_size16">{{$t('orderConfirm.wechatPay')}}</div>
           </div>
           <div class="payway flex_1 gap5" 
           :class="{'active': orderInfo.payMethod === 'union_pay'}" 
           @click="orderInfo.payMethod = 'union_pay';pageRedirectionData=''">
             <div class="checkType"></div>
             <img :src="yinlianIcon" alt="" style="width: 40px; height: 40px;">
-            <div class="font_size16">银联支付</div>
+            <div class="font_size16">{{$t('orderConfirm.unionPay')}}</div>
           </div>
           <div class="payway flex_1 gap5" 
           :class="{'active': orderInfo.payMethod === 'paypal'}" 
           @click="orderInfo.payMethod = 'paypal';pageRedirectionData=''">
             <div class="checkType"></div>
             <img :src="paypalIcon" alt="" style="width: 40px; height: 40px;">
-            <div class="font_size16">PayPal支付</div>
+            <div class="font_size16">{{$t('orderConfirm.paypalPay')}}</div>
           </div>
         </div>
         <!-- <div class="mt20">
@@ -124,7 +124,7 @@
             {{item.configName}}：{{item.configValue}}</div>
         </div>
         <div class="mt20">
-          <div class="bold font_size18"> <span class="color_required">*</span> 付款凭证</div>
+          <div class="bold font_size18"> <span class="color_required">*</span> {{$t('orderConfirm.payVoucher')}}</div>
           <div class="mt20">
             <FileUploader
                 ref="fileUploader"
@@ -142,11 +142,11 @@
         </div>
       </div>
       <div class="mt20 flex-center-between" style="width: 300px;">
-        <div class="font_size18">总价：</div>
+        <div class="font_size18">{{$t('orderConfirm.totalPrice')}}：</div>
         <div class="font_size16 bold">￥{{orderInfo.orderAmt}}</div>
       </div>
       <div class="mt20 flex-center-between" style="width: 300px;">
-        <div class="font_size18">需付金额：</div>
+        <div class="font_size18">{{$t('orderConfirm.payAmount')}}：</div>
         <div class="font_size24 bold color_price">￥{{orderInfo.orderAmt}}</div>
       </div>
       <div style="display: inline-block;" class="mt20" @click="payNowFn" v-loading="loading">
@@ -192,7 +192,7 @@
       <!-- <div class="mt20 font_size14">录播和体验课课程属于虚拟商品，购买后无特殊原因，不支持退款</div> -->
       <div class="mt20 gap10 cursor-pointer" @click="agreement = !agreement">
         <div class="checkType" :class="{'active': agreement}"></div>
-        我已阅读并同意 <span class="color_theme bold">《AI学习论坛服务协议》</span> 和 <span class="color_theme bold">《AI学习论坛知识产权保护协议》</span>
+        {{$t('common.readAndAgree')}} <span class="color_theme bold">《{{$t('orderConfirm.serviceAgreement')}}》</span> 和 <span class="color_theme bold">《{{$t('orderConfirm.IntellectualAgreement')}}》</span>
       </div>
     </div>
   </div>
@@ -259,16 +259,16 @@ onBeforeUnmount(() => {
 // 立即支付
 const payNowFn = () => {
   if(!agreement.value){
-    DGTMessage.warning('请先同意协议')
+    DGTMessage.warning(t('orderConfirm.pleaseAgreeAgreement'))
     return
   }
   if(orderInfo.orderAmt <= 0){
-    DGTMessage.warning('请输入金额')
+    DGTMessage.warning(t('orderConfirm.pleaseInputAmount'))
     return
   }
   orderInfo.transferProof = images.value.map(item => item.url).join(',');
   if(orderInfo.transferProof === '' && orderInfo.payMethod === 'bank_transfer'){
-    DGTMessage.warning('请上传转账凭证')
+    DGTMessage.warning(t('orderConfirm.pleaseUploadVoucher'))
     return
   }
   loading.value = true;

src/pages/workflowTrade/workflowTradeDetail.vue

@@ -21,7 +21,7 @@
               </div>
               <div class="gap5">
                 <img :src="riliIcon" alt="员工" style="width: 16px; height: 16px;">
-                <span class="font_size14">报名截止时间：{{ruleForm.deadline}}</span>
+                <span class="font_size14">{{$t('common.signUpDeadline')}}：{{ruleForm.deadline}}</span>
               </div>
             </div>
           </div>
@@ -29,39 +29,39 @@
         <div class="padding16 bg_color_fff border_radius_16 mt20 box_shadow_card">
           <div class="gap10">
             <div class="line_vertical"></div>
-            <div class="font_size20 bold">需求背景</div>
+            <div class="font_size20 bold">{{$t('workflowTradeAdd.background')}}</div>
           </div>
           <div class="gray font_size14 mt10">
             {{ruleForm.background}}
           </div>
           <div class="gap10 mt10">
             <div class="line_vertical"></div>
-            <div class="font_size20 bold">具体要求</div>
+            <div class="font_size20 bold">{{$t('workflowTradeAdd.requirements')}}</div>
           </div>
           <div class="gray font_size14 mt10">
             {{ruleForm.requirements}}
           </div>
           <div class="gap10 mt10">
             <div class="line_vertical"></div>
-            <div class="font_size20 bold">联系方式</div>
+            <div class="font_size20 bold">{{$t('workflowTradeAdd.contactInfo')}}</div>
           </div>
           <div class="contactInfo_bg mt10 padding16 flex-center-between">
             <div class="flex_1 flex-center">
               <div class="gap10">
                 <img :src="dianhuaIcon" alt="员工" style="width: 24px; height: 24px;">
-                <div class="font_size16">电话：{{ruleForm.phone}}</div>
+                <div class="font_size16">{{$t('workflowTradeAdd.phoneNumber')}}：{{ruleForm.phone}}</div>
               </div>
             </div>
             <div class="flex_1 flex-center">
               <div class="gap10">
                 <img :src="weixinIcon" alt="员工" style="width: 24px; height: 24px;">
-                <div class="font_size16">微信：{{ruleForm.wechat}}</div>
+                <div class="font_size16">{{$t('workflowTradeAdd.wechat')}}：{{ruleForm.wechat}}</div>
               </div>
             </div>
             <div class="flex_1 flex-center">
               <div class="gap10">
                 <img :src="youxiangIcon" alt="员工" style="width: 24px; height: 24px;">
-                <div class="font_size16">邮箱：{{ruleForm.email}}</div>
+                <div class="font_size16">{{$t('workflowTradeAdd.email')}}：{{ruleForm.email}}</div>
               </div>
             </div>
           </div>
@@ -76,30 +76,30 @@
           <div class="totalInfo mt20 flex-center-between contactInfo_bg">
             <div class="flex-column-center flex_1 border_right">
               <div class="font_size24 bold">{{ruleForm.questCount}}</div>
-              <div class="font_size14 mt10">发布需求数</div>
+              <div class="font_size14 mt10">{{$t('workflowTradeAdd.publishDemandNum')}}</div>
             </div>
             <div class="flex-column-center flex_1">
               <div class="font_size24 bold">{{ruleForm.publishCount}}</div>
-              <div class="font_size14 mt10">创建工作流</div>
+              <div class="font_size14 mt10">{{$t('common.chuangjiangongzuoliu')}}</div>
             </div>
           </div>
         </div>
         <div class="padding16 bg_color_fff border_radius_16 mt20 box_shadow_card">
           <div class="gap10">
             <div class="line_vertical"></div>
-            <div class="font_size20 bold">已报名人数</div>
+            <div class="font_size20 bold">{{$t('common.registeredNum')}}</div>
           </div>
           <div class="flex-center-between mt10">
             <div class="gap10">
               <img :src="yuangong" alt="员工" style="width: 20px; height: 20px;">
-              <span class="font_size16">已报名人数</span>
+              <span class="font_size16">{{$t('common.registeredNum')}}</span>
             </div>
             <div class="font_size16 bold">{{ruleForm.questApplyCount}}人</div>
           </div>
           <div class="flex-center-between mt10">
             <div class="gap10">
               <img :src="riliIcon" alt="员工" style="width: 20px; height: 20px;">
-              <span class="font_size16">剩余时间</span>
+              <span class="font_size16">{{$t('common.remainingTime')}}</span>
             </div>
             <div class="font_size16 bold color_price">
               {{formatDeadline(ruleForm.deadline).diffDays}}
@@ -143,8 +143,8 @@
   const appStore = useAppStore()
 
   const applyStatusInfo = {
-    '1': '报名中',
-    '2': '已结束',
+    '1': t('workflowTrade.demandStatusSignUping'),
+    '2': t('workflowTrade.demandStatusEnded'),
   }
 
   //获取参数
@@ -169,7 +169,7 @@
    getQuestDetailFn();
   });
   const getQuestDetailFn = async () => {
-     getQuestDetail({questId: questId.value}).then(res => {
+     getQuestDetail({id: questId.value}).then(res => {
       if(res.code === 200){
         console.log(res)
         ruleForm.value = res.data || {};