Web/daimp-front
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
姚俊旭 2025-06-11 16:37:29 +08:00
commit d0e8ac75fe
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/.env.development
View File

@ -18,3 +18,4 @@ VITE_APP_UPLOAD_API = '/uploadApis'
# 内网接口地址 # 内网接口地址
VITE_APP_BASE_URL = 'http://192.168.18.99:8080' VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
VITE_APP_VIST_URL = 'http://192.168.18.99'

3
main/.env.pre
View File

@ -11,4 +11,5 @@ VITE_APP_VIST_URL = 'http://localhost'
VITE_APP_BASE_API = '/apis' VITE_APP_BASE_API = '/apis'
VITE_APP_BASE_URL = '' VITE_APP_BASE_URL = ''
VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_API = '/uploadApis'
VITE_APP_UPLOAD_URL = '' VITE_APP_UPLOAD_URL = ''
VITE_APP_VIST_URL = 'http://192.168.18.99'

7
main/vite.config.js
View File

@ -21,6 +21,13 @@ export default defineConfig(({ command, mode }) => {
target: 'ESNext', target: 'ESNext',
outDir: 'dist', outDir: 'dist',
minify: 'terser', minify: 'terser',
rollupOptions: {
output: {
chunkFileNames: `static/js/[name]-${Date.now()}-[hash].js`,
entryFileNames: `static/js/[name]-${Date.now()}-[hash].js`,
assetFileNames: `static/[ext]/[name]-${Date.now()}-[hash].[ext]`,
},
},
}, },
server: { server: {
host: '0.0.0.0', host: '0.0.0.0',

16
sub-operation-service/src/views/userCenter/addressList.vue
View File

@ -62,12 +62,16 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<template #isDefault="slotProps"> <template #isDefault="slotProps">
<div style="width: 120px; display: flex; align-items: center; justify-content: flex-start"> <div
<el-checkbox :class="[slotProps.row.isDefault == '1' ? 'pr' : 'er']"
style="width: 120px; display: flex; align-items: center; justify-content: flex-start"
>
{{ slotProps.row.isDefault == '1' ? '是' : '否' }}
<!-- <el-checkbox
:disabled="slotProps.row.isDefault == '1' ? false : true" :disabled="slotProps.row.isDefault == '1' ? false : true"
:checked="slotProps.row.isDefault == '1' ? true : false" :checked="slotProps.row.isDefault == '1' ? true : false"
size="large" size="large"
/> /> -->
</div> </div>
</template> </template>
@ -507,6 +511,12 @@ function removeCheckedItems(data) {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.pr {
color: #25bf82;
}
.er {
color: #999999;
}
:deep(.el-checkbox__inner) { :deep(.el-checkbox__inner) {
border-radius: 50%; border-radius: 50%;
width: 16px; width: 16px;