添加注释，测试功能，选择部门组件报错，会员详情积分字段展示错误，售后原因添加标识判断是新增还是编辑

manager/src/views/member/advance/walletLog.vue

@@ -145,7 +145,6 @@ export default {
     },
     // 获取列表数据
     getDataList() {
-      // 带多条件搜索参数获取表单数据 请自行修改接口
       getUserWallet(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success) {

manager/src/views/member/list/memberDetail.vue

@@ -64,13 +64,13 @@
       </div>
     </Card>
 
-    <Card>
+    <Card class="mt_10">
       <Tabs type="point" @on-click="memberInfoChange">
         <TabPane label="TA的积分" name="point">
           <div class="pointsTitle" style="justify-content: flex-start; text-align: left;">
             <div style="width: 120px;">
               <div class="points-top-title">
-                积分余额
+                剩余积分
               </div>
               <div class="points-top-text">
                 {{memberInfo.point?memberInfo.point:0}}
@@ -85,8 +85,6 @@
                 :data="pointData"
                 class="mt_10"
                 ref="table"
-                sortable="custom"
-                @on-sort-change="pointChangeSort"
               >
               </Table>
 
@@ -174,8 +172,6 @@
               :data="orderData"
               ref="table"
               class="mt_10"
-              sortable="custom"
-              @on-sort-change="orderChangeSort"
             >
             </Table>
 
@@ -253,8 +249,6 @@
             :data="walletData"
             ref="table"
             class="mt_10"
-            sortable="custom"
-            @on-sort-change="walletChangeSort"
           >
           </Table>
 
@@ -295,8 +289,6 @@
             :data="receiptRecordData"
             class="mt_10"
             ref="table"
-            sortable="custom"
-            @on-sort-change="walletChangeSort"
           >
             <template slot="orderSnSlot" slot-scope="scope">
 
@@ -428,7 +420,7 @@
             key: "point",
             width: 150,
             render: (h, params) => {
-              if (params.row.pointType == 1) {
+              if (params.row.pointType == 'INCREASE') {
                 return h('div', [
                   h('span', {
                     style: {
@@ -1079,6 +1071,7 @@
       ,
       //积分记录页数变化
       pointChangePageSize(v) {
+        this.pointSearchForm.pageNumber = 1;
         this.pointSearchForm.pageSize = v;
         this.getPointData();
       }
@@ -1091,6 +1084,7 @@
       ,
       //会员地址记录页数变化
       addressChangePageSize(v) {
+        this.addressSearchForm.pageNumber = 1;
         this.addressSearchForm.pageSize = v;
         this.getPointData();
       },
@@ -1103,6 +1097,7 @@
       ,
       //余额记录页数变化
       walletChangePageSize(v) {
+        this.walletSearchForm.pageNumber = 1;
         this.walletSearchForm.pageSize = v;
         this.getDepositLogData();
       },
@@ -1115,31 +1110,11 @@
       ,
       //订单记录页数变化
       orderChangePageSize(v) {
+        this.orderSearchForm.pageNumber = 1;
         this.orderSearchForm.pageSize = v;
         this.getOrderData();
       },
-      orderChangeSort(e) {
-        this.orderSearchForm.sort = e.key;
-        this.orderSearchForm.order = e.order;
-        this.getOrderData();
-      },
-      addressChangeSort(e) {
-        this.addressSearchForm.sort = e.key;
-        this.addressSearchForm.order = e.order;
-        this.getPointData();
-      }
-
-      ,
-      walletChangeSort(e) {
-        this.walletSearchForm.sort = e.key;
-        this.walletSearchForm.order = e.order;
-        this.getDepositLogData();
-      },
-      pointChangeSort(e) {
-        this.pointSearchForm.sort = e.key;
-        this.pointSearchForm.order = e.order;
-        this.getPointData();
-      },
+      // 起止时间从新赋值
       selectDateRange(v) {
         if (v) {
           this.orderSearchForm.startDate = v[0];

manager/src/views/member/message-manage/messageManage.scss

@@ -1,5 +0,0 @@
-.wangEditor {
-    .ivu-form-item-content {
-        line-height: unset !important;
-    }
-}

manager/src/views/member/notice/addMessage.vue

@@ -1,211 +0,0 @@
-<style lang="scss"  scoped>
-@import "../message-manage/messageManage.scss";
-</style>
-<template>
-  <div>
-    <Card>
-      <p slot="title">
-        <span v-if="type==0">发送新消息</span>
-        <span v-else>编辑消息</span>
-      </p>
-      <Row>
-        <Form
-          ref="form"
-          :model="form"
-          :label-width="90"
-          :rules="formValidate"
-          style="position:relative"
-        >
-          <FormItem label="标题" prop="title">
-            <Input v-model="form.title" style="width:600px" />
-          </FormItem>
-          <FormItem label="内容" prop="content" class="wangEditor">
-            <editor v-model="form.content"></editor>
-          </FormItem>
-          <div v-if="type==0">
-            <FormItem label="发送范围">
-              <RadioGroup type="button" button-style="solid" v-model="form.sendType" >
-                <Radio label="ALL">全部会员</Radio>
-                <Radio label="SELECT">指定会员</Radio>
-              </RadioGroup>
-            </FormItem>
-            <div>
-              <FormItem label="选择用户" v-if="form.sendType==='SELECT'">
-                <member-choose text="选择发送用户" @on-change="handleSelectUser"></member-choose>
-              </FormItem>
-            </div>
-          </div>
-          <Form-item class="br">
-            <Button
-              type="primary"
-              :loading="submitLoading"
-              @click="handleSubmit"
-              style="width:100px"
-            >提交</Button>
-            <Button @click="handelCancel">取消</Button>
-          </Form-item>
-          <Spin size="large" fix v-if="loading"></Spin>
-        </Form>
-      </Row>
-    </Card>
-  </div>
-</template>
-
-<script>
-import editor from "@/views/my-components/lili/editor";
-import memberChoose from "@/views/my-components/lili/member-choose";
-export default {
-  name: "add_message",
-  components: {
-    memberChoose,
-    editor
-  },
-  data() {
-    return {
-      type: 0, // 0 发送新消息 1 编辑消息
-      loading: false, // 表单加载状态
-      selectUsers: [], // 选择用户
-      modalTitle: "", // 添加或编辑标题
-      form: {
-        // 添加或编辑表单对象初始化数据
-        title: "",
-        content: "",
-        sendType: "ALL",
-        memberIds: ""
-      },
-      formValidate: {
-        // 表单验证规则
-        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
-        content: [{ required: true, message: "内容不能为空", trigger: "blur" }]
-      },
-      submitLoading: false, // 添加或编辑提交状态
-      backRoute: "" // back路由路径
-    };
-  },
-  methods: {
-    init() {
-      this.type = this.$route.query.type;
-      this.backRoute = this.$route.query.backRoute;
-      if (this.type == 1) {
-        this.form.id = this.$route.query.id;
-        this.getData();
-      }
-    },
-    getData() {
-      this.loading = true;
-      getMessageDataById(this.form.id).then(res => {
-        this.loading = false;
-        if (res.success) {
-          // 转换null为""
-          let v = res.result;
-          for (let attr in v) {
-            if (v[attr] == null) {
-              v[attr] = "";
-            }
-          }
-          let str = JSON.stringify(v);
-          let data = JSON.parse(str);
-          this.form = data;
-        }
-      });
-    },
-    handleSubmit() {
-      this.$refs.form.validate(valid => {
-
-        let ids = [];
-        this.selectUsers.forEach(e => {
-          ids += e.id + ",";
-        });
-        if (ids.length > 0) {
-          ids = ids.substring(0, ids.length - 1);
-        }
-        this.form.memberIds = ids;
-
-        if (valid) {
-          this.submitLoading = true;
-          if (this.modalType === 0) {
-            // 添加 避免编辑后传入id等数据 记得删除
-            this.postRequest("/memberNoticeSenter/insertOrUpdate", this.form).then(res => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.modalVisible = false;
-              }
-            });
-          } else {
-            // 编辑
-            this.postRequest("/memberNoticeSenter/insertOrUpdate", this.form).then(res => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.modalVisible = false;
-              }
-            });
-          }
-        }
-      });
-    },
-    handelSubmit() {
-      console.log()
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.submitLoading = true;
-          if (this.type == 0) {
-            // 添加 避免编辑后传入id等数据 记得删除
-            delete this.form.id;
-            // 用户id数据
-
-            addMessage(this.form).then(res => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.closeCurrentPage();
-              }
-            });
-          } else if (this.type == 1) {
-            // 编辑
-            editMessage(this.form).then(res => {
-              this.submitLoading = false;
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.closeCurrentPage();
-              }
-            });
-          }
-        }
-      });
-    },
-    handleSelectUser(v) {
-      this.selectUsers = v;
-    },
-    handelCancel() {
-      this.closeCurrentPage();
-    },
-    // 关闭当前页面
-    closeCurrentPage() {
-      this.$store.commit("removeTag", "add_message");
-      localStorage.pageOpenedList = JSON.stringify(
-        this.$store.state.app.pageOpenedList
-      );
-      this.$router.push({
-        name: this.backRoute
-      });
-    }
-  },
-  mounted() {
-    this.init();
-  },
-  watch: {
-    // 监听路由变化
-    $route(to, from) {
-      if (to.name == "member-notice-sender") {
-        this.type = this.$route.query.type;
-        if (this.type == 1) {
-          this.form.id = this.$route.query.id;
-          this.getData();
-        }
-      }
-    }
-  }
-};
-</script>

manager/src/views/member/notice/sender.vue

@@ -1,370 +0,0 @@
-<template>
-  <div class="search">
-    <Card>
-      <Row @keydown.enter.native="handleSearch">
-        <Form
-          ref="searchForm"
-          :model="searchForm"
-          inline
-          :label-width="70"
-          class="search-form"
-        >
-          <Form-item label="标题" prop="title">
-            <Input
-              type="text"
-              v-model="searchForm.title"
-              placeholder="请输入标题"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <Form-item label="消息内容" prop="content">
-            <Input
-              type="text"
-              v-model="searchForm.content"
-              placeholder="请输入消息内容"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-          <span v-if="drop">
-            <Form-item label="发送类型" prop="sendType">
-              <Select
-                v-model="searchForm.sendType"
-                placeholder="请选择"
-                clearable
-                style="width: 200px"
-              >
-                <Option value="ALL">全站会员</Option>
-                <Option value="SELECT">指定会员</Option>
-              </Select>
-            </Form-item>
-            <Form-item label="创建人" prop="createBy">
-              <Input
-                type="text"
-                v-model="searchForm.createBy"
-                placeholder="请输入创建人"
-                clearable
-                style="width: 200px"
-              />
-            </Form-item>
-          </span>
-          <Form-item style="margin-left: -35px" class="br">
-            <Button @click="handleSearch" type="primary" icon="ios-search"
-              >搜索</Button
-            >
-            <Button @click="handleReset">重置</Button>
-            <a class="drop-down" @click="dropDown">
-              {{ dropDownContent }}
-              <Icon :type="dropDownIcon"></Icon>
-            </a>
-          </Form-item>
-        </Form>
-      </Row>
-      <Row class="operation">
-        <Button @click="add" type="primary" icon="md-add">发送新消息</Button>
-        <Button @click="delAll" icon="md-trash">批量删除</Button>
-        <Button @click="getDataList" icon="md-refresh">刷新</Button>
-      </Row>
-      <Row v-show="openTip">
-        <Alert show-icon>
-          已选择 <span class="select-count">{{ selectCount }}</span> 项
-          <a class="select-clear" @click="clearSelectAll">清空</a>
-        </Alert>
-      </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      ></Table>
-      <Row type="flex" justify="end" class="mt_10">
-        <Page
-          :current="searchForm.pageNumber"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
-      </Row>
-    </Card>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "member-notice-sender",
-  components: {},
-  data() {
-    return {
-      openSearch: true, // 显示搜索
-      openTip: true, // 显示提示
-      loading: true, // 表单加载状态
-      modalType: 0, // 添加或编辑标识
-      modalVisible: false, // 添加或编辑显示
-      modalTitle: "", // 添加或编辑标题
-      drop: false, // 更多搜索项
-      dropDownContent: "展开", // drop中文提示
-      dropDownIcon: "ios-arrow-down", // drop图标
-      searchForm: {
-        // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
-        sort: "createTime", // 默认排序字段
-        order: "desc", // 默认排序方式
-      },
-      submitLoading: false, // 添加或编辑提交状态
-      selectList: [], // 多选数据
-      selectCount: 0, // 多选计数
-      columns: [
-        // 表头
-        {
-          type: "selection",
-          width: 60,
-          align: "center",
-        },
-        {
-          type: "index",
-          width: 60,
-          align: "center",
-        },
-        {
-          title: "标题",
-          key: "title",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          title: "发送类型",
-          key: "sendType",
-          minWidth: 120,
-          sortable: false,
-
-          render: (h, params) => {
-            if (params.row.sendType == "ALL") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "全部会员",
-                  },
-                }),
-              ]);
-            } else {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "指定会员",
-                  },
-                }),
-              ]);
-            }
-          },
-        },
-        {
-          title: "创建人",
-          key: "createBy",
-          minWidth: 120,
-          sortable: false,
-        },
-        {
-          title: "创建时间",
-          key: "createTime",
-          minWidth: 120,
-          sortable: true,
-        },
-        {
-          title: "操作",
-          key: "action",
-          align: "center",
-          width: 200,
-          render: (h, params) => {
-            return h("div", [
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "error",
-                    size: "small",
-                    icon: "md-trash",
-                  },
-                  on: {
-                    click: () => {
-                      this.remove(params.row);
-                    },
-                  },
-                },
-                "删除"
-              ),
-            ]);
-          },
-        },
-      ],
-      data: [], // 表单数据
-      total: 0, // 表单数据总数
-    };
-  },
-  methods: {
-    init() {
-      this.getDataList();
-    },
-    changePage(v) {
-      this.searchForm.pageNumber = v;
-      this.getDataList();
-      this.clearSelectAll();
-    },
-    changePageSize(v) {
-      this.searchForm.pageSize = v;
-      this.getDataList();
-    },
-    handleSearch() {
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      this.getDataList();
-    },
-    handleReset() {
-      this.$refs.searchForm.resetFields();
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
-      // 重新加载数据
-      this.getDataList();
-    },
-    changeSort(e) {
-      this.searchForm.sort = e.key;
-      this.searchForm.order = e.order;
-      if (e.order === "normal") {
-        this.searchForm.order = "";
-      }
-      this.getDataList();
-    },
-    clearSelectAll() {
-      this.$refs.table.selectAll(false);
-    },
-    changeSelect(e) {
-      this.selectList = e;
-      this.selectCount = e.length;
-    },
-    dropDown() {
-      if (this.drop) {
-        this.dropDownContent = "展开";
-        this.dropDownIcon = "ios-arrow-down";
-      } else {
-        this.dropDownContent = "收起";
-        this.dropDownIcon = "ios-arrow-up";
-      }
-      this.drop = !this.drop;
-    },
-    getDataList() {
-      this.loading = true;
-      // 带多条件搜索参数获取表单数据 请自行修改接口
-      this.getRequest("/memberNoticeSenter/getByPage", this.searchForm).then(
-        (res) => {
-          this.loading = false;
-          if (res.success) {
-            this.data = res.result.records;
-            this.total = res.result.total;
-          }
-        }
-      );
-      // 以下为模拟数据
-      //this.data = [
-      //];
-      this.total = this.data.length;
-      this.loading = false;
-    },
-    add() {
-      let query = { type: 0, backRoute: this.$route.name };
-      this.$router.push({
-        name: "add_message",
-        query: query,
-      });
-    },
-    edit(v) {
-      this.modalType = 1;
-      this.modalTitle = "编辑";
-      this.$refs.form.resetFields();
-      // 转换null为""
-      for (let attr in v) {
-        if (v[attr] === null) {
-          v[attr] = "";
-        }
-      }
-      let str = JSON.stringify(v);
-      let data = JSON.parse(str);
-      this.form = data;
-      this.modalVisible = true;
-    },
-    remove(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        // 记得确认修改此处
-        content: "您确认要删除么?",
-        loading: true,
-        onOk: () => {
-          // 删除
-          this.deleteRequest("/memberNoticeSenter/delByIds/" + v.id).then(
-            (res) => {
-              this.$Modal.remove();
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.getDataList();
-              }
-            }
-          );
-          // 模拟请求成功
-          //this.$Message.success("操作成功");
-          //this.$Modal.remove();
-          //this.getDataList();
-        },
-      });
-    },
-    delAll() {
-      if (this.selectCount <= 0) {
-        this.$Message.warning("您还未选择要删除的数据");
-        return;
-      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
-        loading: true,
-        onOk: () => {
-          let ids = "";
-          this.selectList.forEach(function (e) {
-            ids += e.id + ",";
-          });
-          ids = ids.substring(0, ids.length - 1);
-          // 批量删除
-          this.deleteRequest("/memberNoticeSenter/delByIds/" + ids).then(
-            (res) => {
-              this.$Modal.remove();
-              if (res.success) {
-                this.$Message.success("操作成功");
-                this.clearSelectAll();
-                this.getDataList();
-              }
-            }
-          );
-          // 模拟请求成功
-          //this.$Message.success("操作成功");
-          //this.$Modal.remove();
-          //this.clearSelectAll();
-          //this.getDataList();
-        },
-      });
-    },
-  },
-  mounted() {
-    this.init();
-  },
-};
-</script>

