bug

pages/eventDetail/eventDetail.wxml

@@ -87,13 +87,14 @@
             <text>(!参会人员需先缴纳会议费,才能预订酒店住房)</text>
           </view>
           <view class="form_info">
-                <text>会议费有以下2种方式付款:</text>
+                {{info.sign_note}}
+                <!-- <text>会议费有以下2种方式付款:</text>
                 <text>(1）转账汇款（公对公转账)。备注:姓名+29次年会转账汇款信息:</text>
                 <text>单位名称：中国科学院文献情报中心</text>
                 <text>账号：0200 00450908 8129 221</text>
                 <text>开户行：北京工行海淀西区支行</text>
 
-                <text>(2）支票(仅限北京参会代表)。</text>
+                <text>(2）支票(仅限北京参会代表)。</text> -->
           </view>
           <button  bindtap="sure" class="post">下一步</button>
     </view>

pages/index/index.js

@@ -31,34 +31,55 @@ Page({
         if (res.data) {
           this.setData({ show: 0 ,uid:res.data})
         }
+        this.getData();
       },
     })
-    this.getData();
+    
   },
-  onGotUserInfo: function (e) {
-    wx.setStorage({
-      key: 'userInfo',
-      data: e.detail.userInfo,
-    })
-    wx.request({
-      url: host + '/api/auth',
-      method: 'POST',
-      data: {
-        nickname: e.detail.userInfo.nickName,
-        avatar: e.detail.userInfo.avatarUrl,
-        openid: app.globalData.openid,
-      },
-      success: res => {
-        console.log(res)
+  onGotUserInfo: function () {
+    wx.getUserProfile({
+      desc: '用于完善会员资料',
+      success: res=> {
+        //获取基本信息
+        var data = {
+          nickName: res.userInfo.nickName,
+          avatarUrl: res.userInfo.avatarUrl
+        }
+        wx.showLoading({
+          title: '正在登陆',
+        })
         wx.setStorage({
-          key: 'uid',
-          data: res.data.data.uid,
+          key: 'userInfo',
+          data: data,
         })
-        this.setData({
-          show: 0
+        wx.request({
+          url: host + '/api/auth',
+          method: 'POST',
+          data: {
+            nickname: data.nickName,
+            avatar: data.avatarUrl,
+            openid: app.globalData.openid,
+          },
+          success: res => {
+            wx.hideLoading()
+            wx.setStorage({
+              key: 'uid',
+              data: res.data.data.uid,
+            })
+            this.setData({
+              show: 0
+            })
+          },
+          fail:error=>{
+            wx.hideLoading()
+            wx.showLoading({
+              title: '登陆失败',
+            })
+          }
         })
       }
-    })
+    })   
+    
   },
   //获取所有数据
   getData:function(flag){
@@ -67,7 +88,7 @@ Page({
     if(!flag){
       wx.request({
         url: host+'/api/index/banners',
-        method:'GET',
+        method:'GET',  
         success:function(res){
             that.setData({
               lb: res.data.data.banners
@@ -81,18 +102,19 @@ Page({
           })
         }
       })
+      // 全刊
+      wx.request({
+        url: host + '/api/index/journals',
+        method: 'GET',
+        success: function (res) {
+          wx.hideNavigationBarLoading()
+          that.setData({
+            journals: res.data.data.journals
+          })
+        }
+      })
     }
-    // 全刊
-    wx.request({
-      url: host + '/api/index/journals',
-      method: 'GET',
-      success: function (res) {
-        wx.hideNavigationBarLoading()
-        that.setData({
-          journals: res.data.data.journals
-        })
-      }
-    })
+    
     // 主办单位
     wx.request({
       url: host + '/api/index/organizers',
@@ -101,6 +123,7 @@ Page({
         uid:this.data.uid
       },
       success: function (res) {
+        wx.hideNavigationBarLoading()
         that.setData({
           organizers: res.data.data.list
         })
@@ -114,6 +137,7 @@ Page({
         uid: this.data.uid
       },
       success: function (res) {
+        wx.hideNavigationBarLoading()
         that.setData({
           subjects: res.data.data.list
         })
@@ -147,6 +171,7 @@ Page({
       })
   },
   cancel_top: function (e) {
+    var that = this;
     wx.request({
       url: host + '/api/index/totop',
       method: 'PUT',

pages/index/index.wxml

@@ -80,7 +80,7 @@
                         <text>{{jour.desc}}</text>
                     </navigator>
                     <view wx:if='{{item.istop}}' bindtap="cancel_top" data-type='subject' data-id='{{item.subject_id}}' class="top cancel">取消置顶</view>
-                    <view wx:else bindtap="top" data-id='{{item.subject_id}}' data-type='subject' class="top">置顶</view>
+                    <view wx:else bindtap="top" data-id='{{item.id}}' data-type='subject' class="top">置顶</view>
               </view>
           </view>
       </scroll-view>
@@ -131,6 +131,6 @@
           <image src="../images/logo.png" mode="widthFix"></image>
         </view>
         <text class="xx">申请获取您的用户信息(头像、昵称等)</text>
-        <button bindgetuserinfo="onGotUserInfo" open-type="getUserInfo">确定</button>
+        <button bindtap="onGotUserInfo">确定</button>
     </view>
 </view>

pages/learning/learning.wxml

@@ -26,7 +26,7 @@
                   <view class="title">精品推荐   <text bindtap="more" data-id='1'>查看更多</text></view>
                   <view class="tj">
                       <navigator wx:for="{{arct}}" url="../conference/conference?id={{item.id}}" wx:if='{{index<3}}'>
-                        <image  mode="widthFix" src="{{item.img}}"></image>
+                        <image  mode="scaleToFill" src="{{item.img}}"></image>
                         <view>{{item.name}}</view>
                         <text>{{item.desc}}</text>
                       </navigator>  

pages/learning/learning.wxss

@@ -44,7 +44,7 @@ scroll-view{
 }
 .tj image{
   width: 100%;
-  max-height: 200rpx;
+  height: 200rpx;
 }
 .tj view{
   color: #333;

pages/mine/mine.wxml

@@ -1,10 +1,13 @@
 <!--pages/mine/mine.wxml-->
 <view class="avatar" wx:if='{{userinfo.avatarUrl}}'>
-  <view>
+  <!-- <view>
     <image src="{{userinfo.avatarUrl}}"></image>
+  </view> -->
+  <view class="photo">
+      <open-data  type="userAvatarUrl"></open-data>
   </view>
   <view class="nickname">
-    <text>{{userinfo.nickName}}</text>
+    <open-data  type="userNickName"></open-data>
   </view>
 </view>
 <view wx:else  style="margin:50rpx 0;"> 

pages/mine/mine.wxss

@@ -9,10 +9,14 @@ page{
   margin:60rpx auto;
   text-align: center;
 }
-.avatar view:first-child{
-  width:100%;
+.photo{
+  width: 200rpx;
   height: 200rpx;
+  border-radius: 100%;
+  overflow: hidden;
+  margin:0  auto 20rpx;
 }
+
 .avatar image{
   width:200rpx;
   height: 100%;

pages/order/order.wxml

@@ -5,7 +5,7 @@
 <view class="content">
     <view class="list" wx:for='{{list}}'>
         <image src="{{item.conference_img}}"></image>
-        <view>
+        <navigator url="../eventDetail/eventDetail?id={{item.conference_id}}">
             <view class="title">{{item.conference_name}}</view>
             <text>报名时间：{{item.ctime}}</text>
             <navigator url="../eventDetail/eventDetail?id={{item.conference_id}}&apply_id={{item.id}}" class="btn" wx:if='{{item.signup_status==0}}' >上传凭证</navigator>
@@ -14,7 +14,7 @@
             <view bindtap="verify" data-url='{{item.verify_qrcode}}' class="btn" wx:if='{{item.signup_status==3}}' >核销</view>
             <navigator class="btn" style="background:#999;" wx:if='{{item.signup_status==4}}' >已核销</navigator>
             <navigator class="btn" style="background:#999;" wx:if='{{item.signup_status==-1}}' >已驳回</navigator>
-        </view>
+        </navigator>
     </view>
 </view>
 

pages/order/order.wxss

@@ -41,7 +41,7 @@ page{
   width: 25%;
   height: 210rpx;
 }
-.list>view{
+.list>navigator{
   width: 75%;
   padding-left: 20rpx;
   vertical-align: middle;

project.config.json

@@ -26,7 +26,7 @@
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.14.0",
+	"libVersion": "2.15.0",
 	"appid": "wx2938132b773c7b5a",
 	"projectname": "zkyxcx",
 	"debugOptions": {