保存

.env

@@ -1,5 +1,5 @@
 VUE_APP_ADMIN_TOKEN_NAME = 'admin_token'
-VUE_APP_API_URL_PREFIX = 'https://kf-qmx-test.jianyu360.cn/api/admin/'
+VUE_APP_API_URL_PREFIX = 'http://kf-qmx-test.jianyu360.cn/api/admin/'
 VUE_APP_API_ACTION_NAME = '_action'
 VUE_APP_API_TOKEN_NAME = '_token'
 VUE_APP_INDEX_URL = '/'

src/assets/css/common.css

@@ -343,7 +343,7 @@ textarea:-ms-input-placeholder {
 .ding-dan .ivu-input-with-prefix {
   padding-left: 20px;
 }
-.jie-suan .ivu-table-tbody tr,.ding-dan .ivu-table-tbody tr,.user-list .ivu-table-tbody tr {
+.jie-suan .ivu-table-tbody tr,.ding-dan .ivu-table-tbody tr,.user-list .ivu-table-tbody tr,.user-detail .ding-table .ivu-table-tbody tr {
   cursor: pointer;
 }
 .shen-model .ivu-modal-body p {

src/components/dateSection.vue

@@ -57,7 +57,7 @@ export default {
         },
         handleChange2 (date) {
             this.endsTime = date
-            this.$emit('endsTime',this.endsTime)
+            this.$emit('endsData',this.endsTime)
         },
         confirmed1 () {
             if (this.startsTime && this.endsTime) {

src/plugins/request.js

@@ -41,13 +41,8 @@ export const requestSuccessHandle = function (vue, response, tipSuccess, tipErro
             vue.$Notice.error({
                 title: '错误提示',
                 desc: response.info,
-                duration: 5
+                duration: 4
             })
-            // if (response.info == '暂无权限') {
-            //     this.$request("/load").success((r) => {
-                    
-            //     })
-            // }
         }
         error && error(response)
     }

src/views/msgCollect/msgList.vue

@@ -79,11 +79,15 @@ export default {
         handleChange1(date) {
             if (date) {
                 this.filter.StartTime = parseInt(new Date(date).getTime()/1000)
+            } else {
+                this.filter.StartTime = ''
             }
         },
         handleChange2(date) {
             if (date) {
                 this.filter.EndTime = parseInt(new Date(date).getTime()/1000)
+            } else {
+                this.filter.EndTime = ''
             }
         },
         confirmed1() {

src/views/order/components/details.vue

@@ -123,12 +123,16 @@
             <Divider />
         </div>
         <!-- 大会员 -->
-        <div class="infor-card" v-if="orderType == 7">
+        <div class="infor-card" v-if="orderType == 7||orderType == 9||orderType == 10">
             <div class="cont">
                 <div class="tit">会员信息</div>
                 <div class="classfity">
                     <span>会员等级： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i v-if="book">{{book?book.level:''}}</i></span>                   
                     <span>订阅周期： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i v-if="orDetails">{{orDetails?vip_starttime:''}}{{orDetails?vip_endtime:''}}</i></span>
+                    <span v-if="orderType == 7||orderType == 9">付费账号： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i v-if="book">{{book.pay_sub_num||book.pay_sub_num==0?book.pay_sub_num+'个':'--'}}</i></span>
+                    <span v-if="orderType == 7||orderType == 9">免费账号： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i v-if="book">{{book.free_sub_num||book.free_sub_num==0?book.free_sub_num+'个':'--'}}</i></span>
+                    <span v-if="orderType == 10">功能类型： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i v-if="book">{{book?'AI中标预测包':'--'}}</i></span>
+                    <span v-if="orderType == 10">购买数量： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i v-if="book">{{book.count||book.count==0?book.count+'个':'--'}}</i></span>
                 </div>
             </div>
             <Divider />
@@ -150,7 +154,7 @@
                     <span v-if="orderType == 7">子账号金额：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <i :class="book.sub_money" v-if="book">{{book.sub_money?localed(book.sub_money/100):localed(0.00)}}</i>
                     </span>
-                    <span v-if="orderType == 7">订单金额： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <span v-if="orderType == 7||orderType == 9||orderType == 10">订单金额： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <i :class="orDetails.order_money" v-if="orDetails">{{orDetails.order_money?localed(orDetails.order_money):localed(0.00)}}</i>
                     </span>
                     <span v-if="orderType == 1">实付数量： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -158,7 +162,7 @@
                     </span><!-- 线下课程 -->
                     <span>实付金额： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <i v-if="orDetails">
-                            <em class="yuan">{{orDetails.pay_money?book.original_price?'原价：￥'+(book.original_price/100).toLocaleString('en-US'):'':''}}</em>
+                            <em class="yuan" v-if="book">{{book.original_price?book.original_price?'原价：￥'+(book.original_price/100).toLocaleString('en-US'):'':''}}</em>
                             {{orDetails.pay_money?localed(orDetails.pay_money/100):localed(0.00)}}
                         </i>
                     </span><!-- VIP订阅 -->
@@ -169,7 +173,7 @@
                         <i :class="orDetails.order_status | orderWord" v-if="orDetails">{{orDetails.order_status}}</i>
                     </span>
                     <span>支付凭证： &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        <i v-if="book.transferV">
+                        <i v-if="book">
                             <a :href="book.transferV" target="_blank" v-if="book.transferV">{{book.transferV?"点击查看":'--'}}</a>
                             <i v-else>--</i>
                         </i>

src/views/order/components/orderModel.vue

@@ -3,7 +3,7 @@
         <Modal title="创建订单" v-model="bShow" class-name="order-model" :mask-closable="false" @on-visible-change="visibleChange">
             <Form ref="member" :model="member" :rules="ruleMembers" @keyup.native="calChange('member')" :show-message="false" :label-width="110">
                 <FormItem label="手机号" prop="phone" :class="{'big-stas':colr}">
-                    <Input v-model="member.phone" type="text" @on-keyup="member.phone=member.phone.replace(/[^\d]/g,'')" :maxlength="11" placeholder="请输入手机号" @on-blur="iptChange"></Input>
+                    <Input v-model="member.phone" type="text" @on-change="pheHandler" :maxlength="11" placeholder="请输入手机号"></Input>
                     <p v-html="colr" style="color:#e13d13"></p>
                 </FormItem>
                 <FormItem label="产品类型" prop="products">
@@ -24,10 +24,10 @@
                         </Select>
                     </FormItem>
                     <FormItem label="付费子账号数量" prop="paySub">
-                        <Input v-model="member.paySub" type="tel" placeholder="请填写付费子账号数量" @on-change="payHandler"></Input>
+                        <Input v-model="member.paySub" type="tel" placeholder="请填写付费子账号数量" @on-keyup="payHandler"></Input>
                     </FormItem>
                     <FormItem label="免费子账号数量" prop="freeSub">
-                        <Input v-model="member.freeSub" type="tel" placeholder="请填写免费子账号数量"></Input>
+                        <Input v-model="member.freeSub" type="tel" @on-keyup="member.freeSub=member.freeSub.replace(/^(0+)|[^\d]+/g,'')" placeholder="请填写免费子账号数量"></Input>
                     </FormItem>
                     <FormItem label="大会员金额" v-if="creAuth == '1'" prop="bigMoney">
                         <span class="sum-jin"><i class="currents">原价 {{tipFunc(bigOri)}}</i>&nbsp;&nbsp;{{tipFunc(member.bigMoney)}}</span>
@@ -56,7 +56,7 @@
                             :on-error="handleError"
                             :show-upload-list="false"
                             accept=".jpg,.png,.jpeg"
-                            name="courseFile"
+                            name="shareFile"
                             :data="uploadData"
                             :max-size="15120"
                             class="pay-load"
@@ -65,13 +65,19 @@
                         </Upload>
                     </FormItem>
                     <FormItem label="实付金额" prop="payMoney">
-                        <Input v-model="member.payMoney" type="text" @on-keyup="member.payMoney=member.payMoney.replace(/[^\d]/g,'')" placeholder="请填写实付金额"></Input>
+                        <Input 
+                            v-model="member.payMoney"
+                            type="text" 
+                            @on-keyup="member.payMoney=member.payMoney.replace(/^(0+)|[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')" 
+                            :maxlength="9"
+                            placeholder="请填写实付金额"
+                        ></Input>
                     </FormItem>
                 </div>
             </Form>
             <div slot="footer">
-                <Button type="primary" size="large" @click="ordConfirm('member')" :disabled="createDis">提交</Button>
-                <Button type="error" size="large" @click="ordCancel('member')">取消</Button>
+                <Button type="primary" size="large" @click="ordConfirm()" :disabled="createDis">提交</Button>
+                <Button type="error" size="large" @click="ordCancel()">取消</Button>
             </div>
         </Modal>
     </div>
@@ -157,7 +163,7 @@ export default {
             nums: 1,
             payHtml: '',
             uploadData: {
-                type: 'courseFile'
+                type: 'shareFile'
             }
         }
     },
@@ -173,6 +179,45 @@ export default {
         }
     },
     methods: {
+        pheHandler() {
+            this.member.phone = this.member.phone.replace(/[^\d]/g,'')
+            if (this.member.phone) {
+                if ((/^1[3456789]\d{9}$/.test(this.member.phone))) {
+                    this.$request('/order/isOpenBig').data({
+                        phone: this.member.phone
+                    }).success((res) => {
+                        this.bigStas = res.data.Bigstatus
+                        if (this.member.products == 1) {
+                            if (this.bigStas == 1) {
+                                this.colr = '此手机号已有大会员权限，无需再次创建'
+                                this.creAuth = ''
+                            } else {
+                                this.colr = ''
+                                this.creAuth = 1
+                            }
+                        }
+                        if (this.member.products == 2) {
+                            if (this.bigStas == 0) {
+                                this.colr = '此手机号无大会员权限'
+                                this.creAuth = ''
+                            } else {
+                                this.colr = ''
+                                this.creAuth = 2
+                            }
+                        }
+                        if (this.member.products == 3) {
+                            if (this.bigStas == 0) {
+                                this.colr = '此手机号无大会员权限'
+                                this.creAuth = ''
+                            } else {
+                                this.colr = ''
+                                this.creAuth = 3
+                            }
+                        }
+                    }).post()
+                }
+            }
+        },
         visibleChange(val) {
             if (val == false) {
                 setTimeout(() => {
@@ -180,32 +225,17 @@ export default {
                     this.orderOri = 0
                     this.payHtml = ''
                     this.colr = ''
-                    // this.member.bigMoney = 0
-                    // this.member.orderMoney = 0
                     this.createDis = true
                     this.$refs.member.resetFields()
                 },500)
             }
         },
-        iptChange() {
-            if (this.member.phone) {
-                if ((/^1[3456789]\d{9}$/.test(this.member.phone))) {
-                    this.$request('/order/isOpenBig').data({
-                        phone: this.member.phone
-                    }).success((res) => {
-                        this.bigStas = res.data.Bigstatus
-                    }).post()
-                }
-            }
-        },
         proChange(val) {// 产品类型
             this.creAuth = this.member.products
             this.proNums = val
             this.bigOri = 0
             this.orderOri = 0
             this.payHtml = ''
-            // this.member.bigMoney = 0
-            // this.member.orderMoney = 0
             if (val == 1) {
                 if (this.bigStas == 1) {
                     this.colr = '此手机号已有大会员权限，无需再次创建'
@@ -261,7 +291,8 @@ export default {
             }
         },
         payHandler() {// 子账号金额
-            this.member.subMoney = this.member.paySub * 2000
+            this.member.paySub=this.member.paySub.replace(/^(0+)|[^\d]+/g,'')
+            this.member.subMoney = parseInt(this.member.paySub==''?0:this.member.paySub) * 2000
             this.ordFunc()
         },
         buyHandler() {// 购买数量
@@ -306,11 +337,6 @@ export default {
                     this.$refs.member.resetFields()
                     this.payHtml = ''
                     this.colr = ''
-                    // this.member.products = ''
-                    // this.member.bigMoney = 0
-                    // this.member.subMoney = 0
-                    // this.member.orderMoney = 0
-                    // this.member.payMoney = ''
                     this.createDis = true
                     this.$parent.reload()
                 }
@@ -330,13 +356,14 @@ export default {
                 products: '',// 产品类型不需要传（传空）
                 subMoney: this.member.subMoney * 100
             }
-            if (this.proNums == 1) {
-                this.urlReq('/order/createBigOrder', obj)
-            } else if (this.proNums == 2) {
-                this.urlReq('/order/createSubOrder', obj)
-            } else if (this.proNums == 3) {
-                this.urlReq('/order/createAIOrder', obj)
-            }
+            console.log(obj)
+            // if (this.proNums == 1) {
+            //     this.urlReq('/order/createBigOrder', obj)
+            // } else if (this.proNums == 2) {
+            //     this.urlReq('/order/createSubOrder', obj)
+            // } else if (this.proNums == 3) {
+            //     this.urlReq('/order/createAIOrder', obj)
+            // }
         },
         ordCancel() {
             this.bShow = false

src/views/order/orderDetail.vue

@@ -39,6 +39,12 @@ export default {
             case '大会员':
                 this.proStatus = '7'
                 break;
+            case '大会员-子账号':
+                this.proStatus = '9'
+                break;
+            case '大会员-AI中标预测包':
+                this.proStatus = '10'
+                break;
             case 'VIP订阅':
                 this.proStatus = '8'
                 break;

src/views/order/orderList.vue

@@ -240,7 +240,7 @@ export default {
             }
         },
         rowClick(row) {
-            const news = this.$router.resolve({path:'/order/orderList/orderDetail',query:{id:row.id,proType:row.product_type,orderStas:row.order_status}})
+            const news = this.$router.resolve({path:'/order/orderList/orderDetail',query:{id:row.id,proType:row.product_type}})
             window.open(news.href,'_blank')
         },
         handleChange1 (date) {
@@ -353,6 +353,8 @@ export default {
             proType: [
                 {v: '', n: '全部'},
                 {v: '6', n: '大会员'},
+                {v: '7', n: '大会员-子账号'},
+                {v: '8', n: '大会员-AI中标预测包'},
                 {v: '0', n: '超级订阅'},
                 {v: '1', n: '数据报告'},
                 {v: '2', n: '历史数据'},

src/views/sales/partnerList.vue

@@ -78,7 +78,6 @@ export default {
         loading: false,
         parType: [{v: '', n: '全部'},{v: '1', n: '个人'}, {v: '2', n: '企业'}, {v: '3', n: '其他'}],
         filter: {
-            // keyword: '',
             type: '',
             salesMin: '',
             salesMax: '',
@@ -144,10 +143,7 @@ export default {
             {
                 title: '类型',
                 slot: 'type',
-                align: 'center',
-                // render: (h, {row}) => {
-                //   return h('span',)
-                // }
+                align: 'center'
             },
             {
                 title: '操作',

src/views/system/user.vue

@@ -126,13 +126,19 @@
                     {
                         title: '最后登录IP',
                         key: 'last_login_ip',
-                        align: 'center'
+                        align: 'center',
+                        render: (h, {row}) => {
+                            return h('span', row.last_login_ip ? row.last_login_ip : '-')
+                        }
                     },
                     {
                         title: '最后登录时间',
                         key: 'last_login_time',
                         align: 'center',
-                        width: 220
+                        width: 220,
+                        render: (h, {row}) => {
+                            return h('span', row.last_login_time ? row.last_login_time : '-')
+                        }
                     },
                     {
                         title: '创建时间',

src/views/userManage/userDetail.vue

@@ -9,18 +9,18 @@
                             <img :src="personData.headImg" v-if="personData.headImg">
                             <img src="../../assets/images/moren.png" v-else>
                         </div>
-                        <div class="names">{{personData.s_nickname}}</div>
-                        <div class="msg1"><span>{{personData.s_phone ? personData.s_phone : personData.s_m_phone}}</span></div>
+                        <div class="names">{{personData.s_nickname ? personData.s_nickname : '-'}}</div>
+                        <div class="msg1"><span>{{personData.s_phone ? personData.s_phone?personData.s_phone:'-' : personData.s_m_phone?personData.s_m_phone:'-'}}</span></div>
                         <div class="msg1 msg2"><span>{{personData.s_myemail ? personData.s_myemail : '-'}}</span></div>
                     </div>
                     <div class="bot-tit">
                         <div class="over-view" @click="tabClick(1)" :class="{active:infor === 1}"><span>概览</span></div>
                         <div class="basic" @click="tabClick(2)" :class="{active:infor === 2}"><span>基本信息</span></div>
                         <div class="basic" @click="tabClick(3)" :class="{active:infor === 3}"><span>大会员信息</span></div>
-                        <div class="shi-ren" @click="tabClick(4)" :class="{active:infor === 4}"><span>实名认证<i :class="authStatus | authColor">{{authStatus | authStatus}}</i></span></div>
+                        <div class="shi-ren" :class="{active:infor === 4}"><span>实名认证<i :class="authStatus | authColor">{{authStatus | authStatus}}</i></span></div>
                         <div class="ding-ji" @click="tabClick(5)" :class="{active:infor === 5}"><span>订单记录</span></div>
-                        <div class="ding-ji" @click="tabClick(6)" :class="{active:infor === 6}"><span>反馈记录</span></div>
-                        <div class="yong-msg" @click="tabClick(7)" :class="{active:infor === 7}"><span>用户信息</span></div>
+                        <div class="ding-ji" :class="{active:infor === 6}"><span>反馈记录</span></div>
+                        <div class="yong-msg" :class="{active:infor === 7}"><span>用户信息</span></div>
                     </div>
                 </Card>
             </Col>
@@ -109,7 +109,8 @@
                         <Tabs :animated="false" v-model="named">
                             <TabPane label="子账号" name="name1">
                                 <div class="tian-jia">
-                                    <Button type="success" icon="md-add" @click="addSub">添加</Button>
+                                    <Button type="success" icon="md-add" @click="addSub" v-if="addDis">添加</Button>
+                                    <Button type="success" icon="md-add" disabled v-else>添加</Button>
                                 </div>
                                 <Table 
                                     size="large"
@@ -176,7 +177,7 @@
                         :filter="filter2"
                         :filterReset="0"
                         :filterType="0"
-                        class="big-class"
+                        class="big-class ding-table"
                         requestApi="/users/orderList" 
                         @loading="load" 
                         style="background:#fff"
@@ -187,13 +188,10 @@
                             :loading="loading" 
                             :columns="column4" 
                             :data="list4.lists"
+                            @on-row-click="rowClick"
                             stripe 
                             v-if="infor == 5"
-                        >
-                            <template slot-scope="{ row }" slot="_code">
-                                <div @click="rowsClick(row)">{{row.order_code}}</div>
-                            </template>
-                        </Table>
+                        ></Table>
                         <template slot="options">
                             <div style="color:#d7d7d7;font-size:14px">共计{{list4.total}}个订单，消费￥{{list4.allMoney>=0?list4.allMoney/100:0}}</div>
                         </template>
@@ -250,11 +248,11 @@ export default {
             this.registedate = ChangeDate3(res.data.userData.l_registedate)
 
             let mony = res.data.userOrderData
-            this.allMoney = this.localed(mony.Big.allMoney/100 + mony.course.allMoney/100
+            this.allMoney = this.localed(mony.Big.allMoney/100 + mony.BigAI.allMoney/100 + mony.BigSub.allMoney/100 + mony.course.allMoney/100
             + mony.course_xs.allMoney/100 + mony.dataExport.allMoney/100 + mony.dataReport.allMoney/100
             + mony.entniche.allMoney/100 + mony.vip.allMoney/100)
 
-            this.payNum = mony.Big.payNum + mony.course.payNum + mony.course_xs.payNum + mony.dataExport.payNum 
+            this.payNum = mony.Big.payNum + mony.BigAI.payNum + mony.BigSub.payNum + mony.course.payNum + mony.course_xs.payNum + mony.dataExport.payNum 
             + mony.dataReport.payNum + mony.entniche.payNum + mony.vip.payNum
             this.allInvoiceMoney = this.localed(res.data.allInvoiceMoney/100)
             for (const i in this.orderDatas) {
@@ -284,6 +282,11 @@ export default {
                 userId: rout.id
             }).success((res) => {
                 this.datas2 = res.data.lists
+                if (res.data.subCount == 0){
+                    this.addDis = false
+                } else {
+                    this.addDis = true
+                }
             }).get()
         },
         load(val) {
@@ -292,18 +295,6 @@ export default {
         tabClick(index) {
             this.infor = index
         },
-        rowsClick (arr) {
-            if (arr.type == '佣金') {
-                const paths = this.$router.resolve({
-                    path: '/order/orderList/orderDetail', 
-                    query:{
-                        id: arr.order_id,
-                        proType: arr.product_name,
-                        par: 1
-                    }})
-                window.open(paths.href,'_blank')
-            }
-        },
         addSub() {
             this.subCorde.show = true
         },
@@ -320,13 +311,8 @@ export default {
                 this.subCorde.status = '1'
             }).post()
         },
-        record(data) {
-            this.$request('/users/subdetail').data({
-                userId: data._id,
-                f_result: ''
-            }).success((res) => {
-                this.list3.lists = res.data.lists
-            }).post()
+        record(row) {
+            this.filter1.keyword = row.s_phone ? row.s_phone : row.s_m_phone
             this.named = 'name2'
         },
         subOpen(data,num) {
@@ -349,7 +335,11 @@ export default {
         },
         disabd(data) {
             this.subOpen(data, 0)
-        }
+        },
+        rowClick(row) {
+            const news = this.$router.resolve({path:'/order/orderList/orderDetail',query:{id:row.id,proType:row.product_type}})
+            window.open(news.href,'_blank')
+        },
     },
     filters: {
         authStatus (val) {
@@ -383,6 +373,7 @@ export default {
             payNum: '',
             allInvoiceMoney: '',
             infor: 1,
+            addDis: false,
             datas1: [],
             datas2: [],
             datas3: [],
@@ -499,14 +490,17 @@ export default {
             column4: [
                 {
                     title: '订单编号',
-                    slot: '_code',
+                    key: 'order_code',
                     width: '150',
                     align: 'center'
                 },
                 {
                     title: '产品类型',
                     key: 'product_type',
-                    align: 'center'
+                    align: 'center',
+                    render: (h, {row}) => {
+                        return h('span', row.product_type == 'VIP订阅' ? '超级订阅' : row.product_type)
+                    }
                 },
                 {
                     title: '订单类型',

src/views/userManage/userList.vue

@@ -13,7 +13,7 @@
       style="background:#fff;padding:10px"
     >
       <template slot="filterContent">
-        <h2>剑鱼个人用户查询系统  <i>bate版</i></h2>
+        <h2>剑鱼个人用户查询系统  <i>beta版</i></h2>
         <FormItem label="精准查找：" :label-width="70" class="zhao-right">
           <Select size="large" :value="secWord" @on-change="selChange" style="width:100px">
             <Option value="1">手机号</Option>
@@ -36,7 +36,7 @@
         <FormItem label="注册来源：" :label-width="60" class="ji-chu lai-yuan">
           <Select size="large" placeholder="全部" v-model="filter.regSource" style="width:70px">
             <Option value="" >全部</Option>
-            <Option value="1" >剑鱼标讯网</Option>
+            <Option value="1" >剑鱼标讯网站</Option>
             <Option value="2" >百度SEO</Option>
           </Select>
         </FormItem><br/>
@@ -103,8 +103,22 @@
         </div><br/>
         <label class="biao-lab">付费信息：</label>
         <FormItem label="付费金额" :label-width="80" class="ji-chu">
-          <Input type="text" size="large" v-model="filter.minMoney" placeholder="最小金额" style="width: 73px" clearable/>
-          <Input type="text" size="large" v-model="filter.maxMoney" placeholder="最大金额" style="width: 73px;margin-left: 2px" clearable/>
+          <Input 
+            type="text" 
+            size="large" 
+            v-model="filter.minMoney" 
+            @on-keyup="filter.minMoney=filter.minMoney.replace(/^(0+)[^\d]+/g,'').replace(/^(0+)|[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
+            placeholder="最小金额" 
+            style="width: 73px" 
+            clearable/>
+          <Input 
+            type="text" 
+            size="large" 
+            v-model="filter.maxMoney" 
+            placeholder="最大金额" 
+            @on-keyup="filter.maxMoney=filter.maxMoney.replace(/^(0+)|[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"
+            style="width: 73px;margin-left: 2px" 
+            clearable/>
         </FormItem>
         <br/>
       </template>
@@ -178,11 +192,21 @@ export default {
       }
     },
     startsData(val) {
-      this.starts = new Date(val).getTime() / 1000
+      console.log(val)
+      if (val) {
+        this.starts = new Date(val).getTime() / 1000
+      } else {
+        this.starts = ''
+      }
       this.filter.regisTime = this.starts + '_' + this.ends
     },
     endsData(val) {
-      this.ends = new Date(val).getTime() / 1000
+      console.log(val)
+      if (val) {
+        this.ends = new Date(val).getTime() / 1000
+      } else {
+        this.ends = ''
+      }
       this.filter.regisTime = this.starts + '_' + this.ends
     }
   },