From 4aa339363610a18da009b372adaa5c5f2c35371b Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Thu, 21 Aug 2025 18:26:43 +0800 Subject: [PATCH] fix market --- .env.development | 4 +-- src/views/consume/gold/coinConsumeDetail.vue | 16 +++++---- src/views/permissions/rolePermission.vue | 2 +- src/views/recharge/gold/coinRechargeDetail.vue | 46 ++++++++++++++++++-------- 4 files changed, 45 insertions(+), 23 deletions(-) diff --git a/.env.development b/.env.development index 29cd5a3..b59f17b 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' + VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' # 测试环境 # VITE_API_BASE='http://54.255.212.181:10704/' # 正式环境 @@ -6,7 +6,7 @@ VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload # VITE_API_BASE='http://192.168.9.28:8081/' # sunjiabei - # VITE_API_BASE='http://192.168.9.135:8081/' +# VITE_API_BASE='http://192.168.9.28:8081/' # VITE_API_BASE='http://192.168.5.92:8081/' # zhangyong # VITE_API_BASE='http://192.168.3.83:8081/' diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue index f54a2d6..d2127e9 100644 --- a/src/views/consume/gold/coinConsumeDetail.vue +++ b/src/views/consume/gold/coinConsumeDetail.vue @@ -365,11 +365,15 @@ const getGoods = async function () { url: '/general/goods', data: {} }) - // 将响应结果存储到响应式数据中 - console.log('请求成功product', result) - // 存储全部数据 - goods.value = result.data - console.log('goods 数据', goods.value) // 修改日志输出 + // 验证数据格式 + if (result.data && Array.isArray(result.data)) { + goods.value = result.data + console.log('商品数据加载成功', goods.value) + } else { + console.error('返回数据格式不正确', result) + // 可以在这里设置默认值或显示错误消息 + goods.value = [] + } } catch (error) { console.log('请求失败', error) // 在这里可以处理错误逻辑，比如显示错误提示等 @@ -570,7 +574,7 @@ const getMarket = async function () { 商品名称： - + diff --git a/src/views/permissions/rolePermission.vue b/src/views/permissions/rolePermission.vue index fced138..8f1d657 100644 --- a/src/views/permissions/rolePermission.vue +++ b/src/views/permissions/rolePermission.vue @@ -702,7 +702,7 @@ onMounted(async function () { :value="item.value"> - + (此地区无实际意义，仅用于各分部负责人查看其地区角色) diff --git a/src/views/recharge/gold/coinRechargeDetail.vue b/src/views/recharge/gold/coinRechargeDetail.vue index a41b856..022c484 100644 --- a/src/views/recharge/gold/coinRechargeDetail.vue +++ b/src/views/recharge/gold/coinRechargeDetail.vue @@ -6,7 +6,7 @@ import API from '@/util/http.js' import { reverseMarketMapping } from '@/utils/marketMap.js'; import dayjs from "dayjs"; -//新增员工数数据复选框，默认no勾选 +//新增员工数数据复选框，默认不勾选 const showEmployeeData = ref(false) const trimJwCode = () => { @@ -332,13 +332,11 @@ const get = async function (val) { return } } - console.log("showEmployeeData.value",showEmployeeData.value) - const result = await API({ url: '/recharge/selectBy', data: { ...getObj.value, - rechargeUser: { ...rechargeUser.value, flag: showEmployeeData.value ? '0' : '1'}//新增flag参数 + rechargeUser: { ...rechargeUser.value, flag: showEmployeeData.value ? 1 : 0 }//新增flag参数 } }) // 复制一份 rechargeUser.value 并移除排序字段和排序方式 @@ -588,17 +586,19 @@ const getTagText = (state) => { - + @@ -674,7 +678,7 @@ const getTagText = (state) => { - + @@ -693,6 +697,8 @@ const getTagText = (state) => { @current-change="handleCurrentChange"> + + @@ -730,7 +736,19 @@ const getTagText = (state) => { display: flex; } +.status { + display: flex; +} + +.head-card { + display: flex; +} + .head-card-element { margin-right: 20px; } + +.head-card-btn { + margin-left: auto; +} \ No newline at end of file