shish 20 часов назад
Родитель
Сommit
7b28b8f557
43 измененных файлов с 79 добавлено и 79 удалено
  1. 0 0
      ghs/dist/shop/js/chunk-2500a632.c258320b.js
  2. 0 0
      ghs/dist/shop/js/chunk-3887613e.7f1f5933.js
  3. 0 0
      ghs/dist/shop/js/chunk-4b0062f0.a6566824.js
  4. 0 0
      ghs/dist/shop/js/chunk-69510fdc.d2627f48.js
  5. 0 0
      ghs/dist/shop/js/chunk-78680b8e.65844e59.js
  6. 0 0
      ghs/dist/shop/js/chunk-7fb73156.79f3f702.js
  7. 0 0
      ghs/dist/shop/js/chunk-b7a9e4f6.58ae6199.js
  8. 0 0
      ghs/dist/shop/js/chunk-b9d39322.33b6015b.js
  9. 0 0
      ghs/dist/shop/js/chunk-d712f49c.cb48758d.js
  10. 1 1
      ghs/src/views/assets/cgItem.vue
  11. 1 1
      ghs/src/views/assets/incomeClass.vue
  12. 1 1
      ghs/src/views/assets/incomeOutItem.vue
  13. 1 1
      ghs/src/views/assets/itemSale.vue
  14. 4 4
      ghs/src/views/custom/account.vue
  15. 3 3
      ghs/src/views/custom/yj.vue
  16. 4 4
      ghs/src/views/in/due.vue
  17. 2 2
      ghs/src/views/in/yj.vue
  18. 2 2
      ghsApp/src/admin/billing/freeRefundList.vue
  19. 1 1
      ghsApp/src/admin/stat/cgItem.vue
  20. 2 2
      ghsApp/src/admin/stat/cgStat.vue
  21. 2 2
      ghsApp/src/admin/stat/cgYj.vue
  22. 1 1
      ghsApp/src/admin/stat/classProfit.vue
  23. 2 2
      ghsApp/src/admin/stat/customSale.vue
  24. 1 1
      ghsApp/src/admin/stat/productSale.vue
  25. 1 1
      ghsApp/src/api/cg-refund/index.js
  26. 1 1
      ghsApp/src/api/custom/index.js
  27. 1 1
      ghsApp/src/api/refund/index.js
  28. 1 1
      ghsApp/src/components/forward-options-popup.vue
  29. 1 1
      ghsApp/src/pagesArrears/detailsItem.vue
  30. 1 1
      ghsApp/src/pagesGys/detailsItem.vue
  31. 1 1
      ghsApp/src/pagesGys/searchItem.vue
  32. 1 1
      ghsApp/src/pagesOrder/detail.vue
  33. 7 7
      ghsApp/src/pagesOrder/refund.vue
  34. 1 1
      ghsApp/src/pagesOrder/refundList.vue
  35. 6 6
      ghsApp/src/pagesPurchase/refund.vue
  36. 4 4
      ghsApp/src/pagesPurchase/refundDetail.vue
  37. 3 3
      ghsApp/src/pagesPurchase/refundList.vue
  38. 15 15
      hdApp/src/admin/order/refund.vue
  39. 1 1
      hdApp/src/admin/order/refundList.vue
  40. 1 1
      hdApp/src/api/refund/index.js
  41. 1 1
      hdApp/src/components/forward-options-popup.vue
  42. 2 2
      hdApp/src/pagesPurchase/refundDetail.vue
  43. 2 2
      hdApp/src/pagesPurchase/refundList.vue

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-2500a632.c258320b.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-3887613e.7f1f5933.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-4b0062f0.a6566824.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-69510fdc.d2627f48.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-78680b8e.65844e59.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-7fb73156.79f3f702.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-b7a9e4f6.58ae6199.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-b9d39322.33b6015b.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
ghs/dist/shop/js/chunk-d712f49c.cb48758d.js


+ 1 - 1
ghs/src/views/assets/cgItem.vue

@@ -20,7 +20,7 @@
 							<span :style="negStyle(totalNum)">{{ formatNum(totalNum) }}</span> 扎
 							<span :style="negStyle(totalNum)">{{ formatNum(totalNum) }}</span> 扎
 							¥<span :style="negStyle(totalAmount)">{{ formatNum(totalAmount) }}</span>
 							¥<span :style="negStyle(totalAmount)">{{ formatNum(totalAmount) }}</span>
 						</span>
 						</span>
-						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后扣减:¥{{ formatNum(nextDayDeduct) }}</span>
+						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后扣减:¥{{ formatNum(nextDayDeduct) }}</span>
 					</div>
 					</div>
 				</div>
 				</div>
 			</template>
 			</template>

+ 1 - 1
ghs/src/views/assets/incomeClass.vue

@@ -1,6 +1,6 @@
 <!--
 <!--
   PC 收支分类:与小程序 classProfit 同源 /stat/class-profit(StatSaleClass::classProfile)。
   PC 收支分类:与小程序 classProfit 同源 /stat/class-profit(StatSaleClass::classProfile)。
-  采购成本、销售收入已含天售后通过日扣减;仅退款含隔天通过日金额。
+  采购成本、销售收入已含天售后通过日扣减;仅退款含隔天通过日金额。
 -->
 -->
 <template>
 <template>
 	<div class="shop-list">
 	<div class="shop-list">

+ 1 - 1
ghs/src/views/assets/incomeOutItem.vue

@@ -1,6 +1,6 @@
 <!--
 <!--
   PC 花材收支明细:与 /stat/income-out-item(StatSaleClass::incomeOutItem)对齐。
   PC 花材收支明细:与 /stat/income-out-item(StatSaleClass::incomeOutItem)对齐。
-  销售/采购均按天售后通过日扣减(数量与金额可为负);仅退款含隔天通过日金额。
+  销售/采购均按天售后通过日扣减(数量与金额可为负);仅退款含隔天通过日金额。
 -->
 -->
 <template>
 <template>
 	<div class="shop-list">
 	<div class="shop-list">

+ 1 - 1
ghs/src/views/assets/itemSale.vue

