Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

# Conflicts: # manager/src/config/index.js # seller/src/config/index.js
2025-12-17 16:35:53 +08:00 · 2021-06-28 11:25:30 +08:00
parent e14ecef05a 510cf963a2
commit 10fc7d4dd0
15 changed files with 595 additions and 301 deletions
--- a/buyer/src/pages/home/userCenter/MoneyManagement.vue
+++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue
@@ -188,10 +188,10 @@ export default {
      },
      formValidate: {
        price: [
-          { required: true, message: '请输入大于0小于9999的合法充值金额' },
+          { required: true, message: '请输入大于等于1小于9999的合法充值金额' },
          {
            pattern: /^[1-9]\d{0,3}(\.\d{1,2})?$/,
-            message: '请输入大于0小于9999的合法充值金额',
+            message: '请输入大于等于1小于9999的合法充值金额',
            trigger: 'change'
          }
        ]
@@ -200,11 +200,13 @@ export default {
      logColumns: [
        {
          title: '时间',
+          width: 190,
          key: 'createTime'
        },
        {
          title: '金额',
          key: 'money',
+          width: 180,
          render: (h, params) => {
            if (params.row.money > 0) {
              return h('div', [
@@ -241,21 +243,30 @@ export default {
      logColumnsData: {}, // 余额日志
      // 充值记录
      rechargeListColumns: [
+        {
+          title: '充值时间',
+          key: 'createTime',
+          width: 168
+        },
        {
          title: '支付单号',
          key: 'rechargeSn',
          width: 200
        },
-        {
-          title: '支付方式',
-          key: 'rechargeWay'
-        },
        {
          title: '充值金额',
          key: 'rechargeMoney',
          render: (h, params) => {
+            if (params.row.payStatus === 'PAID') {
+              return h('div', [h('span', {
+                style: {
+                  color: 'green'
+                }
+              }, this.$options.filters.unitPrice(params.row.rechargeMoney, '+ ¥'))]);
+            } else {
              return h('div', [h('span', this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]);
            }
+          }
        },
        {
          title: '支付状态',
@@ -268,29 +279,60 @@ export default {
            }
          }
        },
+        {
+          title: '支付方式',
+          key: 'rechargeWay',
+          render: (h, params) => {
+            if (params.row.rechargeWay === 'ALIPAY') {
+              return h('div', [h('span', {}, '支付宝')]);
+            } else if (params.row.rechargeWay === 'WECHAT') {
+              return h('div', [h('span', {}, '微信')]);
+            } else if (params.row.rechargeWay === 'BANK_TRANSFER') {
+              return h('div', [h('span', {}, '线下转账')]);
+            } else {
+              return h('div', [h('span', {}, '')]);
+            }
+          }
+        },
        {
          title: '支付时间',
-          key: 'payTime'
+          key: 'payTime',
+          width: 180
        }
      ],
      rechargeListData: {}, // 充值记录数据
      // 提现记录
      withdrawApplyColumns: [
+        {
+          title: '申请时间',
+          key: 'createTime',
+          width: 168
+        },
        {
          title: '提现单号',
          key: 'sn',
-          width: 215
+          width: 200
        },
        {
          title: '提现金额',
          key: 'applyMoney',
+          width: 110,
          render: (h, params) => {
+            if (params.row.applyStatus === 'VIA_AUDITING') {
+              return h('div', [h('span', {
+                style: {
+                  color: 'green'
+                }
+              }, this.$options.filters.unitPrice(params.row.applyMoney, '+ ¥'))]);
+            } else {
              return h('div', [h('span', this.$options.filters.unitPrice(params.row.applyMoney, '¥'))]);
            }
+          }
        },
        {
          title: '提现状态',
          key: 'applyStatus',
+          width: 95,
          render: (h, params) => {
            if (params.row.applyStatus === 'APPLY') {
              return h('div', [h('span', {}, '申请中')]);
@@ -302,12 +344,14 @@ export default {
          }
        },
        {
-          title: '提现时间',
-          key: 'inspectTime'
+          title: '审核时间',
+          key: 'inspectTime',
+          width: 168
        },
        {
          title: '审核备注',
          key: 'inspectRemark'
+
        }
      ],
      withdrawApplyColumnsListData: {} // 提现记录
--- a/buyer/src/plugins/request.js
+++ b/buyer/src/plugins/request.js
@@ -69,7 +69,7 @@ service.interceptors.request.use(
      config.headers['accessToken'] = accessToken;
      // 解析当前token时间
      let jwtData = JSON.parse(
-        decodeURIComponent(escape(window.atob(accessToken.split('.')[1])))
+        decodeURIComponent(escape(window.atob(accessToken.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
      );
      if (jwtData.exp < Math.round(new Date() / 1000)) {
        refresh(config)
--- a/buyer/yarn.lock
+++ b/buyer/yarn.lock
@@ -2621,12 +2621,12 @@ dom-serializer@0:
    domelementtype "^2.0.1"
    entities "^2.0.0"

-dom7@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npm.taobao.org/dom7/download/dom7-3.0.0.tgz#b861ce5d67a6becd7aaa3ad02942ff14b1240331"
-  integrity sha1-uGHOXWemvs16qjrQKUL/FLEkAzE=
+dom7@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/dom7/-/dom7-2.1.5.tgz#a79411017800b31d8400070cdaebbfc92c1f6377"
+  integrity sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==
  dependencies:
-    ssr-window "^3.0.0-alpha.1"
+    ssr-window "^2.0.0"

 domain-browser@^1.1.1:
  version "1.2.0"
@@ -7487,10 +7487,10 @@ sshpk@^1.7.0:
    safer-buffer "^2.0.2"
    tweetnacl "~0.14.0"

-ssr-window@^3.0.0, ssr-window@^3.0.0-alpha.1:
-  version "3.0.0"
-  resolved "https://registry.npm.taobao.org/ssr-window/download/ssr-window-3.0.0.tgz#fd5b82801638943e0cc704c4691801435af7ac37"
-  integrity sha1-/VuCgBY4lD4MxwTEaRgBQ1r3rDc=
+ssr-window@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-2.0.0.tgz#98c301aef99523317f8d69618f0010791096efc4"
+  integrity sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==

 ssri@^5.2.4:
  version "5.3.0"
@@ -7753,14 +7753,13 @@ svgo@^1.0.0:
    unquote "~1.1.1"
    util.promisify "~1.0.0"

-swiper@^6.4.1:
-  version "6.4.1"
-  resolved "https://registry.npm.taobao.org/swiper/download/swiper-6.4.1.tgz?cache=0&sync_timestamp=1607518804170&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fswiper%2Fdownload%2Fswiper-6.4.1.tgz#6d4e9252ed4226821d4005e77924e929848de8af"
-  integrity sha1-bU6SUu1CJoIdQAXneSTpKYSN6K8=
+swiper@^5.2.0:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/swiper/-/swiper-5.4.5.tgz#a350f654bf68426dbb651793824925512d223c0f"
+  integrity sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==
  dependencies:
-    dom7 "^3.0.0"
-    ssr-window "^3.0.0"
-    tslib "^2.0.0"
+    dom7 "^2.1.5"
+    ssr-window "^2.0.0"

 table@4.0.2:
  version "4.0.2"
@@ -7942,11 +7941,6 @@ tslib@^1.10.0:
  resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.14.1.tgz?cache=0&sync_timestamp=1602286724979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
  integrity sha1-zy04vcNKE0vK8QkcQfZhni9nLQA=

-tslib@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.npm.taobao.org/tslib/download/tslib-2.0.3.tgz?cache=0&sync_timestamp=1602286724979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
-  integrity sha1-jgdBrEX8DCJuWKF7/D5kubxsphw=
-
 tty-browserify@0.0.0:
  version "0.0.0"
  resolved "https://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
--- a/manager/src/api/other.js
+++ b/manager/src/api/other.js
@@ -86,4 +86,9 @@ export const getMemberFeedbackDetail = (id) => {
  return getRequest(`/feedback/${id}`);
 };

+//管理员获取发送详情列表
+export const getMemberMessage = (params) => {
+  return getRequest(`/message/member`, params);
+};
+

--- a/manager/src/views/member/advance/recharge.vue
+++ b/manager/src/views/member/advance/recharge.vue
@@ -122,6 +122,17 @@
            title: "充值方式",
            key: "rechargeWay",
            width: 120,
+            render: (h, params) => {
+              if (params.row.rechargeWay === 'ALIPAY') {
+                return h('div', [h('span', {}, '支付宝')]);
+              } else if (params.row.rechargeWay === 'WECHAT') {
+                return h('div', [h('span', {}, '微信')]);
+              } else if (params.row.rechargeWay === 'BANK_TRANSFER') {
+                return h('div', [h('span', {}, '线下转账')]);
+              } else {
+                return h('div', [h('span', {}, '')]);
+              }
+            }
          },
          {
            title: "支付状态",
@@ -137,6 +148,13 @@
              }
            },
          },
+          {
+            title: "充值时间",
+            key: "createTime",
+            align: "left",
+            width: 190,
+            sortable: false,
+          },
          {
            title: "支付时间",
            key: "payTime",
--- a/manager/src/views/member/advance/walletLog.vue
+++ b/manager/src/views/member/advance/walletLog.vue
@@ -78,7 +78,7 @@ export default {
                      color: "red",
                    },
                  },
-                  this.$options.filters.unitPrice(params.row.money, "￥")
+                  this.$options.filters.unitPrice(-params.row.money, "- ￥")
                ),
              ]);
            }
--- a/manager/src/views/promotion/coupon/couponPublish.vue
+++ b/manager/src/views/promotion/coupon/couponPublish.vue
@@ -39,9 +39,11 @@
            </FormItem>
            <FormItem label="发放数量" prop="publishNum" v-if="form.getType==='FREE'">
              <Input v-model="form.publishNum" placeholder="发放数量" style="width: 260px"/>
+              <div class="tips">如果发放数量为0时,则代表不限制发放数量</div>
            </FormItem>
            <FormItem label="领取数量限制" prop="couponLimitNum" v-if="form.getType==='FREE'">
              <Input v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px"/>
+              <div class="tips">如果领取数量为0时,则代表不限制领取数量</div>
            </FormItem>
            <FormItem label="范围描述" prop="description">
              <Input v-model="form.description" type="textarea" :rows="4" maxlength="50" show-word-limit clearable
@@ -576,5 +578,9 @@ h4 {
    margin: 0 4px;
  }
 }
+.tips {
+  font-size: 12px;
+  color: #999;
+}
 </style>

--- a/manager/src/views/promotion/couponActivity/coupon.vue
+++ b/manager/src/views/promotion/couponActivity/coupon.vue
@@ -44,7 +44,7 @@ export default {
        // 搜索框初始化对象
        pageNumber: 0, // 当前页数
        pageSize: 10, // 页面大小
-        sort: "startTime", // 默认排序字段
+        sort: "createTime", // 默认排序字段
        order: "desc", // 默认排序方式
      },
      form: {
--- a/manager/src/views/sys/message/noticeMessageTemplate.vue
+++ b/manager/src/views/sys/message/noticeMessageTemplate.vue
@@ -35,6 +35,7 @@
              <Row class="operation" style="margin-top: 20px">
                <Button @click="sendMessage" type="primary">发送消息</Button>
              </Row>
+              <Row>
                <Table
                  :loading="loading"
                  border
@@ -45,6 +46,7 @@
                  @on-sort-change="messageChangeSort"
                  @on-selection-change="messageChangeSelect"
                ></Table>
+              </Row>
              <Row type="flex" justify="end" class="page">
                <Page
                  :current="searchMessageForm.pageNumber"
@@ -62,6 +64,7 @@
            </TabPane>

            <TabPane label="通知类站内信" name="SETTING">
+              <Row>
                <Table
                  :loading="loading"
                  border
@@ -72,6 +75,7 @@
                  @on-sort-change="changeSort"
                  @on-selection-change="changeSelect"
                ></Table>
+              </Row>
              <Row type="flex" justify="end" class="page">
                <Page
                  :current="searchForm.pageNumber"
@@ -120,7 +124,8 @@
              <Input v-model="form.noticeTitle" clearable type="text" style="width: 90%" maxlength="20"/>
            </FormItem>
            <FormItem label="消息内容" prop="noticeContent">
-              <Input v-model="form.noticeContent" clearable type="textarea" style="width: 90%" maxlength="50" :autosize="{maxRows:4,minRows: 4}" show-word-limit />
+              <Input v-model="form.noticeContent" clearable type="textarea" style="width: 90%" maxlength="50"
+                     :autosize="{maxRows:4,minRows: 4}" show-word-limit/>
            </FormItem>
          </Form>
        </div>
@@ -137,24 +142,34 @@
      :title="messageModalTitle"
      v-model="messageModalVisible"
      :mask-closable="false"
-      :width="500"
+      :width="800"
    >
      <Form ref="messageSendForm" :model="messageSendForm" :label-width="100" :rules="messageFormValidate">
        <FormItem label="消息标题" prop="title">
-          <Input v-model="messageSendForm.title" maxlength="15" clearable style="width: 90%"/>
+          <Input v-model="messageSendForm.title" maxlength="15" clearable style="width: 70%"/>
        </FormItem>
        <FormItem label="消息内容" prop="content">
          <Input
            v-model="messageSendForm.content"
            :rows="4"
            type="textarea"
-            style="max-height:60vh;overflow:auto;width: 90%"
+            style="max-height:60vh;overflow:auto;width: 70%"
          />
        </FormItem>
+
+        <FormItem label="发送对象">
+          <RadioGroup type="button" button-style="solid" v-model="messageSendForm.messageClient"
+                      @on-change="selectObject">
+            <Radio label="member">会员</Radio>
+            <Radio label="store">商家</Radio>
+          </RadioGroup>
+        </FormItem>
+
        <FormItem label="发送范围">
          <RadioGroup type="button" button-style="solid" v-model="messageSendForm.messageRange" @on-change="selectShop">
            <Radio label="ALL">全站</Radio>
-            <Radio label="APPOINT">指定商家</Radio>
+            <Radio v-if="messageSendForm.messageClient == 'store'" label="APPOINT">指定商家</Radio>
+            <Radio v-if="messageSendForm.messageClient == 'member'" label="MEMBER">指定会员</Radio>
          </RadioGroup>
        </FormItem>
        <FormItem label="指定商家" v-if="shopShow">
@@ -165,6 +180,17 @@
            </Option>
          </Select>
        </FormItem>
+        <FormItem label="选择会员" prop="scopeType"
+                  v-if="memberShow">
+          <Button type="primary" icon="ios-add" @click="addVip" ghost>选择会员</Button>
+          <div style="margin-top:24px;" v-if="messageSendForm.messageClient == 'member'">
+            <Table border :columns="userColumns" :data="this.selectedMember">
+            </Table>
+          </div>
+        </FormItem>
+        <Modal width="1200" v-model="checkUserList">
+          <userList v-if="checkUserList" @callback="callbackSelectUser" :selectedList="selectedMember" ref="memberLayout"/>
+        </Modal>
      </Form>
      <div slot="footer">
        <Button type="text" @click="messageModalVisible = false">取消</Button>
@@ -180,7 +206,7 @@
      :title="modalTitle"
      v-model="messageDetailModalVisible"
      :mask-closable="false"
-      :width="700"
+      :width="800"
    >
      <Form ref="messageSendForm" :model="messageSendForm" :label-width="100" :rules="messageFormValidate">
        <FormItem label="消息标题" prop="title">
@@ -195,13 +221,21 @@
            style="max-height:60vh;overflow:auto;width: 50%"
          />
        </FormItem>
+        <FormItem label="发送对象">
+          <RadioGroup type="button" button-style="solid" v-model="messageSendForm.messageClient">
+            <Radio disabled label="member">会员</Radio>
+            <Radio disabled label="store">商家</Radio>
+          </RadioGroup>
+        </FormItem>
        <FormItem label="发送范围">
          <RadioGroup type="button" button-style="solid" v-model="messageSendForm.messageRange">
            <Radio disabled label="ALL">全站</Radio>
-            <Radio  disabled label="APPOINT">指定商家</Radio>
+            <Radio v-if="messageSendForm.messageClient == 'store'" disabled label="APPOINT">指定商家</Radio>
+            <Radio v-if="messageSendForm.messageClient == 'member'" disabled label="MEMBER">指定会员</Radio>
          </RadioGroup>
        </FormItem>
-        <FormItem label="指定商家">
+        <FormItem label="指定商家" v-if="messageSendForm.messageClient == 'store'">
+          <Row>
            <Table
              :loading="loading"
              border
@@ -209,16 +243,43 @@
              :data="shopMessageData"
              ref="table"
              sortable="custom"
-            @on-sort-change="messageChangeSort"
-            @on-selection-change="messageChangeSelect"
+              @on-sort-change="shopMessageChangeSort"
            ></Table>
+          </Row>
          <Row type="flex" justify="end" class="page">
            <Page
              :current="searchShopMessageForm.pageNumber"
              :total="shopMessageDataTotal"
              :page-size="searchShopMessageForm.pageSize"
-              @on-change="messageChangePage"
-              @on-page-size-change="messageChangePageSize"
+              @on-change="shopMessageChangePage"
+              @on-page-size-change="shopMessageChangePageSize"
+              :page-size-opts="[10, 20, 50]"
+              size="small"
+              show-total
+              show-elevator
+              show-sizer
+            ></Page>
+          </Row>
+        </FormItem>
+        <FormItem label="指定会员" v-if="messageSendForm.messageClient == 'member'">
+          <Row>
+            <Table
+              :loading="loading"
+              border
+              :columns="memberMessageDetailColumns"
+              :data="memberMessageData"
+              ref="table"
+              sortable="custom"
+              @on-sort-change="memberMessageChangeSort"
+            ></Table>
+          </Row>
+          <Row type="flex" justify="end" class="page">
+            <Page
+              :current="searchMemberMessageForm.pageNumber"
+              :total="memberMessageDataTotal"
+              :page-size="searchMemberMessageForm.pageSize"
+              @on-change="memberMessageChangePage"
+              @on-page-size-change="memberMessageChangePageSize"
              :page-size-opts="[10, 20, 50]"
              size="small"
              show-total
@@ -239,14 +300,18 @@
  import * as API_Setting from "@/api/setting.js";
  import * as API_Other from "@/api/other.js";
  import * as API_Shop from "@/api/shops.js";
-
+  import userList from "@/views/member/list/index";

  export default {
    name: "bill",
-    components: {},
+    components: {
+      userList
+    },
    data() {
      return {
        openSearch: true, // 显示搜索
+        checkUserList: false, //会员选择器
+        selectedMember: [], //选择的会员
        openTip: true, // 显示提示
        loading: true, // 表单加载状态
        modalVisible: false, // 添加或编辑显示
@@ -255,6 +320,7 @@
        messageModalTitle: "", // 发送站内信标题
        messageDetailModalVisible: false, // 添加或编辑显示
        shopShow: false, //指定商家是否出现
+        memberShow: false, //指定会员是否出现
        shopList: [],//店铺列表
        searchForm: {
          // 搜索框初始化对象
@@ -283,6 +349,12 @@
          pageNumber: 1, // 当前页数
          pageSize: 10, // 页面大小
        },
+        //发送给会员的消息
+        searchMemberMessageForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+        },
        form: {
          noticeNode: "",
          noticeTitle: ""
@@ -290,6 +362,7 @@
        //消息发送表单
        messageSendForm: {
          messageRange: "ALL",
+          messageClient: "member",
          userIds: [],
          userNames: [],
        },
@@ -413,6 +486,45 @@
            }
          },
        ],
+        // 用户表格
+        userColumns: [
+          {
+            title: "用户名称",
+            key: "nickName",
+            minWidth: 120,
+          },
+          {
+            title: "手机号",
+            key: "mobile",
+            render: (h, params) => {
+              return h("div", params.row.mobile || "暂未填写");
+            },
+          },
+          {
+            title: "操作",
+            key: "action",
+            minWidth: 50,
+            align: "center",
+            render: (h, params) => {
+              return h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                    type: "error",
+                    ghost: true,
+                  },
+                  on: {
+                    click: () => {
+                      this.delUser(params.index);
+                    },
+                  },
+                },
+                "删除"
+              );
+            },
+          },
+        ],
        noticeData: [], // 表单数据
        noticeDataTotal: 0, // 表单数据总数
        messageColumns: [
@@ -427,7 +539,22 @@
            minWidth: 350,
            tooltip: true
          },
-
+          {
+            title: "发送对象",
+            key: "messageClient",
+            width: 100,
+            render: (h, params) => {
+              if (params.row.messageClient == "member") {
+                return h('div', [
+                  h('span', {}, '会员'),
+                ]);
+              } else if (params.row.messageClient == "store") {
+                return h('div', [
+                  h('span', {}, '商家'),
+                ]);
+              }
+            }
+          },
          {
            title: "发送类型",
            key: "messageRange",
@@ -439,7 +566,11 @@
                ]);
              } else if (params.row.messageRange == "APPOINT") {
                return h('div', [
-                  h('span', {}, '指定用户'),
+                  h('span', {}, '指定商家'),
+                ]);
+              } else if (params.row.messageRange == "MEMBER") {
+                return h('div', [
+                  h('span', {}, '指定会员'),
                ]);
              }
            }
@@ -529,6 +660,36 @@
        ],
        shopMessageData: [], // 发送给店铺的消息数据
        shopMessageDataTotal: 0, // 发送给店铺的消息数据总数
+
+        memberMessageDetailColumns: [
+          {
+            title: "会员ID",
+            key: "memberId",
+            maxWidth: 300,
+            sortable: false,
+          },
+          {
+            title: "会员名称",
+            key: "memberName",
+            sortable: false,
+          },
+          {
+            title: "是否已读",
+            key: "status",
+            maxWidth: 120,
+            render: (h, params) => {
+              if (params.row.status == "ALREADY_READY") {
+                return h("Badge", {props: {status: "success", text: "已读"}})
+              } else if (params.row.status == "UN_READY") {
+                return h("Badge", {props: {status: "processing", text: "未读"}})
+              } else {
+                return h("Badge", {props: {status: "processing", text: "回收站"}})
+              }
+            }
+          },
+        ],
+        memberMessageData: [], // 发送给店铺的消息数据
+        memberMessageDataTotal: 0, // 发送给店铺的消息数据总数
      };
    },
    methods: {
@@ -536,6 +697,41 @@
        this.getMessage();
      },

