提交代码

src/assets/css/common.css

@@ -318,4 +318,23 @@ textarea:-ms-input-placeholder {
 }
 .ding-dan .ivu-form {
   width: 100%;
+}
+.ding-dan .ivu-input-wrapper-large .ivu-input-prefix i {
+  font-size: 12px;
+}
+.ding-dan .ivu-input-prefix {
+  width: 20px;
+  height: 36px;
+}
+.ding-dan .ivu-input-with-prefix {
+  padding-left: 20px;
+}
+.ding-dan .ivu-icon-ios-arrow-forward {
+  /* display: none; */
+}
+.ding-dan .shai-icon {
+  /* display: block!important; */
+}
+.ding-dan .ivu-collapse {
+  background: none!important;
 }

src/views/order/components/details.vue

@@ -196,8 +196,8 @@ export default {
             this.orders = r.data
             this.orDetails = r.data.res;
             this.book = r.data.filterData;
-            // if (this.book && this.book.keywords) {// 将对象转为
-            //     this.book.keywords.forEach(e => {
+            // if (this.book && this.book.keywords) {
+            //     this.book.keywords.forEach(e => {// 将对象转为用，分割开的数组
             //         this.arr.push(e.keyword)
             //         this.keyMsg = this.arr.join(",")
             //     });

src/views/order/orderDetail.vue

@@ -43,9 +43,6 @@ export default {
                 this.proStatus = '8'
                 break;
         }
-        // if (str.par) {
-        //     sessionStorage.setItem('info',1)
-        // }
     },
     data () {
         return {

src/views/order/orderList.vue

@@ -7,16 +7,18 @@
         :filter="filter" 
         :sear="sear"
         :filterSear="2"
+        :filterReset="filterReset"
+        :filterType="filterType"
         requestApi="/order/orderList" 
         @loading="load" 
         @emptyFilter="emptyFilter"
         style="background:#fff;padding:10px"
     >
         <template slot="filterTitle">
-            <div style="font-size:18px">高级筛选<Input suffix="md-search" type="text" size="large" v-model="sear.keyword" placeholder="搜索订单编号" clearable class="ser-ipt"/></div>
+            <div class="shai_xuan"><span @click="screened">高级筛选<Icon :class="{'arrowTransform': !flag, 'arrowTransformReturn': flag}" type="ios-arrow-down" /></span><Input suffix="md-search" type="text" size="large" v-model="sear.keyword" placeholder="搜索订单编号" clearable class="ser-ipt"/></div>
             <Divider style="margin:15px 0" />
         </template>
-        <template slot="filterContent">
+        <template slot="filterContent" v-if="flag">
             <Select size="large" placeholder="产品类型" clearable v-model="filter.productType" style="width:100px;margin:0 10px 10px 0">
                 <Option v-for="item in proType" :value="item.v" :key="item.v">{{ item.n }}</Option>
             </Select>
@@ -32,8 +34,24 @@
             <Select size="large" placeholder="付款方式" clearable v-model="filter.payStatus" style="width:100px;margin:0 10px 10px 0">
                 <Option v-for="item in payWay" :value="item.v" :key="item.v">{{ item.n }}</Option>
             </Select>
-            <Input style="width:80px" type="text" size="large" v-model="filter.payMoneyMin" placeholder="最小金额" clearable/>
-            <Input style="width:80px;margin-left:2px;margin-right:10px" type="text" size="large" v-model="filter.payMoneyMax" placeholder="最大金额" clearable/>
+            <Input 
+                type="text" 
+                size="large" 
+                v-model="filter.payMoneyMin" 
+                placeholder="最小金额" 
+                clearable
+                prefix="logo-yen"
+                style="width:90px;height:36px:margin-bottom:10px" 
+            ></Input>
+            <Input 
+                type="text" 
+                size="large" 
+                v-model="filter.payMoneyMax" 
+                placeholder="最大金额" 
+                clearable
+                prefix="logo-yen"
+                style="width:90px;height:36px;margin: 0 10px 10px 2px;" 
+            />
             <DatePicker 
                 type="datetime" 
                 size="large" 
@@ -55,7 +73,7 @@
                 @on-change="handleChange2"
                 @on-ok="confirmed2"
                 @on-open-change="opened2"
-            ></DatePicker>
+            ></DatePicker><br/>
             <Select 
                 size="large" 
                 placeholder="付费类型" 
@@ -81,14 +99,14 @@
                 placeholder="发票开具方" 
                 clearable 
                 v-model="filter.invoiceParty" 
-                style="width:100px;margin:0 10px 10px 0"
+                style="width:110px;margin:0 10px 10px 0"
                 v-show="select3"
             >
                 <Option v-for="item in payWay" :value="item.v" :key="item.v">{{ item.n }}</Option>
-            </Select></br>
+            </Select><br v-show="select1 || select2 || select3"/>
         </template>
-        <template slot="exportData">
-            <Button type="primary" size="large" style="margin: 0 0 10px 10px">导出结果</Button>
+        <template slot="exportData" v-if="flag">
+            <Button type="primary" size="large" @click="orderExport" style="margin: 0 0 10px 10px">导出结果</Button>
         </template>
         <Table 
             size="large" 
@@ -165,6 +183,17 @@ export default {
         }
     },
     methods: {
+        screened () {
+            this.flag = !this.flag
+            if (this.flag) {
+                this.filterType = 1
+                this.filterReset = 1
+            } else {
+                this.filterType = 0
+                this.filterReset = 0
+            }
+            
+        },
         load (val) {
             this.loading = val
         },
@@ -236,6 +265,9 @@ export default {
         refund (code) {
             this.models.tShow = true
             this.models.reCode = code
+        },
+        orderExport () {
+
         },
         subSave () {
             var curTime = new Date().getTime()
@@ -261,6 +293,9 @@ export default {
             select1: false,
             select2: false,
             select3: false,
+            flag: true,
+            filterType: 1,
+            filterReset: 1,
             models: {
                 tShow: false,
                 cause: '',
@@ -490,5 +525,21 @@ export default {
         float: right;
         width: 162px;
     }
+    .shai_xuan {
+        font-size: 18px;
+        span {
+            cursor: pointer;
+        }
+    }
+     .arrowTransform{
+        transition: 0.2s;
+        transform-origin: center;
+        transform: rotateZ(90deg);
+    }
+    .arrowTransformReturn{
+        transition: 0.2s;
+        transform-origin: center;
+        transform: rotateZ(0deg);
+    }
 }
 </style>

src/views/sales/commissionList.vue

@@ -114,7 +114,7 @@ export default {
         confirmed1 () {
             if (this.filter.orderTimeMin && this.filter.orderTimeMax) {
                 if (this.filter.orderTimeMin > this.filter.orderTimeMax) {
-                    this.dataVal1 = ''
+                    this.dataValue1 = ''
                     this.filter.orderTimeMin = ''
                     this.$Notice.warning({
                         title: '警告提示',
@@ -127,7 +127,7 @@ export default {
         confirmed2 () {
             if (this.filter.orderTimeMin && this.filter.orderTimeMax) {
                 if (this.filter.orderTimeMin > this.filter.orderTimeMax) {
-                    this.dataVal2 = ''
+                    this.dataValue2 = ''
                     this.filter.orderTimeMax = ''
                     this.$Notice.warning({
                         title: '警告提示',

src/views/sales/components/details.vue

@@ -126,11 +126,6 @@ export default {
                 this.settleDet = r.data;
             }).get()
         }
-        // if (rout.deType == 'tixian' && rout.par) {
-        //     sessionStorage.setItem('info',2)
-        // } else if (rout.deType == 'jiesuan' && rout.par) {
-        //     sessionStorage.setItem('info',3)
-        // }
     },
     data () {
         return {

src/views/sales/partnerDetail.vue

@@ -6,7 +6,8 @@
                 <Card>
                     <div slot="title" class="top-tit">
                         <div class="avatr">
-                            <img :src="parDetail.headImg" onerror="../../assets/images/login_logo.png">
+                            <img :src="parDetail.headImg" v-if="parDetail.headImg">
+                            <img src="../../assets/images/moren.png" v-else>
                         </div>
                         <div class="names">{{parDetail.name}}</div>
                         <div class="msg1"><span>{{parDetail.phone}}</span></div>
@@ -134,10 +135,6 @@ import { ChangeDate } from '../../assets/js/date'
 export default {
     created () {
         let rout = this.$route.query
-        // let sec = sessionStorage.getItem('info')
-        // if (sec) {
-        //     this.infor = 3
-        // }
         this.$request('/sales/partnerList/partnerDetail').data({// 基本信息
             uid: rout.uid,
             id: rout.id
@@ -185,9 +182,6 @@ export default {
         },
         tabClick(index) {
             this.infor = index
-            // if (index != 3) {
-            //     sessionStorage.removeItem('info')
-            // }
         },
         fruit() {
             this.preview = true

src/views/sales/settleList.vue

@@ -5,14 +5,47 @@
         ref="tableLists" 
         v-model="list" 
         :filter="filter" 
-        :filterType="2" 
-        :filterReset="0" 
+        :sear="sear"
+        :filterSear="2" 
+        @emptyFilter="emptyFilter"
         requestApi="/sales/settleList" 
         style="background:#fff;padding:10px"
         @loading="load"
     >
+      <template slot="filterContent">
+          <FormItem label="可提现金额：" :label-width="90">
+            <Input style="width: 73px" type="text" size="large" v-model="filter.cashMoneyMin" placeholder="最小金额" clearable/>
+            <Input style="width: 73px;margin-left: 2px" type="text" size="large" v-model="filter.cashMoneyMax" placeholder="最大金额" clearable/>
+        </FormItem>
+        <FormItem label="结算时间：" :label-width="70" style="margin-right: 30px">
+            <DatePicker 
+                type="datetime" 
+                size="large"
+                v-model="dataVals1"
+                placeholder="起始时间" 
+                format="yyyy-MM-dd HH:mm:ss"
+                style="width: 172px"
+                :options="options1"
+                @on-change="handleChange1"
+                @on-ok="confirmed1"
+                @on-open-change="opened1"
+            ></DatePicker>
+            <DatePicker 
+                type="datetime" 
+                size="large"
+                v-model="dataVals2"
+                placeholder="截止时间" 
+                format="yyyy-MM-dd HH:mm:ss"
+                style="width:172px; margin-left:2px"
+                :options="options2"
+                @on-change="handleChange2"
+                @on-ok="confirmed2"
+                @on-open-change="opened2"
+            ></DatePicker>
+        </FormItem>
+      </template>
       <template slot="filterRight">
-          <Input suffix="md-search" type="text" size="large" v-model="filter.keyword" placeholder="搜索单号或手机号" clearable class="ser-ipt"/>
+          <Input suffix="md-search" type="text" size="large" v-model="sear.keyword" placeholder="搜索单号或手机号" clearable class="ser-ipt"/>
       </template>
       <Table 
         size="large"
@@ -23,7 +56,6 @@
         :data="list.lists" 
         stripe
         @on-row-click="rowClick"
-        style="margin-top:10px"
       >
       </Table>
       <template slot="options">
@@ -33,6 +65,7 @@
   </div>
 </template>
 <script>
+import { ChangeDate } from '../../assets/js/date'
 export default {
     methods: {
         load (val) {
@@ -41,6 +74,63 @@ export default {
         rowClick (data) {
             const news = this.$router.resolve({path: '/sales/settleList/settleDetail', query:{id:data.id, uid:data.uid, deType:'jiesuan'}})
             window.open(news.href,'_blank')
+        },
+        emptyFilter (val) {
+            if (val) {
+                this.filter.keyword = ''
+                this.filter.cashMoneyMin = ''
+                this.filter.cashMoneyMax = ''
+                this.filter.cashTimeStart = ''
+                this.filter.cashTimeEnd = ''
+                this.dataVals1 = ''
+                this.dataVals2 = ''
+            }
+        },
+        handleChange1 (date) {
+            this.filter.cashTimeStart = date
+        },
+        handleChange2 (date) {
+            this.filter.cashTimeEnd = date
+        },
+        confirmed1 () {
+            if (this.filter.cashTimeStart && this.filter.cashTimeEnd) {
+                if (this.filter.cashTimeStart > this.filter.cashTimeEnd) {
+                    this.dataVals1 = ''
+                    this.filter.cashTimeStart = ''
+                    this.$Notice.warning({
+                        title: '警告提示',
+                        desc: "起始时间应小于截止时间",
+                        duration: 5
+                    })
+                }
+            }
+        },
+        confirmed2 () {
+            if (this.filter.cashTimeStart && this.filter.cashTimeEnd) {
+                if (this.filter.cashTimeStart > this.filter.cashTimeEnd) {
+                    this.dataVals2 = ''
+                    this.filter.cashTimeEnd = ''
+                    this.$Notice.warning({
+                        title: '警告提示',
+                        desc: "截止时间应大于起始时间",
+                        duration: 5
+                    })
+                }
+            }
+        },
+        opened1 (val) {
+            if (val) {
+                return
+            } else {
+                this.confirmed1()
+            }
+        },
+        opened2 (val) {
+            if (val) {
+                return
+            } else {
+                this.confirmed2()
+            }
         }
     },
     data () {
@@ -48,9 +138,31 @@ export default {
             lis: '',
             loading: false,
             requestType: [],
+            dataVals1: '',
+            dataVals2: '',
             filter: {
-                keyword: '',
-                type: ''
+                // keyword: '',
+                cashMoneyMin: '',
+                cashMoneyMax: '',
+                cashTimeStart: '',
+                cashTimeEnd: ''
+            },
+            sear: {
+                keyword: ''
+            },
+            options1: {
+                disabledDate: (function(date) {
+                    var timeEnd = ChangeDate(this.filter.cashTimeEnd)
+                    var p_time = new Date(timeEnd).getTime()
+                    return date && date.valueOf() > p_time;
+                }).bind(this)
+            },
+            options2: {
+                disabledDate: (function(date) {
+                    var timeStart = ChangeDate(this.filter.cashTimeStart)
+                    var p_time = new Date(timeStart).getTime()
+                    return date && date.valueOf() < p_time;
+                }).bind(this)
             },
             columns: [
                 {

src/views/sales/withdrawList.vue

@@ -71,7 +71,7 @@
           <div>{{row.type == '1'?'支付宝':'对公转账'}}</div>
         </template>
         <template slot-scope="{ row }" slot="_status">
-          <div style="color:#f4516c" :class="{casActive:row.cashout_status == 1}">{{row.cashout_status | casStatus}}</div>
+          <div style="color:#f4516c" :class="{casActive:row.cashout_status == 1}">{{row.cashout_status | casStat}}</div>
         </template>
         <template slot-scope="{ row }" slot="op">
           <Button  
@@ -117,16 +117,16 @@ export default {
                 this.dataVal2 = ''
             }
         },
-        reload () {
+        reload() {
             this.$refs.tableLists.reload(true)
         },
-        handleChange1 (date) {
+        handleChange1(date) {
             this.filter.cashStartTime = date
         },
-        handleChange2 (date) {
+        handleChange2(date) {
             this.filter.cashEndTime = date
         },
-        confirmed1 () {
+        confirmed1() {
             if (this.filter.cashStartTime && this.filter.cashEndTime) {
                 if (this.filter.cashStartTime > this.filter.cashEndTime) {
                     this.dataVal1 = ''
@@ -139,7 +139,7 @@ export default {
                 }
             }
         },
-        confirmed2 () {
+        confirmed2() {
             if (this.filter.cashStartTime && this.filter.cashEndTime) {
                 if (this.filter.cashStartTime > this.filter.cashEndTime) {
                     this.dataVal2 = ''
@@ -169,15 +169,22 @@ export default {
         seleChange (selection) {
             this.seleData = selection
         },
+        sortNum (a, b) {
+            return a - b
+        },
         exportd() {
-            let arr = []
+            let arr = [], atr = []
             this.seleData.forEach(v => {
-                if (v.cashout_status == 1) {
+                atr.push(v.cashout_status)
+            })
+            atr.sort(this.sortNum) // 排序
+            for(let i in atr) {
+                if (atr[i] == 1) {
                     this.casStatus = false
                 } else {
                     this.casStatus = true
                 }
-            })
+            }
             if (this.seleData.length !=0 && this.casStatus) {
                 this.$Modal.confirm({
                     title: "确定导出结果吗？",
@@ -219,14 +226,18 @@ export default {
             })
         },
         batchFinish () {
-            let arr = []
+            let arr = [], atr = []
             this.seleData.forEach(v => {
-                if (v.cashout_status == 1) {
+                atr.push(v.cashout_status)
+            })
+            atr.sort(this.sortNum)
+            for(let i in atr) {
+                if (atr[i] == 1) {
                     this.casStatus = false
                 } else {
                     this.casStatus = true
                 }
-            })
+            }
             if (this.seleData.length !=0 && this.casStatus) {
                 this.$Modal.confirm({
                     title: "确定要批量完成所选内容",
@@ -249,7 +260,7 @@ export default {
         }
     },
     filters: {
-        casStatus (val) {
+        casStat (val) {
             if (val == -1) {
                 return "失败"
             } else if (val == 0) {

src/views/system/auth.vue

@@ -11,7 +11,7 @@
         >
             <template slot="filterContent">
                 <FormItem>
-                    <Input type="text" size="large" v-model="filter.keyword" placeholder="搜索关键词"/>
+                    <Input type="text" size="large" suffix="md-search" v-model="filter.keyword" placeholder="搜索关键词"/>
                 </FormItem>
             </template>
             <template slot="filterRight">

src/views/system/request.vue

@@ -11,7 +11,7 @@
     >
       <template slot="filterContent">
         <FormItem>
-          <Input type="text" size="large" v-model="filter.keyword" placeholder="搜索关键词" clearable/>
+          <Input type="text" size="large" suffix="md-search" v-model="filter.keyword" placeholder="搜索关键词" clearable/>
         </FormItem>
         <FormItem>
           <Select size="large" placeholder="搜索类型" clearable v-model="filter.type" style="width:162px">

src/views/system/user.vue

@@ -11,7 +11,7 @@
         >
             <template slot="filterContent">
                 <FormItem>
-                    <Input type="text" size="large" v-model="filter.keyword" placeholder="搜索关键词" clearable/>
+                    <Input type="text" size="large" suffix="md-search" v-model="filter.keyword" placeholder="搜索关键词" clearable/>
                 </FormItem>
             </template>
             <template slot="filterRight">

src/views/system/userGroup.vue

@@ -12,7 +12,7 @@
         >
             <template slot="filterContent">
                 <FormItem>
-                    <Input type="text" size="large" v-model="filter.keyword" placeholder="搜索关键词" clearable/>
+                    <Input type="text" size="large" suffix="md-search" v-model="filter.keyword" placeholder="搜索关键词" clearable/>
                 </FormItem>
             </template>
             <template slot="filterRight">

vue.config.js

@@ -2,19 +2,5 @@ module.exports = {
   publicPath: '/',
   outputDir: "dist",
   productionSourceMap: false,
-  // devServer: {
-  //   port: '8080',
-  //   open: true,
-  //   disableHostCheck: true,
-    // proxy: {
-    //   '/': {
-  //       target: 'http://kf-qmx-test.jianyu360.cn',
-  //       changeOrigin: true,
-  //       ws: false,
-  //       pathRewrite: {
-  //         '^/': ''
-  //       }
-  //     }
-  //   }
-  // }
+  // devServer: {}
 }