shish 1 day ago
parent
commit
b202297254

+ 1 - 1
ghsApp/src/api/custom/index.js

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

+ 1 - 1
ghsApp/src/api/refund/index.js

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

+ 1 - 1
ghsApp/src/pages.json

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

+ 1 - 1
ghsApp/src/pagesOrder/detail.vue

@@ -239,7 +239,7 @@
 					<view>过期时间:</view>
 					<view>过期时间:</view>
 					<view>{{detailInfo.deadline?detailInfo.deadline.substr(5,11):''}}</view>
 					<view>{{detailInfo.deadline?detailInfo.deadline.substr(5,11):''}}</view>
 				</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 v-if="detailInfo.refundLog == 1 || Number(detailInfo.nextDayTkPrice) > 0" class="order-info_box" style="margin-top:40upx;">
 					<view>累计退款:</view>
 					<view>累计退款:</view>
 					<view style="color:red;font-weight:bold;font-size:30upx;">{{ totalTkPrice }}</view>
 					<view style="color:red;font-weight:bold;font-size:30upx;">{{ totalTkPrice }}</view>

+ 3 - 3
ghsApp/src/pagesOrder/refund.vue

@@ -234,10 +234,10 @@ export default {
 			orderInfo:{},
 			orderInfo:{},
 			couldRefundPrice:0,
 			couldRefundPrice:0,
 			unClear:[],
 			unClear:[],
-			// 隔天冲销预检
+			// 隔天售后预检
 			nextDayEligible: false,
 			nextDayEligible: false,
 			showForwardPop: false,
 			showForwardPop: false,
-			// 已结账(当天也走冲销
+			// 已结账(当天也走隔天售后
 			orderCleared: false
 			orderCleared: false
 		};
 		};
 	},
 	},
@@ -485,7 +485,7 @@ export default {
 				})
 				})
 			}
 			}
 
 
-			// 预检是否可走隔天冲销
+			// 预检是否可走隔天售后
 			checkNextDayEligible({ orderId: this.option.id }).then(r => {
 			checkNextDayEligible({ orderId: this.option.id }).then(r => {
 				if (r.code == 1 && r.data && r.data.ok) {
 				if (r.code == 1 && r.data && r.data.ok) {
 					this.nextDayEligible = true
 					this.nextDayEligible = true