diff --git a/README.md b/README.md index 67ba925..e7e0aa8 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ #### 项目简介 -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)】 #### 体验地址 -| | 后台系统 | 前端(公众号) | +| | 后台系统 | 前端(公众号+小程序(mpvue2.0)，关注公众号即可体验公众号与小程序) | |--- |--- | --- | | | https://www.yixiang.co |H5:https://h5.yixiang.co 测试号：hupeng/123456,也可以自行注册 | | | 后台体验账号/密码：admin/123456 | 公众号:![输入图片说明](https://images.gitee.com/uploads/images/2019/1116/060936_fd73496c_477893.jpeg "qrcode_for_gh_95df5a2881cc_258.jpg") | @@ -32,7 +32,7 @@ CMS，CRM，OA等等本版本本身属于独立后台商城管理系统; 3.可以个人、企业直接使用。 ### VIP版 -1.包括了开源版，还包括了移动端(H5+公众号)、小程序(mpvue2框架)1.0已经发布一个开发版、移动端API +1.包括了开源版，还包括了移动端(H5+公众号)、小程序(mpvue2框架）、移动端API 2.本版本是演示的所有功能代码; @@ -64,7 +64,6 @@ CMS，CRM，OA等等本版本本身属于独立后台商城管理系统; - yshop-tools 第三方工具模块 - yshop-generator 代码生成模块 - yshop-shop 商城模块 -- yshop-monitor 监控模块 #### 系统预览 @@ -87,7 +86,7 @@ CMS，CRM，OA等等本版本本身属于独立后台商城管理系统;
- + @@ -136,31 +135,38 @@ CMS，CRM，OA等等本版本本身属于独立后台商城管理系统; - 1.3.1版本手机端新增商户管理、后台新增统计 - 1.3.2新增后台微信相关及其支付配置，新增自动回复配置 - 1.3.3新增 后台微信图文发送功能，小程序配置，增加小程序授权等,修复一些bug等 -- yshop1.4版本发布 -- 1.4.1个人中心新增账单流水 -- yshop1.4.2 发布更新如下： -- 1.4.3版本，后台图标更新,后台模块重新拆分,物流快递单独管理,导出最新sql -- 1.4.4版本，新增模板消息通知、H5端商家管理发货修改及其列表时间显示修复 -- yshop1.5版本发布： -- yshop1.6发布： - yshop1.6.1发布：新增移动端浏览记录，下单增加简单ReentrantLock锁 - yshop1.6.2发布：修复用户昵称带有表情导致入库失败问题，修复下单订单金额为0不能支付的问题 - yshop1.6.4发布：后台新增修改订单价格与备注优化订单详情显示明细,修复积分记录标题不显示的问题 -- yshop1.7 发布 - - yshop1.8发布: -- yshop1.8.3发布更新如下： - - yshop1.9.1,新增城市接口,修复小程序登陆与支付问题,发布mpvue1.0小程序 - - 1、新增城市接口 - - 2、修复小程序登陆与支付问题 - - 3、发布mpvue1.0小程序 - - 4、WxJava升级到3.6 - - 5、微信公众号服务配置重构 - - 6、修复后台配置公众号,API端必须要重启才能生效的问题 -- yshop1.9.2 - - 1、修复素材库无法分页的问题#I18KJN - - 2、修复订单退款问题#I18GG6 - - 3、修复分类问题#I17UEI - - 4、修复后台添加角色的问题#I18NCW +- yshop1.9.1,新增城市接口,修复小程序登陆与支付问题,发布mpvue1.0小程序 +- yshop1.9.4,新增小程序普通二维码功能及其修复小程序其他问题,详情登陆演示后台查看明细 +- yshop2.0发布更新如下： +- 1、优化代码结构与名称，修改get请求参数其统一继承分页参数 +- 2、新增redis监听未付款30分钟取消功能与7天自动收货功能，mq队列作为备选(注释掉) +- 3、新增门店到店核销功能 +- 4、新增分销全局开关#I19HB1 +- 5、积分新增消费限制#I19TUR +- 6、新增充值功能#I18V5D +- 7、后台菜单调整，新增财务模块 +- 8、优化后台配置赋值写法 +- 9、修复管理后台新增表单之后如果直接再新增数据导致默认数据缺失问题#I1AFBK +- 10、修复提交购物车可能查询多条数据的问题 +- 11、后台登陆背景图固定#I1A0LS +- 12、增加常量与枚举优化硬编码问题 +- 13、微信支付、公众号、模板消息修改 +- 14、修复代码生成器不全的问题#I1AIO4 +- 15、修复营销产品拼团等轮播图不能修改的问题#I1AHXR +- 16、移除yshop-monitor模块 +- 17、修复退货理由文字错误#I1AQ7D +- 18、修复新增分类的图片自动显示上次一次的图片#I1AQBK +- 19、新增微信jssdk接口返回所需js权限 +- 20、新增余额充值变动模板消息通知 +- 21、首页数据缓存优化 +- 22、新增未支付订单显示到期时间 +- 23、修复加入购物车购买后，后台订单中的商品信息数据重复#I1AXNX +- 24、修复后台-管理商品-规格属性 属性无法删除问题#I1AYL2 +- 25、修复公众号商品直接微信分享标题不显示的问题#I1AX0R + #### 反馈交流 diff --git a/src/api/yxStoreOrder.js b/src/api/yxStoreOrder.js index cfc76d7..bdd9775 100644 --- a/src/api/yxStoreOrder.js +++ b/src/api/yxStoreOrder.js @@ -23,6 +23,15 @@ export function edit(data) { }) } +export function editT(data) { + return request({ + url: 'api/yxStoreOrder/check', + method: 'put', + data + }) +} + + export function refund(data) { return request({ url: 'api/yxStoreOrder/refund', diff --git a/src/api/yxSystemStore.js b/src/api/yxSystemStore.js new file mode 100644 index 0000000..dcaa7c9 --- /dev/null +++ b/src/api/yxSystemStore.js @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +export function get() { + return request({ + url: 'api/yxSystemStore', + method: 'get' + }) +} + +export function getL(data) { + return request({ + url: 'api/yxSystemStore/getL', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/yxSystemStore/', + method: 'delete', + data: ids + }) +} + +export function update(data) { + return request({ + url: 'api/yxSystemStore', + method: 'put', + data + }) +} + +export default { get, getL, update, del } diff --git a/src/api/yxUserRecharge.js b/src/api/yxUserRecharge.js new file mode 100644 index 0000000..38d1180 --- /dev/null +++ b/src/api/yxUserRecharge.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/yxUserRecharge', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/yxUserRecharge/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/yxUserRecharge', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/src/assets/icons/svg/price.svg b/src/assets/icons/svg/price.svg new file mode 100644 index 0000000..952f8ac --- /dev/null +++ b/src/assets/icons/svg/price.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/rec.svg b/src/assets/icons/svg/rec.svg new file mode 100644 index 0000000..18339da --- /dev/null +++ b/src/assets/icons/svg/rec.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/store.svg b/src/assets/icons/svg/store.svg new file mode 100644 index 0000000..65d1f13 --- /dev/null +++ b/src/assets/icons/svg/store.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/bg.jpg b/src/assets/images/bg.jpg new file mode 100644 index 0000000..447a0b5 Binary files /dev/null and b/src/assets/images/bg.jpg differ diff --git a/src/settings.js b/src/settings.js index 068ee84..f47527f 100644 --- a/src/settings.js +++ b/src/settings.js @@ -2,7 +2,7 @@ module.exports = { /** * @description 网站标题 */ - title: 'YSHOP', + title: 'YSHOP-2.0dev', /** * @description 是否显示 tagsView */ diff --git a/src/views/activity/bargain/form.vue b/src/views/activity/bargain/form.vue index d192ac1..e6e60ec 100644 --- a/src/views/activity/bargain/form.vue +++ b/src/views/activity/bargain/form.vue @@ -161,7 +161,7 @@ export default { }, 'form.sliderImageArr': function(val) { if (val) { - this.form.sliderImage = val.join(',') + this.form.images = val.join(',') } } }, diff --git a/src/views/activity/combination/form.vue b/src/views/activity/combination/form.vue index 4bccea7..63d68a6 100644 --- a/src/views/activity/combination/form.vue +++ b/src/views/activity/combination/form.vue @@ -140,7 +140,7 @@ export default { }, 'form.sliderImageArr': function(val) { if (val) { - this.form.sliderImage = val.join(',') + this.form.images = val.join(',') } } }, diff --git a/src/views/activity/coupon/form.vue b/src/views/activity/coupon/form.vue index cb1c9d4..aa34e21 100644 --- a/src/views/activity/coupon/form.vue +++ b/src/views/activity/coupon/form.vue @@ -102,14 +102,13 @@ export default { this.form = { id: '', title: '', - integral: '', - couponPrice: '', - useMinPrice: '', - couponTime: '', - sort: '', - status: '', - addTime: '', - isDel: '' + integral: 0, + couponPrice: 0, + useMinPrice: 0, + couponTime: 1, + sort: 0, + status: 1, + addTime: '' } } } diff --git a/src/views/activity/couponissue/index.vue b/src/views/activity/couponissue/index.vue index dc29244..e7e820a 100644 --- a/src/views/activity/couponissue/index.vue +++ b/src/views/activity/couponissue/index.vue @@ -119,6 +119,8 @@ export default { cid: data.cid, startTime: data.startTime, endTime: data.endTime, + startTimeDate: data.startTimeDate, + endTimeDate: data.endTimeDate, totalCount: data.totalCount, remainCount: data.remainCount, isPermanent: data.isPermanent, diff --git a/src/views/activity/seckill/form.vue b/src/views/activity/seckill/form.vue index b01d0a0..32fcd25 100644 --- a/src/views/activity/seckill/form.vue +++ b/src/views/activity/seckill/form.vue @@ -135,7 +135,7 @@ export default { }, 'form.sliderImageArr': function(val) { if (val) { - this.form.sliderImage = val.join(',') + this.form.images = val.join(',') } } }, diff --git a/src/views/dashboard/YshopInfo.vue b/src/views/dashboard/YshopInfo.vue index 7511430..1facd08 100644 --- a/src/views/dashboard/YshopInfo.vue +++ b/src/views/dashboard/YshopInfo.vue @@ -10,7 +10,7 @@ yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2+Jpa+MybatisPlus+SpringSecurity 的前后端分离的商城系统， - 包含商城、拼团、砍价、商户管理、 秒杀、优惠券、积分、分销、会员等功能。 + 包含商城、拼团、砍价、商户管理、 秒杀、优惠券、积分、分销、会员、充值、门店核销等功能。
技术选型： @@ -39,6 +39,10 @@ H5演示：https://h5.yixiang.co
H5测试号：hupeng/123456,也可以自行注册
+
+ 如果想体验手机端商户管理与订单核销功能，记得去后台会员管理，搜索找到自己， + 然后编辑设置商户管理员开启即可，然后刷新个人中心即可体验 +
@@ -58,7 +62,7 @@
1、VIP为终身制包括JAVA端+H5公众号端，后期免费升级迭代及其技术支持。！
- 2、价格：vip会员价248元(JAVA+H5+公众号版)，后续的系统升级vip价格会有相应的调整的，所以早上车更优惠哦！
+ 2、价格：vip会员价298元(JAVA+H5+公众号版)，后续的系统升级vip价格会有相应的调整的，所以早上车更优惠哦！
3、VIP购买淘宝地址：https://item.taobao.com/item.htm?id=607532386325
4、加入vip群：931426444,请输入你的淘宝订单编号，即可入群
5、群里面获取私服git
@@ -83,70 +87,121 @@ 更新日志
- （2020-02-11）yshop1.9.6版本 发布更新如下： + （即将发布）yshop2.0dev版本 发布更新如下： +
+
+ 1、优化代码结构与名称，修改get请求参数其统一继承分页参数 +
+
+ 2、新增redis监听未付款30分钟取消功能与7天自动收货功能，mq队列作为备选(注释掉) +
+
+ 3、新增门店到店核销功能 +
+
+ 4、新增分销全局开关#I19HB1 +
+
+ 5、积分新增消费限制#I19TUR +
+
+ 6、新增充值功能#I18V5D +
+
+ 7、后台菜单调整，新增财务模块 +
+
+ 8、优化后台配置赋值写法 +
+
+ 9、修复管理后台新增表单之后如果直接再新增数据导致默认数据缺失问题#I1AFBK +
+
+ 10、修复提交购物车可能查询多条数据的问题 +
+
+ 11、后台登陆背景图固定#I1A0LS +
+
+ 12、增加常量与枚举优化硬编码问题 +
+
+ 13、微信支付、公众号、模板消息修改 +
+
+ 14、修复代码生成器不全的问题#I1AIO4 +
+
+ 15、修复营销产品拼团等轮播图不能修改的问题#I1AHXR +
+
+ 16、移除yshop-monitor模块 +
+
+ 17、修复退货理由文字错误#I1AQ7D
- 1、H5(公众号)端新增商品海报功能 + 18、修复新增分类的图片自动显示上次一次的图片#I1AQBK
- 2、管理后台配置新增排序与可隐藏选项，同时移动端接口相应更新 + 19、新增微信jssdk接口返回所需js权限
- 3、去除小程序首页新闻轮播图标识 + 20、新增余额充值变动模板消息通知
- 4、修复小程序图片路径写死了问题(只能修改vue中的url,css中的需要自行替换)#I18KRS + 21、首页数据缓存优化
- 5、修改小程序登录成功后，跳到转个人中心问题 #I194VT + 22、新增未支付订单显示到期时间
- 6、修复小程序申请退款页面图文#I197FG + 23、修复加入购物车购买后，后台订单中的商品信息数据重复#I1AXNX
- 7、修复砍价不能下单问题 + 24、修复后台-管理商品-规格属性 属性无法删除问题#I1AYL2
- （2020-02-07）yshop1.9.5版本 发布更新如下： + 25、修复公众号商品直接微信分享标题不显示的问题#I1AX0R
- 1.H5(公众号)新增手机号绑定#I18IVP + （2020-02-24）yshop修复优化版本 发布更新如下：
- 2.小程序新增手机号绑定接口(小程序待对接) + 1.修复小程序积分支付功能#I1A03I
- 3.H5(公众号)端新增我的账户信息管理(头像等信息修改) + 2.修复小程序砍价功能上面时间没有进行倒计时#I1A037
- 4.修复H5注册NULL问题 + 3.优化小程序底层导航栏适配ios#I1A1QX
- 5.修复小程序未付款订单支付问题#I18ZV5 + 4.修复小程序返回的问题#I1A036
- （2020-02-06）yshop1.9.4版本 发布更新如下： + 5.修复小程序地址管理#I1A03U
- 1.后台砍价列表显示调整 + 6.调整小程序首页样式修改与H5保持同步
- 2.后台会员新增用户来源 + 7.H5首页数据加载顺序调整
- 3.小程序新增普通二维码功能 + （2020-02-20）yshop1.9.10版本 发布更新如下：
- 4.修复小程序砍价海报问题 + 1.小程序新增了商品详情海报功能
- 5.修复小程序首页滚动新闻不显示的问题 + 2.小程序新增了手机号绑定功能
- 6.修复小程序个人中心积分列表问题 + 3.修复小程序选择规格的问题#I19PD7
- 7.修复小程序购物车删除问题#I19176 + 4.修改移动端二维码海报生成拆分为H5端与小程序端
diff --git a/src/views/login.vue b/src/views/login.vue index 95b946d..6f39945 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -147,7 +147,7 @@ export default { justify-content: center; align-items: center; height: 100%; - background-image:url(https://api.isoyu.com/bing_images.php); + background-image:url("../assets/images/bg.jpg"); background-size: cover; } .title { diff --git a/src/views/shop/cate/index.vue b/src/views/shop/cate/index.vue index 2091edf..2dc8b43 100644 --- a/src/views/shop/cate/index.vue +++ b/src/views/shop/cate/index.vue @@ -100,14 +100,15 @@ export default { }, watch: { picArr: function(val) { + console.log(); this.form.pic = val.join(',') } }, methods: { // 新增与编辑前做的操作 [CRUD.HOOK.afterToCU](crud, form) { - console.log(form) - if (form.pic) { + this.picArr = [] + if (form.pic && form.id) { this.picArr = form.pic.split(',') } diff --git a/src/views/shop/express/form.vue b/src/views/shop/express/form.vue index a4b0ca2..62be683 100644 --- a/src/views/shop/express/form.vue +++ b/src/views/shop/express/form.vue @@ -90,8 +90,7 @@ export default { id: '', code: '', name: '', - sort: '', - isShow: '' + sort: 0 } } } diff --git a/src/views/shop/goods/attr.vue b/src/views/shop/goods/attr.vue index abe1a21..e77127f 100644 --- a/src/views/shop/goods/attr.vue +++ b/src/views/shop/goods/attr.vue @@ -36,7 +36,7 @@ :span="3" :name="attr" > - {{ attr }} + {{ attr }} @@ -330,6 +330,7 @@ export default { if (this.items.length > 1) { this.items.splice(index, 1) } else { Message({ message: '请设置至少一个规则', type: 'error' }) } }, attrRemove(item, k) { + console.log('item:') if (item.detail.length == 1) { Message({ message: '请设置至少一个属性', type: 'error' }) return false diff --git a/src/views/shop/goods/form.vue b/src/views/shop/goods/form.vue index 9988df9..caa776a 100644 --- a/src/views/shop/goods/form.vue +++ b/src/views/shop/goods/form.vue @@ -208,7 +208,7 @@ export default { this.$refs['form'].resetFields() this.form = { id: '', - merId: '', + merId: 0, image: '', sliderImage: '', imageArr: [], @@ -217,34 +217,33 @@ export default { storeInfo: '', keyword: '', barCode: '', - cateId: '', - price: '', - vipPrice: '', - otPrice: '', - postage: '', + cateId: 1, + price: 0, + vipPrice: 0, + otPrice: 0, + postage: 0, unitName: '', - sort: '', + sort: 0, sales: 0, stock: 0, isShow: 1, - isHot: 1, - isBenefit: 1, - isBest: 1, - isNew: 1, + isHot: 0, + isBenefit: 0, + isBest: 0, + isNew: 0, description: '', addTime: '', - isPostage: 1, - isDel: '', - merUse: '', - giveIntegral: '', - cost: '', - isSeckill: '', - isBargain: '', - isGood: '', - ficti: '', - browse: '', + isPostage: 0, + isDel: 0, + merUse: 0, + giveIntegral: 0, + cost: 0, + isSeckill: 0, + isBargain: 0, + isGood: 0, + ficti: 0, + browse: 0, codePath: '', - soureLink: '' } }, getCates() { diff --git a/src/views/shop/order/formC.vue b/src/views/shop/order/formC.vue new file mode 100644 index 0000000..b8b72ba --- /dev/null +++ b/src/views/shop/order/formC.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue index a08adbc..10a408f 100644 --- a/src/views/shop/order/index.vue +++ b/src/views/shop/order/index.vue @@ -54,7 +54,7 @@ {{ item.cartInfoMap.productInfo.storeName }} {{ item.cartInfoMap.productInfo.attrInfo.suk }} | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }} -
+
+
+ +
+ + + + + + + + + + 搜索 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/src/views/shop/recharge/index.vue b/src/views/shop/recharge/index.vue new file mode 100644 index 0000000..19a46c9 --- /dev/null +++ b/src/views/shop/recharge/index.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/src/views/shop/set/form.vue b/src/views/shop/set/form.vue index 9813663..919e7ff 100644 --- a/src/views/shop/set/form.vue +++ b/src/views/shop/set/form.vue @@ -112,11 +112,13 @@ export default { this.form = { id: '', groupName: 'routine_home_banner', + name: '', + url: '', + wxapp_url: '', + pic: '', imageArr: [], - value: '', - addTime: '', - sort: '', - status: '' + sort: 0, + status: 1 } } } diff --git a/src/views/shop/set/hotform.vue b/src/views/shop/set/hotform.vue index 0cde572..7bbf4a7 100644 --- a/src/views/shop/set/hotform.vue +++ b/src/views/shop/set/hotform.vue @@ -91,10 +91,9 @@ export default { this.form = { id: '', groupName: 'routine_hot_search', - value: '', - addTime: '', - sort: '', - status: '' + title: '', + sort: 0, + status: 1 } } } diff --git a/src/views/shop/set/menuform.vue b/src/views/shop/set/menuform.vue index 1c64fe8..dcb7b27 100644 --- a/src/views/shop/set/menuform.vue +++ b/src/views/shop/set/menuform.vue @@ -112,11 +112,13 @@ export default { this.form = { id: '', groupName: 'routine_home_menus', + name: '', + url: '', + wxapp_url: '', + pic: '', imageArr: [], - value: '', - addTime: '', - sort: '', - status: '' + sort: 0, + status: 1 } } } diff --git a/src/views/shop/set/rollform.vue b/src/views/shop/set/rollform.vue index 166a87a..cbfca81 100644 --- a/src/views/shop/set/rollform.vue +++ b/src/views/shop/set/rollform.vue @@ -99,10 +99,11 @@ export default { this.form = { id: '', groupName: 'routine_home_roll_news', - value: '', - addTime: '', - sort: '', - status: '' + info: '', + wxapp_url: '', + url: '', + sort: 0, + status: 1 } } } diff --git a/src/views/shop/set/seckillform.vue b/src/views/shop/set/seckillform.vue index 095686c..637af73 100644 --- a/src/views/shop/set/seckillform.vue +++ b/src/views/shop/set/seckillform.vue @@ -86,10 +86,8 @@ export default { this.form = { id: '', groupName: 'routine_seckill_time', - value: '', - addTime: '', - sort: '', - status: '' + time: 5, + continued: 2 } } } diff --git a/src/views/shop/set/signform.vue b/src/views/shop/set/signform.vue index 3da0e41..1e222fc 100644 --- a/src/views/shop/set/signform.vue +++ b/src/views/shop/set/signform.vue @@ -95,10 +95,10 @@ export default { this.form = { id: '', groupName: 'sign_day_num', - value: '', - addTime: '', - sort: '', - status: '' + day: 1, + sign_num: 0, + sort: 0, + status: 1 } } } diff --git a/src/views/shop/set/usermenuform.vue b/src/views/shop/set/usermenuform.vue index fc056f0..39d5b0d 100644 --- a/src/views/shop/set/usermenuform.vue +++ b/src/views/shop/set/usermenuform.vue @@ -52,8 +52,8 @@ export default { wxapp_url: '', pic: '', imageArr: [], - sort: '', - status: '' + sort: 0, + status: 1 }, rules: { } @@ -112,9 +112,11 @@ export default { this.form = { id: '', groupName: 'routine_my_menus', + name: '', + url: '', + wxapp_url: '', + pic: '', imageArr: [], - value: '', - addTime: '', sort: 0, status: 1 } diff --git a/src/views/shop/store/index.vue b/src/views/shop/store/index.vue new file mode 100644 index 0000000..8f28e77 --- /dev/null +++ b/src/views/shop/store/index.vue @@ -0,0 +1,171 @@ + + + + + + diff --git a/src/views/shop/store/set.vue b/src/views/shop/store/set.vue new file mode 100644 index 0000000..21a6c4e --- /dev/null +++ b/src/views/shop/store/set.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/views/shop/userlevel/form.vue b/src/views/shop/userlevel/form.vue index 27401db..3311360 100644 --- a/src/views/shop/userlevel/form.vue +++ b/src/views/shop/userlevel/form.vue @@ -137,17 +137,17 @@ export default { name: '', money: '', validDate: '', - isForever: '', + isForever: 1, isPay: '', - isShow: '', + isShow: 1, grade: '', discount: '', image: '', icon: '', - explain: '', - addTime: '', imageArr: [], iconArr: [], + explain: '', + addTime: '', isDel: '' } } diff --git a/src/views/wechat/config/index.vue b/src/views/wechat/config/index.vue index 40014eb..23dcc14 100644 --- a/src/views/wechat/config/index.vue +++ b/src/views/wechat/config/index.vue @@ -79,13 +79,15 @@ export default { }, created() { get().then(rese => { - const newObj = {} + const that = this rese.content.map(function(key, value) { const keyName = key.menuName - newObj[keyName] = key.value + const newValue = key.value + if(keyName in that.form){ + that.form[keyName] = newValue + } }) - this.form = newObj this.form.imageArr = this.form.wechat_share_img.split(',') }) }, diff --git a/src/views/wechat/config/pay.vue b/src/views/wechat/config/pay.vue index 127ac3a..aae8337 100644 --- a/src/views/wechat/config/pay.vue +++ b/src/views/wechat/config/pay.vue @@ -48,13 +48,14 @@ export default { }, created() { get().then(rese => { - const newObj = {} + const that = this rese.content.map(function(key, value) { const keyName = key.menuName - newObj[keyName] = key.value + const newValue = key.value + if(keyName in that.form){ + that.form[keyName] = newValue + } }) - - this.form = newObj }) }, methods: { diff --git a/src/views/wechat/config/point.vue b/src/views/wechat/config/point.vue index 4ff0b72..af6735d 100644 --- a/src/views/wechat/config/point.vue +++ b/src/views/wechat/config/point.vue @@ -5,6 +5,14 @@

积分抵用比例(1积分抵多少金额)

+ + +

消费必须满一定额度才可使用,0代表无限制

+ + + +

限制一次只能使用多少积分,0代表无限制

+ 提交 @@ -26,7 +34,9 @@ export default { return { delLoading: false, form: { - integral_ratio: '' + integral_ratio: '', + integral_full: 0, + integral_max: 0 }, rules: { } @@ -34,13 +44,15 @@ export default { }, created() { get().then(rese => { - const newObj = {} + const that = this rese.content.map(function(key, value) { const keyName = key.menuName - newObj[keyName] = key.value + const newValue = key.value + if(keyName in that.form){ + that.form[keyName] = newValue + } }) - this.form = newObj }) }, methods: { diff --git a/src/views/wechat/config/postage.vue b/src/views/wechat/config/postage.vue index 6d4cd4c..6011647 100644 --- a/src/views/wechat/config/postage.vue +++ b/src/views/wechat/config/postage.vue @@ -29,7 +29,8 @@ export default { return { delLoading: false, form: { - integral_ratio: '' + store_postage: '', + store_free_postage: '' }, rules: { } @@ -37,13 +38,14 @@ export default { }, created() { get().then(rese => { - const newObj = {} + const that = this rese.content.map(function(key, value) { const keyName = key.menuName - newObj[keyName] = key.value + const newValue = key.value + if(keyName in that.form){ + that.form[keyName] = newValue + } }) - - this.form = newObj }) }, methods: { diff --git a/src/views/wechat/config/promoter.vue b/src/views/wechat/config/promoter.vue index 6d083ec..57535dc 100644 --- a/src/views/wechat/config/promoter.vue +++ b/src/views/wechat/config/promoter.vue @@ -1,6 +1,10 @@