update

陈晓峰
1 parent 47c77a5f
Showing 8 changed files with 101 additions and 93 deletions
app.js
pages/activity/join/join.wxss
pages/contact/contact.wxml
pages/index/index.js
pages/index/index.json
pages/index/index.wxml
pages/jobfairdetail/jobfairdetail.js
pages/member/member.js
--- a/app.js
View file @2c9efa2
+++ b/app.js
View file @2c9efa2
 App({
-  url: 'https://nature.docroot.drupalagile.com',
+  url: 'https://stg.natureresearch.cn',
   onLaunch: function () {
     this.getUserInfo()
@@ -25,7 +25,7 @@ App({
                 typeof cb == "function" && cb(that.globalData.userInfo);
                 //插入修改会员表返回openid
                 wx.request({
-                  url: 'https://nature.docroot.drupalagile.com/mpapi/1.0.0/user/login',
+                  url: 'https://stg.natureresearch.cn/mpapi/1.0.0/user/login',
                   method: 'POST',
                   header: {
                     'content-type': 'application/json',
--- a/pages/activity/join/join.wxss
View file @2c9efa2
+++ b/pages/activity/join/join.wxss
View file @2c9efa2
@@ -44,7 +44,7 @@ page {
 .content2 .li {
   position: relative;
-  margin-bottom: 6rpx;  
+   /* margin-top: 6rpx;  */
 }
 .content2 .li image {
--- a/pages/contact/contact.wxml
View file @2c9efa2
+++ b/pages/contact/contact.wxml
View file @2c9efa2
@@ -10,7 +10,7 @@
     </view> -->
   </view>
   <view class="video">
-    <video src="https://www.natureresearch.cn/sites/default/files/videos/NatureResearch.mp4"
+    <video src="https://stg.natureresearch.cn/sites/default/files/videos/NatureResearch.mp4"
       binderror="videoErrorCallback" poster="http://xcx.yiscio.com/app/shipin.png" controls></video>
   </view>
   <view class="content1">
--- a/pages/index/index.js
View file @2c9efa2
+++ b/pages/index/index.js
View file @2c9efa2
@@ -12,7 +12,7 @@ Page({
     imgheight: 0,
     num: 0,
     gun: true,
-    scrollTop1: '60',
+    scrollTop1: '',
     countTotal: '',
     right: true,
     xiala: true,
@@ -84,6 +84,18 @@ Page({
     ]
   },
+  queryMultipleNodes: function () {
+    var query = wx.createSelectorQuery()
+    query.select('#the-id').boundingClientRect()
+    query.selectViewport().scrollOffset()
+    query.exec(function (res) {
+      console.log('qwe', res)
+      console.log('fgf', res[0].top)
+      res[0].top       // #the-id节点的上边界坐标
+      res[1].scrollTop // 显示区域的竖直滚动位置
+    })
+    
+  },
   onLoad: function (options) {
     var that = this
     var con = that.data.con
@@ -197,7 +209,7 @@ Page({
     }, 2000)
-
+    this.queryMultipleNodes()
   },
   // imageLoad: function (e) {
   //   console.log('asdasfsdfg',e)
@@ -213,7 +225,7 @@ Page({
   //   })
   // },
   scroll: function (e) {
-    // console.log('aa', e)
+    console.log('aa', e)
     // console.log(e.detail.scrollTop);
     var that = this
     var num = that.data.num
@@ -226,6 +238,11 @@ Page({
     that.setData({
       scrollTop: scrollTop
     })
+
+  
+
+
+
     if (scrollTop == 0) {
       // var that = this
       // var skey = that.data.skey
@@ -503,6 +520,60 @@ Page({
     console.log('下拉', e)
   },
   lower: function (e) {
+   
+
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+    var that = this
+    //  wx.showToast({
+    //     title: 'loading...',
+    //     icon: 'loading'
+    //   })
+    setTimeout(function () {
+      wx.stopPullDownRefresh()
+    }, 1500)
+    that.setData({
+      currentTab: 10
+      // con: res.data.data
+    })
+    that.onLoad()
+  },
+  /**
+   * 监听页面滚动事件
+   */ 
+  onPageScroll:function(e){
+    // console.log('eeeee',e)
+    var that = this
+    var scrollTop =e.scrollTop
+    that.setData({
+      scrollTop: scrollTop
+    })
+    // console.log('scrol2',scrollTop)
+  },
+
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function (e) {
+    var that = this
     console.log('上啦', e)
     var that = this
     var skey = that.data.skey
@@ -684,38 +755,6 @@ Page({
   },
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-    console.log('下拉')
-    setTimeout(function () {
-      wx.stopPullDownRefresh()
-    }, 1500)
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  // onReachBottom: function () {
-  //   var that = this
-  //   console.log('上拉')
-
-  // },
   /**
    * 用户点击右上角分享
--- a/pages/index/index.json
View file @2c9efa2
+++ b/pages/index/index.json
View file @2c9efa2
 {
   "navigationBarTitleText": "Nature",
+  "backgroundTextStyle": "dark",
   "enablePullDownRefresh": true
-}
+}
--- a/pages/index/index.wxml
View file @2c9efa2
+++ b/pages/index/index.wxml
View file @2c9efa2
-<scroll-view scroll-y="true" scroll-top="{{scrollTop1}}" style="height:{{windowHeight}}px;" upper-threshold="20px" lower-threshold="20px" bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" bindtouchend='touchend'>
-
-    <view style="height:60px;line-height:60px;text-align: center; font-size:26rpx;"> 
-      <image src="{{gun?'/static/images/gungun.gif':'/static/images/jiantou.png'}}" class="jiantou"></image> 
-      <text class="{{gun?'hide':''}}">下拉刷新</text> 
-   </view>  
-  <view style="font-size:28rpx; height:{{windowHeight}}px;">
+  <view style="font-size:28rpx; height:{{windowHeight}}px;" id="the-id">
     <view class="index-advs">
       <swiper autoplay="{{autoplay}}" circular="{{circular}}" class="index-adcs-sqiper" duration="{{duration}}" indicator-dots="{{indicatorDots}}" indicator-color="{{indicatorColor}}" indicator-active-color="{{indicatoractive}}" interval="{{interval}}" style="height:612rpx">
         <block wx:for="{{adv}}" wx:for-index="idx">
@@ -12,7 +6,6 @@
             <navigator class="index-advs-navigator" url="/{{item.linkTo.pageUri}}">
               <image src="{{item.image.url}}" bindload="imagesHeight" style='width:100%; height:612rpx' data-type="advsheight">
               </image>
-
               <!-- <view class="wenzi"> pssb{{idx}}</view> -->
             </navigator>
           </swiper-item>
@@ -155,4 +148,3 @@
     </view>
   </view>
   <view class="{{meng ? 'hide' : 'block'}} meng" bindtap='meng'></view>
-</scroll-view>
--- a/pages/jobfairdetail/jobfairdetail.js
View file @2c9efa2
+++ b/pages/jobfairdetail/jobfairdetail.js
View file @2c9efa2
@@ -212,6 +212,7 @@ Page({
     var skey = that.data.skey
     var tanchuang = that.data.tanchuang
     var id = that.data.id
+    console.log('id',id)
     var disabled = that.data.disabled
     var information = that.data.information
     console.log('information1', information)
--- a/pages/member/member.js
View file @2c9efa2
+++ b/pages/member/member.js
View file @2c9efa2
@@ -6,6 +6,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    hdid: '',
     meng: true,
     skey: '',
     user: '',
@@ -24,7 +25,7 @@ Page({
     bgbgbgbgbbg: false,
     tanchuang3: false,
     tanchuang4: false,
-    tanchuang5: false
+    tanchuang5: false,
   },
   getmenu: function () {
     var that = this
@@ -86,11 +87,8 @@ Page({
   onLoad: function (options) {
     var that = this
     // var id = options.id
-    // console.log('id1111', id)
-    // that.setData({
-    //   id: id
-    // })
-
+    console.log('thatttttt', that)
+    
     var skey = wx.getStorageSync('key')
     var user = wx.getStorageSync('user')
     var information = that.data.information
@@ -98,7 +96,6 @@ Page({
     var total1 = that.data.total1
     var total2 = that.data.total2
     var total3 = that.data.total3
-
     wx.request({
       url: app.url + '/mpapi/1.0.0/user/profile',
       method: 'GET',
@@ -113,7 +110,7 @@ Page({
         // id:'1'
       },
       success: function (res) {
-        console.log('xinxi', res.data)
+        console.log('xinxi', res)
         that.setData({
           information: res.data
         })
@@ -123,7 +120,7 @@ Page({
     console.log('user', user)
     that.setData({
       skey: skey,
-      user: user
+      user: user,
     })
     wx.request({
       url: app.url + '//mpapi/1.0.0/user/favorite?type=&offset=&limit=',
@@ -193,11 +190,6 @@ Page({
             limit: 9999
           },
           success: function (res) {
-            console.log('res', res.data)
-            console.log(that.data.total2)
-            console.log(that.data.total3)
-
-
             that.setData({
               total3: res.data.countTotal,
               total1: Number(res.data.countTotal) + Number(that.data.total2)
@@ -255,14 +247,11 @@ Page({
         console.log('coupon', res.data)
       }
     })
-
-
-
   },
   formSubmit: function (e) {
     var that = this
-    var id = that.data.id
-    console.log('id2222', id)
+    console.log('2222', that)
+    console.log('eeeee1111', e)
     var mobile = e.detail.value.mobile
     var email = e.detail.value.email
     var major = e.detail.value.major
@@ -275,12 +264,6 @@ Page({
     that.setData({
       skey: skey
     })
-    // wx.showLoading({
-    //   title: '提交中',
-    // })
-    // setTimeout(function () {
-    //   wx.hideLoading()
-    // }, 2000)
     wx.request({
       url: app.url + '/mpapi/1.0.0/user/profile',
       method: 'POST',
@@ -298,8 +281,7 @@ Page({
         // id:'1'
       },
       success: function (res) {
-        console.log('con', res.data)
-
+        console.log('con', res)
         wx.showToast({
           title: '提交成功',
           icon: 'success',
@@ -309,21 +291,14 @@ Page({
           disabled: true
         })
         that.onLoad()
-        // if (id) {
-        //   console.log('id333333', id)
-        wx.navigateBack();
-          // wx.setStorage({
-            // key: "id",
-            // data: that.data.id,
-            // success: function () {
-                 //返回上一个页面
-            // }
-          // })
-
-
-        // } else {
-        //   that.onLoad()
-        // }
+        console.log('that.options.id', that.options.id)
+        if (that.options.id != '' && that.options.id != undefined) {
+          console.log(123456)
+          console.log('that.options.id', that.options.id)
+          setTimeout(function(){
+            wx.navigateBack()
+          },1500)
+        }
       }
     })
   },
@@ -380,7 +355,7 @@ Page({
     var that = this
     var tanchuang4 = that.data.tanchuang4
     var bgbgbgbgbbg = that.data.bgbgbgbgbbg
-    
+
     that.setData({
       tanchuang4: false,
       bgbgbgbgbbg: false
@@ -490,7 +465,7 @@ Page({
         }
       }
     })
-    
+
   },
   a2: function () {
     var that = this