From b944b2b2d1fefae42b942a193636a0af8afcfc55 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 6 Apr 2020 23:19:51 +0800 Subject: [PATCH] yshop2.1 --- src/api/monitor/visits.js | 2 + src/api/visits.js | 7 + src/api/yxSystemGroupData.js | 7 + src/api/yxSystemStore.js | 9 +- src/assets/icons/svg/orderinfo.svg | 1 + src/assets/icons/svg/shopping.svg | 1 + src/assets/icons/svg/today.svg | 2 +- src/assets/images/logo.png | Bin 49551 -> 13240 bytes src/views/activity/seckill/form.vue | 27 ++- src/views/activity/seckill/index.vue | 3 +- .../user.vue => components/user/index.vue} | 13 +- src/views/dashboard/OrderCount.vue | 87 +++++++++ src/views/dashboard/PanelGroup.vue | 169 +++++++++++------- src/views/dashboard/PanelGroupT.vue | 4 + src/views/dashboard/YshopInfo.vue | 56 +++++- src/views/home.vue | 13 +- src/views/shop/goods/index.vue | 2 +- src/views/shop/goods/index2.vue | 2 +- src/views/shop/goods/index3.vue | 2 +- src/views/shop/order/indext.vue | 17 +- src/views/shop/reply/index.vue | 4 +- src/views/shop/set/act.vue | 2 +- src/views/shop/set/actform.vue | 4 +- src/views/shop/set/form.vue | 4 +- src/views/shop/set/hot.vue | 2 +- src/views/shop/set/hotform.vue | 4 +- src/views/shop/set/index.vue | 2 +- src/views/shop/set/menu.vue | 2 +- src/views/shop/set/menuform.vue | 4 +- src/views/shop/set/recharge.vue | 6 +- src/views/shop/set/rechargeform.vue | 4 +- src/views/shop/set/roll.vue | 2 +- src/views/shop/set/rollform.vue | 4 +- src/views/shop/set/seckill.vue | 2 +- src/views/shop/set/seckillform.vue | 4 +- src/views/shop/set/sign.vue | 2 +- src/views/shop/set/signform.vue | 4 +- src/views/shop/set/usermenu.vue | 2 +- src/views/shop/set/usermenuform.vue | 4 +- src/views/shop/store/index.vue | 2 +- src/views/shop/storestaff/index.vue | 2 +- src/views/wechat/config/pay.vue | 9 +- 42 files changed, 371 insertions(+), 128 deletions(-) create mode 100644 src/assets/icons/svg/orderinfo.svg create mode 100644 src/assets/icons/svg/shopping.svg rename src/views/{shop/storestaff/user.vue => components/user/index.vue} (92%) create mode 100644 src/views/dashboard/OrderCount.vue diff --git a/src/api/monitor/visits.js b/src/api/monitor/visits.js index 147ae7c..d35f6b0 100644 --- a/src/api/monitor/visits.js +++ b/src/api/monitor/visits.js @@ -20,3 +20,5 @@ export function getChartData() { method: 'get' }) } + + diff --git a/src/api/visits.js b/src/api/visits.js index ce1165e..d8a7d15 100644 --- a/src/api/visits.js +++ b/src/api/visits.js @@ -34,3 +34,10 @@ export function chart() { method: 'get' }) } + +export function getOrderCount() { + return request({ + url: 'api/yxStoreOrder/orderCount', + method: 'get' + }) +} diff --git a/src/api/yxSystemGroupData.js b/src/api/yxSystemGroupData.js index 363180a..7f5a8b6 100644 --- a/src/api/yxSystemGroupData.js +++ b/src/api/yxSystemGroupData.js @@ -22,3 +22,10 @@ export function edit(data) { data }) } + +export function get() { + return request({ + url: 'api/yxSystemGroupData', + method: 'get' + }) +} diff --git a/src/api/yxSystemStore.js b/src/api/yxSystemStore.js index 80984fc..0f9987f 100644 --- a/src/api/yxSystemStore.js +++ b/src/api/yxSystemStore.js @@ -15,6 +15,13 @@ export function get() { }) } +export function getAll() { + return request({ + url: 'api/yxSystemStore/all', + method: 'get' + }) +} + export function getL(data) { return request({ url: 'api/yxSystemStore/getL', @@ -39,4 +46,4 @@ export function edit(data) { }) } -export default { getL, add, edit, del, get } +export default { getL, add, edit, del, get, getAll } diff --git a/src/assets/icons/svg/orderinfo.svg b/src/assets/icons/svg/orderinfo.svg new file mode 100644 index 0000000..86e919f --- /dev/null +++ b/src/assets/icons/svg/orderinfo.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/svg/shopping.svg b/src/assets/icons/svg/shopping.svg new file mode 100644 index 0000000..87513e7 --- /dev/null +++ b/src/assets/icons/svg/shopping.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/today.svg b/src/assets/icons/svg/today.svg index 11dcd8d..3ab4d15 100644 --- a/src/assets/icons/svg/today.svg +++ b/src/assets/icons/svg/today.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index b7371a5070ace402cedefb81b7a1a1164e314895..626dac1be5ef81742d43c7c89326433cb814ce3f 100644 GIT binary patch delta 10638 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⁡aP|>b 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 @@ -23,11 +23,21 @@ + + + + + @@ -79,6 +89,7 @@ diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue index 28128dc..f3f9d7f 100644 --- a/src/views/dashboard/PanelGroup.vue +++ b/src/views/dashboard/PanelGroup.vue @@ -3,44 +3,52 @@
- +
-
今日成交额
- +
+ 会员总数 +
+
- +
-
昨日成交额
- +
+ 订单总数 +
+
- +
-
近七天成交额
- +
+ 总金额 +
+
-
- 公众号演示: + 公众号演示:
小程序演示:关注上面公众号之后,选择yshop小程序体验即可 @@ -40,7 +40,7 @@ H5测试号:hupeng/123456,也可以自行注册
- 如果想体验手机端商户管理与订单核销功能,记得去后台会员管理,搜索找到自己, + 如果想体验手机端商户管理功能,记得去后台会员管理,搜索找到自己, 然后编辑设置商户管理员开启即可,然后刷新个人中心即可体验
@@ -62,20 +62,31 @@
1、VIP为终身制包括JAVA端+H5公众号端,后期免费升级迭代及其技术支持。!
- 2、价格:vip会员价298元(JAVA+H5+公众号版),后续的系统升级vip价格会有相应的调整的,所以早上车更优惠哦!
+ 2、价格:vip会员价299元(JAVA+H5+公众号版),后续的系统升级vip价格会有相应的调整的,所以早上车更优惠哦!
3、VIP购买淘宝地址:https://item.taobao.com/item.htm?id=607532386325
4、加入vip群:931426444,请输入你的淘宝订单编号,即可入群
5、群里面获取私服git
6、如果需要小程序需要单独购买看下面
+ 7、此套餐必须购买才能进VIP会员群
- VIP版如果需要小程序需要另外单独购买: + VIP版如果需要小程序端需要另外单独购买:
1、小程序是mpvue2.0框架开发
2、价格:100元,只是单独的小程序!购买小程序请务必要购买上面VIP套餐
3、购买淘宝地址:https://item.taobao.com/item.htm?id=612007949053
4、群里面获取私服git
+ 5、可选
+
+
+ VIP版如果需要uniapp端另外单独购买: +
+
+ 1、uniapp目前已经基本开发完成,预计于2.1版本一块发布
+ 2、uniapp目前支持打包微信小程序与APP(包括安卓Android与苹果IOS)
+ 3、uniapp目前只针对会员预售而且预售阶段是有优惠的哦
+ 4、可选
@@ -87,22 +98,49 @@ 更新日志
- (预计4月发布)yshop2.1版本 更新如下: + (预计4月初发布)yshop2.1版本(已上演示版的公众号/H5版本) 更新如下:
- 1、单门店升级为多门店 + 1、单门店升级为多门店)
- 2、充值增加充值方案 + 2、充值新增充值方案
3、打通小程序与公众号账号
- 4、新增微信app支付(主要用于uniapp) + 4、新增微信app支付 +
+
+ 5、会员等级升级新增手动解锁 +
+
+ 6、app分销海报与商品详情海报新增了邀请码 +
+
+ 7、app注册新增了邀请码形成分销关系) +
+
+ 8、后台素材按照时间排序#I1C6MK +
+
+ 9、商品分类新增判断自己不能选择自己作为父级#I1C5AP +
+
+ 10、修复订单详情昵称不显示问题#I1C055 +
+
+ 11、修复导入微信地址必须要刷新的问题#I1CCEJ +
+
+ 12、修复当设置最大抵扣积为0的导致积分不能抵扣的问题 +
+
+ 13、优化订单详情腾讯key的提示
- 5、修复。。。。。等 + 14、优化订单列表新增门店标识
(2020-03-15)2.0.X修复优化版本 发布更新如下: diff --git a/src/views/home.vue b/src/views/home.vue index 192d7d5..9656cd7 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -1,19 +1,22 @@ - + diff --git a/src/views/shop/goods/index2.vue b/src/views/shop/goods/index2.vue index 6762add..48042a2 100644 --- a/src/views/shop/goods/index2.vue +++ b/src/views/shop/goods/index2.vue @@ -28,7 +28,7 @@ - + diff --git a/src/views/shop/goods/index3.vue b/src/views/shop/goods/index3.vue index e40a226..c026054 100644 --- a/src/views/shop/goods/index3.vue +++ b/src/views/shop/goods/index3.vue @@ -28,7 +28,7 @@ - + diff --git a/src/views/shop/order/indext.vue b/src/views/shop/order/indext.vue index bba93e0..e22a274 100644 --- a/src/views/shop/order/indext.vue +++ b/src/views/shop/order/indext.vue @@ -34,6 +34,9 @@ + + + 搜索 - + +
+
- +
-
本月成交额
- +
+ 商品总数 +
+
@@ -56,7 +64,8 @@ export default { data() { return { count: { todayPrice: 0, todayCount: 0, proPrice: 0, proCount: 0, - monthPrice: 0, monthCount: 0, lastWeekCount: 0, lastWeekPrice: 0 } + monthPrice: 0, monthCount: 0, lastWeekCount: 0, lastWeekPrice: 0, + userCount: 0, orderCount: 0, priceCount: 0, goodsCount: 0} } }, mounted() { @@ -70,64 +79,102 @@ export default { this.count.monthCount = res.monthCount this.count.lastWeekCount = res.lastWeekCount this.count.lastWeekPrice = res.lastWeekPrice + + this.count.userCount = res.userCount + this.count.orderCount = res.orderCount + this.count.priceCount = res.priceCount + this.count.goodsCount = res.goodsCount }) } } diff --git a/src/views/dashboard/PanelGroupT.vue b/src/views/dashboard/PanelGroupT.vue index 82a4f46..8386610 100644 --- a/src/views/dashboard/PanelGroupT.vue +++ b/src/views/dashboard/PanelGroupT.vue @@ -86,10 +86,14 @@ export default { font-size: 12px; position: relative; overflow: hidden; + cursor: pointer; color: #666; background: #fff; box-shadow: 4px 4px 40px rgba(0, 0, 0, .05); border-color: rgba(0, 0, 0, .05); + + + .icon-people { color: #40c9c6; } diff --git a/src/views/dashboard/YshopInfo.vue b/src/views/dashboard/YshopInfo.vue index 0963261..3215728 100644 --- a/src/views/dashboard/YshopInfo.vue +++ b/src/views/dashboard/YshopInfo.vue @@ -30,7 +30,7 @@ github:
访问github