From 5c2befa7986b211f29363beb1b8e6534a078e361 Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Wed, 24 Jul 2024 18:42:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 4 + components/privacyRadion/privacyRadion.vue | 2 +- config/api.js | 6 + config/request.js | 15 +- config/site.config.js | 4 +- manifest.json | 35 +- mp_ecard_sdk/constants/log.js | 1 + mp_ecard_sdk/globalConfig.js | 1 + mp_ecard_sdk/index.css | 1 + mp_ecard_sdk/index/index.js | 1 + mp_ecard_sdk/index/index.vue | 24 + mp_ecard_sdk/main.js | 1 + mp_ecard_sdk/utils/http.js | 1 + mp_ecard_sdk/utils/index.js | 1 + mp_ecard_sdk/utils/validate.js | 1 + pages.json | 184 +++-- pages/subPage/authentication/authentication.vue | 165 ++++- pages/subPage/authentication/comp/select1.vue | 47 +- pages/subPage/authentication/comp/select2.vue | 45 +- pages/subPage/authentication/comp/select3.vue | 48 +- pages/subPage/ballots/ballotsList/ballotsList.vue | 151 ++++ pages/subPage/ballots/vote/vote.vue | 11 + pages/subPage/login/login - 副本.vue | 194 +++++ pages/subPage/login/login.vue | 253 ++++--- pages/subPage/login/loginwx.vue | 11 +- pages/tabbar/index/comp/notice.vue | 11 +- pages/tabbar/index/index.vue | 53 +- pages/tabbar/mine/mine.vue | 29 +- static/images/bigImg/homebanner.png | Bin 0 -> 646893 bytes static/images/bigImg/homebanner2.png | Bin 0 -> 307047 bytes static/images/bigImg/homebanner3.png | Bin 0 -> 106842 bytes static/images/bigImg/minebg.png | Bin 0 -> 223252 bytes static/images/okIcon.png | Bin 0 -> 6288 bytes store/index.js | 44 +- unpackage/dist/dev/mp-weixin/app.js | 14 +- unpackage/dist/dev/mp-weixin/app.json | 12 +- unpackage/dist/dev/mp-weixin/common/assets.js | 12 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 815 +++++++++++++++++---- .../components/privacyRadion/privacyRadion.js | 3 +- unpackage/dist/dev/mp-weixin/config/api.js | 14 + unpackage/dist/dev/mp-weixin/config/request.js | 8 +- unpackage/dist/dev/mp-weixin/config/site.config.js | 2 +- .../dev/mp-weixin/mp_ecard_sdk/constants/log.js | 3 + .../dev/mp-weixin/mp_ecard_sdk/globalConfig.js | 3 + .../dist/dev/mp-weixin/mp_ecard_sdk/index/index.js | 22 + .../dev/mp-weixin/mp_ecard_sdk/index/index.json | 4 + .../dev/mp-weixin/mp_ecard_sdk/index/index.wxml | 1 + .../dev/mp-weixin/mp_ecard_sdk/index/index.wxss | 1 + unpackage/dist/dev/mp-weixin/mp_ecard_sdk/main.js | 38 + .../dist/dev/mp-weixin/mp_ecard_sdk/utils/index.js | 23 + .../dev/mp-weixin/mp_ecard_sdk/utils/validate.js | 6 + .../pages/subPage/authentication/authentication.js | 284 ++++++- .../subPage/authentication/authentication.wxml | 2 +- .../subPage/authentication/authentication.wxss | 28 +- .../pages/subPage/authentication/comp/select1.js | 181 ++++- .../pages/subPage/authentication/comp/select1.json | 4 +- .../pages/subPage/authentication/comp/select1.wxml | 2 +- .../pages/subPage/authentication/comp/select2.js | 177 ++++- .../pages/subPage/authentication/comp/select2.json | 4 +- .../pages/subPage/authentication/comp/select2.wxml | 2 +- .../pages/subPage/authentication/comp/select3.js | 186 ++++- .../pages/subPage/authentication/comp/select3.wxml | 2 +- .../subPage/ballots/ballotsList/ballotsList.js | 59 ++ .../subPage/ballots/ballotsList/ballotsList.json | 8 + .../subPage/ballots/ballotsList/ballotsList.wxml | 1 + .../subPage/ballots/ballotsList/ballotsList.wxss | 104 +++ .../mp-weixin/pages/subPage/ballots/vote/vote.js | 8 + .../mp-weixin/pages/subPage/ballots/vote/vote.json | 6 + .../mp-weixin/pages/subPage/ballots/vote/vote.wxml | 1 + .../mp-weixin/pages/subPage/ballots/vote/vote.wxss | 0 .../dev/mp-weixin/pages/subPage/login/login.js | 155 ++-- .../dev/mp-weixin/pages/subPage/login/login.wxml | 2 +- .../dev/mp-weixin/pages/subPage/login/login.wxss | 2 +- .../dev/mp-weixin/pages/subPage/login/loginwx.js | 215 ------ .../dev/mp-weixin/pages/subPage/login/loginwx.json | 9 - .../dev/mp-weixin/pages/subPage/login/loginwx.wxml | 1 - .../dev/mp-weixin/pages/subPage/login/loginwx.wxss | 99 --- .../subPage/privacyAgreement/privacyAgreement.js | 158 ++++ .../subPage/privacyAgreement/privacyAgreement.json | 6 + .../subPage/privacyAgreement/privacyAgreement.wxml | 1 + .../subPage/privacyAgreement/privacyAgreement.wxss | 0 .../mp-weixin/pages/tabbar/index/comp/notice.js | 16 +- .../mp-weixin/pages/tabbar/index/comp/notice.wxml | 2 +- .../dist/dev/mp-weixin/pages/tabbar/index/index.js | 263 +++++-- .../dev/mp-weixin/pages/tabbar/index/index.json | 4 +- .../dev/mp-weixin/pages/tabbar/index/index.wxml | 2 +- .../dist/dev/mp-weixin/pages/tabbar/mine/mine.js | 60 +- .../dist/dev/mp-weixin/pages/tabbar/mine/mine.wxml | 2 +- .../dist/dev/mp-weixin/pages/tabbar/mine/mine.wxss | 2 - unpackage/dist/dev/mp-weixin/project.config.json | 6 +- .../mp-weixin/static/images/bigImg/homebanner.png | Bin 0 -> 646893 bytes .../mp-weixin/static/images/bigImg/homebanner2.png | Bin 0 -> 307047 bytes .../mp-weixin/static/images/bigImg/homebanner3.png | Bin 0 -> 106842 bytes .../dev/mp-weixin/static/images/bigImg/minebg.png | Bin 0 -> 223252 bytes .../dist/dev/mp-weixin/static/images/okIcon.png | Bin 0 -> 6288 bytes unpackage/dist/dev/mp-weixin/store/index.js | 48 ++ .../uview-plus/components/u-badge/props.js | 81 ++ .../uview-plus/components/u-badge/u-badge.js | 162 ++++ .../uview-plus/components/u-badge/u-badge.json | 4 + .../uview-plus/components/u-badge/u-badge.wxml | 1 + .../uview-plus/components/u-badge/u-badge.wxss | 98 +++ .../uview-plus/components/u-input/props.js | 190 ----- .../uview-plus/components/u-input/u-input.js | 327 --------- .../uview-plus/components/u-input/u-input.json | 6 - .../uview-plus/components/u-input/u-input.wxml | 1 - .../uview-plus/components/u-input/u-input.wxss | 105 --- .../uview-plus/components/u-tabs/props.js | 68 ++ .../uview-plus/components/u-tabs/u-tabs.js | 303 ++++++++ .../uview-plus/components/u-tabs/u-tabs.json | 6 + .../uview-plus/components/u-tabs/u-tabs.wxml | 1 + .../uview-plus/components/u-tabs/u-tabs.wxss | 97 +++ .../uni_modules/uview-plus/libs/function/index.js | 1 + 112 files changed, 4152 insertions(+), 1736 deletions(-) create mode 100644 mp_ecard_sdk/constants/log.js create mode 100644 mp_ecard_sdk/globalConfig.js create mode 100644 mp_ecard_sdk/index.css create mode 100644 mp_ecard_sdk/index/index.js create mode 100644 mp_ecard_sdk/index/index.vue create mode 100644 mp_ecard_sdk/main.js create mode 100644 mp_ecard_sdk/utils/http.js create mode 100644 mp_ecard_sdk/utils/index.js create mode 100644 mp_ecard_sdk/utils/validate.js create mode 100644 pages/subPage/ballots/ballotsList/ballotsList.vue create mode 100644 pages/subPage/ballots/vote/vote.vue create mode 100644 pages/subPage/login/login - 副本.vue create mode 100644 static/images/bigImg/homebanner.png create mode 100644 static/images/bigImg/homebanner2.png create mode 100644 static/images/bigImg/homebanner3.png create mode 100644 static/images/bigImg/minebg.png create mode 100644 static/images/okIcon.png create mode 100644 unpackage/dist/dev/mp-weixin/mp_ecard_sdk/constants/log.js create mode 100644 unpackage/dist/dev/mp-weixin/mp_ecard_sdk/globalConfig.js create mode 100644 unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.js create mode 100644 unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.json create mode 100644 unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxml create mode 100644 unpackage/dist/dev/mp-weixin/mp_ecard_sdk/index/index.wxss create mode 100644 unpackage/dist/dev/mp-weixin/mp_ecard_sdk/main.js create mode 100644 unpackage/dist/dev/mp-weixin/mp_ecard_sdk/utils/index.js create mode 100644 unpackage/dist/dev/mp-weixin/mp_ecard_sdk/utils/validate.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxss create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxss delete mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.js delete mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.json delete mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxml delete mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/login/loginwx.wxss create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.wxss create mode 100644 unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner.png create mode 100644 unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner2.png create mode 100644 unpackage/dist/dev/mp-weixin/static/images/bigImg/homebanner3.png create mode 100644 unpackage/dist/dev/mp-weixin/static/images/bigImg/minebg.png create mode 100644 unpackage/dist/dev/mp-weixin/static/images/okIcon.png create mode 100644 unpackage/dist/dev/mp-weixin/store/index.js create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/props.js create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.js create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.json create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.wxml create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-badge/u-badge.wxss delete mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/props.js delete mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.js delete mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.json delete mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxml delete mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-input/u-input.wxss create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/props.js create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.js create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.json create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.wxml create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-tabs/u-tabs.wxss diff --git a/App.vue b/App.vue index 57ad092..28f3b1c 100644 --- a/App.vue +++ b/App.vue @@ -1,9 +1,13 @@ + + diff --git a/mp_ecard_sdk/main.js b/mp_ecard_sdk/main.js new file mode 100644 index 0000000..ec9d4fb --- /dev/null +++ b/mp_ecard_sdk/main.js @@ -0,0 +1 @@ +import validate from"./utils/validate";import Log from"./constants/log";import globalConfig from"./globalConfig";import{navigateToEid,reportStat}from"./utils/index";const EIDAppID="wx0e2cb0b052a91c92";function initEid(e="https://eid.faceid.qq.com",o="release",n="https://eid-enhance.faceid.qq.com"){uni.eidBaseUrl=e,uni.eidEnvVersion=o,uni.eidBackUpUrl=n;uni.onAppShow(e=>{console.log("!!!!!!监听onshow事件",e,uni.eidTokenToCallback);var{scene:e,referrerInfo:o}=e,{appId:o,extraData:n}=o||{},{token:i,verifyDone:t}=n||{};1038===e&&o===EIDAppID&&n&&(t&&uni.handleEidVerifyDone?uni.eidTokenToCallback&&uni.eidTokenToCallback===i&&(uni.eidTokenToCallback="",uni.reportLogToEid({token:i,event:Log.navigateBackFromEid,errMsg:`从EID核身完成返回,token:${i},verifyDone:`+t}),console.log("!!!!!!执行回调"),uni.handleEidVerifyDone(n)):uni.reportLogToEid({token:i,event:Log.navigateBackFromEidFail,errMsg:`核验未完成或者没有处理核验完成的函数,token:${i},verifyDone:`+t}))});e=uni.getSystemInfoSync();const d=e["version"];uni.reportLogToEid=function(e){var{token:e="",event:o="",errCode:n="",errMsg:i="",data:t={}}=e,r=new Date;const a={Token:e,SourceType:Log.SourceType,SourceVersion:Log.version,EnvVersion:d,Timestamp:r.getTime(),Event:o,ErrorCode:"number"==typeof n?n.toString():n,ErrorMsg:i,Data:JSON.stringify(t)};console.log("开始上报日志:",a),uni.request({url:uni.eidBaseUrl+"/api/common/ReportEvent",method:"POST",data:a,success(e){console.log("上报日志完成:","payload:",a,"res:",e)}})}}function startEid(e){const{data:o,verifyDoneCallback:n}=e;if(!o||!n)return uni.reportLogToEid({token:i,event:Log.startEidFail,errMsg:"传入的参数有误"}),void uni.showModal({title:"提示",content:"传入的参数有误",showCancel:!1});const{token:i,needJumpPage:t=!1,enableEmbedded:r=!1,allowFullScreen:a=!0}=o;validate.isValidateToken(i)?(uni.enableEmbedded=r,uni.allowFullScreen=a,uni.VerifyEid_TOKEN=i,reportStat({module:"EidStart",action:"enter"}),uni.handleEidVerifyDone=e=>{const o=e["token"];reportStat({module:"EidEnd",action:"leave"}),t?uni.navigateBack({success(){uni.reportLogToEid({token:o,event:Log.EidVerifyDone,errMsg:"验证完成,token:"+o}),n({token:o,verifyDone:!0})}}):(uni.reportLogToEid({token:o,event:Log.EidVerifyDone,errMsg:"验证完成,token:"+o}),n({token:o,verifyDone:!0}))},t?uni.navigateTo({url:`${globalConfig.normalPath}/mp_ecard_sdk/index/index?token=${i}&needJumpPage=`+t}):navigateToEid(i)):(uni.reportLogToEid({token:i,event:Log.startEidFail,errMsg:"传入的token有误,token:"+i}),uni.showModal({title:"提示",content:"传入的token有误",showCancel:!1}))}export{initEid,startEid}; \ No newline at end of file diff --git a/mp_ecard_sdk/utils/http.js b/mp_ecard_sdk/utils/http.js new file mode 100644 index 0000000..8cb4831 --- /dev/null +++ b/mp_ecard_sdk/utils/http.js @@ -0,0 +1 @@ +import Log from"../constants/log.js";const request=function(e,t){const{token:o="",url:a,method:r="POST",data:s,reTry:d,header:u={"Content-Type":"application/json"}}=e;try{uni.request({url:uni.eidBaseUrl+a,method:r,data:s,header:u,success(r){console.log("request success:",r),200===r.statusCode&&r.data?0==r.data.ErrorCode||0==r.data.code?t({ErrorCode:0,ErrorMsg:r.data.ErrorMsg,Data:r.data.Data||r.data.data,reTry:d}):t({ErrorCode:r.data.ErrorCode,ErrorMsg:r.data.ErrorMsg,Data:r.data.Data||r.data.data}):t({ErrorCode:-101,ErrorMsg:"请求错误,请稍后重试"})},fail(r){console.log("request error:",r),d&&d.tryCount&&0{request(e,t)},d.retryDelay||0)):t({ErrorCode:-107,ErrorMsg:"request请求异常,请稍后重试"}),uni.reportLogToEid({token:o,event:Log.requestFail,errCode:"-1",errMsg:"requestFail 调用失败",data:{url:""+(uni.eidBaseUrl+a),err:r}})}})}catch(r){console.log("request error:",r),t({ErrorCode:-109,ErrorMsg:"request方法异常,请稍后重试"}),uni.reportLogToEid({token:o,event:Log.requestCatch,errCode:"-1",errMsg:"requestFail 调用失败",data:{url:""+(uni.eidBaseUrl+a),err:r}})}},$http=request;export{$http}; \ No newline at end of file diff --git a/mp_ecard_sdk/utils/index.js b/mp_ecard_sdk/utils/index.js new file mode 100644 index 0000000..14b8c23 --- /dev/null +++ b/mp_ecard_sdk/utils/index.js @@ -0,0 +1 @@ +import Log from"../constants/log";const navigateToEid=o=>{console.log("navigateToEid",uni.eidEnvVersion),reportStat({module:"showNavigateToEidDialog",action:"enter"}),(uni.enableEmbedded&&uni.openEmbeddedMiniProgram?uni.openEmbeddedMiniProgram:uni.navigateToMiniProgram)({appId:"wx0e2cb0b052a91c92",path:"pages/huiyan/index",envVersion:uni.eidEnvVersion,allowFullScreen:uni.allowFullScreen,extraData:{useHuiyan:!0,huiyanToken:o},success(e){console.log("success",e),uni.eidTokenToCallback=o,reportStat({module:"NavigateToEid",action:"confirm"}),reportStat({module:"showNavigateToEidDialog",action:"leave"})},fail(e){console.log("err",e),reportStat({module:"NavigateToEid",action:"cancel"})},complete(e){reportStat({module:"NavigateToEidDailog",action:"leave"}),uni.reportLogToEid({token:o,event:Log.navigateToEid,errMsg:e.errMsg})}})},reportStat=async({token:e=uni.VerifyEid_TOKEN,module:a,action:n})=>{if(console.log("reportStat",a,n),e)return console.log("上报埋点:",a,n),new Promise((o,i)=>{uni.request({url:uni.eidBaseUrl+"/api/report/EidEvents?token="+e,method:"POST",data:{token:e,eidSDKVersion:Log.version,enableEmbedded:uni.enableEmbedded,dataList:[{startTimestamp:Date.now(),module:a,action:n}]},success(e){o(e)},fail(e){i(e)}})})};export{navigateToEid,reportStat}; \ No newline at end of file diff --git a/mp_ecard_sdk/utils/validate.js b/mp_ecard_sdk/utils/validate.js new file mode 100644 index 0000000..99f0b1d --- /dev/null +++ b/mp_ecard_sdk/utils/validate.js @@ -0,0 +1 @@ +function isValidateToken(e){return/^[a-zA-Z0-9-]{36}$/.test(e)}export default{isValidateToken:isValidateToken}; \ No newline at end of file diff --git a/pages.json b/pages.json index 71e4273..5433410 100644 --- a/pages.json +++ b/pages.json @@ -13,85 +13,107 @@ "navigationBarTitleText": "我的", "navigationStyle": "custom" } - } - ], - "subPackages": [ + }, + { - "root": "pages/subPage", - "pages": [ - { - "path": "notice/notice", - "style": { - "navigationBarTitleText": "公示公告", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - }, - { - "path": "login/login", - "style": { - "navigationBarTitleText": "登录", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - }, - { - "path": "login/loginwx", - "style": { - "navigationBarTitleText": "登录", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - }, - { - "path": "authentication/authentication", - "style": { - "navigationBarTitleText": "业主认证", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - }, - { - "path": "authentication/comp/select1", - "style": { - "navigationBarTitleText": "业主认证", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - }, - { - "path": "authentication/comp/select2", - "style": { - "navigationBarTitleText": "业主认证", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - }, - { - "path": "authentication/comp/select3", - "style": { - "navigationBarTitleText": "业主认证", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - }, - { - "path": "privacyAgreement/privacyAgreement", - "style": { - "navigationBarTitleText": "业主认证", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - } - - - ] + "path": "mp_ecard_sdk/index/index", + "style": { + "navigationBarTitleText": "腾讯云E证通授权" + } } + ], + "subPackages": [{ + "root": "pages/subPage", + "pages": [{ + "path": "notice/notice", + "style": { + "navigationBarTitleText": "公示公告", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "login/login", + "style": { + "navigationBarTitleText": "登录", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + // { + // "path": "login/loginwx", + // "style": { + // "navigationBarTitleText": "登录", + // "enablePullDownRefresh": false, + // "backgroundTextStyle": "dark" + // } + // }, + { + "path": "authentication/authentication", + "style": { + "navigationBarTitleText": "业主认证", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "authentication/comp/select1", + "style": { + "navigationBarTitleText": "业主认证", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "authentication/comp/select2", + "style": { + "navigationBarTitleText": "业主认证", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "authentication/comp/select3", + "style": { + "navigationBarTitleText": "业主认证", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "privacyAgreement/privacyAgreement", + "style": { + "navigationBarTitleText": "用户协议", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "ballots/ballotsList/ballotsList", + "style": { + "navigationBarTitleText": "投票表决", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + }, + { + "path": "ballots/vote/vote", + "style": { + "navigationBarTitleText": "投票表决", + "enablePullDownRefresh": false, + "backgroundTextStyle": "dark" + } + } + + + + ] + }], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", + "navigationBarBackgroundColor": "#ffffff", "backgroundColor": "#F8F8F8" }, "tabBar": { @@ -114,12 +136,12 @@ }, "uniIdRouter": {}, "easycom": { - "autoscan": true, - // 注意一定要放在custom里,否则无效,https://ask.dcloud.net.cn/question/131175 - "custom": { - "^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue", - "^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue", - "^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue" - } + "autoscan": true, + // 注意一定要放在custom里,否则无效,https://ask.dcloud.net.cn/question/131175 + "custom": { + "^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue", + "^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue", + "^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue" } -} + } +} \ No newline at end of file diff --git a/pages/subPage/authentication/authentication.vue b/pages/subPage/authentication/authentication.vue index 6066ec9..07efcda 100644 --- a/pages/subPage/authentication/authentication.vue +++ b/pages/subPage/authentication/authentication.vue @@ -4,7 +4,7 @@ - 01房屋信息 + 01房屋信息1 02个人资料 @@ -17,48 +17,152 @@ - - + + 请选择您的房屋地址 房屋信息 详细地址 - 请选择 + {{ houseStr }} + 请选择 - + + + + + + + + + + + + + 认证成功 + + + + + - \ No newline at end of file diff --git a/pages/subPage/ballots/vote/vote.vue b/pages/subPage/ballots/vote/vote.vue new file mode 100644 index 0000000..bbd5812 --- /dev/null +++ b/pages/subPage/ballots/vote/vote.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/pages/subPage/login/login - 副本.vue b/pages/subPage/login/login - 副本.vue new file mode 100644 index 0000000..870b086 --- /dev/null +++ b/pages/subPage/login/login - 副本.vue @@ -0,0 +1,194 @@ + + + + + \ No newline at end of file diff --git a/pages/subPage/login/login.vue b/pages/subPage/login/login.vue index 99b3ea9..2fe1dc1 100644 --- a/pages/subPage/login/login.vue +++ b/pages/subPage/login/login.vue @@ -12,87 +12,101 @@ - - + + - + - + - @@ -103,54 +117,54 @@ height: 100%; } -.other { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: 22rpx; - color: #9C9C9C; - position: fixed; - bottom: 80rpx; - left: 0; - width: 100%; - .lineTxt { - position: relative; - - &::before { - content: ''; - position: absolute; - width: 240rpx; - height: 1rpx; - top: 50%; - background: #e6e6e6; - right: 150rpx; - transform: translateY(50%); - z-index: 99; - } - &::after { - content: ''; - position: absolute; - width: 240rpx; - height: 1rpx; - top: 50%; - background: #e6e6e6; - left: 150rpx; - transform: translateY(50%); - z-index: 99; - } - } + .other { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + font-size: 22rpx; + color: #9C9C9C; + position: fixed; + bottom: 80rpx; + left: 0; + width: 100%; + + .lineTxt { + position: relative; - .icon { - width: 80rpx; - height: 80rpx; - margin: 20rpx 0; - } + &::before { + content: ''; + position: absolute; + width: 240rpx; + height: 1rpx; + top: 50%; + background: #e6e6e6; + right: 150rpx; + transform: translateY(50%); + z-index: 99; + } - .txt { - - } -} + &::after { + content: ''; + position: absolute; + width: 240rpx; + height: 1rpx; + top: 50%; + background: #e6e6e6; + left: 150rpx; + transform: translateY(50%); + z-index: 99; + } + } + + .icon { + width: 80rpx; + height: 80rpx; + margin: 20rpx 0; + } + + .txt {} + } .content { .logoCon { @@ -159,6 +173,7 @@ align-items: center; justify-content: center; padding-top: 150rpx; + .logo { width: 160rpx; height: 160rpx; @@ -170,10 +185,12 @@ font-weight: 700; } } + .oneBtnBox { margin-top: 40rpx; position: relative; - .cotact { + + .cotactzz { position: absolute; left: 0; right: 0; diff --git a/pages/subPage/login/loginwx.vue b/pages/subPage/login/loginwx.vue index 8933170..73e1692 100644 --- a/pages/subPage/login/loginwx.vue +++ b/pages/subPage/login/loginwx.vue @@ -25,6 +25,7 @@