From a6fec5cf70dc0ab28cf79295dd9476677070ba77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Thu, 22 Jul 2021 17:32:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=84=E4=BB=B7=E6=97=A0id,=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=8A=95=E8=AF=89=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/api.js                                 | 12 +++----
 pages/order/afterSales/afterSales.vue         |  6 ++--
 pages/order/afterSales/afterSalesDetail.vue   |  9 ++++--
 pages/order/afterSales/applyDetail.vue        | 32 ++++++++++++++++---
 pages/product/goods.vue                       |  6 ++--
 .../product/evaluation/-evaluation.vue        |  6 ++--
 6 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/config/api.js b/config/api.js
index c390038..ed1e83f 100644
--- a/config/api.js
+++ b/config/api.js
@@ -4,12 +4,12 @@
  */
 // 开发环境
 const dev = {
-	// common: "https://common-api.pickmall.cn",
-	// buyer: "https://buyer-api.pickmall.cn",
-	common: 'http://192.168.0.101:8890',
-	buyer: 'http://192.168.0.101:8888',
-	seller: 'http://192.168.0.101:8889',
-	manager: 'http://192.168.0.101:8887'
+	common: "https://common-api.pickmall.cn",
+	buyer: "https://buyer-api.pickmall.cn",
+	// common: 'http://192.168.0.101:8890',
+	// buyer: 'http://192.168.0.101:8888',
+	// seller: 'http://192.168.0.101:8889',
+	// manager: 'http://192.168.0.101:8887'
 
 };
 // 生产环境
