志愿修改

niufei
zhiyuanzhe/pages/apply/apply.wxml
zhiyuanzhe/pages/apply/apply.wxss
zhiyuanzhe/pages/img_txt/img_txt.js
zhiyuanzhe/pages/img_txt/img_txt.wxml
zhiyuanzhe/pages/index/active/active.js
zhiyuanzhe/pages/index/active/active.wxml
zhiyuanzhe/pages/index/active/active.wxss
zhiyuanzhe/pages/index/index.js
zhiyuanzhe/pages/index/index.wxml
zhiyuanzhe/pages/index/index.wxss
zhiyuanzhe/pages/my/my_active/my_active.wxml
zhiyuanzhe/pages/my/my_active/my_active.wxss
--- a/zhiyuanzhe/pages/apply/apply.wxml
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/apply/apply.wxml
查看文件 @8509f92
-<!--pages/apply/apply.wxml-->
-<view class='upimg' bindtap='{{ifempower?"uploadImages":""}}' data-tem='1'>
-<button open-type='getUserInfo' bindgetuserinfo='start'  class='inofbtn' if='{{!ifempower}}'  data-tem='1'></button>
+<view class='avator_box'>
+  <view class='upimg' bindtap='{{ifempower?"uploadImages":""}}' data-tem='1'>
+    <button open-type='getUserInfo' bindgetuserinfo='start' class='inofbtn' if='{{!ifempower}}' data-tem='1'></button>
     <image src='{{photo}}' wx:if='{{photo}}'></image>
- <view class='iconfont icon-xiangji' wx:if='{{!photo}}' ></view>
+    <view class='iconfont icon-xiangji' wx:if='{{!photo}}'></view>
+
+  </view>
+
+  <view class='tips_word'>请选择1:1的图像</view>
 </view>
+
+
+
 <view class='apply_item'>
   <view>姓名</view>
   <view class='apply_item_input'>
-  <input placeholder='未填写' placeholder-class='input_p' bindinput='setname' value='{{name}}' ></input>
+    <input placeholder='未填写' placeholder-class='input_p' bindinput='setname' value='{{name}}'></input>
   </view>
 </view>
 <picker bindchange="bindsex" range="{{arraysex}}">
   <view class='apply_item'>
-  <view >姓别</view>
+    <view>姓别</view>
     <view class='apply_item_input'>
       <view class='iconfont icon-xiangyou'></view>
       <view class='apply_itemtxt {{arraysex[sex-1]?"color333":""}}'>{{arraysex[sex-1]?arraysex[sex-1]:'请选择'}}</view>
@@ -29,7 +36,7 @@
   </view>
 </picker>
 <picker range='{{nationarr}}' bindchange="bindnationChange">
- <view class='apply_item' >
+  <view class='apply_item'>
     <view>民族</view>
     <view class='apply_item_input'>
       <view class='iconfont icon-xiangyou'></view>
@@ -122,13 +129,13 @@
   </view>
 </view>
- <view class='apply_item' bindtap='setshowapply'>
+<view class='apply_item' bindtap='setshowapply'>
   <view>服务区域</view>
   <view class='apply_item_input'>
     <view class='iconfont icon-xiangyou'></view>
     <view class='apply_itemtxt {{address?"color333":""}}'>{{address?address:'请选择'}}</view>
   </view>
- </view>
+</view>
@@ -157,8 +164,8 @@
         <view class='apply_itemtxt {{record[apply_nav].record_start_time?"color333":""}}'>{{record[apply_nav].record_start_time?record[apply_nav].record_start_time:'请选择'}}</view>
       </view>
     </view>
-</picker>
-<picker mode='date' bindchange="bindendChange">
+  </picker>
+  <picker mode='date' bindchange="bindendChange">
     <view class='apply_item'>
       <view>结束时间</view>
       <view class='apply_item_input'>
