warrior 2 months ago
parent
commit
fcc74c009d

+ 12 - 3
projects/live-app/src/app/components/pay-comp/pay-comp.component.html

@@ -7,7 +7,11 @@
 >
   <ng-template>
     <div class="pay-box">
-      <div class="close" (click)="onClose()"><ion-icon name="close-outline"></ion-icon></div>
+      <div class="close" (click)="onClose()">
+        <ion-icon name="close-outline"></ion-icon>
+      </div>
+      @if (!codeLink) {
+
       <div class="pay-title">支付订单</div>
       <div class="pay-num">¥{{ price || 0 }}</div>
       <div class="options">
@@ -42,9 +46,14 @@
         </div>
       </div>
       <div class="pay-footer">
-        <div class="order-num">订单编号{{tradeNo}}</div>
-        <div class="pay-btn">去付款</div>
+        <div class="order-num">订单编号{{ tradeNo }}</div>
+        <div class="pay-btn" (click)="openWxPay()">去付款</div>
+      </div>
+      } @else{
+      <div class="qrcode">
+        <img [src]="codeLink" alt="" />
       </div>
+      }
     </div>
   </ng-template>
 </ion-modal>

+ 11 - 9
projects/live-app/src/app/components/pay-comp/pay-comp.component.ts

@@ -20,6 +20,7 @@ export class PayCompComponent implements OnInit {
   isOpen: boolean = true; //打开弹窗
   checkpay: string = 'wxpay';
   userAgent?: string; //获取当前浏览器环境
+  codeLink?:string
 
   constructor(
     private accServ: AccountService,
@@ -80,15 +81,16 @@ export class PayCompComponent implements OnInit {
       Parse.Cloud.run('pay_code2', params).then(async (res) => {
         let nonce_str = res.nonce_str;
         let codeLink = res.code_url[0];
-        let order = await this.accServ.setOrder('service', {
-          out_trade_no: this.tradeNo,
-          payType: 'wxpay-pc',
-          total_fee: this.price,
-          code: codeLink,
-        });
-        window.open(
-          `${location.protocol}//${location.host}/account/payment/${order.objectId}/${nonce_str}`
-        );
+        console.log(codeLink);
+        // let order = await this.accServ.setOrder('service', {
+        //   out_trade_no: this.tradeNo,
+        //   payType: 'wxpay-pc',
+        //   total_fee: this.price,
+        //   code: codeLink,
+        // });
+        // window.open(
+        //   `${location.protocol}//${location.host}/account/payment/${order.objectId}/${nonce_str}`
+        // );
         this.isOpen = false;
       });
     } catch (error) {