提交

@@ -25,20 +25,24 @@
             /* android打包配置 */
             "android" : {
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
@@ -47,7 +51,12 @@
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},
-                "maps" : {}
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "cfa49866c1d6499af910390d0619d810",
+                        "appkey_android" : "cfa49866c1d6499af910390d0619d810"
+                    }
+                }
             }
         }
     },

@@ -56,13 +56,13 @@
 
 <style>
 	
-	.logoWrap{padding-top: 70rpx;display: flex;justify-content: center;}
+	.logoWrap{padding-top: 110rpx;display: flex;justify-content: center;}
 	.logoWrap image{width: 504rpx;height: 140rpx;}
 	
 	.bgImg{height: 866rpx;background: url(../../static/image/img_bg.png) no-repeat;background-size: 100% 866rpx;padding: 0 48rpx;position: relative;}
 	.bgImg .title{padding-top: 150rpx;font-size: 30rpx;color: #fff;text-align: center;}
 	.bgImg .subTitle{padding-top: 30rpx;font-size: 35rpx;color: #fff;text-align: center;font-weight: 600;}
-	.bgImg .homeOneWrap{padding-top: 110rpx;}
+	.bgImg .homeOneWrap{padding-top: 60rpx;}
 	.homeOneWrap .homeOne{background: url(../../static/image/img_home1.png) no-repeat;background-size: 100% 280rpx;height: 280rpx;}
 	.bgImg .homeTwoWrap{padding-top: 46rpx;}
 	.homeTwoWrap .homeTwo{background: url(../../static/image/img_home2.png) no-repeat;background-size: 100% 280rpx;height: 280rpx;}

 <template>
-	<view>
+	<view v-if="show">
 		<!-- logo区域 -->
 		<view class="logoWrap">
 			<image src="../../static/image/logo_txt.png" mode=""></image>
@@ -15,6 +15,11 @@
 
 <script>
 	export default{
+		data(){
+			return{
+				show:false
+			}
+		},
 		created() {
 		  // 从本地缓存中同步获取指定 key 对应的内容，用于判断是否是第一次打开应用
 		  const value = uni.getStorageSync('launchFlag');
@@ -22,6 +27,7 @@
 		    // 如何已经有，直接去home首页
 			this.$href('/pages/login/login')
 		  } else {
+			  this.show = true
 		    // 没有值，跳到引导页，并存储，下次打开就不会进去引导页
 		    uni.setStorage({
 		      key: 'launchFlag',

@@ -84,7 +84,7 @@
 		onLoad() {
 			//#ifdef APP-PLUS
 			uni.getLocation({
-			    type: 'wgs84',
+			    type: 'gcj02',
 				geocode: true,
 			    success: (res) => {
 					this.cityVal = res.address.city

@@ -26,7 +26,7 @@
 			})
 			//#ifdef APP-PLUS
 			uni.getLocation({
-			    type: 'wgs84',
+			    type: 'gcj02',
 				geocode: true,
 			    success: (res) => {
 					this.latitude = res.latitude

@@ -16,11 +16,11 @@
 	export default {
 		data() {
 			return {
-				
+				pgType:'aboutUs'
 			}
 		},
-		onLoad(option){
-			if(option.pgType == 'aboutUs'){
+		onReady() {
+			if(this.pgType == 'aboutUs'){
 				uni.setNavigationBarTitle({
 					title:'关于我们'
 				})
@@ -30,6 +30,9 @@
 				})
 			}
 		},
+		onLoad(option){
+			this.pgType = option.pgType
+		},
 		methods: {
 			
 		}