diff --git a/node_modules/uview-ui/theme.scss b/node_modules/uview-ui/theme.scss index 0ef4a09..7aba58f 100644 --- a/node_modules/uview-ui/theme.scss +++ b/node_modules/uview-ui/theme.scss @@ -10,7 +10,7 @@ $u-border-color: #dadbde; $u-bg-color: #f3f4f6; $u-disabled-color: #c8c9cc; -$u-primary: #EF9525; +$u-primary: #044ed7; $u-primary-dark: #398ade; $u-primary-disabled: #9acafc; $u-primary-light: #ecf5ff; diff --git a/pages.json b/pages.json index ba7136c..42e34f7 100644 --- a/pages.json +++ b/pages.json @@ -3,43 +3,62 @@ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - - ], + { + "path": "pages/index/index" + }, + { + "path": "pages/index/login", + "style": { + "navigationBarBackgroundColor": "#fff", + "navigationBarTextStyle": "black", + "backgroundColor": "#fff" + } + }, + { + "path": "pages/bd/mine" + }, + { + "path": "pages/bd/record" + }, + { + "path": "pages/visit/detail" + } + ], "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "微信基础", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" - }, - "tabBar": { - "color": "#351C1B", - "selectedColor": "#351C1B", - "backgroundColor": "#fdf9f5", - "list": [{ - "pagePath": "pages/index/index", - "text": "首页", - "iconPath": "/static/img/icon_nav_home.png", - "selectedIconPath": "/static/img/icon_nav_home_on.png" - }, - { - "pagePath": "pages/guide/index", - "text": "参观指南", - "iconPath": "/static/img/icon_nav_guide.png", - "selectedIconPath": "/static/img/icon_nav_guide_on.png" - }, - { - "pagePath": "pages/map/map", - "text": "展馆导航", - "iconPath": "/static/img/icon_nav_map.png", - "selectedIconPath": "/static/img/icon_nav_map_on.png" - }, - { - "pagePath": "pages/mine/index", - "text": "个人中心", - "iconPath": "/static/img/icon_nav_user.png", - "selectedIconPath": "/static/img/icon_nav_user_on.png" - } - ] + "navigationBarTextStyle": "#FFFFFF", + "navigationBarTitleText": "BD访客系统", + "navigationBarBackgroundColor": "#044ed7", + "backgroundColor": "#eceefe" } + // "tabBar": { + // "color": "#351C1B", + // "selectedColor": "#351C1B", + // "backgroundColor": "#fdf9f5", + // "list": [{ + // "pagePath": "pages/index/index", + // "text": "首页", + // "iconPath": "/static/img/icon_nav_home.png", + // "selectedIconPath": "/static/img/icon_nav_home_on.png" + // }, + // { + // "pagePath": "pages/guide/index", + // "text": "参观指南", + // "iconPath": "/static/img/icon_nav_guide.png", + // "selectedIconPath": "/static/img/icon_nav_guide_on.png" + // }, + // { + // "pagePath": "pages/map/map", + // "text": "展馆导航", + // "iconPath": "/static/img/icon_nav_map.png", + // "selectedIconPath": "/static/img/icon_nav_map_on.png" + // }, + // { + // "pagePath": "pages/mine/index", + // "text": "个人中心", + // "iconPath": "/static/img/icon_nav_user.png", + // "selectedIconPath": "/static/img/icon_nav_user_on.png" + // } + // ] + // } } diff --git a/pages/bd/mine.vue b/pages/bd/mine.vue new file mode 100644 index 0000000..f2b5b6c --- /dev/null +++ b/pages/bd/mine.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/pages/bd/record.vue b/pages/bd/record.vue new file mode 100644 index 0000000..8f369c1 --- /dev/null +++ b/pages/bd/record.vue @@ -0,0 +1,92 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue new file mode 100644 index 0000000..f650af5 --- /dev/null +++ b/pages/index/index.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/pages/index/login.vue b/pages/index/login.vue new file mode 100644 index 0000000..35761ad --- /dev/null +++ b/pages/index/login.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/pages/visit/detail.vue b/pages/visit/detail.vue new file mode 100644 index 0000000..feb3105 --- /dev/null +++ b/pages/visit/detail.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/static/css/activitybox.css b/static/css/activitybox.css deleted file mode 100644 index 1d8698c..0000000 --- a/static/css/activitybox.css +++ /dev/null @@ -1,106 +0,0 @@ -.tomap { - width: 34rpx; - height: 34rpx; - background: rgba(242, 214, 188, .4); - border-radius: 50%; - display: flex; - justify-content: center; - align-items: center; - align-content: center; - margin-left: 30rpx; -} - - - -.iconfont { - color: #6EAC97; - font-size: 24rpx; - margin-right: 19rpx; -} - -.icon-ditu-dibiao { - color: #787BA2; -} - -.tag { - height: 37rpx; - background: #ccc; - border-radius: 8rpx; - padding: 7rpx 16rpx; - font-size: 24rpx; - font-family: PingFang SC; - font-weight: 400; - color: #FFFFFF; -} - -.activityBox-row { - font-size: 24rpx; - font-family: PingFang SC; - font-weight: 400; - color: #828282; - margin-bottom: 15rpx; -} - -.activityBox_btn { - - background: #EF9525; -} - -.activityBox { - background-color: #ffffff; - margin-bottom: 26rpx; -} - -.activityBox-title { - flex: 1; - font-size: 28rpx; - font-family: PingFang SC; - font-weight: 400; - color: #4E4E4E; -} - - -.activityBox-content { - padding: 31rpx 24rpx; - box-sizing: border-box; -} - -.activityBox-top { - position: relative; - -} - -.book-status { - background: url("@/static/img/status_bg.png") no-repeat; - background-size: cover; - width: 255rpx; - height: 48rpx; - position: absolute; - margin-left: -127.5rpx; - left: 50%; - top: 142.5rpx; - text-align: center; - font-size: 28rpx; - font-family: PingFang SC; - font-weight: 400; - color: #FFFFFF; - line-height: 48rpx; -} - -.book-num { - background: #FFFFFF; - opacity: 0.85; - position: absolute; - right: 0; - bottom: 21rpx; - padding: 12rpx 34rpx; - border-top-left-radius: 53rpx; - border-bottom-left-radius: 53rpx; - font-size: 20rpx; - color: #4E4E4E; -} - -.book-num-y { - color: #D98012; - font-size: 34rpx; -} diff --git a/static/css/bd.css b/static/css/bd.css new file mode 100644 index 0000000..58acd08 --- /dev/null +++ b/static/css/bd.css @@ -0,0 +1,86 @@ +.db{ + + } + .db>view:first-child{ + font-size:32rpx; + padding:20rpx + } + .dblist{ + + } + .dbitem{ + background-color: #fff; + border-radius: 20rpx; + position: relative; + padding:40rpx 30rpx; + padding-top:0; + margin-bottom:30rpx + } + .dbtype{ + position: absolute; + top:0; + right:0; + padding:20rpx 40rpx; + background-color:#044ed7; + border-radius:0 20rpx 0 20rpx; + color:#fff + } + .dbstatus{ + color:#303639; + } + .dbstatus>view:first-child{ + font-size: 50rpx; + margin-bottom:20rpx + } + .dbinfo{ + padding:30rpx 0 + } + .dbinfo>view{ + padding-right:60rpx; + } + .dbinfo>view:first-child{ + border-right: 1px solid #f0f4f7; + } + .dbinfo>view:last-child{ + padding-left:40rpx; + padding-right:0 + } + .dbinfo>view view{ + padding-bottom:20rpx + } + .dbinfo>view view:last-child{ + padding-bottom:0rpx + } + .dbinfo>view view text{ + color:#8f9596; + } + .dblong{ + color:#8f9596; + font-size: 30rpx; + padding-top:30rpx; + border-top: 1px solid #f0f4f7; + } + .bm{ + border-bottom: 1px solid #f0f4f7; + padding:30rpx 0 + } + .dbbtns{ + background: #fff; + padding: 20rpx; + padding-bottom: 0rpx; + } + .dbbtns text{ + padding: 20rpx 50rpx; + background: #eceefe; + border-radius: 20rpx; + margin-bottom: 10px; + width: 15%; + text-align: center; + } + .dbbtns text.active{ + margin-bottom: 0; + border-radius: 20rpx 20rpx 0 0; + font-size: 36rpx; + background-color: #044ed7; + color:#fff + } \ No newline at end of file diff --git a/static/css/bookbox.css b/static/css/bookbox.css deleted file mode 100644 index 947837b..0000000 --- a/static/css/bookbox.css +++ /dev/null @@ -1,146 +0,0 @@ -.book-box{ - font-size: 24rpx ; -} -.book-box-title { - font-weight: 400; - color: #828282; -} - -.book-box-row { - display: flex; - flex-direction: row; - margin-top: 38rpx; -} - -.book-box-selectInfo { - background: #FCF6E3; - height: 66rpx; - width: 100vw; - padding: 0rpx 42rpx; - margin-bottom: 20rpx; - display: flex; - color: #828282; - line-height: 66rpx; - font-size: 24rpx; - justify-content: space-between; - box-sizing: border-box; -} - -.book-box-selectInfo-right { - display: flex; - color: #EF9525; -} - -.book-box-selectInfo-righttxt { - text-decoration: underline; - margin-right: 10rpx; -} - - -.book-box-row .book-box-row-date { - display: flex; - flex-direction: row; - flex: 1; - justify-content: space-between; -} - -.book-box-row .book-box-row-date .book-box-row-dateitem { - background: #F7F6F4; - border-radius: 5rpx; - padding: 24rpx 32rpx; - color: #4E4E4E; - position: relative; -} - -.book-box-timerow { - display: flex; - margin-top: 36rpx; - flex-wrap: wrap; -} - -.book-box-row-timeitem { - background: #F7F6F4; - border-radius: 5ppx; - padding: 19rpx 39rpx; - font-size: 24rpx; - color: #4E4E4E; - position: relative; - margin-right: 9rpx; - margin-bottom: 19rpx; - box-sizing: border-box; -} - -.book-box-row-timeitem-on { - background: #FCF6E3; - border: 2rpx solid #EF9525; - padding: 17rpx 37rpx !important; -} - -.book-box-row-timeitem-txt { - text-align: center; -} - -.book-box-row-timeitem-status { - position: absolute; - right: 0; - top: 0; - background: #EF9525; - border-top-right-radius: 5rpx; - border-bottom-left-radius: 5rpx; - font-size: 20rpx; - color: #828282; - padding: 7rpx; -} - -.book-box-row .book-box-row-date .book-box-row-dateitem-none { - - color: #CFCFCF !important; -} - -.book-box-row .book-box-row-date .book-box-row-dateitem-on { - - padding: 22rpx 30rpx; - background: #FCF6E3; - border: 2rpx solid #EF9525; - border-radius: 5rpx; - color: #4E4E4E; -} - -.book-box-row-select { - padding: 24rpx 9rpx 24rpx 29rpx; - background: #F7F6F4; - border-radius: 5rpx; - margin-left: 16rpx; - display: flex; - justify-content: space-between; - color: #4E4E4E !important; -} - -.book-box-row .book-box-row-date .book-box-row-dateitem-on .book-box-row-dateitem-status { - - background: #EF9525 !important; - color: #ffffff !important; - font-size: 20rpx !important; -} - -.book-box-row-dateitem-status { - position: absolute; - right: 0; - top: 0; - background: #E3E3E3; - border-top-right-radius: 5rpx; - border-bottom-left-radius: 5rpx; - font-size: 20rpx; - color: #828282; - padding: 7rpx; -} - -.book-box-row-select-more { - display: flex; - align-items: center; - margin-left: 22rpx; -} - -.book-box-card { - margin-bottom: 50rpx; -} diff --git a/static/css/common.css b/static/css/common.css index ec18962..2194ea5 100644 --- a/static/css/common.css +++ b/static/css/common.css @@ -50,6 +50,10 @@ button:active { display: flex; justify-content: space-between; } +.justify-left { + display: flex; + justify-content: left; +} .align-start { display: flex; align-items: flex-start; diff --git a/static/img/bdgl.png b/static/img/bdgl.png new file mode 100644 index 0000000..38b863a Binary files /dev/null and b/static/img/bdgl.png differ diff --git a/static/img/bdlogo.png b/static/img/bdlogo.png new file mode 100644 index 0000000..a0bc53d Binary files /dev/null and b/static/img/bdlogo.png differ diff --git a/static/img/bfjl.png b/static/img/bfjl.png new file mode 100644 index 0000000..53d1454 Binary files /dev/null and b/static/img/bfjl.png differ diff --git a/static/img/down.png b/static/img/down.png deleted file mode 100644 index bcf8daa..0000000 Binary files a/static/img/down.png and /dev/null differ diff --git a/static/img/dyyjl.png b/static/img/dyyjl.png new file mode 100644 index 0000000..2742651 Binary files /dev/null and b/static/img/dyyjl.png differ diff --git a/static/img/footer_logo.png b/static/img/footer_logo.png deleted file mode 100644 index 0529bbe..0000000 Binary files a/static/img/footer_logo.png and /dev/null differ diff --git a/static/img/gamebutton.png b/static/img/gamebutton.png deleted file mode 100644 index 52e5af3..0000000 Binary files a/static/img/gamebutton.png and /dev/null differ diff --git a/static/img/gh_83fed80a6144_258.jpg b/static/img/gh_83fed80a6144_258.jpg deleted file mode 100644 index d030a64..0000000 Binary files a/static/img/gh_83fed80a6144_258.jpg and /dev/null differ diff --git a/static/img/icon_activity.png b/static/img/icon_activity.png deleted file mode 100644 index a7f586c..0000000 Binary files a/static/img/icon_activity.png and /dev/null differ diff --git a/static/img/icon_nav_guide.png b/static/img/icon_nav_guide.png deleted file mode 100644 index 010d07d..0000000 Binary files a/static/img/icon_nav_guide.png and /dev/null differ diff --git a/static/img/icon_nav_guide_on.png b/static/img/icon_nav_guide_on.png deleted file mode 100644 index 26377a7..0000000 Binary files a/static/img/icon_nav_guide_on.png and /dev/null differ diff --git a/static/img/icon_nav_home.png b/static/img/icon_nav_home.png deleted file mode 100644 index 410347d..0000000 Binary files a/static/img/icon_nav_home.png and /dev/null differ diff --git a/static/img/icon_nav_home_on.png b/static/img/icon_nav_home_on.png deleted file mode 100644 index 1ec6f69..0000000 Binary files a/static/img/icon_nav_home_on.png and /dev/null differ diff --git a/static/img/icon_nav_map.png b/static/img/icon_nav_map.png deleted file mode 100644 index a4d7dc5..0000000 Binary files a/static/img/icon_nav_map.png and /dev/null differ diff --git a/static/img/icon_nav_map_on.png b/static/img/icon_nav_map_on.png deleted file mode 100644 index 985d475..0000000 Binary files a/static/img/icon_nav_map_on.png and /dev/null differ diff --git a/static/img/icon_nav_user.png b/static/img/icon_nav_user.png deleted file mode 100644 index 32cf2d3..0000000 Binary files a/static/img/icon_nav_user.png and /dev/null differ diff --git a/static/img/icon_nav_user_on.png b/static/img/icon_nav_user_on.png deleted file mode 100644 index 78f7ff3..0000000 Binary files a/static/img/icon_nav_user_on.png and /dev/null differ diff --git a/static/img/icon_park.png b/static/img/icon_park.png deleted file mode 100644 index b805725..0000000 Binary files a/static/img/icon_park.png and /dev/null differ diff --git a/static/img/icon_visit.png b/static/img/icon_visit.png deleted file mode 100644 index a915dc5..0000000 Binary files a/static/img/icon_visit.png and /dev/null differ diff --git a/static/img/index_bg.jpg b/static/img/index_bg.jpg deleted file mode 100644 index 056a7a1..0000000 Binary files a/static/img/index_bg.jpg and /dev/null differ diff --git a/static/img/index_icon_1.png b/static/img/index_icon_1.png deleted file mode 100644 index 39dc8e0..0000000 Binary files a/static/img/index_icon_1.png and /dev/null differ diff --git a/static/img/index_icon_2.png b/static/img/index_icon_2.png deleted file mode 100644 index 8fe47f0..0000000 Binary files a/static/img/index_icon_2.png and /dev/null differ diff --git a/static/img/index_icon_3.png b/static/img/index_icon_3.png deleted file mode 100644 index 30f340f..0000000 Binary files a/static/img/index_icon_3.png and /dev/null differ diff --git a/static/img/index_name.png b/static/img/index_name.png deleted file mode 100644 index 1a22cd9..0000000 Binary files a/static/img/index_name.png and /dev/null differ diff --git a/static/img/location.png b/static/img/location.png deleted file mode 100644 index a5f043b..0000000 Binary files a/static/img/location.png and /dev/null differ diff --git a/static/img/logo.png b/static/img/logo.png new file mode 100644 index 0000000..2533b43 Binary files /dev/null and b/static/img/logo.png differ diff --git a/static/img/nav_bg.png b/static/img/nav_bg.png deleted file mode 100644 index 24c3400..0000000 Binary files a/static/img/nav_bg.png and /dev/null differ diff --git a/static/img/nav_bottom.png b/static/img/nav_bottom.png deleted file mode 100644 index 8729437..0000000 Binary files a/static/img/nav_bottom.png and /dev/null differ diff --git a/static/img/nav_middle.png b/static/img/nav_middle.png deleted file mode 100644 index 3bbb1a7..0000000 Binary files a/static/img/nav_middle.png and /dev/null differ diff --git a/static/img/nav_top.png b/static/img/nav_top.png deleted file mode 100644 index cb6f989..0000000 Binary files a/static/img/nav_top.png and /dev/null differ diff --git a/static/img/ptfk.png b/static/img/ptfk.png new file mode 100644 index 0000000..59eb61e Binary files /dev/null and b/static/img/ptfk.png differ diff --git a/static/img/ptfk1.png b/static/img/ptfk1.png new file mode 100644 index 0000000..a06d232 Binary files /dev/null and b/static/img/ptfk1.png differ diff --git a/static/img/search.png b/static/img/search.png new file mode 100644 index 0000000..8261043 Binary files /dev/null and b/static/img/search.png differ diff --git a/static/img/sgry.png b/static/img/sgry.png new file mode 100644 index 0000000..74f51fd Binary files /dev/null and b/static/img/sgry.png differ diff --git a/static/img/sgry1.png b/static/img/sgry1.png new file mode 100644 index 0000000..420ddfd Binary files /dev/null and b/static/img/sgry1.png differ diff --git a/static/img/share.png b/static/img/share.png deleted file mode 100644 index 49d7cf3..0000000 Binary files a/static/img/share.png and /dev/null differ diff --git a/static/img/share_used.png b/static/img/share_used.png deleted file mode 100644 index c1bdcb0..0000000 Binary files a/static/img/share_used.png and /dev/null differ diff --git a/static/img/status_bg.png b/static/img/status_bg.png deleted file mode 100644 index 8f56fe4..0000000 Binary files a/static/img/status_bg.png and /dev/null differ diff --git a/static/img/used.png b/static/img/used.png deleted file mode 100644 index 935fe30..0000000 Binary files a/static/img/used.png and /dev/null differ diff --git a/static/img/wdsh.png b/static/img/wdsh.png new file mode 100644 index 0000000..1ebf5ee Binary files /dev/null and b/static/img/wdsh.png differ diff --git a/static/img/wlcl.png b/static/img/wlcl.png new file mode 100644 index 0000000..d89fd31 Binary files /dev/null and b/static/img/wlcl.png differ diff --git a/static/img/wlcl1.png b/static/img/wlcl1.png new file mode 100644 index 0000000..d97ad73 Binary files /dev/null and b/static/img/wlcl1.png differ diff --git a/static/img/yy.png b/static/img/yy.png new file mode 100644 index 0000000..5d9cb2a Binary files /dev/null and b/static/img/yy.png differ diff --git a/static/share.jpg b/static/share.jpg deleted file mode 100644 index f9b7dd9..0000000 Binary files a/static/share.jpg and /dev/null differ diff --git a/uni.scss b/uni.scss index c4ec4a3..a03bd37 100644 --- a/uni.scss +++ b/uni.scss @@ -16,7 +16,7 @@ /* 颜色变量 */ /* 行为相关颜色 */ -$uni-color-primary: #EF9525; +$uni-color-primary: #044ed7; $uni-color-success: #4cd964; $uni-color-warning: #f0ad4e; $uni-color-error: #dd524d; diff --git a/utils/util.js b/utils/util.js index 5e9128b..64a3570 100755 --- a/utils/util.js +++ b/utils/util.js @@ -1,7 +1,7 @@ import md5 from "./md5.min"; const HOSTARR = { - 'development': 'http://leyitest.ali251.langye.net', - 'production': 'https://leyiyuyue.szgmbwg.org.cn' + 'development': 'http://bd-fangke.ali251.langye.net', + 'production': 'http://bd-fangke.ali251.langye.net' }; // 审核状态 const HOST = HOSTARR[process.env @@ -188,7 +188,7 @@ const request = options => { if (res.statusCode == 401) { uni.clearStorageSync(); uni.navigateTo({ - url: '/pages/login/login' + url: '/pages/index/index' }); } else { options.utilFail('TODO: 特殊处理非200错误(' + res.statusCode + ')');