shish 1 일 전
부모
커밋
669784b816
2개의 변경된 파일114개의 추가작업 그리고 14개의 파일을 삭제
  1. 30 14
      ghsApp/src/pagesOrder/refundDetail.vue
  2. 84 0
      hdApp/src/pagesPurchase/refundDetail.vue

+ 30 - 14
ghsApp/src/pagesOrder/refundDetail.vue

@@ -53,7 +53,7 @@
 					<text class="refund-amount">¥{{ refundPrice }}</text>
 					<text class="refund-amount">¥{{ refundPrice }}</text>
 					<text class="refund-extra" v-if="Number(info.refundPackCost) > 0">(含退打包费{{ info.refundPackCost ? parseFloat(info.refundPackCost) : 0 }}元)</text>
 					<text class="refund-extra" v-if="Number(info.refundPackCost) > 0">(含退打包费{{ info.refundPackCost ? parseFloat(info.refundPackCost) : 0 }}元)</text>
 					<text class="refund-extra" v-if="Number(info.refundSendCost) > 0">(含退运费{{ info.refundSendCost ? parseFloat(info.refundSendCost) : 0 }}元)</text>
 					<text class="refund-extra" v-if="Number(info.refundSendCost) > 0">(含退运费{{ info.refundSendCost ? parseFloat(info.refundSendCost) : 0 }}元)</text>
-					<text class="refund-link" @click="changeAmount()" v-if="info.status == 0">修改</text>
+					<text class="refund-link" @click="changeAmount()" style="margin-left: 26upx;" v-if="info.status == 0">修改</text>
 				</view>
 				</view>
 			</view>
 			</view>
 
 
@@ -64,9 +64,35 @@
 				</view>
 				</view>
 			</view>
 			</view>
 
 
-			<view class="refund-row" v-if="Number(info.sameDay) === 0 || Number(info.fundType) > 0">
+			<view class="refund-row" v-if="Number(info.sameDay) === 0">
 				<view class="refund-label">售后类型</view>
 				<view class="refund-label">售后类型</view>
-				<view class="refund-value">{{ sameDayFundText }}</view>
+				<view class="refund-value" style="color: #3385ff;">隔天售后</view>
+			</view>
+
+			<view class="refund-row">
+				<view class="refund-label">返回方式</view>
+				<view class="refund-value">
+					{{ info.fundType==1 ? '原路退回' : info.fundType==2 ? '返充到余额' : info.fundType == 3 ? '线下自行转账' : '其他' }}
+					<block v-if="info.fundType!=2">
+						-
+						<block v-if="info.payWay == 0">
+							{{info.onlinePay == 2?'线上':'线下'}}微信
+						</block>
+						<block v-else-if="info.payWay == 1">
+							{{info.onlinePay == 2?'线上':'线下'}}支付宝
+						</block>
+						<block v-else-if="info.payWay == 2">
+							余额
+						</block>
+						<block v-else-if="info.payWay == 4">
+							现金
+						</block>
+						<block v-else-if="info.payWay == 5">
+							银行卡
+						</block>
+						<block v-else>其它</block>
+					</block>
+				</view>
 			</view>
 			</view>
 
 
 			<view class="refund-row">
 			<view class="refund-row">
@@ -87,7 +113,7 @@
 			<view class="refund-row" v-if="from == 1">
 			<view class="refund-row" v-if="from == 1">
 				<view class="refund-label">订单信息</view>
 				<view class="refund-label">订单信息</view>
 				<view class="refund-value">
 				<view class="refund-value">
-					<text class="refund-link refund-link--bold" @click="goToOrder(info)">点击查看</text>
+					<text class="refund-link refund-link--bold" @click="goToOrder(info)">查看订单</text>
 				</view>
 				</view>
 			</view>
 			</view>
 
 
