code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2026-11-13 04:18:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

解决 Profile.vue 合并冲突，同步master代码

Browse Source
This commit is contained in:
田香琪
2026-07-14 16:45:10 +08:00
parent 4cd96980ba 29d5ba98ff
commit 1fa3a91979
42 changed files with 292 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
seller/src/views/shop/ossManage.vue
View File

@@ -147,7 +147,7 @@
<el-upload
v-if="canUploadImages"
ref="up"
:action="commonUrl + '/common/common/upload/file'"
:action="sellerUrl + '/store/common/upload/file'"
:data="uploadData"
:headers="accessToken"
:before-upload="beforeUpload"
@@ -317,7 +317,7 @@ import {
updateFileDirectory,
} from "@/api/index";
import DPlayer from "dplayer";
import {commonUrl} from "@/libs/axios";
import {sellerUrl} from "@/libs/axios";
import config from "@/config/index";
import playImg from "@/assets/play.png";
@@ -342,7 +342,7 @@ export default {
},
data() {
return {
commonUrl, // 上传文件路径
sellerUrl, // 上传文件路径
config, // api地址
fileDirectoryId: "",
groupFormValidate: {

6
seller/src/views/shop/ossManages.vue
View File

@@ -97,7 +97,7 @@
<el-form-item v-if="canUploadImages">
<el-upload
ref="up"
:action="commonUrl + '/common/common/upload/file'"
:action="sellerUrl + '/store/common/upload/file'"
:data="uploadData"
:headers="accessToken"
:before-upload="beforeUpload"
@@ -313,7 +313,7 @@ import {
updateFileDirectory,
} from "@/api/index";
import DPlayer from "dplayer";
import {commonUrl} from "@/libs/axios";
import {sellerUrl} from "@/libs/axios";
import config from "@/config/index";
import playImg from "@/assets/play.png";
@@ -342,7 +342,7 @@ export default {
},
data() {
return {
commonUrl, // 上传文件路径
sellerUrl, // 上传文件路径
config, // api地址
fileDirectoryId: "",
groupFormValidate: {