shish 1 rok temu
rodzic
commit
2c8a9210c7

+ 5 - 5
hdApp/src/admin/billing/affirm.vue

@@ -199,13 +199,13 @@
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">订单类型</view>
             <button @tap="form.forward = 0;form.hasPay = 4" class="admin-button-com middle" style="width:170upx;" :class="form.forward == 0? 'blue' : 'default'">收入订单</button>
-            <button @click="form.forward = 1;form.hasPay = 1" class="admin-button-com middle" style="width:170upx;" :class="form.forward == 1 ? 'blue' : 'default'">付款订单</button>
+            <button @click="form.forward = 1;form.hasPay = 1" class="admin-button-com middle" style="width:170upx;" :class="form.forward == 1 ? 'blue' : 'default'">售后付款</button>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.forward == 1">
-            <view class="tui-title">退方式</view>
-            <button @tap="form.forwardStock = 0" class="admin-button-com middle" style="width:190upx;" :class="form.forwardStock == 0? 'blue' : 'default'">退货付款</button>
-            <button @click="form.forwardStock = 1" class="admin-button-com middle" style="width:160upx;" :class="form.forwardStock == 1 ? 'blue' : 'default'">只付款</button>
+            <view class="tui-title">退方式</view>
+            <button @tap="form.forwardStock = 0" class="admin-button-com middle" style="width:190upx;" :class="form.forwardStock == 0? 'blue' : 'default'">货退回来</button>
+            <button @click="form.forwardStock = 1" class="admin-button-com middle" style="width:160upx;" :class="form.forwardStock == 1 ? 'blue' : 'default'">货不退回</button>
           </tui-list-cell>
 
           </view>
@@ -541,7 +541,7 @@ export default {
         }else if(this.form.hasPay == 1){
           name = '确认线下付款?'
           if(this.form.forward == 1){
-            name = '确认开付款单?'
+            name = '确认开付款售后单?'
           }
         }else if(this.form.hasPay == 2){
           name = '确认赊账?'

+ 1 - 1
hdApp/src/admin/billing/remind.vue

@@ -50,7 +50,7 @@
       toRecharge(){
         let that = this
         uni.showLoading({mask:true})
-        let remark = '售后充值,付款,单号'+this.orderInfo.orderSn
+        let remark = '来源售后付款,单号'+this.orderInfo.orderSn
         toManRecharge({amount:this.orderInfo.actPrice,remark:remark,payWay:0,customId:this.orderInfo.customId}).then(res=>{
           uni.hideLoading()
           if(res.code == 1){

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

@@ -31,7 +31,7 @@
           <view class="list-bottom" style="padding-top:0upx;">
             <view style="border-bottom:1upx solid #EEEEEE;padding-bottom:8upx;">
               <span v-if="item.sendCost > 0" class="freight-text">运费 ¥{{ item.sendCost ? parseFloat(item.sendCost) : 0 }}</span>
-              <span class="app-size-30 app-bold">{{item.forward==0?'':'-'}}¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
+              <span class="app-size-30 app-bold">{{item.forward==0?'':'售后付出 -'}}¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
             </view>
 
         <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum>1" style="text-align: center;color:white;

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

@@ -4,10 +4,10 @@
 		<!-- 红色提示信息 -->
 		<view class="warning-tip" v-if="minusOrderRefund == 1">
 			<view class="warning-icon">⚠</view>
-			<text class="warning-text" v-if="minusOrderReason == 1">已过可售后时间,只能开付款单售后</text>
+			<text class="warning-text" v-if="minusOrderReason == 1">已过可售后时间,只能开售后付款单</text>
 			<text class="warning-text"v-else>
-				<block v-if="Number(orderInfo.remainDebtPrice)<=0">订单已结账,只能开付款单售后</block>
-				<block v-else>订单已部分结账,只能开付款单售后</block>
+				<block v-if="Number(orderInfo.remainDebtPrice)<=0">订单已结账,只能开售后付款单</block>
+				<block v-else>订单已部分结账,只能开售后付款单</block>
 			</text>
 		</view>
 
@@ -183,13 +183,13 @@
 					</view>
 					<view class="confirm-text">
 						<text v-if="minusOrderRefund == 0">确认要退款吗?</text>
-						<text v-else>确认开付款单退款吗?</text>
+						<text v-else>确认开售后付款单吗?</text>
 					</view>
 				</view>
 				<view class="modal-actions">
 					<button class="modal-btn cancel-modal-btn" @tap="cancelRefundModal">取消</button>
 					<button class="modal-btn confirm-modal-btn" @tap="executeRefund" v-if="minusOrderRefund == 0">确认退款</button>
-					<button class="modal-btn confirm-modal-btn" @tap="executeRefund" v-else>确认开单退款</button>
+					<button class="modal-btn confirm-modal-btn" @tap="executeRefund" v-else>确认</button>
 				</view>
 			</view>
 		</ModalModule>
@@ -211,7 +211,7 @@ export default {
 			orderInfo:{},
 			coundRefundPrice:0,
 			showRefundModal: false,
-			minusOrderRefund:0,//0表示按正常流程售后,1表示开付款单售后
+			minusOrderRefund:0,//0表示按正常流程售后,1表示开售后付款单
 			minusOrderReason:0,//只能开付款单的几种情况:0、开的欠款单,并且已经全部或者部分结清,1、可售后时间到了
 		};
 	},