manager/src/views/member/point/point.vue

@@ -1,55 +1,50 @@
 <template>
   <div class="search">
-    <Row>
-      <Card>
-        <Row @keydown.enter.native="handleSearch">
-          <Form
-            ref="searchForm"
-            :model="searchForm"
-            inline
-            :label-width="70"
-            class="search-form"
-          >
-            <Form-item label="会员名称" prop="username">
-              <Input
-                type="text"
-                v-model="searchForm.memberName"
-                placeholder="请输入会员名称"
-                clearable
-                style="width: 200px"
-              />
-              </Form-item>
-            <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
-          </Form>
-        </Row>
-        <Table
-          :loading="loading"
-          border
-          :columns="columns"
-          :data="data"
-          ref="table"
-          sortable="custom"
-          @on-sort-change="changeSort"
-          @on-selection-change="changeSelect"
-        >
-        </Table>
-        <Row type="flex" justify="end" class="mt_10">
-          <Page
-            :current="searchForm.pageNumber"
-            :total="total"
-            :page-size="searchForm.pageSize"
-            @on-change="changePage"
-            @on-page-size-change="changePageSize"
-            :page-size-opts="[10, 20, 50]"
-            size="small"
-            show-total
-            show-elevator
-            show-sizer
-          ></Page>
-        </Row>
-      </Card>
-    </Row>
-
+    <Card style="padding:0 10px 10px 0">
+      <Form
+        @keydown.enter.native="handleSearch"
+        ref="searchForm"
+        :model="searchForm"
+        inline
+        style="margin-top:10px"
+        :label-width="70"
+        class="search-form"
+      >
+        <Form-item label="会员名称" prop="username">
+          <Input
+            type="text"
+            v-model="searchForm.memberName"
+            placeholder="请输入会员名称"
+            clearable
+            style="width: 200px"
+          />
+          </Form-item>
+        <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">搜索</Button >
+      </Form>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        class="mt_10"
+      >
+      </Table>
+      <Row type="flex" justify="end" class="mt_10">
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
+      </Row>
+    </Card>
   </div>
 </template>
 
