Merge remote-tracking branch 'origin/master' into ljh-sass

src/views/system/announceManage.vue

@@ -80,11 +80,14 @@
           <el-switch v-model="editForm.priority"></el-switch>
         </el-form-item>
       </el-form>
+      <div v-if="dialogVisible">
         <v-editor
           filename="files"
           v-model="editForm.content"
           ref="wangeditor"
           height="300px" />
+      </div>
+
       <div slot="footer">
         <el-button @click="dialogVisible = false" size="mini">取 消</el-button>
         <el-button type="primary" @click="submit" size="mini">确 定</el-button>

src/views/user/rechargeRecord.vue

@@ -184,7 +184,7 @@
         <el-table-column
           label="付款时间"
           sortable="custom"
-          prop="clientTime"
+          prop="serverTime"
           header-align="center"
           align="center"
           width="160"
@@ -230,7 +230,9 @@ export default {
       period: [],
       subjectList: [],
       sortParmas: {},
-      searchForm: {},
+      searchForm: {
+        payStatus: '已支付'
+      },
       total: 0,
       pageSize: 50,
       currentPage: 1,