Merge branch 'develop/3.3.0' into test

* develop/3.3.0:
  feature：修改h5的授权判断
  feature：h5界面，去掉箭头号。
  feature：更新h5小程序的判断方法
  feature：修改判断小程序环境的方法

package.json

@@ -49,62 +49,62 @@
     "test:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin jest -i"
   },
   "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@dcloudio/uni-app-plus": "^2.0.1-34920220630001",
-    "@dcloudio/uni-h5": "^2.0.1-34920220630001",
+    "@amap/amap-jsapi-loader": "1.0.1",
+    "@dcloudio/uni-app-plus": "2.0.1-34920220630001",
+    "@dcloudio/uni-h5": "2.0.1-34920220630001",
     "@dcloudio/uni-helper-json": "*",
-    "@dcloudio/uni-i18n": "^2.0.1-34920220630001",
-    "@dcloudio/uni-mp-360": "^2.0.1-34920220630001",
-    "@dcloudio/uni-mp-alipay": "^2.0.1-34920220630001",
-    "@dcloudio/uni-mp-baidu": "^2.0.1-34920220630001",
-    "@dcloudio/uni-mp-jd": "^2.0.1-34920220630001",
-    "@dcloudio/uni-mp-kuaishou": "^2.0.1-34920220630001",
-    "@dcloudio/uni-mp-lark": "^2.0.1-34920220630001",
-    "@dcloudio/uni-mp-qq": "^2.0.1-34920220630001",
-    "@dcloudio/uni-mp-toutiao": "^2.0.1-34920220630001",
-    "@dcloudio/uni-mp-vue": "^2.0.1-34920220630001",
-    "@dcloudio/uni-mp-weixin": "^2.0.1-34920220630001",
-    "@dcloudio/uni-mp-xhs": "^2.0.1-34920220630001",
-    "@dcloudio/uni-quickapp-native": "^2.0.1-34920220630001",
-    "@dcloudio/uni-quickapp-webview": "^2.0.1-34920220630001",
-    "@dcloudio/uni-stat": "^2.0.1-34920220630001",
-    "@lucky-canvas/uni": "^0.0.11",
-    "@lucky-canvas/vue": "^0.1.11",
-    "@vue/shared": "^3.0.0",
-    "@zebra-ui/swiper": "^2.2.2",
-    "axios": "^1.4.0",
-    "core-js": "^3.6.5",
-    "flyio": "^0.6.2",
-    "js-base64": "^3.7.5",
-    "regenerator-runtime": "^0.12.1",
-    "vconsole": "^3.15.1",
-    "vue": "^2.6.11",
-    "vue-pdf": "^4.3.0",
-    "vuex": "^3.2.0"
+    "@dcloudio/uni-i18n": "2.0.1-34920220630001",
+    "@dcloudio/uni-mp-360": "2.0.1-34920220630001",
+    "@dcloudio/uni-mp-alipay": "2.0.1-34920220630001",
+    "@dcloudio/uni-mp-baidu": "2.0.1-34920220630001",
+    "@dcloudio/uni-mp-jd": "2.0.1-34920220630001",
+    "@dcloudio/uni-mp-kuaishou": "2.0.1-34920220630001",
+    "@dcloudio/uni-mp-lark": "2.0.1-34920220630001",
+    "@dcloudio/uni-mp-qq": "2.0.1-34920220630001",
+    "@dcloudio/uni-mp-toutiao": "2.0.1-34920220630001",
+    "@dcloudio/uni-mp-vue": "2.0.1-34920220630001",
+    "@dcloudio/uni-mp-weixin": "2.0.1-34920220630001",
+    "@dcloudio/uni-mp-xhs": "2.0.1-34920220630001",
+    "@dcloudio/uni-quickapp-native": "2.0.1-34920220630001",
+    "@dcloudio/uni-quickapp-webview": "2.0.1-34920220630001",
+    "@dcloudio/uni-stat": "2.0.1-34920220630001",
+    "@lucky-canvas/uni": "0.0.11",
+    "@lucky-canvas/vue": "0.1.11",
+    "@vue/shared": "3.0.0",
+    "@zebra-ui/swiper": "2.2.2",
+    "axios": "1.4.0",
+    "core-js": "3.6.5",
+    "flyio": "0.6.2",
+    "js-base64": "3.7.5",
+    "regenerator-runtime": "0.12.1",
+    "vconsole": "3.15.1",
+    "vue": "2.6.11",
+    "vue-pdf": "4.3.0",
+    "vuex": "3.2.0"
   },
   "devDependencies": {
     "@babel/runtime": "~7.17.9",
-    "@dcloudio/types": "^3.0.4",
-    "@dcloudio/uni-automator": "^2.0.1-34920220630001",
-    "@dcloudio/uni-cli-i18n": "^2.0.1-34920220630001",
-    "@dcloudio/uni-cli-shared": "^2.0.1-34920220630001",
-    "@dcloudio/uni-migration": "^2.0.1-34920220630001",
-    "@dcloudio/uni-template-compiler": "^2.0.1-34920220630001",
-    "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.1-34920220630001",
-    "@dcloudio/vue-cli-plugin-uni": "^2.0.1-34920220630001",
-    "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.1-34920220630001",
-    "@dcloudio/webpack-uni-mp-loader": "^2.0.1-34920220630001",
-    "@dcloudio/webpack-uni-pages-loader": "^2.0.1-34920220630001",
+    "@dcloudio/types": "3.0.4",
+    "@dcloudio/uni-automator": "2.0.1-34920220630001",
+    "@dcloudio/uni-cli-i18n": "2.0.1-34920220630001",
+    "@dcloudio/uni-cli-shared": "2.0.1-34920220630001",
+    "@dcloudio/uni-migration": "2.0.1-34920220630001",
+    "@dcloudio/uni-template-compiler": "2.0.1-34920220630001",
+    "@dcloudio/vue-cli-plugin-hbuilderx": "2.0.1-34920220630001",
+    "@dcloudio/vue-cli-plugin-uni": "2.0.1-34920220630001",
+    "@dcloudio/vue-cli-plugin-uni-optimize": "2.0.1-34920220630001",
+    "@dcloudio/webpack-uni-mp-loader": "2.0.1-34920220630001",
+    "@dcloudio/webpack-uni-pages-loader": "2.0.1-34920220630001",
     "@vue/cli-plugin-babel": "~4.5.15",
     "@vue/cli-service": "~4.5.15",
-    "babel-plugin-import": "^1.11.0",
-    "cross-env": "^7.0.2",
-    "jest": "^25.4.0",
+    "babel-plugin-import": "1.11.0",
+    "cross-env": "7.0.2",
+    "jest": "25.4.0",
     "mini-types": "*",
     "miniprogram-api-typings": "*",
-    "postcss-comment": "^2.0.0",
-    "sass": "^1.53.0",
-    "vue-template-compiler": "^2.6.11"
+    "postcss-comment": "2.0.0",
+    "sass": "1.53.0",
+    "vue-template-compiler": "2.6.11"
   },
   "browserslist": [
     "Android >= 4.4",
@@ -116,4 +116,4 @@
   "uni-app": {
     "scripts": {}
   }
-}
+}

