diff --git a/App.vue b/App.vue index 678ed4c..66440a9 100644 --- a/App.vue +++ b/App.vue @@ -1,5 +1,4 @@ - - diff --git a/mp_ecard_sdk/main.js b/mp_ecard_sdk/main.js deleted file mode 100644 index e3dd26b..0000000 --- a/mp_ecard_sdk/main.js +++ /dev/null @@ -1 +0,0 @@ -import validate from"./utils/validate";import Log from"./constants/log";import globalConfig from"./globalConfig";import{navigateToEid}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,wx.eidTokenToCallback);var{scene:e,referrerInfo:o}=e,{appId:o,extraData:n}=o||{},{token:i,verifyDone:t}=n||{};1038===e&&o===EIDAppID&&uni.eidTokenToCallback&&(o=i||uni.eidTokenToCallback,uni.reportLogToEid({token:o,event:Log.navigateBackFromEid,errMsg:`从EID核身完成返回，核验未完成或者没有处理核验完成的函数，token:${o},verifyDone:${t},scene:`+e}),uni.eidTokenToCallback)&&uni.eidTokenToCallback===i&&t&&uni.handleEidVerifyDone&&uni.handleEidVerifyDone(n),uni.eidTokenToCallback=""});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}=o;validate.isValidateToken(i)?(uni.handleEidVerifyDone=e=>{const o=e["token"];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 deleted file mode 100644 index 8cb4831..0000000 --- a/mp_ecard_sdk/utils/http.js +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index f15932a..0000000 --- a/mp_ecard_sdk/utils/index.js +++ /dev/null @@ -1 +0,0 @@ -import Log from"../constants/log";const navigateToEid=o=>{console.log("navigateToEid",uni.eidEnvVersion),uni.navigateToMiniProgram({appId:"wx0e2cb0b052a91c92",path:"pages/huiyan/index",envVersion:uni.eidEnvVersion,extraData:{useHuiyan:!0,huiyanToken:o},success(){uni.eidTokenToCallback=o},fail(e){console.log("err",e),uni.eidTokenToCallback=""},complete(e){uni.reportLogToEid({token:o,event:Log.navigateToEid,errMsg:e.errMsg})}})};export{navigateToEid}; \ No newline at end of file diff --git a/mp_ecard_sdk/utils/validate.js b/mp_ecard_sdk/utils/validate.js deleted file mode 100644 index 99f0b1d..0000000 --- a/mp_ecard_sdk/utils/validate.js +++ /dev/null @@ -1 +0,0 @@ -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 5cbbbc9..526cb06 100644 --- a/pages.json +++ b/pages.json @@ -26,13 +26,8 @@ "enablePullDownRefresh": true, "backgroundTextStyle": "dark" } - }, - { - "path": "mp_ecard_sdk/index/index", - "style": { - "navigationBarTitleText": "腾讯云E证通授权" - } - } + } + ], "subPackages": [ diff --git a/pages/indexEntry/NonPlatformStudentInfo/NonPlatformStudentInfo.vue b/pages/indexEntry/NonPlatformStudentInfo/NonPlatformStudentInfo.vue deleted file mode 100644 index 4537c69..0000000 --- a/pages/indexEntry/NonPlatformStudentInfo/NonPlatformStudentInfo.vue +++ /dev/null @@ -1,163 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue index d440cc8..590ce97 100644 --- a/pages/indexEntry/enroll/enroll.vue +++ b/pages/indexEntry/enroll/enroll.vue @@ -84,7 +84,6 @@ - \ No newline at end of file diff --git a/pages/tabbar/learnCar/index - 副本.vue b/pages/tabbar/learnCar/index - 副本.vue deleted file mode 100644 index 5e90c78..0000000 --- a/pages/tabbar/learnCar/index - 副本.vue +++ /dev/null @@ -1,78 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/tabbar/learnCar/index.vue b/pages/tabbar/learnCar/index.vue index b03b7fc..9433c80 100644 --- a/pages/tabbar/learnCar/index.vue +++ b/pages/tabbar/learnCar/index.vue @@ -18,7 +18,7 @@ import subject2 from './comp/subject2.vue' import subject3 from './comp/subject3.vue' import subject4 from './comp/subject4.vue' - import { requestSingleFreshLocation } from '@/common/js/qqLatLng.js' + // import { requestSingleFreshLocation } from '@/common/js/qqLatLng.js' import { getInitFaceVerify } from '@/config/api.js' export default { components: { topInfo, subject1, subject2,subject3,subject4 }, @@ -31,10 +31,13 @@ } }, onLoad() { - const verifyPlugin = uni.requireNativePlugin('AP-FaceDetectModule'); + // #ifdef MP-WEIXIN + // initEid(); + // #endif + // const verifyPlugin = uni.requireNativePlugin('AP-FaceDetectModule'); // var metaInfo = verifyPlugin.getMetaInfo(); - console.log('插件在？') - console.log(verifyPlugin) + // console.log('插件在？') + // console.log(verifyPlugin) }, onShow() { diff --git a/static/images/bigImg/banner.jpg b/static/images/bigImg/banner.jpg deleted file mode 100644 index b1970c7..0000000 Binary files a/static/images/bigImg/banner.jpg and /dev/null differ diff --git a/static/images/bigImg/banner2.jpg b/static/images/bigImg/banner2.jpg deleted file mode 100644 index 3f4691a..0000000 Binary files a/static/images/bigImg/banner2.jpg and /dev/null differ