sgj

@@ -12,7 +12,27 @@
     "pages/my/my_active/my_active",
     "pages/my/my_active/my_active",
     "pages/index/active/active",
     "pages/index/active/active",
     "pages/word_report/word_report",
     "pages/word_report/word_report",
-    "pages/enroll/enroll"
+    "pages/enroll/enroll",
+
+
+    "pages/Volunteer_dynamic/Volunteer_dynamic",
+    "pages/Volunteer_group/Volunteer_group",
+    "pages/Volunteer_detail/Volunteer_detail",
+    "pages/Online_regulations/Online_regulations",
+    "pages/getStudycontent/getStudycontent",
+    "pages/guanlitiaoli/guanlitiaoli",
+    "pages/guangrongpaihang/guangrongpaihang",
+
+
+    "pages/myactivity/myactivity",
+    "pages/myteam/myteam",
+    "pages/mytrain/mytrain",
+    "pages/myfeedback/myfeedback",
+    "pages/mycertificate/mycertificate",
+    "pages/myaddress/myaddress",
+    "pages/myaddcompile/myaddcompile"
+
+
   ],
   ],
   "window": {
   "window": {
     "backgroundTextStyle": "light",
     "backgroundTextStyle": "light",
@@ -21,17 +41,16 @@
     "navigationBarTextStyle": "white"
     "navigationBarTextStyle": "white"
   },
   },
   "tabBar": {
   "tabBar": {
-    "color": "#fff",
-    "selectedColor": "#fff",
-    "backgroundColor": "#EBEBEB",
-    "list": [
-      {
+    "color":"#999999",
+    "list": [{
         "pagePath": "pages/index/index",
         "pagePath": "pages/index/index",
+        "text": "首页",
         "iconPath": "imgs/shouye_02@2x.png",
         "iconPath": "imgs/shouye_02@2x.png",
         "selectedIconPath": "imgs/shouye_01@2x.png"
         "selectedIconPath": "imgs/shouye_01@2x.png"
       },
       },
       {
       {
         "pagePath": "pages/my/my",
         "pagePath": "pages/my/my",
+        "text": "个人中心",
         "iconPath": "imgs/wode_01@2x.png",
         "iconPath": "imgs/wode_01@2x.png",
         "selectedIconPath": "imgs/wode_02@2x.png"
         "selectedIconPath": "imgs/wode_02@2x.png"
       }
       }

@@ -89,3 +89,34 @@
 .icon-chakanshenqing:before {
 .icon-chakanshenqing:before {
   content: "\e6a6";
   content: "\e6a6";
 }
 }
+.display {
+  display: flex;
+}
+.display1 {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+
+}
+.display2 {
+  display: flex;
+  align-items: center;
+}
+
+.display3 {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.displayB {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.displayA {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}

+// pages/Online_regulations/Online_regulations.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+
+    getStudycontent() {
+
+        wx.navigateTo({
+            url: '/pages/getStudycontent/getStudycontent',
+        })
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "在线培训"
+
+}

+<!--在线培训-->
+<view class="myanswer" bindtap="getStudycontent">
+
+    <image src="/imgs/active1.png"></image>
+    <view class="myanswer_right" >
+        <view class="myanswer_name" >
+            如何做一个志愿者,如何做一个负责人心的志愿者
+        </view>
+
+        <view class="myanswer_num">
+            <view>
+                10道题
+            </view>
+            <view class="myanswer_end">
+                前往答题
+                <image src="/imgs/more_gray1.png"></image>
+            </view>
+        </view>
+
+    </view>
+
+</view>

+page{
+
+    background-color:rgb(240, 240, 240);
+}
+.myanswer {
+    margin: 24rpx 32rpx;
+    padding: 24rpx 24rpx;
+    border-radius: 7px;
+    background-color: #ffffff;
+    display: flex;
+    font-size: 28rpx;
+  
+  }
+  
+  .myanswer image {
+    width: 182rpx;
+    height: 138rpx;
+    margin-right: 24rpx;
+    border-radius: 7px;
+  }
+  
+  .myanswer_right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+  
+  
+  .myanswer_num {
+    display: flex;
+    justify-content: space-between;
+    font-size: 28rpx;
+    color: #7D7E80;
+  
+  }
+  
+  .myanswer_num image {
+    width: 22rpx;
+    height: 22rpx;
+  }
+  
+  .myanswer_end {
+  
+    color: #54A7FB;
+  
+  }
+  .myanswer_end image{
+
+    margin-left: 5rpx;
+  }

+// pages/Volunteer_detail/Volunteer_detail.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+    
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+        
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {}
+}

+<!--pages/Volunteer_detail/Volunteer_detail.wxml-->
+<view class="goods_title">
+	<view>北京第三小队</view>
+	<view class="goods_list">
+		<view>
+			<image src="/imgs/vg_1.png"></image>270小时
+		</view>
+		<view>
+			<image src="/imgs/vg_2.png"></image>北京
+		</view>
+		<view>
+			<image src="/imgs/vg_3.png"></image>50人
+		</view>
+	</view>
+</view>
+<view class="goods_introduce">
+	<view class="goods_line"></view>
+	<view bindtap="getadd">详情介绍</view>
+	<view class="goods_line"></view>
+</view>
+

+page {
+    background-color: rgb(240, 240, 240);
+}
+
+.goods_title {
+    padding: 0 32rpx;
+    padding-top: 32rpx;
+    height: 164rpx;
+    background-color: #ffffff;
+}
+
+.goods_list {
+    display: flex;
+    align-items: center;
+    font-size: 28rpx;
+    color: #FF976A;
+    margin-top: 16rpx;
+}
+
+.goods_list image {
+    width: 44rpx;
+    height: 44rpx;
+}
+
+.goods_list>view {
+    display: flex;
+    align-items: center;
+    margin-right: 42rpx;
+}
+
+.goods_introduce {
+    height: 88rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 28rpx;
+    color: #969799;
+}
+
+.goods_introduce :nth-child(2) {
+    margin: 0 32rpx;
+}
+
+.goods_line {
+    width: 200rpx;
+    height: 2rpx;
+    background-color: #d2d2d2;
+}

+//index.js
+const app = getApp();
+Page({
+  data: {
+    navbar: ['活动资讯', '媒体报道','通知公告','志愿随笔'],
+    currentTab: 0,
+    list: [],
+    
+  },
+  //切换bar
+  navbarTap: function (e) {
+    this.setData({
+      currentTab: e.currentTarget.dataset.idx
+    })
+
+    //全局变量
+    app.globalData.currentTab = e.currentTarget.dataset.idx;
+
+  },
+  onShow() {
+    this.setData({
+      currentTab: app.globalData.currentTab
+    })
+
+  },
+
+  onLoad: function () {
+    
+  },
+
+  
+
+  
+  
+
+
+
+})

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "志愿动态"
+}

+<!--  -->
+<view class="goods_index">
+	<!-- 导航条开始 -->
+	<view class="navbar">
+		<view wx:for="{{navbar}}" data-idx="{{index}}" class="item {{currentTab==index ? 'active' : ''}}"
+			wx:key="unique" bindtap="navbarTap">
+			{{item}}
+		</view>
+	</view>
+	<!-- 导航条结束 -->
+	<!-- 内容 -->
+	<!-- 活动资讯开始 -->
+	<view class="display1" wx:if="{{currentTab==0}}">
+		<view class="goods_wrap">
+			<image src="/imgs/active.png"></image>
+			<view class="goods_name">如何才能加入天津市白求恩志愿团队</view>
+			<view class="goods_time">2020-06-08</view>
+		</view>
+
+	</view>
+	<!--媒体报道  -->
+	<view class="display1" wx:elif="{{currentTab==1}}">
+		ss2
+	</view>
+	<!--通知公告  -->
+	<view class="display1" wx:elif="{{currentTab==2}}">
+	
+		ss3
+
+	</view>
+	<!--志愿随笔  -->
+	<view class="display1" wx:elif="{{currentTab==3}}">
+		ss4
+	</view>
+</view>

+
+page{
+
+    background-color: rgb(240, 240, 240);
+}
+.goods_index {
+    padding: 20rpx 32rpx;
+}
+
+/* 导航条开始 */
+.navbar {
+    /* padding        : 10rpx 0; */
+    display: flex;
+    justify-content: space-around;
+    /* background  : linear-gradient(136deg,#4e8fff 2%, #55c2fa); */
+    font-size: 30rpx;
+    color: #969799;
+    border-radius: 2px 0px 0px 2px;
+
+}
+
+.navbar .item {
+    width: 346rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size: 24rpx;
+    position: relative;
+    text-align: center;
+    /* background-color: #FFC909; */
+    /* border-radius   : 19px; */
+
+}
+
+.navbar .item.active {
+    color: black;
+    /* background: linear-gradient(136deg, #4e8fff 2%, #55c2fa); */
+
+}
+
+.navbar .item.active:after {
+    content: "";
+    display: block;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    width: 80rpx;
+    height: 6rpx;
+    background: #21AE58;
+    margin: 0 auto;
+}
+
+/* 导航条结束 */
+
+/* 活动开始 */
+.goods_wrap {
+    width: 334rpx;
+    margin-top: 24rpx;
+    padding-bottom:24rpx ;
+    border-radius: 7px;
+    background-color: #ffffff;
+    overflow: hidden;
+
+}
+
+.goods_wrap image {
+    width: 334rpx;
+    height: 200rpx;
+}
+
+.goods_name {
+    padding: 0 16rpx;
+    margin-top: 16rpx;
+    font-size: 26rpx;
+    color: #3E3E3F;
+}
+
+.goods_time {
+    padding: 0 16rpx;
+    margin-top: 16rpx;
+    font-size: 24rpx;
+    color: #7D7E80;
+
+}

+// pages/Volunteer_group/Volunteer_group.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+    getDetail() {
+        wx.navigateTo({
+            url: '/pages/Volunteer_detail/Volunteer_detail',
+        })
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "志愿团队"
+}

+<!-- 志愿团队 -->
+<view class="group_name">
+	<image src="/imgs/didian-14.png"></image>
+	<view>北京</view>
+</view>
+
+<view class='new_box'>
+	<!-- <navigator wx:for='{{activity}}' wx:key="id" url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none"> -->
+	<view  class='new_cell' bindtap="getDetail">
+		<view class='new_cellmain'>
+			<view class='new_img'>
+				<image src='/imgs/active.png' mode="aspectFill" />
+			</view>
+			<view class='new_title'>[福建省]白求恩志愿招募-志愿者</view>
+			<view class='title_box'>
+				<view class='wz_box'>
+					<text>2020-06-08</text>
+				</view>
+				<view class='word'>北京</view>
+			</view>
+		</view>
+	</view>
+	<!-- </navigator> -->
+</view>

+/* pages/Volunteer_group/Volunteer_group.wxss */
+page{
+    background-color: rgb(240, 240, 240);
+}
+
+.group_name {
+padding: 0 32rpx;
+    height: 88rpx;
+    line-height: 88rpx;
+    font-size: 34rpx;
+    color: #7D7E80;
+    background-color: #ffffff;
+    display: flex;
+    align-items: center;
+}
+
+.group_name image {
+    width: 36rpx;
+    height: 36rpx;
+    margin-right: 16rpx;
+}
+
+/*  */
+.new_box {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    color: #999;
+    margin-top: 24rpx;
+    padding: 0 32rpx;
+    font-size: 24rpx;
+    flex-wrap: wrap;
+    /* border-bottom: 2rpx solid #e6e6e6; */
+  
+  }
+  
+  .new_cell {
+    width: 48%;
+    /* padding: 29rpx 0rpx; */
+    background-color: #ffffff;
+    border-radius: 7px;
+    overflow: hidden;
+  
+  }
+  
+  .new_cell:nth-child(2n) {
+    margin: 0 0 0 10rpx;
+  }
+  
+  .new_cellmain {
+    overflow: hidden;
+    width: 336rpx;
+    background-color: #ffffff;
+    border-radius: 7px;
+  }
+  
+  .new_img {
+    width: 336rpx;
+    height: 220rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+  }
+  
+  .new_img image {
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
+  
+  .new_title {
+    padding: 0 16rpx;
+    height: 76rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    word-break: break-all;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    margin: 18rpx 0 13rpx 0;
+    color: #292929;
+    font-size: 28rpx;
+  }
+  
+  .activity_title {
+    margin: 0 32rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  
+  .title_box {
+    padding: 0 16rpx;
+    margin: 18rpx 0 13rpx 0;
+    font-size: 24rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: rgba(153, 153, 153, 1);
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  
+  .wz_box {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  
+  .title_box .word {
+    max-width: 200rpx;
+    color: #FF976A;
+    font-size: 24rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }

@@ -76,66 +76,139 @@ Page({
     reverse_card: '', //身份证反面照
     reverse_card: '', //身份证反面照
     id: '', //用户id,
     id: '', //用户id,
   },
   },
+
+  onShow: function () {
+
+    var that = this;
+    // 登记表缓存
+    that.setData({
+      name: wx.getStorageSync('name'),
+      sex: wx.getStorageSync('sex'),
+      photo: wx.getStorageSync('photo'),
+      front_card: wx.getStorageSync('front_card'),
+      reverse_card: wx.getStorageSync('reverse_card'),
+      birthday: wx.getStorageSync('birthday'),
+      nation: wx.getStorageSync('nation'),
+      education: wx.getStorageSync('education'),
+      politics: wx.getStorageSync('politics'),
+      unit: wx.getStorageSync('unit'),
+      duty: wx.getStorageSync('duty'),
+      addr: wx.getStorageSync('addr'),
+      postcode: wx.getStorageSync('postcode'),
+      school: wx.getStorageSync('school'),
+      card_number: wx.getStorageSync('card_number'),
+      fixed_phone: wx.getStorageSync('fixed_phone'),
+      move_phone: wx.getStorageSync('move_phone'),
+      email: wx.getStorageSync('email'),
+      urgency_phone: wx.getStorageSync('urgency_phone'),
+      qq: wx.getStorageSync('qq'),
+      address: wx.getStorageSync('address'),
+
+    })
+  },
+
+
   setname(e) {
   setname(e) {
     this.setData({
     this.setData({
       name: e.detail.value
       name: e.detail.value
     })
     })
+    wx.setStorageSync('name', e.detail.value)
   },
   },
-  setunit(e) {
+  // 性别
+  bindsex(e) {
     this.setData({
     this.setData({
-      unit: e.detail.value
+      sex: parseInt(e.detail.value) + 1
     })
     })
+    wx.setStorageSync('sex', parseInt(e.detail.value) + 1)
   },
   },
-  setduty(e) {
+  // 出生日期
+  bindbirthdayChange(e) {
     this.setData({
     this.setData({
-      duty: e.detail.value
+      birthday: e.detail.value
     })
     })
+    wx.setStorageSync('birthday', e.detail.value)
   },
   },
-  setaddr(e) {
+  // 民族
+  bindnationChange(e) {
+    let nationarr = this.data.nationarr;
     this.setData({
     this.setData({
-      addr: e.detail.value
+      nation: nationarr[e.detail.value]
     })
     })
+
+    wx.setStorageSync('nation', nationarr[e.detail.value])
+
   },
   },
-  setpostcode(e) {
+  // 学历
+  bindeducationChange(e) {
+    let educationarr = this.data.educationarr;
     this.setData({
     this.setData({
-      postcode: e.detail.value
+      education: educationarr[e.detail.value]
     })
     })
+    wx.setStorageSync('education', educationarr[e.detail.value])
   },
   },
-  setschool(e) {
+  // 政治面貌
+
+  bindpoliticsChange(e) {
+    let politicsarr = this.data.politicsarr;
     this.setData({
     this.setData({
-      school: e.detail.value
+      politics: politicsarr[e.detail.value]
     })
     })
+
+    wx.setStorageSync('politics', politicsarr[e.detail.value])
+
   },
   },
-  setcard_number(e) {
+  // 工作单位
+  setunit(e) {
     this.setData({
     this.setData({
-      card_number: e.detail.value
+      unit: e.detail.value
     })
     })
+    wx.setStorageSync('unit', e.detail.value)
   },
   },
-  setemail(e) {
+  // 职务
+  setduty(e) {
     this.setData({
     this.setData({
-      email: e.detail.value
+      duty: e.detail.value
     })
     })
+    wx.setStorageSync('duty', e.detail.value)
+
+
   },
   },
-  seturgency_phone(e) {
+  // 通讯地址
+  setaddr(e) {
     this.setData({
     this.setData({
-      urgency_phone: e.detail.value
+      addr: e.detail.value
     })
     })
+    wx.setStorageSync('addr', e.detail.value)
   },
   },
-  setqq(e) {
+  //邮编
+  setpostcode(e) {
     this.setData({
     this.setData({
-      qq: e.detail.value
+      postcode: e.detail.value
     })
     })
+    wx.setStorageSync('postcode', e.detail.value)
   },
   },
-  bindsex(e) {
+  // 就读学校
+  setschool(e) {
     this.setData({
     this.setData({
-      sex: parseInt(e.detail.value) + 1
+      school: e.detail.value
     })
     })
+    wx.setStorageSync('school', e.detail.value)
+
+  },
+  // 身份证号
+  setcard_number(e) {
+    this.setData({
+      card_number: e.detail.value
+    })
+    wx.setStorageSync('card_number', e.detail.value)
+
   },
   },
   //固定电话
   //固定电话
   setfixed_phone(e) {
   setfixed_phone(e) {
     this.setData({
     this.setData({
       fixed_phone: e.detail.value
       fixed_phone: e.detail.value
     })
     })
+    wx.setStorageSync('fixed_phone', e.detail.value)
   },
   },
 
 
   //移动电话
   //移动电话
@@ -143,34 +216,32 @@ Page({
     this.setData({
     this.setData({
       move_phone: e.detail.value
       move_phone: e.detail.value
     })
     })
+    wx.setStorageSync('move_phone', e.detail.value)
   },
   },
-
-  bindbirthdayChange(e) {
-    this.setData({
-      birthday: e.detail.value
-    })
-  },
-  bindnationChange(e) {
-    let nationarr = this.data.nationarr;
+  // 电子邮箱
+  setemail(e) {
     this.setData({
     this.setData({
-      nation: nationarr[e.detail.value]
+      email: e.detail.value
     })
     })
+    wx.setStorageSync('email', e.detail.value)
+
   },
   },
-  bindeducationChange(e) {
-    let educationarr = this.data.educationarr;
+  // 紧急联系人
+  seturgency_phone(e) {
     this.setData({
     this.setData({
-      education: educationarr[e.detail.value]
+      urgency_phone: e.detail.value
     })
     })
-  },
+    wx.setStorageSync('urgency_phone', e.detail.value)
 
 
-  bindpoliticsChange(e) {
-    let politicsarr = this.data.politicsarr;
+  },
+  // QQ号码
+  setqq(e) {
     this.setData({
     this.setData({
-      politics: politicsarr[e.detail.value]
+      qq: e.detail.value
     })
     })
+    wx.setStorageSync('qq', e.detail.value)
   },
   },
 
 
- 
   //选择省市区
   //选择省市区
   getarea() {
   getarea() {
     let that = this;
     let that = this;
@@ -256,7 +327,7 @@ Page({
 
 
     })
     })
   },
   },
-  bindChange: function(e) {
+  bindChange: function (e) {
     let that = this;
     let that = this;
     let valarr = that.data.valarr;
     let valarr = that.data.valarr;
     let provincearr = that.data.provincearr;
     let provincearr = that.data.provincearr;
@@ -312,6 +383,8 @@ Page({
       address: provincearr[i].province_name + cityarr[j].city_name + countryarr[k].country_name,
       address: provincearr[i].province_name + cityarr[j].city_name + countryarr[k].country_name,
       showapply: false
       showapply: false
     })
     })
+
+    wx.setStorageSync('address', this.data.address)
   },
   },
 
 
   setshowapply() {
   setshowapply() {
@@ -396,6 +469,8 @@ Page({
     let tem = e.currentTarget.dataset.tem;
     let tem = e.currentTarget.dataset.tem;
     that.uploadImage(tem);
     that.uploadImage(tem);
 
 
+
+
   },
   },
   //上传头像1为头像，2为省份证正面，3为省份证反面
   //上传头像1为头像，2为省份证正面，3为省份证反面
   uploadImage(tem) {
   uploadImage(tem) {
@@ -403,7 +478,7 @@ Page({
     wx.chooseImage({
     wx.chooseImage({
       count: 1,
       count: 1,
       sizeType: ['original', 'compressed'],
       sizeType: ['original', 'compressed'],
-      success: function(res) {
+      success: function (res) {
         let tempFilePaths = res.tempFilePaths //总文件
         let tempFilePaths = res.tempFilePaths //总文件
         let head = {
         let head = {
           'XX-Token': wx.getStorageSync('token'),
           'XX-Token': wx.getStorageSync('token'),
@@ -416,29 +491,32 @@ Page({
           name: 'file',
           name: 'file',
           header: head,
           header: head,
           formData: {},
           formData: {},
-          success: function(res) {
+          success: function (res) {
             let temdata = JSON.parse(res.data);
             let temdata = JSON.parse(res.data);
             if (temdata.code == 20000) {
             if (temdata.code == 20000) {
               if (tem == '1') {
               if (tem == '1') {
                 that.setData({
                 that.setData({
                   photo: temdata.data.url
                   photo: temdata.data.url
                 })
                 })
+                wx.setStorageSync('photo', temdata.data.url)
               } else if (tem == '2') {
               } else if (tem == '2') {
                 that.setData({
                 that.setData({
                   front_card: temdata.data.url
                   front_card: temdata.data.url
                 })
                 })
+                wx.setStorageSync('front_card', temdata.data.url)
               } else if (tem == '3') {
               } else if (tem == '3') {
                 that.setData({
                 that.setData({
                   reverse_card: temdata.data.url
                   reverse_card: temdata.data.url
                 })
                 })
+                wx.setStorageSync('reverse_card', temdata.data.url)
               }
               }
             }
             }
           },
           },
-          fail: function(res) {},
+          fail: function (res) {},
           complete: () => {}
           complete: () => {}
         })
         })
       },
       },
-      fail: function(res) {}
+      fail: function (res) {}
     })
     })
   },
   },
   setapply_nav(e) {
   setapply_nav(e) {
@@ -490,8 +568,6 @@ Page({
       err = '请输入您的身份证号!';
       err = '请输入您的身份证号!';
     } else if (!AuglyTest_ID.test(that.data.card_number)) {
     } else if (!AuglyTest_ID.test(that.data.card_number)) {
       err = '请输入正确的身份证号!';
       err = '请输入正确的身份证号!';
-    } else if (that.data.fixed_phone == '' || !that.data.fixed_phone) {
-      err = '请输入您的固定电话!';
     } else if (that.data.move_phone == '') {
     } else if (that.data.move_phone == '') {
       err = '请输入您的移动电话!';
       err = '请输入您的移动电话!';
     } else if (!AuglyTest_phone.test(that.data.move_phone)) {
     } else if (!AuglyTest_phone.test(that.data.move_phone)) {
@@ -514,6 +590,7 @@ Page({
       err = '请上传身份证反面！';
       err = '请上传身份证反面！';
     }
     }
     if (err == '') {
     if (err == '') {
+
       let record = that.data.record;
       let record = that.data.record;
       let record_start_time = [];
       let record_start_time = [];
       let record_end_time = [];
       let record_end_time = [];
@@ -567,18 +644,35 @@ Page({
         photo: that.data.photo
         photo: that.data.photo
       }
       }
       app.post(url, params, head).then((res) => {
       app.post(url, params, head).then((res) => {
+
+        wx.showModal({
+          title: '请仔细核对信息，确认无误！',
+          content: '如需修改个人信息，请在微信公众号申请：关注微信公众号“白求恩志愿者中心”，点击菜单按钮“修改个人信息”，申请提交。',
+          confirmText:'确认提交',
+          cancelText:'我再想想',
+          success(res) {
+            if (res.confirm) {
+
               wx.showToast({
               wx.showToast({
                 title: '提交成功,等待审核',
                 title: '提交成功,等待审核',
                 mask: true,
                 mask: true,
                 icon: 'none',
                 icon: 'none',
                 duration: 2000
                 duration: 2000
               })
               })
-
-        setTimeout(function() {
+              setTimeout(function () {
                 wx.switchTab({
                 wx.switchTab({
                   url: '/pages/my/my'
                   url: '/pages/my/my'
                 })
                 })
               }, 1000)
               }, 1000)
+              console.log('用户点击确定')
+            } else if (res.cancel) {
+
+              console.log('用户点击取消')
+            }
+          }
+        })
+
+
       }).catch((err) => {})
       }).catch((err) => {})
     } else {
     } else {
       wx.showToast({
       wx.showToast({
@@ -655,10 +749,11 @@ Page({
   /**
   /**
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
-  onLoad: function(options) {
+  onLoad: function (options) {
+    console.log(options)
     let that = this;
     let that = this;
     that.setData({
     that.setData({
-      is_submit: options.is_submit ? options.is_submit:null,
+      is_submit: options.is_submit ? options.is_submit : null,
       id: options.id,
       id: options.id,
       page_type: options.type ? options.type : null
       page_type: options.type ? options.type : null
     })
     })
@@ -673,22 +768,19 @@ Page({
   /**
   /**
    * 生命周期函数--监听页面初次渲染完成
    * 生命周期函数--监听页面初次渲染完成
    */
    */
-  onReady: function() {
+  onReady: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 生命周期函数--监听页面显示
    * 生命周期函数--监听页面显示
    */
    */
-  onShow: function() {
-
 
 
-  },
 
 
   /**
   /**
    * 生命周期函数--监听页面隐藏
    * 生命周期函数--监听页面隐藏
    */
    */
-  onHide: function() {
+  onHide: function () {
 
 
 
 
 
 
@@ -697,28 +789,28 @@ Page({
   /**
   /**
    * 生命周期函数--监听页面卸载
    * 生命周期函数--监听页面卸载
    */
    */
-  onUnload: function() {
+  onUnload: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    * 页面相关事件处理函数--监听用户下拉动作
    */
    */
-  onPullDownRefresh: function() {
+  onPullDownRefresh: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 页面上拉触底事件的处理函数
    * 页面上拉触底事件的处理函数
    */
    */
-  onReachBottom: function() {
+  onReachBottom: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 用户点击右上角分享
    * 用户点击右上角分享
    */
    */
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
 
 
   }
   }
 })
 })

@@ -3,7 +3,7 @@
     <image src='{{photo}}' wx:if='{{photo}}' mode="aspectFill"></image>
     <image src='{{photo}}' wx:if='{{photo}}' mode="aspectFill"></image>
     <view class='iconfont icon-xiangji' wx:if='{{!photo}}'></view>
     <view class='iconfont icon-xiangji' wx:if='{{!photo}}'></view>
   </view>
   </view>
-  <view class='tips_word'>请选择1:1的图像</view>
+  <view class='tips_word'>请选择1寸免冠照片</view>
 </view>
 </view>
 
 
 
 
@@ -96,7 +96,7 @@
   </view>
   </view>
 </view>
 </view>
 <view class='apply_item'>
 <view class='apply_item'>
-  <view>固定电话</view>
+  <view>固定电话(选填)</view>
   <view class='apply_item_input'>
   <view class='apply_item_input'>
     <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setfixed_phone' value='{{fixed_phone}}'></input>
     <input placeholder='未填写' type='number' placeholder-class='input_p' bindinput='setfixed_phone' value='{{fixed_phone}}'></input>
   </view>
   </view>
@@ -138,7 +138,7 @@
 
 
 
 
 
 
-
+<!-- 个人履历 -->
 <view class='apply_nav'>
 <view class='apply_nav'>
   <view class='apply_cell {{apply_nav==0?"apply_active":""}}' data-apply_nav='0' bindtap='setapply_nav'>个人履历1</view>
   <view class='apply_cell {{apply_nav==0?"apply_active":""}}' data-apply_nav='0' bindtap='setapply_nav'>个人履历1</view>
   <view class='apply_cell {{apply_nav==1?"apply_active":""}}' data-apply_nav='1' bindtap='setapply_nav'>个人履历2</view>
   <view class='apply_cell {{apply_nav==1?"apply_active":""}}' data-apply_nav='1' bindtap='setapply_nav'>个人履历2</view>
@@ -212,7 +212,7 @@
 <view class='apply_bottomtitle' wx:if="{{!page_type}}">志愿者申请书
 <view class='apply_bottomtitle' wx:if="{{!page_type}}">志愿者申请书
 </view>
 </view>
 <view class='apply_bottom' wx:if="{{!page_type}}">
 <view class='apply_bottom' wx:if="{{!page_type}}">
-  为继承和弘扬国际主义战士白求恩的伟大风范和高尚情操，传承和弘扬白求恩的伟大精神，本人自愿申请加入白求恩志愿者队伍。 本人愿尽己所能，以“志愿服务”为宗旨，不计报酬、帮助他人、服务社会，恪守国家法律、法规，遵守白求恩志愿者各项规章制度，努力工作，尽职尽责，力争为公益事业做出贡献。
+  为继承和弘扬国际主义战士白求恩的伟大风范和高尚情操，传承和弘扬白求恩的伟大精神，本人自愿申请加入白求恩志愿者队伍。本人愿尽己所能，以“志愿服务”为宗旨，不计报酬、帮助他人、服务社会，恪守国家法律、法规，遵守白求恩志愿者各项规章制度，努力工作，尽职尽责，力争为公益事业做出贡献。
 </view>
 </view>
 
 
 
 

+// pages/getStudycontent/getStudycontent.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "学习内容"
+}

+<!--pages/getStudycontent/getStudycontent.wxml-->
+
+<view class="answer_text">
+
+    <text-rich>
+        很快适应了当地生活，但对于一个国际中文教学的“新手”来说，走上真正的讲台才是我接下来面临的挑战，不过惊喜也在悄然发生。 造访的第一个学校是Maštolend儿园，第一眼就爱上了这群可爱的孩子们。大班的孩子集体唱《你好歌》
+
+    </text-rich>
+
+
+</view>
+
+
+<view class="answer">
+    <button hover-class="none">去答题</button>
+</view>

+.answer_text {
+    padding: 24rpx 32rpx;
+    font-size: 28rpx;
+    color: #5D5D5D;
+}
+
+
+.answer {
+    width: 100%;
+    height: 122rpx;
+    position: fixed;
+    bottom: 0;
+    box-shadow: 0px -6px 15px 0px rgba(0, 67, 26, 0.06);
+    display: flex;
+    align-items: center;
+
+}
+
+button {
+    width: 622rpx;
+    height: 88rpx;
+    color: #ffffff;
+    font-size: 32rpx;
+    background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
+    border-radius: 22px;
+    box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42);
+}

+//index.js
+const app = getApp();
+Page({
+  data: {
+    navbar: ['志愿者', '志愿团队'],
+    currentTab: 0,
+    list: [],
+    
+  },
+  //切换bar
+  navbarTap: function (e) {
+    this.setData({
+      currentTab: e.currentTarget.dataset.idx
+    })
+
+    //全局变量
+    app.globalData.currentTab = e.currentTarget.dataset.idx;
+
+  },
+  onShow() {
+    this.setData({
+      currentTab: app.globalData.currentTab
+    })
+
+  },
+
+  onLoad: function () {
+    
+  },
+
+  
+
+  
+  
+
+
+
+})

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "光荣排行"
+}

+<!--  -->
+<view class="goods_index">
+	<!-- 导航条开始 -->
+	<view class="navbar">
+		<view wx:for="{{navbar}}" data-idx="{{index}}" class="item {{currentTab==index ? 'active' : ''}}" wx:key="unique" bindtap="navbarTap">
+			{{item}}
+		</view>
+	</view>
+	<!-- 导航条结束 -->
+	<!-- 内容 -->
+	<view wx:if="{{currentTab==0}}">
+    
+		ss2
+	</view>
+	<view wx:elif="{{currentTab==1}}">
+		<view class="goods_groups">
+			<view>1</view>
+			<view>天津市志愿者之家</view>
+			<view>3000小时</view>
+
+		</view>
+	</view>
+
+
+</view>

+
+page{
+
+    background-color: rgb(240, 240, 240);
+}
+.goods_index {
+    padding: 20rpx 32rpx;
+}
+
+/* 导航条开始 */
+.navbar {
+    /* padding        : 10rpx 0; */
+    display: flex;
+    justify-content: space-around;
+    /* background  : linear-gradient(136deg,#4e8fff 2%, #55c2fa); */
+    font-size: 30rpx;
+    color: #969799;
+    border-radius: 2px 0px 0px 2px;
+
+}
+
+.navbar .item {
+    width: 346rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    font-size: 24rpx;
+    position: relative;
+    text-align: center;
+    /* background-color: #FFC909; */
+    /* border-radius   : 19px; */
+
+}
+
+.navbar .item.active {
+    color: black;
+    /* background: linear-gradient(136deg, #4e8fff 2%, #55c2fa); */
+
+}
+
+.navbar .item.active:after {
+    content: "";
+    display: block;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    width: 80rpx;
+    height: 6rpx;
+    background: #21AE58;
+    margin: 0 auto;
+}
+
+/* 导航条结束 */
+.goods_groups{
+height: 88rpx;
+line-height: 88rpx;
+display:flex;
+justify-content: space-between;
+color: #323233;
+font-size: 28rpx;
+}

+// pages/guanlitiaoli/guanlitiaoli.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+    },
+
+    
+
+
+   
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "管理条例"
+}

+<view class="guanlitiaoli">
+	<rich-text >
+		很快适应了当地生活，但对于一个国际中文教学的“新手”来说，
+		走上真正的讲台才是我接下来面临的挑战，不过惊喜也在悄然发生。
+	</rich-text>
+</view>
+
+

+/* pages/guanlitiaoli/guanlitiaoli.wxss */
+page {
+    font-size: 28rpx;
+    color: #5D5D5D;
+}
+
+.guanlitiaoli {
+    padding: 32rpx;
+
+}
+

 {
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "活动招募"
 }
 }

@@ -5,6 +5,7 @@
       <picker range='{{city_arr}}' bindchange='selecteCtiy'>
       <picker range='{{city_arr}}' bindchange='selecteCtiy'>
         <view class="title {{clickIndex?'titleActive':''}}">
         <view class="title {{clickIndex?'titleActive':''}}">
           {{city}}
           {{city}}
+
         </view>
         </view>
       </picker>
       </picker>
     </view>
     </view>
@@ -18,7 +19,8 @@
   </view>
   </view>
   <view>
   <view>
     <view class='new_box'>
     <view class='new_box'>
-      <navigator class='new_cell' wx:for='{{activity}}' wx:key url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none">
+      <navigator class='new_cell' wx:for='{{activity}}' wx:key="id" url='/pages/img_txt/img_txt?id={{item.id}}&status=1'
+        hover-class="none">
         <view class='new_cellmain'>
         <view class='new_cellmain'>
           <view class='new_img'>
           <view class='new_img'>
             <image src='{{item.thumbnail}}' mode="aspectFill"> </image>
             <image src='{{item.thumbnail}}' mode="aspectFill"> </image>
@@ -26,12 +28,12 @@
           <view class='new_title'>{{item.activity_name}}</view>
           <view class='new_title'>{{item.activity_name}}</view>
           <view class='title_box'>
           <view class='title_box'>
             <view class='wz_box'>
             <view class='wz_box'>
-              <image src='/imgs/dizhi@2x.png' />
-              <text>{{item.province_name}}</text>
+              <!-- <image src='/imgs/dizhi@2x.png' /> -->
+              <view>{{item.time}}</view>
             </view>
             </view>
-            <view class='word'>{{item.type_name}}</view>
+            <text>{{item.province_name}}</text>
+            <!-- <view class='word'>{{item.type_name}}</view> -->
           </view>
           </view>
-          <view>{{item.time}}</view>
         </view>
         </view>
       </navigator>
       </navigator>
       <view class='empty' wx:if='{{activity.length == 0}}'>暂无数据,请去添加</view>
       <view class='empty' wx:if='{{activity.length == 0}}'>暂无数据,请去添加</view>

-.index_newbox {
-}
 
 
+page{
+  background-color: rgb(240, 240, 240);
+}
 .new_box {
 .new_box {
   display: flex;
   display: flex;
   justify-content: space-between;
   justify-content: space-between;
@@ -23,6 +24,8 @@
 
 
 .new_cellmain {
 .new_cellmain {
   overflow: hidden;
   overflow: hidden;
+  border-radius: 7px;
+  background-color: #ffffff;
 }
 }
 
 
 .new_img {
 .new_img {
@@ -44,9 +47,10 @@
   white-space: nowrap;
   white-space: nowrap;
   text-overflow: ellipsis;
   text-overflow: ellipsis;
   overflow: hidden;
   overflow: hidden;
+  padding: 0 16rpx;
   margin: 18rpx 0 13rpx 0;
   margin: 18rpx 0 13rpx 0;
   color: #292929;
   color: #292929;
-  font-size: 28rpx;
+  font-size: 26rpx;
 }
 }
 
 
 .wz_box {
 .wz_box {
@@ -56,9 +60,10 @@
 }
 }
 
 
 .title_box {
 .title_box {
+  padding: 0 16rpx;
   margin: 18rpx 0 13rpx 0;
   margin: 18rpx 0 13rpx 0;
   color: #292929;
   color: #292929;
-  font-size: 28rpx;
+  font-size: 24rpx;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: space-between;
   justify-content: space-between;
@@ -78,7 +83,10 @@
   text-overflow: ellipsis;
   text-overflow: ellipsis;
   white-space: nowrap;
   white-space: nowrap;
 }
 }
+text{
 
 
+  color: #FF976A;
+}
 .tabbar {
 .tabbar {
   width: 100%;
   width: 100%;
   height: 100rpx;
   height: 100rpx;

@@ -7,10 +7,62 @@ Page({
   data: {
   data: {
     star_num: 3,
     star_num: 3,
     datalist: [],
     datalist: [],
+    datalists: '',
     activity_page: 0,
     activity_page: 0,
     activity: [],
     activity: [],
-    page_type: true
+    page_type: true,
+    navList: [{
+        path: '/pages/Volunteer_dynamic/Volunteer_dynamic',
+        id: 1,
+        name: '志愿动态',
+        icon: '/imgs/menu1.png',
       },
       },
+      {
+        path: '/pages/index/active/active',
+        id: 2,
+        name: '活动招募',
+        icon: '/imgs/menu2.png',
+      },
+      {
+        path: '/pages/Volunteer_group/Volunteer_group',
+        id: 3,
+        name: '志愿团队',
+        icon: '/imgs/menu3.png',
+      },
+      {
+        path: '/pages/Online_regulations/Online_regulations',
+        id: 4,
+        name: '在线培训',
+        icon: '/imgs/menu4.png',
+      },
+      {
+        path: '/pages/img_txt/img_txt?status=2',
+        id: 5,
+        name: '关于我们',
+        icon: '/imgs/menu5.png',
+      },
+      {
+        path: '/pages/guanlitiaoli/guanlitiaoli',
+        id: 6,
+        name: '管理条例',
+        icon: '/imgs/menu6.png',
+      },
+      {
+        path: '/pages/guangrongpaihang/guangrongpaihang',
+        id: 7,
+        name: '光荣排行',
+        icon: '/imgs/menu7.png',
+      },
+      {
+        path: '/pages/apply/apply',
+        id: 8,
+        name: '个人注册',
+        icon: '/imgs/menu8.png',
+      },
+    ]
+
+  },
+  // 
   getdatalist() {
   getdatalist() {
     let that = this;
     let that = this;
     let url = 'index/index/index';
     let url = 'index/index/index';
@@ -34,60 +86,129 @@ Page({
     })
     })
   },
   },
 
 
+  // 获取个人注册信息
+  getdatalists() {
+    let that = this;
+    let url = 'index/member_center/index';
+    let head = {
+      'XX-Token': wx.getStorageSync('token')
+    }
+    app.post(url, {}, head).then((res) => {
+      // console.log(res)
+      that.setData({
+        datalists: res
+      })
+    }).catch((err) => {
+
+    })
+  },
+
+  // 招募活动
+  get() {
+    wx.navigateTo({
+      url: '/pages/index/active/active',
+    })
+  },
+
+
+
   /**
   /**
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
-  onLoad: function(options) {
+  onLoad: function (options) {
     wx.hideShareMenu()
     wx.hideShareMenu()
-  },
 
 
+  },
   /**
   /**
-   * 生命周期函数--监听页面初次渲染完成
+   * 生命周期函数--监听页面显示
    */
    */
-  onReady: function() {
+  onShow: function () {
+    this.getdatalist();
+    let that = this;
+    that.getdatalists();
+
+  },
+
+  //导航跳转
+  gotoNav(e) {
+    var path = e.currentTarget.dataset.path
+    // console.log(e)
+    var id = e.currentTarget.dataset.id;
+
+    if (id != 8) {
+      wx.navigateTo({
+        url: path,
+      })
+    } else {
+      // console.log( this.data.datalists)
+      wx.navigateTo({
+        url: path + '?id=' + this.data.datalists.id + "&is_submit=" + this.data.datalists.is_submit,
+      })
+    }
+
+    // if (wx.getStorageSync('token')) {
+    //   wx.navigateTo({
+    //     url: path,
+    //   })
+    // } else {
+    //   wx.showModal({
+    //     title: '提示',
+    //     content: '请先去授权',
+    //     success(res) {
+    //       if (res.confirm) {
+    //         wx.navigateTo({
+    //           url: '/pages/shouquan/shouquan',
+    //         })
+    //       } else if (res.cancel) {
+
+    //       }
+    //     }
+    //   })
+    // }
 
 
   },
   },
 
 
   /**
   /**
-   * 生命周期函数--监听页面显示
+   * 生命周期函数--监听页面初次渲染完成
    */
    */
-  onShow: function() {
-    this.getdatalist()
+  onReady: function () {
 
 
   },
   },
 
 
+
+
   /**
   /**
    * 生命周期函数--监听页面隐藏
    * 生命周期函数--监听页面隐藏
    */
    */
-  onHide: function() {
+  onHide: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 生命周期函数--监听页面卸载
    * 生命周期函数--监听页面卸载
    */
    */
-  onUnload: function() {
+  onUnload: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    * 页面相关事件处理函数--监听用户下拉动作
    */
    */
-  onPullDownRefresh: function() {
+  onPullDownRefresh: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 页面上拉触底事件的处理函数
    * 页面上拉触底事件的处理函数
    */
    */
-  onReachBottom: function() {
+  onReachBottom: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 用户点击右上角分享
    * 用户点击右上角分享
    */
    */
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
 
 
   }
   }
 })
 })

 <!-- 轮播图 -->
 <!-- 轮播图 -->
-<swiper indicator-dots="true" autoplay="true" indicator-color='#8C9194' indicator-active-color='#ffffff' class="slide-image">
-  <navigator wx:for="{{datalist.slide}}" wx:key hover-class="none" url='/pages/img_txt/img_txt?id={{item.activity_id}}&status=1'>
+<swiper indicator-dots="true"  indicator-color='#8C9194' indicator-active-color='#ffffff' class="slide-image">
+	<navigator wx:for="{{datalist.slide}}" wx:key="id" hover-class="none" url='/pages/img_txt/img_txt?id={{item.activity_id}}&status=1'>
 		<swiper-item>
 		<swiper-item>
 			<image src="{{item.image}}" mode="aspectFill" />
 			<image src="{{item.image}}" mode="aspectFill" />
 		</swiper-item>
 		</swiper-item>
 	</navigator>
 	</navigator>
 </swiper>
 </swiper>
-<view class='vold_line'></view>
+<!-- <view class='vold_line'></view> -->
+<!-- 菜单 -->
+<view class="home_menu displayB ">
+	<view class="home_time" bindtap="gotoNav" data-id="{{item.id}}" data-path="{{item.path}}" wx:for="{{navList}}" wx:key="id">
+		<view>
+			<image src="{{item.icon}}" />
+		</view>
+		<view class="home_title">{{item.name}}</view>
+	</view>
+
+</view>
 
 
 <!-- 志愿者列表 -->
 <!-- 志愿者列表 -->
 <view class='index_volunteertitle'>
 <view class='index_volunteertitle'>
 	<view class='title'>志愿者</view>
 	<view class='title'>志愿者</view>
-  <navigator url='/pages/more/more' hover-class="none">更多</navigator>
+	<navigator class="more" url='/pages/more/more' hover-class="none">查看更多\t<image src="/imgs/more.png"></image>
+	</navigator>
 </view>
 </view>
 <view class='volunteerbox'>
 <view class='volunteerbox'>
-  <view class='volunteercell' wx:for='{{datalist.volunteer}}' wx:key="index" id='{{item.id}}' wx:if="{{index<=1}}">
+	<view class='volunteercell' wx:for='{{datalist.volunteer}}' wx:key="index" id='{{item.id}}' wx:if="{{index<=3}}">
 		<view class='cell_top'>
 		<view class='cell_top'>
 			<view class='cellimg'>
 			<view class='cellimg'>
 				<image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}' mode="aspectFill" />
 				<image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}' mode="aspectFill" />
@@ -28,22 +39,25 @@
 					<image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>2}}'></image>
 					<image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>2}}'></image>
 					<image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>3}}'></image>
 					<image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>3}}'></image>
 					<image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>4}}'></image>
 					<image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{item.level>4}}'></image>
+					
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>
 </view>
 </view>
-<view class='vold_line'></view>
 
 
 <view class='index_newbox' wx:if="{{activity.length>0}}">
 <view class='index_newbox' wx:if="{{activity.length>0}}">
 	<view class='index_volunteertitle'>
 	<view class='index_volunteertitle'>
-    <view class='title'>活动快讯</view>
-    <navigator url='/pages/index/active/active' hover-class="none">更多</navigator>
+		<view class='title'>招募活动</view>
+		<view class="more" bindtap="get">
+			查看更多\t<image src="/imgs/more.png"></image>
+		</view>
+
 	</view>
 	</view>
 
 
 	<view>
 	<view>
 		<view class='new_box'>
 		<view class='new_box'>
-      <navigator class='new_cell' wx:for='{{activity}}' wx:key url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none">
+			<navigator class='new_cell' wx:for='{{activity}}' wx:key="id" url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none">
 				<view class='new_cellmain'>
 				<view class='new_cellmain'>
 					<view class='new_img'>
 					<view class='new_img'>
 						<image src='{{item.thumbnail}}' mode="aspectFill" />
 						<image src='{{item.thumbnail}}' mode="aspectFill" />
@@ -64,18 +78,21 @@
 <view class='index_newbox' wx:if="{{news.length>0}}">
 <view class='index_newbox' wx:if="{{news.length>0}}">
 	<view class='index_volunteertitle'>
 	<view class='index_volunteertitle'>
 		<view class='title'>活动回顾</view>
 		<view class='title'>活动回顾</view>
-    <navigator url='/pages/index/active/active?end_type=1' hover-class="none">更多</navigator>
+		<navigator class="more" url='/pages/index/active/active?end_type=1' hover-class="none">查看更多\t<image src="/imgs/more.png"></image>
+		</navigator>
 	</view>
 	</view>
 	<view class="review_box">
 	<view class="review_box">
+		<view class="review_wrap">
 			<navigator class="r_item" wx:for='{{news}}' wx:key="index" url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none">
 			<navigator class="r_item" wx:for='{{news}}' wx:key="index" url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none">
 				<view class="r_left">
 				<view class="r_left">
 					<view class="r_title">{{item.activity_name}}</view>
 					<view class="r_title">{{item.activity_name}}</view>
-        <view class="r_info">
+					<!-- <view class="r_info">
 					<text>活动时间：{{item.time}}</text>
 					<text>活动时间：{{item.time}}</text>
 					<text>地区：{{item.province_name}}</text>
 					<text>地区：{{item.province_name}}</text>
-        </view>
+				</view> -->
 				</view>
 				</view>
 				<image src="/imgs/right.png" class="r_right" />
 				<image src="/imgs/right.png" class="r_right" />
 			</navigator>
 			</navigator>
 		</view>
 		</view>
+	</view>
 </view>
 </view>

+page {
+  background-color: rgb(240, 240, 240);
+}
+
 .slide-image {
 .slide-image {
   height: 300rpx;
   height: 300rpx;
   width: 100%;
   width: 100%;
@@ -8,6 +12,33 @@
   height: 100%;
   height: 100%;
 }
 }
 
 
+/* 菜单 */
+.home_menu {
+  padding-left: 70rpx;
+  margin-top: 40rpx;
+  flex-wrap: wrap;
+  max-width: 605rpx;
+}
+
+.home_time {
+  width: 96rpx;
+  font-size: 22rpx;
+  text-align: center;
+  margin-right: 30rpx;
+  margin-bottom: 32rpx;
+}
+
+.home_time image {
+  width: 96rpx;
+  height: 96rpx;
+}
+
+.home_title {
+  font-size: 24rpx;
+  margin-top: 17rpx;
+}
+
+
 .index_volunteertitle {
 .index_volunteertitle {
   color: #666;
   color: #666;
   font-size: 26rpx;
   font-size: 26rpx;
@@ -25,6 +56,16 @@
   position: relative;
   position: relative;
 }
 }
 
 
+
+.more {
+  color: #009E5F;
+}
+
+.more image {
+  width: 10rpx;
+  height: 17rpx;
+}
+
 .title::after {
 .title::after {
   position: absolute;
   position: absolute;
   content: '';
   content: '';
@@ -46,26 +87,34 @@
 }
 }
 
 
 .volunteercell {
 .volunteercell {
-  width: 48%;
-  padding: 56rpx 0;
+  /* width: 48%; */
+  /* padding: 56rpx 0; */
+  padding: 24rpx 0;
   box-sizing: border-box;
   box-sizing: border-box;
 }
 }
 
 
 .cell_top {
 .cell_top {
-  display: flex;
-  align-items: center;
+  width: 160rpx;
+  height: 246rpx;
+  text-align: center;
+  padding-top: 24rpx;
+  /* display: flex;
+  align-items: center; */
   color: #333;
   color: #333;
+  border-radius: 7px;
+  background-color: #ffffff;
 }
 }
 
 
 .cellimg {
 .cellimg {
-  display: flex;
+  /* display: flex;
   align-items: cneter;
   align-items: cneter;
-  justify-content: center;
-  margin-right: 19rpx;
+  justify-content: center; */
+  /* margin-right: 19rpx; */
   width: 100rpx;
   width: 100rpx;
   height: 100rpx;
   height: 100rpx;
   border-radius: 50%;
   border-radius: 50%;
   overflow: hidden;
   overflow: hidden;
+  margin: 0 auto;
 }
 }
 
 
 .cellimg image {
 .cellimg image {
@@ -75,10 +124,13 @@
 }
 }
 
 
 .c_right {
 .c_right {
-  width: 210rpx;
+  /* width: 210rpx; */
+  margin: 0 auto;
+
 }
 }
 
 
 .c_right .name {
 .c_right .name {
+  padding-top: 8rpx;
   font-size: 30rpx;
   font-size: 30rpx;
   font-family: PingFang SC;
   font-family: PingFang SC;
   font-weight: 500;
   font-weight: 500;
@@ -107,15 +159,22 @@
   justify-content: space-between;
   justify-content: space-between;
   align-items: center;
   align-items: center;
   color: #999;
   color: #999;
+  margin-top: 24rpx;
   padding: 0 32rpx;
   padding: 0 32rpx;
   font-size: 24rpx;
   font-size: 24rpx;
   flex-wrap: wrap;
   flex-wrap: wrap;
-  border-bottom: 2rpx solid #e6e6e6;
+  /* border-bottom: 2rpx solid #e6e6e6; */
+
 }
 }
 
 
 .new_cell {
 .new_cell {
   width: 48%;
   width: 48%;
-  padding: 29rpx 0rpx;
+  /* padding: 29rpx 0rpx; */
+
+  background-color: #ffffff;
+  border-radius: 7px;
+  overflow: hidden;
+
 }
 }
 
 
 .new_cell:nth-child(2n) {
 .new_cell:nth-child(2n) {
@@ -142,6 +201,7 @@
 }
 }
 
 
 .new_title {
 .new_title {
+  padding: 0 16rpx;
   height: 76rpx;
   height: 76rpx;
   overflow: hidden;
   overflow: hidden;
   text-overflow: ellipsis;
   text-overflow: ellipsis;
@@ -162,6 +222,7 @@
 }
 }
 
 
 .title_box {
 .title_box {
+  padding: 0 16rpx;
   margin: 18rpx 0 13rpx 0;
   margin: 18rpx 0 13rpx 0;
   font-size: 24rpx;
   font-size: 24rpx;
   font-family: PingFang SC;
   font-family: PingFang SC;
@@ -180,7 +241,7 @@
 
 
 .title_box .word {
 .title_box .word {
   max-width: 200rpx;
   max-width: 200rpx;
-  color: #666;
+  color: #FF976A;
   font-size: 24rpx;
   font-size: 24rpx;
   overflow: hidden;
   overflow: hidden;
   text-overflow: ellipsis;
   text-overflow: ellipsis;
@@ -207,8 +268,18 @@
   margin-top: 23rpx;
   margin-top: 23rpx;
   padding: 0 32rpx;
   padding: 0 32rpx;
   box-sizing: border-box;
   box-sizing: border-box;
+
+}
+
+.review_wrap {
+  background: #ffffff;
+  border-radius: 5px;
+  padding: 0 16rpx;
+  margin-bottom: 24rpx;
 }
 }
 
 
+
+
 .r_item {
 .r_item {
   width: 100%;
   width: 100%;
   padding: 33rpx 0 27rpx;
   padding: 33rpx 0 27rpx;
@@ -216,11 +287,13 @@
   display: flex;
   display: flex;
   justify-content: space-between;
   justify-content: space-between;
   align-items: center;
   align-items: center;
-  border-bottom: 2rpx solid #E6E6E6;
+  /* border-bottom: 2rpx solid #E6E6E6; */
 }
 }
-.r_item:last-child{
+
+.r_item:last-child {
   border-bottom: none;
   border-bottom: none;
 }
 }
+
 .r_item .r_left {
 .r_item .r_left {
   width: 637rpx;
   width: 637rpx;
 }
 }

@@ -3,12 +3,12 @@
 .volunteerbox {
 .volunteerbox {
   justify-content: space-between;
   justify-content: space-between;
   flex-wrap: wrap;
   flex-wrap: wrap;
-  margin: 0 50rpx;
+  /* margin: 0 50rpx; */
 }
 }
 
 
 .volunteercell {
 .volunteercell {
-  width: 48%;
-  padding: 48rpx 0 52rpx;
+  /* width: 48%; */
+  /* padding: 48rpx 0 52rpx; */
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
 }
 }

-
 const app = getApp();
 const app = getApp();
 Page({
 Page({
 
 
@@ -16,6 +15,7 @@ Page({
       'XX-Token': wx.getStorageSync('token')
       'XX-Token': wx.getStorageSync('token')
     }
     }
     app.post(url, {}, head).then((res) => {
     app.post(url, {}, head).then((res) => {
+      // console.log(res)
       that.setData({
       that.setData({
         datalist: res
         datalist: res
       })
       })
@@ -30,24 +30,84 @@ Page({
     })
     })
 
 
   },
   },
+  // 我的活动
+  getMyactive() {
+    wx.navigateTo({
+      url: '/pages/myactivity/myactivity',
+    })
+
+  },
+  //我的团队  
+  getMyteam() {
+    wx.navigateTo({
+      url: '/pages/myteam/myteam',
+    })
+
+  },
+  // 我的培训
+  getMytrain() {
+    wx.navigateTo({
+      url: '/pages/mytrain/mytrain',
+    })
+
+  },
+  // 志愿回馈
+  getfeedback() {
+    wx.navigateTo({
+      url: '/pages/myfeedback/myfeedback',
+    })
+  },
+
+  // 成为志愿者
+  getVolunteer(e) {
+    // console.log(e)
+    wx.navigateTo({
+      url: '/pages/apply/apply?id=' + this.data.datalist.id + "&is_submit=" + this.data.datalist.is_submit,
+
+    })
+  },
+// 电子证件
+  getCertificate(){
+    wx.navigateTo({
+      url: '/pages/mycertificate/mycertificate',
+    })
+
+
+
+  },
+
+  // 我的地址
+  getmyAdd() {
+    wx.navigateTo({
+      url: '/pages/myaddress/myaddress',
+    })
+
+  },
+
+  // 管理条例
+  getRule() {
+    wx.navigateTo({
+      url: '/pages/guanlitiaoli/guanlitiaoli',
+    })
+  },
   /**
   /**
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
-  onLoad: function(options) {
+  onLoad: function (options) {
     wx.hideShareMenu()
     wx.hideShareMenu()
   },
   },
 
 
   /**
   /**
    * 生命周期函数--监听页面初次渲染完成
    * 生命周期函数--监听页面初次渲染完成
    */
    */
-  onReady: function() {
+  onReady: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 生命周期函数--监听页面显示
    * 生命周期函数--监听页面显示
    */
    */
-  onShow: function() {
+  onShow: function () {
     let that = this;
     let that = this;
     that.getdatalist();
     that.getdatalist();
   },
   },
@@ -55,35 +115,35 @@ Page({
   /**
   /**
    * 生命周期函数--监听页面隐藏
    * 生命周期函数--监听页面隐藏
    */
    */
-  onHide: function() {
+  onHide: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 生命周期函数--监听页面卸载
    * 生命周期函数--监听页面卸载
    */
    */
-  onUnload: function() {
+  onUnload: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    * 页面相关事件处理函数--监听用户下拉动作
    */
    */
-  onPullDownRefresh: function() {
+  onPullDownRefresh: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 页面上拉触底事件的处理函数
    * 页面上拉触底事件的处理函数
    */
    */
-  onReachBottom: function() {
+  onReachBottom: function () {
 
 
   },
   },
 
 
   /**
   /**
    * 用户点击右上角分享
    * 用户点击右上角分享
    */
    */
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
 
 
   }
   }
 })
 })

 <view class='my_head'>
 <view class='my_head'>
-  <image src='https://volunteer.cnpu.org/imgs/gerenzhongxin_bg@2x.png'></image>
+	<image class="my_headimg" src='/imgs/card.png'></image>
 	<view class='my_headitem'>
 	<view class='my_headitem'>
+		<view class="my_headitemtop">
 			<view class='my_headitemimg'>
 			<view class='my_headitemimg'>
 				<image src="{{datalist.avatar?datalist.avatar:'/imgs/icon_59.png'}}"></image>
 				<image src="{{datalist.avatar?datalist.avatar:'/imgs/icon_59.png'}}"></image>
 			</view>
 			</view>
+			<view class="my_headitemname">
 				<view class='word'>{{datalist.user_nickname}}</view>
 				<view class='word'>{{datalist.user_nickname}}</view>
-    <view class='word'>已完成的工时: {{datalist.work_time}}h</view>
+				<view class="word1">志愿者（待学习）<image src="/imgs/more_gray.png"></image>
+				</view>
+				<!-- <view class='word'>工时: {{datalist.work_time}}h</view> -->
 				<view class='star_box'>
 				<view class='star_box'>
-      <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'></image>
-      <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>1}}'></image>
-      <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>2}}'></image>
-      <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>3}}'></image>
-      <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>4}}'></image>
+					<image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'>
+					</image>
+					<image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>1}}'>
+					</image>
+					<image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>2}}'>
+					</image>
+					<image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>3}}'>
+					</image>
+					<image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>4}}'>
+					</image>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="my_activebox">
+		<view class="my_active">
+			<view>300</view>
+			<view>活动</view>
+		</view>
+		<view class="my_active">
+			<view>120</view>
+			<view>团队</view>
+		</view>
+		<view class="my_active">
+			<view>{{datalist.work_time}}</view>
+			<view>工时</view>
+		</view>
+
+	</view>
+
+</view>
+
+<!--我的活动  -->
+<view class="my_actives_box">
+	<view class="my_actives">
+		<view bindtap="getMyactive">
+			<image src="/imgs/ac1.png"></image>
+			<view>我的活动</view>
+		</view>
+		<view bindtap="getMyteam">
+			<image src="/imgs/ac2.png"></image>
+			<view>我的团队</view>
+		</view>
+		<view bindtap="getMytrain" >
+			<image src="/imgs/ac3.png"></image>
+			<view>我的培训</view>
+		</view>
+		<view bindtap="getfeedback">
+			<image src="/imgs/ac4.png"></image>
+			<view>志愿回馈</view>
 		</view>
 		</view>
 	</view>
 	</view>
 </view>
 </view>
