fix

code

@@ -0,0 +1 @@
+Subproject commit 00898be4c9e74bf02da6c3263583eecb4b09fb9b

pagesFace/pages/index/index.js

@@ -0,0 +1,43 @@
+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: '',
+    })
+  }
+})

pagesFace/pages/index/index.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "人脸识别认证"
+}

pagesFace/pages/index/index.wxml

@@ -0,0 +1,13 @@
+<view class="container">
+  <view class="container box1">
+    <view class="title">
+     在当前小程序内打开实名/签署页面，刷脸跳转到公证签小程序
+    </view>
+    <input class="weui-input" maxlength="-1" placeholder="输入链接" value="{{url}}" bindinput="inputUrl"/>
+    <view class="btn-box">
+      <button class="weui-btn my-btn" type="primary" bindtap="goScanCode">扫描二维码</button>
+      <button class="weui-btn my-btn" type="primary" bindtap="goUrl">跳转</button>
+      <button class="weui-btn my-btn" bindtap="clearUrl">清空</button>
+    </view>
+  </view>
+</view>

pagesFace/pages/index/index.wxss

@@ -0,0 +1,33 @@
+.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;
+}

pagesFace/pages/middle/middle.js

@@ -0,0 +1,81 @@
+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,
+      });
+    }
+  },
+});

pagesFace/pages/middle/middle.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "人脸识别认证"
+}

pagesFace/pages/middle/middle.wxss

@@ -0,0 +1,30 @@
+.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;
+}

pagesFace/pages/project.config.json

@@ -0,0 +1,28 @@
+{
+    "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
+    }
+}

pagesFace/pages/project.private.config.json

@@ -0,0 +1,7 @@
+{
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "projectname": "pages",
+    "setting": {
+        "compileHotReLoad": true
+    }
+}

pagesFace/pages/webview/webview.js

@@ -0,0 +1,22 @@
+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,
+    })
+  },
+})

pagesFace/pages/webview/webview.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "人脸识别认证"
+}

pagesFace/pages/webview/webview.wxml

@@ -0,0 +1 @@
+<web-view src="{{url}}"></web-view>

unpackage/dist/dev/mp-weixin/app.json

@@ -18,15 +18,7 @@
     "pages/paySuccess/paySuccess",
     "pages/payError/payError"
   ],
-  "subPackages": [ {
-    "root": "pagesFace",
-    "name": "pagesFace",
-    "pages": [
-      "pages/index/index",
-      "pages/webview/webview",
-      "pages/middle/middle"
-    ]
-  }],
+  "subPackages": [],
   "window": {
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "uni-app",
@@ -55,5 +47,16 @@
       "desc": "你的摄像头将用于拍照或录像"
     }
   },
+  "subpackages": [
+    {
+      "root": "pagesFace",
+      "name": "pagesFace",
+      "pages": [
+        "pages/index/index",
+        "pages/webview/webview",
+        "pages/middle/middle"
+      ]
+    }
+  ],
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/components/title-block/title-block.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pagesFace/pages/index/index.js

@@ -1,66 +1,43 @@
-// pagesFace/pages/index/index.js
+const app = getApp();
+
 Page({
+  data: {
+    url: ''
+  },
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
+  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)
+      }
+    })
+  },
 
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
+  goUrl() {
+    const url = this.data.url
+    wx.navigateTo({
+      url: '/pagesFace/pages/webview/webview?url=' + encodeURIComponent(url),
+    })
+  },
 
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
+  clearUrl() {
+    this.setData({
+      url: '',
+    })
+  }
 })

unpackage/dist/dev/mp-weixin/pagesFace/pages/index/index.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "人脸识别认证"
+}

unpackage/dist/dev/mp-weixin/pagesFace/pages/index/index.wxml

