From 6ef45b33f7dbba86dd2f166fa2333e46220ae5e6 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 14 Oct 2021 21:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=8A=A5=E5=90=8D=20=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=81=94=E7=B3=BB=E4=BA=BA=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BC=81=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/common.wxss                 |  20 ++++
 assets/js/http/signUp.js               |  24 ++++
 pages/addCompany/addCompany.js         |  75 +++++++++++++
 pages/addCompany/addCompany.json       |   3 +
 pages/addCompany/addCompany.wxml       |  75 +++++++++++++
 pages/addCompany/addCompany.wxss       |  45 ++++++++
 pages/addPerson/addPerson.js           | 105 ++++++++++++++++++
 pages/addPerson/addPerson.json         |   3 +
 pages/addPerson/addPerson.wxml         |  81 ++++++++++++++
 pages/addPerson/addPerson.wxss         |  46 ++++++++
 pages/companyList/companyList.js       | 139 +++++++++++++++++++++++
 pages/companyList/companyList.json     |   3 +
 pages/companyList/companyList.wxml     |  30 +++++
 pages/companyList/companyList.wxss     |  75 +++++++++++++
 pages/meeting/meeting.js               |  26 ++++-
 pages/personList/personList.js         | 146 +++++++++++++++++++++++++
 pages/personList/personList.json       |   3 +
 pages/personList/personList.wxml       |  31 ++++++
 pages/personList/personList.wxss       |  75 +++++++++++++
 pages/signUpPage/signUpPage.js         | 108 ++++++++++++++++--
 pages/signUpPage/signUpPage.wxml       |  34 +++---
 pages/signUpPage/signUpPage.wxss       |   8 +-
 pages/signUpSuccess/signUpSuccess.js   |  66 +++++++++++
 pages/signUpSuccess/signUpSuccess.json |   3 +
 pages/signUpSuccess/signUpSuccess.wxml |   2 +
 pages/signUpSuccess/signUpSuccess.wxss |   1 +
 26 files changed, 1195 insertions(+), 32 deletions(-)
 create mode 100644 assets/js/http/signUp.js
 create mode 100644 pages/addCompany/addCompany.js
 create mode 100644 pages/addCompany/addCompany.json
 create mode 100644 pages/addCompany/addCompany.wxml
 create mode 100644 pages/addCompany/addCompany.wxss
 create mode 100644 pages/addPerson/addPerson.js
 create mode 100644 pages/addPerson/addPerson.json
 create mode 100644 pages/addPerson/addPerson.wxml
 create mode 100644 pages/addPerson/addPerson.wxss
 create mode 100644 pages/companyList/companyList.js
 create mode 100644 pages/companyList/companyList.json
 create mode 100644 pages/companyList/companyList.wxml
 create mode 100644 pages/companyList/companyList.wxss
 create mode 100644 pages/personList/personList.js
 create mode 100644 pages/personList/personList.json
 create mode 100644 pages/personList/personList.wxml
 create mode 100644 pages/personList/personList.wxss
 create mode 100644 pages/signUpSuccess/signUpSuccess.js
 create mode 100644 pages/signUpSuccess/signUpSuccess.json
 create mode 100644 pages/signUpSuccess/signUpSuccess.wxml
 create mode 100644 pages/signUpSuccess/signUpSuccess.wxss

diff --git a/assets/css/common.wxss b/assets/css/common.wxss
index 8f2dab7..8da6aa0 100644
--- a/assets/css/common.wxss
+++ b/assets/css/common.wxss
@@ -855,3 +855,23 @@ color: #2A2A2A;
   text-align: center;
 }
 
