diff --git a/src/App.vue b/src/App.vue index aea2389..a2245f0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,3 +8,6 @@ export default { } + diff --git a/src/components/selectPro.vue b/src/components/selectPro.vue new file mode 100644 index 0000000..7856f6f --- /dev/null +++ b/src/components/selectPro.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 2337cc1..82b0806 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -69,6 +69,7 @@ const mainRoutes = { // { path: '/miniClassList', component: _import('modules/miniClass/miniClassList'), name: 'miniClass', meta: { title: '班级列表', isTab: true } }, // { path: '/miniClassList8', component: _import('modules/miniClass/miniClassList8'), name: 'miniClassList8', meta: { title: 'miniClassList8', isTab: true } }, { path: '/ClassType', component: _import('modules/miniClass/miniClassType'), name: 'ClassType', meta: { title: '班级类型管理', isTab: true } }, + { path: '/reLearn', component: _import('modules/order/reLearn'), name: 'reLearn', meta: { title: '复读订单', isTab: true } }, ], beforeEnter (to, from, next) { let token = Vue.cookie.get('token') diff --git a/src/views/common/common.vue b/src/views/common/common.vue index d8f36ed..0167c28 100644 --- a/src/views/common/common.vue +++ b/src/views/common/common.vue @@ -6,8 +6,32 @@ const baseUrl = 'https://api.nuttyreading.com' // function commonFun() { // console.log("公共方法") // } +const rangList =[ + { + value: 0, + label: "无限制" + }, + { + value: 1, + label: "课程券" + }, + { + value: 2, + label: "课程品类券" + } + ]; +const TypeList =[ + { + value: "0", + label: "现金" + }, + { + value: "1", + label: "折扣" + } + ] export default { - baseUrl + baseUrl,rangList,TypeList //commonFun }; diff --git a/src/views/modules/coupon/coupon-add-or-update.vue b/src/views/modules/coupon/coupon-add-or-update.vue index cf89a00..2642cf6 100644 --- a/src/views/modules/coupon/coupon-add-or-update.vue +++ b/src/views/modules/coupon/coupon-add-or-update.vue @@ -1,181 +1,352 @@ diff --git a/src/views/modules/coupon/coupon.vue b/src/views/modules/coupon/coupon.vue index 736ad3c..365cccb 100644 --- a/src/views/modules/coupon/coupon.vue +++ b/src/views/modules/coupon/coupon.vue @@ -1,17 +1,39 @@ + + diff --git a/src/views/modules/course/course-add-or-update.vue b/src/views/modules/course/course-add-or-update.vue index 94f302d..9987558 100644 --- a/src/views/modules/course/course-add-or-update.vue +++ b/src/views/modules/course/course-add-or-update.vue @@ -392,7 +392,8 @@ export default { // console.log('editor ready!', quill) }, init(row) { - console.log("11111", row); + console.log("进来了吗?", row); + // if(!) if (row && row.id) { this.courseId = row.id this.$http diff --git a/src/views/modules/order/reLearn.vue b/src/views/modules/order/reLearn.vue new file mode 100644 index 0000000..80996ba --- /dev/null +++ b/src/views/modules/order/reLearn.vue @@ -0,0 +1,299 @@ + + + + diff --git a/src/views/modules/shop/proCouponList.vue b/src/views/modules/shop/proCouponList.vue new file mode 100644 index 0000000..c52e09a --- /dev/null +++ b/src/views/modules/shop/proCouponList.vue @@ -0,0 +1,412 @@ + + + + + diff --git a/src/views/modules/shop/shopproduct.vue b/src/views/modules/shop/shopproduct.vue index f62f253..007d0cb 100644 --- a/src/views/modules/shop/shopproduct.vue +++ b/src/views/modules/shop/shopproduct.vue @@ -142,7 +142,10 @@ @click.native="handleEditCurriculum(scope.row.productId)" >新版修改 --> - + 购买赠优惠券 图书与课程 - +