Merge remote-tracking branch 'origin/release/1.0' into release/1.0

@@ -230,6 +230,12 @@ const _getUserOrder = (uid, type, page) => {
             const ot = parseInt(item.orderType, 10);
             const st = parseInt(item.status, 10);
 
+            item.orderGoods.forEach(good => {
+                let cnAlphabet = good.cnAlphabet ? good.cnAlphabet : '';
+
+                good.goodUrl = helpers.urlFormat(`/product/pro_${good.productId}_${good.goodsId}/${cnAlphabet}.html`);
+            });
+
             // 转换订单创建时间
             item.createTime = _convertUnixTime(item.createTime);
 

@@ -84,8 +84,11 @@ const getUserReturn = (uid, page) => {
                 item.showStatus = true;
                 item.refundStr = refundStr[item.refundType];
 
-                item.orderGoods.forEach(it => {
-                    it.hidePrice = true;
+                item.orderGoods.forEach(good => {
+                    let cnAlphabet = good.cnAlphabet ? good.cnAlphabet : '';
+
+                    good.hidePrice = true;
+                    good.goodUrl = helpers.urlFormat(`/product/pro_${good.productId}_${good.goodsId}/${cnAlphabet}.html`); // eslint-disable-line
                 });
             });
         }

 <div class="good-info {{#if @last}}last{{/if}}">
-    <img src="{{image goodsImage 65 90}}">
+        <a href="{{goodUrl}}">
+        <img src="{{image goodsImage 65 90}}">
+    </a>
     <div class="detail">
-        <p class="with-bottom-space">{{productName}}</p>
+        <a href="{{goodUrl}}">
+            <p class="with-bottom-space">{{productName}}</p>
+        </a>
         <span class="with-space">颜色：{{colorName}}</span>
         <span>尺码：
             <span class="bold">{{sizeName}}</span>