diff --git a/manifest.json b/manifest.json index 44e58bf..ce93d5b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "ggjuni", - "appid" : "__UNI__49E3CD6", + "appid" : "__UNI__6E73513", "description" : "云端一体应用快速开发基本项目模版", "versionName" : "1.0.0", "versionCode" : "100", @@ -34,13 +34,17 @@ "", "", "" - ] + ], + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] + }, + "ios" : { + "dSYMs" : false }, - "ios" : {}, "sdkConfigs" : { "push" : { "unipush" : null - } + }, + "ad" : {} } } }, diff --git a/pages.json b/pages.json index 6612c2b..b74cdb3 100644 --- a/pages.json +++ b/pages.json @@ -65,7 +65,8 @@ "popGesture": "none" } } - }, { + }, + { "path": "pages/ucenter/settings/settings", "style": { "navigationBarTitleText": "设置" @@ -156,6 +157,11 @@ { "navigationBarTitleText": "专区", "enablePullDownRefresh": false + // "app-plus": { + // "animationType": "slide-in-bottom", + // "background": "transparent", + // "popGesture": "none" + // } } } @@ -453,17 +459,18 @@ // "rpxCalcIncludeWidth":0 }, "condition": { - "list": [{ - "path": "pages/list/detail" - }, + "list": [ + { + "path": "pages/home/home" + } // { // "path": "pages/list/list" // }, - { - "path": "pages/ucenter/settings/settings" - } + // { + // "path": "pages/ucenter/settings/settings" + // } ], - "current": 1 + "current": 0 }, "tabBar": { "color": "#999999", diff --git a/pages/NoticeDetails/NoticeDetails.vue b/pages/NoticeDetails/NoticeDetails.vue index a18d7f6..c32eb19 100644 --- a/pages/NoticeDetails/NoticeDetails.vue +++ b/pages/NoticeDetails/NoticeDetails.vue @@ -48,13 +48,16 @@ background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); width: 700rpx; - height: 88rpx; padding: 0px 25rpx; - padding-top: var(--status-bar-height); + /* #ifdef H5 */ + height: 88rpx;padding-top: var(--status-bar-height); + /* #endif */ + /* #ifdef APP-PLUS */ + height: 2px; + /* #endif */ box-sizing: content-box; color: #b0b0b0; font-size: 14px; - } .wrapper{ text-align: center; diff --git a/pages/about/about.vue b/pages/about/about.vue index ac6fa0e..71271d1 100644 --- a/pages/about/about.vue +++ b/pages/about/about.vue @@ -80,9 +80,13 @@ background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); width: 700rpx; - height: 88rpx; padding: 0px 25rpx; - padding-top: var(--status-bar-height); + /* #ifdef H5 */ + height: 88rpx;padding-top: var(--status-bar-height); + /* #endif */ + /* #ifdef APP-PLUS */ + height: 2px; + /* #endif */ box-sizing: content-box; color: #b0b0b0; font-size: 14px; diff --git a/pages/about/bannerManage/addBanner.vue b/pages/about/bannerManage/addBanner.vue index 422714a..ceac9b8 100644 --- a/pages/about/bannerManage/addBanner.vue +++ b/pages/about/bannerManage/addBanner.vue @@ -110,9 +110,13 @@ background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); width: 700rpx; - height: 88rpx; padding: 0px 25rpx; - padding-top: var(--status-bar-height); + /* #ifdef H5 */ + height: 88rpx;padding-top: var(--status-bar-height); + /* #endif */ + /* #ifdef APP-PLUS */ + height: 2px; + /* #endif */ box-sizing: content-box; color: #b0b0b0; font-size: 14px; diff --git a/pages/about/bannerManage/bannerManage.vue b/pages/about/bannerManage/bannerManage.vue index 9df64a8..b3ec365 100644 --- a/pages/about/bannerManage/bannerManage.vue +++ b/pages/about/bannerManage/bannerManage.vue @@ -82,9 +82,13 @@ background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); width: 700rpx; - height: 88rpx; padding: 0px 25rpx; - padding-top: var(--status-bar-height); + /* #ifdef H5 */ + height: 88rpx;padding-top: var(--status-bar-height); + /* #endif */ + /* #ifdef APP-PLUS */ + height: 2px; + /* #endif */ box-sizing: content-box; color: #b0b0b0; font-size: 14px; diff --git a/pages/about/bonusSet/bonusList.vue b/pages/about/bonusSet/bonusList.vue index 83aedef..5afed02 100644 --- a/pages/about/bonusSet/bonusList.vue +++ b/pages/about/bonusSet/bonusList.vue @@ -108,9 +108,13 @@ background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); width: 700rpx; - height: 88rpx; padding: 0px 25rpx; - padding-top: var(--status-bar-height); + /* #ifdef H5 */ + height: 88rpx;padding-top: var(--status-bar-height); + /* #endif */ + /* #ifdef APP-PLUS */ + height: 2px; + /* #endif */ box-sizing: content-box; color: #b0b0b0; font-size: 14px; diff --git a/pages/about/bonusSet/bonusSet.vue b/pages/about/bonusSet/bonusSet.vue index 188f2b9..eb4ad06 100644 --- a/pages/about/bonusSet/bonusSet.vue +++ b/pages/about/bonusSet/bonusSet.vue @@ -104,6 +104,7 @@ }) this.showEdit = false; this.editInfo = {}; + this.getList(); }) }, getList(){ @@ -135,9 +136,13 @@ background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); width: 700rpx; - height: 88rpx; padding: 0px 25rpx; - padding-top: var(--status-bar-height); + /* #ifdef H5 */ + height: 88rpx;padding-top: var(--status-bar-height); + /* #endif */ + /* #ifdef APP-PLUS */ + height: 2px; + /* #endif */ box-sizing: content-box; color: #b0b0b0; font-size: 14px; diff --git a/pages/about/bonusSet/index.vue b/pages/about/bonusSet/index.vue index d9a72fa..daa551d 100644 --- a/pages/about/bonusSet/index.vue +++ b/pages/about/bonusSet/index.vue @@ -86,9 +86,13 @@ background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); width: 700rpx; - height: 88rpx; padding: 0px 25rpx; - padding-top: var(--status-bar-height); + /* #ifdef H5 */ + height: 88rpx;padding-top: var(--status-bar-height); + /* #endif */ + /* #ifdef APP-PLUS */ + height: 2px; + /* #endif */ box-sizing: content-box; color: #b0b0b0; font-size: 14px; diff --git a/pages/about/noticeManage/addNotice.vue b/pages/about/noticeManage/addNotice.vue index 3248fa0..6528096 100644 --- a/pages/about/noticeManage/addNotice.vue +++ b/pages/about/noticeManage/addNotice.vue @@ -78,9 +78,13 @@ background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); width: 700rpx; - height: 88rpx; padding: 0px 25rpx; - padding-top: var(--status-bar-height); + /* #ifdef H5 */ + height: 88rpx;padding-top: var(--status-bar-height); + /* #endif */ + /* #ifdef APP-PLUS */ + height: 2px; + /* #endif */ box-sizing: content-box; color: #b0b0b0; font-size: 14px; diff --git a/pages/about/noticeManage/noticeManage.vue b/pages/about/noticeManage/noticeManage.vue index 1adfd01..769daf3 100644 --- a/pages/about/noticeManage/noticeManage.vue +++ b/pages/about/noticeManage/noticeManage.vue @@ -92,9 +92,13 @@ background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); width: 700rpx; - height: 88rpx; padding: 0px 25rpx; - padding-top: var(--status-bar-height); + /* #ifdef H5 */ + height: 88rpx;padding-top: var(--status-bar-height); + /* #endif */ + /* #ifdef APP-PLUS */ + height: 2px; + /* #endif */ box-sizing: content-box; color: #b0b0b0; font-size: 14px; diff --git a/pages/about/rechargeSet/rechargeSet.vue b/pages/about/rechargeSet/rechargeSet.vue index d7fbac3..29912bc 100644 --- a/pages/about/rechargeSet/rechargeSet.vue +++ b/pages/about/rechargeSet/rechargeSet.vue @@ -2,29 +2,43 @@ - + - 用户端充值按钮 - - - - - 代理端充值按钮 - + {{item.title}} + @@ -38,9 +52,13 @@ background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); width: 700rpx; - height: 88rpx; padding: 0px 25rpx; - padding-top: var(--status-bar-height); + /* #ifdef H5 */ + height: 88rpx;padding-top: var(--status-bar-height); + /* #endif */ + /* #ifdef APP-PLUS */ + height: 2px; + /* #endif */ box-sizing: content-box; color: #b0b0b0; font-size: 14px; diff --git a/pages/about/serviceSet/serviceSet.vue b/pages/about/serviceSet/serviceSet.vue index db4ce2d..2c26a6d 100644 --- a/pages/about/serviceSet/serviceSet.vue +++ b/pages/about/serviceSet/serviceSet.vue @@ -149,9 +149,13 @@ background-color: #fff; box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); width: 700rpx; - height: 88rpx; padding: 0px 25rpx; - padding-top: var(--status-bar-height); + /* #ifdef H5 */ + height: 88rpx;padding-top: var(--status-bar-height); + /* #endif */ + /* #ifdef APP-PLUS */ + height: 2px; + /* #endif */ box-sizing: content-box; color: #b0b0b0; font-size: 14px; diff --git a/pages/home/echarts.vue b/pages/home/echarts.vue new file mode 100644 index 0000000..e7d141d --- /dev/null +++ b/pages/home/echarts.vue @@ -0,0 +1,209 @@ + + + + + + \ No newline at end of file diff --git a/pages/home/home.vue b/pages/home/home.vue index bc1521f..ea8d0a3 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -58,7 +58,12 @@ 用户统计 + + + + + {{userStatistics.sum.num}} @@ -93,24 +98,35 @@ {{ chartIndex==1?'上分总数':'下分总数' }}:{{ UpDownSta.sum_value }} + + + + + + + - + - + if(this.userType=='user' && this.isPlay){ + this.isPlay = false; + this.innerAudioContext.pause(); + } + } + + } + +