+
+<!-- 成为志愿者  -->
 <view class='my_itembox'>
 <view class='my_itembox'>
-  <navigator class='my_item' url='/pages/apply/apply?id={{datalist.id}}&is_submit={{datalist.is_submit}}' hover-class="none">
+	<view class='my_item' bindtap="getVolunteer">
 		<view class='my_itemletf'>
 		<view class='my_itemletf'>
-      <view class='iconfont icon-aixin'></view>成为志愿者
+			<view class='iconfont '>
+				<image src="/imgs/ac5.png"></image>
+			</view>成为志愿者
 		</view>
 		</view>
 		<view class='iconfont icon-xiangyou'></view>
 		<view class='iconfont icon-xiangyou'></view>
-  </navigator>
+
+	</view>
+	
+	<view class='my_item' bindtap="getCertificate">
+		<view class='my_itemletf'>
+			<view class='iconfont '>
+				<image src="/imgs/ac6.png"></image>
+			</view>电子证件
+		</view>
+		<view class='iconfont icon-xiangyou'></view>
+
+	</view>
+	<view class='my_item' bindtap="getRule">
+		<view class='my_itemletf'>
+			<view class='iconfont '>
+				<image src="/imgs/ac7.png"></image>
+			</view>管理条例
+		</view>
+		<view class='iconfont icon-xiangyou'></view>
+	</view>
+
 	<navigator class='my_item' url='/pages/result/result' hover-class="none">
 	<navigator class='my_item' url='/pages/result/result' hover-class="none">
 		<view class='my_itemletf'>
 		<view class='my_itemletf'>
