Merge branch 'dev-tem' into 'dev'

修改支付获取订单地址

See merge request !30

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

@@ -102,9 +102,13 @@
         uni.showLoading({
           title: "请求中..."
         })
-
+        let url = 'https://demo.dcloud.net.cn/payment/wxpayv3.__UNI__uniappx/?total=1'
+        const res = uni.getAppBaseInfo();
+        if (res.packageName == 'io.dcloud.hellouniappx') {//hello uniappx
+          url = 'https://demo.dcloud.net.cn/payment/wxpayv3.__UNI__HelloUniAppX/?total=1'
+        }
         uni.request({
-          url: 'https://demo.dcloud.net.cn/payment/wxpayv3.__UNI__uniappx/?total=1',
+          url: url,
           method: 'GET',
           timeout: 6000,
           header: {