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

dist/css/card-package.55b42bce.css → dist/css/card-package.84066fa1.css

-.ml40[data-v-29eba1e0]{margin-left:40px}.filter-block[data-v-29eba1e0]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-29eba1e0]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-29eba1e0]{padding-left:70px;min-height:60px;position:relative}.card img[data-v-29eba1e0]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-29eba1e0]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-f4951480]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-f4951480]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
+.ml40[data-v-29eba1e0]{margin-left:40px}.filter-block[data-v-29eba1e0]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-29eba1e0]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-29eba1e0]{padding-left:70px;min-height:60px;position:relative}.card img[data-v-29eba1e0]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-29eba1e0]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-aff5dd22]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-aff5dd22]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file

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

@@ -67,7 +67,7 @@
                   <el-button @click="delCard(item)" type="text">删除</el-button>
                 </el-col>
               </el-row>
-              <div v-if="item.remainedStock < ruleForm.packageStock" class="gray03"><i class="el-icon-warning mr5 danger-color"></i>卡券包库存大于福利库存，请调整福利占用库存</div>
+              <div v-if="item.activityRemainedStock < ruleForm.packageStock" class="gray03"><i class="el-icon-warning mr5 danger-color"></i>卡券包库存大于福利库存，请调整福利占用库存</div>
             </div>
           </div>
         </div>

src/views/card/gic-card/member-get.vue

@@ -64,7 +64,7 @@
                   <li>核销渠道：{{ formatChannel(scope.row) }}</li>
                   <li>核销门店/店铺：{{ scope.row.verifyStoreCode || '--' }}/{{ scope.row.verifyStoreName || '--' }}</li>
                 </template>
-                <li v-if="scope.row.statusFlag  == 7">销毁时间：{{ scope.row.destroyTime }}</li>
+                <li v-if="scope.row.statusFlag  == 7">销毁时间：{{ formatDateTimeByType(scope.row.destroyTime) }}</li>
               </ul>
               <i class="el-icon-more cursor" slot="reference"></i>
             </el-popover>