diff --git a/manifest.json b/manifest.json index fe3ae3c..aa12b13 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,9 @@ "modules" : { "VideoPlayer" : {}, "Contacts" : {}, - "Messaging" : {} + "Messaging" : {}, + "Camera" : {}, + "Maps" : {} }, /* 模块配置 */ "distribute" : { @@ -50,10 +52,49 @@ }, /* ios打包配置 */ "sdkConfigs" : { - "ad" : {} + "ad" : {}, + "maps" : { + "amap" : { + "name" : "4799ff37874e604a22b910b44ca948e5", + "appkey_ios" : "755dafdf984df7a1609fb30f6861bd17", + "appkey_android" : "755dafdf984df7a1609fb30f6861bd17" + } + } }, "splashscreen" : { "androidStyle" : "common" + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } } } }, diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index 51240e2..cba9f54 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -219,14 +219,15 @@

短时天气预报

-
{{ imgHourstm[0] }} 至 {{ imgHourstm[1] }}
+
{{ imgHourstm[0] }}至{{ imgHourstm[1] }}
+
@@ -513,7 +514,8 @@ export default { }) }, getTmData () { - let h = moment().format('HH') + let hn = this.numPic > 0 ? this.numPic : 1 + let h = moment().subtract(hn, 'hours').format() let m = moment().format('mm') console.log('hhh--', h, m, this.numPic) let tms = null, @@ -544,9 +546,7 @@ export default { let tms = null, mm = null let h1 = Number(h) - 1 - if (h1 < 9) { - h1 = Number(h) - Number(this.numPic) - } + if (h1 < 10) { let t = Number(h1) - Number(this.numPic) h1 = `0${t}` @@ -555,11 +555,11 @@ export default { h1 = Number(h) - 1 let t3 = Number(h) - this.numPic if (this.numPic <= 0) { - tms = `${this.imgtm}${h}30` + tms = `${this.imgtm}${h1}30` } else { + t3 = t3 < 10 ? `0${t3}` : t3 tms = `${this.imgtm}${t3}30` } - mm = '30' } else if (m < 10) { tms = `${this.imgtm}${h1}00` @@ -1089,4 +1089,7 @@ export default { text-align: center !important; } /*table样式 end*/ +.noData { + width: 100px; +} diff --git a/static/logo1.png b/static/logo1.png new file mode 100644 index 0000000..02334f0 Binary files /dev/null and b/static/logo1.png differ diff --git a/static/tabs/noData1.png b/static/tabs/noData1.png new file mode 100644 index 0000000..418e9c5 Binary files /dev/null and b/static/tabs/noData1.png differ diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json index 8225760..5467371 100644 --- a/unpackage/dist/dev/app-plus/manifest.json +++ b/unpackage/dist/dev/app-plus/manifest.json @@ -1 +1 @@ -{"@platforms":["android","iPhone","iPad"],"id":"__UNI__CB311EF","name":"xffxkh-app","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"VideoPlayer":{},"Contacts":{},"Messaging":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","distribute":{"splashscreen":{"androidStyle":"common"},"google":{"permissions":["","","","","","","","","","","","","","","",""]},"apple":{"dSYMs":false},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.15","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333333","selectedColor":"#59A7FF","list":[{"pagePath":"pages/homeIndex/index","iconPath":"/static/tabs/home.png","selectedIconPath":"static/tabs/home2.png","text":"首页"},{"pagePath":"pages/addressBook/addressBook","iconPath":"/static/tabs/phone_icon@2x.png","selectedIconPath":"static/tabs/phone_icon@2x2.png","text":"通讯录"},{"pagePath":"pages/mypage/mypage","iconPath":"/static/images/my2_icon@2x.png","selectedIconPath":"static/images/my2_icon@2x2.png","text":"我的"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px"},"launch_path":"__uniappview.html"}} \ No newline at end of file +{"@platforms":["android","iPhone","iPad"],"id":"__UNI__CB311EF","name":"xffxkh-app","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"VideoPlayer":{},"Contacts":{},"Messaging":{},"Camera":{},"Maps":{"coordType":"gcj02"},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","distribute":{"splashscreen":{"androidStyle":"common"},"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["","","","","","","","","","","","","","","",""]},"apple":{"dSYMs":false},"plugins":{"ad":{},"maps":{"amap":{"name":"4799ff37874e604a22b910b44ca948e5","appkey_ios":"755dafdf984df7a1609fb30f6861bd17","appkey_android":"755dafdf984df7a1609fb30f6861bd17"}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.15","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333333","selectedColor":"#59A7FF","list":[{"pagePath":"pages/homeIndex/index","iconPath":"/static/tabs/home.png","selectedIconPath":"static/tabs/home2.png","text":"首页"},{"pagePath":"pages/addressBook/addressBook","iconPath":"/static/tabs/phone_icon@2x.png","selectedIconPath":"static/tabs/phone_icon@2x2.png","text":"通讯录"},{"pagePath":"pages/mypage/mypage","iconPath":"/static/images/my2_icon@2x.png","selectedIconPath":"static/images/my2_icon@2x2.png","text":"我的"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px"},"launch_path":"__uniappview.html"}} \ No newline at end of file