.

src/pages/Personal/Demand.vue

@@ -2,32 +2,34 @@
   <div class="demand">
     <el-tabs v-model="form.activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane v-for="tab in tabs" :key="tab.name" :label="$t(tab.label)" :name="tab.name">
-        <ul class="demand-list">
-          <li v-for="(item, index) in list" :key="index">
+        <div class="demand-list">
+          <div v-for="(item, index) in list" :key="index" @click="toDetail(item)" class="li">
             <div class="flex-center-between">
               <div class="flex-align-center">
-                <div v-if="form.activeName == 1" class="tag" :class="{ 'tag_red': item.applyStatus == 2 }">{{
-                  item.applyStatus == 1 ? '报名中' : '已结束' }}{{ item.applyStatus }}</div>
+                <div v-if="form.activeName == 1" class="tag"
+                  :class="{ 'tag_red': item.applyStatus == 2 || item.applyStatus == null }">{{
+                    item.applyStatus == 1 ? '报名中' : '已结束' }}</div>
                 <div class="title">{{ item.title }}</div>
               </div>
-              <div class="price">￥{{ item.budgetMin }}-{{ item.budgetMax }}</div>
+              <div class="price" v-if="item.budgetMin || item.budgetMax">￥{{ item.budgetMin }}-{{ item.budgetMax }}
+              </div>
             </div>
-            <div class="flex-align-center content">
+            <div class="flex-align-center content" v-if="item.categoryName3">
               <div class="flex-align-center">
                 <!-- <el-button type="primary" size="small" plain>{{ item.categoryName1 }}</el-button> -->
                 <!-- <el-button type="primary" size="small" plain>{{ item.categoryName2 }}</el-button> -->
                 <el-button type="primary" size="small" plain>{{ item.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="">{{ item.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') }}：{{ item.deadline }}</div>
                 </div>
-              </ul>
+              </div>
             </div>
             <div class="description">{{ item.requirements }}</div>
             <div class="info">
@@ -66,8 +68,8 @@
 
               </div>
             </div>
-          </li>
-        </ul>
+          </div>
+        </div>
       </el-tab-pane>
     </el-tabs>
     <template v-if="list.length">
@@ -246,7 +248,7 @@ const changeItem = async (item, index, type) => {
   } else if (type == 3) {
     ElMessageBox.confirm(
       t('personalCenter.shifoushanchu'),
-       t('common.warning'),
+      t('common.warning'),
       {
         confirmButtonText: 'OK',
         cancelButtonText: t('common.cancel'),
@@ -287,6 +289,15 @@ const changeItem = async (item, index, type) => {
   }
 }
 
+const toDetail = (item) => {
+  router.push({
+    path: `/workflow-trade/workflow-trade-detail`,
+    query: {
+      id: null
+    }
+  })
+}
+
 const handleClick = (tab: TabsPaneContext) => {
   list.value = []
   form.value.pageNum = 1;
@@ -315,10 +326,6 @@ onMounted(() => {
 
 </script>
 <style scoped lang="scss">
-  ul,li {
-    margin: 0;
-    padding: 0;
-  }
 .demand {
   padding-bottom: 20px;
 
@@ -327,7 +334,7 @@ onMounted(() => {
   }
 
   .demand-list {
-    li {
+    .li {
       padding: 16px;
       margin-bottom: 16px;
       background: #F5F7FA;
@@ -428,7 +435,7 @@ onMounted(() => {
   margin-top: 8px;
 
   .list {
-    .li {
+    .lis {
       display: flex;
       align-items: center;
 

src/pages/Personal/Orders.vue

@@ -32,7 +32,7 @@
                 <div class="order-list-con flex-center-between flex_1">
 
                   <div class="mi_price">
-                    <div class="">X{{ item.orderNum }}</div>
+                    <div class="">x{{ item.orderNum }}</div>
                     <div class="">数量</div>
                   </div>
                   <div class="mi_price price">

src/pages/PersonalCenter.vue

@@ -60,7 +60,7 @@
             <div class="btn">
               <el-button type="primary" @click="router.push({
                 path: `/order-confirm`,
-              })">充值</el-button>
+              })">{{ $t('route.recharge') }}</el-button>
             </div>
 
 
@@ -222,10 +222,10 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="n8n初始密码">
-              <el-input v-model="userInfo.name" :placeholder="$t('common.placeholderInput')" class="inputStyle"
+              <el-input v-model="userInfo.userPhone" :placeholder="$t('common.placeholderInput')" class="inputStyle"
                 :input-style="{
                   backgroundColor: 'transparent',
-                }" disabled />
+                }" readonly type="password" show-password />
             </el-form-item>
           </el-col>
 
@@ -249,7 +249,7 @@
               <el-input v-model="userInfo.name" :placeholder="$t('common.placeholderInput')" class="inputStyle"
                 :input-style="{
                   backgroundColor: 'transparent',
-                }" disabled />
+                }" readonly type="password" show-password />
             </el-form-item>
           </el-col>
         </el-row>
@@ -271,7 +271,7 @@
               <el-input v-model="userInfo.name" :placeholder="$t('common.placeholderInput')" class="inputStyle"
                 :input-style="{
                   backgroundColor: 'transparent',
-                }" disabled />
+                }" readonly type="password" show-password />
             </el-form-item>
           </el-col>
         </el-row>
@@ -294,7 +294,7 @@
               <el-input v-model="userInfo.name" :placeholder="$t('common.placeholderInput')" class="inputStyle"
                 :input-style="{
                   backgroundColor: 'transparent',
-                }" disabled />
+                }" readonly type="password" show-password />
             </el-form-item>
           </el-col>
         </el-row>
@@ -729,6 +729,7 @@ div {
 
   .personal-head-box {
     flex: 1;
+    margin-left: 16px;
   }
 
   .personal-head-top {
@@ -776,7 +777,7 @@ div {
     display: flex;
 
     .personal-user-info {
-      margin-left: 16px;
+      
 
       .personal-username {
         display: flex;