Merge remote-tracking branch 'remotes/origin/dev' into alpha

pages/API/request-payment/reqeust-payment.test.js

@@ -9,24 +9,14 @@ describe("payment", () => {
   //支付失败700711
   it("errorcode700711", async () => {
     let orderInfo =
-      "service=\"111";
+      "service=\"mobile.securitypay.pay\"&partner=\"2088801273866834\"&_input_charset=\"UTF-8\"&out_trade_no=\"20240229115452\"&subject=\"DCloud项目捐赠\"&payment_type=\"1\"&seller_id=\"payservice@dcloud.io\"&total_fee=\"0.01\"&body=\"DCloud致力于打造HTML5最好的移动开发工具，包括终端的Runtime、云端的服务和IDE，同时提供各项配套的开发者服务。\"&it_b_pay=\"1d\"&notify_url=\"http%3A%2F%2Fdemo.dcloud.net.cn%2Fpayment%2Falipay%2Fnotify.php\"&show_url=\"http%3A%2F%2Fwww.dcloud.io%2Fhelloh5%2F\"&sign=\"diZdkTX2iIP1oZh25UCGqx%2BpkViqAN8xdvMNSJF79aq0JiunX2mtr%2BbNlDsP0YL5x85KjULsqx%2Fq%2B5wij6eMoBVeJ%2BHhyjkwt0PYuwntroJ2Ho8bdUVEybBgOjy240NbCUtKmZzNRQAGsmLztKWzsg1srsQ8Se3Qi8KGDaOhqBs%3D\"&sign_type=\"RSA\"";
     await page.setData({
       orderinfo: orderInfo,
     })
-    await page.callMethod('pay')
-    await page.waitFor(10000);
+    await page.callMethod('jest_pay')
+    await page.waitFor(async () => {
+      return await page.data('complete') === true;
+    });
     expect((await page.data())['errorCode']).toEqual(700711)
   });
-  //重复支付
-  it("errorcode700712", async () => {
-    let orderInfo=
-      "service=\"mobile.securitypay.pay\"&partner=\"2088801273866834\"&_input_charset=\"UTF-8\"&out_trade_no=\"20240226180607\"&subject=\"DCloud项目捐赠\"&payment_type=\"1\"&seller_id=\"payservice@dcloud.io\"&total_fee=\"0.01\"&body=\"DCloud致力于打造HTML5最好的移动开发工具，包括终端的Runtime、云端的服务和IDE，同时提供各项配套的开发者服务。\"&it_b_pay=\"1d\"&notify_url=\"http%3A%2F%2Fdemo.dcloud.net.cn%2Fpayment%2Falipay%2Fnotify.php\"&show_url=\"http%3A%2F%2Fwww.dcloud.io%2Fhelloh5%2F\"&sign=\"iYxQ8EmMdezAWPMGIFXifBoEkotH0Fg%2BLbNNgAP%2F%2BJquO0rLgoxgF8b%2Fo5lhUIQT7MkDf2JacmHvrUAZqQAuL%2BaPG%2BCOUu7hMu7zlZt3k7%2F1sUv9HFxP%2FhCFssfpZXhpTGEkttF6CmF7YQueCtxsAYBqBpQsVwGb2Pxi01ylko0%3D\"&sign_type=\"RSA\"";
-
-      await page.setData({
-        orderinfo: orderInfo,
-      })
-    await page.callMethod('pay')
-    await page.waitFor(6000);
-    expect((await page.data())['errorCode']).toEqual(700712)
-  });
 });

pages/API/request-payment/request-payment.uvue

@@ -11,7 +11,8 @@
         btnType: "primary",
         orderInfo: "",
         errorCode: 0,
-        errorMsg: ""
+        errorMsg: "",
+        complete: false
       }
     },
     methods: {
@@ -29,7 +30,7 @@
               provider: "alipay",
               orderInfo: res.data as string,
               fail: (res : RequestPaymentFail) => {
-                console.log(JSON.stringify(res))
+                console.log(JSON.stringify(res))
                 this.errorCode = res.errCode
                 uni.showToast({
                   icon: 'error',
@@ -49,6 +50,21 @@
             uni.hideLoading()
           },
         });
+      },
+      //自动化测试使用
+      jest_pay() {
+        uni.requestPayment({
+          provider: "alipay",
+          orderInfo: this.orderInfo,
+          fail: (res : RequestPaymentFail) => {
+            this.errorCode = res.errCode
+            this.complete = true
+          },
+          success: (res : RequestPaymentSuccess) => {
+            console.log(JSON.stringify(res))
+             this.complete = true
+          }
+        } as RequestPaymentOptions)
       }
     }
   }

pages/API/set-navigation-bar-color/set-navigation-bar-color.uvue

