Merge branch 'dev'

src/views/market/orders/index.vue

@@ -11,20 +11,26 @@
           <el-form-item>
             输入搜索：<el-input v-model="orders.productName" placeholder="商品名称" style="width: 180px;margin-right: 50px"></el-input>
             订单编号：<el-input v-model="orders.ordersNum" placeholder="编号" style="width: 180px;margin-right: 50px"></el-input>
-            <el-col :span="8">
+            订单款项状态：
-              <el-date-picker v-model="orders.startDate" type="date" placeholder="选择开始时间"></el-date-picker>
+            <el-select v-model="orders.ordersState" placeholder="请选择状态" style="margin-right: 30px" clearable>
-              <el-col :span="8">
+              <el-option v-for="item in options"
-              <el-date-picker v-model="orders.endDate" type="date" placeholder="选择结束时间"></el-date-picker>
+                         :key="item.value"
-            </el-col>
+                         :label="item.label"
-            订单款项状态：<el-select v-model="orders.ordersState" placeholder="请选择状态" style="margin-right: 30px" clearable>
+                         :value="item.value">
-            <el-option v-for="item in orders.ordersState" :label="item.label" :value="item.value" :key="item.value"></el-option>
+              </el-option>
             </el-select>
+            <br/> <br/>
+            选择时间:
+            <el-date-picker v-model="orders.startDate" type="date" placeholder="开始时间" />
+            -----
+            <el-date-picker v-model="orders.endDate" type="date" placeholder="结束时间"/>
+
           </el-form-item>
         </el-form>
       </div>
     </el-card>
 
-
+<br>
     <el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 10px">
       <div slot="header" class="clearfix">
         <span>数据列表</span>
@@ -127,10 +133,31 @@ export default {
       },
       arr:[],
       type:[],
+
       Cascader:{ expandTrigger:'hover',value:'id',label:'typeName',children:'parentPOS' },
       typeId:[],
       startDate: null,
       endDate: null,
+
+      options: [{
+        value: ' ',
+        label: '全选'
+      }, {
+        value: '0',
+        label: '待支付'
+      }, {
+        value: '1',
+        label: '已付款'
+      }, {
+        value: '2',
+        label: '未付款'
+      }, {
+        value: '3',
+        label: '售后中(申请退款) '
+      } ,{
+        value: '4',
+        label: '已退款 '
+      }]
     };
   },
   //计算属性 类似于data概念",
@@ -140,7 +167,6 @@ export default {
   //方法集合",
   methods: {
 
-    },
     // 删除
     handleDelete(orders){
       handleDelete(orders.id).then(
@@ -190,26 +216,28 @@ export default {
     },
     // 添加跳转路径
     add(){
-      this.$router.push('index')
+      this.$router.push('add')
     },
     // 多选框
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
     //商品列表
-  selectList(){
+    selectList() {
       selectList(this.orders).then(
         res => {
           console.log(res)
-          this.arr=res.data.list
+          this.arr = res.data.list
-          this.orders.total=res.data.total
+          this.orders.total = res.data.total
         }
       )
+    }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
     // this.diGui()
     this.selectList()
+    this.selected = this.options[0].value
   },
   //生命周期 - 挂载完成（可以访问DOM元素）",
   mounted() {