1

src/components/activity/OrderManagement.vue

@@ -75,7 +75,7 @@
               {{getDate(item.crateTime)}}
           </td>
           <td class="paddinglr10">
-            <p class="tleft">联系电话： {{item.customerPhone}}</p>
+            <p class="tleft">联系信息： {{item.receiver}}/{{item.customerPhone}}</p>
             <p class="tleft">收货地址： {{item.customerAddress}}</p>
           </td>
           <td>{{item.sendRemark}}</td>

src/components/activity/pushManagement.vue

@@ -99,7 +99,7 @@
           <el-input type="text" v-model="addMsg.MinProgram"  class="w217"></el-input>
         </el-form-item>
         <el-form-item label="推送时间" prop="SendDate">
-          <el-date-picker v-model='addMsg.SendDate' :picker-options="pickerOptions0" class='w217' value-format="yyyy-MM-dd" type="date"></el-date-picker>
+          <el-date-picker v-model='addMsg.SendDate' :picker-options="pickerOptions0" class='w217' value-format="yyyy-MM-dd HH:mm" type="datetime"></el-date-picker>
         </el-form-item>
         <el-form-item label="所属公司">
           <el-select filterable v-model="addMsg.RB_Branch_id">

src/components/index.vue

@@ -70,9 +70,8 @@
                       <span class="MenuConfirm" v-if="item.fatherCount>0">{{item.fatherCount}}</span>
                   </span>
                   <div class="hoverNote"></div>
-                  <!--<div :class="{menuList_son:item.ChildMenu.length>=1}" :style="{width:item.ChildMenu.length>=1 ? ((item.ChildMenu.length*160) + 'px') : '0',left: item.ChildMenu.length>1 ? '-50%' : '0'}" @click.stop>-->
-                  <div v-if="item.ChildMenu && item.ChildMenu.length>0" :class="{menuList_son:item.ChildMenu.length>=1}" :style="{width:item.ChildMenu.length>=1 ? '1300px' : '0',left:'50px'}" style='border: 1px solid #eee;border-top:none;' @click.stop>
-                     <div class="menuList_son_item" @mousemove.stop @mouseout.stop>
+                  <div  @mousemove.stop @mouseout.stop v-if="item.ChildMenu && item.ChildMenu.length>0" :class="{menuList_son:item.ChildMenu.length>=1}" :style="{width:item.ChildMenu.length>=1 ? '1300px' : '0',left:'50px'}" style='border: 1px solid #eee;border-top:none;' @click.stop>
+                     <div class="menuList_son_item">
                        <div v-for="(son, sIndex) in item.ChildMenu" style="width: 150px;border-right: 1px solid rgb(246, 246, 249);">
                          <p class="menuList_son_one_tittle">
                            {{son.MenuName}}
@@ -4364,12 +4363,10 @@ export default {
   margin: 32px 0 14px;
 }
 .nav-middle ul li:hover .menuList_son{
-  // display: block;
+  display: block;
   width: 1000px;
   z-index: 999999;
-  opacity: 1;
   // padding: 20px 0 20px 20px;
-  height: auto;
   // transition: all .5s linear .5s;
   animation:ttt .5s forwards;
 }
@@ -4386,14 +4383,10 @@ export default {
 }
 .nav-middle ul li .menuList_son{
   position: fixed;
-  z-index: 9000;
   background-color: #FFF;
   top: 50px;
-  // display: none;
-  opacity: 0;
-  padding: 0;
+  display: none;
   overflow: hidden;
-  height: 0;
   box-shadow: 0px 0px 50px 0px rgba(82, 63, 105, 0.15);
 }
 .menuList_tittle_box{