弹框问题，支付成功逻辑处理

admin-ui/src/components/payStatusPopup/index.vue

@@ -212,6 +212,7 @@ export default {
                 this.$confirm('是否关闭打印操作？')
                     .then(() => {
                         _.show = false
+                        _.$emit('close')
                     })
                     .catch(() => {})
             }
@@ -273,7 +274,8 @@ export default {
                 if (res) {
                     this.pointerInfo = res.data
                     listOrderClothItem({ pageSize: 99999, pageNum: 1, orderNo: data.orderNo }).then((res) => {
-                        this.pointerInfo.orderClothDetails = res.data.records
+                        console.log(res)
+                        this.pointerInfo.orderClothDetails = res.rows
                     })
                 }
             })

admin-ui/src/views/app/user/index.vue

@@ -111,7 +111,7 @@
         </Page>
 
         <!-- 会员详情弹窗 -->
-        <el-dialog title="会员详情" :visible.sync="userViewType" width="80%" class="user-detail-dialog" :before-close="usercheckClose">
+        <el-dialog title="会员详情" :visible.sync="userViewType" width="80%" class="user-detail-dialog" :before-close="usercheckClose" append-to-body>
             <div class="user-detail">
                 <!-- 基本信息卡片 -->
                 <el-card class="detail-card" shadow="never">

admin-ui/src/views/order/cloth/collectCloth.vue

@@ -360,7 +360,7 @@
             </div>
         </el-dialog>
 
-        <el-dialog title="衣服附件" :visible.sync="addClothAdjunctOpen" width="60%">
+        <el-dialog title="衣服附件" :visible.sync="addClothAdjunctOpen" width="60%" append-to-body>
             <el-row :gutter="20">
                 <el-col :span="8">
                     <div>选择附件</div>
@@ -395,7 +395,7 @@
             </span>
         </el-dialog>
 
-        <el-dialog title="衣服照片" :visible.sync="addClothPicOpen" width="50%">
+        <el-dialog title="衣服照片" :visible.sync="addClothPicOpen" width="50%" append-to-body>
             <form ref="picForm">
                 <image-upload :limit="9" v-model="addClothPics"></image-upload>
             </form>
@@ -405,7 +405,7 @@
             </span>
         </el-dialog>
 
-        <el-dialog title="洗衣方式" :visible.sync="addClothWashModeOpen" width="30%">
+        <el-dialog title="洗衣方式" :visible.sync="addClothWashModeOpen" width="30%" append-to-body>
             <div style="margin-bottom: 50px">
                 <el-tag :key="item.id" type="info" v-for="(item, index) in clothWashModes" style="margin-top: 15px; margin-left: 15px" size="medium" @click="onClothWashModeSelect(index)">
                     {{ item.washModeName + '（￥' + item.price + '）' }}
@@ -414,7 +414,7 @@
         </el-dialog>
 
         <!--  设置备注  -->
-        <el-dialog title="备注" :visible.sync="addClothRemarkOpen" width="30%">
+        <el-dialog title="备注" :visible.sync="addClothRemarkOpen" width="30%" append-to-body>
             <form ref="remarkForm">
                 <el-input type="textarea" :rows="5" placeholder="请输入备注" v-model="clothRemark"> </el-input>
             </form>
@@ -425,7 +425,7 @@
         </el-dialog>
 
         <!--  设置默认价格  -->
-        <el-dialog title="设置价格" :visible.sync="setClothDefaultPriceOpen" width="30%" :before-close="handleClose">
+        <el-dialog title="设置价格" :visible.sync="setClothDefaultPriceOpen" width="30%" :before-close="handleClose" append-to-body>
             <form ref="remarkForm">
                 <el-input-number placeholder="请输入价格" v-model="defaultPrice"> </el-input-number>
             </form>
@@ -436,7 +436,7 @@
         </el-dialog>
 
         <!--  特殊衣物  -->
-        <el-dialog title="特殊衣物" :visible.sync="setClothSpecialPriceOpen" width="55%" :before-close="handleClose">
+        <el-dialog title="特殊衣物" :visible.sync="setClothSpecialPriceOpen" width="55%" :before-close="handleClose" append-to-body>
             <el-form ref="remarkForm">
                 <el-row :gutter="10">
                     <el-col :span="12">
@@ -481,12 +481,12 @@
             </span>
         </el-dialog>
 
-        <el-dialog title="收银" :visible.sync="confirmPayOpen" size="80%" :before-close="handleClose" destroy-on-close>
-            <CashCloth ref="cashCloth" :orderForm="orderForm" :orderClothItemDTOS="orderClothItemDTOS" :appUserInfo="appUserInfo" :clothSpeeds="clothSpeeds" :deductCouponVOS="deductCouponVOS" :discountCouponVOS="discountCouponVOS" @onPaySuccess="onPaySuccess" @initOrderList="initOrderList" />
+        <el-dialog title="收银" :visible.sync="confirmPayOpen" size="80%" :before-close="handleClose" destroy-on-close append-to-body>
+            <CashCloth ref="cashCloth" :orderForm="orderForm" :orderClothItemDTOS="orderClothItemDTOS" :appUserInfo="appUserInfo" :clothSpeeds="clothSpeeds" :deductCouponVOS="deductCouponVOS" :discountCouponVOS="discountCouponVOS" @onPaySuccess="onPaySuccess" @initOrderList="initOrderList" @confirm="handelPaySuccess"/>
         </el-dialog>
 
         <!-- 拍照上传 -->
-        <el-dialog title="拍照上传" :visible.sync="photographType" :before-close="hidephotograph" width="55%">
+        <el-dialog title="拍照上传" :visible.sync="photographType" :before-close="hidephotograph" width="55%" append-to-body>
             <div class="photo_content">
                 <div class="video_content">
                     <div class="loading" v-if="videoType">
@@ -524,7 +524,7 @@
             </span>
         </el-dialog>
         <pay-status-popup ref="payStatusPopup" @paySuccess="handelPaySuccess"></pay-status-popup>
-        <el-dialog title="预约订单" :visible.sync="showAdvanceOrder" width="55%">
+        <el-dialog title="预约订单" :visible.sync="showAdvanceOrder" width="55%" append-to-body>
             <el-table :data="advanceOrderList">
                 <el-table-column prop="orderNo" label="预约单号" width="180"> </el-table-column>
                 <el-table-column prop="appointmentTime" label="预约时间" width="180"></el-table-column>
@@ -843,8 +843,8 @@ export default {
         },
 
         onPaySuccess(orderInfo) {
+            console.log('aaaaa')
             this.confirmPayOpen = false
-
             console.log('res', orderInfo)
             if (orderInfo.payTimeType == '0') {
                 //第三方支付
@@ -871,10 +871,12 @@ export default {
         },
 
         handelPaySuccess() {
+            console.log("AAAAA")
             this.orderClothItemDTOS = []
             this.queryParams = {}
+            this.confirmPayOpen = false
             this.appUserInfo = null
-            this.orderForm = {}
+            // this.orderForm = {}
         },
         intervalCheckOrderStatus(orderno) {
             getOrderStatusByOrderNo({ orderNo: orderno }).then((response) => {

admin-ui/src/views/order/cloth/component/cashCloth.vue

@@ -270,6 +270,7 @@
                 :hide-user="false"
                 @pay-success="handlePaySuccess"
                 @confirm="handleConfirm"
+                @close="handleConfirm"
             />
         </div>
     </div>