Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -161,7 +161,7 @@ class UserData
 	public static function couponData($uid, $status, $page = 1, $limit = 10)
 	{
 		$param = Yohobuy::param();
-		$param['method'] = 'app.yohocoin.lists';
+		$param['method'] = 'app.coupons.li';
 		$param['uid'] = $uid;
 		$param['status'] = $status;
 		$param['page'] = $page;
@@ -188,6 +188,76 @@ class UserData
 	}
 
 	/**
+	 * 获取三级地址列表数据
+	 *
+	 * @param int $uid 用户ID
+	 * @return array 地址接口返回的数据
+	 */
+	public static function addressListData($uid)
+	{
+		$param = Yohobuy::param();
+		$param['method'] = 'app.address.getlist';
+		$param['uid'] = $uid;
+		$param['client_secret'] = Sign::getSign($param);
+
+		return Yohobuy::get(Yohobuy::API_URL, $param);
+	}
+
+	/**
+	 * 保存地址数据
+	 *
+	 * @param int $uid 用户ID
+	 * @param string $address 地址信息
+	 * @param int $area_code 城市码
+	 * @param string $consignee 收货人
+	 * @param string $email 邮箱地址
+	 * @param int $id 地址唯一标识符id
+	 * @param string $mobile 手机号码
+	 * @param string $zip_code 邮编
+	 * @return array 地址接口返回的数据
+	 */
+	public static function saveAddressData($uid, $address, $area_code, $consignee, $email, $id, $mobile, $zip_code)
+	{
+		$param = Yohobuy::param();
+		$param['address'] = $address;
+		$param['area_code'] = $area_code;
+		$param['consignee'] = $consignee;
+		$param['email'] = $email;
+
+		if ($id !== null) { // 修改
+			$param['id'] = $id;
+			$param['method'] = 'app.address.update';
+		} else { // 添加
+			$param['method'] = 'app.address.add';
+		}
+
+		$param['mobile'] = $mobile;
+		$param['zip_code'] = $zip_code;
+		$param['uid'] = $uid;
+		$param['client_secret'] = Sign::getSign($param);
+
+		return Yohobuy::get(Yohobuy::API_URL, $param);
+	}
+
+	/**
+	 * 设置默认地址
+	 *
+	 * @param int $uid 用户ID
+	 * @param int $id 地址唯一标识符id
+	 * @return array 接口返回的数据
+	 */
+	public static function setDefaultAddress($uid, $id)
+	{
+		$param = Yohobuy::param();
+		$param['id'] = $id;
+		$param['method'] = 'app.address.setdefault';
+		$param['uid'] = $uid;
+		$param['client_secret'] = Sign::getSign($param);
+
+		return Yohobuy::get(Yohobuy::API_URL, $param);
+	}
+
+	/**
 	 * 意见反馈数据
 	 *
 	 * @param string $udid 客户端唯一标识

@@ -10,13 +10,18 @@ var $ = require('jquery'),
 
 var orderId = $('#order-detail').data('id');
 
-var delHammer;
+var optHammer;
 
 lazyLoad();
 
 //订单删除
-delHammer = new Hammer(document.getElementsByClassName('btn-del')[0]);
-delHammer.on('tap', function() {
+optHammer = new Hammer(document.getElementsByClassName('opt')[0]);
+optHammer.on('tap', function(e) {
+    var $cur = $(e.target);
+
+    if ($cur.hasClass('btn-del')) {
+
+        //删除订单
         if (confirm('确定删除订单吗？')) {
             $.ajax({
                 type: 'GET',
@@ -26,4 +31,17 @@ delHammer.on('tap', function() {
                 }
             });
         }
+    } else if ($cur.hasClass('btn-cancel')) {
+
+        //取消订单
+        if (confirm('确定取消订单吗？')) {
+            $.ajax({
+                type: 'GET',
+                url: '/home/cancelOrder',
+                data: {
+                    id: orderId
+                }
+            });
+        }
+    }
 });
\ No newline at end of file

@@ -123,4 +123,11 @@
         text-align: center;
         border: 1px solid #000;
     }
+
+    .btn-pay {
+        color: #fff;
+        border: none;
+        background: #d0021b;
+        margin-left: 10rem / $pxConvertRem;
+    }
 }
\ No newline at end of file

@@ -167,13 +167,14 @@ class HomeController extends AbstractAction
 	    $this->setNavHeader('优惠券', true, SITE_MAIN);
 		// $uid = $this->getUid();
 	    $uid = 8826435;
-		$status = $this->get('status', 0);
 		$coupons  = array(
-			'couponsUrl' => \Index\UserModel::getCouponData($uid, $status), 
+			'couponsUrl' => array(
+				\Index\UserModel::getCouponData($uid, 0),
+				\Index\UserModel::getCouponData($uid, 1),
+			),
 			'couponsPage' => true
 		);
 		
-		print_r($coupons);
         $this->_view->display('coupons', $coupons);
 
 	}
@@ -207,37 +208,68 @@ class HomeController extends AbstractAction
         $uid = 967016;
 
 		$address = \Index\UserModel::getAddressData($uid);
+		$addressList = \Index\UserModel::getAddressListData($uid);
 
 		// print_r($address);
 
         $this->_view->display('address', array(
             'addressPage' => true,
             'pageFooter' => true,
-            'address' => $address
+            'address' => $address,
+	        'addressList' => $addressList
         ));
 	}
 
 	/**
-     * 修改地址
+	 * 修改地址或者添加新地址
 	 */