@@ -186,16 +212,6 @@ export default {
 		canShowPoster() {
 		canShowPoster() {
 			return Number(this.info.status) === 1 && Number(this.info.fundType) === 2
 			return Number(this.info.status) === 1 && Number(this.info.fundType) === 2
 		},
 		},
-		/** 隔天/资金方式文案 */
-		sameDayFundText() {
-			const sameDay = Number(this.info.sameDay)
-			const fund = Number(this.info.fundType)
-			const dayText = sameDay === 0 ? '隔天售后' : '当天售后'
-			if (fund === 2) return dayText + ' · 返充余额'
-			if (fund === 3) return dayText + ' · 线下转账'
-			if (fund === 1) return dayText + ' · 原路退回'
-			return dayText
-		},
 		/** 申请原因文案 */
 		/** 申请原因文案 */
 		causeText() {
 		causeText() {
 			const causeMap = {
 			const causeMap = {

+ 84 - 0
hdApp/src/pagesPurchase/refundDetail.vue

@@ -50,6 +50,17 @@
             <div class="detail-price_box">{{ refundData.info.remark }}</div>
             <div class="detail-price_box">{{ refundData.info.remark }}</div>
           </tui-list-cell>
           </tui-list-cell>
 				</div>
 				</div>
+        <!-- 与 ghsApp refundDetail 同款行样式:售后类型 / 返回方式 -->
+        <view class="refund-meta" v-if="refundData.info">
+          <view class="refund-row" v-if="isNextDayRefund">
+            <view class="refund-label">售后类型</view>
+            <view class="refund-value" style="color:#3385ff;">隔天售后</view>
+          </view>
+          <view class="refund-row">
+            <view class="refund-label">返回方式</view>
+            <view class="refund-value">{{ fundReturnText }}</view>
+          </view>
+        </view>
 			</view>
 			</view>
       <block v-if="refundData.info && refundData.info.smallImgList && !$util.isEmpty(refundData.info.smallImgList)">
       <block v-if="refundData.info && refundData.info.smallImgList && !$util.isEmpty(refundData.info.smallImgList)">
         <view style="background-color: white;border-radius: 10upx;height:200upx;">
         <view style="background-color: white;border-radius: 10upx;height:200upx;">
@@ -86,6 +97,49 @@ export default {
       refundPrice:0
       refundPrice:0
     };
     };
   },
   },
+  computed: {
+    /** sameDay=0 为隔天售后(与 ghsApp refundDetail 一致才展示「售后类型」) */
+    isNextDayRefund() {
+      const info = (this.refundData && this.refundData.info) || {}
+      return Number(info.sameDay) === 0
+    },
+    /**
+     * 返回方式文案(对齐 ghsApp refundDetail)
+     * fundType:1原路 2返余额 3线下转账;返余额不再拼支付渠道
+     */
+    fundReturnText() {
+      const info = (this.refundData && this.refundData.info) || {}
+      const fundType = Number(info.fundType)
+      const fundLabel = fundType === 1
+        ? '原路退回'
+        : fundType === 2
+          ? '返充到余额'
+          : fundType === 3
+            ? '线下自行转账'
+            : '其他'
+      // 返充余额:只展示资金方式
+      if (fundType === 2) {
+        return fundLabel
+      }
+      const payWay = Number(info.payWay)
+      const online = Number(info.onlinePay) === 2 ? '线上' : '线下'
+      let channel = '其它'
+      if (payWay === 0) {
+        channel = online + '微信'
+      } else if (payWay === 1) {
+        channel = online + '支付宝'
+      } else if (payWay === 2) {
+        channel = '余额'
+      } else if (payWay === 3) {
+        channel = '挂账'
+      } else if (payWay === 4) {
+        channel = '现金'
+      } else if (payWay === 5) {
+        channel = '银行卡'
+      }
+      return fundLabel + '-' + channel
+    }
+  },
   onPullDownRefresh() {
   onPullDownRefresh() {
 			this.initData().then(res => {
 			this.initData().then(res => {
 				uni.stopPullDownRefresh()
 				uni.stopPullDownRefresh()
@@ -336,6 +390,36 @@ export default {
       color: #ff2842;
       color: #ff2842;
     }
     }
   }
   }
+  /* 对齐 ghsApp pagesOrder/refundDetail 的售后类型 / 返回方式行 */
+  .refund-meta {
+    padding: 0 24upx 8upx;
+    border-top: 1upx solid #f0f2f5;
+  }
+  .refund-row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 22upx 0;
+    border-bottom: 1upx solid #f0f2f5;
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+  .refund-label {
+    width: 168upx;
+    flex-shrink: 0;
+    font-size: 28upx;
+    color: #909399;
+    line-height: 42upx;
+  }
+  .refund-value {
+    flex: 1;
+    min-width: 0;
+    font-size: 28upx;
+    color: #303133;
+    line-height: 42upx;
+    text-align: right;
+  }
 }
 }
 .app-footer {
 .app-footer {
   display: flex;
   display: flex;