订单结算 翻译完成

@@ -105,6 +105,8 @@ exports.selectCoupon = (req, res) => {
     });
     });
 
 
     res.render('select-coupon', {
     res.render('select-coupon', {
+        module: 'cart',
+        page: 'select-coupon',
         title: '选择优惠券',
         title: '选择优惠券',
         selectCouponPage: true,
         selectCouponPage: true,
         pageHeader: headerData,
         pageHeader: headerData,
@@ -153,7 +155,7 @@ exports.selectAddress = (req, res, next) => {
 
 
     return addressModel.addressData(uid)
     return addressModel.addressData(uid)
         .then(address => {
         .then(address => {
-            let moreUrl = req.get('Referer') || '/cart/index/orderEnsure'; // 取跳过来的url
+            let moreUrl = req.get('Referer') || '/cart/index/new/orderEnsure'; // 取跳过来的url
 
 
             address = address.data;
             address = address.data;
 
 
@@ -174,6 +176,8 @@ exports.selectAddress = (req, res, next) => {
             });
             });
 
 
             res.render('select-address', {
             res.render('select-address', {
+                module: 'cart',
+                page: 'select-address',
                 pageHeader: headerData,
                 pageHeader: headerData,
                 pageFooter: true,
                 pageFooter: true,
                 moreUrl,
                 moreUrl,

@@ -21,15 +21,6 @@ module.exports = {
         // liveApi: 'http://api.live.yoho.cn/',
         // liveApi: 'http://api.live.yoho.cn/',
         // singleApi: 'http://single.yoho.cn/'
         // singleApi: 'http://single.yoho.cn/'
 
 
-<<<<<<< HEAD
-        api: 'http://api.gray.yohops.com',
-        service: 'service.gray.yohops.com'
-
-        // api: 'http://api.yoho.cn/',
-        // service: 'http://service.yoho.cn/',
-        // liveApi: 'http://api.live.yoho.cn/',
-        // singleApi: 'http://single.yoho.cn/'
-=======
         api: 'http://api-test3.yohops.com:9999/',
         api: 'http://api-test3.yohops.com:9999/',
         service: 'http://service-test3.yohops.com:9999/',
         service: 'http://service-test3.yohops.com:9999/',
         liveApi: 'http://testapi.live.yohops.com:9999/',
         liveApi: 'http://testapi.live.yohops.com:9999/',
@@ -49,7 +40,6 @@ module.exports = {
          // service: 'http://dev-service.yohops.com:9999/',
          // service: 'http://dev-service.yohops.com:9999/',
          // liveApi: 'http://testapi.live.yohops.com:9999/',
          // liveApi: 'http://testapi.live.yohops.com:9999/',
          // singleApi: 'http://api-test1.yohops.com:9999/'
          // singleApi: 'http://api-test1.yohops.com:9999/'
->>>>>>> origin/master
     },
     },
     subDomains: {
     subDomains: {
         host: '.m.yohobuy.com',
         host: '.m.yohobuy.com',

+/**
+ * 购物车 地址选择
+ * @author: bikai<kai.bi@yoho.cn>
+ * @date: 2015/12/14
+ */
+
+var $ = require('jquery'),
+    orderInfo = require('./order-info').orderInfo;
+
+require('home/address.page.js');
+
+var $confim = $('.confim-mask'),
+    deleteId;
+
+require('../common');
+
+$('.address-item').on('click', function() {
+    var $this = $(this);
+    var addressId = decodeURIComponent($this.data('address-id'));
+    var address = {
+        address_id: addressId,
+        consignee: $this.find('.name').text(),
+        mobile: $this.find('.tel').text(),
+        address_info: $this.find('.address-info').text(),
+        is_support: $this.data('is-support')
+    };
+
+    orderInfo('addressId', addressId);
+    orderInfo('address', address);
+    window.location.href = $this.data('href') + (orderInfo('limitUrlSufix') || '');
+
+}).on('click', '.edit', function() {
+    window.location.href = $(this).data('href');
+    return false;
+}).on('click', '.del', function() {
+    deleteId = $(this).data('id');
+});
+
+$confim.on('click', '.confim', function() {
+    if (orderInfo('addressId') === deleteId) {
+        orderInfo('addressId', null);
+        orderInfo('address', null);
+    }
+});