@@ -57,9 +52,9 @@
   import region from "@/views/lili-components/region";
   import * as API_Member from "@/api/member.js";
   import ossManage from "@/views/sys/oss-manage/ossManage";
-  import * as RegExp from '@/libs/RegExp.js';
 
   export default {
+    // 积分历史页面
     name: "point",
     components: {
       region,
@@ -67,14 +62,11 @@
     },
     data() {
       return {
-        descFlag: false, //编辑查看框
         loading: true, // 表单加载状态
         searchForm: { // 请求参数
           pageNumber: 1,
           pageSize: 10,
         },
-        selectList: [], // 多选数据
-        selectCount: 0, // 多选计数
         columns: [
           {
             title: "会员名称",
@@ -141,41 +133,27 @@
       callback(val) {
         this.$emit("callback", val);
       },
+      // 初始化数据
       init() {
         this.getData();
       },
+      // 分页 改变页码
       changePage(v) {
         this.searchForm.pageNumber = v;
         this.getData();
       },
+      // 分页 改变页数
       changePageSize(v) {
+        this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = v;
         this.getData();
       },
+      // 搜索
       handleSearch() {
         this.searchForm.pageNumber = 1;
         this.searchForm.pageSize = 10;
         this.getData();
       },
-
-      changeSort(e) {
-        this.searchForm.sort = e.key;
-        this.searchForm.order = e.order;
-        if (e.order === "normal") {
-          this.searchForm.order = "";
-        }
-        this.getData();
-      },
-      changeSelect(e) {
-        this.selectList = e;
-        this.selectCount = e.length;
-      },
-      selectDateRange(v) {
-        if (v) {
-          this.searchForm.startDate = v[0];
-          this.searchForm.endDate = v[1];
-        }
-      },
       //查新积分列表
       getData() {
         this.loading = true;