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

components/sign/step-education.vue

@@ -325,7 +325,7 @@ export default {
       //   this.$message.error("教育经历不得低于15个字符");
       //   return;
       // }
-      if (item.description !== "" || item.description.length > 140) {
+      if (item.description.length > 140) {
         this.$message.error("教育经历不得多于140个字符");
         return;
       }

components/sign/step-experience.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="sign-new-experience">
     <div class="sign-new-tips">
-      完善经历和技能信息，尤其<b>技能</b>将直接用于<b>派单匹配</b>，确保准确，完善
+      完善经历和技能信息，尤其<b>技能</b>信息将直接用于<b>派单匹配</b>，确保准确，完善
     </div>
     <div class="sign-experience-main">
       <!-- 教育经历 -->
@@ -66,8 +66,7 @@ export default {
       return (
         this.education.length > 0 &&
         this.workExperience.length > 0 &&
-        this.skills.length > 0 &&
-        this.profile !== ""
+        this.skills.length > 0
       );
     }
   },

components/sign/step-profile.vue

@@ -88,20 +88,20 @@ export default {
     },
     async onSubmit() {
       this.cnzz("签约", "签约页面+个人介绍保存", "");
-      if (!this.content) {
-        this.$message.error("请输入个人介绍");
-        return false;
-      }
-      if (this.content.length < 150) {
-        this.$message.error("个人介绍不得低于150字");
-        return false;
-      }
-      if (!this.content.length > 3000) {
-        this.$message.error("个人介绍不得 超过3000字");
-        return false;
-      }
+      // if (!this.content) {
+      //   this.$message.error("请输入个人介绍");
+      //   return false;
+      // }
+      // if (this.content.length < 150) {
+      //   this.$message.error("个人介绍不得低于150字");
+      //   return false;
+      // }
+      // if (!this.content.length > 3000) {
+      //   this.$message.error("个人介绍不得 超过3000字");
+      //   return false;
+      // }
       const formData = {
-        personaldetails: this.content
+        personaldetails: this.content || ""
       };
       let res = await this.$axios.$post("/api/user/update_resume", formData);
       if (res.status === 1) {

components/sign/step-work-experience.vue

@@ -263,8 +263,8 @@ export default {
         this.$message.error("请设置公司名称/职位!");
         return;
       }
-      if (!item.description || item.description.length < 60) {
-        this.$message.error("经历描述不少于60字符!");
+      if (!item.description || item.description.length < 40) {
+        this.$message.error("经历描述不少于40字符!");
         return;
       }
       this.editingItem = [];

components/works/editor.vue

@@ -31,7 +31,7 @@
           <div
             id="work-tag-input-placeholder"
             class="work-tag-input-placeholder"
-            @click.stop="isShowTagList = true"
+            @click.stop="isShowTagList = !isShowTagList"
           >
             添加标签
             <i
@@ -40,7 +40,11 @@
             ></i>
           </div>
         </div>
-        <div class="work-tag-select-container" v-show="isShowTagList">
+        <div
+          class="work-tag-select-container"
+          @click.stop=""
+          v-show="isShowTagList"
+        >
           <div
             v-for="(rowsItem, index) in tagArr"
             :key="index"
@@ -53,7 +57,7 @@
               :class="{
                 cur: dynamicTags.indexOf(item) > -1
               }"
-              @click="addTags(item)"
+              @click.stop="addTags(item)"
               >{{ item }}</span
             >
           </div>
@@ -201,7 +205,7 @@
         type="primary"
         @click="publish"
         class="btn-save"
-        v-bind:disabled="isPublishing"
+        v-bind:disabled="isPublishing || !canNext"
         >{{ submitText }}</el-button
       >
       <!--      <el-button @click="cancel">取消</el-button>-->
@@ -324,6 +328,13 @@ export default {
       }
 
       return res;
+    },
+    canNext() {
+      const condition = this.dynamicTags.length > 0;
+      const condition2 = this.workName !== "";
+      const condition3 = this.content !== "";
+      const condition4 = this.workImages.length > 1;
+      return condition && condition2 && condition3 && condition4;
     }
   },
   created() {},
@@ -559,6 +570,9 @@ export default {
      * @return {{msg: string, success: boolean}}
      */
     publishValidCheck() {
+      if (this.dynamicTags.length === 0) {
+        return { success: false, msg: "请请输入（项目类型、标签）" };
+      }
       if (!this.workName) {
         return { success: false, msg: "请输入作品名称" };
       }
@@ -937,7 +951,7 @@ export default {
 .btn-save {
   width: 140px;
   height: 48px;
-  background: #96c6ff;
+  // background: #96c6ff;
   border-radius: 24px;
   outline: none;
   border: none;
@@ -1130,25 +1144,18 @@ export default {
 .work-tag-input-placeholder {
   width: 244px;
   height: 40px;
-  background: #ffffff;
+  background: #308eff;
   border-radius: 4px;
-  border: 1px solid #dcdfe6;
+  text-align: center;
 
   font-size: 15px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #c0c4cc;
+  color: #fff;
   line-height: 40px;
   text-indent: 14px;
   cursor: pointer;
   user-select: none;
-  position: relative;
-  .el-icon-arrow-down {
-    position: absolute;
-    right: 16px;
-    top: 50%;
-    transform: translateY(-50%);
-  }
 }
 .work-el-textarea {
   position: relative;