elink-star
/
shibeirencai_wechat
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

一些修改

master
xuxubarca 4 years ago
parent
ad0e2bec56
commit
9aedbd4da4
16 changed files with 244 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      app.json
  2. 2
      pages/ad/ad.js
  3. 2
      pages/home/index.js
  4. 42
      pages/service/detail/detail.js
  5. 4
      pages/service/detail/detail.wxml
  6. 12
      pages/service/myService/myService.wxml
  7. 5
      pages/service/myService/myService.wxs
  8. 3
      pages/service/service.wxml
  9. 102
      pages/service/settle/settle.js
  10. 92
      pages/service/settle/settle.wxml
  11. 1
      pages/service/settle/settle.wxss
  12. 14
      pages/service/vipCard/vipCard.js
  13. 3
      pages/user/index.js
  14. 32
      pages/user/index.wxml
  15. 6
      pages/user/index.wxss
  16. 2
      pages/user/myInfo/index.wxml

3
app.json
View File

@ -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",

2
pages/ad/ad.js
View File

@ -5,7 +5,7 @@ Page({
* 页面的初始数据
*/
data: {
url:"../../images/ad.jpg",
url:"",
show:true,
flag:1,
web:'http://www.rencaibeichu.cn'

2
pages/home/index.js
View File

@ -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'
},

42
pages/service/detail/detail.js
View File

@ -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({

4
pages/service/detail/detail.wxml
View File

@ -37,10 +37,10 @@
</view>
</view>
<block wx:if="{{code != 'poaz' && code != 'mrt'}}">
<block wx:if="{{code != 'poaz' && code != 'mrt' && code != 'jgtc'}}">
<view class="publish" bindtap="onTap">
<!-- <image src="/images/topic/publish.png"></image> -->
<block wx:if="{{code == 'xljy'}}">
<block wx:if="{{code == 'xljy' || code == 'qyzp'}}">
<text>申请</text>
</block>
<block wx:else>

12
pages/service/myService/myService.wxml
View File

@ -29,11 +29,17 @@
<block wx:if="{{detail.server_code == 'cjkf'}}">预约场馆: {{detail.affiliate_org_name}}</block>
<block wx:if="{{detail.server_code == 'tycg'}}">体育场馆: {{detail.affiliate_org_name}}</block>
<block wx:if="{{detail.server_code == 'whly'}}">参观景点: {{detail.affiliate_org_name}}</block>
<block wx:if="{{detail.server_code == 'zwfw'}}">办理部门: {{detail.depart_name}}</block>
<block wx:if="{{detail.server_code == 'zwfw' || detail.server_code == 'flwf'}}">办理部门: {{detail.depart_name}}</block>
</view>
</block>
<block wx:if="{{detail.attendance}}">
<view class="date">参会人数: {{detail.attendance}}</view>
<block wx:if="{{detail.server_code == 'whly'}}">
<view class="date">参观人数: {{detail.attendance}}</view>
</block>
<block wx:else>
<view class="date">参会人数: {{detail.attendance}}</view>
</block>
</block>
<block wx:if="{{detail.invoice_prove}}">
@ -131,7 +137,7 @@
<view class="date">用途: {{detail.demand}}</view>
</block>
<block wx:elif="{{detail.server_code == 'whly'}}">
<view class="date">参观人员: {{detail.demand}}</view>
<view class="date">服务需求: {{detail.demand}}</view>
</block>
<block wx:else>
<view class="con">{{detail.demand}}</view>

5
pages/service/myService/myService.wxs
View File

@ -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 = ''
}

3
pages/service/service.wxml
View File

@ -1,11 +1,12 @@
<!--pages/service/service.wxml-->
<wxs module="myService" src="myService/myService.wxs"></wxs>
<block wx:for="{{list}}">
<view class="column" bindtap="detail" data-id="{{item.id}}">
<view class="box">
<view class="tit">{{item.server_name}}</view>
<view class="con">
<view>{{item.submit_time}}</view>
<view>{{item.progress}}</view>
<view style="color:{{myService.getColor(item.progress)}}">{{item.progress}}</view>
</view>
</view>

102
pages/service/settle/settle.js
View File

@ -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

92
pages/service/settle/settle.wxml
View File

@ -12,7 +12,7 @@
<view class="column">
<view class="cell">
<view class="tit">性别</view>
<view class="con">{{info.gender}}</view>
<view class="con">{{info.genderStr}}</view>
</view>
</view>
<view class="column">
@ -70,7 +70,21 @@
</picker>
</view>
<view class="column">
<view class="cell">
<view class="tit">服务需求</view>
</view>
<textarea
class="textArea"
maxlength="1000"
value="{{demand}}"
bindinput="inputDemand"
placeholder="请描述您的服务需求"
placeholder-style="font-size:12px;color:rgb(202,202,202)"
/>
</view>
<!-- <view class="column">
<picker bindchange="bindDoctorChange" value="{{doctorIndex}}" range="{{doctorArray}}" style="width:100%;">
<view class="picker-box">
<view class="cell">
@ -87,7 +101,7 @@
</view>
</view>
</picker>
</view>
</view> -->
</block>
<block wx:if="{{tp == 'zybj'}}">
@ -187,6 +201,7 @@
</view>
</view>
<!-- 文化旅游 -->
<view wx:elif="{{code == 'whly'}}" class="content">
<view class="column">
<view class="cell">
@ -235,16 +250,24 @@
</view>
</view>
</view>
<view class="column">
<view class="cell">
<view class="tit">参观人数</view>
<view class="con">
<input bindinput="formInputChange" type="number" placeholder="请输入人数" style="text-align: right" placeholder-style='text-align:right;color:rgb(202,202,202)'/>
</view>
</view>
</view>
<view class="column">
<view class="cell">
<view class="tit">参观人员</view>
<view class="tit">服务需求</view>
</view>
<textarea
class="textArea"
maxlength="1000"
bindinput="inputDemand"
placeholder="请填写参观人员"
placeholder="请填写服务需求"
placeholder-style="font-size:12px;color:rgb(202,202,202)"
/>
</view>
@ -257,6 +280,12 @@
<view class="con">{{info.realName}}</view>
</view>
</view>
<view class="column">
<view class="cell">
<view class="tit">身份证号</view>
<view class="con">{{info.idCard}}</view>
</view>
</view>
<view class="column">
<view class="cell">
<view class="tit">联系电话</view>
@ -266,6 +295,21 @@
</view>
</view>
<view class="column">
<view class="cell">
<view class="tit">服务需求</view>
</view>
<textarea
class="textArea"
maxlength="1000"
bindinput="inputDemand"
placeholder="请描述您的服务需求"
placeholder-style="font-size:12px;color:rgb(202,202,202)"
/>
<view class="pic">
<mp-uploader ext-class="myUploader" delete="true" binddelete="deleteFile" upload="{{uplaodFile}}" files="{{files}}" select="{{selectFile}}" max-count="9" title=""></mp-uploader>
</view>
</view>
<!-- <view class="column">
<picker bindchange="bindDepartChange" value="{{departIndex}}" range="{{departArray}}" style="width:100%;">
<view class="picker-box">
<view class="cell">
@ -296,7 +340,7 @@
<text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text>
</view>
</view>
</view>
</view> -->
</view>
<!-- 学历教育 -->
<view wx:elif="{{code == 'xljy'}}" class="content">
@ -544,14 +588,11 @@
</view>
</view>
<view class="column">
<!-- <view class="cell">
<view class="tit">实际到岗证明（连续三个月）</view>
</view> -->
<!-- <view class="column">
<view class="pic">
<mp-uploader ext-class="myUploader" delete="true" binddelete="deletePostProve" upload="{{uplaodPostProve}}" files="{{postProve}}" select="{{selectFile}}" max-count="9" title="实际到岗证明（连续三个月）"></mp-uploader>
</view>
</view>
</view> -->
<view class="column">
<!-- <view class="cell">
@ -564,11 +605,11 @@
<block wx:if="{{tp == 'lpbt'}}">
<view class="column">
<view class="cell">
<!-- <view class="cell">
<view class="tit">薪酬证明</view>
</view>
</view> -->
<view class="pic">
<mp-uploader ext-class="myUploader" delete="true" binddelete="deleteSalaryProve" upload="{{uplaodSalaryProve}}" files="{{salaryProve}}" select="{{selectFile}}" max-count="9" title=""></mp-uploader>
<mp-uploader ext-class="myUploader" delete="true" binddelete="deleteSalaryProve" upload="{{uplaodSalaryProve}}" files="{{salaryProve}}" select="{{selectFile}}" max-count="9" title="薪酬证明"></mp-uploader>
<!-- <view class="photo" bindtap="salaryProve"><text class="fa fa-camera fa-2x" style="color:rgba(0, 0, 0, 0.300);"></text></view>
<block wx:if="{{text}}">
<text style="font-size:28rpx;color:rgba(0, 0, 0, 0.400);"></text>
@ -651,7 +692,6 @@
</view>
</view>
<block wx:else>
<view class="content">
<view class="column">
@ -674,6 +714,26 @@
</view>
</view>
</view>
<block wx:if="{{code =='flwf'}}">
<view class="column">
<picker bindchange="bindDepartChange" value="{{departIndex}}" range="{{departArray}}" style="width:100%;">
<view class="picker-box">
<view class="cell">
<view class="tit">办理部门</view>
<view class="con">
<block wx:if="{{departIndex === ''}}">
<text style="color:rgb(202,202,202)">请选择</text>
</block>
<block wx:else>
{{departArray[departIndex]}}
</block>
<text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text>
</view>
</view>
</view>
</picker>
</view>
</block>
<view class="column">
<view class="cell">
<view class="tit">服务需求</view>
@ -715,12 +775,12 @@
</block>
<!--
<block wx:if="{{code == 'ylbj'}}">
<view class="tips">
提醒：为提高效率便于安排，请您至少提前5个工作日提出预约申请，申请时长不超过1个月
</view>
</block>
</block> -->
<view class="btnView">
<e-ibutton title="提交" bind:onTap="submit"/>

1
pages/service/settle/settle.wxss
View File

@ -65,6 +65,7 @@ page{
/* display: flex; */
align-items: center;
margin-bottom: 15px;
margin-top:10px;
/* overflow: visible !important; */
}

14
pages/service/vipCard/vipCard.js
View File

@ -16,9 +16,17 @@ Page({
*/
onLoad: function (options) {
serviceModel.vipCard(res=>{
this.setData({
detail:res.result
})
console.log(111)
if(res.code == 500){
wx.switchTab({
url: '/pages/home/index',
})
}else{
this.setData({
detail:res.result
})
}
})
},

3
pages/user/index.js
View File

@ -47,7 +47,8 @@ Page({
]
],
talentsType:0
talentsType:0,
shield:'../../images/shield.png'
},

32
pages/user/index.wxml
View File

@ -19,9 +19,13 @@
<image slot="icon" class="user_logo" src="{{avatarUrl}}"/>
<view slot="title" class="user_name">
<view>{{nickName}}</view>
<view bindtap="vip" wx:if="{{talentsType != 0}}">
<van-tag type="primary" size="medium" round color="rgb(230,208,68)" style="margin-left:5px;">市北区高层次人才 <text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text></van-tag>
<view style="display:flex;align-items: center;" wx:if="{{talentsType != 0}}">
<image src="{{shield}}" style="width:20px;height:20px" mode="aspectFit"></image>
<view bindtap="vip" >
<van-tag type="primary" size="medium" round color="rgb(230,208,68)" style="margin-left:5px;">市北区高层次人才 <text class="fa fa-angle-right fa-lg" style="margin-left:5px;"></text></van-tag>
</view>
</view>
</view>
</view>
</view>
@ -33,7 +37,7 @@
<view class="title-cell" wx:if="{{talentsType != 0}}">
<view class="con">
<view class="t">人才服务</view>
<view class="t2" bindtap="service"><text>我的服务</text><text class="fa fa-angle-right fa-lg" style="margin-left:5px;margin-bottom:1px;color:rgb(178,178,178)"></text></view>
<view class="t2" bindtap="service"><text>我的服务</text><text class="fa fa-angle-right fa-lg" style="margin-left:5px;margin-bottom:1px;color:rgb(178,178,178);font-size: 20px;"></text></view>
</view>
</view>
<swiper class="nav" indicator-dots="{{true}}" indicator-color="rgb(217,217,217)" indicator-active-color="rgb(230,208,68)" wx:if="{{talentsType != 0}}">
@ -42,7 +46,27 @@
<van-grid column-num="5" border="{{false}}">
<block wx:for="{{item}}" wx:for-item="it">
<block wx:if="{{it.app_id}}">
<van-grid-item use-slot bindtap="jump" data-appid="{{it.app_id}}">
<!-- <van-grid-item use-slot bindtap="jump" data-appid="{{it.app_id}}">
<view class="circular">
<image src="../../images/icon/{{it.server_code}}.png" mode="aspectFit" class="icon"></image>
</view>
<view class="tit">{{it.server_name}}</view>
</van-grid-item> -->
<van-grid-item use-slot url="/pages/service/detail/detail?code={{it.server_code}}&app_id={{it.app_id}}">
<view class="circular">
<image src="../../images/icon/{{it.server_code}}.png" mode="aspectFit" class="icon"></image>
</view>
<view class="tit">{{it.server_name}}</view>
</van-grid-item>
</block>
<block wx:elif="{{it.pic}}">
<!-- <van-grid-item use-slot bindtap="jump" data-appid="{{it.app_id}}">
<view class="circular">
<image src="../../images/icon/{{it.server_code}}.png" mode="aspectFit" class="icon"></image>
</view>
<view class="tit">{{it.server_name}}</view>
</van-grid-item> -->
<van-grid-item use-slot url="/pages/service/detail/detail?code={{it.server_code}}&pic={{it.pic}}">
<view class="circular">
<image src="../../images/icon/{{it.server_code}}.png" mode="aspectFit" class="icon"></image>
</view>

6
pages/user/index.wxss
View File

@ -104,11 +104,11 @@ page{
display: flex;
align-items: center;
justify-content: center;
padding:5px 0 ;
padding:10px 0 5px 0;
}
.con{
width: 90%;
width: 92%;
display: flex;
align-items: center;
justify-content: space-between;
@ -122,7 +122,7 @@ page{
.t2{
display: flex;
align-items: center;
font-size: 12px;
font-size: 13px;
color:rgb(106,106,106);
}
.header{

2
pages/user/myInfo/index.wxml
View File

@ -11,7 +11,7 @@
</mp-cell>
<mp-cell link="true"
data-type="userName"
title="姓名" bindtap="onTapItem"
title="昵称" bindtap="onTapItem"
ext-class="cell-item">
<!-- <view slot="footer" class="msg_footer" >{{nikeName}}</view> -->
<input slot="footer" style="text-align:right;" class="footer_input_phone" maxlength="120" value="{{nickName}}" disabled placeholder="请输入"></input>

Write Preview
Loading…
Cancel
Save