update: UI调整

src/views/goods/gift/gift.vue

@@ -18,41 +18,41 @@
         <!-- <div class="page-info">
           <h3><i class="el-icon-info"></i>优惠券已支持主图和图文详情，如需再发布以“微信兑换券”来配送的礼品，请直接前往优惠券中设置</h3>
         </div>-->
-        <div class="operate-top">
-          <div class="fl">
-            <div class="search-item">
+        <div class="search-wrap" style="height: 74px;display: flex;justify-content: space-between;margin-bottom: 22px;">
+          <div class="left" style="width: 732px;height: 74px;display: flex;gap:8px;flex-wrap: wrap;">
+            <div class="search-content-item" style="height:32px;">
               <el-input v-model="searchValue" placeholder="请输入礼品名称/编码进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
             </div>
-            <div class="search-item">
+            <div class="search-content-item" style="height:32px;">
               <el-select v-model="shelf" placeholder="上下架状态" clearable class="w-140" @change="getListCurr">
                 <el-option label="已上架" :value="2"></el-option>
                 <el-option label="已下架" :value="1"></el-option>
               </el-select>
             </div>
-            <div class="search-item">
+            <div class="search-content-item" style="height:32px;">
               <el-select v-model="stockStatus" placeholder="库存状态" clearable class="w-140" @change="getListCurr">
                 <el-option label="有库存" :value="1"></el-option>
                 <el-option label="无库存" :value="2"></el-option>
               </el-select>
             </div>
-            <div class="search-item">
+            <div class="search-content-item" style="height:32px;">
               <el-select v-model="giftType" placeholder="礼品类型" clearable class="w-140" @change="getListCurr">
                 <el-option label="实物礼品" :value="1"></el-option>
                 <el-option label="虚拟礼品" :value="2"></el-option>
               </el-select>
             </div>
-            <div class="search-item">
+            <div class="search-content-item" style="height:32px;">
               <el-select v-model="category" placeholder="礼品分类" class="w-140" clearable @change="getListCurr">
                 <el-option v-for="(v, i) in categoryOptions" :key="i" :label="v.categoryName" :value="v.integralMallCategoryId">
                   <span class="fl">{{ v.categoryName }}</span>
                 </el-option>
               </el-select>
             </div>
-            <div class="search-item">
+            <div class="search-content-item" style="height:32px;">
               <el-checkbox v-model="showSelfStatus" label="仅看本人" border @change="getListCurr" v-if="showFlag"></el-checkbox>
             </div>
           </div>
-          <div class="fr">
+          <div class="right">
             <div class="search-item">
               <el-select v-model="goodsType" placeholder="请选择批量操作" clearable @change="handleData">
                 <el-option label="批量上架" :value="0"></el-option>
@@ -65,8 +65,8 @@
         </div>
         <div v-loading="loading">
           <el-table ref="multipleTable" :data="tableDate" style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectAll">
-            <el-table-column type="selection" width="50" :selectable="selectInit"></el-table-column>
-            <el-table-column label="礼品信息" min-width="300px">
+            <el-table-column fixed type="selection" width="50" :selectable="selectInit"></el-table-column>
+            <el-table-column fixed label="礼品信息" min-width="300px">
               <template slot-scope="scope">
                 <div class="gift-info">
                   <img :src="scope.row.mainImageUrl" alt />
