Merge branch 'dev' of git.gicdev.com:dm4/welfare into dev

src/views/card/card-package/list.vue

@@ -43,7 +43,7 @@
               <el-popover placement="top-start" width="300" trigger="hover" open-delay="200" :offset="-8">
                 <div class="gray01 fz14">
                   <p style="margin-bottom:5px;">卡券包ID：{{ scope.row.couponPackageId }}</p>
-                  <p>更新时间：{{ formatDateTimeByType(scope.row.updateTime, 'yyyy-MM-dd hh:mm:ss') }}</p>
+                  <p>更新时间：{{ formatDateTimeByType(scope.row.updateTime, 'yyyy-MM-dd HH:mm:ss') }}</p>
                 </div>
                 <i class="el-icon-question cursor fz12 gray-lighter" slot="reference"></i>
               </el-popover>
@@ -60,8 +60,8 @@
       </el-table-column>
       <el-table-column label="卡券数量" min-width="120">
         <template slot-scope="scope">
-          <span :class="{ 'danger-color': scope.row.totalCouponSize > scope.row.useCouponSize }">{{ scope.row.useCouponSize }}/{{ scope.row.totalCouponSize }}</span>
-          <el-popover placement="top-start" width="200" trigger="hover" open-delay="200" content="存在已过期或已删除的卡券" v-if="scope.row.totalCouponSize > scope.row.useCouponSize">
+          <span :class="{ 'danger-color': (scope.row.totalCouponSize > scope.row.useCouponSize || scope.row.totalCouponSize == 0) }">{{scope.row.useCouponSize==scope.row.totalCouponSize?scope.row.totalCouponSize:(scope.row.useCouponSize+'/'+scope.row.totalCouponSize)}}</span>
+          <el-popover placement="top-start" width="200" trigger="hover" open-delay="200" :content="scope.row.totalCouponSize > scope.row.useCouponSize?'存在已过期或已删除的卡券':'卡券包中未添加卡券'" v-if="(scope.row.totalCouponSize > scope.row.useCouponSize || scope.row.totalCouponSize == 0)">
             <i class="el-icon-question ml5 cursor gray-lighter" slot="reference"></i>
           </el-popover>
         </template>

src/views/card/gic-card/card-list.vue

@@ -65,7 +65,7 @@
             <el-popover placement="top-start" width="300" trigger="hover" open-delay="200" :offset="-8">
               <div class="gray01 fz14">
                 <p style="margin-bottom:5px;">福利ID：{{ scope.row.couponId }}</p>
-                <p>更新时间：{{ formatDateTimeByType(scope.row.updateTime, 'yyyy-MM-dd hh:mm:ss') }}</p>
+                <p>更新时间：{{ formatDateTimeByType(scope.row.updateTime, 'yyyy-MM-dd HH:mm:ss') }}</p>
               </div>
               <i class="el-icon-question cursor fz12 gray-lighter" slot="reference"></i>
             </el-popover>