diff --git a/config/index.js b/config/index.js index a8f8fa9..7d3a216 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ module.exports = { }, // Various Dev Server settings - host: '192.168.110.160', // can be overwritten by process.env.HOST + host: '192.168.110.157', // can be overwritten by process.env.HOST port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/assets/img/email.png b/src/assets/img/email.png new file mode 100644 index 0000000..3742a60 Binary files /dev/null and b/src/assets/img/email.png differ diff --git a/src/assets/img/tel.png b/src/assets/img/tel.png new file mode 100644 index 0000000..a9fb85d Binary files /dev/null and b/src/assets/img/tel.png differ diff --git a/src/router/index.js b/src/router/index.js index 3fef2d4..7fce71a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -67,6 +67,7 @@ const mainRoutes = { { path: '/course-sociologyList', component: _import('modules/course/sociologyList'), name: 'course-sociologyList', meta: { title: '国学标签列表', isTab: true } }, { path: '/userCourse', component: _import('modules/user/userCourse'), name: 'userCourse', meta: { title: '用户课程列表', isTab: true } }, { path: '/userCertificate', component: _import('modules/user/userCertificate'), name: 'userCertificate', meta: { title: '用户证书列表', isTab: true } }, + { path: '/userPoints', component: _import('modules/user/userPoints'), name: 'userPoints', meta: { title: '用户湖分列表', isTab: true } }, { path: '/workOrder', component: _import('modules/workOrderLIst'), name: 'workOrder', meta: { title: '工单列表', isTab: true } }, // { 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 } }, diff --git a/src/views/modules/certificate/addCertificate.vue b/src/views/modules/certificate/addCertificate.vue index 57009a7..2ef3bc6 100644 --- a/src/views/modules/certificate/addCertificate.vue +++ b/src/views/modules/certificate/addCertificate.vue @@ -3,10 +3,12 @@ -
+
绑定用户

--> + diff --git a/src/views/modules/user/userCertificate.vue b/src/views/modules/user/userCertificate.vue index 23ee1fa..b94e1e3 100644 --- a/src/views/modules/user/userCertificate.vue +++ b/src/views/modules/user/userCertificate.vue @@ -8,12 +8,12 @@
- - 查询 - 开通证书 - --> + + 开通证书 + -
-
用户信息:{{ user.name }}{{ user.tel }}
-
+
+
用户信息:{{ user.name }}{{user.tel?user.tel:user.email }}
+
@@ -166,7 +167,7 @@ label="创建日期" > - +
@@ -457,14 +459,14 @@ export default { ) .then(async () => { // var lableIds = row[0].bookLabelId; - var productIds = row[0].id; + var productIds = row.id; await this.$http .request({ - url: this.$http.adornUrl(`${this.urlList.deleteShop}`), + url: this.$http.adornUrl(`/master/userCertificate/delCertificate`), method: "POST", data: { - id: row[0].bindId + id: productIds // marketId: this.addForm.id }, header: { @@ -480,9 +482,7 @@ export default { } this.$nextTick(() => { // this.$refs.commonShop.selectShopArr = []; - if (this.$refs.commonShop) { - this.$refs.commonShop.getAssociatedGoodsList(); - } + this.getDataList() }); }); }) @@ -507,7 +507,17 @@ export default { }, delay(val) { this.$nextTick(() => { - this.$refs.addCertificate.init("edit", { val }); + this.$refs.addCertificate.init("edit", { + certificateNo:val.certificateNo, + id:val.id, + userId:val.userId, + userKey:val.user.tel||val.user.email, + userName:val.user.name, + courseId:val.courseId, + courseName:val.title, + labelId:val.labelId, + images:val.certificateUrl, + }); }); }, delaySubmit(data) { diff --git a/src/views/modules/user/userCourse.vue b/src/views/modules/user/userCourse.vue index 97c1e89..c959521 100644 --- a/src/views/modules/user/userCourse.vue +++ b/src/views/modules/user/userCourse.vue @@ -6,7 +6,7 @@ @keyup.enter.native="getDataList()" > - + - @@ -28,7 +28,7 @@ - 开通课程 + 开通课程 -
+
用户信息:{{ user.name }}{{ user.tel }}
-
+
diff --git a/src/views/modules/user/userPoints.vue b/src/views/modules/user/userPoints.vue new file mode 100644 index 0000000..12d9498 --- /dev/null +++ b/src/views/modules/user/userPoints.vue @@ -0,0 +1,686 @@ + + + + diff --git a/static/config/index.js b/static/config/index.js index 7168a66..490ba3f 100644 --- a/static/config/index.js +++ b/static/config/index.js @@ -7,7 +7,7 @@ // api接口请求地址 window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com'; // 线上正式环境 // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb'; //川 - //window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.110:9200/pb'; //本地 + // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.110:9200/pb'; //本地 // cdn地址 = 域名 + 版本号 window.SITE_CONFIG['domain'] = './'; // 域名