售后流程

hdApp/src/admin/billing/affirm.vue

@@ -930,7 +930,7 @@ export default {
        text-align: center;
        font-size: 32upx;
        color: #666;
-       margin-top: 20upx;
+       margin-top: 30upx;
        padding: 15upx 20upx;
        background-color: #f5f5f5;
        border-radius: 8upx;

hdApp/src/admin/custom/selectCustom.vue

@@ -14,26 +14,21 @@
                 <div class="tui-msg-name">
                   <div class="tui-user-name">
                     {{ item.name }}
-                    <text v-if="item.level == 2" class="super-man">大客</text>
-                    <text v-if="item.level == 0" class="ls-man">散客</text>
                   </div>
                 </div>
                 <div class="tui-msg-content">
                   <span>{{ item.visitTime.substr(5,11) }}</span>
   
-                  <span v-if="Number(item.remainDebtAmount) > 0" class="debt-amount">
-                    欠款<span class="amount_num">{{item.remainDebtAmount}}</span>
-                  </span>
+                    <span v-if="Number(item.balance)!=0" class="balance-amount">
+                      <span v-if="item.balance>0" class="amount_add">余额{{item.balance?parseFloat(item.balance):0}}</span>
+                      <span v-else class="amount_sub">欠款{{item.balance?Math.abs(parseFloat(item.balance)):0}}</span>
+                    </span>
   
-                  <span v-if="Number(item.remainDebtAmount) < 0" class="debt-amount">
-                    余额<span class="amount_num" style="color:#3385FF;">{{Math.abs(item.remainDebtAmount)}}</span>
-                  </span>
-  
-                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">没有下过单</text>
-                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1周未下单</text>
-                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1个月未下单</text>
-                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超半年未下单</text>
-                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1年未下单</text>
+                    <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">没有下过单</text>
+                    <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1周未下单</text>
+                    <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1个月未下单</text>
+                    <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超半年未下单</text>
+                    <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1年未下单</text>
   
                 </div>
   
@@ -302,13 +297,18 @@
       font-size: 24upx;
       line-height: 1;
       color: #9397a4;
-      .debt-amount{
+      .balance-amount{
         margin-left:20upx;
-        .amount_num{
+        .amount_sub{
           color:red;
           margin-left:6upx;
           font-weight:bold;
         }
+        .amount_add{
+          color:#3385FF;
+          margin-left:6upx;
+          font-weight:bold;
+        }
       }
     }
   }

hdApp/src/admin/order/detail.vue

@@ -229,7 +229,8 @@ export default {
     return {
       constant: this.$constant,
       orderInfo: {},
-      dj:0
+      dj:0,
+      refreshPage:0
     };
   },
   onLoad() {
@@ -239,6 +240,12 @@ export default {
 		let prevPage = pages[ pages.length - 2 ];
 		prevPage.$vm.refreshPage = 0
 
+  },
+	onShow() {
+		if(this.refreshPage == 1){
+			this.refreshPage = 0
+			this.init()
+		}
   },
   methods: {
     goPreOrder(info){

hdApp/src/admin/order/refund.vue

@@ -382,10 +382,11 @@ export default {
 								//余额支付
 								this.$util.pageTo({url:'/admin/refund/balanceCp?orderId='+this.orderInfo.id+'&amount='+this.refundMoney,type:2})
 							}else if(this.orderInfo.payWay == 0 || this.orderInfo.payWay == 1 || this.orderInfo.payWay == 4 || this.orderInfo.payWay == 5){
-								//线下微信、支付宝、现金和银行卡付款的，也引导走充值
+								//线下微信、支付宝、现金和银行卡付款
 								this.$util.pageTo({url:'/admin/refund/offlineRemind?orderId='+this.orderInfo.id+'&amount='+this.refundMoney+'&payWay='+this.orderInfo.payWay,type:2})
 							}else{
-								this.$util.pageTo({url:'/common/success',query:{titleType:1},type:2})
+								//记账的
+								this.$util.pageTo({url:'/admin/refund/debtResult?orderId='+this.orderInfo.id+'&amount='+this.refundMoney,type:2})
 							}
 						}
 					}

hdApp/src/admin/refund/balanceCp.vue

@@ -39,9 +39,7 @@ export default {
     //返回上一页时刷新
     let pages = getCurrentPages();
     let prevPage = pages[ pages.length - 2 ];
-    if(prevPage.$vm){
-      prevPage.$vm.pageAction = {refresh:1}
-    }
+    prevPage.$vm.refreshPage = 1
 
   },
   methods: {
@@ -52,7 +50,7 @@ export default {
         if(res.code == 1){
          let rechargeAccountLink = res.data.rechargeAccountLink ? res.data.rechargeAccountLink:''
          let orderLink = res.data.orderLink?res.data.orderLink:''
-         this.copyText = "售后金额¥"+amount+"元，已退回到你的余额，点击下面链接查看你的余额\n\n余额 "+rechargeAccountLink+"\n\n订单 "+orderLink+"\n\n链接30天后失效"
+         this.copyText = "售后金额¥"+amount+"元，已退回到你的余额，点击下面链接查看你的余额\n\n余额 "+rechargeAccountLink+"\n\n本单 "+orderLink+"\n\n链接30天后失效"
         }
       })
     },

hdApp/src/admin/refund/debtResult.vue

@@ -25,12 +25,14 @@
 </template>
 <script>
 import { getMallRechargeShortLink } from "@/api/recharge";
+import { getDetB} from "@/api/order";
 export default {
-  name: "shPayCp",
+  name: "debtResult",
   data() {
     return {
       orderInfo:[],
-      copyText:""
+      copyText:"",
+      remainDebtPrice:0
     }
   },
   onLoad(){
@@ -38,19 +40,24 @@ export default {
     //返回上一页时刷新
     let pages = getCurrentPages();
     let prevPage = pages[ pages.length - 2 ];
-    if(prevPage.$vm){
-      prevPage.$vm.pageAction = {refresh:1}
-    }
+    prevPage.$vm.refreshPage = 1
 
   },
   methods: {
     init(){
       let amount = this.option.amount?parseFloat(this.option.amount):0
-      getMallRechargeShortLink().then(res=>{
-        if(res.code == 1){
-         let link = res.data.link ? res.data.link:''
-         this.copyText = "售后金额¥"+amount+"元，已充值到你的账户\n点击下面链接查看你的账户余额\n"+link+"\n链接30天后失效"
-        }
+      let orderId = this.option.orderId?this.option.orderId:0
+      let that = this
+      getDetB({id:orderId}).then(res => {
+        that.orderInfo = res.data
+        that.remainDebtPrice = that.orderInfo.remainDebtPrice?parseFloat(that.orderInfo.remainDebtPrice):0
+        getMallRechargeShortLink({orderId:orderId}).then(res=>{
+          if(res.code == 1){
+          let rechargeAccountLink = res.data.rechargeAccountLink ? res.data.rechargeAccountLink:''
+          let orderLink = res.data.orderLink?res.data.orderLink:''
+          that.copyText = "已售后，欠款减少"+amount+"元，本单剩余欠款"+that.remainDebtPrice+"元，点击下面链接查看详情\n\n余额 "+rechargeAccountLink+"\n\n本单 "+orderLink+"\n\n链接30天后失效"
+          }
+        })
       })
     },
     copyBack(){
@@ -60,7 +67,7 @@ export default {
           uni.showToast({ title: '复制成功', icon: 'success', duration: 2000 })
           setTimeout(() => {
             uni.navigateBack()      
-          }, 800)
+          }, 500)
         },
         fail: () => {
           uni.showToast({ title: '复制失败', icon: 'none', duration: 2000 })

hdApp/src/admin/refund/offlineCp.vue

@@ -39,7 +39,7 @@ export default {
     let pages = getCurrentPages();
     let prevPage = pages[ pages.length - 2 ];
     if(prevPage.$vm){
-      prevPage.$vm.pageAction = {refresh:1}
+      prevPage.$vm.refreshPage = 1
     }
 
   },
@@ -51,7 +51,7 @@ export default {
         if(res.code == 1){
          let rechargeAccountLink = res.data.rechargeAccountLink ? res.data.rechargeAccountLink:''
          let orderLink = res.data.orderLink?res.data.orderLink:''
-         this.copyText = "售后金额¥"+amount+"元，已充值到你的账户，点击下面链接查看你的账户余额\n\n余额 "+rechargeAccountLink+"\n\n订单 "+orderLink+"\n\n链接30天后失效"
+         this.copyText = "售后金额¥"+amount+"元，已充值到你的账户，点击下面链接查看你的账户余额\n\n余额 "+rechargeAccountLink+"\n\n本单 "+orderLink+"\n\n链接30天后失效"
         }
       })
     },

hdApp/src/admin/refund/offlineRemind.vue

@@ -38,7 +38,7 @@ export default {
     //返回上一页时刷新
     let pages = getCurrentPages();
     let prevPage = pages[ pages.length - 2 ];
-    prevPage.$vm.pageAction = {refresh:1}
+    prevPage.$vm.refreshPage = 1
 
     this.amount = this.option.amount?parseFloat(this.option.amount):0
     this.orderId = this.option.orderId?this.option.orderId:0

hdApp/src/admin/refund/onlineResult.vue

@@ -29,9 +29,7 @@ export default {
     //返回上一页时刷新
     let pages = getCurrentPages();
     let prevPage = pages[ pages.length - 2 ];
-    if(prevPage.$vm){
-      prevPage.$vm.pageAction = {refresh:1}
-    }
+    prevPage.$vm.refreshPage = 1
 
   },
   methods: {

hdApp/src/admin/refund/shPayCp.vue

@@ -38,9 +38,7 @@ export default {
     //返回上一页时刷新
     let pages = getCurrentPages();
     let prevPage = pages[ pages.length - 2 ];
-    if(prevPage.$vm){
-      prevPage.$vm.pageAction = {refresh:1}
-    }
+    prevPage.$vm.refreshPage = 1
 
   },
   methods: {
@@ -51,7 +49,7 @@ export default {
         if(res.code == 1){
          let rechargeAccountLink = res.data.rechargeAccountLink ? res.data.rechargeAccountLink:''
          let orderLink = res.data.orderLink?res.data.orderLink:''
-         this.copyText = "售后金额¥"+amount+"元，已充值到你的账户，点击下面链接查看你的账户余额\n\n余额 "+rechargeAccountLink+"\n\n订单 "+orderLink+"\n\n链接30天后失效"
+         this.copyText = "售后金额¥"+amount+"元，已充值到你的账户，点击下面链接查看你的账户余额\n\n余额 "+rechargeAccountLink+"\n\n本单 "+orderLink+"\n\n链接30天后失效"
         }
       })
     },

hdApp/src/admin/refund/shPayRemind.vue

@@ -36,7 +36,7 @@
       //返回上一页时刷新
       let pages = getCurrentPages();
       let prevPage = pages[ pages.length - 2 ];
-      prevPage.$vm.pageAction = {refresh:1}
+      prevPage.$vm.refreshPage = 1
     },
     methods: {
       recharge(){