diff --git a/App.vue b/App.vue index eb58fc8..e29f6aa 100644 --- a/App.vue +++ b/App.vue @@ -50,6 +50,65 @@ } .u-navbar { - border-radius: 0 0 40rpx 40rpx; + border-radius: 0 0 40rpx 40rpx !important; + } + + + // 待护理 + .icon1 { + width: 16rpx; + height: 16rpx; + background: #FDB030; + border-radius: 100%; + + margin-right: 14rpx; + } + + //已完成 + .icon2 { + width: 16rpx; + height: 16rpx; + background: #1173FF; + border-radius: 100%; + + margin-right: 14rpx; + } + + //进行中 + .icon3 { + width: 12rpx; + height: 12rpx; + background: #2EC28B; + border-radius: 100%; + + margin-right: 14rpx; + position: relative; + + &::after { + content: ''; + width: 24rpx; + height: 24rpx; + border: 2rpx solid #2EC28B; + border-radius: 100%; + animation: icon-scale 3s linear infinite; + + position: absolute; + top: -10rpx; + left: -10rpx; + } + + @keyframes icon-scale { + + 0%, + 30%, + 100%, + 40% { + transform: scale(0.7, 0.7); + } + + 70% { + transform: scale(1, 1); + } + } } diff --git a/manifest.json b/manifest.json index f385d0c..7ff13f1 100644 --- a/manifest.json +++ b/manifest.json @@ -1,72 +1,77 @@ { - "name" : "uni", - "appid" : "__UNI__3136F4B", - "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : {}, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : {} - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "", - "setting" : { - "urlCheck" : false - }, - "usingComponents" : true - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "2" + "name": "uni", + "appid": "__UNI__3136F4B", + "description": "", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": {}, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": {} + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wx2129de75c4937c40", + "setting": { + "urlCheck": false + }, + "usingComponents": true, + "permission": { + "scope.userLocation": { + "desc": "获取位置" + } + } + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "2" } diff --git a/pages.json b/pages.json index e89641f..bb50f41 100644 --- a/pages.json +++ b/pages.json @@ -4,11 +4,18 @@ "^cpn-(.*)": "@/components/cpn-$1.vue" }, "pages": [{ - "path": "pages/home/home", + "path": "pages/enter/enter", "style": { "navigationStyle": "custom" } }, + { + "path": "pages/home/home", + "style": { + "navigationStyle": "custom", + "navigationBarTextStyle": "black" + } + }, { "path": "pages/list/list", "style": { @@ -56,7 +63,7 @@ }] }], "globalStyle": { - "navigationBarTextStyle": "black", + "navigationBarTextStyle": "white", "navigationBarTitleText": "uni-app", "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8" diff --git a/pages/detailNursing/detailNursing.vue b/pages/detailNursing/detailNursing.vue index 8c26201..15f2fa6 100644 --- a/pages/detailNursing/detailNursing.vue +++ b/pages/detailNursing/detailNursing.vue @@ -39,8 +39,79 @@ 158****5455 + + 更新定位 + + + + + + 今日护理 + + + + + + + + + 手、足部清洁 + + + + + 分钟 + + + + + + 口腔清洁 + + + + + 分钟 + + + + + + 整理床单元 + + + + + 分钟 + + + + + + + + + 过程打卡 + （1） + + + 更新定位 + 05:19:34 + + + + + + 定位时间：05:19:49 江苏省常州市天宁雕庄街道清扬中路辅路彩铃公寓 + @@ -49,7 +120,26 @@ export default { data() { return { - + inputStyle: { + fontSize: "24rpx", + color: "#36596A", + width: "140rpx", + background: "#F9F9F9" + }, + form: { + handClean: { + isSelect: false, + time: null + }, + mouthClean: { + isSelect: false, + time: null + }, + bedClean: { + isSelect: false, + time: null + } + } } }, methods: { @@ -62,6 +152,10 @@ diff --git a/pages/enter/enter.vue b/pages/enter/enter.vue new file mode 100644 index 0000000..9382b27 --- /dev/null +++ b/pages/enter/enter.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/pages/home/home.vue b/pages/home/home.vue index ed4db5e..7e16126 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -14,7 +14,7 @@ - + @@ -23,10 +23,12 @@ - + - + + + + 四世同堂服务管理 @@ -37,6 +39,10 @@ + + + @@ -57,7 +63,8 @@ - + {{item.title}} @@ -146,6 +153,7 @@ export default { data() { return { + swiperIndex: 0, inputStyle: { width: "468rpx", fontSize: "28rpx", @@ -180,7 +188,9 @@ } }, methods: { - + swiperChange(e) { + this.swiperIndex = e.detail.current + } }, computed: { @@ -243,15 +253,53 @@ .swiper { margin: 30rpx 20rpx 0 20rpx; + swiper { + width: 710rpx; + height: 324rpx; + } + swiper-item { + width: 710rpx; + height: 324rpx; border-radius: 16rpx; + position: relative; + } + + .dots { + display: flex; + transform: translateX(-50%); + + position: absolute; + left: 50%; + bottom: 20rpx; + + .dot { + width: 20rpx; + height: 10rpx; + border-radius: 10rpx; + background-color: rgba(255, 255, 255, 0.4); + + margin: 0 6rpx; + } + + .activeDot { + width: 36rpx; + background-color: #fff; + } + } + + .bkg { + width: 710rpx; + height: 324rpx; + position: absolute; + top: 0; + left: 0; } .swiper-content { width: 710rpx; - height: 322rpx; - background: #1479FF; + height: 324rpx; position: relative; .cir1 { @@ -295,7 +343,7 @@ font-family: PingFang-SC-Medium, PingFang-SC; font-weight: 500; color: #FFFFFF; - line-height: 26rpx; + line-height: 50rpx; position: absolute; top: 94rpx; @@ -309,7 +357,7 @@ font-family: PingFang-SC-Medium, PingFang-SC; font-weight: 500; color: #FFFFFF; - line-height: 18rpx; + line-height: 40rpx; position: absolute; top: 164rpx; @@ -418,9 +466,8 @@ justify-content: space-between; .data-item { - flex-basis: 50%; - padding: 24rpx 0 0 20rpx; + padding: 24rpx 0 0 0rpx; .data-title { width: 200rpx; @@ -487,64 +534,6 @@ display: flex; align-items: center; - // 待护理 - .icon1 { - width: 16rpx; - height: 16rpx; - background: #FDB030; - border-radius: 100%; - - margin-right: 14rpx; - } - - //已完成 - .icon2 { - width: 16rpx; - height: 16rpx; - background: #1173FF; - border-radius: 100%; - - margin-right: 14rpx; - } - - //进行中 - .icon3 { - width: 12rpx; - height: 12rpx; - background: #2EC28B; - border-radius: 100%; - - margin-right: 14rpx; - position: relative; - - &::after { - content: ''; - width: 24rpx; - height: 24rpx; - border: 2rpx solid #2EC28B; - border-radius: 100%; - animation: icon-scale 3s linear infinite; - - position: absolute; - top: -8rpx; - left: -8rpx; - } - - @keyframes icon-scale { - - 0%, - 30%, - 100%, - 40% { - transform: scale(0.7, 0.7); - } - - 70% { - transform: scale(1, 1); - } - } - } - .text { width: 84rpx; height: 40rpx; @@ -614,7 +603,6 @@ .info-title { width: 480rpx; - height: 46rpx; font-size: 32rpx; font-family: PingFang-SC-Medium, PingFang-SC; font-weight: 500; diff --git a/pages/list/list.vue b/pages/list/list.vue index c055268..0405874 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -6,7 +6,7 @@ - + @@ -91,7 +91,7 @@ data() { return { inputStyle: { - width: "468rpx", + width: "600rpx", fontSize: "28rpx", fontWeight: "500" }, diff --git a/pages/login/login.vue b/pages/login/login.vue index 9612c7c..4cc8ebe 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,34 +1,41 @@ @@ -42,7 +49,7 @@ color: "#999", minHeight: "40rpx", height: "40rpx", - width: "168rpx", + flex: "1", lineHeight: "40rpx", fontSize: "28rpx", fontWeight: "500" @@ -69,113 +76,130 @@ diff --git a/pages/map/map.vue b/pages/map/map.vue index 8187e9e..406c242 100644 --- a/pages/map/map.vue +++ b/pages/map/map.vue @@ -66,8 +66,20 @@ methods: { async markertap(e) { let marker = this.covers[e.detail.markerId - 1] + this.covers[e.detail.markerId - 1].height = 39 + this.covers[e.detail.markerId - 1].width = 30 + this.covers.map(item => { + if (item.id != marker.id) { + item.width = 20 + item.height = 24 + } + }) + this.mapCtx.addMarkers({ + markers: this.covers, + clear: true, + complete: (res) => {} + }) this.selectMarker = marker - console.log(marker); this.isShowPopup = true this.mapCtx.moveToLocation({ @@ -102,10 +114,10 @@ color: '#36596A', width: 50, height: 25, - bgColor: 'rgba(255, 255, 255, 0.95)', + bgColor: '#FFFFFF', borderRadius: 5, textAlign: 'center', - anchorX: 0, + anchorX: -10, anchorY: 0, } } @@ -132,10 +144,10 @@ color: '#36596A', width: 54, height: 25, - bgColor: 'rgba(255, 255, 255, 0.95)', + bgColor: '#FFFFFF', borderRadius: 5, textAlign: 'center', - anchorX: 0, + anchorX: -7, anchorY: 0, } }, @@ -153,10 +165,10 @@ color: '#36596A', width: 54, height: 25, - bgColor: 'rgba(255, 255, 255, 0.95)', + bgColor: '#FFFFFF', borderRadius: 5, textAlign: 'center', - anchorX: 0, + anchorX: -7, anchorY: 0, } }, @@ -174,10 +186,10 @@ color: '#36596A', width: 54, height: 25, - bgColor: 'rgba(255, 255, 255, 0.95)', + bgColor: '#FFFFFF', borderRadius: 5, textAlign: 'center', - anchorX: 0, + anchorX: -7, anchorY: 0, } }, @@ -195,10 +207,10 @@ color: '#36596A', width: 54, height: 25, - bgColor: 'rgba(255, 255, 255, 0.95)', + bgColor: '#FFFFFF', borderRadius: 5, textAlign: 'center', - anchorX: 0, + anchorX: -7, anchorY: 0, } }, @@ -216,10 +228,10 @@ color: '#36596A', width: 54, height: 25, - bgColor: 'rgba(255, 255, 255, 0.95)', + bgColor: '#FFFFFF', borderRadius: 5, textAlign: 'center', - anchorX: 0, + anchorX: -7, anchorY: 0, } } @@ -254,64 +266,6 @@