Merge refs/remotes/origin/feature/share into refs/heads/feature/share

pages/toRegister/toRegister.js

@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = '1.2.0'
+    const versionNum = '1.2.1'
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag

subpages/heart/pages/heartDetail/heartDetail.json

@@ -1,7 +1,7 @@
 {
   "navigationBarTitleText": "详情",
     "usingComponents": {
-      "preload-detail-item": "../preloadDetailItem/preloadDetailItem",
+      "preload-detail-item": "./preloadDetailItem/preloadDetailItem",
       "wux-dialog": "../../../../dist/dialog/index",
       "coverview-dialog": "../../components/coverViewDialog/coverViewDialog",
       "cancel-signup-dialog": "../../components/cancelSignupDialog/cancelSignupDialog"