2.0

src/assets/fontfile/demo_index.html

@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe701;</span>
+                <div class="name">关闭</div>
+                <div class="code-name">&amp;#xe701;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe8dc;</span>
                 <div class="name">关闭实心</div>
@@ -192,9 +198,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1644306892433') format('woff2'),
-       url('iconfont.woff?t=1644306892433') format('woff'),
-       url('iconfont.ttf?t=1644306892433') format('truetype');
+  src: url('iconfont.woff2?t=1644375850663') format('woff2'),
+       url('iconfont.woff?t=1644375850663') format('woff'),
+       url('iconfont.ttf?t=1644375850663') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -220,6 +226,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-guanbi"></span>
+            <div class="name">
+              关闭
+            </div>
+            <div class="code-name">.icon-guanbi
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-guanbishixin"></span>
             <div class="name">
@@ -427,6 +442,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-guanbi"></use>
+                </svg>
+                <div class="name">关闭</div>
+                <div class="code-name">#icon-guanbi</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-guanbishixin"></use>

src/assets/fontfile/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3135652 */
-  src: url('iconfont.woff2?t=1644306892433') format('woff2'),
-       url('iconfont.woff?t=1644306892433') format('woff'),
-       url('iconfont.ttf?t=1644306892433') format('truetype');
+  src: url('iconfont.woff2?t=1644375850663') format('woff2'),
+       url('iconfont.woff?t=1644375850663') format('woff'),
+       url('iconfont.ttf?t=1644375850663') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-guanbi:before {
+  content: "\e701";
+}
+
 .icon-guanbishixin:before {
   content: "\e8dc";
 }