-      <view class='iconfont icon-chakanshenqing'></view>查看审核状态
+			<view class='iconfont '>
+				<image src="/imgs/ac8.png"></image>
+			</view>查看审核状态
 		</view>
 		</view>
 		<view class='iconfont icon-xiangyou'></view>
 		<view class='iconfont icon-xiangyou'></view>
 	</navigator>
 	</navigator>
-  <navigator class='my_item' url='/pages/img_txt/img_txt' hover-class="none" url='/pages/img_txt/img_txt?status=3'>
+
+	<navigator class='my_item' url='/pages/my/my_active/my_active' hover-class="none">
 		<view class='my_itemletf'>
 		<view class='my_itemletf'>
-      <view class='iconfont icon-lianximaijia'></view>联系我们
+			<image src='/imgs/ac9.png' mode='widthFix'></image>参与过的活动
 		</view>
 		</view>
 		<view class='iconfont icon-xiangyou'></view>
 		<view class='iconfont icon-xiangyou'></view>
 	</navigator>
 	</navigator>
-  <navigator class='my_item' url='/pages/img_txt/img_txt' hover-class="none" url='/pages/img_txt/img_txt?status=2'>
+
+	<view class='my_item' bindtap="getmyAdd">
+		<view class='my_itemletf'>
+			<view class='iconfont '>
+				<image src="/imgs/ac10.png"></image>
+			</view>我的收货地址
+		</view>
+		<view class='iconfont icon-xiangyou'></view>
+
+	</view>
+	<view class='my_item' bindtap="">
+		<view class='my_itemletf'>
+			<view class='iconfont '>
+				<image src="/imgs/ac11.png"></image>
+			</view>我的志愿回馈
+		</view>
+		<view class='iconfont icon-xiangyou'></view>
+	</view>
+	<navigator class='my_item' url='/pages/img_txt/img_txt' hover-class="none" url='/pages/img_txt/img_txt?status=3'>
 		<view class='my_itemletf'>
 		<view class='my_itemletf'>