+      // 返回已选择的用户
+      callbackSelectUser(val) {
+        // 每次将返回的数据回调判断
+        let findUser = this.selectedMember.find((item) => {
+          return item.id === val.id;
+        });
+        // 如果没有则添加
+        if (!findUser) {
+          this.selectedMember.push(val);
+        } else {
+          // 有重复数据就删除
+          this.selectedMember.map((item, index) => {
+            if (item.id === findUser.id) {
+              this.selectedMember.splice(index, 1);
+            }
+          });
+        }
+        this.reSelectMember();
+      },
+
+      // 删除选择的会员
+      delUser(index) {
+        this.selectedMember.splice(index, 1);
+        this.reSelectMember();
+      },
+      //更新选择的会员
+      reSelectMember() {
+        this.form.memberDTOS = this.selectedMember.map((item) => {
+          return {
+            nickName: item.nickName,
+            id: item.id
+          }
+        });
+      },
+
      //获取全部商家
      getShopList() {
        this.loading = true;
@@ -548,6 +744,13 @@
        this.loading = false;

      },
+      // 添加指定用户
+      addVip() {
+        this.checkUserList = true;
+        this.$nextTick(() => {
+          this.$refs.memberLayout.selectedMember = true;
+        });
+      },
      paneChange(v) {
        if (v == "SETTING") {
          this.getNoticeMessage()
@@ -582,6 +785,42 @@
        this.getMessage();
        this.clearSelectAll();
      },
+
+      //会员消息每页条数发生变化
+      memberMessageChangePageSize(v) {
+        this.searchMemberMessageForm.pageSize = v;
+        this.messageDetail();
+      },
+      //会员消息页数变化
+      memberMessageChangePage(v) {
+        this.searchMemberMessageForm.pageNumber = v;
+        this.messageDetail();
+        this.clearSelectAll();
+      },
+      //会员消息
+      memberMessageChangeSort(e) {
+        this.searchMemberMessageForm.sort = e.key;
+        this.searchMemberMessageForm.order = e.order;
+        this.messageDetail()
+      },
+
+      //店铺消息每页条数发生变化
+      shopMessageChangePageSize(v) {
+        this.searchShopMessageForm.pageSize = v;
+        this.messageDetail();
+      },
+      //店铺消息页数变化
+      shopMessageChangePage(v) {
+        this.searchShopMessageForm.pageNumber = v;
+        this.messageDetail();
+        this.clearSelectAll();
+      },
+      //店铺消息
+      shopMessageChangeSort(e) {
+        this.searchShopMessageForm.sort = e.key;
+        this.searchShopMessageForm.order = e.order;
+        this.messageDetail()
+      },
      //消息
      messageChangeSort(e) {
        this.searchMessageForm.sort = e.key;
@@ -647,9 +886,11 @@
        this.messageModalVisible = true
        this.messageModalTitle = "发送站内信"
        this.shopShow = false
+        this.memberShow = false
        this.messageSendForm =
          {
            messageRange: "ALL",
+            messageClient: "member",
            content: "",
            title: "",
            userIds: [],
@@ -658,6 +899,18 @@
      },
      //管理员发送站内信提交
      sendMessageSubmit() {
+        let userIds = [];
+        let userNames = [];
+        console.warn(this.selectedMember)
+        if (this.messageSendForm.messageClient == 'member' && this.messageSendForm.messageRange == 'MEMBER'){
+          this.selectedMember.forEach(function(item, index) {
+            userIds.push(item.id)
+            userNames.push(item.username)
+          })
+          this.messageSendForm.userIds = userIds
+          this.messageSendForm.userNames = userNames
+        }
+
        if (this.messageSendForm.userIds.length <= 0 && this.messageSendForm.messageRange == "APPOINT") {
          this.$Message.error("请选择发送对象");
          return
@@ -677,14 +930,27 @@
        })

      },
+      //发送对象选择
+      selectObject(v) {
+        this.messageSendForm.messageRange = "ALL"
+        this.shopShow = false
+        this.memberShow =false
+      },
      //弹出选择商家的框
      selectShop(v) {
        if (v == "APPOINT") {
          this.getShopList()
          this.shopShow = true
+          this.memberShow = false
        }
        if (v == "ALL") {
          this.shopShow = false
+          this.memberShow = false
+        }
+        if (v == "MEMBER") {
+          this.shopShow = false
+          this.memberShow = true
+          this.selectedMember = []
        }
      },
      //获取管理员发送列表
@@ -731,19 +997,38 @@
        });
      },
      //消息详情
