Merge branch 'master' into release/6.3

@@ -11,7 +11,7 @@ exports.index = (req, res) => {
     let responseData = {
         module: 'activity',
         page: 'birthday',
-        title: '生日卷',
+        title: '生日券',
         width750: true,
         localCss: true
     };

@@ -7,7 +7,7 @@
         </div>
         <div class="rule-item">
             <div>领取详情:</div>
-            <div>生日卷领取之日起16日内有效，过期不补偿，领取后请尽快使用。</div>
+            <div>生日券领取之日起16日内有效，过期不补偿，领取后请尽快使用。</div>
         </div>
         <div class="rule-item">
             <div>领取资格:</div>

@@ -55,7 +55,7 @@ module.exports = class extends global.yoho.BaseModel {
         return this.get({
             data: {
                 method: params.id ? 'app.address.update' : 'app.address.add',
-                id: params.id,
+                id: params.id ? _.parseInt(params.id) : null,
                 address: params.address,
                 area_code: params.area_code,
                 consignee: params.consignee,
@@ -77,7 +77,7 @@ module.exports = class extends global.yoho.BaseModel {
             data: {
                 method: 'app.address.setdefault',
                 uid: params.id,
-                id: params.id
+                id: _.parseInt(params.id)
             }
         });
     }
@@ -91,7 +91,7 @@ module.exports = class extends global.yoho.BaseModel {
         return this.get({
             data: {
                 method: 'app.address.del',
-                id: params.id,
+                id: _.parseInt(params.id),
                 uid: params.uid
             }
         });
@@ -161,7 +161,7 @@ module.exports = class extends global.yoho.BaseModel {
      */
     saveAddress(params) {
         if (params.id) {
-            params.id = crypto.decrypt(null, decodeURIComponent(params.id));
+            params.id = _.parseInt(crypto.decrypt(null, decodeURIComponent(params.id)));
         }
 
         return this._saveAddressData(params).then(result => {
@@ -175,7 +175,7 @@ module.exports = class extends global.yoho.BaseModel {
      */
     setDefaultAddress(params) {
         if (params.id) {
-            params.id = crypto.encryption(null, params.id);
+            params.id = _.parseInt(crypto.encryption(null, params.id));
         }
         return this._setDefaultAddress(params).then(result => {
             return result;
@@ -188,7 +188,7 @@ module.exports = class extends global.yoho.BaseModel {
      */
     delAddress(params) {
         if (params.id) {
-            params.id = crypto.decrypt(null, params.id);
+            params.id = _.parseInt(crypto.decrypt(null, params.id));
         }
         return this._delAddressData(params).then(result => {
             return result;
@@ -216,7 +216,7 @@ module.exports = class extends global.yoho.BaseModel {
         return this.get({
             data: {
                 method: 'app.address.provinces',
-                id: params.id || '0'
+                id: _.parseInt(params.id) || 0
             },
             param: {code: 200, cache: true}
         }).then(result => {
@@ -234,7 +234,7 @@ module.exports = class extends global.yoho.BaseModel {
                 method: 'app.SpaceOrders.updateDeliveryAddress',
                 uid: uid,
                 order_code: orderCode,
-                address_id: crypto.decrypt(null, addressId)
+                address_id: _.parseInt(crypto.decrypt(null, addressId))
             }
         }).then((result) => {
             return result;

@@ -2,6 +2,7 @@
 const PAGE = 'H5';
 const logger = global.yoho.logger;
 const serviceAPI = global.yoho.ServiceAPI.ApiUrl;
+const config = global.yoho.config;
 
 module.exports = class extends global.yoho.BaseModel {
     constructor(ctx) {
@@ -16,7 +17,7 @@ module.exports = class extends global.yoho.BaseModel {
         return Promise.resolve({
             code: 200,
             data: {
-                verifiedGraphicCode: `${serviceAPI}passport/img-check.jpg?udid=${udid}&fromPage=${PAGE}`
+                verifiedGraphicCode: `${serviceAPI}passport/img-check.jpg?udid=${udid}&fromPage=${PAGE}&client_type=${config.app}`
             }
         });
     }

+0feb9a8aacef33d5daf4bd0ace934e45
\ No newline at end of file