@@ -23,7 +23,7 @@
 							¥<span :style="negStyle(totalAmount)">{{ formatNum(totalAmount) }}</span>
 							¥<span :style="negStyle(totalAmount)">{{ formatNum(totalAmount) }}</span>
 							总毛利 <span :style="negStyle(totalMl)">{{ formatNum(totalMl) }}</span>
 							总毛利 <span :style="negStyle(totalMl)">{{ formatNum(totalMl) }}</span>
 						</span>
 						</span>
-						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后扣减:¥{{ formatNum(nextDayDeduct) }}</span>
+						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后扣减:¥{{ formatNum(nextDayDeduct) }}</span>
 					</div>
 					</div>
 				</div>
 				</div>
 			</template>
 			</template>

+ 4 - 4
ghs/src/views/custom/account.vue

@@ -1,5 +1,5 @@
 <!--
 <!--
-  PC 应收统计:未扣隔天金额 / 天售后金额 / 已扣隔天金额 三分列,便于对照。
+  PC 应收统计:未扣隔天金额 / 天售后金额 / 已扣隔天金额 三分列,便于对照。
 -->
 -->
 <template>
 <template>
 	<div class="shop-list">
 	<div class="shop-list">
@@ -21,11 +21,11 @@
 				<div class="yj-total-wrap">
 				<div class="yj-total-wrap">
 					<div class="yj-total-nums">
 					<div class="yj-total-nums">
 						<span style="font-size:15px;font-weight:bold;">未扣隔天:¥{{ formatNum(totalOriginAmount) }}</span>
 						<span style="font-size:15px;font-weight:bold;">未扣隔天:¥{{ formatNum(totalOriginAmount) }}</span>
-						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后:¥{{ formatNum(nextDayDeduct) }}</span>
+						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后:¥{{ formatNum(nextDayDeduct) }}</span>
 						<span :style="numStyle(totalAmount, true)">已扣隔天:¥{{ formatNum(totalAmount) }}</span>
 						<span :style="numStyle(totalAmount, true)">已扣隔天:¥{{ formatNum(totalAmount) }}</span>
 					</div>
 					</div>
 					<div class="yj-total-tip">
 					<div class="yj-total-tip">
-						<div>未扣隔天=开单实付合计;隔天售后=通过日扣减额;已扣隔天=未扣隔天−隔天售后(可为负;订单数不减)。</div>
+						<div>未扣隔天=开单实付合计;跨天售后=通过日扣减额;已扣隔天=未扣隔天−跨天售后(可为负;订单数不减)。</div>
 					</div>
 					</div>
 				</div>
 				</div>
 			</template>
 			</template>
@@ -152,7 +152,7 @@ export default {
 							align: 'center',
 							align: 'center',
 						},
 						},
 						{
 						{
-							label: '天售后金额',
+							label: '天售后金额',
 							prop: 'nextDayAmount',
 							prop: 'nextDayAmount',
 							align: 'center',
 							align: 'center',
 						},
 						},

+ 3 - 3
ghs/src/views/custom/yj.vue

@@ -1,5 +1,5 @@
 <!--
 <!--
-  PC 客户业绩:按账单时间汇总开单;天售后按通过日扣实际金额并计入退款(与小程序 customSale 对齐)。
+  PC 客户业绩:按账单时间汇总开单;天售后按通过日扣实际金额并计入退款(与小程序 customSale 对齐)。
 -->
 -->
 <template>
 <template>
 	<div class="shop-list">
 	<div class="shop-list">
@@ -30,10 +30,10 @@
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">含(纸箱:{{ totalCartonNum }}个 ¥{{ totalCarton }}</span>
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">含(纸箱:{{ totalCartonNum }}个 ¥{{ totalCarton }}</span>
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">打包费:¥{{ totalPack }}</span>
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">打包费:¥{{ totalPack }}</span>
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">运费:¥{{ totalFreight }})</span>
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">运费:¥{{ totalFreight }})</span>
-						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后扣减:¥{{ nextDayDeduct }}</span>
+						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后扣减:¥{{ nextDayDeduct }}</span>
 					</div>
 					</div>
 					<div class="yj-total-tip">
 					<div class="yj-total-tip">
-						<div>实际金额、退款已按售后扣减(天售后记在通过日,实际金额可为负;订单数不减)。</div>
+						<div>实际金额、退款已按售后扣减(天售后记在通过日,实际金额可为负;订单数不减)。</div>
 						<div>纸箱/打包/运费仍按开单日剩余数量统计。</div>
 						<div>纸箱/打包/运费仍按开单日剩余数量统计。</div>
 					</div>
 					</div>
 				</div>
 				</div>

+ 4 - 4
ghs/src/views/in/due.vue

@@ -1,5 +1,5 @@
 <!--
 <!--
-  PC 应付统计:未扣隔天金额 / 天售后金额 / 已扣隔天金额 三分列,便于对照。
+  PC 应付统计:未扣隔天金额 / 天售后金额 / 已扣隔天金额 三分列,便于对照。
 -->
 -->
 <template>
 <template>
 	<div class="shop-list">
 	<div class="shop-list">
@@ -21,11 +21,11 @@
 				<div class="yj-total-wrap">
 				<div class="yj-total-wrap">
 					<div class="yj-total-nums">
 					<div class="yj-total-nums">
 						<span style="font-size:15px;font-weight:bold;">未扣隔天:¥{{ formatNum(totalOriginAmount) }}</span>
 						<span style="font-size:15px;font-weight:bold;">未扣隔天:¥{{ formatNum(totalOriginAmount) }}</span>
-						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后:¥{{ formatNum(nextDayDeduct) }}</span>
+						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后:¥{{ formatNum(nextDayDeduct) }}</span>
 						<span :style="numStyle(totalAmount, true)">已扣隔天:¥{{ formatNum(totalAmount) }}</span>
 						<span :style="numStyle(totalAmount, true)">已扣隔天:¥{{ formatNum(totalAmount) }}</span>
 					</div>
 					</div>
 					<div class="yj-total-tip">
 					<div class="yj-total-tip">
-						<div>未扣隔天=入库实付合计;隔天售后=通过日扣减额;已扣隔天=未扣隔天−隔天售后(可为负;订单数不减)。</div>
+						<div>未扣隔天=入库实付合计;跨天售后=通过日扣减额;已扣隔天=未扣隔天−跨天售后(可为负;订单数不减)。</div>
 					</div>
 					</div>
 				</div>
 				</div>
 			</template>
 			</template>