-      detail(v) {
-        this.searchShopMessageForm.messageId = v.id
+      messageDetail() {
+        if (this.messageSendForm.messageClient == 'member') {
+          API_Other.getMemberMessage(this.searchMemberMessageForm).then((res) => {
+            if (res.success) {
+              this.memberMessageData = res.result.records;
+              this.memberMessageDataTotal = res.result.total;
+            }
+          });
+        } else {
+          console.warn(this.searchShopMessageForm)
          API_Other.getShopMessage(this.searchShopMessageForm).then((res) => {
            if (res.success) {
-            this.messageDetailModalVisible = true;
-            this.modalTitle = "消息详情"
-            this.messageSendForm = v
              this.shopMessageData = res.result.records;
              this.shopMessageDataTotal = res.result.total;
            }
          });
+        }

      },
+      //消息详情弹出框
+      detail(v) {
+        console.warn(this.searchShopMessageForm)
+        this.messageSendForm = v
+        if (this.messageSendForm.messageClient == 'member') {
+          this.searchMemberMessageForm.messageId = v.id
+        } else {
+          this.searchShopMessageForm.messageId = v.id
+        }
+        this.messageDetail();
+        this.messageDetailModalVisible = true;
+        this.modalTitle = "消息详情"
+      },
      edit(v) {
        API_Setting.getNoticeMessageDetail(v.id).then((res) => {
          if (res.success) {
--- a/seller/src/store/modules/app.js
+++ b/seller/src/store/modules/app.js
@@ -7,6 +7,7 @@ import Vue from 'vue';
 const app = {
    state: {
        shipTemplates:"",
+        regions:[], //此处是在地区选择器时赋值一次
        styleStore:"", //移动端楼层装修中选择风格存储
        loading: false, // 全局加载动画
        added: false, // 加载路由标识
--- a/seller/src/views/lili-components/multiple-region.vue
+++ b/seller/src/views/lili-components/multiple-region.vue
@@ -44,23 +44,27 @@ export default {
     */
    open(val, index) {
      if (val) {
+        // console.warn(val);
        //已选中的地址
        let checkedData = this.$store.state.shipTemplate;

+        // console.warn(this.$store.state.shipTemplate);
        // 禁止选中的地址
        let disabledData = checkedData.filter((item, i) => {
          return i != index;
        });
-
        disabledData.forEach((dis) => {
+          console.log(dis)
          // 循环出已经选中的地址id
          dis.areaId.split(",").forEach((ids) => {
            // 循环出省份
            this.data.forEach((item) => {
              // 如果当前省份下市区全部选中则选中该省份
+
              if (dis.selectedAll) {
                dis.area.split(",").forEach((area) => {
                  if (area == item.name) {
+                    console.log(item.name +"选中")
                    this.$set(item, "disabled", true);
                  }
                });
@@ -99,7 +103,11 @@ export default {

        // 筛选出当前选中的市
        sort.forEach((sortItem, sortIndex) => {
-          if (item.level != "province" && sortItem.id == item.parentId && !item.disabled) {
+          if (
+            item.level != "province" &&
+            sortItem.id == item.parentId &&
+            !item.disabled
+          ) {
            sortItem.selectedList.push({
              ...item,
            });
@@ -147,6 +155,7 @@ export default {
            this.selectedWay.push({ name: data.title, id: data.id });
          });
          console.log(this.data);
+          this.$store.state.regions = this.data;
        }
      });
    },
--- a/seller/src/views/promotion/coupon/couponPublish.vue
+++ b/seller/src/views/promotion/coupon/couponPublish.vue
@@ -6,22 +6,10 @@
          <h4>基本信息</h4>
          <div class="form-item-view">
            <FormItem label="活动名称" prop="promotionName">
-              <Input
-                type="text"
-                v-model="form.promotionName"
-                placeholder="活动名称"
-                clearable
-                style="width: 260px"
-              />
+              <Input type="text" v-model="form.promotionName" placeholder="活动名称" clearable style="width: 260px" />
            </FormItem>
            <FormItem label="优惠券名称" prop="couponName">
-              <Input
-                type="text"
-                v-model="form.couponName"
-                placeholder="优惠券名称"
-                clearable
-                style="width: 260px"
-              />
+              <Input type="text" v-model="form.couponName" placeholder="优惠券名称" clearable style="width: 260px" />
            </FormItem>
            <FormItem label="优惠券类型" prop="couponType">
              <Select v-model="form.couponType" style="width: 260px">
@@ -29,32 +17,12 @@
                <Option value="PRICE">减免现金</Option>
              </Select>
            </FormItem>
-            <FormItem
-              label="折扣"
-              prop="discount"
-              v-if="form.couponType == 'DISCOUNT'"
-            >
-              <Input
-                type="number"
-                v-model="form.couponDiscount"
-                placeholder="折扣"
-                clearable
-                style="width: 260px"
-              />
+            <FormItem label="折扣" prop="discount" v-if="form.couponType == 'DISCOUNT'">
+              <Input type="number" v-model="form.couponDiscount" placeholder="折扣" clearable style="width: 260px" />
              <span class="describe">请输入0-10之间数字，可以输入一位小数</span>
            </FormItem>
-            <FormItem
-              label="面额"
-              prop="price"
-              v-if="form.couponType == 'PRICE'"
-            >
-              <Input
-                type="text"
-                v-model="form.price"
-                placeholder="面额"
-                clearable
-                style="width: 260px"
-              />
+            <FormItem label="面额" prop="price" v-if="form.couponType == 'PRICE'">
+              <Input type="text" v-model="form.price" placeholder="面额" clearable style="width: 260px" />
            </FormItem>
            <FormItem label="活动类型" prop="getType">
              <Select v-model="form.getType" style="width: 260px">
@@ -63,42 +31,22 @@
              </Select>
            </FormItem>

-            <FormItem label="发放数量" prop="publishNum">
-              <Input
-                v-model="form.publishNum"
-                placeholder="发放数量"
-                style="width: 260px"
-              />
+            <FormItem label="发放数量" v-if="form.getType == 'FREE'" prop="publishNum">
+              <Input v-model="form.publishNum" placeholder="发放数量" style="width: 260px" />
+              <div class="tips">如果发放数量为0时,则代表不限制发放数量</div>
            </FormItem>
          </div>
          <h4>使用限制</h4>
          <div class="form-item-view">
            <FormItem label="消费门槛" prop="consumeThreshold">
-              <Input
-                type="text"
-                v-model="form.consumeThreshold"
-                placeholder="消费门槛"
-                clearable
-                style="width: 260px"
-              />
+              <Input type="text" v-model="form.consumeThreshold" placeholder="消费门槛" clearable style="width: 260px" />
            </FormItem>
-            <FormItem label="领取限制" prop="couponLimitNum">
-              <Input
-                v-model="form.couponLimitNum"
-                placeholder="领取限制"
-                clearable
-                style="width: 260px"
-              />
+            <FormItem label="领取限制" v-if="form.getType == 'FREE'" prop="couponLimitNum">
+              <Input v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px" />
+              <div class="tips">如果领取限制为0时,则代表不限制领取数量</div>
            </FormItem>
            <FormItem label="有效期" prop="rangeTime">
-              <DatePicker
-                type="datetimerange"
-                v-model="form.rangeTime"
-                format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择"
-                :options="options"
-                style="width: 260px"
-              >
+              <DatePicker type="datetimerange" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
              </DatePicker>
            </FormItem>
            <FormItem label="使用范围" prop="scopeType">
@@ -109,34 +57,14 @@
              </RadioGroup>
            </FormItem>

-            <FormItem
-              style="width: 100%"
-              v-if="form.scopeType == 'PORTION_GOODS'"
-            >
+            <FormItem style="width: 100%" v-if="form.scopeType == 'PORTION_GOODS'">
              <div style="display: flex; margin-bottom: 10px">
-                <Button type="primary" @click="openSkuList"
-                  >选择商品</Button>
-                <Button
-                  type="error"
-                  ghost
-                  style="margin-left: 10px"
-                  @click="delSelectGoods"
-                  >批量删除</Button
-                >
+                <Button type="primary" @click="openSkuList">选择商品</Button>
+                <Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button>
              </div>
-              <Table
-                border
-                :columns="columns"
-                :data="form.promotionGoodsList"
-                @on-selection-change="changeSelect"
-              >
+              <Table border :columns="columns" :data="form.promotionGoodsList" @on-selection-change="changeSelect">
                <template slot-scope="{ row }" slot="QRCode">
-                  <img
-                    :src="row.QRCode || '../../../assets/lili.png'"
-                    width="50px"
-                    height="50px"
-                    alt=""
-                  />
+                  <img :src="row.QRCode || '../../../assets/lili.png'" width="50px" height="50px" alt="" />
                </template>
              </Table>
            </FormItem>
@@ -147,35 +75,17 @@
            </FormItem>

            <FormItem label="范围描述" prop="description">
-              <Input
-                v-model="form.description"
-                type="textarea"
-                :rows="4"
-                maxlength="50"
-                show-word-limit
-                clearable
-                style="width: 260px"
-              />
+              <Input v-model="form.description" type="textarea" :rows="4" maxlength="50" show-word-limit clearable style="width: 260px" />
            </FormItem>
            <div>
-              <Button type="text" @click="$router.push({ name: 'coupon' })"
-                >返回</Button
-              >
-              <Button
-                type="primary"
-                :loading="submitLoading"
-                @click="handleSubmit"
-                >提交</Button
-              >
+              <Button type="text" @click="$router.push({ name: 'coupon' })">返回</Button>
+              <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
            </div>
          </div>
        </div>
      </Form>
    </Card>
-    <sku-select
-      ref="skuSelect"
-      @selectedGoodsData="selectedGoodsData"
-    ></sku-select>
+    <sku-select ref="skuSelect" @selectedGoodsData="selectedGoodsData"></sku-select>
  </div>
 </template>

@@ -232,6 +142,7 @@ export default {
        getType: "FREE",
        promotionGoodsList: [],
        scopeIdGoods: [],
+        rangeDayType: "FIXEDTIME",
      },
      id: this.$route.query.id,
      submitLoading: false, // 添加或编辑提交状态
@@ -392,7 +303,11 @@ export default {
          params.endTime = this.$options.filters.unixToDate(
            this.form.rangeTime[1] / 1000
          );
-          delete params.rangeTime
+          if (params.getType == "ACTIVITY") {
+            params.couponLimitNum = 0;
+            params.publishNum = 0;
+          }
+          delete params.rangeTime;
          let scopeId = [];
          if (
            params.scopeType == "PORTION_GOODS" &&
@@ -465,12 +380,13 @@ export default {
        name: "coupon",
      });
    },
-    openSkuList() { // 显示商品选择器
+    openSkuList() {
+      // 显示商品选择器
      this.$refs.skuSelect.open("goods");
-      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
-      data.forEach(e => {
-        e.id = e.skuId
-      })
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList));
+      data.forEach((e) => {
+        e.id = e.skuId;
+      });
      this.$refs.skuSelect.goodsData = data;
    },
    changeSelect(e) {
@@ -604,5 +520,9 @@ h4 {
 .wrapper {
  min-height: 1000px;
 }
+.tips {
+  font-size: 12px;
+  color: #999;
+}
 </style>

--- a/seller/src/views/promotion/live/addLive.vue
+++ b/seller/src/views/promotion/live/addLive.vue
@@ -97,7 +97,7 @@
        </FormItem>

        <FormItem label="商品" v-if="$route.query.id">
-          <Button type="primary" :disabled="liveStatus!='NEW'" ghost @click="liveGoodsVisible=true" icon="md-add">添加商品</Button>
+          <Button type="primary" ghost @click="liveGoodsVisible=true" :disabled="liveStatus!='NEW'" icon="md-add">添加商品</Button>
          <Table class="goods-table" :columns="liveColumns" :data="liveData">
            <template slot-scope="{ row,index }" slot="goodsName">
              <div class="flex-goods">
@@ -140,8 +140,8 @@
      <img :src="imageSrc" v-if="imageVisible" style="width: 100%">
    </Modal>

-    <Modal width="800" v-model="liveGoodsVisible" @on-ok="addGoods">
-      <liveGoods :init="liveData" @selectedGoods="callBackData" reviewed />
+    <Modal width="800" v-model="liveGoodsVisible" footer-hide>
+      <liveGoods @selectedGoods="callBackData" reviewed />
    </Modal>
  </div>
 </template>
@@ -259,10 +259,14 @@ export default {
     * 删除直播间商品
     */
    async deleteGoods(val, index) {
+      this.$Spin.show();
      let res = await delRoomLiveGoods(this.liveForm.roomId, val.liveGoodsId);
      if (res.success) {
        this.$Message.success("删除成功!");
        this.liveData.splice(index, 1);
+        this.$Spin.hide();
+      } else {
+        this.$Spin.hide();
      }
    },
    /**
@@ -325,35 +329,19 @@ export default {
     * 回调的商品选择数据
     */
    callBackData(way) {
-      this.$set(this, "liveData", way);
-    },
-
-    /**
-     * 提交直播间商品
-     */
-    addGoods() {
+      console.log(way);
+      this.liveGoodsVisible = false;
+      this.$Spin.show();
      addLiveGoods({
        roomId: this.$route.query.roomId,
-        liveGoodsId: item.liveGoodsId,
-      });
-    },
-
-    /**
-     * dialog点击确定时判断
-     */
-    addGoods() {
-      this.liveData.forEach((item) => {
-        if (this.commodityList.length == 1 && this.liveData.length == 1) {
-          addLiveGoods({
-            roomId: this.$route.query.roomId,
-            liveGoodsId: item.liveGoodsId,
-          });
+        liveGoodsId: way.liveGoodsId,
+      }).then((res) => {
+        if (res.success) {
+          this.liveData.push(way);
+          this.$Spin.hide();
+          console.log(this.liveData);
        } else {
-          this.commodityList.forEach((oldVal, i) => {
-            // 如果商品里面没有商品，以及添加商品为第一次的话
-            if (oldVal.liveGoodsId != item.liveGoodsId) {
-            }
-          });
+          this.$Spin.hide();
        }
      });
    },
--- a/seller/src/views/promotion/live/liveGoods.vue
+++ b/seller/src/views/promotion/live/liveGoods.vue
@@ -208,20 +208,20 @@ export default {
     * 回调参数补充
     */
    selectedLiveGoods(val, index) {
-      if (!val.___selected) {
-        val.___selected = true;
-        this.$set(this.liveGoodsData[index], "___selected", true);
-        this.selectedGoods.push(this.liveGoodsData[index]);
-      } else {
-        this.$nextTick(() => {
-          val.___selected = false;
+      // if (!val.___selected) {
+      //   val.___selected = true;
+      //   this.$set(this.liveGoodsData[index], "___selected", true);
+      //   this.selectedGoods.push(this.liveGoodsData[index]);
+      // } else {
+      //   this.$nextTick(() => {
+      //     val.___selected = false;

-          this.$set(this.liveGoodsData[index], "___selected", true);
-          this.selectedGoods.splice(index, 1);
-        });
-      }
+      //     this.$set(this.liveGoodsData[index], "___selected", true);
+      //     this.selectedGoods.splice(index, 1);
+      //   });
+      // }

-      this.$emit("selectedGoods", this.selectedGoods);
+      this.$emit("selectedGoods", val);
    },
    /**
     * 解决radio数据不回显问题
@@ -279,7 +279,7 @@ export default {
        console.log(element);
        return {
          goodsId: element.goodsId, //商品id
-          goodsImage: element.small, //商品图片  必须为 300 * 300
+          goodsImage: element.small, //商品图片  最大为 300 * 300
          name: element.goodsName, //商品昵称
          price: parseInt(element.price), //商品价格
          quantity: element.quantity, //库存
--- a/seller/src/views/shop/ship/shipTemplate.vue
+++ b/seller/src/views/shop/ship/shipTemplate.vue
@@ -195,6 +195,11 @@ export default {
      },
    };
  },
+  computed: {
+    regions() {
+      return this.$store.state.regions;
+    },
+  },
  methods: {
    init() {
      this.getData();
@@ -224,7 +229,7 @@ export default {
            firstPrice: "",
            continuedCompany: "1",
            continuedPrice: "",
-            selectedAll:false
+            selectedAll: false,
          },
        ],
      };
@@ -241,10 +246,22 @@ export default {
    },
    //选择地区
    editRegion(item, index) {
-      this.selectedIndex = index
+      this.selectedIndex = index;
      this.item = item;

-      this.$store.state.shipTemplate =  this.form.freightTemplateChildList
+      this.regions.forEach((addr) => {
+        this.form.freightTemplateChildList.forEach((child) => {
+          child.area.split(",").forEach((area) => {
+            if (addr.name == area) {
+              addr.selectedAll = true;
+              this.$set(child, "selectedAll", true);
+            }
+          });
+        });
+      });
+
+      this.$store.state.shipTemplate = this.form.freightTemplateChildList;
+
      this.$refs.region.open(item, index);
    },
    //刷细数据
@@ -274,8 +291,10 @@ export default {
            // 只显示省份

            if (child.selectedAll) {
-                area += child.name + ","
-                this.form.freightTemplateChildList[this.selectedIndex].selectedAll = true
+              area += child.name + ",";
+              this.form.freightTemplateChildList[
+                this.selectedIndex
+              ].selectedAll = true;
            }

            child.selectedList.forEach((son) => {
@@ -302,11 +321,16 @@ export default {

      this.$refs.form.validate((valid) => {
        const regNumber = /^\+?[1-9][0-9]*$/;
-        const regMoney = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
+        const regMoney =
+          /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
        if (valid) {
-          if (this.form.pricingMethod != 'FREE') {
+          if (this.form.pricingMethod != "FREE") {
            //校验运费模板详细信息
-            for (let i = 0; i < this.form.freightTemplateChildList.length; i++) {
+            for (
+              let i = 0;
+              i < this.form.freightTemplateChildList.length;
+              i++
+            ) {
              if (
                this.form.freightTemplateChildList[i].area == "" ||
                this.form.freightTemplateChildList[i].firstCompany == "" ||
@@ -324,8 +348,9 @@ export default {
                regNumber.test(
                  this.form.freightTemplateChildList[i].continuedCompany
                ) == false ||
-                regMoney.test(this.form.freightTemplateChildList[i].firstPrice) ==
-                  false ||
+                regMoney.test(
+                  this.form.freightTemplateChildList[i].firstPrice
+                ) == false ||
                regMoney.test(
                  this.form.freightTemplateChildList[i].continuedPrice
                ) == false
@@ -336,7 +361,6 @@ export default {
            }
          }

-
          if (this.operation == "ADD") {
            API_Shop.addShipTemplate(this.form, headers).then((res) => {
              if (res.success) {
@@ -372,7 +396,7 @@ export default {
        firstPrice: "",
        continuedCompany: "1",
        continuedPrice: "",
-        selectedAll:false
+        selectedAll: false,
      };
      this.form.freightTemplateChildList.push(params);
    },