调整样式

src/components/card/card.vue

@@ -65,25 +65,25 @@
             <!-- <template slot-scope="scope"> -->
               <!-- <el-radio class="radio-style" :label="scope.row.coupCardId" v-model="radio" :disabled="scope.row.disabled"></el-radio> -->
             <!-- </template> -->
-          <el-table-column :show-overflow-tooltip="true" :min-width="100" align="left" prop="cardName" label="卡券名称"></el-table-column>
-          <el-table-column :show-overflow-tooltip="true" :min-width="100" align="left" prop="subName" label="备注名"></el-table-column>
-          <el-table-column prop="" label="有效期" :min-width="100" :show-overflow-tooltip="false">
+          <el-table-column :show-overflow-tooltip="true" min-width="100" align="left" prop="cardName" label="卡券名称"></el-table-column>
+          <el-table-column :show-overflow-tooltip="true" min-width="100" align="left" prop="subName" label="备注名"></el-table-column>
+          <el-table-column prop="" label="有效期" min-width="130" :show-overflow-tooltip="false">
             <template slot-scope="scope">
-              <div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ formateDateTimeByType(scope.row.beginDate, 'yyyy-MM-dd') + '至' + formateDateTimeByType(scope.row.endDate, 'yyyy-MM-dd') }}</div>
+              <div v-if="scope.row.cardEffectiveMode == 0">固定日期：<br>{{ formateDateTimeByType(scope.row.beginDate, 'yyyy-MM-dd') + '至' + formateDateTimeByType(scope.row.endDate, 'yyyy-MM-dd') }}</div>
               <div v-if="scope.row.cardEffectiveMode == 1">领取后{{ (scope.row.startDay === 0 ? '当' : scope.row.startDay) + '天，有效天数' + scope.row.limitDay }}天</div>
             </template>
           </el-table-column>
-          <el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" width="90">
+          <el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" min-width="100">
             <template slot-scope="scope">
               {{ scope.row.cardLimit }}张/人
             </template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="false" :width="90" align="left" prop="storeMode" label="适用门店">
+          <el-table-column :show-overflow-tooltip="false" min-width="100" align="left" prop="storeMode" label="适用门店">
             <template slot-scope="scope">
               {{ scope.row.storeMode === 0 ? '所有门店' : scope.row.storeMode === 1 ? '部分分组' : '部分门店' }}
             </template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="false" :width="100" align="left" prop="couponStock" label="库存"></el-table-column>
+          <el-table-column :show-overflow-tooltip="false" width="90" align="left" prop="couponStock" label="库存"></el-table-column>
         </el-table>
 
         <div class="pagination" v-if="total > 0">
@@ -480,10 +480,9 @@ export default {
 }
 .attention-textAndImg-wrap {
   .text-img-search {
-    padding: 10px;
+    padding: 16px 10px 0;
     font-size: 14px;
     color: #292929;
-    padding-bottom: 22px;
     display: block;
     overflow: hidden;
     background-color: #f7faff;

src/view/manualTag/manualTagEdit.vue

@@ -106,7 +106,7 @@
         </div>
         <!-- 无标签值 -->
         <div class="no-tag-value" v-else>
-          <p class="font-14 color-909399">你还没有标签值，</p>
+          <p class="font-14 color-909399">你还没有创建标签，</p>
           <p class="m-t-10 font-14 color-909399">请先完善标签基本信息再添加标签值</p>
           <el-button class="m-t-18" :disabled="!canAddTagVal" type="primary" @click="addTagValPop.isShow = true">添加标签值</el-button>
         </div>

src/view/memberGroup/edit-tag.vue

@@ -12,8 +12,10 @@
         </div>
         <p v-if="tagId" class="m-t-20 m-b-20 tag-config">标签值设置</p>
         <!-- 所有标签的配置项 -->
+        <div class="tag-config-options">
           <tag-config-options v-if="isAddFlag" :tagId="tagDataAssgin.tagId" ref="tagConfig" :templateDataList="templateObj" @returnTagData="returnTagData"></tag-config-options>
         </div>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose">取 消</el-button>
         <el-button type="primary" @click="handleSave">确 定</el-button>
@@ -96,8 +98,6 @@ export default {
 
 <style lang="less" scoped>
 .dialog-box {
-  max-height: 70vh;
-  overflow-y: scroll;
   .tag-info {
     padding-bottom: 10px;
     border-bottom: 1px solid #dcdfe6;
@@ -132,6 +132,10 @@ export default {
     font-size: 14px;
     color: #606266;
   }
+  .tag-config-options {
+    max-height: 50vh;
+    overflow-y: scroll;
+  }
   .tag-value {
     margin-top: 10px;
     padding-top: 10px;