充值优化

hdApp/src/admin/billing/affirm.vue

@@ -208,9 +208,9 @@
           </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:170upx;" :class="form.forwardStock == 0? 'blue' : 'default'">库存退回</button>
-            <button @click="form.forwardStock = 1" class="admin-button-com middle" style="width:170upx;" :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>
@@ -538,7 +538,7 @@ export default {
         }else if(this.form.hasPay == 1){
           name = '确认线下付款？'
           if(this.form.forward == 1){
-            name = '确认要开负数订单？'
+            name = '确认开负数订单？'
           }
         }else if(this.form.hasPay == 2){
           name = '确认赊账？'
@@ -547,7 +547,6 @@ export default {
         }else{
           name = '确认提交'
         }
-
         self.$util.confirmModal({content:name},() => {
           self.formSubmit()
         })

hdApp/src/admin/billing/remind.vue

@@ -55,8 +55,8 @@
           if(res.code == 1){
             this.$msg('充值成功')
             setTimeout(() => {
-              that.pageTo({url:`/admin/billing/resultCp?id=${this.option.orderId}`, type: 2})
-            }, 1100)
+              that.pageTo({url:`/admin/billing/resultCp?id=${this.option.orderId}&amount=${this.orderInfo.actPrice}`, type: 2})
+            }, 1000)
           }
         })
       },

hdApp/src/admin/billing/resultCp.vue

@@ -1,141 +1,149 @@
 <template>
-    <view class="app-content">
-      <view class="billing_box_bg">
-        <view class="top-view"> </view>
-        <view class="result-view">
-          <view :class="['iconfont', 'iconchenggong']"></view>
-          <view class="result-title">充值成功</view>
-          <view class="textarea-container">
-            <textarea 
-              class="result-textarea" 
-              v-model="copyText" 
-              readonly 
-              placeholder="售后金额¥20元，已充值到你的账户，点击下面链接查看你的账户余额和明细&#10;链接：#小程序://花掌柜/v9C1DSa6pqAVGGH&#10;链接有效期30天"
-            ></textarea>
+  <view class="app-content">
+    <view class="billing_box_bg">
+      <view class="top-view"> </view>
+      <view class="result-view">
+        <view :class="['iconfont', 'iconchenggong']"></view>
+        <view class="result-title">充值成功</view>
+        <view class="textarea-container">
+          <textarea 
+            class="result-textarea" 
+            v-model="copyText" 
+            readonly 
+            placeholder=""
+          ></textarea>
+        </view>
+        <view class="pay-confirm-content">
+          <view>
+              <button class="admin-button-com blue big" @click="recharge()" style="width:420upx;">复制上面文字，发给客户</button>
           </view>
-          <view class="pay-confirm-content">
-            <view>
-                <button class="admin-button-com blue big" @click="recharge()" style="width:420upx;">复制上面文字，发给客户</button>
-            </view>
-            <view style="margin-top:40upx;">
-                <button class="admin-button-com big" @click="goBack" style="width:420upx;">返回</button>
-            </view>
+          <view style="margin-top:40upx;">
+              <button class="admin-button-com big" @click="goBack" style="width:420upx;">返回</button>
           </view>
         </view>
       </view>
     </view>
