From dde6528455b91d992b252195a6f44ed7aa93e7b4 Mon Sep 17 00:00:00 2001 From: Double-_-Z <2492419643@qq.com> Date: Mon, 30 Dec 2024 19:01:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dapp=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- common/config.service.js | 7 ++ common/ossutil/ossWebUpload.js | 5 ++ manifest.json | 73 ++++++++++--------- pages/index/rich-detail.vue | 8 ++ pages/index/webview.vue | 4 +- pages/mobile_web/home/home.vue | 34 ++++++++- pages/mobile_web/my/child_pages/contact.vue | 8 ++ pages/mobile_web/my/child_pages/create.vue | 30 +++++--- pages/mobile_web/my/child_pages/login.vue | 8 ++ pages/mobile_web/my/child_pages/recharge.vue | 8 ++ pages/mobile_web/my/child_pages/setting.vue | 8 ++ pages/mobile_web/my/child_pages/share.vue | 71 ++++++++++++++---- pages/mobile_web/work/work.vue | 4 +- .../workshops/components/dress_select.vue | 6 +- pages/mobile_web/workshops/index.vue | 48 ++++++++++-- 16 files changed, 252 insertions(+), 73 deletions(-) create mode 100644 pages/mobile_web/my/child_pages/recharge.vue diff --git a/.gitignore b/.gitignore index d20465a..b086004 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,7 @@ .DS_Store # 忽略项目编译后的文件 -unpackage/dist -unpackage/cache +unpackage node_modules/ dist/ diff --git a/common/config.service.js b/common/config.service.js index 3c4d437..7c2d62a 100644 --- a/common/config.service.js +++ b/common/config.service.js @@ -1,5 +1,12 @@ // 接口环境 + +// #ifdef H5 let BASE_URL = '/pixelApi'; +// #endif +// #ifdef APP-PLUS ||MP +let BASE_URL = 'http://8.138.171.103/pixelApi'; +// #endif + let IP = 'http://8.138.171.103/';// 测试环境 // let IP = 'http://1.12.224.227/';// 正式环境 let FILE_URL = IP+'static/'; diff --git a/common/ossutil/ossWebUpload.js b/common/ossutil/ossWebUpload.js index e2078b5..fbe2753 100644 --- a/common/ossutil/ossWebUpload.js +++ b/common/ossutil/ossWebUpload.js @@ -44,7 +44,12 @@ const ossUpload = async(vm,filePath,success) => { let res = await vm.$api.getOssSignal(); if(res?.success){ resultPath = res.data.substring(0, res.data.indexOf("?")); + // #ifdef H5 clientPath = res.data.replace(configService.aliUrl, "/ossUpload"); + // #endif + // #ifndef H5 + clientPath = res.data; + // #endif // clientPath = res.data.replace(configService.aliAsyncUrl, "/asyncOssUpload"); } getImageBase64(vm,filePath,success); diff --git a/manifest.json b/manifest.json index 479261d..598f3d7 100644 --- a/manifest.json +++ b/manifest.json @@ -102,51 +102,54 @@ "devServer" : { "disableHostCheck" : true, "proxy" : { - "/pixelApi" : { - "target" : "http://8.138.171.103/pixelApi",// 测试环境 - // "target" : "http://1.12.224.227/pixelApi",// 正式环境 - "changeOrigin" : true, - "secure" : true, - "ws" : false, - "pathRewrite" : { - "^/pixelApi" : "" - } - }, + "/pixelApi" : { + "target" : "http://8.138.171.103/pixelApi", // 测试环境 + + // "target" : "http://1.12.224.227/pixelApi",// 正式环境 + "changeOrigin" : true, + "secure" : true, + "ws" : false, + "pathRewrite" : { + "^/pixelApi" : "" + } + }, "/upload" : { - "target" : "http://8.138.171.103",// 测试环境 - // "target" : "http://1.12.224.227",// 正式环境 + "target" : "http://8.138.171.103", // 测试环境 + + // "target" : "http://1.12.224.227",// 正式环境 "changeOrigin" : true, "secure" : true, "ws" : false }, "/aiupload" : { - "target" : "http://8.138.171.103/upload",// 测试环境 - // "target" : "http://1.12.224.227",// 正式环境 + "target" : "http://8.138.171.103/upload", // 测试环境 + + // "target" : "http://1.12.224.227",// 正式环境 "changeOrigin" : true, "secure" : true, "ws" : false, - "pathRewrite" : { - "^/aiupload" : "" - } + "pathRewrite" : { + "^/aiupload" : "" + } }, - "/ossUpload" : { - "target" : "http://guojunjie.oss-cn-hangzhou.aliyuncs.com", - "changeOrigin" : true, - "secure" : true, - "ws" : false, - "pathRewrite" : { - "^/ossUpload/" : "" - } - }, - "/asyncOssUpload" : { - "target" : "https://dashscope-result-bj.oss-cn-beijing.aliyuncs.com", - "changeOrigin" : true, - "secure" : true, - "ws" : false, - "pathRewrite" : { - "^/asyncOssUpload/" : "" - } - } + "/ossUpload" : { + "target" : "http://guojunjie.oss-cn-hangzhou.aliyuncs.com", + "changeOrigin" : true, + "secure" : true, + "ws" : false, + "pathRewrite" : { + "^/ossUpload/" : "" + } + }, + "/asyncOssUpload" : { + "target" : "https://dashscope-result-bj.oss-cn-beijing.aliyuncs.com", + "changeOrigin" : true, + "secure" : true, + "ws" : false, + "pathRewrite" : { + "^/asyncOssUpload/" : "" + } + } } } }, diff --git a/pages/index/rich-detail.vue b/pages/index/rich-detail.vue index 7beb8b8..bbd8736 100644 --- a/pages/index/rich-detail.vue +++ b/pages/index/rich-detail.vue @@ -92,6 +92,14 @@ flex-direction: column; min-height: 100vh; background-size: cover; + // #ifdef APP + .app-top{ + width: 100%; + position: fixed; + z-index: 81; + top: 0; + } + // #endif .rdt-top{ // #ifdef APP .app-top{ diff --git a/pages/index/webview.vue b/pages/index/webview.vue index 74619d3..7ef5ac9 100644 --- a/pages/index/webview.vue +++ b/pages/index/webview.vue @@ -18,14 +18,14 @@ export default { src: '', wbStyles: { width: '100%', - height: '100vh', + height: '100%', }, } }, onLoad(option) { this.title = option?.title this.src = option.src ? decodeURI(option.src) : ''; - console.log(this.src); + console.log('this.src',this.src); }, } \ No newline at end of file diff --git a/pages/mobile_web/home/home.vue b/pages/mobile_web/home/home.vue index 0024213..52932cf 100644 --- a/pages/mobile_web/home/home.vue +++ b/pages/mobile_web/home/home.vue @@ -69,6 +69,10 @@ {{ siftList[item.serviceId] ? siftList[item.serviceId].name : '暂无' }} + + + 做同款 + @@ -149,6 +153,8 @@ export default { touchNum : 0, // 轮播功能列表单组功能数 group: 10, + // 魔术棒 + magicWand: 'magic-wand.png' } }, methods:{ @@ -238,7 +244,7 @@ export default { }, // 前往工作室 toDeal(id = null){ - if(id!==null) + if(id!==null&&id!=='') uni.navigateTo({url: `/pages/mobile_web/workshops/index?id=${id}`}); else this.$refs.uToast.show({type:'error',title: "暂未开放对应功能!"}); }, @@ -472,6 +478,32 @@ export default { left: 0.9em; z-index: 1; } + .work-todo{ + position: absolute; + bottom: 0.85em; + right: 0.7em; + z-index: 1; + border-radius: 12rpx; + padding: 14rpx 30rpx; + background-color: rgba(0, 0, 0, 0.3); + display: flex; + align-items: center; + text{ + font-weight: bold; + background-image: linear-gradient(to right, #cdfbf2 0%, #a3d4ff 100%); + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } + image{ + margin-right: 10rpx; + width: 34rpx; + height: 34rpx; + } + &:active{ + opacity: 0.8; + } + } .compare-sign{ position: absolute; left: 0; diff --git a/pages/mobile_web/my/child_pages/contact.vue b/pages/mobile_web/my/child_pages/contact.vue index 3388f09..c121bea 100644 --- a/pages/mobile_web/my/child_pages/contact.vue +++ b/pages/mobile_web/my/child_pages/contact.vue @@ -169,6 +169,14 @@ export default { background-size: cover; opacity: 0.9; + // #ifdef APP + .app-top{ + width: 100%; + position: fixed; + z-index: 81; + top: 0; + } + // #endif .ct-top { // #ifdef APP .app-top { diff --git a/pages/mobile_web/my/child_pages/create.vue b/pages/mobile_web/my/child_pages/create.vue index 1021150..15327b3 100644 --- a/pages/mobile_web/my/child_pages/create.vue +++ b/pages/mobile_web/my/child_pages/create.vue @@ -23,14 +23,14 @@ - + -