Authored by 毕凯

Merge branch 'master' into release/5.7

... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2016-05-18 10:02:21
* @Last Modified by: Targaryen
* @Last Modified time: 2017-05-19 14:17:08
* @Last Modified time: 2017-05-19 14:26:36
*/
'use strict';
... ... @@ -342,8 +342,7 @@ let getintroData = (data, req) => {
let getintroIntro = (data) => {
return api.get('', {
method: 'app.product.intro',
product_skn: data.productskn,
app_version: '5.6.0'
product_skn: data.productskn
}, {
cache: true
}).then(result => {
... ...
... ... @@ -104,7 +104,7 @@
"yoho-hammer": "^2.0.7",
"yoho-iscroll": "^5.2.0",
"yoho-jquery": "^2.2.4",
"yoho-jquery-lazyload": "^1.9.11",
"yoho-jquery-lazyload": "^1.9.12",
"yoho-jquery-qrcode": "^0.14.0",
"yoho-mlellipsis": "0.0.3",
"yoho-qs": "^1.0.1",
... ...