@@ -149,7 +149,7 @@
                 <span style="display:none">{{ refash }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" min-width="220px">
+            <el-table-column fixed="right" label="操作" min-width="220px">
               <template slot-scope="scope">
                 <div>
                   <el-button type="text" @click="getLink(scope.row)" v-if="scope.row.canEdit">推广</el-button>

src/views/order/couponExchange.vue

@@ -37,7 +37,7 @@
               </div>
               <div class="search-item">
                 <span>优惠券创建人</span
-                ><el-autocomplete class="inline-input" :value="creatorName" :select-when-unmatched="true" @change.native="changeAuto" @select="selectCreator" :fetch-suggestions="querySearch" placeholder="请输入创建人" :trigger-on-focus="false">
+                ><el-autocomplete prefix-icon="el-icon-search" class="inline-input" :value="creatorName" :select-when-unmatched="true" @change.native="changeAuto" @select="selectCreator" :fetch-suggestions="querySearch" placeholder="请输入创建人" :trigger-on-focus="false">
                   <template slot-scope="{ item }">{{ item.creatorName }}</template>
                 </el-autocomplete>
               </div>

src/views/order/giftExchange.vue

@@ -53,7 +53,7 @@
                     </el-select>
                   </div>
                   <div class="search-item">
-                    <el-autocomplete class="inline-input" :value="creatorName" :select-when-unmatched="true" @select="selectCreator" @change.native="changeAuto" :fetch-suggestions="querySearch" placeholder="请输入创建人" :trigger-on-focus="false">
+                    <el-autocomplete prefix-icon="el-icon-search" class="inline-input" :value="creatorName" :select-when-unmatched="true" @select="selectCreator" @change.native="changeAuto" :fetch-suggestions="querySearch" placeholder="请输入创建人" :trigger-on-focus="false">
                       <template slot-scope="{ item }">{{ item.creatorName }}</template>
                     </el-autocomplete>
                   </div>

src/views/order/refundList.vue

@@ -39,7 +39,7 @@
                 <!-- <el-input class="w-340" v-model.trim="searchValue" placeholder="请输入商品/会员/订单/退款编号进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input> -->
               </div>
               <div class="search-item">
-                <el-autocomplete class="inline-input" :value="updaterName" :select-when-unmatched="true" @change.native="changeAuto" @select="selectCreator" :fetch-suggestions="querySearch" placeholder="请输入操作人" :trigger-on-focus="false">
+                <el-autocomplete prefix-icon="el-icon-search" class="inline-input" :value="updaterName" :select-when-unmatched="true" @change.native="changeAuto" @select="selectCreator" :fetch-suggestions="querySearch" placeholder="请输入操作人" :trigger-on-focus="false">
                   <template slot-scope="{ item }">{{ item.creatorName }}</template>
                 </el-autocomplete>
               </div>

src/views/setting/deliverSet.vue

@@ -36,16 +36,16 @@
                 <el-input v-model="searchValue" placeholder="请输入自提点名称/code" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
               </div>
               <div class="search-item">
+                <el-autocomplete prefix-icon="el-icon-search" class="inline-input" :value="creatorName" :select-when-unmatched="true" @select="selectCreator" clearable :fetch-suggestions="querySearch" placeholder="请输入创建人" :trigger-on-focus="false">
+                  <template slot-scope="{ item }">{{ item.creatorName }}</template>
+                </el-autocomplete>
+              </div>
+              <div class="search-item">
                 <el-select v-model="isValid" placeholder="自提点状态" clearable class="w-140" @change="getSearchList">
                   <el-option label="失效" :value="0"></el-option>
                   <el-option label="正常" :value="1"></el-option>
                 </el-select>
               </div>
-              <div class="search-item">
-                <el-autocomplete class="inline-input" :value="creatorName" :select-when-unmatched="true" @select="selectCreator" clearable :fetch-suggestions="querySearch" placeholder="请输入创建人" :trigger-on-focus="false">
-                  <template slot-scope="{ item }">{{ item.creatorName }}</template>
-                </el-autocomplete>
-              </div>
             </div>
             <div class="fr">
               <el-button plain @click="exportData"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出自提点</el-button>

src/views/setting/editDeliver.vue

@@ -528,11 +528,7 @@ export default {
       this.$refs[form].validate(valid => {
         if (valid) {
           this.enableAccessControl = localStorage.getItem('enableAccessControl') == 'false' ? false : true;
-          if (this.enableAccessControl) {
-            confirmInfo(this.submitForm, form);
-          } else {
-            this.submitForm(form);
-          }
+          this.submitForm(form);
         } else {
           return false;
         }