4 年之前 · 87e09d719a
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 
				 VUE_APP_ADMIN_TOKEN_NAME = 'admin_token'
			
 
				-VUE_APP_API_URL_PREFIX = 'http://admin204.jydev.jianyu360.com/api/admin/'
			
 
				+VUE_APP_API_URL_PREFIX = 'http://192.168.20.67:8001/api/admin/'
			
 
				 VUE_APP_API_ACTION_NAME = '_action'
			
 
				 VUE_APP_API_TOKEN_NAME = '_token'
			
 
				 VUE_APP_INDEX_URL = '/index'
			
--- a/qmx_page/css/app.f1cacde0.css
+++ b/qmx_page/css/app.f1cacde0.css
--- a/qmx_page/css/chunk-vendors.784fa8c1.css
+++ b/qmx_page/css/chunk-vendors.784fa8c1.css
--- a/qmx_page/index.html
+++ b/qmx_page/index.html
@@ -1 +1,5 @@
 
				-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.f1cacde0.css rel=preload as=style><link href=/css/chunk-vendors.784fa8c1.css rel=preload as=style><link href=/js/app.71d6de0d.js rel=preload as=script><link href=/js/chunk-vendors.7f2b39e7.js rel=preload as=script><link href=/css/chunk-vendors.784fa8c1.css rel=stylesheet><link href=/css/app.f1cacde0.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.7f2b39e7.js></script><script src=/js/app.71d6de0d.js></script></body></html>
			
 
				+<<<<<<< HEAD
			
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.f1cacde0.css rel=preload as=style><link href=/css/chunk-vendors.784fa8c1.css rel=preload as=style><link href=/js/app.71d6de0d.js rel=preload as=script><link href=/js/chunk-vendors.7f2b39e7.js rel=preload as=script><link href=/css/chunk-vendors.784fa8c1.css rel=stylesheet><link href=/css/app.f1cacde0.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.7f2b39e7.js></script><script src=/js/app.71d6de0d.js></script></body></html>
			
 
				+=======
			
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.6488de46.css rel=preload as=style><link href=/css/chunk-vendors.784fa8c1.css rel=preload as=style><link href=/js/app.4339f620.js rel=preload as=script><link href=/js/chunk-vendors.7f2b39e7.js rel=preload as=script><link href=/css/chunk-vendors.784fa8c1.css rel=stylesheet><link href=/css/app.6488de46.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.7f2b39e7.js></script><script src=/js/app.4339f620.js></script></body></html>
			
 
				+>>>>>>> master
			
