favoritemore

@@ -42,19 +42,19 @@ exports.address = (req, res, next) => {
  * @param next
  * @param next
  */
  */
 exports.addressAct = (req, res, next) => {
 exports.addressAct = (req, res, next) => {
+    addressModel.address({
+        id: req.params.id,
+        uid: req.user.uid || 8039759 // TODO 待删除
+    }).then(result => {
         let responseData = {
         let responseData = {
             module: 'home',
             module: 'home',
             page: 'address-act',
             page: 'address-act',
             pageHeader: headerModel.setNav({
             pageHeader: headerModel.setNav({
-            navTitle: '编辑地址'
+                navTitle: result.navTitle
             }),
             }),
-        title: '编辑地址'
+            title: result.navTitle
         };
         };
 
 
-    addressModel.address({
-        id: req.params.id,
-        uid: req.user.uid || 8039759 // TODO 待删除
-    }).then(result => {
         res.render('address/address-act', Object.assign(responseData, result));
         res.render('address/address-act', Object.assign(responseData, result));
     }).catch(next);
     }).catch(next);
 };
 };

@@ -110,11 +110,13 @@ const address = (params) => {
                         return o.address_id === params.id;
                         return o.address_id === params.id;
                     })),
                     })),
                     addressList: camelCase(result[1] ? result[1].data : []),
                     addressList: camelCase(result[1] ? result[1].data : []),
-                    addressActionPage: true
+                    navTitle: '编辑地址'
                 };
                 };
             } else {
             } else {
                 return {
                 return {
-                    address: camelCase(selfAddress.data)
+                    address: camelCase(selfAddress.data),
+                    addressList: camelCase(result[1] ? result[1].data : []),
+                    navTitle: '添加地址'
                 };
                 };
             }
             }
         }
         }
@@ -127,7 +129,7 @@ const address = (params) => {
  */
  */
 const saveAddress = (params) => {
 const saveAddress = (params) => {
     if (params.id) {
     if (params.id) {
-        params.id = crypto.encryption(null, params.id);
+        params.id = crypto.decrypt(null, params.id);
     }
     }
     return _saveAddressData(params).then(result => {
     return _saveAddressData(params).then(result => {
         return result;
         return result;