From 6d570d39c4e2e15740431a34a6d659e1c4a73a07 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sun, 8 Dec 2019 17:03:34 +0800 Subject: [PATCH] =?UTF-8?q?yshop1.4=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=A7=AF=E5=88=86=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=AD=89=EF=BC=8C=E8=AF=A6=E7=BB=86=E7=9C=8B?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 31 +++--- src/api/yxSystemUserLevel.js | 24 +++++ src/api/yxSystemUserTask.js | 24 +++++ src/api/yxUser.js | 8 ++ src/views/dashboard/PanelGroup.vue | 2 +- src/views/dashboard/PanelGroupT.vue | 2 +- src/views/shop/goods/form.vue | 6 +- src/views/shop/set/actform.vue | 2 +- src/views/shop/set/form.vue | 2 +- src/views/shop/set/hotform.vue | 2 +- src/views/shop/set/menuform.vue | 2 +- src/views/shop/set/rollform.vue | 2 +- src/views/shop/set/sign.vue | 118 ++++++++++++++++++++++ src/views/shop/set/signform.vue | 101 +++++++++++++++++++ src/views/shop/set/usermenuform.vue | 2 +- src/views/shop/user/form.vue | 9 +- src/views/shop/user/formp.vue | 128 ++++++++++++++++++++++++ src/views/shop/user/index.vue | 33 ++++++- src/views/shop/userlevel/form.vue | 143 +++++++++++++++++++++++++++ src/views/shop/userlevel/index.vue | 147 ++++++++++++++++++++++++++++ src/views/shop/usertask/form.vue | 126 ++++++++++++++++++++++++ src/views/shop/usertask/index.vue | 111 +++++++++++++++++++++ 22 files changed, 994 insertions(+), 31 deletions(-) create mode 100644 src/api/yxSystemUserLevel.js create mode 100644 src/api/yxSystemUserTask.js create mode 100644 src/views/shop/set/sign.vue create mode 100644 src/views/shop/set/signform.vue create mode 100644 src/views/shop/user/formp.vue create mode 100644 src/views/shop/userlevel/form.vue create mode 100644 src/views/shop/userlevel/index.vue create mode 100644 src/views/shop/usertask/form.vue create mode 100644 src/views/shop/usertask/index.vue diff --git a/README.md b/README.md index e93d7a8..7273a5e 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,7 @@ #### 项目简介 -yshop基于当前流行技术组合： SpringBoot2+Jpa+MybatisPlus+SpringSecurity+jwt+redis+Vue的前后端分离的商城系统， 包含商城、拼团、砍价、 -秒杀、优惠券、积分、分销等功能，更适合企业或个人二次开发； +yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2+Jpa+MybatisPlus+SpringSecurity+jwt+redis+Vue的前后端分离的商城系统， 包含商城、拼团、砍价、商户管理、 秒杀、优惠券、积分、分销等功能，更适合企业或个人二次开发；； **开发文档** 【[查看文档](https://gitee.com/guchengwuyue/yshopmall/wikis/%E5%BC%80%E5%8F%91%E7%8E%AF%E5%A2%83?sort_id=1718722)】 @@ -54,7 +53,6 @@ yshop基于当前流行技术组合： SpringBoot2+Jpa+MybatisPlus+SpringSecurit #### 已经完成功能 - 可以具体查看演示地址查看当前版本已经完成的功能，不再絮叨啦 - #### 项目结构 项目采用分模块开发方式 - yshop-api 公众号(H5)API模块 @@ -72,7 +70,7 @@ yshop基于当前流行技术组合： SpringBoot2+Jpa+MybatisPlus+SpringSecurit - + @@ -86,16 +84,16 @@ yshop基于当前流行技术组合： SpringBoot2+Jpa+MybatisPlus+SpringSecurit - - + + - - + + - - + +
@@ -123,7 +121,6 @@ yshop基于当前流行技术组合： SpringBoot2+Jpa+MybatisPlus+SpringSecurit * 2.1 Vue 全家桶 * 2.2 Element - #### 项目发布明细 - 1.0版本 @@ -132,7 +129,17 @@ yshop基于当前流行技术组合： SpringBoot2+Jpa+MybatisPlus+SpringSecurit - 1.2.1增加了未付款订单取消功能库存销量退出、优惠券、积分功能，个人中心增加了积分流水 - 1.3版本新增拼团功能，已经发布 - 1.3.1版本手机端新增商户管理、后台新增统计 -- 1.4版本规划：补充公众号功能、发布mpvue小程序 +- 1.3.2新增后台微信相关及其支付配置，新增自动回复配置 +- 1.3.3新增 后台微信图文发送功能，小程序配置，增加小程序授权等,修复一些bug等 +- yshop1.4版本发布，更新如下： + - 1.1、新增积分签到 + - 1.2、新增会员等级、任务等功能，新增会员价格等 + - 1.3、修复Redisson linux系统启动报错问题 + - 1.4、修复商户简单权限功能 + - 1.5、修复加入购物车覆盖问题 + - 1.6、修复拼团出现undefined + - 1.7、会员后台新增余额调整 + - 1.8、修复新增配置数据有时候不成功问题等 #### 反馈交流 diff --git a/src/api/yxSystemUserLevel.js b/src/api/yxSystemUserLevel.js new file mode 100644 index 0000000..a91c032 --- /dev/null +++ b/src/api/yxSystemUserLevel.js @@ -0,0 +1,24 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/yxSystemUserLevel', + method: 'post', + data + }) +} + +export function del(id) { + return request({ + url: 'api/yxSystemUserLevel/' + id, + method: 'delete' + }) +} + +export function edit(data) { + return request({ + url: 'api/yxSystemUserLevel', + method: 'put', + data + }) +} diff --git a/src/api/yxSystemUserTask.js b/src/api/yxSystemUserTask.js new file mode 100644 index 0000000..995f945 --- /dev/null +++ b/src/api/yxSystemUserTask.js @@ -0,0 +1,24 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/yxSystemUserTask', + method: 'post', + data + }) +} + +export function del(id) { + return request({ + url: 'api/yxSystemUserTask/' + id, + method: 'delete' + }) +} + +export function edit(data) { + return request({ + url: 'api/yxSystemUserTask', + method: 'put', + data + }) +} diff --git a/src/api/yxUser.js b/src/api/yxUser.js index 14e08b5..def1c8b 100644 --- a/src/api/yxUser.js +++ b/src/api/yxUser.js @@ -30,3 +30,11 @@ export function onStatus(id, data) { data }) } + +export function editp(data) { + return request({ + url: 'api/yxUser/money', + method: 'post', + data + }) +} diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue index a1dccbd..e3a86f7 100644 --- a/src/views/dashboard/PanelGroup.vue +++ b/src/views/dashboard/PanelGroup.vue @@ -28,7 +28,7 @@
-
上周成交额
+
近七天成交额
diff --git a/src/views/dashboard/PanelGroupT.vue b/src/views/dashboard/PanelGroupT.vue index 691b350..48cbfbe 100644 --- a/src/views/dashboard/PanelGroupT.vue +++ b/src/views/dashboard/PanelGroupT.vue @@ -28,7 +28,7 @@
-
上周订单数
+
近七天订单数
diff --git a/src/views/shop/goods/form.vue b/src/views/shop/goods/form.vue index 539e2f2..361a8e9 100644 --- a/src/views/shop/goods/form.vue +++ b/src/views/shop/goods/form.vue @@ -31,9 +31,9 @@ - - - + + + diff --git a/src/views/shop/set/actform.vue b/src/views/shop/set/actform.vue index 1a50923..c13b29c 100644 --- a/src/views/shop/set/actform.vue +++ b/src/views/shop/set/actform.vue @@ -95,7 +95,7 @@ export default { this.$refs['form'].resetFields() this.form = { id: '', - groupName: '', + groupName: 'routine_home_activity', value: '', addTime: '', sort: '', diff --git a/src/views/shop/set/form.vue b/src/views/shop/set/form.vue index a9dcaf2..2ee6c61 100644 --- a/src/views/shop/set/form.vue +++ b/src/views/shop/set/form.vue @@ -91,7 +91,7 @@ export default { this.$refs['form'].resetFields() this.form = { id: '', - groupName: '', + groupName: 'routine_home_banner', value: '', addTime: '', sort: '', diff --git a/src/views/shop/set/hotform.vue b/src/views/shop/set/hotform.vue index 2e5e1a4..b7c3366 100644 --- a/src/views/shop/set/hotform.vue +++ b/src/views/shop/set/hotform.vue @@ -81,7 +81,7 @@ export default { this.$refs['form'].resetFields() this.form = { id: '', - groupName: '', + groupName: 'routine_hot_search', value: '', addTime: '', sort: '', diff --git a/src/views/shop/set/menuform.vue b/src/views/shop/set/menuform.vue index 006babb..18690e0 100644 --- a/src/views/shop/set/menuform.vue +++ b/src/views/shop/set/menuform.vue @@ -91,7 +91,7 @@ export default { this.$refs['form'].resetFields() this.form = { id: '', - groupName: '', + groupName: 'routine_home_menus', value: '', addTime: '', sort: '', diff --git a/src/views/shop/set/rollform.vue b/src/views/shop/set/rollform.vue index 5b952da..3ac2cac 100644 --- a/src/views/shop/set/rollform.vue +++ b/src/views/shop/set/rollform.vue @@ -85,7 +85,7 @@ export default { this.$refs['form'].resetFields() this.form = { id: '', - groupName: '', + groupName: 'routine_home_roll_news', value: '', addTime: '', sort: '', diff --git a/src/views/shop/set/sign.vue b/src/views/shop/set/sign.vue new file mode 100644 index 0000000..41bc4b3 --- /dev/null +++ b/src/views/shop/set/sign.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/shop/set/signform.vue b/src/views/shop/set/signform.vue new file mode 100644 index 0000000..ac60a19 --- /dev/null +++ b/src/views/shop/set/signform.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/src/views/shop/set/usermenuform.vue b/src/views/shop/set/usermenuform.vue index e70a011..6f03f2e 100644 --- a/src/views/shop/set/usermenuform.vue +++ b/src/views/shop/set/usermenuform.vue @@ -91,7 +91,7 @@ export default { this.$refs['form'].resetFields() this.form = { id: '', - groupName: '', + groupName: 'routine_my_menus', value: '', addTime: '', sort: '', diff --git a/src/views/shop/user/form.vue b/src/views/shop/user/form.vue index 61a4472..512c1d7 100644 --- a/src/views/shop/user/form.vue +++ b/src/views/shop/user/form.vue @@ -13,9 +13,6 @@ - - - @@ -23,6 +20,10 @@ 开启 关闭 + + 开启 + 关闭 +
取消 @@ -74,7 +75,7 @@ export default { spreadCount: '', cleanTime: '', addres: '', - adminid: '', + adminid: 0, loginType: '' }, rules: { diff --git a/src/views/shop/user/formp.vue b/src/views/shop/user/formp.vue new file mode 100644 index 0000000..6cd83ea --- /dev/null +++ b/src/views/shop/user/formp.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/src/views/shop/user/index.vue b/src/views/shop/user/index.vue index 2a9c363..11c73b1 100644 --- a/src/views/shop/user/index.vue +++ b/src/views/shop/user/index.vue @@ -12,6 +12,7 @@
+ @@ -40,10 +41,21 @@ - + @@ -74,9 +87,10 @@ import checkPermission from '@/utils/permission' import initData from '@/mixins/initData' import { del, onStatus } from '@/api/yxUser' import eForm from './form' +import pForm from './formp' import { formatTime } from '@/utils/index' export default { - components: { eForm }, + components: { eForm, pForm }, mixins: [initData], data() { return { @@ -185,6 +199,17 @@ export default { loginType: data.loginType } _this.dialog = true + }, + editP(data) { + this.isAdd = false + const _this = this.$refs.formp + _this.form = { + uid: data.uid, + nickname: data.nickname, + ptype: 1, + money: 0 + } + _this.dialog = true } } } diff --git a/src/views/shop/userlevel/form.vue b/src/views/shop/userlevel/form.vue new file mode 100644 index 0000000..647fed0 --- /dev/null +++ b/src/views/shop/userlevel/form.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/src/views/shop/userlevel/index.vue b/src/views/shop/userlevel/index.vue new file mode 100644 index 0000000..12504f8 --- /dev/null +++ b/src/views/shop/userlevel/index.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/src/views/shop/usertask/form.vue b/src/views/shop/usertask/form.vue new file mode 100644 index 0000000..d58d6b9 --- /dev/null +++ b/src/views/shop/usertask/form.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/views/shop/usertask/index.vue b/src/views/shop/usertask/index.vue new file mode 100644 index 0000000..3f77c46 --- /dev/null +++ b/src/views/shop/usertask/index.vue @@ -0,0 +1,111 @@ + + + + +