From dc787fb883413f3c352b1672d361107645b15e76 Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Fri, 8 Dec 2023 15:03:37 +0800 Subject: [PATCH] pages --- README.md | 2 +- package.json | 4 + pnpm-lock.yaml | 87 ++++++++++++- src/App.vue | 5 +- src/components/rank.vue | 64 +++++++++ src/main.js | 2 + src/manifest.json | 135 ++++++++++--------- src/pages.json | 85 +++++++++++- src/pages/article/detail.vue | 37 ++++++ src/pages/auth/login.vue | 88 +++++++++++++ src/pages/feedback/add.vue | 51 ++++++++ src/pages/index/index.vue | 134 ++++++++++++++++--- src/pages/score/category.vue | 89 +++++++++++++ src/pages/score/form.vue | 134 +++++++++++++++++++ src/pages/score/user-rank.vue | 51 ++++++++ src/pages/user/profile.vue | 210 ++++++++++++++++++++++++++++++ src/static/css/base.css | 18 +++ src/static/images/arrow-right.png | Bin 0 -> 2220 bytes src/static/images/form-active.png | Bin 0 -> 3279 bytes src/static/images/form.png | Bin 0 -> 3256 bytes src/static/images/home-active.png | Bin 0 -> 3250 bytes src/static/images/home.png | Bin 0 -> 3298 bytes src/static/{ => images}/logo.png | Bin src/static/images/user-active.png | Bin 0 -> 5171 bytes src/static/images/user.png | Bin 0 -> 5069 bytes src/uni.scss | 2 +- vue.config.js | 3 + 27 files changed, 1105 insertions(+), 96 deletions(-) create mode 100644 src/components/rank.vue create mode 100644 src/pages/article/detail.vue create mode 100644 src/pages/auth/login.vue create mode 100644 src/pages/feedback/add.vue create mode 100644 src/pages/score/category.vue create mode 100644 src/pages/score/form.vue create mode 100644 src/pages/score/user-rank.vue create mode 100644 src/pages/user/profile.vue create mode 100644 src/static/css/base.css create mode 100644 src/static/images/arrow-right.png create mode 100644 src/static/images/form-active.png create mode 100644 src/static/images/form.png create mode 100644 src/static/images/home-active.png create mode 100644 src/static/images/home.png rename src/static/{ => images}/logo.png (100%) create mode 100644 src/static/images/user-active.png create mode 100644 src/static/images/user.png create mode 100644 vue.config.js diff --git a/README.md b/README.md index b49d04c..867a0a6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# uniapp +# 五星党建 ## Project setup ``` diff --git a/package.json b/package.json index ddafe6f..6c32ec8 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,9 @@ "@dcloudio/uni-stat": "^2.0.2-3061420221215001", "@vue/shared": "^3.0.0", "core-js": "^3.8.3", + "echarts": "^5.4.3", "flyio": "^0.6.2", + "uview-ui": "2.0.36", "vue": ">= 2.6.14 < 2.7", "vuex": "^3.2.0" }, @@ -92,6 +94,8 @@ "cross-env": "^7.0.2", "jest": "^25.4.0", "postcss-comment": "^2.0.0", + "sass": "^1.69.5", + "sass-loader": "10", "vue-template-compiler": ">= 2.6.14 < 2.7" }, "browserslist": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d1d85a6..d859d3c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -68,9 +68,15 @@ dependencies: core-js: specifier: ^3.8.3 version: 3.8.3 + echarts: + specifier: ^5.4.3 + version: 5.4.3 flyio: specifier: ^0.6.2 version: 0.6.2 + uview-ui: + specifier: 2.0.36 + version: 2.0.36 vue: specifier: '>= 2.6.14 < 2.7' version: 2.6.14 @@ -120,7 +126,7 @@ devDependencies: version: 5.0.0(@vue/cli-service@5.0.1)(core-js@3.8.3)(vue@2.6.14) '@vue/cli-service': specifier: ~5.0.0 - version: 5.0.1(vue-template-compiler@2.6.14)(vue@2.6.14) + version: 5.0.1(sass-loader@10.5.0)(vue-template-compiler@2.6.14)(vue@2.6.14) babel-plugin-import: specifier: ^1.11.0 version: 1.11.0 @@ -133,6 +139,12 @@ devDependencies: postcss-comment: specifier: ^2.0.0 version: 2.0.0 + sass: + specifier: ^1.69.5 + version: 1.69.5 + sass-loader: + specifier: '10' + version: 10.5.0(sass@1.69.5)(webpack@4.47.0) vue-template-compiler: specifier: '>= 2.6.14 < 2.7' version: 2.6.14 @@ -2915,7 +2927,7 @@ packages: dependencies: '@babel/core': 7.23.5 '@vue/babel-preset-app': 5.0.8(@babel/core@7.23.5)(core-js@3.8.3)(vue@2.6.14) - '@vue/cli-service': 5.0.1(vue-template-compiler@2.6.14)(vue@2.6.14) + '@vue/cli-service': 5.0.1(sass-loader@10.5.0)(vue-template-compiler@2.6.14)(vue@2.6.14) '@vue/cli-shared-utils': 5.0.8 babel-loader: 8.3.0(@babel/core@7.23.5)(webpack@5.89.0) thread-loader: 3.0.4(webpack@5.89.0) @@ -2936,7 +2948,7 @@ packages: peerDependencies: '@vue/cli-service': ^3.0.0 || ^4.0.0 || ^5.0.0-0 dependencies: - '@vue/cli-service': 5.0.1(vue-template-compiler@2.6.14)(vue@2.6.14) + '@vue/cli-service': 5.0.1(sass-loader@10.5.0)(vue-template-compiler@2.6.14)(vue@2.6.14) '@vue/cli-shared-utils': 5.0.8 transitivePeerDependencies: - encoding @@ -2947,10 +2959,10 @@ packages: peerDependencies: '@vue/cli-service': ^3.0.0 || ^4.0.0 || ^5.0.0-0 dependencies: - '@vue/cli-service': 5.0.1(vue-template-compiler@2.6.14)(vue@2.6.14) + '@vue/cli-service': 5.0.1(sass-loader@10.5.0)(vue-template-compiler@2.6.14)(vue@2.6.14) dev: true - /@vue/cli-service@5.0.1(vue-template-compiler@2.6.14)(vue@2.6.14): + /@vue/cli-service@5.0.1(sass-loader@10.5.0)(vue-template-compiler@2.6.14)(vue@2.6.14): resolution: {integrity: sha512-lhTW1d8waZv1VaRSvhE5pWWfkdmAgRTRSluDfyxkehZHMAWi//rd7a9zppN3k9Zr4X3oYVii+u7wR/RcTlr9cQ==} engines: {node: ^12.0.0 || >= 14.0.0} hasBin: true @@ -3024,6 +3036,7 @@ packages: postcss: 8.4.32 postcss-loader: 6.2.1(postcss@8.4.32)(webpack@5.89.0) progress-webpack-plugin: 1.0.16(webpack@5.89.0) + sass-loader: 10.5.0(sass@1.69.5)(webpack@4.47.0) ssri: 8.0.1 terser-webpack-plugin: 5.3.9(webpack@5.89.0) thread-loader: 3.0.4(webpack@5.89.0) @@ -4056,6 +4069,7 @@ packages: /binary-extensions@2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} + requiresBuild: true /bindings@1.5.0: resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==} @@ -5601,6 +5615,13 @@ packages: jsbn: 0.1.1 safer-buffer: 2.1.2 + /echarts@5.4.3: + resolution: {integrity: sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==} + dependencies: + tslib: 2.3.0 + zrender: 5.4.4 + dev: false + /ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} @@ -6798,6 +6819,10 @@ packages: resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==} dev: false + /immutable@4.3.4: + resolution: {integrity: sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==} + dev: true + /import-fresh@3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} engines: {node: '>=6'} @@ -6909,6 +6934,7 @@ packages: /is-binary-path@2.1.0: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} + requiresBuild: true dependencies: binary-extensions: 2.2.0 @@ -9803,6 +9829,7 @@ packages: /readdirp@3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} + requiresBuild: true dependencies: picomatch: 2.3.1 @@ -10124,6 +10151,41 @@ packages: - supports-color dev: true + /sass-loader@10.5.0(sass@1.69.5)(webpack@4.47.0): + resolution: {integrity: sha512-VsU71W7VR6SChMJZUqtrfLeMSA8ns7QTHbnA7cfevtjb3c392mX93lr0Dmr4uU1ch5uIbEmfmHjdrDYcXXkQ7w==} + engines: {node: '>= 10.13.0'} + peerDependencies: + fibers: '>= 3.1.0' + node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 + sass: ^1.3.0 + webpack: ^4.36.0 || ^5.0.0 + peerDependenciesMeta: + fibers: + optional: true + node-sass: + optional: true + sass: + optional: true + dependencies: + klona: 2.0.6 + loader-utils: 2.0.4 + neo-async: 2.6.2 + sass: 1.69.5 + schema-utils: 3.3.0 + semver: 7.5.4 + webpack: 4.47.0 + dev: true + + /sass@1.69.5: + resolution: {integrity: sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==} + engines: {node: '>=14.0.0'} + hasBin: true + dependencies: + chokidar: 3.5.3 + immutable: 4.3.4 + source-map-js: 1.0.2 + dev: true + /sax@1.3.0: resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==} dev: true @@ -11084,6 +11146,10 @@ packages: punycode: 2.3.1 dev: true + /tslib@2.3.0: + resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==} + dev: false + /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: true @@ -11327,6 +11393,11 @@ packages: hasBin: true dev: true + /uview-ui@2.0.36: + resolution: {integrity: sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA==} + engines: {HBuilderX: ^3.1.0} + dev: false + /v8-to-istanbul@4.1.4: resolution: {integrity: sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==} engines: {node: 8.x.x || >=10.10.0} @@ -12154,3 +12225,9 @@ packages: resolution: {integrity: sha512-RXRJzMiK6U2ye0BlGGZnmpwJDPgakn6aNQ0A7gHRbD4I0uvK4TW6UqkK1V0pp9jskjJBAXd3dRrbzWkqJ+6cxA==} engines: {node: '>= 4.0.0'} dev: false + + /zrender@5.4.4: + resolution: {integrity: sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==} + dependencies: + tslib: 2.3.0 + dev: false diff --git a/src/App.vue b/src/App.vue index 8c2b732..5e1b42b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,6 +12,7 @@ } - diff --git a/src/components/rank.vue b/src/components/rank.vue new file mode 100644 index 0000000..a763967 --- /dev/null +++ b/src/components/rank.vue @@ -0,0 +1,64 @@ + + + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 20883fb..7feb7a6 100644 --- a/src/main.js +++ b/src/main.js @@ -1,8 +1,10 @@ import Vue from 'vue' import App from './App' import './uni.promisify.adaptor' +import uView from 'uview-ui' Vue.config.productionTip = false +Vue.use(uView) App.mpType = 'app' diff --git a/src/manifest.json b/src/manifest.json index 972bd1e..031f380 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,66 +1,67 @@ { - "name": "", - "appid": "", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - "app-plus": { /* 5+App特有相关 */ - "usingComponents": true, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": { /* 模块配置 */ - - }, - "distribute": { /* 应用发布信息 */ - "android": { /* android打包配置 */ - "permissions": ["", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "ios": { /* ios打包配置 */ - - }, - "sdkConfigs": { /* SDK配置 */ - - } - } - }, - "quickapp": { /* 快应用特有相关 */ - - }, - "mp-weixin": { /* 微信小程序特有相关 */ - "appid": "", - "setting": { - "urlCheck": false - }, - "usingComponents": true - }, - "mp-alipay" : { + "name" : "PartyRank", + "appid" : "__UNI__828F200", + "description" : "五星党建", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, + "app-plus" : { + /* 5+App特有相关 */ + "usingComponents" : true, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "modules" : {}, + /* 模块配置 */ + "distribute" : { + /* 应用发布信息 */ + "android" : { + /* android打包配置 */ + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + "ios" : {}, + /* ios打包配置 */ + "sdkConfigs" : {} + } + }, + /* SDK配置 */ + "quickapp" : {}, + /* 快应用特有相关 */ + "mp-weixin" : { + /* 微信小程序特有相关 */ + "appid" : "", + "setting" : { + "urlCheck" : false + }, + "usingComponents" : true + }, + "mp-alipay" : { "usingComponents" : true }, "mp-baidu" : { @@ -71,5 +72,15 @@ }, "mp-qq" : { "usingComponents" : true + }, + "h5" : { + "title" : "五星党建", + "router" : { + "mode" : "history", + "base" : "/h5/" + }, + "devServer" : { + "https" : false + } } } diff --git a/src/pages.json b/src/pages.json index 1aea851..884bcd9 100644 --- a/src/pages.json +++ b/src/pages.json @@ -3,14 +3,89 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "uni-app" + "navigationBarTitleText": "五星党建" + } + }, + { + "path": "pages/auth/login", + "style": { + "navigationBarTitleText": "登录" + } + }, + { + "path" : "pages/score/category", + "style" : + { + "navigationBarTitleText" : "填报" + } + }, + { + "path" : "pages/score/form", + "style" : + { + "navigationBarTitleText" : "填报" + } + }, + { + "path" : "pages/score/user-rank", + "style" : + { + "navigationBarTitleText" : "排行榜" + } + }, + { + "path" : "pages/user/profile", + "style" : + { + "navigationBarTitleText" : "个人中心", + "navigationBarBackgroundColor": "white", + "navigationBarTextStyle": "black" + } + }, + { + "path" : "pages/article/detail", + "style" : + { + "navigationBarTitleText" : "文章详细" + } + }, + { + "path" : "pages/feedback/add", + "style" : + { + "navigationBarTitleText" : "书记信箱" } } ], + "tabBar": { + "backgroundColor": "#FFFFFF", + "color": "#B2B2B2", + "selectedColor": "#C20000", + "borderStyle": "white", + "list": [{ + "pagePath": "pages/index/index", + "iconPath": "static/images/home.png", + "selectedIconPath": "static/images/home-active.png", + "text": "首页" + }, { + "pagePath": "pages/score/category", + "iconPath": "static/images/form.png", + "selectedIconPath": "static/images/form-active.png", + "text": "填报" + }, { + "pagePath": "pages/user/profile", + "iconPath": "static/images/user.png", + "selectedIconPath": "static/images/user-active.png", + "text": "我的" + }] + }, "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" + "navigationBarTextStyle": "white", + "navigationBarTitleText": "五星党建", + "navigationBarBackgroundColor": "#C20000", + "backgroundColor": "#efefef" + }, + "easycom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" } } diff --git a/src/pages/article/detail.vue b/src/pages/article/detail.vue new file mode 100644 index 0000000..c0c485e --- /dev/null +++ b/src/pages/article/detail.vue @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file diff --git a/src/pages/auth/login.vue b/src/pages/auth/login.vue new file mode 100644 index 0000000..aa68760 --- /dev/null +++ b/src/pages/auth/login.vue @@ -0,0 +1,88 @@ + + + + + \ No newline at end of file diff --git a/src/pages/feedback/add.vue b/src/pages/feedback/add.vue new file mode 100644 index 0000000..df18e0e --- /dev/null +++ b/src/pages/feedback/add.vue @@ -0,0 +1,51 @@ +