主支代码合并到分支

package-lock.json

@@ -12494,6 +12494,11 @@
       "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
       "dev": true
     },
+    "qrcodejs2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
+      "integrity": "sha512-+Y4HA+cb6qUzdgvI3KML8GYpMFwB24dFwzMkS/yXq6hwtUGNUnZQdUnksrV1XGMc2mid5ROw5SAuY9XhI3ValA=="
+    },
     "qs": {
       "version": "6.9.4",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",

package.json

@@ -36,6 +36,7 @@
     "nprogress": "^0.2.0",
     "pdfjs-dist": "2.3.200",
     "pinyin4js": "^1.3.18",
+    "qrcodejs2": "0.0.2",
     "signature_pad": "^3.0.0-beta.3",
     "text-effect": "^1.0.1",
     "v-click-outside-x": "^4.1.0",

src/business/platform/form/components/hyperlink/index.vue

@@ -243,10 +243,7 @@ export default {
         reportPath: this.$reportPath,
         reportPaths: this.$reportPaths
       }
-<<<<<<< HEAD
-      // console.log(options, 'optionsoptionsoptionsoptions')
-=======
->>>>>>> master
+
 
       if (this.$utils.isEmpty(scrip)) return
       const promise = new window.Promise((resolve, reject) => {