public/index.html

@@ -8,6 +8,9 @@
         <%= htmlWebpackPlugin.options.title %>
     </title>
     <script>
+        // type = "text/javascript"
+        // src = "https://res.wx.qq.com/open/js/jweixin-1.3.2.js"
+        // src = "http://res2.wx.qq.com/open/js/jweixin-1.6.0.js"
         var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
         document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
     </script>

src/pages/ximalaya/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class='app-container'>
+  
     <uni-icons :class="[title === '加载中...' ? 'spin' : '']" :type="type" color="#FFF" size="68" />
     <span>{{ title }}</span>
   </div>
@@ -15,38 +16,7 @@ export default {
       isSuccess: false,
     }
   },
-    mounted() {
-    window.addEventListener('popstate', this.handleBack);
-  },
-  beforeDestroy() {
-    window.removeEventListener('popstate', this.handleBack);
-  },
-     handleBack() {
- 
-    const name = 'authXmlyWeb'
-      const code = this.isSuccess ? "1" : "0"
-      const postMessage = `?name=${name}&code=${code}`
-    if (window.wx && window.wx.miniProgram) {
-      uni.showToast({
-        title: "微信小程序环境2",
-        icon: 'none',
-        duration: 2000
-      });
-      window.wx.miniProgram.postMessage(postMessage);
-    } else if (window.webChannel) {
-      uni.showToast({
-        title: "app环境2",
-        icon: 'none',
-        duration: 2000
-      });
-      webChannel.postMessage(postMessage)
-    } else {
-      uni.showToast({
-        title: "其他环境2",
-        icon: 'none',
-        duration: 2000
-      });}
-    },
+
   onLoad(e) {
     const deviceid = window.location.hash.split('=')[1]
     getCallBack({ ...e, deviceid: deviceid }).then(res => {
@@ -62,36 +32,25 @@ export default {
       const name = 'authXmlyWeb'
       const code = res.code === 0 ? "1" : "0"
       const postMessage = `?name=${name}&code=${code}`
-    if (window.wx && window.wx.miniProgram) {
-      uni.showToast({
-        title: "微信小程序环境",
-        icon: 'none',
-        duration: 2000
-      });
-      window.wx.miniProgram.postMessage(postMessage);
-    } else if (window.webChannel) {
-      uni.showToast({
-        title: "app环境",
-        icon: 'none',
-        duration: 2000
-      });
-      webChannel.postMessage(postMessage)
-    } else {
-      uni.showToast({
-        title: "其他环境",
-        icon: 'none',
-        duration: 2000
-      });}
-    })
-  },  getEnvType() {
-    if (window.wx && window.wx.miniProgram) {
-      return 'miniProgram' // 微信小程序环境
+
+  //     console.log(res.miniprogram)
+  if (window.wx && wx.miniProgram) {
+      console.log('miniProgram:')  // 微信小程序环境
+      console.log(window.__wxjs_environment === 'miniprogram') // true
+      // console.log(window.wx) // true
+      // window.wx.emit("authXmlyWeb", postMessage);
+
+      // console.log(wx.miniProgram) // null
+      // console.log(window.wx.miniProgram) // null
+      // console.log(window.navigator.userAgent); // 有值
+  //  window.wx.miniProgram.postMessage(postMessage);
     } else if (window.webChannel) {
-      return 'app' // App 环境
-    } else {
-      return 'web' // 普通网页环境
-    }
-  }
+      webChannel.postMessage(postMessage) 
+               } else {
+
+               }
+    })   
+    }, 
 }
 </script>