From abea9bf929c3bb7b6b09b1197263bd28ef582eb9 Mon Sep 17 00:00:00 2001 From: Double-_-Z <2492419643@qq.com> Date: Wed, 18 Dec 2024 14:45:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 277 ++---------- common/config.service.js | 3 +- manifest.json | 9 +- pages.json | 23 +- pages/mobile_web/home/home.vue | 47 ++- pages/mobile_web/index/index.vue | 2 +- pages/mobile_web/my/child_pages/login.vue | 4 +- pages/mobile_web/my/child_pages/setting.vue | 399 ++++++++++++++++++ pages/mobile_web/my/my.vue | 24 +- pages/mobile_web/work/work.vue | 2 +- .../workshops/components/dress_select.vue | 4 +- store/index.js | 4 +- 12 files changed, 490 insertions(+), 308 deletions(-) create mode 100644 pages/mobile_web/my/child_pages/setting.vue diff --git a/.gitignore b/.gitignore index dff31f6..d20465a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,248 +1,29 @@ -unpackage/cache/certdata -unpackage/cache/apk/__UNI__0B08B09_cm.apk -unpackage/cache/apk/apkurl -unpackage/cache/apk/cmManifestCache.json -unpackage/cache/wgt/__UNI__0B08B09/__uniappchooselocation.js -unpackage/cache/wgt/__UNI__0B08B09/__uniapperror.png -unpackage/cache/wgt/__UNI__0B08B09/__uniappes6.js -unpackage/cache/wgt/__UNI__0B08B09/__uniappopenlocation.js -unpackage/cache/wgt/__UNI__0B08B09/__uniapppicker.js -unpackage/cache/wgt/__UNI__0B08B09/__uniappquill.js -unpackage/cache/wgt/__UNI__0B08B09/__uniappquillimageresize.js -unpackage/cache/wgt/__UNI__0B08B09/__uniappscan.js -unpackage/cache/wgt/__UNI__0B08B09/__uniappsuccess.png -unpackage/cache/wgt/__UNI__0B08B09/__uniappview.html -unpackage/cache/wgt/__UNI__0B08B09/app-config.js -unpackage/cache/wgt/__UNI__0B08B09/app-config-service.js -unpackage/cache/wgt/__UNI__0B08B09/app-service.js -unpackage/cache/wgt/__UNI__0B08B09/app-view.js -unpackage/cache/wgt/__UNI__0B08B09/manifest.json -unpackage/cache/wgt/__UNI__0B08B09/view.css -unpackage/cache/wgt/__UNI__0B08B09/view.umd.min.js -unpackage/cache/wgt/__UNI__0B08B09/static/favicon.ico -unpackage/cache/wgt/__UNI__0B08B09/static/header.png -unpackage/cache/wgt/__UNI__0B08B09/static/logo.png -unpackage/dist/build/.automator/app-plus/.automator.json -unpackage/dist/build/.automator/h5/.automator.json -unpackage/dist/build/.automator/mp-weixin/.automator.json -unpackage/dist/build/app-plus/__uniappchooselocation.js -unpackage/dist/build/app-plus/__uniapperror.png -unpackage/dist/build/app-plus/__uniappes6.js -unpackage/dist/build/app-plus/__uniappopenlocation.js -unpackage/dist/build/app-plus/__uniapppicker.js -unpackage/dist/build/app-plus/__uniappquill.js -unpackage/dist/build/app-plus/__uniappquillimageresize.js -unpackage/dist/build/app-plus/__uniappscan.js -unpackage/dist/build/app-plus/__uniappsuccess.png -unpackage/dist/build/app-plus/__uniappview.html -unpackage/dist/build/app-plus/app-config.js -unpackage/dist/build/app-plus/app-config-service.js -unpackage/dist/build/app-plus/app-service.js -unpackage/dist/build/app-plus/app-view.js -unpackage/dist/build/app-plus/manifest.json -unpackage/dist/build/app-plus/view.css -unpackage/dist/build/app-plus/view.umd.min.js -unpackage/dist/build/app-plus/static/favicon.ico -unpackage/dist/build/app-plus/static/header.png -unpackage/dist/build/app-plus/static/logo.png -unpackage/dist/build/mp-weixin/app.js -unpackage/dist/build/mp-weixin/app.json -unpackage/dist/build/mp-weixin/app.wxss -unpackage/dist/build/mp-weixin/project.config.json -unpackage/dist/build/mp-weixin/project.private.config.json -unpackage/dist/build/mp-weixin/common/main.js -unpackage/dist/build/mp-weixin/common/main.wxss -unpackage/dist/build/mp-weixin/common/runtime.js -unpackage/dist/build/mp-weixin/common/vendor.js -unpackage/dist/build/mp-weixin/components/loading/index.js -unpackage/dist/build/mp-weixin/components/loading/index.json -unpackage/dist/build/mp-weixin/components/loading/index.wxml -unpackage/dist/build/mp-weixin/components/loading/index.wxss -unpackage/dist/build/mp-weixin/pages/index/index.js -unpackage/dist/build/mp-weixin/pages/index/index.json -unpackage/dist/build/mp-weixin/pages/index/index.wxml -unpackage/dist/build/mp-weixin/pages/mobile_web/home/home.js -unpackage/dist/build/mp-weixin/pages/mobile_web/home/home.json -unpackage/dist/build/mp-weixin/pages/mobile_web/home/home.wxml -unpackage/dist/build/mp-weixin/pages/mobile_web/home/home.wxss -unpackage/dist/build/mp-weixin/pages/mobile_web/index/index.js -unpackage/dist/build/mp-weixin/pages/mobile_web/index/index.json -unpackage/dist/build/mp-weixin/pages/mobile_web/index/index.wxml -unpackage/dist/build/mp-weixin/pages/mobile_web/index/index.wxss -unpackage/dist/build/mp-weixin/pages/mobile_web/my/my.js -unpackage/dist/build/mp-weixin/pages/mobile_web/my/my.json -unpackage/dist/build/mp-weixin/pages/mobile_web/my/my.wxml -unpackage/dist/build/mp-weixin/pages/mobile_web/my/my.wxss -unpackage/dist/build/mp-weixin/pages/mobile_web/work/work.js -unpackage/dist/build/mp-weixin/pages/mobile_web/work/work.json -unpackage/dist/build/mp-weixin/pages/mobile_web/work/work.wxml -unpackage/dist/build/mp-weixin/pages/mobile_web/work/work.wxss -unpackage/dist/build/mp-weixin/pages/mobile_web/workshops/index.js -unpackage/dist/build/mp-weixin/pages/mobile_web/workshops/index.json -unpackage/dist/build/mp-weixin/pages/mobile_web/workshops/index.wxml -unpackage/dist/build/mp-weixin/pages/mobile_web/workshops/index.wxss -unpackage/dist/build/mp-weixin/pages/mobile_web/workshops/components/editor.js -unpackage/dist/build/mp-weixin/pages/mobile_web/workshops/components/editor.json -unpackage/dist/build/mp-weixin/pages/mobile_web/workshops/components/editor.wxml -unpackage/dist/build/mp-weixin/pages/mobile_web/workshops/components/editor.wxss -unpackage/dist/build/mp-weixin/pages/pc_web/index/index.js -unpackage/dist/build/mp-weixin/pages/pc_web/index/index.json -unpackage/dist/build/mp-weixin/pages/pc_web/index/index.wxml -unpackage/dist/build/mp-weixin/pages/pc_web/index/index.wxss -unpackage/dist/build/mp-weixin/pages/pc_web/index/components/header.js -unpackage/dist/build/mp-weixin/pages/pc_web/index/components/header.json -unpackage/dist/build/mp-weixin/pages/pc_web/index/components/header.wxml -unpackage/dist/build/mp-weixin/pages/pc_web/index/components/header.wxss -unpackage/dist/build/mp-weixin/static/favicon.ico -unpackage/dist/build/mp-weixin/static/header.png -unpackage/dist/build/mp-weixin/static/logo.png -unpackage/dist/build/mp-weixin/uview-ui/components/u-avatar-cropper/u-avatar-cropper.js -unpackage/dist/build/mp-weixin/uview-ui/components/u-avatar-cropper/u-avatar-cropper.json -unpackage/dist/build/mp-weixin/uview-ui/components/u-avatar-cropper/u-avatar-cropper.wxml -unpackage/dist/build/mp-weixin/uview-ui/components/u-avatar-cropper/u-avatar-cropper.wxss -unpackage/dist/build/mp-weixin/uview-ui/components/u-count-to/u-count-to.js -unpackage/dist/build/mp-weixin/uview-ui/components/u-count-to/u-count-to.json -unpackage/dist/build/mp-weixin/uview-ui/components/u-count-to/u-count-to.wxml -unpackage/dist/build/mp-weixin/uview-ui/components/u-count-to/u-count-to.wxss -unpackage/dist/build/mp-weixin/uview-ui/components/u-icon/u-icon.js -unpackage/dist/build/mp-weixin/uview-ui/components/u-icon/u-icon.json -unpackage/dist/build/mp-weixin/uview-ui/components/u-icon/u-icon.wxml -unpackage/dist/build/mp-weixin/uview-ui/components/u-icon/u-icon.wxss -unpackage/dist/build/mp-weixin/uview-ui/components/u-input/u-input.js -unpackage/dist/build/mp-weixin/uview-ui/components/u-input/u-input.json -unpackage/dist/build/mp-weixin/uview-ui/components/u-input/u-input.wxml -unpackage/dist/build/mp-weixin/uview-ui/components/u-input/u-input.wxss -unpackage/dist/build/mp-weixin/uview-ui/components/u-mask/u-mask.js -unpackage/dist/build/mp-weixin/uview-ui/components/u-mask/u-mask.json -unpackage/dist/build/mp-weixin/uview-ui/components/u-mask/u-mask.wxml -unpackage/dist/build/mp-weixin/uview-ui/components/u-mask/u-mask.wxss -unpackage/dist/build/mp-weixin/uview-ui/components/u-popup/u-popup.js -unpackage/dist/build/mp-weixin/uview-ui/components/u-popup/u-popup.json -unpackage/dist/build/mp-weixin/uview-ui/components/u-popup/u-popup.wxml -unpackage/dist/build/mp-weixin/uview-ui/components/u-popup/u-popup.wxss -unpackage/dist/build/mp-weixin/uview-ui/components/u-select/u-select.js -unpackage/dist/build/mp-weixin/uview-ui/components/u-select/u-select.json -unpackage/dist/build/mp-weixin/uview-ui/components/u-select/u-select.wxml -unpackage/dist/build/mp-weixin/uview-ui/components/u-select/u-select.wxss -unpackage/dist/build/mp-weixin/uview-ui/components/u-swiper/u-swiper.js -unpackage/dist/build/mp-weixin/uview-ui/components/u-swiper/u-swiper.json -unpackage/dist/build/mp-weixin/uview-ui/components/u-swiper/u-swiper.wxml -unpackage/dist/build/mp-weixin/uview-ui/components/u-swiper/u-swiper.wxss -unpackage/dist/build/mp-weixin/uview-ui/components/u-toast/u-toast.js -unpackage/dist/build/mp-weixin/uview-ui/components/u-toast/u-toast.json -unpackage/dist/build/mp-weixin/uview-ui/components/u-toast/u-toast.wxml -unpackage/dist/build/mp-weixin/uview-ui/components/u-toast/u-toast.wxss -unpackage/dist/build/web/index.html -unpackage/dist/build/web/assets/element-icons.535877f5.woff -unpackage/dist/build/web/assets/element-icons.732389de.ttf -unpackage/dist/build/web/static/favicon.ico -unpackage/dist/build/web/static/header.png -unpackage/dist/build/web/static/index.css -unpackage/dist/build/web/static/logo.png -unpackage/dist/build/web/static/js/chunk-vendors.50d2fbeb.js -unpackage/dist/build/web/static/js/index.85a08705.js -unpackage/dist/build/web/static/js/pages-index-index.c0cbedfd.js -unpackage/dist/build/web/static/js/pages-mobile_web-index-index.af5c2abe.js -unpackage/dist/build/web/static/js/pages-mobile_web-index-index~pages-mobile_web-workshops-index~pages-pc_web-index-index~uview-ui-comp~4322e855.45cf24ee.js -unpackage/dist/build/web/static/js/pages-mobile_web-workshops-index.c3328c75.js -unpackage/dist/build/web/static/js/pages-pc_web-index-index.cd6b4dd4.js -unpackage/dist/build/web/static/js/uview-ui-components-u-avatar-cropper-u-avatar-cropper.784d3fd8.js -unpackage/dist/dev/.automator/app-plus/.automator.json -unpackage/dist/dev/.automator/mp-weixin/.automator.json -unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/components/loading/index.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/pages/mobile_web/home/home.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/pages/mobile_web/index/index.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/pages/pc_web/index/index.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/pages/pc_web/index/components/header.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-avatar-cropper/u-avatar-cropper.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-select/u-select.js.map -unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map -unpackage/dist/dev/app-plus/__uniappchooselocation.js -unpackage/dist/dev/app-plus/__uniapperror.png -unpackage/dist/dev/app-plus/__uniappes6.js -unpackage/dist/dev/app-plus/__uniappopenlocation.js -unpackage/dist/dev/app-plus/__uniapppicker.js -unpackage/dist/dev/app-plus/__uniappquill.js -unpackage/dist/dev/app-plus/__uniappquillimageresize.js -unpackage/dist/dev/app-plus/__uniappscan.js -unpackage/dist/dev/app-plus/__uniappsuccess.png -unpackage/dist/dev/app-plus/__uniappview.html -unpackage/dist/dev/app-plus/app-config.js -unpackage/dist/dev/app-plus/app-config-service.js -unpackage/dist/dev/app-plus/app-service.js -unpackage/dist/dev/app-plus/app-view.js -unpackage/dist/dev/app-plus/manifest.json -unpackage/dist/dev/app-plus/view.css -unpackage/dist/dev/app-plus/view.umd.min.js -unpackage/dist/dev/app-plus/static/favicon.ico -unpackage/dist/dev/app-plus/static/header.png -unpackage/dist/dev/app-plus/static/logo.png -unpackage/dist/dev/mp-weixin/app.js -unpackage/dist/dev/mp-weixin/app.json -unpackage/dist/dev/mp-weixin/app.wxss -unpackage/dist/dev/mp-weixin/project.config.json -unpackage/dist/dev/mp-weixin/project.private.config.json -unpackage/dist/dev/mp-weixin/assets/element-icons.732389de.ttf -unpackage/dist/dev/mp-weixin/common/main.js -unpackage/dist/dev/mp-weixin/common/main.wxss -unpackage/dist/dev/mp-weixin/common/runtime.js -unpackage/dist/dev/mp-weixin/common/vendor.js -unpackage/dist/dev/mp-weixin/components/loading/index.js -unpackage/dist/dev/mp-weixin/components/loading/index.json -unpackage/dist/dev/mp-weixin/components/loading/index.wxml -unpackage/dist/dev/mp-weixin/components/loading/index.wxss -unpackage/dist/dev/mp-weixin/pages/index/index.js -unpackage/dist/dev/mp-weixin/pages/index/index.json -unpackage/dist/dev/mp-weixin/pages/index/index.wxml -unpackage/dist/dev/mp-weixin/pages/mobile_web/home/home.js -unpackage/dist/dev/mp-weixin/pages/mobile_web/home/home.json -unpackage/dist/dev/mp-weixin/pages/mobile_web/home/home.wxml -unpackage/dist/dev/mp-weixin/pages/mobile_web/home/home.wxss -unpackage/dist/dev/mp-weixin/pages/mobile_web/index/index.js -unpackage/dist/dev/mp-weixin/pages/mobile_web/index/index.json -unpackage/dist/dev/mp-weixin/pages/mobile_web/index/index.wxml -unpackage/dist/dev/mp-weixin/pages/mobile_web/index/index.wxss -unpackage/dist/dev/mp-weixin/pages/pc_web/index/index.js -unpackage/dist/dev/mp-weixin/pages/pc_web/index/index.json -unpackage/dist/dev/mp-weixin/pages/pc_web/index/index.wxml -unpackage/dist/dev/mp-weixin/pages/pc_web/index/index.wxss -unpackage/dist/dev/mp-weixin/pages/pc_web/index/components/header.js -unpackage/dist/dev/mp-weixin/pages/pc_web/index/components/header.json -unpackage/dist/dev/mp-weixin/pages/pc_web/index/components/header.wxml -unpackage/dist/dev/mp-weixin/pages/pc_web/index/components/header.wxss -unpackage/dist/dev/mp-weixin/static/favicon.ico -unpackage/dist/dev/mp-weixin/static/header.png -unpackage/dist/dev/mp-weixin/static/logo.png -unpackage/dist/dev/mp-weixin/uview-ui/components/u-avatar-cropper/u-avatar-cropper.js -unpackage/dist/dev/mp-weixin/uview-ui/components/u-avatar-cropper/u-avatar-cropper.json -unpackage/dist/dev/mp-weixin/uview-ui/components/u-avatar-cropper/u-avatar-cropper.wxml -unpackage/dist/dev/mp-weixin/uview-ui/components/u-avatar-cropper/u-avatar-cropper.wxss -unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js -unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.json -unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.wxml -unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.wxss -unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.js -unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.json -unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.wxml -unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.wxss -unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.js -unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.json -unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.wxml -unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.wxss -unpackage/dist/dev/mp-weixin/uview-ui/components/u-select/u-select.js -unpackage/dist/dev/mp-weixin/uview-ui/components/u-select/u-select.json -unpackage/dist/dev/mp-weixin/uview-ui/components/u-select/u-select.wxml -unpackage/dist/dev/mp-weixin/uview-ui/components/u-select/u-select.wxss -unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js -unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.json -unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.wxml -unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.wxss -unpackage/release/apk/__UNI__0B08B09__20241123171225.apk -unpackage/release/apk/__UNI__0B08B09__20241128202014.apk +# 忽略 macOs 自带的 .DS_Store 文件 +.DS_Store + +# 忽略项目编译后的文件 +unpackage/dist +unpackage/cache + +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log + +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock \ No newline at end of file diff --git a/common/config.service.js b/common/config.service.js index c101ac9..b4eaa5f 100644 --- a/common/config.service.js +++ b/common/config.service.js @@ -1,6 +1,7 @@ // 接口环境 let BASE_URL = '/pixelApi'; -let IP = 'http://8.138.171.103/'; +let IP = 'http://8.138.171.103/';// 测试环境 +// let IP = 'http://1.12.224.227/';// 正式环境 let FILE_URL = IP+'static/'; // 火山引擎ai接口地址 let AI_URL = 'https://visual.volcengineapi.com'; diff --git a/manifest.json b/manifest.json index a2a2f0f..8f8d16e 100644 --- a/manifest.json +++ b/manifest.json @@ -103,7 +103,8 @@ "disableHostCheck" : true, "proxy" : { "/pixelApi" : { - "target" : "http://8.138.171.103:8082", + "target" : "http://8.138.171.103/pixelApi",// 测试环境 + // "target" : "http://1.12.224.227/pixelApi",// 正式环境 "changeOrigin" : true, "secure" : true, "ws" : false, @@ -112,13 +113,15 @@ } }, "/upload" : { - "target" : "http://8.138.171.103", + "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", + "target" : "http://8.138.171.103",// 测试环境 + // "target" : "http://1.12.224.227",// 正式环境 "changeOrigin" : true, "secure" : true, "ws" : false diff --git a/pages.json b/pages.json index 65bec52..172be94 100644 --- a/pages.json +++ b/pages.json @@ -76,19 +76,20 @@ "style": { "navigationBarTitleText": "登录" } + }, + { + "path": "my/child_pages/contact", + "style": { + "navigationBarTitleText": "联系客服" + } + }, + { + "path": "my/child_pages/setting", + "style": { + "navigationBarTitleText": "个人资料" + } } ] - }, - { - "root": "pages/mobile_web/my/child_pages", - "pages": [ - { - "path": "contact", - "style": { - "navigationBarTitleText": "联系客服" - } - } - ] } ], "globalStyle": { diff --git a/pages/mobile_web/home/home.vue b/pages/mobile_web/home/home.vue index 4ae4990..cb99fab 100644 --- a/pages/mobile_web/home/home.vue +++ b/pages/mobile_web/home/home.vue @@ -16,12 +16,14 @@ + - - + + + - + @@ -33,8 +35,8 @@ @@ -53,7 +55,7 @@ 筛选 - @@ -62,7 +64,7 @@ 收藏 - {{ siftList[item.type]?siftList[item.type].label:'暂无' }} + {{ siftList[item.type]?siftList[item.type].name:'暂无' }} @@ -78,7 +80,7 @@ + confirm-color="#94d500" labelName="name" valueName="name"> @@ -91,13 +93,10 @@ export default { type: Number, default: 0 }, - siftList:{ - type: Array, - default: [] - } }, data(){ return{ + staticIp: configService.ip, fileUrl: configService.fileUrl + 'pixel/home/', // logo图标 logo: 'logo.png', @@ -142,8 +141,10 @@ export default { select: 'select.png', // 展示筛选项 showSift: false, - // 筛选项下标 - siftIndex: 0, + // 筛选项 + siftList: [], + // 筛选项label + siftLabel: '全部', // 推荐作品列表 workList:[ { @@ -205,6 +206,8 @@ export default { // 这里按一页10个分组 this.swiperFunctionList = []; const arr = res.data; + this.siftList = [{name:"全部"}] + this.siftList.push(...arr); for (let i = 0; i < arr.length; i += this.group) { this.swiperFunctionList.push(arr.slice(i, i + this.group)); } @@ -218,7 +221,7 @@ export default { }, // 推荐作品筛选 selectSift(e){ - this.siftIndex = e[0].value; + this.siftLabel = e[0].value; }, // 监听单双击，单击-预览图片、双击-收藏 maskTouchend(item,index){ @@ -366,6 +369,7 @@ export default { display: flex; flex-direction: column; align-items: center; + justify-content: flex-end; padding: 0 12rpx; &:active{ filter: opacity(0.8); @@ -376,11 +380,14 @@ export default { white-space: nowrap; text-overflow: ellipsis; color: #fff; + text-align: center; font-size: 25rpx; } image{ - width: 110rpx; - height: 60rpx; + // width: 110rpx; + // height: 60rpx; + width: 60rpx; + height:60rpx; margin-bottom: 14rpx; } } @@ -462,10 +469,14 @@ export default { position: absolute; top: 0.8em; left: 0.6em; - width: 142rpx; + width: 152rpx; height: 47rpx; } .sign-text{ + width: 132rpx; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; color: #ffffff; font-size: 28rpx; position: absolute; diff --git a/pages/mobile_web/index/index.vue b/pages/mobile_web/index/index.vue index 97437ba..50244d6 100644 --- a/pages/mobile_web/index/index.vue +++ b/pages/mobile_web/index/index.vue @@ -80,7 +80,7 @@ export default { } this.changeCurrent(this.current); // #ifndef H5 - } + }, // #endif // #ifdef H5 diff --git a/pages/mobile_web/my/child_pages/login.vue b/pages/mobile_web/my/child_pages/login.vue index 0c843ee..c043ad7 100644 --- a/pages/mobile_web/my/child_pages/login.vue +++ b/pages/mobile_web/my/child_pages/login.vue @@ -249,8 +249,8 @@ if(res.success){ that.$refs.loginForm.resetFields(); if(!that.current){ - that.$u.vuex('vuex_token', res.data.token); - // that.$u.vuex('vuex_token', 'fbc545a91cc94fe89296828a25a7e08e@9085553879028596738'); + // that.$u.vuex('vuex_token', res.data.token); + that.$u.vuex('vuex_token', 'fbc545a91cc94fe89296828a25a7e08e@9085553879028596738'); that.$u.vuex('user_message', JSON.stringify(res.data.user)); if(that.nextUrl===''){ uni.navigateBack({complete() { diff --git a/pages/mobile_web/my/child_pages/setting.vue b/pages/mobile_web/my/child_pages/setting.vue new file mode 100644 index 0000000..0f7e636 --- /dev/null +++ b/pages/mobile_web/my/child_pages/setting.vue @@ -0,0 +1,399 @@ + + + + + + \ No newline at end of file diff --git a/pages/mobile_web/my/my.vue b/pages/mobile_web/my/my.vue index 3500d6e..d941768 100644 --- a/pages/mobile_web/my/my.vue +++ b/pages/mobile_web/my/my.vue @@ -161,14 +161,14 @@ export default { }, // 获取头像旁tip getTopTip(){ - // return this.isLogin ? `你好, PIXEL.AI!` : '请登录pixel.ai！'; - return this.isLogin ? `你好, ${this.userMessage?.nickName||this.userMessage?.username}!` : '请登录pixel.ai！'; + return this.isLogin ? `你好, PIXEL.AI!` : '请登录pixel.ai！'; + // return this.isLogin ? `你好, ${this.userMessage?.nickName||this.userMessage?.username}!` : '请登录pixel.ai！'; } }, methods:{ // 初始化 init(){ - this.userMessage = this.isLogin === ''?{}:JSON.parse(this.$store.state.user_message); + // this.userMessage = this.isLogin === ''?{}:JSON.parse(this.$store.state.user_message); }, // 操作栏 toControl(item){ @@ -177,22 +177,8 @@ export default { // 点击头像 handleClickAvatar(){ if(this.isLogin){ - let that = this; - uni.showModal({ - title: '注销', - content: '是否确认退出登录？', - confirmColor: '#94d500', - success: function (res) { - if (res.confirm) { - that.$api.logOut(); - that.$u.vuex('vuex_token', ''); - that.$u.vuex('user_message', {}); - // that.isLogin = ''; - that.$emit('userLogOut'); - that.userMessage = {}; - that.$refs.uToast.show({type:'success',title: "退出登录成功!"}); - } - } + uni.navigateTo({ + url: '/pages/mobile_web/my/child_pages/setting' }) }else{ uni.navigateTo({ diff --git a/pages/mobile_web/work/work.vue b/pages/mobile_web/work/work.vue index 5d1b733..5fb61f3 100644 --- a/pages/mobile_web/work/work.vue +++ b/pages/mobile_web/work/work.vue @@ -347,7 +347,7 @@ export default { position: absolute; top: 1.7em; left: 0.6em; - width: 142rpx; + width: 152rpx; height: 47rpx; } .sign-text{ diff --git a/pages/mobile_web/workshops/components/dress_select.vue b/pages/mobile_web/workshops/components/dress_select.vue index e310eba..5540a85 100644 --- a/pages/mobile_web/workshops/components/dress_select.vue +++ b/pages/mobile_web/workshops/components/dress_select.vue @@ -65,10 +65,10 @@ export default { // 列表存储 list: [ [{id: 1,optionName: '男'}, {id: 2,optionName: '女'},], - [{id: 1,optionName: '上衣'}, {id: 2,optionName: '下装'},], + [{id: 1,optionName: '上衣'}, {id: 2,optionName: '下衣'},], ], // 提示列表 - tips: ["选择性别","选择上下衣","选择服装"], + tips: ["选择性别","衣服模块","选择服装"], currentStep: 1,// 当前步骤 form: { sex: '',// 性别，0-男、1-女 diff --git a/store/index.js b/store/index.js index 3d6d43c..3aa2bc8 100644 --- a/store/index.js +++ b/store/index.js @@ -31,8 +31,8 @@ const store = new Vuex.Store({ state: { // 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量 // 加上vuex_前缀，是防止变量名冲突，也让人一目了然 - // vuex_token: 'fbc545a91cc94fe89296828a25a7e08e@9085553879028596738', - vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '', + vuex_token: 'fbc545a91cc94fe89296828a25a7e08e@9085553879028596738', + // vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '', user_message:lifeData.user_message ? lifeData.user_message : {}, current_platform: lifeData.current_platform ? lifeData.current_platform : '' },