diff --git a/app.json b/app.json index 3dcef98..70a97af 100644 --- a/app.json +++ b/app.json @@ -38,7 +38,8 @@ "pages/service/settle/settle", "pages/service/service", "pages/service/myService/myService", - "pages/service/vipCard/vipCard" + "pages/service/vipCard/vipCard", + "pages/service/rqCode/rqCode" ], "window": { "backgroundTextStyle": "light", diff --git a/pages/ad/ad.js b/pages/ad/ad.js index f509b86..eee258f 100644 --- a/pages/ad/ad.js +++ b/pages/ad/ad.js @@ -5,7 +5,7 @@ Page({ * 页面的初始数据 */ data: { - url:"../../images/ad.jpg", + url:"", show:true, flag:1, web:'http://www.rencaibeichu.cn' diff --git a/pages/home/index.js b/pages/home/index.js index 699a6d6..45365a0 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -12,7 +12,7 @@ Page({ hots: [], list: [], show:false, - url:"../../images/ad.jpg", + // url:"../../images/ad.jpg", web:'https://wx.vzan.com/live/TpForm?zbid=860533452&oId=213742&type=0&v=1623841891714' // web:'http://www.rencaibeichu.cn' }, diff --git a/pages/service/detail/detail.js b/pages/service/detail/detail.js index 7d56772..3739d57 100644 --- a/pages/service/detail/detail.js +++ b/pages/service/detail/detail.js @@ -14,7 +14,9 @@ Page({ show:false, classify:null, code:'', - departList:[] + departList:[], + app_id:'', + pic:'' }, /** @@ -22,7 +24,9 @@ Page({ */ onLoad: function (options) { this.setData({ - code:options.code + code:options.code, + app_id:options.app_id, + pic:options.pic }) serviceModel.serviceDetail(options.code,res=>{ @@ -100,13 +104,37 @@ Page({ }, onTap:function(){ - if(!this.data.classify){ - wx.navigateTo({ - url: '/pages/service/settle/settle?code=' + this.data.code, + if(this.data.app_id){ + wx.navigateToMiniProgram({ + appId: this.data.app_id, + // path: 'page/index/index?id=123', + extraData: { + // foo: 'bar' + }, + envVersion: 'release', + success(res) { + // 打开成功 + } }) - return + return; + } + else if(this.data.pic){ + wx.navigateTo({ + url: '/pages/service/rqCode/rqCode?pic=' + this.data.pic, + }) + return } - this.setData({ show: true }); + else{ + if(!this.data.classify){ + wx.navigateTo({ + url: '/pages/service/settle/settle?code=' + this.data.code, + }) + return + } + this.setData({ show: true }); + } + + }, settle:function(e){ wx.navigateTo({ diff --git a/pages/service/detail/detail.wxml b/pages/service/detail/detail.wxml index b1d3f13..8f302fa 100644 --- a/pages/service/detail/detail.wxml +++ b/pages/service/detail/detail.wxml @@ -37,10 +37,10 @@ - + - + 申请 diff --git a/pages/service/myService/myService.wxml b/pages/service/myService/myService.wxml index 4add5a3..695c545 100644 --- a/pages/service/myService/myService.wxml +++ b/pages/service/myService/myService.wxml @@ -29,11 +29,17 @@ 预约场馆: {{detail.affiliate_org_name}} 体育场馆: {{detail.affiliate_org_name}} 参观景点: {{detail.affiliate_org_name}} - 办理部门: {{detail.depart_name}} + 办理部门: {{detail.depart_name}} - 参会人数: {{detail.attendance}} + + 参观人数: {{detail.attendance}} + + + 参会人数: {{detail.attendance}} + + @@ -131,7 +137,7 @@ 用途: {{detail.demand}} - 参观人员: {{detail.demand}} + 服务需求: {{detail.demand}} {{detail.demand}} diff --git a/pages/service/myService/myService.wxs b/pages/service/myService/myService.wxs index 8701ce0..fd3ed99 100644 --- a/pages/service/myService/myService.wxs +++ b/pages/service/myService/myService.wxs @@ -48,7 +48,10 @@ var myService = { var color = 'rgb(255,135,25)'; } else if (status == '已答复') { var color = 'rgb(242,7,7)'; - } else{ + } else if (status == '已提交') { + var color = 'rgb(250,70,70)'; + } + else{ color = '' } diff --git a/pages/service/service.wxml b/pages/service/service.wxml index bddcf5a..33196ab 100644 --- a/pages/service/service.wxml +++ b/pages/service/service.wxml @@ -1,11 +1,12 @@ + {{item.server_name}} {{item.submit_time}} - {{item.progress}} + {{item.progress}} diff --git a/pages/service/settle/settle.js b/pages/service/settle/settle.js index e729bea..dce2c49 100644 --- a/pages/service/settle/settle.js +++ b/pages/service/settle/settle.js @@ -114,7 +114,7 @@ Page({ }) }) - if(this.data.code == 'zwfw' || this.data.code == 'whly' || this.data.code == 'tycg' || this.data.code == 'cjkf' || this.data.code == 'jgtc'){ + if(this.data.code == 'zwfw' || this.data.code == 'whly' || this.data.code == 'tycg' || this.data.code == 'cjkf' || this.data.code == 'jgtc' || this.data.code == 'flwf'){ serviceModel.getDepartList(this.data.code,res=>{ var departArray = [] for(let i = 0;i < res.result.length; i++){ @@ -633,14 +633,14 @@ Page({ return } - if(this.data.doctorIndex == ''){ - wx.showModal({ - title: '提示', - content: '请选择预约专家', - showCancel:false, - }) - return - } + // if(this.data.doctorIndex == ''){ + // wx.showModal({ + // title: '提示', + // content: '请选择预约专家', + // showCancel:false, + // }) + // return + // } if(this.data.date == '' || !this.data.date){ wx.showModal({ @@ -651,6 +651,15 @@ Page({ return } + if(this.data.demand == '' || !this.data.demand){ + wx.showModal({ + title: '提示', + content: '请填写服务需求', + showCancel:false, + }) + return + } + }else if(type == 'zwfw'){ // 政务服务 if(this.data.date == '' || !this.data.date){ @@ -698,29 +707,38 @@ Page({ if(this.data.demand == '' || !this.data.demand){ wx.showModal({ title: '提示', - content: '请填写参观人员', - showCancel:false, - }) - return - } - }else if(type == 'tycg'){ // 体育场馆 - if(this.data.departIndex == ''){ - wx.showModal({ - title: '提示', - content: '请选择体育场馆', + content: '请填写服务需求', showCancel:false, }) return } - if(this.data.date == '' || !this.data.date){ - wx.showModal({ - title: '提示', - content: '请选择使用时间', - showCancel:false, - }) - return + if(this.data.attendance == '' || !this.data.attendance){ + wx.showModal({ + title: '提示', + content: '请填写参观人数', + showCancel:false, + }) + return } + }else if(type == 'tycg'){ // 体育场馆 + // if(this.data.departIndex == ''){ + // wx.showModal({ + // title: '提示', + // content: '请选择体育场馆', + // showCancel:false, + // }) + // return + // } + + // if(this.data.date == '' || !this.data.date){ + // wx.showModal({ + // title: '提示', + // content: '请选择使用时间', + // showCancel:false, + // }) + // return + // } }else if(type == 'zzxljy'){ // 在职学历教育 method = 2 @@ -855,14 +873,14 @@ Page({ return } - if(this.data.postProve.length <= 0){ - wx.showModal({ - title: '提示', - content: '请上传到岗证明', - showCancel:false, - }) - return - } + // if(this.data.postProve.length <= 0){ + // wx.showModal({ + // title: '提示', + // content: '请上传到岗证明', + // showCancel:false, + // }) + // return + // } if(type == 'lpbt'){ if(this.data.salaryProve.length <= 0){ wx.showModal({ @@ -886,6 +904,16 @@ Page({ return } } + if(type == 'flwf'){ + if(this.data.departIndex == ''){ + wx.showModal({ + title: '提示', + content: '请选择办理部门', + showCancel:false, + }) + return + } + } if(this.data.demand == '' || !this.data.demand){ wx.showModal({ title: '提示', @@ -993,9 +1021,9 @@ Page({ if(this.data.hospitalIndex != ''){ params.medicalInstitutions = this.data.hospitalArray[this.data.hospitalIndex] } - if(this.data.doctorIndex != ''){ - params.medicalExpert = this.data.doctorArray[this.data.doctorIndex] - } + // if(this.data.doctorIndex != ''){ + // params.medicalExpert = this.data.doctorArray[this.data.doctorIndex] + // } // console.log(this.imageUrl(this.data.files)) // return diff --git a/pages/service/settle/settle.wxml b/pages/service/settle/settle.wxml index 1707ef7..a37cbb4 100644 --- a/pages/service/settle/settle.wxml +++ b/pages/service/settle/settle.wxml @@ -12,7 +12,7 @@ 性别 - {{info.gender}} + {{info.genderStr}} @@ -70,7 +70,21 @@ + + + 服务需求 + +