diff --git a/components/Tabbar/Tabbar.vue b/components/Tabbar/Tabbar.vue index d4f17fa..7b910a6 100644 --- a/components/Tabbar/Tabbar.vue +++ b/components/Tabbar/Tabbar.vue @@ -109,6 +109,8 @@ background-size: 100% 100%; padding: 10rpx 0; background-color: #4873ff; + border-top-left-radius: 20rpx; + border-top-right-radius: 20rpx; .tabbar-item { diff --git a/manifest.json b/manifest.json index 7e5ad07..9cbd354 100644 --- a/manifest.json +++ b/manifest.json @@ -17,7 +17,9 @@ "delay" : 0 }, /* 模块配置 */ - "modules" : {}, + "modules" : { + "Payment" : {} + }, /* 应用发布信息 */ "distribute" : { /* android打包配置 */ @@ -43,7 +45,13 @@ /* ios打包配置 */ "ios" : {}, /* SDK配置 */ - "sdkConfigs" : {} + "sdkConfigs" : { + "payment" : { + "alipay" : { + "__platform__" : [ "android" ] + } + } + } } }, /* 快应用特有相关 */ diff --git a/pages.json b/pages.json index b96e297..8259d1a 100644 --- a/pages.json +++ b/pages.json @@ -29,7 +29,8 @@ { "path": "pages/program/program", "style": { - "navigationBarTitleText": "项目" + "navigationBarTitleText": "项目", + "navigationStyle": "custom" } }, { @@ -45,6 +46,12 @@ "navigationBarTitleText" : "注册", "navigationStyle": "custom" } + }, + { + "path": "pages/program/programDetail/programDetail", + "style": { + "navigationBarTitleText": "项目详情" + } } ], "globalStyle": { diff --git a/pages/message/message.vue b/pages/message/message.vue index 10029f7..3f7be08 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -28,9 +28,9 @@ mode=""> - - - {{item.programName}} + + + {{item.messageName}} @@ -85,12 +85,12 @@ } // 项目 - const programList = ref([]) + const messageList = ref([]) const mockData = () => { for (var i = 0; i < 20; i++) { - programList.value.push({ - programName: "test" + i + messageList.value.push({ + messageName: "test" + i }) } } @@ -206,10 +206,10 @@ } } - .program-list { + .message-list { margin-top: 10rpx; - .program-item { + .message-item { // border: 1px solid #000; padding: 20rpx 10px; background-color: #FFFFFF; diff --git a/pages/program/program.vue b/pages/program/program.vue index dbe7520..4ea07c6 100644 --- a/pages/program/program.vue +++ b/pages/program/program.vue @@ -1,11 +1,268 @@ - - \ No newline at end of file diff --git a/pages/program/programDetail/programDetail.vue b/pages/program/programDetail/programDetail.vue new file mode 100644 index 0000000..e583f83 --- /dev/null +++ b/pages/program/programDetail/programDetail.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/static/ceshi_avatar.jpg b/static/ceshi_avatar.jpg new file mode 100644 index 0000000..2145a3a Binary files /dev/null and b/static/ceshi_avatar.jpg differ diff --git a/uni_modules/vk-uview-ui/components/u-dropdown/u-dropdown.vue b/uni_modules/vk-uview-ui/components/u-dropdown/u-dropdown.vue index 2f335ef..e7662cc 100644 --- a/uni_modules/vk-uview-ui/components/u-dropdown/u-dropdown.vue +++ b/uni_modules/vk-uview-ui/components/u-dropdown/u-dropdown.vue @@ -279,7 +279,7 @@ &__mask { position: absolute; z-index: 9; - background: rgba(0, 0, 0, .3); + //background: rgba(0, 0, 0, .3); width: 100%; left: 0; top: 0;