diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..cadfd6b Binary files /dev/null and b/dist.zip differ diff --git a/src/router/index.js b/src/router/index.js index 6371471..214e41e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,7 +45,8 @@ const mainRoutes = { { path: '/buyorder-mergeorder', component: _import('modules/order/buyorder-mergeorder'), name: 'buyorder-mergeorder', meta: { title: '合并发货', isTab: true } }, { path: '/buyorder-print', component: _import('modules/order/buyorder-print'), name: 'buyorder-print', meta: { title: '打印面单', isTab: true } }, { path: '/activity-list', component: _import('modules/activity/activityList'), name: 'activity-list', meta: { title: '活动列表', isTab: true } }, - { path: '/user-point-memery', component: _import('modules/user/user-point-memery'), name: 'user-point-memery', meta: { title: '充/扣记录', isTab: true } }, + { path: '/user-point-memery', component: _import('modules/user/user-point-memery'), name: 'user-point-memery', meta: { title: '天医币充/扣记录', isTab: true } }, + { path: '/user-point-jf', component: _import('modules/user/user-point-jf'), name: 'user-point-jf', meta: { title: '积分充/扣记录', isTab: true } }, { path: '/user-add-course', component: _import('modules/user/user-add-course'), name: 'user-add-course', meta: { title: '开通课程', isTab: true } }, { path: '/order-epay', component: _import('modules/order/order-errorpay'), name: 'order-epay', meta: { title: '充值异常列表', isTab: true } }, { path: '/xieyi_list', component: _import('modules/xieyi/xieyi'), name: 'xieyi_list', meta: { title: '协议管理', isTab: true } }, diff --git a/src/views/modules/order/buyorderdetail.vue b/src/views/modules/order/buyorderdetail.vue index 65ab857..ac289aa 100644 --- a/src/views/modules/order/buyorderdetail.vue +++ b/src/views/modules/order/buyorderdetail.vue @@ -2,83 +2,331 @@
- 待付款 - 待发货 - 已发货 - 已完成 + 待付款 + 待发货 + 已发货 + 已完成
- +
-
运单信息：{{currentSheet.expressCompanyName}} - {{currentSheet.expressOrderSn}}
-
+
+ 运单信息：{{ currentSheet.expressCompanyName }} - + {{ currentSheet.expressOrderSn }} +
+
- + {{ activity.acceptStation }} @@ -168,9 +519,20 @@
-暂无物流信息-
- +
- + @@ -181,25 +543,52 @@ - - + + - - + + - - + + - +
@@ -208,17 +597,28 @@ 确 定 - +
- 该商品共包含了 {{currBookLIst.length}} 个书籍 + 该商品共包含了 {{ currBookLIst.length }} 个书籍
  • - +
    - {{item.name}}[{{item.id}}] + {{ item.name }}[{{ item.id }}]
@@ -228,571 +628,601 @@ - +
\ No newline at end of file +} + +.liName { + font-size: 12px; + margin-bottom: 10px; + font-weight: bold; +} + +.text_button { + padding: 0; +} + +.el-icon-truck:before { + content: "\e740"; +} + +.el-timeline-item:first-child { + .el-timeline-item__node { + background-color: rgb(11, 189, 135); + } + + color: rgb(11, 189, 135) !important; +} + +.el-timeline-item { + width: 100%; + position: relative; + padding-bottom: 20px; +} + +.el-timeline-item__node--large { + left: -2px; + width: 14px; + height: 14px; +} + +.el-timeline-item__node { + position: absolute; + background-color: #e4e7ed; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; +} + +.el-timeline-item__node--normal { + left: -1px; + width: 12px; + height: 12px; +} + +.el-timeline-item__wrapper { + position: relative; + padding-left: 28px; + top: -3px; +} + +.el-timeline li { + list-style: none; +} + +.el-timeline-item__tail { + position: absolute; + left: 4px; + height: 100%; + border-left: 2px solid #e4e7ed; +} + +.el-timeline .el-timeline-item:last-child .el-timeline-item__tail { + display: none; +} + +.el-timeline-item__timestamp { + color: #c3c3c3; + font-size: 14px; +} + +/deep/ .el-select-dropdown { + width: 200px !important; +} + +:deep(.el-select-dropdown__list) { + width: 200px !important; +} + +/deep/ .el-select-dropdown__list { + width: 200px !important; +} +.DiscountColor { + color: #f94f04; +} + diff --git a/src/views/modules/order/set-deliver-dialog.vue b/src/views/modules/order/set-deliver-dialog.vue index 6ded56c..c8aa8a3 100644 --- a/src/views/modules/order/set-deliver-dialog.vue +++ b/src/views/modules/order/set-deliver-dialog.vue @@ -1,7 +1,7 @@ + + + diff --git a/src/views/modules/points/userPoints.vue b/src/views/modules/points/userPoints.vue new file mode 100644 index 0000000..bcb2f5e --- /dev/null +++ b/src/views/modules/points/userPoints.vue @@ -0,0 +1,686 @@ + + + + diff --git a/src/views/modules/user/addJf.vue b/src/views/modules/user/addJf.vue new file mode 100644 index 0000000..add14fd --- /dev/null +++ b/src/views/modules/user/addJf.vue @@ -0,0 +1,456 @@ + + + + diff --git a/src/views/modules/user/user-point-jf.vue b/src/views/modules/user/user-point-jf.vue new file mode 100644 index 0000000..4c3d374 --- /dev/null +++ b/src/views/modules/user/user-point-jf.vue @@ -0,0 +1,720 @@ + + + + diff --git a/src/views/modules/user/user-point-memery.vue b/src/views/modules/user/user-point-memery.vue index fffe331..d869f85 100644 --- a/src/views/modules/user/user-point-memery.vue +++ b/src/views/modules/user/user-point-memery.vue @@ -9,23 +9,50 @@ 查询 --> -
当前用户：{{userName}} / {{query.tel}}
- +
+ 当前用户：{{ userName }} / {{ query.tel }} +
+ - + - + - + - - + - + - + - + - + - - + + +
+ +
- - - {{mdetail.remark}} - - - - {{mdetail.createTime}} - - - 充值天医币 - 扣除天医币 - - - - {{mdetail.changeAmount}} - - - - {{mdetail.note}} - - - 关 闭 @@ -88,147 +137,161 @@ diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue index 65bfa18..ab825f3 100644 --- a/src/views/modules/user/user.vue +++ b/src/views/modules/user/user.vue @@ -214,6 +214,42 @@ + + + + +
@@ -525,7 +568,8 @@ import userCouponList from "../coupon/userCouponList"; import OpenVip from "./user-open-vip"; import AddOrUpdate from "./user-add-or-update"; -import addCertificate from "./addPoints.vue"; +import addCertificate from "@/views/modules/points/addPoints.vue"; +import addJF from "./addJf.vue"; export default { data() { return { @@ -581,6 +625,7 @@ export default { AddOrUpdate, userCouponList, addCertificate, + addJF, OpenVip }, activated() { @@ -833,6 +878,12 @@ export default { this.$refs.addCertificate.init("add", {}); }); }, + handleJF(val) { + this.currentuserInfo = val; + this.$nextTick(() => { + this.$refs.addJF.init("add", {}); + }); + }, huaSheng(point) { // console.log(this.pointForm.pointAmount, point) if (this.pointForm.pointAmount > point && this.pointForm.pointType == 1) { diff --git a/src/views/modules/user/userPoints.vue b/src/views/modules/user/userPoints.vue index 12d9498..bcb2f5e 100644 --- a/src/views/modules/user/userPoints.vue +++ b/src/views/modules/user/userPoints.vue @@ -239,7 +239,7 @@