diff --git a/antis-app-siberian/pages.json b/antis-app-siberian/pages.json index ff269d3..81a017d 100644 --- a/antis-app-siberian/pages.json +++ b/antis-app-siberian/pages.json @@ -99,7 +99,7 @@ { "path": "pages/index/zskd", "style": { - "navigationBarTitleText": "纸质证书邮寄" + "navigationBarTitleText": "朗思测评纪念品领取" } }, { diff --git a/antis-app-siberian/pages/Report/index.vue b/antis-app-siberian/pages/Report/index.vue index 0241f9d..684b0fb 100644 --- a/antis-app-siberian/pages/Report/index.vue +++ b/antis-app-siberian/pages/Report/index.vue @@ -48,8 +48,7 @@ 上传身份证* - + diff --git a/antis-app-siberian/pages/index/zskd.vue b/antis-app-siberian/pages/index/zskd.vue index 44f192e..fa66758 100644 --- a/antis-app-siberian/pages/index/zskd.vue +++ b/antis-app-siberian/pages/index/zskd.vue @@ -6,7 +6,8 @@ - + 联系电话 - + @@ -22,29 +24,43 @@ - + + + {{''+CandidateDetailNum+'/50'}} - {{''+CandidateDetailNum+'/50'}} - Exam - ID不是成绩单上的Exam Session ID,Exam ID可在您预约考试成功时收到的邮件内查到。请阅读以上内容后在此栏填写：已确认* + 英国就读院校* - + - {{''+CandidateInfoNum+'/10'}} + {{''+CandidateInfoNum+'/50'}} - Exam ID* - + 朗思成绩单* + + + + + + + + + - 温馨提示：1.纸质证书并非成绩单，没有小分；2.纸质证书从海外总部寄出到收到需要8-12周，收到后消杀，录入需5个工作日。查询请联系考务老师。 + 温馨提示：请上传朗思成绩单截图提供审核，我们将会在收到请求后尽快完成审核并联系您。 提交 @@ -55,18 +71,31 @@ import BASE_URL from '../../common/config.js' import service from '../../service/service.js' export default { + onShareAppMessage(res) { + if (res.from === 'button') { // 来自页面内分享按钮 + console.log(res.target) + } + let datas = 'type=' + 2 + let scene = encodeURIComponent(JSON.stringify(datas)) + return { + title: '朗思测评官方纪念品领取', + path: `/pages/login/index?scene=${scene}`, + imageUrl: this.BASE_URL + '/api/File/Image/annexpic/20221222_375601989435786501.png' + } + }, data() { return { BASE_URL, CandidateDetailNum: 0, - CandidateInfoNum:0, + CandidateInfoNum: 0, model: { "userId": "", "consigneeUser": "", "phone": "", "addressDetail": "", "confirmInfo": "", - "examId": "", + // "examId": "", + "banner": [], "creatorTime": "2022-12-23T06:10:32.051Z", "lastModifyTime": "2022-12-23T06:10:32.051Z" } @@ -76,11 +105,56 @@ }, methods: { - ChangeDetail(){ - this.CandidateDetailNum=this.model.addressDetail.length + TopCardUpload() { + let that = this + that.model.banner = [] + uni.chooseImage({ + count: 1, + sourceType: ['album', 'camera'], + success(res) { + console.log('这是成功', res) + uni.uploadFile({ + url: that.BASE_URL + '/api/file/Uploader/annexpic', // 仅为示例，非真实的接口地址 + filePath: res.tempFilePaths[0], + name: 'file', + header: { + Authorization: service.getToken() + }, + formData: { + user: 'test' + }, + success(e) { + console.log('上传成功', e) + let info = JSON.parse(e.data) + let file = { + "name": info.data.name, + "fileId": info.data.name, + "url": info.data.url + } + that.model.banner.push(file) + console.log('这是追加', that.model.banner) + }, + fail(err) { + uni.showToast({ + title: err, + icon: 'none' + }) + } + }) + }, + fail(error) { + uni.showToast({ + title: '调起相册失败', + icon: 'none' + }) + } + }) }, - ChangeInfo(){ - this.CandidateInfoNum=this.model.confirmInfo.length + ChangeDetail() { + this.CandidateDetailNum = this.model.addressDetail.length + }, + ChangeInfo() { + this.CandidateInfoNum = this.model.confirmInfo.length }, Checked() { let bl = true @@ -104,17 +178,11 @@ bl = false } else if (!this.model.confirmInfo) { uni.showToast({ - title: '请输入确认信息', - icon: 'none' - }) - bl = false - } else if (!this.model.examId) { - uni.showToast({ - title: '请输入ExamId', + title: '请输入就读院校', icon: 'none' }) bl = false - } + } return bl }, Submit() { diff --git a/antis-app-siberian/pages/login/index.vue b/antis-app-siberian/pages/login/index.vue index a57e00f..dbf3149 100644 --- a/antis-app-siberian/pages/login/index.vue +++ b/antis-app-siberian/pages/login/index.vue @@ -48,8 +48,8 @@ "userId": "" }, chekced: false, - // 1--跳转模考兑换码 2--正常跳转 - type:2 + // 1--跳转模考兑换码 2--纪念品领取页面 3--正常跳转 + type:3 } }, onLoad(data) { @@ -86,7 +86,10 @@ // } // }) - }else{ + }else if(urlDecode.includes('type=2')){ + this.type=2 + console.log('进入这里了') + } else{ // uni.showModal({ // title:'提示啊', // content:'进入绑定关系', @@ -162,6 +165,13 @@ url: '/pages/CDKEY/index' }) }, 1000) + }else if(that.type==2){ + setTimeout(()=>{ + uni.navigateTo({ + url:'/pages/index/zskd' + }) + },1000) + }else{ // 正常跳转 setTimeout(() => { diff --git a/antis-app-siberian/pages/my/index.vue b/antis-app-siberian/pages/my/index.vue index 04a1828..98d5d1e 100644 --- a/antis-app-siberian/pages/my/index.vue +++ b/antis-app-siberian/pages/my/index.vue @@ -132,7 +132,7 @@ - 纸质证书邮寄信息 + 朗思测评纪念品领取 diff --git a/antis-app-siberian/static/add.jpeg b/antis-app-siberian/static/add.jpeg new file mode 100644 index 0000000..8c46ac9 --- /dev/null +++ b/antis-app-siberian/static/add.jpeg diff --git a/antis-app-siberian/static/add.png b/antis-app-siberian/static/add.png new file mode 100644 index 0000000..a180b53 --- /dev/null +++ b/antis-app-siberian/static/add.png diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.json index 29dd32f..60a52e9 100644 --- a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.json +++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.json @@ -1,4 +1,4 @@ { - "navigationBarTitleText": "纸质证书邮寄", + "navigationBarTitleText": "朗思测评纪念品领取", "usingComponents": {} } \ No newline at end of file diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.wxml index b7ddee3..21be333 100644 --- a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.wxml +++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/index/zskd.wxml @@ -1,2 +1 @@ -收件人*联系电话*详细地址(请务必写明地址,否则无法寄出)*{{''+CandidateDetailNum+'/50'}}Exam - ID不是成绩单上的Exam Session ID,Exam ID可在您预约考试成功时收到的邮件内查到。请阅读以上内容后在此栏填写：已确认*{{''+(''+CandidateInfoNum+'/10')+''}}Exam ID*温馨提示：1.纸质证书并非成绩单，没有小分；2.纸质证书从海外总部寄出到收到需要8-12周，收到后消杀，录入需5个工作日。查询请联系考务老师。提交 \ No newline at end of file +收件人*联系电话*详细地址(请务必写明地址,否则无法寄出)*{{''+CandidateDetailNum+'/50'+''}}英国就读院校*{{''+(''+CandidateInfoNum+'/50')+''}}朗思成绩单*温馨提示：请上传朗思成绩单截图提供审核，我们将会在收到请求后尽快完成审核并联系您。提交 \ No newline at end of file diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/index.wxml b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/index.wxml index 776b8be..89b7808 100644 --- a/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/index.wxml +++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/pages/my/index.wxml @@ -1 +1 @@ -{{user.realName}}个人资料{{collectCount}}我的收藏{{orderCount}}我的订单我的订单查看更多待付款待收货待评价已完成菜单栏下级订单新用户报备在线报备纸质证书邮寄信息专属二维码退款政策 \ No newline at end of file +{{user.realName}}个人资料{{collectCount}}我的收藏{{orderCount}}我的订单我的订单查看更多待付款待收货待评价已完成菜单栏下级订单新用户报备在线报备朗思测评纪念品领取专属二维码退款政策 \ No newline at end of file diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/project.config.json b/antis-app-siberian/unpackage/dist/build/mp-weixin/project.config.json index 9ab50d7..91aeb39 100644 --- a/antis-app-siberian/unpackage/dist/build/mp-weixin/project.config.json +++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/project.config.json @@ -18,7 +18,7 @@ } }, "compileType": "miniprogram", - "libVersion": "2.29.1", + "libVersion": "2.32.1", "appid": "wx94f3d523457fc388", "projectname": "antis-app-siberian", "condition": {}, diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/add.jpeg b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/add.jpeg new file mode 100644 index 0000000..8c46ac9 --- /dev/null +++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/add.jpeg diff --git a/antis-app-siberian/unpackage/dist/build/mp-weixin/static/add.png b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/add.png new file mode 100644 index 0000000..a180b53 --- /dev/null +++ b/antis-app-siberian/unpackage/dist/build/mp-weixin/static/add.png diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/zskd.json b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/zskd.json index 29dd32f..60a52e9 100644 --- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/zskd.json +++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/zskd.json @@ -1,4 +1,4 @@ { - "navigationBarTitleText": "纸质证书邮寄", + "navigationBarTitleText": "朗思测评纪念品领取", "usingComponents": {} } \ No newline at end of file diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/zskd.wxml b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/zskd.wxml index b7ddee3..21be333 100644 --- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/zskd.wxml +++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/index/zskd.wxml @@ -1,2 +1 @@ -收件人*联系电话*详细地址(请务必写明地址,否则无法寄出)*{{''+CandidateDetailNum+'/50'}}Exam - ID不是成绩单上的Exam Session ID,Exam ID可在您预约考试成功时收到的邮件内查到。请阅读以上内容后在此栏填写：已确认*{{''+(''+CandidateInfoNum+'/10')+''}}Exam ID*温馨提示：1.纸质证书并非成绩单，没有小分；2.纸质证书从海外总部寄出到收到需要8-12周，收到后消杀，录入需5个工作日。查询请联系考务老师。提交 \ No newline at end of file +收件人*联系电话*详细地址(请务必写明地址,否则无法寄出)*{{''+CandidateDetailNum+'/50'+''}}英国就读院校*{{''+(''+CandidateInfoNum+'/50')+''}}朗思成绩单*温馨提示：请上传朗思成绩单截图提供审核，我们将会在收到请求后尽快完成审核并联系您。提交 \ No newline at end of file diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/my/index.wxml b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/my/index.wxml index 776b8be..89b7808 100644 --- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/my/index.wxml +++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/pages/my/index.wxml @@ -1 +1 @@ -{{user.realName}}个人资料{{collectCount}}我的收藏{{orderCount}}我的订单我的订单查看更多待付款待收货待评价已完成菜单栏下级订单新用户报备在线报备纸质证书邮寄信息专属二维码退款政策 \ No newline at end of file +{{user.realName}}个人资料{{collectCount}}我的收藏{{orderCount}}我的订单我的订单查看更多待付款待收货待评价已完成菜单栏下级订单新用户报备在线报备朗思测评纪念品领取专属二维码退款政策 \ No newline at end of file diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.config.json b/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.config.json index ee6dafa..468bffa 100644 --- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.config.json +++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.config.json @@ -18,7 +18,7 @@ } }, "compileType": "miniprogram", - "libVersion": "2.28.1", + "libVersion": "2.32.1", "appid": "wx94f3d523457fc388", "projectname": "antis-app-siberian", "condition": { diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.private.config.json b/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.private.config.json index 6539e36..7475902 100644 --- a/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.private.config.json +++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/project.private.config.json @@ -83,6 +83,13 @@ "query": "scene=avt%3D409681011887047941%26type%3D1", "launchMode": "default", "scene": null + }, + { + "name": "", + "pathName": "pages/index/zskd", + "query": "", + "launchMode": "default", + "scene": null } ] } diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/add.jpeg b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/add.jpeg new file mode 100644 index 0000000..8c46ac9 --- /dev/null +++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/add.jpeg diff --git a/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/add.png b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/add.png new file mode 100644 index 0000000..a180b53 --- /dev/null +++ b/antis-app-siberian/unpackage/dist/dev/mp-weixin/static/add.png diff --git a/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/Form.vue b/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/Form.vue index 2de4e44..986586f 100644 --- a/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/Form.vue +++ b/antis-ncc-admin/antis-ncc-admin/src/views/tbMailSend/Form.vue @@ -1,56 +1,69 @@  \ No newline at end of file + } +