diff --git a/src/assets/myself/4_101.png b/src/assets/myself/4_101.png new file mode 100644 index 0000000..f207a3f Binary files /dev/null and b/src/assets/myself/4_101.png differ diff --git a/src/assets/myself/4_104.png b/src/assets/myself/4_104.png new file mode 100644 index 0000000..028dff8 Binary files /dev/null and b/src/assets/myself/4_104.png differ diff --git a/src/assets/myself/4_107.png b/src/assets/myself/4_107.png new file mode 100644 index 0000000..80520f1 Binary files /dev/null and b/src/assets/myself/4_107.png differ diff --git a/src/assets/myself/4_109.png b/src/assets/myself/4_109.png new file mode 100644 index 0000000..36fc01c Binary files /dev/null and b/src/assets/myself/4_109.png differ diff --git a/src/assets/myself/4_111.png b/src/assets/myself/4_111.png new file mode 100644 index 0000000..b6ed0da Binary files /dev/null and b/src/assets/myself/4_111.png differ diff --git a/src/assets/myself/4_42.png b/src/assets/myself/4_42.png new file mode 100644 index 0000000..3d69438 Binary files /dev/null and b/src/assets/myself/4_42.png differ diff --git a/src/assets/myself/4_45.png b/src/assets/myself/4_45.png new file mode 100644 index 0000000..f07f628 Binary files /dev/null and b/src/assets/myself/4_45.png differ diff --git a/src/assets/myself/4_47.png b/src/assets/myself/4_47.png new file mode 100644 index 0000000..59c2cf8 Binary files /dev/null and b/src/assets/myself/4_47.png differ diff --git a/src/assets/myself/4_53.png b/src/assets/myself/4_53.png new file mode 100644 index 0000000..c36e033 Binary files /dev/null and b/src/assets/myself/4_53.png differ diff --git a/src/assets/myself/4_62.png b/src/assets/myself/4_62.png new file mode 100644 index 0000000..1ebff62 Binary files /dev/null and b/src/assets/myself/4_62.png differ diff --git a/src/assets/myself/4_72.png b/src/assets/myself/4_72.png new file mode 100644 index 0000000..8332be3 Binary files /dev/null and b/src/assets/myself/4_72.png differ diff --git a/src/assets/myself/4_76.png b/src/assets/myself/4_76.png new file mode 100644 index 0000000..04e4ed1 Binary files /dev/null and b/src/assets/myself/4_76.png differ diff --git a/src/assets/myself/4_79.png b/src/assets/myself/4_79.png new file mode 100644 index 0000000..fe8a119 Binary files /dev/null and b/src/assets/myself/4_79.png differ diff --git a/src/assets/myself/4_81.png b/src/assets/myself/4_81.png new file mode 100644 index 0000000..26775a8 Binary files /dev/null and b/src/assets/myself/4_81.png differ diff --git a/src/assets/myself/4_88.png b/src/assets/myself/4_88.png new file mode 100644 index 0000000..765a706 Binary files /dev/null and b/src/assets/myself/4_88.png differ diff --git a/src/assets/myself/4_91.png b/src/assets/myself/4_91.png new file mode 100644 index 0000000..3512cbd Binary files /dev/null and b/src/assets/myself/4_91.png differ diff --git a/src/assets/myself/4_96.png b/src/assets/myself/4_96.png new file mode 100644 index 0000000..9783f09 Binary files /dev/null and b/src/assets/myself/4_96.png differ diff --git a/src/assets/myself/4_98.png b/src/assets/myself/4_98.png new file mode 100644 index 0000000..709c0ef Binary files /dev/null and b/src/assets/myself/4_98.png differ diff --git a/src/assets/img/callLog.png b/src/assets/myself/callLog.png similarity index 100% rename from src/assets/img/callLog.png rename to src/assets/myself/callLog.png diff --git a/src/assets/img/drownReport.png b/src/assets/myself/drownReport.png similarity index 100% rename from src/assets/img/drownReport.png rename to src/assets/myself/drownReport.png diff --git a/src/assets/img/health/blood_icon.png b/src/assets/myself/health/blood_icon.png similarity index 100% rename from src/assets/img/health/blood_icon.png rename to src/assets/myself/health/blood_icon.png diff --git a/src/assets/img/health/blood_oxygen.png b/src/assets/myself/health/blood_oxygen.png similarity index 100% rename from src/assets/img/health/blood_oxygen.png rename to src/assets/myself/health/blood_oxygen.png diff --git a/src/assets/img/health/bulb.png b/src/assets/myself/health/bulb.png similarity index 100% rename from src/assets/img/health/bulb.png rename to src/assets/myself/health/bulb.png diff --git a/src/assets/img/health/gps.png b/src/assets/myself/health/gps.png similarity index 100% rename from src/assets/img/health/gps.png rename to src/assets/myself/health/gps.png diff --git a/src/assets/img/health/gps_frequency.png b/src/assets/myself/health/gps_frequency.png similarity index 100% rename from src/assets/img/health/gps_frequency.png rename to src/assets/myself/health/gps_frequency.png diff --git a/src/assets/img/health/health.png b/src/assets/myself/health/health.png similarity index 100% rename from src/assets/img/health/health.png rename to src/assets/myself/health/health.png diff --git a/src/assets/img/health/heartRate.png b/src/assets/myself/health/heartRate.png similarity index 100% rename from src/assets/img/health/heartRate.png rename to src/assets/myself/health/heartRate.png diff --git a/src/assets/img/health/location.png b/src/assets/myself/health/location.png similarity index 100% rename from src/assets/img/health/location.png rename to src/assets/myself/health/location.png diff --git a/src/assets/img/health/psychological_icon.png b/src/assets/myself/health/psychological_icon.png similarity index 100% rename from src/assets/img/health/psychological_icon.png rename to src/assets/myself/health/psychological_icon.png diff --git a/src/assets/img/health/report_ frequency.png b/src/assets/myself/health/report_ frequency.png similarity index 100% rename from src/assets/img/health/report_ frequency.png rename to src/assets/myself/health/report_ frequency.png diff --git a/src/assets/img/health/rest.png b/src/assets/myself/health/rest.png similarity index 100% rename from src/assets/img/health/rest.png rename to src/assets/myself/health/rest.png diff --git a/src/assets/img/health/right_more.png b/src/assets/myself/health/right_more.png similarity index 100% rename from src/assets/img/health/right_more.png rename to src/assets/myself/health/right_more.png diff --git a/src/assets/img/health/setting.png b/src/assets/myself/health/setting.png similarity index 100% rename from src/assets/img/health/setting.png rename to src/assets/myself/health/setting.png diff --git a/src/assets/img/health/temperature.png b/src/assets/myself/health/temperature.png similarity index 100% rename from src/assets/img/health/temperature.png rename to src/assets/myself/health/temperature.png diff --git a/src/assets/img/healthy.png b/src/assets/myself/healthy.png similarity index 100% rename from src/assets/img/healthy.png rename to src/assets/myself/healthy.png diff --git a/src/assets/img/home/layer.png b/src/assets/myself/home/layer.png similarity index 100% rename from src/assets/img/home/layer.png rename to src/assets/myself/home/layer.png diff --git a/src/assets/img/home/lbs_icon.png b/src/assets/myself/home/lbs_icon.png similarity index 100% rename from src/assets/img/home/lbs_icon.png rename to src/assets/myself/home/lbs_icon.png diff --git a/src/assets/img/home/md-highlight_off.svg b/src/assets/myself/home/md-highlight_off.svg similarity index 100% rename from src/assets/img/home/md-highlight_off.svg rename to src/assets/myself/home/md-highlight_off.svg diff --git a/src/assets/img/home/message.png b/src/assets/myself/home/message.png similarity index 100% rename from src/assets/img/home/message.png rename to src/assets/myself/home/message.png diff --git a/src/assets/img/home/phone.png b/src/assets/myself/home/phone.png similarity index 100% rename from src/assets/img/home/phone.png rename to src/assets/myself/home/phone.png diff --git a/src/assets/img/home/spread_left.png b/src/assets/myself/home/spread_left.png similarity index 100% rename from src/assets/img/home/spread_left.png rename to src/assets/myself/home/spread_left.png diff --git a/src/assets/img/home/spread_right.png b/src/assets/myself/home/spread_right.png similarity index 100% rename from src/assets/img/home/spread_right.png rename to src/assets/myself/home/spread_right.png diff --git a/src/assets/img/home/trajectory.png b/src/assets/myself/home/trajectory.png similarity index 100% rename from src/assets/img/home/trajectory.png rename to src/assets/myself/home/trajectory.png diff --git a/src/assets/img/home/warning.png b/src/assets/myself/home/warning.png similarity index 100% rename from src/assets/img/home/warning.png rename to src/assets/myself/home/warning.png diff --git a/src/assets/img/leaveDrownReport.png b/src/assets/myself/leaveDrownReport.png similarity index 100% rename from src/assets/img/leaveDrownReport.png rename to src/assets/myself/leaveDrownReport.png diff --git a/src/assets/img/noWear.png b/src/assets/myself/noWear.png similarity index 100% rename from src/assets/img/noWear.png rename to src/assets/myself/noWear.png diff --git a/src/assets/img/phone_ record.png b/src/assets/myself/phone_ record.png similarity index 100% rename from src/assets/img/phone_ record.png rename to src/assets/myself/phone_ record.png diff --git a/src/assets/img/prohibition.png b/src/assets/myself/prohibition.png similarity index 100% rename from src/assets/img/prohibition.png rename to src/assets/myself/prohibition.png diff --git a/src/assets/img/spo.png b/src/assets/myself/spo.png similarity index 100% rename from src/assets/img/spo.png rename to src/assets/myself/spo.png diff --git a/src/assets/img/tooltip-sizing.png b/src/assets/myself/tooltip-sizing.png similarity index 100% rename from src/assets/img/tooltip-sizing.png rename to src/assets/myself/tooltip-sizing.png diff --git a/src/assets/img/wear.png b/src/assets/myself/wear.png similarity index 100% rename from src/assets/img/wear.png rename to src/assets/myself/wear.png diff --git a/src/components/SubmenuList.vue b/src/components/SubmenuList.vue index e2bb660..7cdc33b 100644 --- a/src/components/SubmenuList.vue +++ b/src/components/SubmenuList.vue @@ -10,7 +10,7 @@
-
+
@@ -166,7 +166,8 @@ export default { @include flexbox(flex-start, center, row, wrap); .left { p { - font-size: 42px; + font-size: 36px; + font-weight: bold; } } } @@ -177,11 +178,9 @@ export default { .list { position: relative; padding-left: 20px; - /* @include flexbox(flex-start, flex-start, row, wrap); */ display: grid; grid-template-columns: repeat(4, auto); grid-gap: 40px; - /* grid-template-rows: auto auto; */ .item { position: relative; /* height: 140px; */ @@ -189,16 +188,20 @@ export default { /* padding: 0 20px; */ @include flexbox(center, center, column, nowrap); .img-icon-con { - padding: 20px; + height: 110px; + width: 110px; @include flexbox(space-around, center, column, wrap); + background-color: #fff; img { - height: 80px; - widows: 80px; + height: 110px; + widows: 110px; + /* border-radius: 50%; */ + object-fit: cover; } } .text { - @include flexbox(flex-start, center, column, wrap); - padding: 5px; + @include flexbox(space-around, center, column, nowrap); + padding: 5px 0; font-size: 28px; font-weight: 400; } diff --git a/src/views/myself/callList.vue b/src/views/myself/callList.vue index 7c9062c..cf0fd88 100644 --- a/src/views/myself/callList.vue +++ b/src/views/myself/callList.vue @@ -1,31 +1,33 @@ @@ -75,44 +77,45 @@ export default { diff --git a/src/views/myself/clock.vue b/src/views/myself/clock.vue index 95807b4..bcee6d2 100644 --- a/src/views/myself/clock.vue +++ b/src/views/myself/clock.vue @@ -215,7 +215,7 @@ export default { margin: 200px auto 0; width: 640px; height: 238px; - /* background: url(../../assets/img/uyqk-noData.png) center no-repeat; */ + /* background: url(../../assets/myself/uyqk-noData.png) center no-repeat; */ background-size: 336px 238px; display: flex; justify-content: center; diff --git a/src/views/myself/deviceSetting/blood.vue b/src/views/myself/deviceSetting/blood.vue index dfca15b..a976b75 100644 --- a/src/views/myself/deviceSetting/blood.vue +++ b/src/views/myself/deviceSetting/blood.vue @@ -112,7 +112,7 @@ export default { name: '', data() { return { - rightIcon: require('../../../assets/img/health/right_more.png'), + rightIcon: require('../../../assets/myself/health/right_more.png'), checked: false, sampleinteval: '', //上报频率-定位检测 temperatureAlarmType: ['temperaturevibrateenabled', 'temperaturelcdenabled', 'temperaturereportenabled'], //体温告警方式 diff --git a/src/views/myself/deviceSetting/dangerAreaMonitor.vue b/src/views/myself/deviceSetting/dangerAreaMonitor.vue index 054e6af..0ca9578 100644 --- a/src/views/myself/deviceSetting/dangerAreaMonitor.vue +++ b/src/views/myself/deviceSetting/dangerAreaMonitor.vue @@ -449,7 +449,7 @@ export default { name: '', data() { return { - rightIcon: require('../../../assets/img/health/right_more.png'), + rightIcon: require('../../../assets/myself/health/right_more.png'), checked: false, sampleinteval: '', //上报频率-定位检测 waterAreaAlarmType: ['vibrateenabled', 'lcdenabled', 'musicenabled'], //体温告警方式 diff --git a/src/views/myself/deviceSetting/drownWhiteList.vue b/src/views/myself/deviceSetting/drownWhiteList.vue index 87a4cf2..3a40038 100644 --- a/src/views/myself/deviceSetting/drownWhiteList.vue +++ b/src/views/myself/deviceSetting/drownWhiteList.vue @@ -47,7 +47,7 @@ export default { data() { return { date: new Date().Format('yyyy-MM-dd'), - bloodIcon: require('../../../assets/img/health/blood_icon.png'), + bloodIcon: require('../../../assets/myself/health/blood_icon.png'), drownList: [], isPageShow: false }; @@ -187,7 +187,7 @@ export default { height: 450px; @include center(); margin: 200px auto 0; - /* background: url('../../../assets/img/news-noData.png') center no-repeat; + /* background: url('../../../assets/myself/news-noData.png') center no-repeat; background-size: 336px 236px; */ p { @include colorAndFont(#999, 28); diff --git a/src/views/myself/deviceSetting/healthMonitor.vue b/src/views/myself/deviceSetting/healthMonitor.vue index c8d496f..a370b9f 100644 --- a/src/views/myself/deviceSetting/healthMonitor.vue +++ b/src/views/myself/deviceSetting/healthMonitor.vue @@ -335,7 +335,7 @@ export default { name: '', data() { return { - rightIcon: require('../../../assets/img/health/right_more.png'), + rightIcon: require('../../../assets/myself/health/right_more.png'), checked: false, sampleinteval: '', //上报频率-定位检测 temperatureAlarmType: ['temperaturevibrateenabled', 'temperaturelcdenabled', 'temperaturereportenabled'], //体温告警方式 diff --git a/src/views/myself/deviceSetting/locationMonitor.vue b/src/views/myself/deviceSetting/locationMonitor.vue index a049a1b..014101e 100644 --- a/src/views/myself/deviceSetting/locationMonitor.vue +++ b/src/views/myself/deviceSetting/locationMonitor.vue @@ -81,7 +81,7 @@ export default { name: '', data() { return { - rightIcon: require('../../../assets/img/health/right_more.png'), + rightIcon: require('../../../assets/myself/health/right_more.png'), checked: false, sampleinteval: 15, //检测周期-定位检测 alarmType: ['a', 'b'], //告警方式 diff --git a/src/views/myself/deviceSetting/personInfos.vue b/src/views/myself/deviceSetting/personInfos.vue index 5601306..d8aa9af 100644 --- a/src/views/myself/deviceSetting/personInfos.vue +++ b/src/views/myself/deviceSetting/personInfos.vue @@ -203,7 +203,7 @@ export default { gender: '男', height: '', weight: '', - rightIcon: require('../../../assets/img/health/right_more.png'), + rightIcon: require('../../../assets/myself/health/right_more.png'), isDateShow: false, currentDate: '', minDate: '', diff --git a/src/views/myself/deviceSetting/psychologicalSetting.vue b/src/views/myself/deviceSetting/psychologicalSetting.vue index 6852013..b779f4b 100644 --- a/src/views/myself/deviceSetting/psychologicalSetting.vue +++ b/src/views/myself/deviceSetting/psychologicalSetting.vue @@ -270,7 +270,7 @@ export default { name: '', data() { return { - rightIcon: require('../../../assets/img/health/right_more.png'), //右边图标 + rightIcon: require('../../../assets/myself/health/right_more.png'), //右边图标 checked: null, //是否选中 interval: 60, //检测周期-定位检测 alarmType: ['reportenabled'], //告警方式 diff --git a/src/views/myself/deviceSetting/sceneMode.vue b/src/views/myself/deviceSetting/sceneMode.vue index feef762..be1942b 100644 --- a/src/views/myself/deviceSetting/sceneMode.vue +++ b/src/views/myself/deviceSetting/sceneMode.vue @@ -54,7 +54,7 @@ export default { name: '', data() { return { - rightIcon: require('../../../assets/img/health/right_more.png'), + rightIcon: require('../../../assets/myself/health/right_more.png'), checked: false, selectConfirmActive: 0, radio: '1', diff --git a/src/views/myself/deviceSetting/settingIndex.vue b/src/views/myself/deviceSetting/settingIndex.vue index a12bafa..8868737 100644 --- a/src/views/myself/deviceSetting/settingIndex.vue +++ b/src/views/myself/deviceSetting/settingIndex.vue @@ -239,7 +239,7 @@ export default { settingListBottomUp: [ { name: '上报周期', iconUrl: '', className: 'uploadinteval', routerName: '', remark: '', powerStatus: '' } ], - rightIcon: /* require('../../../assets/img/health/right_more.png') */ '', + rightIcon: /* require('../../../assets/myself/health/right_more.png') */ '', dialog: { isDialogshow: false, title: '上报周期', diff --git a/src/views/myself/deviceSetting/wearMonitor.vue b/src/views/myself/deviceSetting/wearMonitor.vue index 925bfba..dd8970c 100644 --- a/src/views/myself/deviceSetting/wearMonitor.vue +++ b/src/views/myself/deviceSetting/wearMonitor.vue @@ -342,7 +342,7 @@ export default { name: '', data() { return { - rightIcon: require('../../../assets/img/health/right_more.png'), //右边图标 + rightIcon: require('../../../assets/myself/health/right_more.png'), //右边图标 checked: true, //是否选中 alarmType: ['reportenabled'], //告警方式 reportenabled: true, //是否上报数据,默认为true diff --git a/src/views/myself/index.scss b/src/views/myself/index.scss index 9f2be58..852ae2d 100644 --- a/src/views/myself/index.scss +++ b/src/views/myself/index.scss @@ -1,33 +1,28 @@ .myself { position: relative; - height: 100vh; - width: 100%; - overflow: hidden; + min-height: 100vh; .container { - position: relative; - height: calc(100vh - 160px); - padding: 30px; - overflow: scroll; + padding: 0 30px; .banner { height: 420px; width: 100%; - background-color: green; + background-color: $green; border-radius: 60px; .top { height: 320px; @include flexbox(center, center, column, nowrap); .avatar { - height: 200px; - width: 200px; + height: 130px; + width: 130px; @include flexbox(flex-end, center, column, nowrap); + img { - position: relative; height: 130px; width: 130px; - padding: 10px; - object-fit: cover; + padding: 1px; + background-color: $green; + background-color: #fff; border-radius: 50%; - border: 2px solid #333; } } .nick-name { @@ -35,6 +30,7 @@ span { font-size: 42px; font-weight: bold; + color: #fff; } } } @@ -66,7 +62,7 @@ } &.safe-helper { .title { - font-size: 42px; + font-size: 36px; font-weight: bold; padding: 20px; } diff --git a/src/views/myself/index.vue b/src/views/myself/index.vue index 2b86329..177ff31 100644 --- a/src/views/myself/index.vue +++ b/src/views/myself/index.vue @@ -6,7 +6,7 @@