修改订单页面

src/views/order/order/index.vue

@@ -94,7 +94,7 @@ export default {
         {value: '',label: '全部'},
       ],
       stateList:[
-        {value:"",label:"全部"},
+        {value:null,label:"全部"},
         {value:"0",label:"创建未校验"},
         {value:"1",label:"未支付"},
         {value:"2",label:"已支付"},

src/views/order/refund/index.vue

@@ -20,9 +20,9 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" >
+      <!-- <el-form-item label="创建时间" >
         <el-date-picker v-model="createdTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" style="width:230px"></el-date-picker>        
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="付款时间">
         <el-date-picker v-model="payTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" style="width:230px"></el-date-picker>
       </el-form-item>
@@ -87,21 +87,23 @@ export default {
         {value: '',label: '全部'},
       ],
       stateList:[
-        {value:"",label:"创建未校验"},
-        {value:"0",label:"全部"},
+        {value:null,label:"全部"},
+        {value:"0",label:"创建未校验"},
         {value:"1",label:"未支付"},
         {value:"2",label:"已支付"},
         {value:"3",label:"支付制作中"},
         {value:"4",label:"制作完成未取"},
         {value:"5",label:"取餐中"},
         {value:"6",label:"正常完成"},
-        {value:"7",label:"未支付取消"},
-        {value:"8",label:"支付后制作前取消"},
-        {value:"9",label:"制作中取消"},
-        {value:"10",label:"制作完成取消"},
-        {value:"11",label:"已退款"},
-        {value:"12",label:"部分退款"},
-        {value:"13",label:"待取超时"},
+        {value:"7",label:"待取超时"},
+        {value:"8",label:"未支付取消"},
+        {value:"9",label:"支付后制作前取消"},
+        {value:"10",label:"制作中取消"},
+        {value:"11",label:"制作完成取消"},
+        {value:"12",label:"退款中"},        
+        {value:"13",label:"退款失败"},
+        {value:"14",label:"部分退款"},
+        {value:"15",label:"已退款"},
         {value:"50",label:"其他人工干预状态"},
       ],  
       piovince,
@@ -143,6 +145,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getShopList();
   },
   methods: {
     getProvince(province){