支付

src/pages/index/index.vue

@@ -367,7 +367,7 @@
                                                 <div class="goods__right">
                                                     <div class="goods__price">
                                                         ¥{{
-                                                            good.payAmount
+                                                            good.price
                                                                 | minuteToRmb
                                                         }}
                                                     </div>

src/pages/manage/cashier/detail.vue

@@ -1,18 +1,16 @@
 <template>
     <div class="page">
         <div class="head">
-            <!-- <section class="item">
-                <my-image class="img" src=""></my-image>
-                0002
-            </section>
             <section class="item">
-                <my-image class="img" src=""></my-image>
-                非会员
-            </section> -->
+                <!-- <my-image class="img" src=""></my-image> -->
+                订单号： {{ data.tradeNo }}
+            </section>
             <section class="item">
-                <my-image class="img" src=""></my-image>
+                <!-- <my-image class="img" src=""></my-image> -->
+                备注：
                 {{ data.payRemark }}
             </section>
+            <my-image class="line-img" src="/static/icon/line.jpg"></my-image>
         </div>
         <div class="goods">
             <div class="good-head">
@@ -37,20 +35,20 @@
             </section>
             <section class="item">
                 <div>商品总额</div>
-                <div>￥{{ data.amount |  minuteToRmb2}}</div>
+                <div>￥{{ data.amount | minuteToRmb2 }}</div>
             </section>
-            <!-- <section class="item">
+            <section class="item">
                 <div>折扣</div>
-                <div>￥{{ (data.amount/100)*(data.discount/100) }}</div>
-            </section> -->
+                <div>-￥{{ (data.amount - data.payAmount) | minuteToRmb2 }}</div>
+            </section>
             <section class="item color">
                 <div>应付</div>
-                <div>￥{{ data.payAmount | minuteToRmb2}}</div>
+                <div>￥{{ data.payAmount | minuteToRmb2 }}</div>
             </section>
         </div>
 
-        <div class="tool">
-
+        <div class="tool" v-if="data.status !== 12">
+            <span class="btn" @click="reverseSettle">反结账</span>
         </div>
     </div>
 </template>
@@ -68,6 +66,7 @@ export default {
             pageIndex: 1,
             pageSize: 20,
             data: {},
+            btnLoading: false,
         };
     },
 
@@ -87,6 +86,39 @@ export default {
                     this.data = res.data;
                 });
         },