@@ -152,7 +152,7 @@ export default {
 							align: 'center',
 							align: 'center',
 						},
 						},
 						{
 						{
-							label: '天售后金额',
+							label: '天售后金额',
 							prop: 'nextDayAmount',
 							prop: 'nextDayAmount',
 							align: 'center',
 							align: 'center',
 						},
 						},

+ 2 - 2
ghs/src/views/in/yj.vue

@@ -29,10 +29,10 @@
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">含(纸箱:{{ totalCarton }}</span>
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">含(纸箱:{{ totalCarton }}</span>
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">打包费:{{ totalPack }}</span>
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">打包费:{{ totalPack }}</span>
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">运费:{{ totalFreight }})</span>
 						<span style="font-size:15px;font-weight:bold;margin-left:15px;">运费:{{ totalFreight }})</span>
-						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后扣减:¥{{ nextDayDeduct }}</span>
+						<span v-if="Number(nextDayDeduct) > 0" style="font-size:15px;font-weight:bold;margin-left:15px;color:#e67e22;">天售后扣减:¥{{ nextDayDeduct }}</span>
 					</div>
 					</div>
 					<div class="yj-total-tip">
 					<div class="yj-total-tip">
-						<div>金额已按售后扣减(天售后记在通过日,可为负;订单数不减)。</div>
+						<div>金额已按售后扣减(天售后记在通过日,可为负;订单数不减)。</div>
 						<div>纸箱/打包/运费仍按入库日剩余数量统计。</div>
 						<div>纸箱/打包/运费仍按入库日剩余数量统计。</div>
 					</div>
 					</div>
 				</div>
 				</div>

+ 2 - 2
ghsApp/src/admin/billing/freeRefundList.vue

@@ -207,7 +207,7 @@ export default {
       startTime: '',
       startTime: '',
       endTime: '',
       endTime: '',
       totalAmount: 0,
       totalAmount: 0,
-      // -1全部 1当天售后 0天售后
+      // -1全部 1当天售后 0天售后
       sameDay: -1,
       sameDay: -1,
       customId: 0,
       customId: 0,
       searchList: [],
       searchList: [],
@@ -225,7 +225,7 @@ export default {
       sameDayOptions: [
       sameDayOptions: [
         { label: '全部', value: -1 },
         { label: '全部', value: -1 },
         { label: '当天售后', value: 1 },
         { label: '当天售后', value: 1 },
-        { label: '天售后', value: 0 }
+        { label: '天售后', value: 0 }
       ]
       ]
     }
     }
   },
   },

+ 1 - 1
ghsApp/src/admin/stat/cgItem.vue

@@ -22,7 +22,7 @@
 						<t-th><view @click="rankByFn('amount')">总金额<i class="iconfont iconsanjiao_xia"></i></view></t-th>
 						<t-th><view @click="rankByFn('amount')">总金额<i class="iconfont iconsanjiao_xia"></i></view></t-th>
 						</t-tr>
 						</t-tr>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							天售后扣减:¥{{ nextDayDeduct }}
+							天售后扣减:¥{{ nextDayDeduct }}
 						</view>
 						</view>
 						<block v-if="itemList && !$util.isEmpty(itemList)">
 						<block v-if="itemList && !$util.isEmpty(itemList)">
 							<view v-for="(item, index) in itemList" :key="index">
 							<view v-for="(item, index) in itemList" :key="index">

+ 2 - 2
ghsApp/src/admin/stat/cgStat.vue

@@ -1,5 +1,5 @@
 <!--
 <!--
-  供货业绩:按供货商汇总采购金额(含天售后通过日扣减,金额可为负)。
+  供货业绩:按供货商汇总采购金额(含天售后通过日扣减,金额可为负)。
 -->
 -->
 <template>
 <template>
 <view class="app-content">
 <view class="app-content">
@@ -21,7 +21,7 @@
 							<text :style="totalActPrice < 0 ? 'color:#e74c3c;font-weight:bold;' : ''">{{ totalActPrice }}</text>
 							<text :style="totalActPrice < 0 ? 'color:#e74c3c;font-weight:bold;' : ''">{{ totalActPrice }}</text>
 						</view>
 						</view>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							天售后扣减:¥{{ nextDayDeduct }}
+							天售后扣减:¥{{ nextDayDeduct }}
 						</view>
 						</view>
 						<view v-for="(item, index) in displayList" :key="index">
 						<view v-for="(item, index) in displayList" :key="index">
 							<t-tr>
 							<t-tr>

+ 2 - 2
ghsApp/src/admin/stat/cgYj.vue

@@ -1,5 +1,5 @@
 <!--
 <!--
-  采购人业绩:按采购员汇总(天售后通过日扣金额,订单数不减;金额可为负)。
+  采购人业绩:按采购员汇总(天售后通过日扣金额,订单数不减;金额可为负)。
 -->
 -->
 <template>
 <template>
 <view class="app-content">
 <view class="app-content">
@@ -22,7 +22,7 @@
 						<t-th>金额</t-th>
 						<t-th>金额</t-th>
 						</t-tr>
 						</t-tr>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							天售后扣减:¥{{ nextDayDeduct }}
+							天售后扣减:¥{{ nextDayDeduct }}
 						</view>
 						</view>
 						<block v-if="staffList && !$util.isEmpty(staffList)">
 						<block v-if="staffList && !$util.isEmpty(staffList)">
 							<view v-for="(cgItem, index) in staffList" :key="index">
 							<view v-for="(cgItem, index) in staffList" :key="index">

+ 1 - 1
ghsApp/src/admin/stat/classProfit.vue

@@ -61,7 +61,7 @@
 						</t-tr>
 						</t-tr>
 
 
 						<view style="margin:10upx 60upx;color:#1c89e0;font-size:24upx;line-height:1.5;">
 						<view style="margin:10upx 60upx;color:#1c89e0;font-size:24upx;line-height:1.5;">
