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

src/locales/en.js

@@ -17,7 +17,7 @@ export default {
     hour: 'Hour',
     lijixuexi: 'Learn Now',
     renkanguo: 'People Have Seen',
-    renbaoming: 'People Registered',
+    renbaoming: ' People Registered',
     qitakechengtuijian: 'Other Course Recommendations',
     kechengjieshao: 'Course Description',
     kechengmulu: 'Course Directory',
@@ -362,7 +362,7 @@ export default {
     jujueliyou:'reason for rejection',
     sfscggzl:'Whether to delete the workflow?',
     sfqxbm:'Whether to cancel the sign up?',
-    zdfp:'The monthly MiCoin package for members can be allocated to your employees, and the remaining amount will be credited to your account each month.',
+    zdfp:'The monthly MiBi package for members can be allocated to your employees, and the remaining amount will be credited to your account each month.',
     qydbtyzhxy:'Please read and agree to the conversion agreement',
     qydbty:'Please read and agree',
     zhxy:'Conversion Agreement',

src/pages/Personal/Demand.vue

@@ -8,7 +8,8 @@
               <div class="flex-align-center">
                 <div v-if="form.activeName == 1" class="tag"
                   :class="{ 'tag_red': item.applyStatus == 2 || item.applyStatus == null }">{{
-                    item.applyStatus == 1 ? $t('workflowTrade.demandStatusSignUping') : $t('workflowTrade.demandStatusEnded') }}</div>
+                    item.applyStatus == 1 ? $t('workflowTrade.demandStatusSignUping') :
+                      $t('workflowTrade.demandStatusEnded') }}</div>
                 <div class="title">{{ item.title }}</div>
               </div>
               <div class="price" v-if="item.budgetMin || item.budgetMax">￥{{ item.budgetMin }}-{{ item.budgetMax }}
@@ -83,7 +84,8 @@
         <div class="detail-top">
           <div class="flex-center-between">
             <div class="flex-align-center">
-              <div class="tag" :class="{ 'tag_red': itemData.applyStatus == '2' }">{{ itemData.applyStatus == 1 ? $t('workflowTrade.demandStatusSignUping')
+              <div class="tag" :class="{ 'tag_red': itemData.applyStatus == '2' }">{{ itemData.applyStatus == 1 ?
+                $t('workflowTrade.demandStatusSignUping')
                 :
                 $t('workflowTrade.demandStatusEnded')
               }}</div>
@@ -96,16 +98,16 @@
               <!-- <el-button type="primary" size="small" plain>一级分类名称</el-button> -->
               <el-button type="primary" size="small" plain>{{ itemData.categoryName3 }}</el-button>
             </div>
-            <ul class="flex-align-center list">
-              <div class="li">
+            <div class="flex-align-center list">
+              <div class="lis">
                 <img src="/src/assets/imgs/yuangong.png" alt="">
                 <div class="">{{ itemData.questApplyCount || 0 }}{{ $t('common.renbaoming') }}</div>
               </div>
-              <div class="li">
+              <div class="lis">
                 <img src="/src/assets/imgs/rili.png" alt="">
                 <div class="">{{ $t('common.signUpDeadline') }}：{{ itemData.deadline }}</div>
               </div>
-            </ul>
+            </div>
           </div>
           <div class="desc">{{ itemData.requirements }}
           </div>
@@ -114,13 +116,14 @@
         <div class="detail-txt">{{ $t('personalCenter.baomiliang') }}（{{ itemData.questApplyCount || 0 }} {{
           $t('personalCenter.ren') }}）</div>
         <div class="detail-list">
-          <div v-for="(item, index) in recordList" :key="index" class="li">
+          <div v-for="(item, index) in recordList" :key="index" class="li" :class="{'success':item.applyStatus == 1,'failure':item.applyStatus == 2}">
             <div class="flex-align-center detail-list-left">
               <el-avatar :size="20" :src="item.userAvatar" />
               <div class="">{{ item.applyUserName }}</div>
               <div class="">{{ item.userPhone }}</div>
             </div>
-            <div class="detail-list-number">{{ $t('personalCenter.gongzuoliuliang') }}：{{ item.publishCount }}</div>
+            <div class="flex_1 flex-between">
+              <div class="detail-list-number">{{ $t('personalCenter.gongzuoliuliang') }}：{{ item.publishCount }}</div>
             <div class="flex-align-center detail-list-right">
               <template v-if="item.applyStatus == 0">
                 <div @click.stop="changeDemand(item, index, 1)" class="lex-align-center btn green">
@@ -132,12 +135,12 @@
                   <div class="">{{ $t('common.reject') }}</div>
                 </div>
               </template>
-
               <!-- <div @click="changeDemand(item, index, 3)" class="lex-align-center btn blue">
                 <img src="/src/assets/imgs/my/jilu@2x.png" alt="">
                 <div class="">{{ $t('common.viewHomepage') }}</div>
               </div> -->
             </div>
+            </div>
           </div>
         </div>
       </div>
@@ -210,7 +213,11 @@ const changeDemand = async (item, index, applyStatus) => {
     })
     if (res.code === 200) {
       DGTMessage.success(`${t('common.success')}`)
-      dialogVisible.value = false;
+      // dialogVisible.value = false;
+      let result = await appliList({ questId: item.questId });
+      if (result.code === 200) {
+        recordList.value = result.rows;
+      }
     }
   }
 
