diff --git a/.prettierrc b/.prettierrc index 170b4a2..f20f145 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,35 +1,28 @@ { - "$schema": "https://json.schemastore.org/prettierrc.json", + "$schema": "http://json.schemastore.org/prettierrc", "printWidth": 120, "tabWidth": 2, "useTabs": false, - "semi": true, + "semi": false, "singleQuote": true, "bracketSpacing": true, "trailingComma": "all", "arrowParens": "always", - "endOfLine": "auto", + "endOfLine": "lf", "htmlWhitespaceSensitivity": "ignore", "singleAttributePerLine": false, - "jsxSingleQuote": true, "overrides": [ { "files": "*.wxml", - "options": { - "parser": "html" - } + "options": { "parser": "html" } }, { "files": "*.wxss", - "options": { - "parser": "css" - } + "options": { "parser": "css" } }, { "files": "*.wxs", - "options": { - "parser": "babel" - } + "options": { "parser": "babel" } } ] } diff --git a/README.md b/README.md index 5888b3c..9dcb3b2 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,8 @@ https://pic1.zhimg.com/50/v2-dcfbab1219ae4f7a7a6db168bb1580a2_720w.jpg?source=2c26e567 images svn 地址 -svn://39.106.86.127:28386/projects/takeda/proj_src/shop/frontend/web/wt +svn://39.106.86.127:28386/projects/xd/proj_src/shop/frontend/web/xd +svn://39.106.86.127:28386/projects/xd/proj_src/branches/dev_v2.0/shop/frontend/web/xd/ (/images/)(\S*(?=["|'])) {{imageUrl}}$2?t={{Timestamp}} diff --git a/project.config.json b/project.config.json index 4a3111e..c975dce 100644 --- a/project.config.json +++ b/project.config.json @@ -1,75 +1,73 @@ -{ - "description": "项目配置文件", - "miniprogramRoot": "src/", - "compileType": "miniprogram", - "setting": { - "useCompilerPlugins": [ - "typescript", - "sass" - ], - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "coverView": false, - "postcss": false, - "minified": false, - "enhance": true, - "showShadowRootInWxmlPanel": false, - "packNpmManually": true, - "packNpmRelationList": [ - { - "packageJsonPath": "package.json", - "miniprogramNpmDistDir": "./src" - } - ], - "ignoreUploadUnusedFiles": true, - "compileHotReLoad": false, - "skylineRenderEnable": true, - "es6": true, - "compileWorklet": false, - "uglifyFileName": false, - "uploadWithSourceMap": true, - "minifyWXSS": true, - "minifyWXML": true, - "localPlugins": false, - "disableUseStrict": false, - "condition": false, - "swc": false, - "disableSWC": true - }, - "simulatorType": "wechat", - "simulatorPluginLibVersion": {}, - "condition": {}, - "srcMiniprogramRoot": "src/", - "editorSetting": { - "tabIndent": "insertSpaces", - "tabSize": 2 - }, - "libVersion": "3.7.7", - "ignore": [], - "packOptions": { - "ignore": [ - { - "value": "/images/*.*", - "type": "glob" - }, - { - "value": "/images/**/*.*", - "type": "glob" - }, - { - "value": "/images/**/**/*.*", - "type": "glob" - } - ], - "include": [ - { - "value": "/images/tabbar/*.*", - "type": "glob" - } - ] - }, - "appid": "wxf9ce8010f1ad24aa" -} \ No newline at end of file +{ + "description": "项目配置文件", + "miniprogramRoot": "src/", + "compileType": "miniprogram", + "setting": { + "useCompilerPlugins": ["typescript", "sass"], + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "coverView": false, + "postcss": false, + "minified": false, + "enhance": true, + "showShadowRootInWxmlPanel": false, + "packNpmManually": true, + "packNpmRelationList": [ + { + "packageJsonPath": "package.json", + "miniprogramNpmDistDir": "./src" + } + ], + "ignoreUploadUnusedFiles": true, + "compileHotReLoad": false, + "skylineRenderEnable": true, + "es6": true, + "compileWorklet": false, + "uglifyFileName": false, + "uploadWithSourceMap": true, + "minifyWXSS": true, + "minifyWXML": true, + "localPlugins": false, + "disableUseStrict": false, + "condition": false, + "swc": false, + "disableSWC": true + }, + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, + "condition": {}, + "srcMiniprogramRoot": "src/", + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 2 + }, + "libVersion": "3.7.7", + "ignore": [], + "packOptions": { + "ignore": [ + { + "value": "/images/*.*", + "type": "glob" + }, + { + "value": "/images/**/*.*", + "type": "glob" + }, + { + "value": "/images/**/**/*.*", + "type": "glob" + } + ], + "include": [ + { + "value": "/images/tabbar/*.*", + "type": "glob" + } + ] + }, + "appid": "wxf9ce8010f1ad24aa" +} + diff --git a/project.private.config.json b/project.private.config.json index 7c6e787..2357198 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -23,11 +23,32 @@ "miniprogram": { "list": [ { + "name": "患者-直播结果页", + "pathName": "patient/pages/liveResult/index", + "query": "id=5", + "scene": null, + "launchMode": "default" + }, + { + "name": "患者-医生详情", + "pathName": "patient/pages/doctorDetail/index", + "query": "id=3", + "launchMode": "default", + "scene": null + }, + { + "name": "患者-互动", + "pathName": "patient/pages/interactivePatient/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { "name": "患者端-登录", "pathName": "patient/pages/login/index", "query": "", - "scene": null, - "launchMode": "default" + "launchMode": "default", + "scene": null }, { "name": "资料库详情", diff --git a/src/app.json b/src/app.json index 89d5194..de8e074 100644 --- a/src/app.json +++ b/src/app.json @@ -131,8 +131,8 @@ "text": "资料库" }, { - "iconPath": "/images/tabbar/tab2.png", - "selectedIconPath": "/images/tabbar/tab-active2.png", + "iconPath": "/images/tabbar/tab4.png", + "selectedIconPath": "/images/tabbar/tab-active4.png", "pagePath": "pages/d_interactive/index", "text": "互动" }, diff --git a/src/components/patient-tab-bar/index.scss b/src/components/patient-tab-bar/index.scss index a2aa18b..c93a87f 100644 --- a/src/components/patient-tab-bar/index.scss +++ b/src/components/patient-tab-bar/index.scss @@ -1,19 +1,15 @@ -/* custom-tab-bar/index.wxss */ - - -.tab-item { - .icon { - width: 50rpx; - height: 50rpx; - } - .name { - font-size: 24rpx; - color: #CCCCCC; - &.active{ - color: #CF5375; - } - &.drug-active{ - color: #25D9C8; - } - } -} +/* custom-tab-bar/index.wxss */ + +.tab-item { + .icon { + width: 48rpx; + height: 48rpx; + } + .name { + font-size: 20rpx; + color: rgba(105, 104, 110, 1); + &.active { + color: rgba(33, 29, 46, 1); + } + } +} diff --git a/src/components/patient-tab-bar/index.ts b/src/components/patient-tab-bar/index.ts index 48d4621..33f3520 100644 --- a/src/components/patient-tab-bar/index.ts +++ b/src/components/patient-tab-bar/index.ts @@ -1,5 +1,5 @@ -import { getCurrentPageUrl } from '@/utils/util'; -const app = getApp(); +import { getCurrentPageUrl } from '@/utils/util' +const app = getApp() Component({ properties: {}, @@ -11,32 +11,26 @@ Component({ { pagePath: '/patient/pages/index/index', text: '首页', - icon: 'home', - iconActive: 'home-active', + icon: 'tab1', + iconActive: 'tab-active1', }, { pagePath: '/patient/pages/repository/index', - text: 'MG全知道', - icon: 'story', - iconActive: 'story-active', + text: '了解TED', + icon: 'tab2', + iconActive: 'tab-active2', }, { pagePath: '/patient/pages/live/index', - text: '周三大咖说', - icon: 'gift', - iconActive: 'gift-active', - }, - { - pagePath: '/patient/pages/story/index', - text: '向往的生活', - icon: 'class', - iconActive: 'class-active', + text: '大咖说', + icon: 'tab5', + iconActive: 'tab-active5', }, { pagePath: '/patient/pages/my/index', text: '我的', - icon: 'my', - iconActive: 'my-active', + icon: 'tab3', + iconActive: 'tab-active3', }, ], userInfo: {}, @@ -50,17 +44,17 @@ Component({ app.zdGetTheme().then((res) => { this.setData({ theme: res, - }); - }); + }) + }) - const pagePath = getCurrentPageUrl(); - const active = this.data.list.findIndex((item) => item.pagePath === pagePath); + const pagePath = getCurrentPageUrl() + const active = this.data.list.findIndex((item) => item.pagePath === pagePath) this.setData({ active, - }); + }) this.setData({ showRed: app.globalData.showRed, - }); + }) // getApp().registerListener(() => { // wx.ajax({ // method: 'GET', @@ -76,30 +70,30 @@ Component({ methods: { onChange() {}, handleNav(e) { - const { index } = e.currentTarget.dataset; - const { list, config } = this.data; - const pagePath = list[index].pagePath; - app.globalData.BeginnerCardId = ''; + const { index } = e.currentTarget.dataset + const { list, config } = this.data + const pagePath = list[index].pagePath + app.globalData.BeginnerCardId = '' if (pagePath == '/patient/pages/my/index') { app.zdPermissionVerification(2, 0, `/patient/pages/index/index`).then(() => { wx.reLaunch({ url: pagePath, - }); - }); + }) + }) } else if (pagePath == '/patient/pages/repository/index' && config.picTextEbookStatus == 1) { app.zdPermissionVerification(2, 0, `/pages/repository/index`).then(() => { const webviewUrl = encodeURIComponent( `${app.globalData.url}/zdcare/#/cover?loginState=${app.globalData.loginState}`, - ); + ) wx.navigateTo({ url: `/patient/pages/webview/index?url=${webviewUrl}`, - }); - }); + }) + }) } else { wx.reLaunch({ url: pagePath, - }); + }) } }, }, -}); +}) diff --git a/src/components/patient-tab-bar/index.wxml b/src/components/patient-tab-bar/index.wxml index d76abe5..5d25952 100644 --- a/src/components/patient-tab-bar/index.wxml +++ b/src/components/patient-tab-bar/index.wxml @@ -4,9 +4,9 @@ class="tab-item" bind:tap="handleNav" data-index="{{index}}" - icon="{{imageUrl}}za-images/tabbar/{{active==index ? (theme === 'DRUG' ? 'drug-' :'' ) + item.iconActive: item.icon}}.png" + icon="{{imageUrl}}tabbar/{{active==index ? item.iconActive: item.icon}}.png" > - {{item.text}} + {{item.text}} diff --git a/src/images/bg10.png b/src/images/bg10.png new file mode 100644 index 0000000..e38a0c7 Binary files /dev/null and b/src/images/bg10.png differ diff --git a/src/images/icon24.png b/src/images/icon24.png new file mode 100644 index 0000000..358b3cc Binary files /dev/null and b/src/images/icon24.png differ diff --git a/src/images/icon25.png b/src/images/icon25.png new file mode 100644 index 0000000..dc98882 Binary files /dev/null and b/src/images/icon25.png differ diff --git a/src/images/icon26.png b/src/images/icon26.png new file mode 100644 index 0000000..6e13c3e Binary files /dev/null and b/src/images/icon26.png differ diff --git a/src/images/icon27.png b/src/images/icon27.png new file mode 100644 index 0000000..fb3e62d Binary files /dev/null and b/src/images/icon27.png differ diff --git a/src/images/icon28.png b/src/images/icon28.png new file mode 100644 index 0000000..8f73a97 Binary files /dev/null and b/src/images/icon28.png differ diff --git a/src/images/icon29.png b/src/images/icon29.png new file mode 100644 index 0000000..ba9fed9 Binary files /dev/null and b/src/images/icon29.png differ diff --git a/src/images/icon30.png b/src/images/icon30.png new file mode 100644 index 0000000..e4877a4 Binary files /dev/null and b/src/images/icon30.png differ diff --git a/src/images/icon31.png b/src/images/icon31.png new file mode 100644 index 0000000..fdec640 Binary files /dev/null and b/src/images/icon31.png differ diff --git a/src/images/icon32.png b/src/images/icon32.png new file mode 100644 index 0000000..ade313e Binary files /dev/null and b/src/images/icon32.png differ diff --git a/src/images/icon33.png b/src/images/icon33.png new file mode 100644 index 0000000..87b84db Binary files /dev/null and b/src/images/icon33.png differ diff --git a/src/images/icon34.png b/src/images/icon34.png new file mode 100644 index 0000000..478a8c0 Binary files /dev/null and b/src/images/icon34.png differ diff --git a/src/images/icon35.png b/src/images/icon35.png new file mode 100644 index 0000000..5c0646e Binary files /dev/null and b/src/images/icon35.png differ diff --git a/src/images/icon36.png b/src/images/icon36.png new file mode 100644 index 0000000..8ff1790 Binary files /dev/null and b/src/images/icon36.png differ diff --git a/src/images/icon37.png b/src/images/icon37.png new file mode 100644 index 0000000..c512770 Binary files /dev/null and b/src/images/icon37.png differ diff --git a/src/images/icon38.png b/src/images/icon38.png new file mode 100644 index 0000000..0c7ce8e Binary files /dev/null and b/src/images/icon38.png differ diff --git a/src/images/icon39.png b/src/images/icon39.png new file mode 100644 index 0000000..f49c105 Binary files /dev/null and b/src/images/icon39.png differ diff --git a/src/images/icon40.png b/src/images/icon40.png new file mode 100644 index 0000000..f54e777 Binary files /dev/null and b/src/images/icon40.png differ diff --git a/src/images/icon41.png b/src/images/icon41.png new file mode 100644 index 0000000..35cf88e Binary files /dev/null and b/src/images/icon41.png differ diff --git a/src/images/icon42.png b/src/images/icon42.png new file mode 100644 index 0000000..6a4be30 Binary files /dev/null and b/src/images/icon42.png differ diff --git a/src/images/icon43.png b/src/images/icon43.png new file mode 100644 index 0000000..85768b7 Binary files /dev/null and b/src/images/icon43.png differ diff --git a/src/images/icon44.png b/src/images/icon44.png new file mode 100644 index 0000000..957a2d3 Binary files /dev/null and b/src/images/icon44.png differ diff --git a/src/images/logo2.png b/src/images/logo2.png new file mode 100644 index 0000000..e8d5929 Binary files /dev/null and b/src/images/logo2.png differ diff --git a/src/images/tabbar/tab-active4.png b/src/images/tabbar/tab-active4.png new file mode 100644 index 0000000..3894dc2 Binary files /dev/null and b/src/images/tabbar/tab-active4.png differ diff --git a/src/images/tabbar/tab-active5.png b/src/images/tabbar/tab-active5.png new file mode 100644 index 0000000..d0cfb89 Binary files /dev/null and b/src/images/tabbar/tab-active5.png differ diff --git a/src/images/tabbar/tab4.png b/src/images/tabbar/tab4.png new file mode 100644 index 0000000..026a1e6 Binary files /dev/null and b/src/images/tabbar/tab4.png differ diff --git a/src/images/tabbar/tab5.png b/src/images/tabbar/tab5.png new file mode 100644 index 0000000..dbb0a7b Binary files /dev/null and b/src/images/tabbar/tab5.png differ diff --git a/src/images/title6.png b/src/images/title6.png new file mode 100644 index 0000000..327e324 Binary files /dev/null and b/src/images/title6.png differ diff --git a/src/patient/pages/cancellation/index.json b/src/patient/pages/cancellation/index.json index c70e319..a10316d 100644 --- a/src/patient/pages/cancellation/index.json +++ b/src/patient/pages/cancellation/index.json @@ -1,6 +1,6 @@ { - "navigationBarTitleText": "", - "navigationStyle": "custom", + "navigationBarTitleText": "注销账号", + "navigationStyle": "default", "usingComponents": { "navBar": "/components/zd-navBar/navBar" } diff --git a/src/patient/pages/cancellation/index.scss b/src/patient/pages/cancellation/index.scss index 2e5974d..48a3d8b 100644 --- a/src/patient/pages/cancellation/index.scss +++ b/src/patient/pages/cancellation/index.scss @@ -1,48 +1,44 @@ -page { - background-color: #afb7cb; -} -.page { - height: 100vh; - display: flex; - flex-direction: column; - .container { - padding: 76rpx 48rpx 58rpx; - flex: 1; - margin-top: 160rpx; - box-sizing: border-box; - border-radius: 48rpx 48rpx 0 0; - background-color: #fff; - text-align: center; - display: flex; - flex-direction: column; - justify-content: space-between; - .icon { - width: 256rpx; - height: 256rpx; - } - .title { - margin-top: 51rpx; - font-size: 48rpx; - color: #495069; - font-weight: bold; - } - .tip { - text-align: left; - margin-top: 44rpx; - font-size: 30rpx; - line-height: 53rpx; - color: #aeb7cd; - } - .footer { - .rescan { - width: 100%; - height: 80rpx; - text-align: center; - color: #fff; - line-height: 80rpx; - background: #B8BFD1; - border-radius: 42rpx; - } - } - } -} +page { + background-color: rgba(246, 248, 249, 1); +} +.page { + height: 100vh; + .container { + padding: 84rpx 40rpx 0; + text-align: center; + display: flex; + flex-direction: column; + justify-content: space-between; + .icon { + width: 128rpx; + height: 128rpx; + } + .title { + margin-top: 51rpx; + font-size: 36rpx; + color: rgba(0, 0, 0, 1); + font-weight: bold; + } + .tip { + margin-top: 48rpx; + padding: 32rpx; + font-size: 32rpx; + line-height: 48rpx; + border-radius: 24rpx; + color: rgba(173, 172, 178, 1); + background-color: #fff; + } + .footer { + margin-top: 80rpx; + .rescan { + width: 100%; + height: 88rpx; + text-align: center; + color: #fff; + line-height: 88rpx; + background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%); + border-radius: 42rpx; + } + } + } +} diff --git a/src/patient/pages/cancellation/index.wxml b/src/patient/pages/cancellation/index.wxml index 22fb617..62bd718 100644 --- a/src/patient/pages/cancellation/index.wxml +++ b/src/patient/pages/cancellation/index.wxml @@ -1,13 +1,8 @@ -