shish 1 год назад
Родитель
Сommit
f19489e0e6
3 измененных файлов с 176 добавлено и 3 удалено
  1. 24 3
      hdApp/src/admin/billing/affirm.vue
  2. 151 0
      hdApp/src/admin/billing/remind.vue
  3. 1 0
      hdApp/src/pages.json

+ 24 - 3
hdApp/src/admin/billing/affirm.vue

@@ -198,9 +198,21 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">备注</view>
-						<textarea style="height: 100upx;z-index:0" v-model="form.remark" placeholder-class="remark-class" placeholder=".." />
+						<textarea style="height:80upx;z-index:0" v-model="form.remark" placeholder-class="remark-class" placeholder="选填" />
 					</tui-list-cell>
 
+          <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>
+          </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>
+          </tui-list-cell>
+
           </view>
         </view>
       </form>
@@ -321,7 +333,9 @@ export default {
         needPrint:2,
         hasPay:0,
         getStaffName:'',
-        dealPrice:0
+        dealPrice:0,
+        forward:0,
+        forwardStock:0
       },
       showCustomer: false,
       customInfo:{discount:1,balance:0},
@@ -523,6 +537,9 @@ export default {
           name = '确认扫码付?'
         }else if(this.form.hasPay == 1){
           name = '确认线下付款?'
+          if(this.form.forward == 1){
+            name = '确认清楚负数订单用法,要开单?'
+          }
         }else if(this.form.hasPay == 2){
           name = '确认赊账?'
         }else if(this.form.hasPay == 4){
@@ -579,7 +596,11 @@ export default {
             if(this.form.hasPay == 0){
               this.$util.pageTo({ url: '/admin/billing/toPay',type:2,query: {orderId:id,orderSn:orderSn,actPrice:actPrice}})
             }else{
-              this.$util.pageTo({ url: '/admin/billing/result?orderId='+id,type:2})
+              if(this.form.forward == 1){
+                this.$util.pageTo({ url: '/admin/billing/remind?orderId='+id,type:2})
+              }else{
+                this.$util.pageTo({ url: '/admin/billing/result?orderId='+id,type:2})
+              }
             }
           }else{
             this.$msg('提交失败')

+ 151 - 0
hdApp/src/admin/billing/remind.vue

@@ -0,0 +1,151 @@
+<template>
+    <view class="app-content">
+      <view class="billing_box_bg">
+        <view class="top-view"> </view>
+        <view class="result-view">
+          <view class="custom-info-icon">i</view>
+          <view class="result-title">操作成功,还有下一步</view>
+          <view class="pay-confirm-content">
+            <view class="confirm-text">
+              <view class="text-desc">请线下转账给客户,或充到客户账户</view>
+            </view>
+            <view>
+                <button class="admin-button-com blue big" @click="" style="width:320upx;">充到客户余额</button>
+            </view>
+            <view style="margin-top:30upx;">
+                <button class="admin-button-com big" @click="goBack" style="width:320upx;">线下退钱给客户</button>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </template>
+  <script>
+  import { getDetB} from "@/api/order";
+  export default {
+    name: "remind",
+    data() {
+      return {
+      }
+    },
+    onLoad(){
+      //返回上一页时刷新
+      let pages = getCurrentPages();
+      let prevPage = pages[ pages.length - 2 ];
+      prevPage.$vm.pageAction = {refresh:1}
+    },
+    methods: {
+      init(){
+        let orderId = this.option.orderId?this.option.orderId:0
+        getDetB({id: orderId}).then(res => {
+          this.orderInfo = res.data
+        })
+      },
+      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: #09C567;
+      border-radius: 0upx 0upx 83upx 83upx;
+    }
+    .result-view {
+      position: relative;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding: 80upx 0upx 70upx 0upx;
+      width: 100%;
+      background: #ffffff;
+      border-radius: 20upx;
+      z-index: 1;
+      .custom-info-icon {
+        width: 130upx;
+        height: 130upx;
+        border-radius: 50%;
+        background: #FF9800;
+        color: #fff;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 80upx;
+        font-weight: bold;
+        box-shadow: 0 4upx 12upx rgba(9, 197, 103, 0.3);
+      }
+      .result-title {
+        margin: 50upx 0 30upx;
+        font-size: 38upx;
+        font-weight:bold;
+      }
+    }
+  }
+
+  // 支付确认弹框样式
+  .pay-confirm-content {
+    padding: 30upx 40upx;
+    text-align: center;
+    
+    .confirm-text {
+      margin-bottom: 60upx;
+      
+      .text-title {
+        font-size: 42upx;
+        font-weight: bold;
+        color: #333;
+        margin-bottom: 25upx;
+        line-height: 1.4;
+      }
+      
+      .text-desc {
+        font-size: 38upx;
+        color: #3f3e3e;
+        line-height: 1.4;
+      }
+    }
+    
+    .confirm-btn-wrap {
+      .confirm-btn {
+        width: 60%;
+        height: 100upx;
+        background: linear-gradient(135deg, #07c160 0%, #10ad6a 100%);
+        color: #fff;
+        border: none;
+        border-radius: 50upx;
+        font-size: 38upx;
+        font-weight: bold;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        box-shadow: 0 4upx 12upx rgba(7, 193, 96, 0.3);
+        transition: all 0.3s ease;
+        margin: 0 auto 25upx;
+        
+        &:active {
+          transform: scale(0.98);
+          box-shadow: 0 2upx 8upx rgba(7, 193, 96, 0.4);
+        }
+      }
+      
+      .tech-support {
+        font-size: 32upx;
+        color: #999;
+        text-align: center;
+        line-height: 1.4;
+      }
+    }
+  }
+  </style>

+ 1 - 0
hdApp/src/pages.json

@@ -362,6 +362,7 @@
 				{ "path": "customerPlace", "style": { "navigationBarTitleText": "开单" } },
 				{ "path": "priceChange", "style": { "navigationBarTitleText": "改价", "enablePullDownRefresh": true } },
 				{ "path": "result", "style": { "navigationBarTitleText": "开单状态" } },
+				{ "path": "remind", "style": { "navigationBarTitleText": "提示" } },
 				{ "path": "affirm", "style": { "navigationBarTitleText": "确认订单信息" } },
 				{ "path": "toPay", "style": { "navigationBarTitleText": "等待付款" } },
 				{ "path": "affirmGoods", "style": { "navigationBarTitleText": "确认订单信息" } },