Przeglądaj źródła

Merge branch 'dev-majunjie' into dev

ccf 4 lat temu
rodzic
commit
b5ce4c7421

+ 15 - 6
pages/frontend/developer/developData.js

@@ -72,9 +72,11 @@ export default class DealSeoData {
             // let info = {...res.data}
             // let login = {...res.data}
 
+            userInfo['uid'] = login.uid;
             userInfo['realname_re'] = info.realname_re;
             userInfo['realname_verify_status'] = info.realname_verify_status;
             userInfo['dynamic_rand'] = info.dynamic_rand
+            userInfo['rand_score'] = parseInt(info.rand_score)
             userInfo['is_open_mall'] = info.is_open_mall
             userInfo['is_open_kill'] = info.is_open_kill
             userInfo['is_open_consult'] = info.is_open_consult
@@ -82,8 +84,9 @@ export default class DealSeoData {
 
             userInfo['nickname'] = login.nickname
             userInfo['icon_url'] = login.icon_url
-            userInfo['freework_level'] = login.freework_level
-            
+            userInfo['freework_level'] = info.freework_level
+
+
         } else if (Number(res.status) === 40001) {
             this.isExist = false
         }
@@ -98,13 +101,13 @@ export default class DealSeoData {
 
         if (Number(res.status) === 1) {
             let info = res.data
-            //账户余额	
+            //账户余额
             balanceInfo['totalBalance'] = info['totalBalance']
-            //总收入		
+            //总收入
             balanceInfo['historyTotalBalance'] = info['historyTotalBalance']
-            //冻结余额		
+            //冻结余额
             balanceInfo['frozenBalance'] = info['frozenBalance']
-            //薪资余额			
+            //薪资余额
             balanceInfo['gongMallBalance'] = info['gongMallBalance']
 
         } else if (Number(res.status) === 40001) {
@@ -173,6 +176,12 @@ export default class DealSeoData {
             let info = res.data
 
             typeList = [...info]
+            typeList.unshift({
+                "typeId": 0,
+                "name": "推荐",
+                // "icon": "https://filescdn.proginn.com/test/community/666700/20220228/pTZku6d4C1.png",
+                "num": "0"
+            })
         } else if (Number(res.status) === 40001) {
             this.isExist = false
         }

+ 3 - 3
pages/frontend/developer/index.vue

@@ -60,7 +60,7 @@
             <section class="developer-order block" v-else>
                 <h3 class="title">新人如何接单</h3>
                 <p class="tips">
-                    客栈接单采用智能对接池匹配原则,权重越高优先匹配。当前在“前端”对接池的<span style="color: #308eff;font-weight: bold;">排名100</span>,影响对接池的因素有以下几点:
+                    客栈接单采用智能对接池匹配原则,权重越高优先匹配。当前在“前端”对接池的<span style="color: #308eff;font-weight: bold;">排名{{ userInfo.rand_score || "100+" }}</span>,影响对接池的因素有以下几点:
                 </p>
                 <div class="developer-order-list">
                     <article class="developer-order-item">
@@ -70,7 +70,7 @@
                                 <h5 class="developer-order-title">完善个人资料</h5>
                             </div>
                             <div class="developer-order-link">
-                                <a href="/setting/work">立即完善</a>
+                                <a :href="'/wo/'+userinfo.uid">立即完善</a>
                             </div>
                         </div>
                         <p class="developer-order-tips">
@@ -243,7 +243,7 @@
                             {{ userInfo.nickname }}
                         </div>
                         <div class="developer-user-level">
-                            当前等级Lv.{{ userInfo.freework_level || 0 }} <span class="arrow_icon"></span>
+                            当前等级Lv.{{ userInfo.dynamic_rand || 0 }} <span class="arrow_icon"></span>
                         </div>
                     </div>
                 </div>

+ 5 - 5
pages/frontend/requirements/components/Form_recommend.vue

@@ -15,7 +15,7 @@
                         </div>
                         <div class="worder-info">
                             <p class="recommend-worder-name text-line-1">{{user.nickname}}</p>
-                            <p class="recommend-worder-detail">日薪:{{user.work_price}} | <a :href="'/wo/'+user.uid">查看简历</a></p>
+                            <p class="recommend-worder-detail">日薪:{{user.work_price}} | <a target="_blank"  :href="'/wo/'+user.uid">查看简历</a></p>
                         </div>
                     </div>
                     <div class="recommend-choice-btn-area">
@@ -35,7 +35,7 @@
                         </div>
                         <div class="worder-info">
                             <p class="recommend-worder-name text-line-1">{{user.nickname}}</p>
-                            <p class="recommend-worder-detail">日薪:{{user.work_price}} | <a :href="'/wo/'+user.uid">查看简历</a></p>
+                            <p class="recommend-worder-detail">日薪:{{user.work_price}} | <a target="_blank"  :href="'/wo/'+user.uid">查看简历</a></p>
                         </div>
                     </div>
                     <div class="recommend-choice-btn-area">
@@ -54,7 +54,7 @@
                         </div>
                         <div class="worder-info">
                             <p class="recommend-worder-name text-line-1">{{user.nickname}}</p>
-                            <p class="recommend-worder-detail">日薪:{{user.work_price}} | <a :href="'/wo/'+user.uid">查看简历</a></p>
+                            <p class="recommend-worder-detail">日薪:{{user.work_price}} | <a target="_blank" :href="'/wo/'+user.uid">查看简历</a></p>
                         </div>
                     </div>
                     <div class="recommend-choice-btn-area">
@@ -84,9 +84,9 @@
             </div>
             <div class="recommend-submit">
                 <div class="recommend-submit-btn" @click="submit">确认选择</div>
-                <div class="recommend-submit-btn pass">
+                <div @click="close" class="recommend-submit-btn pass">
                     <span>跳过选择</span>
-                    <span @click="close" class="recommend-submit-btn-tips">客户经理为您选择</span>
+                    <span  class="recommend-submit-btn-tips">客户经理为您选择</span>
                 </div>
             </div>
         </div>

+ 1 - 1
pages/frontend/requirements/components/Form_yunduan.vue

@@ -210,7 +210,7 @@ export default {
                     trigger: "blur"
                 }],
                 skills: [{
-                    required: true,
+                    required: false,
                     message: "请选择核心技能标签",
                     trigger: "blur"
                 }],