front/java-mall-admin
7
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

合并分支

Browse Source
This commit is contained in:
qijq 2025-05-16 17:47:28 +08:00
commit 75b4b128d8
6 changed files with 1234 additions and 1194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -36,7 +36,7 @@ pnpm-lock.yaml
!.yarn/sdks
!.yarn/versions
.pnp.*
.history
# Vab
public/video
*.zip

2
src/views/login/index.vue
View File

@ -89,7 +89,7 @@
</el-col>
</el-row>
<div class="internet-content-provider">
<a href="https://beian.miit.gov.cn/" target="_blank" style="color: #fff">
<a href="https://beian.miit.gov.cn/" style="color: #fff" target="_blank">
桂ICP备2024040484号-1
</a>
</div>

4
src/views/product/productList/components/addProductEdit.vue
View File

@ -2045,8 +2045,8 @@ export default {
}
})
} else {
if (shop_product_image) {
let image = shop_product_image[0]
if (shop_product_image.length) {
let image = shop_product_image?.[0]
obj.main_color_img = image.item_image_default
let other = image.item_image_other
if (other) {

3
src/views/settings/config/receiptMachine.vue
View File

@ -304,7 +304,7 @@ export default {
this.brandName = ''
this.params = {
pageNum: 1,
paper_with: 20,
pageSize: 20,
}
this.getReceiptMachineList()
},
@ -326,6 +326,7 @@ export default {
}
this.isEdit = false
}
this.$refs['formDialog'].resetFields()
},
handleSizeChange(pageSize) {
this.params.pageSize = pageSize

52
src/views/settings/config/site.vue
View File

@ -2,7 +2,6 @@
<el-row>
<el-col>
<el-card id="box-card-form-1">
<el-form ref="form" :model="form">
<el-form-item
:label="__('网站名称')"
@ -228,7 +227,11 @@
:style="{ width: '100%' }"
/>
</el-form-item>
<el-form-item :label="__('平台QQ')" label-width="150px" prop="site_qq">
<el-form-item
:label="__('平台QQ')"
label-width="150px"
prop="site_qq"
>
<el-input
v-model="form.site_qq"
clearable
@ -236,7 +239,12 @@
:style="{ width: '100%' }"
/>
</el-form-item>
<el-form-item v-if="false" :label="__('平台旺旺')" label-width="150px" prop="site_ww">
<el-form-item
v-if="false"
:label="__('平台旺旺')"
label-width="150px"
prop="site_ww"
>
<el-input
v-model="form.site_ww"
clearable
@ -244,7 +252,8 @@
:style="{ width: '100%' }"
/>
</el-form-item>
<el-form-item v-if="false"
<el-form-item
v-if="false"
:label="__('网站默认模版')"
label-width="150px"
prop="theme_id_wrap"
@ -264,7 +273,8 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="false"
<el-form-item
v-if="false"
:label="__('系统默认语言')"
label-width="150px"
prop="language_id_wrap"
@ -284,7 +294,8 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="false"
<el-form-item
v-if="false"
:label="__('使用时区')"
label-width="150px"
prop="date_default_timezone_set_wrap"
@ -304,7 +315,8 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="false"
<el-form-item
v-if="false"
:label="__('货币单位符号')"
label-width="150px"
prop="monetary_unit"
@ -316,7 +328,8 @@
:style="{ width: '100%' }"
/>
</el-form-item>
<el-form-item v-if="false"
<el-form-item
v-if="false"
:label="__('日期格式')"
label-width="150px"
prop="date_format_wrap"
@ -336,7 +349,8 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="false"
<el-form-item
v-if="false"
:label="__('时间格式')"
label-width="150px"
prop="time_format_wrap"
@ -436,22 +450,26 @@
/>
</el-form-item>
</el-form>
<el-button class="form-sub-btn" icon="el-icon-s-tools" type="primary" @click="handleEdit">
<el-button
class="form-sub-btn"
icon="el-icon-s-tools"
type="primary"
@click="handleEdit"
>
{{ __('修改') }}
</el-button>
</el-card>
</el-col>
</el-row>
</template>
<script>
import { translateTitle as __ } from '@/utils/i18n'
import { getList, doEdit } from '@/api/base/config'
import { URL } from '@/config'
import Upload from '@/components/upload'
import { translateTitle as __ } from '@/utils/i18n'
import { getList, doEdit } from '@/api/base/config'
import { URL } from '@/config'
import Upload from '@/components/upload'
export default {
export default {
name: 'Site',
components: { Upload },
data() {
@ -640,5 +658,5 @@
})
},
},
}
}
</script>

47
src/views/settings/config/upload.vue
View File

@ -10,7 +10,8 @@
:model="uploadForm"
size="medium"
>
<el-form-item v-if="false"
<el-form-item
v-if="false"
:label="__('图片文件大小')"
label-width="150px"
prop="image_max_filesize"
@ -142,7 +143,12 @@
</el-form>
</div>
<div>
<el-button class="form-sub-btn" icon="el-icon-s-tools" type="primary" @click="ossEdit">
<el-button
class="form-sub-btn"
icon="el-icon-s-tools"
type="primary"
@click="ossEdit"
>
{{ __('修改') }}
</el-button>
</div>
@ -395,7 +401,12 @@
</el-form>
</div>
<div>
<el-button class="form-sub-btn" icon="el-icon-s-tools" type="primary" @click="selfEdit">
<el-button
class="form-sub-btn"
icon="el-icon-s-tools"
type="primary"
@click="selfEdit"
>
{{ __('修改') }}
</el-button>
</div>
@ -406,12 +417,12 @@
</template>
<script>
import { translateTitle as __ } from '@/utils/i18n'
import { getList, doEdit } from '@/api/base/config'
import { getToken } from '@/utils/token'
import { URL } from '@/config'
import { translateTitle as __ } from '@/utils/i18n'
import { getList, doEdit } from '@/api/base/config'
import { getToken } from '@/utils/token'
import { URL } from '@/config'
export default {
export default {
name: 'Upload',
components: {},
data() {
@ -621,6 +632,16 @@
key: 39,
value: '.xml',
},
{
label: 'apk',
key: 40,
value: '.apk',
},
{
label: 'wgt',
key: 41,
value: '.wgt',
},
],
uploadForm: {
image_max_filesize: null,
@ -981,20 +1002,20 @@
})
},
},
}
}
</script>
<style>
.avatar-uploader-icon {
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 255px;
height: 256px;
line-height: 256px;
text-align: center;
}
}
.image_font {
.image_font {
color: #979898;
font-size: 14px;
}
}
</style>