From 4735dbd8743b6cf473cfc9bf77d588f0f742c66f Mon Sep 17 00:00:00 2001 From: pikachu <1321288662@qq.com> Date: Sun, 20 Jun 2021 10:59:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E5=8F=91?= =?UTF-8?q?=E9=80=81=E4=BC=9A=E5=91=98=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/message/noticeMessageTemplate.vue | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/manager/src/views/sys/message/noticeMessageTemplate.vue b/manager/src/views/sys/message/noticeMessageTemplate.vue index 6f1850ad..1dbb7d67 100644 --- a/manager/src/views/sys/message/noticeMessageTemplate.vue +++ b/manager/src/views/sys/message/noticeMessageTemplate.vue @@ -230,7 +230,8 @@ 全站 - 指定商家 + 指定商家 + 指定会员 @@ -565,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', {}, '指定会员'), ]); } } @@ -894,11 +899,18 @@ }, //管理员发送站内信提交 sendMessageSubmit() { - + let userIds = []; + let userNames = []; console.warn(this.selectedMember) - if(this.messageSendForm.messageClient == 'member' && this.messageSendForm.messageRange == 'MEMBER'){ - + 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 @@ -938,6 +950,7 @@ if (v == "MEMBER") { this.shopShow = false this.memberShow = true + this.selectedMember = [] } }, //获取管理员发送列表 From f0914960a466d69df032c6267122fac4938f5983 Mon Sep 17 00:00:00 2001 From: pikachu <1321288662@qq.com> Date: Sat, 26 Jun 2021 03:23:26 +0000 Subject: [PATCH 2/8] update buyer/src/components/header/Header.vue. --- buyer/src/components/header/Header.vue | 46 -------------------------- 1 file changed, 46 deletions(-) diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue index 0568ae95..d83050d0 100644 --- a/buyer/src/components/header/Header.vue +++ b/buyer/src/components/header/Header.vue @@ -34,27 +34,18 @@ -<<<<<<< HEAD -
  • 我的订单
    • -
  • 我的足迹
    • -=======
  • 我的订单
  • 我的足迹
  • 我的消息
    • ->>>>>>> dev-ryan
  • {{cartNum < 100 ? cartNum : '99'}} -<<<<<<< HEAD - -======= ->>>>>>> dev-ryan 购物车 @@ -128,50 +119,21 @@ export default { }, }, methods: { -<<<<<<< HEAD - handleClickTheme() { - this.themeType === "light" - ? (this.themeType = "dark") - : (this.themeType = "light"); - window.document.documentElement.setAttribute( - "data-theme", - this.themeType - ); - }, - changeCity(city) { - this.city = city; - }, - goToPay() { -======= changeCity (city) { // 选择所在城市 this.city = city; }, goToPay () { // 跳转购物车 ->>>>>>> dev-ryan let url = this.$router.resolve({ path: "/cart", }); window.open(url.href, "_blank"); }, -<<<<<<< HEAD - myInfo() { -======= myInfo () { // 跳转会员中心 ->>>>>>> dev-ryan let url = this.$router.resolve({ path: "/home", }); window.open(url.href, "_blank"); }, -<<<<<<< HEAD - signOutFun() { - storage.removeItem("accessToken"); - storage.removeItem("refreshToken"); - storage.removeItem("userInfo"); - storage.removeItem("cartNum"); - this.$store.commit("SET_CARTNUM", 0); - this.$router.push("/login"); -======= signOutFun () { // 退出登录 storage.removeItem('accessToken'); storage.removeItem('refreshToken'); @@ -179,7 +141,6 @@ export default { storage.removeItem('cartNum'); this.$store.commit('SET_CARTNUM', 0) this.$router.push('/login'); ->>>>>>> dev-ryan }, goUserCenter(path) { // 跳转我的订单，我的足迹 @@ -410,13 +371,6 @@ export default { .sign-out p { font-size: 12px; } -<<<<<<< HEAD -.cart-icon { - padding: 0 6px; -} -======= - ->>>>>>> dev-ryan .goods-title:hover { color: $theme_color; } From f436d177355767fa61a50e94beaea712e2161750 Mon Sep 17 00:00:00 2001 From: pikachu <1321288662@qq.com> Date: Sat, 26 Jun 2021 16:49:44 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E9=87=91?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/home/userCenter/MoneyManagement.vue | 57 +++++++++++++++---- manager/src/views/member/advance/recharge.vue | 7 +++ 2 files changed, 52 insertions(+), 12 deletions(-) diff --git a/buyer/src/pages/home/userCenter/MoneyManagement.vue b/buyer/src/pages/home/userCenter/MoneyManagement.vue index f57011b3..81932188 100644 --- 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,20 +243,29 @@ export default { logColumnsData: {}, // 余额日志 // 充值记录 rechargeListColumns: [ + { + title: '充值时间', + key: 'createTime', + width: 168 + }, { title: '支付单号', key: 'rechargeSn', width: 200 }, - { - title: '支付方式', - key: 'rechargeWay' - }, { title: '充值金额', key: 'rechargeMoney', render: (h, params) => { - return h('div', [h('span', this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]); + 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, '¥'))]); + } } }, { @@ -268,29 +279,49 @@ export default { } } }, + { + title: '支付方式', + key: 'rechargeWay' + }, { 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) => { - return h('div', [h('span', this.$options.filters.unitPrice(params.row.applyMoney, '¥'))]); + 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 +333,14 @@ export default { } }, { - title: '提现时间', - key: 'inspectTime' + title: '审核时间', + key: 'inspectTime', + width: 168 }, { title: '审核备注', key: 'inspectRemark' + } ], withdrawApplyColumnsListData: {} // 提现记录 diff --git a/manager/src/views/member/advance/recharge.vue b/manager/src/views/member/advance/recharge.vue index 6d2b893d..55c3b3db 100644 --- a/manager/src/views/member/advance/recharge.vue +++ b/manager/src/views/member/advance/recharge.vue @@ -137,6 +137,13 @@ } }, }, + { + title: "充值时间", + key: "createTime", + align: "left", + width: 190, + sortable: false, + }, { title: "支付时间", key: "payTime", From 081d25159416b14b29d9d5c1cc943f19fb765f54 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 28 Jun 2021 10:07:46 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=85=85=E5=80=BC=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/home/userCenter/MoneyManagement.vue | 19 +++++++++++++++---- manager/src/views/member/advance/recharge.vue | 11 +++++++++++ .../src/views/member/advance/walletLog.vue | 2 +- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/buyer/src/pages/home/userCenter/MoneyManagement.vue b/buyer/src/pages/home/userCenter/MoneyManagement.vue index 81932188..1c097ed8 100644 --- a/buyer/src/pages/home/userCenter/MoneyManagement.vue +++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue @@ -258,13 +258,13 @@ export default { key: 'rechargeMoney', render: (h, params) => { if (params.row.payStatus === 'PAID') { - return h('div', [h('span',{ + 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, '¥'))]); + return h('div', [h('span', this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]); } } }, @@ -281,7 +281,18 @@ export default { }, { title: '支付方式', - key: 'rechargeWay' + 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: '支付时间', @@ -308,7 +319,7 @@ export default { width: 110, render: (h, params) => { if (params.row.applyStatus === 'VIA_AUDITING') { - return h('div', [h('span',{ + return h('div', [h('span', { style: { color: 'green' } diff --git a/manager/src/views/member/advance/recharge.vue b/manager/src/views/member/advance/recharge.vue index 55c3b3db..c615f9aa 100644 --- 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: "支付状态", diff --git a/manager/src/views/member/advance/walletLog.vue b/manager/src/views/member/advance/walletLog.vue index 3de776e4..3f2da047 100644 --- 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, "- ￥") ), ]); } From 510cf963a2cfa26ce2ae0f9c0fe00f6eb2ab593f Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 28 Jun 2021 10:15:57 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=AF=B9=E6=B2=A1=E6=9C=89=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=96=B9=E5=BC=8F=E7=9A=84=E5=85=85=E5=80=BC=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=B8=80=E4=B8=8B=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/home/userCenter/MoneyManagement.vue | 2 +- manager/src/views/member/advance/recharge.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buyer/src/pages/home/userCenter/MoneyManagement.vue b/buyer/src/pages/home/userCenter/MoneyManagement.vue index 1c097ed8..9ebd1f13 100644 --- a/buyer/src/pages/home/userCenter/MoneyManagement.vue +++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue @@ -290,7 +290,7 @@ export default { } else if (params.row.rechargeWay === 'BANK_TRANSFER') { return h('div', [h('span', {}, '线下转账')]); } else { - return h('div', [h('span', {}, '未知方式')]); + return h('div', [h('span', {}, '')]); } } }, diff --git a/manager/src/views/member/advance/recharge.vue b/manager/src/views/member/advance/recharge.vue index c615f9aa..26c2be83 100644 --- a/manager/src/views/member/advance/recharge.vue +++ b/manager/src/views/member/advance/recharge.vue @@ -130,7 +130,7 @@ } else if (params.row.rechargeWay === 'BANK_TRANSFER') { return h('div', [h('span', {}, '线下转账')]); } else { - return h('div', [h('span', {}, '未知方式')]); + return h('div', [h('span', {}, '')]); } } }, From c3bd727694c3f211215f2c736be4cac093572c76 Mon Sep 17 00:00:00 2001 From: mabo Date: Mon, 28 Jun 2021 11:23:22 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=85=A5=E9=A9=BBbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/forgetPassword.vue | 2 +- buyer/src/pages/shopEntry/first-apply.vue | 8 +- buyer/src/pages/shopEntry/shop-entry.vue | 95 ++++++++++--------- buyer/src/pages/shopEntry/third-apply.vue | 17 +++- buyer/src/pages/user/Home.vue | 11 +-- .../src/views/my-components/verify/index.vue | 5 +- 6 files changed, 73 insertions(+), 65 deletions(-) diff --git a/buyer/src/pages/forgetPassword.vue b/buyer/src/pages/forgetPassword.vue index 322c6e50..c955c89e 100644 --- a/buyer/src/pages/forgetPassword.vue +++ b/buyer/src/pages/forgetPassword.vue @@ -280,7 +280,7 @@ export default { .login-container { position: relative; margin: 10px auto; - width: 1200px; + width: 600px; background-color: #fff; padding: 20px; .login-btn{ diff --git a/buyer/src/pages/shopEntry/first-apply.vue b/buyer/src/pages/shopEntry/first-apply.vue index 91ca0608..7b82e101 100644 --- a/buyer/src/pages/shopEntry/first-apply.vue +++ b/buyer/src/pages/shopEntry/first-apply.vue @@ -10,7 +10,6 @@ /> - 人 + + +

    店铺入驻

    - + @@ -21,6 +21,9 @@ 店铺已关闭，重申请联系管理员 审核未通过,请修改资质信息，如有疑问请联系管理员
    + + + @@ -38,38 +41,37 @@