diff --git a/pages/order/afterSales/afterSales.vue b/pages/order/afterSales/afterSales.vue
index 1d0f5ea..ad83aec 100644
--- a/pages/order/afterSales/afterSales.vue
+++ b/pages/order/afterSales/afterSales.vue
@@ -129,8 +129,8 @@ export default {
       params: {
         pageNumber: 1,
         pageSize: 10,
-		sort: 'createTime',
-		order: 'desc'
+        sort: "createTime",
+        order: "desc",
       },
 
       logParams: {
@@ -171,6 +171,8 @@ export default {
         this.logParams = {
           pageNumber: 1,
           pageSize: 10,
+          sort: "createTime",
+          order: "desc",
         };
         if (index === 1) {
           this.logParams.serviceStatus = "APPLY";
diff --git a/pages/order/afterSales/afterSalesDetail.vue b/pages/order/afterSales/afterSalesDetail.vue
index 19b87c1..a930e2b 100644
--- a/pages/order/afterSales/afterSalesDetail.vue
+++ b/pages/order/afterSales/afterSalesDetail.vue
@@ -462,7 +462,7 @@ page,
     align-items: center;
   }
   .images-view {
-    padding: 20rpx;
+    
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -484,7 +484,12 @@ page,
   background-color: #ffffff;
   height: 100rpx;
   width: 750rpx;
+  display: flex;
   align-items: center;
-  padding: 0rpx 20rpx;
+  width: 100%;
+  /deep/ .u-btn{
+    width: 94% !important;
+
+  }
 }
 </style>
diff --git a/pages/order/afterSales/applyDetail.vue b/pages/order/afterSales/applyDetail.vue
index 9a7e940..1d0dfd7 100644
--- a/pages/order/afterSales/applyDetail.vue
+++ b/pages/order/afterSales/applyDetail.vue
@@ -75,7 +75,7 @@
       </view>
       <view class="detail-item">
         <view class="title">申请原因:</view>
-        <view class="value">{{ serviceDetail.reason }}</view>
+        <view class="value">{{ reason }}</view>
       </view>
       <!-- <view class="detail-item" v-if="serviceDetail.apply_vouchers">
 				<view class="title">申请凭证:</view>
@@ -195,6 +195,7 @@ import {
   getServiceDetail,
   getstoreAfterSaleAddress,
   getAfterSaleLog,
+  getAfterSaleReason,
 } from "@/api/after-sale.js";
 import UniIcons from "@/components/uni-icons/uni-icons.vue";
 
@@ -204,6 +205,7 @@ export default {
   },
   data() {
     return {
+      reason: "", //申请原因
       serviceTypeList: {
         // 售后类型
         CANCEL: "取消",
@@ -330,6 +332,20 @@ export default {
       });
     },
 
+    /**
+     * 获取申请原因
+     */
+    getReasonList(serviceType) {
+      getAfterSaleReason(serviceType).then((res) => {
+        if (res.data.success) {
+          // 1357583466371219456
+          this.reason = res.data.result.filter((item) => {
+            return item.id == this.serviceDetail.reason;
+          })[0].reason;
+        }
+      });
+    },
+
     /**
      * 初始化详情
      */
@@ -340,7 +356,10 @@ export default {
       getServiceDetail(this.sn).then((res) => {
         uni.hideLoading();
         this.serviceDetail = res.data.result;
-        if (this.serviceDetail.serviceType == "RETURN_GOODS") {
+        if (
+          this.serviceDetail.serviceType == "RETURN_GOODS" ||
+          this.serviceDetail.serviceType === "RETURN_MONEY"
+        ) {
           this.refundShow = true;
         }
 
@@ -349,10 +368,13 @@ export default {
             this.serviceDetail.serviceType === "ORDER_CANCEL") &&
           this.serviceDetail.refundWay === "OFFLINE";
         this.bankShow =
-          (this.serviceDetail.serviceType === "RETURN_GOODS" ||
+          this.serviceDetail.serviceType === "RETURN_MONEY" ||
+          ((this.serviceDetail.serviceType === "RETURN_GOODS" ||
             this.serviceDetail.serviceType === "ORDER_CANCEL") &&
-          this.serviceDetail.refundWay === "OFFLINE" &&
-          this.serviceDetail.accountType === "BANK_TRANSFER";
+            this.serviceDetail.refundWay === "OFFLINE" &&
+            this.serviceDetail.accountType === "BANK_TRANSFER");
+
+        this.getReasonList(this.serviceDetail.serviceType);
       });
     },
 
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index c686628..2b59091 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -328,7 +328,7 @@ export default {
         top: 0,
         height: 50,
       },
-	  goodsParams: [], // 商品参数
+      goodsParams: [], // 商品参数
       headerFlag: false, //顶部导航显示与否
       headerList: [
         //顶部导航文字按照规则来 详情全局搜索
@@ -475,7 +475,7 @@ export default {
       this.init(
         this.routerVal.id,
         this.routerVal.goodsId,
-        this.routerVal.distributionId,
+        this.routerVal.distributionId
       );
     }
   },
@@ -533,7 +533,7 @@ export default {
       this.goodsDetail = response.data.result.data;
       this.goodsSpec = response.data.result.specs;
       this.PromotionList = response.data.result.promotionMap;
-	  this.goodsParams = response.data.result.goodsParamsDTOList || []
+      this.goodsParams = response.data.result.goodsParamsDTOList || [];
 
       // 判断是否拼团活动或者积分商品 如果有则显示拼团活动信息
       this.PromotionList &&
diff --git a/pages/product/product/evaluation/-evaluation.vue b/pages/product/product/evaluation/-evaluation.vue
index af246ca..c10125f 100644
--- a/pages/product/product/evaluation/-evaluation.vue
+++ b/pages/product/product/evaluation/-evaluation.vue
@@ -71,14 +71,14 @@ export default {
     goodsDetail: {
       handler(val) {
         this.grade = val.grade;
-        this.getGoodsComments();
+        this.getGoodsCommentsMethods();
       },
       deep: true,
       immediate: true,
     },
   },
   mounted() {
-    // this.getGoodsComments();
+  
   },
   methods: {
     parseLoaded() {
@@ -86,7 +86,7 @@ export default {
     },
 
     // 获取商品评论
-    getGoodsComments() {
+    getGoodsCommentsMethods() {
       API_Members.getGoodsComments(this.goodsDetail.goodsId, this.params).then(
         (res) => {
           this.commDetail = res.data.result;