解决冲突

src/assets/css/common.css

@@ -451,7 +451,7 @@ textarea:-ms-input-placeholder {
   margin-right: 60px;
 }
 .order-model .ivu-modal, .combo-model .ivu-modal {
-  width: 780px!important;
+  width: 700px!important;
 }
 .combo-model .table-form1 .ivu-form-item-label {
   width: 80px!important;
@@ -477,9 +477,6 @@ textarea:-ms-input-placeholder {
 .combo-model .table-form2 .ivu-form-item-content .ivu-table-cell span,.order-model .table-order1 .ivu-form-item-content .ivu-table-cell span {
   font-size: 13px;
 }
-.ivu-table-wrapper {
-  overflow: inherit;
-}
 .sel-table, .prei-table {
   border: none;
 }
@@ -514,10 +511,13 @@ textarea:-ms-input-placeholder {
 .date-sigles .ivu-date-picker {
   width: 100%;
 }
-.ivu-date-picker-cells {
+.ivu-date-picker-transfer {
+  width: 260px;
+}
+.ivu-date-picker-transfer .ivu-date-picker-cells {
   width: 240px;
 }
-.ivu-date-picker-cells .ivu-date-picker-cells-header span,.ivu-date-picker-cells .ivu-date-picker-cells-cell {
+.ivu-date-picker-transfer .ivu-date-picker-cells .ivu-date-picker-cells-header span,.ivu-date-picker-transfer .ivu-date-picker-cells .ivu-date-picker-cells-cell {
   width: 34px;
   height: 34px;
   line-height: 34px;
@@ -678,6 +678,14 @@ textarea:-ms-input-placeholder {
 .order-model .order-spin {
   height: 36px;
 }
+.sel-table .ivu-table .ivu-select-selection, .sel-table .ivu-table .ivu-select-selection div .ivu-select-selected-value  {
+  height: 30px;
+  line-height: 30px;
+}
+.sel-table .ivu-table .ivu-select-selection .ivu-select-placeholder {
+  height: 30px;
+  line-height: 30px;
+}
 .combo-model .ivu-select {
   width: 94%;
 }
@@ -726,6 +734,8 @@ textarea:-ms-input-placeholder {
 }
 .xuan .d-mask {
   position: relative;
+  max-height: 600px;
+  overflow: scroll;
 }
 .xuan .zhuan {
   position: absolute;

src/assets/js/date.js

@@ -33,6 +33,72 @@ export function dateFormatter (date, fmt = 'yyyy-MM-dd HH:mm:ss') {
     return fmt
 }
 
+//计算时间间隔差
+//[年个数, 月个数]
+export function getDateSub(start, end) {
+    if (start) {
+        var startTime = new Date(start * 1000);
+    } else {
+        var startTime = (new Date());
+    }
+    var endTime = new Date(end * 1000);
+
+    var startYear = startTime.getFullYear();
+    var startMonth = startTime.getMonth();
+    var startDay = startTime.getDate();
+
+    var endYear = endTime.getFullYear();
+    var endMonth = endTime.getMonth();
+    var endDay = endTime.getDate();
+
+    var finalMonthNum = 0;
+    var finalYearNum = 0;
+    if (startYear === endYear) {
+        if (startMonth === endMonth) {
+            finalMonthNum = 1;
+        } else {
+            if (endDay > startDay) {
+                finalMonthNum = endMonth - startMonth + 1;
+            } else {
+                finalMonthNum = endMonth - startMonth;
+            }
+        }
+    } else {
+        if (startMonth === endMonth) {
+            if (endDay <= startDay) {
+                finalMonthNum = (endYear - startYear) * 12;
+            } else {
+                finalMonthNum = (endYear - startYear) * 12 + 1;
+            }
+        } else if (endMonth > startMonth) {
+            if (endDay <= startDay) {
+                finalMonthNum = (endYear - startYear) * 12 + (endMonth - startMonth);
+            } else {
+                finalMonthNum = (endYear - startYear) * 12 + (endMonth - startMonth) + 1;
+            }
+        } else {
+            if (endDay <= startDay) {
+                finalMonthNum = (endYear - startYear - 1) * 12 + (12 - startMonth + endMonth);
+            } else {
+                finalMonthNum = (endYear - startYear - 1) * 12 + (12 - startMonth + endMonth) + 1;
+            }
+        }
+
+        finalYearNum = Math.floor(finalMonthNum / 12);
+        if (finalYearNum > 0) {
+            finalMonthNum = finalMonthNum - finalYearNum * 12
+        }
+    }
+    if (finalYearNum < 1) {
+        console.log(Math.ceil(finalYearNum))
+        return Math.ceil(finalMonthNum)
+    } else {
+        console.log(Math.ceil(finalYearNum * 12 + finalMonthNum))
+        return Math.ceil(finalYearNum * 12 + finalMonthNum)
+    }
+    // return [finalYearNum, finalMonthNum]
+}
+
 // date为相加前的时间， days为需要相加的天数
 export function addDate(date, days) {
     var date = new Date(date)

src/assets/js/debounce.js

@@ -1,11 +0,0 @@
-export function debounce (fn, wait) {
-    let timer = null
-    wait = wait || 600
-    return function () {
-        let that = this
-        if (timer !== null) clearTimeout(timer)
-        timer = setTimeout(() => {
-            fn.apply(that)
-        }, wait)
-    }
-}

src/assets/js/msgFunc.js

@@ -1,37 +0,0 @@
-// 消息类型
-export function msgPro (time){
-  return [
-    {v: '1', n: '活动优惠'},
-    {v: '2', n: '服务通知'},
-    // {v: '3', n: '订阅消息'},
-    // {v: '4', n: '项目动态'},
-    // {v: '5', n: '企业动态'},
-    // {v: '6', n: '分析报告'},
-    {v: '7', n: '系统通知'}
-  ]
-}
-// const msgPro = [
-//   {v: '1', n: '活动优惠'},
-//   {v: '2', n: '服务通知'},
-//   // {v: '3', n: '订阅消息'},
-//   // {v: '4', n: '项目动态'},
-//   // {v: '5', n: '企业动态'},
-//   // {v: '6', n: '分析报告'},
-//   {v: '7', n: '系统通知'}
-// ]
-const msgPro1 = [
-  {v: '1', n: '活动优惠'},
-  {v: '2', n: '服务通知'},
-  {v: '3', n: '订阅消息'},
-  {v: '4', n: '项目动态'},
-  {v: '5', n: '企业动态'},
-  {v: '6', n: '分析报告'},
-  {v: '7', n: '系统通知'}
-]
-// 发送状态
-const sendPro = [
-  {v: '1', n: '待发送'},
-  {v: '2', n: '发送中'},
-  {v: '3', n: '发送失败'},
-  {v: '4', n: '已发送'}
-]

src/components/dateSection.vue

@@ -9,6 +9,7 @@
             @on-change="handleChange1"
             @on-ok="confirmed1"
             :editable="false"
+            transfer
             style="width: 175px"
         ></DatePicker>
         <i class="lines1" v-if="placeholder1=='起始时间'"></i>
@@ -22,13 +23,14 @@
             :options="options2"
             @on-change="handleChange2"
             @on-ok="confirmed2"
+            transfer
             :editable="false"
         ></DatePicker>
     </div>
 </template>
 
 <script>
-import { ChangeDate, ChangeDate2 } from '../assets/js/date.js'
+import { dateFormatter } from '../assets/js/date.js'
 export default {
     props: {
         placeholder1: String,
@@ -47,14 +49,14 @@ export default {
             endsTime: '',
             options1: {
                 disabledDate: (function(date) {
-                    var timeEnd = ChangeDate(this.endsTime)
+                    var timeEnd = this.endsTime
                     var p_time = new Date(timeEnd).getTime()
                     return date && date.valueOf() > p_time;
                 }).bind(this)
             },
             options2: {
                 disabledDate: (function(date) {
-                    var timeStart = ChangeDate(this.startsTime)
+                    var timeStart = this.startsTime
                     var p_time = new Date(timeStart).getTime()
                     return date && date.valueOf() < p_time;
                 }).bind(this)
@@ -78,7 +80,7 @@ export default {
         },
         confirmed1 () {
             if (!this.startsTime) {
-                let dates = ChangeDate2(new Date())
+                let dates = dateFormatter(new Date())
                 this.dataVal1 = dates
                 this.startsTime = dates
                 this.$emit('startsData', dates)
@@ -99,7 +101,7 @@ export default {
         },
         confirmed2 () {
             if (!this.endsTime) {
-                let dates = ChangeDate2(new Date())
+                let dates = dateFormatter(new Date())
                 this.dataVal2 = dates
                 this.endsTime = dates
                 this.$emit('startsData', dates)

src/components/dateSigle.vue

@@ -11,6 +11,7 @@
         :editable="false"
         :disabled="dateDis"
         :readonly="beginDis"
+        transfer
     ></DatePicker>
 </template>
 

src/components/tableLists.vue

@@ -129,7 +129,7 @@
         methods: {
             changePage: function (page) {
                 this.page = page;
-                this.$emit('pageChange', true)
+                this.$emit('pageChange', page)
                 this.load();
             },
             pageSizeChange: function (size) {
@@ -237,8 +237,8 @@
                 if (!isPage) {
                     this.page = 1;
                 }
-                this.load();
                 this.$emit('serachBtn',true)
+                this.load()
             },
             reset (isPage) {
                 for(let i in this.filter) { // 判断对象中任意key是否有值

src/router.js

@@ -43,10 +43,25 @@ const routes = [
         component: () => import('./views/order/orderDetail.vue')
     },
     {
-        path: '/userMage/userList/userDetail',
+        path: '/userManage/userList/userDetail',
         name: 'userDetail',
         component: () => import('./views/userManage/userDetail.vue')
     },
+    {
+        path: '/userManage/instiAudit/detail',
+        name: 'instiAuditDetail',
+        component: () => import('./views/userManage/instiAuditDetail.vue')
+    },
+    {
+        path: '/msgCollect/inforAudit/detail',
+        name: 'inforAuditDetail',
+        component: () => import('./views/msgCollect/inforAuditDetail.vue')
+    },
+    {
+        path: '/userManage/instiManage/detail',
+        name: 'instiManageDetail',
+        component: () => import('./views/userManage/instiManageDetail.vue')
+    },
     {
         path: '/boardMsg/inforList/inforDetail',
         name: 'inforDetail',

src/views/dataManage/detail.vue

@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import { ChangeDate1 } from '@/assets/js/date'
+import { dateFormatter } from '@/assets/js/date'
 export default {
   data () {
     return {
@@ -103,7 +103,7 @@ export default {
         this.conditions = JSON.parse(res.data.filter)
         if (this.conditions.publishtime) {
           let time = this.conditions.publishtime.split('_')
-          this.publishtime = ChangeDate1(time[0]) + ' - ' + ChangeDate1(time[1])
+          this.publishtime = dateFormatter(time[0] * 1000, 'yyyy年MM月dd日') + ' - ' + dateFormatter(time[1] * 1000, 'yyyy年MM月dd日')
         } else {
           this.publishtime = '--'
         }

src/views/dataManage/exportList.vue

@@ -63,7 +63,7 @@
 </template>
 <script>
 import vDate from '@/components/dateSection'
-import { ChangeDate4 } from '@/assets/js/date'
+import { dateFormatter } from '@/assets/js/date'
 export default {
     components: {
         vDate
@@ -175,7 +175,7 @@ export default {
                     key: 'exportDate',
                     align: 'center',
                     render: (h, {row}) => {
-                        return h('div', row.exportDate ? ChangeDate4(row.exportDate) : '-')
+                        return h('div', row.exportDate ? dateFormatter(row.exportDate * 1000) : '-')
                     }
                 }
             ],

src/views/msgCollect/inforAudit.vue

@@ -111,10 +111,10 @@ export default {
       }
     },
     startsData(val) {
-      this.filter.applyStartTime = val
+      this.filter.applyStartTime = val + ' 00:00:00'
     },
     endsData(val) {
-      this.filter.applyEndTime = val
+      this.filter.applyEndTime = val + ' 23:59:59'
     },
     goDetail(row, val) {
       const url = this.$router.resolve({path:'/msgCollect/inforAudit/detail', query: {id: row.id, msgType: row.msgType, type: val}})

src/views/msgCollect/msgList.vue

@@ -35,7 +35,7 @@
   </div>
 </template>
 <script>
-import { ChangeDate } from '../../assets/js/date'
+import { dateFormatter } from '../../assets/js/date'
 import vDate from '@/components/dateSection'
 export default {
     components: {
@@ -55,10 +55,10 @@ export default {
             this.$refs.tableLists.reload(true)
         },
         startsData(val) {
-            this.filter.StartTime = parseInt(new Date(ChangeDate(val).replace(/-/g, '/') + ' 00:00:00').getTime() / 1000)
+            this.filter.StartTime = new Date(val).getTime() / 1000
         },
         endsData(val) {
-            this.filter.EndTime = parseInt(new Date(ChangeDate(val).replace(/-/g, '/') + ' 23:59:59').getTime() / 1000)
+            this.filter.EndTime = new Date(val).getTime() / 1000
         },
         exportd() {
             this.$Modal.confirm({

src/views/msgManage/components/curstomerList.vue

@@ -278,7 +278,7 @@ export default {
             this.customerList()
           }
           this.selectDatas.splice(index, 1)
-          if (this.selectDatas.length < 5) {
+          if (this.selectDatas.length <= 5) {
             this.selectList = this.selectDatas
           } else {
             if (this.selectDatas.length % 5 == 0) {

src/views/msgManage/selfSending.vue

@@ -80,6 +80,7 @@ export default {
           cur.filter.state = '0'
           cur.selectDatas = []
           cur.selectIds = []
+          cur.filter.offset = 0
           cur.customerList()
         }
       }, 300)

src/views/msgManage/sendingMsg.vue

@@ -228,7 +228,7 @@ export default {
     sendCancel(name) {
       let rout = this.$route.query.id
       if (rout) {
-        this.$router.push('/dataManage/msgManage/sentList')
+        this.$router.push('/msgManage/sentList')
       } else {
         this.inited()
         this.$refs[name].resetFields()

src/views/operateAnalysis/partner.vue

@@ -30,7 +30,7 @@
 </template>
 <script>
 import vDate from '@/components/dateSection'
-import { ChangeDate2 } from '@/assets/js/date'
+import { dateFormatter } from '@/assets/js/date'
 export default {
     components: {
         vDate
@@ -129,7 +129,7 @@ export default {
                     key: 'createtime',
                     align: 'center',
                     render: (h, {row}) => {
-                        return h('span',row.createtime ? ChangeDate2(row.createtime * 1000) : '-')
+                        return h('span',row.createtime ? dateFormatter(row.createtime * 1000) : '-')
                     }
                 },
                 {

src/views/order/components/batchOrder.vue

@@ -313,6 +313,7 @@ export default {
           }
         })
       })
+      console.log(sums.monery.value.toFixed(2))
       // if (parseInt(this.returnCash.serialCash * 100) < this.allPrice || (this.returnCash.flowType && parseInt(this.returnCash.serialCash * 100) == this.allPrice)) {
       if (parseInt(this.returnCash.serialCash * 100) < this.allPrice) {
         console.log(this.returnCash.serialCash-sums.monery.value.toFixed(2))
@@ -703,6 +704,7 @@ export default {
                       this.$set(v, i, e.target.value)
                     }
                   })
+                  console.log(this.selectData)
                 }
               }
             })

src/views/order/components/bigOrder.vue

@@ -267,12 +267,12 @@
 </template>
 
 <script>
-import { ChangeDate, dateFormatter } from '@/assets/js/date'
+import { dateFormatter } from '@/assets/js/date'
 import dateSigle from '@/components/dateSigle'
 import vCascader from '@/components/cascader'
 import bUpload from '@/components/uploadFile.vue'
 import saleSelect from './salesSelect.vue'
-import { getDateSub } from '@/assets/js/dateSub'
+import { getDateSub } from '@/assets/js/date'
 export default {
     components: {
         vCascader,
@@ -1052,7 +1052,7 @@ export default {
             }
         },
         timeReg(val) {
-            return new Date(ChangeDate(val).replace(/-/g, '/') + ' 00:00:00').getTime() / 1000
+            return new Date(dateFormatter(val, 'yyyy-MM-dd') + ' 00:00:00').getTime() / 1000
         },
         moneyChange(num) {
             if (num == 0) {

src/views/order/components/bigOrderEdit.vue

@@ -4,8 +4,9 @@
             <Form ref="member" :model="member" :rules="ruleValidate" :show-message="false" :label-width="121">
                 <FormItem label="订单状态" prop="order_status">
                   <Select v-model="member.order_status" placeholder="请选择订单状态">
-                    <Option value="0">未完成</Option>
-                    <Option value="1">已完成</Option>
+                    <Option value="0" :disabled="noFinishDis">未完成</Option>
+                    <Option value="1" :disabled="finishDis">已完成</Option>
+                    <Option value="-2" :disabled="cancelDis || interested">已取消</Option>
                   </Select>
                 </FormItem>
                 <FormItem label="销售渠道" prop="salesChannel">
@@ -26,7 +27,7 @@
                         @on-keyup="keyHandler" 
                         :maxlength="11" 
                         placeholder="请输入手机号"
-                        :readonly="pReadon"
+                        :readonly="pReadon || interested"
                     ></Input>
                     <Checkbox v-model="noPhone" @on-change="noPchange">无手机号</Checkbox>
                     <Spin fix class="order-spin" v-if="spinShow">
@@ -35,7 +36,7 @@
                     <p v-html="colr" style="color:#e13d13"></p>
                 </FormItem>
                 <FormItem label="产品类型">
-                    <Select v-model="member.products" placeholder="请选择产品类型（暂不支持数据导出）" @on-change="proChange" :disabled="proDis">
+                    <Select v-model="member.products" placeholder="请选择产品类型（暂不支持数据导出）" @on-change="proChange" :disabled="proDis || interested">
                         <Option v-for="item in bigPro" :value="item.v" :key="item.v">{{ item.n }}</Option>
                     </Select>
                 </FormItem>
@@ -51,7 +52,7 @@
                   <date-sigle ref="sigleRef3" :dateType="'date'" :dataV="member.sale_time" :placeholderd="'请选择业绩统计时间'" @startDate="saleDate" :overTime="0"></date-sigle>
               </FormItem>
                 <FormItem label="会员套餐" v-if="creAuth == '1'" prop="level">
-                    <Select v-model="member.level" placeholder="请选择会员套餐" @on-change="leChange" @on-select="leSelect">
+                    <Select v-model="member.level" placeholder="请选择会员套餐" @on-change="leChange" @on-select="leSelect" :disabled="interested">
                         <Option :value="JSON.stringify(comVal)">自定义</Option>
                         <Option v-for="(item,index) in levelDown" :value="JSON.stringify(item)" :key="index" :disabled="downDis">{{ item.s_name }}</Option>
                     </Select>
@@ -60,9 +61,9 @@
                 <div v-if="nums !== ''&&creAuth">
                     <FormItem prop="createType" v-if="creAuth == '1'&&nums == '0'">
                         <RadioGroup v-model="member.createType" class="form-radio1" @on-change="serChange">
-                            <Radio label="1" :disabled="radioDis1">新建服务</Radio>
-                            <Radio label="2" :disabled="radioDis2">补充服务</Radio>
-                            <Radio label="3" :disabled="radioDis3">延长服务</Radio>
+                            <Radio label="1" :disabled="radioDis1 || interested">新建服务</Radio>
+                            <Radio label="2" :disabled="radioDis2 || interested">补充服务</Radio>
+                            <Radio label="3" :disabled="radioDis3 || interested">延长服务</Radio>
                         </RadioGroup>
                     </FormItem>
                     <FormItem class="table-order1 table-order2" v-if="creAuth == '1'&&nums == '0'">
@@ -92,17 +93,27 @@
                                 @on-keyup="payHandler" 
                                 @on-change="payChange" 
                                 @on-blur="payBlur"
+                                :readonly="interested"
                             ></Input>
                         </FormItem>
                         <FormItem label="免费子账号数量">
-                            <Input v-model="member.freeSub" type="tel" maxlength="4" @on-keyup="freeHandler" placeholder="请填写免费子账号数量"></Input>
+                            <Input v-model="member.freeSub" type="tel" maxlength="4" @on-keyup="freeHandler" placeholder="请填写免费子账号数量" :readonly="interested"></Input>
                         </FormItem>
                     </div>
                     <div v-if="creAuth !== '2'">
                         <FormItem label="有效周期" prop="payCycle" v-if="creAuth == '1' && repair !== '2'">
                             <div class="you-xiao" style="display:flex">
-                                <Input v-model="member.payCycle" type="tel" maxlength="2" @on-keyup="cycleHandler" @on-change="peChange" :placeholder="placed" style="width:376px"></Input>
-                                <Select v-model="member.cycleType" placeholder="请选择单位" @on-change="unitChange" style="width:110px;margin-left:10px">
+                                <Input
+                                    v-model="member.payCycle"
+                                    type="tel"
+                                    maxlength="2"
+                                    @on-keyup="cycleHandler"
+                                    @on-change="peChange"
+                                    :placeholder="placed"
+                                    :disabled="interested"
+                                    style="width:376px"
+                                ></Input>
+                                <Select v-model="member.cycleType" placeholder="请选择单位" @on-change="unitChange" :disabled="interested" style="width:110px;margin-left:10px">
                                     <Option v-for="item in unitOptions" :value="item.v" :key="item.v">{{ item.n }}</Option>
                                 </Select>
                             </div>
@@ -116,6 +127,7 @@
                                 :overTime="overTime" 
                                 class="no-pass"
                                 :beginDis="noPass"
+                                :readonly="interested"
                             ></date-sigle>
                             <Checkbox v-model="noPass" @on-change="noTchange">暂不开通</Checkbox >
                         </FormItem>
@@ -267,12 +279,12 @@
 </template>
 
 <script>
-import { ChangeDate, dateFormatter } from '@/assets/js/date'
+import { dateFormatter } from '@/assets/js/date'
 import dateSigle from '@/components/dateSigle'
 import vCascader from '@/components/cascader'
 import bUpload from '@/components/uploadFile.vue'
 import saleSelect from './salesSelect.vue'
-import { getDateSub } from '@/assets/js/dateSub'
+import { getDateSub } from '@/assets/js/date'
 export default {
     components: {
         vCascader,
@@ -388,6 +400,31 @@ export default {
             }
           },200)
         },
+        intered(time, phone, money) {// 判断权益是否开通
+            if (money > 0) {// 已回款金额
+                this.others.order_status = 1
+                this.noFinishDis = true
+                this.cancelDis = true
+            }
+            if (time == '2099-01-01 00:00:00' || phone.substr(0, 1) == '9') {// 权益未开通
+                if (money == 0) {
+                    this.noFinishDis = false
+                    this.finishDis = false
+                    this.cancelDis = false
+                } else {
+                    this.interested = false
+                }
+            } else {// 权益开通
+                if (money == 0) {
+                    this.noFinishDis = false
+                    this.finishDis = false
+                    this.cancelDis = true
+                } else {
+                    this.interested = true
+                }
+            }
+            console.log('权益是否开通' + this.interested)
+        },
         moneyReg(val) {
             return val.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')
         },
@@ -648,6 +685,7 @@ export default {
             this.resArr3 = []
             this.resArr4 = []
             this.resArr5 = []
+            this.datas2 = []
             this.$request('/order/getServer').data().success((res) => {// 获取自定义套餐所有服务选项
                 this.servedData = res.data.lists
                 res.data.lists.forEach(v => {
@@ -841,9 +879,16 @@ export default {
                         this.sumSel.push(k)
                     }
                 } else if (this.repair == 2) {
-                    if (this.currentId.indexOf(k.id) > -1) {
-                        k._checked = true
+                    if (this.interested) {
                         k._disabled = true
+                        if (this.currentId.indexOf(k.id) > -1) {
+                            k._checked = true
+                        }
+                    } else {
+                        if (this.currentId.indexOf(k.id) > -1) {
+                            k._checked = true
+                            k._disabled = true
+                        }
                     }
                 } else if (this.repair == '3') {
                     if (this.currentId.indexOf(k.id) > -1) {
@@ -855,20 +900,24 @@ export default {
                 }
             })
             this.pacData.forEach(j => {
-                if (this.currentId.indexOf(j.id) > -1) {
-                    j._rowDis = false
+                if (this.interested) {
+                    j._rowDis = true
                 } else {
-                    if (j.id == 16) {
-                        if (this.currentId.indexOf(12) > -1 && this.currentId.indexOf(13) > -1 ||this.currentId.indexOf(23) > -1 && this.currentId.indexOf(13) > -1  || this.currentId.indexOf(20) > -1 && this.currentId.indexOf(21) > -1) {
-                            j._rowDis = false
-                        } else {
-                            j._rowDis = true
-                        }
+                    if (this.currentId.indexOf(j.id) > -1) {
+                        j._rowDis = false
                     } else {
-                        if (this.currentId.indexOf(j.id) > -1) {
-                            j._rowDis = false
+                        if (j.id == 16) {
+                            if (this.currentId.indexOf(12) > -1 && this.currentId.indexOf(13) > -1 ||this.currentId.indexOf(23) > -1 && this.currentId.indexOf(13) > -1  || this.currentId.indexOf(20) > -1 && this.currentId.indexOf(21) > -1) {
+                                j._rowDis = false
+                            } else {
+                                j._rowDis = true
+                            }
                         } else {
-                            j._rowDis = true
+                            if (this.currentId.indexOf(j.id) > -1) {
+                                j._rowDis = false
+                            } else {
+                                j._rowDis = true
+                            }
                         }
                     }
                 }
@@ -876,17 +925,21 @@ export default {
         },
         checkedDis2(val) {
             this.pacData.forEach(v => {
-                if (v.id == 16) {
-                    if (val.s_servers.indexOf(12) > -1 && val.s_servers.indexOf(13) > -1 || val.s_servers.indexOf(23) > -1 && val.s_servers.indexOf(13) > -1  || val.s_servers.indexOf(20) > -1 && val.s_servers.indexOf(21) > -1) {
-                        v._rowDis = false
-                    } else {
-                        v._rowDis = true
-                    }
+                if (this.interested) {
+                    v._rowDis = true
                 } else {
-                    if (val.s_servers.indexOf(v.id) > -1) {
-                        v._rowDis = false
+                    if (v.id == 16) {
+                        if (val.s_servers.indexOf(12) > -1 && val.s_servers.indexOf(13) > -1 || val.s_servers.indexOf(23) > -1 && val.s_servers.indexOf(13) > -1  || val.s_servers.indexOf(20) > -1 && val.s_servers.indexOf(21) > -1) {
+                            v._rowDis = false
+                        } else {
+                            v._rowDis = true
+                        }
                     } else {
-                        v._rowDis = true
+                        if (val.s_servers.indexOf(v.id) > -1) {
+                            v._rowDis = false
+                        } else {
+                            v._rowDis = true
+                        }
                     }
                 }
             })
@@ -1102,7 +1155,7 @@ export default {
             }
         },
         timeReg(val) {
-            return new Date(ChangeDate(val).replace(/-/g, '/') + ' 00:00:00').getTime() / 1000
+            return new Date(dateFormatter(val, 'yyyy-MM-dd') + ' 00:00:00').getTime() / 1000
         },
         moneyChange(num) {
             if (num == 0) {
@@ -1467,6 +1520,11 @@ export default {
                         })
                     }
                 }
+                let trueMoney = this.fixedNum(this.member.payMoney - this.member.commission - this.member.proceduresMoney)
+                if (trueMoney < this.returnBoll) {
+                    this.$Notice.warning({title: '实付金额小于已回款金额，无法编辑订单！'})
+                    return
+                }
                 let obj = {
                     orderCode: this.member.orderCode,
                     createTime: this.member.createTime,
@@ -1583,6 +1641,8 @@ export default {
         },
         show(data) {
             const {contractRes,filterData,refundRes,res,returnInfo,returnRes } = data
+            this.intered(res.vip_starttime, res.user_phone, returnInfo.money)
+            this.returnBoll = returnInfo.money
             //产品类型
             let products = ''
             if (res.productType=='大会员-AI中标预测包'||res.productType=='大会员-招标文件解读'){
@@ -1638,7 +1698,7 @@ export default {
             this.proNums = products
             // 补充包列表
             this.supplys = filterData.supplys
-
+            console.log(typeof res.vip_starttime)
             this.member = {
                 orderCode: res.order_code, //
                 createTime: res.create_time, //
@@ -1682,6 +1742,7 @@ export default {
                 contract_archive_time: contractRes.contract_archive_time, //
                 contract_archive_num: contractRes.contract_archive_num //
             }
+            console.log(this.member)
             //会员套餐
             this.proChange(Number(products))
             this.$request('/order/getCombo').data().success((res) => {
@@ -1716,6 +1777,7 @@ export default {
             optionDis6: false,
             repair: '1',
             spinShow: false,
+            interested: false,
             bShow: false,
             downDis: false,
             shiDis: false,
@@ -1726,6 +1788,9 @@ export default {
             pArr2: [],
             supplys: [],
             combo_id: {},
+            noFinishDis: false,
+            finishDis: false,
+            cancelDis: false,
             allDis: false,
             bigDis: true,
             subDis: true,
@@ -1735,6 +1800,7 @@ export default {
             noPass: false,
             pReadon: false,
             isDisable: false,
+            returnBoll: 0,
             selData: [],
             placed: '请输入有效周期',
             member: {

src/views/order/components/detailModel.vue

@@ -334,7 +334,7 @@ export default {
           sums = sums + v.return_money
         })
         if (this.fixedNum(this.models.refundMoney) / 100 > sums / 100) {
-          this.$Message.warning('退款金额不能大于已回款金额之和！')
+          this.$Message.warning('退款金额不能大于已回款金额！')
           return
         }
       }

src/views/order/components/details.vue

@@ -11,40 +11,14 @@
                     <span v-if="orderType == 14&&orDetails.product_type=='广告'"><p>广告来源：</p>{{book?book.adSource:'--'}}</span>
                     <span v-if="book.source == 'qmx'||orderType == 3||orderType == 6||orderType == 7||orderType == 8||orderType == 9||orderType == 10||orderType == 15">
                         <p>销售人员：</p>
-                        <Input 
-                            class="sale-inpt"
-                            v-model="salesMen" 
-                            type="text" 
-                            placeholder="请输入销售人员姓名" 
-                            @on-blur="saleBlur"
-                            element-id="inptId"
-                            :readonly="saleReadon"
-                            v-if="isSales"
-                        ></Input>
-                        <i class="i-inpt" v-else>{{salesMen}}</i>
-                        <!-- <Button class="i-btn" type="primary" @click="inptSave" v-if="isSales">保存</Button>
-                        <Button class="i-btn" type="primary" @click="inptBtn" v-else>编辑</Button> -->
+                        <i class="i-inpt">{{orDetails.salesperson?orDetails.salesperson:'--'}}</i>
                     </span>
                     <span v-if="orDetails.order_channel_new == '微信小商店'">
                         <p>业绩统计时间：</p>--
                     </span>
                     <span v-else>
                         <p>业绩统计时间：</p>
-                        <date-sigle 
-                            ref="sigleRef3" 
-                            :dateType="'datetime'"
-                            :placeholderd="'请选择业绩统计时间'" 
-                            @startDate="startDate2" 
-                            :overTime="0"
-                            v-if="isTimes"
-                            style="width:180px"
-                        ></date-sigle>
-                        <i class="i-inpt" v-else>{{orDetails?orDetails.sale_time?orDetails.sale_time:'--':'--'}}</i>
-                        <!-- <div v-if="!orDetails.sale_time&&book.source !== 'qmx'"> -->
-                        <div v-if="!orDetails.sale_time&&book.source == 'qmx'">
-                            <Button class="i-btn" type="primary" @click="saveTime(3)" v-if="isTimes">保存</Button>
-                            <Button class="i-btn" type="primary" @click="timeBtn(3)" v-else>编辑</Button>
-                        </div>
+                        <i class="i-inpt">{{orDetails?orDetails.sale_time?orDetails.sale_time:'--':'--'}}</i>
                     </span>
                     <span><p>公司名称：</p>{{orDetails?orDetails.company_name?orDetails.company_name:'--':'--'}}</span>
                     <span><p>签约主体：</p>{{orDetails?orDetails.return_commpany?orDetails.return_commpany:'--':'--'}}</span>
@@ -159,20 +133,7 @@
                     <span v-if="orderType == 16"><p>购买区域：</p><i v-if="book">{{orderObjectd(book.area)?String(Object.keys(book.area)):'全国'}}</i></span>
                     <span>
                         <p>开始日期：</p>
-                        <date-sigle 
-                            ref="sigleRef1" 
-                            :dateType="'date'"
-                            :placeholderd="'请选择开始时间'" 
-                            @startDate="startDate1" 
-                            :overTime="0"
-                            v-if="isTime"
-                            style="width:180px"
-                        ></date-sigle>
-                        <i class="i-inpt" v-else>{{orDetails?vip_starttime:'--'}}</i>
-                        <div v-if="book.source !== 'qmx'">
-                            <Button class="i-btn" type="primary" @click="saveTime(1)" v-if="isTime">保存</Button>
-                            <Button class="i-btn" type="primary" @click="timeBtn(1)" v-else>编辑</Button>
-                        </div>
+                        <i class="i-inpt">{{orDetails?vip_starttime:'--'}}</i>
                     </span>
                     <span><p>计费模式：</p>{{orDetails?orDetails.billingMode==0?'免费':'收费':'--'}}</span>
                     <span><p>订购区域：</p><i v-if="book">{{book?book.subscription_area?book.subscription_area:'--':'--'}}</i></span>
@@ -224,42 +185,14 @@
                 <div class="classfity">
                     <span v-if="orderType == 7">
                         <p>手机号：</p>
-                        <Input 
-                            class="sale-inpt"
-                            v-model="bigPhone" 
-                            type="text" 
-                            placeholder="请输入正确的手机号" 
-                            maxlength="11"
-                            @on-blur="phoneBlur"
-                            element-id="phoneId"
-                            :readonly="phoneReadon"
-                            v-if="isPhone"
-                        ></Input>
-                        <i class="i-inpt" v-else>{{bigPhone}}</i>
-                        <div v-if="book.source !== 'qmx'">
-                            <Button class="i-btn" type="primary" @click="saveBtn" v-if="isPhone">保存</Button>
-                            <Button class="i-btn" type="primary" @click="phoneBtn" v-else>编辑</Button>
-                        </div>
+                        <i class="i-inpt">{{orDetails.user_phone?orDetails.user_phone:'--'}}</i>
                     </span>
                     <span v-else><p>手机号：</p>{{orDetails.user_phone?orDetails.user_phone:'--'}}</span>
                     <span><p>计费模式：</p><i v-if="orDetails">{{orDetails?orDetails.billingMode==0?'免费':'收费':'--'}}</i></span>                   
                     <span><p>会员套餐：</p><i v-if="book">{{book?orderType == 10?'自定义':book.level:'--'}}</i></span>                   
                     <span v-if="orderType == 7">
                         <p>开始时间：</p>
-                        <date-sigle 
-                            ref="sigleRef2" 
-                            :dateType="'date'"
-                            :placeholderd="'请选择开始时间'" 
-                            @startDate="startDate" 
-                            :overTime="0"
-                            v-if="isTime"
-                            style="width:180px"
-                        ></date-sigle>
-                        <i class="i-inpt" v-else>{{orDetails?vip_starttime:'--'}}</i>
-                        <div v-if="book.source !== 'qmx'">
-                            <Button class="i-btn" type="primary" @click="saveTime(2)" v-if="isTime">保存</Button>
-                            <Button class="i-btn" type="primary" @click="timeBtn(2)" v-else>编辑</Button>
-                        </div>
+                        <i class="i-inpt">{{orDetails?vip_starttime:'--'}}</i>
                     </span>
                     <span v-if="orderType == 7"><p>订阅周期：</p><i v-if="orDetails">{{orDetails?vip_starttime:''}}{{orDetails?vip_endtime:''}}</i></span>
                     <span v-if="orderType !== 7"><p>有效日期：</p><i v-if="book">{{book?book.effective_date?book.effective_date:'--':'--'}}</i></span>
@@ -418,7 +351,7 @@
                     <span><p>退款状态：</p><i>{{orDetails?refundStatus(orDetails.refund_status):'--'}}</i></span>
                     <span><p>退款时间：</p><i>{{refundDis?refundRes.refund_time:'--'}}</i></span>
                     <span><p>退款金额：</p><i>{{refundDis?localed(refundRes.refund_money/100):'--'}}</i></span>
-                    <span><p>退款原因：</p><i>{{refundRes?refundRes.refund_reason:'--'}}</i></span>
+                    <span><p>退款原因：</p><i>{{refundRes?refundRes.refund_reason?refundRes.refund_reason:'--':'--'}}</i></span>
                 </div>
             </div>
             <Divider />
@@ -619,7 +552,7 @@ import dateSigle from '@/components/dateSigle'
 import onlineOrderEdit from "./onlineOrderEdit.vue"
 import otherOrderEdit from "./otherOrderEdit.vue"
 import bigOrderEdit from "./bigOrderEdit.vue"
-import { ChangeDate, ChangeDate1, ChangeDate4, addDate } from '@/assets/js/date.js'
+import { dateFormatter, addDate } from '@/assets/js/date.js'
 export default {
     props:{
         orderType: String
@@ -771,6 +704,8 @@ export default {
                 return '已申请'
             } else if (val == 2) {
                 return '已开具'
+            } else {
+                return '--'
             }
         },
         timeChange(val, type) {
@@ -817,12 +752,11 @@ export default {
                 this.orders = r.data
                 if (r.data.res.invoice.length > 0) {
                     r.data.res.invoice.forEach(v => {
-                        v.create_time = ChangeDate4(v.create_time)
+                        v.create_time = dateFormatter(v.create_time * 1000)
                     })
                     this.invoiceed = r.data.res.invoice
                 }
                 this.orDetails = r.data.res
-                this.salesMen = r.data.res.salesperson?r.data.res.salesperson:'--'
                 this.bigPhone = r.data.res.user_phone?r.data.res.user_phone:'--'
                 this.contractData = r.data.contractRes?r.data.contractRes:{}
                 this.refundRes = r.data.refundRes?r.data.refundRes[0]:[];
@@ -845,26 +779,16 @@ export default {
                 this.serverData = r.data.filterData.serversName?r.data.filterData.serversName.split(','):[]
                 this.supplysData = r.data.filterData.supplys?r.data.filterData.supplys:[]
                 if (this.strCourse) {
-                    this.l_starttime = ChangeDate1(this.strCourse.l_starttime);
-                    this.l_endtime = ChangeDate1(this.strCourse.l_endtime);
+                    this.l_starttime = dateFormatter(this.strCourse.l_starttime * 1000, 'yyyy年MM月dd日')
+                    this.l_endtime = dateFormatter(this.strCourse.l_endtime * 1000, 'yyyy年MM月dd日')
                 }
                 if (this.orDetails) {
-                    this.vip_starttime = this.orderObjectd(this.orDetails.vip_starttime)?ChangeDate(this.orDetails.vip_starttime):'-';
-                    this.vip_endtime = this.orderObjectd(this.orDetails.vip_endtime)?' - ' + ChangeDate(this.orDetails.vip_endtime):'-';
+                    this.vip_starttime = this.orderObjectd(this.orDetails.vip_starttime)?dateFormatter(this.orDetails.vip_starttime, 'yyyy.MM.dd'):'-'
+                    this.vip_endtime = this.orderObjectd(this.orDetails.vip_endtime)?' - ' + dateFormatter(this.orDetails.vip_endtime, 'yyyy.MM.dd'):'-'
                     this.trueMoney = this.localed((this.contractData.contract_money - (this.orDetails.commission + this.orDetails.procedures_money))/100)
                 }
             }).get()
         },
-        // 销售人员姓名修改
-        saleBlur() {
-            if (!this.isSales) {
-                if (this.salesMen == '--') {
-                    this.salesMen = '--'
-                } else {
-                    this.salesMen = this.orDetails.salesperson
-                }
-            }
-        },
         invoiceCode(item) {
             this.codeDetail = item
             this.$refs.codeRef.codeShow = true
@@ -876,134 +800,6 @@ export default {
                 this.saleReadon = false
             }, 100)
         },
-        inptSave() {
-            if (!this.salesMen) {
-                this.$Message.warning('销售人员姓名不能为空')
-                return
-            }
-            this.$request('/order/updateSalesperson').data({
-                orderCode: this.orDetails.order_code,
-                salesperson: this.salesMen,
-                userId: this.orDetails.user_id
-            }).success(() => {
-                this.$Message.success('修改成功')
-                this.saleReadon = true
-                setTimeout(() => {
-                    this.isSales = false
-                    document.getElementById("inptId").blur()
-                }, 100)
-                this.ordered()
-            }).post()
-        },
-        // 手机号修改
-        phoneBlur() {
-            if (!this.isPhone) {
-                if (this.bigPhone == '--') {
-                    this.bigPhone = '--'
-                } else {
-                    this.bigPhone = this.orDetails.user_phone
-                }
-            }
-        },
-        phoneBtn() {
-            this.isPhone = true
-            setTimeout(() => {
-                document.getElementById("phoneId").focus()
-                this.phoneReadon = false
-            }, 100)
-        },
-        saveBtn() {
-            if (!this.bigPhone) {
-                this.$Message.warning('手机号不能为空')
-                return
-            }
-            if (!(/^1[3456789]\d{9}$/.test(this.bigPhone))) {
-                this.$Message.warning('手机号格式错误')
-                return
-            }
-            this.$request('/order/updateSalesperson').data({
-                orderCode: this.orDetails.order_code,
-                phone: this.bigPhone,
-                userPhone: this.orDetails.user_phone,
-                userId: this.orDetails.user_id
-            }).success(() => {
-                this.$Message.success('修改成功')
-                this.phoneReadon = true
-                setTimeout(() => {
-                    this.isPhone = false
-                    document.getElementById("phoneId").blur()
-                    this.ordered()
-                }, 100)
-            }).post()
-        },
-        startDate(val) {
-            this.beginTime = new Date(ChangeDate(val).replace(/-/g, '/') + ' 00:00:00').getTime() / 1000
-        },
-        startDate1(val) {
-            this.beginTime = val
-        },
-        startDate2(val) {
-            this.saleTime = val
-        },
-        // 开始时间修改
-        timeBtn(num) {
-            if (num == 1 || num == 2) {
-                this.isTime = true
-            } else if (num == 3) {
-                this.isTimes = true
-            }
-        },
-        urlFunc(url, obj, status) {
-            this.$request(url).data(obj).success(() => {
-                this.$Message.success('修改成功')
-                setTimeout(() => {
-                    if (status == 1 || status == 2) {
-                        this.isTime = false
-                    } else {
-                        this.isTimes = false
-                    }
-                    this.ordered()
-                }, 100)
-            }).post()
-        },
-        saveTime(num) {
-            if (num == 1) {
-                if (!this.beginTime) {
-                    this.$Message.warning('开始日期不能为空')
-                    return
-                }
-                const obj = {
-                    id: this.$route.query.id,
-                    vipStartTime: this.beginTime
-                }
-                this.urlFunc('/order/updateVipStartTime', obj, 1)
-            } else if (num == 2) {
-                if (!this.beginTime) {
-                    this.$Message.warning('开始日期不能为空')
-                    return
-                }
-                const obj = {
-                    orderCode: this.orDetails.order_code,
-                    startTime: this.beginTime,
-                    cycle: this.book.cycle,
-                    cycleType: this.book.cycleType,
-                    userId: this.orDetails.user_id
-                }
-                this.urlFunc('/order/updateSalesperson', obj, 2)
-            } else if (num == 3) {
-                console.log(this.saleTime)
-                if (!this.saleTime) {
-                    this.$Message.warning('业绩统计时间不能为空')
-                    return
-                }
-                const obj = {
-                    orderCode: this.orDetails.order_code,
-                    saleTime: this.saleTime
-                }
-                console.log(obj)
-                this.urlFunc('/order/updateSalesperson', obj, 3)
-            }
-        },
         pushInvo() {
             this.$refs.backRef.iShow = true
         },
@@ -1188,7 +984,6 @@ export default {
         return {
             saleReadon: true,
             phoneReadon: true,
-            isPhone: false,
             isSales: false,
             addDate7: false,
             buyProvince: '',
@@ -1200,7 +995,6 @@ export default {
             refundRes: [],
             orders: {},
             codeDetail: [],
-            salesMen: '',
             beginTime: '',
             saleTime: '',
             orDetails: [],
@@ -1213,8 +1007,6 @@ export default {
             serverData: [],
             supplysData: [],
             isDisable: false,
-            isTime: false,
-            isTimes: false,
             invoiceed: [],
             uploadData: {
                 type: 'transferAccounts'
@@ -1268,16 +1060,6 @@ export default {
                     .no-line {
                         color: #999;
                     }
-                    .sale-inpt {
-                        width: 180px;
-                        /deep/ .ivu-input {
-                            font-size: 16px;
-                            color: #333;
-                            &:focus {
-                                box-shadow: none;
-                            }
-                        }
-                    }
                     .i-inpt {
                         width: 180px;
                     }

src/views/order/components/otherOrder.vue

@@ -227,7 +227,7 @@ import fDate from '@/components/dateSection'
 import bUpload from '@/components/uploadFile.vue'
 import citySelect from "@/components/citySelect"
 import saleSelect from './salesSelect.vue'
-import { ChangeDate, dateFormatter } from '@/assets/js/date'
+import { dateFormatter } from '@/assets/js/date'
 export default {
   components: { 
       dateSigle,
@@ -297,7 +297,7 @@ export default {
         })
       },
       timeReg(val) {
-          return new Date(ChangeDate(val).replace(/-/g, '/') + ' 00:00:00').getTime() / 1000
+          return new Date(val + ' 00:00:00').getTime() / 1000
       },
       pheHandler() {
           this.others.phone = this.others.phone.replace(/[^\d]/g,'')

src/views/order/components/otherOrderEdit.vue

@@ -6,7 +6,7 @@
                 <Select v-model="others.order_status" placeholder="请选择订单状态">
                   <Option value="0" :disabled="noFinishDis">未完成</Option>
                   <Option value="1" :disabled="finishDis">已完成</Option>
-                  <Option value="-2" :disabled="interested">已取消</Option>
+                  <Option value="-2" :disabled="cancelDis || interested">已取消</Option>
                 </Select>
               </FormItem>
               <FormItem label="销售渠道" prop="salesChannel">
@@ -230,7 +230,7 @@ import fDate from '@/components/dateSection'
 import bUpload from '@/components/uploadFile.vue'
 import citySelect from "@/components/citySelect"
 import saleSelect from './salesSelect.vue'
-import { ChangeDate, dateFormatter } from '@/assets/js/date'
+import { dateFormatter } from '@/assets/js/date'
 import chinaMapJSON from "@/assets/js/china_area.js";
 export default {
   components: { 
@@ -241,18 +241,6 @@ export default {
       citySelect,
       saleSelect
   },
-  computed: {
-    interested: function() {
-      console.log(this.others.vipStartTime.substr(0, 2))
-      if (this.others.vipStartTime == '2099-01-01' || this.others.vipStartTime.substr(0, 2) == '9') {
-        this.stopCheck = false
-        return false
-      } else {
-        // this.stopCheck = true
-        return true
-      }
-    }
-  },
   methods: {
       inited() {// 初始化
         // this.$refs['others'].resetFields()
@@ -312,8 +300,35 @@ export default {
           }
         })
       },
+      intered(time, phone, money) {// 判断权益是否开通
+        console.log(time, phone.substr(0, 1))
+        if (money > 0) {// 已回款金额
+          this.others.order_status = 1
+          this.noFinishDis = true
+          this.cancelDis = true
+        }
+        if (time == '2099-01-01 00:00:00' || phone.substr(0, 1) == '9') {// 权益未开通
+          if (money == 0) {
+            this.noFinishDis = false
+            this.finishDis = false
+            this.cancelDis = false
+          } else {
+            this.stopCheck = false
+            this.interested = false
+          }
+        } else {// 权益开通
+          if (money == 0) {
+            this.noFinishDis = false
+            this.finishDis = false
+            this.cancelDis = true
+          } else {
+            this.stopCheck = true
+            this.interested = true
+          }
+        }
+      },
       timeReg(val) {
-          return new Date(ChangeDate(val).replace(/-/g, '/') + ' 00:00:00').getTime() / 1000
+          return new Date(val + ' 00:00:00').getTime() / 1000
       },
       pheHandler() {
           this.others.phone = this.others.phone.replace(/[^\d]/g,'')
@@ -359,14 +374,14 @@ export default {
                   this.areaNums = res.data.userData
                 }
                 if (res.data.willEffect == true) { // 存在即将生效的超级订阅订单
-                  this.$Modal.warning({
-                    title: '警告提示',
-                    content: '该用户存在即将生效的超级订阅订单，无法创建新订单',
-                    okText: '我知道了',
-                    onOk:() => {
-                      this.oShow = false
-                    }
-                  })
+                  // this.$Modal.warning({
+                  //   title: '警告提示',
+                  //   content: '该用户存在即将生效的超级订阅订单，无法创建新订单',
+                  //   okText: '我知道了',
+                  //   onOk:() => {
+                  //     this.oShow = false
+                  //   }
+                  // })
                 } else {// 不存在即将生效的超级订阅订单
                   if (res.data.vipExist == true ) { // 存在已经生效的超级订阅订单
                       if (res.data.nationwide) { // 购买区域是“全国”
@@ -716,6 +731,7 @@ export default {
       show(data){
         const {contractRes,filterData,refundRes,res,returnInfo,returnRes } = data
         this.returnBoll = returnInfo.money
+        this.intered(res.vip_starttime, res.user_phone, returnInfo.money)
         //产品类型
         let rest = res.productType === 'VIP订阅'?'超级订阅':res.productType
         const productType = this.otherPro.find(item => item.n==rest).v
@@ -851,6 +867,8 @@ export default {
           returnBoll: 0,
           noFinishDis: false,
           finishDis: false,
+          cancelDis: false,
+          interested: false,
           phoneReg: [],
           infoData: [],
           areaNums: [],

src/views/sales/partnerDetail.vue

@@ -129,29 +129,27 @@
                 </Card>
             </Col>
         </Row>
-        <div class="ivu-modal-mask par-model xuan" style="z-index: 1006;" v-show="preview" @click="preview = false">
-            <div class="d-mask">
-                <img width="100" id="imged" :src="parDetail.license" @click.stop="preview = true">
-                <div class="zhuan">
-                    <Icon size="28" type="md-refresh" @click.stop="moved" />
-                </div>
-            </div>
-        </div>
+        <!-- 图片放大 -->
+        <preview-imgs ref="previewRef" :urls="parDetail.license"></preview-imgs>
     </div>
 </template>
 
 <script>
-import { ChangeDate } from '../../assets/js/date'
+import previewImgs from '@/components/previewImg'
+import { dateFormatter } from '../../assets/js/date'
 export default {
+    components: {
+        previewImgs
+    },
     created () {
         let rout = this.$route.query
         this.$request('/sales/partnerList/partnerDetail').data({// 基本信息
             uid: rout.uid,
             id: rout.id
         }).success((r) => {
-            this.parDetail = r.data;
-            this.parDetail.createtime = ChangeDate(this.parDetail.createtime);
-            this.parDetail.lastlogintime = ChangeDate(this.parDetail.lastlogintime)
+            this.parDetail = r.data
+            this.parDetail.createtime = dateFormatter(this.parDetail.createtime, 'yyyy.MM.dd')
+            this.parDetail.lastlogintime = dateFormatter(this.parDetail.lastlogintime, 'yyyy.MM.dd')
         }).get()
 
         this.$request('/sales/partnerList/overview').data({// 概览
@@ -197,12 +195,7 @@ export default {
             this.infor = index
         },
         fruit() {
-            this.preview = true
-        },
-        moved() {
-            let imgId = document.getElementById('imged')
-            this.place++
-            imgId.style.WebkitTransform = 'rotate(' + this.place * 90 + 'deg)'
+            this.$refs.previewRef.preview = true
         },
         rowsClick (arr) {
             if (arr.type == '佣金') {
@@ -263,9 +256,7 @@ export default {
             loading: false,
             parDetail: [],
             infor: 1,
-            place: 0,
             types: this.$route.query.type,
-            preview: false,
             datas1: [],
             datas2: [],
             column1: [

src/views/userManage/instiAudit.vue

@@ -110,11 +110,10 @@ export default {
       this.filter.page = 0
     },
     startsData(val) {
-      console.log(val)
-      this.filter.authStartTime = val
+      this.filter.authStartTime = val + ' 00:00:00'
     },
     endsData(val) {
-      this.filter.authEndTime = val
+      this.filter.authEndTime = val + ' 23:59:59'
     },
     goDetail(row, val) {
       const url = this.$router.resolve({path:'/userManage/instiAudit/detail', query: {id: row.id, entId: row.entId, type: val}})

src/views/userManage/instiManage.vue

@@ -90,16 +90,16 @@ export default {
       this.filter.page = 0
     },
     startsData(val) {
-      this.filter.createStartTime = val
+      this.filter.createStartTime = val + ' 00:00:00'
     },
     endsData(val) {
-      this.filter.createEndTime = val
+      this.filter.createEndTime = val + ' 23:59:59'
     },
     startsData1(val) {
-      this.filter.validStartTime = val
+      this.filter.validStartTime = val + ' 00:00:00'
     },
     endsData1(val) {
-      this.filter.validEndTime = val
+      this.filter.validEndTime = val + ' 23:59:59'
     },
     goDetail(val) {
       const url = this.$router.resolve({path:'/userManage/instiManage/detail', query: {id: val.id}})

src/views/userManage/mergeUserList.vue

@@ -60,7 +60,7 @@
   </div>
 </template>
 <script>
-import { ChangeDate2 } from "../../assets/js/date";
+import { dateFormatter } from "../../assets/js/date";
 export default {
   methods: {
     load(val) {
@@ -105,7 +105,7 @@ export default {
           key: "l_mergeData",
           align: "center",
           render: (h, { row }) => {
-            return h("span", row.l_mergeData ? ChangeDate2(row.l_mergeData * 1000) : "-");
+            return h("span", row.l_mergeData ? dateFormatter(row.l_mergeData * 1000) : "-");
           },
         },
         {

src/views/userManage/userDetail.vue

@@ -250,7 +250,7 @@
 </template>
 
 <script>
-import { ChangeDate3 } from '../../assets/js/date'
+import { dateFormatter } from '../../assets/js/date'
 export default {
     created () {
         let rout = this.$route.query
@@ -264,7 +264,7 @@ export default {
                 this.personData = res.data.userData
                 this.orderDatas = res.data.userOrderData
                 this.authStatus = res.data.authStatus
-                this.registedate = ChangeDate3(res.data.userData.l_registedate)
+                this.registedate = dateFormatter(res.data.userData.l_registedate * 1000, 'yyyy.MM.dd')
 
                 let mony = res.data.userOrderData
                 this.allPrice = this.localed(mony.Big.allMoney/100 + mony.BigSub.allMoney/100 + mony.BigSupply.allMoney/100 + mony.bidFile.allMoney/100

src/views/userManage/userList.vue

@@ -286,7 +286,6 @@
   </div>
 </template>
 <script>
-import { ChangeDate } from "../../assets/js/date";
 import vDate from "@/components/dateSection";
 export default {
   components: {
@@ -327,7 +326,7 @@ export default {
     },
     rowClick(row) {
       const srcs = this.$router.resolve({
-        path: "/userMage/userList/userDetail",
+        path: "/userManage/userList/userDetail",
         query: { id: row._id },
       });
       window.open(srcs.href, "_blank");
@@ -368,21 +367,19 @@ export default {
     },
     startsData(val) {
       if (val) {
-        this.starts =
-          new Date(ChangeDate(val).replace(/-/g, "/") + " 00:00:00").getTime() / 1000;
+        this.starts = new Date(val).getTime() / 1000
       } else {
-        this.starts = "";
+        this.starts = ""
       }
       if (this.starts == "" && this.ends == "") {
-        this.filter.regisTime = "";
+        this.filter.regisTime = ""
       } else {
-        this.filter.regisTime = this.starts + "_" + this.ends;
+        this.filter.regisTime = this.starts + "_" + this.ends
       }
     },
     endsData(val) {
       if (val) {
-        this.ends =
-          new Date(ChangeDate(val).replace(/-/g, "/") + " 23:59:59").getTime() / 1000;
+        this.ends = new Date(val).getTime() / 1000
       } else {
         this.ends = "";
       }