Ver código fonte

大牌点餐

wenjie 9 meses atrás
pai
commit
89b4fed426

+ 3 - 3
src/utils/config.js

@@ -2,14 +2,14 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2024-01-05 16:08:18
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-08-23 17:51:11
+ * @LastEditTime: 2024-08-26 16:01:28
  * @FilePath: \admin-manage\src\utils\config.js
  * @Description: 124234
  * 
  * Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. 
  */
-const BASE_URL = 'https://api.zonelife.cn/';
-// const BASE_URL = 'https://api.dev.zonelife.cn/';
+// const BASE_URL = 'https://api.zonelife.cn/';
+const BASE_URL = 'https://api.dev.zonelife.cn/';
 // http://192.168.110.226:9002
 
 

+ 2 - 2
src/views/operationManage/orderManage/index.vue

@@ -230,8 +230,8 @@ export default {
 				if(val.refundLog&&val.refundLog.refund == 'REFUSAL_REFUND'&&!val.change){
 					return '拒绝退款'
 				}
-                else if(val.jobFlowMap == 'Hotel'&&JSON.parse(val.extend).orderInfo){
-					return JSON.parse(val.extend).orderInfo.orderStatus
+                else if(val.jobFlowMap == 'Hotel'&&val.extend.orderInfo){
+					return val.extend.orderInfo.orderStatus
 				}
 				else if(val.goodsState == 'APPLY_REFUND'){
 					return '退款审核中'

+ 2 - 2
src/views/operationManage/orderManage/list.vue

@@ -311,8 +311,8 @@ export default {
 				if(val.refundLog&&val.refundLog.refund == 'REFUSAL_REFUND'&&!val.change){
 					return '拒绝退款'
 				}
-                else if(val.jobFlowMap == 'Hotel'&&JSON.parse(val.extend).orderInfo){
-					return JSON.parse(val.extend).orderInfo.orderStatus
+                else if(val.jobFlowMap == 'Hotel'&&val.extend.orderInfo){
+					return val.extend.orderInfo.orderStatus
 				}
 				else if(val.goodsState == 'APPLY_REFUND'){
 					return '退款审核中'

+ 5 - 5
src/views/operationManage/orderManage/orderDetail.vue

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-11-01 14:21:43
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-07-29 15:58:58
+ * @LastEditTime: 2024-08-26 16:07:32
  * @FilePath: \admin-manage\src\views\operationManage\orderManage\orderDetail.vue
  * @Description:
  *
@@ -336,8 +336,8 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
 				if(val.refundLog&&val.refundLog.refund == 'REFUSAL_REFUND'&&!val.change){
 					return '拒绝退款'
 				}
-                else if(val.jobFlowMap == 'Hotel'&&JSON.parse(val.extend).orderInfo){
-					return JSON.parse(val.extend).orderInfo.orderStatus
+                else if(val.jobFlowMap == 'Hotel'&&val.extend.orderInfo){
+					return val.extend.orderInfo.orderStatus
 				}
 				else if(val.goodsState == 'APPLY_REFUND'){
 					return '退款审核中'
@@ -418,9 +418,9 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
             },
              formatData(row){
                 if(row.goodsList[0].jobFlowMap == 'XiaoJu'){
-                    if(JSON.parse(row.goodsList[0].extend).hasOwnProperty('notifyOrderInfo')){
+                    if(row.goodsList[0].extend.hasOwnProperty('notifyOrderInfo')){
                         return {
-                            paymentTime:JSON.parse(row.goodsList[0].extend).notifyOrderInfo.payTime,
+                            paymentTime:row.goodsList[0].extend.notifyOrderInfo.payTime,
                             paymentWay:'-',
                             price:(row.goodsList[0].goodsInfo.storePrice/100).toFixed(2) +'/L',
                             goodsName:row.goodsList[0].goodsInfo.goodsName,

+ 5 - 5
src/views/operationManage/orderManage/payDetail.vue

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-11-01 14:21:43
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-07-29 16:02:03
+ * @LastEditTime: 2024-08-26 16:08:54
  * @FilePath: \admin-manage\src\views\operationManage\orderManage\payDetail.vue
  * @Description:
  *
@@ -154,8 +154,8 @@ export default {
 				if(val.refundLog&&val.refundLog.refund == 'REFUSAL_REFUND'&&!val.change){
 					return '拒绝退款'
 				}
-        else if(val.jobFlowMap == 'Hotel'&&JSON.parse(val.extend).orderInfo){
-					return JSON.parse(val.extend).orderInfo.orderStatus
+        else if(val.jobFlowMap == 'Hotel'&&val.extend.orderInfo){
+					return val.extend.orderInfo.orderStatus
 				}
 				else if(val.goodsState == 'APPLY_REFUND'){
 					return '退款审核中'
@@ -194,9 +194,9 @@ export default {
   methods: {
     formatData(row){
         if(row.goodsList[0].jobFlowMap == 'XiaoJu'){
-          if(JSON.parse(row.goodsList[0].extend).hasOwnProperty('notifyOrderInfo')){
+          if(row.goodsList[0].extend.hasOwnProperty('notifyOrderInfo')){
             return {
-              paymentTime:JSON.parse(row.goodsList[0].extend).notifyOrderInfo.payTime,
+              paymentTime:row.goodsList[0].extend.notifyOrderInfo.payTime,
               paymentWay:'-'
             }
           }else{