'1'

src/api/userinfo.js

@@ -1,28 +1,28 @@
 import request from "../utils/request";
 // 获取卡券信息
 export function userCardApi(data) {
-	return request({
-		url: "/yishoudan/usercoupon/list",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/usercoupon/list",
+    // method: "post",
+    params: data,
+  });
 }
 // 获取用户余额信息
 export function userBalanceApi(data) {
-	return request({
-		url: "/yishoudan/wallet/info",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/wallet/info",
+    // method: "post",
+    params: data,
+  });
 }
 
 // 获取用户提现详情
 export function userDetailApi(data) {
-	return request({
-		url: "/yishoudan/wallet/withdrawal/list",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/wallet/withdrawal/list",
+    // method: "post",
+    params: data,
+  });
 }
 // // 获取我的老乡信息
 // export function userTownsmanApi(data) {
@@ -34,106 +34,114 @@ export function userDetailApi(data) {
 // }
 // 获取我的报名信息
 export function userBillApi(data) {
-	return request({
-		url: "/yishoudan/user/apply/order/list",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/user/apply/order/list",
+    // method: "post",
+    params: data,
+  });
+}
+// 获取我的报名状态数量
+export function userBillNumberApi(data) {
+  return request({
+    url: "/yishoudan/user/apply/order/listStatisticsNum",
+    // method: "post",
+    params: data,
+  });
 }
 // 获取用户信息
 export function userBaseInfoApi(data) {
-	return request({
-		url: "/yishoudan/user/getUserInfo",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/user/getUserInfo",
+    // method: "post",
+    params: data,
+  });
 }
 // 获取用户积分信息
 
 export function getPointApi(data) {
-	return request({
-		url: "/yishoudan/wallet/getPoint",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/wallet/getPoint",
+    // method: "post",
+    params: data,
+  });
 }
 // 获取用户积分使用信息
 
 export function getPointDetailApi(data) {
-	return request({
-		url: "/yishoudan/pointUseRecord/list",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/pointUseRecord/list",
+    // method: "post",
+    params: data,
+  });
 }
 // 登录状态账号设置修改密码
 
 export function setUserPswApi(data) {
-	return request({
-		url: "/yishoudan/changePassword",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/changePassword",
+    // method: "post",
+    params: data,
+  });
 }
 // 登录状态账号修改绑定手机号
 
 export function setUserTelApi(data) {
-	return request({
-		url: "/yishoudan/user/changeTel",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/user/changeTel",
+    // method: "post",
+    params: data,
+  });
 }
 // 账号修改绑定银行卡
 
 export function getUserBankListApi(data) {
-	return request({
-		url: "/yishoudan/user/bank/getUserBankList",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/user/bank/getUserBankList",
+    // method: "post",
+    params: data,
+  });
 }
 // 实名认证
 
 export function setUserRealNameApi(data) {
-	return request({
-		url: "/yishoudan/user/realNameAuth",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/user/realNameAuth",
+    // method: "post",
+    params: data,
+  });
 }
 // 获取用户微信绑定的二维码
 export function getUserWxApi(data) {
-	return request({
-		url: "/yishoudan/user/getMiniAppQrCodeOfBindUser",
-		// method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/user/getMiniAppQrCodeOfBindUser",
+    // method: "post",
+    params: data,
+  });
 }
 // 上传用户头像
 export function uploadUserAvatarApi(data) {
-	return request({
-		url: "/yishoudan/user/changeUserImgsrc",
-		method: "post",
-		headers: { "Content-Type": "multipart/form-data" },
-		data: data,
-		// data,
-	});
+  return request({
+    url: "/yishoudan/user/changeUserImgsrc",
+    method: "post",
+    headers: { "Content-Type": "multipart/form-data" },
+    data: data,
+    // data,
+  });
 }
 // 获取我的老乡
 export function userTownsmanApi(data) {
-	return request({
-		url: "/yishoudan/agency/user/list",
-		method: "post",
-		params: data,
-		// data,
-	});
+  return request({
+    url: "/yishoudan/agency/user/list",
+    method: "post",
+    params: data,
+    // data,
+  });
 }
 // 我的老乡各个状态统计
 export function gettownsManCountApi(data) {
-	return request({
-		url: "/yishoudan/agency/user/listStatistics",
-		method: "post",
-		params: data,
-	});
+  return request({
+    url: "/yishoudan/agency/user/listStatistics",
+    method: "post",
+    params: data,
+  });
 }

src/components/AboutUs/index.vue

@@ -2,9 +2,10 @@
   <div class="aboutus-container">
     <div class="w">
       <div class="bannerbox">
-        <img src="../../assets/aboutusbanner.png" alt="" /><i
-          class="iconfont icon-yigezhuanmenfuwudailidepingtai"
-        ></i>
+        <img
+          src="http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/newBanner/aboutusbanner.png"
+          alt=""
+        /><i class="iconfont icon-yigezhuanmenfuwudailidepingtai"></i>
       </div>
       <div class="contentbox">
         <h1><span class="beforeblock"></span>伯才一手单</h1>

src/components/FirstJob/components/recommend.vue

@@ -40,13 +40,15 @@
             >{{ item1 }}</span
           >
         </div>
-        <div class="jobprice">
-          {{
+        <div
+          class="jobprice"
+          v-html="
             getSalaryClassifyValue(
               item.salaryClassify,
               item.salaryClassifyValue
             )
-          }}
+          "
+        >
           <!-- <template v-if="item.hourlyPay"
             ><span>{{ item.hourlyPayTemp / 100 }}</span
             >元/小时</template
@@ -155,19 +157,20 @@ export default {
   // height: 1008px;
   overflow: hidden;
   background: #ffffff;
-  border-radius: 4px;
-  padding: 0px 20px 4px 20px;
+  // border-radius: 4px;
+  padding: 0px 20px 0px 20px;
 
   h1 {
     // margin-bottom: 12px;
+    font-size: 16px;
     text-align: left;
     &::after {
-      display: none;
+      // display: none;
     }
     i {
       display: inline-block;
       line-height: 20px;
-      border-bottom: 2px solid #ff4400;
+      // border-bottom: 2px solid #ff4400;
       padding: 6px 0;
     }
     span {
@@ -230,12 +233,11 @@ export default {
       // border-bottom: 1px solid #f2f0ec;
     }
     .jobinfo {
-      margin-top: 16px;
-      opacity: 0.5;
-      font-size: 16px;
+      margin-top: 12px;
+      font-size: 14px;
       font-weight: 400;
       text-align: left;
-      color: #4d575e;
+      color: #999;
       line-height: 18px;
     }
     .jobtag {
@@ -248,7 +250,7 @@ export default {
       span {
         margin-right: 12px;
         font-size: 14px;
-        padding: 3px 5px;
+        padding: 2px 5px;
         background: rgba(51, 51, 51, 0.06);
         border-radius: 4px;
       }
@@ -256,16 +258,20 @@ export default {
         display: none;
       }
     }
-    .jobprice {
+    /deep/ .jobprice {
       margin-top: 16px;
       margin-bottom: 16px;
       font-size: 16px;
       text-align: left;
       color: #ff4400;
-      font-weight: normal;
       line-height: 18px;
+      font-weight: 600;
       span {
-        font-size: 20px;
+        font-weight: 600 !important;
+      }
+      i {
+        font-size: 18px;
+        line-height: 28px;
       }
     }
   }

src/components/FirstJob/components/recordSuccess.vue

@@ -12,7 +12,7 @@
       </a-breadcrumb-item>
       <!-- <a-breadcrumb-item href="" v-if="!islist"> -->
       <a-breadcrumb-item>
-        <router-link :to="'/detail/' + firminfo.id">
+        <router-link :to="'/detail?id=' + firminfo.id">
           <!-- <span @click="$router.back(-1)">企业详情</span> -->
           <span>企业详情</span>
         </router-link>
@@ -44,8 +44,8 @@
           <a-button
             style="
               color: #fff;
-              background-color: #ff6a00;
-              border-color: #ff6a00;
+              background-color: #ff4400;
+              border-color: #ff4400;
             "
             @click="handleOk"
           >
@@ -91,7 +91,7 @@ export default {
   // 组件方法
   methods: {
     onClose() {
-      this.$router.push("/detail/" + this.firminfo.id);
+      this.$router.push("/detail?id=" + this.firminfo.id);
     },
     handleOk() {
       this.$router.push("/mybill");

src/components/FirstJob/components/recordbill.vue

@@ -1,428 +0,0 @@
-<template>
-  <div class="recordcomponent">
-    <a-form-model
-      ref="ruleForm"
-      :model="form"
-      :rules="rules"
-      :colon="false"
-      :wrapperCol="{ span: 19 }"
-      :labelCol="{ span: 4 }"
-    >
-      <a-form-model-item ref="proxy" label="代理" prop="">
-        <a-input
-          :value="
-            proxyinfo.userName !== '' ? proxyinfo.userName : proxyinfo.tel
-          "
-          :disabled="true"
-        />
-      </a-form-model-item>
-      <a-form-model-item ref="name" label="姓名" prop="name">
-        <a-input
-          v-model="form.username"
-          placeholder="请输入老乡姓名"
-          class="special-input"
-        />
-      </a-form-model-item>
-      <a-form-model-item ref="gender" label="性别" prop="gender">
-        <a-radio-group
-          v-model="form.gender"
-          defaultValue="nan"
-          class="radiobox"
-        >
-          <a-radio value="nan"> 男 </a-radio>
-          <a-radio value="nv"> 女 </a-radio>
-        </a-radio-group>
-      </a-form-model-item>
-      <!-- :offset="2" -->
-      <a-form-model-item ref="tel" label="年龄" prop="tel">
-        <a-input
-          v-model="form.age"
-          placeholder="请输入年龄"
-          class="special-input"
-        />
-      </a-form-model-item>
-      <a-form-model-item ref="peoplecard" label="民族" prop="peoplecard">
-        <a-select
-          v-model="form.nation"
-          placeholder="请选择民族"
-          class="special-input"
-        >
-          <a-select-option
-            v-for="item in nationlist"
-            :key="item.id"
-            :value="item.id"
-            >{{ item.name }}</a-select-option
-          >
-        </a-select>
-      </a-form-model-item>
-
-      <a-form-model-item ref="peoplecard" label="身份证号" prop="peoplecard">
-        <a-input v-model="form.peoplecard" placeholder="请输入老乡身份证号" />
-      </a-form-model-item>
-      <a-form-model-item ref="peoplecard" label="家庭住址" prop="peoplecard">
-        <a-input v-model="form.address" placeholder="请输入家庭住址" />
-      </a-form-model-item>
-      <a-form-model-item ref="username" label="面试时间" prop="username">
-        <a-date-picker
-          :showToday="false"
-          format="YYYY-MM-DD HH:mm"
-          :disabledDate="interviewTimeDisabledDate"
-          :disabledTime="interviewTimeDisabledDateTime"
-          :locale="locale"
-          :showTime="{
-            hideDisabledOptions: true,
-            defaultValue: moment('12:00', 'HH:mm'),
-            format: 'HH:mm',
-          }"
-          v-decorator="[
-            'interviewTime',
-            { rules: [{ required: true, message: '请选择面试时间' }] },
-          ]"
-          placeholder="请选择面试时间"
-          style="width: 100%"
-        />
-      </a-form-model-item>
-      <a-form-model-item ref="username" label="报名企业" prop="username">
-        <a-input :value="firminfo.aliasName" :disabled="true" />
-      </a-form-model-item>
-      <a-form-model-item ref="username" label="岗位" prop="username">
-        <a-input :value="firminfo.jobName" :disabled="true" />
-      </a-form-model-item>
-      <!-- <a-form-model-item ref="username" label="模式" prop="username">
-          <a-select v-model="form.pattern" placeholder="请选择民族">
-            <a-select-option :value="apply.id">{{ apply.id }}</a-select-option>
-          </a-select>
-        </a-form-model-item> -->
-      <a-form-model-item ref="username" label="政策" prop="username">
-        <a-input
-          v-model="form.policy"
-          style="min-height: 150px; max-height: 200px"
-          type="textarea"
-        />
-      </a-form-model-item>
-    </a-form-model>
-    <div class="upline">
-      <div>
-        <a-button
-          type="primary"
-          @click="onClose"
-          :style="{
-            color: '#666',
-            backgroundColor: '#fafafa',
-            borderColor: '#ddd',
-            boxShadow: 'none',
-            textShadow: 'none',
-          }"
-        >
-          取消
-        </a-button>
-        <a-button
-          style="
-            margin-left: 10px;
-            color: #fff;
-            background-color: #ff4400;
-            border-color: #ff4400;
-          "
-          @click="handleOk"
-        >
-          提交
-        </a-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import moment from "moment";
-import { nationlist } from "../../../utils/datalist";
-import { recordBillApi } from "@/api/job";
-export default {
-  // 组件名称
-  name: "",
-  // 局部注册的组件
-  components: {},
-  // 组件参数 接收来自父组件的数据
-  props: {
-    visible: {
-      require: true,
-    },
-    firminfo: {
-      require: true,
-    },
-  },
-  // 组件状态值
-  data() {
-    return {
-      form: {
-        // 录单数据
-        name: "",
-        peoplecard: "",
-        gender: "", // 性别
-        nation: undefined, // 民族
-        location: "", // 家庭住址
-        firm: "", // 公司名
-        post: "", // 岗位
-        pattern: "", // 模式
-        policy: "", // 代理政策
-        proxy: "", // 代理
-        facedate: "", // 面试时间
-      },
-      rules: {
-        // 录单校验规则
-        name: [{ required: true, message: "请输入姓名", trigger: "submit" }],
-        // tel: [{ required: true, message: "请输入手机号", trigger: "submit" }],
-      },
-      proxyinfo: JSON.parse(sessionStorage.getItem("LOGIN_DATA")),
-      nationlist: nationlist,
-      moment: this.$moment,
-      locale: {
-        lang: {
-          locale: "zh_CN",
-          placeholder: "请选择面试时间",
-          today: "今天",
-          yearFormat: "YYYY",
-          dateFormat: "M/D/YYYY",
-          dayFormat: "D",
-          dateTimeFormat: "M/D/YYYY HH:mm:ss",
-          monthFormat: "MMMM",
-          timeSelect: "选择时间",
-          ok: "确认",
-          monthBeforeYear: false,
-        },
-      },
-    };
-  },
-  // 计算属性
-  computed: {},
-  // 侦听器
-  watch: {},
-  // 生命周期钩子   注：没用到的钩子请自行删除
-  /**
-   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
-   */
-  created() {},
-  /**
-   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
-   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
-   */
-  mounted() {},
-  // 组件方法
-  methods: {
-    onClose() {
-      // this.visible = false;
-      this.$emit("update:visible", false);
-      this.form = {
-        // 录单数据
-        name: "",
-        peoplecard: "",
-        gender: "", // 性别
-        nation: undefined, // 民族
-        location: "", // 家庭住址
-        firm: "", // 公司名
-        post: "", // 岗位
-        pattern: "", // 模式
-        policy: "", // 代理政策
-        proxy: "", // 代理
-        facedate: "", // 面试时间
-      };
-    },
-    handleOk() {
-      this.$refs.ruleForm.validate(async (ispass, no) => {
-        console.log(ispass);
-        if (ispass) {
-          // this.confirmLoading = true;
-          // console.log(this.form);
-
-          // setTimeout(() => {
-          //   this.confirmLoading = false;
-          //   this.form = {
-          //     // 录单数据置空
-          //     name: "",
-          //     tel: "",
-          //     peoplecard: "",
-          //     username: "",
-          //   };
-          //   this.visible = false;
-          // }, 2000);
-          let { data } = await recordBillApi(this.form);
-          console.log(data);
-        } else {
-          console.log(123);
-        }
-        console.log(no);
-      });
-    },
-    // 录单弹出层的关闭
-    handleCancel() {
-      this.visible = false;
-      this.form = {
-        // 录单数据
-        name: "",
-        peoplecard: "",
-        gender: "",
-        nation: undefined,
-        location: "",
-        firm: "",
-        post: "",
-        pattern: "",
-        policy: "",
-        proxy: "",
-        facedate: "",
-      };
-    },
-    interviewTimeDisabledDate(current) {
-      // Can not select days before today and today
-      return (
-        current < moment().startOf("day") || current > moment().add(100, "days")
-      );
-    },
-    interviewTimeDisabledDateTime() {
-      return {
-        disabledHours: () => [0, 1, 2, 3, 4, 5, 6, 22, 23],
-        disabledMinutes: () =>
-          this.range(0, 60)
-            .splice(1, 29)
-            .concat(this.range(0, 60).splice(31, 59)),
-        disabledSeconds: () => this.range(1, 60),
-      };
-    },
-    range(start, end) {
-      const result = [];
-      for (let i = start; i < end; i++) {
-        result.push(i);
-      }
-      return result;
-    },
-  },
-};
-</script>
-
-<style scoped lang="less">
-.recordcomponent {
-  padding-top: 10px;
-  /deep/ .ant-form-item {
-    // margin-bottom: 0;
-    // display: flex;
-    // justify-content: start;
-    // align-items: flex-start;
-    margin-top: -16px;
-    .radiobox {
-      height: 40px;
-      display: flex;
-      align-items: center;
-    }
-    .ant-form-item-label > label {
-      color: #4d575e;
-    }
-    .ant-form-item-label {
-      line-height: 40px;
-      // margin-right: 8px;
-      .ant-form-item-no-colon {
-        font-size: 14px !important;
-        // text-shadow: 0px 0px 1px black;
-      }
-    }
-    .ant-calendar-picker-container-content {
-      width: 323px !important;
-    }
-    .ant-select-selection__rendered {
-      font-size: 14px;
-    }
-    .ant-input {
-      // width: 430px;
-      height: 32px;
-      font-size: 14px;
-      // border: none;
-      border: 1px solid #dddddd;
-      box-shadow: none !important;
-      &::placeholder {
-        color: #cdcdcd;
-      }
-      // background-color: #f6f6f6;
-    }
-    .ant-select-selection__rendered,
-    .ant-select-selection--single,
-    .ant-select {
-      height: 32px;
-      // border: none;
-      // border: 1px solid #dddddd;
-      line-height: 32px;
-      box-shadow: none !important;
-      border-color: #d9d9d9;
-      .ant-select-selection__placeholder {
-        line-height: 18px;
-        color: #cdcdcd;
-      }
-      /deep/ .ant-form-item-children {
-        line-height: 40px;
-
-        // display: flex !important;
-      }
-      &:hover {
-        border-color: #d9d9d9;
-      }
-      // &:focus {
-      //   border-color: #d9d9d9;
-      // }
-      // &:active {
-      //   border-color: #d9d9d9;
-      // }
-    }
-  }
-  // /deep/ .ant-calendar-picker {
-  //   border-color: #d9d9d9 !important;
-  //   &:hover {
-  //     border-color: #d9d9d9 !important;
-  //   }
-  // }
-  .upline {
-    position: absolute;
-    width: 100%;
-    height: 48px;
-    // margin-bottom: 20px;
-    // margin-left: 410px;
-    bottom: 0;
-    right: 0;
-    background-color: #fff;
-    box-shadow: 1px -5px 20px rgb(241, 241, 241);
-    > div {
-      // display: inline-block;
-      margin: 8px 35px 8px 20px;
-      display: flex;
-      justify-content: end;
-      // float: right;
-      // bottom: 0;
-      // right: 0;
-    }
-  }
-  /deep/ .ant-radio-wrapper {
-    margin-right: 16px;
-    span:last-child {
-      padding: 0 2px;
-    }
-  }
-  /deep/ .ant-radio-checked {
-    .ant-radio-input:focus {
-      box-shadow: none;
-    }
-    .ant-radio-inner {
-      border-color: #ff4400;
-      box-shadow: none;
-      &::after {
-        background-color: #ff4400 !important;
-      }
-    }
-  }
-  /deep/ .ant-radio {
-    border-color: #d9d9d9;
-    box-shadow: none;
-    &:after {
-      display: none;
-    }
-    &:hover .ant-radio-inner {
-      border-color: #ff4400 !important;
-      box-shadow: none;
-    }
-  }
-}
-</style>

src/components/FirstJob/components/timepicker.vue

@@ -126,6 +126,7 @@ export default {
       type: Boolean,
       default: true,
     },
+    baseColor: {},
   },
   data: () => ({
     label: {
@@ -426,6 +427,8 @@ export default {
 };
 </script>
 <style lang="less">
+@color: #ff4400;
+@bgColor: #fff3ef;
 .time-container {
   opacity: 1;
   transition: opacity 0.3s;
@@ -505,7 +508,7 @@ export default {
         padding-bottom: 5px;
         tr {
           margin-bottom: 5px;
-          background-color: #ff6a001a;
+          background-color: @bgColor;
           color: rgba(77, 87, 94);
           th {
             text-align: center;
@@ -582,13 +585,13 @@ export default {
           }
           td:not(.bggray):hover {
             div {
-              border: 1px solid #ff4400;
-              color: #ff4400;
+              border: 1px solid @color;
+              color: @color;
             }
           }
           td.active {
             div {
-              background: #ff4400;
+              background: @color;
               color: white !important;
               font-weight: bold;
             }
@@ -642,10 +645,10 @@ export default {
         margin: 0;
         margin-bottom: 6px;
         color: #4d575ecc;
-        background-color: #ff6a001a;
+        background-color: @bgColor;
         width: 48%;
         border-radius: 4px;
-        /* font-weight: 600; */
+        font-weight: 600;
         display: flex;
         height: 26px !important;
         line-height: 26px;
@@ -658,13 +661,17 @@ export default {
         span:last-child {
           margin-left: 0 !important;
         }
+        &:hover {
+          color: white;
+          background: @color;
+        }
       }
       // li:not(:last-child) {
       // border-bottom: solid 1px gainsboro;
       // }
       li.active {
         color: white;
-        background: #ff4400;
+        background: @color;
       }
     }
     .minutes-list {
@@ -672,43 +679,43 @@ export default {
     }
   }
 
-  .picker-footer {
-    display: block;
-    line-height: 42px;
-    text-align: right;
-    white-space: nowrap;
-    button {
-      outline: none;
-      border: solid 1px gainsboro;
-      border-radius: 2px;
-      text-align: center;
-      padding-left: 1px;
-      color: #8a8a8a;
-      height: 24px;
-      width: 50px;
-      line-height: 20px;
-      font-size: 12px;
-      margin-right: 12px;
-      background-color: #f3f3f3;
-      &:first-child {
-        background-color: #fff;
-        &:active,
-        &:hover {
-          border-color: #eee;
-          background-color: #eee;
-        }
-      }
-      &:last-child {
-        background-color: #ff4400;
-        border-color: #ff4400;
-        color: #fff;
-        &:active,
-        &:hover {
-          border-color: #ff4400;
-          background-color: #ff4400;
-        }
-      }
-    }
-  }
+  // .picker-footer {
+  // 	display: block;
+  // 	line-height: 42px;
+  // 	text-align: right;
+  // 	white-space: nowrap;
+  // 	button {
+  // 		outline: none;
+  // 		border: solid 1px gainsboro;
+  // 		border-radius: 2px;
+  // 		text-align: center;
+  // 		padding-left: 1px;
+  // 		color: #8a8a8a;
+  // 		height: 24px;
+  // 		width: 50px;
+  // 		line-height: 20px;
+  // 		font-size: 12px;
+  // 		margin-right: 12px;
+  // 		background-color: #f3f3f3;
+  // 		&:first-child {
+  // 			background-color: #fff;
+  // 			&:active,
+  // 			&:hover {
+  // 				border-color: #eee;
+  // 				background-color: #eee;
+  // 			}
+  // 		}
+  // 		&:last-child {
+  // 			background-color: @color;
+  // 			border-color: @color;
+  // 			color: #fff;
+  // 			&:active,
+  // 			&:hover {
+  // 				border-color: @color;
+  // 				background-color: @color;
+  // 			}
+  // 		}
+  // 	}
+  // }
 }
 </style>

src/components/FirstJob/detail.vue

@@ -109,12 +109,12 @@
         <router-link to="/main"><a-icon type="home" /></router-link>
       </a-breadcrumb-item>
       <a-breadcrumb-item href="">
-        <router-link to="/list">
+        <a @click="toList">
           <span>一手职位</span>
-        </router-link>
+        </a>
       </a-breadcrumb-item>
       <a-breadcrumb-item href="">
-        <span>企业详情</span>
+        <span style="color: #333">企业详情</span>
       </a-breadcrumb-item>
     </a-breadcrumb>
     <!-- 主体区域 -->
@@ -192,6 +192,13 @@
                   >{{ item }}</a-tag
                 >
               </div>
+              <div
+                style="height: 27px"
+                v-if="!jobDetail.jobSpecialLabelNames"
+                class="jobtag"
+              >
+                <a-tag style="backgroundcolor: #f5f5f5">暂无特色</a-tag>
+              </div>
               <div
                 style="
                   display: flex;
@@ -200,7 +207,15 @@
                   margin-top: 16px;
                 "
               >
-                <div class="jobpricehour">
+                <div
+                  class="jobpricehour"
+                  v-html="
+                    getSalaryClassifyValue(
+                      jobDetail.salaryClassify,
+                      jobDetail.salaryClassifyValue
+                    )
+                  "
+                >
                   <!-- <template v-if="jobDetail.hourlyPay"
                     ><span>{{ jobDetail.hourlyPay }}</span
                     >元/小时</template
@@ -209,12 +224,6 @@
                     ><span>{{ jobDetail.dayPay }}</span
                     >元/日</template
                   > -->
-                  {{
-                    getSalaryClassifyValue(
-                      jobDetail.salaryClassify,
-                      jobDetail.salaryClassifyValue
-                    )
-                  }}
                 </div>
                 <span style="font-size: 16px">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
                 <div class="jobpricemonth">
@@ -248,7 +257,7 @@
                 <span>{{ jobDetail.servetype }}</span>
               </div>
             </div>
-            <div class="bottombox">
+            <div class="sub-bottombox">
               <!-- <a-popover title="" trigger="click" placement="bottomRight">
 								
 								<a-button type="primary" class="jobDesp">职位详单</a-button>
@@ -294,13 +303,15 @@
               <!-- </template> -->
             </a-modal>
           </h1>
+          <div class="pay" id="tip" v-show="tabchange === 1">
+            <div class="mb12 mt20 titlestyle">温馨提示</div>
+            <div class="showInfo" style="width: unset">
+              {{ jobDetail.sweetTips || "-" }}
+            </div>
+          </div>
           <div v-if="tabchange === 1" style="display: flex">
             <!-- 薪资 -->
             <div class="baseInfoContent" v-if="tabchange === 1">
-              <div class="pay" id="tip">
-                <div class="mb12 mt20">温馨提示</div>
-                <div class="showInfo">{{ jobDetail.sweetTips || "-" }}</div>
-              </div>
               <div class="pay" id="pay">
                 <div class="mb12 mt20">薪资待遇</div>
                 <a-descriptions
@@ -588,7 +599,7 @@
               </div>
               <div class="otherInfo" id="other">
                 <div class="mb12 mt20">其他信息</div>
-                <div style="white-space: break-spaces; color: #666">
+                <div style="white-space: break-spaces">
                   {{ jobDetail.otherInfo || "-" }}
                 </div>
               </div>
@@ -605,8 +616,10 @@
           <!-- 财务结算 -->
           <div v-else>
             <div class="pay" id="tip">
-              <div class="mb12 mt20">代理须知</div>
-              <div class="showInfo">{{ jobDetail.agencyStatement || "-" }}</div>
+              <div class="mb12 mt20 titlestyle">代理须知</div>
+              <div class="showInfo" style="width: 640px">
+                {{ jobDetail.agencyStatement || "-" }}
+              </div>
             </div>
             <a-descriptions
               bordered
@@ -665,11 +678,12 @@
               是文案我很长很长我是文案我很 长很长 -->
             </p>
           </div>
-          <div class="companylocation">
+          <div class="companylocation" v-if="positionInfo.lng">
             <h1 class="bottombox"><i>企业位置</i></h1>
             <div class="imgbox">
               <!-- <GDMap/> -->
-              <img src="../../assets/map.png" alt="" />
+              <GDMap :positionInfo="positionInfo"></GDMap>
+              <!-- <img src="../../assets/map.png" alt="" /> -->
             </div>
           </div>
         </div>
@@ -694,15 +708,17 @@ import {
 } from "../../utils/commonUtil";
 import recommend from "../../components/FirstJob/components/recommend.vue";
 import { nationlist } from "../../utils/datalist";
-// import GDMap from '../map.vue'
+import GDMap from "../map.vue";
 // import recordbill from "@/components/FirstJob/components/recordbill.vue";
 import Clipboard from "clipboard";
+// import map from '../map.vue'
 export default {
   // 组件名称
   name: "",
   // 局部注册的组件
   components: {
     recommend,
+    GDMap,
     // GDMap
     // recordbill,
   },
@@ -715,10 +731,12 @@ export default {
       jobDetail: {},
       storeImage: [],
       storeInfo: {},
-      id: this.$route.params.id,
+      id: this.$route.query.id,
+      currentPageNum: this.$route.query.page,
       visible: false, // 录单模态框的展示
       xiangdanVisible: false, // 详单的弹出
       confirmLoading: false, // 录单提交的loading效果
+      positionInfo: {}, // 企业位置信息
       skeletonshow: true,
       tabchange: 1,
       nationlist,
@@ -767,7 +785,7 @@ export default {
   beforeCreate() {},
   created() {
     // console.log(this.$router.matcher.match());
-    console.log(this.$route.params); // 获取传过来的params数据
+    console.log(this.$route); // 获取传过来的params数据
     this.getJobDetail();
     // Object.defineProperties("window.opener", "sessionStorage", {
     //   LOGIN_DATA: {},
@@ -791,6 +809,10 @@ export default {
         if (data.status === 200) {
           console.log(data);
           this.jobDetail = disposeJobListData(data.data.storeJob);
+          this.positionInfo = data.data.store;
+          this.positionInfo.desc = this.positionInfo.detailPosition;
+          this.positionInfo.containerName = "mapContainer";
+          this.positionInfo.name = this.positionInfo.aliasName;
           this.skeletonshow = false;
           this.jobDetail.district = disposeJobListData(
             data.data.store
@@ -878,6 +900,8 @@ export default {
       // let userinfo = JSON.stringify(item);
       console.log(this.jobDetail);
       console.log(this.storeInfo);
+      this.storeInfo.currentPageNum = this.currentPageNum;
+      console.log(this.storeInfo);
       this.$router.push({ name: "recordbill", params: this.storeInfo });
       sessionStorage.setItem("CURRENT_FIRM", JSON.stringify(this.storeInfo));
     },
@@ -899,6 +923,15 @@ export default {
         this.$message.success("复制成功");
       });
     },
+    toList() {
+      // 跳转到列表页
+      this.$router.push({
+        name: "JobList",
+        params: {
+          pagenum: this.currentPageNum,
+        },
+      });
+    },
   },
 };
 </script>
@@ -908,7 +941,7 @@ export default {
   overflow: hidden;
   // border-top: 1px solid #eeefef;
 
-  background-color: #f6f6f6;
+  // background-color: #f6f6f6;
 }
 /deep/ .ant-form {
   // overflow: auto;
@@ -1008,14 +1041,14 @@ export default {
       // width: 914px;
       background-color: #fff;
       // height: 302px;
-      border-radius: 4px;
-      // border: 1px solid #eeefef;
+      // border-radius: 4px;
+      border: 1px solid #ededed;
       .subsetleft {
         display: flex;
         .imgbox {
-          width: 177px;
-          height: 177px;
-          margin-right: 16px;
+          width: 186px;
+          height: 186px;
+          margin-right: 20px;
           overflow: hidden;
           position: relative;
           // .slick-active {
@@ -1045,7 +1078,7 @@ export default {
           .ant-carousel {
             .slick-slide {
               text-align: center;
-              height: 177px;
+              height: 186px;
               // height: 160px;
               // line-height: 160px;
               // background: #364d79;
@@ -1078,22 +1111,21 @@ export default {
           .jobname {
             // margin: 12px 0;
             font-size: 20px;
-            font-weight: 400;
+            font-weight: 600;
             text-align: left;
-            color: #4d575e;
-            line-height: 20px;
+            color: #333;
+            line-height: 30px;
             // &:hover {
             //   color: #ff4400;
             // }
           }
           .jobinfo {
-            margin-top: 16px;
-            opacity: 0.5;
-            font-size: 16px;
+            margin-top: 12px;
+            font-size: 18px;
             font-weight: 400;
             text-align: left;
-            color: #4d575e;
-            line-height: 20px;
+            color: #999;
+            line-height: 26px;
           }
           .jobtag,
           .jobtag1 {
@@ -1105,18 +1137,19 @@ export default {
             // }
             span {
               margin-right: 8px;
-              font-size: 16px;
-              padding: 0px 6px;
+              font-size: 14px;
+              padding: 0px 12px;
               border: none;
-              height: 22px;
-              line-height: 21px;
+              height: 26px;
+              line-height: 26px;
               // background: rgba(51, 51, 51, 0.06);
-              border-radius: 4px;
+              // border-radius: 4px;
             }
           }
           .jobtag1 {
             span {
               background-color: #f5f5f5;
+              color: #666;
             }
           }
           .jobpricemonth {
@@ -1124,19 +1157,20 @@ export default {
             font-size: 18px;
             font-weight: 400;
             text-align: left;
-            color: #4d575e;
+            color: #666;
             line-height: 26px;
           }
           .jobpricehour {
             // margin-top: 16px;
-            font-size: 18px;
+            font-size: 16px;
             font-weight: normal;
             text-align: left;
             color: #ff4400;
             // line-height: 24px;
             span {
               vertical-align: baseline;
-              font-size: 20px;
+              font-weight: 600;
+              font-size: 22px;
               line-height: 26px;
             }
           }
@@ -1148,7 +1182,7 @@ export default {
               padding: 0 16px;
               height: 36px;
               margin-right: 20px;
-              border-radius: 4px;
+              // border-radius: 4px;
               background-color: rgba(254, 97, 0, 0.1);
               font-size: 18px;
               font-weight: normal;
@@ -1179,14 +1213,14 @@ export default {
               color: #fff;
               font-weight: normal;
               font-size: 18px;
-              border-radius: 4px;
+              // border-radius: 4px;
               text-align: center;
               line-height: 36px;
               cursor: pointer;
               &:hover {
                 color: #fff;
 
-                background-color: rgba(255, 121, 26);
+                background-color: #ff4400cc;
               }
             }
           }
@@ -1203,7 +1237,7 @@ export default {
           text-align: center;
           overflow: hidden;
           background: rgba(255, 106, 0, 0.1);
-          border-radius: 4px;
+          // border-radius: 4px;
           line-height: 30px;
           div {
             // font-weight: normal;
@@ -1221,7 +1255,7 @@ export default {
             font-size: 14px;
             color: #ffffff;
             border: 1px solid #ff4400;
-            border-radius: 4px 4px 0px 0px;
+            // border-radius: 4px 4px 0px 0px;
           }
           div:last-child {
             font-weight: normal;
@@ -1233,43 +1267,44 @@ export default {
             }
           }
         }
-        .bottombox {
+        .sub-bottombox {
+          font-size: 16px;
           .bottombox1 {
             width: 116px;
             height: 32px;
             line-height: 30px;
             font-size: 16px;
             // border: 1px solid rgba(77, 87, 94, 0.3);
-            border-radius: 4px;
+            // border-radius: 4px;
             border: 1px solid #ff4400;
             background-color: #fff;
-            color: rgba(255, 106, 0, 1);
+            color: #ff4400;
             cursor: pointer;
             &:hover {
               color: #fff;
 
-              background-color: rgba(255, 121, 26);
+              background-color: #ff4400;
             }
           }
-          .jobDesp {
-            width: 116px;
-            height: 32px;
-            line-height: 30px;
-            font-size: 16px;
-            margin-right: 20px;
-            // border: 1px solid rgba(77, 87, 94, 0.3);
-            border-radius: 4px;
-            border: 1px solid #ff4400;
-            background-color: #fff;
-            color: rgba(255, 106, 0, 1);
-            transition: none;
-            cursor: pointer;
-            &:hover {
-              color: #fff;
+          // .jobDesp {
+          // 	width: 116px;
+          // 	height: 32px;
+          // 	line-height: 30px;
+          // 	font-size: 16px;
+          // 	margin-right: 20px;
+          // 	// border: 1px solid rgba(77, 87, 94, 0.3);
+          // 	border-radius: 4px;
+          // 	border: 1px solid #ff4400;
+          // 	background-color: #fff;
+          // 	color: rgba(255, 106, 0, 1);
+          // 	transition: none;
+          // 	cursor: pointer;
+          // 	&:hover {
+          // 		color: #fff;
 
-              background-color: rgba(255, 121, 26);
-            }
-          }
+          // 		background-color: #ff791a;
+          // 	}
+          // }
         }
       }
     }
@@ -1285,8 +1320,8 @@ export default {
       width: 944px;
       // border: 1px solid #eeefef;
       overflow: hidden;
-      border-radius: 4px;
-      padding: 20px;
+      // border-radius: 4px;
+      padding: 20px 0;
       background-color: #fff;
 
       h1 {
@@ -1302,10 +1337,10 @@ export default {
             padding: 1px 12px 0 12px;
             margin-right: 6px;
             background-color: #fafafa;
-            border: 1px solid #e8e8e8;
+            border: 1px solid #ededed;
             border-bottom: none;
             cursor: pointer;
-            border-radius: 4px 4px 0 0;
+            // border-radius: 4px 4px 0 0;
           }
           .active {
             background-color: #fafafa;
@@ -1321,9 +1356,11 @@ export default {
     #tip,
     #other {
       div:last-child {
+        width: 640px;
         padding: 12px 16px;
         font-size: 16px;
-        border: 1px solid #e8e8e8;
+        border: 1px solid #ededed;
+        color: #333;
       }
     }
     .jobinformationbox {
@@ -1332,12 +1369,12 @@ export default {
         .copy {
           position: absolute;
           padding: 0px 12px;
-          right: 0px;
-          bottom: 12px;
+          right: 20px;
+          bottom: 4px;
           font-size: 14px;
           border: 1px solid #ff4400;
           color: #ff4400;
-          border-radius: 5px;
+          // border-radius: 5px;
           line-height: 22px;
           text-align: center;
           cursor: pointer;
@@ -1348,26 +1385,28 @@ export default {
         }
       }
       .navigation {
-        width: 55px !important;
-        margin-left: 25px;
-        margin-top: 154px;
+        position: relative;
+        flex: 1;
+        margin-top: 40px;
+        // width: 70px !important;
         .ant-affix {
-          left: calc(50% + 278px) !important; // 手动定位固定位置
+          left: calc(50% + 156px) !important; // 手动定位固定位置
         }
         .ant-anchor-wrapper {
           padding-left: 5px !important;
         }
         .ant-anchor-ink-ball {
           // border-color: #ff4400;
-          width: 10px;
-          height: 10px;
-          border: 2px solid #ff4400;
+          width: 12px;
+          height: 12px;
+          border: 3px solid #ff4400;
         }
         .ant-anchor-link {
-          padding: 7px 0 7px 12px !important;
+          padding: 10px 20px !important;
           a {
-            color: #787878;
+            color: #666;
             font-size: 18px;
+            font-weight: 600;
           }
         }
         .ant-anchor-link-active {
@@ -1379,27 +1418,30 @@ export default {
       }
 
       .baseInfoContent {
-        width: 840px;
+        width: 748px;
         > div {
           > div:first-child {
-            color: #4d575e;
-            font-weight: normal;
+            font-size: 16px;
+            color: #333;
+            font-weight: 600;
           }
         }
 
         .condition {
           .conditiontable {
             display: flex;
+            width: 640px;
             flex-direction: column;
             font-size: 16px;
-            border: 1px solid #e8e8e8;
+            border: 1px solid #ededed;
             > li {
               display: flex;
               align-items: center;
-              border-bottom: 1px solid #e8e8e8;
+              border-bottom: 1px solid #ededed;
               > div {
-                width: 120px;
+                width: 104px;
                 // font-weight: bold;
+                color: #666;
                 text-align: center;
               }
               &:last-child {
@@ -1409,7 +1451,7 @@ export default {
                 display: flex;
                 flex-direction: column;
                 justify-content: space-around;
-                border-left: 1px solid #e8e8e8;
+                border-left: 1px solid #ededed;
                 flex: 1;
 
                 li {
@@ -1417,22 +1459,24 @@ export default {
                   min-height: 44px;
                   width: 100%;
                   span:first-child {
-                    padding: 12px 15px;
+                    padding: 12px 16px;
                     width: 100px;
-                    border-right: 1px solid #e8e8e8;
+                    text-align: center;
+                    border-right: 1px solid #ededed;
+                    color: #666;
                     // font-weight: bold;
                   }
                   span:last-child {
                     flex: 1;
                     display: flex;
-                    color: #878787;
+                    color: #333;
                     padding: 12px 16px;
                     white-space: break-space;
                     align-items: center;
                   }
                 }
                 li:not(li:last-child) {
-                  border-bottom: 1px solid #e8e8e8;
+                  border-bottom: 1px solid #ededed;
                 }
               }
             }
@@ -1451,7 +1495,7 @@ export default {
       overflow: hidden;
       // height: 114px;
       // padding: 0 20px 0px 20px;
-      border-radius: 4px;
+      // border-radius: 4px;
       background-color: #fff;
       text-align: left;
       h1 {
@@ -1477,22 +1521,22 @@ export default {
       overflow: hidden;
       // height: 114px;
       padding: 0 20px 20px 20px;
-      border-radius: 4px;
+      // border-radius: 4px;
       background-color: #fff;
       text-align: center;
-      // border: 1px solid #eeefef;
+      border: 1px solid #ededed;
       p {
         font-size: 24px;
         color: #ff4400;
-        // font-weight: normal;
+        font-weight: 600;
         margin-top: 12px;
       }
     }
     .companyinfo {
       overflow: hidden;
       padding: 0 20px 20px 20px;
-      border-radius: 4px;
-      // border: 1px solid #eeefef;
+      // border-radius: 4px;
+      border: 1px solid #ededed;
       background-color: #fff;
 
       .companydetail {
@@ -1510,11 +1554,12 @@ export default {
         }
         .imgbox {
           // width: 230px;
+          display: flex;
+          align-items: center;
           height: 172px;
           margin-bottom: 12px;
           img {
             width: 100%;
-            height: 100%;
           }
         }
         p:last-of-type {
@@ -1544,7 +1589,18 @@ export default {
         }
       }
     }
+    .recommendposition {
+      border: 1px solid #ededed;
+    }
   }
+  .leftDesc {
+    .ant-descriptions-view {
+      width: 640px;
+      border-radius: 0px;
+      // border: 0 !important;
+    }
+  }
+
   .leftDesc.ant-descriptions-bordered table {
     // min-height: 352px !important;
     tbody {
@@ -1554,21 +1610,23 @@ export default {
     }
   }
   .leftDesc.ant-descriptions-bordered .ant-descriptions-item-label {
-    width: 120px;
-    text-align: left;
+    width: 104px;
+    text-align: center;
     font-weight: normal;
     background-color: #fff;
     font-size: 16px;
-    color: #4d575e;
+    color: #666;
     letter-spacing: 1px;
+    // padding: 8px 0px;
     /*vertical-align: baseline;*/
   }
 
   .leftDesc.ant-descriptions-bordered .ant-descriptions-item-content {
     white-space: break-spaces;
     text-align: left;
+    // padding-left: 8px;
     font-size: 16px;
-    color: #878787;
+    color: #333;
   }
   .boubleLevel
     > .ant-descriptions-view
@@ -1584,11 +1642,13 @@ export default {
     }
   }
   // .right
-  .showInfo {
-    white-space: pre-wrap;
-    word-break: break-all;
-    color: #ff4400;
-  }
+}
+.showInfo {
+  width: unset;
+  white-space: pre-wrap;
+  word-break: break-all;
+  line-height: 28px;
+  color: #ff4400 !important;
 }
 .hotTel {
   position: fixed;

src/components/FirstJob/recordBill.vue

@@ -6,12 +6,21 @@
         <router-link to="/main"><a-icon type="home" /></router-link>
       </a-breadcrumb-item>
       <a-breadcrumb-item href="">
-        <router-link to="/list" @click.native="toList">
+        <a @click="toList">
           <span>一手职位</span>
-        </router-link>
+        </a>
       </a-breadcrumb-item>
       <a-breadcrumb-item>
-        <router-link :to="'/detail/' + firminfo.id">
+        <router-link
+          :to="
+            '/detail?' +
+            'id=' +
+            firminfo.id +
+            '&' +
+            'page=' +
+            firminfo.currentPageNum
+          "
+        >
           <!-- <span @click="$router.back(-1)">企业详情</span> -->
           <span>企业详情</span>
         </router-link>
@@ -400,10 +409,8 @@
           :labelCol="{ span: 4 }"
         >
           <!-- <a-input v-model="form.policy" type='textarea'/> -->
-          <div class="policy" style="">
-            {{ form.policy }}
-          </div>
-          <div class="openContral">
+          <div class="policy" style="">{{ form.policy }}</div>
+          <div class="openContral" v-if="isContainerShow">
             <span v-if="isFold" @click="toFold(1)">展开</span
             ><span v-else @click="toFold(2)">收起</span>
           </div>
@@ -488,7 +495,7 @@ export default {
       storeStatus: "", // 企业选择的控制
       jobnameStatus: "", // 岗位选择的控制
       isContainerShow: false, // 政策展示控制按钮是否显示
-      isFold: false,
+      isFold: true,
       previewImage: "",
       isMaster: true,
       isShow: false,
@@ -625,6 +632,7 @@ export default {
     if (this.proxyinfo.roleOfPmd) {
       this.isMaster = true;
     }
+    console.log(this.firminfo);
     this.getProxyInfo(this.proxyinfo.id);
     this.getJob(this.firminfo);
     this.getPolicyByJobId(this.firminfo.id);
@@ -637,22 +645,6 @@ export default {
    * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
    */
   mounted() {
-    let that = this;
-    const policy = document.querySelector(".policy");
-    // this.$nextTick(()=>{
-    setTimeout(() => {
-      console.log(policy.offsetHeight);
-      if (policy.offsetHeight >= 230) {
-        policy.style.maxHeight = "230px";
-        policy.style.marginBottom = "24px";
-        that.isContainerShow = true;
-        that.isFold = true;
-      } else {
-        policy.style.minHeight = "230px";
-        that.isContainerShow = false;
-        that.isFold = false;
-      }
-    }, 200);
     // })
   },
   // 组件方法
@@ -663,6 +655,21 @@ export default {
         console.log(data);
         if (data.status === 200) {
           this.storeJobList = data.data;
+          let that = this;
+          const policy = document.querySelector(".policy");
+          // this.$nextTick(()=>{
+          setTimeout(() => {
+            console.log(policy.offsetHeight);
+            console.log(policy.innerHTML);
+            if (policy.offsetHeight >= 230) {
+              policy.style.maxHeight = "230px";
+              policy.style.marginBottom = "24px";
+              that.isContainerShow = true;
+            } else {
+              policy.style.minHeight = "230px";
+              that.isContainerShow = false;
+            }
+          }, 100);
         }
       } catch (error) {
         console.log(error);
@@ -692,7 +699,14 @@ export default {
         interviewTime: "", // 面试时间
         idCardImageUrl: "",
       };
-      this.$router.push("/detail/" + this.firminfo.id);
+      this.$router.push(
+        "/detail?" +
+          "id=" +
+          this.firminfo.id +
+          "&" +
+          "page=" +
+          this.firminfo.currentPageNum
+      );
     },
     handleOk() {
       this.$refs.ruleForm.validate(async (ispass, no) => {
@@ -954,7 +968,7 @@ export default {
     },
     async getProxyInfo(id) {
       const { data } = await getProxyInfoApi(id);
-      // console.log(data);
+      console.log(data);
       if (data.status === 200) {
         this.proxyList = data.data;
         this.proxyList.forEach((item) => {
@@ -1026,9 +1040,15 @@ export default {
       // }
     },
     toList() {
+      this.$router.push({
+        name: "JobList",
+        params: {
+          pagenum: this.firminfo.currentPageNum,
+        },
+      });
       // this.$router.go(0);
       // window.location.reload();
-      this.reload();
+      // this.reload();
     },
     getIdInfo(e) {
       if (e.target.value.length == 18) {
@@ -1080,6 +1100,7 @@ export default {
       display: flex;
       justify-content: start;
       button {
+        border-radius: 0;
         transition: none;
       }
       button:first-child {
@@ -1107,7 +1128,7 @@ export default {
   }
 }
 /deep/ .ant-radio {
-  border-color: #d9d9d9;
+  border-color: #ddd;
   box-shadow: none;
   &:after {
     display: none;
@@ -1177,7 +1198,7 @@ export default {
     padding: 0;
     border-color: #dddddd !important;
     box-sizing: border-box;
-    border-radius: 2px;
+    border-radius: 0px;
     &:hover {
       border-color: #ff4400 !important;
     }
@@ -1244,7 +1265,7 @@ export default {
   }
   .ant-input-affix-wrapper {
     &:hover .ant-input {
-      border-color: #d9d9d9;
+      border-color: #ddd;
     }
   }
   .radiobox {
@@ -1302,7 +1323,7 @@ export default {
     // border: none;
     // border: 1px solid #dddddd;
     box-shadow: none !important;
-    border-color: #d9d9d9;
+    border-color: #ddd;
     .ant-select-selection__placeholder {
       line-height: 17px;
       color: #cdcdcd;
@@ -1312,7 +1333,7 @@ export default {
       color: #666;
     }
     &:hover {
-      border-color: #d9d9d9;
+      border-color: #ddd;
     }
     // &:focus {
     //   border-color: #d9d9d9;
@@ -1351,7 +1372,8 @@ export default {
     position: unset;
     .policy {
       // position: relative;
-      padding: 0 16px;
+      padding: 0;
+      padding-top: 6px;
       // padding-bottom: 24px;
       white-space: pre-wrap;
       border-radius: 4px;
@@ -1370,7 +1392,7 @@ export default {
         position: absolute;
         width: 480px;
         height: 1px;
-        background-color: #eee;
+        background-color: #ededed;
         bottom: -10px;
         left: -445px;
       }
@@ -1382,242 +1404,261 @@ export default {
 
   // background-color: #ff4400;
 }
-/deep/ .date-picker {
-  .picker-content {
-    table {
-      width: 100%;
-      // padding: 4px !important;
-      margin: 4px 0;
-      border-collapse: separate;
-      border-spacing: 0;
-      font-size: 12px;
-      line-height: 20px !important;
-      .contain {
-        height: 2px;
-      }
-      thead {
-        padding-bottom: 5px;
-        tr {
-          margin-bottom: 5px;
-          background-color: #ff6a001a;
-          color: rgba(77, 87, 94);
-          th {
-            text-align: center;
-            font-weight: 600;
-            font-size: 14px;
-            line-height: 26px;
-            &:first-child {
-              border-radius: 4px 0 0 4px;
-            }
-            &:last-child {
-              border-radius: 0 4px 4px 0;
-            }
-          }
-        }
-      }
-      tbody {
-        margin-top: 10px;
-        tr {
-          td {
-            // height: 50px;
-            box-sizing: border-box;
-            color: rgba(77, 87, 94);
-            // font-weight: 600;
-            padding: 0 4px;
-            font-size: 14px;
-            cursor: pointer;
-            &:first-child {
-              border-radius: 4px 0 0 4px;
-            }
-            &:last-child {
-              border-radius: 0 4px 4px 0;
-            }
-            div {
-              border: 1px solid transparent;
-              position: relative;
-              width: 30px;
-              height: 26px;
-              line-height: 24px;
-              border-radius: 4px;
-              text-align: center;
-              margin: 0 2px;
-              z-index: 99;
-              box-sizing: border-box;
-            }
-          }
-          td.gray {
-            font-weight: 400;
-            color: rgba(138, 138, 138, 0.7);
-          }
-          td.bggray {
-            position: relative;
-            color: #ccc;
-            cursor: default;
+// /deep/ .date-picker {
+// 	.picker-content {
+// 		table {
+// 			width: 100%;
+// 			// padding: 4px !important;
+// 			margin: 4px 0;
+// 			border-collapse: separate;
+// 			border-spacing: 0;
+// 			font-size: 12px;
+// 			line-height: 20px !important;
+// 			.contain {
+// 				height: 2px;
+// 			}
+// 			thead {
+// 				padding-bottom: 5px;
+// 				tr {
+// 					margin-bottom: 5px;
+// 					background-color: #ff6a001a;
+// 					color: rgba(77, 87, 94);
+// 					th {
+// 						text-align: center;
+// 						font-weight: 600;
+// 						font-size: 14px;
+// 						line-height: 26px;
+// 						&:first-child {
+// 							border-radius: 4px 0 0 4px;
+// 						}
+// 						&:last-child {
+// 							border-radius: 0 4px 4px 0;
+// 						}
+// 					}
+// 				}
+// 			}
+// 			tbody {
+// 				margin-top: 10px;
+// 				tr {
+// 					td {
+// 						// height: 50px;
+// 						box-sizing: border-box;
+// 						color: rgba(77, 87, 94);
+// 						// font-weight: 600;
+// 						padding: 0 4px;
+// 						font-size: 14px;
+// 						cursor: pointer;
+// 						&:first-child {
+// 							border-radius: 4px 0 0 4px;
+// 						}
+// 						&:last-child {
+// 							border-radius: 0 4px 4px 0;
+// 						}
+// 						div {
+// 							border: 1px solid transparent;
+// 							position: relative;
+// 							width: 30px;
+// 							height: 26px;
+// 							line-height: 24px;
+// 							border-radius: 4px;
+// 							text-align: center;
+// 							margin: 0 2px;
+// 							z-index: 99;
+// 							box-sizing: border-box;
+// 						}
+// 					}
+// 					td.gray {
+// 						font-weight: 400;
+// 						color: rgba(138, 138, 138, 0.7);
+// 					}
+// 					td.bggray {
+// 						position: relative;
+// 						color: #ccc;
+// 						cursor: default;
 
-            &::after {
-              content: "";
-              position: absolute;
-              display: block;
-              width: 100%;
-              height: 26px;
-              background-color: #f5f5f5;
-              top: 50%;
-              transform: translateY(-50%);
-              left: 0;
-              z-index: 9;
-            }
-          }
+// 						&::after {
+// 							content: "";
+// 							position: absolute;
+// 							display: block;
+// 							width: 100%;
+// 							height: 26px;
+// 							background-color: #f5f5f5;
+// 							top: 50%;
+// 							transform: translateY(-50%);
+// 							left: 0;
+// 							z-index: 9;
+// 						}
+// 					}
 
-          .bggray:first-child::after {
-            border-radius: 4px 0 0 4px;
-          }
-          .bggray:last-of-type::after {
-            border-radius: 0 4px 4px 0;
-          }
-          td:not(.bggray):hover {
-            div {
-              border: 1px solid #ff4400;
-              color: #ff4400;
-            }
-          }
-          td.active {
-            div {
-              background: #ff4400;
-              color: white !important;
-              font-weight: bold;
-            }
-          }
-        }
-      }
-    }
-  }
+// 					.bggray:first-child::after {
+// 						border-radius: 4px 0 0 4px;
+// 					}
+// 					.bggray:last-of-type::after {
+// 						border-radius: 0 4px 4px 0;
+// 					}
+// 					td:not(.bggray):hover {
+// 						div {
+// 							border: 1px solid #ff4400;
+// 							color: #ff4400;
+// 						}
+// 					}
+// 					td.active {
+// 						div {
+// 							background: #ff4400;
+// 							color: white !important;
+// 							font-weight: bold;
+// 						}
+// 					}
+// 				}
+// 			}
+// 		}
+// 	}
 
-  .picker-content1:extend(.picker-content all) {
-    // &: extend ;
-    display: flex;
-    flex-direction: row;
-    table {
-      width: calc(100% - 40px);
-      margin-right: 4px;
-      // border-right: 1px solid #eee;
-    }
-    .hour-list {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: space-between;
-      border-left: 1px solid #eee;
-      list-style: none;
-      padding: 5px 2px 0 4px;
-      margin: 0;
-      height: 100%;
-      overflow-x: hidden;
-      width: 300px;
-      font-size: 12px;
-      overflow-y: auto;
-      &::-webkit-scrollbar {
-        /*滚动条整体样式*/
-        width: 0px !important; /*高宽分别对应横竖滚动条的尺寸*/
-        height: 4px;
-      }
-      &::-webkit-scrollbar-thumb {
-        /*滚动条里面小方块*/
-        border-radius: 5px;
-        // -webkit-box-shadow: inset 0 0 5px rgba(126, 126, 126, 0.06);
-        background: #ddd !important;
-      }
-      // &::-webkit-scrollbar-track {
-      //   /*滚动条里面轨道*/
-      //   -webkit-box-shadow: inset 0 0 5px rgba(112, 112, 112, 0.06);
-      //   border-radius: 0;
-      //   background: rgba(0, 0, 0, 0.1);
-      // }
-      li {
-        padding: 0;
-        margin: 0;
-        margin-bottom: 6px;
-        color: #4d575ecc;
-        font-weight: 600;
-        background-color: #ff6a001a;
-        width: 48%;
-        border-radius: 4px;
-        /* font-weight: 600; */
-        display: flex;
-        height: 26px !important;
-        line-height: 26px;
-        font-size: 14px;
-        justify-content: center;
-        align-items: center;
-        padding: 0 4px;
-        height: 26px;
-        cursor: pointer;
-        span:last-child {
-          margin-left: 0 !important;
-        }
-        &:hover {
-          color: white;
-          background: #ff4400;
-        }
-      }
-      // li:not(:last-child) {
-      // border-bottom: solid 1px gainsboro;
-      // }
+// 	.picker-content1:extend(.picker-content all) {
+// 		// &: extend ;
+// 		display: flex;
+// 		flex-direction: row;
+// 		table {
+// 			width: calc(100% - 40px);
+// 			margin-right: 4px;
+// 			// border-right: 1px solid #eee;
+// 		}
+// 		.hour-list {
+// 			display: flex;
+// 			flex-wrap: wrap;
+// 			justify-content: space-between;
+// 			border-left: 1px solid #eee;
+// 			list-style: none;
+// 			padding: 5px 2px 0 4px;
+// 			margin: 0;
+// 			height: 100%;
+// 			overflow-x: hidden;
+// 			width: 300px;
+// 			font-size: 12px;
+// 			overflow-y: auto;
+// 			&::-webkit-scrollbar {
+// 				/*滚动条整体样式*/
+// 				width: 0px !important; /*高宽分别对应横竖滚动条的尺寸*/
+// 				height: 4px;
+// 			}
+// 			&::-webkit-scrollbar-thumb {
+// 				/*滚动条里面小方块*/
+// 				border-radius: 5px;
+// 				// -webkit-box-shadow: inset 0 0 5px rgba(126, 126, 126, 0.06);
+// 				background: #ddd !important;
+// 			}
+// 			// &::-webkit-scrollbar-track {
+// 			//   /*滚动条里面轨道*/
+// 			//   -webkit-box-shadow: inset 0 0 5px rgba(112, 112, 112, 0.06);
+// 			//   border-radius: 0;
+// 			//   background: rgba(0, 0, 0, 0.1);
+// 			// }
+// 			li {
+// 				padding: 0;
+// 				margin: 0;
+// 				margin-bottom: 6px;
+// 				color: #4d575ecc;
+// 				font-weight: 600;
+// 				background-color: #ff6a001a;
+// 				width: 48%;
+// 				border-radius: 4px;
+// 				/* font-weight: 600; */
+// 				display: flex;
+// 				height: 26px !important;
+// 				line-height: 26px;
+// 				font-size: 14px;
+// 				justify-content: center;
+// 				align-items: center;
+// 				padding: 0 4px;
+// 				height: 26px;
+// 				cursor: pointer;
+// 				span:last-child {
+// 					margin-left: 0 !important;
+// 				}
+// 				&:hover {
+// 					color: white;
+// 					background: #ff4400;
+// 				}
+// 			}
+// 			// li:not(:last-child) {
+// 			// border-bottom: solid 1px gainsboro;
+// 			// }
 
-      .active {
-        color: white;
-        background: #ff4400;
-      }
-    }
-    .minutes-list {
-      width: 60px;
-    }
-  }
+// 			.active {
+// 				color: white;
+// 				background: #ff4400;
+// 			}
+// 		}
+// 		.minutes-list {
+// 			width: 60px;
+// 		}
+// 	}
 
-  .picker-footer {
-    display: block;
-    line-height: 42px;
-    text-align: right;
-    white-space: nowrap;
-    button {
-      outline: none;
-      border: solid 1px gainsboro;
-      border-radius: 2px;
-      text-align: center;
-      padding-left: 1px;
-      color: #8a8a8a;
-      height: 24px;
-      width: 50px;
-      line-height: 20px;
-      font-size: 12px;
-      margin-right: 12px;
-      background-color: #f3f3f3;
-      &:first-child {
-        background-color: #fff;
-        &:active,
-        &:hover {
-          border-color: #eee;
-          background-color: #eee;
-        }
-      }
-      &:last-child {
-        background-color: #ff4400;
-        border-color: #ff4400;
-        color: #fff;
-        &:active,
-        &:hover {
-          border-color: #ff4400;
-          background-color: #ff4400;
-        }
-      }
-    }
-  }
-}
+// 	.picker-footer {
+// 		display: block;
+// 		line-height: 42px;
+// 		text-align: right;
+// 		white-space: nowrap;
+// 		button {
+// 			outline: none;
+// 			border: solid 1px gainsboro;
+// 			border-radius: 2px;
+// 			text-align: center;
+// 			padding-left: 1px;
+// 			color: #8a8a8a;
+// 			height: 24px;
+// 			width: 50px;
+// 			line-height: 20px;
+// 			font-size: 12px;
+// 			margin-right: 12px;
+// 			background-color: #f3f3f3;
+// 			&:first-child {
+// 				background-color: #fff;
+// 				&:active,
+// 				&:hover {
+// 					border-color: #eee;
+// 					background-color: #eee;
+// 				}
+// 			}
+// 			&:last-child {
+// 				background-color: #ff4400;
+// 				border-color: #ff4400;
+// 				color: #fff;
+// 				&:active,
+// 				&:hover {
+// 					border-color: #ff4400;
+// 					background-color: #ff4400;
+// 				}
+// 			}
+// 		}
+// 	}
+// }
 /deep/ .time-input {
   margin-bottom: 16px;
   .ant-input {
     font-size: 20px !important;
+    border-radius: 0px;
+    -webkit-text-stroke-width: 0.5px;
+    font-weight: 400;
     &::placeholder {
       font-size: 14px;
+      -webkit-text-stroke-width: 0.1px;
     }
   }
+  .ant-input-suffix {
+    right: 16px;
+  }
+  .anticon-close-circle {
+    width: 24px;
+    height: 24px;
+    line-height: 28px;
+    margin-right: 8px;
+  }
+}
+.ant-input {
+  border-radius: 0px;
+}
+/deep/ .ant-select-selection {
+  border-radius: 0px !important;
 }
 </style>

src/components/Login/login.vue

@@ -3,7 +3,7 @@
     <div class="formcontainer">
       <div class="logo">
         <svg class="icon" aria-hidden="true">
-          <use xlink:href="#icon-dingbulogo"></use>
+          <use xlink:href="#icon-yishoudanlogo"></use>
         </svg>
       </div>
       <ul class="loginchange centerall">
@@ -427,10 +427,10 @@ export default {
         display: none;
       }
       &:hover {
-        background-color: rgba(255, 106, 0, 0.8);
+        background-color: #ff4400cc;
       }
       &:active {
-        background-color: rgba(234, 99, 2, 0.9);
+        background-color: #ff4400;
       }
     }
     .register {

src/components/main/index.vue

@@ -170,9 +170,9 @@ export default {
     return {
       isshow: false,
       imglist: [
-        require("../../assets/banner1.png"),
-        require("../../assets/banner2.png"),
-        require("../../assets/banner3.png"),
+        "http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/newBanner/banner1.png",
+        "http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/newBanner/banner2.png",
+        "http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/newBanner/banner3.png",
       ],
       cooperativeImg: [],
       isLogin: false,
@@ -258,12 +258,12 @@ export default {
     position: relative;
     overflow: hidden;
     width: 100vw;
-    height: calc(100% - 80px);
+    height: calc(100% - 32px);
     // height: 100%;
     // background: url("../../assets/banner1.png") no-repeat center;
     img {
       width: 100% !important;
-      height: calc(100vh - 80px);
+      height: calc(100vh - 32px);
     }
     .middleslogan {
       position: absolute;

src/components/main/index1.vue

@@ -1,473 +0,0 @@
-<template>
-  <!-- 首页页面 -->
-  <div class="main-container">
-    <div class="bgimg">
-      <a-carousel :autoplay="true" effect="fade" :dots="false" ref="scrollimg">
-        <img :src="item" alt="" v-for="(item, index) in imglist" :key="index" />
-      </a-carousel>
-      <div class="middleslogan" :style="{ opacity: isshow ? '1' : '0' }">
-        <i class="iconfont icon-yigezhuanmenfuwudailidepingtai"></i>
-      </div>
-      <div
-        id="toAboutBill"
-        style="height: 84px; width: 1200px; position: absolute; bottom: 0"
-      ></div>
-      <!-- <div class="bottominfo">
-				Copyright © 2015 - 2022 Matripe. All Rights Reserved. <i></i>
-				<a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">京ICP备16043923号-9</a>
-			</div> -->
-    </div>
-    <div class="navigationBar" ref="navigationBar" id="navigationBar">
-      <!-- <ul>
-				<li @click="toTargetLocation('aboutBill')">关于一手单</li>
-				<li @click="toTargetLocation('cooperativeBrand')">合作品牌</li>
-				<li @click="toTargetLocation('businessLandscape')">业务版图</li>
-				<li @click="toTargetLocation('relationUs')">联系我们</li>
-			</ul> -->
-      <a-anchor :affix="true">
-        <a-anchor-link
-          @click.native.prevent=""
-          href="#toAboutBill"
-          title="关于一手单"
-        />
-        <a-anchor-link
-          @click.native.prevent=""
-          href="#cooperativeBrand"
-          title="合作品牌"
-        />
-        <a-anchor-link
-          @click.native.prevent=""
-          href="#businessLandscape"
-          title="业务版图"
-        />
-        <a-anchor-link
-          @click.native.prevent=""
-          href="#relationUs"
-          title="联系我们"
-        />
-      </a-anchor>
-    </div>
-
-    <div class="aboutBill" id="aboutBill">
-      <div class="w">
-        <div class="title">关于一手单</div>
-        <div class="content">
-          <p>
-            伯才一手单，隶属于郑州伯才人力科技有限公司，是一个专门服务同业合作伙伴的综合平台——一个专门服务代理的平台，平台为合作伙伴提供交付全流程的产品和服务，是伯才供应链产品矩阵中的旗舰产品，平台通过直签、联合派遣和战略合作等方式，严选上线项目，深度介入服务的每一个环节，为合作伙伴的顺利交付保驾护航。
-          </p>
-          <p>
-            郑州伯才人力科技有限公司，是一家人力资源服务行业的数字化平台企业，前身为北京矩阵动力科技有公司。项目与2015年5月在郑州启动，并于2016年5月在背景正式注册成立公司，开始公司化运作。旗下有人海（北京）企业管理有限公司、江西人海企业管理有限公司等多家企业服务业务公司。2021年启用全新业务品牌——伯才。新品牌、新里程，品牌升级，但初心不变，伯才人以崭新的面貌更好的服务老乡、成就伙伴
-          </p>
-        </div>
-      </div>
-    </div>
-    <div class="cooperativeBrand" id="cooperativeBrand">
-      <div class="w">
-        <div class="title">合作品牌</div>
-        <div class="content">
-          <ul class="clearfix">
-            <li v-for="item in cooperativeImg" :key="item">
-              <img :src="`../../../${item}`" alt="" />
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-    <div class="businessLandscape" id="businessLandscape">
-      <div class="w">
-        <div class="title">业务版图</div>
-        <div class="content">
-          <div class="left">
-            <p>合作项目覆盖</p>
-            <p>
-              华东、华南、华中、华北、西南、西北6大区域辐射18个省及直辖市，触达城市100+
-            </p>
-          </div>
-          <div class="right">
-            <img src="../../../static/img/map.svg" alt="" />
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="relationUs" id="relationUs">
-      <div class="w">
-        <div class="title">联系我们</div>
-        <div class="content">
-          <div class="left">
-            <p>总部地址：郑州市管城回族区东站南街升龙广场2号楼A座1116室</p>
-            <p>接待地址：伯才人力资源服务中心（航空港区店）</p>
-            <p>联系电话：168 3666 8888</p>
-          </div>
-          <div class="right">
-            <span
-              ><img src="../../../static/img/【伯才一手单】公众号.png" alt="" />
-              <p>伯才一手单公众号</p></span
-            >
-            <span
-              ><img src="../../../static/img/【伯才一手单】小程序.png" alt="" />
-              <p>伯才一手单小程序</p></span
-            >
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="banner">
-      <div class="w">
-        <i class="iconfont icon-yigezhuanmenfuwudailidepingtai"></i>
-      </div>
-    </div>
-    <footer>
-      <div class="w">
-        <!-- <ul>
-          <li @click="totop"><router-link to="/list">一手职位</router-link></li>
-          <li></li>
-          <li @click="totop">
-            <router-link to="/serviceoutlets">服务网点</router-link>
-          </li>
-          <li></li>
-          <li @click="totop">
-            <router-link to="/aboutus">关于我们</router-link>
-          </li>
-        </ul> -->
-        <div>
-          Copyright © 2015 - 2022 Matripe. All Rights Reserved. <i></i>
-          <a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index"
-            >京ICP备16043923号-9</a
-          >
-        </div>
-      </div>
-    </footer>
-  </div>
-</template>
-
-<script>
-import Vue from "vue";
-
-import { animate } from "popmotion";
-const path = require("path");
-const files = require.context("../../../static/img", false, /.png$/);
-
-// const modules = {}
-
-console.dir(Vue);
-export default {
-  // 组件名称
-  name: "Main",
-  // 局部注册的组件
-  components: {},
-  // 组件参数 接收来自父组件的数据
-  props: {},
-  // 组件状态值
-  data() {
-    return {
-      isshow: false,
-      imglist: [
-        require("../../assets/banner1.png"),
-        require("../../assets/banner2.png"),
-        require("../../assets/banner3.png"),
-      ],
-      cooperativeImg: [],
-    };
-  },
-  // 计算属性
-  computed: {},
-  // 侦听器
-  watch: {},
-  // 生命周期钩子   注：没用到的钩子请自行删除
-  /**
-   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
-   */
-  created() {
-    setTimeout(() => {
-      this.isshow = true;
-    }, 500);
-  },
-  /**
-   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
-   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
-   */
-  mounted() {
-    this.getCooperativeImg();
-    // console.log(navigationBar);
-  },
-  // 组件方法
-  methods: {
-    changeStyle(e) {
-      console.log(e);
-      console.log(1);
-    },
-
-    getCooperativeImg() {
-      files.keys().forEach((key) => {
-        const names = path.basename(key, ".png"); //返回文件名 不含后缀名
-        let content = files(key).default || files(key);
-        if (
-          names.indexOf("imgList") != -1 &&
-          names.substr(names.length - 1, 1) == "1"
-        ) {
-          this.cooperativeImg.push(content);
-        }
-      });
-    },
-    toTargetLocation(target) {
-      // console.log(123);
-      const now = window.scrollY;
-      // 2. 目标位置（文章信息区域的高度）
-      const dist = document.getElementById(target).getBoundingClientRect().top;
-      console.log(dist);
-      animate({
-        from: now, // 当前的位置
-        to: dist, // 目标位置
-        onUpdate: (latest) => window.scrollTo(0, latest),
-      });
-    },
-    totop() {
-      // console.log(window);
-      document.body.scrollTop = 0;
-      document.documentElement.scrollTop = 0;
-      // window.body.scrollY = 0;
-    },
-  },
-};
-</script>
-
-<style scoped lang="less">
-.clearfix:after {
-  /*伪元素是行内元素 正常浏览器清除浮动方法*/
-  content: "";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
-}
-.main-container {
-  overflow: hidden;
-  .bgimg {
-    position: relative;
-    overflow: hidden;
-    width: 100vw;
-    height: calc(100% - 80px);
-    // height: 100%;
-    height: calc(100vh - 80px);
-    // background: url("../../assets/banner1.png") no-repeat center;
-    img {
-      width: 1920px !important;
-      height: calc(100vh - 80px);
-    }
-    .middleslogan {
-      position: absolute;
-      top: 40%;
-      left: 50%;
-      transform: translateX(-50%) translateY(-50%);
-      color: #fff;
-      z-index: 99;
-      transition: all 1.5s;
-      i {
-        font-size: 90px;
-        text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.4);
-      }
-    }
-    .bottominfo {
-      position: absolute;
-      bottom: 40px;
-      left: 50%;
-      font-size: 14px;
-      transform: translateX(-50%);
-      color: #fff;
-    }
-  }
-  /deep/ .navigationBar {
-    overflow: hidden;
-    width: 1200px;
-    height: 84px;
-    position: absolute;
-    bottom: 0;
-    left: 50%;
-    border-radius: 8px 8px 0 0;
-    overflow: hidden;
-    transform: translateX(-50%);
-    z-index: 999;
-    .ant-anchor {
-      display: flex;
-      height: 84px;
-      margin: 0 auto;
-      justify-content: center;
-      align-items: center;
-      background-color: #fff;
-      > div {
-        margin: 0 52px;
-        font-size: 16px;
-      }
-      .ant-anchor-link-active > .ant-anchor-link-title {
-        color: #ff4400;
-      }
-      .ant-anchor-ink {
-        display: none;
-      }
-    }
-  }
-  .aboutBill,
-  .cooperativeBrand,
-  .businessLandscape,
-  .relationUs {
-    padding-top: 25px;
-    padding-bottom: 70px;
-    background-color: #fff;
-    .title {
-      position: relative;
-      text-align: center;
-      font-size: 24px;
-      line-height: 33px;
-      padding-bottom: 12px;
-      &:after {
-        content: "";
-        display: block;
-        width: 30px;
-        height: 2px;
-        position: absolute;
-        background-color: #ff4400;
-        bottom: 0;
-        left: 50%;
-        transform: translateX(-50%);
-      }
-    }
-    .content {
-      margin-top: 50px;
-      font-size: 18px;
-      line-height: 40px;
-      > p {
-        margin-bottom: 20px;
-      }
-    }
-  }
-  .cooperativeBrand {
-    padding-top: 100px;
-    // padding-bottom: 96px;
-    height: 740px;
-    background: url("../../../static/img/cooperativeBrandBg.png") no-repeat 100%;
-    .content {
-      ul {
-        li {
-          float: left;
-          width: 186px;
-          height: 88px;
-          margin-top: 16px;
-          border-radius: 8px;
-          &:not(li:nth-child(6n)) {
-            margin-right: 16px;
-          }
-
-          &:hover {
-            background-color: #fff;
-            box-shadow: 0px 0px 12px 3px #ddd;
-          }
-          img {
-            width: 100%;
-            height: 100%;
-          }
-        }
-      }
-    }
-  }
-  .businessLandscape {
-    .title {
-      margin-top: 80px;
-    }
-    .content {
-      display: flex;
-      justify-content: space-between;
-      .left {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        width: 330px;
-        font-size: 20px;
-        p:last-child {
-          font-size: 16px;
-        }
-      }
-    }
-  }
-  .relationUs {
-    background: url("../../../static/img/relationUsBg.png") no-repeat 100% 100%;
-    padding-bottom: 126px;
-    .title {
-      padding-top: 80px;
-    }
-    .content {
-      display: flex;
-      justify-content: space-between;
-      margin-top: 72px;
-      .left {
-        // display: flex;
-      }
-      .right {
-        display: flex;
-        justify-content: space-around;
-        > span {
-          text-align: center;
-          margin-right: 36px;
-        }
-      }
-    }
-  }
-  .banner {
-    height: 72px;
-    margin-top: 20px;
-    background-color: #ff4400;
-    margin-bottom: -20px;
-    .w {
-      display: flex;
-      height: 100%;
-      justify-content: center;
-      align-items: center;
-      i {
-        font-size: 32px;
-        color: #fff;
-      }
-      img:last-child {
-        width: 173px;
-        height: 42px;
-        margin-right: 110px;
-      }
-    }
-    // background-color: black;
-  }
-  footer {
-    padding: 30px;
-    margin-top: 20px;
-    .w {
-      ul {
-        display: flex;
-        justify-content: center;
-        li {
-          font-size: 16px;
-          text-align: center;
-          color: #4d575e;
-          line-height: 25px;
-        }
-        li:nth-of-type(2n) {
-          width: 1px;
-          height: 20px;
-          margin: 5px 54px;
-          background-color: #4d575e;
-        }
-      }
-      div {
-        text-align: center;
-        // margin-top: 16px;
-        color: #4d575e;
-        font-size: 14px;
-        i {
-          display: inline-block;
-          vertical-align: middle;
-          width: 1px;
-          height: 16px;
-          margin: 0 10px;
-          background-color: #4d575e;
-        }
-      }
-    }
-  }
-}
-</style>

src/components/map.vue

@@ -1,28 +1,37 @@
 <template>
-  <div id="wrap" class="my-map">
-    <div id="container"></div>
+  <!-- 
+    :positionInfo="{
+      lng: 113.863823,
+      lat: 34.571367,
+      name: '服务中心',
+      desc: '河南省郑州市航空港区相州街29-60号（豫康新城-北区）',
+      containerName: 'mapContainer1',
+      picUrl:require('../../assets/bcSVG/服务中心.png')
+    }"
+ -->
+  <div :id="positionInfo.containerName">
+    <!-- <img :src="positionInfo.picUrl" alt="" v-show="isMapContainer" /> -->
+    <!-- <img src="../assets/bcSVG/服务中心.png" alt="" v-show="isMapContainer" /> -->
   </div>
 </template>
-<script
-  type="text/javascript"
-  src="https://webapi.amap.com/maps?v=1.4.15&key=44f4591aabba558514366f6e55f8d20e"
-></script>
-<script>
-window._polygon = []; //这些玩意用不着放data里
-window._markerList = [];
-
-import AMap from "AMap";
 
+<script>
 export default {
   // 组件名称
   name: "",
   // 局部注册的组件
   components: {},
   // 组件参数 接收来自父组件的数据
-  props: {},
+  props: {
+    positionInfo: {
+      require: true,
+    },
+  },
   // 组件状态值
   data() {
-    return {};
+    return {
+      isMapContainer: false,
+    };
   },
   // 计算属性
   computed: {},
@@ -32,59 +41,206 @@ export default {
   /**
    * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
    */
+  beforeCreate() {
+    let that = this;
+    var script = document.createElement("script");
+    script.type = "text/javascript";
+    script.src =
+      "https://webapi.amap.com/maps?v=1.4.15&key=44f4591aabba558514366f6e55f8d20e"; // 高德地图
+    document.body.appendChild(script);
+    setTimeout(function () {
+      var infoWindow,
+        map,
+        level = 12,
+        // center = { lng: 113.772207, lat: 34.757083 },
+        center = { lng: that.positionInfo.lng, lat: that.positionInfo.lat },
+        // features = [
+        // 	{
+        // 		icon: "cir",
+        // 		color: "red",
+        // 		name: "伯才科技有限公司",
+        // 		desc: "河南省郑州市郑东新区升龙广场2号楼A座",
+        // 		lnglat: {
+        // 			Q: 34.75720614600168,
+        // 			R: 113.77201218992474,
+        // 			lng: 113.772207,
+        // 			lat: 34.757083,
+        // 		},
+        // 		offset: { x: -9, y: -31 },
+        // 		type: "Marker",
+        // 	},
+        // ];
+        features = [
+          {
+            icon: "cir",
+            color: "red",
+            name: that.positionInfo.name,
+            desc: that.positionInfo.desc,
+            lnglat: {
+              Q: that.positionInfo.lat,
+              R: that.positionInfo.lng,
+              lng: that.positionInfo.lng,
+              lat: that.positionInfo.lat,
+            },
+            offset: { x: -9, y: -31 },
+            type: "Marker",
+          },
+        ];
+      function loadFeatures() {
+        for (
+          var feature, data, i = 0, len = features.length, j, jl, path;
+          i < len;
+          i++
+        ) {
+          data = features[i];
+          switch (data.type) {
+            case "Marker":
+              feature = new AMap.Marker({
+                map: map,
+                position: new AMap.LngLat(data.lnglat.lng, data.lnglat.lat),
+                zIndex: 3,
+                extData: data,
+                offset: new AMap.Pixel(data.offset.x, data.offset.y),
+                title: data.name,
+                content:
+                  '<div class="icon icon-' +
+                  data.icon +
+                  " icon-" +
+                  data.icon +
+                  "-" +
+                  data.color +
+                  '"></div>',
+              });
+              break;
+            case "Polyline":
+              for (j = 0, jl = data.path.length, path = []; j < jl; j++) {
+                path.push(new AMap.LngLat(data.path[j].lng, data.path[j].lat));
+              }
+              feature = new AMap.Polyline({
+                map: map,
+                path: path,
+                extData: data,
+                zIndex: 2,
+                strokeWeight: data.strokeWeight,
+                strokeColor: data.strokeColor,
+                strokeOpacity: data.strokeOpacity,
+              });
+              break;
+            case "Polygon":
+              for (j = 0, jl = data.path.length, path = []; j < jl; j++) {
+                path.push(new AMap.LngLat(data.path[j].lng, data.path[j].lat));
+              }
+              feature = new AMap.Polygon({
+                map: map,
+                path: path,
+                extData: data,
+                zIndex: 1,
+                strokeWeight: data.strokeWeight,
+                strokeColor: data.strokeColor,
+                strokeOpacity: data.strokeOpacity,
+                fillColor: data.fillColor,
+                fillOpacity: data.fillOpacity,
+              });
+              break;
+            default:
+              feature = null;
+          }
+          if (feature) {
+            AMap.event.addListener(feature, "click", mapFeatureClick);
+            var infoWindow = new AMap.InfoWindow({
+              content:
+                "<div class='myinfowindow'><h5>" +
+                that.positionInfo.name +
+                "</h5><div>" +
+                that.positionInfo.desc +
+                "</div></div>", //信息窗体的内容
+              offset: new AMap.Pixel(1, -20),
+            });
+            infoWindow.open(map, feature.getPosition());
+          }
+        }
+      }
+      function mapFeatureClick(e) {
+        if (!infoWindow) {
+          infoWindow = new AMap.InfoWindow({ autoMove: true, isCustom: false });
+        }
+        var extData = e.target.getExtData();
+        infoWindow.setContent(
+          "<div class='myinfowindow'><h5>" +
+            extData.name +
+            "</h5><div>" +
+            extData.desc +
+            "</div></div>"
+        );
+        infoWindow.open(map, e.lnglat);
+      }
+      // mapFeatureClick()
+      map = new AMap.Map(that.positionInfo.containerName, {
+        center: new AMap.LngLat(center.lng, center.lat),
+        level: level,
+        keyboardEnable: true,
+        dragEnable: true,
+        scrollWheel: true,
+        doubleClickZoom: true,
+      });
+      console.log(map);
+      loadFeatures();
+      map.on("complete", function () {
+        map.plugin(
+          ["AMap.ToolBar", "AMap.OverView", "AMap.Scale"],
+          function () {
+            // map.addControl(new AMap.ToolBar({ ruler: true, direction: true, locate: false }));
+            map.addControl(new AMap.OverView({ isOpen: false }));
+            map.addControl(new AMap.Scale());
+          }
+        );
+      });
+    }, 200);
+    setTimeout(() => {
+      console.log(that.positionInfo.containerName);
+      let map1 = document.querySelector("#" + that.positionInfo.containerName);
+      // let map2 = document.querySelector("#mapContainer1");
+      console.log(map1);
+      console.log(map1.childNodes.length);
+      // console.log(map2.childNodes.length);
+      if (map1.childNodes.length <= 1) {
+        that.isMapContainer = true;
+      }
+      // if (map2.childNodes.length <= 1) {
+      // 	that.isMapContainer1 = true;
+      // }
+      // that.isMapContainer1 = true;
+    }, 1000);
+  },
   created() {},
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
    * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
    */
-  async mounted() {
-    this.c_center = [
-      this.$route.query["lng"] || 121.099038,
-      this.$route.query["lat"] || 31.578119,
-    ];
-
-    await this.initMap();
-  },
+  mounted() {},
   // 组件方法
-  methods: {
-    initMap() {
-      let AMapUI = (this.AMapUI = window.AMapUI);
-      let AMap = (this.AMap = window.AMap); //地图对象直接挂到window上
-      let mapConfig = {
-        zoom: 12,
-        center: [121.099038, 31.578119], //沙溪
-        crs: "EPSG3857",
-        zooms: [10, 20],
-        layers: [new AMap.TileLayer.Satellite(), new AMap.TileLayer.RoadNet()],
-        resizeEnable: true,
-      };
-
-      window.map = new AMap.Map("amapContainer", mapConfig);
-
-      this.addPlugin(map);
-      this.getList(true);
-    },
-    addPlugin(map) {
-      AMap.plugin(["AMap.ToolBar", "AMap.Scale", "AMap.MapType"], function () {
-        map.addControl(new AMap.ToolBar());
-        map.addControl(new AMap.Scale());
-        map.addControl(new AMap.MapType());
-      });
-    },
-  },
+  methods: {},
 };
 </script>
 
-<style scoped lang="less">
-.my-map {
+<style lang="less">
+.amap-maps {
   margin: 0 auto;
-  width: 800px;
-  height: 640px;
+  width: 200px;
+  height: 172px;
 }
-.my-map .icon {
+.amap-maps .icon {
+  width: 100px;
   background: url(//a.amap.com/lbs-dev-yuntu/static/web/image/tools/creater/marker.png)
     no-repeat;
 }
+.amap-maps .icon-cir {
+  height: 31px;
+  width: 28px;
+}
+.amap-maps .icon-cir-red {
+  background-position: -11px -5px;
+}
 .amap-container {
   height: 100%;
 }
@@ -110,4 +266,14 @@ export default {
   font-size: 13px;
   color: #6f6f6f;
 }
+.amap-info-content {
+  padding: 10px;
+  .myinfowindow {
+    width: 100px;
+    overflow: hidden;
+  }
+  a {
+    right: 5px !important;
+  }
+}
 </style>

src/components/memberInfo/memberInfo.vue

@@ -0,0 +1,594 @@
+<template>
+  <div class="townsman-container w">
+    <!-- <div class="contenttitle">
+			<ul @click="resetpag">
+				<li @click="pagination.status = 0" :class="{ townsmanactive: pagination.status === 0 }">
+					全部<span>{{ statusNum.num0 == 0 ? "" : statusNum.num0 }}</span>
+				</li>
+				<li @click="pagination.status = 1" :class="{ townsmanactive: pagination.status === 1 }">
+					空闲中<span>{{ statusNum.num1 == 0 ? "" : statusNum.num1 }}</span>
+				</li>
+				<li @click="pagination.status = 2" :class="{ townsmanactive: pagination.status === 2 }">
+					报名中<span>{{ statusNum.num2 == 0 ? "" : statusNum.num2 }}</span>
+				</li>
+				<li @click="pagination.status = 3" :class="{ townsmanactive: pagination.status === 3 }">
+					在职中<span>{{ statusNum.num3 == 0 ? "" : statusNum.num3 }}</span>
+				</li>
+			</ul>
+		</div> -->
+    <div class="contentbody">
+      <div class="searchbox">
+        <div class="searchinput">
+          <a-input
+            placeholder="请输入老乡姓名/身份证号"
+            @keyup.enter="onSearch"
+            @input="resetsearch"
+            v-model="pagination.keys"
+            ><i slot="prefix" class="iconfont icon-sousuo"></i>
+            <button slot="suffix" @click="onSearch">搜索</button>
+          </a-input>
+        </div>
+        <div class="pagechange">
+          <button><i class="iconfont icon-fangda"></i> 添加成员</button>
+          <!-- <button @click="changepage(1)">下一页</button> -->
+        </div>
+      </div>
+      <a-table
+        :columns="columns"
+        :data-source="data"
+        :pagination="false"
+        @change="onChange"
+        :loading="{
+          spinning: isspinning,
+          tip: '加载中',
+          wrapperClassName: 'spinstyle',
+        }"
+        :locale="tablenodata"
+        :rowKey="(record) => record.index"
+      >
+        <a slot="name" slot-scope="text">{{ text }}</a>
+        <div
+          slot="setting"
+          class="setting"
+          slot-scope="text"
+          style="color: #f40"
+        >
+          <a @click="visible = true">详情</a>
+          <a>删除</a>
+        </div>
+      </a-table>
+      <div class="pagecontainer">
+        <a-pagination
+          :current="+pagination.pageNum"
+          :default-current="1"
+          :defaultPageSize="8"
+          :total="pagination.total"
+          @change="onChange"
+        />
+        <div class="ant-pagination-options-quick-jumper">
+          <span>共{{ pagination.total }}条，</span>跳至<input
+            ref="pageinput"
+            type="text"
+            @keyup.enter="inputpageChange"
+            @blur="inputpageChange"
+          />页
+        </div>
+      </div>
+    </div>
+    <a-modal
+      v-model="visible"
+      :footer="false"
+      width="640px"
+      class="detailWindow"
+      title="成员详情"
+    >
+      <a-row>
+        <a-col :span="4">姓名：</a-col>
+        <a-col :span="20">12312312</a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">手机号：</a-col>
+        <a-col :span="20">12312312</a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">登录密码：</a-col>
+        <a-col :span="20">12312312</a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="4">角色：</a-col>
+        <a-col :span="20">12312312</a-col>
+      </a-row>
+
+      <a-row>
+        <a-col :span="4">权限：</a-col>
+        <a-col :span="20">12312312</a-col>
+      </a-row>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { userTownsmanApi, gettownsManCountApi } from "../../api/userinfo";
+import {
+  formatDateYMD,
+  getUserApplyOrderStatusById,
+} from "../../utils/commonUtil";
+
+export default {
+  // 组件名称
+  name: "",
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data() {
+    return {
+      tablenodata: {
+        // 空状态文本内容
+        emptyText: () => (
+          <div>
+            <div>
+              <img
+                src="https://user-images.githubusercontent.com/507615/54591670-ac0a0180-4a65-11e9-846c-e55ffce0fe7b.png"
+                style="width:105px;height:90px;marginTop:20px"
+              />
+            </div>
+            <div style="marginBottom:20px">暂无数据</div>
+          </div>
+        ),
+      },
+      pagination: {
+        pageNum: 1,
+        pageSize: 8,
+        total: null, //分页配置
+        status: 0,
+        keys: null,
+        // searchTag: 1,
+      },
+      isspinning: false,
+      sortedInfo: null,
+      statusNum: {
+        num0: 0,
+        num1: 0,
+        num2: 0,
+        num3: 0,
+      },
+      data: [],
+      visible: false,
+    };
+  },
+  // 计算属性
+  computed: {
+    columns() {
+      let { sortedInfo } = this;
+      console.log(sortedInfo);
+      sortedInfo = sortedInfo || {};
+      const columns = [
+        {
+          title: "序号",
+          dataIndex: "index",
+          key: "index",
+          scopedSlots: { customRender: "index" },
+          ellipsis: true,
+          width: 60,
+        },
+        {
+          title: "姓名",
+          dataIndex: "userName",
+          key: "userName",
+          ellipsis: true,
+          width: 200,
+        },
+        {
+          title: "角色",
+          dataIndex: "age",
+          key: "age",
+          ellipsis: true,
+          width: 100,
+        },
+        {
+          title: "权限",
+          dataIndex: "nation",
+          key: "nation",
+          ellipsis: true,
+        },
+        {
+          title: "操作",
+          dataIndex: "setting",
+          key: "setting",
+          // sorter: (a, b) => a.userApplyOrder.localeCompare(b.userApplyOrder),
+          scopedSlots: { customRender: "setting" },
+
+          // sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order,
+          // ellipsis: true,
+          width: 100,
+        },
+      ];
+      console.log(sortedInfo);
+      return columns;
+    },
+  },
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+   */
+  created() {
+    this.getTownsman();
+  },
+  /**
+   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+   */
+  mounted() {
+    this.gettownsManCount();
+  },
+  // 组件方法
+  methods: {
+    onChange(e, e1, e2) {
+      console.log(e);
+      console.log(e1);
+      console.log(e2);
+      if (typeof e == "number") {
+        this.pagination.pageNum = e;
+        this.getTownsman();
+      }
+    },
+    inputpageChange(e) {
+      const pagenumcount = this.pagination.total / this.pagination.pageSize;
+      console.log(pagenumcount);
+      if (e.target.value) {
+        if (e.target.value > pagenumcount) {
+          this.pagination.pageNum = Math.ceil(pagenumcount);
+        } else {
+          this.pagination.pageNum = e.target.value;
+        }
+      } else {
+        this.pagination.pageNum = 1;
+      }
+      // this.getJobList();
+      this.getTownsman();
+      console.log(e);
+    },
+    async getTownsman() {
+      // let jobinfo = {...this.pagination , searchTag:1}
+      try {
+        this.isspinning = true;
+        console.log(this.pagination);
+        const { data } = await userTownsmanApi(this.pagination);
+        if (data.status === 200) {
+          // console.log();
+          this.data = data.data.recordList;
+          this.data.forEach((item, index) => {
+            // console.log(item);
+            item.userApplyOrder = getUserApplyOrderStatusById(
+              item.userApplyOrderStatus
+            );
+            item.updateTime = formatDateYMD(item.updateTime);
+            item.index = index + 1;
+          });
+          console.log(data);
+
+          console.log(true);
+          this.pagination.total = data.data.recordCount;
+        }
+      } catch (error) {
+        console.log(error);
+      }
+      this.isspinning = false;
+    },
+    async gettownsManCount() {
+      try {
+        const { data } = await gettownsManCountApi(this.pagination);
+        console.log(data);
+        if (data.status == 200) {
+          console.log("yes");
+          this.statusNum = data.data;
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    getPopupContainer(el, dialogContext) {
+      console.log(el);
+      console.log(dialogContext);
+      if (dialogContext) {
+        return dialogContext.getDialogWrap();
+      } else {
+        return document.body;
+      }
+    },
+    resetpag() {
+      // this.pagination = {
+      // 	//分页配置
+      // 	pageNum: 1,
+      // 	pageSize: 8,
+      // 	total: null,
+      // 	status: this.pagination.status,
+      // 	keys: null,
+      // };
+      this.gettownsManCount();
+      this.getTownsman();
+    },
+    resetsearch(e) {
+      console.log(e);
+      if (e.target.value.length === 0) {
+        this.pagination.keys = "";
+
+        this.gettownsManCount();
+        this.getTownsman();
+      }
+    },
+    onSearch() {
+      if (this.pagination.keys != null && this.pagination.keys.length != 0) {
+        this.getTownsman();
+        this.gettownsManCount();
+      }
+    },
+    // changepage(num) {
+    // 	console.log(Math.ceil(this.pagination.total / this.pagination.pageSize));
+    // 	if ((this.pagination.pageNum === 1 && num === -1) || (this.pagination.pageNum === Math.ceil(this.pagination.total / this.pagination.pageSize) && num === 1)) {
+    // 		if (num === -1) {
+    // 			this.$message.warning("已经到第一页了");
+    // 		} else {
+    // 			this.$message.warning("已经到最后一页了");
+    // 		}
+    // 		return;
+    // 	} else {
+    // 		this.pagination.pageNum += num;
+    // 	}
+    // 	this.getTownsman();
+    // },
+  },
+};
+</script>
+
+<style scoped lang="less">
+.townsman-container {
+  margin-top: 16px;
+  min-height: calc(100vh - 200px);
+  padding: 0 10px;
+  background-color: #fff;
+  border: 1px solid #0000;
+}
+.contenttitle {
+  display: flex;
+  padding-bottom: 0px;
+  justify-content: space-between;
+  border-bottom: 1px solid rgba(77, 87, 94, 0.1);
+  font-weight: 600;
+  margin-top: 16px;
+  margin-bottom: 16px;
+
+  ul {
+    display: flex;
+    height: 40px;
+    .townsmanactive {
+      // border-color: #;
+      // width: 128px;
+      color: #ff4400;
+      z-index: 999;
+      border-bottom: 2px solid #ff6600;
+      > span {
+        font-size: 16px;
+        color: #ff6600;
+      }
+    }
+    li {
+      position: relative;
+      width: 118px;
+      font-size: 16px;
+      // height: 40px;
+      padding-bottom: 16px;
+      color: #666;
+      // line-height: 40px;
+      text-align: center;
+      transition: width 0.2s;
+      cursor: pointer;
+      > span {
+        margin-left: 12px;
+        font-size: 16px;
+        color: #ff6600;
+      }
+      &::after {
+        content: "";
+        position: absolute;
+        display: block;
+        width: 1px;
+        height: 16px;
+        right: 0;
+        top: 5px;
+        // transform: translateY(-50%);
+        background-color: #eeeeee;
+      }
+      &:last-child::after {
+        display: none;
+      }
+    }
+    button {
+      width: 100px;
+      height: 28px;
+      position: relative;
+      font-size: 14px;
+      border: 1px solid #cccccc;
+      background-color: #fff;
+      margin-right: -1px;
+      cursor: pointer;
+      &:hover {
+        color: #ff4400;
+      }
+    }
+    button:first-child {
+      // border-radius: 4px 0px 0px 4px;
+    }
+    button:last-child {
+      // border-radius: 0px 4px 4px 0px;
+    }
+  }
+}
+.contentbody {
+  overflow: hidden;
+  /deep/ .searchbox {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 16px;
+    .searchinput {
+      width: 326px;
+      position: relative;
+      .ant-input {
+        // width: 300px;
+        position: relative;
+        height: 32px;
+        text-indent: 10px;
+        background: #fff;
+        // border: 1px solid rgba(77, 87, 94, 0.3);
+        border-radius: 0px;
+        box-shadow: 0px 2px 4px 0px transparent;
+        font-size: 14px !important;
+        padding-right: 0;
+        border-color: #ddd;
+        // z-index: ;
+        &::placeholder {
+          text-indent: 10px;
+          font-size: 14px !important;
+        }
+        &:hover {
+          border-color: #ff4400;
+          box-shadow: none;
+        }
+        &:focus {
+          border-color: #ff4400;
+        }
+      }
+      .ant-input-affix-wrapper {
+        .ant-input-prefix {
+          position: absolute;
+          width: 20px;
+          right: 0;
+          top: 16px;
+          i {
+            color: #c9c9c9;
+          }
+        }
+        .ant-input-suffix {
+          // position: absolute;
+          right: 0px !important;
+        }
+      }
+      button {
+        width: 70px;
+        height: 32px;
+        color: white;
+        background: #ff4400;
+        border-color: #ff4400;
+        border: none;
+        border-radius: 0px;
+        font-size: 14px;
+        box-shadow: none;
+        cursor: pointer;
+        outline: none;
+        &:hover {
+          background-color: #ff4400cc;
+        }
+        // &:focus {
+        //   border: none;
+        // }
+      }
+    }
+    .pagechange {
+      button {
+        width: 120px;
+        height: 32px;
+        line-height: 32px;
+        border: 1px solid #f40;
+        // border-radius: 4px;
+        font-size: 16px;
+        color: #f40;
+        background-color: #fff;
+        &:hover {
+          border-color: #ff4400;
+          color: #ff4400;
+        }
+        &:first-child {
+          margin-right: 12px;
+        }
+      }
+    }
+  }
+  /deep/ .ant-table-placeholder {
+    min-height: 300px;
+    > div {
+      position: relative;
+      height: 131px;
+      top: 30px;
+      // transform: translateY(-50%);
+    }
+  }
+  /deep/ .ant-table-content {
+    .ant-table-body {
+      .ant-table-thead {
+        th {
+          padding: 12px 0;
+          div {
+            padding: 0px 8px;
+          }
+          &:not(:first-child) {
+            > span {
+              //  line-height: 22px;
+              > div {
+                //  line-height: 1;
+                border-left: 1px solid #ccc;
+                padding-left: 12px;
+              }
+            }
+          }
+        }
+      }
+      .ant-table-tbody {
+        .ant-table-row-cell-ellipsis {
+          padding: 12px 14px;
+        }
+      }
+    }
+  }
+}
+/deep/ .ant-table-column-sorter-inner {
+  height: 16px !important;
+}
+.setting {
+  a:first-child {
+    padding-right: 9px;
+    border-right: 1px solid #979797;
+  }
+  a:last-child {
+    padding-left: 9px;
+  }
+}
+/deep/ .ant-table-row-cell-break-word {
+  padding: 12px 8px !important;
+}
+.detailWindow {
+  /deep/ .ant-modal {
+    .ant-modal-close-x {
+      height: 42px;
+      width: 42px;
+      line-height: 42px;
+    }
+    .ant-modal-header {
+      padding: 8px 16px;
+    }
+    .ant-modal-body {
+      padding-left: 100px;
+      min-height: 318px;
+      .ant-row {
+        line-height: 30px;
+        .ant-col:first-child {
+          text-align: right;
+        }
+      }
+    }
+  }
+}
+</style>

src/components/userinfo/accountsetting/components/boundtel.vue

@@ -174,7 +174,7 @@ export default {
       font-size: 16px;
       background: #fff;
       border: 1px solid #dddddd;
-      border-radius: 4px;
+      border-radius: 0px;
     }
     .getrulecode {
       padding: 0 0 0 10px;
@@ -199,12 +199,12 @@ export default {
     width: 64px;
     height: 32px;
     background: #ff4400;
-    border-radius: 4px;
+    border-radius: 0px;
     border: none;
     font-size: 14px;
     color: #fff;
     &:hover {
-      background-color: #fe8034;
+      background-color: #ff4400cc;
     }
   }
 }

src/components/userinfo/accountsetting/components/loginpsw.vue

@@ -11,7 +11,18 @@
       <div class="password">
         <div>密码</div>
         <input type="password" v-model.trim="password" class="passwordInp" />
-        <i class="iconfont icon-biyan1" @click="changeStatus"></i>
+        <i
+          class="iconfont icon-biyan1"
+          style="font-size: 12px"
+          @click="changeStatus"
+          v-if="inputStatus == 0"
+        ></i>
+        <i
+          class="iconfont icon-zhengyan1"
+          style="font-size: 16px; margin-top: -5px; margin-right: -3px"
+          @click="changeStatus"
+          v-else
+        ></i>
       </div>
       <button @click="submit">确定</button>
     </div>
@@ -36,6 +47,7 @@ export default {
     return {
       username: "",
       password: null,
+      inputStatus: 0,
     };
   },
   // 计算属性
@@ -88,10 +100,12 @@ export default {
       let pas = document.querySelector(".passwordInp");
       // console.dir(pas);
       if (e.target.className == "iconfont icon-biyan1") {
-        e.target.className = "iconfont icon-zhengyan1";
+        this.inputStatus = 1;
+        // e.target.className = "iconfont icon-zhengyan1";
         pas.attributes[1].nodeValue = "text";
       } else {
-        e.target.className = "iconfont icon-biyan1";
+        this.inputStatus = 0;
+        // e.target.className = "iconfont icon-biyan1";
         pas.attributes[1].nodeValue = "password";
       }
     },
@@ -116,9 +130,9 @@ export default {
         height: 40px;
         text-indent: 10px;
         font-size: 16px;
-        background: #eeeeee;
-        border: 1px solid #dddddd;
-        border-radius: 4px;
+        background: #f0f0f0;
+        border: 1px solid #ededed;
+        border-radius: 0px;
       }
     }
     .password {
@@ -130,7 +144,7 @@ export default {
         position: absolute;
         font-size: 14px;
         right: 48%;
-        top: 36px;
+        top: 38px;
       }
     }
     button {
@@ -138,12 +152,12 @@ export default {
       height: 32px;
       margin-top: 21px;
       background: #ff4400;
-      border-radius: 4px;
+      border-radius: 0px;
       border: none;
       font-size: 14px;
       color: #fff;
       &:hover {
-        background-color: #fe8034;
+        background-color: #ff4400cc;
       }
     }
   }

src/components/userinfo/accountsetting/inedex.vue

@@ -137,7 +137,7 @@
               <i class="iconfont icon-youjiantou"></i>
             </span>
           </li>
-          <li
+          <!-- <li
             @click="pushto('/accountsetting/boundbankcard')"
             :class="{ tagactive: activelist === 3 }"
             style="display: none"
@@ -148,7 +148,7 @@
               ><span>{{ userbanklist.length }}张</span>
               <i class="iconfont icon-youjiantou"></i>
             </span>
-          </li>
+          </li> -->
         </ul>
         <ul>
           <li
@@ -161,7 +161,7 @@
               <i class="iconfont icon-youjiantou"></i>
             </span>
           </li>
-          <li
+          <!-- <li
             @click="pushto('/accountsetting/realname')"
             :class="{ tagactive: activelist === 4 }"
             style="display: none"
@@ -172,7 +172,7 @@
               ><span v-else>未认证</span>
               <i class="iconfont icon-youjiantou"></i>
             </span>
-          </li>
+          </li> -->
         </ul>
       </div>
       <div class="rightcontent">
@@ -513,10 +513,10 @@ export default {
       width: 346px;
       height: 158px;
       background: #ffffff;
-      border-radius: 4px;
+      border-radius: 0px;
       padding: 24px 0;
       text-align: center;
-
+      border: 1px solid #ededed;
       .avatarbox {
         margin: 0 auto;
         width: 64px;
@@ -581,7 +581,7 @@ export default {
         // margin-top: 16px;
         // padding: 0 16px;
         background-color: #fff;
-        border-radius: 4px;
+        border-radius: 0px;
         overflow: hidden;
         li {
           position: relative;
@@ -590,7 +590,7 @@ export default {
 
           line-height: 24px;
           justify-content: space-between;
-          // border-bottom: 1px solid #f3f4f4;
+          border-bottom: 1px solid #ededed;
           cursor: pointer;
           &:nth-child(-n + 2):after {
             position: absolute;
@@ -643,17 +643,19 @@ export default {
       background-color: #fff;
       margin-top: 16px;
       // padding: 0 16px;
-      border-radius: 4px;
+      border-radius: 0px;
       overflow: hidden;
-
+      border: 1px solid #ededed;
       li {
         position: relative;
         display: flex;
         padding: 16px;
         line-height: 24px;
         justify-content: space-between;
-        // border-bottom: 1px solid #f3f4f4;
         cursor: pointer;
+        &:not(:last-child) {
+          // border-bottom: 1px solid #ededed;
+        }
         &:nth-child(-n + 3):after {
           position: absolute;
           content: "";
@@ -666,6 +668,8 @@ export default {
         }
         > span:first-child {
           font-size: 16px;
+          display: flex;
+          align-items: center;
           i {
             margin-right: 12px;
             font-size: 20px;
@@ -708,6 +712,7 @@ export default {
     height: 600px;
     padding: 0 16px;
     background-color: #fff;
+    border: 1px solid #ededed;
   }
 }
 

src/components/userinfo/usercenter/components/mybill.vue

@@ -6,55 +6,59 @@
           @click="pagination.status = -1"
           :class="{ townsmanactive: pagination.status === -1 }"
         >
-          全部<span>99</span>
+          全部<span>{{ billNumber.num == 0 ? "" : billNumber.num }}</span>
         </li>
         <li
           @click="pagination.status = 10"
           :class="{ townsmanactive: pagination.status === 10 }"
         >
-          审核中<span>99</span>
+          审核中<span>{{ billNumber.num10 == 0 ? "" : billNumber.num10 }}</span>
         </li>
         <li
           @click="pagination.status = 20"
           :class="{ townsmanactive: pagination.status === 20 }"
         >
-          待面试<span>99</span>
+          待面试<span>{{ billNumber.num20 == 0 ? "" : billNumber.num20 }}</span>
         </li>
         <li
           @click="pagination.status = 25"
           :class="{ townsmanactive: pagination.status === 25 }"
         >
-          已接到<span>99</span>
+          已接到<span>{{ billNumber.num25 == 0 ? "" : billNumber.num25 }}</span>
         </li>
         <li
           @click="pagination.status = 30"
           :class="{ townsmanactive: pagination.status === 30 }"
         >
-          面试通过<span>99</span>
+          面试通过<span>{{
+            billNumber.num30 == 0 ? "" : billNumber.num30
+          }}</span>
         </li>
         <li
           @click="pagination.status = 40"
           :class="{ townsmanactive: pagination.status === 40 }"
         >
-          在职中<span>99</span>
+          在职中<span>{{ billNumber.num40 == 0 ? "" : billNumber.num40 }}</span>
         </li>
         <li
           @click="pagination.status = 999"
           :class="{ townsmanactive: pagination.status === 999 }"
         >
-          报名结束<span>99</span>
+          报名结束<span>{{
+            billNumber.num999 == 0 ? "" : billNumber.num999
+          }}</span>
         </li>
         <li
           @click="pagination.status = 50"
           :class="{ townsmanactive: pagination.status === 50 }"
         >
-          当前<span>99</span>
+          当前<span>{{ billNumber.num == 0 ? "" : billNumber.num }}</span>
         </li>
         <li
           @click="pagination.status = 70"
           :class="{ townsmanactive: pagination.status === 70 }"
         >
-          稍后<span>99</span>
+          稍后<span>{{ billNumber.num == 0 ? "" : billNumber.num }}</span>
         </li>
         <!-- <li
           @click="pagination.status = 70"
@@ -95,7 +99,7 @@
             <li>政策</li>
             <!-- <button @click="statusFilter">filter</button> -->
             <li>
-              <div>状态</div>
+              <div>状态：</div>
               <a-select
                 size="small"
                 placeholder=""
@@ -144,7 +148,7 @@
                 <i
                   class="iconfont icon-shenfenzheng"
                   :style="{
-                    color: item.idCardImageUrl !== '' ? '#1296db' : '#666',
+                    color: item.idCardImageUrl !== '' ? '#ff4400cc' : '#666',
                   }"
                   @click.stop="showdiymodal(item)"
                 ></i
@@ -162,8 +166,8 @@
                   @click="changeStatus(item, index)"
                   :ref="'Control' + index"
                 >
-                  <span v-if="item.controlUnfold">展开</span
-                  ><span v-else>收起</span>
+                  <span v-show="item.controlUnfold">展开</span
+                  ><span v-show="!item.controlUnfold">收起</span>
                 </div>
               </li>
               <li>
@@ -171,6 +175,9 @@
                 ><span v-show="item.statusShowTime"
                   >{{ item.statusTimeInfo }}: {{ item.statusShowTime }}</span
                 >
+                <span v-show="item.status == 40 || item.status == 50"
+                  >具体以出名单时间为准</span
+                >
               </li>
             </ul>
           </div>
@@ -191,7 +198,7 @@
             type="text"
             @keyup.enter="inputpageChange"
             @blur="inputpageChange"
-            :style="{ 'background-Color': '#f6f6f6' }"
+            style=""
           />页
         </div>
       </div>
@@ -233,7 +240,7 @@
 </template>
 
 <script>
-import { userBillApi } from "../../../../api/userinfo";
+import { userBillApi, userBillNumberApi } from "../../../../api/userinfo";
 import {
   getUserApplyOrderStatusById,
   isEmptyCheck,
@@ -266,6 +273,7 @@ export default {
         status: -1,
         keys: "",
       },
+      statusValue: "",
       orderStatus: [
         {
           id: "10",
@@ -325,6 +333,7 @@ export default {
       isunfold: false,
       statusTimeInfo: "", // 状态的时间类型
       statusShowTime: "", // 状态时间
+      billNumber: {},
     };
   },
   // 计算属性
@@ -337,6 +346,7 @@ export default {
    */
   created() {
     this.getBill();
+    this.userBillNumber();
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@@ -364,6 +374,7 @@ export default {
         this.pagination.endDate = "";
       }
       this.getBill();
+      this.userBillNumber();
     },
     inputpageChange(e) {
       const pagenumcount = this.pagination.total / this.pagination.pageSize;
@@ -381,6 +392,17 @@ export default {
       this.getBill();
       console.log(e);
     },
+    async userBillNumber() {
+      try {
+        const { data } = await userBillNumberApi(this.pagination);
+        if (data.status == 200) {
+          console.log(data.data);
+          this.billNumber = data.data;
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
     async getBill() {
       console.log("click");
       // let that = this;
@@ -399,12 +421,12 @@ export default {
               let differenceTime =
                 new Date().getTime() - new Date(item.updateTime).getTime();
               var D = Math.floor(differenceTime / (24 * 60 * 60 * 1000));
-              var leave1 = differenceTime % (24 * 3600 * 1000);
-              var H = Math.floor(leave1 / (3600 * 1000));
-              var leave2 = leave1 % (3600 * 1000);
-              var M = Math.floor(leave2 / (60 * 1000));
-              var leave3 = leave2 % (60 * 1000);
-              var S = Math.floor(leave3 / 1000);
+              var level1 = differenceTime % (24 * 3600 * 1000);
+              var H = Math.floor(level1 / (3600 * 1000));
+              var level2 = level1 % (3600 * 1000);
+              var M = Math.floor(level2 / (60 * 1000));
+              var level3 = level2 % (60 * 1000);
+              var S = Math.floor(level3 / 1000);
               item.diffTime = null;
               if (D > 0) {
                 item.diffTime = D + "天前";
@@ -457,25 +479,7 @@ export default {
               item.index = index + 1;
 
               // console.log(that.$refs["Control" + index][0]);
-              let parent = this.$refs["Control" + index][0].parentNode;
-              let sibling =
-                this.$refs["Control" + index][0].previousElementSibling;
-              // console.log(window.getComputedStyle(sibling));
-              // console.log(parent.offsetHeight);
-              // console.log(sibling.offsetHeight);
-              // console.log(window.getComputedStyle(parent).height);
-              // console.log("子元素高度", sibling.offsetHeight);
-              // console.log("父元素高度", parent.offsetHeight);
-              if (sibling.offsetHeight > parent.offsetHeight) {
-                // sibling.style.height = "100%";
-                sibling.style.overflow = "hidden";
-                parent.style.paddingBottom = "20px";
-                item.isunfold = true;
-              } else {
-                item.isunfold = false;
-              }
-              item.controlUnfold = true;
-              console.log(item.status);
+
               // setTimeout(() => {
               if (
                 item.status == 10 ||
@@ -503,6 +507,8 @@ export default {
               // console.log("isunfold", item.isunfold);
               // console.log(item);
             });
+            this.showFlod(this.billList);
+
             this.saveBill = JSON.parse(JSON.stringify(this.billList));
           }, 0);
 
@@ -513,17 +519,12 @@ export default {
       } catch (error) {
         console.log(error);
       }
-      this.isspinning = false;
+      (this.statusValue = ""), (this.isspinning = false);
     },
     resetpag() {
-      this.pagination = {
-        //分页配置
-        pageNum: 1,
-        pageSize: 10,
-        total: null,
-        status: this.pagination.status,
-      };
+      // this.pagination.status = this.pagination.status
       this.getBill();
+      this.userBillNumber();
     },
     customRendert(a) {
       console.log(a);
@@ -627,10 +628,12 @@ export default {
         this.pagination.keys = "";
 
         this.getBill();
+        this.userBillNumber();
       }
     },
     onSearch() {
       this.getBill();
+      this.userBillNumber();
     },
     changepage(num) {
       console.log(Math.ceil(this.pagination.total / this.pagination.pageSize));
@@ -660,8 +663,8 @@ export default {
     },
     changeStatus(item, index) {
       // 控制政策的展开
-      console.log(item);
-      console.log(index);
+      // console.log(item);
+      // console.log(index);
       let parent = this.$refs["Control" + index][0].parentNode;
       let sibling = this.$refs["Control" + index][0].previousElementSibling;
       if (item.controlUnfold) {
@@ -694,35 +697,63 @@ export default {
       }
       this.filterStatus++;
     },
-    handleChange(e) {
-      this.billList = JSON.parse(JSON.stringify(this.saveBill));
-      let list = [];
-      this.billList.forEach((item) => {
-        if (item.status == e.value) {
-          list.push(item);
-        }
-      });
-      this.billList = list;
-      this.billList.forEach((item, index) => {
+    showFlod(list) {
+      // setTimeout(() => {
+      list.forEach((item, index) => {
+        // console.log('=======');
         let parent = this.$refs["Control" + index][0].parentNode;
         let sibling = this.$refs["Control" + index][0].previousElementSibling;
-        if (sibling.offsetHeight > parent.offsetHeight) {
+        // console.log('parent ' + parenzt );
+        // console.log('sibling ' + sibling );
+        // console.log('sibling.offsetHeight' + sibling.offsetHeight );
+        // console.log('parent.offsetHeight' + parent.offsetHeight );
+        if (sibling.scrollHeight >= parent.scrollHeight) {
           // sibling.style.height = "100%";
           sibling.style.overflow = "hidden";
           parent.style.paddingBottom = "20px";
           item.isunfold = true;
+          item.controlUnfold = true;
         } else {
           item.isunfold = false;
         }
-        item.controlUnfold = true;
+        // console.log(item);
       });
-      console.log(e);
+      // }, 100);
+      this.$forceUpdate();
+    },
+    handleChange(e) {
+      // console.log(e);
+      // let that = this;
+      // this.billList = JSON.parse(JSON.stringify(this.saveBill));
+      // let list = [];
+      // this.billList.forEach((item) => {
+      // 	if (item.status == e.value) {
+      // 		list.push(item);
+      // 	}
+      // });
+      // this.billList = list;
+      // setTimeout(() => {
+      // 	this.$nextTick(() => {
+      // 		this.showFlod(that.billList);
+      // 	});
+      // }, 0);
+      // console.log(e);
+      this.pagination.statusMin = e.id;
+      this.getBill();
+      this.userBillNumber();
     },
     resetStatus(e) {
+      console.log(e);
       if (e == undefined) {
-        this.billList = JSON.parse(JSON.stringify(this.saveBill));
+        this.pagination.statusMin = "";
+        this.userBillNumber();
+        this.getBill();
+        // this.billList = JSON.parse(JSON.stringify(this.saveBill));
+        // setTimeout(() => {
+        // 	this.showFlod(this.billList);
+        // }, 0);
       }
-      console.log(e);
+      // console.log(e);
     },
   },
 };
@@ -733,7 +764,7 @@ export default {
   position: relative;
   min-height: 802px;
   margin-top: 16px;
-  border-radius: 4px;
+  // border-radius: 4px;
   padding: 1px 10px;
   background-color: #fff;
   font-size: 16px;
@@ -809,7 +840,7 @@ export default {
             background-color: #ff4400;
             border: none;
             color: #fff;
-            border-radius: 4px;
+            // border-radius: 4px;
             margin-right: 60px;
           }
         }
@@ -912,10 +943,10 @@ export default {
       }
     }
     button:first-child {
-      border-radius: 4px 0px 0px 4px;
+      // border-radius: 4px 0px 0px 4px;
     }
     button:last-child {
-      border-radius: 0px 4px 4px 0px;
+      // border-radius: 0px 4px 4px 0px;
     }
   }
 }
@@ -931,7 +962,11 @@ export default {
   // }
   .searchbox {
     display: flex;
+    align-items: center;
     justify-content: space-between;
+    .ant-input {
+      border-radius: 0;
+    }
     .searchinput {
       display: flex;
       position: relative;
@@ -940,10 +975,10 @@ export default {
         // width: 375px;
         justify-content: start;
         align-items: center;
-        font-size: 16px;
+        font-size: 14px;
         > div {
           margin-left: 50px;
-          width: 84px;
+          width: 70px;
         }
       }
       .ant-input {
@@ -954,7 +989,7 @@ export default {
         text-indent: 10px;
         background: #fff;
         // border: 1px solid rgba(77, 87, 94, 0.3);
-        border-radius: 136px;
+        // border-radius: 136px;
         box-shadow: 0px 2px 4px 0px transparent;
         font-size: 14px !important;
         padding-right: 0;
@@ -994,13 +1029,13 @@ export default {
         background: #ff4400;
         border-color: #ff4400;
         border: none;
-        border-radius: 16px;
+        // border-radius: 16px;
         font-size: 14px;
         box-shadow: none;
         cursor: pointer;
         outline: none;
         &:hover {
-          background-color: #ff842b;
+          background-color: #ff4400d9;
         }
         // &:focus {
         //   border: none;
@@ -1008,13 +1043,19 @@ export default {
       }
       .ant-calendar-picker-input {
         display: flex;
+        padding-left: 0;
+        justify-content: space-between;
         // margin-left: 20px;
         width: 260px;
         border-color: #ccc;
-        border-radius: 4px;
+        // border-radius: 4px;
         // border: none;
+        &:hover {
+          border-color: #ff4400;
+        }
         .ant-calendar-range-picker-input {
           width: 95px;
+          font-size: 14px;
         }
         .ant-calendar-range-picker-separator {
           margin-right: 10px;
@@ -1029,7 +1070,7 @@ export default {
         width: 66px;
         height: 24px;
         border: 1px solid rgba(77, 87, 94, 0.3);
-        border-radius: 4px;
+        // border-radius: 4px;
         font-size: 14px;
         color: #4d575e;
         background-color: #fff;
@@ -1073,13 +1114,29 @@ export default {
         }
         li:nth-child(4) {
           display: flex;
-          justify-content: center;
+          justify-content: end;
           align-items: center;
           padding-left: 50px;
+          padding-right: 16px;
           width: 321px;
+          > div:first-child {
+            line-height: 30px;
+          }
           .ant-select {
             width: 120px;
-            margin-left: 20px;
+            // margin-left: 20px;
+          }
+          .ant-select-focused .ant-select-selection,
+          .ant-select-selection:focus,
+          .ant-select-selection:active {
+            border-color: #ff4400;
+            box-shadow: none;
+          }
+          .ant-select-selection {
+            border-radius: 0;
+          }
+          .ant-select-selection:hover {
+            border-color: #ff4400;
           }
           .ant-select-focused {
             box-shadow: none;
@@ -1090,14 +1147,14 @@ export default {
     }
     .isDownstyle {
       .proxyInfo {
-        background-color: rgba(0, 122, 255, 0.09) !important;
-        border-color: rgba(0, 122, 255, 0.6) !important;
+        background-color: #fff3ef !important;
+        border-color: #ff4400cc !important;
       }
       .billInfo {
         li {
-          border-color: rgba(0, 122, 255, 0.6) !important;
+          border-color: #ff4400cc !important;
           .serial {
-            border-color: rgba(0, 122, 255, 0.6) !important;
+            border-color: #ff4400cc !important;
           }
         }
       }

src/components/userinfo/usercenter/components/townsman.vue

@@ -6,25 +6,25 @@
           @click="pagination.status = 0"
           :class="{ townsmanactive: pagination.status === 0 }"
         >
-          全部<span>{{ statusNum.num0 }}</span>
+          全部<span>{{ statusNum.num0 == 0 ? "" : statusNum.num0 }}</span>
         </li>
         <li
           @click="pagination.status = 1"
           :class="{ townsmanactive: pagination.status === 1 }"
         >
-          空闲中<span>{{ statusNum.num1 }}</span>
+          空闲中<span>{{ statusNum.num1 == 0 ? "" : statusNum.num1 }}</span>
         </li>
         <li
           @click="pagination.status = 2"
           :class="{ townsmanactive: pagination.status === 2 }"
         >
-          报名中<span>{{ statusNum.num2 }}</span>
+          报名中<span>{{ statusNum.num2 == 0 ? "" : statusNum.num2 }}</span>
         </li>
         <li
           @click="pagination.status = 3"
           :class="{ townsmanactive: pagination.status === 3 }"
         >
-          在职中<span>{{ statusNum.num3 }}</span>
+          在职中<span>{{ statusNum.num3 == 0 ? "" : statusNum.num3 }}</span>
         </li>
       </ul>
     </div>
@@ -69,12 +69,11 @@
           @change="onChange"
         />
         <div class="ant-pagination-options-quick-jumper">
-          跳至<input
+          <span>共{{ pagination.total }}条，</span>跳至<input
             ref="pageinput"
             type="text"
             @keyup.enter="inputpageChange"
             @blur="inputpageChange"
-            :style="{ 'background-Color': '#f6f6f6' }"
           />页
         </div>
       </div>
@@ -136,6 +135,7 @@ export default {
   computed: {
     columns() {
       let { sortedInfo } = this;
+      console.log(sortedInfo);
       sortedInfo = sortedInfo || {};
       const columns = [
         {
@@ -144,7 +144,7 @@ export default {
           key: "index",
           scopedSlots: { customRender: "index" },
           ellipsis: true,
-          width: 40,
+          width: 60,
         },
         {
           title: "老乡姓名",
@@ -158,14 +158,14 @@ export default {
           dataIndex: "age",
           key: "age",
           ellipsis: true,
-          width: 50,
+          width: 60,
         },
         {
           title: "民族",
           dataIndex: "nation",
           key: "nation",
           ellipsis: true,
-          width: 50,
+          width: 120,
         },
         {
           title: "手机号",
@@ -189,7 +189,7 @@ export default {
 
           // sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order,
           // ellipsis: true,
-          width: 120,
+          width: 150,
         },
       ];
       console.log(sortedInfo);
@@ -288,14 +288,15 @@ export default {
       }
     },
     resetpag() {
-      this.pagination = {
-        //分页配置
-        pageNum: 1,
-        pageSize: 8,
-        total: null,
-        status: this.pagination.status,
-        keys: null,
-      };
+      // this.pagination = {
+      // 	//分页配置
+      // 	pageNum: 1,
+      // 	pageSize: 8,
+      // 	total: null,
+      // 	status: this.pagination.status,
+      // 	keys: null,
+      // };
+      this.gettownsManCount();
       this.getTownsman();
     },
     resetsearch(e) {
@@ -339,6 +340,7 @@ export default {
 <style scoped lang="less">
 .townsman-container {
   margin-top: 16px;
+  min-height: calc(100vh - 200px);
   padding: 0 10px;
   background-color: #fff;
   border: 1px solid #0000;
@@ -348,7 +350,7 @@ export default {
   padding-bottom: 0px;
   justify-content: space-between;
   border-bottom: 1px solid rgba(77, 87, 94, 0.1);
-
+  font-weight: 600;
   margin-top: 16px;
   margin-bottom: 16px;
 
@@ -360,10 +362,10 @@ export default {
       // width: 128px;
       color: #ff4400;
       z-index: 999;
-      border-bottom: 2px solid #ff4400;
+      border-bottom: 2px solid #ff6600;
       > span {
         font-size: 16px;
-        color: #ff4400;
+        color: #ff6600;
       }
     }
     li {
@@ -380,7 +382,7 @@ export default {
       > span {
         margin-left: 12px;
         font-size: 16px;
-        color: #666;
+        color: #ff6600;
       }
       &::after {
         content: "";
@@ -411,10 +413,10 @@ export default {
       }
     }
     button:first-child {
-      border-radius: 4px 0px 0px 4px;
+      // border-radius: 4px 0px 0px 4px;
     }
     button:last-child {
-      border-radius: 0px 4px 4px 0px;
+      // border-radius: 0px 4px 4px 0px;
     }
   }
 }
@@ -434,11 +436,11 @@ export default {
         text-indent: 10px;
         background: #fff;
         // border: 1px solid rgba(77, 87, 94, 0.3);
-        border-radius: 136px;
+        border-radius: 0px;
         box-shadow: 0px 2px 4px 0px transparent;
         font-size: 14px !important;
         padding-right: 0;
-        border-color: #e9e9e9;
+        border-color: #ddd;
         // z-index: ;
         &::placeholder {
           text-indent: 10px;
@@ -474,13 +476,13 @@ export default {
         background: #ff4400;
         border-color: #ff4400;
         border: none;
-        border-radius: 16px;
+        border-radius: 0px;
         font-size: 14px;
         box-shadow: none;
         cursor: pointer;
         outline: none;
         &:hover {
-          background-color: #ff842b;
+          background-color: #ff4400cc;
         }
         // &:focus {
         //   border: none;
@@ -492,7 +494,7 @@ export default {
         width: 66px;
         height: 24px;
         border: 1px solid rgba(77, 87, 94, 0.3);
-        border-radius: 4px;
+        // border-radius: 4px;
         font-size: 14px;
         color: #4d575e;
         background-color: #fff;
@@ -520,7 +522,9 @@ export default {
       .ant-table-thead {
         th {
           padding: 16px 0;
-
+          div {
+            padding: 0px 8px;
+          }
           &:not(:first-child) {
             > span {
               //  line-height: 22px;
@@ -535,10 +539,13 @@ export default {
       }
       .ant-table-tbody {
         .ant-table-row-cell-ellipsis {
-          padding: 16px 0;
+          padding: 16px 14px;
         }
       }
     }
   }
 }
+/deep/ .ant-table-column-sorter-inner {
+  height: 16px !important;
+}
 </style>

src/router/index.js

@@ -15,11 +15,6 @@ const routes = [
         name: "Main",
         component: () => import("../components/main/index.vue"),
       },
-      {
-        path: "/main1",
-        name: "Main1",
-        component: () => import("../components/main/index1.vue"),
-      },
       {
         path: "/list",
         name: "JobList",
@@ -31,7 +26,7 @@ const routes = [
         component: () => import("../components/FirstJob/joblist1.vue"),
       },
       {
-        path: "/detail/:id",
+        path: "/detail",
         name: "Detail",
         component: () => import("../components/FirstJob/detail.vue"),
       },
@@ -105,6 +100,11 @@ const routes = [
         component: () =>
           import("../components/userinfo/usercenter/components/mybill.vue"),
       },
+      {
+        path: "memberInfo",
+        name: "memberinfo",
+        component: () => import("../components/memberInfo/memberInfo.vue"),
+      },
       {
         path: "accountsetting",
         name: "accountsetting",

src/style/index.less

@@ -1,4 +1,4 @@
-@import "http://at.alicdn.com/t/font_3135652_fha9d3mzga5.css";
+@import "http://at.alicdn.com/t/font_3135652_tzuybmnhq2.css";
 // 初始化页面样式
 body,
 h1,
@@ -28,7 +28,8 @@ td,
 div {
 	margin: 0;
 	padding: 0;
-  color: #4d575e;
+  color: #333;
+  // color: #666;
 	font-family: PingFangSC, PingFangSC-Regular;
 }
 body,
@@ -115,7 +116,7 @@ body {
 	padding: 0;
 	// height: 3080px;
 	// background-color: #eef1f5;
-	background-color: #f6f6f6;
+	background-color: #fff;
 	font-size: 18px;
 	// width: 100vw;
 	// text-align: center;
@@ -134,228 +135,7 @@ i {
 	fill: currentColor;
 	overflow: hidden;
 }
-// 字体图标
-// @font-face {
-// 	font-family: "iconfont"; /* Project id 3135652 */
-// 	src: url("../assets/fontfile/iconfont.woff2") format("woff2"),
-// 		url("../assets/fontfile/iconfont.woff") format("woff"),
-// 		url("../assets/fontfile/iconfont.ttf") format("truetype");
-// }
-// .iconfont {
-//   font-family: "iconfont" !important;
-//   font-size: 16px;
-//   font-style: normal;
-//   -webkit-font-smoothing: antialiased;
-//   -moz-osx-font-smoothing: grayscale;
-// }
 
-// .icon-sousuoxiala:before {
-//   content: "\e73f";
-// }
-
-// .icon-shenfenzheng:before {
-//   content: "\e740";
-// }
-
-// .icon-xiangzuoxuanzhuan:before {
-//   content: "\e744";
-// }
-
-// .icon-xiangyouxuanzhuan:before {
-//   content: "\e746";
-// }
-
-// .icon-rotatexuanzhuan2:before {
-//   content: "\e6e2";
-// }
-
-// .icon-rotatexuanzhuan:before {
-//   content: "\e6eb";
-// }
-
-// .icon-xuanzhuan:before {
-//   content: "\e652";
-// }
-
-// .icon-zhengjian:before {
-//   content: "\e654";
-// }
-
-// .icon-shangchuan:before {
-//   content: "\e73a";
-// }
-
-// .icon-guanbi1:before {
-//   content: "\e739";
-// }
-
-// .icon-yulan:before {
-//   content: "\e737";
-// }
-
-// .icon-rili:before {
-//   content: "\e736";
-// }
-
-// .icon-dingbulogo:before {
-//   content: "\e71d";
-// }
-
-// .icon-weixin1:before {
-//   content: "\e716";
-// }
-
-// .icon-gerenzhongxin-mima:before {
-//   content: "\e71c";
-// }
-
-// .icon-bangdingyinhangka:before {
-//   content: "\e71b";
-// }
-
-// .icon-gerenzhongxin:before {
-//   content: "\e719";
-// }
-
-// .icon-zhanghaoshezhi:before {
-//   content: "\e71a";
-// }
-
-// .icon-gerenzhongxin-bangdingshouji:before {
-//   content: "\e70c";
-// }
-
-// .icon-shimingrenzheng:before {
-//   content: "\e70d";
-// }
-
-// .icon-gongdan:before {
-//   content: "\e710";
-// }
-
-// .icon-yue:before {
-//   content: "\e711";
-// }
-
-// .icon-laoxiang:before {
-//   content: "\e715";
-// }
-
-// .icon-jifen:before {
-//   content: "\e717";
-// }
-
-// .icon-kaquan:before {
-//   content: "\e718";
-// }
-
-// .icon-youjiantou:before {
-//   content: "\e68c";
-// }
-
-// .icon-zanwukaquan:before {
-//   content: "\e714";
-// }
-
-// .icon-zhengyan:before {
-//   content: "\e712";
-// }
-
-// .icon-biyan:before {
-//   content: "\e713";
-// }
-
-// .icon-zhongguoyinhang:before {
-//   content: "\e70a";
-// }
-
-// .icon-zhongyuanyinhang:before {
-//   content: "\e70b";
-// }
-
-// .icon-nongyeyinhang:before {
-//   content: "\e70f";
-// }
-
-// .icon-guanbi:before {
-//   content: "\e701";
-// }
-
-// .icon-guanbishixin:before {
-//   content: "\e8dc";
-// }
-
-// .icon-morentouxiang:before {
-//   content: "\e700";
-// }
-
-// .icon-touxiang:before {
-//   content: "\e620";
-// }
-
-// .icon-xuanzhong:before {
-//   content: "\e6fe";
-// }
-
-// .icon-weixuanzhong:before {
-//   content: "\e6ff";
-// }
-
-// .icon-yigezhuanmenfuwudailidepingtai2:before {
-//   content: "\e6fa";
-// }
-
-// .icon-yigezhuanmenfuwudailidepingtai:before {
-//   content: "\e6f8";
-// }
-
-// .icon-xiala:before {
-//   content: "\e6f5";
-// }
-
-// .icon-sousuo:before {
-//   content: "\e608";
-// }
-
-// .icon-duanxinyanzheng:before {
-//   content: "\e6f3";
-// }
-
-// .icon-shouji:before {
-//   content: "\e6f2";
-// }
-
-// .icon-mima:before {
-//   content: "\e6f1";
-// }
-
-// .icon-yonghuming:before {
-//   content: "\e6f0";
-// }
-
-// .icon-shibai:before {
-//   content: "\e6ef";
-// }
-
-// .icon-chenggong:before {
-//   content: "\e6ee";
-// }
-
-// .icon-weixin:before {
-//   content: "\e6e9";
-// }
-
-// .icon-sologan:before {
-//   content: "\e6e1";
-// }
-
-// .icon-dingwei:before {
-//   content: "\e6df";
-// }
-
-// .icon-yonghu:before {
-//   content: "\e6e0";
-// }
 
 // 公用样式类名
 .w {
@@ -368,6 +148,19 @@ i {
 .mt20 {
   margin-top: 20px;
 }
+.titlestyle {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+.nobd {
+  border-left-color: transparent !important;
+  border-right-color: transparent !important;
+  border-top: none !important;
+  border-bottom: none !important;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+}
 // 日期选择框
 .ant-calendar-picker-container-content {
 	margin-top: 3px;
@@ -423,7 +216,9 @@ i {
 	}
 	input[type="text"] {
 		box-shadow: none;
-		border-color: transparent;
+    background-color: #fff;
+		border-color: #ddd;
+    border-radius: 0;
 		&:focus {
 			border: 1px solid #ff4400;
 		}
@@ -433,6 +228,7 @@ i {
 	}
 	.ant-pagination-item {
 		border: none;
+    border-radius: 0;
 		a:hover {
 			color: #ff4400;
 		}
@@ -466,7 +262,7 @@ i {
   // border-top: 1px solid #000;
 	width: 100vw;
 	margin: 0 auto;
-	top: 144px !important;
+	top: 45px !important;
 	-webkit-box-shadow: 0 8px 8px rgba(0, 0, 0, 0.15);
 	box-shadow: 0 8px 8px rgba(0, 0, 0, 0.15);
 	transition: none !important;
@@ -502,7 +298,7 @@ i {
 }
 .ant-cascader-menus.flitercity {
 	left: calc((100vw - 1216px) / 2) !important;
-	top: 70px !important;
+	top: 45px !important;
 	border-radius: 0 0 4px 4px !important;
 	-webkit-box-shadow: 0 8px 8px rgba(0, 0, 0, 0.15);
 	box-shadow: 0 8px 8px rgba(0, 0, 0, 0.15);
@@ -589,7 +385,9 @@ p.bottombox {
 	position: relative;
 	text-align: center;
 	// border-bottom: 1px solid #eeefef;
+  font-weight: 600;
 	margin-top: 12px;
+  font-size: 16px;
 	padding-bottom: 12px;
 	margin-bottom: 16px;
 	color: rgba(0, 0, 0, 0.85);
@@ -715,4 +513,45 @@ p.bottombox {
     }
   }
  
+}
+// 日期选择器样式
+.ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month{
+  background: #ff4400;
+}
+.ant-calendar-date:hover {
+  border-color: #ff4400;
+  background-color: #fff;
+  color: #ff4400;
+}
+.ant-calendar-today .ant-calendar-date {
+  background-color: #ff4400;
+  border-color: #ff4400;
+  color: #fff;
+}
+.ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date, .ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date{
+  background-color: #ff4400;
+  border-color: #ff4400;
+  color: #fff;
+}
+.ant-calendar-range .ant-calendar-in-range-cell::before{
+  background: #fff3ef;
+}
+.ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date:hover, .ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date:hover {
+  background: #ff4400;
+}
+.ant-calendar-header a:hover{
+  color: #ff4400;
+}
+.ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month:hover , .ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year , .ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade,.ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade:hover,.ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year:hover{
+  background: #ff4400;
+}
+.ant-calendar-month-panel-month:hover,.ant-calendar-year-panel-year:hover,.ant-calendar-decade-panel-decade:hover {
+  background: #fff3ef;
+}
+// 全体样式
+.ant-table-thead > tr > th .ant-table-column-sorter .ant-table-column-sorter-inner .ant-table-column-sorter-up.on, .ant-table-thead > tr > th .ant-table-column-sorter .ant-table-column-sorter-inner .ant-table-column-sorter-down.on {
+  color: #ff4400;
+}
+.ant-table-thead > tr.ant-table-row-hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td, .ant-table-tbody > tr.ant-table-row-hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td, .ant-table-thead > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td, .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td{
+  background: #fff3ef;
 }

src/style/index.wxss

@@ -1,4 +1,4 @@
-@import "http://at.alicdn.com/t/font_3135652_fha9d3mzga5.css";
+@import "http://at.alicdn.com/t/font_3135652_tzuybmnhq2.css";
 body,
 h1,
 h2,
@@ -27,7 +27,7 @@ td,
 div {
   margin: 0;
   padding: 0;
-  color: #4d575e;
+  color: #333;
   font-family: PingFangSC, PingFangSC-Regular;
 }
 body,
@@ -108,7 +108,7 @@ table {
 }
 body {
   padding: 0;
-  background-color: #f6f6f6;
+  background-color: #fff;
   font-size: 18px;
 }
 p {
@@ -134,6 +134,19 @@ i {
 .mt20 {
   margin-top: 20px;
 }
+.titlestyle {
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+.nobd {
+  border-left-color: transparent !important;
+  border-right-color: transparent !important;
+  border-top: none !important;
+  border-bottom: none !important;
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+}
 .ant-calendar-picker-container-content {
   margin-top: 3px;
 }
@@ -176,7 +189,9 @@ i {
 }
 .pagecontainer input[type="text"] {
   box-shadow: none;
-  border-color: transparent;
+  background-color: #fff;
+  border-color: #ddd;
+  border-radius: 0;
 }
 .pagecontainer input[type="text"]:focus {
   border: 1px solid #ff4400;
@@ -186,6 +201,7 @@ i {
 }
 .pagecontainer .ant-pagination-item {
   border: none;
+  border-radius: 0;
 }
 .pagecontainer .ant-pagination-item a:hover {
   color: #ff4400;
@@ -207,7 +223,7 @@ i {
 .ant-cascader-menus.gender {
   width: 100vw;
   margin: 0 auto;
-  top: 144px !important;
+  top: 45px !important;
   -webkit-box-shadow: 0 8px 8px rgba(0, 0, 0, 0.15);
   box-shadow: 0 8px 8px rgba(0, 0, 0, 0.15);
   transition: none !important;
@@ -229,7 +245,7 @@ i {
 .ant-cascader-menus.agestr .ant-cascader-menu .ant-cascader-menu-item:hover,
 .ant-cascader-menus.gender .ant-cascader-menu .ant-cascader-menu-item:hover {
   background-color: rgba(255, 106, 0, 0.1);
-  color: #ff4400;
+  color: #ff6a00;
 }
 .ant-cascader-menus.slide-up-leave-active {
   animation: none !important;
@@ -249,7 +265,7 @@ i {
 }
 .ant-cascader-menus.flitercity {
   left: calc(-558vw) !important;
-  top: 70px !important;
+  top: 45px !important;
   border-radius: 0 0 4px 4px !important;
   -webkit-box-shadow: 0 8px 8px rgba(0, 0, 0, 0.15);
   box-shadow: 0 8px 8px rgba(0, 0, 0, 0.15);
@@ -263,7 +279,7 @@ i {
 }
 .ant-cascader-menus.flitercity .ant-cascader-menu .ant-cascader-menu-item:hover {
   background-color: rgba(255, 106, 0, 0.1);
-  color: #ff4400;
+  color: #ff6a00;
 }
 .logindropdown {
   left: calc(463vw) !important;
@@ -327,7 +343,9 @@ h1.bottombox,
 p.bottombox {
   position: relative;
   text-align: center;
+  font-weight: 600;
   margin-top: 12px;
+  font-size: 16px;
   padding-bottom: 12px;
   margin-bottom: 16px;
   color: rgba(0, 0, 0, 0.85);
@@ -436,3 +454,54 @@ p.bottombox::after {
   color: #fff;
   background-color: #ff4400;
 }
+.ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month {
+  background: #ff4400;
+}
+.ant-calendar-date:hover {
+  border-color: #ff4400;
+  background-color: #fff;
+  color: #ff4400;
+}
+.ant-calendar-today .ant-calendar-date {
+  background-color: #ff4400;
+  border-color: #ff4400;
+  color: #fff;
+}
+.ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date,
+.ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date {
+  background-color: #ff4400;
+  border-color: #ff4400;
+  color: #fff;
+}
+.ant-calendar-range .ant-calendar-in-range-cell::before {
+  background: #fff3ef;
+}
+.ant-calendar-range .ant-calendar-selected-start-date .ant-calendar-date:hover,
+.ant-calendar-range .ant-calendar-selected-end-date .ant-calendar-date:hover {
+  background: #ff4400;
+}
+.ant-calendar-header a:hover {
+  color: #ff4400;
+}
+.ant-calendar-month-panel-selected-cell .ant-calendar-month-panel-month:hover,
+.ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year,
+.ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade,
+.ant-calendar-decade-panel-selected-cell .ant-calendar-decade-panel-decade:hover,
+.ant-calendar-year-panel-selected-cell .ant-calendar-year-panel-year:hover {
+  background: #ff4400;
+}
+.ant-calendar-month-panel-month:hover,
+.ant-calendar-year-panel-year:hover,
+.ant-calendar-decade-panel-decade:hover {
+  background: #fff3ef;
+}
+.ant-table-thead > tr > th .ant-table-column-sorter .ant-table-column-sorter-inner .ant-table-column-sorter-up.on,
+.ant-table-thead > tr > th .ant-table-column-sorter .ant-table-column-sorter-inner .ant-table-column-sorter-down.on {
+  color: #ff4400;
+}
+.ant-table-thead > tr.ant-table-row-hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td,
+.ant-table-tbody > tr.ant-table-row-hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td,
+.ant-table-thead > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td,
+.ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
+  background: #fff3ef;
+}

src/utils/commonUtil.js

@@ -956,8 +956,9 @@ export function getAgencyPromotionDetailMoneyStatusNameId(id) {
 export function moneyToFixed(money, fixed = 2, multiplicator = 100) {
   if (money != 0 && money != null && money != "" && money != undefined) {
     return cutZero(new Number(money / multiplicator).toFixed(fixed));
+  } else {
+    return "0";
   }
-  return "0";
 }
 export function cutZero(old) {
   //拷贝一份 返回去掉零的新串
@@ -1207,19 +1208,48 @@ export function userApplyOrderStatusArray() {
   //   { id: "60", name: "已完成", value: "60", text: "已完成" },
   // ];
   let orderStatus = [
-
-    { id: "10", name: "已报名，审核中", value: "10", text: "报名审核中", num: 0 },
-    { id: "20", name: "报名成功，待面试", value: "20", text: "审核通过", num: 0 },
-    { id: "21", name: "审核未通过，报名失败", value: "21", text: "审核未通过", num: 0 },
+    {
+      id: "10",
+      name: "已报名，审核中",
+      value: "10",
+      text: "报名审核中",
+      num: 0,
+    },
+    {
+      id: "20",
+      name: "报名成功，待面试",
+      value: "20",
+      text: "审核通过",
+      num: 0,
+    },
+    {
+      id: "21",
+      name: "审核未通过，报名失败",
+      value: "21",
+      text: "审核未通过",
+      num: 0,
+    },
     { id: "25", name: "已接到", value: "25", text: "已接到", num: 0 },
     { id: "26", name: "未接到", value: "26", text: "未接到", num: 0 },
-    { id: "30", name: "面试通过，待入职", value: "30", text: "面试通过", num: 0 },
+    {
+      id: "30",
+      name: "面试通过，待入职",
+      value: "30",
+      text: "面试通过",
+      num: 0,
+    },
     { id: "35", name: "面试未通过", value: "35", text: "面试未通过", num: 0 },
     { id: "40", name: "已入职，在职中", value: "40", text: "已入职", num: 0 },
-    { id: "45", name: "面试通过，未入职", value: "45", text: "通过未入职", num: 0 },
-    { id: "50", name: "已离职", value: "50", text: "已离职", num: 0 }
+    {
+      id: "45",
+      name: "面试通过，未入职",
+      value: "45",
+      text: "通过未入职",
+      num: 0,
+    },
+    { id: "50", name: "已离职", value: "50", text: "已离职", num: 0 },
     // { id: "60", name: "已完成", value: "60", text: "已完成", num: 0 }
-];
+  ];
   return orderStatus;
 }
 
@@ -1251,11 +1281,11 @@ export function disposeJobListData(jobList) {
         // console.log(jobList);
         var ageStr = "";
         if (isNotEmptyCheck(item.minAge) && isNotEmptyCheck(item.maxAge)) {
-          ageStr = "丨" + item.minAge + "-" + item.maxAge + "岁";
+          ageStr = item.minAge + "-" + item.maxAge + "岁";
         } else if (isNotEmptyCheck(item.minAge)) {
-          ageStr = "丨" + item.minAge + "岁以上";
+          ageStr = item.minAge + "岁以上";
         } else if (isNotEmptyCheck(item.maxAge)) {
-          ageStr = "丨" + item.maxAge + "岁以下";
+          ageStr = item.maxAge + "岁以下";
         }
         item["age"] = ageStr;
         item.updateTime = formatDateYMDHM(item.updateTime);
@@ -1293,7 +1323,7 @@ export function disposeJobListData(jobList) {
           } else if (item.returnFeeType === 3) {
             item.servetype = `${item.returnFee || "--"}元/次`;
           } else if (item.returnFeeType === 4) {
-            item.servetype = `${item.returnFee || "--"}元/斤`;
+            item.servetype = `${item.returnFee || "--"}元/公斤`;
           } else if (item.returnFeeType === 5) {
             item.servetype = `工人收入${item.returnFee || "--"}%`;
           }
@@ -1350,11 +1380,20 @@ export function disposeJobListData(jobList) {
         //地址深圳丨龙岗区丨
         var districtStr = "";
         if (isNotEmptyCheck(item.district)) {
+          // console.log(item.district);
           var districtArr = item.district.split(",");
+          var districtArr1 = [];
+          // console.log(districtArr);
+          districtArr.forEach((item1) => {
+            if (item1.length != 0) {
+              item1 = item1 + "丨";
+              districtArr1.push(item1);
+            }
+          });
           if (districtArr.length < 3) {
-            districtStr = districtArr[districtArr.length - 1];
+            districtStr = districtArr1[districtArr1.length - 1];
           } else {
-            districtStr = districtArr[1] + "丨" + districtArr[2];
+            districtStr = districtArr1.join("");
           }
           //districtStr = districtArr[1] + '丨' + districtArr[2];
         }
@@ -1385,14 +1424,14 @@ export function disposeJobListData(jobList) {
           Boolean(item.minAgeWoman) === true &&
           Boolean(item.minAgeMan) === false
         ) {
-          item.gender = "丨女";
+          item.gender = "女丨";
         } else if (
           Boolean(item.minAgeWoman) === false &&
           Boolean(item.minAgeMan) === true
         ) {
-          item.gender = "丨男";
+          item.gender = "男丨";
         } else {
-          item.gender = "丨男女不限";
+          item.gender = "男女不限丨";
         }
       });
     } else {
@@ -1404,11 +1443,11 @@ export function disposeJobListData(jobList) {
       //年龄
       var ageStr = "";
       if (isNotEmptyCheck(jobList.minAge) && isNotEmptyCheck(jobList.maxAge)) {
-        ageStr = "丨" + jobList.minAge + "-" + jobList.maxAge + "岁";
+        ageStr = jobList.minAge + "-" + jobList.maxAge + "岁";
       } else if (isNotEmptyCheck(jobList.minAge)) {
-        ageStr = "丨" + jobList.minAge + "岁以上";
+        ageStr = jobList.minAge + "岁以上";
       } else if (isNotEmptyCheck(jobList.maxAge)) {
-        ageStr = "丨" + jobList.maxAge + "岁以下";
+        ageStr = jobList.maxAge + "岁以下";
       }
       jobList["age"] = ageStr;
       //时薪
@@ -1469,12 +1508,10 @@ export function disposeJobListData(jobList) {
         } else if (jobList.returnFeeType === 3) {
           jobList.servetype = `${jobList.returnFee || "--"}元/次`;
         } else if (jobList.returnFeeType === 4) {
-          jobList.servetype = `${jobList.returnFee || "--"}元/斤`;
+          jobList.servetype = `${jobList.returnFee || "--"}元/公斤`;
         } else if (jobList.returnFeeType === 5) {
           jobList.servetype = `工人收入${jobList.returnFee || "--"}%`;
         }
-        // console.log(jobList);
-        // jobList["returnFee"] = jobList.returnFee / 100;
       } else {
         jobList.servetype = `${jobList.returnFee || "--"}元/小时`;
       }
@@ -1497,10 +1534,19 @@ export function disposeJobListData(jobList) {
       var districtStr = "";
       if (isNotEmptyCheck(jobList.district)) {
         var districtArr = jobList.district.split(",");
+        var districtArr1 = [];
+        // console.log(districtArr);
+        districtArr.forEach((item1) => {
+          if (item1.length != 0) {
+            item1 = item1 + "丨";
+            districtArr1.push(item1);
+          }
+        });
         if (districtArr.length < 3) {
-          districtStr = districtArr[districtArr.length - 1];
+          districtStr = districtArr1[districtArr1.length - 1];
         } else {
-          districtStr = districtArr[1] + "丨" + districtArr[2];
+          // districtStr = districtArr[1] + "丨" + districtArr[2];
+          districtStr = districtArr1.join("");
         }
         //districtStr = districtArr[1] + '丨' + districtArr[2];
       }
@@ -1528,20 +1574,20 @@ export function disposeJobListData(jobList) {
         jobList.jobSpecialLabelNames = jobSpecialLabelNames;
       }
       // 年龄限制
-      console.log(jobList);
+      // console.log(jobList);
       // console.log(jobList["gender"]);
       if (
         Boolean(jobList.minAgeWoman) === true &&
         Boolean(jobList.minAgeMan) === false
       ) {
-        jobList.gender = "丨女";
+        jobList.gender = "女丨";
       } else if (
         Boolean(jobList.minAgeWoman) === false &&
         Boolean(jobList.minAgeMan) === true
       ) {
-        jobList.gender = "丨男";
+        jobList.gender = "男丨";
       } else {
-        jobList.gender = "丨男女不限";
+        jobList.gender = "男女不限丨";
       }
       // if (jobList["gender"] === 1) {
       //   jobList["gender"] = "丨男";
@@ -1563,22 +1609,22 @@ export function disposeJobListData(jobList) {
 export function getSalaryClassifyValue(salaryClassify, salaryClassifyValue) {
   var hourlyPay = moneyToFixed(salaryClassifyValue);
   if (salaryClassify == 0) {
-    return `${hourlyPay}元/小时`;
+    return `<span>${hourlyPay}</span>元/小时`;
   } else if (salaryClassify == 1) {
-    return `${hourlyPay}元/天`;
+    return `<span>${hourlyPay}</span>元/天`;
   } else if (salaryClassify == 2) {
-    return `补${hourlyPay}元`;
+    return `补<span>${hourlyPay}</span>元`;
   } else if (salaryClassify == 3) {
-    return `返${hourlyPay}元`;
+    return `返<span>${hourlyPay}</span>元`;
   } else if (salaryClassify == 4) {
-    return "计件";
+    return "<i>计件</i>";
   } else if (salaryClassify == 5) {
-    return `保底${hourlyPay}元`;
+    return `保底<span>${hourlyPay}</span>元`;
   } else if (salaryClassify == 6) {
-    return `面议`;
+    return `<i>面议</i>`;
   } else if (salaryClassify == 7) {
     // return '请配置薪资';
-    return `月薪`;
+    return `<i>月薪</i>`;
   } else {
     return "-";
   }
@@ -1592,8 +1638,8 @@ export function getAgeFromBirthday(bir) {
   var infoObj = { age: "", gender: "" };
   var birth = bir.substr(6, 8);
   var age = bir.substr(16, 1);
-  console.log(age);
-  console.log(birth);
+  // console.log(age);
+  // console.log(birth);
   if (age % 2 == 0) {
     infoObj.gender = "2";
   } else {

src/views/login.vue

@@ -91,6 +91,7 @@ export default {
     margin: auto;
     border-radius: 16px;
     overflow: hidden;
+    box-shadow: 0 0 30px 6px #eee;
     .contentleft {
       width: 320px;
       height: 100%;

src/views/main.vue

@@ -3,13 +3,7 @@
     <!-- title部分 -->
     <div class="pagetitle" id="pay">
       <div class="w">
-        <span>
-          <!-- <i class="iconfont icon-yigezhuanmenfuwudailidepingtai"></i> -->
-          <router-link to="/main"
-            ><svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-dingbulogo"></use></svg
-          ></router-link>
-        </span>
+        <span> 欢迎来到伯才一手单平台！ </span>
         <span>
           <ul>
             <li>
@@ -18,7 +12,7 @@
                 :class="routertitleindex == 0 ? 'titleactive' : ''"
                 rel="opener"
               >
-                首页</router-link
+                一手单首页</router-link
               >
             </li>
             <li>
@@ -67,15 +61,11 @@
         </span>
 
         <span class="login">
-          <span v-if="isLogin">
+          <span v-if="isLogin" class="logined">
             <a-dropdown overlayClassName="logindropdown">
-              <img
-                :src="loginValue.imgSrc"
-                alt=""
-                v-if="loginValue.imgSrc !== ''"
-                style="border-radius: 50%"
-              />
-              <span v-else><i class="iconfont icon-morentouxiang"></i></span>
+              <!-- <img :src="loginValue.imgSrc" alt="" v-if="loginValue.imgSrc !== ''" style="border-radius: 50%" />
+							<span v-else><i class="iconfont icon-morentouxiang" style="color:#ff4400"></i></span> -->
+              <span>个人中心</span>
               <div class="loginbox" slot="overlay">
                 <div>
                   <img
@@ -95,6 +85,14 @@
                       ><i class="iconfont icon-gerenzhongxin"></i>个人中心</span
                     ><i class="iconfont icon-youjiantou"></i></div
                 ></router-link>
+                <router-link to="/memberInfo"
+                  ><div>
+                    <span
+                      ><i class="iconfont icon-zhanghaoshezhi"></i
+                      >成员管理</span
+                    ><i class="iconfont icon-youjiantou"></i>
+                  </div>
+                </router-link>
                 <!-- <router-link to="/accountsetting"
                   ><div>
                     <span
@@ -324,11 +322,11 @@ export default {
       this.showfooter();
     },
     $route: {
-      handler(to, from) {
-        console.log("ischange");
-        console.log(to);
-        console.log(from);
-        console.dir(this.navigationBarLocation);
+      handler(to) {
+        // console.log("ischange");
+        // console.log(to);
+        // console.log(from);
+        // console.dir(this.navigationBarLocation);
         window.addEventListener("scroll", this.navigationBarLocation);
         window.addEventListener("scroll", this.windowScroll); //监听页面滚动
         if (to.fullPath == "/list") {
@@ -383,43 +381,47 @@ export default {
     /**
      * 处理后台返回的职位列表
      */
-    windowScroll() {
-      // console.log(e);
-      let scrollTop =
-        window.pageYOffset ||
-        document.documentElement.scrollTop ||
-        document.body.scrollTop;
-      // console.log(scrollTop); // 获取到页面滚动的值,
-      let navigation = document.getElementById("navigation");
-      let content = document.getElementById("maincontent");
-      // let filterbox = document.querySelector(".w");
-      // console.log(filterbox);
-      // console.log(content);
-      // let left = ("100vw" - "1200px") / 2;
-      if (this.$route.fullPath == "/list") {
-        if (scrollTop >= 81) {
-          navigation.style.position = "fixed";
-          navigation.style.top = "0px";
-          navigation.style.boxShadow = "2px 2px 4px 0px rgba(0,0,0,0.05)";
-          content.style.marginTop = "90px";
-        } else {
-          navigation.style.position = "relative";
-          navigation.style.right = "0";
-          content.style.marginTop = "16px";
-          navigation.style.boxShadow = "none";
-        }
-      }
-    },
+    // windowScroll() {
+    // 	// console.log(e);
+    // 	let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
+    // 	// console.log(scrollTop); // 获取到页面滚动的值,
+    // 	let navigation = document.getElementById("navigation");
+    // 	let content = document.getElementById("maincontent");
+    // 	// let filterbox = document.querySelector(".w");
+    // 	// console.log(filterbox);
+    // 	// console.log(content);
+    // 	// let left = ("100vw" - "1200px") / 2;
+    // 	// console.log(navigator.userAgent);
+    // 	if (this.$route.fullPath == "/list") {
+    // 		if (scrollTop >= 81) {
+    // 			navigation.style.position = "fixed";
+    // 			navigation.style.top = "0px";
+    // 			navigation.style.boxShadow = "2px 2px 4px 0px rgba(0,0,0,0.05)";
+    // 			content.style.marginTop = "64px";
+    // 			if (navigator.userAgent.indexOf("Mac OS X") == -1) {
+    // 				navigation.style.paddingLeft = "35px";
+    // 			}
+    // 		} else {
+    // 			navigation.style.position = "relative";
+    // 			navigation.style.right = "0";
+    // 			content.style.marginTop = "16px";
+    // 			navigation.style.boxShadow = "none";
+    // 			if (navigator.userAgent.indexOf("Mac OS X") == -1) {
+    // 				navigation.style.paddingLeft = "0px";
+    // 			}
+    // 		}
+    // 	}
+    // },
     navigationBarLocation() {
       let navigationBar = document.getElementById("navigationBar");
       let aboutBill = document.getElementById("aboutBill");
       // console.log(navigationBar.getBoundingClientRect().top);
-      console.log(aboutBill);
-      console.log(aboutBill.getBoundingClientRect().top);
+      // console.log(aboutBill);
+      // console.log(aboutBill.getBoundingClientRect().top);
       if (this.$route.fullPath == "/main") {
         if (
           navigationBar.getBoundingClientRect().top <= 0 &&
-          aboutBill.getBoundingClientRect().top < 85
+          aboutBill.getBoundingClientRect().top < 84
         ) {
           navigationBar.style.position = "fixed";
           navigationBar.style.top = "0px";
@@ -570,7 +572,7 @@ export default {
 
         this.isfootershow = true;
       }
-      if (path.indexOf("login") > -1) {
+      if (path.indexOf("login") > -1 && path.indexOf("loginpsw") == -1) {
         this.isbannershow = false;
       }
     },
@@ -588,13 +590,14 @@ export default {
 .index-container {
   height: 100%;
   /deep/ .pagetitle {
-    background-color: #fff;
-    padding: 14px 0;
+    background-color: #f0f0f0;
+    padding: 0;
+    // height: 32px;
     // width: 100vw;
     // font-size: 16px;
     .titleactive {
       // font-size: 18px;
-      font-weight: bold;
+      font-weight: normal;
       color: #ff4400;
     }
     .w {
@@ -604,39 +607,33 @@ export default {
       // line-height: 36px;
 
       span {
+        height: 32px;
         float: left;
       }
       > span:first-of-type {
         display: block;
         width: 160px;
-        height: 52px;
+        font-size: 12px;
+        color: #333;
+        line-height: 32px;
         // width: 228px;
         // height: 36px;
         // img {
         //   width: 100%;
         //   height: 100%;
         // }
-        svg {
-          width: 100%;
-          height: 52px;
-          // font-size: 46px;
-          // line-height: 52px;
-          // color: #ff4400;
-          color: #ff4400;
-        }
       }
       > span:nth-of-type(2) {
         ul {
-          font-size: 16px;
+          font-size: 12px;
           display: flex;
-          margin-left: 80px;
-          color: #666666;
+          margin-left: 110px;
           li {
-            font-weight: 600;
-            color: #666;
-            margin-right: 40px;
-            line-height: 52px;
-            text-shadow: 2px 2px 4px 0px rgba(0, 0, 0, 0.05);
+            font-weight: 400;
+            color: #333;
+            margin-right: 24px;
+            line-height: 32px;
+            // text-shadow: 2px 2px 4px 0px rgba(0, 0, 0, 0.05);
 
             a {
               transition: none;
@@ -676,50 +673,65 @@ export default {
       .login {
         float: right;
         // width: 36px;
-        line-height: 52px;
+        line-height: 24px;
         .loginbtn {
           width: 70px;
         }
-
-        > span {
-          width: 36px;
-          height: 36px;
-          img {
-            width: 36px;
-            height: 36px;
-          }
-          span {
-            width: 36px;
-            height: 36px;
-            margin-top: 4px;
-            // margin-left: 33px;
+        .loginbtn {
+          margin-top: 02px;
+          button {
+            width: 70px;
+            height: 24px;
+            font-size: 12px;
+            margin-top: 2px;
+            background-color: #fff;
+            border: 1px solid #ff4400;
+            line-height: 22px;
             border-radius: 999px;
-            // background-color: #ff4400;
-            margin-right: -3px;
-            text-align: center;
-          }
-
-          i {
-            font-size: 32px;
-            line-height: 30px;
             color: #ff4400;
-            cursor: pointer;
+            text-shadow: 2px 2px 4px 0px rgba(0, 0, 0, 0.05);
             &:hover {
-              color: #ff842b;
+              border-color: rgba(255, 68, 0, 0.8);
+              color: rgba(255, 68, 0, 0.8);
             }
           }
         }
-        button {
-          width: 70px;
-          height: 32px;
-          font-size: 14px;
-          margin-top: 10px;
-          background-color: #fff;
-          border: 1px solid #ff4400;
-          line-height: 30px;
-          border-radius: 999px;
-          color: #ff4400;
-          text-shadow: 2px 2px 4px 0px rgba(0, 0, 0, 0.05);
+        .logined {
+          // border-radius: 999px;
+          overflow: hidden;
+          border: 1px solid #eee;
+          margin-top: 4px;
+          font-size: 12px;
+          cursor: default;
+          &:hover {
+            color: #ff4400;
+          }
+          // width: 24px;
+          // height: 24px;
+          img {
+            width: 24px;
+            height: 24px;
+          }
+          // span {
+          // 	width: 36px;
+          // 	height: 36px;
+          // 	margin-top: 4px;
+          // 	// margin-left: 33px;
+          // 	border-radius: 999px;
+          // 	// background-color: #ff4400;
+          // 	margin-right: -3px;
+          // 	text-align: center;
+          // }
+
+          // i {
+          // 	font-size: 32px;
+          // 	line-height: 30px;
+          // 	color: #ff4400;
+          // 	cursor: pointer;
+          // 	&:hover {
+          // 		color: #ff4400;
+          // 	}
+          // }
         }
       }
     }
@@ -925,6 +937,9 @@ export default {
   }
   button {
     line-height: 28px;
+    &:hover {
+      border-color: #ff4400;
+    }
   }
 }
 </style>

src/views/userinfo.vue

@@ -7,7 +7,7 @@
           <!-- <i class="iconfont icon-yigezhuanmenfuwudailidepingtai"></i> -->
           <router-link to="/main"
             ><svg class="icon" aria-hidden="true">
-              <use xlink:href="#icon-dingbulogo"></use></svg
+              <use xlink:href="#icon-yishoudanlogo"></use></svg
           ></router-link>
         </span>
         <span class="navigationleft">
@@ -364,7 +364,7 @@ export default {
   height: 100%;
   /deep/ .pagetitle {
     background-color: #fff;
-    padding: 14px 0;
+    padding: 32px 0;
 
     font-size: 16px;
     .titleactive {

vue.config.js

@@ -44,6 +44,7 @@ module.exports = {
       "/api_prod": {
         // target: "http://localhost:8001/",
         target: "http://bl7.matripe.com.cn:8001",
+        // target: "http://1shoudan.renminshitang.com.cn",
         // target: "https://d.matripe.com.cn",
         ws: true, // proxy websockets
         changeOrigin: true, // 确定是否跨域