@@ -166,7 +173,7 @@
         <view class='apply_itemtxt {{record[apply_nav].record_end_time?"color333":""}}'>{{record[apply_nav].record_end_time?record[apply_nav].record_end_time:'请选择'}}</view>
       </view>
     </view>
-</picker>
+  </picker>
   <view class='apply_item'>
     <view>单位名称</view>
     <view class='apply_item_input'>
@@ -195,7 +202,7 @@
 <view class='apply_title'>上传身份证照片</view>
 <view class='apply_idbox'>
   <view class='apply_idimg' bindtap='uploadImages' data-tem='2'>
-  <view class='apply_idimgmain' wx:if='{{!front_card}}' >
+    <view class='apply_idimgmain' wx:if='{{!front_card}}'>
       <view class='apply_idupimg'>
         <text class='iconfont icon-camera1'></text>
       </view>
@@ -204,7 +211,7 @@
     <image src='{{front_card?front_card:"https://volunteer.cnpu.org/imgs/renzhengxinxi_fanmian_bg@2x.png"}}'></image>
   </view>
   <view class='apply_idimg' bindtap='uploadImages' data-tem='3'>
-  <view class='apply_idimgmain' wx:if='{{!reverse_card}}' >
+    <view class='apply_idimgmain' wx:if='{{!reverse_card}}'>
       <view class='apply_idupimg'>
         <text class='iconfont icon-camera1'></text>
       </view>
@@ -216,16 +223,15 @@
 <view class='apply_bottomtitle'>志愿者申请书
 </view>
 <view class='apply_bottom'>
-  为继承和弘扬国际主义战士白求恩的伟大风范和高尚情操，传承和弘扬白求恩的伟大精神，本人自愿申请加入白求恩志愿者队伍。
-    本人愿尽己所能，以“志愿服务”为宗旨，不计报酬、帮助他人、服务社会，恪守国家法律、法规，遵守白求恩志愿者各项规章制度，努力工作，尽职尽责，力争为公益事业做出贡献。
- </view>
- <view class='apply_btn' bindtap='submit' >
+  为继承和弘扬国际主义战士白求恩的伟大风范和高尚情操，传承和弘扬白求恩的伟大精神，本人自愿申请加入白求恩志愿者队伍。 本人愿尽己所能，以“志愿服务”为宗旨，不计报酬、帮助他人、服务社会，恪守国家法律、法规，遵守白求恩志愿者各项规章制度，努力工作，尽职尽责，力争为公益事业做出贡献。
+</view>
+<view class='apply_btn' bindtap='submit'>
   提交
- </view>
+</view>
- <!-- 服务区域 -->
- <view class='apply_vold' wx:if='{{showapply}}' >
+<!-- 服务区域 -->
+<view class='apply_vold' wx:if='{{showapply}}'>
   <view class='pickerview'>
     <picker-view indicator-style="height: 40px;" class='pickerview_top' value="{{confirmvalarr}}" bindchange="bindChange">
       <view class='iconfont icon-guanbi1' catchtap='setshowapply_no'></view>
@@ -244,4 +250,4 @@
       <view class='applybtn yes_applybtn' catchtap='setyes'>确定</view>
     </view>
   </view>
- </view>
+</view>
--- a/zhiyuanzhe/pages/apply/apply.wxss
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/apply/apply.wxss
查看文件 @8509f92
 /* pages/apply/apply.wxss */
