diff --git a/.env.development b/.env.development index f289417..3b5ebee 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,3 @@ -# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' +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.21:8081/' -VITE_API_BASE='http://18.143.76.3:10704/' diff --git a/.env.production b/.env.production index 332ab80..94b830f 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ -# VITE_API_BASE='https://hwjb.homilychart.com/prod' -VITE_API_BASE='http://192.168.8.246:8081/' +VITE_API_BASE='https://hwjb.homilychart.com/prod' +# VITE_API_BASE='http://192.168.8.246:8081/' VITE_UPLOAD_URL=https://api.homilychart.com/hljw/api/aws/upload diff --git a/.env.test b/.env.test index 3ecc103..9605d97 100644 --- a/.env.test +++ b/.env.test @@ -1,5 +1,5 @@ # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin/' +VITE_API_BASE='https://hwjb.homilychart.com/dev/admin/' # VITE_API_BASE='http://18.143.76.3:10704/' -VITE_API_BASE='http://192.168.8.246:8081/' +# VITE_API_BASE='http://192.168.8.246:8081/' VITE_UPLOAD_URL=https://api.homilychart.com/hljw/api/aws/upload \ No newline at end of file diff --git a/src/views/usergold/clientCountBalance.vue b/src/views/usergold/clientCountBalance.vue index a09a9e4..ce4d2ba 100644 --- a/src/views/usergold/clientCountBalance.vue +++ b/src/views/usergold/clientCountBalance.vue @@ -325,11 +325,11 @@ const handleMarketChange = (val) => { if (hasHeadquarters && hasOther) { if (val[val.length - 1] === '总部') { // 用户最后点的是总部,保留总部,清除其他 - goldDetail.value.markets = ['总部'] + user.value.markets = ['总部'] ElMessage.warning('“总部”与其他地区不可同时选择,系统已为您保留“总部”') } else { // 用户最后点的是其他,保留其他,移除总部 - goldDetail.value.markets = val.filter(item => item !== '总部') + user.value.markets = val.filter(item => item !== '总部') ElMessage.warning('“总部”与其他地区不可同时选择,系统已为您去除“总部”') } } diff --git a/src/views/usergold/clientCountDetail.vue b/src/views/usergold/clientCountDetail.vue index 2702919..829c084 100644 --- a/src/views/usergold/clientCountDetail.vue +++ b/src/views/usergold/clientCountDetail.vue @@ -89,8 +89,7 @@ const type = [ label: '退款' } ] -const market = ref([]) -/* + // 定义加载状态,获取地区数据 const isLoadingArea = ref(false); const market = ref([]) @@ -114,21 +113,22 @@ const getArea = async () => { } finally { isLoadingArea.value = false; } -};*/ +}; -// 地区下拉框 +/*// 地区下拉框 const getMarket = async function () { try { const result = await API({ url: '/general/market', data: {} }) + console.log('@@@@@@@@@@@@@地区数据', result) market.value = result.data - console.log('地区', market.value) + console.log('@@@@@@@@@@@@@@@@地区', market.value) } catch (error) { console.log('请求失败', error) } -} +}*/ // 充值明细表格 const tableData = ref([]) @@ -342,7 +342,7 @@ const exportExcel = async function () { sortField: goldDetail.value.sortField || '', sortOrder: goldDetail.value.sortOrder || '' }, - + } const res = await API({ url: '/goldDetail/export', data: params }) if (res.code === 200) { @@ -364,7 +364,7 @@ const handleCurrentChange = function (val) { // 挂载 onMounted(async function () { await get() - await getMarket() + await getArea() await getAdminData() await getPlatform() // 调用获取平台信息的函数 })