合并test分支

替换 我的 子菜单图标

src/components/SubmenuList.vue

@@ -10,7 +10,7 @@
     <div class="main">
       <div class="list">
         <div class="item" v-for="(item, index) in list" :key="index" @click="onItemClick(item)">
-          <div class="img-icon-con" :style="{ borderRadius: rounded ? '50%' : '8px', backgroundColor: item.bgColor }">
+          <div class="img-icon-con" :style="{ borderRadius: rounded ? '50%' : '', backgroundColor: '#fff' }">
             <img :src="item.imgPath" alt="" />
           </div>
           <div class="text">
@@ -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;
         }

src/views/myself/callList.vue

@@ -1,31 +1,33 @@
 <template>
   <div class="call-list">
-    <van-nav-bar title="通话清单" left-arrow :border="true" @click-left="onNavBack" />
-    <div class="newsNotData" v-show="list.length == 0">您暂时还没有通话记录~</div>
-    <van-list
-      v-model="loading"
-      class="call-list-container"
-      :finished="finished"
-      finished-text="没有更多了"
-      @load="onLoad"
-    >
-      <div v-for="(item, index) in list" :key="index" :title="item" class="call-list">
-        <van-row type="flex" justify="center" class="date-row">
-          <van-col span="12">
-            <!--<p class="call-list-date">{{item.dDateTime}}</p>-->
-          </van-col>
-        </van-row>
-        <div class="call-list-content">
-          <van-row type="flex" justify="center">
-            <van-col span="23" offset="1">
-              <p class="call-list-record">通话记录</p>
-              <p class="call-list-detail">{{ item.dDateTime }}</p>
-              <p class="call-list-detail">{{ item.sCallLog }}</p>
+    <van-nav-bar title="通话清单" left-arrow :border="true" @click-left="onNavBack" left-text="返回" />
+    <div class="call-list-con">
+      <div class="newsNotData" v-show="list.length == 0">您暂时还没有通话记录~</div>
+      <van-list
+        v-model="loading"
+        class="call-list-container"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+      >
+        <div v-for="(item, index) in list" :key="index" :title="item" class="call-list">
+          <van-row type="flex" justify="center" class="date-row">
+            <van-col span="12">
+              <!--<p class="call-list-date">{{item.dDateTime}}</p>-->
             </van-col>
           </van-row>
+          <div class="call-list-content">
+            <van-row type="flex" justify="center">
+              <van-col span="23" offset="1">
+                <p class="call-list-record">通话记录</p>
+                <p class="call-list-detail">{{ item.dDateTime }}</p>
+                <p class="call-list-detail">{{ item.sCallLog }}</p>
+              </van-col>
+            </van-row>
+          </div>
         </div>
-      </div>
-    </van-list>
+      </van-list>
+    </div>
   </div>
 </template>
 