-							采购成本、销售收入已按售后扣减(天售后记在通过日,分类成本/收入可为负)。采购仅退款、销售仅退款含隔天通过日金额。与 PC 收支分类同源接口。
+							采购成本、销售收入已按售后扣减(天售后记在通过日,分类成本/收入可为负)。采购仅退款、销售仅退款含隔天通过日金额。与 PC 收支分类同源接口。
 						</view>
 						</view>
 
 
 						<view v-if="!$util.isEmpty(tbSaleIncome)">
 						<view v-if="!$util.isEmpty(tbSaleIncome)">

+ 2 - 2
ghsApp/src/admin/stat/customSale.vue

@@ -1,5 +1,5 @@
 <!--
 <!--
-  小程序客户业绩:按客户汇总金额/成本/利润;天售后记通过日扣减(后端 statCustomCg)。
+  小程序客户业绩:按客户汇总金额/成本/利润;天售后记通过日扣减(后端 statCustomCg)。
 -->
 -->
 <template>
 <template>
 <view class="app-content">
 <view class="app-content">
@@ -27,7 +27,7 @@
 							<t-th>利润</t-th>
 							<t-th>利润</t-th>
 						</t-tr>
 						</t-tr>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							天售后扣减:¥{{ nextDayDeduct }}
+							天售后扣减:¥{{ nextDayDeduct }}
 						</view>
 						</view>
 						<block v-if="displayList && !$util.isEmpty(displayList)">
 						<block v-if="displayList && !$util.isEmpty(displayList)">
 							<view v-for="(item, index) in displayList" :key="index">
 							<view v-for="(item, index) in displayList" :key="index">

+ 1 - 1
ghsApp/src/admin/stat/productSale.vue

@@ -28,7 +28,7 @@
 							</t-td>
 							</t-td>
 						</t-tr>
 						</t-tr>
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
 						<view v-if="Number(nextDayDeduct) > 0" style="color:#e67e22;font-size:26upx;margin:0 10upx 10upx 10upx;font-weight:bold;">
-							天售后扣减:¥{{ nextDayDeduct }}
+							天售后扣减:¥{{ nextDayDeduct }}
 						</view>
 						</view>
 						<block v-if="displayList && !$util.isEmpty(displayList)">
 						<block v-if="displayList && !$util.isEmpty(displayList)">
 							<view v-for="(item, index) in displayList" :key="index">
 							<view v-for="(item, index) in displayList" :key="index">

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

@@ -12,7 +12,7 @@ export const getRefundFullInfo = data => {
 	return https.get('/cg-refund/get-refund-full-info', data)
 	return https.get('/cg-refund/get-refund-full-info', data)
 }
 }
 
 
-/** 采购原单是否可走天售后(售后页预检) */
+/** 采购原单是否可走天售后(售后页预检) */
 export const checkNextDayEligible = data => {
 export const checkNextDayEligible = data => {
 	return https.get('/cg-refund/check-next-day-eligible', data)
 	return https.get('/cg-refund/check-next-day-eligible', data)
 }
 }

+ 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/components/forward-options-popup.vue

@@ -1,5 +1,5 @@
 <!--
 <!--
-  天售后确认弹框
+  天售后确认弹框
   用途:隔天/已结账售后二次确认;资金默认原路,不再选手选 fundType。
   用途:隔天/已结账售后二次确认;资金默认原路,不再选手选 fundType。
   mode=purchase:上游采购文案(退回采购账户余额)
   mode=purchase:上游采购文案(退回采购账户余额)
 -->
 -->

+ 1 - 1
ghsApp/src/pagesArrears/detailsItem.vue

@@ -21,7 +21,7 @@
 				<view class="refund-tip refund-tip-same">当天售后 ¥{{info.tkPrice?parseFloat(info.tkPrice):0}}</view>
 				<view class="refund-tip refund-tip-same">当天售后 ¥{{info.tkPrice?parseFloat(info.tkPrice):0}}</view>
 			</view>
 			</view>
 			<view class="item-row" v-if="Number(info.nextDayTkPrice)>0">
 			<view class="item-row" v-if="Number(info.nextDayTkPrice)>0">
-				<view class="refund-tip refund-tip-next">天售后 ¥{{parseFloat(info.nextDayTkPrice)}}</view>
+				<view class="refund-tip refund-tip-next">天售后 ¥{{parseFloat(info.nextDayTkPrice)}}</view>
 			</view>
 			</view>
 			<view class="item-row" v-if="!$util.isEmpty(info.remark)">
 			<view class="item-row" v-if="!$util.isEmpty(info.remark)">
 				<view class="remark">{{ info.remark }}</view>
 				<view class="remark">{{ info.remark }}</view>

+ 1 - 1
ghsApp/src/pagesGys/detailsItem.vue

@@ -31,7 +31,7 @@
 				<view class="refund-tip refund-tip-same">当天售后 ¥{{info.tkPrice?parseFloat(info.tkPrice):0}}</view>
 				<view class="refund-tip refund-tip-same">当天售后 ¥{{info.tkPrice?parseFloat(info.tkPrice):0}}</view>
 			</view>
 			</view>
 			<view class="item-row" v-if="Number(info.nextDayTkPrice)>0">
 			<view class="item-row" v-if="Number(info.nextDayTkPrice)>0">
-				<view class="refund-tip refund-tip-next">天售后 ¥{{parseFloat(info.nextDayTkPrice)}}</view>
+				<view class="refund-tip refund-tip-next">天售后 ¥{{parseFloat(info.nextDayTkPrice)}}</view>
 			</view>
 			</view>
 			<view class="item-row" v-if="hasPartialClear">
 			<view class="item-row" v-if="hasPartialClear">
 				<view class="price" style="color:red;">剩余待结 ¥{{ parseFloat(remainDebtPrice) }}</view>
 				<view class="price" style="color:red;">剩余待结 ¥{{ parseFloat(remainDebtPrice) }}</view>

+ 1 - 1
ghsApp/src/pagesGys/searchItem.vue

@@ -28,7 +28,7 @@
 				<view class="price action-detail" @click.stop="goToDetai(info)">查看明细</view>
 				<view class="price action-detail" @click.stop="goToDetai(info)">查看明细</view>
 			</view>
 			</view>
 			<view class="item-row" v-if="Number(info.nextDayTkPrice)>0">
 			<view class="item-row" v-if="Number(info.nextDayTkPrice)>0">