-.upimg{
+
+.upimg {
   position: relative;
   display: flex;
   align-items: center;
   justify-content: center;
- color:#fff;
- font-size:40rpx;
- width:120rpx;
+  color: #fff;
+  font-size: 40rpx;
+  width: 120rpx;
   height: 120rpx;
   border-radius: 50%;
   overflow: hidden;
   margin: 24rpx auto 34rpx auto;
- background: #CCCCCC;
+  background: #ccc;
 }
-.upimg image{
+
+.upimg image {
   display: block;
- width:100%;
+  width: 100%;
   height: 100%;
   border-radius: 50%;
 }
-.upimg .iconfont{
+
+.upimg .iconfont {
   position: absolute;
- top:50%;
- left:50%;
- transform: translate(-50%,-50%);
- color:#fff;
- font-size:50rpx;
-}
-.apply_item{
- color:#333333;
- font-size:28rpx;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  color: #fff;
+  font-size: 50rpx;
+}
+
+.tips_word {
+  width: 100%;
+  text-align: center;
+  color: #ccc;
+  font-size: 28rpx;
+}
+
+.apply_item {
+  color: #333;
+  font-size: 28rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
   margin: 0 32rpx;
- border-bottom:1rpx solid #e6e6e6;
- padding:30rpx 0;
+  border-bottom: 1rpx solid #e6e6e6;
+  padding: 30rpx 0;
 }
-.apply_item_input{
+.apply_item_input {
   display: flex;
   align-items: center;
   flex-direction: row-reverse;
- width:70%;
- color:#333;
- font-size:28rpx;
+  width: 70%;
+  color: #333;
+  font-size: 28rpx;
 }
-.apply_item_input input{
- width:100%;
+
+.apply_item_input input {
+  width: 100%;
 }
-.apply_item_input .iconfont{
- color:#ccc;
+
+.apply_item_input .iconfont {
+  color: #ccc;
 }
-.big_item .apply_item_input{
- width:60%;
+
+.big_item .apply_item_input {
+  width: 60%;
 }
-.apply_item_input input{
+
+.apply_item_input input {
   text-align: right;
 }
-.input_p{
- color:#ccc;
- font-size:28rpx;
+
+.input_p {
+  color: #ccc;
+  font-size: 28rpx;
 }
-.apply_itemtxt{
- color:#ccc;
- font-size:28rpx;
+
+.apply_itemtxt {
+  color: #ccc;
+  font-size: 28rpx;
 }
-.apply_nav{
+
+.apply_nav {
   display: flex;
   align-items: center;
   margin: 70rpx 32rpx 0rpx 32rpx;
 }
-.apply_cell{
+
+.apply_cell {
   position: relative;
   margin: 0 50rpx 0 0;
- color:#999;
- font-size:26rpx;
+  color: #999;
+  font-size: 26rpx;
 }
-.apply_active{
+
+.apply_active {
   position: relative;
- color:#21AE59;
-}
-.apply_active::after{
-position: absolute;
-width:100%;
-bottom:-5rpx;
-background:#21AE59; 
-left:0;
-height: 2rpx;
-content: '';
-z-index:10;
-}
-.apply_title{
+  color: #21ae59;
+}
+
+.apply_active::after {
+  position: absolute;
+  width: 100%;
+  bottom: -5rpx;
+  background: #21ae59;
+  left: 0;
+  height: 2rpx;
+  content: '';
+  z-index: 10;
+}
+
+.apply_title {
   margin: 34rpx 32rpx;
- color:#333;
- font-size:28rpx;
+  color: #333;
+  font-size: 28rpx;
 }
-.apply_idbox{
+
+.apply_idbox {
   margin: 0 32rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.apply_idimg{
+
+.apply_idimg {
   position: relative;
- width:49%;
+  width: 49%;
   height: 202rpx;
- border:1rpx solid #e6e6e6;
+  border: 1rpx solid #e6e6e6;
   display: flex;
   align-items: center;
   justify-content: center;
   border-radius: 8rpx;
 }
-.apply_idimg image{
+
+.apply_idimg image {
   height: 100%;
- width:100%;
+  width: 100%;
   display: block;
 }
-.apply_idimgmain{
+
+.apply_idimgmain {
   position: absolute;
- top:50%;
- left:50%;
+  top: 50%;
+  left: 50%;
   display: flex;
   align-items: center;
   justify-content: center;
   flex-direction: column;
- width:100%;
+  width: 100%;
   height: 100%;
- transform: translate(-50%,-50%);
- color:#666;
- font-size:26rpx;
+  transform: translate(-50%, -50%);
+  color: #666;
+  font-size: 26rpx;
 }
-.apply_idupimg{
+
+.apply_idupimg {
   display: flex;
   align-items: center;
   justify-content: center;
- width:74rpx;
+  width: 74rpx;
   height: 74rpx;
   border-radius: 50%;
- background: #41CD79;
- color:#fff;
- font-size:40rpx;
+  background: #41cd79;
+  color: #fff;
+  font-size: 40rpx;
   margin: 0 0 20rpx 0;
 }
-.apply_idupimg .iconfont{
+
+.apply_idupimg .iconfont {
   font-size: 30rpx;
 }
-.apply_bottomtitle{
+
+.apply_bottomtitle {
   margin: 74rpx 0 26rpx 0;
   text-align: center;
- color:#333333;
- font-size:33rpx;
+  color: #333;
+  font-size: 33rpx;
   font-weight: bold;
 }
-.apply_bottom{
+
+.apply_bottom {
   margin: 0 32rpx 58rpx 32rpx;
- color:#666;
- font-size:26rpx;
+  color: #666;
+  font-size: 26rpx;
   line-height: 50rpx;
 }
-.apply_btn{
+
+.apply_btn {
   position: relative;
   margin: 0 32rpx 32rpx 32rpx;
   height: 88rpx;
   line-height: 88rpx;
- background: #41CD79;
- color:#fff;
- font-size:32rpx;
+  background: #41cd79;
+  color: #fff;
+  font-size: 32rpx;
   display: flex;
   align-items: center;
   justify-content: center;
   border-radius: 8rpx;
 }
-.apply_btn:active{
+
+.apply_btn:active {
   opacity: 0.7;
 }
-.color333{
- color:#333;
+
+.color333 {
+  color: #333;
 }
-.apply_vold{
+.apply_vold {
   position: fixed;
- top:0;
- left:0;
- width:100%;
+  top: 0;
+  left: 0;
+  width: 100%;
   height: 100%;
- background: rgba(0,0,0,0.2);
+  background: rgba(0, 0, 0, 0.2);
   z-index: 10;
   display: flex;
   /* display: none; */
   justify-content: center;
   align-items: center;
 }
-.pickerview{
+
+.pickerview {
   position: relative;
   background: #fff;
- width:100%;
+  width: 100%;
   margin: 0 auto;
   overflow: hidden;
 }
-.pickerview .icon-guanbi1{
+
+.pickerview .icon-guanbi1 {
   position: absolute;
   font-weight: bold;
   font-size: 40rpx;
- top:20rpx;
+  top: 20rpx;
   right: 50rpx;
- color:#333;
- z-index:100;
+  color: #333;
+  z-index: 100;
 }
-.pickerview_top{
- width:100%;
- padding:0 30rpx;
+
+.pickerview_top {
+  width: 100%;
+  padding: 0 30rpx;
   height: 400rpx;
 }
-.apply_vold_btn{
+
+.apply_vold_btn {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.applybtn{
+
+.applybtn {
   position: relative;
- border:1rpx solid #f6f6f6;
- color:#333;
+  border: 1rpx solid #f6f6f6;
+  color: #333;
   font-size: 40rpx;
   height: 80rpx;
- width:50%;
+  width: 50%;
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.inofbtn{
- position: absolute;
- top:0;
- left:0;
- width:100%;
+.inofbtn {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
   height: 100%;
- z-index:10;
+  z-index: 10;
   opacity: 0;
-
 }
-.applybtn:active{
+
+.applybtn:active {
   opacity: 0.7;
 }
-.yes_applybtn{
+
+.yes_applybtn {
   background-color: #04be02;
- color:#fff;
- border:1rpx solid #04be02;
+  color: #fff;
+  border: 1rpx solid #04be02;
 }
-.column_view{
+
+.column_view {
   display: flex;
   justify-content: center;
   align-items: center;
--- a/zhiyuanzhe/pages/img_txt/img_txt.js
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/img_txt/img_txt.js
查看文件 @8509f92
@@ -196,13 +196,42 @@ Page({
     }).catch((err) => {
     })
+  },
+  get_news(){
+    let that = this;
+    let head = {
+      'XX-Token': wx.getStorageSync('token')
+    }
+    let url = '/index/index/news_info';
+    let params = {
+      id: that.data.id
+    }
+    app.post(url, params, head).then((res) => {
+      that.setData({
+        datalist: res
+      })
+      wxParse.wxParse('content', 'html', res.content, that, 5);
+    }).catch((err) => {
+    })
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+    console.log(options)
     let that = this;
+    if (options.type == 1){
+      wx.setNavigationBarTitle({
+        title: '活动详情'
+      })
+      that.setData({
+        type: options.type,
+        id: options.id,
+        status: options.status
+      })
+      that.get_news()
+    } else {
       if (options.status == '1') {
         that.setData({
           id: options.id,
@@ -230,6 +259,8 @@ Page({
         that.getdatalist();
       }
       that.getSystemInfo()
+    }
+    
   },
   /**
--- a/zhiyuanzhe/pages/img_txt/img_txt.wxml
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/img_txt/img_txt.wxml
查看文件 @8509f92
-
 <view class='main'>
   <view class='top_img'>
     <image src='{{datalist.thumbnail}}'></image>
@@ -10,7 +9,7 @@
     <import src="../../wxParse/wxParse.wxml" />
     <template is='wxParse' data='{{wxParseData:content.nodes}}' />
   </view>
-  <view class='memberbox' wx:if='{{datalist.join.length>0}}'>
+  <view class='memberbox' wx:if='{{datalist.join.length>0 && type != 1}}'>
     <view class='title'>已成功报名人员</view>
     <view class='member' wx:for='{{datalist.join}}' wx:key=''>
       <image src='{{item.photo}}'></image>
@@ -18,13 +17,14 @@
     </view>
   </view>
 </view>
-<view class='foot' bindtap='enroll' wx:if='{{datalist.button_status == 1}}'>报名</view>
-<view class='foot' wx:if='{{datalist.button_status == 2}}'>待审核</view>
-<view class='foot' bindtap='sign' wx:if='{{datalist.button_status == 3}}'>签到</view>
-<view class='foot' wx:if='{{datalist.button_status == 4}}'>已签到</view>
-<view class='foot' wx:if='{{datalist.button_status == 5}}'>已结束</view>
-<navigator url='/pages/result/result' class='foot' wx:if='{{datalist.button_status == 6}}'>成为志愿者</navigator>
-<view class='cover' style='width:100%;height:{{height}};' wx:if='{{cover_type}}'>
+<view wx:if="{{type!= 1}}">
+  <view class='foot' bindtap='enroll' wx:if='{{datalist.button_status == 1}}'>报名</view>
+  <view class='foot' wx:if='{{datalist.button_status == 2}}'>待审核</view>
+  <view class='foot' bindtap='sign' wx:if='{{datalist.button_status == 3}}'>签到</view>
+  <view class='foot' wx:if='{{datalist.button_status == 4}}'>已签到</view>
+  <view class='foot' wx:if='{{datalist.button_status == 5}}'>已结束</view>
+  <navigator url='/pages/result/result' class='foot' wx:if='{{datalist.button_status == 6}}'>成为志愿者</navigator>
+  <view class='cover' style='width:100%;height:{{height}};' wx:if='{{cover_type}}'>
     <view class='toast_box'>
       <view class='cover_box' catchtap=''>
         <view class='title'>报名方式</view>
@@ -50,4 +50,6 @@
       </view>
     </view>
+  </view>
+
 </view>
--- a/zhiyuanzhe/pages/index/active/active.js
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/index/active/active.js
查看文件 @8509f92
@@ -5,6 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    city_id: '',
     clickIndex: true,
     index:0,
     datalist: [],
@@ -18,6 +19,7 @@ Page({
     category: '选择分类',
   },
   selecteCtiy(e){
+    console.log(e)
     this.setData({
       city: this.data.city_arr[e.detail.value],
       city_id: this.data.city_arrid[e.detail.value]
@@ -25,6 +27,7 @@ Page({
     this.city_active()
   },
   selecteClass(e) {
+    console.log(e)
     this.setData({
       category: this.data.class_arr[e.detail.value],
       type: this.data.class_arrid[e.detail.value]
@@ -35,6 +38,7 @@ Page({
    * 切换
    */
   clicktab(e) {
+    console.log(e)
     let that = this
     let id = e.currentTarget.dataset.id
     if (id == '2') {
@@ -42,13 +46,11 @@ Page({
         clickIndexs: true,
         clickIndex: false
       })
-      this.type_active()
     } else if (id == '1') {
       that.setData({
         clickIndexs: false,
         clickIndex: true
       })
-      this.city_active()
     }
     //调用接口
   },
@@ -149,9 +151,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    let that = this;
-
-    
   },
--- a/zhiyuanzhe/pages/index/active/active.wxml
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/index/active/active.wxml
查看文件 @8509f92
@@ -25,7 +25,7 @@
           </view>
           <view class='new_title'>{{item.activity_name}}</view>
           <view class='title_box'>
-            <view>
+            <view class='wz_box'>
               <image src='/imgs/dizhi@2x.png' />
               <text>{{item.province_name}}</text>
             </view>
--- a/zhiyuanzhe/pages/index/active/active.wxss
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/index/active/active.wxss
查看文件 @8509f92
@@ -50,7 +50,11 @@
   font-size: 28rpx;
 }
-
+.wz_box{
+   overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .title_box {
   margin: 18rpx 0 13rpx 0;
@@ -68,6 +72,9 @@
 .title_box .word{
   color: #666;
   font-size: 24rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .tabbar {
   width: 100%;
--- a/zhiyuanzhe/pages/index/index.js
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/index/index.js
查看文件 @8509f92
-const app=getApp();
+const app = getApp();
 Page({
   /**
@@ -6,57 +6,55 @@ Page({
    */
   data: {
     star_num: 3,
-   datalist:[],
-   activity_page:0,
-   activity:[]
+    datalist: [],
+    activity_page: 0,
+    activity: [],
+    page_type: true
   },
-  getdatalist(){
-   let that=this;
-   let url ='index/index/index';
+  getdatalist() {
+    let that = this;
+    let url = 'index/index/index';
     let head = {
       'XX-Token': wx.getStorageSync('token')
     }
-   let params={
-    volunteer_page:0,
-    volunteer_pageNum:3,
+    let params = {
+      volunteer_page: 0,
+      volunteer_pageNum: 3,
       activity_page: that.data.activity_page,
-    activity_pageNum:4
-   }
-   app.post(url, params, head).then((res)=>{
-    let activity = res.activity;
-    let tem = [];
-    let temactivity = [];
-    for (let i = 0; i < activity.length; i++) {
-     tem.push(activity[i])
-     if ((i + 1) != activity.length){
-      if ((i + 1) % 2 == 0) {
-       temactivity.push(tem);
-       tem = [];
+      activity_pageNum: 4
     }
-     }else{
-      temactivity.push(tem);
-      tem = [];
-     }
-     
-    
+    app.post(url, params, head).then((res) => {
+      console.log(res)
+      if (res.news.length > 0) {
+        that.setData({
+          page_type: true
+        })
+      } else {
+        that.setData({
+          page_type: false
+        })
       }
-    let dataactivity = that.data.activity;
-    let temdataactivity = dataactivity.concat(temactivity);
+      if (that.data.news == null) {
+        that.setData({
+          datalist: res,
+          activity: res.activity,
+          //  activity_page: res.activity_page,
+          news: res.news
+        })
+      } else {
         that.setData({
-     datalist:res,
-     activity: temdataactivity,
-     activity_page: res.activity_page,
-      begin: res.begin
+          news: that.data.news.concat(res.news)
         })
-   }).catch((err)=>{
+      }
+    }).catch((err) => {
     })
   },
   //判断是否登陆
- get_token(){
-let that=this;
+  get_token() {
+    let that = this;
     wx.login({
-   success: function (s) {
+      success: function(s) {
         let url = 'wxapp/public/getSessionKey';
         if (s.code) {
           var code = s.code;
@@ -64,13 +62,13 @@ let that=this;
             code: code
           }
           app.post(url, param).then((res) => {
-      let url ='wxapp/public/get_token';
-      let params={
+            let url = 'wxapp/public/get_token';
+            let params = {
               openid: res.openid
             }
-      app.post(url, params).then((res)=>{
+            app.post(url, params).then((res) => {
               console.log(res);
-       if(res.data){
+              if (res.data) {
                 wx.setStorageSync('token', res.data);
                 that.setData({
                   datalist: [],
@@ -78,12 +76,12 @@ let that=this;
                   activity: []
                 })
                 that.getdatalist();
-       }else{
+              } else {
                 wx.redirectTo({
                   url: '/pages/start/start'
                 })
               }
-      }).catch((err)=>{
+            }).catch((err) => {
             })
           }).catch((errMsg) => {
@@ -96,64 +94,78 @@ let that=this;
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-   let windowHeight = wx.getSystemInfoSync().windowHeight;// 屏幕的高度
-   let windowWidth = wx.getSystemInfoSync().windowWidth // 屏幕的宽度
-   this.setData({
-    scroll_height: windowHeight * 750 / windowWidth
-   }) 
+  onLoad: function(options) {
+    let that = this;
+    that.get_token();
+    // let windowHeight = wx.getSystemInfoSync().windowHeight; // 屏幕的高度
+    // let windowWidth = wx.getSystemInfoSync().windowWidth // 屏幕的宽度
+    // this.setData({
+    //   scroll_height: windowHeight * 750 / windowWidth
+    // })
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
+  onReady: function() {
   },
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
-   let that = this;
+  onShow: function() {
-   that.get_token();
   },
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {
+  onHide: function() {
   },
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {
+  onUnload: function() {
   },
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
   },
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
-    
+  onReachBottom: function() {
+    let that = this
+    if (that.data.page_type == false) {
+      wx.showToast({
+        title: '暂无更多数据',
+        icon: 'none',
+        duration: 1000
+      })
+      return false
+    }
+    console.log(that.data.activity_page)
+    that.setData({
+      activity_page: that.data.activity_page + 1
+    })
+    console.log(that.data.activity_page)
+    that.getdatalist()
   },
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
   }
 })
--- a/zhiyuanzhe/pages/index/index.wxml
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/index/index.wxml
查看文件 @8509f92
-<!--index.wxml-->
-<scroll-view scroll-y='true' bindscrolltolower='getdatalist' style='height:{{scroll_height}}rpx'>
+
+<!-- <scroll-view scroll-y='true' bindscrolltolower='getdatalist' style='height:{{scroll_height}}rpx'> -->
   <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-item>
@@ -41,14 +41,14 @@
     <view>
       <view class='new_box'>
-        <navigator class='new_cell' wx:for='{{begin}}' 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 url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none">
           <view class='new_cellmain'>
             <view class='new_img'>
               <image src='{{item.thumbnail}}'> </image>
             </view>
             <view class='new_title'>{{item.activity_name}}</view>
             <view class='title_box'>
-              <view>
+              <view class='wz_box'>
                 <image src='/imgs/dizhi@2x.png' />
                 <text>{{item.province_name}}</text>
               </view>
@@ -64,8 +64,8 @@
   <view class='index_newbox'>
     <view class='title activity_title'>活动快讯</view>
     <view>
-      <view class='new_box' wx:for='{{activity}}' wx:key>
-        <navigator class='new_cell' wx:for='{{item}}' wx:key url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none">
+      <view class='new_box'>
+        <navigator class='new_cell' wx:for='{{news}}' wx:key url='/pages/img_txt/img_txt?id={{item.id}}&status=1&type=1' hover-class="none">
           <view class='new_cellmain'>
             <view class='new_img'>
               <image src='{{item.thumbnail}}'> </image>
@@ -77,4 +77,4 @@
       </view>
     </view>
   </view>
-</scroll-view>
+<!-- </scroll-view> -->
--- a/zhiyuanzhe/pages/index/index.wxss
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/index/index.wxss
查看文件 @8509f92
-/**index.wxss**/
-
 .slide-image {
   height: 300rpx;
   width: 100%;
@@ -43,7 +41,6 @@
   color: #999;
   font-size: 26rpx;
   display: flex;
-  /* justify-content: space-between; */
   align-items: center;
 }
@@ -75,7 +72,7 @@
   height: 100%;
   display: block;
 }
-/* 22 */
+
 .index_newbox {
   margin: 32rpx 0rpx 0 0rpx;
 }
@@ -88,13 +85,12 @@
   padding: 0 32rpx;
   font-size: 24rpx;
   flex-wrap: wrap;
-  border-bottom: 1rpx solid #e6e6e6;
+  border-bottom: 2rpx solid #e6e6e6;
 }
 .new_cell {
   width: 48%;
   padding: 29rpx 0rpx;
-  /* border-bottom:1rpx solid #E6E6E6; */
 }
 .new_cell:nth-child(2n) {
@@ -121,9 +117,12 @@
 }
 .new_title {
-  white-space: nowrap;
-  text-overflow: ellipsis;
   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;
@@ -144,30 +143,45 @@
   align-items: center;
   justify-content: space-between;
 }
-.title_box image{
+
+.title_box image {
   width: 30rpx;
   height: 30rpx;
   margin-right: 10rpx;
 }
-.title_box .word{
+
+
+.wz_box{
+   overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.title_box .word {
+  max-width: 200rpx;
   color: #666;
   font-size: 24rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
+
 .star_box {
   width: auto;
   height: auto;
   margin-top: 16rpx;
-  
 }
+
 .star_box image {
   width: 28rpx;
   height: 26rpx;
   padding-left: 5rpx;
   padding-right: 5rpx;
 }
-.star_box image:first-child{
+
+.star_box image:first-child {
   padding-left: 0;
 }
-.star_box image:last-child{
+
+.star_box image:last-child {
   padding-right: 0;
 }
--- a/zhiyuanzhe/pages/my/my_active/my_active.wxml
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/my/my_active/my_active.wxml
查看文件 @8509f92
@@ -8,11 +8,11 @@
             </view>
             <view class='new_title'>{{item.activity_name}}</view>
             <view class='title_box'>
-              <view>
+              <view class='wz_box'>
                 <image src='/imgs/dizhi@2x.png' />
-                <text>北京</text>
+                <text>{{item.province_name}}</text>
               </view>
-              <view class='word'>{{item.type_name}}</view>
+              <view class='word'>{{item.type_name}}大傻瓜发啊发事发发</view>
             </view>
             <view>{{item.create_time}}</view>
           </view>
--- a/zhiyuanzhe/pages/my/my_active/my_active.wxss
查看文件 @8509f92
+++ b/zhiyuanzhe/pages/my/my_active/my_active.wxss
查看文件 @8509f92
@@ -63,6 +63,7 @@
   border: 2rpx solid #999;
   font-size: 28rpx;
 }
+
 .title_box {
   margin: 18rpx 0 13rpx 0;
   color: #292929;
@@ -71,14 +72,24 @@
   align-items: center;
   justify-content: space-between;
 }
-.title_box image{
+
+.title_box image {
   width: 30rpx;
   height: 30rpx;
   margin-right: 10rpx;
 }
-.title_box .word{
+.wz_box{
+   overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.title_box .word {
+  max-width: 200rpx;
   color: #666;
   font-size: 24rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .empty{
   width: 100%;