Authored by ccbikai

Merge branch 'feature/home' into develop

@@ -4,4 +4,3 @@ @@ -4,4 +4,3 @@
4 @import "product/index"; 4 @import "product/index";
5 @import "channel/index"; 5 @import "channel/index";
6 @import "home/index"; 6 @import "home/index";
7 -@import "brand/index";  
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 <div class="refund"> 2 <div class="refund">
3 <product-list v-bind:title="title" v-bind:list="list" v-bind:refund-data="refundData"></product-list> 3 <product-list v-bind:title="title" v-bind:list="list" v-bind:refund-data="refundData"></product-list>
4 <div class="return-amount"> 4 <div class="return-amount">
  5 + <!-- TODO:退货信息优化为组件 -->
5 <div class="return-amount-item"> 6 <div class="return-amount-item">
6 退款方法 7 退款方法
7 8
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <div class="remark"> 15 <div class="remark">
16 <textarea v-model="product.remark" rows="3" max-length="100" placeholder="退货原因说明"></textarea> 16 <textarea v-model="product.remark" rows="3" max-length="100" placeholder="退货原因说明"></textarea>
17 </div> 17 </div>
18 - <div class="image-list clearfix"> 18 + <div v-show="specialReturnReason.indexOf(product.reason.id) !== -1" class="image-list clearfix">
19 <div class="image-item" v-for="image in imageListForShow"> 19 <div class="image-item" v-for="image in imageListForShow">
20 <span v-on:click="deleteImage(image.index)" class="icon icon-close"></span> 20 <span v-on:click="deleteImage(image.index)" class="icon icon-close"></span>
21 <img v-bind:src="image.path"> 21 <img v-bind:src="image.path">
@@ -50,6 +50,15 @@ @@ -50,6 +50,15 @@
50 name: '请选择' 50 name: '请选择'
51 }].concat(this.refundData.returnReason); 51 }].concat(this.refundData.returnReason);
52 }, 52 },
  53 + specialReturnReason() {
  54 + const list = [];
  55 +
  56 + this.refundData.specialReturnReason.forEach(reason => {
  57 + list.push(reason.id);
  58 + });
  59 +
  60 + return list;
  61 + },
53 imageListForShow() { 62 imageListForShow() {
54 const list = []; 63 const list = [];
55 64