Merge branch 'main' of https://code.tiantongsl.com/senyao/travel

admin/src/layout/components/Navbar.vue

@@ -129,7 +129,7 @@
         <el-button v-if="QaShow" type="success" @click="drawer = false">关 闭</el-button>
         <el-button v-if="!QaShow" type="success" @click="QaShow = true">返 回</el-button>
         <div v-if="QaShow" class="mod">
-          <el-button v-for="item in getQaCityList" style="width: 150px;" size="medium" type="primary" @click="clickQaList(item)">
+          <el-button v-for="item in getQaCityList" :key="item.city_id" style="width: 150px;" size="medium" type="primary" @click="clickQaList(item)">
             {{ item.city_name }}
           </el-button>
         </div>

admin/src/views/admin/works.vue

@@ -116,7 +116,7 @@
 
     <el-dialog title="主播排班表" :visible.sync="dialogCreate">
       <el-form label-width="120px">
-        <el-row v-for="an in anchors" style="margin-bottom: 10px;">
+        <el-row v-for="an in anchors" :key="an.id" style="margin-bottom: 10px;">
           <el-col :span="2">{{ an.name }}</el-col>
           <el-col :span="14">
             <el-date-picker

admin/src/views/order/back.vue

@@ -82,7 +82,7 @@
           <el-input v-model="item.sn" name="check_sn" placeholder="请输入订单号" />
         </el-form-item>
         <el-form-item label="平台">
-          <el-radio v-for="(value,index) in oss" v-model="item.os" :label="index">{{ value }}</el-radio>
+          <el-radio v-for="(value,index) in oss" v-model="item.os" :key="item.os" :label="index">{{ value }}</el-radio>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

admin/src/views/qa/qa.vue

@@ -10,7 +10,7 @@
       <el-button class="filter-item" type="primary" icon="el-icon-circle-plus" @click="onAdd">添加</el-button>
     </div>
 
-    <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
+    <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%; padding-bottom: 60px !important">
       <el-table-column align="center" label="ID" width="80" prop="id" />
       <el-table-column align="center" label="城市" width="80" prop="qaCitys.city_name" />
       <el-table-column align="center" label="标题" width="280" style="overflow: hidden;">
@@ -402,9 +402,9 @@ export default {
   position: relative;
   padding-bottom: 60px; /* 分页条的高度 */
 }
-::v-deep.el-table--fit{
+/* ::v-deep.el-table--fit{
-  padding-bottom: 0 !important;
+  padding-bottom: 0px !important;
-}
+} */
 .filter-container,
 .el-table {
   padding-bottom: 52px; /* 分页条的高度，以避免内容重叠 */

service/public/static/css/chunk-03e0c360.353ca1f1.css

@@ -1 +1 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-30533d90]{position:relative;padding-bottom:60px}.el-table[data-v-30533d90],.filter-container[data-v-30533d90]{padding-bottom:52px}
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-3c1250e6]{position:relative;padding-bottom:60px}.el-table[data-v-3c1250e6],.filter-container[data-v-3c1250e6]{padding-bottom:52px}

service/public/static/css/chunk-55c2cffb.dc8a9c19.css

@@ -0,0 +1 @@
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.disable-layer[data-v-25113710]{width:100%;height:100%;background:#f5f7fa;position:absolute;top:0;left:0;z-index:99;opacity:.5}.img-box[data-v-14eba1da]{position:relative}.el-icon-folder[data-v-14eba1da]{color:#409eff!important;font-size:100px}.close[data-v-14eba1da]{position:absolute;top:-10px;right:-8px;font-size:18px;color:#409eff}.mistake-content[data-v-14eba1da],.qa-desc[data-v-14eba1da]{display:-webkit-box;display:-ms-flexbox;display:flex}.mistake-left[data-v-14eba1da]{width:90%}.mistake-right[data-v-14eba1da]{padding-left:20px;height:auto;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.app-container[data-v-14eba1da]{position:relative;padding-bottom:60px}.el-table[data-v-14eba1da],.filter-container[data-v-14eba1da]{padding-bottom:52px}.mistake-btn[data-v-14eba1da]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:reverse;-ms-flex-direction:row-reverse;flex-direction:row-reverse;margin-top:10px}.search[data-v-14eba1da]{margin-left:10px}.avatar-uploader .el-upload[data-v-14eba1da]{border:1px solid #131313;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-14eba1da]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-14eba1da]{border:1px solid #979797;border-radius:15px;font-size:28px;color:#8c939d;width:100px;height:100px;line-height:100px;text-align:center;position:relative}

service/public/static/css/chunk-64491af4.52f57a12.css

@@ -1 +0,0 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.disable-layer[data-v-25113710]{width:100%;height:100%;background:#f5f7fa;position:absolute;top:0;left:0;z-index:99;opacity:.5}.img-box[data-v-bc20ec64]{position:relative}.el-icon-folder[data-v-bc20ec64]{color:#409eff!important;font-size:100px}.close[data-v-bc20ec64]{position:absolute;top:-10px;right:-8px;font-size:18px;color:#409eff}.mistake-content[data-v-bc20ec64],.qa-desc[data-v-bc20ec64]{display:-webkit-box;display:-ms-flexbox;display:flex}.mistake-left[data-v-bc20ec64]{width:90%}.mistake-right[data-v-bc20ec64]{padding-left:20px;height:auto;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.app-container[data-v-bc20ec64]{position:relative;padding-bottom:60px}[data-v-bc20ec64].el-table--fit{padding-bottom:0!important}.el-table[data-v-bc20ec64],.filter-container[data-v-bc20ec64]{padding-bottom:52px}.mistake-btn[data-v-bc20ec64]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:reverse;-ms-flex-direction:row-reverse;flex-direction:row-reverse;margin-top:10px}.search[data-v-bc20ec64]{margin-left:10px}.avatar-uploader .el-upload[data-v-bc20ec64]{border:1px solid #131313;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-bc20ec64]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-bc20ec64]{border:1px solid #979797;border-radius:15px;font-size:28px;color:#8c939d;width:100px;height:100px;line-height:100px;text-align:center;position:relative}