martin.ma 4 年 前
コミット
030b0f4d6c

+ 3 - 3
assets/css/developer/index.scss

@@ -428,10 +428,9 @@
   color: #828c99;
   line-height: 18px;
   margin-bottom: 10px;
-  span {
+  span.num {
     margin-left: 6px;
     font-size: 16px;
-
     font-weight: 400;
     color: #0b121a;
     line-height: 22px;
@@ -686,6 +685,7 @@
   background: #f7f8fa;
   align-items: center;
   margin-top: 10px;
+  cursor: pointer;
 }
 
 .dynamic-link-img-area {
@@ -696,7 +696,7 @@
 }
 
 .dynamic-link-content {
-  a {
+  a,span {
     font-size: 14px;
 
     font-weight: 400;

+ 67 - 48
pages/frontend/developer/index.vue

@@ -17,7 +17,7 @@
                         <div class="developer-process-tips">成为客栈注册用户</div>
                     </article>
 
-                    <article class="developer-process-item" :class="isRealName ? '' : ''">
+                    <article class="developer-process-item" :class="isRealName ? 'cur' : ''">
                         <div class="developer-process-step normal line">
                             <div class="developer-process-step-icon icon-2" :class="isRealName ? 'icon-1' : 'icon-2'"></div>
                             <div class="developer-process-step-content">实名认证</div>
@@ -34,7 +34,7 @@
                         </div>
                     </article>
 
-                    <article class="developer-process-item" :class="isSign ? '' : ''">
+                    <article class="developer-process-item" :class="isSign ? 'cur' : ''">
                         <div class="developer-process-step normal line">
                             <div class="developer-process-step-icon icon-3"></div>
                             <div class="developer-process-step-content">签约开发者</div>
@@ -50,7 +50,7 @@
                             <div class="developer-process-step-icon icon-4"></div>
                             <div class="developer-process-step-content">开始接单</div>
                         </div>
-<!--                        <div class="developer-process-tips">内容已通过</div>-->
+                        <!--                        <div class="developer-process-tips">内容已通过</div>-->
                     </article>
                 </div>
             </section>
@@ -60,15 +60,15 @@
             <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;">排名100</span>,影响对接池的因素有以下几点:
                 </p>
                 <div class="developer-order-list">
                     <article class="developer-order-item">
                         <div class="developer-order-title-area">
-                          <div class="developer-order-title-area-wrap">
-                            <div class="developer-order-icon icon-1"></div>
-                            <h5 class="developer-order-title">完善个人资料</h5>
-                          </div>
+                            <div class="developer-order-title-area-wrap">
+                                <div class="developer-order-icon icon-1"></div>
+                                <h5 class="developer-order-title">完善个人资料</h5>
+                            </div>
                             <div class="developer-order-link">
                                 <a href="/setting/work">立即完善</a>
                             </div>
@@ -79,10 +79,10 @@
                     </article>
                     <article class="developer-order-item">
                         <div class="developer-order-title-area">
-                          <div class="developer-order-title-area-wrap">
-                            <div class="developer-order-icon icon-2"></div>
-                            <h5 class="developer-order-title">技术等级认证</h5>
-                          </div>
+                            <div class="developer-order-title-area-wrap">
+                                <div class="developer-order-icon icon-2"></div>
+                                <h5 class="developer-order-title">技术等级认证</h5>
+                            </div>
                             <div class="developer-order-link">
                                 <a href="/frontend/skill_cert/profile">立即认证</a>
                             </div>
@@ -93,10 +93,10 @@
                     </article>
                     <article class="developer-order-item">
                         <div class="developer-order-title-area">
-                          <div class="developer-order-title-area-wrap">
-                            <div class="developer-order-icon icon-3"></div>
-                            <h5 class="developer-order-title">Ping一下</h5>
-                          </div>
+                            <div class="developer-order-title-area-wrap">
+                                <div class="developer-order-icon icon-3"></div>
+                                <h5 class="developer-order-title">Ping一下</h5>
+                            </div>
                             <div class="developer-order-link">
                                 <a href="" @click.prevent="ping">Ping一下</a>
                             </div>
@@ -107,10 +107,10 @@
                     </article>
                     <article class="developer-order-item">
                         <div class="developer-order-title-area">
-                          <div class="developer-order-title-area-wrap">
-                            <div class="developer-order-icon icon-4"></div>
-                            <h5 class="developer-order-title">客户好评</h5>
-                          </div>
+                            <div class="developer-order-title-area-wrap">
+                                <div class="developer-order-icon icon-4"></div>
+                                <h5 class="developer-order-title">客户好评</h5>
+                            </div>
                             <!-- <div class="developer-order-link"><a href="">立即完善</a></div> -->
                         </div>
                         <p class="developer-order-tips">
@@ -119,10 +119,10 @@
                     </article>
                     <article class="developer-order-item">
                         <div class="developer-order-title-area">
-                          <div class="developer-order-title-area-wrap">
-                            <div class="developer-order-icon icon-5"></div>
-                            <h5 class="developer-order-title">开通开发者会员</h5>
-                          </div>
+                            <div class="developer-order-title-area-wrap">
+                                <div class="developer-order-icon icon-5"></div>
+                                <h5 class="developer-order-title">开通开发者会员</h5>
+                            </div>
                             <div class="developer-order-link">
                                 <a href="/type/vip/developer">会员介绍</a>
                             </div>
@@ -206,14 +206,12 @@
                                     </el-image>
                                 </div>
                             </div>
-                            <div class="dynamic-link-area dynamic-margin">
+                            <div class="dynamic-link-area dynamic-margin" @click.capture.stop="clickResource(dynamic.resources)" v-if="dynamic.resources.resources_exist == 1">
                                 <div class="dynamic-link-img-area">
                                     <img :src="dynamic.resources.resources_img" />
                                 </div>
                                 <div class="dynamic-link-content text-line-1">
-                                    <a :href="dynamic.resources.resources_url">{{
-                      dynamic.resources.resources_title
-                    }}</a>
+                                    <span :href="dynamic.resources.resources_url">{{dynamic.resources.resources_title}}</span>
                                 </div>
                             </div>
 
@@ -238,14 +236,14 @@
             <section class="developer-workbench block">
                 <div class="developer-workbench-user">
                     <div class="developer-user-avatar">
-                        <img :src="userInfo.icon_url" />
+                        <img :src="userInfo.icon_url || personalIcon" />
                     </div>
                     <div class="developer-user-info">
                         <div class="developer-user-name text-line-1">
                             {{ userInfo.nickname }}
                         </div>
                         <div class="developer-user-level">
-                            当前等级Lv.{{ userInfo.freework_level }} <span class="arrow_icon"></span>
+                            当前等级Lv.{{ userInfo.freework_level || 0 }} <span class="arrow_icon"></span>
                         </div>
                     </div>
                 </div>
@@ -253,26 +251,26 @@
                 <div class="developer-work-list">
                     <div class="developer-work-item" @click="goto('/wo/work_todo')">
                         <div class="developer-work-count">
-                            {{ workPlatInfo.pendingNumber }}
+                            {{ workPlatInfo.pendingNumber || 0 }}
                         </div>
                         <div class="developer-work-tips">待办</div>
                     </div>
 
                     <div class="developer-work-item" @click="gotoAppTips">
                         <div class="developer-work-count">
-                            {{ workPlatInfo.recruitDeveloperCount }}
+                            {{ workPlatInfo.recruitDeveloperCount || 0 }}
                         </div>
                         <div class="developer-work-tips">沟通</div>
                     </div>
                     <div class="developer-work-item" @click="goto('/wo/work_hire')">
                         <div class="developer-work-count">
-                            {{ workPlatInfo.developerWorkNumber }}
+                            {{ workPlatInfo.developerWorkNumber || 0 }}
                         </div>
                         <div class="developer-work-tips">工作</div>
                     </div>
                     <div class="developer-work-item" @click="goto('/wo/work_platform')">
                         <div class="developer-work-count">
-                            {{ workPlatInfo.developerProjectNumber }}
+                            {{ workPlatInfo.developerProjectNumber || 0 }}
                         </div>
                         <div class="developer-work-tips">整包</div>
                     </div>
@@ -297,40 +295,45 @@
                     <p @click="goto('/wo/bills')">总收入 (元) <span class="arrow_icon"></span></p>
                     <div @click="toggleBanlace" class="developer-reward-show-setting" :class="isShowBablance ? 'show' : 'hide'"></div>
                 </div>
-                <div class="developer-reward-count">
+
+                <div  v-if="isLogin" class="developer-reward-count">
                     {{ isShowBablance ? balanceInfo.historyTotalBalance : "****" }}
                 </div>
+                <div v-else class="developer-reward-count">
+                    {{ isShowBablance ? 0 : "****" }}
+                </div>
                 <div class="developer-reward-detail">
                     <div class="developer-reward-item">
-                        账户余额:<span>{{
-                isShowBablance ? balanceInfo.totalBalance : "****"
-              }}</span>
+                        <span>账户余额:</span>
+                        <span v-if="isLogin" class="num">{{isShowBablance ? balanceInfo.totalBalance : "****"}}</span>
+                        <span v-else class="num">{{isShowBablance ? 0 : "****"}}</span>
                     </div>
                     <div class="developer-reward-item">
-                        薪资余额:<span>{{
-                isShowBablance ? balanceInfo.gongMallBalance : "****"
-              }}</span>
+                        <span>薪资余额:</span>
+                        <span v-if="isLogin" class="num">{{isShowBablance ? balanceInfo.gongMallBalance : "****"}}</span>
+                        <span v-else class="num">{{isShowBablance ? 0 : "****"}}</span>
                     </div>
                     <div class="developer-reward-item">
-                        冻结余额:<span>{{
-                isShowBablance ? balanceInfo.frozenBalance : "****"
-              }}</span>
+                        <span>冻结余额:</span>
+
+                        <span v-if="isLogin" class="num">{{isShowBablance ? balanceInfo.frozenBalance : "****"}}</span>
+                        <span v-else class="num">{{isShowBablance ? 0 : "****"}}</span>
                     </div>
                 </div>
             </section>
             <!-- 收入:end -->
 
             <div class="developer-skill block">
-                <div class="developer-skill-item"  @click="goto('/workbench/skill/index')">
+                <div class="developer-skill-item" @click="goto('/workbench/skill/index')">
                     <span class="developer-skill-icon icon1"></span>发布技能
                 </div>
                 <div class="developer-skill-item" @click="goto('/workbench/consult/index')">
                     <span class="developer-skill-icon icon2"></span>发布咨询
                 </div>
-                <div class="developer-skill-item"  @click="goto('/workbench/learn/index')">
+                <div class="developer-skill-item" @click="goto('/workbench/learn/index')">
                     <span class="developer-skill-icon icon3"></span>上传课程
                 </div>
-                <div class="developer-skill-item"  @click="goto('/otherpage/works/create')">
+                <div class="developer-skill-item" @click="goto('/otherpage/works/create')">
                     <span class="developer-skill-icon icon4"></span>上传资源
                 </div>
             </div>
@@ -346,6 +349,8 @@ import {
 import qs from "qs";
 import DeveloperSeoData from "./developData";
 import Empty from "./empty";
+import personalIcon from "@/assets/img/account/personal.png"
+
 export default {
     name: "SeoLearnList",
     components: {
@@ -365,7 +370,9 @@ export default {
             pageSize: 10,
             list: [],
             isMore: true,
-            pageLoading: false
+            pageLoading: false,
+
+            personalIcon
         };
     },
     head() {
@@ -426,10 +433,12 @@ export default {
         // 是否实名
         isRealName() {
             return this.userInfo["realname_verify_status"] == 2 ? true : false;
+            // return false
         },
         // 是否签约
         isSign() {
             return this.userInfo["realname_re"] == 2 ? true : false;
+            // return false
         },
         dynamicTranlate() {
             let typeList = this.typeList;
@@ -444,6 +453,9 @@ export default {
 
             let result = curIndex * block + half - line;
             return result;
+        },
+        isLogin() {
+            return this.$store.getters.isLogin
         }
     },
     async asyncData({
@@ -575,6 +587,13 @@ export default {
             } else if (Number(res.status) === 40001) {
                 this.isExist = false;
             }
+        },
+        clickResource(resources){
+            if(resources.resources_status != 1){
+                this.$message.info(resources.resources_text)
+            }else{
+                location.href = resources.resources_url
+            }
         }
     }
 };

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

@@ -211,8 +211,8 @@ export default {
 .recommend-main {
     position: absolute;
     left: 50%;
-    transform: translateX(-50%);
-    top: 194px;
+    transform: translate(-50%,-50%);
+    top: 50%;
     width: 880px;
     height: 636px;
     background: #FFFFFF;

+ 5 - 8
pages/frontend/requirements/components/Form_yunduan.vue

@@ -12,7 +12,7 @@
         <div class="form-label">2.开发者需要具备哪些核心技能标签? (1-5个)</div>
 
         <el-form-item label-width="0" prop="skills">
-            <el-select v-model="modalFormData.skills" @change="skillChange" multiple filterable remote reserve-keyword placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading" :style="{width: '50%'}">
+            <el-select  v-model="modalFormData.skills" @change="skillChange" multiple filterable remote :reserve-keyword="false" placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading" :style="{width: '50%'}">
                 <el-option v-for="item in skills" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
             </el-select>
@@ -392,20 +392,17 @@ export default {
                         ...params
                     }
                 )
-                .then(res => {
+                .then(async (res) => {
+
                     if (Number(res.status) === 1) {
                         this.$message.success("提交成功");
                         let id = res.data.id
-                        return Promise.resolve(id);
+                        await this.$refs['loading'].start()
+                        this.$emit('formSubmit', 2, id)
                     } else {
                         this.$message.error("提交失败");
                     }
                 })
-                .then(async (id) => {
-                    await this.$refs['loading'].start()
-                    this.$emit('formSubmit', 2, id)
-                    // 跳转
-                })
         }
 
     }