From e047b29738d649bbf7598f28cee3559077268e68 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Thu, 18 Apr 2024 11:07:43 +0800
Subject: [PATCH] add

---
 src/views/order/index.vue                          | 2 +-
 src/views/systemForm/setSystem/modifyStoreInfo.vue | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 9425ed1..f41b367 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -223,7 +223,7 @@
             <el-button v-if="scope.row.paid === 0 && scope.row.is_del===0 && scope.row.activity_type != 2" type="text" size="small" @click="edit(scope.row.order_id)">编辑</el-button>
             <el-button v-if="(scope.row.order_type == 0 || scope.row.order_type == 2) && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" @click="send(scope.row,scope.row.order_id)">发送货</el-button>
             <el-button v-if="scope.row.is_del !== 0" type="text" size="small" @click.native="handleDelete(scope.row, scope.$index)">删除</el-button>
-            <el-button :disabled='!!scope.row.refund_open' v-if="(scope.row.paid ==1 && scope.row.status !=-1)" type="text" size="small" @click="onOrderOpenRefund(scope.row.order_id)">开启售后</el-button>
+            <el-button :disabled='!!scope.row.refund_open' v-if="(scope.row.paid ==1 && scope.row.status !=-1 && scope.row.status !=0)" type="text" size="small" @click="onOrderOpenRefund(scope.row.order_id)">开启售后</el-button>
             <el-button v-if="scope.row.order_type == 1 && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" @click.native="orderCancellation(scope.row.verify_code)">去核销</el-button>
           </template>
         </el-table-column>
diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index c3002a7..7eec935 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -457,7 +457,7 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item label="客服电话：" prop="service_phone">
-                  <el-input v-model="merData.service_phone" type="number" />
+                  <el-input v-model="merData.service_phone" type="text" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -572,7 +572,8 @@ export default {
   components: { Maps, VueQr },
   data() {
     var checkPhone = (rule, value, callback) => {
-      if (value === '') {
+      console.log(value)
+      if (!value) {
         callback(new Error('请输入客服电话'))
       } else {
         let regPone = null
@@ -673,6 +674,7 @@ export default {
         mer_take_day: [],
         mer_take_location: '',
         id: 0,
+        service_phone:'',
         mer_take_status: 0 }, // 默认数据
       myHeaders: { 'X-Token': getToken() },
       uploadedQualifications: [], // 资质图片列表