+
+        reverseSettle() {
+            if (this.btnLoading) {
+                return;
+            }
+            this.btnLoading = true;
+            uni.showLoading({
+                title: "提交中...",
+                mask: true,
+            });
+            this.api
+                .post(
+                    "/order/reverseSettle",
+                    {
+                        query: true,
+                        id: this.data.id,
+                    },
+                    { pass: true }
+                )
+                .then((res) => {
+                    this.btnLoading = false;
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.fn.showToast("保存成功");
+                        this.router.back();
+                    } else {
+                        this.fn.showModal({
+                            content: res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
+        },
     },
 
     // 数据计算
@@ -104,6 +136,7 @@ export default {
 <style lang="scss" scoped>
 .head {
     background-color: #fff;
+    border-bottom: 1px solid #f1f1f1;
     .item {
         min-height: px(110);
         display: flex;
@@ -123,8 +156,8 @@ export default {
         }
     }
 }
-.goods{
-    margin-top: px(30);
+.goods {
+    margin-top: px(40);
     .good-head {
         display: flex;
         align-items: center;
@@ -150,7 +183,7 @@ export default {
     }
 }
 .other-info {
-    margin-top: px(30);
+    margin-top: px(40);
     background-color: #fff;
     padding: px(35);
     .item {
@@ -163,4 +196,36 @@ export default {
 .color {
     color: #0c89c9;
 }
+.line-img {
+    width: 100%;
+    height: px(10);
+    /deep/ img {
+        width: 100%;
+        height: px(10);
+    }
+}
+.tool{
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: px(130);
+    z-index: 10;
+    border-top: 1px solid #f1f1f1;
+    display: flex;
+    padding: px(35);
+    align-items: center;
+    justify-content: flex-end;
+    background-color: #fff;
+    .btn{
+        width: px(190);
+        height: px(88);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: px(40);
+        border-radius: px(8);
+        border: 1px solid #f1f1f1;
+    }
+}
 </style>

src/pages/manage/cashier/list.vue

@@ -1,16 +1,25 @@
 <template>
     <div class="page">
-        <ul class="list">
-            <li class="item" v-for="item of dataList" :key="item.id" @click="goDetail(item)">
+        <div class="empty" v-if="!dataList || dataList.length === 0">
+            无数据
+        </div>
+        <ul class="list" v-if="dataList && dataList.length">
+            <li
+                class="item"
+                v-for="item of dataList"
+                :key="item.id"
+                @click="goDetail(item)"
+            >
                 <div class="main">
                     <div class="trade-no">{{ item.tradeNo }}</div>
                     <div class="info">
                         共{{
                             item.orderItems ? item.orderItems.length : 0
                         }}件商品
-                        <span class="price">{{
-                            item.payAmount | minuteToRmb2
-                        }}元</span>
+
+                        <span class="price"
+                            >{{ item.payAmount | minuteToRmb2 }}元</span
+                        >
                     </div>
                     <div class="time">
                         {{ item.payTime }}
@@ -40,6 +49,7 @@ export default {
             pageIndex: 1,
             pageSize: 20,
             dataList: [],
+            dataEnd: false,
         };
     },
 
@@ -47,27 +57,55 @@ export default {
         this.getList();
     },
     async onShow() {},
+    onPullDownRefresh() {
+        this.getMoreList();
+    },
     // 函数
     methods: {
         getList() {
+            uni.showLoading({
+                title: "提交中...",
+                mask: true,
+            });
+            this.dataEnd = false;
             this.api
                 .get("/Order/GetSettleList", {
                     pageIndex: this.pageIndex,
                     pageSize: this.pageSize,
                 })
                 .then((res) => {
+                    uni.hideLoading();
                     let data = res.data;
                     this.dataList = res.data.data;
                 });
         },
+        getMoreList() {
+            if(this.dataEnd){
+                return;
+            }
+            this.pageIndex++;
+            this.api
+                .get("/Order/GetSettleList", {
+                    pageIndex: this.pageIndex,
+                    pageSize: this.pageSize,
+                })
+                .then((res) => {
+                    let data = res.data;
+                    if (data.length === 0) {
+                        this.dataEnd = true;
+                    } else {
+                        this.dataList = [this.dataList, ...data];
+                    }
+                });
+        },
 
-        goDetail(item){
+        goDetail(item) {
             this.router.push({
-                path:'/pages/manage/cashier/detail',
-                query:{
-                    orderNo:item.tradeNo
-                }
-            })
+                path: "/pages/manage/cashier/detail",
+                query: {
+                    orderNo: item.tradeNo,
+                },
+            });
         },
     },
 
@@ -84,6 +122,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.page {
+    min-height: 100vh;
+    background-color: #fff;
+}
 .list {
     .item {
         padding: px(30) px(35);
@@ -104,7 +146,8 @@ export default {
         color: #999;
     }
     .price {
-        margin-left: px(10);
+        margin-left: px(20);
+        display: inline-block;
         color: #0099cb;
     }
     .time {
@@ -125,4 +168,10 @@ export default {
         }
     }
 }
+.empty {
+    padding: px(35);
+    text-align: center;
+    font-size: px(44);
+    color: #666;
+}
 </style>

src/pages/manage/cashier/settlement.vue

@@ -29,17 +29,16 @@
                     </span>
                 </div>
             </div>
-            <div class="info" v-if="surplusPrice > 0">
+            <div class="info" v-if="surplusPrice > 0 && !orderId">
                 <div class="tools">
                     <span @click="discountShow">折扣</span>
-                    <!-- <span>优惠券</span> -->
                 </div>
                 <div class="money">
                     <span>应收（元）</span>
                     <span class="price"> {{ surplusPrice }} </span>
                 </div>
             </div>
-            <div class="success" v-if="surplusPrice <= 0">
+            <div class="success" v-if="surplusPrice <= 0 && !orderId">
                 <my-image
                     v-if="surplusPrice === 0"
                     class="img"
@@ -54,17 +53,27 @@
                     {{ successText }}
                 </div>
             </div>
+            <div class="success" v-if="orderId && payErr">
+                <my-image class="img" src="/static/icon/error.png"></my-image>
+                <div class="text err-text">结算成功，支付失败，请重新支付</div>
+            </div>
+        </div>
+        <div
+            class="submit-btn"
+            v-if="!orderId && surplusPrice <= 0"
+            @click="submit"
+        >
+            结算
         </div>
 
-        <div class="submit-btn" v-if="surplusPrice <= 0" @click="submit">
-            完成支付
+        <div class="submit-btn" v-if="orderId && payErr" @click="seanCode">
+            继续支付
         </div>
 
         <ul class="pay-list" v-if="surplusPrice > 0">
             <li class="item" @click="showPay('1')">现金</li>
             <li class="item" @click="showPay('2')">刷卡</li>
-            <li class="item" @click="showPay('3')">支付宝</li>
-            <li class="item" @click="showPay('4')">微信</li>
+            <li class="item" @click="showPay('3')">扫码</li>
         </ul>
 
         <div class="modal" v-if="cashVisibile">
@@ -187,9 +196,7 @@ export default {
                 case "2":
                     return "刷卡";
                 case "3":
-                    return "支付宝";
-                case "4":
-                    return "微信";
+                    return "扫码";
             }
         },
     },
@@ -206,8 +213,7 @@ export default {
             payType: {
                 1: "", // 现金
                 2: "", // 刷卡
-                3: "", // 支付宝
-                4: "", // 微信
+                3: "", // 扫码
             },
             // 折扣
             discountList: [], // 折扣列表
@@ -218,6 +224,8 @@ export default {
                 value: "",
             },
             btnLoading: false,
+            orderId: "",
+            payErr: false,
         };
     },
 
@@ -348,6 +356,8 @@ export default {
             this.discount.show = false;
             this.discount.ratio = "";
             this.discount.value = "";
+            this.orderId = "";
+            this.payErr = false;
         },
         // 折扣显示
         discountShow() {
@@ -385,7 +395,7 @@ export default {
                 discount: this.discount.show
                     ? Number(this.discount.ratio)
                     : 100, // 折扣
-                payMethod: this.curPayType, // 支付方式，1-现金支付，2-刷卡支付，3-支付宝支付，4-微信支付
+                payMethod: Number(this.curPayType), // 支付方式，1-现金支付，2-刷卡支付，3-扫码
                 orderItems: [],
             };
             for (let item of this.goods) {
@@ -409,8 +419,18 @@ export default {
                     this.btnLoading = false;
                     uni.hideLoading();
                     if (res.success) {
-                        this.fn.showToast("保存成功");
-                        this.router.back();
+                        // 微信 支付宝支付
+                        if (
+                            this.curPayType === "4" ||
+                            this.curPayType === "3"
+                        ) {
+                            this.orderId = res.data;
+                            console.log(this.orderId);
+                            this.seanCode();
+                        } else {
+                            this.fn.showToast("保存成功");
+                            this.router.back();
+                        }
                     } else {
                         this.fn.showModal({
                             content: res.message,
@@ -419,6 +439,50 @@ export default {
                     }
                 });
         },
+
+        seanCode() {
+            let self = this;
+            uni.scanCode({
+                scanType: "barCode",
+                success(res) {
+                    console.log("扫码", res);
+                    if (res.scanType === "CODE_128") {
+                        uni.showLoading({
+                            title: "支付中...",
+                            mask: true,
+                        });
+                        self.api
+                            .post(
+                                "/order/BarcodePay",
+                                {
+                                    query: true,
+                                    orderId: self.orderId,
+                                    barcode: res.result,
+                                },
+                                { pass: true }
+                            )
+                            .then((res) => {
+                                uni.hideLoading();
+                                if (res.success) {
+                                    self.fn.showToast("支付成功");
+                                    self.router.back();
+                                } else {
+                                    self.fn.showToast("支付失败");
+                                    self.payErr = true;
+                                }
+                            });
+                    } else {
+                        self.fn.showToast("扫码失败");
+                        self.payErr = true;
+                    }
+                },
+                fail(res) {
+                    self.fn.showToast("扫码失败");
+                    console.log("扫码失败：", res);
+                    self.payErr = true;
+                },
+            });
+        },
     },
 
     // 数据计算
@@ -570,7 +634,7 @@ export default {
     align-items: center;
     padding: 0 px(35);
     .item {
-        width: 24%;
+        width: 32%;
         height: px(150);
         border-radius: px(8);
         background-color: #fff;
@@ -728,4 +792,7 @@ export default {
         background-color: #fff;
     }
 }
+.err-text {
+    color: #f00 !important;
+}
 </style>