-      <view class='iconfont icon-renyuanxiaozu'></view>关于我们
+			<view class='iconfont'>
+				<image src="/imgs/ac12.png"></image>
+			</view>联系我们
 		</view>
 		</view>
 		<view class='iconfont icon-xiangyou'></view>
 		<view class='iconfont icon-xiangyou'></view>
 	</navigator>
 	</navigator>
-  <navigator class='my_item' url='/pages/my/my_active/my_active' hover-class="none">
+
+	<navigator class='my_item' url='/pages/img_txt/img_txt' hover-class="none" url='/pages/img_txt/img_txt?status=2'>
 		<view class='my_itemletf'>
 		<view class='my_itemletf'>
-      <image src='/imgs/activity-close-open@2x.png' mode='widthFix'></image>参与过的活动
+			<view class='iconfont '>
+				<image src="/imgs/ac13.png"></image>
+			</view>关于我们
 		</view>
 		</view>
 		<view class='iconfont icon-xiangyou'></view>
 		<view class='iconfont icon-xiangyou'></view>
 	</navigator>
 	</navigator>
 
 
+
+
+
 	<view class='my_item' bindtap='goamdin' wx:if='{{datalist.type=="2"}}' data-type="1">
 	<view class='my_item' bindtap='goamdin' wx:if='{{datalist.type=="2"}}' data-type="1">
 		<view class='my_itemletf'>
 		<view class='my_itemletf'>
 			<view class='iconfont icon-gongzhang'></view>管理员审核
 			<view class='iconfont icon-gongzhang'></view>管理员审核

