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

dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
pull from: dev2
merge into: front:main
Conversation 0 Commits 174 Files Changed 776 +57 -37
17 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d03c5710d3 - Show all commits

4
admin/index.html
View File

@ -5,5 +5,5 @@
window.ver = "2.0.278";
window.SYS = {CONFIG:{}, URL:{}};</script><script>window._AMapSecurityConfig = {
securityJsCode:"07788e7ebd7e913985722bfc5986999f"
}</script><script src="https://mall.gpxscs.cn/admin/config.js?v=2.0.278"></script><script src="https://mall.gpxscs.cn/admin/im/libs3.6.0.min.js?v=2.0.278"></script><script src="https://mall.gpxscs.cn/admin/im/im.js?v=2.0.278"></script><link href="static/css/chunk-19648027.83a11e8c.css" rel="prefetch"><link href="static/css/chunk-9d08728e.a2ba01b6.css" rel="prefetch"><link href="static/css/vab-extra.9da8d2d7.css" rel="prefetch"><link href="static/js/chunk-19648027.6233a553.js" rel="prefetch"><link href="static/js/chunk-9d08728e.cce09ea2.js" rel="prefetch"><link href="static/js/vab-extra.29abc81b.js" rel="prefetch"><link href="static/css/app.d3766ec2.css" rel="preload" as="style"><link href="static/css/element-ui.0e3a750b.css" rel="preload" as="style"><link href="static/js/app.15437a55.js" rel="preload" as="script"><link href="static/js/element-ui.4e8e0db4.js" rel="preload" as="script"><link href="static/js/vue.11eaebc3.js" rel="preload" as="script"><link href="static/css/element-ui.0e3a750b.css" rel="stylesheet"><link href="static/css/app.d3766ec2.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="img/icons/favicon-16x16.png"><link rel="manifest" href="manifest.json"><meta name="theme-color" content="#ffffff"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><meta name="apple-mobile-web-app-title" content="xiaofa-admin"><link rel="apple-touch-icon" href="img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="img/icons/safari-pinned-tab.svg" color="#ffffff"><meta name="msapplication-TileImage" content="img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#ffffff"></head><body><noscript></noscript><div id="app"><div class="first-loading-wrp"><div class="loading-wrp"><span class="dot dot-spin"><i></i> <i></i> <i></i> <i></i></span></div><h1>小发同城</h1></div></div><script>if (window.location.hostname !== 'localhost') {
}</script><script src="static/js/element-ui.4e8e0db4.js"></script><script src="static/js/vue.11eaebc3.js"></script><script src="static/js/app.15437a55.js"></script></body></html>
}</script><script src="https://mall.gpxscs.cn/admin/config.js?v=2.0.278"></script><script src="https://mall.gpxscs.cn/admin/im/libs3.6.0.min.js?v=2.0.278"></script><script src="https://mall.gpxscs.cn/admin/im/im.js?v=2.0.278"></script><link href="static/css/chunk-19648027.83a11e8c.css" rel="prefetch"><link href="static/css/chunk-982af3b2.2e626fb8.css" rel="prefetch"><link href="static/css/vab-extra.9da8d2d7.css" rel="prefetch"><link href="static/js/chunk-19648027.6233a553.js" rel="prefetch"><link href="static/js/chunk-982af3b2.f2d8b0ef.js" rel="prefetch"><link href="static/js/vab-extra.29abc81b.js" rel="prefetch"><link href="static/css/app.d3766ec2.css" rel="preload" as="style"><link href="static/css/element-ui.0e3a750b.css" rel="preload" as="style"><link href="static/js/app.52cdf3c7.js" rel="preload" as="script"><link href="static/js/element-ui.4e8e0db4.js" rel="preload" as="script"><link href="static/js/vue.11eaebc3.js" rel="preload" as="script"><link href="static/css/element-ui.0e3a750b.css" rel="stylesheet"><link href="static/css/app.d3766ec2.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="img/icons/favicon-16x16.png"><link rel="manifest" href="manifest.json"><meta name="theme-color" content="#ffffff"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><meta name="apple-mobile-web-app-title" content="xiaofa-admin"><link rel="apple-touch-icon" href="img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="img/icons/safari-pinned-tab.svg" color="#ffffff"><meta name="msapplication-TileImage" content="img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#ffffff"></head><body><noscript></noscript><div id="app"><div class="first-loading-wrp"><div class="loading-wrp"><span class="dot dot-spin"><i></i> <i></i> <i></i> <i></i></span></div><h1>小发同城</h1></div></div><script>if (window.location.hostname !== 'localhost') {
}</script><script src="static/js/element-ui.4e8e0db4.js"></script><script src="static/js/vue.11eaebc3.js"></script><script src="static/js/app.52cdf3c7.js"></script></body></html>

