Merge branch 'master' of http://gogs.gzzzyd.com/pangqijun/vending-machine-admin into dev

# Conflicts:
#	vue.config.js

src/views/finance/aftersales.vue

@@ -30,7 +30,7 @@
 
         <template slot-scope="scope" slot="menu">
             <el-button
-                    v-if="scope.row.refundState == 0 && scope.row.status == 3"
+                    v-if="scope.row.refundState == 0 && scope.row.status == 0"
                     type="text"
                     size="small"
                     @click="openRefundApplyBox(scope.row)"
@@ -44,7 +44,7 @@
                        :data="tableData"
                        ref="crudGoods">
                 <template slot="grouponPrice" slot-scope="scope" >
-                    <avue-input-number precision="2" v-model="scope.row.grouponPrice"></avue-input-number>
+                    <avue-input-number precision="2" v-model="scope.order.paymentAmount"></avue-input-number>
                 </template>
             </avue-crud>
         </template>
@@ -150,6 +150,27 @@
                 trigger: "blur"
               }]
             },
+
+              {
+                  label: "补充描述",
+                  prop: "afterSaleDescribe",
+                  rules: [{
+                      required: true,
+                      message: "请输入售后原因",
+                      trigger: "blur"
+                  }]
+              },
+
+              {
+                  label: "补充图片",
+                  prop: "imgList",
+                  type: 'upload',
+                  dataType: 'array',
+                  listType: 'picture-card',
+                  addDisplay: false,
+                  editDisplay: false,
+                  span: 24,
+              },
             {
               label: "售后状态",
               prop: "status",
@@ -177,7 +198,6 @@
               {
                   label: "订单编号",
                   prop: "orderNo",
-                  hide: true
               },
               {
                   label: "退款商品",
@@ -202,7 +222,7 @@
               column: [
                   {
                       label: '商品图片',
-                      prop: 'goodsImage',
+                      prop: 'goodsImg',
                       type: 'img',
                   },
                   {
@@ -309,7 +329,7 @@
         if (["edit", "view"].includes(type)) {
           getDetail(this.form.id).then(res => {
             this.form = res.data.data;
-            this.tableData = res.data.data.goodsList;
+            this.tableData = res.data.data.afterSalesGoodsList;
           });
         }
         done();
@@ -345,7 +365,11 @@
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
+          data.records.forEach(item=>{
+              item.imgList = JSON.parse(item.imgListStr)
+          })
           this.data = data.records;
+            console.log(this.data)
           this.loading = false;
           this.selectionClear();
         });