-/* pages/my/my.wxss */
+page {
+
+  background-color: #F2F3F5;
+}
 
 
 .my_head {
 .my_head {
   position: relative;
   position: relative;
   height: 268rpx;
   height: 268rpx;
-  width: 750rpx;
+  /* width: 750rpx; */
+  padding: 32rpx;
 }
 }
 
 
 .my_head image {
 .my_head image {
   width: 100%;
   width: 100%;
-  height: 100%;
-  display: block;
+  height: 365rpx;
+  /* display: block; */
 }
 }
 
 
 .my_headitem {
 .my_headitem {
   position: absolute;
   position: absolute;
-  left: 50%;
-  bottom: -93rpx;
+  left: 36%;
+  bottom: 137rpx;
   transform: translateX(-50%);
   transform: translateX(-50%);
-  color: #5e6661;
-  font-weight: bold;
+  color: #ffffff;
   font-size: 32rpx;
   font-size: 32rpx;
+  /* display: flex; */
+  /* flex-wrap: wrap; */
+  /* justify-content: center; */
+  /* align-items: center; */
+}
+
+.my_headitemtop {
   display: flex;
   display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-  align-items: center;
+
 }
 }
 
 
 .my_headitemimg {
 .my_headitemimg {
-  width: 100%;
+  /* width: 100%; */
   display: flex;
   display: flex;
   justify-content: center;
   justify-content: center;
   align-items: center;
   align-items: center;
+  margin-right: 16rpx;
 }
 }
 
 
