From 4160ebe004057c3741a8c1fc2811a1d977d8d3bd Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 25 Jun 2021 17:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=95=86=E5=93=81=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/goodsDetail/ShowGoods.vue  |  1 +
 .../goodsDetail/ShowGoodsDetail.vue           | 22 +++++++++++++++++++
 .../home/orderCenter/AfterSaleDetail.vue      |  9 ++++++++
 .../pages/home/orderCenter/ApplyAfterSale.vue | 11 ++++++----
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue
index 4378d9ac..32536da6 100644
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@@ -327,6 +327,7 @@ export default {
       })
     },
     promotion () { // 格式化促销活动，返回当前促销的对象
+      if (!this.detail.promotionMap) return false;
       let keysArr = Object.keys(this.detail.promotionMap);
       if (keysArr.length === 0) return false;
 
diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
index 72b4a349..d58f5a6e 100644
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -86,6 +86,14 @@
                 </div>
               </div>
             </TabPane>
+            <TabPane label="商品参数">
+              <table class="mt_10" border="1" cellpadding='0' cellspacing="0" v-if="skuDetail.goodsParamsList && skuDetail.length">
+                <tr v-for="param in skuDetail.goodsParamsList" :key="param">
+                  <td>{{param.paramName}}</td><td>{{param.paramValue}}</td>
+                </tr>
+              </table>
+              <!-- <div v-else>暂无商品参数</div> -->
+            </TabPane>
           </Tabs>
         </div>
       </div>
@@ -475,4 +483,18 @@ export default {
 .ivu-rate-star-full:before, .ivu-rate-star-half .ivu-rate-star-content:before {
   color: $theme_color;
 }
+table{
+  border-color: #eee;
+  color: #999;
+  width: 70%;
+  margin-left: 10px;
+  tr{
+    td:nth-child(1){
+      width: 200px;
+    }
+  }
+  td{
+    padding: 5px;
+  }
+}
 </style>
diff --git a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
index 7adcfd1a..51301f2e 100644
--- a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
@@ -44,6 +44,12 @@
         </tr>
       </table>
     </div>
+    <div class="order-card" v-if="afterSale.afterSaleImage">
+      <h3 class="mb_10">图片信息</h3>
+      <div v-for="img in afterSale.afterSaleImage.split(',')" :key="img">
+        <img :src="img" width="200" height="200" @click="perviewImg(img)" class="hover-pointer" alt="">
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -83,6 +89,9 @@ export default {
     filterOrderStatus (status) { // 获取订单状态中文
       const ob = this.afterSaleStatusList.filter(e => { return e.status === status });
       return ob[0].name
+    },
+    perviewImg (img) {
+      window.open(img, '_blank')
     }
   },
   mounted () {
diff --git a/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue
index b05f8c6a..f2a45781 100644
--- a/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue
+++ b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue
@@ -16,11 +16,11 @@
     </template>
     </Table>
     <div>
-      <Form :model="form" ref="form" :rules="rules" :label-width="80">
+      <Form :model="form" ref="form" class="mt_10" :rules="rules" :label-width="80">
         <FormItem label="售后类别">
           <RadioGroup v-model="form.serviceType" @on-change="changeReason" type="button" button-style="solid">
-            <Radio label="RETURN_GOODS">退货</Radio>
-            <Radio label="RETURN_MONEY">退款</Radio>
+            <Radio v-if="info.returnGoods" label="RETURN_GOODS">退货</Radio>
+            <Radio v-if="info.returnMoney" label="RETURN_MONEY">退款</Radio>
           </RadioGroup>
         </FormItem>
         <FormItem label="提交数量" prop="num">
@@ -144,6 +144,10 @@ export default {
         if (res.success) {
           this.info = res.result
           this.goodsData.push(res.result)
+          if (!this.info.returnGoods && this.info.returnMoney) {
+            this.form.serviceType = 'RETURN_MONEY'
+          }
+          this.getReason(this.form.serviceType)
         }
       })
     },
@@ -195,7 +199,6 @@ export default {
   mounted () {
     this.accessToken.accessToken = storage.getItem('accessToken');
     this.getInfo()
-    this.getReason('RETURN_GOODS')
   }
 }
 </script>