+.validate::before{
+  content: '*';
+  font-size: 18px;
+  color: red;
+  position: absolute;
+  left: 2rpx;
+}
+
+/* 表单右对齐 */
+.text-right {
+  text-align: right!important;
+}
+
+/* 改变radio的默认大小 */
+.radio-scale {
+  transform:scale(0.7);
+}
+
+
+
diff --git a/assets/js/http/signUp.js b/assets/js/http/signUp.js
new file mode 100644
index 0000000..76ffb3c
--- /dev/null
+++ b/assets/js/http/signUp.js
@@ -0,0 +1,24 @@
+import http from './http.js'
+let URL_CONFIG = '/jero-boot/'
+const signUpApi = {
+  // 选择参会单位有权限的接口
+  companyList: (params) => http.get(`${URL_CONFIG}company/payCompanyManagement/list`, params),
+  // 选择参会单位无权限的接口
+  companyListNoLimit: (params) => http.get(`${URL_CONFIG}company/payCompanyManagement/listMeeting`, params),
+  // 添加参会单位
+  addCompany:(params) => http.post(`${URL_CONFIG}company/payCompanyManagement/add`, params),
+  //添加参会单位无权限接口
+  addCompanyNoLimit:(params) => http.post(`${URL_CONFIG}company/payCompanyManagement/add`, params),
+  // 选择联系人接口
+  personList:(params) => http.get(`${URL_CONFIG}company/payContactsManagement/queryByCompany`, params),
+  // 选择联系人的接口无权限
+  personListNolimit:(params) => http.get(`${URL_CONFIG}/company/payContactsManagement/queryByCompanyMeeting`, params),
+  // 添加联系人接口
+  addPerson: (params) => http.post(`${URL_CONFIG}company/payContactsManagement/add`, params),
+  // 添加联系人接口无权限
+  addPersonNoLimit: (params) => http.post(`${URL_CONFIG}company/payContactsManagement/addMeeting`, params),
+  // 会议报名接口
+  signUpMeeting:(params) => http.post(`${URL_CONFIG}meeting/payMeetingSituation/signUp`, params),
+}
+
+export default signUpApi
\ No newline at end of file
diff --git a/pages/addCompany/addCompany.js b/pages/addCompany/addCompany.js
new file mode 100644
index 0000000..26a94b3
--- /dev/null
+++ b/pages/addCompany/addCompany.js
@@ -0,0 +1,75 @@
+// pages/addCompany/addCompany.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+  // 返回选择单位
+  backCompanyList(){
+    wx.navigateTo({
+      url: '../companyList/companyList',
+    })
+  },
+  // 确定
+  addCompany(e){
+    console.log(e);
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/addCompany/addCompany.json b/pages/addCompany/addCompany.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/addCompany/addCompany.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/addCompany/addCompany.wxml b/pages/addCompany/addCompany.wxml
new file mode 100644
index 0000000..1d17e7c
--- /dev/null
+++ b/pages/addCompany/addCompany.wxml
@@ -0,0 +1,75 @@
+<!--创建企业-->
+<view class="container-box">
+  <form bindsubmit="addCompany">
+    <text class="back" bindtap="backCompanyList">去选择</text>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label validate">企业名称：</view>
+      <view class="wx-form-value">
+        <input name="companyName" placeholder="请输入企业名称" />
+        <text class="hint">请确保与发票抬头企业名称一致</text>
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label validate">信用代码：</view>
+      <view class="wx-form-value">
+        <input name="dutyCode" placeholder="请输入信用代码" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label validate">公司地址：</view>
+      <view class="wx-form-value">
+        <input name="companyAddress" placeholder="请输入公司地址" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label">公司电话：</view>
+      <view class="wx-form-value">
+        <input name="companyPhone" placeholder="请输入公司电话" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label">银行户名：</view>
+      <view class="wx-form-value">
+        <input name="bankAccountName" placeholder="请输入银行户名" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label validate">邮编：</view>
+      <view class="wx-form-value">
+        <input name="postalCode" placeholder="请输入邮编" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label">银行账号：</view>
+      <view class="wx-form-value">
+        <input name="bankAccount" placeholder="请输入银行账号" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label">开户行：</view>
+      <view class="wx-form-value">
+        <input name="openingBank" placeholder="请输入开户行" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label">备注：</view>
+      <view class="wx-form-value">
+        <textarea name="remarks" placeholder="请输入备注" name="remark" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <button class="btn-ok" formType="submit">确定</button>
+    </view>
+
+  </form>
+</view>
\ No newline at end of file
diff --git a/pages/addCompany/addCompany.wxss b/pages/addCompany/addCompany.wxss
new file mode 100644
index 0000000..e9cd6b2
--- /dev/null
+++ b/pages/addCompany/addCompany.wxss
@@ -0,0 +1,45 @@
+/* pages/addCompany/addCompany.wxss */
+.back {
+  color: #069f99;
+  position: absolute;
+  right: 40rpx;
+  top: 20rpx;
+}
+
+.wx-form-item {
+  padding: 20rpx;
+}
+
+.wx-form-label {
+  margin-bottom: 20rpx;
+}
+
+.wx-form-item .btn-ok{
+  width: 100%;
+  background: #069f99;
+  color: #fff;
+  font-weight: 400;
+  letter-spacing: 2px;
+}
+
+.wx-form-value input{
+  border: 1px solid #eee;
+  padding-left: 10px;
+  box-sizing: border-box;
+  height: 30px;
+  border-radius: 4px;
+}
+
+.wx-form-value textarea{
+  width: 100%;
+  border: 1px solid #eee;
+  padding-left: 10px;
+  box-sizing: border-box;
+  height: 80px;
+  border-radius: 4px;
+}
+
+.hint {
+  color: red;
+  font-size: 24rpx;
+}
diff --git a/pages/addPerson/addPerson.js b/pages/addPerson/addPerson.js
new file mode 100644
index 0000000..c8277a5
--- /dev/null
+++ b/pages/addPerson/addPerson.js
@@ -0,0 +1,105 @@
+// pages/addPerson/addPerson.js
+
+import signUpApi from '../../assets/js/http/signUp'
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    // 上一个页面选中的企业
+    selectedCompany:{}
+  },
+  // 返回联系人列表 
+  backPersonList(){
+    wx.navigateTo({
+      url: '../personList/personList',
+    })
+  },
+  // 添加参会人
+  addPerson(e){
+    console.log(e);
+    const formData = e.detail.value
+    // 参数需要传入公司id
+    formData.companyId = this.data.selectedCompany.id
+
+    signUpApi.addPersonNoLimit(formData).then(res => {
+      if(res.success){
+        wx.showToast({
+          title: res.message,
+          icon: "none",
+          duration: 800,
+        });
+        wx.navigateTo({
+          url: '../signUpPage/signUpPage',
+        })
+      }
+    }).catch(err => {
+      console.log(err);
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    const that = this
+    // 从缓存中拿 上个页面选中的企业
+    wx.getStorage({
+      key:'selectedCompany',
+      success(res) {
+        that.setData({
+          selectedCompany:JSON.parse(res.data)
+        })
+      }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/addPerson/addPerson.json b/pages/addPerson/addPerson.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/addPerson/addPerson.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/addPerson/addPerson.wxml b/pages/addPerson/addPerson.wxml
new file mode 100644
index 0000000..4fad17a
--- /dev/null
+++ b/pages/addPerson/addPerson.wxml
@@ -0,0 +1,81 @@
+<!--新建联系人-->
+<view class="container-box">
+  <form bindsubmit="addPerson">
+    <text class="back" bindtap="backPersonList">去选择</text>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label">企业名称：</view>
+      <view class="wx-form-value">
+        <input disabled name="companyName" value="{{selectedCompany.companyName}}" placeholder="请输入企业名称" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label validate">姓名：</view>
+      <view class="wx-form-value">
+        <input name="name" placeholder="请输入姓名" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label validate">邮政编码：</view>
+      <view class="wx-form-value">
+        <input name="postalCode" placeholder="请输入邮政编码" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label validate">手机号：</view>
+      <view class="wx-form-value">
+        <input name="phone" placeholder="请输入手机号" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label">职务：</view>
+      <view class="wx-form-value">
+        <input name="post" placeholder="请输入职务" />
+      </view>
+    </view>
+
+    
+    <view class="wx-form-item">
+      <view class="wx-form-label validate">性别：</view>
+      <view class="wx-form-value">
+        <radio-group name='gender' bindchange="paymentMethodRadioChange">
+            <label>
+              <radio class="radio-scale" value="1"/>男
+              <radio class="radio-scale" value="2"/>女
+            </label>
+          </radio-group>
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label validate">通讯地址：</view>
+      <view class="wx-form-value">
+        <input name="contactAddress" placeholder="请输入通讯地址" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <view class="wx-form-label validate">邮箱：</view>
+      <view class="wx-form-value">
+        <input name="email" placeholder="请输入邮箱" />
+      </view>
+    </view>
+
+
+    <view class="wx-form-item">
+      <view class="wx-form-label">备注：</view>
+      <view class="wx-form-value">
+        <textarea name="remarks" placeholder="请输入备注" name="remark" />
+      </view>
+    </view>
+
+    <view class="wx-form-item">
+      <button class="btn-ok" formType="submit">确定</button>
+    </view>
+
+  </form>
+</view>
diff --git a/pages/addPerson/addPerson.wxss b/pages/addPerson/addPerson.wxss
new file mode 100644
index 0000000..e1acbe3
--- /dev/null
+++ b/pages/addPerson/addPerson.wxss
@@ -0,0 +1,46 @@
+/* pages/addPerson/addPerson.wxss */
+
+.back {
+  color: #069f99;
+  position: absolute;
+  right: 40rpx;
+  top: 20rpx;
+}
+
+.wx-form-item {
+  padding: 20rpx;
+}
+
+.wx-form-label {
+  margin-bottom: 20rpx;
+}
+
+.wx-form-item .btn-ok{
+  width: 100%;
+  background: #069f99;
+  color: #fff;
+  font-weight: 400;
+  letter-spacing: 2px;
+}
+
+.wx-form-value input{
+  border: 1px solid #eee;
+  padding-left: 10px;
+  box-sizing: border-box;
+  height: 30px;
+  border-radius: 4px;
+}
+
+.wx-form-value textarea{
+  width: 100%;
+  border: 1px solid #eee;
+  padding-left: 10px;
+  box-sizing: border-box;
+  height: 80px;
+  border-radius: 4px;
+}
+
+.hint {
+  color: red;
+  font-size: 24rpx;
+}
diff --git a/pages/companyList/companyList.js b/pages/companyList/companyList.js
new file mode 100644
index 0000000..463ad1c
--- /dev/null
+++ b/pages/companyList/companyList.js
@@ -0,0 +1,139 @@
+// pages/companyList/companyList.js
+import signUpApi from '../../assets/js/http/signUp'
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    // 企业查询input
+    companyName:'',
+    // 列表查询条件
+    queryParam:{
+
+    },
+    // 数据
+    dataSource:[]
+  },
+  // 输入查询条件 
+  bindInputCompanyName(e){
+    this.setData({
+      companyName:e.detail.value
+    })
+  },
+  // 查询
+  search(){
+    const param = {
+      companyName:this.data.companyName
+    }
+    this.loadData(param)
+  },
+  // 重置
+  reset(){
+    this.setData({
+      companyName:''
+    })
+    this.search()
+  },
+  // 创建新的企业 
+  addCompany() {
+    wx.navigateTo({
+      url: '../addCompany/addCompany',
+    })
+  },
+  // 加载企业列表
+  loadData(param) {  
+    signUpApi.companyList(param).then(res => {
+      if(res.success){
+        this.setData({
+          dataSource:res.result.records
+        })
+      }
+    }).catch(err => {
+      wx.showToast({
+        title: '加载失败',
+        icon: 'none',
+        duration: 1000
+      })
+    })
+  },
+  // 选中的企业
+  selectedItem(e){
+   // 带过去的信息
+   let selectedCompany = JSON.stringify(e.currentTarget.dataset.company) 
+    wx.showModal({
+      title: '提示',
+      content: '是否选中该企业',
+      success: function (res) {
+        if (res.confirm) {
+          //这里是点击了确定以后
+          wx.navigateTo({
+            url: `../signUpPage/signUpPage?company=${selectedCompany}`,
+          })
+          // 在选中企业后 将选中的企业信息存入缓存中 保证新建企业联系人的时候的回显 与参数传id
+          wx.setStorage({
+            key:'selectedCompany',
+            data:selectedCompany
+          })
+        } else {
+          //这里是点击了取消以后
+        }
+      }
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.loadData()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/companyList/companyList.json b/pages/companyList/companyList.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/companyList/companyList.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/companyList/companyList.wxml b/pages/companyList/companyList.wxml
new file mode 100644
index 0000000..e8742b0
--- /dev/null
+++ b/pages/companyList/companyList.wxml
@@ -0,0 +1,30 @@
+<!--选择单位-->
+<view class="container-box">
+  <!-- 查询begin -->
+  <view class="search-box">
+    <view class="input">
+      <input bindinput="bindInputCompanyName" value="{{companyName}}" placeholder="请输入企业名称" />
+      <text class="clear-input" wx:if="{{!!companyName}}" bindtap="reset">x</text>
+    </view>
+    <button class="btn-search" bindtap="search">查询</button>
+  </view>
+  <!-- 查询end -->
+
+  <!-- 列表begin -->
+  <view class="list-wrap" wx:if="{{dataSource.length > 0}}">
+    <view wx:for="{{dataSource}}" wx:key='item'>
+      <view class="list-item" bindtap="selectedItem" data-company="{{item}}">{{item.companyName}}</view>
+    </view>
+  </view>
+
+
+  <view class="list-wrap" wx:if="{{dataSource.length === 0}}" class="no-data">
+  	<text>暂无数据</text>
+  </view>
+  <!-- 列表end -->
+</view>
+
+
+<view class="create-company">
+  <text class="color-green" bindtap="addCompany"> 没找到本企业?点此创建</text>
+</view>
\ No newline at end of file
diff --git a/pages/companyList/companyList.wxss b/pages/companyList/companyList.wxss
new file mode 100644
index 0000000..374b3b7
--- /dev/null
+++ b/pages/companyList/companyList.wxss
@@ -0,0 +1,75 @@
+/* pages/companyList/companyList.wxss */
+
+
+/* 查询 */
+.search-box {
+  display: flex;
+  justify-content: space-between;
+  padding: 20rpx;
+  margin-bottom: 40rpx;
+  box-sizing: border-box;
+  height: 60rpx;
+  line-height: 60rpx;
+  width: 100%;
+}
+
+.search-box input {
+  border: 1px solid #eee;
+  padding: 0 20rpx;
+  width: 400rpx;
+  height: 60rpx;
+  border-radius: 4px;
+}
+
+.btn-search {
+  margin: 0 !important;
+  width: 160rpx !important;
+  height: 60rpx;
+  line-height: 30rpx;
+  background: #069F99;
+  color: #fff;
+  letter-spacing: 1px;
+  font-size: 30rpx;
+}
+/* 重置 */
+.input {
+  height: 60rpx;
+  position: relative;
+}
+.clear-input {
+  position: absolute;
+  width: 30rpx;
+  text-align: center;
+  z-index: 123;
+  color: #eee;
+  right: 10rpx;
+  top: 0;
+  font-size: 16px;
+}
+/* 列表 */
+.list-wrap {
+  margin: 20rpx;
+  border: 1px solid #eee;
+  border-bottom: none;
+
+}
+.list-item {
+  word-break:break-all;
+  line-height: 60rpx;
+  padding: 10rpx;
+  border-bottom: 1px solid #eee;
+}
+/* 新建企业  */
+.create-company {
+  width: 100%;
+  position: fixed;
+  height: 40rpx;
+  line-height: 40rpx;
+  text-align: center;
+  border-top: 1px solid #eee;
+  padding: 20rpx;
+  bottom: 0;
+}
+.bg-f5 {
+  background-color: #f5f5f5;
+}
\ No newline at end of file
diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index 53a133c..daf353d 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -44,12 +44,28 @@ Page({
 
   // 会议详情
   meetingDetail(e){
-    // 会议id
+
     let meetingInfo =JSON.stringify(e.currentTarget.dataset.meetinginfo)
-    wx.navigateTo({
-      // url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, // (已报名)
-      url:'../signUpPage/signUpPage'
-    })
+    // wx.navigateTo({
+    //   // url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, // (已报名)
+    //   // 报名页面
+    //   url:`../signUpPage/signUpPage?meetingInfo=${meetingInfo}`
+
+    // })
+
+    // 如果是去报名页面需要在缓存中存储会议信息 当报名结束后 需要清除缓存中的当前会议信息
+    if(true){
+      wx.setStorage({
+        key:"currentMeetingInfo",
+        data:e.currentTarget.dataset.meetinginfo,
+        success(){
+          wx.navigateTo({
+            url:`../signUpPage/signUpPage`
+          })
+        }
+      })
+    }
+
   },
   // 获取会议列表数据
   queryMeetingList(){
diff --git a/pages/personList/personList.js b/pages/personList/personList.js
new file mode 100644
index 0000000..2d61381
--- /dev/null
+++ b/pages/personList/personList.js
@@ -0,0 +1,146 @@
+// pages/personList/personList.js
+import signUpApi from "../../assets/js/http/signUp"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    // 用户查询input
+    name: '',
+    // 列表查询条件
+    queryParam: {
+      companyId: ''
+    },
+    // 数据
+    dataSource: []
+  },
+  // 输入查询条件 
+  bindInputName(e) {
+    this.setData({
+      name: e.detail.value
+    })
+  },
+  // 查询
+  search() {
+    const param = {
+      companyId: '1448106910856052737',
+      name: this.data.name
+    }
+    this.loadData(param)
+  },
+  // 重置
+  reset() {
+    this.setData({
+      name: ''
+    })
+    this.search()
+  },
+  // 创建新的联系人
+  addPerson() {
+    wx.navigateTo({
+      url: '../addPerson/addPerson',
+    })
+  },
+  // 选中联系人
+  selectedItem(e) {
+    // 带过去的信息
+    let selectedPerson = e.currentTarget.dataset.person
+    wx.showModal({
+      title: '提示',
+      content: '是否选中该联系人',
+      success: function (res) {
+        if (res.confirm) {
+          //这里是点击了确定以后
+          // 将选中的联系人存入缓存中
+          wx.setStorage({
+            key:'selectedPerson',
+            data:selectedPerson,
+            success() {
+              wx.navigateTo({
+                url: `../signUpPage/signUpPage`,
+              })
+            }
+          })
+        } else {
+          //这里是点击了取消以后
+        }
+      }
+    })
+  },
+  // 加载联系人列表
+  loadData(param) {
+    signUpApi.personList(param).then(res => {
+      if (res.success) {
+        this.setData({
+          dataSource: res.result
+        })
+      }
+    }).catch(err => {
+      wx.showToast({
+        title: '加载失败',
+        icon: 'none',
+        duration: 1000
+      })
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      'queryParam.companyId':options.companyId
+    })
+    this.loadData(this.data.queryParam)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/personList/personList.json b/pages/personList/personList.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/personList/personList.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/personList/personList.wxml b/pages/personList/personList.wxml
new file mode 100644
index 0000000..c803a2d
--- /dev/null
+++ b/pages/personList/personList.wxml
@@ -0,0 +1,31 @@
+<!--联系人列表-->
+<!--选择单位-->
+<view class="container-box">
+  <!-- 查询begin -->
+  <view class="search-box">
+    <view class="input">
+      <input bindinput="bindInputName" value="{{name}}" placeholder="请输入用户名称" />
+      <text class="clear-input" wx:if="{{!!name}}" bindtap="reset">x</text>
+    </view>
+    <button class="btn-search" bindtap="search">查询</button>
+  </view>
+  <!-- 查询end -->
+
+  <!-- 列表begin -->
+  <view class="list-wrap" wx:if="{{dataSource.length > 0}}">
+    <view wx:for="{{dataSource}}" wx:key='item' data-company="{{item}}" >
+      <view class="list-item" bindtap="selectedItem" data-person="{{item}}">{{item.name}}</view>
+    </view>
+  </view>
+
+
+  <view class="list-wrap" wx:if="{{dataSource.length === 0}}" class="no-data">
+  	<text>暂无数据</text>
+  </view>
+  <!-- 列表end -->
+</view>
+
+
+<view class="create-company">
+  <text class="color-green" bindtap="addPerson"> 没找到联系人?点此创建</text>
+</view>
diff --git a/pages/personList/personList.wxss b/pages/personList/personList.wxss
new file mode 100644
index 0000000..a7055dc
--- /dev/null
+++ b/pages/personList/personList.wxss
@@ -0,0 +1,75 @@
+/* pages/personList/personList.wxss *//* pages/companyList/companyList.wxss */
+
+
+/* 查询 */
+.search-box {
+  display: flex;
+  justify-content: space-between;
+  padding: 20rpx;
+  margin-bottom: 40rpx;
+  box-sizing: border-box;
+  height: 60rpx;
+  line-height: 60rpx;
+  width: 100%;
+}
+
+.search-box input {
+  border: 1px solid #eee;
+  padding: 0 20rpx;
+  width: 400rpx;
+  height: 60rpx;
+  border-radius: 4px;
+}
+
+.btn-search {
+  margin: 0 !important;
+  width: 160rpx !important;
+  height: 60rpx;
+  line-height: 30rpx;
+  background: #069F99;
+  color: #fff;
+  letter-spacing: 1px;
+  font-size: 30rpx;
+}
+/* 重置 */
+.input {
+  height: 60rpx;
+  position: relative;
+}
+.clear-input {
+  position: absolute;
+  width: 30rpx;
+  text-align: center;
+  z-index: 123;
+  color: #eee;
+  right: 10rpx;
+  top: 0;
+  font-size: 16px;
+}
+/* 列表 */
+.list-wrap {
+  margin: 20rpx;
+  border: 1px solid #eee;
+  border-bottom: none;
+
+}
+.list-item {
+  word-break:break-all;
+  line-height: 60rpx;
+  padding: 10rpx;
+  border-bottom: 1px solid #eee;
+}
+/* 新建企业  */
+.create-company {
+  width: 100%;
+  position: fixed;
+  height: 40rpx;
+  line-height: 40rpx;
+  text-align: center;
+  border-top: 1px solid #eee;
+  padding: 20rpx;
+  bottom: 0;
+}
+.bg-f5 {
+  background-color: #f5f5f5;
+}
\ No newline at end of file
diff --git a/pages/signUpPage/signUpPage.js b/pages/signUpPage/signUpPage.js
index 141fdaf..092f754 100644
--- a/pages/signUpPage/signUpPage.js
+++ b/pages/signUpPage/signUpPage.js
@@ -1,6 +1,6 @@
 // pages/signUpPage/signUpPage.js
+import signUpApi from '../../assets/js/http/signUp'
 Page({
-
   /**
    * 页面的初始数据
    */
@@ -33,11 +33,16 @@ Page({
     // 抵达时间
     arrivalTime:'请选择抵达时间',
     // 离开时间
-    departureTime:'请选择离开时间'
+    departureTime:'请选择离开时间',
+    // 选中的参会单位
+    selectedCompany:{},
+    // 选中的联系人
+    selectedPerson:{},
+    // 选中的会议
+    selectedMeeting:{}
   },
   // 是否需要发票的选择
   needInvoiceChange(e){
-    console.log(e);
     this.setData({
       index:e.detail.value
     })
@@ -54,15 +59,104 @@ Page({
       departureTime:e.detail.value
     })
   },
-  // 确定 
-  formSubmit(){
-    console.log(113);
+  // 确定
+  formSubmit(e){
+
+    const formData = Object.assign({},e.detail.value)
+    // 会议id
+    formData.meetingId = '1448213074467938306'
+    // 参会人id
+    formData.companyContactId = this.data.selectedPerson.id
+    // 邮寄联系人id   暂时写一样的 测试用
+    formData.postContactId = this.data.selectedPerson.id
+    // 参会企业id
+    formData.companyId = this.data.selectedCompany.id
+    // 会议类型
+    formData.meetingType = this.data.selectedMeeting.meetingType
+
+    console.log(formData);
+
+    signUpApi.signUpMeeting(formData).then(res => {
+      if(res.success){
+        // 成功 清除缓存 跳转报名成功页面
+        wx.removeStorage({
+          key: 'selectedCompany',
+        })
+        wx.removeStorage({
+          key: 'selectedPerson',
+        })
+        wx.removeStorage({
+          key: 'currentMeetingInfo',
+          success(){
+            // 跳转报名成功页面
+            wx.navigateTo({
+              url: '../signUpSuccess/signUpSuccess',
+            })
+          }
+        })
+      }
+    })
+  },
+  // 选择参会单位
+  selectCompany(){
+    wx.navigateTo({
+      url: '../companyList/companyList',
+    })
+  },
+  // 选择参会人
+  selectPerson(){
+    console.log(this.data.selectedCompany);
+    if(!!this.data.selectedCompany.id){
+      wx.navigateTo({
+        url: `../personList/personList?companyId=${this.data.selectedCompany.id}`,
+      })
+    }else{
+      wx.showToast({
+        title: '请先选择参会单位',
+        icon: "none",
+        duration: 800,
+      });
+    }
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options);
+    // this.setData({
+    //   selectedCompany:JSON.parse(options.company)
+    // })
 
+    // 从缓存中拿选中的企业
+    const that = this
+    wx.getStorage({
+      key:'selectedCompany',
+      success(res) {
+        that.setData({
+          selectedCompany:JSON.parse(res.data)
+        })
+      }
+    })
+    // 从缓存中拿选中的联系人
+    wx.getStorage({
+      key:'selectedPerson',
+      success(res) {
+        that.setData({
+          selectedPerson:res.data
+        })
+      }
+    })
+    //  从缓存中拿选中的会议的信息
+
+    wx.getStorage({
+      key:'currentMeetingInfo',
+      success(res) {
+        console.log(res,'meetingInfo');
+        that.setData({
+          selectedMeeting:res.data
+        })
+      }
+    })
   },
 
   /**
@@ -113,4 +207,4 @@ Page({
   onShareAppMessage: function () {
 
   }
-})
\ No newline at end of file
+})
diff --git a/pages/signUpPage/signUpPage.wxml b/pages/signUpPage/signUpPage.wxml
index a7bb54e..69a098b 100644
--- a/pages/signUpPage/signUpPage.wxml
+++ b/pages/signUpPage/signUpPage.wxml
@@ -5,12 +5,12 @@
 
     <view class="form-item">
       <text class="item-label flex-1">参会单位：</text>
-      <input placeholder-class="text-right" name="phone" bindinput="bindInputPhone" value="{{phone}}" placeholder="请选择参会单位" />
+      <input placeholder-class="text-right" bindtap="selectCompany" name="selectedCompany.companyName" bindinput="bindInputPhone" value="{{selectedCompany.companyName}}" placeholder="请选择参会单位" />
     </view>
 
     <view class="form-item">
       <text class="item-label flex-1">参会人：</text>
-      <input placeholder-class="text-right" name="phone" bindinput="bindInputPhone" value="{{phone}}" placeholder="请选择" />
+      <input placeholder-class="text-right"  bindtap="selectPerson" bindinput="bindInputPhone" value="{{selectedPerson.name}}" placeholder="请选择参会人" />
     </view>
 
     <view class="form-item">
@@ -19,26 +19,26 @@
     </view>
 
     <view class="form-item-radio">
-        <view class="radio-label"> 
+        <view class="radio-label">
           <text class="item-label flex-1 validate">参会身份：</text>
         </view>
         <view>
-          <radio-group bindchange="identifyRadioChange">
+          <radio-group name='identity' bindchange="identifyRadioChange">
             <label class="radio radio-item" wx:for="{{identifyList}}" wx:key="item">
-              <radio value="{{item.value}}"/>{{item.name}} 
+              <radio class="radio-scale" value="{{item.value}}"/>{{item.name}}
             </label>
           </radio-group>
         </view>
     </view>
 
     <view class="form-item-radio">
-        <view class="radio-label"> 
+        <view class="radio-label">
           <text class="item-label flex-1 validate">缴费方式：</text>
         </view>
         <view>
-          <radio-group bindchange="paymentMethodRadioChange">
+          <radio-group name='payMode' bindchange="paymentMethodRadioChange">
             <label class="radio radio-item" wx:for="{{paymentMethodList}}" wx:key="item">
-              <radio value="{{item.value}}"/>{{item.name}} 
+              <radio class="radio-scale" value="{{item.value}}"/>{{item.name}}
             </label>
           </radio-group>
         </view>
@@ -47,7 +47,7 @@
 
     <view class="form-item">
       <text class="item-label flex-1 validate">是否需要发票：</text>
-      <picker bindchange="needInvoiceChange" range="{{needInvoiceList}}"  value="{{index}}" range-key='name'>
+      <picker name='needInvoice' bindchange="needInvoiceChange" range="{{needInvoiceList}}"  value="{{index}}" range-key='name'>
         <view class="picker">
         {{index === -1 ? '请选择' :needInvoiceList[index].name }}
         </view>
@@ -61,22 +61,22 @@
 
     <view class="form-item">
       <text class="item-label flex-1 validate">邮寄地址：</text>
-      <input placeholder-class="text-right" name="phone" bindinput="bindInputPhone" value="{{phone}}" placeholder="请输入邮寄地址" />
+      <input  placeholder-class="text-right" name="postContactAddress" bindinput="bindInputPhone"  placeholder="请输入邮寄地址" />
     </view>
 
     <view class="form-item">
       <text class="item-label flex-1 validate">邮编：</text>
-      <input placeholder-class="text-right" name="phone" bindinput="bindInputPhone" value="{{phone}}" placeholder="请输入邮编" />
+      <input placeholder-class="text-right" name="postCode" bindinput="bindInputPhone"  placeholder="请输入邮编" />
     </view>
 
     <view class="form-item-radio">
-        <view class="radio-label"> 
+        <view class="radio-label">
           <text  class="item-label flex-1 validate">是否住酒店：</text>
         </view>
         <view>
-          <radio-group bindchange="paymentMethodRadioChange">
+          <radio-group name='checkInHotel' bindchange="paymentMethodRadioChange">
             <label class="radio radio-item" wx:for="{{needCheckInHotel}}" wx:key="item">
-              <radio value="{{item.value}}"/>{{item.name}} 
+              <radio class="radio-scale" value="{{item.value}}"/>{{item.name}}
             </label>
           </radio-group>
         </view>
@@ -84,7 +84,7 @@
 
     <view class="form-item">
       <text class="item-label flex-1">抵达时间：</text>
-      <picker mode="date" value="{{date}}" bindchange="bindDateChangeArriveTime">
+      <picker name='arrivalTime' mode="date" value="{{date}}" bindchange="bindDateChangeArriveTime">
     <view class="picker">
        {{arrivalTime}}
     </view>
@@ -93,7 +93,7 @@
 
     <view class="form-item">
       <text class="item-label flex-1">离开时间：</text>
-      <picker mode="date" value="{{date}}" bindchange="bindDateChangeLeaveTime">
+      <picker name='departureTime' mode="date" value="{{date}}" bindchange="bindDateChangeLeaveTime">
     <view class="picker">
     {{departureTime}}
     </view>
@@ -104,7 +104,7 @@
       <text class="item-label flex-1">费用合计：</text>
       <text>200元</text>
     </view>
-    
+
     <view class="btn-wrap">
       <button class="btn-ok"  formType="submit">确定</button>
     </view>
diff --git a/pages/signUpPage/signUpPage.wxss b/pages/signUpPage/signUpPage.wxss
index 79089cc..00dfdbd 100644
--- a/pages/signUpPage/signUpPage.wxss
+++ b/pages/signUpPage/signUpPage.wxss
@@ -13,7 +13,9 @@
   padding: 10rpx 20rpx;
   box-sizing: border-box;
 }
-
+.form-item input {
+  text-align: right;
+}
 .form-item-radio {
   margin-top: 20px;
   width: 100%;
@@ -33,7 +35,7 @@
 .text-right {
   text-align: right;
 }
- 
+
 .btn-wrap {
   padding: 0 20rpx;
   margin: 20rpx 0;
@@ -60,4 +62,4 @@
   color: red;
   position: absolute;
   left: 2rpx;
-}
\ No newline at end of file
+}
diff --git a/pages/signUpSuccess/signUpSuccess.js b/pages/signUpSuccess/signUpSuccess.js
new file mode 100644
index 0000000..18fa8c0
--- /dev/null
+++ b/pages/signUpSuccess/signUpSuccess.js
@@ -0,0 +1,66 @@
+// pages/signUpSuccess/signUpSuccess.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/signUpSuccess/signUpSuccess.json b/pages/signUpSuccess/signUpSuccess.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/signUpSuccess/signUpSuccess.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/signUpSuccess/signUpSuccess.wxml b/pages/signUpSuccess/signUpSuccess.wxml
new file mode 100644
index 0000000..e65d766
--- /dev/null
+++ b/pages/signUpSuccess/signUpSuccess.wxml
@@ -0,0 +1,2 @@
+<!--pages/signUpSuccess/signUpSuccess.wxml-->
+<text>报名成功</text>
diff --git a/pages/signUpSuccess/signUpSuccess.wxss b/pages/signUpSuccess/signUpSuccess.wxss
new file mode 100644
index 0000000..46f7a5b
--- /dev/null
+++ b/pages/signUpSuccess/signUpSuccess.wxss
@@ -0,0 +1 @@
+/* pages/signUpSuccess/signUpSuccess.wxss */
\ No newline at end of file