-    public function editAddressAction()
+	public function saveAddressAction()
 	{
-        // 设置网站标题
-        $this->setTitle('修改地址');
-        $this->setNavHeader('修改地址', true, SITE_MAIN);
+		$result = array();
 
+		if ($this->isAjax()) {
 			// $uid = $this->getUid();
 			$uid = 967016;
+			$address = $this->post('address', '');
+			$area_code = $this->post('area_code', '');
+			$consignee = $this->post('consignee', '');
+			$email = $this->post('email', '');
+			$id = $this->post('id', null);
+			$mobile = $this->post('mobile', '');
+			$zip_code = $this->post('zip_code', '');
+
+			$result = \Index\UserModel::saveAddressData($uid, $address, $area_code, $consignee, $email, $id, $mobile, $zip_code);
+		}
 
-        $address = \Index\UserModel::getAddressData($uid);
+		if (empty($result)) {
+			echo ' ';
+		} else {
+			$this->echoJson($result);
+		}
 
-        // print_r($address);
+	}
+
+	/**
+	 * 设置默认地址
+	 */
+	public function defaultAddressAction()
+	{
+		$result = array();
+
+		if ($this->isAjax()) {
+			// $uid = $this->getUid();
+			$uid = 967016;
+			$id = $this->post('id', '');
+
+			$result = \Index\UserModel::setDefaultAddress($uid, $id);
+		}
+
+		if (empty($result)) {
+			echo ' ';
+		} else {
+			$this->echoJson($result);
+		}
 
-        $this->_view->display('edit_address', array(
-            'editAddressPage' => true,
-            'pageFooter' => true,
-            'address' => $address
-        ));
 	}
 
     //在线客服
@@ -261,10 +293,13 @@ class HomeController extends AbstractAction
     {
         $service = array();
         $cateId = $this->get('cateId', 0);
+        $cateName = $this->get('cateName', '');
         if ($cateId > 0)
         {
             $service = home\OnlineModel::getOnlineServiceDetail($cateId);
         }
+        $this->setTitle('在线客服');
+        $this->setNavHeader($cateName, true, '');
         $this->_view->display('online_service_detail', $service);
     }
 

@@ -218,7 +218,7 @@ class UserModel
 
 		// 处理优惠券数据
 		if (isset($coupons['data']) && !empty($coupons['data'])) {
-			$result = $coupons['data'];
+			$result = $coupons['data']['info'];
 		}
 
 		return $result;
