Merge remote-tracking branch 'origin/dev' into dev

pages/cert/type/_id.vue

@@ -39,13 +39,19 @@
           <div class="condition-point"></div>
           <div v-if="conditions[1] && conditions[1].is_completed" class="action">已达标</div>
           <div v-else class="action unactive">未达标</div>
-          <div class="condition-text">客栈评分不低于4.3</div>
+          <div class="condition-text">客栈评分不低于4.3（{{ conditions[1].completed_num }}/ {{ conditions[1].target }}）</div>
         </div>
         <div class="condition-item" :class="conditions[2] && conditions[2].is_completed ? 'condition-item-completed' : ''">
           <div class="condition-point"></div>
           <div v-if="conditions[2] && conditions[2].is_completed" class="action">已达标</div>
           <div v-else class="action unactive">未达标</div>
-          <div class="condition-text">在程序员客栈平台完成不低于3个项目，且累计提现超过3万</div>
+          <div class="condition-text">在程序员客栈平台完成不低于3个项目（{{ conditions[2].completed_num }}/ {{ conditions[2].target }}）</div>
+        </div>
+        <div class="condition-item" :class="conditions[3] && conditions[3].is_completed ? 'condition-item-completed' : ''">
+          <div class="condition-point"></div>
+          <div v-if="conditions[3] && conditions[3].is_completed" class="action">已达标</div>
+          <div v-else class="action unactive">未达标</div>
+          <div class="condition-text">在程序员客栈平台累计提现超过3万（{{ conditions[3].completed_num }}/ {{ conditions[3].target }}）</div>
         </div>
         <div class="verify-tips" v-if="!f2f3ConditionsCompelete">提示：由于您未在以上条件未达标，您还可以通过提交过往知名互联网公司职级证明，申请人工审核认证</div>
       </section>
@@ -62,27 +68,33 @@
           <div class="condition-point"></div>
           <div v-if="conditions[1] && conditions[1].is_completed" class="action">已达标</div>
           <div v-else class="action unactive">未达标</div>
-          <div class="condition-text">客栈评分不低于4.5</div>
+          <div class="condition-text">客栈评分不低于4.5（{{ conditions[1].completed_num }}/ {{ conditions[1].target }}）</div>
         </div>
         <div class="condition-item" :class="conditions[2] && conditions[2].is_completed ? 'condition-item-completed' : ''">
           <div class="condition-point"></div>
           <div v-if="conditions[2] && conditions[2].is_completed" class="action">已达标</div>
           <div v-else class="action unactive">未达标</div>
-          <div class="condition-text">在程序员客栈平台完成不低于10个项目，且累计提现超过10万</div>
+          <div class="condition-text">在程序员客栈平台完成不低于10个项目（{{ conditions[2].completed_num }}/ {{ conditions[2].target }}）</div>
+        </div>
+        <div class="condition-item" :class="conditions[3] && conditions[3].is_completed ? 'condition-item-completed' : ''">
+          <div class="condition-point"></div>
+          <div v-if="conditions[3] && conditions[3].is_completed" class="action">已达标</div>
+          <div v-else class="action unactive">未达标</div>
+          <div class="condition-text">在程序员客栈平台累计提现超过10万（{{ conditions[3].completed_num }}/ {{ conditions[3].target }}）</div>
         </div>
         <div class="verify-tips" v-if="!f2f3ConditionsCompelete">提示：由于您未在以上条件未达标，您还可以通过提交过往知名互联网公司职级证明，申请人工审核认证</div>
       </section>
       <!-- F2、F3上传图片 -->
       <section v-if="(id === '20' || id === '21') && !f2f3ConditionsCompelete" class="user-level-wrapper">
         <!-- <div class="user-level-title">上传职级证明<span class="tips">请上传png,jp(e)g格式的图片</span></div> -->
-        <div class="user-level-title">图片</div>
+        <div class="user-level-title">职级证明图片</div>
         <uploader
           :imageUrl="certVerifyUrl"
           @change="val => uploadImgSuccess(val)"
         ></uploader>
         <div class="tips-wrapper">
-          <a href="https://support.proginn.com/data/company/" target="_blank" class="tips-text">1.知名互联网大厂详情参考</a>
-          <div class="tips-text">2.有效的职级证明包括：职称提升通知、邮件/证书/工牌等（提交一种证明即可，图中需同时出现公司信息和个人信息）</div>
+          <a href="https://support.proginn.com/data/company/" style="color: #0093fd;" target="_blank" class="tips-text">1.知名互联网大厂详情参考</a>
+          <div class="tips-text">2.有效的职级证明包括：职称提升通知、邮件/证书等（提交一种证明即可，图中需同时出现公司信息和个人信息）</div>
           <div class="tips-text">3.图片不大于5MB</div>
         </div>
       </section>

pages/frontend/consult/list.vue

@@ -395,6 +395,18 @@ export default {
         },
         /** 点击一级分类时 */
         handleClickCategoryOne (id) {
+            if (id === 0) {
+                // 点击全部时，移除筛选分类
+                this.pagination.selectedCateIdOne = id
+                this.pagination.selectedCateIdTwo = ''
+                this.currentDrawerCategoryId = ''
+                this.pagination.page = 1
+                this.consultList = []
+                window.scroll(0, 0)
+
+                this._getConsultList()
+                return
+            }
             if (this.pagination.selectedCateIdOne !== id) {
                 this.pagination.selectedCateIdOne = id
             }

pages/frontend/skill/list.vue

@@ -354,6 +354,18 @@ export default {
         },
         /** 点击一级分类时 */
         handleClickCategoryOne (id) {
+            if (id === 0) {
+                // 点击全部时，移除筛选分类
+                this.pagination.selectedCateIdOne = id
+                this.pagination.selectedCateIdTwo = ''
+                this.currentDrawerCategoryId = ''
+                this.pagination.page = 1
+                this.skillList = []
+                window.scroll(0, 0)
+
+                this._getSkillList()
+                return
+            }
             if (this.pagination.selectedCateIdOne !== id) {
                 this.pagination.selectedCateIdOne = id
             }

pages/work_down/index.vue

@@ -426,6 +426,17 @@ export default {
          * 点击一级分类
          */
         handleClickCategoryOne (id) {
+            if (id === 0) {
+                // 点击全部时，移除筛选分类
+                this.currentCategoryIndex = id
+                this.pagination.cate_id_two = []
+                this.pagination.page = 1
+                this.worksList = []
+                window.scroll(0, 0)
+
+                this._getWorksList()
+                return
+            }
             if (id !== this.currentCategoryIndex) {
                 this.currentCategoryIndex = id
             }