Merge remote-tracking branch 'origin/develop/3.2.1' into develop/3.2.1

# Conflicts:
#	src/pages/pay/index.vue

src/pages.json

@@ -214,6 +214,13 @@
       "style": {
         "navigationStyle": "custom"
       }
+    },
+    {
+      // 微信浏览器检测
+      "path": "pages/weixin/index",
+      "style": {
+        "navigationStyle": "custom"
+      }
     }
   ]
 }

src/pages/pay/index.vue

@@ -173,6 +173,7 @@ wechatPay,
 export default {
   data() {
     return {
+      isWeixin: false,
       type: "center",
       msgType: "success",
       messageText: "这是一条成功提示",
@@ -203,6 +204,14 @@ export default {
   },
 
   onLoad(e) {
+    // this.detectWeixin();
+    // if (!this.isWeixin){
+    //   // 跳转到微信页面
+    //   uni.navigateTo({
+    //     url: `/pages/weixin/index`,
+    //   });
+    // }
+
     this.state = e.state;
     this.getOpenId(e);
     this.getDetail();
@@ -211,6 +220,14 @@ export default {
     this.getNewAcitivityDetail();
   },
   methods: {
+    // detectWeixin() {
+    //   let userAgent = navigator.userAgent;
+    //   if (userAgent.includes("MicroMessenger")) {
+    //     this.isWeixin = true
+    //   } else {
+    //     this.isWeixin = false
+    //   }
+    // },
     // 联通流量详细信息
     getNewAcitivityDetail() {
       newAcitivityDetail({