From dd1f40353a43efe59ddcdc8e48bb6ee91c65a968 Mon Sep 17 00:00:00 2001 From: xuminyui <576362016@qq.com> Date: Sun, 8 Oct 2023 13:57:38 +0800 Subject: [PATCH] fix --- code | 1 - pagesFace/pages/index/index.js | 43 ---------- pagesFace/pages/index/index.json | 4 - pagesFace/pages/index/index.wxml | 13 --- pagesFace/pages/index/index.wxss | 33 -------- pagesFace/pages/middle/middle.js | 81 ------------------- pagesFace/pages/middle/middle.json | 4 - pagesFace/pages/middle/middle.wxml | 8 -- pagesFace/pages/middle/middle.wxss | 30 ------- pagesFace/pages/project.config.json | 28 ------- pagesFace/pages/project.private.config.json | 7 -- pagesFace/pages/webview/webview.js | 22 ----- pagesFace/pages/webview/webview.json | 4 - pagesFace/pages/webview/webview.wxml | 1 - pagesFace/pages/webview/webview.wxss | 0 .../pagesFace/pages/middle/middle.js.map | 2 +- .../pagesFace/pages/project.config.json | 28 ------- .../pages/project.private.config.json | 7 -- .../dist/dev/mp-weixin/project.config.json | 5 +- .../components/u-divider/u-divider.json | 4 +- .../uview-ui/components/u-icon/u-icon.json | 4 +- 21 files changed, 8 insertions(+), 321 deletions(-) delete mode 160000 code delete mode 100644 pagesFace/pages/index/index.js delete mode 100644 pagesFace/pages/index/index.json delete mode 100644 pagesFace/pages/index/index.wxml delete mode 100644 pagesFace/pages/index/index.wxss delete mode 100644 pagesFace/pages/middle/middle.js delete mode 100644 pagesFace/pages/middle/middle.json delete mode 100644 pagesFace/pages/middle/middle.wxml delete mode 100644 pagesFace/pages/middle/middle.wxss delete mode 100644 pagesFace/pages/project.config.json delete mode 100644 pagesFace/pages/project.private.config.json delete mode 100644 pagesFace/pages/webview/webview.js delete mode 100644 pagesFace/pages/webview/webview.json delete mode 100644 pagesFace/pages/webview/webview.wxml delete mode 100644 pagesFace/pages/webview/webview.wxss delete mode 100644 unpackage/dist/dev/mp-weixin/pagesFace/pages/project.config.json delete mode 100644 unpackage/dist/dev/mp-weixin/pagesFace/pages/project.private.config.json diff --git a/code b/code deleted file mode 160000 index 00898be..0000000 --- a/code +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 00898be4c9e74bf02da6c3263583eecb4b09fb9b diff --git a/pagesFace/pages/index/index.js b/pagesFace/pages/index/index.js deleted file mode 100644 index 4f42344..0000000 --- a/pagesFace/pages/index/index.js +++ /dev/null @@ -1,43 +0,0 @@ -const app = getApp(); - -Page({ - data: { - url: '' - }, - - inputUrl(e) { - this.setData({ - url: e.detail.value, - }) - }, - - goScanCode() { - wx.scanCode({ - onlyFromCamera: true, - success: ({result = ''}) => { - if(!result) { - wx.showToast({ - title: '扫码失败', - icon: 'error' - }) - } - this.setData({ - url: result - }, this.goUrl) - } - }) - }, - - goUrl() { - const url = this.data.url - wx.navigateTo({ - url: '/pagesFace/pages/webview/webview?url=' + encodeURIComponent(url), - }) - }, - - clearUrl() { - this.setData({ - url: '', - }) - } -}) diff --git a/pagesFace/pages/index/index.json b/pagesFace/pages/index/index.json deleted file mode 100644 index 56ae519..0000000 --- a/pagesFace/pages/index/index.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "usingComponents": {}, - "navigationBarTitleText": "人脸识别认证" -} \ No newline at end of file diff --git a/pagesFace/pages/index/index.wxml b/pagesFace/pages/index/index.wxml deleted file mode 100644 index 90762cb..0000000 --- a/pagesFace/pages/index/index.wxml +++ /dev/null @@ -1,13 +0,0 @@ - - - - 在当前小程序内打开实名/签署页面，刷脸跳转到公证签小程序 - - - - - - - - - diff --git a/pagesFace/pages/index/index.wxss b/pagesFace/pages/index/index.wxss deleted file mode 100644 index 1b2ebf8..0000000 --- a/pagesFace/pages/index/index.wxss +++ /dev/null @@ -1,33 +0,0 @@ -.container { - padding-top: 20rpx !important; -} -.box1 { - margin-bottom: 100rpx; - padding-bottom: 130rpx; -} -.title { - margin-bottom: 20px; - text-align: left; - width: 100%; - font-weight: bold; -} -.weui-input { - width: 100%; - border-bottom: 1px solid #ccc; - margin-bottom: 50rpx; -} -.btn-box { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; -} -.weui-btn { - display: flex; - align-items: center; - justify-content: center; - margin-bottom: 50rpx; -} -.my-btn { - margin-top: 0 !important; -} diff --git a/pagesFace/pages/middle/middle.js b/pagesFace/pages/middle/middle.js deleted file mode 100644 index 3008a54..0000000 --- a/pagesFace/pages/middle/middle.js +++ /dev/null @@ -1,81 +0,0 @@ -Page({ - data: { - /** 刷脸token */ - bizToken: "", - /** 认证小程序appId */ - miniProgramAppId: "", - /** 认证小程序跳转页地址 */ - miniProgramPath: "", - /** 刷脸结束回调地址 */ - miniProgramCallBackUrl: "", - /** 是否已跳转认证小程序 */ - goFaceDone: false, - }, - - /** 点击前往认证 */ - onJump() { - const { bizToken, miniProgramAppId, miniProgramPath } = this.data; - wx.navigateToMiniProgram({ - appId: miniProgramAppId, - path: miniProgramPath + "?bizToken=" + bizToken, - success: (res) => { - this.setData({ - goFaceDone: true, - }); - }, - }); - }, - - /** 生命周期函数--监听页面加载 */ - onLoad: function ({ - bizToken = "", - miniProgramAppId = "", - miniProgramPath = "", - miniProgramCallBackUrl = "", - }) { - console.log("---middle onLoad"); - this.setData({ - bizToken: decodeURIComponent(bizToken), - miniProgramAppId: decodeURIComponent(miniProgramAppId), - miniProgramPath: decodeURIComponent(miniProgramPath), - miniProgramCallBackUrl: decodeURIComponent(miniProgramCallBackUrl), - }); - }, - - /** 生命周期函数--监听页面显示 */ - onShow: function () { - console.log("---middle onShow"); - const { goFaceDone, miniProgramCallBackUrl } = this.data; - /** 防止从认证进入后直接返回 */ - if (!goFaceDone) return; - - /** 已跳转认证小程序，重置 */ - this.setData({ - goFaceDone: false, - }); - - /** getEnterOptionsSync 基础库 2.9.4 开始支持，低版本需做兼容处理 */ - const options = wx.getEnterOptionsSync(); - console.log("---app onShow options", options); - - /** 从认证小程序返回 */ - if ( - options.scene === 1038 && - options.referrerInfo.extraData && - options.referrerInfo.extraData.faceResult - ) { - const pages = getCurrentPages(); - const previous = pages[pages.length - 2]; - /** 重新加载认证页面 */ - previous.$vm.reloadPage( - miniProgramCallBackUrl.replace( - "https://realnameverify-test.fadada.com", - "https://realnameverify-test07.fadada.com" - ) - ); - wx.navigateBack({ - delta: 1, - }); - } - }, -}); diff --git a/pagesFace/pages/middle/middle.json b/pagesFace/pages/middle/middle.json deleted file mode 100644 index 56ae519..0000000 --- a/pagesFace/pages/middle/middle.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "usingComponents": {}, - "navigationBarTitleText": "人脸识别认证" -} \ No newline at end of file diff --git a/pagesFace/pages/middle/middle.wxml b/pagesFace/pages/middle/middle.wxml deleted file mode 100644 index c385564..0000000 --- a/pagesFace/pages/middle/middle.wxml +++ /dev/null @@ -1,8 +0,0 @@ - - - - 点击下方按钮，前往互联网公证签小程序 - 完成人脸认证 - - - \ No newline at end of file diff --git a/pagesFace/pages/middle/middle.wxss b/pagesFace/pages/middle/middle.wxss deleted file mode 100644 index eb58417..0000000 --- a/pagesFace/pages/middle/middle.wxss +++ /dev/null @@ -1,30 +0,0 @@ -.middle-page { - display: flex; - flex-direction: column; - align-items: center; - padding-top: 250rpx; -} -.middle-page-icon { - width: 200rpx; - height: 160rpx; -} -.middle-page-text { - display: flex; - flex-direction: column; - align-items: center; - padding: 48rpx 0; - line-height: 42rpx; - font-size: 28rpx; - color: #595959; -} -.middle-page-button { - width: 332rpx !important; - height: 88rpx; - padding: 0; - line-height: 88rpx; - font-size: 34rpx; - font-weight: initial; - color: #fff; - border-radius: 16rpx; - background: #276EF9; -} \ No newline at end of file diff --git a/pagesFace/pages/project.config.json b/pagesFace/pages/project.config.json deleted file mode 100644 index b2b3e4d..0000000 --- a/pagesFace/pages/project.config.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "appid": "wx1e155fd041eda3be", - "compileType": "miniprogram", - "libVersion": "3.1.2", - "packOptions": { - "ignore": [], - "include": [] - }, - "setting": { - "coverView": true, - "es6": true, - "postcss": true, - "minified": true, - "enhance": true, - "showShadowRootInWxmlPanel": true, - "packNpmRelationList": [], - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - } - }, - "condition": {}, - "editorSetting": { - "tabIndent": "insertSpaces", - "tabSize": 4 - } -} \ No newline at end of file diff --git a/pagesFace/pages/project.private.config.json b/pagesFace/pages/project.private.config.json deleted file mode 100644 index f162e48..0000000 --- a/pagesFace/pages/project.private.config.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "projectname": "pages", - "setting": { - "compileHotReLoad": true - } -} \ No newline at end of file diff --git a/pagesFace/pages/webview/webview.js b/pagesFace/pages/webview/webview.js deleted file mode 100644 index aec6058..0000000 --- a/pagesFace/pages/webview/webview.js +++ /dev/null @@ -1,22 +0,0 @@ -Page({ - - data: { - url: '', - }, - - /** 初始打开实名认证页面 */ - onLoad(options) { - console.log('---wevbiew onload', options) - this.setData({ - url: decodeURIComponent(options.url), - }) - }, - - /** 刷脸完成后重新加载实名认证页面 */ - reloadPage(url) { - console.log('---webview reloadPage', url) - this.setData({ - url, - }) - }, -}) diff --git a/pagesFace/pages/webview/webview.json b/pagesFace/pages/webview/webview.json deleted file mode 100644 index 56ae519..0000000 --- a/pagesFace/pages/webview/webview.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "usingComponents": {}, - "navigationBarTitleText": "人脸识别认证" -} \ No newline at end of file diff --git a/pagesFace/pages/webview/webview.wxml b/pagesFace/pages/webview/webview.wxml deleted file mode 100644 index 77a6354..0000000 --- a/pagesFace/pages/webview/webview.wxml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pagesFace/pages/webview/webview.wxss b/pagesFace/pages/webview/webview.wxss deleted file mode 100644 index e69de29..0000000 diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pagesFace/pages/middle/middle.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pagesFace/pages/middle/middle.js.map index 9ce1d0b..27a28f1 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/pagesFace/pages/middle/middle.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pagesFace/pages/middle/middle.js.map @@ -1 +1 @@ -{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":"wJAAA,MAGA,aACA,YAFAA,EAAGC,kCAAoCC,EAGvCC,EAAWC,a","file":"pagesFace/pages/middle/middle.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pagesFace/pages/middle/middle.vue'\ncreatePage(Page)"],"sourceRoot":""} \ No newline at end of file +{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":"wJAAA,MAGA,aACA,qIAFAA,EAAGC,kCAAoCC,EAGvCC,EAAWC,a","file":"pagesFace/pages/middle/middle.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pagesFace/pages/middle/middle.vue'\ncreatePage(Page)"],"sourceRoot":""} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesFace/pages/project.config.json b/unpackage/dist/dev/mp-weixin/pagesFace/pages/project.config.json deleted file mode 100644 index b2b3e4d..0000000 --- a/unpackage/dist/dev/mp-weixin/pagesFace/pages/project.config.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "appid": "wx1e155fd041eda3be", - "compileType": "miniprogram", - "libVersion": "3.1.2", - "packOptions": { - "ignore": [], - "include": [] - }, - "setting": { - "coverView": true, - "es6": true, - "postcss": true, - "minified": true, - "enhance": true, - "showShadowRootInWxmlPanel": true, - "packNpmRelationList": [], - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - } - }, - "condition": {}, - "editorSetting": { - "tabIndent": "insertSpaces", - "tabSize": 4 - } -} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pagesFace/pages/project.private.config.json b/unpackage/dist/dev/mp-weixin/pagesFace/pages/project.private.config.json deleted file mode 100644 index f162e48..0000000 --- a/unpackage/dist/dev/mp-weixin/pagesFace/pages/project.private.config.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "projectname": "pages", - "setting": { - "compileHotReLoad": true - } -} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json index 3a36739..71ebfdd 100644 --- a/unpackage/dist/dev/mp-weixin/project.config.json +++ b/unpackage/dist/dev/mp-weixin/project.config.json @@ -6,7 +6,7 @@ }, "setting": { "urlCheck": false, - "es6": false, + "es6": true, "postcss": false, "minified": false, "newFeature": true, @@ -15,7 +15,8 @@ "ignore": [], "disablePlugins": [], "outputPath": "" - } + }, + "enhance": true }, "compileType": "miniprogram", "libVersion": "3.1.0", diff --git a/unpackage/dist/dev/mp-weixin/uview-ui/components/u-divider/u-divider.json b/unpackage/dist/dev/mp-weixin/uview-ui/components/u-divider/u-divider.json index 0927587..5abb3d3 100644 --- a/unpackage/dist/dev/mp-weixin/uview-ui/components/u-divider/u-divider.json +++ b/unpackage/dist/dev/mp-weixin/uview-ui/components/u-divider/u-divider.json @@ -1,6 +1,6 @@ { - "component": true, "usingComponents": { "u-line": "/uview-ui/components/u-line/u-line" - } + }, + "component": true } \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.json b/unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.json index e8cfaaf..4575d1b 100644 --- a/unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.json +++ b/unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.json @@ -1,4 +1,4 @@ { - "component": true, - "usingComponents": {} + "usingComponents": {}, + "component": true } \ No newline at end of file