Merge branch 'after-sale' into redesign‌-260706

ghsApp/src/admin/billing/forwardResult.vue

@@ -1,16 +1,16 @@
 <!--
   退款结果页 / 资金落地 / 返充凭证海报
   用途：
-    1) 无原单退款成功后：选手选「我已线下转账」或「返充到客户余额」
+    1) 无原单退款、线下原单售后成功后：选手选「已线下转账」或「返充到客户余额」
     2) 已返充余额：绘制退款凭证海报
     3) 已原路退回：简单成功提示
-  谁用：freeRefundConfirm、售后详情/列表补发、隔天售后待落地资金。
+  谁用：freeRefundConfirm、refund.vue 线下售后、售后详情/列表补发。
 -->
 <template>
   <view class="forward-result-page">
     <!-- 待资金落地：原路确认 or 返充余额 -->
     <appResult v-if="showFundActions" title="退款成功">
-      <text class="simple-success">已退款 ¥{{ formatMoney(amount) }}，请选择资金退还方式</text>
+      <text class="simple-success">退款 ¥{{ formatMoney(amount) }}，请选择资金退还方式</text>
       <text class="fund-tip">原单：{{ payWayLabel }}</text>
       <button
         class="admin-button-com big blue action-btn"
@@ -100,6 +100,7 @@ export default {
       orderId: 0,
       mode: '',
       payWay: -1,
+      onlinePay: 1,
       hasReturn: 0,
       couldReturn: 1,
       returnBalance: 0,
@@ -135,15 +136,15 @@ export default {
       return `退款成功，金额 ¥${amt}`
     },
     payWayLabel() {
-      const map = {
-        0: '线下微信',
-        1: '线下支付宝',
-        2: '余额',
-        3: '挂账',
-        4: '现金',
-        5: '银行卡'
-      }
-      return map[Number(this.payWay)] || '线下转账'
+      const payWay = Number(this.payWay)
+      const online = Number(this.onlinePay) === 2 ? '线上' : '线下'
+      if (payWay === 0) return online + '微信'
+      if (payWay === 1) return online + '支付宝'
+      if (payWay === 2) return '余额'
+      if (payWay === 3) return '挂账'
+      if (payWay === 4) return '现金'
+      if (payWay === 5) return '银行卡'
+      return '线下转账'
     }
   },
   onLoad(option) {
@@ -175,6 +176,8 @@ export default {
       this.orderId = Number(payload.orderId || 0)
       this.mode = payload.mode || ''
       this.payWay = Number(payload.payWay != null ? payload.payWay : -1)
+      // 1线下 / 2线上，用于微信支付宝通道文案
+      this.onlinePay = Number(payload.onlinePay != null ? payload.onlinePay : 1)
       this.hasReturn = Number(payload.hasReturn || 0)
       this.couldReturn = payload.couldReturn != null ? Number(payload.couldReturn) : 1
       this.returnBalance = Number(payload.returnBalance || 0)
@@ -204,6 +207,7 @@ export default {
         orderId: this.orderId,
         mode: this.mode,
         payWay: this.payWay,
+        onlinePay: this.onlinePay,
         hasReturn: this.hasReturn,
         couldReturn: this.couldReturn,
         returnBalance: this.returnBalance,
@@ -239,7 +243,7 @@ export default {
       }
       that.$util.confirmModal({
         content: '确认已线下转账给客户？',
-        okText: '已转账',
+        okText: '确认',
         cancelText: '取消'
       }, () => {
         that.fundActing = true
@@ -269,8 +273,8 @@ export default {
         return
       }
       that.$util.confirmModal({
-        content: '确认不线下转账，将退款返充到客户余额？',
-        okText: '确认返充',
+        content: '确认返充到客户余额？',
+        okText: '确认',
         cancelText: '取消'
       }, () => {
         that.fundActing = true

ghsApp/src/admin/billing/freeRefundConfirm.vue

@@ -293,6 +293,7 @@ export default {
           forwardId: data.id || 0,
           orderId: 0,
           payWay: data.payWay != null ? data.payWay : that.form.payWay,
+          onlinePay: data.onlinePay != null ? data.onlinePay : 1,
           hasReturn: data.hasReturn != null ? data.hasReturn : 0,
           couldReturn: data.couldReturn != null ? data.couldReturn : 1,
           returnBalance: data.returnBalance != null ? data.returnBalance : 0,
@@ -311,6 +312,7 @@ export default {
             forwardId: payload.forwardId,
             orderId: 0,
             payWay: payload.payWay,
+            onlinePay: payload.onlinePay,
             hasReturn: payload.hasReturn,
             couldReturn: payload.couldReturn,
             returnBalance: payload.returnBalance,

ghsApp/src/admin/billing/freeRefundList.vue

@@ -89,6 +89,10 @@
               <text class="meta-value" v-if="item.relateOrderSn">{{ item.relateOrderSn }}</text>
               <text class="meta-value" v-else style="color: #3385FF;font-weight: bold;">没有订单</text>
             </view>
+            <view class="meta-item">
+              <text class="meta-label">方式</text>
+              <text class="meta-value">{{ item.refundType == 1 ? '退货退款' : '仅退款' }}</text>
+            </view>
             <view class="meta-item">
               <text class="meta-label">原单</text>
               <text class="meta-value">{{ payWayText(item) }}</text>
@@ -101,10 +105,6 @@
               <text class="meta-label">时间</text>
               <text class="meta-value" style="color: green;font-weight: bold;">隔天售后</text>
             </view>
-            <view class="meta-item">
-              <text class="meta-label">方式</text>
-              <text class="meta-value">{{ item.refundType == 1 ? '退货退款' : '仅退款' }}</text>
-            </view>
             <view class="meta-item">
               <text class="meta-label">操作</text>
               <text class="meta-value">{{ item.shopAdminName || '-' }}</text>
@@ -266,20 +266,16 @@ export default {
       if (Number(item.status) === 1) return '待确认'
       return '-'
     },
-    /** 原路通道：售后单 payWay 快照 */
+    /** 原路通道：与 refundDetail 一致，微信/支付宝区分线上线下 */
     payWayText(item) {
-      const map = {
-        0: '线下微信',
-        1: '线下支付宝',
-        2: '余额',
-        3: '挂账',
-        4: '现金',
-        5: '银行卡'
-      }
-      const pw = Number(item && item.payWay)
-      if (map[pw] != null) {
-        return map[pw]
-      }
+      const payWay = Number(item && item.payWay)
+      const online = Number(item && item.onlinePay) === 2 ? '线上' : '线下'
+      if (payWay === 0) return online + '微信'
+      if (payWay === 1) return online + '支付宝'
+      if (payWay === 2) return '余额'
+      if (payWay === 3) return '挂账'
+      if (payWay === 4) return '现金'
+      if (payWay === 5) return '银行卡'
       return '-'
     },
     statusText(status) {
@@ -423,6 +419,7 @@ export default {
         forwardId: item.id || 0,
         orderId: 0,
         payWay: item.payWay,
+        onlinePay: item.onlinePay != null ? item.onlinePay : 1,
         hasReturn: item.hasReturn || 0,
         couldReturn: item.couldReturn != null ? item.couldReturn : 1,
         returnBalance: item.returnBalance || 1,
@@ -453,6 +450,7 @@ export default {
         forwardId: item.id || 0,
         orderId: 0,
         payWay: item.payWay,
+        onlinePay: item.onlinePay != null ? item.onlinePay : 1,
         hasReturn: item.hasReturn || 0,
         couldReturn: item.couldReturn != null ? item.couldReturn : 1,
         returnBalance: item.returnBalance || 0,

ghsApp/src/admin/stat/customSale.vue

@@ -43,7 +43,7 @@
 							</t-td></t-tr>
 							<t-tr><t-td>
 								<view style="color:#1c89e0;font-size:28upx;">
-									扎数没有减掉售后的数量，只能作为参考数据。金额、成本和利润已经减掉了售后部分，是准确的。
+									金额、利润已按售后扣减（隔天售后记在通过日，可为负）。扎数：当天售后未从开单扎数扣除，隔天退货会在通过日扣扎数。成本仍取开单剩余成本。
 								</view>
 							</t-td></t-tr>
 					</t-table>

ghsApp/src/admin/stat/distSale.vue

@@ -43,7 +43,7 @@
 							</t-td></t-tr>
 							<t-tr><t-td>
 								<view style="color:#1c89e0;font-size:28upx;">
-									扎数没有减掉售后的数量，只能作为参考数据。金额、成本和利润已经减掉了售后部分，是准确的。
+									金额、利润已按售后扣减（隔天售后记在通过日，可为负）。扎数：当天售后未从开单扎数扣除，隔天退货会在通过日扣扎数。成本仍取开单剩余成本。
 								</view>
 							</t-td></t-tr>
 					</t-table>

ghsApp/src/api/custom/index.js

@@ -12,7 +12,7 @@ export const getGatheringCode = data => {
 	return https.get('/custom/get-gathering-code', data)
 }
 
-/** 隔天冲销返余额海报用小程序码（含 balance） */
+/** 隔天售后返余额海报用小程序码（含 balance） */
 export const getGatheringMiniCode = data => {
 	return https.get('/custom/get-gathering-mini-code', data)
 }

ghsApp/src/api/refund/index.js

@@ -45,7 +45,7 @@ export const changeRefundOption = data => {
 	return https.post('/refund/change-refund-option', data)
 }
 
-/** 原单是否可走隔天冲销 */
+/** 原单是否可走隔天售后 */
 export const checkNextDayEligible = data => {
 	return https.get('/refund/check-next-day-eligible', data)
 }

ghsApp/src/components/forward-options-popup.vue

@@ -28,12 +28,12 @@ export default {
 	computed: {
 		tipText() {
 			if (this.mode === 'free') {
-				return '无关联销售单：退货回库；资金请在成功页确认原路或返充余额。'
+				return '无关联销售单：退货回库；资金请在成功页确认按原路退回或返充余额。'
 			}
 			if (this.orderCleared) {
-				return '订单已结账，本次售后不减订单实付，只会算作今天退款；资金按原支付方式原路处理。'
+				return '订单已结账，本次售后不减订单实付，只会算作今天退款；资金将按原路退回。'
 			}
-			return '本次售后不减订单实付，只会算作今天退款；资金按原支付方式原路处理。'
+			return '本次售后不减订单实付，只会算作今天退款；资金将按原路退回。'
 		}
 	},
 	methods: {
@@ -68,14 +68,14 @@ export default {
 	box-sizing: border-box;
 }
 .title {
-	font-size: 34upx;
+	font-size: 46upx;
 	font-weight: bold;
 	color: #333;
 	text-align: center;
 	margin-bottom: 16upx;
 }
 .tip {
-	font-size: 26upx;
+	font-size: 34upx;
 	color: #666;
 	line-height: 1.5;
 	margin-bottom: 28upx;
@@ -86,10 +86,10 @@ export default {
 }
 .popup-btn {
 	flex: 1;
-	height: 80upx;
-	line-height: 80upx;
+	height: 100upx;
+	line-height: 100upx;
 	border-radius: 12upx;
-	font-size: 30upx;
+	font-size: 36upx;
 	margin: 0 10upx;
 }
 .popup-btn.cancel {

ghsApp/src/pages.json

@@ -340,7 +340,7 @@
 				{ "path": "confirm", "style": { "navigationBarTitleText": "待确认" } },
 				{"path": "toPay","style": {"navigationBarTitleText": "等待付款"}},
 				{"path": "affirmGhsBook","style": {"navigationBarTitleText": "等待付款"}},
-				{ "path": "forwardResult", "style": { "navigationBarTitleText": "冲销凭证" } },
+				{ "path": "forwardResult", "style": { "navigationBarTitleText": "退款凭证" } },
 				{ "path": "freeRefund", "style": { "navigationBarTitleText": "退款选花材" } },
 				{ "path": "freeRefundConfirm", "style": { "navigationBarTitleText": "退款确认" } },
 				{ "path": "freeRefundList", "style": { "navigationBarTitleText": "退款记录", "enablePullDownRefresh": true } },

ghsApp/src/pagesOrder/detail.vue

@@ -239,7 +239,7 @@
 					<view>过期时间：</view>
 					<view>{{detailInfo.deadline?detailInfo.deadline.substr(5,11):''}}</view>
 				</view>
-				<!-- 累计退款 = tkPrice + nextDayTkPrice；不单独展示隔天冲销 -->
+				<!-- 累计退款 = tkPrice + nextDayTkPrice；不单独展示隔天售后 -->
 				<view v-if="detailInfo.refundLog == 1 || Number(detailInfo.nextDayTkPrice) > 0" class="order-info_box" style="margin-top:40upx;">
 					<view>累计退款：</view>
 					<view style="color:red;font-weight:bold;font-size:30upx;">{{ totalTkPrice }}</view>
@@ -257,22 +257,18 @@
 				商品信息
 				<text style="font-weight:normal;font-size:26upx;color:green;max-width:190upx;overflow: hidden;white-space:nowrap;">{{ detailInfo.customName||'' }}</text>
 				<view class="flex" style="color: #3385ff;font-weight: 400" v-if="(detailInfo.status == 3 || detailInfo.status == 2) && detailInfo.book == 0">
-					<button class="admin-button-com bule middle" @click.stop="confirmReach(detailInfo,0)">确认送达</button>
+					<button class="admin-button-com bule middle" @click.stop="confirmReach(detailInfo)">确认送达</button>
 				</view>
 				<view v-else class="flex">
 					<button disabled="true" class="admin-button-com bule active middle" style="border:1rpx solid #ccc;">确认送达</button>
 				</view>
 
-				<view class="flex" style="color: #3385ff;" v-if="detailInfo.status == 4">
+				<!-- 待付款/已取消不可售后；其余直接进售后页（未完成由后端提交时自动确认送达/完成） -->
+				<view class="flex" style="color: #3385ff;" v-if="detailInfo.status != 1 && detailInfo.status != 5">
 					<button class="admin-button-com bule middle" @click.stop="goRefund()">发起售后</button>
 				</view>
 				<view v-else class="flex">
-					<block v-if="detailInfo.status == 1 || detailInfo.status == 5">
-						<button disabled="true" class="admin-button-com bule active middle" style="border:1rpx solid #ccc;">发起售后</button>
-					</block>
-					<block v-else>
-						<button class="admin-button-com bule middle" @click.stop="readyGoRefund(detailInfo)">发起售后</button>
-					</block>
+					<button disabled="true" class="admin-button-com bule active middle" style="border:1rpx solid #ccc;">发起售后</button>
 				</view>
 			</view>
 			<view class="module-com content-box">
@@ -1401,29 +1397,29 @@ export default {
 				}
 			})
 		},
-		confirmReach(info,type){
+		/**
+		 * 确认送达：仅「确认送达」按钮，把待发货/配送中订单置为已完成
+		 * @param {Object} info 订单详情
+		 */
+		confirmReach(info){
 			let that = this
 			if(![-1, -2,-4].includes(that.detailInfo.sendStatus)){
 				that.$msg('等跑腿送完再操作')
 				return
 			}
-			let remind = type == 0 ? '确认已送达？' : '确认订单完成？'
-			that.$util.confirmModal({content:remind},() => {
+			that.$util.confirmModal({content:'确认已送达？'},() => {
 				confirmReachFn({id:info.id}).then(res=>{
 					if(res.code == 1){
-						if(type == 0){
-							that.init()
-							that.$msg('已确认')
-						}else{
-							that.$util.pageTo({url:'/pagesOrder/refund?id='+this.option.id})
-						}
+						that.init()
+						that.$msg('已确认')
 					}
 				})
-            })
-		},
-		readyGoRefund(info){
-			this.confirmReach(info,1)
+			})
 		},
+		/**
+		 * 发起售后：直接进售后页，不再前端预确认送达/完成
+		 * 订单未完成时，由后端在提交售后时自动 confirmReach
+		 */
 		goRefund(){
 			this.$util.pageTo({url:'/pagesOrder/refund?id='+this.option.id})
 		},
@@ -2039,9 +2035,9 @@ export default {
 		line-height: 40upx;
 	}
 	.order-clear-bills__amt {
-		color: red;
+		color: #3385ff;
 		font-size: 28upx;
-		margin-left: 8upx;
+		margin-left: 18upx;
 		font-weight: 400;
 		line-height: 40upx;
 	}

ghsApp/src/pagesOrder/refund.vue

@@ -10,6 +10,14 @@
 			<text class="warning-action">查看</text>
 		</view>
 
+		<!-- 支付方式提示：线上/余额/挂账/线下 -->
+		<view class="tip-section">
+			<text v-if="orderInfo.onlinePay == 2" class="tip-text online-tip">此单线上付款，售后钱会原路自动退回给客户</text>
+			<text v-else-if="orderInfo.payWay == 2" class="tip-text online-tip">此单余额付款，售后钱会原路自动退回到客户余额</text>
+			<text v-else-if="orderInfo.payWay == 3 || Number(orderInfo.debtPrice)>0" class="tip-text debt-tip">此单挂账，售后挂账金额会自动减少</text>
+			<text v-else class="tip-text offline-tip">此单线下付款，售后请确认退回方式</text>
+		</view>
+
 		<!-- 退款方式选择卡片 -->
 		<view class="card-section">
 			<view class="section-title">
@@ -186,16 +194,6 @@
 			</view>
 		</view>
 
-		<!-- 提示信息 -->
-		<view class="tip-section">
-			<text v-if="orderInfo.onlinePay == 2" class="tip-text online-tip">此单线上付款，提交后，钱会原路自动退回给客户</text>
-			<text v-else-if="orderInfo.payWay == 2" class="tip-text online-tip">此单余额付款，提交后，钱会原路自动退回到客户余额</text>
-			<block v-else>
-				<text v-if="Number(orderInfo.debtPrice)>0" class="tip-text debt-tip">此单为欠款单，提交后，欠款金额会自动减少</text>
-				<text v-else class="tip-text offline-tip">此单线下付款，提交后钱不会原路退回，请线下转账给客户</text>
-			</block>
-		</view>
-
 		<!-- 底部操作按钮 -->
 		<view class="bottom-actions">
 			<button class="action-btn cancel-btn" @tap="cancelRefund">取消</button>
@@ -236,10 +234,10 @@ export default {
 			orderInfo:{},
 			couldRefundPrice:0,
 			unClear:[],
-			// 隔天冲销预检
+			// 隔天售后预检
 			nextDayEligible: false,
 			showForwardPop: false,
-			// 已结账（当天也走冲销）
+			// 已结账（当天也走隔天售后）
 			orderCleared: false
 		};
 	},
@@ -361,10 +359,10 @@ export default {
 			let topTitle = '提示'
 			let title = '确认退款？'
 			if(this.orderInfo.payWay == 2){
-				title = '此单余额付款，提交后钱会原路退回客户余额，确认退款？'
+				title = '此单余额付款，提交后会原路退回客户余额，确认退款？'
 			}else if(this.orderInfo.onlinePay == 1 && Number(this.orderInfo.debtPrice)<=0){
-				title = '此单线下付款，钱没有原路退回，还要线下转钱给客户，确认知道了？'
-				topTitle = '特别注意！！！'
+				title = '确认退款？'
+				topTitle = '确认退款'
 			}
 			that.$util.confirmModal({title:topTitle,content:title},() => {
 				that.submitRefund(that._pendingRefundParams)
@@ -411,7 +409,7 @@ export default {
 		},
 		submitRefund(refundParams) {
 			const that = this
-			uni.showLoading({title: "提交中",mask:true})
+			uni.showLoading({title: "提交中"})
 			refund(refundParams).then(res => {
 				uni.hideLoading()
 				if(res.code == 1){
@@ -420,8 +418,11 @@ export default {
 						return
 					}
 					const data = res.data || {}
+					// 待确认退回方式：当天/隔天线下等 hasReturn=0 且 couldReturn=1
 					const needFund = Number(data.needFundAction) === 1
-						|| (Number(data.hasReturn) === 0 && Number(data.returnBalance) === 0 && Number(data.sameDay) === 0 && Number(data.couldReturn) === 1)
+						|| (Number(data.hasReturn) === 0
+							&& Number(data.returnBalance) === 0
+							&& Number(data.couldReturn) === 1)
 					const showPoster = Number(data.returnBalance) === 1
 					// 待资金落地或已返充：进结果页
 					if (needFund || showPoster) {
@@ -434,6 +435,7 @@ export default {
 							forwardId: data.id || 0,
 							orderId: data.orderId || that.option.id,
 							payWay: data.payWay != null ? data.payWay : that.orderInfo.payWay,
+							onlinePay: data.onlinePay != null ? data.onlinePay : that.orderInfo.onlinePay,
 							hasReturn: data.hasReturn || 0,
 							couldReturn: data.couldReturn != null ? data.couldReturn : 1,
 							returnBalance: data.returnBalance || 0,
@@ -451,8 +453,6 @@ export default {
 					}
 					that.$util.pageTo({url: '/pagesOrder/refundSuccess?id='+(data.id||''),type:2})
 				}
-			}).catch(() => {
-				uni.hideLoading()
 			})
 		},
 		needCancelRemind(id){
@@ -485,7 +485,7 @@ export default {
 				})
 			}
 
-			// 预检是否可走隔天冲销
+			// 预检是否可走隔天售后
 			checkNextDayEligible({ orderId: this.option.id }).then(r => {
 				if (r.code == 1 && r.data && r.data.ok) {
 					this.nextDayEligible = true
@@ -903,15 +903,15 @@ export default {
 	resize: none;
 }
 
-// 提示信息
+// 支付方式提示（页顶）
 .tip-section {
 	margin: 20upx;
-	padding: 20upx;
+	padding: 0 0 0;
 	border-radius: 12upx;
 	
 	.tip-text {
 		display: block;
-		font-size: 32upx;
+		font-size: 30upx;
 		line-height: 1.5;
 		font-weight: 600;
 		

ghsApp/src/pagesOrder/refundAllList.vue

@@ -196,6 +196,7 @@ export default {
         forwardId: refundInfo.id || 0,
         orderId: 0,
         payWay: refundInfo.payWay,
+        onlinePay: refundInfo.onlinePay != null ? refundInfo.onlinePay : 1,
         hasReturn: refundInfo.hasReturn || 0,
         couldReturn: refundInfo.couldReturn != null ? refundInfo.couldReturn : 1,
         returnBalance: refundInfo.returnBalance || 1,

ghsApp/src/pagesOrder/refundDetail.vue

@@ -134,7 +134,7 @@
 				v-if="canFundAction"
 				class="admin-button-com big blue refund-actions__btn"
 				@click="goFundAction()"
-			>确认退回方式</button>
+			>退还方式</button>
 			<button
 				v-if="canShowPoster"
 				class="admin-button-com big blue refund-actions__btn"
@@ -392,6 +392,7 @@ export default {
 				forwardId: info.id || 0,
 				orderId: orderId,
 				payWay: info.payWay,
+				onlinePay: info.onlinePay != null ? info.onlinePay : 1,
 				hasReturn: info.hasReturn || 0,
 				couldReturn: info.couldReturn != null ? info.couldReturn : 1,
 				returnBalance: info.returnBalance || 0,

hdApp/src/pagesPurchase/gatherPay.vue

@@ -21,9 +21,6 @@
         <block>
           <div class="call-one-btn">
             <block v-if="orderTime>0">
-              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:50upx;color:red;font-weight:bold;" v-if="live == 1">请确认收到花材质量没有问题</view>
-              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:15upx;color:red;font-weight:bold;" v-if="live == 1">欠款单付清后，将无法再申请售后</view>
-              <view style="width:100%;font-size:38upx;margin:0 auto;margin-top:15upx;color:red;font-weight:bold;" v-if="live == 1">确认没问题，点下方按钮付款</view>
 
               <button class="button-com green pay-wx" @click="wxPayFn(1)" style="height:100upx;line-height:50upx;" v-if="live == 1">微信支付</button>