-.my_headitemimg image ,.my_headitemimg .avator {
+.my_headitemname {
+  width: 260rpx;
+
+}
+
+.my_headitemimg image,
+.my_headitemimg .avator {
   width: 132rpx;
   width: 132rpx;
   height: 132rpx;
   height: 132rpx;
   border-radius: 50%;
   border-radius: 50%;
@@ -44,12 +59,87 @@
 
 
 .my_headitem .word {
 .my_headitem .word {
   width: 100%;
   width: 100%;
-  text-align: center;
+  /* text-align: center; */
   margin-top: 10rpx;
   margin-top: 10rpx;
+  font-size: 32rpx;
+  font-weight: bold;
+
+}
+
+.word1 {
+  font-size: 28rpx;
+}
+
+.word1 image {
+  width: 12rpx;
+  height: 20rpx;
+}
+
+.my_activebox {
+  padding: 0 80rpx;
+  display: flex;
+  justify-content: space-between;
+  font-size: 36rpx;
+  color: #ffffff;
+  text-align: center;
+  position: absolute;
+  left: 32rpx;
+  right: 32rpx;
+  bottom: 0;
+}
+
+.my_active :nth-child(2) {
+
+  font-size: 24rpx;
+  margin-top: 8rpx;
+}
+.star_box {
+  width: auto;
+  height: auto;
+  margin-top: 16rpx;
+  display: flex;
+  /* justify-content: space-between; */
+}
+
+.star_box image {
+  width: 20rpx;
+  height: 20rpx;
+  padding-left: 10rpx;
+  padding-right: 10rpx;
+}
+
+/* 我的活动 */
+.my_actives_box {
+
+  padding: 0 32rpx;
+
 }
 }
 
 
+.my_actives {
+  padding: 0 26rpx;
+  height: 206rpx;
+  font-size: 28rpx;
+  color: #66696e;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 95rpx;
+  text-align: center;
+  background-color: #ffffff;
+  border-radius: 7px;
+
+}
+
+.my_actives image {
+  width: 80rpx;
+  height: 80rpx;
+}
+
+/*  */
 .my_itembox {
 .my_itembox {
-  margin: 210rpx 0 0 0;
+  margin: 32rpx 32rpx;
+  border-radius: 7px;
+  background-color: #ffffff;
 }
 }
 
 
 .my_item {
 .my_item {
@@ -59,40 +149,45 @@
   color: #333;
   color: #333;
   font-size: 32rpx;
   font-size: 32rpx;
   padding: 30rpx 32rpx;
   padding: 30rpx 32rpx;
-  border-bottom: 1px solid #e6e6e6;
+  /* border-bottom: 1px solid #e6e6e6; */
 }
 }
 
 
-.my_item .iconfont {
-  color: #ccc;
-  font-size: 32rpx;
-}
+/* .my_item .iconfont { */
+  /* color: #ccc;
+  font-size: 32rpx; */
+/* } */
 
 
 .my_itemletf {
 .my_itemletf {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: center;
   justify-content: center;
-  color: #333;
-  font-size: 32rpx;
+  /* color: #333;
+  font-size: 32rpx; */
+  color: #323233;
+  font-size: 28rpx;
 }
 }
-.my_itemletf image{
-  width: 64rpx;
-  height: 64rpx;
-  margin-right: 5rpx;
+
+.my_itemletf image {
+  width: 40rpx;
+  height: 40rpx;
+  margin-right: 10rpx;
   position: relative;
   position: relative;
-  left: -10rpx;
-  top: 0;
+  /* left: -10rpx;
+  top: 0; */
 }
 }
-.my_itemletf .time{
+
+.my_itemletf .time {
   width: 34rpx;
   width: 34rpx;
   height: 32rpx;
   height: 32rpx;
   margin-right: 30rpx;
   margin-right: 30rpx;
   left: 0;
   left: 0;
 }
 }
-.my_itemletf .iconfont {
-  font-size: 40rpx;
-  color: #fa8286;
-  margin: 0 32rpx 0 0;
-}
+
+/* .my_itemletf .iconfont { */
+  /* font-size: 40rpx;
+  color: #fa8286; */
+  /* margin: 0 32rpx 0 0; */
+/* } */
 
 
 .my_itemletf .icon-chakanshenqing {
 .my_itemletf .icon-chakanshenqing {
   color: #68a6ff;
   color: #68a6ff;
@@ -105,16 +200,4 @@
 .my_itemletf .icon-gongzhang {
 .my_itemletf .icon-gongzhang {
   color: #44cbee;
   color: #44cbee;
 }
 }
-.star_box {
-  width: auto;
-  height: auto;
-  margin-top: 16rpx;
-  display: flex;
-  justify-content: space-between;
-}
-.star_box image {
-  width: 28rpx;
-  height: 26rpx;
-  padding-left: 10rpx;
-  padding-right: 10rpx;
-}
+

+// pages/myactivity/myactivity.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {}
+}

+<view>
+
+
+    活动打卡
+</view>

+/* pages/myactivity/myactivity.wxss */

+// pages/myaddcompile/myaddcompile.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "我的收货地址"
+}

+<!-- 修改收货地址 -->
+<view class="itemInput display">
+    <view class="itemName" > 姓名</view>
+    <input placeholder="请输入姓名" value="{{name}}" bindinput="bindName" placeholder-class="plaSty"></input>
+</view>
+<view class="itemInput display">
+    <view class="itemName">联系方式</view>
+    <input placeholder="请输入联系方式" value="{{phone}}" bindinput="bindPhone" maxlength="11" placeholder-class="plaSty"></input>
+</view>
+<view class="itemInput display">
+    <view class="itemName">详细地址</view>
+    <input placeholder="请输入详细地址" value="{{address}}" bindinput="bindAddress" placeholder-class="plaSty"></input>
+</view>
+
+
+<view class="itemInput center display">
+    <view class="itemName">设为默认</view>
+    <switch checked="{{addressDetail.delFlag==0?false:true}}" bindchange="switchChange" color="#21AE59"/>
+</view>
+<!-- 编辑结束 -->
+<view class="newaddress">
+    <view class="newaddress_left" bindtap="bindDelete" wx:if="{{type=='change'}}">删除</view>
+    <view class="newaddress_right" bindtap="save">保存</view>
+</view>

+/* pages/compile/index.wxss */
+page {
+    background-color: #f8f8f8;
+}
+
+.itemInput {
+    margin: 28rpx 36rpx;
+    padding-bottom: 28rpx;
+    border-bottom: 2rpx solid #eeeeee;
+    align-items: center;
+}
+
+.itemName {
+    font-size: 32rpx;
+    color: #727273;
+    margin-right: 32rpx;
+    min-width: 128rpx;
+}
+
+.plaSty {
+    font-size: 28rpx
+}
+
+.itemInput input {
+    font-size: 32rpx;
+    color: #333333;
+    flex: 1;
+}
+
+.center {
+    align-items: center !important;
+    justify-content: space-between;
+}
+
+.newaddress {
+    height: 50px;
+    line-height: 50px;
+    text-align: center;
+    color: #ffffff;
+    font-size: 16px;
+    font-weight: 600;
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    display: flex;
+}
+
+.newaddress_left {
+    flex: 1;
+    background: #d0d0d0;
+}
+
+.newaddress_right {
+    flex: 1;
+    background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
+}

+const app = getApp();
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+        
+
+    },
+
+    //新增地址 
+    getAddress() {
+        wx.navigateTo({
+            url: '/pages/myaddcompile/myaddcompile',
+        })
+
+    },
+   
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "我的收货地址"
+}

