Browse Source

1. 跳转

MONSTER-ygh 2 weeks ago
parent
commit
82ead16504

+ 1 - 1
src/views/order/groupBuyingMr/index.vue

@@ -342,7 +342,7 @@
                   <!--  scope.row.status == 0  -->
                   <el-dropdown-item 
                   command="4" 
-                  v-if="hasPermi('groupBuyingMr:groupBuyingMr:reset') && scope.row.status == 0">修改订单</el-dropdown-item>
+                  v-if="hasPermi('groupBuyingMr:groupBuyingMr:reset') && scope.row.status == 9">修改订单</el-dropdown-item>
                   <!-- <el-dropdown-item 
                   command="5" 
                   v-if="hasPermi('groupBuyingMr:groupBuyingMr:place')"

+ 21 - 10
src/views/windowTicketSales/mixins/pay.js

@@ -253,16 +253,24 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
             }).then(() => {
-            teamPayOrderUrlApi({ orderId: this.orderId }).then((res) => {
-                if (res.code == 200) {
-                this.$message({
-                    type: 'success',
-                    message: res.msg
-                });
-                this.copyToClipboard(res.data.url)
-                }
-            });
-            }).catch(() => { }).finally(() => {
+                this.loadingText = "生成并复制链接中..."
+                this.loading = true
+                teamPayOrderUrlApi({ orderId: this.orderId }).then((res) => {
+                    if (res.code == 200) {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg
+                        });
+                        this.copyToClipboard(res.data.url)
+                    }
+                }).catch(() => {
+                    this.loading = false
+                    this.payStatus = null
+                })
+            }).catch(() => {
+                this.loading = false
+                this.payStatus = null
+             }).finally(() => {
             });
         },
         /**  复制内容  */
@@ -274,6 +282,9 @@ export default {
             tempInput.select();
             document.execCommand('copy');
             document.body.removeChild(tempInput);
+            this.loading = false
+            this.rebookDialog = false
+
         },
         // 跳转取票界面
         goTicketingCollections(){

+ 0 - 6
src/views/windowTicketSales/model/upgradeBox.vue

@@ -163,12 +163,6 @@
                         <el-button v-if="payStatus==6 || payStatus==7" @click="vbar_open(orderId)"
                             type="success">重新连接扫码支付</el-button>
 
-                        <!--   现金支付  -->
-                        <el-button v-if="payStatus==2" @click="vbar_open(orderId)" type="success">扫码支付</el-button>
-
-                        <!--   现金支付  -->
-                        <el-button v-if="payStatus==2" @click="vbar_open(orderId)" type="success">扫码支付</el-button>
-
                     </div>
 
                     <!-- 打印 8  -->