Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/busManagement/busUsePrice.vue

@@ -315,7 +315,7 @@
                 </span>
               </el-popover>
             </td>
-            <td rowspan="2" style="text-align:center;">
+            <td style="text-align:center;">
               <el-button-group size='mini'>
                 <el-tooltip class="item" effect="dark" :content="$t('ground.glbaojia')" placement="top-start">
                   <el-button type="primary" class="iconfont icon-bianji-smal" @click="managePrice(item.Id)"></el-button>
@@ -332,14 +332,14 @@
             </td>
           </tr>
           <tr>
-            <td colspan="10">
+            <td colspan="13">
               {{$t('pub.pubRemark')}}: {{item.Remark}}
             </td>
           </tr>
         </tbody>
         <tfoot>
           <tr>
-            <td colspan="11">
+            <td colspan="13">
               <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
                 layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
               </el-pagination>

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -861,7 +861,6 @@
     },
     mounted() {
       this.CurrentUserInfo = this.getLocalStorage();;
-      console.log("this.CurrentUserInfo",this.CurrentUserInfo);
       this.ScrollMethod();
     },
     created() {

src/components/personalCenter/newpersonal.vue

@@ -8,7 +8,7 @@
           <i class="iconfont icon-nan nan"></i>
           <el-tag size="mini" style="margin-left:10px">{{item.postName}}</el-tag>
         </div>
-        <div class="last-msg">{{item.companyName}} · {{item.departmentName}} · {{emEntryStr}}入职</div>
+        <div class="last-msg">{{item.companyName}} · {{item.departmentName}} · {{item.emEntryStr}}入职</div>
       </div>
       <i class="iconfont icon-chat send-msg" title="认识一下" @click="openChart(item)"></i>
     </div>
@@ -28,7 +28,9 @@ export default {
         'this.src="' + require("../../assets/img/default_head_img.jpg") + '"'
     };
   },
-  mounted() {},
+  mounted() {
+
+  },
   methods: {
     openChart(obj) {
       this.MsgBus.$emit("openChat", {

src/components/scenicSpot/scenicRecommentList.vue

@@ -439,7 +439,7 @@
           pageIndex: 1,
           pageSize: 14,
           Name: "",
-          CountryId: 651,
+          CountryId: 0,
           ProviceId: 0,
           CityId: 0,
           total: 0,