@@ -221,8 +228,10 @@ const changeItem = async (item, index, type) => {
   if (type == 0) {
 
     let res = await appliList({ questId: item.questId })
-    recordList.value = res.rows;
-    dialogVisible.value = true;
+    if (res.code === 200) {
+      recordList.value = res.rows;
+      dialogVisible.value = true;
+    }
   } else if (type == 1) {
     router.push({ path: `/workflow-trade/workflow-trade-add`, query: { id: item.questId } });
   } else if (type == 2) {
@@ -230,7 +239,7 @@ const changeItem = async (item, index, type) => {
       t('personalCenter.jieshuxuqiu') + '?',
       t('common.warning'),
       {
-         confirmButtonText: t('common.confirm'),
+        confirmButtonText: t('common.confirm'),
         cancelButtonText: t('common.cancel'),
         type: 'warning',
       }
@@ -252,7 +261,7 @@ const changeItem = async (item, index, type) => {
       t('personalCenter.shifoushanchu'),
       t('common.warning'),
       {
-         confirmButtonText: t('common.confirm'),
+        confirmButtonText: t('common.confirm'),
         cancelButtonText: t('common.cancel'),
         type: 'warning',
       }
@@ -273,7 +282,7 @@ const changeItem = async (item, index, type) => {
       t('personalCenter.sfqxbm'),
       t('common.warning'),
       {
-         confirmButtonText: t('common.confirm'),
+        confirmButtonText: t('common.confirm'),
         cancelButtonText: t('common.cancel'),
         type: 'warning',
       }
@@ -533,6 +542,7 @@ onMounted(() => {
       }
 
       .detail-list-left {
+        width: 40%;
         div {
           color: #666666;
           font-size: 14px;
@@ -599,6 +609,14 @@ onMounted(() => {
         }
       }
     }
+
+    .success {
+      background: #E9F7EF;
+    }
+
+    .failure {
+      background: #FCEBEB;
+    }
   }
 }
 </style>

src/pages/Personal/Orders.vue

@@ -41,8 +41,9 @@
                   </div>
 
                   <div class="flex-center-flex-end" style="width: 300px;">
+                     <el-tag style="margin-right: 16px;" :type=" item.shipStatus == 0 ? 'primary' : 'shipStatus'" v-if="item.orderType == 'mi_mall'">{{ item.shipStatusName }}</el-tag>
                     <template v-if="item.invoiceStatus == 0 && item.orderStatus == 1">
-                      <el-tag style="margin-right: 16px;" :type=" item.shipStatus == 0 ? 'primary' : 'shipStatus'" v-if="item.orderType == 'mi_mall'">{{ item.shipStatusName }}</el-tag>
+                     
                       <div @click.stop="applyInvoices(item, index)" class="blue btn">
                         <img src="/src/assets/imgs/my/order3@2x.png" alt="">
                         <div class="">{{ $t('common.applyInvoice') }}</div>
@@ -61,7 +62,7 @@
                         item.transferSug
                         }}</el-text>
                     </div>
-                    <div class="btn_kong" v-else></div>
+                    <!-- <div class="btn_kong" v-else></div> -->
                     <template v-if="false">
                       <template v-if="index == 0">
                         <div class="gradient btn">
@@ -219,7 +220,7 @@ const tabs = ref([
   { label: 'personalCenter.allOrders', name: '' },
   { label: 'personalCenter.daifukuan', name: 0 },
   { label: 'personalCenter.yiwancheng', name: 1 },
-  { label: 'personalCenter.yiquxiao', name: 2 },
+  // { label: 'personalCenter.yiquxiao', name: 2 },
 ])
 
 const list = ref([]);

src/pages/Personal/Wallet.vue

@@ -467,7 +467,7 @@ const getList = async () => {
 
 const handlePageChange = (newPage: number) => {
   // list.value = []
-  form.value.pageNum = page;
+  form.value.pageNum = newPage;
   getList()
 }
 // 获取用户信息

src/pages/PersonalCenter.vue

@@ -1078,10 +1078,6 @@ div {
   background: #F5F7FA;
   border-radius: 4px;
   border: 1px solid #F2F6FC;
-
-  :deep(.el-input__wrapper) {
-    // background-color: transparent;
-  }
 }
 
 .workOrder-dot {