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

src/components/SalesModule/enrollTotal.vue

@@ -809,7 +809,7 @@
           <td v-if="isEditOrderCreate == 1">
             <button
               class="normalBtn"
-              style="margin-left: 0; width: 95px; padding: 0"
+              style="margin-left: 0; padding: 0"
               @click="getSalerInfo(item)"
             >
               {{ $t("salesModule.UpdateYWY") }}

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1784,7 +1784,7 @@
           <th width="200">操作</th>
         </tr>
         <tr>
-          <td v-show="list.length == 0" colspan="17" align="center">
+          <td v-show="list.length == 0" colspan="18" align="center">
             暂无数据
           </td>
         </tr>

src/components/SalesModule/productQuery2.vue

@@ -446,7 +446,7 @@
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
     <!-- 产品列表 -->
-    <productOrderList :loading="loading" :list="list" @success="reSearchPage"></productOrderList>
+    <productOrderList :loading="loading" :list="list" @success="reSearchPage" :pagesTitle="pagesTitle"></productOrderList>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
@@ -460,6 +460,7 @@
   export default {
     data() {
       return {
+        pagesTitle: '跟团游产品',
         //当前登录用户信息
         CurrentUserInfo: {},
         userId: "",