vue2-client 1.6.25 → 1.6.27

package/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.6.26 - 1.6.27 -2023-04-16 @江超**
+- 修复单页面iframe对http前缀的兼容处理
+
 **1.6.23 - 1.6.25 -2023-04-11 @江超**
 - `request.js`的响应拦截器增加了一种对非v4环境调用v4接口的兼容处理
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.6.25",
+  "version": "1.6.27",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/layouts/SinglePageView.vue

@@ -44,7 +44,7 @@ export default {
   },
   computed: {
     ...mapState('setting', ['animate', 'iframeSrc']),
-    ...mapState('account', ['login'])
+    ...mapState('account', { login: 'login', currUser: 'user' })
   },
   created () {
     this.isLoaded = false
@@ -65,6 +65,11 @@ export default {
         console.warn(msg)
         this.$message.error(msg)
       })
+    } else if (this.singlePageUrl.indexOf('http') !== -1) {
+      if (this.singlePageUrl.indexOf('?goto=') !== -1) {
+        this.singlePageUrl = this.singlePageUrl + '&f_user_id=' + this.currUser.username + '&password=' + this.currUser.password
+      }
+      this.url = this.singlePageUrl
     } else {
       this.url = this.iframeSrc
     }

package/src/pages/login/Login.vue

@@ -185,7 +185,9 @@ export default {
     },
     afterGeneral (result) {
       const user = Object.assign({
+        id: result.id,
         username: result.ename,
+        password: this.form.getFieldValue('password'),
         name: result.name,
         avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
         address: '西安市',

package/src/utils/map-utils.js

@@ -1,37 +1,37 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap () {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: '275e59edb26ab1f917cfe7f05bea7979'
-    }
-    Amap = await AMapLoader.load({
-      key: '55a4807a6fc3adca5510f69578b1ae4a', // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster','AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: [] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-async function GetLocation (address) {
-  return new Promise(async (resolve, reject) => {
-    new (await GetGDMap()).Geocoder({
-      radius: 500 // 范围，默认：500
-    }).getLocation(address, function (status, result) {
-      console.log(result)
-      if (status === 'complete' && result.geocodes.length) {
-        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-      } else {
-        // eslint-disable-next-line prefer-promise-reject-errors
-        reject('根据经纬度查询地址失败')
-      }
-    })
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap () {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: '275e59edb26ab1f917cfe7f05bea7979'
+    }
+    Amap = await AMapLoader.load({
+      key: '55a4807a6fc3adca5510f69578b1ae4a', // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: [] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+async function GetLocation (address) {
+  return new Promise(async (resolve, reject) => {
+    new (await GetGDMap()).Geocoder({
+      radius: 500 // 范围，默认：500
+    }).getLocation(address, function (status, result) {
+      console.log(result)
+      if (status === 'complete' && result.geocodes.length) {
+        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+      } else {
+        // eslint-disable-next-line prefer-promise-reject-errors
+        reject('根据经纬度查询地址失败')
+      }
+    })
+  })
+}
+export { GetGDMap, GetLocation }