Merge branch 'dev' of www.gitinn.com:proginn/boss

# Conflicts:
#	dist/200.html
#	dist/_nuxt/0020a206ec9244550a9a.js
#	dist/_nuxt/011797eef621bfe13655.js
#	dist/_nuxt/0258dd4312e1be10ecdf.js
#	dist/_nuxt/0920338745b3779ead45.js
#	dist/_nuxt/0c5a68e7e23bea55bd5d.js
#	dist/_nuxt/0c80753c669f6a5fee11.js
#	dist/_nuxt/0ec91493abaaeccb2a16.js
#	dist/_nuxt/1315db141a62debf6964.js
#	dist/_nuxt/15705c68f10edb4cb4dc.js
#	dist/_nuxt/16912911911f4f9add47.js
#	dist/_nuxt/1805aa54b6b4fb55bb56.js
#	dist/_nuxt/1b504972eca2d5cd4c49.js
#	dist/_nuxt/27c02a9ba3e0e19ac2c4.js
#	dist/_nuxt/27ce64547d8cc8e1660c.js
#	dist/_nuxt/27d976580f33e70bfe39.js
#	dist/_nuxt/29295bb7adaa7a75459f.js
#	dist/_nuxt/296cfd7ee6474029f0a5.js
#	dist/_nuxt/300fba8ee946066ebb36.js
#	dist/_nuxt/3397fd546efaf4302bfc.js
#	dist/_nuxt/374a8c3eca75984a4788.js
#	dist/_nuxt/38b2bc1cb434eebbc07e.js
#	dist/_nuxt/392f69cdbdd4bde4c4e1.js
#	dist/_nuxt/39b3c1bc599b2c37002a.js
#	dist/_nuxt/3ab9c84fe49cf26c5f75.js
#	dist/_nuxt/3ef7fd4a07d753a3d311.js
#	dist/_nuxt/416c58f8857fe8b11259.js
#	dist/_nuxt/422b5cd1917f28de5432.js
#	dist/_nuxt/429af81722308fdd2741.js
#	dist/_nuxt/4340a5147dc921cc5d6f.js
#	dist/_nuxt/44b8244824479e3db07e.js
#	dist/_nuxt/456f25e9348a1d4df2a0.js
#	dist/_nuxt/4bed8654a82dceeedd2e.js
#	dist/_nuxt/4c9dc7419cf1c5fb727d.js
#	dist/_nuxt/4ebadbd4da6ec4ba119f.js
#	dist/_nuxt/4f6498cab4f576dbab0d.js
#	dist/_nuxt/5022a88bae0223465f53.js
#	dist/_nuxt/515613f9cf02fc6aec9a.js
#	dist/_nuxt/5225a7bffbfe25931c90.js
#	dist/_nuxt/587f50ce48de3c9f6659.js
#	dist/_nuxt/59c26dd601af367e1c27.js
#	dist/_nuxt/59c2cf367654afc78dec.js
#	dist/_nuxt/5c6d226f264d7cf50bbb.js
#	dist/_nuxt/5ff3c646a8cd2ed37300.js
#	dist/_nuxt/646ec82e353b5d0b5f94.js
#	dist/_nuxt/684886aee46196915c8a.js
#	dist/_nuxt/6c13f5728bfc04adde1b.js
#	dist/_nuxt/6e7bc9e066aa4d203b96.js
#	dist/_nuxt/7455e455cf3a80a044ee.js
#	dist/_nuxt/775f2481b652a30314e4.js
#	dist/_nuxt/79208153045acfc4a22f.js
#	dist/_nuxt/7a617221992f255860a8.js
#	dist/_nuxt/7c064aeb56f500346377.js
#	dist/_nuxt/880f6c879bc7fb9993ad.js
#	dist/_nuxt/89a6f27451ec848fe550.js
#	dist/_nuxt/8a07b667302a04b6393d.js
#	dist/_nuxt/8b0b967b4a2296d11cc3.js
#	dist/_nuxt/8b387e5438e1d940b9af.js
#	dist/_nuxt/907a765c77fc1da8dba9.js
#	dist/_nuxt/944c628f893d0e8c40fc.js
#	dist/_nuxt/a122bd15e7be0df66eab.js
#	dist/_nuxt/a3290d0e922329ebc940.js
#	dist/_nuxt/a52d2f39eb5af734befd.js
#	dist/_nuxt/a5fb242abb9fbcb20435.js
#	dist/_nuxt/aa203589ec7ad5cec951.js
#	dist/_nuxt/ae75fac55ecc18c7ccbf.js
#	dist/_nuxt/b082a43c5dcb0ea58a1e.js
#	dist/_nuxt/b12186cb2d37934990a2.js
#	dist/_nuxt/b21b485d1457eb70cd40.js
#	dist/_nuxt/b62fae103977dd1054e4.js
#	dist/_nuxt/b66fa34eeb5bb6cdf8a7.js
#	dist/_nuxt/b72147c018f0af92824b.js
#	dist/_nuxt/bcdc0ab888ea414d6362.js
#	dist/_nuxt/bf8bc5f6e7140720c19e.js
#	dist/_nuxt/c5a98a15f5d517252bce.js
#	dist/_nuxt/c6600dcf868df90c9cf4.js
#	dist/_nuxt/cb2b6f4da73651d8af9a.js
#	dist/_nuxt/cd2b4bc44e4d5e77ecfd.js
#	dist/_nuxt/cdb8aa46ce29d0a49446.js
#	dist/_nuxt/cf26cb5fba275d16bdaa.js
#	dist/_nuxt/d2fb8af8fef5730e50cd.js
#	dist/_nuxt/d4f799449b5742e8285a.js
#	dist/_nuxt/dc1ca692bbaf434b1cb5.js
#	dist/_nuxt/dd4c6ca65ce46f9fa9cc.js
#	dist/_nuxt/dd5a64a860d20615ca91.js
#	dist/_nuxt/e08b0713089b7133acd0.js
#	dist/_nuxt/e1a5b14479ed3a88da03.js
#	dist/_nuxt/e52c64b8575450b0e3a6.js
#	dist/_nuxt/e67cdcde888b79b34eee.js
#	dist/_nuxt/e93e52418df7aad77a8b.js
#	dist/_nuxt/efc77ad44c75b45c3e6c.js
#	dist/_nuxt/efda1dd2c1840f404886.js
#	dist/_nuxt/f22d232c7172a7f8e424.js
#	dist/_nuxt/f401cba7d1b398d038e0.js
#	dist/_nuxt/faec5bdbac13d86c0ab9.js
#	dist/_nuxt/fc0894660e7419a2dbba.js
#	dist/_nuxt/ffb2fccc5781971937d4.js
#	dist/index.html
#	dist/login/index.html
#	dist/main/404/index.html
#	dist/main/artificial_order/index.html
#	dist/main/artificial_orders/index.html
#	dist/main/balance_change/index.html
#	dist/main/cats copy/index.html
#	dist/main/cats/index.html
#	dist/main/cert_check/index.html
#	dist/main/cert_edit/index.html
#	dist/main/cert_pro/index.html
#	dist/main/cloud_balance/index.html
#	dist/main/cloud_developer/index.html
#	dist/main/cloud_job/index.html
#	dist/main/cloud_order copy/index.html
#	dist/main/dev_check/index.html
#	dist/main/dev_check_detail/index.html
#	dist/main/dev_show/index.html
#	dist/main/gongmall/index.html
#	dist/main/group_list/index.html
#	dist/main/index.html
#	dist/main/orders/index.html
#	dist/main/orders_detail/index.html
#	dist/main/orders_frozen/index.html
#	dist/main/outsource_bill/index.html
#	dist/main/present_job_apply/index.html
#	dist/main/publish_present/index.html
#	dist/main/user_bills/index.html
#	dist/main/vip_manager/index.html
#	dist/main/vip_order/index.html
#	dist/main/vip_setting/index.html
#	dist/main/wage_details/index.html
#	dist/main/wage_settlement/index.html
#	dist/main/wait_expend/index.html
#	dist/main/withdraw/index.html
#	dist/main/work_bill/index.html

