Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/guestManagement/Agreement.vue

@@ -396,7 +396,7 @@
             },
         },
         mounted() {
-            this.msg.StartTime = this.getBeforeDate(31, new Date())
+            // this.msg.StartTime = this.getBeforeDate(31, new Date())
             this.msg.EndTime = this.formatDate(new Date(), "YYYY-MM-dd", 0)
             this.userInfo = this.getLocalStorage();
             this.getList();

src/components/myOrdersAllType/components/allList.vue

@@ -13,8 +13,13 @@
     }
     .orderAllList {
       background-color: #ffffff;
+      display: flex;
+      flex-wrap: wrap;
     }
     .orderAllList-box {
+      flex: 1;
+      max-width: 528px;
+      min-width: 450px;
       background-color: #dddee0;
       display: flex;
       margin: 0 5px;
@@ -214,9 +219,7 @@
                 </el-row>
             </div>
             <div class="orderAllList">
-                <el-row :gutter="20">
                   <template v-for="(item,index) in SummaryList">
-                    <el-col :xs="24" :sm="14" :md="12" :lg="8" :xl="6">
                       <div class="orderAllList-box" :key="index">
                         <div class="orderAllList-title">
                           <!-- <span>币种</span> -->
@@ -253,10 +256,8 @@
                         </div>
                       </div>
                     </div>
-                    </el-col>
                   </template>
                   
-                </el-row>
             </div>
             <div class="query-box status-box"></div>
             <orderList :dataList="dataList" :pagesTitle="title" :loading="loading" @emptyMore="emptyMore"></orderList>

src/views/login.vue

@@ -120,7 +120,7 @@
           Domain: "fcrmyx.oytour.com",
         };
         if (!this.isOnline()) {
-          msg.Domain = "localhost";//www.test.com localhost
+          msg.Domain = "www.test.com";//www.test.com localhost
         }
         this.apipost("/api/Login/UserLogin", msg, (res) => {
           var jsonData = res.data;