tanyanfei 4 years ago
parent
commit
7f30a2ca12

+ 8 - 4
app.json

@@ -1,19 +1,23 @@
 {
   "pages": [
-    "pages/index/index",
+    "pages/hotel/hotel",
+    "pages/order/order",
+    "pages/order/hotel",
+   
+    "pages/mine/mine",
     "pages/eventDetail/eventDetail",
     "pages/learning/learning",
     "pages/conference/conference",  
     
-    
+    "pages/index/index",
     "pages/collect/collect",
     "pages/search/search",
     "pages/knowledge/knowledge",   
     "pages/list/list",   
     "pages/actDetail/actDetail",    
     "pages/jInfo/jInfo", 
-    "pages/journalDetail/journalDetail", 
-    "pages/mine/mine"   
+    "pages/journalDetail/journalDetail"
+       
   ],
   "window": {
     "backgroundTextStyle": "light",

+ 1 - 1
app.wxss

@@ -1,6 +1,6 @@
 /**app.wxss**/
 
-page,view,text,input,scroll-view{
+page,view,text,input,scroll-view,form{
   box-sizing: border-box;
   font-size: 28rpx;
   color: #333;

+ 22 - 3
pages/eventDetail/eventDetail.js

@@ -15,9 +15,10 @@ Page({
     sex: -1,
     job_array: ['非中科院单位','中科院单位'],
     job: 0,
-    show: 0,
+    show: 1,
     list:[],
-    index:[0,0,0]
+    index:[0,0,0],
+    page:0
   },
 
   /**
@@ -58,7 +59,7 @@ Page({
         var list=[];
         list[0] = res.data.data;
         list[1] = list[0][0].children;
-        list[2] = list[1][0].chileren;
+        list[2] = list[1][0].children;
         
         that.setData({
           list: list
@@ -68,6 +69,24 @@ Page({
   },
   bindMultiPickerColumnChange:function(e){
     console.log('修改的列为', e.detail.column, ',值为', e.detail.value);
+    var list = this.data.list, i = e.detail.value, j = e.detail.column;
+    var index=this.data.index;
+    index[j] = i
+    if (e.detail.column == 0){
+      list[1] = list[i][0].children;
+      list[2] = list[1][0].children;
+      index[1]=0;
+      index[2]=0;
+    }
+    if (e.detail.column == 1) {
+      list[1] = list[i][0].children;
+      list[2] = list[1][0].children;
+      index[2] = 0;
+    }
+    this.setData({
+      list: list,
+      index: index
+    })
   },
   bindPickerChange:function(e){
     this.setData({

+ 81 - 2
pages/eventDetail/eventDetail.wxml

@@ -29,7 +29,7 @@
 <button bindtap="open" class="post">我要报名</button>
 
 <view class="bg" wx:if='{{show}}'>
-    <form class="form" bindsubmit='submit'>
+    <form wx:if='{{page==1}}' class="form" bindsubmit='submit'>
       <image bindtap='close' class='close'  mode="widthFix" src="../images/close.png"></image>
         <view class="form_tt">请填写报名信息</view>
         <view class="item">
@@ -80,5 +80,84 @@
         <text class="ts">报名成功后工作人员会尽快与您取得联系</text>
         <button  formType="submit"  class="post">提交报名信息</button>
     </form>
-</view>                          
+
+    <view class="form form1" wx:if='{{page==2}}'>
+          <view class="form_tt">提示</view>
+          <view class="tips">您的报名信息已提交成功,请尽快缴纳会议费。
+            <text>(!参会人员需先缴纳会议费,才能预订酒店住房)</text>
+          </view>
+          <view class="form_info">
+                <text>会议费有以下2种方式付款:</text>
+                <text>(1)转账汇款(公对公转账)。备注:姓名+29次年会转账汇款信息:</text>
+                <text>单位名称:中国科学院文献情报中心</text>
+                <text>账号:0200 00450908 8129 221</text>
+                <text>开户行:北京工行海淀西区支行</text>
+
+                <text>(2)支票(仅限北京参会代表)。</text>
+          </view>
+          <button   class="post">下一步</button>
+    </view>
+
+    <view class="form form2" wx:if='{{page==3}}'>
+      <view class="form_tt">上传入住凭证</view>
+      <view class="upload">
+          <image  mode="widthFix" src="../images/up.png"></image>
+          (上传银行汇款凭证或其他财务转账证明)
+      </view>
+        <view class="item">
+            <label style="width:105rpx;">支付方式</label>
+            <radio-group>
+                <radio value="">汇款:</radio><radio style="margin-left:10px;" value="">支票</radio>
+            </radio-group>
+        </view>
+        <view class="item">
+            <label style="width:105rpx;">发票种类:</label>
+            <radio-group>
+                <radio value="">增值税普通发票</radio>
+                <radio  style="margin-left:8px;"  value="">增值税专用发票</radio>
+            </radio-group>
+        </view>
+        <view class="item">
+            <label>发票抬头:</label><input name='job'></input>
+        </view>
+        <view class="item">
+            <label>纳税人识别号:</label><input name='job'></input>
+        </view>
+        <view class="item">
+            <label>注册地址(专票必填):</label><input name='job'></input>
+        </view>
+        <view class="item">
+            <label>注册电话(专票必填):</label><input name='job'></input>
+        </view>
+        <view class="item">
+            <label>开户行(专票必填):</label><input name='job'></input>
+        </view>
+        <view class="item">
+            <label>银行帐号(专票必填):</label><input name='job'></input>
+        </view>
+        <view class="btns">
+          <button  formType="submit">提交信息</button>
+          <button class="success">跳过</button>
+        </view>
+    </view>
+
+    <view  class="form form1" style="height:600rpx;" wx:if='{{page==4}}'>
+        <view class="form_tt">提示</view>
+        <view class="suc">凭证上传成功</view>
+        <view class="form_info">
+            <text>待文献情报中心财务部门确认收到会议费后,系统将发送授权码至报名手机。</text>
+            <text>请您凭授权码登录报名系统预订酒店住房。</text>
+        </view>
+        <button   class="post">关闭</button>
+    </view>
+
+    <view wx:if='{{page==5}}' class="bg end" style="background:#F1F1F1;">
+        <icon type="success" size='72'></icon>
+        <view>恭喜您报名成功</view>
+        <view class="form_info">请您准时参加会议,到达会议地点届时将会有我方工作人员安排您的入住</view>
+        <button class="post">确认</button>
+    </view>
+</view>  
+
+
                           

+ 103 - 3
pages/eventDetail/eventDetail.wxss

@@ -51,13 +51,14 @@ page{
 
 .post{
   width: 100% !important;
-  background: #3780CD;
+  background: #0580D3;
   color: #fff;
   display: block;
   font-size: 34rpx;
   height: 90rpx;
   line-height: 90rpx;
   padding: 0;
+  border-radius: 18rpx;
 }
 
 .bg{
@@ -68,7 +69,7 @@ page{
   left: 0;
   z-index: 99;
   background: rgba(0,0,0,.5);
-  padding: 50rpx;
+  padding: 50rpx 0;
 }
 .form{
   background: #fff;
@@ -76,6 +77,8 @@ page{
   padding: 50rpx 60rpx;
   display: block;
   position: relative;
+  width: 90%;
+  margin: auto;
 }
 .form_tt{
   text-align: center;
@@ -90,7 +93,7 @@ page{
   position: relative;
   display: flex;
   margin-bottom: 18rpx;
-  padding: 0 28rpx;
+  padding: 0 20rpx;
 }
 .item label{
   line-height: 72rpx;
@@ -131,4 +134,101 @@ page{
   position: absolute;
   top: 20rpx;
   right: 20rpx;
+}
+.tips,.tips text{
+  font-size: 24rpx;
+  color: #F6C830;
+  margin-bottom: 40rpx;
+  line-height: 40rpx;
+  display: block;
+}
+.form_info text{
+  color: #333;
+  font-size: 26rpx;
+  display: block;
+  line-height: 50rpx;
+}
+.form_info{
+  margin-bottom: 50rpx;
+}
+.form1{
+  height: 800rpx;
+  /* width: 100%; */
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
+  position: absolute;
+}
+.upload{
+  border: 1px solid #3BA0FF;
+  padding: 30rpx;
+  text-align: center;
+  color: #999;
+  font-size: 20rpx;
+  border-radius: 12rpx;
+  margin-bottom: 20rpx;
+  position: relative;
+}
+
+.upload image{
+  display: block;
+  width: 100rpx;
+  margin:0 auto 30rpx;
+}
+.form2 .item label{
+  width: 40%;
+  font-size: 24rpx;
+}
+.form2 radio{
+  font-size: 22rpx;
+  /* line-height: 65rpx; */
+  margin-top: 15rpx;
+}
+.form2 .item input{
+  width: 60%;
+}
+.btns{
+  display: flex;
+  justify-content: space-between;
+}
+.btns button{
+  width: 40% !important;
+  height: 90rpx;
+  background: #0580D3;
+  border-radius: 18px;
+  color: #fff;
+  font-size: 30rpx;
+  line-height: 90rpx;
+  padding: 0;
+  margin-top: 30rpx;
+}
+.btns .success{
+  background: #09A65E;
+}
+.form2{
+  max-height: 95vh;
+  overflow: auto;
+  padding: 50rpx 40rpx;
+}
+.suc{
+  color: #333;
+  font-size: 34rpx;
+  margin-bottom: 40rpx;
+  text-align: center;
+}
+.end{
+  text-align: center;
+  padding: 50rpx;
+}
+.end view{
+  color: #333;
+  font-size: 38rpx;
+  margin: 50rpx 0;
+}
+.end .form_info{
+  color: #666;
+  font-size: 30rpx;
+  line-height: 50rpx;
 }

+ 66 - 0
pages/hotel/hotel.js

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

+ 3 - 0
pages/hotel/hotel.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "酒店详情"
+}

+ 20 - 0
pages/hotel/hotel.wxml

@@ -0,0 +1,20 @@
+<!--pages/hotel/hotel.wxml-->
+  <!-- <image style="width:100%;" mode="widthFix" src="../images/qk1.jpeg"></image> -->
+<view class="top">
+  <view class="tt">迎园饭店</view>
+  <text>地址:上海市嘉定区清河路115号</text>
+  <text>联系电话:021-59521346</text>
+</view>
+
+<view class="content">
+    <navigator class="list">
+        <image src="../images/qk1.jpeg"></image>
+        <view>
+            <view class="title">标间</view>
+            <text style="color:#999;">15m²   早餐   双床房   2人入住    </text>
+            <text>350元</text>
+            <text>剩余数量:50</text>
+            <navigator class="btn">预定</navigator>
+        </view>
+    </navigator>
+</view>

+ 74 - 0
pages/hotel/hotel.wxss

@@ -0,0 +1,74 @@
+/* pages/hotel/hotel.wxss */
+page{
+  padding: 0;
+}
+.top{
+  background: #fff;
+  padding: 20rpx;
+}
+.tt{
+  font-size: 32rpx;
+  margin-bottom: 30rpx;
+}
+.top text{
+  display: block;
+  font-size: 26rpx;
+  color: #666;
+  margin-bottom: 20rpx;
+}
+.content{
+  height: calc(100vh - 80rpx);
+  overflow: auto;
+  padding: 30rpx;
+}
+.list{
+  /* box-shadow: 0px 2rpx 9rpx 0px rgba(0, 0, 0, 0.2); */
+  border-radius: 20rpx;
+  display: flex;
+  /* padding: 20rpx; */
+  /* box-shadow: 0 0 15rpx 0px rgba(0, 0, 0, 0.2); */
+  /* margin: 0 20rpx 40rpx; */
+  padding: 28rpx;
+  background: #fff;
+  position: relative;
+  margin-bottom: 40rpx;
+  
+}
+.list image{
+  width: 25%;
+  height: 210rpx;
+}
+.list>view{
+  width: 75%;
+  padding-left: 20rpx;
+  vertical-align: middle;
+}
+.list .title{
+  margin-bottom: 20rpx;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  font-size: 28rpx;
+}
+.list text{
+  color: #999;
+  display: block;
+  font-size: 26rpx;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  margin-bottom: 20rpx;
+}
+.btn{
+  width: 132rpx;
+  height: 56rpx;
+  background: #3780CD;
+  border-radius: 6px;
+  text-align: center;
+  line-height: 56rpx;
+  color: #fff;
+  font-size: 26rpx;
+  position: absolute;
+  bottom: 28rpx;
+  right: 28rpx;
+}

BIN
pages/images/up.png


+ 70 - 0
pages/order/hotel.js

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

+ 3 - 0
pages/order/hotel.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我的报名"
+}

+ 10 - 0
pages/order/hotel.wxml

@@ -0,0 +1,10 @@
+<view class="content">
+    <navigator class="list">
+        <image src="../images/qk1.jpeg"></image>
+        <view>
+            <view class="title">迎园饭店</view>
+            <text>地址:上海市嘉定区清河路115号</text>
+            <text>联系电话:021-59521346</text>
+        </view>
+    </navigator>
+</view>

+ 64 - 0
pages/order/hotel.wxss

@@ -0,0 +1,64 @@
+/* pages/order/order.wxss */
+page{
+  padding: 0;
+}
+
+.content{
+  height: calc(100vh - 80rpx);
+  overflow: auto;
+  padding: 30rpx;
+}
+.list{
+  /* box-shadow: 0px 2rpx 9rpx 0px rgba(0, 0, 0, 0.2); */
+  border-radius: 20rpx;
+  display: flex;
+  /* padding: 20rpx; */
+  /* box-shadow: 0 0 15rpx 0px rgba(0, 0, 0, 0.2); */
+  /* margin: 0 20rpx 40rpx; */
+  padding: 28rpx;
+  background: #fff;
+  position: relative;
+  margin-bottom: 40rpx;
+  
+}
+.list image{
+  width: 25%;
+  height: 210rpx;
+}
+.list>view{
+  width: 75%;
+  padding-left: 20rpx;
+  vertical-align: middle;
+}
+.list .title{
+  margin-bottom: 30rpx;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  font-size: 28rpx;
+}
+.list text{
+  color: #666;
+  display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    white-space: normal;
+    font-size: 26rpx;
+    margin-bottom: 20rpx;
+}
+.btn{
+  width: 132rpx;
+  height: 56rpx;
+  background: #09A65E;
+  border-radius: 6px;
+  text-align: center;
+  line-height: 56rpx;
+  color: #fff;
+  font-size: 26rpx;
+  position: absolute;
+  bottom: 28rpx;
+  right: 28rpx;
+}

+ 71 - 0
pages/order/order.js

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

+ 3 - 0
pages/order/order.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我的报名"
+}

+ 22 - 0
pages/order/order.wxml

@@ -0,0 +1,22 @@
+<view class="tab">
+    <text bindtap="tab" data-id='0'  class="{{act==0?'act':''}}">未开始</text>
+    <text bindtap="tab" data-id='1' class="{{act==1?'act':''}}">已结束</text>
+</view>
+<view class="content">
+    <navigator class="list">
+        <image src="../images/qk1.jpeg"></image>
+        <view>
+            <view class="title">企业家点赞中科院创新成果展...</view>
+            <text>报名时间:2020-12-30 10:10:10</text>
+            <navigator class="btn">选酒店</navigator>
+        </view>
+    </navigator>
+</view>
+
+<view class="bg" wx:if='{{code}}'>
+    <view class="form">
+        <view class="tt">核销码</view>
+        <view class="code"></view>
+        <text>请将二维码出示给工作人员</text>
+    </view>
+</view>

+ 118 - 0
pages/order/order.wxss

@@ -0,0 +1,118 @@
+/* pages/order/order.wxss */
+page{
+  padding: 0;
+}
+.tab{
+  height: 80rpx;
+  display: flex;
+}
+.tab text{
+  width: 50%;
+  line-height: 80rpx;
+  text-align: center;
+  color: #333;
+  font-size: 26rpx;
+  background: #fff;
+  transition: .5s;
+}
+.tab .act{
+  color: #fff;
+  background: #3780CD;
+}
+.content{
+  height: calc(100vh - 80rpx);
+  overflow: auto;
+  padding: 30rpx;
+}
+.list{
+  /* box-shadow: 0px 2rpx 9rpx 0px rgba(0, 0, 0, 0.2); */
+  border-radius: 20rpx;
+  display: flex;
+  /* padding: 20rpx; */
+  /* box-shadow: 0 0 15rpx 0px rgba(0, 0, 0, 0.2); */
+  /* margin: 0 20rpx 40rpx; */
+  padding: 28rpx;
+  background: #fff;
+  position: relative;
+  margin-bottom: 40rpx;
+  
+}
+.list image{
+  width: 25%;
+  height: 210rpx;
+}
+.list>view{
+  width: 75%;
+  padding-left: 20rpx;
+  vertical-align: middle;
+}
+.list .title{
+  margin-bottom: 20rpx;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  font-size: 28rpx;
+}
+.list text{
+  color: #999;
+  display: block;
+  overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    white-space: normal;
+  font-size: 22rpx;
+}
+.btn{
+  width: 132rpx;
+  height: 56rpx;
+  background: #09A65E;
+  border-radius: 6px;
+  text-align: center;
+  line-height: 56rpx;
+  color: #fff;
+  font-size: 26rpx;
+  position: absolute;
+  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;
+}
+.form{
+  background: #fff;
+  border-radius: 18rpx;
+  padding: 80rpx 100rpx;
+  display: block;
+  position: absolute;
+  width: 90%;
+  height: 700rpx;
+  margin: auto;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  text-align: center;
+}
+.form .tt{
+  font-size: 32rpx;
+}
+.code{
+  width: 400rpx;
+  height: 400rpx;
+  border: 1px solid #D0D0D0;
+  margin: 40rpx auto;
+}
+.form text{
+  color: #999;
+  font-size: 26rpx;
+}