From ddc813efd1ebdf55385156779e83223628457795 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 18 May 2022 18:06:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=A1=E6=9D=91=E7=9B=B8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/axios.js | 3 + src/manifest.json | 9 +- src/saas/AppCountryAlbum/AddAlbum.vue | 83 +++++++- src/saas/AppCountryAlbum/AlbumDetail.vue | 159 +++++--------- src/saas/AppCountryAlbum/SourceSetting.vue | 38 +++- src/saas/AppCountryAlbum/Watermark.vue | 100 ++++++++- src/saas/AppCountryAlbum/WatermarkSetting.vue | 55 +++-- src/saas/AppCountryAlbum/components/Home.vue | 43 +++- .../components/watermark/Watermark2.vue | 133 ++++++------ .../components/watermark/Watermark3.vue | 133 ++++++------ .../components/watermark/Watermark4.vue | 182 +++++++--------- .../components/watermark/Watermark5.vue | 196 +++++++----------- .../components/watermark/Watermark6.vue | 166 +++++++++++---- src/saas/AppCountryAlbum/config/index.js | 20 +- src/saas/AppCountryAlbum/images/sy/2.png | Bin 25732 -> 25655 bytes src/saas/AppCountryAlbum/images/sy/22.png | Bin 0 -> 25732 bytes src/saas/AppCountryAlbum/images/sy/3.png | Bin 25655 -> 0 bytes .../images/zhaopianshuliang.png | Bin 2443 -> 721 bytes 18 files changed, 746 insertions(+), 574 deletions(-) create mode 100644 src/saas/AppCountryAlbum/images/sy/22.png delete mode 100644 src/saas/AppCountryAlbum/images/sy/3.png diff --git a/src/common/axios.js b/src/common/axios.js index 3b9ee8f1..7150f0f0 100644 --- a/src/common/axios.js +++ b/src/common/axios.js @@ -13,6 +13,9 @@ instance.interceptors.request.use(config => { if (/AppCountryAlbum/.test(location.pathname)) { config.url = config.url.replace(/(app|auth|admin)\//, "api/") } + if (sessionStorage.getItem("prj") == "saas") { + config.url = config.url.replace(/(app|auth|admin)\//, "api/") + } if (!config.withoutToken && store.state.token) { config.headers["Authorization"] = store.state.token } diff --git a/src/manifest.json b/src/manifest.json index 702a78a6..ef7e18da 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -36,12 +36,19 @@ } }, "/online": { - "target": "https://test87tpweb.cunwuyun.cn", + "target": "https://test87xcxc.cunwuyun.cn", "changeOrigin": true, "pathRewrite": { "^/online": "/" } }, + "/api": { + "target": "https://test87xcxc.cunwuyun.cn", + "changeOrigin": true, + "pathRewrite": { + "^/api": "/api" + } + }, "/tmap": { "target": "https://apis.map.qq.com", "changeOrigin": true, diff --git a/src/saas/AppCountryAlbum/AddAlbum.vue b/src/saas/AppCountryAlbum/AddAlbum.vue index 7ad825dd..772d6f32 100644 --- a/src/saas/AppCountryAlbum/AddAlbum.vue +++ b/src/saas/AppCountryAlbum/AddAlbum.vue @@ -7,7 +7,7 @@ 相册名称
- +
@@ -15,8 +15,8 @@ 水印
-
- 请选择 +
+ {{ watermarkId ? '已选择' : '不限' }}
@@ -26,22 +26,22 @@ 拍摄人
- 请选择 + {{ createUserId ? '已选择' : '不限' }}
-
+
照片来源
- 请选择 + {{ photoSource == 1 ? '仅限乡村相册拍摄' : '不限' }}
-
保存
+