home

@@ -21,10 +21,14 @@ module.exports = class extends global.yoho.BaseModel {
      * @param params
      */
     _getAddressData(params) {
-        return api.get('', {
-            method: 'app.address.gethidden',
-            uid: params.uid
-        }, {code: 200});
+        return this.get({
+            data: {
+                method: 'app.address.gethidden',
+                uid: params.uid
+            },
+            api: global.yoho.API,
+            param: {code: 200}
+        });
     }
 
     /**
@@ -34,10 +38,14 @@ module.exports = class extends global.yoho.BaseModel {
      * @private
      */
     _getThrAddressData(params) {
-        return api.get('', {
-            method: 'app.address.getlist',
-            uid: params.uid
-        }, {code: 200, cache: true});
+        return this.get({
+            data: {
+                method: 'app.address.getlist',
+                uid: params.uid
+            },
+            api: global.yoho.API,
+            param: {code: 200, cache: true}
+        });
     }
 
     /**
@@ -46,16 +54,19 @@ module.exports = class extends global.yoho.BaseModel {
      * @private
      */
     _saveAddressData(params) {
-        return api.get('', {
-            method: params.id ? 'app.address.update' : 'app.address.add',
-            id: params.id,
-            address: params.address,
-            area_code: params.area_code,
-            consignee: params.consignee,
-            email: params.email,
-            mobile: params.mobile,
-            zip_code: params.zip_code,
-            uid: params.uid
+        return this.get({
+            data: {
+                method: params.id ? 'app.address.update' : 'app.address.add',
+                id: params.id,
+                address: params.address,
+                area_code: params.area_code,
+                consignee: params.consignee,
+                email: params.email,
+                mobile: params.mobile,
+                zip_code: params.zip_code,
+                uid: params.uid
+            },
+            api: global.yoho.API
         });
     }
 
@@ -65,10 +76,13 @@ module.exports = class extends global.yoho.BaseModel {
      * @private
      */
     _setDefaultAddress(params) {
-        return api.get('', {
-            method: 'app.address.setdefault',
-            uid: params.id,
-            id: params.id
+        return this.get({
+            data: {
+                method: 'app.address.setdefault',
+                uid: params.id,
+                id: params.id
+            },
+            api: global.yoho.API
         });
     }
 
@@ -78,10 +92,13 @@ module.exports = class extends global.yoho.BaseModel {
      * @private
      */
     _delAddressData(params) {
-        return api.get('', {
-            method: 'app.address.del',
-            id: params.id,
-            uid: params.uid
+        return this.get({
+            data: {
+                method: 'app.address.del',
+                id: params.id,
+                uid: params.uid
+            },
+            api: global.yoho.API
         });
     }
 
@@ -201,10 +218,14 @@ module.exports = class extends global.yoho.BaseModel {
      * 新版地址选择获取地址
      */
     newGetAddress(params) {
-        return api.get('', {
-            method: 'app.address.provinces',
-            id: params.id || '0'
-        }, {code: 200, cache: true}).then(result => {
+        return this.get({
+            data: {
+                method: 'app.address.provinces',
+                id: params.id || '0'
+            },
+            api: global.yoho.API,
+            param: {code: 200, cache: true}
+        }).then(result => {
             return result && result.data;
         });
     }
@@ -214,11 +235,14 @@ module.exports = class extends global.yoho.BaseModel {
      * @param params
      */
     chooseAddress(orderCode, addressId, uid) {
-        return api.get('', {
-            method: 'app.SpaceOrders.updateDeliveryAddress',
-            uid: uid,
-            order_code: orderCode,
-            address_id: crypto.decrypt(null, addressId)
+        return this.get({
+            data: {
+                method: 'app.SpaceOrders.updateDeliveryAddress',
+                uid: uid,
+                order_code: orderCode,
+                address_id: crypto.decrypt(null, addressId)
+            },
+            api: global.yoho.API
         }).then((result) => {
             return result;
         });

@@ -8,11 +8,9 @@
 'use strict';
 
 const api = global.yoho.API;
-const singleAPI = global.yoho.SingleAPI;
 const helpers = global.yoho.helpers;
 const _ = require('lodash');
 const crypto = global.yoho.crypto;
-const service = global.yoho.ServiceAPI;
 const utils = '../../../utils';
 const resourcesProcess = require(`${utils}/resources-process`);
 
@@ -26,11 +24,13 @@ module.exports = class extends global.yoho.BaseModel {
      */
     _userData(params) {
         if (params.uid) {
-            return api.get('', {
-                method: 'app.passport.profile',
-                uid: params.uid
-            }, {
-                code: 200
+            return this.get({
+                data: {
+                    method: 'app.passport.profile',
+                    uid: params.uid
+                },
+                api: global.yoho.API,
+                param: {code: 200}
             });
         } else {
             return Promise.resolve({});
@@ -41,10 +41,10 @@ module.exports = class extends global.yoho.BaseModel {
      * 获取个人中心公告有关数据
      */
     _noticeData() {
-        return api.get('', {
-            method: 'app.resources.getNotices'
-        }, {
-            code: 200
+        return this.get({
+            data: {method: 'app.resources.getNotices'},
+            api: global.yoho.API,
+            param: {code: 200}
         });
     }
 
@@ -55,11 +55,14 @@ module.exports = class extends global.yoho.BaseModel {
      */
     _favoriteData(params) {
         if (params.uid) {
-            return singleAPI.get('favorite', {
-                method: 'app.favorite.getFavoriteCount',
-                uid: params.uid
-            }, {
-                code: 200
+            return this.get({
+                url: 'favorite',
+                data: {
+                    method: 'app.favorite.getFavoriteCount',
+                    uid: params.uid
+                },
+                api: global.yoho.ServiceAPI,
+                param: {code: 200}
             });
         } else {
             return false;
@@ -71,12 +74,14 @@ module.exports = class extends global.yoho.BaseModel {
      */
     _infoNum(params) {
         if (params.uid) {
-            return api.get('', {
-                method: 'app.home.getInfoNum',
-                uid: params.uid,
-                udid: params.udid
-            }, {
-                code: 200
+            return this.get({
+                data: {
+                    method: 'app.home.getInfoNum',
+                    uid: params.uid,
+                    udid: params.udid
+                },
+                api: global.yoho.API,
+                param: {code: 200}
             });
         } else {
             return false;
@@ -89,11 +94,13 @@ module.exports = class extends global.yoho.BaseModel {
      */
     _getAddressData(params) {
         if (params.uid) {
-            return api.get('', {
-                method: 'app.address.gethidden',
-                uid: params.uid
-            }, {
-                code: 200
+            return this.get({
+                data: {
+                    method: 'app.address.gethidden',
+                    uid: params.uid
+                },
+                api: global.yoho.API,
+                param: {code: 200}
             });
         } else {
             return false;
@@ -102,8 +109,12 @@ module.exports = class extends global.yoho.BaseModel {
 
     // 资源位
     _getRes() {
-        return service.get('/operations/api/v5/resource/home', {
-            content_code: '5d05d443a557783b1489d328c127e9bf',
+        return this.get({
+            url: '/operations/api/v5/resource/home',
+            data: {
+                content_code: '5d05d443a557783b1489d328c127e9bf',
+            },
+            api: global.yoho.ServiceAPI
         }).then(result => {
             if (result && result.code === 200 && result.data && result.data.list) {
                 for (let item of result.data.list) {
@@ -121,11 +132,13 @@ module.exports = class extends global.yoho.BaseModel {
     // 潮流口令
     _getCode(uid) {
         if (uid) {
-            return api.get('', {
-                method: 'app.invitecode.my',
-                uid: uid
-            }, {
-                code: 200
+            return this.get({
+                data: {
+                    method: 'app.invitecode.my',
+                    uid: uid
+                },
+                api: global.yoho.API,
+                param: {code: 200}
             });
         } else {
             return Promise.resolve({});
@@ -133,8 +146,12 @@ module.exports = class extends global.yoho.BaseModel {
     }
 
     _getTrendPop(contentCode) {
-        return service.get('operations/api/v5/resource/get', {
-            content_code: contentCode,
+        return this.get({
+            url: 'operations/api/v5/resource/get',
+            data: {
+                content_code: contentCode,
+            },
+            api: global.yoho.ServiceAPI
         }).then(result => {
             if (result && result.code === 200 && result.data) {
                 return result.data[0];
@@ -237,11 +254,13 @@ module.exports = class extends global.yoho.BaseModel {
     }
 
     _detailInfo(uid) {
-        return api.get('', {
-            method: 'app.passport.profile',
-            uid: uid
-        }, {
-            code: 200
+        return this.get({
+            data: {
+                method: 'app.passport.profile',
+                uid: uid
+            },
+            api: global.yoho.API,
+            param: {code: 200}
         });
     }
 
@@ -278,13 +297,15 @@ module.exports = class extends global.yoho.BaseModel {
      */
     recordContent(uid, udid, page, limit) {
         if (uid) {
-            return api.get('', {
-                method: 'app.browse.product',
-                uid: uid,
-                limit: limit,
-                page: page
-            }, {
-                code: 200
+            return this.get({
+                data: {
+                    method: 'app.browse.product',
+                    uid: uid,
+                    limit: limit,
+                    page: page
+                },
+                api: global.yoho.API,
+                param: {code: 200}
             }).then((result) => {
 
                 let resu = {};
@@ -338,10 +359,13 @@ module.exports = class extends global.yoho.BaseModel {
      * @param params
      */
     delRecord(uid, skn) {
-        return api.get('', {
-            method: 'app.browse.delete',
-            uid: uid,
-            skn: skn
+        return this.get({
+            data: {
+                method: 'app.browse.delete',
+                uid: uid,
+                skn: skn
+            },
+            api: global.yoho.API
         });
     }
 
@@ -350,22 +374,30 @@ module.exports = class extends global.yoho.BaseModel {
      * @param params
      */
     getGradeGrade(uid, channel) {
-        return api.get('', {
-            method: 'app.passport.vip',
-            uid: uid,
-            channel: channel || 1
-        }, {
-            code: 200
+        return this.get({
+            data: {
+                method: 'app.passport.vip',
+                uid: uid,
+                channel: channel || 1
+            },
+            api: global.yoho.API,
+            param: {
+                code: 200
+            }
         });
     }
 
     getGradeUser(uid, channel) {
-        return api.get('', {
-            method: 'app.passport.profile',
-            uid: uid,
-            channel: channel || 1
-        }, {
-            code: 200
+        return this.get({
+            data: {
+                method: 'app.passport.profile',
+                uid: uid,
+                channel: channel || 1
+            },
+            api: global.yoho.API,
+            param: {
+                code: 200
+            }
         });
     }
 
@@ -474,12 +506,16 @@ module.exports = class extends global.yoho.BaseModel {
      */
     getPreferential(params) {
 
-        return api.get('', {
-            method: 'app.passport.getPrivilege',
-            uid: params.uid,
-            channel: params.channel || 1
-        }, {
-            code: 200
+        return this.get({
+            data: {
+                method: 'app.passport.getPrivilege',
+                uid: params.uid,
+                channel: params.channel || 1
+            },
+            api: global.yoho.API,
+            param: {
+                code: 200
+            }
         }).then((result) => {
 
             let obj = {};

 'use strict';
 
-const api = global.yoho.API;
 const helpers = global.yoho.helpers;
 const _ = require('lodash');
 
@@ -99,15 +98,19 @@ module.exports = class extends global.yoho.BaseModel {
      * @param params
      */
     _getOrderData(params) {
-        return api.get('', {
-            method: 'app.SpaceOrders.get',
-            type: params.type,
-            page: params.page,
-            limit: params.limit,
-            gender: params.gender,
-            yh_channel: params.yh_channel,
-            uid: params.uid
-        }, {code: 200});
+        return this.get({
+            data: {
+                method: 'app.SpaceOrders.get',
+                type: params.type,
+                page: params.page,
+                limit: params.limit,
+                gender: params.gender,
+                yh_channel: params.yh_channel,
+                uid: params.uid
+            },
+            api: global.yoho.API,
+            param: {code: 200}
+        });
     }
 
     /**
@@ -248,11 +251,12 @@ module.exports = class extends global.yoho.BaseModel {
             navs: this._getNavs(params.type)
         };
 
-        return api.get('', _.assign({
-            method: 'app.SpaceOrders.closeReasons'
-        }, params), {
-            cache: true,
-            code: 200
+        return this.get({
+            data: _.assign({
+                method: 'app.SpaceOrders.closeReasons'
+            }, params),
+            api: global.yoho.API,
+            param: {cache: true, code: 200}
         }).then(result => {
 
             if (result && result.data) {
@@ -267,9 +271,11 @@ module.exports = class extends global.yoho.BaseModel {
      * 申请退款原因
      */
     refundReason() {
-        return api.get('', {
-            method: 'app.SpaceOrders.refundApplyReasons'
-        }, {code: 200, cache: true}).then(result => {
+        return this.get({
+            data: {method: 'app.SpaceOrders.refundApplyReasons'},
+            api: global.yoho.API,
+            param: {code: 200, cache: true}
+        }).then(result => {
             return _.get(result, 'data', []);
         });
     }
@@ -324,10 +330,13 @@ module.exports = class extends global.yoho.BaseModel {
      * 确认收货确认订单接口
      */
     sure(params) {
-        return api.get('', {
-            method: 'app.SpaceOrders.confirm',
-            order_code: params.order_code,
-            uid: params.uid
+        return this.get({
+            data: {
+                method: 'app.SpaceOrders.confirm',
+                order_code: params.order_code,
+                uid: params.uid
+            },
+            api: global.yoho.API
         });
     }
 };

 'use strict';
 
-
-const api = global.yoho.API;
-const serviceApi = global.yoho.ServiceAPI;
-
 const _ = require('lodash');
 
 // const config = global.yoho.config;
@@ -20,10 +16,10 @@ module.exports = class extends global.yoho.BaseModel {
     }
 
     closeReasons() {
-        return api.get('', {
-            method: 'app.SpaceOrders.closeReasons'
-        }, {
-            cache: true
+        return this.get({
+            data: {method: 'app.SpaceOrders.closeReasons'},
+            api: global.yoho.API,
+            param: {cache: true}
         }).then((result) => {
             if (result && result.code === 200) {
                 return result.data;
@@ -156,10 +152,13 @@ module.exports = class extends global.yoho.BaseModel {
             return Promise.resolve({});
         }
 
-        return api.get('', {
-            method: 'app.SpaceOrders.detail',
-            uid: uid,
-            order_code: orderCode
+        return this.get({
+            data: {
+                method: 'app.SpaceOrders.detail',
+                uid: uid,
+                order_code: orderCode
+            },
+            api: global.yoho.API
         }).then(result => {
             if (result && result.code === 200) {
                 let orderDetail = camelCase(result.data);
@@ -296,19 +295,25 @@ module.exports = class extends global.yoho.BaseModel {
 
     // 删除订单
     delOrder(orderCode, uid) {
-        return api.get('', {
-            method: 'app.SpaceOrders.delOrderByCode',
-            uid: uid,
-            order_code: orderCode
+        return this.get({
+            data: {
+                method: 'app.SpaceOrders.delOrderByCode',
+                uid: uid,
+                order_code: orderCode
+            },
+            api: global.yoho.API
         });
     }
 
     // 再次购买
     readdData(orderCode, uid) {
-        return api.get('', {
-            method: 'app.Shopping.readd',
-            uid: uid,
-            order_code: orderCode
+        return this.get({
+            data: {
+                method: 'app.Shopping.readd',
+                uid: uid,
+                order_code: orderCode
+            },
+            api: global.yoho.API
         }).then((result) => {
             if (result && result.code === 200) {
                 result.message = '商品已重新加入购物车';
@@ -326,14 +331,17 @@ module.exports = class extends global.yoho.BaseModel {
     // 取消订单
     cancelOrder(orderCode, uid, reasonId, gender, channel, reason) {
 
-        return api.get('', {
-            method: 'app.SpaceOrders.close',
-            uid: uid,
-            order_code: orderCode,
-            reasonId: reasonId,
-            reasons: reason,
-            gender: gender,
-            yh_channel: channel
+        return this.get({
+            data: {
+                method: 'app.SpaceOrders.close',
+                uid: uid,
+                order_code: orderCode,
+                reasonId: reasonId,
+                reasons: reason,
+                gender: gender,
+                yh_channel: channel
+            },
+            api: global.yoho.API
         });
     }
 
@@ -341,12 +349,15 @@ module.exports = class extends global.yoho.BaseModel {
      * 申请退款
      */
     refundApply(params) {
-        return api.get('', {
-            method: 'app.SpaceOrders.refundApply',
-            uid: params.uid,
-            order_code: params.orderCode,
-            reason_id: params.reasonId,
-            reason: params.reason
+        return this.get({
+            data: {
+                method: 'app.SpaceOrders.refundApply',
+                uid: params.uid,
+                order_code: params.orderCode,
+                reason_id: params.reasonId,
+                reason: params.reason
+            },
+            api: global.yoho.API
         });
     }
 
@@ -377,16 +388,21 @@ module.exports = class extends global.yoho.BaseModel {
             });
         }
 
-        return api.get('', finalParams);
+        return this.get({
+            data: finalParams,
+            api: global.yoho.API
+        });
     }
 
     /**
      * 获取物流详情页banner
      */
     _getLogisterBanner() {
-        return serviceApi.get('operations/api/v5/resource/get', {
-            content_code: CODE_LOGISTIC_BANNER
-        }, {code: 200});
+        return this.get({
+            url: 'operations/api/v5/resource/get',
+            data: {content_code: CODE_LOGISTIC_BANNER},
+            params: {code: 200}
+        });
     }
 
     /**
@@ -467,6 +483,9 @@ module.exports = class extends global.yoho.BaseModel {
             });
         }
 
-        return api.post('', apiParams);
+        return this.post({
+            data: apiParams,
+            api: global.yoho.API
+        });
     }
 };

@@ -41,7 +41,7 @@
   "license": "MIT",
   "dependencies": {
     "bluebird": "^3.4.7",
-    "body-parser": "^1.17.2",
+    "body-parser": "^1.18.0",
     "captchapng": "0.0.1",
     "cheerio": "^0.22.0",
     "client-sessions": "^0.8.0",
@@ -77,7 +77,7 @@
     "yoho-zookeeper": "^1.0.8"
   },
   "devDependencies": {
-    "autoprefixer": "^7.1.2",
+    "autoprefixer": "^7.1.4",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
     "babel-polyfill": "^6.26.0",
@@ -93,7 +93,7 @@
     "happypack": "^3.1.0",
     "husky": "^0.14.3",
     "ignore-file-loader": "^1.0.0",
-    "nodemon": "^1.11.0",
+    "nodemon": "^1.12.0",
     "opn": "^5.1.0",
     "postcss-assets": "^4.2.0",
     "postcss-calc": "^6.0.0",
@@ -112,7 +112,7 @@
     "shelljs": "^0.7.8",
     "store": "^2.0.12",
     "style-loader": "^0.18.2",
-    "stylelint": "^8.0.0",
+    "stylelint": "^8.1.1",
     "stylelint-config-yoho": "^1.2.10",
     "stylelint-formatter-table": "^1.0.2",
     "stylelint-processor-html": "^1.0.0",
@@ -122,11 +122,11 @@
     "vue-lazyload": "^1.0.6",
     "vue-loader": "^13.0.4",
     "vue-template-compiler": "^2.4.2",
-    "webpack": "^3.5.5",
+    "webpack": "^3.5.6",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-middleware": "^1.12.0",
     "webpack-dev-server": "^2.7.1",
-    "webpack-hot-middleware": "^2.18.2",
+    "webpack-hot-middleware": "^2.19.1",
     "webpack-merge": "^4.1.0",
     "webpack-uglify-parallel": "^0.1.3",
     "yoho-cookie": "^1.2.0",