@@ -75,44 +77,45 @@ export default {
 
 <style lang="scss" scoped>
 .call-list {
-  .newsNotData {
+  overflow: hidden;
+  .call-list-con {
     height: calc(100vh - 160px);
-    @include flexbox(center, center, column, nowrap);
-    font-size: 32px;
-  }
-  .call-list-container {
     padding: 30px;
-    height: calc(100vh - 160px);
     overflow: scroll;
-  }
-  .call-list-date {
-    color: #999;
-    font-size: 28px;
-    text-align: center;
-    margin-bottom: 40px;
-  }
-  .call-list-content {
-    background-color: #f0f0f0ef;
-    padding: 20px;
-    border-radius: 30px;
-    margin-top: 20px;
-    .call-list-record {
-      color: #313131;
+    .newsNotData {
+      @include flexbox(center, center, column, nowrap);
+      font-size: 32px;
+      padding: 30px;
+    }
+    .call-list-date {
+      color: #999;
       font-size: 28px;
+      text-align: center;
       margin-bottom: 40px;
     }
-    .call-list-detail {
+    .call-list-content {
+      background-color: #f0f0f0ef;
+      padding: 20px;
+      border-radius: 30px;
+      margin-top: 20px;
+      .call-list-record {
+        color: #313131;
+        font-size: 28px;
+        margin-bottom: 40px;
+      }
+      .call-list-detail {
+        color: #313131;
+        font-size: 30px;
+      }
+    }
+    .record {
       color: #313131;
       font-size: 30px;
     }
-  }
-  .record {
-    color: #313131;
-    font-size: 30px;
-  }
-  .detail {
-    color: #666;
-    font-size: 28px;
+    .detail {
+      color: #666;
+      font-size: 28px;
+    }
   }
 }
 </style>

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;

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'], //体温告警方式

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'], //体温告警方式

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);

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'], //体温告警方式

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'], //告警方式

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: '',

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'], //告警方式

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',

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: '上报周期',

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

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;
                 }

src/views/myself/index.vue

@@ -6,7 +6,7 @@
       <div class="banner">
         <div class="top">
           <div class="avatar">
-            <img :src="userInfos.imagePath" alt="" />
+            <img src="../../assets/myself/4_62.png" alt="" />
           </div>
           <div class="nick-name">
             <span>{{ userInfos.username }}</span>
@@ -73,21 +73,21 @@ export default {
         title: '亲情沟通',
         list: [
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_76.png'),
             text: '亲情号码',
             bgColor: this.$green,
             showType: 'newPage',
             routerName: 'familyNumber'
           },
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_79.png'),
             text: '留言',
             bgColor: this.$green,
             showType: 'newPage',
             routerName: 'sendMessage'
           },
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_81.png'),
             text: '通话记录',
             bgColor: this.$green,
             showType: 'newPage',
@@ -98,55 +98,50 @@ export default {
       device: {
         title: '孩子管理',
         list: [
-          /* { imgPath: require('../../assets/logo.png'), text: '测试设置', bgColor: 'green' },
-          { imgPath: require('../../assets/logo.png'), text: '测试设置', bgColor: 'green' },
-          { imgPath: require('../../assets/logo.png'), text: '测试设置', bgColor: 'green' },
-          { imgPath: require('../../assets/logo.png'), text: '留言', bgColor: 'green' },
-          { imgPath: require('../../assets/logo.png'), text: '留言', bgColor: 'green' },
-          { imgPath: require('../../assets/logo.png'), text: '测试设置', bgColor: 'green' },
-          { imgPath: require('../../assets/logo.png'), text: '留言', bgColor: 'green' },
-          { imgPath: require('../../assets/logo.png'), text: '留言', bgColor: 'green' } */
+          { imgPath: require('../../assets/myself/4_62.png'), text: '孩子1', bgColor: 'green' },
+          { imgPath: require('../../assets/myself/4_62.png'), text: '孩子2', bgColor: 'green' },
+          { imgPath: require('../../assets/myself/4_62.png'), text: '孩子3', bgColor: 'green' }
         ]
       },
       studyHelper: {
         title: '学习助手',
         list: [
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_88.png'),
             text: '课堂禁用',
             bgColor: this.$green,
             showType: 'newPage',
             routerName: 'prohibit'
           },
-          { imgPath: require('../../assets/logo.png'), text: '课程表', bgColor: 'green' }
+          { imgPath: require('../../assets/myself/4_91.png'), text: '课程表', bgColor: 'green' }
         ]
       },
       lifeHelper: {
         title: '生活助手',
         list: [
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_104.png'),
             text: '闹钟',
             bgColor: this.$green,
             showType: 'newPage',
             routerName: 'clock'
           },
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_107.png'),
             text: '支付密码修改',
             bgColor: this.$green,
             showType: 'newPage',
             routerName: 'changePayPassword'
           },
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_109.png'),
             text: '短信代收',
             bgColor: this.$green,
             showType: 'newPage',
             routerName: 'messageList'
           },
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_96.png'),
             text: '亲友关注',
             bgColor: this.$green,
             showType: 'newPage',
@@ -158,21 +153,21 @@ export default {
         title: '参数设置',
         list: [
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_98.png'),
             text: '参数设置',
             bgColor: this.$green,
             showType: 'newPage',
             routerName: 'watchSetting'
           },
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_111.png'),
             text: '远程控制',
             bgColor: this.$green,
             showType: 'newDialog',
             routerName: 'remote'
           },
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_101.png'),
             text: '休眠设置',
             bgColor: this.$green,
             showType: 'newPage',
@@ -184,22 +179,29 @@ export default {
         title: '其他设置',
         list: [
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_42.png'),
+            text: '账户安全',
+            bgColor: this.$green,
+            showType: '',
+            routerName: ''
+          },
+          {
+            imgPath: require('../../assets/myself/4_45.png'),
             text: '常见问题',
             bgColor: this.$green,
             showType: 'newPage',
             routerName: 'help'
           },
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_47.png'),
             text: '版本信息',
             bgColor: this.$green,
             showType: 'newDialog',
             routerName: 'version'
           },
-          { imgPath: require('../../assets/logo.png'), text: '关于我们', bgColor: 'green' },
+          { imgPath: require('../../assets/myself/4_53.png'), text: '关于我们', bgColor: 'green' },
           {
-            imgPath: require('../../assets/logo.png'),
+            imgPath: require('../../assets/myself/4_72.png'),
             text: '退出登录',
             bgColor: 'green',
             showType: 'newDialog',
@@ -208,7 +210,7 @@ export default {
         ]
       },
 
-      userImg: require('../../assets/logo.png'), //用户头像
+      userImg: require('../../assets/myself/4_62.png'), //用户头像
       currentDevice: {
         address: '',
         lat: '',
@@ -252,7 +254,7 @@ export default {
         .then(res => {
           let item = res.data;
           this.longName = item.longName;
-          this.device.list =
+          /* this.device.list =
             item.devicesList == null
               ? []
               : item.devicesList.map(device => {
@@ -261,7 +263,7 @@ export default {
                     text: device.nickName ? device.nickName : device.serialNo.slice(-3),
                     bgColor: 'green'
                   };
-                });
+                }); */
 
           if (isNotNull(item.devicesList)) {
             this.currentDevice = { ...item.devicesList[0] };

src/views/myself/location.scss

@@ -202,7 +202,7 @@
                 /* @include icon_position(50, 50, 50, 200); */
                 background: no-repeat;
                 margin: 5px 42px 0 53px;
-                @include bgimg(url('../..//assets/img/home/spread_left.png'), 34, 35);
+                @include bgimg(url('../../assets/myself/home/spread_left.png'), 34, 35);
             }
         }
         .noData {

src/views/myself/location.vue

@@ -263,37 +263,37 @@ export default {
         {
           index: 5,
           fastKey: '地图',
-          fastImgPath: require('../../assets/img/home/layer.png'),
+          fastImgPath: require('../../assets/myself/home/layer.png'),
           className: 'layer'
         },
         {
           index: 2,
           fastKey: '轨迹',
-          fastImgPath: require('../../assets/img/home/trajectory.png'),
+          fastImgPath: require('../../assets/myself/home/trajectory.png'),
           className: 'trajectory'
         },
         {
           index: 1,
           fastKey: '告警',
-          fastImgPath: require('../../assets/img/home/warning.png'),
+          fastImgPath: require('../../assets/myself/home/warning.png'),
           className: 'warning'
         },
         {
           index: 6,
           fastKey: '留言',
-          fastImgPath: require('../../assets/img/home/message.png'),
+          fastImgPath: require('../../assets/myself/home/message.png'),
           className: 'message'
         },
         /* {
           index: 7,
           fastKey: '拨打',
-          fastImgPath: require('../../assets/img/home/phone.png'),
+          fastImgPath: require('../../assets/myself/home/phone.png'),
           className: 'phone'
         }, */
         {
           index: 0,
           fastKey: '隐藏',
-          fastImgPath: require('../../assets/img/home/spread_right.png'),
+          fastImgPath: require('../../assets/myself/home/spread_right.png'),
           className: 'spread_right'
         }
       ], //快捷键
@@ -308,8 +308,8 @@ export default {
       spMarker: '', //扩散动画的marker
       deviceSportsStatus: null, //设备运动状态
       isCloseSportStatus: null, //是否可以关闭设备运动状态, 跑步中/静止中
-      lbsIcon: require('../../assets/img/home/lbs_icon.png'),
-      closeIcon: require('../../assets/img/home/md-highlight_off.svg'),
+      lbsIcon: require('../../assets/myself/home/lbs_icon.png'),
+      closeIcon: require('../../assets/myself/home/md-highlight_off.svg'),
       isShowLbsTips: false,
       isShowShortcuts: true //是否显示快捷方式
     };

src/views/myself/news/news.vue

@@ -373,7 +373,7 @@ export default {
                 &:after {
                   width: 50px;
                   height: 50px;
-                  background: url('~@/assets/img/drownReport.png') no-repeat;
+                  background: url('~@/assets/myself/drownReport.png') no-repeat;
                   background-size: 50px;
                 }
               }
@@ -389,7 +389,7 @@ export default {
                 &:after {
                   width: 50px;
                   height: 50px;
-                  background: url('~@/assets/img/callLog.png') no-repeat;
+                  background: url('~@/assets/myself/callLog.png') no-repeat;
                   background-size: 50px;
                 }
               }
@@ -405,7 +405,7 @@ export default {
                 &:after {
                   width: 50px;
                   height: 50px;
-                  background: url('~@/assets/img/healthy.png') no-repeat;
+                  background: url('~@/assets/myself/healthy.png') no-repeat;
                   background-size: 50px;
                 }
               }
@@ -421,7 +421,7 @@ export default {
                 &:after {
                   width: 50px;
                   height: 50px;
-                  background: url('~@/assets/img/noWear.png') no-repeat;
+                  background: url('~@/assets/myself/noWear.png') no-repeat;
                   background-size: 50px;
                 }
               }

src/views/myself/prohibit.vue

@@ -244,7 +244,8 @@ export default {
     .noData_img,
     .watchTips {
       font-size: 32px;
-      height: 400px;
+      min-height: 200px;
+      padding: 30px;
       @include flexbox(center, center, column, nowrap);
     }
   }

src/views/myself/trajectory.vue

@@ -1839,7 +1839,7 @@ export default {
   align-items: center;
   width: 60px;
   height: 80px;
-  background: url(../../assets/img/tooltip-sizing.png);
+  background: url(../../assets/myself/tooltip-sizing.png);
 }
 
 .imageArea img {