16
admin/precache-manifest.e8d797c4bd4379590d8a1d61605b7283.js → admin/precache-manifest.b780d40cc148a215e3c74cad49255c60.js
View File

@ -2376,7 +2376,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "im/libs3.6.0.min.js"
},
{
"revision": "fd0bb8a8fc29ba6a6b0b589c456d4553",
"revision": "5e68213f497b1b8a54106885d5dd9b7b",
"url": "index.html"
},
{
@ -2392,7 +2392,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "robots.txt"
},
{
"revision": "1476376bf52eca0503a5",
"revision": "82f435e12b7ad5ccbe21",
"url": "static/css/app.d3766ec2.css"
},
{
@ -2400,8 +2400,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "static/css/chunk-19648027.83a11e8c.css"
},
{
"revision": "c10cdebb2e5fcc83b03b",
"url": "static/css/chunk-9d08728e.a2ba01b6.css"
"revision": "78131a376c39b9654578",
"url": "static/css/chunk-982af3b2.2e626fb8.css"
},
{
"revision": "7b9212a0410ce12f6058",
@ -2636,16 +2636,16 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "static/img/xiaofa-logo.20439423.png"
},
{
"revision": "1476376bf52eca0503a5",
"url": "static/js/app.15437a55.js"
"revision": "82f435e12b7ad5ccbe21",
"url": "static/js/app.52cdf3c7.js"
},
{
"revision": "f5dd29b853f67685e75d",
"url": "static/js/chunk-19648027.6233a553.js"
},
{
"revision": "c10cdebb2e5fcc83b03b",
"url": "static/js/chunk-9d08728e.cce09ea2.js"
"revision": "78131a376c39b9654578",
"url": "static/js/chunk-982af3b2.f2d8b0ef.js"
},
{
"revision": "7b9212a0410ce12f6058",

2
admin/service-worker.js
View File

@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
importScripts(
"precache-manifest.e8d797c4bd4379590d8a1d61605b7283.js"
"precache-manifest.b780d40cc148a215e3c74cad49255c60.js"
);
workbox.core.setCacheNameDetails({prefix: "xiaofa-admin"});

2
admin/static/css/app.d3766ec2.css
View File

File diff suppressed because one or more lines are too long

2
admin/static/css/chunk-19648027.83a11e8c.css
View File

@ -1,7 +1,7 @@
/*!
* build: xiaofa-admin
* copyright: https://www.lancerdt.com
* time: 2025-9-24 14:10:56
* time: 2025-9-26 15:14:07
*/
/*!
* Quill Editor v1.3.7

4
admin/static/css/chunk-9d08728e.a2ba01b6.css → admin/static/css/chunk-982af3b2.2e626fb8.css
View File

File diff suppressed because one or more lines are too long

2
admin/static/css/element-ui.0e3a750b.css
View File

@ -1,5 +1,5 @@
/*!
* build: xiaofa-admin
* copyright: https://www.lancerdt.com
* time: 2025-9-24 14:10:56
* time: 2025-9-26 15:14:07
*/@media only screen and (max-width:767px){.hidden-xs-only{display:none!important}}@media only screen and (min-width:768px){.hidden-sm-and-up{display:none!important}}@media only screen and (min-width:768px) and (max-width:991px){.hidden-sm-only{display:none!important}}@media only screen and (max-width:991px){.hidden-sm-and-down{display:none!important}}@media only screen and (min-width:992px){.hidden-md-and-up{display:none!important}}@media only screen and (min-width:992px) and (max-width:1199px){.hidden-md-only{display:none!important}}@media only screen and (max-width:1199px){.hidden-md-and-down{display:none!important}}@media only screen and (min-width:1200px){.hidden-lg-and-up{display:none!important}}@media only screen and (min-width:1200px) and (max-width:1919px){.hidden-lg-only{display:none!important}}@media only screen and (max-width:1919px){.hidden-lg-and-down{display:none!important}}@media only screen and (min-width:1920px){.hidden-xl-only{display:none!important}}

2
admin/static/css/vab-extra.9da8d2d7.css
View File

@ -1,5 +1,5 @@
/*!
* build: xiaofa-admin
* copyright: https://www.lancerdt.com
* time: 2025-9-24 14:10:56
* time: 2025-9-26 15:14:07
*/[data-v-28093814]:export{menu-color:#fff;menu-color-active:#fff;menu-background:#282c34;column-second-menu-background:#fff}.vab-avatar-list[data-v-28093814] .el-avatar{display:inline-block;margin-left:-15px;cursor:pointer;border:3px solid #fff}.echarts{width:600px;height:400px}[data-v-7f7baab5]:export{menu-color:#fff;menu-color-active:#fff;menu-background:#282c34;column-second-menu-background:#fff}@media only screen and (max-width:767px){[data-v-7f7baab5] .vab-cropper-canvas{display:block;float:none;margin:0 auto}[data-v-7f7baab5] .vab-cropper-preview{display:none}}[data-v-7f7baab5] .el-textarea{margin-top:20px}[data-v-7f7baab5] .el-dialog__footer{height:72px}[data-v-7f7baab5] .el-dialog__footer:before{display:block;clear:both;content:""}[data-v-7f7baab5] .el-dialog__footer>div>div{display:inline}[data-v-7f7baab5] .el-dialog__footer>div>div .el-upload-list{display:none}[data-v-7f7baab5] .el-dialog__footer>div>div .el-upload--picture-card{float:right;width:auto;height:32px;line-height:32px;vertical-align:middle;background-color:transparent;border:0;border-radius:0}[data-v-7f7baab5] .el-dialog__footer>div .el-button{float:right;margin-left:10px}.icon-selector-popper .el-card__body{position:relative;display:flex;flex-direction:column;align-items:center;justify-content:center;height:20px;cursor:pointer}.icon-selector-popper .el-card__body i{font-size:28px;color:rgba(0,0,0,.65);text-align:center;vertical-align:middle;pointer-events:none;cursor:pointer}.icon-selector-popper .el-pagination{margin:0}[data-v-3aef4cea]:export{menu-color:#fff;menu-color-active:#fff;menu-background:#282c34;column-second-menu-background:#fff}.upload[data-v-3aef4cea]{height:500px}.upload .upload-content .el-upload__tip[data-v-3aef4cea]{display:block;height:30px;line-height:30px}.upload .upload-content[data-v-3aef4cea] .el-upload--picture-card{width:128px;height:128px;margin:3px 8px 8px 8px;border:2px dashed #c0ccda}.upload .upload-content[data-v-3aef4cea] .el-upload-list--picture{margin-bottom:20px}.upload .upload-content[data-v-3aef4cea] .el-upload-list--picture-card .el-upload-list__item{width:128px;height:128px;margin:3px 8px 8px 8px}

8
admin/static/js/app.15437a55.js → admin/static/js/app.52cdf3c7.js
View File

File diff suppressed because one or more lines are too long

2
admin/static/js/chunk-19648027.6233a553.js
View File

File diff suppressed because one or more lines are too long

6
admin/static/js/chunk-982af3b2.f2d8b0ef.js Normal file
View File

File diff suppressed because one or more lines are too long

6
admin/static/js/chunk-9d08728e.cce09ea2.js
View File

File diff suppressed because one or more lines are too long

2
admin/static/js/element-ui.4e8e0db4.js
View File

File diff suppressed because one or more lines are too long

2
admin/static/js/vab-extra.29abc81b.js
View File

File diff suppressed because one or more lines are too long

2
admin/static/js/vue.11eaebc3.js
View File

File diff suppressed because one or more lines are too long

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

@ -602,7 +602,7 @@
:model="productForm"
size="medium"
>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item :label="__('运费设置')" prop="transport_type_id">
<el-select
v-model="productForm.transport_type_id"
@ -618,7 +618,7 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item :label="__('购买上限')" prop="product_buy_limit">
<el-input

28
src/views/store/shopAudit/shopAuditDetails.vue
View File

@ -43,12 +43,26 @@
<div class="item-block" style="margin-left: 30px;">
<div class="item-lable">经营品类</div>
<el-input
<!-- <el-input
class="item-input"
v-model="form.biz_category"
clearable
:disabled="isReadonly"
/> -->
<el-select
v-model.trim="form.biz_category"
clearable
:placeholder="__('经营分类')"
:style="{ width: '48%' }"
:disabled="isReadonly"
>
<el-option
v-for="item in classifyData"
:key="item.store_category_id"
:label="item.store_category_name"
:value="item.store_category_id"
/>
</el-select>
</div>
</div>
<div class="item-info">
@ -1019,9 +1033,9 @@ import {
createShop,
createSubAccount,
checkShopName,
updateUserInfo
updateUserInfo,
} from '@/api/shopAudit/shopAudit'
import { GetStoreClassify } from '@/api/base/store/category'
import { batchNoApi, imgOcrResultApi } from "@/api/upload";
import {
@ -1066,6 +1080,7 @@ export default {
showLoading: false,
formConfig: JSON.parse(JSON.stringify(config)),
cityData: JSON.parse(JSON.stringify(city.cityData)),
classifyData: [],
form: {
id:'',
login_mobile: '66',
@ -1324,7 +1339,7 @@ export default {
},
created() {
this.uploadParams.authorization = getToken()
this.fetchdataGetStoreClassify()
console.log(this.uploadParams)
},
methods: {
@ -1842,6 +1857,11 @@ export default {
console.log(this.form.province_nmae)
}
},
async fetchdataGetStoreClassify() {
await GetStoreClassify().then((res) => {
this.classifyData = res.data
})
},
handerChangeCity(e){
this.provinceData = [];
this.provinceCode = ""