@@ -1,2 +1,13 @@
-<!--pagesFace/pages/index/index.wxml-->
-<text>pagesFace/pages/index/index.wxml</text>
+<view class="container">
+  <view class="container box1">
+    <view class="title">
+     在当前小程序内打开实名/签署页面，刷脸跳转到公证签小程序
+    </view>
+    <input class="weui-input" maxlength="-1" placeholder="输入链接" value="{{url}}" bindinput="inputUrl"/>
+    <view class="btn-box">
+      <button class="weui-btn my-btn" type="primary" bindtap="goScanCode">扫描二维码</button>
+      <button class="weui-btn my-btn" type="primary" bindtap="goUrl">跳转</button>
+      <button class="weui-btn my-btn" bindtap="clearUrl">清空</button>
+    </view>
+  </view>
+</view>

unpackage/dist/dev/mp-weixin/pagesFace/pages/index/index.wxss

@@ -0,0 +1,33 @@
+.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;
+}

unpackage/dist/dev/mp-weixin/pagesFace/pages/middle/middle.json

@@ -1,5 +1,4 @@
 {
-  "navigationBarTitleText": "人脸识别认证",
-  "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "人脸识别认证"
 }

unpackage/dist/dev/mp-weixin/pagesFace/pages/project.config.json

@@ -0,0 +1,28 @@
+{
+    "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
+    }
+}

unpackage/dist/dev/mp-weixin/pagesFace/pages/project.private.config.json

@@ -0,0 +1,7 @@
+{
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "projectname": "pages",
+    "setting": {
+        "compileHotReLoad": true
+    }
+}

unpackage/dist/dev/mp-weixin/pagesFace/pages/webview/webview.js

@@ -1,66 +1,22 @@
-// pagesFace/pages/webview/webview.js
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
+  data: {
+    url: '',
+  },
   
-    },
+  /** 初始打开实名认证页面 */
+  onLoad(options) {
+    console.log('---wevbiew onload', options)
+    this.setData({
+      url: decodeURIComponent(options.url),
+    })
+  },
 
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
+  /** 刷脸完成后重新加载实名认证页面 */
+  reloadPage(url) {
+    console.log('---webview reloadPage', url)
+    this.setData({
+      url,
+    })
+  },
 })

unpackage/dist/dev/mp-weixin/pagesFace/pages/webview/webview.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "人脸识别认证"
+}

unpackage/dist/dev/mp-weixin/pagesFace/pages/webview/webview.wxml

@@ -1,2 +1 @@
-<!--pagesFace/pages/webview/webview.wxml-->
-<text>pagesFace/pages/webview/webview.wxml</text>
+<web-view src="{{url}}"></web-view>

unpackage/dist/dev/mp-weixin/project.config.json

@@ -6,7 +6,7 @@
     },
     "setting": {
         "urlCheck": false,
-        "es6": true,
+        "es6": false,
         "postcss": false,
         "minified": false,
         "newFeature": true,
@@ -15,8 +15,7 @@
             "ignore": [],
             "disablePlugins": [],
             "outputPath": ""
-        },
-        "enhance": true
+        }
     },
     "compileType": "miniprogram",
     "libVersion": "3.1.0",

unpackage/dist/dev/mp-weixin/uview-ui/components/u-action-sheet/u-action-sheet.json

@@ -1,10 +1,10 @@
 {
-  "component": true,
   "usingComponents": {
     "u-popup": "/uview-ui/components/u-popup/u-popup",
     "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-line": "/uview-ui/components/u-line/u-line",
     "u-loading-icon": "/uview-ui/components/u-loading-icon/u-loading-icon",
     "u-gap": "/uview-ui/components/u-gap/u-gap"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.json

@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "u-loading-icon": "/uview-ui/components/u-loading-icon/u-loading-icon",
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-count-down/u-count-down.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading-page/u-loading-page.json

@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "u-transition": "/uview-ui/components/u-transition/u-transition",
     "u-loading-icon": "/uview-ui/components/u-loading-icon/u-loading-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-safe-bottom": "/uview-ui/components/u-safe-bottom/u-safe-bottom"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-upload/u-upload.json

@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-loading-icon": "/uview-ui/components/u-loading-icon/u-loading-icon"
-  }
+  },
+  "component": true
 }