--- a/qmx_page/js/app.4339f620.js
+++ b/qmx_page/js/app.4339f620.js
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -101,18 +101,6 @@ a {
 
				   -webkit-tap-highlight-color: transparent;
			
 
				 }
			
 
				 
			
 
				-/* 图片自适应 */
			
 
				-img {
			
 
				-  width: 100%;
			
 
				-  height: auto;
			
 
				-  width: auto\9;
			
 
				-  /* ie8 */
			
 
				-  display: block;
			
 
				-  border: none;
			
 
				-  -ms-interpolation-mode: bicubic;
			
 
				-  /*为了照顾ie图片缩放失真*/
			
 
				-}
			
 
				-
			
 
				 em,
			
 
				 i,
			
 
				 strong {
			
@@ -647,11 +635,11 @@ textarea:-ms-input-placeholder {
 
				 .order-model .order-spin {
			
 
				   height: 36px;
			
 
				 }
			
 
				-.order-model .ivu-form .ivu-select-selection, .ivu-form .ivu-select-selection div .ivu-select-selected-value{
			
 
				+.sel-table .ivu-table .ivu-select-selection, .sel-table .ivu-table .ivu-select-selection div .ivu-select-selected-value  {
			
 
				   height: 30px;
			
 
				   line-height: 30px;
			
 
				 }
			
 
				-.order-model .ivu-form .ivu-select-selection .ivu-select-placeholder {
			
 
				+.sel-table .ivu-table .ivu-select-selection .ivu-select-placeholder {
			
 
				   height: 30px;
			
 
				   line-height: 30px;
			
 
				 }
			
--- a/src/components/tableLists.vue
+++ b/src/components/tableLists.vue
@@ -182,6 +182,8 @@
 
				 <style lang="scss" scoped>
			
 
				 .table-lists {
			
 
				     min-height: calc(100vh - 210px);
			
 
				+    background:#fff;
			
 
				+    padding: 10px;
			
 
				    .top-bar {
			
 
				         padding: 10px 0;
			
 
				         button {
			
--- a/src/router.js
+++ b/src/router.js
@@ -23,7 +23,8 @@ const routes = [
 
				     {
			
 
				         path: '/sales/partnerList/partnerDetail',
			
 
				         name: 'partnerDetail',
			
 
				-        component: () => import('./views/sales/partnerDetail.vue')
			
 
				+        component: () => import('./views/sales/partnerDetail.vue'),
			
 
				+        alias: ['/sales/examineList/examineDetail']
			
 
				     },
			
 
				     {
			
 
				         path: '/sales/withdrawList/withdrawDetail',
			
--- a/src/views/bigMenber/bigCombo.vue
+++ b/src/views/bigMenber/bigCombo.vue
@@ -8,7 +8,6 @@
 
				             :filterType="2" 
			
 
				             :filterReset="0"
			
 
				             requestApi="/order/getCombo" 
			
 
				-            style="background:#fff;padding:10px" 
			
 
				             @loading="load"
			
 
				         >
			
 
				             <template slot="filterTitle">
			
--- a/src/views/bigMenber/components/comboModel.vue
+++ b/src/views/bigMenber/components/comboModel.vue
@@ -1,212 +0,0 @@
 
				-<template>
			
 
				-    <div class="combo-list">
			
 
				-        <Modal :title="editData.tips=='1'?'新增套餐':'编辑套餐'" v-model="cShow" class-name="order-model combo-model" :mask-closable="false" @on-visible-change="visibleChange">
			
 
				-            <Form ref="combo" :model="combo" :show-message="false" :label-width="240">
			
 
				-                <FormItem label="名称" prop="name" class="table-form1">
			
 
				-                    <Input 
			
 
				-                        v-model="names" 
			
 
				-                        type="text" 
			
 
				-                        :maxlength="4" 
			
 
				-                        placeholder="请输入套餐名称（最多4个中文）" 
			
 
				-                    ></Input>
			
 
				-                </FormItem>
			
 
				-                <FormItem class="table-form2">
			
 
				-                    <Table 
			
 
				-                        class="sel-table"
			
 
				-                        border 
			
 
				-                        ref="selection" 
			
 
				-                        :columns="columns" 
			
 
				-                        :data="editData.lists" 
			
 
				-                        @on-selection-change="selChage"
			
 
				-                        :summary-method="handleSummary"
			
 
				-                        show-summary
			
 
				-                    ></Table>
			
 
				-                </FormItem>
			
 
				-            </Form>
			
 
				-            <div slot="footer">
			
 
				-                <div class="tips">此套餐与xxx套餐内容一样，请重新选择</div>
			
 
				-                <Button type="primary" size="large" @click="comConfirm()">提交</Button>
			
 
				-                <!-- <Button type="primary" size="large" disabled v-else>提交</Button> -->
			
 
				-                <Button type="error" size="large" @click="comCancel()">取消</Button>
			
 
				-            </div>
			
 
				-        </Modal>
			
 
				-    </div>
			
 
				-</template>
			
 
				-
			
 
				-<script>
			
 
				-export default {
			
 
				-    props: {
			
 
				-        editData: {}
			
 
				-    },
			
 
				-    // computed: {
			
 
				-    //     names: {
			
 
				-    //         get() {
			
 
				-    //             if (this.editData.length == 0) {
			
 
				-    //                 return ''
			
 
				-    //             } else {
			
 
				-    //                 return this.editData.rows.s_name
			
 
				-    //             }
			
 
				-    //         },
			
 
				-    //         set(val) {
			
 
				-    //             return val
			
 
				-    //         }
			
 
				-    //     }
			
 
				-    // },
			
 
				-    methods: {
			
 
				-        wordReg(e) {
			
 
				-            console.log(e.target.value)
			
 
				-            e.target.value = e.target.value.replace(/[^\u4e00-\u9fa5]+/g,'')
			
 
				-            // this.comNames = e.target.value
			
 
				-        },
			
 
				-        initialized() {
			
 
				-            this.names = ''
			
 
				-            this.zPrice = 0
			
 
				-            this.$refs.selection.selectAll(false)
			
 
				-        },
			
 
				-        visibleChange(val) {
			
 
				-            this.initialized()  
			
 
				-        },
			
 
				-        // 合计
			
 
				-        handleSummary ({ columns, data }) {
			
 
				-            const sums = {}
			
 
				-            columns.forEach((column, index) => {
			
 
				-                const key = column.key
			
 
				-                if (index === 0) {
			
 
				-                    sums[key] = {
			
 
				-                        key,
			
 
				-                        value: '合计'
			
 
				-                    }
			
 
				-                    return
			
 
				-                }
			
 
				-                const values = this.sumSel.map(item => Number(item[key]))
			
 
				-                if (!values.every(value => isNaN(value))) {
			
 
				-                    const v = values.reduce((prev, curr) => {
			
 
				-                        const value = Number(curr);
			
 
				-                        if (!isNaN(value)) {
			
 
				-                            return prev + curr;
			
 
				-                        } else {
			
 
				-                            return prev;
			
 
				-                        }
			
 
				-                    }, 0)
			
 
				-                    sums[key] = {
			
 
				-                        key,
			
 
				-                        value: v
			
 
				-                    }
			
 
				-                    this.zPrice = sums.i_price_year.value
			
 
				-                } else {
			
 
				-                    if (key == 's_name') {
			
 
				-                        sums[key] = {
			
 
				-                            key,
			
 
				-                            value: 'N/A'
			
 
				-                        }
			
 
				-                    } else {
			
 
				-                        sums[key] = {
			
 
				-                            key,
			
 
				-                            value: 0
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-            })
			
 
				-            return sums;
			
 
				-        },
			
 
				-        // 多选
			
 
				-        selChage(selection) {
			
 
				-            console.log(selection)
			
 
				-            let arrs = []
			
 
				-            selection.map(v => {
			
 
				-                arrs.push(v)
			
 
				-            })
			
 
				-            // if (this.editData.length == 0) {
			
 
				-            //     this.sumSel = arrs
			
 
				-            // } else {
			
 
				-            //     let cArr = []
			
 
				-            //     this.editData.lists.forEach(k => {
			
 
				-            //         if (k._checked) {
			
 
				-            //             cArr.push(k)
			
 
				-            //         }
			
 
				-            //     })
			
 
				-            //     console.log(cArr)
			
 
				-            //     this.sumSel = Object.assign(cArr,arrs)
			
 
				-            // }
			
 
				-            //     console.log(this.sumSel)
			
 
				-            this.sumSel = arrs
			
 
				-            // console.log(this.names)
			
 
				-        },
			
 
				-        comConfirm() {
			
 
				-            console.log(this.names)
			
 
				-            if (!this.names) {
			
 
				-                this.$Notice.warning({
			
 
				-                    title: "套餐名称不能为空"
			
 
				-                })
			
 
				-                return
			
 
				-            }
			
 
				-            let serverId = []
			
 
				-            this.sumSel.forEach(v => {
			
 
				-                serverId.push(v.id)
			
 
				-            })
			
 
				-            console.log(this.editData)
			
 
				-            let str = {
			
 
				-                id: this.editData.tips == 1 ? '' : this.editData.rows.id,
			
 
				-                name: this.names,
			
 
				-                price: this.zPrice,
			
 
				-                serverids: String(serverId)
			
 
				-            }
			
 
				-            console.log(str)
			
 
				-            // this.$request('/order/updateCombo').data(str).success(() => {
			
 
				-            //     this.cShow = false
			
 
				-            //     this.initialized()
			
 
				-            //     this.$parent.reload()
			
 
				-            // }).post()
			
 
				-        },
			
 
				-        comCancel() {
			
 
				-            this.cShow = false
			
 
				-            this.initialized()
			
 
				-        }
			
 
				-    },
			
 
				-    data() {
			
 
				-        return {
			
 
				-            cShow: false,
			
 
				-            combo: {},
			
 
				-            sumSel: [],
			
 
				-            names: '',
			
 
				-            zPrice: 0,
			
 
				-            columns: [
			
 
				-                {
			
 
				-                    type: 'selection',
			
 
				-                    width: 40,
			
 
				-                    align: 'center'
			
 
				-                },
			
 
				-                {
			
 
				-                    title: '服务名称',
			
 
				-                    key: 's_name',
			
 
				-                    width: 240,
			
 
				-                    align: 'center',
			
 
				-                    render: (h, {row}) => {
			
 
				-                        return h('span', row.s_name ? row.s_name : '-')
			
 
				-                    }
			
 
				-                },
			
 
				-                {
			
 
				-                    title: '年价格',
			
 
				-                    key: 'i_price_year',
			
 
				-                    align: 'center',
			
 
				-                    render: (h, {row}) => {
			
 
				-                        return h('span', row.i_price_year ? row.s_count_year ? row.s_count_year + '个/' + row.i_price_year : row.i_price_year : '-')
			
 
				-                    }
			
 
				-                },
			
 
				-                {
			
 
				-                    title: '月价格',
			
 
				-                    key: 'i_price_month',
			
 
				-                    align: 'center',
			
 
				-                    render: (h, {row}) => {
			
 
				-                        return h('span', row.i_price_month ? row.s_count_month ? row.s_count_month + '个/' + row.i_price_month : row.i_price_month : '-')
			
 
				-                    }
			
 
				-                }
			
 
				-            ]
			
 
				-        }
			
 
				-    }
			
 
				-}
			
 
				-</script>
			
 
				-
			
 
				-<style lang="scss" scoped>
			
 
				-
			
 
				-</style>
			
--- a/src/views/msgCollect/msgList.vue
+++ b/src/views/msgCollect/msgList.vue
@@ -6,7 +6,6 @@
 
				         v-model="list" 
			
 
				         :filter="filter" 
			
 
				         requestApi="/userMsg/msgList" 
			
 
				-        style="background:#fff;padding:10px" 
			
 
				         @loading="load"
			
 
				         @emptyFilter="emptyFilter"
			
 
				     >
			
@@ -107,7 +106,10 @@ export default {
 
				                     title: '姓名',
			
 
				                     key: 's_name',
			
 
				                     width: '170',
			
 
				-                    align: 'center'
			
 
				+                    align: 'center',
			
 
				+                    render: (h, {row}) => {
			
 
				+                        return h('span', row.s_name ? row.s_name : '-')
			
 
				+                    }
			
 
				                 },
			
 
				                 {
			
 
				                     title: '手机号',
			
@@ -150,13 +152,18 @@ export default {
 
				                             return h('span','超级订阅')
			
 
				                         } else if (row.s_source.indexOf('member') > -1) {
			
 
				                             return h('span','大会员')
			
 
				+                        } else {
			
 
				+                            return h('span', '-')
			
 
				                         }
			
 
				                     }
			
 
				                 },
			
 
				                 {
			
 
				                     title: '收集日期',
			
 
				                     key: 'i_time',
			
 
				-                    align: 'center'
			
 
				+                    align: 'center',
			
 
				+                    render: (h, {row}) => {
			
 
				+                        return h('span', row.i_time ? row.i_time : '-' )
			
 
				+                    }
			
 
				                 }
			
 
				             ],
			
 
				             list: []
			
--- a/src/views/order/orderList.vue
+++ b/src/views/order/orderList.vue
@@ -12,7 +12,6 @@
 
				         requestApi="/order/orderList" 
			
 
				         @loading="load" 
			
 
				         @emptyFilter="emptyFilter"
			
 
				-        style="background:#fff;padding:10px"
			
 
				     >
			
 
				         <template slot="filterTitle">
			
 
				             <div class="shai_xuan">
			
--- a/src/views/sales/commissionList.vue
+++ b/src/views/sales/commissionList.vue
@@ -30,6 +30,9 @@
 
				             <v-date ref="dateRef" :placeholder1="'起始时间'" :placeholder2="'截止时间'" @startsData="startsData" @endsData="endsData"></v-date>
			
 
				         </FormItem>
			
 
				       </template>
			
 
				+      <template slot="exportData">
			
 
				+            <Button type="primary" @click="exportd" style="height: 36px;margin-left: 10px">导出</Button>
			
 
				+      </template>
			
 
				       <template slot="filterRight">
			
 
				           <Input suffix="md-search" type="text" v-model="sear.keyword" placeholder="搜索单号或手机号" clearable class="ser-ipt"/>
			
 
				       </template>
			
@@ -72,6 +75,34 @@ export default {
 
				         },
			
 
				         endsData(val) {
			
 
				             this.filter.orderTimeMax = val
			
 
				+        },
			
 
				+        exportd() {
			
 
				+            let obj = {
			
 
				+                export: true,
			
 
				+                product: this.filter.product,
			
 
				+                salesMin: this.filter.salesMin,
			
 
				+                salesMax: this.filter.salesMax,
			
 
				+                orderTimeMin: this.filter.orderTimeMin?this.filter.orderTimeMin:'',
			
 
				+                orderTimeMax: this.filter.orderTimeMax?this.filter.orderTimeMax:'',
			
 
				+                commissionMin: this.filter.commissionMin,
			
 
				+                commissionMax: this.filter.commissionMax,
			
 
				+            }
			
 
				+            this.$Modal.confirm({
			
 
				+                title: "确定导出该列表吗？",
			
 
				+                onOk: () => {
			
 
				+                    this.$request('/sales/commissionList').data(obj).success((res) => {
			
 
				+                        if (res.data) {
			
 
				+                            window.location.href = res.data.path
			
 
				+                        } else {
			
 
				+                            this.$Notice.warning({
			
 
				+                                title: '警告提示',
			
 
				+                                desc: "暂无相应数据",
			
 
				+                                duration: 5
			
 
				+                            })
			
 
				+                        }
			
 
				+                    }).get()
			
 
				+                }
			
 
				+            })
			
 
				         }
			
 
				     },
			
 
				     data () {
			
@@ -87,6 +118,7 @@ export default {
 
				                 {v: '3', n: '数据报告'}
			
 
				             ],
			
 
				             filter: {
			
 
				+                export: false,
			
 
				                 product: '',
			
 
				                 salesMin: '',
			
 
				                 salesMax: '',
			
--- a/src/views/sales/examineList.vue
+++ b/src/views/sales/examineList.vue
@@ -0,0 +1,135 @@
 
				+<template>
			
 
				+  <div class="exa-list">
			
 
				+    <h1>企业审核</h1>
			
 
				+      <table-lists 
			
 
				+          ref="tableLists" 
			
 
				+          v-model="list" 
			
 
				+          :filter="filter" 
			
 
				+          :filterType="2" 
			
 
				+          :filterReset="0" 
			
 
				+          requestApi="/sales/partnerList" 
			
 
				+          @loading="load"
			
 
				+      >
			
 
				+          <template slot="filterContent">
			
 
				+              <FormItem>
			
 
				+                  <Input type="text" suffix="md-search" v-model="filter.keyword" placeholder="搜索关键词" clearable/>
			
 
				+              </FormItem>
			
 
				+          </template>
			
 
				+          <Table
			
 
				+              ellipsis 
			
 
				+              :loading="loading" 
			
 
				+              :columns="columns" 
			
 
				+              :data="list.lists" 
			
 
				+              stripe
			
 
				+          >
			
 
				+            <template slot-scope="{ row }" slot="_status">
			
 
				+                <field-map :class="aStatus(row.type)" :value="row.type" :map="map.status"></field-map>
			
 
				+            </template>
			
 
				+            <template slot-scope="{ row }" slot="op">
			
 
				+                <Button size="small" @click="examined" v-if="row.type == 2">审核</Button>
			
 
				+                <Button size="small" type="primary" @click="checkFind(row)" v-else>查看</Button>
			
 
				+            </template>
			
 
				+          </Table>
			
 
				+          <template slot="options">
			
 
				+              <div style="color:#d7d7d7;font-size:14px">共计{{list.total}}家企业</div>
			
 
				+          </template>
			
 
				+      </table-lists>
			
 
				+  </div>
			
 
				+</template>
			
 
				+<script>
			
 
				+  export default {
			
 
				+      methods: {
			
 
				+        load (val) {
			
 
				+          this.loading = val
			
 
				+        },
			
 
				+        examined() {
			
 
				+
			
 
				+        },
			
 
				+        checkFind(row) {
			
 
				+          const hrefs = this.$router.resolve({path: '/sales/examineList/examineDetail',query: {uid: row.uid, id: row.id, type: row.type}})
			
 
				+          window.open(hrefs.href, '_blank')
			
 
				+        },
			
 
				+        aStatus(val) {
			
 
				+          if (val == 1) {
			
 
				+            return 'primary'
			
 
				+          } else if (val == 2) {
			
 
				+            return 'warn'
			
 
				+          } else if (val == 3) {
			
 
				+            return 'fail'
			
 
				+          }
			
 
				+        }
			
 
				+      },
			
 
				+      data() {
			
 
				+        return {
			
 
				+          loading: false,
			
 
				+          map: {
			
 
				+              status: [
			
 
				+                  {v: 1, n: '审核通过'},
			
 
				+                  {v: 2, n: '待审核'},
			
 
				+                  {v: 3, n: '审核失败'}
			
 
				+              ]
			
 
				+          },
			
 
				+          filter: {
			
 
				+              keyword: ""
			
 
				+          },
			
 
				+          columns: [
			
 
				+              {
			
 
				+                  title: '伙伴名称',
			
 
				+                  key: 'name',
			
 
				+                  align: 'center',
			
 
				+                  render: (h, {row}) => {
			
 
				+                      return h('span', row.name ? row.name : '-')
			
 
				+                  }
			
 
				+              },
			
 
				+              {
			
 
				+                  title: '手机号',
			
 
				+                  key: 'phone',
			
 
				+                  align: 'center',
			
 
				+                  render: (h, {row}) => {
			
 
				+                      return h('span', row.phone ? row.phone == '0'?'-':row.phone : '-')
			
 
				+                  }
			
 
				+              },
			
 
				+              {
			
 
				+                  title: '状态',
			
 
				+                  slot: '_status',
			
 
				+                  align: 'center'
			
 
				+              },
			
 
				+              {
			
 
				+                  title: '审核通过时间',
			
 
				+                  key: 'createtime',
			
 
				+                  align: 'center',
			
 
				+                  render: (h, {row}) => {
			
 
				+                      return h('span', row.createtime ? row.createtime : '-')
			
 
				+                  }
			
 
				+              },
			
 
				+              {
			
 
				+                  title: '操作',
			
 
				+                  key: 'updateAuth',
			
 
				+                  slot: 'op',
			
 
				+                  align: 'center'
			
 
				+              },
			
 
				+          ],
			
 
				+          list: []
			
 
				+        }
			
 
				+      },
			
 
				+  }
			
 
				+</script>
			
 
				+
			
 
				+<style lang="scss" scoped>
			
 
				+.exa-list {
			
 
				+    h1 {
			
 
				+      font-size:24px;
			
 
				+      color:#3f4047;
			
 
				+      padding: 10px 0 20px 10px;
			
 
				+    }
			
 
				+    .primary {
			
 
				+      color: #34bfa3;
			
 
				+    }
			
 
				+    .warn {
			
 
				+      color: #ffb822;
			
 
				+    }
			
 
				+    .fail {
			
 
				+      color: #f4516c;
			
 
				+    }
			
 
				+}
			
 
				+</style>
			
--- a/src/views/sales/partnerDetail.vue
+++ b/src/views/sales/partnerDetail.vue
@@ -68,9 +68,16 @@
 
				                 <Card v-else-if="infor == 2">
			
 
				                     <div slot="title" class="right-fund">基本信息</div>
			
 
				                     <div class="infor-card">
			
 
				-                        <div class="con" v-if="types == '2'">
			
 
				-                            <span>企业名称</span>
			
 
				-                            <span class="spa2">{{parDetail.name?parDetail.name:'-'}}</span>
			
 
				+                        <div v-if="types == '2'">
			
 
				+                            <div class="con">
			
 
				+                                <span>企业名称</span>
			
 
				+                                <span class="spa2">{{parDetail.name?parDetail.name:'-'}}</span>
			
 
				+                            </div>
			
 
				+                            <Divider />
			
 
				+                            <div class="con">
			
 
				+                                <span>联系人</span>
			
 
				+                                <span class="spa2">{{parDetail.name?parDetail.name:'-'}}</span>
			
 
				+                            </div>
			
 
				                         </div>
			
 
				                         <div class="con" v-else>
			
 
				                             <span>用户名</span>
			
--- a/src/views/sales/partnerList.vue
+++ b/src/views/sales/partnerList.vue
@@ -10,7 +10,6 @@
 
				       requestApi="/sales/partnerList" 
			
 
				       @loading="load" 
			
 
				       @emptyFilter="emptyFilter" 
			
 
				-      style="background:#fff;padding:10px"
			
 
				     >
			
 
				       <template slot="filterContent">
			
 
				         <FormItem label="类型：" :label-width="50">
			
--- a/src/views/sales/settleList.vue
+++ b/src/views/sales/settleList.vue
@@ -9,7 +9,6 @@
 
				         :filterSear="2" 
			
 
				         @emptyFilter="emptyFilter"
			
 
				         requestApi="/sales/settleList" 
			
 
				-        style="background:#fff;padding:10px"
			
 
				         @loading="load"
			
 
				     >
			
 
				       <template slot="filterContent">
			
--- a/src/views/sales/withdrawList.vue
+++ b/src/views/sales/withdrawList.vue
@@ -8,7 +8,6 @@
 
				         :sear="sear"
			
 
				         :filterSear="2"
			
 
				         requestApi="/sales/withdrawList" 
			
 
				-        style="background:#fff;padding:10px" 
			
 
				         @loading="load"
			
 
				         @emptyFilter="emptyFilter"
			
 
				         @serachBtn="serachBtn"
			
--- a/src/views/system/listsConst.js
+++ b/src/views/system/listsConst.js
@@ -1,4 +0,0 @@
 
				-export const userStatus = [
			
 
				-    {v: 1, n: '启用'},
			
 
				-    {v: 2, n: '禁用'}
			
 
				-];
			
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -80,7 +80,6 @@
 
				     </div>
			
 
				 </template>
			
 
				 <script>
			
 
				-    import {userStatus} from './listsConst.js'
			
 
				     import _ from "lodash";
			
 
				     export default {
			
 
				         computed: {
			
@@ -202,7 +201,10 @@
 
				                 changes: false,
			
 
				                 timer: null,
			
 
				                 map: {
			
 
				-                    status: userStatus
			
 
				+                    status: [
			
 
				+                        {v: 1, n: '启用'},
			
 
				+                        {v: 2, n: '禁用'}
			
 
				+                    ]
			
 
				                 },
			
 
				                 filter: {
			
 
				                     keyword: ""
			
--- a/src/views/userManage/mergeUserList.vue
+++ b/src/views/userManage/mergeUserList.vue
@@ -10,7 +10,6 @@
 
				       class="user-class"
			
 
				       requestApi="/users/mergeUserList"
			
 
				       @loading="load"
			
 
				-      style="background: #fff; padding: 10px"
			
 
				     >
			
 
				       <template slot="filterTitle">
			
 
				         <div class="shai_xuan">
			
--- a/src/views/userManage/userDetail.vue
+++ b/src/views/userManage/userDetail.vue
@@ -170,7 +170,40 @@
 
				                         </Tabs>
			
 
				                     </div>
			
 
				                 </Card>
			
 
				+<<<<<<< HEAD
			
 
				 
			
 
				+=======
			
 
				+                <div v-if="infor == 4 && Object.keys(datas5).length !== 0">
			
 
				+                    <Card>
			
 
				+                        <div slot="title" class="right-fund">基本信息</div>
			
 
				+                        <div class="in-cards">
			
 
				+                            <div class="l-cont">
			
 
				+                                <p>姓名：{{datas5.name || '-'}}</p>
			
 
				+                                <p class="par">邮箱：{{datas5.mail || '-'}}</p>
			
 
				+                                <p>行业：{{datas5.industry || '-'}}</p>
			
 
				+                            </div>
			
 
				+                            <div class="l-cont r-cont">
			
 
				+                                <p>手机号：{{datas5.phone || '-'}}</p>
			
 
				+                                <p class="par">地区：{{datas5.province || ''}}{{datas5.city || '-'}}</p>
			
 
				+                                <p>受雇类型：{{datas5.hireType || '-'}}</p>
			
 
				+                            </div>
			
 
				+                        </div>
			
 
				+                    </Card>
			
 
				+                    <Card style="marginTop: 20px">
			
 
				+                        <div slot="title" class="right-fund">公司信息</div>
			
 
				+                        <div class="in-cards b-cards">
			
 
				+                            <p>公司名称：{{datas5.company || '-'}}</p>
			
 
				+                            <p>公司类型：{{datas5.companyType || '-'}}</p>
			
 
				+                            <p>职位：{{datas5.position || '-'}}</p>
			
 
				+                            <p>公司规模：{{datas5.company_size || '-'}}</p>
			
 
				+                            <p>业务范围：{{datas5.workScope || '-'}}</p>
			
 
				+                            <p>合作需求：{{datas5.partnerNeeds || '-'}}</p>
			
 
				+                            <p>是否同意剑鱼标讯将业务范围及合作需求提供给潜在合作伙伴搜索、查看：{{datas5.agree == true ? '是' : datas5.agree == false ? '否' : '-'}}</p>
			
 
				+                        </div>
			
 
				+                    </Card>
			
 
				+                </div>
			
 
				+                <Card class="no-msg" v-if="infor == 4 && Object.keys(datas5).length == 0"><span>该用户尚未留存过资料</span></Card>
			
 
				+>>>>>>> c2dba1694788fb7ebafb2d989f0c832e3646f069
			
 
				                 <Card v-if="infor == 5">
			
 
				                     <div slot="title" class="right-fund">订单记录</div>
			
 
				                     <table-lists 
			
@@ -876,5 +909,41 @@ export default {
 
				             }
			
 
				         }
			
 
				     }
			
 
				+<<<<<<< HEAD
			
 
				+=======
			
 
				+    .in-cards {
			
 
				+        display: flex;
			
 
				+        flex-direction: inherit;
			
 
				+        font-size: 14px;
			
 
				+        .l-cont {
			
 
				+            width: 50%;
			
 
				+            .par {
			
 
				+                margin: 20px 0;
			
 
				+            }
			
 
				+        }
			
 
				+        .r-cont {
			
 
				+            width: 50%;
			
 
				+        }
			
 
				+    }
			
 
				+    .b-cards {
			
 
				+        flex-direction: column;
			
 
				+        p {
			
 
				+            margin-bottom: 20px;
			
 
				+        }
			
 
				+    }
			
 
				+<<<<<<< HEAD
			
 
				+=======
			
 
				+    .no-msg {
			
 
				+        width: 100%;
			
 
				+        height: 100%;
			
 
				+        display: flex;
			
 
				+        justify-content: center;
			
 
				+        align-items: center;
			
 
				+        /deep/ .ivu-card-head {
			
 
				+            display: none;
			
 
				+        }
			
 
				+    }
			
 
				+>>>>>>> master
			
 
				+>>>>>>> c2dba1694788fb7ebafb2d989f0c832e3646f069
			
 
				 }
			
 
				 </style>
			
--- a/src/views/userManage/userList.vue
+++ b/src/views/userManage/userList.vue
@@ -13,7 +13,6 @@
 
				       requestApi="/users/userList"
			
 
				       @loading="load"
			
 
				       @emptyFilter="emptyFilter"
			
 
				-      style="background: #fff; padding: 10px"
			
 
				     >
			
 
				       <template slot="filterTitle">
			
 
				         <div class="shai_xuan">