-<template>
-  <page-head title="setNavigationBarColor"></page-head>
-  <view class="uni-padding-wrap uni-common-mt">
-    <button @tap="setNavigationBarColor1" class="uni-btn">
-      设置导航条背景绿色，标题白色
-    </button>
-    <button @tap="setNavigationBarColor2" class="uni-btn">
-      设置导航条背景红色，标题黑色
-    </button>
-    <button @tap="goNavbarLite" class="uni-btn">
-      跳转自定义导航栏页面
-    </button>
-    <button @tap="goCustomNavigation" class="uni-btn">
-      跳转设置状态栏页面
-    </button>
-  </view>
-</template>
-
-<script>
-  import { state, setLifeCycleNum } from '@/store/index.uts'
-
-  export default {
-    methods: {
-      setNavigationBarColor1() {
-        uni.setNavigationBarColor({
-          frontColor: '#ffffff',
-          backgroundColor: '#00ff00',
-          success: () => {
-            console.log('setNavigationBarColor success')
-            this.setLifeCycleNum(state.lifeCycleNum + 1)
-          },
-          fail: () => {
-            console.log('setNavigationBarColor fail')
-            this.setLifeCycleNum(state.lifeCycleNum - 1)
-          },
-          complete: () => {
-            console.log('setNavigationBarColor complete')
-            this.setLifeCycleNum(state.lifeCycleNum + 1)
-          }
-        })
-      },
-      setNavigationBarColor2() {
-        uni.setNavigationBarColor({
-          frontColor: '#000000',
-          backgroundColor: '#ff0000',
-          success: () => {
-            console.log('setNavigationBarColor success')
-            this.setLifeCycleNum(state.lifeCycleNum + 1)
-          },
-          fail: () => {
-            console.log('setNavigationBarColor fail')
-            this.setLifeCycleNum(state.lifeCycleNum - 1)
-          },
-          complete: () => {
-            console.log('setNavigationBarColor complete')
-            this.setLifeCycleNum(state.lifeCycleNum + 1)
-          }
-        })
-      },
-      // 自动化测试
-      getLifeCycleNum() : number {
-        return state.lifeCycleNum
-      },
-      // 自动化测试
-      setLifeCycleNum(num : number) {
-        setLifeCycleNum(num)
-      },
-      goNavbarLite() {
-        uni.navigateTo({
-          url: '/pages/template/navbar-lite/navbar-lite'
-        })
-      },
-      goCustomNavigation(){
-        uni.navigateTo({
-          url: '/pages/API/set-navigation-bar-color/set-navigation-bar-color-custom-navigation'
-        })
-      }
-    },
-  }
+<template>
+  <page-head title="setNavigationBarColor"></page-head>
+  <view class="uni-padding-wrap uni-common-mt">
+    <button @tap="setNavigationBarColor1" class="uni-btn">
+      设置导航条背景绿色，标题白色
+    </button>
+    <button @tap="setNavigationBarColor2" class="uni-btn">
+      设置导航条背景红色，标题黑色
+    </button>
+    <!-- #ifdef WEB -->
+    <button @tap="goNavbarLite" class="uni-btn">
+      跳转自定义导航栏页面
+    </button>
+    <!-- #endif -->
+    <!-- #ifdef APP -->
+    <button @tap="goCustomNavigation" class="uni-btn">
+      跳转设置状态栏页面
+    </button>
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+  import { state, setLifeCycleNum } from '@/store/index.uts'
+
+  export default {
+    methods: {
+      setNavigationBarColor1() {
+        uni.setNavigationBarColor({
+          frontColor: '#ffffff',
+          backgroundColor: '#00ff00',
+          success: () => {
+            console.log('setNavigationBarColor success')
+            this.setLifeCycleNum(state.lifeCycleNum + 1)
+          },
+          fail: () => {
+            console.log('setNavigationBarColor fail')
+            this.setLifeCycleNum(state.lifeCycleNum - 1)
+          },
+          complete: () => {
+            console.log('setNavigationBarColor complete')
+            this.setLifeCycleNum(state.lifeCycleNum + 1)
+          }
+        })
+      },
+      setNavigationBarColor2() {
+        uni.setNavigationBarColor({
+          frontColor: '#000000',
+          backgroundColor: '#ff0000',
+          success: () => {
+            console.log('setNavigationBarColor success')
+            this.setLifeCycleNum(state.lifeCycleNum + 1)
+          },
+          fail: () => {
+            console.log('setNavigationBarColor fail')
+            this.setLifeCycleNum(state.lifeCycleNum - 1)
+          },
+          complete: () => {
+            console.log('setNavigationBarColor complete')
+            this.setLifeCycleNum(state.lifeCycleNum + 1)
+          }
+        })
+      },
+      // 自动化测试
+      getLifeCycleNum() : number {
+        return state.lifeCycleNum
+      },
+      // 自动化测试
+      setLifeCycleNum(num : number) {
+        setLifeCycleNum(num)
+      },
+      goNavbarLite() {
+        uni.navigateTo({
+          url: '/pages/template/navbar-lite/navbar-lite'
+        })
+      },
+      goCustomNavigation() {
+        uni.navigateTo({
+          url: '/pages/API/set-navigation-bar-color/set-navigation-bar-color-custom-navigation'
+        })
+      }
+    },
+  }
 </script>