components/menu/data.js

@@ -105,6 +105,15 @@ export default [
 		path: '',
 		subs: [
 			{
+				title: '兼职招聘',
+				path: baseUrl + 'jobs'
+			},
+			{
+				title: '兼职招聘详情',
+				path: baseUrl + 'job',
+				hidden: true
+			},
+			{
 				title: '云端工作',
 				path: baseUrl + 'cloud_job'
 			},

pages/main/index/artificial_order.vue

@@ -346,6 +346,7 @@ export default {
         uid: this.form.uid,
         product_title: this.form.productTitle,
         product_type: this.form.productType,
+        product_id:this.form.productId,
         order_type: this.form.orderType,
         price: this.form.price,
         channel: this.form.channel,
@@ -382,6 +383,7 @@ export default {
         uid: this.form.uid,
         product_title: this.form.productTitle,
         product_type: this.form.productType,
+        product_id:this.form.productId,
         order_type: this.form.orderType,
         price: this.form.price,
         channel: this.form.channel,

pages/main/index/job.vue

@@ -0,0 +1,134 @@
+<template>
+  <div v-if="recruitData">
+    <div class="header">
+      <div class="header-left">
+        <div class="title-wrapper">
+          <div class="title">{{recruitData.title}}</div>
+          <div class="status" :style="{color: recruitData.statusColor}">{{recruitData.statusName}}</div>
+        </div>
+        <div class="salary">薪酬范围：{{recruitData.salaryName}}</div>
+        <div class="skill">技能：
+          <span v-for="(item,index) in recruitData.skills" :key="index">
+            <span v-if="index>0">,</span><span>{{item.name}}</span>
+          </span>
+        </div>
+        <div class="experience">经验：3-5年</div>
+      </div>
+      <div class="owner-wrapper" @click="handleOwnerClick()">
+        <img class="owner-img" :src="recruitData.ownerInfo && recruitData.ownerInfo.iconUrl || ''" alt="">
+        <div class="owner-name">{{recruitData.ownerInfo && recruitData.ownerInfo.nickname || ''}}</div>
+      </div>
+    </div>
+    <div class="description-wrapper">
+      <div class="description-title">工作描述</div>
+      <div class="description-content">{{recruitData.description}}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        recruitId: '',
+        recruitData: ''
+      }
+    },
+    mounted() {
+      this.recruitId = this.$route.query.id
+      this.getRecruit()
+    },
+    methods: {
+      async getRecruit() {
+        const recruitId = this.recruitId
+        const data = {
+          recruitId
+        }
+        let res = await this.$post("/api/admin/recruit/getRecruit", data);
+        if (res && res.status === 1) {
+          this.recruitData = res.data
+          console.log(this.recruitData)
+        }
+      },
+      handleOwnerClick() {
+        const recruitData = this.recruitData
+        // 前往老的后台
+        if (location.hostname === 'rooter.proginn.com') {
+          window.open(`https://www.proginn.com/rooter/user/${recruitData.uid}`)
+        }
+        else {
+          window.open(`https://dev.test.proginn.com/rooter/user/${recruitData.uid}`)
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+.header {
+  display: flex;
+}
+.title-wrapper {
+  display: flex;
+  align-items: center;
+}
+.title {
+  line-height: 27px;
+  font-weight: bold;
+  font-size: 18px;
+  color: #101010;
+}
+.status {
+  margin-left: 6px;
+  line-height: 20px;
+  font-size: 14px;
+}
+.salary {
+  margin-top: 13px;
+  line-height: 24px;
+  font-size: 16px;
+  color: #101010;
+}
+.skill {
+  margin-top: 8px;
+  line-height: 24px;
+  font-size: 16px;
+  color: #101010; 
+}
+.experience {
+  margin-top: 8px;
+  line-height: 24px;
+  font-size: 16px;
+  color: #101010; 
+}
+.owner-wrapper {
+  margin-left: 100px;
+  text-align: center;
+}
+.owner-img {
+  width: 53px;
+  height: 53px;
+  border-radius: 50%;
+}
+.owner-name {
+  margin-top: 8px;
+  line-height: 20px;
+  font-size: 14px;
+  color: #3F51B5;
+}
+.description-wrapper {
+  margin-top: 22px;
+}
+.description-title {
+  line-height: 27px;
+  font-weight: bold;
+  font-size: 18px;
+  color: #101010;
+}
+.description-content {
+  margin-top: 16px;
+  line-height: 24px;
+  font-size: 16px;
+  color: #101010;
+}
+</style>

pages/main/index/jobs.vue

@@ -0,0 +1,171 @@
+<template>
+  <div>
+    <div class="count-list" v-if="auditData">
+      <div class="count-item">全部：{{auditData.countAllStatus}}</div>
+      <div class="count-item">审核中：{{auditData.countWaitAudit}}</div>
+      <div class="count-item">开放中：{{auditData.countOpen}}</div>
+    </div>
+    <div class="content" v-if="auditData && auditData.list">
+      <el-table :data="auditData.list" @row-click="clickRow" height="100%" border style="width: 100%">
+        <el-table-column prop="id" label="岗位ID"></el-table-column>
+        <el-table-column prop="occupationName" label="职位类型"></el-table-column>
+        <el-table-column prop="workTypeName" label="工作方式"></el-table-column>
+        <el-table-column label="工作周期">
+          <template slot-scope="scope">
+            <span>{{scope.row.month}}个月</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="驻场地区">
+          <template slot-scope="scope">
+            <span>{{scope.row.cityName || '-'}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="salaryName" label="薪酬范围"></el-table-column>
+        <el-table-column prop="statusName" label="岗位状态"></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <div v-if="scope.row.status==='2'">
+              <el-button type="primary" class="btn" @click.stop="handleApproveClick(scope.row.id)">通过</el-button>
+              <el-button type="primary" class="btn" @click.stop="handleRejectClick(scope.row.id)">不通过</el-button>
+            </div>
+            <div v-if="scope.row.status==='3'">
+              <el-button type="primary" class="btn" @click.stop="handleRejectClick(scope.row.id)">不通过</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-pagination class="order-footer" background layout="prev, pager, next" :page-size="20" :total="Number(auditData.total)" @current-change="handleCurrentChange"/>
+    <el-dialog title="请输入审核不通过的原因" :visible.sync="isDialogShow">
+      <el-form :model="form">
+        <el-form-item label="">
+          <el-input v-model="form.reason"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="handleCancleClick()">取 消</el-button>
+        <el-button type="primary" @click="handleComfirmClick()">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      page: 1,
+      auditData: "",
+      form: {
+        reason: ''
+      },
+      isDialogShow: false
+    };
+  },
+  mounted() {
+    this.getAuditList();
+  },
+  methods: {
+    async getAuditList() {
+      const page = this.page;
+      const data = {
+        page
+      };
+      let res = await this.$post("/api/admin/recruit/getAuditList", data);
+      if (res && res.status === 1) {
+        this.auditData = res.data;
+        console.log(this.auditData);
+      }
+    },
+    async handleApproveClick(recruitId) {
+      const action = 'approve'
+      const data = {
+        recruitId,
+        action
+      };
+      let res = await this.$post("/api/admin/recruit/audit", data);
+      if (res && res.status === 1) {
+        console.log(res)
+        this.$message({
+          message: res.info,
+          type: 'success'
+        })
+        this.getAuditList()
+      }
+    },
+    async handleRejectClick(recruitId) {
+      this.recruitId = recruitId
+      this.isDialogShow = true
+    },
+    handleCancleClick() {
+      this.form = {
+        reason: ''
+      }
+      this.isDialogShow = false
+    },
+    async handleComfirmClick() {
+      const recruitId = this.recruitId
+      const action = 'reject'
+      const reason = this.form.reason
+      const data = {
+        recruitId,
+        action,
+        reason
+      };
+      let res = await this.$post("/api/admin/recruit/audit", data);
+      if (res && res.status === 1) {
+        console.log(res)
+        this.$message({
+          message: res.info,
+          type: 'success'
+        })
+        this.getAuditList()
+      }
+      this.form = {
+        reason: ''
+      }
+      this.isDialogShow = false
+    },
+    handleCurrentChange(val) {
+      this.page = val
+      this.getAuditList()
+    },
+    clickRow(row) {
+      const id = row.id
+      this.$router.push({ 
+        path: "/main/job", 
+        query: { 
+          id 
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.count-list {
+  padding-bottom: 10px;
+  display: flex;
+  align-items: center;
+}
+
+.count-item {
+  margin-right: 20px;
+  font-size: 16px;
+}
+
+.content {
+  white-space: nowrap;
+  overflow-x: scroll;
+  height: calc(100vh - 150px);
+}
+
+.btn {
+  width: 80px;
+}
+
+.order-footer {
+  margin-top: 10px;
+}
+</style>

pages/main/index/outsource_bill.vue

@@ -13,7 +13,7 @@
             <div>实际托管：￥{{Number(bill.order.real_amount/100)}}</div>
             <div>代金券抵扣：￥0.00</div>
             <div>税费：￥{{bill.project.tax/100}}（{{bill.project.tax_rate}}%）</div>
-            <div>平台服务费：￥{{(bill.project.service_fee-bill.project.company_fee_vip_reduce_amount)/100}}
+            <div>平台服务费：￥{{(bill.project.service_fee)/100}}
               （费率{{Number(bill.project.service_fee_rate) + Number(bill.project.company_fee_rate_vip_reduce)}}%,企业版会员减免{{bill.project.company_fee_rate_vip_reduce}}%）</div>
           </div>
         </el-col>
@@ -23,7 +23,7 @@
             <div>结算金额：￥{{bill.order.real_amount/100-bill.project.person_tax/100-bill.project.person_platform_fee/100}}</div>
             <div>开发款项：￥{{bill.order.amount}}</div>
 <!--            <div>冻结金额：￥88.96(冻结20%）</div>-->
-            <div>税费：￥{{bill.project.person_tax/100}}（税率{{bill.project.person_tax_rate}}%）</div>
+            <div>税费：￥{{Number(bill.project.person_tax/100+bill.project.person_tax_service_fee/100).toFixed(2)}}（税率{{parseFloat(bill.project.person_tax_rate)+parseFloat(bill.project.person_tax_service_fee_rate)}}%）</div>
             <div>平台服务费：￥{{bill.project.person_platform_fee/100}}
               （费率{{(Number(bill.project.person_platform_fee_rate)+Number(bill.project.person_fee_rate_vip_reduce)).toFixed(2)}}%,开发者会员减免{{bill.project.person_fee_rate_vip_reduce}}%）</div>
           </div>