From 67f67d189a2661ef4b68ab3ab5a7e04e1799db0c Mon Sep 17 00:00:00 2001 From: Double-_-Z <2492419643@qq.com> Date: Thu, 5 Dec 2024 11:46:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http.api.js | 3 + common/routerInterceptor.js | 3 +- manifest.json | 8 +- pages.json | 23 ++ pages/index/rich-detail.vue | 10 +- pages/index/webview.vue | 31 ++ pages/mobile_web/home/home.vue | 14 +- pages/mobile_web/index/index.vue | 6 +- pages/mobile_web/my/child_pages/contact.vue | 344 ++++++++++++++++++- pages/mobile_web/my/child_pages/login.vue | 123 +++++++ pages/mobile_web/my/my.vue | 32 +- pages/mobile_web/workshops/common/imgDeal.js | 9 +- pages/mobile_web/workshops/index.vue | 4 + store/index.js | 1 + 14 files changed, 595 insertions(+), 16 deletions(-) create mode 100644 pages/index/webview.vue create mode 100644 pages/mobile_web/my/child_pages/login.vue diff --git a/common/http.api.js b/common/http.api.js index 1a96024..911d8c6 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -4,6 +4,9 @@ const install = (Vue, vm) => { vm.$api.wxLogin = async (params = {}) => await vm.$u.get('/wxUser/wxPhoneLogin', params);// 手机号一键登录 // vm.$api.wxLogin = async (params = {}) => await vm.$u.get('/wxUser/wxPhoneLogin', params);// 手机号一键登录 + // 留言板 + vm.$api.addMessage = async (params = {}) => await vm.$u.post('/cpMessage', params);// 添加留言 + // 百度ai调用 vm.$api.colouRize = async (params = {}) => await vm.$u.post('/AiPicture/Colourize', params);// 旧照修复 vm.$api.selfieAnime = async (params = {}) => await vm.$u.post('/AiPicture/selfie_anime', params);// 人像动漫化 diff --git a/common/routerInterceptor.js b/common/routerInterceptor.js index edb5077..d8b5d84 100644 --- a/common/routerInterceptor.js +++ b/common/routerInterceptor.js @@ -5,7 +5,8 @@ let needLogin = [ // 多端通用路由 let filterRoute = [ "/uview-ui/components/u-avatar-cropper/u-avatar-cropper", - "/pages/index/rich-detail" + "/pages/index/rich-detail", + "/pages/index/webview", ]; // 拦截类型 let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]; diff --git a/manifest.json b/manifest.json index 6bc346b..d948ccf 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name" : "pixel.ai制图", "appid" : "__UNI__0B08B09", - "description" : "", + "description" : "给您带来有趣的制图体验!", "versionName" : "1.5.0", "versionCode" : "100", "transformPx" : false, @@ -59,6 +59,9 @@ /* SDK配置 */ "sdkConfigs" : { "ad" : {} + }, + "splashscreen" : { + "androidStyle" : "common" } } }, @@ -113,5 +116,6 @@ } } } - } + }, + "locale" : "zh-Hans" } diff --git a/pages.json b/pages.json index 5ff8be2..65bec52 100644 --- a/pages.json +++ b/pages.json @@ -36,6 +36,12 @@ "style": { "navigationBarTitleText": "协议内容" } + }, + { + "path": "webview" + // "style": { + // "navigationBarTitleText": "" + // } } ] }, @@ -64,8 +70,25 @@ "style": { "navigationBarTitleText": "工作室" } + }, + { + "path": "my/child_pages/login", + "style": { + "navigationBarTitleText": "登录" + } } ] + }, + { + "root": "pages/mobile_web/my/child_pages", + "pages": [ + { + "path": "contact", + "style": { + "navigationBarTitleText": "联系客服" + } + } + ] } ], "globalStyle": { diff --git a/pages/index/rich-detail.vue b/pages/index/rich-detail.vue index 7021602..7beb8b8 100644 --- a/pages/index/rich-detail.vue +++ b/pages/index/rich-detail.vue @@ -11,7 +11,8 @@ - + @@ -160,11 +160,11 @@ export default { swiperList:[ { picture: configService.fileUrl + 'pixel/home/banner.png', - path: '' + path: 'https://docs.qq.com/doc/DSXpVWGlJb01BS0VO' }, { picture: configService.fileUrl + 'pixel/home/banner.png', - path: '' + path: 'https://baidu.com/' } ], // 推荐作品图标 @@ -266,6 +266,14 @@ export default { toDeal({name, model}){ if(name && model) uni.navigateTo({url: `/pages/mobile_web/workshops/index?name=${name}&model=${model}`}); + }, + // 轮播图跳转 + linkTo(e){ + if(this.swiperList[e].path){ + uni.navigateTo({ + url: `/pages/index/webview?src=${encodeURI(this.swiperList[e].path)}` + }) + } } } } diff --git a/pages/mobile_web/index/index.vue b/pages/mobile_web/index/index.vue index 1740a00..c99a1c1 100644 --- a/pages/mobile_web/index/index.vue +++ b/pages/mobile_web/index/index.vue @@ -67,7 +67,7 @@ export default { }, // #ifdef H5 - mounted(){ + onShow(){ let that = this; window.onscroll = function () { //为了保证兼容性,这里取三个值,哪个有值取哪一个 @@ -78,6 +78,10 @@ export default { else that.topLevel = 1; } }, + + onHide() { + window.onscroll = null; + }, // #endif onLoad() { diff --git a/pages/mobile_web/my/child_pages/contact.vue b/pages/mobile_web/my/child_pages/contact.vue index 9e92375..bbfbf8b 100644 --- a/pages/mobile_web/my/child_pages/contact.vue +++ b/pages/mobile_web/my/child_pages/contact.vue @@ -1,11 +1,349 @@ + - \ No newline at end of file diff --git a/pages/mobile_web/my/child_pages/login.vue b/pages/mobile_web/my/child_pages/login.vue new file mode 100644 index 0000000..c176b88 --- /dev/null +++ b/pages/mobile_web/my/child_pages/login.vue @@ -0,0 +1,123 @@ + + + + + + \ No newline at end of file diff --git a/pages/mobile_web/my/my.vue b/pages/mobile_web/my/my.vue index 9b73a47..4346b9f 100644 --- a/pages/mobile_web/my/my.vue +++ b/pages/mobile_web/my/my.vue @@ -11,7 +11,7 @@ - @@ -73,6 +73,8 @@ export default { background: 'background.png', // 头像 avatar: 'avatar.png', + // 默认登录头像 + defaultLoginAvatar: 'login-avatar.png', // 次数背景 timeBox: 'time-box.png', // 次数列表 @@ -119,7 +121,7 @@ export default { { icon: 'customer.png', name: '联系客服', - path: '', + path: '/pages/mobile_web/my/child_pages/contact', }, { icon: 'agreement.png', @@ -141,13 +143,34 @@ export default { // name: '激活码', // path: '', // } - ] + ], + // 是否登录 + isLogin: this.$store.state.vuex_token, + } + }, + // mounted() { + // console.log('isLogin',this.isLogin); + // }, + computed:{ + // 获取登录头像 + getAvatar(){ + return this.isLogin ? this.defaultLoginAvatar : this.avatar; + }, + // 获取头像旁tip + getTopTip(){ + return this.isLogin ? '你好, SSDFH!' : '请登录pixel.ai!'; } }, methods:{ // 操作栏 toControl(item){ if(item.path) uni.navigateTo({ url: item.path }); + }, + // 点击头像 + handleClickAvatar(){ + uni.navigateTo({ + url: '/pages/mobile_web/my/child_pages/login' + }) } } } @@ -185,6 +208,9 @@ export default { margin: 125rpx 70rpx 45rpx; font-weight: bold; word-spacing: 3px; + /deep/.u-icon__img{ + border-radius: 100%; + } } .mm-member{ display: flex; diff --git a/pages/mobile_web/workshops/common/imgDeal.js b/pages/mobile_web/workshops/common/imgDeal.js index ffe709f..3453c8e 100644 --- a/pages/mobile_web/workshops/common/imgDeal.js +++ b/pages/mobile_web/workshops/common/imgDeal.js @@ -32,9 +32,16 @@ const commonUpload = (vm,path,params,success) =>{ name: 'image', header:{'token':vm.$store.state.vuex_token}, success: (res) => { - success(encodeURI(JSON.parse(res.data).data)); + if(res.data){ + success(encodeURI(JSON.parse(res.data).data)); + } else { + vm.$refs.uToast.show({type: 'error',title: "余额不足,请充值!"}); + vm.dotLoading = false; + return; + } }, fail: function (res) { + vm.$refs.uToast.show({type: 'error',title: "处理失败!"}); } }); } diff --git a/pages/mobile_web/workshops/index.vue b/pages/mobile_web/workshops/index.vue index 6d7b12e..589acd3 100644 --- a/pages/mobile_web/workshops/index.vue +++ b/pages/mobile_web/workshops/index.vue @@ -176,6 +176,10 @@ export default { else that.topLevel = 1; } }, + + onHide() { + window.onscroll = null; + }, // #endif onLoad(options) { this.form.title = options.name; diff --git a/store/index.js b/store/index.js index ea3c755..e20deea 100644 --- a/store/index.js +++ b/store/index.js @@ -31,6 +31,7 @@ const store = new Vuex.Store({ state: { // 如果上面从本地获取的lifeData对象下有对应的属性,就赋值给state中对应的变量 // 加上vuex_前缀,是防止变量名冲突,也让人一目了然 + // fbc545a91cc94fe89296828a25a7e08e@9085553879028596738 vuex_token: lifeData.vuex_token ? lifeData.vuex_token : 'fbc545a91cc94fe89296828a25a7e08e@9085553879028596738', user_message:lifeData.user_message ? lifeData.user_message : {}, current_platform: lifeData.current_platform ? lifeData.current_platform : ''