From d5942f5453af4d810b5a236017a66aa65d276274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Thu, 14 Mar 2024 16:21:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=94=AF=E4=BB=98=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E6=9E=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/components/payCard/payCard.vue     | 315 ------------------
 .../member/components/payCard/scanModal.vue   | 278 ----------------
 src/views/member/index.vue                    |   9 +-
 src/views/order/index.vue                     |   7 +-
 4 files changed, 7 insertions(+), 602 deletions(-)
 delete mode 100644 src/views/member/components/payCard/payCard.vue
 delete mode 100644 src/views/member/components/payCard/scanModal.vue

diff --git a/src/views/member/components/payCard/payCard.vue b/src/views/member/components/payCard/payCard.vue
deleted file mode 100644
index 29ef8b5..0000000
--- a/src/views/member/components/payCard/payCard.vue
+++ /dev/null
@@ -1,315 +0,0 @@
-<template>
-    <div class="card">
-        <div class="header">
-            <div class="t1">
-                <span class="title">应收:￥</span>
-                <span class="num">{{ props.amount }}</span>
-            </div>
-            <div class="t2">
-                <span>已付:￥0.00</span>
-                <span>优惠:￥0.00</span>
-            </div>
-        </div>
-        <div class="number_wrap">
-            <div class="menus">
-                <div class="item" :class="{ active: payActive == index }" v-for="(item, index) in payList"
-                    :key="item.id" @click="payTypeChange(index, item)">
-                    <div class="icon">
-                        <el-image :src="item.icon" class="img"></el-image>
-                    </div>
-                    <span class="title">{{ item.payName }}</span>
-                </div>
-            </div>
-            <div class="input_wrap">
-                <div class="input" style="flex: 1;">储值:￥{{ money }}</div>
-                <div class="input" v-if="waitPayMoney > 0">待支付:￥{{ waitPayMoney }}</div>
-            </div>
-            <div class="blance">
-                <!-- 可用余额：0.00 -->
-            </div>
-            <div class="keybord_wrap">
-                <div class="left">
-                    <div class="item" v-for="item in 9" :key="item" @click="amountInput(`${item}`)">{{ item }}</div>
-                    <div class="item" @click="amountInput('.')">.</div>
-                    <div class="item" @click="amountInput('0')">0</div>
-                    <div class="item" @click="delHandle">
-                        <el-icon>
-                            <CloseBold />
-                        </el-icon>
-                    </div>
-                </div>
-                <div class="pay_btn" v-loading="payLoading" @click="confirmOrder">
-                    <span>支</span>
-                    <span>付</span>
-                </div>
-            </div>
-        </div>
-    </div>
-    <scanModal ref="scanModalRef" :amount="props.amount" :orderId="props.orderId" @success="scanCodeSuccess" />
-</template>
-
-<script setup>
-import { onMounted, ref, computed, watch } from 'vue'
-import { queryPayType, accountPay, cashPay } from '@/api/pay'
-import { useUser } from "@/store/user.js"
-import { clearNoNum } from '@/utils'
-
-import scanModal from '@/components/payCard/scanModal.vue'
-import { ElMessage } from "element-plus";
-
-const store = useUser()
-
-const props = defineProps({
-    amount: {
-        type: Number,
-        default: 0
-    },
-    orderId: {
-        type: [String, Number],
-        default: ''
-    }
-})
-
-const emit = defineEmits(['paySuccess'])
-
-const money = ref('0')
-const scanModalRef = ref(null)
-
-watch(props, (value) => {
-    money.value = `${props.amount}`
-})
-
-const waitPayMoney = computed(() => {
-    let num = JSON.stringify(props.amount - money.value)
-    num = Math.floor(num * 100) / 100
-    return num
-})
-
-const payActive = ref(0)
-const payList = ref([])
-const payLoading = ref(false)
-
-// 获得扫码值
-function scanCodeSuccess() {
-    emit('paySuccess')
-}
-
-// 切换支付类型
-function payTypeChange(index, item) {
-    payActive.value = index
-    if (item.payType == 'scanCode') {
-        scanModalRef.value.show()
-    }
-}
-
-// 结算支付
-async function confirmOrder() {
-    try {
-        if (payList.value[payActive.value].payType == 'scanCode') {
-            scanModalRef.value.show()
-        } else {
-            if (money.value < props.amount) return
-            payLoading.value = true
-            switch (payList.value[payActive.value].payType) {
-                case 'deposit':
-                    await accountPay({
-                        orderId: props.orderId,
-                        memberId: 1
-                    })
-                    break;
-                case 'cash':
-                    await cashPay({
-                        orderId: props.orderId
-                    })
-                    break;
-                default:
-                    break;
-            }
-            payLoading.value = false
-            ElMessage.success('支付成功')
-            emit('paySuccess')
-        }
-    } catch (error) {
-        console.log(error)
-        payLoading.value = false
-        scanModalRef.value.loading = false
-    }
-}
-
-// 输入
-function amountInput(num) {
-    if (money.value + num <= props.amount) {
-        money.value = clearNoNum({ value: (money.value += num) })
-    } else {
-        money.value = clearNoNum({ value: `${props.amount}` })
-    }
-}
-
-// 删除
-function delHandle() {
-    if (!money.value) return
-    money.value = money.value.substring(0, money.value.length - 1)
-    if (!money.value) {
-        money.value = '0'
-    }
-}
-
-// 获取支付方式
-async function queryPayTypeAjax() {
-    try {
-        const res = await queryPayType({
-            shopId: store.userInfo.shopId
-        })
-        payList.value = res
-    } catch (error) {
-        console.log(error)
-    }
-}
-
-onMounted(() => {
-    money.value = `${props.amount}`
-    queryPayTypeAjax()
-})
-
-</script>
-
-<style scoped lang="scss">
-.card {
-    padding: var(--el-font-size-base);
-    height: 100%;
-}
-
-.header {
-    padding-bottom: var(--el-font-size-base);
-    border-bottom: 1px solid #ececec;
-
-    .t1 {
-        display: flex;
-        color: var(--el-color-danger);
-        font-weight: bold;
-
-        .title {
-            font-size: var(--el-font-size-base);
-            position: relative;
-            top: 14px;
-        }
-
-        .num {
-            font-size: 30px;
-        }
-    }
-
-    .t2 {
-        display: flex;
-        gap: var(--el-font-size-base);
-        color: #999;
-        padding-top: 10px;
-    }
-}
-
-.number_wrap {
-    padding: var(--el-font-size-base) 0;
-
-    .menus {
-        display: flex;
-        gap: var(--el-font-size-base);
-
-        .item {
-            height: 130px;
-            flex: 1;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-            background-color: #efefef;
-            padding: 10px 0;
-            border-radius: 10px;
-            position: relative;
-            $lineHeight: 4px;
-
-            &.active {
-                &::after {
-                    content: "";
-                    width: 50%;
-                    height: $lineHeight;
-                    background-color: var(--primary-color);
-                    position: absolute;
-                    bottom: 0;
-                    left: 25%;
-                    border-radius: $lineHeight;
-                }
-            }
-
-            .img {
-                $size: 40px;
-                width: $size;
-                height: $size;
-            }
-
-            .title {
-                padding-top: 10px;
-            }
-        }
-    }
-
-    .input_wrap {
-        display: flex;
-        gap: var(--el-font-size-base);
-        padding: var(--el-font-size-base) 0;
-
-        .input {
-            display: flex;
-            align-items: center;
-            height: 60px;
-            border-radius: 6px;
-            border: 1px solid var(--primary-color);
-            font-size: calc(var(--el-font-size-base) + 6px);
-            padding: 0 var(--el-font-size-base);
-        }
-    }
-
-    .blance {
-        color: var(--el-color-danger);
-        font-size: calc(var(--el-font-size-base) + 10px);
-    }
-}
-
-.keybord_wrap {
-    display: flex;
-
-    .left {
-        --item-height: calc((100vh - 440px) / 4);
-        flex: 1;
-        display: grid;
-        grid-template-columns: 1fr 1fr 1fr;
-        grid-template-rows: var(--item-height) var(--item-height) var(--item-height) var(--item-height);
-        gap: var(--el-font-size-base);
-
-        .item {
-            background-color: #efefef;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 6px;
-            font-size: calc(var(--el-font-size-base) + 10px);
-
-            &:active {
-                background-color: #dbdbdb;
-            }
-        }
-    }
-
-    .pay_btn {
-        flex: 0.3;
-        border-radius: 6px;
-        color: #fff;
-        background-color: var(--el-color-warning);
-        margin-left: var(--el-font-size-base);
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        font-size: calc(var(--el-font-size-base) + 10px);
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/member/components/payCard/scanModal.vue b/src/views/member/components/payCard/scanModal.vue
deleted file mode 100644
index 17385e4..0000000
--- a/src/views/member/components/payCard/scanModal.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-<!-- 扫码弹窗 -->
-
-<template>
-    <div class="dialog">
-        <el-dialog title="扫码支付" width="600" v-model="dialogVisible" @open="reset">
-            <div class="content">
-                <div class="left">
-                    <el-image :src="icon" style="width: 60px;height: 60px;"></el-image>
-                </div>
-                <div class="right" v-if="!userPayWait">
-                    <div class="amount">
-                        <span class="t">扫码支付</span>
-                        <span class="n">{{ props.amount }}</span>
-                    </div>
-                    <div class="input">
-                        <el-input ref="inputRef" v-model="scanCode"
-                            style="height: calc(var(--el-component-size-large) + 20px);" placeholder="请扫描付款码"
-                            @keydown.enter="enterHandle" clearable></el-input>
-                    </div>
-                    <div class="number_warp">
-                        <div class="item" v-for="item in 9" :key="item" @click="inputHandle(item)">{{ item }}</div>
-                        <div class="item disabled">.</div>
-                        <div class="item" @click="inputHandle(0)">0</div>
-                        <div class="item" @click="delHandle">
-                            <el-icon>
-                                <CloseBold />
-                            </el-icon>
-                        </div>
-                    </div>
-                    <div class="btn">
-                        <el-button type="primary" style="width: 100%;" v-loading="loading"
-                            @click="submitHandle">立即支付</el-button>
-                    </div>
-                </div>
-                <div class="pay_wait" v-else>
-                    <div class="loading" v-loading="loading" element-loading-text="用户支付中..."></div>
-                    <div class="btn">
-                        <el-button type="primary" style="width: 100%;" v-loading="checkPayStatusLoading"
-                            @click="checkPayStauts">
-                            <span v-if="!checkPayStatusLoading">查询用户支付状态</span>
-                            <span v-else>查询中...</span>
-                        </el-button>
-                    </div>
-                    <div class="btn">
-                        <el-button style="width: 100%;" @click="resetScanCode">重新扫码</el-button>
-                    </div>
-                </div>
-            </div>
-        </el-dialog>
-    </div>
-</template>
-
-<script setup>
-import _ from 'lodash'
-import { ref } from 'vue'
-import icon from '@/assets/icon_scan.png'
-import { scanpay, queryOrder } from '@/api/pay'
-
-import { ElMessage } from "element-plus";
-
-const emits = defineEmits(['success'])
-
-const props = defineProps({
-    amount: {
-        type: [Number, String],
-        default: 0
-    },
-    orderId: {
-        type: [Number, String],
-        default: ''
-    }
-})
-
-const dialogVisible = ref(false)
-const scanCode = ref('')
-const inputRef = ref(null)
-
-const loading = ref(false)
-const userPayWait = ref(false)
-const checkPayStatusLoading = ref(false)
-
-// 提交扫码支付
-async function submitHandle() {
-    try {
-        if (!scanCode.value) return
-        loading.value = true
-        await scanpay({
-            orderId: props.orderId,
-            authCode: scanCode.value
-        })
-        loading.value = false
-        scanCode.value = ''
-        emits('success')
-    } catch (error) {
-        if (error.code === '100015') {
-            userPayWait.value = true
-        } else {
-            loading.value = false
-            console.log(error)
-        }
-    }
-}
-
-// 查询用户支付状态
-async function checkPayStauts() {
-    try {
-        const res = await queryOrder({ orderId: props.orderId })
-        loading.value = false
-        if (res.status == 'closed') {
-            emits('success')
-            scanModalRef.value.close()
-        } else {
-            checkPayStatusLoading.value = false
-            ElMessage.error(res.payRemark || '支付失败！')
-            scanModalRef.value.loading = false
-        }
-    } catch (error) {
-        console.log(error)
-    }
-}
-
-// 重新扫码
-function resetScanCode() {
-    userPayWait.value = false
-    loading.value = false
-    scanCode.value = ''
-    inputRef.value.focus()
-}
-
-// 输入
-function inputHandle(n) {
-    scanCode.value += n
-    inputRef.value.focus()
-}
-
-// 删除
-function delHandle() {
-    if (!scanCode.value) return
-    scanCode.value = scanCode.value.substring(0, scanCode.value.length - 1)
-    inputRef.value.focus()
-}
-
-// 监听扫码枪回车事件
-function enterHandle() {
-    inputRef.value.focus()
-}
-
-// const inputChange = _.debounce(function (e) {
-//     console.log(e);
-// }, 300)
-
-function show() {
-    dialogVisible.value = true
-    setTimeout(() => {
-        inputRef.value.focus()
-    }, 500)
-}
-
-function close() {
-    dialogVisible.value = false
-}
-
-function reset() {
-    loading.value = false
-    scanCode.value = ''
-}
-
-defineExpose({
-    show,
-    close,
-    loading
-})
-</script>
-
-<style scoped lang="scss">
-.dialog :deep(.el-dialog__body) {
-    padding: 0 !important;
-}
-
-.content {
-    display: flex;
-
-    .left {
-        width: 200px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        background-color: #efefef;
-    }
-
-    .right {
-        flex: 1;
-        padding: var(--el-font-size-base);
-
-        .amount {
-            display: flex;
-            height: calc(var(--el-component-size-large) + 20px);
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            color: var(--primary-color);
-            background-color: #555;
-            border-radius: 6px;
-            padding: 0 var(--el-font-size-base);
-            font-size: calc(var(--el-font-size-base) + 10px);
-        }
-
-        .input {
-            padding: var(--el-font-size-base) 0;
-
-            :deep(.el-input__inner) {
-                font-size: calc(var(--el-font-size-base) + 10px);
-            }
-        }
-
-        .number_warp {
-            --h: 50px;
-            display: grid;
-            grid-template-columns: 1fr 1fr 1fr;
-            grid-template-rows: var(--h) var(--h) var(--h) var(--h);
-            gap: 8px;
-
-            .item {
-                background-color: #dddddd;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                font-size: calc(var(--el-font-size-base) + 10px);
-                border-radius: 4px;
-
-                &.disabled {
-                    color: #999;
-                    background-color: #efefef;
-
-                    &:active {
-                        background-color: #efefef;
-                    }
-
-                }
-
-                &:active {
-                    background-color: #b9b9b9;
-                }
-            }
-        }
-
-        .btn {
-            padding-top: 20px;
-        }
-    }
-
-    .pay_wait {
-        flex: 1;
-        padding: 0 var(--el-font-size-base);
-        height: 600px;
-        padding-bottom: 100px;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-
-        .loading {
-            width: 200px;
-            height: 200px;
-            --el-loading-spinner-size: 100px;
-
-            :deep(.el-loading-text) {
-                font-size: 20px;
-            }
-        }
-
-        .btn {
-            width: 200px;
-            padding-top: var(--el-font-size-base);
-        }
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/member/index.vue b/src/views/member/index.vue
index 3b09ae5..6605baa 100644
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -186,7 +186,10 @@ const emit = defineEmits('paySuccess')
 
 function paySuccess() {
     console.log('188')
-    dialogVisible.value = false
+    payCarddialogVisible.value = false
+    recharge.value = false
+    moneys.value = 0
+
     emit('paySuccess')
 }
 
@@ -202,10 +205,6 @@ const props = defineProps({//首页传值
     amount: {
         type: [Number, String],
         default: 0
-    },
-    orderId: {
-        type: [String, Number],
-        default: ''
     }
 })
 
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index f7f356a..a821ce7 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -87,14 +87,14 @@
                 </div>
             </div>
             <div class="orderbox_right_button">
-                <div class="orderbox_right_buttonbutton">
+                <div class="orderbox_right_buttonbutton" v-if="orderDetaildata.status == 'refund'">
                     <router-link to="/" style="width: 45%;">
                         <el-button style="width: 100%;" type="primary">打票</el-button>
                     </router-link>
                     <el-button style="width: 45%;" type="danger" @click="recharge = true">退单</el-button>
                     <!--payreturnOrderclick @click="recharge = true" -->
                 </div>
-                <!-- <el-button style="width: 100%; margin-top: 10px;" type="primary" @click="onSubmit">结算</el-button> -->
+                <el-button v-else style="width: 100%; margin-top: 10px;" type="primary" @click="onSubmit">结算</el-button>
             </div>
         </div>
         <div class="orderbox_rightbox" v-else>
@@ -725,8 +725,7 @@ onMounted(() => {
             height: 75%;
 
             .orderbox_right_item {
-                margin-top: 16px;
-
+                margin-top: 6px;
                 span {
                     font-size: var(--el-font-size-base);
                     // color: var(--primary-color);