+<view class="itemAddress displayB" >
+	<view class="add_left" >
+		<view class="add_user display">
+			<!-- <view class="user_name">{{item.name}}</view>
+			<view class="user_phone">{{item.phone}}</view>
+			<view class="is_default" wx:if="{{item.delFlag==1}}">默认</view> -->
+			<view class="user_name">王先生</view>
+			<view class="user_phone">19609549855</view>
+			<view class="is_default" >默认</view>
+		</view>
+		<view class="add_msg">天津市</view>
+	</view>
+	<view class="add_right">
+		<view class="item_choose display2" bindtap="bindCompile" data-id="{{item.id}}">
+			<image src="/imgs/compile.png"></image>
+			<view>编辑</view>
+		</view>
+		<view class="item_choose display2" style="margin-top:48rpx" bindtap="bindDelete" data-id="{{item.id}}">
+			<image src="/imgs/delete.png"></image>
+			<view>删除</view>
+		</view>
+	</view>
+</view>
+
+
+<view class="addAddress" bindtap="getAddress">
+    新增收货地址
+</view>

+/* pages/myaddress/myaddress.wxss */
+page {
+    background-color: #f8f8f8;
+    padding-bottom: 120rpx;
+}
+
+.itemAddress {
+    padding: 32rpx 26rpx 32rpx 36rpx;
+    background-color: #fff;
+    margin-bottom: 20rpx;
+}
+
+.add_user {
+    align-items: flex-end;
+}
+
+.user_name {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #333333;
+    margin-right: 10rpx;
+}
+
+.user_phone {
+    font-size: 24rpx;
+    font-weight: 600;
+    color: #bdc4ce;
+    margin-right: 16rpx;
+}
+
+.is_default {
+    width: 88rpx;
+    height: 30rpx;
+    line-height: 30rpx;
+    opacity: 0.74;
+    background: #e2f6ff;
+    border-radius: 2rpx;
+    font-size: 24rpx;
+    text-align: center;
+    color: #2d91cc;
+}
+
+.add_msg {
+    font-size: 24rpx;
+    color: #6f6f6f;
+    margin-top: 16rpx;
+    max-width: 535rpx;
+}
+
+
+.add_right {
+    padding: 2rpx 0 2rpx 33rpx;
+    border-left: 2rpx solid #eeeeee;
+}
+
+.item_choose view {
+    font-size: 24rpx;
+    color: #6f6f6f;
+}
+
+.item_choose image {
+    width: 24rpx;
+    height: 24rpx;
+    margin-right: 8rpx;
+}
+
+.newAddress {
+    width: 100%;
+    height: 100rpx;
+    line-height: 100rpx;
+    text-align: center;
+    background: linear-gradient(132deg, #1dcaf7 4%, #2e8fcb 98%);
+    box-shadow: 0 4rpx 8rpx 0 rgba(0, 0, 0, 0.5);
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    opacity: 0.85;
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #ffffff;
+    z-index: 111;
+}
+
+
+
+.addAddress {
+    height: 88rpx;
+    line-height: 88rpx;
+    font-size: 28rpx;
+    color: #ffffff;
+    text-align: center;
+    background-color: #21AE59;
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+}

+// pages/mycertificate/mycertificate.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {},
+"navigationBarTitleText": "电子证件"
+}

+<!-- 电子证件 -->
+<view class="mycertificate">
+    <image src="/imgs/dianzizhengjian1.png"></image>
+    <view class="mycertificate_text">
+        <view class="goods_left">
+            <view>姓名：张三</view>
+            <view>身份：医生</view>
+            <view>编号：007556562</view>
+            <view>学时：100</view>
+        </view>
+        <image class="One_inch_photos" src="/imgs/u=2815405920,207947254&fm=26&gp=0.png"></image>
+    </view>
+
+</view>
+<view class="mycertificate">
+    <image src="/imgs/dianzizhengjian.png"></image>
+    <view class="mycertificate_text">
+        <view class="goods_lefts">
+            <image class="logo" src="/imgs/dianzizhengjian2.png"></image>
+            <view>白求恩志愿者</view>
+        </view>
+        <image class="erweima" src="/imgs/dianzizhengjian3.png"></image>
+    </view>
+
+
+    <!-- 注意事项 -->
+    <view class="good_line">
+        <view></view>
+        注意事项
+    </view>
+    <view class="good_typeface">1. 本证件限个人使用，不得转借他人</view>
+    <view class="good_typeface">2. 电子证件不等效于实体证件，公益活动上岗时请佩戴您的实体证件 </view>
+    <view class="good_typeface">3. 特别情况未携带实体证件，需证明身份可出示此电子证件 </view>
+    <view class="good_typeface">4. 如实体证件丢失请及时联系白求恩志愿者中心补办</view>
+</view>
+
+<view class="btn">
+    <button hover-class="none" > 将电子证件生成图片</button>
+</view>

+page {
+
+    background-color: rgb(240, 240, 240);
+}
+
+.mycertificate {
+    padding: 0 32rpx;
+    padding-top: 32rpx;
+    position: relative;
+}
+
+image {
+    width: 688rpx;
+    height: 428rpx;
+}
+
+.mycertificate_text {
+    margin: 32rpx 32rpx;
+    padding: 0 32rpx;
+    padding-top: 62rpx;
+    width: 621rpx;
+    /* height: 377rpx; */
+    /* border: 1px solid red; */
+    position: absolute;
+    left: 0;
+    top: 0;
+    display: flex;
+
+    justify-content: space-between;
+
+
+}
+
+.goods_left {
+    color: #ffffff;
+}
+
+.goods_left view {
+    margin-top: 25rpx;
+}
+
+.One_inch_photos {
+    /* width: 226rpx;
+    height: 300rpx; */
+    width: 220rpx;
+    height: 308rpx;
+
+}
+
+.goods_lefts {
+    text-align: center;
+    color: #ffffff;
+    font-size: 40rpx;
+    padding-top: 42rpx;
+    padding-left: 10rpx;
+}
+
+.logo {
+
+    width: 160rpx;
+    height: 160rpx;
+}
+
+.erweima {
+    width: 220rpx;
+    height: 220rpx;
+    padding-top: 42rpx;
+    padding-right: 10rpx;
+}
+
+.good_line {
+    display: flex;
+    align-items: center;
+    margin-top: 24rpx;
+    margin-bottom: 16rpx;
+
+}
+
+.good_line view {
+    width: 6rpx;
+    height: 28rpx;
+    background: linear-gradient(180deg, #00cd98, #009e5f);
+    border-radius: 4px;
+    margin-right: 18rpx;
+
+}
+
+.good_typeface {
+    font-size: 28rpx;
+    color: #323232;
+}
+
+.btn {
+    margin-top: 80rpx;
+    height: 122rpx;
+    background-color: #ffffff;
+    display: flex;
+    align-items: center;
+}
+
+button {
+    width: 622rpx;
+    height: 88rpx;
+    background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
+    border-radius: 44px;
+    color: #ffffff;
+    box-shadow: 0px 18px 38px 0px rgba(0, 116, 45, 0.42);
+}

+
+const app = getApp();
+
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        datalist: ''
+
+    },
+
+    getdatalist() {
+        let that = this;
+        let url = 'index/member_center/index';
+        let head = {
+            'XX-Token': wx.getStorageSync('token')
+        }
+        app.post(url, {}, head).then((res) => {
+            console.log(res)
+            that.setData({
+                datalist: res
+            })
+        }).catch((err) => {
+
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+        let that = this;
+        that.getdatalist();
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {}
+}

+<view class='my_head'>
+    <image class="my_headimg" src='/imgs/myfeedback.png'></image>
+    <view class='my_headitem'>
+        <view class="my_headitemtop">
+            <view class='my_headitemimg'>
+                <image src="{{datalist.avatar?datalist.avatar:'/imgs/icon_59.png'}}"></image>
+            </view>
+            <view class="my_headitemname">
+                <view class='word'>{{datalist.user_nickname}}</view>
+                <view class="word1">志愿者（待学习）<image src="/imgs/more_gray.png"></image>
+                </view>
+                <!-- <view class='word'>工时: {{datalist.work_time}}h</view> -->
+                <view class='star_box'>
+                    <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill'
+                        wx:if='{{datalist.level>0}}'>
+                    </image>
+                    <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill'
+                        wx:if='{{datalist.level>1}}'>
+                    </image>
+                    <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill'
+                        wx:if='{{datalist.level>2}}'>
+                    </image>
+                    <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill'
+                        wx:if='{{datalist.level>3}}'>
+                    </image>
+                    <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill'
+                        wx:if='{{datalist.level>4}}'>
+                    </image>
+                </view>
+            </view>
+        </view>
+    </view>
+    <view class="my_activebox">
+        <view class="my_active">
+            <view>396</view>
+            <view>可用工时</view>
+        </view>
+        <view class="my_active">
+            <view>1000</view>
+            <view>累计总共工时</view>
+        </view>
+        <view class="my_active">
+            <view>176</view>
+            <view>已兑换工时</view>
+        </view>
+    </view>
+    <view class="my_hint">
+        <image src="/imgs/tishi-4@2x.png"></image> 兑换志愿回馈礼品不影响总工时，即不影响志愿者排名及星级
+    </view>
+</view>
+<!-- 礼品 -->
+<view class="gift">
+    <image src="/imgs/shop.png"></image>
+    <view class="gift_message">
+        <view class="gift_introduce">原装正品Apple AirPods Pro 主动降噪无线蓝兑换志愿回馈礼品不影响总工时，即不影响志愿者排名及星级</view>
+        <view class="gift_time">
+            <view>已被兑换:2000</view>
+            <view>库存:500</view>
+        </view>
+        <view class="gift_time">
+            <view class="gift_exchange">工时兑换</view>
+            <view class="gift_exchange_time"><p>20</p>小时</view>
+        </view>
+    </view>
+</view>

+page {
+
+    background-color: #F2F3F5;
+}
+
+.my_head {
+    position: relative;
+    height: 436rpx;
+    /* width: 750rpx; */
+    /* padding: 32rpx; */
+}
+
+.my_head image {
+    width: 100%;
+    height: 436rpx;
+    /* display: block; */
+}
+
+.my_headitem {
+    position: absolute;
+    left: 36%;
+    /* bottom: 137rpx; */
+    top: 46rpx;
+    transform: translateX(-50%);
+    color: #ffffff;
+    font-size: 32rpx;
+    /* display: flex; */
+    /* flex-wrap: wrap; */
+    /* justify-content: center; */
+    /* align-items: center; */
+}
+
+.my_headitemtop {
+    display: flex;
+
+}
+
+.my_headitemimg {
+    /* width: 100%; */
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-right: 16rpx;
+}
+
+.my_headitemname {
+    width: 260rpx;
+
+}
+
+.my_headitemimg image,
+.my_headitemimg .avator {
+    width: 132rpx;
+    height: 132rpx;
+    border-radius: 50%;
+    display: block;
+    overflow: hidden;
+}
+
+
+.my_headitem .word {
+    width: 100%;
+    /* text-align: center; */
+    margin-top: 10rpx;
+    font-size: 32rpx;
+    font-weight: bold;
+
+}
+
+.word1 {
+    font-size: 28rpx;
+}
+
+.word1 image {
+    width: 12rpx;
+    height: 20rpx;
+}
+
+.my_activebox {
+    padding: 0 80rpx;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    font-size: 36rpx;
+    color: #ffffff;
+    text-align: center;
+    position: absolute;
+    left: 10rpx;
+    right: 10rpx;
+    top: 200rpx;
+}
+
+.my_active :nth-child(1) {
+    font-size: 48rpx;
+    margin-top: 8rpx;
+
+
+}
+
+.my_active :nth-child(2) {
+    font-size: 24rpx;
+    margin-top: 8rpx;
+    color: #ceebd9;
+}
+
+.my_hint {
+    display: flex;
+    align-items: center;
+    position: absolute;
+    left: 36rpx;
+    bottom: 44rpx;
+    font-size: 24rpx;
+    color: #ceebd9;
+
+
+}
+
+.my_hint image {
+    width: 24rpx;
+    height: 24rpx;
+    margin-right: 8rpx;
+}
+
+.star_box {
+    width: auto;
+    height: auto;
+    margin-top: 16rpx;
+    display: flex;
+    /* justify-content: space-between; */
+}
+
+.star_box image {
+    width: 20rpx;
+    height: 20rpx;
+    padding-left: 10rpx;
+    padding-right: 10rpx;
+}
+
+/* 礼品 */
+
+.gift {
+    margin: 24rpx 34rpx;
+    padding: 24rpx;
+    /* height: 288rpx; */
+    background-color: #ffffff;
+    border-radius: 7px;
+    display: flex;
+    justify-content: space-between;
+
+}
+
+.gift image {
+    width: 240rpx;
+    height: 240rpx;
+}
+
+.gift_message {
+    padding: 18rpx 0;
+    width: 374rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+}
+
+.gift_introduce {
+    font-size: 28rpx;
+    color: #323232;
+    /* overflow: hidden;
+    text-overflow: ellipsis; */
+    display: -webkit-box;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    word-break: break-all;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+
+}
+
+.gift_time {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 28rpx;
+    color: #969799;
+}
+
+.gift_exchange {
+    width: 146rpx;
+    height: 46rpx;
+    line-height: 46rpx;
+    color: #FF976A;
+    text-align: center;
+    border: 1px solid #FF976A;
+    border-radius: 7px;
+}
+.gift_exchange_time{
+    color: #21AE58;
+}
+.gift_exchange_time p{
+    font-size: 44rpx;
+}

+// pages/myteam/myteam.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {}
+}

+<view class="myteamBox" >
+    <view class="teamtop">
+        <image src="/imgs/ac14.png"></image>
+        <view class="teamAddress">北京</view>
+        <image src="/imgs/ac15.png"></image>
+        <view>50人</view>
+    </view>
+    <view class="teambottom">
+        <image src="/imgs/active.png"></image>
+        <view class="teamright">
+            <view class="teamName">河北省邯郸市丛台区白求恩第三志愿者小队</view>
+            <view class="teamTime">
+                <view>团队时长：60小时</view>
+                <view>我的时长：60小时</view>
+            </view>
+        </view>
+    </view>
+</view>

+/* pages/myteam/myteam.wxss */
+
+page {
+    background-color: rgb(240, 240, 240);
+}
+
+.myteamBox {
+    margin: 24rpx 32rpx;
+    padding: 32rpx 24rpx;
+    /* height: 266rpx; */
+    background-color: #ffffff;
+    border-radius: 7px;
+    font-size: 28rpx;
+}
+
+.teamtop {
+    display: flex;
+    align-items: center;
+    color: #FF976A;
+
+}
+
+.teamtop image {
+    width: 40rpx;
+    height: 40rpx;
+}
+
+.teamAddress {
+    margin-right: 44rpx;
+}
+
+.teambottom {
+    display: flex;
+    margin-top: 24rpx;
+}
+
+.teambottom image {
+    width: 182rpx;
+    height: 132rpx;
+    border-radius: 7px;
+    margin-right: 24rpx;
+}
+
+.teamright {
+    width: 434rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+}
+
+.teamName {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #323233;
+    text-align: justify;
+}
+
+.teamTime {
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #7D7E80;
+}

+const app = getApp();
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    star_num: 3,
+    datalist: '',
+  },
+  
+  getdatalist() {
+    let that = this;
+    let url = 'index/member_center/index';
+    let head = {
+      'XX-Token': wx.getStorageSync('token')
+    }
+    app.post(url, {}, head).then((res) => {
+
+      // console.log(res);
+      that.setData({
+        datalist: res
+      })
+    }).catch((err) => {
+
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    let that = this;
+    this.getdatalist();
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+{
+  "usingComponents": {}
+}

+<!--pages/mytrain/mytrain.wxml-->
+<view class="mytrain">
+    <image src="/imgs/mytrain.png"></image>
+    <view class='my_headitem'>
+        <view class="my_headitemtop">
+            <view class='my_headitemimg'>
+                <image src="{{datalist.avatar?datalist.avatar:'/imgs/icon_59.png'}}"></image>
+            </view>
+            <view class="my_headitemname">
+                <view class='word'>{{datalist.user_nickname}}</view>
+                <view class="word1">志愿者（待学习）<image src="/imgs/more_gray.png"></image>
+                </view>
+                <!-- <view class='word'>工时: {{datalist.work_time}}h</view> -->
+                <view class='star_box'>
+                    <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'>
+                    </image>
+                    <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>1}}'>
+                    </image>
+                    <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>2}}'>
+                    </image>
+                    <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>3}}'>
+                    </image>
+                    <image src="/imgs/xingxing_xuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>4}}'>
+                    </image>
+                </view>
+            </view>
+            <view class="mystudytime">
+                <view class="time"> 50小时</view>
+                <view class="mytime">
+                    <image src="/imgs/clock.png"></image>
+                    我的学时
+                </view>
+            </view>
+
+        </view>
+    </view>
+
+    <view class="rule">
+        <view class="rule_box">
+            <view class="rule_line"></view>
+            规则
+        </view>
+        <view>
+            1.答对全部题目即可获得学时
+        </view>
+        <view>
+            2.如有题目打错不能获得学时，请认真学习后重新答题
+        </view>
+        <view>
+            3.获得的学时将同步累加计入志愿服务总工时
+        </view>
+    </view>
+
+    <view class="rule_box">
+        <view class="rule_line"></view>
+        答题
+    </view>
+
+    <view class="myanswer">
+
+        <image src="/imgs/active1.png"></image>
+        <view class="myanswer_right">
+            <view class="myanswer_name">
+                如何做一个志愿者,如何做一个负责人心的志愿者
+            </view>
+
+            <view class="myanswer_num">
+                <view>
+                    10道题
+                </view>
+                <view class="myanswer_end">
+                    完成答题
+                    <image src="/imgs/more.png"></image>
+                </view>
+            </view>
+
+        </view>
+
+    </view>
+
+
+</view>

