Merge branch 'develop' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-30 17:26:11
+ * @LastEditTime: 2023-03-31 11:11:12
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -310,4 +310,13 @@ update
 ## v1.0.36
 `2023.3.30`
 update
-- 增加 debug按钮
+- 增加 debug按钮
+
+
+## v1.0.37
+`2023.3.31`
+update
+- alarmDetails
+    - 修改 详情地址转化方式
+- packageList
+    - 修改 微信支付方式

src/config/models.js

@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.35F'; //版本号
+export const VERSION_MODEL = '1.0.37F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/alarm/alarm-details.vue

@@ -10,7 +10,7 @@
         <div class="bottom">
             <div class="address">
                 <div class="title">
-                    <p>{{ alarm.address }}(附近)</p>
+                    <p>{{ params.address }}(附近)</p>
                 </div>
                 <div class="time">
                     <span>{{ params.time }}</span>

src/views/package-list/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-03-29 16:57:58
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-03-30 17:09:16
+ * @LastEditTime: 2023-03-31 11:02:13
  * @FilePath: \TelpoH5FrontendWeb\src\views\package-list\index.vue
  * @description: TODO 小台风充值h5
 -->
@@ -415,7 +415,6 @@ export default {
         },
         onWxPay(data) {
             let that = this;
-            console.log("微信支付开启", data);
             function onBridgeReady() {
                 WeixinJSBridge.invoke(
                     "getBrandWCPayRequest",
@@ -445,14 +444,29 @@ export default {
                             });
                         } else {
                             that.$dialog.confirm({
-                                title: "温馨提示",
-                                message: "您取消了支付",
-                                showCancelButton: false
+                                content: "您取消了支付"
                             });
                         }
                     }
                 );
             }
+            if (typeof WeixinJSBridge == "undefined") {
+                if (document.addEventListener) {
+                    document.addEventListener(
+                        "WeixinJSBridgeReady",
+                        onBridgeReady,
+                        false
+                    );
+                } else if (document.attachEvent) {
+                    document.attachEvent("WeixinJSBridgeReady", onBridgeReady);
+                    document.attachEvent(
+                        "onWeixinJSBridgeReady",
+                        onBridgeReady
+                    );
+                }
+            } else {
+                onBridgeReady();
+            }
         },
         // 跳转到支付宝花呗外部链接
         aliPay(data) {