Merge remote-tracking branch 'origin/master'

src/views/dashboard/index/index.vue

@@ -4,14 +4,16 @@
       <div class="homepage_topTitle">运营报表</div>
       <div class="titleBottom">
         <div class="titleBottom_companyName">--{{ companyName }}</div>
-        <el-select v-model="company" class="titleTopSelect" :disabled="!queryShop" filterable placeholder="请选择所属商家" @change="changeCompany">
-          <el-option
-            v-for="(item,index) in deptList"
-            :key="index"
-            :label="item.unitName"
-            :value="item.businessId"
-          />
-        </el-select>
+      </div>
+      <div class="titleTopSelect">
+      <el-select v-model="company"  :disabled="!queryShop" filterable placeholder="请选择所属商家" @change="changeCompany">
+        <el-option
+          v-for="(item,index) in deptList"
+          :key="index"
+          :label="item.unitName"
+          :value="item.businessId"
+        />
+      </el-select>
       </div>
     </div>
 
@@ -739,14 +741,16 @@ export default {
   padding-top: 20px;
   display: flex;
   align-items: center;
-  justify-content: right;
+  justify-content: center;
   //margin-left: 450px;
   .titleBottom_companyName{
     padding-right: 20px;
   }
-  .titleTopSelect{
-    margin: 0 250px 0 130px;
-  }
+
+}
+.titleTopSelect{
+  display: flex;
+  justify-content: end;
 }
   .el-row{
     margin-bottom: 20px;