+/* pages/mytrain/mytrain.wxss */
+page {
+  background-color: rgb(240, 240, 240);
+}
+
+.mytrain {
+  padding: 24rpx 32rpx;
+  position: relative;
+}
+
+.mytrain image {
+  width: 100%;
+  height: 232rpx;
+}
+
+/*  */
+.my_headitem {
+  position: absolute;
+  /* left: 36%; */
+  left: 64rpx;
+  top: 75rpx;
+  /* transform: translateX(-50%); */
+  color: #ffffff;
+  font-size: 32rpx;
+  /* display: flex; */
+  /* flex-wrap: wrap; */
+  /* justify-content: center; */
+  /* align-items: center; */
+}
+
+.my_headitemtop {
+  display: flex;
+
+}
+
+.my_headitemimg {
+  /* width: 100%; */
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-right: 16rpx;
+}
+
+.my_headitemname {
+  width: 260rpx;
+
+}
+
+.my_headitemimg image,
+.my_headitemimg .avator {
+  width: 132rpx;
+  height: 132rpx;
+  border-radius: 50%;
+  display: block;
+  overflow: hidden;
+}
+
+
+.my_headitem .word {
+  width: 100%;
+  /* text-align: center; */
+  margin-top: 10rpx;
+  font-size: 32rpx;
+  font-weight: bold;
+}
+
+.word1 {
+  font-size: 28rpx;
+}
+
+.word1 image {
+  width: 12rpx;
+  height: 20rpx;
+}
+
+.mystudytime {
+  margin-left: 86rpx;
+
+}
+
+.time {
+  font-size: 40rpx;
+  line-height: 56rpx;
+}
+
+.mytime {
+  font-size: 22rpx;
+  line-height: 34rpx;
+  margin-top: 8rpx;
+  display: flex;
+  align-items: center;
+}
+
+.mytime image {
+  width: 22rpx;
+  height: 22rpx;
+  margin-right: 8rpx;
+}
+.star_box {
+  width: auto;
+  height: auto;
+  margin-top: 16rpx;
+  display: flex;
+  /* justify-content: space-between; */
+}
+
+.star_box image {
+  width: 20rpx;
+  height: 20rpx;
+  padding-left: 10rpx;
+  padding-right: 10rpx;
+}
+/* 规则 */
+.rule {
+  font-size: 28rpx;
+  color: #323233;
+}
+
+.rule_box {
+  display: flex;
+  align-items: center;
+  margin-top: 24rpx;
+  margin-bottom: 16rpx;
+  font-weight: 600;
+  font-size: 32rpx;
+
+}
+
+.rule_line {
+  width: 6rpx;
+  height: 28rpx;
+  background: linear-gradient(180deg, #00cd98, #009e5f);
+  border-radius: 4px;
+  margin-right: 18rpx;
+}
+
+.myanswer {
+  padding: 24rpx 24rpx;
+  border-radius: 7px;
+  background-color: #ffffff;
+  display: flex;
+  font-size: 28rpx;
+
+}
+
+.myanswer image {
+  width: 182rpx;
+  height: 138rpx;
+  margin-right: 24rpx;
+  border-radius: 7px;
+}
+
+.myanswer_right {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+
+.myanswer_num {
+  display: flex;
+  justify-content: space-between;
+  font-size: 28rpx;
+  color: #7D7E80;
+
+}
+
+.myanswer_num image {
+  width: 16rpx;
+  height: 22rpx;
+}
+
+.myanswer_end {
+  color: #21AE58;
+}
+
+.myanswer_end image {
+  margin-left: 5rpx;
+}

@@ -6,20 +6,33 @@
     "setting": {
     "setting": {
         "urlCheck": false,
         "urlCheck": false,
         "es6": true,
         "es6": true,
+        "enhance": false,
         "postcss": true,
         "postcss": true,
+        "preloadBackgroundData": false,
         "minified": true,
         "minified": true,
         "newFeature": true,
         "newFeature": true,
         "coverView": true,
         "coverView": true,
+        "nodeModules": false,
         "autoAudits": false,
         "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": true,
         "checkInvalidKey": true,
         "checkInvalidKey": true,
         "checkSiteMap": true,
         "checkSiteMap": true,
         "uploadWithSourceMap": true,
         "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "useMultiFrameRuntime": false,
+        "useApiHook": false,
         "babelSetting": {
         "babelSetting": {
             "ignore": [],
             "ignore": [],
             "disablePlugins": [],
             "disablePlugins": [],
             "outputPath": ""
             "outputPath": ""
         },
         },
-		"uglifyFileName": true
+        "useIsolateContext": true,
+        "useCompilerModule": true,
+        "userConfirmedUseCompilerModuleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": []
     },
     },
     "compileType": "miniprogram",
     "compileType": "miniprogram",
     "libVersion": "2.8.3",
     "libVersion": "2.8.3",
@@ -61,6 +74,82 @@
                     "pathName": "pages/word_report/word_report",
                     "pathName": "pages/word_report/word_report",
                     "query": "id=17&status=1",
                     "query": "id=17&status=1",
                     "scene": null
                     "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/myteam/myteam",
+                    "pathName": "pages/myteam/myteam",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/mytrain/mytrain",
+                    "pathName": "pages/mytrain/mytrain",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/Online_regulations/Online_regulations",
+                    "pathName": "pages/Online_regulations/Online_regulations",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/getStudycontent/getStudycontent",
+                    "pathName": "pages/getStudycontent/getStudycontent",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/apply/apply",
+                    "pathName": "pages/apply/apply",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/Volunteer_detail/Volunteer_detail",
+                    "pathName": "pages/Volunteer_detail/Volunteer_detail",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/myfeedback/myfeedback",
+                    "pathName": "pages/myfeedback/myfeedback",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/myaddress/myaddress",
+                    "pathName": "pages/myaddress/myaddress",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/Volunteer_dynamic/Volunteer_dynamic",
+                    "pathName": "pages/Volunteer_dynamic/Volunteer_dynamic",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/guanlitiaoli/guanlitiaoli",
+                    "pathName": "pages/guanlitiaoli/guanlitiaoli",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "pages/mycertificate/mycertificate",
+                    "pathName": "pages/mycertificate/mycertificate",
+                    "scene": null
                 }
                 }
             ]
             ]
         }
         }