-  </template>
-  <script>
-  export default {
-    name: "resultCp",
-    data() {
-      return {
-        orderInfo:[],
-        copyText: "售后金额¥20元，已充值到你的账户，点击下面链接查看你的账户余额和明细\n链接：#小程序://花掌柜/v9C1DSa6pqAVGGH\n链接有效期30天"
-      }
-    },
-    onLoad(){
-      //返回上一页时刷新
-      let pages = getCurrentPages();
-      let prevPage = pages[ pages.length - 2 ];
+  </view>
+</template>
+<script>
+import { getMallRechargeShortLink } from "@/api/recharge";
+export default {
+  name: "resultCp",
+  data() {
+    return {
+      orderInfo:[],
+      copyText:""
+    }
+  },
+  onLoad(){
+
+    //返回上一页时刷新
+    let pages = getCurrentPages();
+    let prevPage = pages[ pages.length - 2 ];
+    if(prevPage.$vm){
       prevPage.$vm.pageAction = {refresh: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天后失效"
+        }
+      })
     },
-    methods: {
-      init(){
-        let id = this.option.id?this.option.id:0
-        getDetB({id: id}).then(res => {
-          this.orderInfo = res.data
-        })
-      },
-      recharge(){
-        // 复制文本到剪贴板
-        uni.setClipboardData({
-          data: this.copyText,
-          success: () => {
-            uni.showToast({
-              title: '复制成功',
-              icon: 'success',
-              duration: 2000
-            });
-          },
-          fail: () => {
-            uni.showToast({
-              title: '复制失败',
-              icon: 'none',
-              duration: 2000
-            });
-          }
-        });
-      },
-      goBack(){
-        uni.navigateBack()
-      }
+    recharge(){
+      // 复制文本到剪贴板
+      uni.setClipboardData({
+        data: this.copyText,
+        success: () => {
+          uni.showToast({
+            title: '复制成功',
+            icon: 'success',
+            duration: 2000
+          });
+        },
+        fail: () => {
+          uni.showToast({
+            title: '复制失败',
+            icon: 'none',
+            duration: 2000
+          });
+        }
+      });
     },
-  };
-  </script>
-  <style lang="scss" scoped>
-  .billing_box_bg {
+    goBack(){
+      uni.navigateBack()
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.billing_box_bg {
+  position: relative;
+  padding: 30upx 30upx;
+  display: flex;
+  flex-direction: column;
+  background-color: #f5f5f5;
+  .top-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 299upx;
+    background: #3385ff;
+    border-radius: 0upx 0upx 83upx 83upx;
+  }
+  .result-view {
     position: relative;
-    padding: 30upx 30upx;
     display: flex;
     flex-direction: column;
-    background-color: #f5f5f5;
-    .top-view {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 299upx;
-      background: #3385ff;
-      border-radius: 0upx 0upx 83upx 83upx;
+    align-items: center;
+    padding: 80upx 0upx 70upx 0upx;
+    width: 100%;
+    background: #ffffff;
+    border-radius: 20upx;
+    z-index: 1;
+    .iconchenggong {
+      font-size: 130upx;
+      color: $mainColor1;
     }
-    .result-view {
-      position: relative;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding: 80upx 0upx 70upx 0upx;
+    .result-title {
+      margin: 50upx 0 30upx;
+      font-size: 38upx;
+    }
+    
+    .textarea-container {
       width: 100%;
-      background: #ffffff;
-      border-radius: 20upx;
-      z-index: 1;
-      .iconchenggong {
-        font-size: 130upx;
-        color: $mainColor1;
-      }
-      .result-title {
-        margin: 50upx 0 30upx;
-        font-size: 38upx;
-      }
+      padding: 0 40upx;
+      margin-bottom: 40upx;
       
-      .textarea-container {
+      .result-textarea {
         width: 100%;
-        padding: 0 40upx;
-        margin-bottom: 40upx;
+        min-height: 300upx;
+        padding: 30upx;
+        background: #f8f9fa;
+        border: 2upx solid #e9ecef;
+        border-radius: 16upx;
+        font-size: 32upx;
+        line-height: 1.6;
+        color: #333;
+        resize: none;
         
-        .result-textarea {
-          width: 100%;
-          min-height: 300upx;
-          padding: 30upx;
-          background: #f8f9fa;
-          border: 2upx solid #e9ecef;
-          border-radius: 16upx;
-          font-size: 32upx;
-          line-height: 1.6;
-          color: #333;
-          resize: none;
-          
-          &:focus {
-            border-color: $mainColor1;
-            background: #fff;
-          }
+        &:focus {
+          border-color: $mainColor1;
+          background: #fff;
         }
       }
     }
   }
+}
 
-  .pay-confirm-content {
-    padding: 30upx 40upx;
-    text-align: center;
-  }
-  </style>
+.pay-confirm-content {
+  padding: 30upx 40upx;
+  text-align: center;
+}
+</style>

hdApp/src/admin/order/refundDetail.vue

@@ -33,12 +33,12 @@
 				<view class="amount">￥{{parseFloat(refundPrice)}}</view>
 			</view>
 		</view>
-		<!-- 库存变化 -->
+		<!-- 退款方式 -->
 		<view class="info-section">
-			<view class="section-title">库存变化</view>
+			<view class="section-title">退款方式</view>
 			<view class="section-content">
 				<view class="status-tag" :class="refundType==1 ? 'return-stock' : 'no-return'">
-					{{refundType==1?'退回库存':'不退库存'}}
+					{{refundType==1?'退货并退款':'只退款'}}
 				</view>
 			</view>
 		</view>

hdApp/src/api/recharge/index.js

@@ -38,4 +38,8 @@ export const rechargeRenewSuccess = data => {
 //供货商的充值送红包活动 
 export const getGhsHb = data => {
 	return https.get('/recharge-hb/get-ghs-hb', data)
+}
+
+export const getMallRechargeShortLink = data => {
+	return https.get('/recharge/get-mall-recharge-short-link', data)
 }