支付

src/pages/settledMerchant/index.vue

@@ -79,7 +79,7 @@ export default {
             // this.getList();
         },
         getTabs() {
-            post("v1/merchant/business", {}).then(res => {
+            post("v1/merchant/menu", {}).then(res => {
                 if (res.code == 0) {
                     this.tabs = res.data
                     this.getTypeDesc()

src/pages/szw-order-details/index.vue

@@ -185,8 +185,10 @@ export default {
             post("v1/goods/payOrder", {
                 id, trade_type: type,
             }).then((res) => {
-                if (res.code === 0) {
-                    toPayOpre.toPay(res.data.data, (da) => {
+                let data = JSON.parse(res.data.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code === 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (da) => {
                         if (!da) {
                             // 支付成功
                             this.$toast("支付成功");

src/pages/szw-order-list/index.vue

@@ -197,8 +197,10 @@ export default {
                 id: e.order_id,
                 trade_type: type,
             }).then((res) => {
-                if (res.code === 0) {
-                    toPayOpre.toPay(res.data.data, (da) => {
+                let data = JSON.parse(res.data.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code === 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (da) => {
                         if (!da) {
                             // 支付成功
                             this.$toast("支付成功");

src/pages/to-pay-list/index.vue

@@ -458,8 +458,10 @@ export default {
                 price: that.goodsInfo.cost_price,
             }).then((res) => {
                 if (res.code === 0) {
-                    if (res.data.length !== 0) {
-                        toPayOpre.toPay(res.data, (rea) => {
+                    let data = JSON.parse(res.data)
+                    data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                    if (res.code == 0 && data.prepayid) {
+                        toPayOpre.toPay(data, (rea) => {
                             if (!rea) {
                                 // 支付成功
                                 this.$toast("支付成功");

src/pages/top-up/index.vue

@@ -89,18 +89,22 @@ export default {
                 };
 
                 post("v1/user/recharge", data).then((res) => {
-                    toPayOpre.toPay(res.data.data, (rea) => {
-                        if (!rea) {
-                            // 支付成功
-                            this.$toast("支付成功");
-                            that.$set(that,"price","");
-                            if(that.type == "local") that.getLU();
-                            else that.getuserInfo();
-                        } else {
-                            // 支付失败
-                            this.$toast("支付已取消");
-                        }
-                    });
+                    let data = JSON.parse(res.data.data)
+                    data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                    if (res.code == 0 && data.prepayid) {
+                        toPayOpre.toPay(data, (rea) => {
+                            if (!rea) {
+                                // 支付成功
+                                this.$toast("支付成功");
+                                that.$set(that,"price","");
+                                if(that.type == "local") that.getLU();
+                                else that.getuserInfo();
+                            } else {
+                                // 支付失败
+                                this.$toast("支付已取消");
+                            }
+                        });
+                    }
                 });
             }
         },

src/pagesB/cinema/cinemaTicket.vue

@@ -172,8 +172,10 @@ export default {
 			// #endif
             
             post("local/goOrderPay", { trade_no: this.order.trade_no,trade_type: type }).then(res => {
-                if (res.code == 0 && res.data.data.prepayid) {
-                    toPayOpre.toPay(res.data.data, (rea) => {
+                let data = JSON.parse(res.data.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                         if (!rea) {
                             // 支付成功
                             this.getTicket(this.pda);

src/pagesB/cinema/confirmOrder.vue

@@ -128,8 +128,10 @@ export default {
                 trade_type: type,
             }
             post("local/cinemaOrder", da).then(res => {
-                if (res.code == 0 && res.data.prepayid) {
-                    toPayOpre.toPay(res.data, (rea) => {
+                let data = JSON.parse(res.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                       if (!rea) {
                         // 支付成功
                         this.goto("/pagesB/orderingfood/orderlist")

src/pagesB/directCharge/coupon.vue

@@ -173,8 +173,10 @@ export default {
                 trade_type: type,
             }
             post("local/coupon/addOrder", da).then(res => {
-                if (res.code == 0 && res.data.prepayid) {
-                    toPayOpre.toPay(res.data, (rea) => {
+                let data = JSON.parse(res.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                         if (!rea) {
                             // 支付成功
                             this.goto("/pagesB/orderingfood/orderlist")

src/pagesB/directCharge/orderDetail.vue

@@ -113,8 +113,10 @@ export default {
 			// #endif
             
             post("local/goOrderPay", { trade_no: this.order.trade_no,trade_type: type }).then(res => {
-                if (res.code == 0 && res.data.data.prepayid) {
-                    toPayOpre.toPay(res.data.data, (rea) => {
+                let data = JSON.parse(res.data.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                         if (!rea) {
                             // 支付成功
                             this.getOrderDetail(this.pda);

src/pagesB/directCharge/payment.vue

@@ -152,8 +152,10 @@ export default {
                 trade_type: type,
             }
             post("local/coupon/addOrder", da).then(res => {
-                if (res.code == 0 && res.data.prepayid) {
-                    toPayOpre.toPay(res.data, (rea) => {
+                let data = JSON.parse(res.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                         if (!rea) {
                             // 支付成功
                             this.goto("/pagesB/orderingfood/orderlist")

src/pagesB/hotel/hotelDetail.vue

@@ -216,8 +216,10 @@ export default {
             delete RI.ratePlanId;
             da.attachment = JSON.stringify(RI);
             post("local/hotel/addOrder", da).then(res => {
-                if (res.code == 0 && res.data.prepayid) {
-                    toPayOpre.toPay(res.data, (rea) => {
+                let data = JSON.parse(res.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                         if (!rea) {
                             // 支付成功
                             this.goto("/pagesB/orderingfood/orderlist")

src/pagesB/hotel/orderDetail.vue

@@ -44,7 +44,7 @@
             </div>
         </div>
         
-        <template v-if="detail">
+        <template v-if="detail && JSON.stringify(detail) != '{}'">
             <div class="card">
                 <div class="tit">订单信息</div>
                 <div class="pli">
@@ -180,8 +180,10 @@ export default {
 			type = "jsapi";
 			// #endif
             post("local/goOrderPay", { trade_no: this.order.trade_no,trade_type: type }).then(res => {
-                if (res.code == 0 && res.data.data.prepayid) {
-                    toPayOpre.toPay(res.data.data, (rea) => {
+                let data = JSON.parse(res.data.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                         if (!rea) {
                             // 支付成功
                             this.getTicket(this.pda);

src/pagesB/orderingfood/detail.vue

@@ -234,8 +234,10 @@ export default {
 			// #endif
             
             post("local/goOrderPay", {trade_no,trade_type: type}).then(res => {
-                if (res.code == 0 && res.data.data.prepayid) {
-                    toPayOpre.toPay(res.data.data, (rea) => {
+                let data = JSON.parse(res.data.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1] :''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                       if (!rea) {
                         // 支付成功
                         this.getOrderDetail(this.pda);

src/pagesB/orderingfood/payTheBill.vue

@@ -175,8 +175,10 @@ export default {
                 trade_type: type,
             }
             post("local/merchantOrder", da).then(res => {
-                if (res.code == 0 && res.data.prepayid) {
-                    toPayOpre.toPay(res.data, (rea) => {
+                let data = JSON.parse(res.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                       if (!rea) {
                         // 支付成功
                         this.goto("/pagesB/orderingfood/orderlist")

src/pagesB/prepaidRefill/index.vue

@@ -148,8 +148,10 @@ export default {
 			// #endif
             this.qda.trade_type = type
             post("local/ofpay/onlineorde", this.qda).then((res) => {
-                if (res.code == 0 && res.data.prepayid) {
-                    toPayOpre.toPay(res.data, (rea) => {
+                let data = JSON.parse(res.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                         if (!rea) {
                             // 支付成功
                             this.goto("/pagesB/orderingfood/orderlist");

src/pagesB/prepaidRefill/orderDetail.vue

@@ -87,8 +87,10 @@ export default {
 			type = "jsapi";
 			// #endif
             post("local/goOrderPay", { trade_no: this.order.trade_no,trade_type: type }).then(res => {
-                if (res.code == 0 && res.data.data.prepayid) {
-                    toPayOpre.toPay(res.data.data, (rea) => {
+                let data = JSON.parse(res.data.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                         if (!rea) {
                             // 支付成功
                             this.getOrderDetail(this.pda);

src/pagesB/scenicSpotTicket/orderDetail.vue

@@ -88,8 +88,10 @@ export default {
 			type = "jsapi";
 			// #endif
             post("local/goOrderPay", { trade_no: this.order.trade_no,trade_type: type }).then(res => {
-                if (res.code == 0 && res.data.data.prepayid) {
-                    toPayOpre.toPay(res.data.data, (rea) => {
+                let data = JSON.parse(res.data.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                         if (!rea) {
                             // 支付成功
                             this.getOrderDetail(this.pda);

src/pagesB/scenicSpotTicket/scenicDetail.vue

@@ -205,8 +205,10 @@ export default {
                 trade_type: type,
             }
             post("local/ticket/addOrder", da).then(res => {
-                if (res.code == 0 && res.data.prepayid) {
-                    toPayOpre.toPay(res.data, (rea) => {
+                let data = JSON.parse(res.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.prepayid) {
+                    toPayOpre.toPay(data, (rea) => {
                         if (!rea) {
                             // 支付成功
                             this.goto("/pagesB/orderingfood/orderlist")

src/pagesB/topUp/Local.vue

@@ -102,8 +102,10 @@ export default {
 			// #endif
             this.qda.trade_type = type
             post("v1/user/recharge", this.qda).then((res) => {
-                if (res.code == 0 && res.data?.data?.paySign) {
-                    toPayOpre.toPay(res.data?.data, (rea) => {
+                let data = JSON.parse(res.data?.data)
+                data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
+                if (res.code == 0 && data.paySign) {
+                    toPayOpre.toPay(data, (rea) => {
                         if (!rea) {
                             // 支付成功
                             uni.showToast({ title: '充值成功' })

src/pagesC/settledMerchant/pay.vue

@@ -163,7 +163,6 @@ export default {
             this.Body.trade_type = type
             post("v1/merchant/orders",this.Body).then(res=>{
                 let data = JSON.parse(res.data)
-                console.log(data,data.prepayid);
                 data.prepayid = data.package?data.package.split('prepay_id=')[1]:''
                 if (res.code == 0 && data.prepayid) {
                     toPayOpre.toPay(data, (rea) => {