diff --git a/models/user.js b/models/user.js
index fed38a2..1511eb9 100644
--- a/models/user.js
+++ b/models/user.js
@@ -10,7 +10,8 @@ const UserConst = {
user_updateUserInfo_url:'/api/miniuser/updateMiniUser', // 更新用户信息
user_sendUserInfo_url:'/api/miniuser/updateUserInfo', // 上传用户信息
- user_register_url:'/api/miniuser/wxregister', // 微信注册
+ // user_register_url:'/api/miniuser/wxregister', // 微信注册
+ user_register_url:'/api/miniuser/wxNewRegister', // 微信注册
user_myWhistle_url:'/api/whistle/getMyWhistleList',// 我的吹哨
user_whistleDetail_url:'/api/whistle/getWhistleById', // 吹哨详情
diff --git a/pages/service/myService/myService.wxml b/pages/service/myService/myService.wxml
index ea833de..fa7ce87 100644
--- a/pages/service/myService/myService.wxml
+++ b/pages/service/myService/myService.wxml
@@ -6,7 +6,7 @@
{{detail.server_name}}
- {{detail.progress}}
+ {{detail.progress}}
@@ -29,8 +29,8 @@
- 发票证明
-
+ 发票证明:
+
@@ -41,8 +41,8 @@
- 企业执照
-
+ 企业执照:
+
@@ -53,8 +53,8 @@
- 到岗证明
-
+ 到岗证明:
+
@@ -65,8 +65,8 @@
- 合同证明
-
+ 合同证明:
+
@@ -77,8 +77,8 @@
- 薪酬证明
-
+ 薪酬证明:
+
@@ -90,10 +90,10 @@
- 入学证明
- 参加活动证明
+ 入学证明:
+ 参加活动证明:
-
+
@@ -105,10 +105,10 @@
- 学费证明
- 费用证明
+ 学费证明:
+ 费用证明:
-
+
diff --git a/pages/service/myService/myService.wxs b/pages/service/myService/myService.wxs
index 35fbbfb..8701ce0 100644
--- a/pages/service/myService/myService.wxs
+++ b/pages/service/myService/myService.wxs
@@ -45,14 +45,10 @@ var myService = {
getColor:function(status){
if (status == '处理中') {
- var color = '#ff8a0e';
- } else if (status == '1') {
- var color = '#f41414';
- } else if (status == '2') {
- var color = '#1131e4';
- } else if (status == '3') {
- var color = '#463c59';
- }else{
+ var color = 'rgb(255,135,25)';
+ } else if (status == '已答复') {
+ var color = 'rgb(242,7,7)';
+ } else{
color = ''
}
diff --git a/pages/service/myService/myService.wxss b/pages/service/myService/myService.wxss
index 069d995..25788f4 100644
--- a/pages/service/myService/myService.wxss
+++ b/pages/service/myService/myService.wxss
@@ -56,6 +56,14 @@ page{
margin-top:30rpx;
}
+ .image-show2{
+ height: 220rpx;
+ width:95%;
+ overflow-x:scroll;
+ white-space:nowrap;
+ margin-top:10rpx;
+ }
+
.img-box{
margin-right:15rpx;
width:220rpx;
diff --git a/pages/service/vipCard/vipCard.js b/pages/service/vipCard/vipCard.js
index bd353e8..d8e93a2 100644
--- a/pages/service/vipCard/vipCard.js
+++ b/pages/service/vipCard/vipCard.js
@@ -7,7 +7,8 @@ Page({
* 页面的初始数据
*/
data: {
- detail:{}
+ detail:{},
+ card:"../../../images/card.png"
},
/**
diff --git a/pages/service/vipCard/vipCard.wxml b/pages/service/vipCard/vipCard.wxml
index 69fc32a..e8301f5 100644
--- a/pages/service/vipCard/vipCard.wxml
+++ b/pages/service/vipCard/vipCard.wxml
@@ -1,5 +1,7 @@
-
+
+
+
{{detail.cardName}}
{{detail.name}}
{{detail.talentsType}}
diff --git a/pages/service/vipCard/vipCard.wxss b/pages/service/vipCard/vipCard.wxss
index ce50da3..8a17be6 100644
--- a/pages/service/vipCard/vipCard.wxss
+++ b/pages/service/vipCard/vipCard.wxss
@@ -14,6 +14,7 @@ page{
height:350rpx;
border-radius: 4px;
margin-top: 20px;
+ position: relative;
}
.title{
@@ -28,6 +29,7 @@ page{
margin: 0 0 2rpx 40rpx;
font-size: 50rpx;
font-weight: bold;
+ z-index: 20;
}
.type{
@@ -35,12 +37,14 @@ page{
margin: 0 0 2rpx 40rpx;
font-size: 36rpx;
font-weight: bold;
+ z-index: 20;
}
.number{
color: white;
margin: 0 0 0 40rpx;
font-size: 24rpx;
+ z-index: 999;
}
.explain-tit{
@@ -53,4 +57,11 @@ page{
.explain{
width: 85%;
font-size: 12px;
-}
\ No newline at end of file
+}
+
+.bg{
+ width: 100%;
+ height:100%;
+ position: absolute;
+ z-index: -200;
+ }
\ No newline at end of file
diff --git a/pages/user/index.js b/pages/user/index.js
index 436cf0c..959b86c 100644
--- a/pages/user/index.js
+++ b/pages/user/index.js
@@ -46,7 +46,8 @@ Page({
{id:20,name:'机关停车'},
]
- ]
+ ],
+ talentsType:0
},
@@ -75,7 +76,6 @@ Page({
service:service
})
})
-
},
onShow: function () {
if (store.hasBindUserInfo()) {
@@ -113,6 +113,8 @@ Page({
// url: '/pages/weChatAuth/index',
// })
}
+
+
},
// 获取用户信息
@@ -131,6 +133,7 @@ Page({
avatarUrl: res.result.avatarUrl,
nickName: res.result.nickName,
isAuth:true,
+ talentsType:res.result.talentsType
},()=>{
if (store.hasPhone()) {
//console.log('已经绑定手机号码')
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 817c7a9..ec66606 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -13,13 +13,13 @@
-->
-