miniprogram / volunteer · 提交

转到一个项目

作者 王智
提交 3c371d4a73cd571aff5949597907edb8b9418df2 1 个父辈 abd1d5dc

页面完善

内嵌 并排对比
正在显示 24 个修改的文件 包含 597 行增加 和 333 行删除
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 "pages/my/my", 5 "pages/my/my",
6 "pages/mydetail/mydetail", 6 "pages/mydetail/mydetail",
7 "pages/more/more", 7 "pages/more/more",
  8 + "pages/more_other/more_other",
8 "pages/admin/admin", 9 "pages/admin/admin",
9 "pages/apply/apply", 10 "pages/apply/apply",
10 "pages/img_txt/img_txt", 11 "pages/img_txt/img_txt",
@@ -44,6 +45,12 @@ @@ -44,6 +45,12 @@
44 45
45 46
46 ], 47 ],
  48 +
  49 + "permission": {
  50 + "scope.userLocation": {
  51 + "desc": "你的位置信息将用于小程序位置接口的效果展示"
  52 + }
  53 + },
47 "window": { 54 "window": {
48 "backgroundTextStyle": "light", 55 "backgroundTextStyle": "light",
49 "navigationBarBackgroundColor": "#21AE59", 56 "navigationBarBackgroundColor": "#21AE59",
@@ -26,8 +26,8 @@ Page({ @@ -26,8 +26,8 @@ Page({
26 26
27 }, 27 },
28 28
29 - // 选择  
30 - bindPickerChange: function (e) { 29 + // 选择
  30 + bindPickerChange: function (e) {
31 console.log('picker发送选择改变，携带值为', e.detail.value) 31 console.log('picker发送选择改变，携带值为', e.detail.value)
32 this.setData({ 32 this.setData({
33 index: e.detail.value 33 index: e.detail.value
@@ -35,24 +35,6 @@ Page({ @@ -35,24 +35,6 @@ Page({
35 that.getList() 35 that.getList()
36 36
37 }, 37 },
38 - // 地址获取  
39 - get_city() {  
40 - let that = this;  
41 - let url = '/index/index/cityList'  
42 - let head = {  
43 - 'XX-Token': wx.getStorageSync('token')  
44 - }  
45 -  
46 - app.post(url, {}, head).then((res) => {  
47 - console.log(res)  
48 - that.setData({  
49 - array: res.city  
50 -  
51 - })  
52 - }).catch((err) => {  
53 -  
54 - })  
55 - },  
56 38
57 // 志愿列表 39 // 志愿列表
58 getList() { 40 getList() {
@@ -75,6 +57,24 @@ Page({ @@ -75,6 +57,24 @@ Page({
75 57
76 }) 58 })
77 }, 59 },
  60 + // 地址获取
  61 + get_city() {
  62 + let that = this;
  63 + let url = '/index/index/cityList'
  64 + let head = {
  65 + 'XX-Token': wx.getStorageSync('token')
  66 + }
  67 +
  68 + app.post(url, {}, head).then((res) => {
  69 + console.log(res)
  70 + that.setData({
  71 + array: res.city
  72 +
  73 + })
  74 + }).catch((err) => {
  75 +
  76 + })
  77 + },
78 78
79 // 详情页 79 // 详情页
80 getDetail(e) { 80 getDetail(e) {
@@ -94,37 +94,13 @@ Page({ @@ -94,37 +94,13 @@ Page({
94 94
95 }) 95 })
96 }, 96 },
97 -  
98 97
99 98
100 99
101 - /**  
102 - * 生命周期函数--监听页面隐藏  
103 - */  
104 - onHide: function () {  
105 100
106 - },  
107 101
108 - /**  
109 - * 生命周期函数--监听页面卸载  
110 - */  
111 - onUnload: function () {  
112 -  
113 - },  
114 -  
115 - /**  
116 - * 页面相关事件处理函数--监听用户下拉动作  
117 - */  
118 - onPullDownRefresh: function () {  
119 -  
120 - },  
121 102
122 - /**  
123 - * 页面上拉触底事件的处理函数  
124 - */  
125 - onReachBottom: function () {  
126 103
127 - },  
128 104
129 /** 105 /**
130 * 用户点击右上角分享 106 * 用户点击右上角分享
@@ -61,6 +61,20 @@ page { @@ -61,6 +61,20 @@ page {
61 font-size: 28rpx; 61 font-size: 28rpx;
62 } 62 }
63 63
  64 +
64 .goods_groups view { 65 .goods_groups view {
65 width: 25%; 66 width: 25%;
  67 +}
  68 +
  69 +.goods_groups :nth-child(2){
  70 + text-align: left;
  71 +
  72 +}
  73 +.goods_groups :nth-child(3){
  74 + text-align: center;
  75 +
  76 +}
  77 +.goods_groups :nth-child(4){
  78 + text-align: right;
  79 +
66 } 80 }
@@ -103,19 +103,21 @@ Page({ @@ -103,19 +103,21 @@ Page({
103 }) 103 })
104 }, 104 },
105 105
106 -  
107 -  
108 -  
109 -  
110 -  
111 -  
112 // 招募活动 106 // 招募活动
113 get() { 107 get() {
114 wx.navigateTo({ 108 wx.navigateTo({
115 url: '/pages/index/active/active', 109 url: '/pages/index/active/active',
116 }) 110 })
117 }, 111 },
  112 + //他人主页
  113 + getother(e) {
  114 + var id =e.currentTarget.id
  115 + console.log(e)
  116 + wx.navigateTo({
  117 + url: '/pages/more_other/more_other?id='+id,
  118 + })
118 119
  120 + },
119 121
120 122
121 /** 123 /**
@@ -132,7 +134,7 @@ Page({ @@ -132,7 +134,7 @@ Page({
132 this.getdatalist(); 134 this.getdatalist();
133 let that = this; 135 let that = this;
134 that.getdatalists(); 136 that.getdatalists();
135 - 137 +
136 }, 138 },
137 139
138 //导航跳转 140 //导航跳转
1 <!-- 轮播图 --> 1 <!-- 轮播图 -->
2 -<swiper indicator-dots="true" indicator-color='#8C9194' indicator-active-color='#ffffff' class="slide-image">  
3 - <navigator wx:for="{{datalist.slide}}" wx:key="id" hover-class="none" url='/pages/img_txt/img_txt?id={{item.activity_id}}&status=1'> 2 +<swiper indicator-dots="true" indicator-color='#8C9194' indicator-active-color='#ffffff' class="slide-image">
  3 + <navigator wx:for="{{datalist.slide}}" wx:key="id" hover-class="none"
  4 + url='/pages/img_txt/img_txt?id={{item.activity_id}}&status=1'>
4 <swiper-item> 5 <swiper-item>
5 <image src="{{item.image}}" mode="aspectFill" /> 6 <image src="{{item.image}}" mode="aspectFill" />
6 </swiper-item> 7 </swiper-item>
@@ -9,7 +10,8 @@ @@ -9,7 +10,8 @@
9 <!-- <view class='vold_line'></view> --> 10 <!-- <view class='vold_line'></view> -->
10 <!-- 菜单 --> 11 <!-- 菜单 -->
11 <view class="home_menu "> 12 <view class="home_menu ">
12 - <view class="home_time" bindtap="gotoNav" data-id="{{item.id}}" data-path="{{item.path}}" wx:for="{{navList}}" wx:key="id" > 13 + <view class="home_time" bindtap="gotoNav" data-id="{{item.id}}" data-path="{{item.path}}" wx:for="{{navList}}"
  14 + wx:key="id">
13 <view> 15 <view>
14 <image src="{{item.icon}}" /> 16 <image src="{{item.icon}}" />
15 </view> 17 </view>
@@ -25,21 +27,28 @@ @@ -25,21 +27,28 @@
25 </navigator> 27 </navigator>
26 </view> 28 </view>
27 <view class='volunteerbox'> 29 <view class='volunteerbox'>
28 - <view class='volunteercell' wx:for='{{datalist.volunteer}}' wx:key="index" id='{{item.id}}' wx:if="{{index<=3}}"> 30 + <view class='volunteercell' wx:for='{{datalist.volunteer}}' wx:key="index" id='{{item.user_id}}' wx:if="{{index<=3}}"
  31 + bindtap="getother">
29 <view class='cell_top'> 32 <view class='cell_top'>
30 <view class='cellimg'> 33 <view class='cellimg'>
31 - <image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}' mode="aspectFill" /> 34 + <image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}'
  35 + mode="aspectFill" />
32 </view> 36 </view>
33 <view class="c_right"> 37 <view class="c_right">
34 <view class="name">{{item.name}}</view> 38 <view class="name">{{item.name}}</view>
35 <view class="province">{{item.province}}</view> 39 <view class="province">{{item.province}}</view>
36 <view class='star_box'> 40 <view class='star_box'>
37 - <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>0}}'></image>  
38 - <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>1}}'></image>  
39 - <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>2}}'></image>  
40 - <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>3}}'></image>  
41 - <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>4}}'></image>  
42 - 41 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>0}}'>
  42 + </image>
  43 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>1}}'>
  44 + </image>
  45 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>2}}'>
  46 + </image>
  47 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>3}}'>
  48 + </image>
  49 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>4}}'>
  50 + </image>
  51 +
43 </view> 52 </view>
44 </view> 53 </view>
45 </view> 54 </view>
@@ -57,7 +66,8 @@ @@ -57,7 +66,8 @@
57 66
58 <view> 67 <view>
59 <view class='new_box'> 68 <view class='new_box'>
60 - <navigator class='new_cell' wx:for='{{activity}}' wx:key="id" url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none"> 69 + <navigator class='new_cell' wx:for='{{activity}}' wx:key="id"
  70 + url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none">
61 <view class='new_cellmain'> 71 <view class='new_cellmain'>
62 <view class='new_img'> 72 <view class='new_img'>
63 <image src='{{item.thumbnail}}' mode="aspectFill" /> 73 <image src='{{item.thumbnail}}' mode="aspectFill" />
@@ -78,12 +88,14 @@ @@ -78,12 +88,14 @@
78 <view class='index_newbox' wx:if="{{news.length>0}}"> 88 <view class='index_newbox' wx:if="{{news.length>0}}">
79 <view class='index_volunteertitle'> 89 <view class='index_volunteertitle'>
80 <view class='title'>活动回顾</view> 90 <view class='title'>活动回顾</view>
81 - <navigator class="more" url='/pages/index/active/active?end_type=1' hover-class="none">查看更多\t<image src="/imgs/more.png"></image> 91 + <navigator class="more" url='/pages/index/active/active?end_type=1' hover-class="none">查看更多\t<image
  92 + src="/imgs/more.png"></image>
82 </navigator> 93 </navigator>
83 </view> 94 </view>
84 <view class="review_box"> 95 <view class="review_box">
85 <view class="review_wrap"> 96 <view class="review_wrap">
86 - <navigator class="r_item" wx:for='{{news}}' wx:key="index" url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none"> 97 + <navigator class="r_item" wx:for='{{news}}' wx:key="index"
  98 + url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none">
87 <view class="r_left"> 99 <view class="r_left">
88 <view class="r_title">{{item.activity_name}}</view> 100 <view class="r_title">{{item.activity_name}}</view>
89 <!-- <view class="r_info"> 101 <!-- <view class="r_info">
1 -  
2 const app = getApp(); 1 const app = getApp();
3 Page({ 2 Page({
4 3
@@ -9,7 +8,7 @@ Page({ @@ -9,7 +8,7 @@ Page({
9 page: 0, 8 page: 0,
10 pageNum: 24, 9 pageNum: 24,
11 volunteer: [], 10 volunteer: [],
12 - page_type: false 11 + page_type: false
13 }, 12 },
14 getdatalist() { 13 getdatalist() {
15 wx.showLoading({ 14 wx.showLoading({
@@ -30,7 +29,7 @@ Page({ @@ -30,7 +29,7 @@ Page({
30 let datavolunteer = this.data.volunteer; 29 let datavolunteer = this.data.volunteer;
31 let tem = []; 30 let tem = [];
32 let temvolunteer = []; 31 let temvolunteer = [];
33 - if (volunteer.length > 0){ 32 + if (volunteer.length > 0) {
34 for (let i = 0; i < volunteer.length; i++) { 33 for (let i = 0; i < volunteer.length; i++) {
35 tem.push(volunteer[i]); 34 tem.push(volunteer[i]);
36 if ((i + 1) != volunteer.length) { 35 if ((i + 1) != volunteer.length) {
@@ -44,80 +43,90 @@ Page({ @@ -44,80 +43,90 @@ Page({
44 } 43 }
45 } 44 }
46 let setvolunteer = datavolunteer.concat(temvolunteer) 45 let setvolunteer = datavolunteer.concat(temvolunteer)
47 - if (that.data.page == 0){ 46 + if (that.data.page == 0) {
48 wx.hideLoading() 47 wx.hideLoading()
49 that.setData({ 48 that.setData({
50 volunteer: setvolunteer, 49 volunteer: setvolunteer,
51 page: res.page 50 page: res.page
52 }) 51 })
53 } else { 52 } else {
54 - setTimeout(()=>{ 53 + setTimeout(() => {
55 wx.hideLoading() 54 wx.hideLoading()
56 that.setData({ 55 that.setData({
57 volunteer: setvolunteer, 56 volunteer: setvolunteer,
58 page: res.page 57 page: res.page
59 }) 58 })
60 - },1000) 59 + }, 1000)
61 } 60 }
62 } else { 61 } else {
63 wx.hideLoading() 62 wx.hideLoading()
64 that.setData({ 63 that.setData({
65 page_type: true 64 page_type: true
66 }) 65 })
67 - 66 +
68 } 67 }
69 - 68 +
70 }).catch((err) => { 69 }).catch((err) => {
71 70
72 }) 71 })
73 }, 72 },
  73 + //他人主页
  74 + getother(e) {
  75 + // console.log(e)
  76 + var id = e.currentTarget.dataset.id
  77 + wx.navigateTo({
  78 + url: '/pages/more_other/more_other?id=' + id,
  79 + })
  80 +
  81 + },
  82 +
74 /** 83 /**
75 * 生命周期函数--监听页面加载 84 * 生命周期函数--监听页面加载
76 */ 85 */
77 - onLoad: function(options) { 86 + onLoad: function (options) {
78 this.getdatalist() 87 this.getdatalist()
79 }, 88 },
80 89
81 /** 90 /**
82 * 生命周期函数--监听页面初次渲染完成 91 * 生命周期函数--监听页面初次渲染完成
83 */ 92 */
84 - onReady: function() { 93 + onReady: function () {
85 94
86 }, 95 },
87 96
88 /** 97 /**
89 * 生命周期函数--监听页面显示 98 * 生命周期函数--监听页面显示
90 */ 99 */
91 - onShow: function() {  
92 - 100 + onShow: function () {
  101 +
93 102
94 }, 103 },
95 104
96 /** 105 /**
97 * 生命周期函数--监听页面隐藏 106 * 生命周期函数--监听页面隐藏
98 */ 107 */
99 - onHide: function() { 108 + onHide: function () {
100 109
101 }, 110 },
102 111
103 /** 112 /**
104 * 生命周期函数--监听页面卸载 113 * 生命周期函数--监听页面卸载
105 */ 114 */
106 - onUnload: function() { 115 + onUnload: function () {
107 116
108 }, 117 },
109 118
110 /** 119 /**
111 * 页面相关事件处理函数--监听用户下拉动作 120 * 页面相关事件处理函数--监听用户下拉动作
112 */ 121 */
113 - onPullDownRefresh: function() { 122 + onPullDownRefresh: function () {
114 123
115 }, 124 },
116 125
117 /** 126 /**
118 * 页面上拉触底事件的处理函数 127 * 页面上拉触底事件的处理函数
119 */ 128 */
120 - onReachBottom: function() { 129 + onReachBottom: function () {
121 let that = this 130 let that = this
122 if (that.data.page_type) { 131 if (that.data.page_type) {
123 wx.showToast({ 132 wx.showToast({
@@ -133,7 +142,7 @@ Page({ @@ -133,7 +142,7 @@ Page({
133 /** 142 /**
134 * 用户点击右上角分享 143 * 用户点击右上角分享
135 */ 144 */
136 - onShareAppMessage: function() { 145 + onShareAppMessage: function () {
137 146
138 } 147 }
139 }) 148 })
1 1
2 <bolck wx:for='{{volunteer}}' wx:key > 2 <bolck wx:for='{{volunteer}}' wx:key >
3 - <view class='volunteerbox'>  
4 - <view class='volunteercell' wx:for='{{item}}' wx:key> 3 + <view class='volunteerbox' >
  4 + <view class='volunteercell' wx:for='{{item}}' bindtap="getother" data-id="{{item.user_id}}" wx:key>
5 <view class='cell_top'> 5 <view class='cell_top'>
6 <view class='cellimg'> 6 <view class='cellimg'>
7 <image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}' mode="aspectFill" /> 7 <image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}' mode="aspectFill" />
  1 +const app = getApp();
  2 +Page({
  3 +
  4 +
  5 + data: {
  6 + nav: 0,
  7 + id:'',
  8 + list:''
  9 + },
  10 +
  11 + getlist(e) {
  12 + let that = this;
  13 + let url = '/index/second/otherHome';
  14 + let head = {
  15 + 'XX-Token': wx.getStorageSync('token')
  16 + }
  17 + let params = {
  18 + user_id: that.data.id
  19 + }
  20 + app.post(url, params, head).then((res) => {
  21 +
  22 + console.log(res)
  23 + that.setData({
  24 + list: res
  25 + })
  26 +
  27 +
  28 + }).catch(() => {})
  29 +
  30 + },
  31 + // 导航切换
  32 + bindNav(e) {
  33 + var nav = e.currentTarget.dataset.nav
  34 + console.log(nav)
  35 + this.setData({
  36 + nav
  37 + })
  38 + },
  39 + onLoad: function (options) {
  40 + console.log(options)
  41 + this.setData({
  42 + id: options.id
  43 + })
  44 + },
  45 + onReady: function () {
  46 +
  47 + },
  48 +
  49 +
  50 + onShow: function () {
  51 + let that = this
  52 + that.getlist()
  53 + },
  54 +
  55 + /**
  56 + * 生命周期函数--监听页面隐藏
  57 + */
  58 + onHide: function () {
  59 +
  60 + },
  61 +
  62 + /**
  63 + * 生命周期函数--监听页面卸载
  64 + */
  65 + onUnload: function () {
  66 +
  67 + },
  68 +
  69 + /**
  70 + * 页面相关事件处理函数--监听用户下拉动作
  71 + */
  72 + onPullDownRefresh: function () {
  73 +
  74 + },
  75 +
  76 + /**
  77 + * 页面上拉触底事件的处理函数
  78 + */
  79 + onReachBottom: function () {
  80 +
  81 + },
  82 +
  83 + /**
  84 + * 用户点击右上角分享
  85 + */
  86 + onShareAppMessage: function () {
  87 +
  88 + }
  89 +})
  1 +{
  2 + "usingComponents": {},
  3 + "navigationBarTitleText": "他人主页"
  4 +}
  1 +<!--姓名 -->
  2 +<view class='apply_item'>
  3 + <view>头像</view>
  4 + <view class='apply_item_list'>
  5 + <image src="{{list.userInfo.avatar}}"></image>
  6 + </view>
  7 +</view>
  8 +<view class="line">
  9 + <view></view>
  10 +</view>
  11 +
  12 +
  13 +<view class='apply_item'>
  14 + <view>姓名</view>
  15 + <view class='apply_item_list'>
  16 + {{list.userInfo.name}}
  17 + </view>
  18 +</view>
  19 +<view class="line">
  20 + <view></view>
  21 +</view>
  22 +<view class='apply_item'>
  23 + <view>志愿者</view>
  24 + <view class='apply_item_list'>
  25 + {{list.userInfo.status}}
  26 + </view>
  27 +</view>
  28 +<view class="line">
  29 + <view></view>
  30 +</view>
  31 +<view class='apply_item'>
  32 + <view>等级</view>
  33 + <view class='apply_item_list star'>
  34 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{list.userInfo.level>0}}'>
  35 + </image>
  36 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{list.userInfo.level>1}}'>
  37 + </image>
  38 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{list.userInfo.level>2}}'>
  39 + </image>
  40 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{list.userInfo.level>3}}'>
  41 + </image>
  42 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{list.userInfo.level>4}}'>
  43 + </image>
  44 + </view>
  45 +</view>
  46 +<view class="line">
  47 + <view></view>
  48 +</view>
  49 +<view class='apply_item'>
  50 + <view>地区</view>
  51 + <view class='apply_item_list'>
  52 + {{list.address}}
  53 + </view>
  54 +</view>
  55 +
  56 +<view class="navbar">
  57 + <view class="item {{nav==0?'choose':''}}" bindtap="bindNav" data-nav="{{0}}">加入的活动</view>
  58 + <view class="item {{nav==1?'choose':''}}" bindtap="bindNav" data-nav="{{1}}">加入的团队</view>
  59 +</view>
  60 +
  61 +<view wx:if="{{nav==0}}">
  62 +
  63 + <view class="myactive_wrap" wx:for="{{list.userJoin}}">
  64 + <view class="myactive_time">
  65 + <image src="/imgs/shijian-19.png"></image>{{item.date}}
  66 + {{ item.start_clock_time}}-{{item.end_clock_time}}
  67 +
  68 + </view>
  69 + <view class="myactive_list">
  70 + <image src="{{item.thumbnail}}"></image>
  71 + <view class="myactive_name">
  72 + <view>{{item.activity_name}}</view>
  73 + <view class="myactive_gps">
  74 + <image src="/imgs/didian-14.png"></image> 获得5小时工时
  75 + </view>
  76 + </view>
  77 + </view>
  78 + </view>
  79 +</view>
  80 +<view wx:else>
  81 + <view class="myactive_wrap" wx:for="{{list.team}}">
  82 + <view class="myactive_time">
  83 + <image src="/imgs/shijian-19.png"></image>{{item.date}}
  84 + {{ item.start_clock_time}}-{{item.end_clock_time}}
  85 +
  86 + </view>
  87 + <view class="myactive_list">
  88 + <image src="{{item.pic}}"></image>
  89 + <view class="myactive_name">
  90 + <view>{{item.name}}</view>
  91 + <view class="myactive_gps">
  92 + <image src="/imgs/didian-14.png"></image> 获得5小时工时
  93 + </view>
  94 + </view>
  95 + </view>
  96 + </view>
  97 +</view>
  1 +page {
  2 + background-color: rgb(240, 240, 240);
  3 +}
  4 +
  5 +.apply_item {
  6 + padding: 0 32rpx;
  7 + height: 88rpx;
  8 + color: #333;
  9 + font-size: 28rpx;
  10 + background-color: #ffffff;
  11 + display: flex;
  12 + align-items: center;
  13 + justify-content: space-between;
  14 +}
  15 +
  16 +.apply_item_list {
  17 + text-align: right;
  18 + width: 70%;
  19 + color: #333;
  20 + font-size: 28rpx;
  21 +}
  22 +
  23 +.apply_item_list image {
  24 + width: 56rpx;
  25 + height: 56rpx;
  26 + border-radius: 50%;
  27 +}
  28 +
  29 +.distance {
  30 + margin-top: 16rpx;
  31 +}
  32 +
  33 +.distance image {
  34 + width: 16rpx;
  35 + height: 27rpx;
  36 +}
  37 +
  38 +.star image {
  39 + width: 28rpx;
  40 + height: 28rpx;
  41 +
  42 +}
  43 +
  44 +.line view {
  45 + margin: 0 32rpx;
  46 + background-color: #e6e6e6;
  47 + height: 1px;
  48 +}
  49 +
  50 +.line {
  51 + background-color: #ffffff;
  52 +}
  53 +
  54 +
  55 +/* 导航条开始 */
  56 +.navbar {
  57 + height: 88rpx;
  58 + padding: 0 62rpx;
  59 + margin-top: 24rpx;
  60 + display: flex;
  61 + justify-content: space-around;
  62 + /* background : linear-gradient(136deg,#4e8fff 2%, #55c2fa); */
  63 + background-color: #ffffff;
  64 + font-size: 30rpx;
  65 + color: #969799;
  66 + border-radius: 2px 0px 0px 2px;
  67 +
  68 +}
  69 +
  70 +.navbar .item {
  71 + width: 346rpx;
  72 + height: 64rpx;
  73 + line-height: 66rpx;
  74 + font-size: 24rpx;
  75 + position: relative;
  76 + text-align: center;
  77 + /* background-color: #FFC909; */
  78 + /* border-radius : 19px; */
  79 +
  80 +}
  81 +
  82 +.navbar .item.choose {
  83 + color: black;
  84 + /* background: linear-gradient(136deg, #4e8fff 2%, #55c2fa); */
  85 +
  86 +}
  87 +
  88 +.navbar .item.choose:after {
  89 + content: "";
  90 + display: block;
  91 + position: absolute;
  92 + bottom: 0;
  93 + left: 0;
  94 + right: 0;
  95 + width: 80rpx;
  96 + height: 6rpx;
  97 + background: #21AE58;
  98 + margin: 0 auto;
  99 +}
  100 +
  101 +/* 团队 */
  102 +.myactive_wrap {
  103 + margin: 32rpx 24rpx;
  104 + padding: 32rpx 24rpx;
  105 + background-color: #ffffff;
  106 + border-radius: 16rpx;
  107 +}
  108 +
  109 +.myactive_time image {
  110 + width: 26rpx;
  111 + height: 26rpx;
  112 +}
  113 +
  114 +.myactive_name {
  115 + width: 434rpx;
  116 + padding: 6rpx 0;
  117 + display: flex;
  118 + flex-direction: column;
  119 + justify-content: space-between;
  120 +
  121 +}
  122 +
  123 +.myactive_list {
  124 + font-size: 28rpx;
  125 + margin-top: 24rpx;
  126 + display: flex;
  127 + justify-content: space-between;
  128 +}
  129 +
  130 +.myactive_list image {
  131 + width: 182rpx;
  132 + height: 138rpx;
  133 + margin-right: 24rpx;
  134 + border-radius: 5px;
  135 +}
  136 +
  137 +.myactive_gps {
  138 + margin-top: 16rpx;
  139 + color: #7D7E80;
  140 +}
  141 +
  142 +
  143 +.myactive_gps image {
  144 + width: 28rpx;
  145 + height: 28rpx;
  146 +
  147 +}
@@ -24,9 +24,12 @@ Page({ @@ -24,9 +24,12 @@ Page({
24 }) 24 })
25 }, 25 },
26 // 我的个人信息 26 // 我的个人信息
27 - getmy() { 27 + getmy(e) {
  28 +
  29 + var id =e.currentTarget.dataset.id
  30 + console.log(id)
28 wx.navigateTo({ 31 wx.navigateTo({
29 - url: '/pages/mydetail/mydetail', 32 + url: '/pages/mydetail/mydetail?id='+id,
30 }) 33 })
31 34
32 35
1 <view class='my_head'> 1 <view class='my_head'>
2 <image class="my_headimg" src='/imgs/card.png'></image> 2 <image class="my_headimg" src='/imgs/card.png'></image>
3 - <view class='my_headitem' bindtap="getmy"> 3 + <view class='my_headitem' >
4 <view class="my_headitemtop"> 4 <view class="my_headitemtop">
5 - <view class='my_headitemimg'> 5 + <view class='my_headitemimg' bindtap="getmy" data-id="{{datalist.id}}">
6 <image src="{{datalist.avatar?datalist.avatar:'/imgs/icon_59.png'}}"></image> 6 <image src="{{datalist.avatar?datalist.avatar:'/imgs/icon_59.png'}}"></image>
7 </view> 7 </view>
8 <view class="my_headitemname"> 8 <view class="my_headitemname">
9 <view class='word'>{{datalist.user_nickname}}</view> 9 <view class='word'>{{datalist.user_nickname}}</view>
10 - <view class="word1">志愿者（待学习）<image src="/imgs/more_gray.png"></image> 10 + <view class="word1">{{datalist.status}}（待学习）<image src="/imgs/more_gray.png"></image>
11 </view> 11 </view>
12 - <!-- <view class='word'>工时: {{datalist.work_time}}h</view> -->  
13 <view class='star_box'> 12 <view class='star_box'>
14 <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'> 13 <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'>
15 </image> 14 </image>
@@ -63,7 +63,7 @@ page { @@ -63,7 +63,7 @@ page {
63 .my_headitem .word { 63 .my_headitem .word {
64 width: 100%; 64 width: 100%;
65 /* text-align: center; */ 65 /* text-align: center; */
66 - margin-top: 10rpx; 66 + /* margin-top: 10rpx; */
67 font-size: 32rpx; 67 font-size: 32rpx;
68 font-weight: bold; 68 font-weight: bold;
69 69
@@ -9,7 +9,8 @@ Page({ @@ -9,7 +9,8 @@ Page({
9 list: '', 9 list: '',
10 id: '', 10 id: '',
11 latitude: '', 11 latitude: '',
12 - longitude: '' 12 + longitude: '',
  13 + time: ''
13 }, 14 },
14 15
15 onLoad: function (options) { 16 onLoad: function (options) {
@@ -17,6 +18,9 @@ Page({ @@ -17,6 +18,9 @@ Page({
17 this.setData({ 18 this.setData({
18 id: options.id 19 id: options.id
19 }) 20 })
  21 +
  22 +
  23 +
20 }, 24 },
21 onReady: function () { 25 onReady: function () {
22 26
@@ -36,7 +40,12 @@ Page({ @@ -36,7 +40,12 @@ Page({
36 }, 40 },
37 }) 41 })
38 42
39 - 43 + // 获取时间点
  44 + var time = util.formathour(new Date());
  45 + this.setData({
  46 + time: time
  47 + })
  48 +
40 49
41 }, 50 },
42 51
@@ -84,7 +93,7 @@ Page({ @@ -84,7 +93,7 @@ Page({
84 app.post(url, d, head).then((res) => { 93 app.post(url, d, head).then((res) => {
85 console.log(res) 94 console.log(res)
86 wx.showToast({ 95 wx.showToast({
87 - title: '打卡成功', 96 + title: '打卡成功',
88 }) 97 })
89 98
90 }).catch((err) => { 99 }).catch((err) => {
@@ -103,7 +112,7 @@ Page({ @@ -103,7 +112,7 @@ Page({
103 } 112 }
104 let d = { 113 let d = {
105 id: that.data.id, 114 id: that.data.id,
106 - 115 +
107 116
108 } 117 }
109 console.log(d) 118 console.log(d)
@@ -111,7 +120,7 @@ Page({ @@ -111,7 +120,7 @@ Page({
111 console.log(res) 120 console.log(res)
112 wx.showToast({ 121 wx.showToast({
113 title: '打卡成功', 122 title: '打卡成功',
114 - }) 123 + })
115 124
116 }).catch((err) => { 125 }).catch((err) => {
117 126
@@ -11,22 +11,20 @@ @@ -11,22 +11,20 @@
11 <view class="myactivity_starttime"> 11 <view class="myactivity_starttime">
12 <view>上岗打卡{{list.start_clock_time}}</view> 12 <view>上岗打卡{{list.start_clock_time}}</view>
13 <view class="state">{{list.user_start_text}} {{list.start_status}}</view> 13 <view class="state">{{list.user_start_text}} {{list.start_status}}</view>
14 - <!-- <view class="state" wx:if="{{list.status==1}}">已开始</view>  
15 - <view class="state" wx:if="{{list.status==2}}">完成打卡</view>  
16 - <view class="state" wx:if="{{list.status==3}}">未完成</view> -->  
17 </view> 14 </view>
18 <view class="myactivity_starttime"> 15 <view class="myactivity_starttime">
19 <view>下岗打卡{{list.end_clock_time}}</view> 16 <view>下岗打卡{{list.end_clock_time}}</view>
20 <view class="state">{{list.user_end_text}} {{list.end_status}}</view> 17 <view class="state">{{list.user_end_text}} {{list.end_status}}</view>
21 </view> 18 </view>
22 </view> 19 </view>
  20 + <!-- 打卡 -->
23 <view class="myactivity_start" bindtap="getpunch" wx:if="{{list.status==0}}"> 21 <view class="myactivity_start" bindtap="getpunch" wx:if="{{list.status==0}}">
24 <view>上岗打卡</view> 22 <view>上岗打卡</view>
25 - <view>12:00</view> 23 + <view>{{time}}</view>
26 </view> 24 </view>
27 <view class="myactivity_start" bindtap="getEnd" wx:if="{{list.status==1}}"> 25 <view class="myactivity_start" bindtap="getEnd" wx:if="{{list.status==1}}">
28 <view>下岗打卡</view> 26 <view>下岗打卡</view>
29 - <view>12:00</view> 27 + <view>{{time}}</view>
30 </view> 28 </view>
31 29
32 <view class="myactivity_end" wx:if="{{list.status==2}}"> 30 <view class="myactivity_end" wx:if="{{list.status==2}}">
@@ -3,88 +3,45 @@ Page({ @@ -3,88 +3,45 @@ Page({
3 3
4 4
5 data: { 5 data: {
6 - name: '',  
7 -  
8 - },  
9 -  
10 -  
11 - //姓名  
12 - setname(e) {  
13 - console.log(e)  
14 - this.setData({  
15 - name: e.detail.value  
16 - })  
17 - 6 + list: '',
  7 + id:''
18 }, 8 },
19 -  
20 -  
21 -  
22 -  
23 -  
24 -  
25 -  
26 -  
27 - // submit(e) {  
28 - // let that = this;  
29 9
30 - // let url = '/index/second/applyTeam';  
31 - // let head = {  
32 - // 'XX-Token': wx.getStorageSync('token')  
33 - // }  
34 - // let params = {  
35 - // name: that.data.name,  
36 - // job: that.data.job,  
37 - // data: that.data.data,  
38 - // time: that.data.time,  
39 - // join_reason: that.data.join_reason  
40 - // } 10 + getlist(e) {
  11 + let that = this;
  12 + let url = 'index/member_center/edit';
  13 + let head = {
  14 + 'XX-Token': wx.getStorageSync('token')
  15 + }
  16 + let params = {
  17 + id: that.data.id
  18 + }
  19 + app.post(url, params, head).then((res) => {
41 20
42 - // app.post(url, params, head).then((res) => { 21 + console.log(res)
  22 + that.setData({
  23 + list: res
43 24
44 - // wx.showModal({  
45 - // title: '提示',  
46 - // content: '请仔细核对信息，确认无误！',  
47 - // confirmText: '确认提交',  
48 - // cancelText: '我再想想',  
49 - // success(res) {  
50 - // if (res.confirm) {  
51 25
52 - // wx.showToast({  
53 - // title: '提交成功,等待审核',  
54 - // mask: true,  
55 - // icon: 'none',  
56 - // // duration: 2000  
57 - // })  
58 - // setTimeout(function () {  
59 - // wx.navigateBack({  
60 - // delta: 0,  
61 - // })  
62 - // }, 1000)  
63 - // console.log('用户点击确定')  
64 - // } else if (res.cancel) { 26 + })
65 27
66 - // console.log('用户点击取消')  
67 - // }  
68 - // }  
69 - // })  
70 -  
71 -  
72 - // }).catch(() => {})  
73 -  
74 -  
75 -  
76 -  
77 -  
78 - // },  
79 28
  29 + }).catch(() => {})
80 30
  31 + },
81 32
  33 + // 我的志愿者资料
  34 + getmyData() {
  35 + wx.navigateTo({
  36 + url: '/pages/apply/apply',
  37 + })
  38 + },
82 39
83 /** 40 /**
84 * 生命周期函数--监听页面加载 41 * 生命周期函数--监听页面加载
85 */ 42 */
86 onLoad: function (options) { 43 onLoad: function (options) {
87 - // console.log(options) 44 + console.log(options)
88 this.setData({ 45 this.setData({
89 id: options.id 46 id: options.id
90 }) 47 })
@@ -101,7 +58,8 @@ Page({ @@ -101,7 +58,8 @@ Page({
101 * 生命周期函数--监听页面显示 58 * 生命周期函数--监听页面显示
102 */ 59 */
103 onShow: function () { 60 onShow: function () {
104 - 61 + let that = this
  62 + that.getlist()
105 }, 63 },
106 64
107 /** 65 /**
1 { 1 {
2 "usingComponents": {}, 2 "usingComponents": {},
3 - "navigationBarTitleText": "编辑资料" 3 + "navigationBarTitleText": "我的主页"
4 } 4 }
1 <!--姓名 --> 1 <!--姓名 -->
2 <view class='apply_item'> 2 <view class='apply_item'>
  3 + <view>头像</view>
  4 + <view class='apply_item_list'>
  5 + <image src="{{list.photo}}"></image>
  6 + </view>
  7 +</view>
  8 +<view class="line">
  9 + <view></view>
  10 +</view>
  11 +
  12 +<view class='apply_item'>
3 <view>姓名</view> 13 <view>姓名</view>
4 - <view class='apply_item_input'>  
5 - <input placeholder='请输入姓名' placeholder-class='input_p' bindinput='setname' value='{{name}}'  
6 - disabled="{{page_type}}">444</input> 14 + <view class='apply_item_list'>
  15 + {{list.name}}
7 </view> 16 </view>
8 </view> 17 </view>
9 <view class="line"> 18 <view class="line">
10 <view></view> 19 <view></view>
11 </view> 20 </view>
12 -<!--工作内容 -->  
13 <view class='apply_item'> 21 <view class='apply_item'>
14 - <view>工作内容</view>  
15 - <view class='apply_item_input'>  
16 - <input placeholder='请输入工作内容' placeholder-class='input_p' bindinput='setmove_job' value='{{job}}'  
17 - disabled="{{page_type}}"></input> 22 + <view>志愿者</view>
  23 + <view class='apply_item_list'>
  24 + {{list.status}}
18 </view> 25 </view>
19 </view> 26 </view>
20 <view class="line"> 27 <view class="line">
21 <view></view> 28 <view></view>
22 </view> 29 </view>
  30 +<view class='apply_item'>
  31 + <view>等级</view>
  32 + <view class='apply_item_list star'>
  33 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{list.level>0}}'>
  34 + </image>
  35 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{list.level>1}}'>
  36 + </image>
  37 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{list.level>2}}'>
  38 + </image>
  39 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{list.level>3}}'>
  40 + </image>
  41 + <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{list.level>4}}'>
  42 + </image>
  43 + </view>
  44 +</view>
  45 +<view class="line">
  46 + <view></view>
  47 +</view>
  48 +<view class='apply_item'>
  49 + <view>地区</view>
  50 + <view class='apply_item_list'>
  51 + {{list.addr}}
  52 + </view>
  53 +</view>
23 54
24 -  
25 -  
26 -  
27 -<form class="shengqin" bindsubmit="submit" report-submit='true'>  
28 - <button form-type="submit">提交</button>  
29 -</form>  
  55 +<view class='apply_item distance' bindtap="getmyData">
  56 + <view>我的志愿者资料</view>
  57 + <view class='apply_item_list '>
  58 + <image src="/imgs/right.png"></image>
  59 + </view>
  60 +</view>
1 -/* @import "../../apply//apply.wxss"; */  
2 -/* page { 1 +page {
3 background-color: rgb(240, 240, 240); 2 background-color: rgb(240, 240, 240);
4 -} */ 3 +}
5 4
6 .apply_item { 5 .apply_item {
  6 + padding: 0 32rpx;
  7 + height: 88rpx;
7 color: #333; 8 color: #333;
8 font-size: 28rpx; 9 font-size: 28rpx;
  10 + background-color: #ffffff;
9 display: flex; 11 display: flex;
10 align-items: center; 12 align-items: center;
11 justify-content: space-between; 13 justify-content: space-between;
12 - /* margin: 0 32rpx; */  
13 - /* border-bottom: 1rpx solid #e6e6e6; */  
14 - padding: 30rpx 32rpx;  
15 - background-color: #ffffff;  
16 } 14 }
17 15
18 -.apply_item_input {  
19 - display: flex;  
20 - align-items: center;  
21 - flex-direction: row-reverse; 16 +.apply_item_list {
  17 + text-align: right;
22 width: 70%; 18 width: 70%;
23 color: #333; 19 color: #333;
24 font-size: 28rpx; 20 font-size: 28rpx;
25 } 21 }
26 22
27 -.apply_item_input input {  
28 - width: 100%; 23 +.apply_item_list image {
  24 + width: 56rpx;
  25 + height: 56rpx;
  26 + border-radius: 50%;
29 } 27 }
30 28
31 -.apply_item_input .iconfont {  
32 - color: #ccc; 29 +.distance {
  30 + margin-top: 16rpx;
33 } 31 }
34 32
35 -.big_item .apply_item_input {  
36 - width: 60%; 33 +.distance image {
  34 + width: 16rpx;
  35 + height: 27rpx;
37 } 36 }
38 37
39 -.apply_item_input input {  
40 - text-align: right;  
41 -} 38 +.star image {
  39 + width: 28rpx;
  40 + height: 28rpx;
42 41
43 -.input_p {  
44 - color: #ccc;  
45 - font-size: 28rpx;  
46 } 42 }
47 43
48 .line view { 44 .line view {
@@ -53,124 +49,4 @@ @@ -53,124 +49,4 @@
53 49
54 .line { 50 .line {
55 background-color: #ffffff; 51 background-color: #ffffff;
56 -}  
57 -  
58 -/* */  
59 -/* .doc-listform {  
60 - margin-bottom: 100rpx;  
61 - padding: 40rpx 32rpx;  
62 - font-size: 28rpx;  
63 - background-color: #ffffff;  
64 - position: relative;  
65 -  
66 -}  
67 -  
68 -.listforms {  
69 - height: 15rpx;  
70 - background-color: #eeeeee;  
71 -}  
72 -  
73 -textarea {  
74 - padding: 20rpx;  
75 - font-size: 28rpx;  
76 - margin-top: 20rpx;  
77 - width: auto;  
78 - border: 2rpx solid #eeeeee;  
79 -}  
80 -  
81 -/* 提示 */  
82 -/*  
83 -.tishi_wrap {  
84 - padding: 24rpx 36rpx;  
85 - margin: 0 32rpx;  
86 - margin-top: 40rpx;  
87 - border-radius: 8px;  
88 - background-color: #ffffff;  
89 -}  
90 -  
91 -.tishi {  
92 - display: flex;  
93 - align-items: center;  
94 - justify-content: space-between;  
95 - color: #FF4444;  
96 - font-size: 32rpx;  
97 -}  
98 -  
99 -.tishi image {  
100 - width: 28rpx;  
101 - height: 28rpx;  
102 - margin-right: 8rpx;  
103 -}  
104 -  
105 -.tishi_text {  
106 - margin-top: 16rpx;  
107 - font-size: 28rpx;  
108 - color: #7D7E80;  
109 -  
110 -} */  
111 -  
112 -/* 图片 */  
113 -/* .doc-Images {  
114 - width: 100%;  
115 -}  
116 -  
117 -.chooseImage {  
118 - width: 200rpx;  
119 - height: 200rpx;  
120 - line-height: 200rpx;  
121 - text-align: center;  
122 - font-size: 80rpx;  
123 - padding: 0px !important;  
124 - margin: 20rpx 0rpx !important;  
125 - color: #ddd;  
126 - border: 1px solid #eeeeee;  
127 - display: inline-block !important;  
128 - border-radius: 0px  
129 -}  
130 -  
131 -.chooseImage::after {  
132 - border: none;  
133 -}  
134 -  
135 -.doc-ImageList {  
136 - height: 200rpx;  
137 - margin: 0 25rpx;  
138 - display: inline-block;  
139 -}  
140 -  
141 -.doc-ImageList image {  
142 - width: 200rpx;  
143 - height: 200rpx;  
144 - position: relative;  
145 - z-index: 4px;  
146 -}  
147 -  
148 -.doc-ImageList image .iconfont {  
149 - position: absolute;  
150 - z-index: 5px;  
151 - right: 0rpx;  
152 - top: 0rpx;  
153 -} */  
154 -  
155 -.shengqin {  
156 - height: 122rpx;  
157 - background-color: #ffffff;  
158 - font-size: 32rpx;  
159 - position: fixed;  
160 - left: 0;  
161 - right: 0;  
162 - bottom: 0;  
163 - display: flex;  
164 - justify-content: center;  
165 - align-items: center;  
166 -}  
167 -  
168 -.shengqin button {  
169 - width: 622rpx;  
170 - height: 88rpx;  
171 - color: #ffffff;  
172 - border-radius: 22px;  
173 - background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);  
174 - box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42);  
175 -  
176 } 52 }
@@ -50,14 +50,19 @@ Page({ @@ -50,14 +50,19 @@ Page({
50 50
51 // 商品详情 51 // 商品详情
52 getbindshop(e) { 52 getbindshop(e) {
53 - var id =e.currentTarget.dataset.id 53 + var id = e.currentTarget.dataset.id
54 // console.log(id) 54 // console.log(id)
55 wx.navigateTo({ 55 wx.navigateTo({
56 - url: '/pages/myfeedback/myfeedback_active/myfeedback_active?id='+id, 56 + url: '/pages/myfeedback/myfeedback_active/myfeedback_active?id=' + id,
57 }) 57 })
58 58
59 }, 59 },
60 - 60 + //我的主页
  61 + getmyData() {
  62 + wx.navigateTo({
  63 + url: '/pages/mydetail/mydetail',
  64 + })
  65 + },
61 66
62 67
63 68
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <image class="my_headimg" src='/imgs/myfeedback.png'></image> 2 <image class="my_headimg" src='/imgs/myfeedback.png'></image>
3 <view class='my_headitem'> 3 <view class='my_headitem'>
4 <view class="my_headitemtop"> 4 <view class="my_headitemtop">
5 - <view class='my_headitemimg'> 5 + <view class='my_headitemimg' bindtap="getmyData">
6 <image src="{{datalist.user.avatar?datalist.user.avatar:'/imgs/icon_59.png'}}"></image> 6 <image src="{{datalist.user.avatar?datalist.user.avatar:'/imgs/icon_59.png'}}"></image>
7 </view> 7 </view>
8 <view class="my_headitemname"> 8 <view class="my_headitemname">
@@ -268,6 +268,20 @@ @@ -268,6 +268,20 @@
268 "id": -1, 268 "id": -1,
269 "name": "工时兑换", 269 "name": "工时兑换",
270 "pathName": "pages/myfeedback/myfeedback_list/myfeedback_list", 270 "pathName": "pages/myfeedback/myfeedback_list/myfeedback_list",
  271 + "query": "",
  272 + "scene": null
  273 + },
  274 + {
  275 + "id": -1,
  276 + "name": "我的资料",
  277 + "pathName": "pages/mydetail/mydetail",
  278 + "query": "",
  279 + "scene": null
  280 + },
  281 + {
  282 + "id": -1,
  283 + "name": "更多志愿者",
  284 + "pathName": "pages/more/more",
271 "scene": null 285 "scene": null
272 } 286 }
273 ] 287 ]
@@ -9,11 +9,25 @@ const formatTime = date => { @@ -9,11 +9,25 @@ const formatTime = date => {
9 return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':') 9 return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':')
10 } 10 }
11 11
  12 +const formathour = date => {
  13 +
  14 + const hour = date.getHours()
  15 + const minute = date.getMinutes()
  16 +
  17 + return [hour, minute].map(formatNumber).join(':')
  18 +}
  19 +
  20 +
  21 +
  22 +
  23 +
  24 +
12 const formatNumber = n => { 25 const formatNumber = n => {
13 n = n.toString() 26 n = n.toString()
14 return n[1] ? n : '0' + n 27 return n[1] ? n : '0' + n
15 } 28 }
16 29
17 module.exports = { 30 module.exports = {
18 - formatTime: formatTime 31 + formatTime: formatTime,
  32 + formathour: formathour
19 } 33 }