Authored by 陈峰

Merge branch 'release/10.10' into 'master'

Release/10.10



See merge request !383
1 { 1 {
2 "name": "yohobuy-node", 2 "name": "yohobuy-node",
3 - "version": "6.6.17", 3 + "version": "6.6.18",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 "urlencode": "^1.1.0", 57 "urlencode": "^1.1.0",
58 "uuid": "^2.0.2", 58 "uuid": "^2.0.2",
59 "yoho-express-session": "^2.0.0", 59 "yoho-express-session": "^2.0.0",
60 - "yoho-node-lib": "=0.6.32", 60 + "yoho-node-lib": "=0.6.33",
61 "yoho-zookeeper": "^1.0.10", 61 "yoho-zookeeper": "^1.0.10",
62 "yo-cli": "=1.0.7" 62 "yo-cli": "=1.0.7"
63 }, 63 },
@@ -79,6 +79,7 @@ var notifyOkTpl = require('hbs/product/notify-ok.hbs'); @@ -79,6 +79,7 @@ var notifyOkTpl = require('hbs/product/notify-ok.hbs');
79 var $goodsIdArr = []; 79 var $goodsIdArr = [];
80 80
81 require('yoho-jquery-qrcode'); 81 require('yoho-jquery-qrcode');
  82 +require('yoho-jquery-dotdotdot');
82 83
83 function limitedProductUrl(s) { 84 function limitedProductUrl(s) {
84 return window.location.href + '?openby:yohobuy={"action":"go.limitpurchase","params":{"lp":"' + s + '"}}'; 85 return window.location.href + '?openby:yohobuy={"action":"go.limitpurchase","params":{"lp":"' + s + '"}}';