Merge branch 'feature/会员标签调整' into dev

src/components/wechatmembers/storedValue.vue

@@ -4,7 +4,7 @@
      <v-nav :navpath="navpath"></v-nav>
       <div class="wrap table-container">
         <div class="mBottom20">
-          <el-date-picker  class="w250" v-model="dateTime"  value-format="yyyy-MM-dd HH:mm:ss"  type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="handleTimeChange"></el-date-picker>
+          <el-date-picker  class="w250" v-model="dateTime"  value-format="yyyy-MM-dd"  type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="handleTimeChange"></el-date-picker>
             <el-select
             v-model="searchType"
             placeholder="所有"
@@ -29,14 +29,14 @@
                 prop="businessOccurrenceTime"
                 label="时间"
               >
+                 <template slot-scope="{row}">
+                  {{ row.businessOccurrenceTime | formatTime }}
+                </template>
               </el-table-column>
               <el-table-column
-                prop="businessType"
+                prop="businessTypeName"
                 label="类型"
               >
-                <template slot-scope="scope">
-                  <span>{{scope.row.businessType | typeFilter}}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 prop="storedValueChange"
@@ -44,8 +44,8 @@
               >
               <template slot-scope="{ row }">
                  <span :style="row.storedValueChange>0?'color:green':'color:red'">
-                     <span v-if="row.storedValueChange>0">+</span>
-                     <span else>-</span>
+                     <span v-show="row.storedValueChange>0">+</span>
+                     <span  v-show="row.storedValueChange<0">-</span>
                      {{row.storedValueChange}}
                  </span>
               </template>
@@ -103,6 +103,7 @@ import {
 } from "../../../static/js/checkStatus";
 import { doFetch } from "../../components/axios/api";
 import url from "../../components/axios/url";
+import { formatLongTime } from "@/utils/utils";
 export default ({
   components: {
     "v-nav": nav