src/assets/fontfile/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "27523084",
+      "name": "关闭",
+      "font_class": "guanbi",
+      "unicode": "e701",
+      "unicode_decimal": 59137
+    },
     {
       "icon_id": "2076434",
       "name": "关闭实心",

src/components/FirstJob/components/recommend.vue

@@ -16,7 +16,18 @@
             <div class="imgbox">
               <img v-if="item.logo" :src="item.logo" alt="" />
               <img v-else src="../../../../static/img/nopicture.png" alt="" />
-              <span>服务费<i>1.3</i>元/小时</span>
+              <span
+                >服务费<i
+                  v-if="
+                    item.returnFee &&
+                    item.returnFee !== -1 &&
+                    item.returnFee !== null
+                      ? true
+                      : false
+                  "
+                  >{{ item.returnFee }}</i
+                ><i v-else> -</i> 元/小时</span
+              >
             </div>
             <div class="jobname">
               {{

src/components/FirstJob/detail.vue

@@ -301,14 +301,44 @@ export default {
 .modal {
   .ant-form-item {
     // margin-bottom: 0;
+    margin-top: -8px;
     .ant-input {
       // width: 430px;
       height: 40px;
-      border: none;
+      // border: none;
+      border: 1px solid #dddddd;
       box-shadow: none !important;
-      background-color: rgba(77, 87, 94, 0.1);
+      // background-color: #f6f6f6;
+    }
+  }
+  /deep/ .ant-modal-footer {
+    padding: 10px 24px;
+    .ant-btn {
+      &:hover {
+        color: #ff6a00;
+        border-color: #ff6a00;
+      }
+    }
+    .ant-btn.ant-btn-primary {
+      background-color: #ff6a00 !important;
+      border: none;
+      line-height: 32px;
+      margin-left: 12px;
+      color: #fff;
+      &:hover {
+        background-color: #ff8025 !important;
+      }
+    }
+  }
+  /deep/ .ant-modal-header {
+    .ant-modal-title {
+      font-size: 20px;
+      // font-weight: bold;
     }
   }
+  /deep/ .ant-modal-body {
+    padding: 24px 24px 8px 24px;
+  }
 }
 /deep/ .maincontent {
   display: flex;
@@ -474,6 +504,10 @@ export default {
               font-weight: bold;
               font-size: 18px;
               border-radius: 4px;
+              cursor: pointer;
+              &:hover {
+                background-color: #ff7614;
+              }
             }
           }
         }

src/components/FirstJob/joblist.vue

@@ -118,15 +118,23 @@
               @click.stop="isspecialboxshowclick"
               :style="isspecialboxshow ? 'color:#ff6a00' : ''"
             >
-              <ul class="showspecial" v-if="specialvalue.length !== 0">
-                <li v-for="(item, index) in specialactive" :key="index">
-                  {{ item }}<i></i>
+              <ul class="showspecial" v-if="specialactive.length !== 0">
+                <li
+                  v-for="(item, index) in specialactive"
+                  :key="index"
+                  @click.stop
+                >
+                  {{ item
+                  }}<i
+                    class="iconfont icon-guanbi"
+                    @click.stop="delmark(index)"
+                  ></i>
                 </li>
               </ul>
-              <span v-if="specialvalue.length >= 3">...</span>
+              <span v-if="specialactive.length > 3">...</span>
               <span
                 :style="specialactive.length != 0 ? 'color:#ff6a00' : ''"
-                v-if="specialvalue.length === 0"
+                v-if="specialactive.length === 0"
                 >特色</span
               ><i
                 class="iconfont icon-xiala"
@@ -730,6 +738,12 @@ export default {
       this.dateinfo.day = "0" + date.getDate();
       this.dateinfo.date = date.getFullYear() + "." + (date.getMonth() + 1);
     },
+    delmark(index) {
+      console.log(index);
+      this.specialactive.splice(index, 1);
+      this.specialvalue.splice(index, 1);
+      this.getJobList();
+    },
   },
 };
 </script>
@@ -775,11 +789,21 @@ export default {
   }
   /deep/ .ant-modal-footer {
     padding: 10px 24px;
-    .ant-btn-primary {
+    .ant-btn {
+      &:hover {
+        color: #ff6a00;
+        border-color: #ff6a00;
+      }
+    }
+    .ant-btn.ant-btn-primary {
       background-color: #ff6a00 !important;
       border: none;
       line-height: 32px;
       margin-left: 12px;
+      color: #fff;
+      &:hover {
+        background-color: #ff8025 !important;
+      }
     }
   }
   /deep/ .ant-modal-header {
@@ -917,7 +941,7 @@ export default {
       display: flex;
       justify-content: flex-start;
       min-width: 595px;
-      li {
+      > li {
         margin-top: 24px;
         font-size: 14px;
         color: #4d575e;
@@ -962,7 +986,7 @@ export default {
           }
         }
       }
-      li:first-child {
+      > li:first-child {
         > i {
           position: relative;
           display: inline-block;
@@ -1019,11 +1043,21 @@ export default {
               margin: 6px 5px 0 0;
               float: left;
               height: 20px;
-              line-height: 20px;
-              padding: 0 6px;
+              line-height: 19px;
+              padding: 0 8px;
               color: #fff;
               background-color: #ff6a00;
               border-radius: 999px;
+              i {
+                display: inline-block;
+                font-size: 12px;
+                height: 12px;
+                position: relative;
+                margin-left: 10px;
+
+                transform: scale(0.8);
+                // vertical-align: middle;
+              }
               &:nth-child(n + 4) {
                 display: none;
               }
@@ -1226,6 +1260,7 @@ export default {
               background-color: #fff;
               cursor: pointer;
               &:hover {
+                color: #ff7614;
                 border-color: #ff7614;
               }
             }
@@ -1237,7 +1272,9 @@ export default {
             color: rgba(255, 106, 0, 1);
             cursor: pointer;
             &:hover {
-              background-color: rgba(255, 121, 26, 0.1);
+              color: #fff;
+
+              background-color: rgba(255, 121, 26);
             }
           }
         }

src/components/Login/login.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="center">
     <div class="formcontainer">
+      <div class="logo">
+        <i class="iconfont icon-dingbulogo"></i>
+      </div>
       <ul class="loginchange centerall">
         <li :class="{ loginactive: loginway === 1 }" @click="loginway = 1">
           用户名密码登录
@@ -328,6 +331,20 @@ export default {
   .centerall {
     margin: 0 auto;
   }
+  .logo {
+    width: 120px;
+    height: 52px;
+    margin: 30px auto 0px;
+    // img {
+    //   width: 100%;
+    //   height: 100%;
+    // }
+    i {
+      font-size: 52px;
+      line-height: 52px;
+      color: #ff6a00;
+    }
+  }
   .loginchange {
     display: flex;
     width: 230px;
@@ -340,7 +357,8 @@ export default {
     }
     li {
       padding: 0 0 4px 0;
-      margin-bottom: 50px;
+      margin-bottom: 20px;
+      margin-top: 20px;
       font-size: 14px;
       text-align: left;
       color: #cccccc;
@@ -354,7 +372,7 @@ export default {
     // padding-bottom: 20px !important;
     // }
     /deep/.ant-form-item {
-      margin-top: -10px;
+      // margin-top: -10px;
       /deep/ .ant-form-explain {
         margin-top: -2px;
         line-height: 20px;
@@ -367,7 +385,7 @@ export default {
       }
 
       .ant-input {
-        height: 32px;
+        height: 36px;
         text-indent: 15px;
         // background-color: #f6f6f6;
         // border: none;

src/components/Login/updatepsw.vue

@@ -2,6 +2,7 @@
   <div class="center">
     <div class="formcontainer">
       <ul class="loginchange centerall">
+        <router-link to="/login"><li class="goback">&lt;返回</li></router-link>
         <li class="loginactive">找回密码</li>
       </ul>
       <div class="formbox">
@@ -258,14 +259,28 @@ export default {
   }
   .loginchange {
     display: flex;
+    position: relative;
     width: 230px;
     justify-content: center;
     margin-top: 32px;
-
     .loginactive {
       color: #4d575e;
       border-bottom: 1px solid #4d575e;
     }
+    a {
+      li {
+        position: absolute;
+        left: 0;
+        top: 0;
+        font-size: 14px;
+        margin-bottom: 0;
+        padding: 0;
+        color: #4d575e;
+        &:hover {
+          color: #ff6a00cc;
+        }
+      }
+    }
     li {
       padding: 0 0 4px 0;
       margin-bottom: 24px;

src/style/index.less

@@ -126,6 +126,10 @@ i {
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-guanbi:before {
+  content: "\e701";
+}
+
 .icon-guanbishixin:before {
   content: "\e8dc";
 }

src/views/login.vue

@@ -7,9 +7,6 @@
         </div>
       </div>
       <div class="contentright">
-        <div class="logo">
-          <i class="iconfont icon-dingbulogo" @click="push123"></i>
-        </div>
         <div class="contentbox">
           <router-view></router-view>
         </div>
@@ -31,27 +28,29 @@ export default {
   data() {
     return {
       loginway: 1,
-
+      islogoshow: true, // 控制logo是否显示
       form: this.$form.createForm(this),
       form1: this.$form.createForm(this),
       isfinish: true,
       deadline: 60,
+      path: this.$route.fullPath,
     };
   },
   // 计算属性
   computed: {},
   // 侦听器
-  watch: {},
+  watch: {
+    path() {
+      this.getpathinfo();
+      console.log(this.path);
+    },
+  },
   // 生命周期钩子   注：没用到的钩子请自行删除
   /**
    * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
    */
   created() {
-    const path = this.$route.fullPath;
-    if (path.indexOf()) {
-      this.islogoshow = true;
-    }
-    console.log(path);
+    // this.getpathinfo();
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@@ -60,8 +59,14 @@ export default {
   mounted() {},
   // 组件方法
   methods: {
-    push123() {
-      this.$router.push({ name: "updatepsw" });
+    getpathinfo() {
+      this.path = this.$route.fullPath;
+      if (this.path.indexOf("updatepsw") > -1) {
+        this.islogoshow = false;
+      } else {
+        this.islogoshow = true;
+      }
+      console.log(this.path);
     },
   },
 };
@@ -117,20 +122,7 @@ export default {
       // padding: 40px 55px;
       box-sizing: border-box;
       background-color: #fff;
-      .logo {
-        width: 120px;
-        height: 52px;
-        margin: 30px auto 0px;
-        // img {
-        //   width: 100%;
-        //   height: 100%;
-        // }
-        i {
-          font-size: 52px;
-          line-height: 52px;
-          color: #ff6a00;
-        }
-      }
+
       .contentbox {
         width: 290px;
         margin: 0 auto;