## v1.3.1 更新列表

1. 【修复】申请退款后积分等操作可能出现错误的问题
	2. 【修复】拼团支付可能出现支付错误的问题
	3. 【修复】退款申请后的订单流程优化和积分赠送的问题
	4. 【修复】回收站中的商品无法恢复的问题
	5. 【修复】一号通短信查询记录不完整的问题
	6. 【修复】用户管理批量加分组，标签的问题
	7. 【修复】积分日志搜索显示有误的问题
	8. 【修复】手动发送优惠券可能会出错的问题
	9. 【修复】核销订单创建在某种条件下会出错的问题
	10. 【修复】移动端商品详情，购物车等样式兼容问题
	11. 【修复】业务流程性的优化

admin/src/views/order/index.vue

@@ -100,7 +100,7 @@
           <template slot-scope="scope">
             <div v-if=" scope.row.productList && scope.row.productList.length">
               <div v-for="(val, i ) in scope.row.productList" :key="i" class="tabBox acea-row row-middle" style="flex-wrap: inherit;">
-                <div class="demo-image__preview">
+                <div class="demo-image__preview mr10">
                   <el-image
                     :src="val.info.productInfo.image"
                     :preview-src-list="[val.info.productInfo.image]"
@@ -173,8 +173,10 @@
                 <el-dropdown-item @click.native="onOrderLog(scope.row.id)">订单记录</el-dropdown-item>
                 <el-dropdown-item @click.native="onOrderMark(scope.row)">订单备注</el-dropdown-item>
                 <el-dropdown-item v-show="scope.row.statusStr.key === 'refunding'" @click.native="onOrderRefuse(scope.row)">拒绝退款</el-dropdown-item>
-                <el-dropdown-item v-show="scope.row.statusStr.key !== 'refunded' && ((parseFloat(scope.row.payPrice) >= parseFloat(scope.row.refundPrice) || (scope.row.payPrice == 0 && [0,1].indexOf(scope.row.refundStatus) !== -1)))" @click.native="onOrderRefund(scope.row)">立即退款</el-dropdown-item>
-                <el-dropdown-item @click.native="handleDelete(scope.row, scope.$index)">删除订单</el-dropdown-item>
+                <!--(scope.row.payPrice == 0 && [0,1].indexOf(scope.row.refundStatus) !== -1))-->
+                <!--&& (parseFloat(scope.row.payPrice) >= parseFloat(scope.row.refundPrice))-->
+                <el-dropdown-item v-show="((scope.row.statusStr.key !== 'refunded' && scope.row.statusStr.key !== 'unPaid') && (parseFloat(scope.row.payPrice) >= parseFloat(scope.row.refundPrice))) || (scope.row.payPrice == 0 && [0,1].indexOf(scope.row.refundStatus) !== -1)" @click.native="onOrderRefund(scope.row)">立即退款</el-dropdown-item>
+                <el-dropdown-item v-show="scope.row.statusStr.key === 'deleted'" @click.native="handleDelete(scope.row, scope.$index)">删除订单</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -204,6 +206,7 @@
         :is-create="isCreate"
         :edit-data="editData"
         @submit="handlerSubmit"
+        @resetForm="resetForm"
       />
     </el-dialog>
 
@@ -283,6 +286,7 @@
         :is-create="1"
         :edit-data="refundData"
         @submit="refundhandlerSubmit"
+        v-if="refundVisible"
         @resetForm="resetFormRefundhandler"
       />
     </el-dialog>
@@ -297,7 +301,6 @@
   import orderSend from './orderSend'
   import { storeStaffListApi } from '@/api/storePoint'
   import Cookies from 'js-cookie'
-  import { fromList } from '@/utils/constants.js'
   import { isWriteOff } from "@/utils";
   export default {
     name: 'orderlistDetails',
@@ -342,7 +345,7 @@
           },
           orderChartType: {},
           timeVal: [],
-          fromList: fromList,
+          fromList: this.$constants.fromList,
           selectionList: [],
           ids: '',
           orderids: '',
@@ -368,7 +371,6 @@
         this.$modalSure('核销订单吗').then(() => {
           writeUpdateApi(row.verifyCode).then(() => {
             this.$message.success('核销成功')
-            this.tableFrom.status = 'toBeWrittenOff'
             this.tableFrom.page = 1
             this.getList()
           })
@@ -584,11 +586,10 @@
     font-size: 12px;
   }
   .tabBox_tit {
-    /*width: 60%;*/
     font-size: 12px !important;
-    margin: 0 2px 0 10px;
+    /*margin: 0 2px 0 10px;*/
     letter-spacing: 1px;
-    padding: 5px 0;
+    /*padding: 5px 0;*/
     box-sizing: border-box;
   }
 </style>