update

app.json

@@ -1,13 +1,15 @@
 {
   "pages": [
-    "pages/verify/verify",
+    "pages/hotel/hotel",
+    "pages/mine/mine",
+    "pages/learning/learning",
     "pages/index/index",
     "pages/order/order",
-    "pages/mine/mine",
+    
     "pages/eventDetail/eventDetail",
-    "pages/hotel/hotel",
+    
     "pages/order/hotel",
-    "pages/learning/learning",
+    
     "pages/conference/conference",
     "pages/collect/collect",
     "pages/search/search",
@@ -15,6 +17,7 @@
     "pages/list/list",
     "pages/actDetail/actDetail",
     "pages/jInfo/jInfo",
+    "pages/verify/verify",
     "pages/journalDetail/journalDetail"
   ],
   "window": {

pages/eventDetail/eventDetail.js

@@ -161,6 +161,27 @@ Page({
     form.uid=this.data.user_id;
     form.conference_id=this.data.info.id;
     form.conference_name = this.data.info.name;
+    if(!form.name){
+      wx.showToast({
+        title: '请输入姓名！',
+        icon:'none'
+      })
+      return;
+    }
+    if (!form.job) {
+      wx.showToast({
+        title: '请输入职务！',
+        icon: 'none'
+      })
+      return;
+    }
+    if (!form.phone) {
+      wx.showToast({
+        title: '请输入手机号！',
+        icon: 'none'
+      })
+      return;
+    }
     wx.showLoading({
       title: '正在提交',
     })

pages/eventDetail/eventDetail.wxml

@@ -105,7 +105,7 @@
             <image  mode="widthFix" src="../images/up.png"></image>
             （上传银行汇款凭证或其他财务转账证明）
           </block>
-          <image class="proof_img" wx:else mode="widthFix" src="{{proof_img}}"></image>
+          <image class="proof_img" wx:else mode="heightFix" src="{{proof_img}}"></image>
       </view>
         <view class="item">
             <label style="width:105rpx;">支付方式</label>

pages/eventDetail/eventDetail.wxss

@@ -178,8 +178,8 @@ page{
   margin:0 auto 30rpx;
 }
 .upload .proof_img{
-  width: 100%;
-  margin: 0;
+  height: 200rpx;
+  margin: 0 auto;
 }
 .form2 .item label{
   width: 40%;

pages/hotel/hotel.js

@@ -8,7 +8,9 @@ Page({
    */
   data: {
     info:{},
-    aid:''
+    aid:'',
+    data:{},
+    date:''
   },
 
   /**
@@ -16,8 +18,8 @@ Page({
    */
   onLoad: function (options) {
     wx.showNavigationBarLoading();
-    // options.id=1;
-    // options.conference_id=1;
+    options.id=1;
+    options.conference_id=1;
     this.setData({
       aid: Number(options.aid)
     })
@@ -30,7 +32,8 @@ Page({
       success: res => {
         wx.hideNavigationBarLoading();
         this.setData({
-          info: res.data.data
+          info: res.data.data,
+          data: res.data.data.rooms[0]
         })
       },
       fail: function () {

pages/hotel/hotel.wxml

@@ -8,7 +8,7 @@
 
 <view class="content">
     <view class="list" wx:for='{{info.rooms}}'>
-        <image src="{{item.imgs}}"></image>
+        <image src="{{item.img}}"></image>
         <view>
             <view class="title">{{item.name}}</view>
             <text style="color:#999;">{{item.room_area}}m²   {{item.food_condition}}   {{item.floor}}层   {{item.enable_number}}人入住    </text>
@@ -17,4 +17,40 @@
             <view bindtap="order" data-id='{{item.id}}' class="btn">预定</view>
         </view>
     </view>
+</view>
+
+<view class="bg">
+  <view class="room">  
+      <text class="room_title">{{data.name}}</text>
+      <image src="{{data.img}}"></image>
+      <view class="room_item">
+          房型信息
+          <view><text>房型:{{data.room_type}}</text><text>面积:{{data.room_area}}m²</text></view>
+          <view><text>可住:{{data.enable_number}}人</text><text>楼层:{{data.floor}}层</text></view>
+          <view><text>床型:{{data.name}}</text><text>窗户:{{data.window_condition}}</text></view>
+          <view><text>餐食:{{data.food_condition}}</text><text>房价:{{data.unit_price}}元</text></view>
+      </view>
+      <view class="room_item" style="padding-bottom:0;">
+        <label>入住人数: </label><input></input>
+      </view>
+      <view class="room_item">
+        <view><label>入住时间: </label>
+          <picker mode="date" value="{{date}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">
+            <view class="picker">
+              <text>请选择</text>
+               {{date}}
+            </view>
+          </picker>
+        </view>
+        <view>
+          <label>离开时间: </label>
+          <picker mode="date" value="{{date}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">
+            <view class="picker">
+              <text>请选择</text>
+               {{date}}
+            </view>
+          </picker>
+          </view>
+      </view>
+  </view>
 </view>

pages/hotel/hotel.wxss

@@ -75,3 +75,67 @@ page{
   bottom: 28rpx;
   right: 28rpx;
 }
+.bg{
+  position: fixed;
+  width: 100%;
+  height: 100vh;
+  top: 0;
+  left: 0;
+  z-index: 99;
+  background: rgba(0,0,0,.5);
+  padding: 50rpx 0;
+}
+.room{
+  background: #fff;
+  border-radius: 10rpx;
+  padding: 30rpx;
+  display: block;
+  position: relative;
+  width: 90%;
+  margin: auto;
+}
+.room_title{
+  display: block;
+  text-align: center;
+}
+.room image{
+  width: 100%;
+  border-radius: 10rpx;
+}
+.room_item{
+  background: #f5f5f5;
+  padding: 10rpx;
+  margin: 10rpx 0;
+  border-radius: 10rpx;
+  color: #333;
+  font-size: 24rpx;
+}
+.room_item view{
+  display: flex;
+  flex-wrap: wrap;
+  padding: 3px 0;
+}
+.room_item text{
+  width: 50%;
+  font-size: 22rpx;
+  color: #666;
+}
+.room_item input{
+  width: 50%;
+  display: inline-block;
+  height: 30px;
+}
+.room_item label{
+  line-height: 30px;
+  display: inline-block;
+  vertical-align: top;
+  margin-right: 5px;
+  font-size: 24rpx;
+  color: #999;
+}
+picker{
+  font-size: 24rpx;
+  width: 50%;
+  position: relative;
+  top: 4px;
+}

pages/learning/learning.wxml

@@ -37,7 +37,7 @@
                   <view class="title">热门会议   <text bindtap="more" data-id='2'>查看更多</text></view>
                   <view class="hd">
                       <navigator class="list" wx:for='{{hot_arct}}' wx:key="hot_arct{{index}}"  url="../eventDetail/eventDetail?id={{item.id}}">
-                          <image  mode="widthFix" src="{{item.img}}"></image>
+                          <image src="{{item.img}}"></image>
                           <view>
                               <view class="tt">{{item.name}}  </view>
                               <text class="hd_ly">来源 :{{item.organizer_name}} <text>{{item.publish_time}}</text></text>
@@ -51,7 +51,7 @@
                   <view class="title">活动预告   <text bindtap="more" data-id='3'>查看更多</text></view>
                   <view class="hd">
                       <navigator class="list" wx:for='{{pre_arct}}' wx:key="pre_arct{{index}}" url="../conference/conference?id={{item.id}}" >
-                          <image  mode="widthFix" src="{{item.img}}"></image>
+                          <image  src="{{item.img}}"></image>
                           <view>
                               <view class="tt">{{item.name}}  </view>
                               <view class="ly"> 
@@ -71,7 +71,7 @@
                   <view class="title">活动回顾   <text bindtap="more" data-id='4'>查看更多</text></view>
                   <view class="hd">
                       <navigator class="list" wx:for='{{over_arct}}' wx:key="over_arct{{index}}" url="../conference/conference?id={{item.id}}" >
-                          <image  mode="widthFix" src="{{item.img}}"></image>
+                          <image   src="{{item.img}}"></image>
                           <view>
                               <view class="tt">{{item.name}}  </view>
                               <view class="ly"> 
@@ -112,7 +112,7 @@
   <swiper-item>
       <scroll-view class="content" scroll-y="true">
                 <navigator class="list" wx:for='{{conference}}' wx:key="conference{{index}}" url="../eventDetail/eventDetail?id={{item.id}}">
-                      <image  mode="widthFix" src="{{item.img}}"></image>
+                      <image  src="{{item.img}}"></image>
                       <view>
                           <view class="tt">{{item.name}}  </view>
                           <text class="hd_ly">来源 :{{item.organizer_name}} <text>{{item.publish_time}}</text></text>

pages/learning/learning.wxss

@@ -82,7 +82,7 @@ scroll-view{
 }
 .list image{
   width: 20%;
-  max-height: 100px;
+  height: 50px;
 }
 .list>view{
   width: 80%;

pages/verify/verify.js

@@ -1,18 +1,39 @@
 // pages/verify/verify.js
+const app = getApp()
+var host = app.globalData.host;
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    check:''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    options.sid=1;
+    wx.showNavigationBarLoading();
+    wx.getStorage({
+      key: 'uid',
+      success: res => {
+        if (res.data) {
+          wx.request({
+            url: host + '/api/signup/verify',
+            method: 'POST',
+            data: { uid: res.data, sid: options.sid },
+            success: result => {
+              wx.hideLoading();
+              this.setData({
+                check: result.data.data
+              })
+            }
+          })
+        }
+      },
+    })
   },
 
   /**

pages/verify/verify.wxml

@@ -1,2 +1,11 @@
-<!--pages/verify/verify.wxml-->
-<text>pages/verify/verify.wxml</text>
+<view wx:if='{{check==false}}'>
+    <icon class="icon-box-img" type="warn" size="100"></icon>
+    <text>您没有该会议的核销权限</text>
+    <navigator>返回首页</navigator>
+</view>
+
+<view wx:if='{{check==true}}'>
+    <icon class="icon-box-img" type="success" size="100"></icon>
+    <text>核销成功</text>
+    <navigator>返回首页</navigator>
+</view>

pages/verify/verify.wxss

@@ -1 +1,19 @@
-/* pages/verify/verify.wxss */
+/* pages/verify/verify.wxss */
+view{
+  text-align: center;
+  padding: 20% 50rpx;
+}
+view text{
+  display: block;
+  margin: 100rpx 0;
+  color: #000;
+  font-size: 22rpx;
+}
+navigator{
+   background: #0580D3;
+   color: #fff;
+   width: 100%;
+   border-radius: 50rpx;
+   /* height: 40px; */
+   line-height: 36px;
+}