Merge branch 'hotfix/fix_qrCode' into 'master'

fix_qrCode



See merge request !12

 {
 {
   "name": "yas-jssdk",
   "name": "yas-jssdk",
-  "version": "2.4.18",
+  "version": "2.4.19",
   "description": "YOHO!采集系统的前端js的开发包",
   "description": "YOHO!采集系统的前端js的开发包",
   "keywords": [
   "keywords": [
     "YOHO!",
     "YOHO!",
@@ -42,7 +42,7 @@
     "babel-runtime": "^6.20.0",
     "babel-runtime": "^6.20.0",
     "css-loader": "^0.26.1",
     "css-loader": "^0.26.1",
     "expect.js": "^0.3.1",
     "expect.js": "^0.3.1",
-    "gulp": "^3.8.11",
+    "gulp": "^3.9.1",
     "gulp-ftp": "^1.0.3",
     "gulp-ftp": "^1.0.3",
     "gulp-jshint": "^1.9.2",
     "gulp-jshint": "^1.9.2",
     "gulp-util": "^3.0.4",
     "gulp-util": "^3.0.4",

@@ -274,7 +274,7 @@ exports.getMiniAppDialog = function() {
     str += '<div class="mini-app-dialog" id="mini-app-dialog">';
     str += '<div class="mini-app-dialog" id="mini-app-dialog">';
     str += '<div class="mini-app-header"><span class="mini-app-close" id="mini-app-close"></span></div>';
     str += '<div class="mini-app-header"><span class="mini-app-close" id="mini-app-close"></span></div>';
     str += '<div class="mini-app-content"><img id="mini-app-img" src="' + minipath + '" onerror="this.src= \'' + imgpath + '\';this.onerror=null;" /></div>';
     str += '<div class="mini-app-content"><img id="mini-app-img" src="' + minipath + '" onerror="this.src= \'' + imgpath + '\';this.onerror=null;" /></div>';
-    str += '<div class="mini-app-footer">长按识别小程序码进入有货精选</div>';
+    str += '<div class="mini-app-footer">长按识别小程序码进入</div>';
     str += '</div>';
     str += '</div>';
     return str;
     return str;
 }
 }