Commit 3ebb0f33 by Jings

fix: 修改bug

parent c2847335
......@@ -3,8 +3,8 @@
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditTime: 2020-08-26 10:01:07
* @LastEditors: Drama
* @LastEditTime: 2022-10-13 16:08:46
-->
<!--
......@@ -15,7 +15,7 @@
<div class="app-detail-pane border-box p-lbr-20">
<div class="condition-wrap flex flex-space-between">
<div>
<el-input placeholder="请输入分组名称" maxlength="50" v-model="conditionObj.searchInput" class="w-264" style="width: 217px;" prefix-icon="el-icon-search" @keyup.native="value => toInput(value, conditionObj.searchInput)" clearable @clear="clearInput"></el-input
<el-input placeholder="请输入分组名称" maxlength="50" v-model="conditionObj.searchInput" class="w-264" style="width: 217px" prefix-icon="el-icon-search" @keyup.native="value => toInput(value, conditionObj.searchInput)" clearable @clear="clearInput"></el-input
><el-select class="w-168 m-l-10" v-model="conditionObj.classifyName" placeholder="全部分类" @change="changeCondition">
<el-option label="全部分类" value=""></el-option>
<el-option v-for="item in classifyList" :key="item" :label="item" :value="item"> </el-option> </el-select
......@@ -27,7 +27,7 @@
</div>
<div>
<el-checkbox v-if="$getButtonLimit($buttonCode.groupExpire)" :limit-code="$buttonCode.groupExpire" v-model="overTimeSeeFlag" @change="saveGroupSet" :disabled="$store.state.wxEnterpriseType">
<el-tooltip class="item" effect="dark" content="开启后,GIC中设置的好办端会员分组失效后,即使在GIC开启好办展示,好办移动端也不再展示该条分组" placement="top-start"> <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;margin-left:-4px;" class="font-14 color-606266 m-r-20">会员分组失效后不展示</span></el-tooltip>
<el-tooltip class="item" effect="dark" content="勾选后,失效的分组不在好办小程序端展示" placement="top-start"> <span style="cursor: pointer; padding-bottom: 2px; border-bottom: 1px dashed #2f54eb; margin-left: -4px" class="font-14 color-606266 m-r-20">会员分组失效后不展示</span></el-tooltip>
</el-checkbox>
<el-button v-if="$getButtonLimit($buttonCode.syncGroup)" :limit-code="$buttonCode.syncGroup" type="primary" :loading="loadingBtn" @click="toSync" :disabled="$store.state.wxEnterpriseType">立即同步</el-button>
<span v-if="syncDate" class="font-14 color-606266 p-r-10">最近一次同步时间:{{ syncDate | formatTimeStamp }}</span>
......@@ -58,8 +58,16 @@
</el-table-column> -->
<el-table-column prop="" label="到期时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="line-18">{{ scope.row.effectiveDate | timeStampToYmd }}</div>
<div class="line-18">{{ scope.row.effectiveDate | timeStampToHms }}</div>
<!-- <div class="line-18">{{ scope.row.effectiveDate | timeStampToYmd }}</div>
<div class="line-18">{{ scope.row.effectiveDate | timeStampToHms }}</div> -->
<div v-if="scope.row.isRealTime == 1">
<div class="line-18">--</div>
<div class="line-18">--</div>
</div>
<div v-else>
<div class="line-18">{{ scope.row.effectiveDate | timeStampToYmd }}</div>
<div class="line-18">{{ scope.row.effectiveDate | timeStampToHms }}</div>
</div>
</template>
</el-table-column>
</el-table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment