diff --git a/config/request.js b/config/request.js index d67c745..346402c 100644 --- a/config/request.js +++ b/config/request.js @@ -59,7 +59,7 @@ module.exports = (vm) => { if(data.code==401) { console.log('报401的接口') console.log(response.config.url) - return vm.$store.commit('goLogin') + return uni.$u.debounce(vm.$store.commit('goLogin'), 800) } // 自定义参数 diff --git a/config/site.config.js b/config/site.config.js index b6741f8..4730b65 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -2,7 +2,7 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM; // localIp = false module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 - WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://192.168.1.43:8318/',//非代理地址 不要忘记加/ + WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://123.6.232.54:8099/',//非代理地址 不要忘记加/ // WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://work.lyjppt.com:8099/',// http://192.168.1.43:8318/ http://123.6.232.1:8099//非代理地址 website: 'http://192.168.1.37', httpPrefix: 'app-api/', diff --git a/manifest.json b/manifest.json index d7e5d10..328187c 100644 --- a/manifest.json +++ b/manifest.json @@ -115,6 +115,38 @@ }, "splashscreen" : { "useOriginalMsgbox" : true + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } } }, "nativePlugins" : { @@ -139,17 +171,17 @@ } } }, - "AP-FaceDetectModule" : { + "Ocr-FaceDetectModule" : { "__plugin_info__" : { - "name" : "APFaceDetectPlugin", - "description" : "阿里云金融级实人认证SDK", + "name" : "Ocr-FaceDetectModule", + "description" : "阿里云金融级实名认证，包括实人认证，活体人脸认证。", "platforms" : "Android,iOS", - "url" : "", - "android_package_name" : "", - "ios_bundle_id" : "", - "isCloud" : false, - "bought" : -1, - "pid" : "", + "url" : "https://ext.dcloud.net.cn/plugin?id=16895", + "android_package_name" : "com.junan.luoyangxueche", + "ios_bundle_id" : "com.junan.luoyangxueche", + "isCloud" : true, + "bought" : 1, + "pid" : "16895", "parameters" : {} } } diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/back.png b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/back.png deleted file mode 100644 index 7205327..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/back.png and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/close.png b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/close.png deleted file mode 100644 index 4876ba1..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/close.png and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/en.strings b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/en.strings deleted file mode 100644 index 4bd66fe..0000000 --- a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/en.strings +++ /dev/null @@ -1,40 +0,0 @@ -/* - Localizable.strings - AliyunIdentityFace - - Created by Lingxuan on 2022/12/1. - Copyright © 2022 aliyun.com. All rights reserved. -*/ - -// nfc提示文案 -"kNeed" = "Time left: "; -"kDontMove" = "seconds. Do not remove your device."; -"kNFCIdentification" = "NFC Verification"; -"kIDNumber" = "ID Number"; -"kEnterIDNumber" = "Enter a 9-digit ID number"; -"kDateOfBirth" = "Date of Birth"; -"kPeriodOfValidity" = "Validity Period"; -"kPleaseSelect" = "Select"; -"kNextStep" = "Next"; -"kCancelTitle" = "Cancel"; -"kOKTitle" = "OK"; -"kStart" = "Please prepare your documents and click to start reading"; -"kStartReading" = "Start Reading"; -"kReadException" = "An error occurred. Try again."; -"kNetworkAnomaly" = "Check the network connection and try again."; -"kReadError" = "An error occurred."; -"kCardReadingFailure" = "Do not move the document during reading. Position the document in the NFC area and try again."; -"kThreeElementErrors" = "The specified parameters of your document are invalid. Change the values."; -"kCardError" = "An error occurred. Use a valid document."; -"kDeviceNotSupported" = "An error occurred. The current device does not support this feature."; -"kNFCTurnedOff" = "NFC is disabled."; -"kSuccessfullyRead" = "Successful"; -"kCardReading" = "The document is being read. Do not move the document."; -"kPutIDCardInPosition" = "Position your document"; -"kPutIDCardInPositionMove" = "Position your document and wait for "; -"kIDCardReadFailedRetry" = "Failed to read the document. Try again."; -"kIDCardReadFailed" = "Failed to read the document."; -"kExpirationMustGreaterBirthdate" = "The valid expiry date of the certificate must be greater than the date of birth."; -"kPrompt" = "Prompt"; -"kReadyToScan" = "Ready to scan"; - diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_card.png b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_card.png deleted file mode 100644 index 88fd4a3..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_card.png and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_finger.png b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_finger.png deleted file mode 100644 index 6432e06..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_finger.png and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_image6.png b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_image6.png deleted file mode 100644 index 929264d..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_image6.png and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_image7.png b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_image7.png deleted file mode 100644 index 29102b7..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_image7.png and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_image8.png b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_image8.png deleted file mode 100644 index 8055ce0..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_image8.png and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_nfc_backgrond.png b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_nfc_backgrond.png deleted file mode 100644 index 602693b..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_nfc_backgrond.png and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_passport.png b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_passport.png deleted file mode 100644 index 7d5f613..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/icon_passport.png and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/youjiantoucu.png b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/youjiantoucu.png deleted file mode 100644 index 8449489..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/youjiantoucu.png and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/zh-Hans.strings b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/zh-Hans.strings deleted file mode 100644 index 17b054b..0000000 --- a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.bundle/zh-Hans.strings +++ /dev/null @@ -1,41 +0,0 @@ -/* - Localizable.strings - AliyunIdentityFace - - Created by Lingxuan on 2022/12/1. - Copyright © 2022 aliyun.com. All rights reserved. -*/ - -// nfc提示文案 -"kNeed" = "还需"; -"kDontMove" = "秒,请勿移动"; -"kNFCIdentification" = "NFC识别"; -"kIDNumber" = "证件号码"; -"kEnterIDNumber" = "请输入9位证件号码"; -"kDateOfBirth" = "出生日期"; -"kPeriodOfValidity" = "有效期"; -"kPleaseSelect" = "请选择"; -"kNextStep" = "下一步"; -"kCancelTitle" = "取消"; -"kOKTitle" = "确定"; -"kStart" = "请准备好证件，点击开始读卡"; -"kStartReading" = "开始读取"; -"kReadException" = "读取异常，请重试"; -"kNetworkAnomaly" = "请检查网络，重新读卡"; -"kReadError" = "读取错误"; -"kCardReadingFailure" = "读取时请勿移动证件，请将证件对准NFC区域，重新读卡"; -"kThreeElementErrors" = "证件要素输入不正确，请重新输入"; -"kCardError" = "读取异常，请使用正确的证件"; -"kDeviceNotSupported" = "读取异常，当前设备不支持此功能"; -"kNFCTurnedOff" = "NFC已关闭"; -"kSuccessfullyRead" = "读取成功"; -"kCardReading" = "证件读取中，请勿移动"; -"kPutIDCardInPosition" = "请将证件放到图示位置"; -"kPutIDCardInPositionMove" = "请将证件放到图示位置，静置"; -"kIDCardReadFailedRetry" = "读取证件失败，请重试"; -"kIDCardReadFailed" = "读取证件失败"; -"kExpirationMustGreaterBirthdate" = "证件有效截止日期必须大于出生日期。"; -"kPrompt" = "提示"; -"kReadyToScan" = "已准备好扫描"; - - diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/.DS_Store b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/.DS_Store deleted file mode 100644 index ddc8d9e..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/.DS_Store and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/DTFNFCIdentityManager b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/DTFNFCIdentityManager deleted file mode 100644 index 61d6f70..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/DTFNFCIdentityManager and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/DTFNFCIdentityManager-Info.plist b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/DTFNFCIdentityManager-Info.plist deleted file mode 100644 index 01af302..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/DTFNFCIdentityManager-Info.plist and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/Headers/NFCDatePickerView.h b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/Headers/NFCDatePickerView.h deleted file mode 100644 index ae890f4..0000000 --- a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/Headers/NFCDatePickerView.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// NFCDatePickerView.h -// ZimDemo -// -// Created by 汪澌哲 on 2023/6/7. -// Copyright © 2023 com.alipay. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface NFCDatePickerView : UIView - -@property (nonatomic, copy) void (^onConfirm)(NSDate *); - -@property (nonatomic, copy) NSString *maxDate; - -- (void)showWithSelectedDate:(NSDate *)selectedDate onConfirm:(void (^)(NSDate *date))onConfirm; - -- (void)dismiss; - -@end - -NS_ASSUME_NONNULL_END diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/Info.plist b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/Info.plist deleted file mode 100644 index 48d0cf2..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/Info.plist and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/en.lproj/InfoPlist.strings b/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/en.lproj/InfoPlist.strings deleted file mode 100644 index 3967e06..0000000 Binary files a/nativePlugins/AP-FaceDetectModule/ios/DTFNFCIdentityManager.framework/en.lproj/InfoPlist.strings and /dev/null differ diff --git a/nativePlugins/AP-FaceDetectModule/package.json b/nativePlugins/AP-FaceDetectModule/package.json index 36c9a4b..0f58d8a 100644 --- a/nativePlugins/AP-FaceDetectModule/package.json +++ b/nativePlugins/AP-FaceDetectModule/package.json @@ -90,7 +90,6 @@ "APBToygerFacade.bundle", "APBToygerFacadeSuitable.bundle", "BioAuthEngine.bundle", - "DTFNFCIdentityManager.bundle", "MultiFactorFacade.bundle", "OCRXMedia.bundle", "ToygerService.bundle" diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue index 660176d..f4d3c14 100644 --- a/pages/indexEntry/enroll/enroll.vue +++ b/pages/indexEntry/enroll/enroll.vue @@ -188,7 +188,7 @@ // this.$goPage('/pages/indexEntry/enroll/uploadAvatar/uploadAvatar') }, async getInitFaceVerifyFn() { - const verifyPlugin = uni.requireNativePlugin('AP-FaceDetectModule'); + const verifyPlugin = uni.requireNativePlugin('Ocr-FaceDetectModule'); var metaInfo = verifyPlugin.getMetaInfo() let p = uni.getSystemInfoSync().platform; if (p === "ios") { diff --git a/pages/indexEntry/enroll/payment/payh5.vue b/pages/indexEntry/enroll/payment/payh5.vue index e14ce38..e5d07ca 100644 --- a/pages/indexEntry/enroll/payment/payh5.vue +++ b/pages/indexEntry/enroll/payment/payh5.vue @@ -1,6 +1,6 @@ @@ -12,7 +12,12 @@ export default { data() { return { - iswxPay: false + iswxPay: false, + webviewStyles: { + progress: { + color: '#3877ff' + }, + }, } }, onLoad(options) { diff --git a/pages/indexEntry/enroll/payment/payment.vue b/pages/indexEntry/enroll/payment/payment.vue index 2cc1258..00457ff 100644 --- a/pages/indexEntry/enroll/payment/payment.vue +++ b/pages/indexEntry/enroll/payment/payment.vue @@ -83,12 +83,15 @@ }, // 1，下订单 async getStudentByPayment(type) { - console.log('来到了这没有') + uni.showLoading({ + title: '正在加载...' + }) const { data: res } = await pre_create({ trainingApplyId: this.trainingApplyId }) + uni.hideLoading() console.log('创建的订单信息') console.log(res) this.param_sign(res.orderNo) diff --git a/pages/indexEntry/signIn/signAndOut/signAndOut.vue b/pages/indexEntry/signIn/signAndOut/signAndOut.vue index b77fd5e..0d06808 100644 --- a/pages/indexEntry/signIn/signAndOut/signAndOut.vue +++ b/pages/indexEntry/signIn/signAndOut/signAndOut.vue @@ -141,7 +141,7 @@ }, // 人脸对比 async getInitFaceVerifyFn() { - const verifyPlugin = uni.requireNativePlugin('AP-FaceDetectModule'); + const verifyPlugin = uni.requireNativePlugin('Ocr-FaceDetectModule'); var metaInfo = verifyPlugin.getMetaInfo() if(typeof metaInfo =='object' ) { metaInfo = JSON.stringify(metaInfo) diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index f5ccfdb..c66bc70 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -73,8 +73,9 @@ // {name: '退款申请', icon: require('@/static/images/mineIcon/minIcon (3).png'),url: '/pages/mineEntry/refund/refund'}, // {name: '变更车型', icon: require('@/static/images/mineIcon/minIcon (7).png'),url: '/pages/mineEntry/modelChange/modelChange'}, // {name: '同城转校', icon: require('@/static/images/mineIcon/minIcon (5).png'),url: '/pages/mineEntry/schoolTransfer/schoolTransfer'}, - {name: '隐私政策', icon: require('@/static/images/mineIcon/minIcon (6).png'),url: ''}, {name: '关于我们', icon: require('@/static/images/mineIcon/minIcon (2).png'),url: '/pages/mineEntry/aboutUs/aboutUs'}, + {name: '用户协议', icon: require('@/static/images/mineIcon/minIcon (4).png'),url: '/pages/userCenter/login/privacyAgreement/privacyAgreement?type=2'}, + {name: '隐私政策', icon: require('@/static/images/mineIcon/minIcon (6).png'),url: '/pages/userCenter/login/privacyAgreement/privacyAgreement?type=1'}, ] } }, @@ -91,7 +92,8 @@ } }, goPage(item) { - if(item.name!='关于我们') { + let whileUrl = ['关于我们', '用户协议', '隐私政策'] + if(!whileUrl.includes(item.name)) { // return this.$goPage('/pages/mineEntry/myForecastName/myForecastName') // console.log(this.vuex_userInfo.applyStep) console.log(this.vuex_userInfo.applyStep) diff --git a/pages/userCenter/login/login.vue b/pages/userCenter/login/login.vue index 7b5bf58..96f5608 100644 --- a/pages/userCenter/login/login.vue +++ b/pages/userCenter/login/login.vue @@ -196,12 +196,13 @@ .inputBox { flex: 1; + padding: 10rpx 0; input { display: block; width: 100%; height: 100%; display: block; - line-height: 112rpx; + // line-height: 112rpx; font-size: 30rpx; } } diff --git a/static/images/logo.png b/static/images/logo.png new file mode 100644 index 0000000..d117833 Binary files /dev/null and b/static/images/logo.png differ