徐强 / eej · 提交

转到一个项目

作者 xuqiang
提交 845db8f93d5e115b9c1931d5bc8f2978916b7094 1 个父辈 095cda7b

提交

内嵌 并排对比
正在显示 6 个修改的文件 包含 35 行增加 和 17 行删除
@@ -25,20 +25,24 @@ @@ -25,20 +25,24 @@
25 /* android打包配置 */ 25 /* android打包配置 */
26 "android" : { 26 "android" : {
27 "permissions" : [ 27 "permissions" : [
28 - "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",  
29 - "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",  
30 - "<uses-permission android:name=\"android.permission.VIBRATE\"/>",  
31 - "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",  
32 - "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", 28 + "<uses-feature android:name=\"android.hardware.camera\"/>",
33 "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", 29 "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
  30 + "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
  31 + "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
34 "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", 32 "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
  33 + "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
35 "<uses-permission android:name=\"android.permission.CAMERA\"/>", 34 "<uses-permission android:name=\"android.permission.CAMERA\"/>",
  35 + "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
  36 + "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
  37 + "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
36 "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", 38 "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
  39 + "<uses-permission android:name=\"android.permission.INTERNET\"/>",
  40 + "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
  41 + "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
37 "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", 42 "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
38 - "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", 43 + "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
39 "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", 44 "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
40 - "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",  
41 - "<uses-feature android:name=\"android.hardware.camera\"/>", 45 + "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
42 "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" 46 "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
43 ] 47 ]
44 }, 48 },
@@ -47,7 +51,12 @@ @@ -47,7 +51,12 @@
47 /* SDK配置 */ 51 /* SDK配置 */
48 "sdkConfigs" : { 52 "sdkConfigs" : {
49 "ad" : {}, 53 "ad" : {},
50 - "maps" : {} 54 + "maps" : {
  55 + "amap" : {
  56 + "appkey_ios" : "cfa49866c1d6499af910390d0619d810",
  57 + "appkey_android" : "cfa49866c1d6499af910390d0619d810"
  58 + }
  59 + }
51 } 60 }
52 } 61 }
53 }, 62 },
@@ -56,13 +56,13 @@ @@ -56,13 +56,13 @@
56 56
57 <style> 57 <style>
58 58
59 - .logoWrap{padding-top: 70rpx;display: flex;justify-content: center;} 59 + .logoWrap{padding-top: 110rpx;display: flex;justify-content: center;}
60 .logoWrap image{width: 504rpx;height: 140rpx;} 60 .logoWrap image{width: 504rpx;height: 140rpx;}
61 61
62 .bgImg{height: 866rpx;background: url(../../static/image/img_bg.png) no-repeat;background-size: 100% 866rpx;padding: 0 48rpx;position: relative;} 62 .bgImg{height: 866rpx;background: url(../../static/image/img_bg.png) no-repeat;background-size: 100% 866rpx;padding: 0 48rpx;position: relative;}
63 .bgImg .title{padding-top: 150rpx;font-size: 30rpx;color: #fff;text-align: center;} 63 .bgImg .title{padding-top: 150rpx;font-size: 30rpx;color: #fff;text-align: center;}
64 .bgImg .subTitle{padding-top: 30rpx;font-size: 35rpx;color: #fff;text-align: center;font-weight: 600;} 64 .bgImg .subTitle{padding-top: 30rpx;font-size: 35rpx;color: #fff;text-align: center;font-weight: 600;}
65 - .bgImg .homeOneWrap{padding-top: 110rpx;} 65 + .bgImg .homeOneWrap{padding-top: 60rpx;}
66 .homeOneWrap .homeOne{background: url(../../static/image/img_home1.png) no-repeat;background-size: 100% 280rpx;height: 280rpx;} 66 .homeOneWrap .homeOne{background: url(../../static/image/img_home1.png) no-repeat;background-size: 100% 280rpx;height: 280rpx;}
67 .bgImg .homeTwoWrap{padding-top: 46rpx;} 67 .bgImg .homeTwoWrap{padding-top: 46rpx;}
68 .homeTwoWrap .homeTwo{background: url(../../static/image/img_home2.png) no-repeat;background-size: 100% 280rpx;height: 280rpx;} 68 .homeTwoWrap .homeTwo{background: url(../../static/image/img_home2.png) no-repeat;background-size: 100% 280rpx;height: 280rpx;}
1 <template> 1 <template>
2 - <view> 2 + <view v-if="show">
3 <!-- logo区域 --> 3 <!-- logo区域 -->
4 <view class="logoWrap"> 4 <view class="logoWrap">
5 <image src="../../static/image/logo_txt.png" mode=""></image> 5 <image src="../../static/image/logo_txt.png" mode=""></image>
@@ -15,6 +15,11 @@ @@ -15,6 +15,11 @@
15 15
16 <script> 16 <script>
17 export default{ 17 export default{
  18 + data(){
  19 + return{
  20 + show:false
  21 + }
  22 + },
18 created() { 23 created() {
19 // 从本地缓存中同步获取指定 key 对应的内容，用于判断是否是第一次打开应用 24 // 从本地缓存中同步获取指定 key 对应的内容，用于判断是否是第一次打开应用
20 const value = uni.getStorageSync('launchFlag'); 25 const value = uni.getStorageSync('launchFlag');
@@ -22,6 +27,7 @@ @@ -22,6 +27,7 @@
22 // 如何已经有，直接去home首页 27 // 如何已经有，直接去home首页
23 this.$href('/pages/login/login') 28 this.$href('/pages/login/login')
24 } else { 29 } else {
  30 + this.show = true
25 // 没有值，跳到引导页，并存储，下次打开就不会进去引导页 31 // 没有值，跳到引导页，并存储，下次打开就不会进去引导页
26 uni.setStorage({ 32 uni.setStorage({
27 key: 'launchFlag', 33 key: 'launchFlag',
@@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
84 onLoad() { 84 onLoad() {
85 //#ifdef APP-PLUS 85 //#ifdef APP-PLUS
86 uni.getLocation({ 86 uni.getLocation({
87 - type: 'wgs84', 87 + type: 'gcj02',
88 geocode: true, 88 geocode: true,
89 success: (res) => { 89 success: (res) => {
90 this.cityVal = res.address.city 90 this.cityVal = res.address.city
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 }) 26 })
27 //#ifdef APP-PLUS 27 //#ifdef APP-PLUS
28 uni.getLocation({ 28 uni.getLocation({
29 - type: 'wgs84', 29 + type: 'gcj02',
30 geocode: true, 30 geocode: true,
31 success: (res) => { 31 success: (res) => {
32 this.latitude = res.latitude 32 this.latitude = res.latitude
@@ -16,11 +16,11 @@ @@ -16,11 +16,11 @@
16 export default { 16 export default {
17 data() { 17 data() {
18 return { 18 return {
19 - 19 + pgType:'aboutUs'
20 } 20 }
21 }, 21 },
22 - onLoad(option){  
23 - if(option.pgType == 'aboutUs'){ 22 + onReady() {
  23 + if(this.pgType == 'aboutUs'){
24 uni.setNavigationBarTitle({ 24 uni.setNavigationBarTitle({
25 title:'关于我们' 25 title:'关于我们'
26 }) 26 })
@@ -30,6 +30,9 @@ @@ -30,6 +30,9 @@
30 }) 30 })
31 } 31 }
32 }, 32 },
  33 + onLoad(option){
  34 + this.pgType = option.pgType
  35 + },
33 methods: { 36 methods: {
34 37
35 } 38 }