Authored by wangwei

Merge branch 'hotfix_0119_resource' into test6.5

@@ -22,8 +22,11 @@ @@ -22,8 +22,11 @@
22 <option value="6">YOHO</option> 22 <option value="6">YOHO</option>
23 <option value="7">SHOW</option> 23 <option value="7">SHOW</option>
24 <option value="8">分期</option> 24 <option value="8">分期</option>
25 - <option value="9">订单详情</option>  
26 - <option value="10">物流详情</option> 25 + <option value="9">订单列表</option>
  26 + <option value="10">订单详情</option>
  27 + <option value="11">物流详情</option>
  28 + <option value="12">退换货</option>
  29 + <option value="13">服务与反馈</option>
27 </select> 30 </select>
28 </div> 31 </div>
29 <div class="panel-col"> 32 <div class="panel-col">
@@ -65,8 +68,11 @@ @@ -65,8 +68,11 @@
65 <option value="6">爱享潮物</option> 68 <option value="6">爱享潮物</option>
66 <option value="7">潮人自曝</option> 69 <option value="7">潮人自曝</option>
67 <option value="8">分期</option> 70 <option value="8">分期</option>
68 - <option value="9">订单详情</option>  
69 - <option value="10">物流详情</option> 71 + <option value="9">订单列表</option>
  72 + <option value="10">订单详情</option>
  73 + <option value="11">物流详情</option>
  74 + <option value="12">退换货</option>
  75 + <option value="13">服务与反馈</option>
70 </select> 76 </select>
71 </div> 77 </div>
72 <div id="showchannel" class="col-sm-5"> 78 <div id="showchannel" class="col-sm-5">