diff --git a/config.js b/config.js index c5ef683..d6720f9 100644 --- a/config.js +++ b/config.js @@ -4,8 +4,8 @@ export default { uploadQiNiuDomain: 'https://upload-z2.qiniup.com', // baseUrl: 'https://vue.ruoyi.vip/prod-api', // baseUrl: 'http://47.93.242.168:8080', - // baseUrl: 'http://47.93.242.168:8080', - baseUrl: 'http://localhost:8080', + baseUrl: 'http://47.93.242.168:8080', + // baseUrl: 'http://localhost:8080', // baseUrl: 'http://47.93.242.168:8080', // 应用信息 appInfo: { diff --git a/pages/activity/index.vue b/pages/activity/index.vue index 79748ff..708ae04 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -337,8 +337,6 @@ align-items: center; .text { font-weight: 400; - width: 60rpx; - height: 20rpx; font-size: 20rpx; text-align: center; color: #00CCBE; diff --git a/pages/activity/info.vue b/pages/activity/info.vue index 1892b56..fac6f5f 100644 --- a/pages/activity/info.vue +++ b/pages/activity/info.vue @@ -145,7 +145,7 @@ const leftClick = () => { .dictAuto { margin: 4rpx auto; - margin-bottom: 200rpx; + margin-bottom: 400rpx; .state1 { width: 686rpx; height: 80rpx; diff --git a/pages/common/file/fileUpload/index.vue b/pages/common/file/fileUpload/index.vue index 4a32637..bc3d1e0 100644 --- a/pages/common/file/fileUpload/index.vue +++ b/pages/common/file/fileUpload/index.vue @@ -115,11 +115,13 @@ const uploadFilePromise = async (fileInfo1, name) => { } fileInfo.name = fileNameOld[0] + "_" + store.state.user.phoneType + "_" + name; + let extension1 = fileInfo1.url.split('.'); // 防止 h5 报错 if (extension1[1] == null) { extension1[1] = fileNameOld[1]; } + //主要是为了拼接文件type(video/mp4),因为各端传入的type各有不同 fileInfo.type = fileInfo1.type + "/" + extension1[1]; fileInfo.extension = extension1[1]; try { @@ -134,13 +136,8 @@ const uploadFilePromise = async (fileInfo1, name) => { throw error; } }; - +//多走一步,为了实现文件分片上传(废弃,简单上传即可) const uploadQN = (file) => { - // if (store.state.user.phoneType === 'mp-weixin') { - // return uploadQN1(file.url); - // } else { - // return uploadQN2(file); - // } return uploadQN1(file.url); }; //废弃 diff --git a/pages/work/index.vue b/pages/work/index.vue index a4b261e..eacbc8e 100644 --- a/pages/work/index.vue +++ b/pages/work/index.vue @@ -89,7 +89,7 @@ import { useStore } from 'vuex'; const { proxy } = getCurrentInstance(); const store = useStore(); const fileTypeInfo1 = ref("image") -const fileTypeInfo2 = ref("file") +const fileTypeInfo2 = ref("video") const QNDomain = store.state.user.QNDomain const current = ref(0) const swiperDotIndex = ref(0) diff --git a/static/images/icon/tu1-1.png b/static/images/icon/tu1-1.png deleted file mode 100644 index 98783a2..0000000 Binary files a/static/images/icon/tu1-1.png and /dev/null differ diff --git a/static/images/icon/tu1-10.png b/static/images/icon/tu1-10.png deleted file mode 100644 index e8bd419..0000000 Binary files a/static/images/icon/tu1-10.png and /dev/null differ diff --git a/static/images/icon/tu1-2.png b/static/images/icon/tu1-2.png deleted file mode 100644 index 8a6b023..0000000 Binary files a/static/images/icon/tu1-2.png and /dev/null differ diff --git a/static/images/icon/tu1-3.png b/static/images/icon/tu1-3.png deleted file mode 100644 index cb92c29..0000000 Binary files a/static/images/icon/tu1-3.png and /dev/null differ diff --git a/static/images/icon/tu1-4.png b/static/images/icon/tu1-4.png deleted file mode 100644 index 88d0c19..0000000 Binary files a/static/images/icon/tu1-4.png and /dev/null differ diff --git a/static/images/icon/tu1-5.png b/static/images/icon/tu1-5.png deleted file mode 100644 index 49c2685..0000000 Binary files a/static/images/icon/tu1-5.png and /dev/null differ diff --git a/static/images/icon/tu1-6.png b/static/images/icon/tu1-6.png deleted file mode 100644 index be8fa4e..0000000 Binary files a/static/images/icon/tu1-6.png and /dev/null differ diff --git a/static/images/icon/tu1-7.png b/static/images/icon/tu1-7.png deleted file mode 100644 index 65b727a..0000000 Binary files a/static/images/icon/tu1-7.png and /dev/null differ diff --git a/static/images/icon/tu1-8.png b/static/images/icon/tu1-8.png deleted file mode 100644 index bab0412..0000000 Binary files a/static/images/icon/tu1-8.png and /dev/null differ diff --git a/static/images/icon/tu1-9.png b/static/images/icon/tu1-9.png deleted file mode 100644 index b26c090..0000000 Binary files a/static/images/icon/tu1-9.png and /dev/null differ