-				<view class="refund-tip refund-tip-next">天售后 ¥{{parseFloat(info.nextDayTkPrice)}}</view>
+				<view class="refund-tip refund-tip-next">天售后 ¥{{parseFloat(info.nextDayTkPrice)}}</view>
 			</view>
 			</view>
 			<view class="item-row" v-if="hasPartialClear">
 			<view class="item-row" v-if="hasPartialClear">
 				<view class="price" style="color:red;">剩余待结 ¥{{ parseFloat(remainDebtPrice) }}</view>
 				<view class="price" style="color:red;">剩余待结 ¥{{ parseFloat(remainDebtPrice) }}</view>

+ 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>

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

@@ -200,7 +200,7 @@
 			<button class="action-btn confirm-btn" @tap="confirmRefund">确定</button>
 			<button class="action-btn confirm-btn" @tap="confirmRefund">确定</button>
 		</view>
 		</view>
 
 
-		<!-- 天售后确认(不再选手选资金方式,默认原路) -->
+		<!-- 天售后确认(不再选手选资金方式,默认原路) -->
 		<forward-options-popup
 		<forward-options-popup
 			:show="showForwardPop"
 			:show="showForwardPop"
 			:order-cleared="orderCleared"
 			:order-cleared="orderCleared"
@@ -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
 		};
 		};
 	},
 	},
@@ -348,7 +348,7 @@ export default {
 				refundSendCost:this.orderInfo.refundSendCostAmount,
 				refundSendCost:this.orderInfo.refundSendCostAmount,
 				refundPackCost:this.orderInfo.refundPackCostAmount
 				refundPackCost:this.orderInfo.refundPackCostAmount
 			};
 			};