@@ -246,6 +246,96 @@ class UserModel
 	}
 
 	/**
+	 * 处理地址列表数据
+	 *
+	 * @param int $uid 用户ID
+	 * @return array|mixed 处理之后的地址列表数据
+	 */
+	public static function getAddressListData($uid)
+	{
+		$result = array();
+
+		// 调用接口获取地址列表数据
+		$address = UserData::addressListData($uid);
+
+		// 处理地址数据
+		if (isset($address['data']) && !empty($address['data'])) {
+			$result = $address['data'];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * 保存地址数据
+	 *
+	 * @param int $uid 用户ID
+	 * @param string $address 地址信息
+	 * @param int $area_code 城市码
+	 * @param string $consignee 收货人
+	 * @param string $email 邮箱地址
+	 * @param int $id 地址唯一标识符id
+	 * @param string $mobile 手机号码
+	 * @param string $zip_code 邮编
+	 * @return array|mixed 处理之后的地址列表数据
+	 */
+	public static function saveAddressData($uid, $address, $area_code, $consignee, $email, $id, $mobile, $zip_code)
+	{
+		$result = array();
+
+		// 参数验证
+		if (empty($uid)) {
+			$result['code'] = 400;
+			$result['message'] = '用户不可用';
+		} else if (empty($address)) {
+			$result['code'] = 401;
+			$result['message'] = '请输入可用的地址信息';
+		} else if (empty($area_code)) {
+			$result['code'] = 402;
+			$result['message'] = '地区码不可用';
+		} else if (empty($consignee)) {
+			$result['code'] = 403;
+			$result['message'] = '请输入收件人姓名';
+		} else if (!empty($email) && Helpers::verifyEmail($email)) {
+			$result['code'] = 404;
+			$result['message'] = '输入的邮箱地址格式不正确';
+		} else if (!empty($mobile) && Helpers::verifyMobile($mobile)) {
+			$result['code'] = 404;
+			$result['message'] = '输入的手机号码格式不正确';
+		} else {
+			// 调用接口保存地址数据
+			$address = UserData::saveAddressData($uid, $address, $area_code, $consignee, $email, $id, $mobile, $zip_code);
+			// 处理返回结果
+			if (isset($address['code']) && $address['code'] == 200) {
+				$result = $address['data'];
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * 设置默认地址
+	 *
+	 * @param int $uid 用户ID
+	 * @param int $id 地址唯一标识符id
+	 * @return array|mixed 处理之后的返回数据
+	 */
+	public static function setDefaultAddress($uid, $id)
+	{
+		$result = array('code' => 400, 'message' => '错误');
+
+		// 调用接口设置默认地址
+		$address = UserData::setDefaultAddress($uid, $id);
+		// 处理返回结果
+		if ($address && isset($address['code'])) {
+			$result = $address;
+		}
+
+		return $result;
+	}
+
+	/**
 	 * 处理意见反馈数据
 	 *
 	 * @param string $udid 客户端唯一标识

@@ -230,16 +230,27 @@ class NewsaleModel
 	/**
 	 * 筛选出来的热销排行榜商品数据处理
 	 *
-     * @param  array $data 筛选出来的原数据
+	 * @param  string $gender "1,3"表示男, "2,3"表示女, "1,2,3"表示全部
+	 * @param  string|null $sort 品类ID查询参数
+	 * @param  integer|null $tab_id Tab的ID
+	 * @param  boolean $notab 时候返回顶部tab的数据，默认返回
+	 * @param  integer $limit 查询返回的最大限制数, 默认为50
+	 * @param  integer $page 分页第几页, 默认第1页
 	 * @return array       处理之后的数据
 	 */
-    public static function selectTopData($data)
+    public static function selectTopData($gender, $sort, $tab_id, $notab, $limit, $page)
     {
         $result = array();
 
+	    $data = NewsaleData::getTopProducts($gender, $sort, $tab_id, $limit, $page);
+
         if (isset($data['code']) && $data['code'] === 200 && isset($data['data']['product_list'])) {
 	        $result = NewSaleProcess::newSaleData($data['data']);
 	        unset($result['filter']);
+
+	        if ($notab) {
+		        unset($result['tabs']);
+	        }
         }
 
         return $result;

@@ -42,7 +42,7 @@ class OnlineModel
                     foreach ($sub as $sk => $sv)
                     {
                         $qTmp[$sk]['title'] = $sv['category_name'];
-                        $qTmp[$sk]['link'] = '/home/onlineservicedetail?cateId=' . $sv['id'];
+                        $qTmp[$sk]['link'] = '/home/onlineservicedetail?cateId=' . $sv['id'].'&cateName='.$sv['category_name'];
                     }
                 }
                 $question[$key]['list'] = $qTmp;

@@ -106,12 +106,11 @@ class NewsaleController extends AbstractAction
 			$tab_id = $this->get('tab_id', null);
 			$limit = $this->get('limit', 50);
 			$page = $this->get('page', 1);
+			$notab = (boolean)$this->get('notab', false);
 
 			// 获取性别
 			$gender = Helpers::getGenderByCookie();
-
-			$data = NewsaleData::getTopProducts($gender, $sort, $tab_id, $limit, $page);
-			$result = \Product\NewsaleModel::selectTopData($data);
+			$result = \Product\NewsaleModel::selectTopData($gender, $sort, $tab_id, $notab, $limit, $page);
 		}
 
 		if (empty($result)) {