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

ghsApp/src/admin/billing/forwardResult.vue

@@ -22,7 +22,7 @@
         class="admin-button-com big action-btn"
         :disabled="fundActing"
         @click="onReturnBalance"
-      >不想转账，返充到客户余额</button>
+      >不转账，返充到客户余额</button>
       <button class="admin-button-com big action-btn" @click="goBack">返回首页</button>
     </appResult>
 
@@ -265,7 +265,7 @@ export default {
       })
     },
 
-    /** 不想转账，返充到客户余额 → returnBalance=1 + 海报 */
+    /** 不转账，返充到客户余额 → returnBalance=1 + 海报 */
     onReturnBalance() {
       const that = this
       if (!that.forwardId) {

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

@@ -31,9 +31,9 @@ export default {
 				return '无关联销售单：退货回库；资金请在成功页确认按原路退回或返充余额。'
 			}
 			if (this.orderCleared) {
-				return '订单已结账，本次售后不减订单实付，只会算作今天退款；资金将按原路退回。'
+				return '订单已结账，本次售后不减订单实付，只会算作今天退款；资金将原路退回。'
 			}
-			return '本次售后不减订单实付，只会算作今天退款；资金将按原路退回。'
+			return '本次售后不减订单实付，只会算作今天退款；资金将原路退回。'
 		}
 	},
 	methods: {

ghsApp/src/pagesOrder/refundDetail.vue

@@ -18,8 +18,13 @@
 			<view class="refund-section" v-if="!$util.isEmpty(product)">
 				<view class="refund-label refund-section__title">{{ isFreeRefund ? '花材明细' : '退货商品' }}</view>
 				<view class="refund-product-list">
+					<!-- 点击花材名跳转供货商花材详情，便于核对库存/价格 -->
 					<view class="refund-product-item" v-for="(res, i) in product" :key="i">
-						<view class="refund-product-item__name">
+						<view
+							class="refund-product-item__name"
+							:class="{ 'refund-product-item__name--link': !!res.productId }"
+							@click="goItemDetail(res)"
+						>
 							{{ res.name }} ￥{{ parseFloat(res.xhUnitPrice) }}×{{ res.xhNum }}{{ res.xhUnitName }}=￥{{ parseFloat(res.xhPrice) }}
 						</view>
 						<view class="refund-product-item__option" v-if="res.refundOptionId != 0">
@@ -324,6 +329,15 @@ export default {
 			}
 			this.$util.pageTo({ url: '/pagesOrder/detail?id=' + info.relateOrderId })
 		},
+		/** 跳转花材详情（admin/item/detail），无 productId 时提示 */
+		goItemDetail(item) {
+			const productId = item && (item.productId || item.product_id)
+			if (!productId) {
+				this.$msg('没有花材信息')
+				return
+			}
+			this.$util.pageTo({ url: '/admin/item/detail?id=' + productId })
+		},
 		cancelReject() {
 			this.$refs.rejectRef.close()
 		},
@@ -593,6 +607,10 @@ export default {
 		font-size: 32upx;
 		color: #303133;
 		line-height: 40upx;
+
+		&--link {
+			color: #3385ff;
+		}
 	}
 
 	&__option {