优化

hdApp/src/admin/billing/affirm.vue

@@ -133,21 +133,16 @@
 						</view>
 					</tui-list-cell>
 
-          <view style="border:1upx solid green;" v-if="form.hasPay == 1">
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.hasPay == 1">
-            <view class="tui-title special-title">线下渠道</view>
-            <view class="payment-buttons">
-              <view class="button-row">
-                <button @click="setPayWay(0)" class="admin-button-com middle" :class="form.payWay == 0 ? 'blue' : 'default'">微信</button>
-                <button @click="setPayWay(1)" class="admin-button-com middle" :class="form.payWay == 1 ? 'blue' : 'default'">支付宝</button>
-              </view>
-              <view class="button-row">
-                <button @click="setPayWay(4)" class="admin-button-com middle" :class="form.payWay == 4 ? 'blue' : 'default'">现金</button>
-                <button @click="setPayWay(5)" class="admin-button-com middle" :class="form.payWay == 5 ? 'blue' : 'default'">银行卡</button>
-              </view>
-            </view>
+          <tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.hasPay == 1">
+            <view class="tui-title">线下渠道</view>
+            <picker mode="selector" :value="payWayindex" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input">
+              <view class="uni-input" v-if="form.payWay == 0">线下微信</view>
+              <view class="uni-input" v-else-if="form.payWay == 1">线下支付宝</view>
+              <view class="uni-input" v-else-if="form.payWay == 4">现金</view>
+              <view class="uni-input" v-else-if="form.payWay == 5">银行卡</view>
+              <view class="uni-input" v-else style="color:#CCCCCC;">请选择</view>
+            </picker>
           </tui-list-cell>
-          </view>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">打印小票</view>
@@ -167,7 +162,7 @@
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
             <view v-if="form.hasPay == 2" class="tui-title">应收金额</view>
             <view v-else-if="form.hasPay == 3" class="tui-title">余额扣减</view>
-            <view v-else class="tui-title">实收金额</view>
+            <view v-else class="tui-title">{{form.forward==0?'实收':'实付'}}金额</view>
             <input style="border:1upx solid #eee;color:#3385FF;width:150upx;height:70upx;" type="digit" @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="tui-placeholder"/>
             <text v-if="modifyPrice > 0 && modifyPrice > finalPrice" style="font-size:25upx;margin-left:20upx;color:red;">人工包装费 ¥{{parseFloat((modifyPrice-finalPrice).toFixed(2))}}</text>
             <text v-if="modifyPrice > 0 && modifyPrice < finalPrice" style="font-size:25upx;margin-left:20upx;color:green;">优惠 ¥{{parseFloat((finalPrice-modifyPrice).toFixed(2))}}</text>
@@ -203,14 +198,14 @@
 
           <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 @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>
           </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>
+            <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>
@@ -223,7 +218,7 @@
         <text class="price-title">
           <text></text>
         </text>
-        <text class="price-number"><text class="large">¥{{ modifyPrice }}</text></text>
+        <text class="price-number"><text class="large">{{form.forward==0?'':'-'}}¥{{ modifyPrice }}</text></text>
       </view>
       <!-- <text style="font-size:30upx;right:100upx;">当前在<text style="font-weight:bold;color:red;margin-left:5upx;font-size:32upx;">{{currentShop.shopName}}</text></text> -->
       <button class="admin-button-com blue big" @click="confirmSubmit">提交</button>
@@ -382,6 +377,8 @@ export default {
 
     //默认欠款是首选项
     this.form.hasPay = 4
+    // 初始化支付方式索引
+    this.payWayindex = 0
     // #ifdef APP-PLUS
     if(this.$util.isScanEnv()){
       this.isScanEnv = true
@@ -511,8 +508,14 @@ export default {
 			this.payWayindex = index
       this.form.payWay = this.payWayList[index].id
 		},
+		// 根据支付方式ID更新索引
+		updatePayWayIndex(){
+			const index = this.payWayList.findIndex(item => item.id === this.form.payWay)
+			this.payWayindex = index >= 0 ? index : 0
+		},
     setPayWay(payWay){
       this.form.payWay = payWay
+      this.updatePayWayIndex()
     },
     diffPriceConfirm(){
       this.form.dealPrice = 1
@@ -538,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 = '确认赊账？'

hdApp/src/admin/billing/remind.vue

@@ -7,13 +7,14 @@
           <view class="result-title">操作成功，还有下一步</view>
           <view class="pay-confirm-content">
             <view class="confirm-text">
-              <view class="text-desc">请线下转账给客户，或充余额给客户</view>
+              <view class="text-desc">请给客户充值或线下转账</view>
+              <view class="text-amount">￥{{orderInfo.actPrice?parseFloat(orderInfo.actPrice):0}}</view>
             </view>
             <view>
-                <button class="admin-button-com blue big" @click="recharge()" style="width:320upx;">充余额给客户</button>
+                <button class="admin-button-com blue big" @click="recharge()" style="width:320upx;">充到客户余额</button>
             </view>
             <view style="margin-top:30upx;">
-                <button class="admin-button-com big" @click="goBack" style="width:320upx;">线下退钱给客户</button>
+                <button class="admin-button-com big" @click="goBack" style="width:320upx;">线下转账给客户</button>
             </view>
           </view>
         </view>
@@ -42,14 +43,14 @@
           this.$msg('没有找到订单信息')
           return false
         }
-        this.$util.confirmModal({content:'确认充余额给客户？'},() => {
+        this.$util.confirmModal({content:'确认充到客户余额里？'},() => {
           this.toRecharge()
 			  })
       },
       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){
@@ -140,6 +141,13 @@
         color: #3f3e3e;
         line-height: 1.4;
       }
+      .text-amount {
+        margin-top: 30upx;
+        font-size: 46upx;
+        color: red;
+        line-height: 1.4;
+        font-weight: bold;
+      }
     }
     
     .confirm-btn-wrap {

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,7 +183,7 @@
 					</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">
@@ -211,8 +211,8 @@ export default {
 			orderInfo:{},
 			coundRefundPrice:0,
 			showRefundModal: false,
-			minusOrderRefund:0,//0表示按正常流程售后，1表示开负数订单售后
-			minusOrderReason:0,//只能开负数订单的几种情况：0、开的欠款单，并且已经全部或者部分结清，1、可售后时间到了
+			minusOrderRefund:0,//0表示按正常流程售后，1表示开付款单售后
+			minusOrderReason:0,//只能开付款单的几种情况：0、开的欠款单，并且已经全部或者部分结清，1、可售后时间到了
 		};
 	},
 
@@ -264,8 +264,8 @@ export default {
 		},
 		askRefund(){
 			if(this.orderInfo.payWay == 3 && Number(this.orderInfo.remainDebtPrice)>0 && Number(this.refundMoney)>Number(this.orderInfo.remainDebtPrice)){
-				//如果退款金额大于剩余欠款，则提醒走开负数订单方式退款
-				this.$util.confirmModal({content:'售后金额超过剩余欠款，只能开负数订单方式售后'},() => {
+				//如果退款金额大于剩余欠款，则提醒走开付款单方式退款
+				this.$util.confirmModal({content:'售后金额超过剩余欠款，只能开付款单方式售后'},() => {
 					this.minusOrderRefund = 1
 					this.confirmRefund()
 				})