diff --git a/config.js b/config.js index 1760d30..53e10f7 100644 --- a/config.js +++ b/config.js @@ -2,18 +2,16 @@ module.exports = { // baseUrl: 'https://vue.ruoyi.vip/prod-api', - baseUrl: 'https://www.nuoyunr.com/jx', + //baseUrl: 'https://www.nuoyunr.com/jx', imagesUrl: 'https://www.nuoyunr.com/jx', - //baseUrl: 'http://192.168.31.54:8016/jx', - //baseUrl: 'http://192.168.31.54:8016/jx', - //imagesUrl: 'http://192.168.31.54:8016/jx', - //imagesUrl: 'http://192.168.31.54:8016/jx', + baseUrl: 'http://192.168.31.54:8016/jx', + // imagesUrl: 'http://192.168.31.54:8016/jx', // 应用信息 appInfo: { // 应用名称 name: "ruoyi-app", // 应用版本 - version: "1.1.0", + version: "1.2.0", // 应用logo logo: "http://www.nuoyunr.com/lananRsc/logo.png'", // 官方网站 @@ -29,4 +27,4 @@ module.exports = { } ] } -} +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 0e38353..2add045 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,11 @@ { - "name": "driver-shool-uni", - "lockfileVersion": 3, "requires": true, - "packages": {} + "lockfileVersion": 1, + "dependencies": { + "uqrcodejs": { + "version": "4.0.7", + "resolved": "https://registry.npmmirror.com/uqrcodejs/-/uqrcodejs-4.0.7.tgz", + "integrity": "sha512-84+aZmD2godCVI+93lxE3YUAPNY8zAJvNA7xRS7R7U+q57KzMDepBSfNCwoRUhWOfR6eHFoAOcHRPwsP6ka1cA==" + } + } } diff --git a/package.json b/package.json new file mode 100644 index 0000000..589c027 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "uqrcodejs": "^4.0.7" + } +} diff --git a/pages.json b/pages.json index 94c8bf0..4a59c68 100644 --- a/pages.json +++ b/pages.json @@ -45,7 +45,7 @@ "path": "pages/teacher/orderManage", "style": { "enablePullDownRefresh": true, - "navigationBarTitleText": "账单管理" + "navigationBarTitleText": "收益管理" } }, @@ -57,6 +57,47 @@ } }, + { + "path": "pages/index/Addrc", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "工作日志" + + } + }, + { + "path": "pages/teacher/Addrc", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "工作日志" + + } + }, + { + "path": "pages/index/jglist", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "公告通知" + + } + }, + { + "path": "pages/teacher/jglist", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "公告通知" + + } + }, + { + "path": "pages/teacher/jgDetail", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "监管详情" + + } + }, + { "path": "pages/index/index", @@ -170,6 +211,14 @@ } } + , { + "path": "pages/viewCode/viewCode", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } ], "globalStyle": { "navigationBarTextStyle": "black", @@ -178,4 +227,4 @@ "backgroundColor": "#F8F8F8" }, "uniIdRouter": {} -} \ No newline at end of file +} diff --git a/pages/index/Addrc.vue b/pages/index/Addrc.vue new file mode 100644 index 0000000..2ecc853 --- /dev/null +++ b/pages/index/Addrc.vue @@ -0,0 +1,152 @@ + + + + + \ No newline at end of file diff --git a/pages/index/CoachDetails.vue b/pages/index/CoachDetails.vue index a5b6844..0c46329 100644 --- a/pages/index/CoachDetails.vue +++ b/pages/index/CoachDetails.vue @@ -17,13 +17,14 @@ - + - {{item.name}} + 成人班 + 学生班 {{item.automatic}} {{item.license}} @@ -37,14 +38,14 @@ - + 学员名称: {{" "+item.name}} - 课程: {{item.coueseName}} + 课程: {{item.coueseName ||'暂无' }} 电话:{{item.phone}} - ¥{{item.price}} + ¥{{item.price || 0}} @@ -92,13 +93,12 @@ onLoad(option) { this.id = option.id this.queryParams.jlId = option.id - }, - onShow() { this.getDataInfo() this.getUserInfo() this.getStudent() }, + methods: { makePhone(phoneNum) { uni.makePhoneCall({ @@ -128,19 +128,22 @@ } }) }, - getDataInfo() { - request({ + async getDataInfo() { + let res = await request({ url: '/drivingSchool/system/driveSchoolCourse/list', method: 'get', params: this.queryParams - }).then((res) => { - if (res.code == 200) { - this.dataList = res.rows - } }) + + if (res.code == 200) { + this.dataList = res.rows + console.log('123456789', this.dataList, res.rows); + } + + }, switchType(idx) { - this.tabindex2 = idx + this.tabindex = idx }, goAdd() { uni.navigateTo({ diff --git a/pages/index/ManageList.vue b/pages/index/ManageList.vue index 299c021..239e237 100644 --- a/pages/index/ManageList.vue +++ b/pages/index/ManageList.vue @@ -5,11 +5,11 @@ {{item.createTime}} - {{item.driveSchoolPay.driveSchoolCourse.automatic}} + - {{item.driveSchoolPay.driveSchoolCourse.license}} - {{item.driveSchoolPay.driveSchoolCourse.name}} + 预约人: @@ -54,6 +54,7 @@ method: 'get' }) this.courseList = res.data + console.log(this.courseList); }, goDetails() { uni.navigateTo({ diff --git a/pages/index/cadetDetails.vue b/pages/index/cadetDetails.vue index e578071..644173d 100644 --- a/pages/index/cadetDetails.vue +++ b/pages/index/cadetDetails.vue @@ -63,7 +63,7 @@ - + @@ -143,7 +143,7 @@ methods: { async findCadetOne() { let res = await request({ - url: `/system/pay/getInfoByUserId/${this.userId}`, + url: `/system/pay/getInfoByUserIndenty/${this.userId}`, method: 'get' }) this.cadetOne = res.data diff --git a/pages/index/cadetManage.vue b/pages/index/cadetManage.vue index 76be312..e4217bf 100644 --- a/pages/index/cadetManage.vue +++ b/pages/index/cadetManage.vue @@ -1,7 +1,7 @@