-			// 非当天 / 已结清 → 必须天售后(接口预检 + 本地兜底)
+			// 非当天 / 已结清 → 必须天售后(接口预检 + 本地兜底)
 			if (this.nextDayEligible || this.isMustNextDayOrder()) {
 			if (this.nextDayEligible || this.isMustNextDayOrder()) {
 				if (!this.nextDayEligible) {
 				if (!this.nextDayEligible) {
 					this.orderCleared = Number(this.orderInfo.clearId) > 0
 					this.orderCleared = Number(this.orderInfo.clearId) > 0
@@ -374,7 +374,7 @@ export default {
 			return !!payTime && payTime !== '0000-00-00 00:00:00'
 			return !!payTime && payTime !== '0000-00-00 00:00:00'
 		},
 		},
 		/**
 		/**
-		 * 本地判断是否必须天售后:非当天支付 / 已结账单 / 挂账已结清
+		 * 本地判断是否必须天售后:非当天支付 / 已结账单 / 挂账已结清
 		 * 仅用 payTime;无支付时间由 hasValidPayTime 先行拦截
 		 * 仅用 payTime;无支付时间由 hasValidPayTime 先行拦截
 		 */
 		 */
 		isMustNextDayOrder() {
 		isMustNextDayOrder() {
@@ -398,7 +398,7 @@ export default {
 			return payDay !== today
 			return payDay !== today
 		},
 		},
 		/**
 		/**
-		 * 天售后确认:仅写 sameDay=0,资金按原单原路处理
+		 * 天售后确认:仅写 sameDay=0,资金按原单原路处理
 		 */
 		 */
 		onForwardConfirm() {
 		onForwardConfirm() {
 			this.showForwardPop = false
 			this.showForwardPop = 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

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

@@ -9,7 +9,7 @@
               <text>操作:{{item.shopAdminName}}</text>
               <text>操作:{{item.shopAdminName}}</text>
               <text>原因:{{ item.cause==0?'质量问题' : item.cause==1 ?'多开错开': item.cause==2 ? '打包原因' : item.cause==3 ? '物流原因' : '其它'}}</text>
               <text>原因:{{ item.cause==0?'质量问题' : item.cause==1 ?'多开错开': item.cause==2 ? '打包原因' : item.cause==3 ? '物流原因' : '其它'}}</text>
               <text>类型:{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
               <text>类型:{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
-              <!-- sameDay=0 天售后,否则当天售后 -->
+              <!-- sameDay=0 天售后,否则当天售后 -->
               <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
               <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
                 退款:{{ Number(item.sameDay) === 0 ? '封账后退款' : '当天退款' }}
                 退款:{{ Number(item.sameDay) === 0 ? '封账后退款' : '当天退款' }}
               </text>
               </text>

+ 6 - 6
ghsApp/src/pagesPurchase/refund.vue

@@ -46,7 +46,7 @@
 			<view class="list">
 			<view class="list">
 				¥{{parseFloat(orderInfo.actPrice || orderInfo.orderPrice)||0}}
 				¥{{parseFloat(orderInfo.actPrice || orderInfo.orderPrice)||0}}
 				<text style="margin-left:25upx;font-size:25upx;color:green;" v-if="Number(orderInfo.tkPrice)>0">当天售后 ¥{{orderInfo.tkPrice ? parseFloat(orderInfo.tkPrice) : 0}}</text>
 				<text style="margin-left:25upx;font-size:25upx;color:green;" v-if="Number(orderInfo.tkPrice)>0">当天售后 ¥{{orderInfo.tkPrice ? parseFloat(orderInfo.tkPrice) : 0}}</text>
-				<text style="margin-left:15upx;font-size:25upx;color:#e6a23c;" v-if="Number(orderInfo.nextDayTkPrice)>0">天售后 ¥{{parseFloat(orderInfo.nextDayTkPrice)}}</text>
+				<text style="margin-left:15upx;font-size:25upx;color:#e6a23c;" v-if="Number(orderInfo.nextDayTkPrice)>0">天售后 ¥{{parseFloat(orderInfo.nextDayTkPrice)}}</text>
 			</view>
 			</view>
 		</view>
 		</view>
 		<view class="flex refund-item">
 		<view class="flex refund-item">
@@ -70,7 +70,7 @@
 			<view class="flex-center btn active" @tap="confirmRefund" style="margin-left: 80upx">确定</view>
 			<view class="flex-center btn active" @tap="confirmRefund" style="margin-left: 80upx">确定</view>
 		</view>
 		</view>
 
 
-		<!-- 天售后确认:不减实付,退回采购账户余额 -->
+		<!-- 天售后确认:不减实付,退回采购账户余额 -->
 		<forward-options-popup
 		<forward-options-popup
 			:show="showForwardPop"
 			:show="showForwardPop"
 			mode="purchase"
 			mode="purchase"
@@ -99,7 +99,7 @@ export default {
 			remark:'',
 			remark:'',
 			orderInfo:{},
 			orderInfo:{},
 			couldRefundPrice:0,
 			couldRefundPrice:0,
-			// 天售后预检
+			// 天售后预检
 			nextDayEligible: false,
 			nextDayEligible: false,
 			showForwardPop: false,
 			showForwardPop: false,
 			orderCleared: false,
 			orderCleared: false,
@@ -185,7 +185,7 @@ export default {
 				remark:this.remark,
 				remark:this.remark,
 				refundType:this.refundType
 				refundType:this.refundType
 			};
 			};
-			// 跨入库日 / 已结清 → 必须天售后
+			// 跨入库日 / 已结清 → 必须天售后
 			if (this.nextDayEligible || this.isMustNextDayOrder()) {
 			if (this.nextDayEligible || this.isMustNextDayOrder()) {
 				if (!this.nextDayEligible) {
 				if (!this.nextDayEligible) {
 					this.orderCleared = Number(this.orderInfo.clearId) > 0 || Number(this.orderInfo.debt) === 2
 					this.orderCleared = Number(this.orderInfo.clearId) > 0 || Number(this.orderInfo.debt) === 2
@@ -203,7 +203,7 @@ export default {
 			return !!entryTime && entryTime !== '0000-00-00 00:00:00'
 			return !!entryTime && entryTime !== '0000-00-00 00:00:00'
 		},
 		},
 		/**
 		/**
-		 * 本地判断是否必须天售后:非当天入库 / 已结清 / 已进结账单
+		 * 本地判断是否必须天售后:非当天入库 / 已结清 / 已进结账单
 		 */
 		 */
 		isMustNextDayOrder() {
 		isMustNextDayOrder() {
 			const info = this.orderInfo || {}
 			const info = this.orderInfo || {}
@@ -223,7 +223,7 @@ export default {
 			const today = now.getFullYear() + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
 			const today = now.getFullYear() + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
 			return entryDay !== today
 			return entryDay !== today
 		},
 		},
-		/** 天售后确认:写 sameDay=0 */
+		/** 天售后确认:写 sameDay=0 */
 		onForwardConfirm() {
 		onForwardConfirm() {
 			this.showForwardPop = false
 			this.showForwardPop = false
 			const params = Object.assign({}, this._pendingRefundParams || {}, {
 			const params = Object.assign({}, this._pendingRefundParams || {}, {

+ 4 - 4
ghsApp/src/pagesPurchase/refundDetail.vue

@@ -1,5 +1,5 @@
 <!--
 <!--
-  上游采购售后详情:展示退款信息;sameDay=0 时显示「天售后」(对齐销售侧)
+  上游采购售后详情:展示退款信息;sameDay=0 时显示「天售后」(对齐销售侧)
 -->
 -->
 <template>
 <template>
 	<view class="app-content">
 	<view class="app-content">
@@ -26,8 +26,8 @@
 		<!-- 仅隔天展示,与销售侧 refundDetail「售后类型」一致 -->
 		<!-- 仅隔天展示,与销售侧 refundDetail「售后类型」一致 -->
 		<view class="flex refund-item" v-if="isNextDayRefund">
 		<view class="flex refund-item" v-if="isNextDayRefund">
 			<view class="refund-label">售后类型:</view>
 			<view class="refund-label">售后类型:</view>
-			<!-- 与列表页天售后同色 #e67e22 -->
-			<view class="list" style="color:#e67e22;font-weight:bold;">天售后</view>
+			<!-- 与列表页天售后同色 #e67e22 -->
+			<view class="list" style="color:#e67e22;font-weight:bold;">天售后</view>
 		</view>
 		</view>
 		<view class=" refund-item" v-if="!$util.isEmpty(remark)">
 		<view class=" refund-item" v-if="!$util.isEmpty(remark)">
 			<view class="refund-label" style="color:red;font-weight:bold;">备注信息:</view>
 			<view class="refund-label" style="color:red;font-weight:bold;">备注信息:</view>
@@ -48,7 +48,7 @@ export default {
 		};
 		};
 	},
 	},
 	computed: {
 	computed: {
-		/** sameDay=0 为天售后 */
+		/** sameDay=0 为天售后 */
 		isNextDayRefund() {
 		isNextDayRefund() {
 			return Number(this.sameDay) === 0
 			return Number(this.sameDay) === 0
 		}
 		}

+ 3 - 3
ghsApp/src/pagesPurchase/refundList.vue

@@ -8,9 +8,9 @@
               <text>单号:{{item.refundSn}}</text>
               <text>单号:{{item.refundSn}}</text>
               <text>操作:{{item.shopAdminName}}</text>
               <text>操作:{{item.shopAdminName}}</text>
               <text style="color:#3385FF;">状态:{{ item.status==0?'退款中':item.status==1?'已完成':'已取消' }}</text>
               <text style="color:#3385FF;">状态:{{ item.status==0?'退款中':item.status==1?'已完成':'已取消' }}</text>
-              <!-- sameDay=0 天售后,否则当天售后(对齐销售侧/花店采购售后列表) -->
+              <!-- sameDay=0 天售后,否则当天售后(对齐销售侧/花店采购售后列表) -->
               <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
               <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
-                时间:{{ Number(item.sameDay) === 0 ? '天售后' : '当天售后' }}
+                时间:{{ Number(item.sameDay) === 0 ? '天售后' : '当天售后' }}
               </text>
               </text>
               <text v-if="!$util.isEmpty(item.remark)" style="color:red;font-weight:bold;">备注:{{item.remark}}</text>
               <text v-if="!$util.isEmpty(item.remark)" style="color:red;font-weight:bold;">备注:{{item.remark}}</text>
           </view>
           </view>
@@ -25,7 +25,7 @@
 </template>
 </template>
 <script>
 <script>
 /**
 /**
- * 上游采购售后列表:展示当天/天售后标记(sameDay)
+ * 上游采购售后列表:展示当天/天售后标记(sameDay)
  */
  */
 import { list } from "@/mixins";
 import { list } from "@/mixins";
 import { getRefundList } from "@/api/cg-refund";
 import { getRefundList } from "@/api/cg-refund";

+ 15 - 15
hdApp/src/admin/order/refund.vue

@@ -1,17 +1,17 @@
 <template>
 <template>
 	<view class="refund-page">
 	<view class="refund-page">
 
 
-		<!-- 天售后提示:接口预检 / 本地兜底 / 订单 shAddPay -->
+		<!-- 天售后提示:接口预检 / 本地兜底 / 订单 shAddPay -->
 		<view class="warning-tip" v-if="showNextDayTip">
 		<view class="warning-tip" v-if="showNextDayTip">
 			<view class="warning-icon">⚠</view>
 			<view class="warning-icon">⚠</view>
-			<text class="warning-text" v-if="shAddPayReason == 1">已过可售后时间,将按天售后办理</text>
+			<text class="warning-text" v-if="shAddPayReason == 1">已过可售后时间,将按天售后办理</text>
 			<text class="warning-text" v-else-if="orderCleared || Number(orderInfo.clearId) > 0 || (Number(orderInfo.debtPrice) > 0 && Number(orderInfo.remainDebtPrice) <= 0)">
 			<text class="warning-text" v-else-if="orderCleared || Number(orderInfo.clearId) > 0 || (Number(orderInfo.debtPrice) > 0 && Number(orderInfo.remainDebtPrice) <= 0)">
-				订单已结账,将按天售后办理
+				订单已结账,将按天售后办理
 			</text>
 			</text>
 			<text class="warning-text" v-else-if="shAddPay == 1 && Number(orderInfo.remainDebtPrice) > 0">
 			<text class="warning-text" v-else-if="shAddPay == 1 && Number(orderInfo.remainDebtPrice) > 0">
-				订单已部分结账或售后超额,将按天售后办理
+				订单已部分结账或售后超额,将按天售后办理
 			</text>
 			</text>
-			<text class="warning-text" v-else>非付款日,将按天售后办理</text>
+			<text class="warning-text" v-else>非付款日,将按天售后办理</text>
 		</view>
 		</view>
 
 
 		<!-- 退款方式选择卡片 -->
 		<!-- 退款方式选择卡片 -->
@@ -208,7 +208,7 @@
 			</view>
 			</view>
 		</ModalModule>
 		</ModalModule>
 
 
-		<!-- 天售后确认(对齐 ghs:写 sameDay=0,资金原路) -->
+		<!-- 天售后确认(对齐 ghs:写 sameDay=0,资金原路) -->
 		<forward-options-popup
 		<forward-options-popup
 			:show="showForwardPop"
 			:show="showForwardPop"
 			:order-cleared="orderCleared"
 			:order-cleared="orderCleared"
@@ -221,7 +221,7 @@
 /**
 /**
  * 花店订单售后页:选择退货商品、填写退款金额并提交。
  * 花店订单售后页:选择退货商品、填写退款金额并提交。
  * 退货单价直接取订单原单价,只需填数量。
  * 退货单价直接取订单原单价,只需填数量。
- * 天售后:预检 + 确认弹窗后提交 sameDay=0;成功进 forwardResult。
+ * 天售后:预检 + 确认弹窗后提交 sameDay=0;成功进 forwardResult。
  */
  */
 import { getDetail,refund } from "@/api/order/index";
 import { getDetail,refund } from "@/api/order/index";
 import { checkNextDayEligible } from "@/api/refund/index";
 import { checkNextDayEligible } from "@/api/refund/index";
@@ -245,7 +245,7 @@ export default {
 			nextDayEligible: false,
 			nextDayEligible: false,
 			orderCleared: false,
 			orderCleared: false,
 			_pendingRefundParams: null,
 			_pendingRefundParams: null,
-			shAddPay:0,//0正常当天售后,1天售后(订单详情兜底)
+			shAddPay:0,//0正常当天售后,1天售后(订单详情兜底)
 			shAddPayReason:0,//0欠款已结清或部分结清,1可售后时间到了
 			shAddPayReason:0,//0欠款已结清或部分结清,1可售后时间到了
 		};
 		};
 	},
 	},
@@ -334,11 +334,11 @@ export default {
 		askRefund(){
 		askRefund(){
 			if(this.orderInfo.payWay == 3 && Number(this.orderInfo.remainDebtPrice)>0 && Number(this.refundMoney) > Number(this.orderInfo.remainDebtPrice)){
 			if(this.orderInfo.payWay == 3 && Number(this.orderInfo.remainDebtPrice)>0 && Number(this.refundMoney) > Number(this.orderInfo.remainDebtPrice)){
 				if(this.refundType==2){
 				if(this.refundType==2){
-					uni.showToast({title:'天售后请选择商品',icon:'none'})
+					uni.showToast({title:'天售后请选择商品',icon:'none'})
 					return false
 					return false
 				}
 				}
-				// 售后金额超过剩余欠款:按天售后办理
-				this.$util.confirmModal({content:'售后金额超过剩余欠款,将按天售后办理'},() => {
+				// 售后金额超过剩余欠款:按天售后办理
+				this.$util.confirmModal({content:'售后金额超过剩余欠款,将按天售后办理'},() => {
 					this.shAddPay = 1
 					this.shAddPay = 1
 					this.confirmRefund()
 					this.confirmRefund()
 				})
 				})
@@ -409,7 +409,7 @@ export default {
 				getOriginalItem: 1,
 				getOriginalItem: 1,
 				version: 2
 				version: 2
 			}
 			}
-			// 非当天 / 已结清 / 预检通过 → 天售后确认弹窗
+			// 非当天 / 已结清 / 预检通过 → 天售后确认弹窗
 			if (this.nextDayEligible || this.shAddPay == 1 || this.isMustNextDayOrder()) {
 			if (this.nextDayEligible || this.shAddPay == 1 || this.isMustNextDayOrder()) {
 				if (!this.nextDayEligible && !this.orderCleared) {
 				if (!this.nextDayEligible && !this.orderCleared) {
 					this.orderCleared = Number(this.orderInfo.clearId) > 0
 					this.orderCleared = Number(this.orderInfo.clearId) > 0
@@ -427,7 +427,7 @@ export default {
 			return !!payTime && payTime !== '0000-00-00 00:00:00'
 			return !!payTime && payTime !== '0000-00-00 00:00:00'
 		},
 		},
 		/**
 		/**
-		 * 本地判断是否必须天售后:非当天支付 / 已结账单 / 挂账已结清
+		 * 本地判断是否必须天售后:非当天支付 / 已结账单 / 挂账已结清
 		 */
 		 */
 		isMustNextDayOrder() {
 		isMustNextDayOrder() {
 			const info = this.orderInfo || {}
 			const info = this.orderInfo || {}
@@ -462,7 +462,7 @@ export default {
 			this.doRefund(this._pendingRefundParams || {})
 			this.doRefund(this._pendingRefundParams || {})
 		},
 		},
 		/**
 		/**
-		 * 天售后确认:写 sameDay=0,资金按原单原路处理
+		 * 天售后确认:写 sameDay=0,资金按原单原路处理
 		 */
 		 */
 		onForwardConfirm() {
 		onForwardConfirm() {
 			this.showForwardPop = false
 			this.showForwardPop = false
@@ -533,7 +533,7 @@ export default {
 				return {...ele,refundCount:null}
 				return {...ele,refundCount:null}
 			})
 			})
 
 
-			// 预检是否可走天售后(对齐 ghs)
+			// 预检是否可走天售后(对齐 ghs)
 			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

+ 1 - 1
hdApp/src/admin/order/refundList.vue

@@ -12,7 +12,7 @@
               <text>单号:{{item.orderSn}}</text>
               <text>单号:{{item.orderSn}}</text>
               <text>操作:{{item.shopAdminName}}</text>
               <text>操作:{{item.shopAdminName}}</text>
               <text>类型:{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
               <text>类型:{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
-              <!-- sameDay=0 天售后,否则当天售后(与有无原单无关) -->
+              <!-- sameDay=0 天售后,否则当天售后(与有无原单无关) -->
               <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
               <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
                 原单:{{ Number(item.sameDay) === 0 ? '历史订单' : '当天订单' }}
                 原单:{{ Number(item.sameDay) === 0 ? '历史订单' : '当天订单' }}
               </text>
               </text>

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

@@ -42,7 +42,7 @@ export const returnBalance = data => {
 	return https.post('/refund/return-balance', data)
 	return https.post('/refund/return-balance', data)
 }
 }
 
 
-/** 原单是否可走天售后(预检,对齐 ghs) */
+/** 原单是否可走天售后(预检,对齐 ghs) */
 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
hdApp/src/components/forward-options-popup.vue

@@ -1,5 +1,5 @@
 <!--
 <!--
-  天售后确认弹框
+  天售后确认弹框
   用途:隔天/已结账售后二次确认;资金默认原路,不再选手选 fundType。
   用途:隔天/已结账售后二次确认;资金默认原路,不再选手选 fundType。
   mode=purchase:上游采购文案(退回采购账户余额)
   mode=purchase:上游采购文案(退回采购账户余额)
 -->
 -->

+ 2 - 2
hdApp/src/pagesPurchase/refundDetail.vue

@@ -44,7 +44,7 @@
           <!-- 仅隔天展示,样式与金额/状态同套 tui-list-cell -->
           <!-- 仅隔天展示,样式与金额/状态同套 tui-list-cell -->
           <tui-list-cell class="line-cell" :hover="false" v-if="isNextDayRefund">
           <tui-list-cell class="line-cell" :hover="false" v-if="isNextDayRefund">
             <div class="tui-title">售后类型</div>
             <div class="tui-title">售后类型</div>
-            <div class="detail-price_box" style="color:#3385ff;">天售后</div>
+            <div class="detail-price_box" style="color:#3385ff;">天售后</div>
           </tui-list-cell>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="refundData.info">
           <tui-list-cell class="line-cell" :hover="false" v-if="refundData.info">
             <div class="tui-title">返回方式</div>
             <div class="tui-title">返回方式</div>
@@ -96,7 +96,7 @@ export default {
     };
     };
   },
   },
   computed: {
   computed: {
-    /** sameDay=0 为天售后(与 ghsApp refundDetail 一致才展示「售后类型」) */
+    /** sameDay=0 为天售后(与 ghsApp refundDetail 一致才展示「售后类型」) */
     isNextDayRefund() {
     isNextDayRefund() {
       const info = (this.refundData && this.refundData.info) || {}
       const info = (this.refundData && this.refundData.info) || {}
       return Number(info.sameDay) === 0
       return Number(info.sameDay) === 0

+ 2 - 2
hdApp/src/pagesPurchase/refundList.vue

@@ -8,9 +8,9 @@
               <text>单号:{{item.orderSn}}</text>
               <text>单号:{{item.orderSn}}</text>
               <text>操作:{{item.shopAdminName}}</text>
               <text>操作:{{item.shopAdminName}}</text>
               <text>类型:{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
               <text>类型:{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
-              <!-- sameDay=0 天售后,否则当天售后 -->
+              <!-- sameDay=0 天售后,否则当天售后 -->
               <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
               <text :style="Number(item.sameDay) === 0 ? 'color:#e67e22;font-weight:bold;' : ''">
-                时间:{{ Number(item.sameDay) === 0 ? '天售后' : '当天售后' }}
+                时间:{{ Number(item.sameDay) === 0 ? '天售后' : '当天售后' }}
               </text>
               </text>
               <text style="position:absolute;right:-425upx;top:0upx;">{{ item.status==0?'待审核':item.status==1?'已通过':item.status==2?'已驳回':item.status==3?'已取消':'' }}</text>    
               <text style="position:absolute;right:-425upx;top:0upx;">{{ item.status==0?'待审核':item.status==1?'已通过':item.status==2?'已驳回':item.status==3?'已取消':'' }}</text>    
           </view>
           </view>

Некоторые файлы не были показаны из-за большого количества измененных файлов