Merge branch 'develop' into test

@@ -6,3 +6,11 @@
         {{# used}}<i></i>{{/ used}}
         {{# used}}<i></i>{{/ used}}
     </div>
     </div>
 {{/coupons}}
 {{/coupons}}
+
+{{# noRecord}}
+<div class="null">
+	<i></i>
+	<p>您还没有优惠券!</p>
+	<a href="{{topURL}}">随便逛逛</a>
+</div>
+{{/ noRecord}}

@@ -249,12 +249,12 @@
 {{#if onlineServicePage}}
 {{#if onlineServicePage}}
 <script>
 <script>
     seajs.use('js/me/online-service');
     seajs.use('js/me/online-service');
-</script>onlineServiceDetailPage
+</script>
 {{/if}}
 {{/if}}
 {{#if onlineServiceDetailPage}}
 {{#if onlineServiceDetailPage}}
 <script>
 <script>
     seajs.use('js/index/footer');
     seajs.use('js/index/footer');
-</script>onlineServiceDetailPage
+</script>
 {{/if}}
 {{/if}}
 {{#if addressPage}}
 {{#if addressPage}}
 <script>
 <script>

@@ -368,17 +368,33 @@ class UserModel
 		// 调用接口获取优惠券数据
 		// 调用接口获取优惠券数据
 		$coupons = UserData::couponData($uid, $status, $page);
 		$coupons = UserData::couponData($uid, $status, $page);
 
 
+		// 没有获取到优惠券时
+		if (!$coupons) {
+			$result['topURL'] = '/product/new';
+			$result['noRecord'] = true;
+
+			return $result;
+		}
+
 		// 处理优惠券数据
 		// 处理优惠券数据
-		if (isset($coupons['data']) && !empty($coupons['data']['total'])) {
-			$result['coupons'] = $coupons['data']['info'];
+		if (isset($coupons['data'])) {
+			// 不能再查到结果了
+			if ($page == 1 && $coupons['data']['total'] === 0) {
+				$result['walkwayUrl'] = '/product/new';
+				$result['noRecord'] = true;
+			} else {
+				$couponArr = array();
+				isset($coupons['data']['info']) && $couponArr = $coupons['data']['info'];
 
 
-			foreach ($result['coupons'] as &$val) {
+				foreach ($couponArr as &$val) {
 					// 处理已使用的优惠券
 					// 处理已使用的优惠券
 					if ($status == 1) {
 					if ($status == 1) {
 						$val['used'] = true;
 						$val['used'] = true;
 					}
 					}
 				}
 				}
 
 
+				!empty($couponArr) && $result['coupons'] = $couponArr;
+			}
 		}
 		}
 
 
 		return $result;
 		return $result;

@@ -339,7 +339,7 @@ class DetailModel
             
             
             // 详情配图
             // 详情配图
             if (isset($sizeInfo['productIntroBo']['productIntro'])) {
             if (isset($sizeInfo['productIntroBo']['productIntro'])) {
-                $productIntro = strstr($sizeInfo['productIntroBo']['productIntro'], '<br />');
+                $productIntro = $sizeInfo['productIntroBo']['productIntro'];
                 if ($productIntro) {
                 if ($productIntro) {
                     $result['productDetail'] = array(
                     $result['productDetail'] = array(
                         'title' => '商品详情',
                         'title' => '商品详情',