From 9a051da32eebb2b24be8e86a6f0677242cf6309e Mon Sep 17 00:00:00 2001 From: Hx <2294602187@qq.com> Date: Thu, 27 Mar 2025 17:34:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 12 +- src/components/ex-list/ex-list.vue | 147 ---------- src/manifest.json | 165 +++++------ src/pages.json | 26 +- src/pages/electionList/index.vue | 76 ++---- src/pages/electionList/info.vue | 162 +++++++++++ src/pages/electionResults/index.vue | 199 +++++++++++++- src/pages/index/guide.vue | 112 -------- src/pages/mine/add.vue | 107 ++++++++ src/pages/mine/index.vue | 406 ++++++++++------------------ src/pages/votingElection/index.vue | 64 ++--- 11 files changed, 772 insertions(+), 704 deletions(-) delete mode 100644 src/components/ex-list/ex-list.vue create mode 100644 src/pages/electionList/info.vue delete mode 100644 src/pages/index/guide.vue create mode 100644 src/pages/mine/add.vue diff --git a/src/App.vue b/src/App.vue index b95142e..ad899f7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,13 +8,13 @@ onLaunch(() => { // routingIntercept() -}) +}); onShow(() => { - console.log('App Show') -}) + console.log("App Show"); +}); onHide(() => { - console.log('App Hide') -}) + console.log("App Hide"); +}); // 全局变量 // provide('globalObj', { // // 公用跳转方法 @@ -25,5 +25,5 @@ onHide(() => { diff --git a/src/components/ex-list/ex-list.vue b/src/components/ex-list/ex-list.vue deleted file mode 100644 index 8d86195..0000000 --- a/src/components/ex-list/ex-list.vue +++ /dev/null @@ -1,147 +0,0 @@ - - - - - diff --git a/src/manifest.json b/src/manifest.json index 80d5370..d6e3cd4 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,38 +1,38 @@ { - "name" : "新未来", - "appid" : "__UNI__1AE1F37", - "description" : "v3+ts+uniapp模版", - "versionName" : "1.0.68", - "versionCode" : 168, - "transformPx" : false, + "name": "问卷系统", + "appid": "__UNI__1AE1F37", + "description": "v3+ts+uniapp模版", + "versionName": "1.0.68", + "versionCode": 168, + "transformPx": false, /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 }, - "compatible" : { - "ignoreVersion" : true + "compatible": { + "ignoreVersion": true }, /* 模块配置 */ - "modules" : { - "Barcode" : {}, - "Camera" : {}, - "VideoPlayer" : {}, - "Share" : {}, - "Geolocation" : {}, - "Maps" : {} + "modules": { + "Barcode": {}, + "Camera": {}, + "VideoPlayer": {}, + "Share": {}, + "Geolocation": {}, + "Maps": {} }, /* 应用发布信息 */ - "distribute" : { + "distribute": { /* android打包配置 */ - "android" : { - "permissions" : [ + "android": { + "permissions": [ "", "", "", @@ -49,83 +49,86 @@ "", "" ], - "minSdkVersion" : 21 + "minSdkVersion": 21 }, /* ios打包配置 */ - "ios" : { - "dSYMs" : false + "ios": { + "dSYMs": false }, /* SDK配置 */ - "sdkConfigs" : { - "ad" : {}, - "share" : { - "weixin" : { - "appid" : "wxd448c878a54da98d", - "UniversalLinks" : "" + "sdkConfigs": { + "ad": {}, + "share": { + "weixin": { + "appid": "wxd448c878a54da98d", + "UniversalLinks": "" } }, - "geolocation" : { - "amap" : { - "name" : "amap_18648278829CcsBXVUm1", - "__platform__" : [ "ios", "android" ], - "appkey_ios" : "435934cdfcc901e4872a70391d92cccd", - "appkey_android" : "435934cdfcc901e4872a70391d92cccd" + "geolocation": { + "amap": { + "name": "amap_18648278829CcsBXVUm1", + "__platform__": [ + "ios", + "android" + ], + "appkey_ios": "435934cdfcc901e4872a70391d92cccd", + "appkey_android": "435934cdfcc901e4872a70391d92cccd" } }, - "maps" : { - "amap" : { - "name" : "amap_18648278829CcsBXVUm1", - "appkey_ios" : "435934cdfcc901e4872a70391d92cccd", - "appkey_android" : "435934cdfcc901e4872a70391d92cccd" + "maps": { + "amap": { + "name": "amap_18648278829CcsBXVUm1", + "appkey_ios": "435934cdfcc901e4872a70391d92cccd", + "appkey_android": "435934cdfcc901e4872a70391d92cccd" } } }, - "icons" : { - "android" : { - "hdpi" : "src/static/logo.png", - "xhdpi" : "src/static/logo.png", - "xxhdpi" : "src/static/logo.png", - "xxxhdpi" : "src/static/logo.png" + "icons": { + "android": { + "hdpi": "src/static/logo.png", + "xhdpi": "src/static/logo.png", + "xxhdpi": "src/static/logo.png", + "xxxhdpi": "src/static/logo.png" } }, - "splashscreen" : { - "iosStyle" : "common", - "androidStyle" : "default", - "android" : { - "hdpi" : "C:/Users/Lenovo/Desktop/480x762.9/res/drawable-xhdpi/480x762.9.png", - "xhdpi" : "C:/Users/Lenovo/Desktop/720x1242.9/res/drawable-xhdpi/720x1242.9.png", - "xxhdpi" : "C:/Users/Lenovo/Desktop/1080x1882.9/res/drawable-xhdpi/1080x1882.9.png" + "splashscreen": { + "iosStyle": "common", + "androidStyle": "default", + "android": { + "hdpi": "C:/Users/Lenovo/Desktop/480x762.9/res/drawable-xhdpi/480x762.9.png", + "xhdpi": "C:/Users/Lenovo/Desktop/720x1242.9/res/drawable-xhdpi/720x1242.9.png", + "xxhdpi": "C:/Users/Lenovo/Desktop/1080x1882.9/res/drawable-xhdpi/1080x1882.9.png" }, - "ios" : { - "storyboard" : "C:/Users/Lenovo/Desktop/CustomStoryboard.zip" + "ios": { + "storyboard": "C:/Users/Lenovo/Desktop/CustomStoryboard.zip" } } } }, /* 快应用特有相关 */ - "quickapp" : {}, + "quickapp": {}, /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "", - "setting" : { - "urlCheck" : false, - "es6" : true, - "postcss" : false, - "minified" : true + "mp-weixin": { + "appid": "", + "setting": { + "urlCheck": false, + "es6": true, + "postcss": false, + "minified": true }, - "usingComponents" : true + "usingComponents": true }, - "mp-alipay" : { - "usingComponents" : true + "mp-alipay": { + "usingComponents": true }, - "mp-baidu" : { - "usingComponents" : true + "mp-baidu": { + "usingComponents": true }, - "mp-toutiao" : { - "usingComponents" : true + "mp-toutiao": { + "usingComponents": true }, - "uniStatistics" : { - "enable" : false + "uniStatistics": { + "enable": false }, - "vueVersion" : "3" -} + "vueVersion": "3" +} \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index c982b41..cc6864f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -18,6 +18,13 @@ "path": "pages/electionList/index", "style": { "navigationBarTitleText": "选举列表", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/electionList/info", + "style": { + "navigationBarTitleText": "选举结果详情", "enablePullDownRefresh": false } }, @@ -46,28 +53,25 @@ } }, { - "name": "guide", - "path": "pages/index/guide", + "name": "user", + "path": "pages/mine/index", "style": { - "navigationBarTitleText": "用户指南", - "enablePullDownRefresh": false, - "navigationStyle": "custom" + "navigationBarTitleText": "个人信息", + "enablePullDownRefresh": true } }, { "name": "user", - "path": "pages/mine/index", + "path": "pages/mine/add", "style": { "navigationBarTitleText": "个人信息", - "enablePullDownRefresh": false, - "navigationStyle": "custom" + "enablePullDownRefresh": false } } ], "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#2563EB", "backgroundColor": "#F8F8F8" }, "tabBar": { diff --git a/src/pages/electionList/index.vue b/src/pages/electionList/index.vue index 197b0e5..e3f7045 100644 --- a/src/pages/electionList/index.vue +++ b/src/pages/electionList/index.vue @@ -1,83 +1,65 @@ diff --git a/src/pages/electionResults/index.vue b/src/pages/electionResults/index.vue index 243ce38..c17b743 100644 --- a/src/pages/electionResults/index.vue +++ b/src/pages/electionResults/index.vue @@ -1,7 +1,200 @@ + + - + + &-bts { + padding: 16rpx; + margin: 48rpx 0 24rpx; + font-size: 28rpx; + font-weight: normal; + line-height: 42rpx; + text-align: center; + color: #ffffff; + background-color: #2563eb; + border-radius: 8rpx; + } + } + } +} + diff --git a/src/pages/index/guide.vue b/src/pages/index/guide.vue deleted file mode 100644 index 3a4351a..0000000 --- a/src/pages/index/guide.vue +++ /dev/null @@ -1,112 +0,0 @@ - - - - diff --git a/src/pages/mine/add.vue b/src/pages/mine/add.vue new file mode 100644 index 0000000..6d9e220 --- /dev/null +++ b/src/pages/mine/add.vue @@ -0,0 +1,107 @@ + + + + diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index 628e05c..bee1473 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -1,313 +1,195 @@