11

.env.development

@@ -11,14 +11,14 @@ ENV = 'development'
 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
 # VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-VITE_ADMIN_PROXY_PATH = http://192.168.101.132:9999/ # 邓-本地
+VITE_ADMIN_PROXY_PATH = http://192.168.101.139:9999/ # 邓-本地
 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
 
 # 图片访问基础地址
 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
 # VITE_IMAGE_BASE_PATH = http://localhost:9999
-VITE_IMAGE_BASE_PATH = http://192.168.101.132:9999 # 邓-本地
+VITE_IMAGE_BASE_PATH = http://192.168.101.139:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上
 
 # 代码生成服务地址

src/views/hard/hard-order/index.vue

@@ -240,7 +240,7 @@
 								编辑
 							</el-button>
 							<el-button
-								v-if="!row.payRefundId && row.orderType !== '5'"
+								v-if="!row.payRefundId && row.orderType !== '5' && !['5', '6'].includes(row.payType)"
 								icon="stamp"
 								text
 								type="primary"
@@ -277,6 +277,7 @@ import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
 import { ElLoading, TableColumnCtx } from "element-plus"
 import { VNode } from "vue"
+import { ro } from "element-plus/es/locale"
 
 const { push } = useRouter()