新建企业与新建联系人修改

assets/js/http/signUp.js

@@ -8,7 +8,7 @@ const signUpApi = {
   // 添加参会单位
   addCompany:(params) => http.post(`${URL_CONFIG}company/payCompanyManagement/add`, params),
   //添加参会单位无权限接口
-  addCompanyNoLimit:(params) => http.post(`${URL_CONFIG}company/payCompanyManagement/add`, params),
+  addCompanyNoLimit:(params) => http.post(`${URL_CONFIG}company/payCompanyManagement/addMeeting`, params),
   // 选择联系人接口
   personList:(params) => http.get(`${URL_CONFIG}company/payContactsManagement/queryByCompany`, params),
   // 选择联系人的接口无权限

pages/addCompany/addCompany.js

@@ -1,11 +1,14 @@
 // pages/addCompany/addCompany.js
+
+import signUpApi from '../../assets/js/http/signUp'
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    // 是否是国际研讨会报名的选择
+    prepage:''
   },
   // 返回选择单位
   backCompanyList(){
@@ -15,13 +18,38 @@ Page({
   },
   // 确定
   addCompany(e){
-    console.log(e);
+    const formData = e.detail.value
+    const that = this
+
+    signUpApi.addCompanyNoLimit(formData).then(res => {
+      if(res.success){
+        wx.showToast({
+          title: res.message,
+          icon: "none",
+          duration: 800,
+        });
+        if(that.data.prepage === 'guoji' ){
+          wx.navigateTo({
+            url: '../signUpPageGuoji/signUpPageGuoji',
+          })
+        }else{
+          wx.navigateTo({
+            url: '../signUpPage/signUpPage',
+          })
+        }
+      }
+    }).catch(err => {
+      console.log(err);
+    })
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    this.setData({
+      prepage:options.prepage
+    })
   },
 
   /**

pages/addPerson/addPerson.js

@@ -8,7 +8,9 @@ Page({
    */
   data: {
     // 上一个页面选中的企业
-    selectedCompany:{}
+    selectedCompany:{},
+    // 是否是国际研讨会的选择
+    prepage:""
   },
   // 返回联系人列表 
   backPersonList(){
@@ -18,6 +20,9 @@ Page({
   },
   // 添加参会人
   addPerson(e){
+    
+    const that = this
+    console.log(that.data.prepage);
     console.log(e);
     const formData = e.detail.value
     // 参数需要传入公司id
@@ -30,9 +35,16 @@ Page({
           icon: "none",
           duration: 800,
         });
-        wx.navigateTo({
+    
-          url: '../signUpPage/signUpPage',
+        if(that.data.prepage === 'guoji' ){
-        })
+          wx.navigateTo({
+            url: '../signUpPageGuoji/signUpPageGuoji',
+          })
+        }else{
+          wx.navigateTo({
+            url: '../signUpPage/signUpPage',
+          })
+        }
       }
     }).catch(err => {
       console.log(err);
@@ -48,7 +60,8 @@ Page({
       key:'selectedCompany',
       success(res) {
         that.setData({
-          selectedCompany:JSON.parse(res.data)
+          selectedCompany:JSON.parse(res.data),
+          prepage:options.prepage
         })
       }
     })

pages/companyList/companyList.js

@@ -7,49 +7,57 @@ Page({
    */
   data: {
     // 企业查询input
-    companyName:'',
+    companyName: '',
     // 列表查询条件
-    queryParam:{
+    searchParams: {
-
+      pageNo: 1,
+      pageSize: 10,
+      companyName: ''
     },
     // 数据
-    dataSource:[],
+    dataSource: [],
     // 是否国际研讨会过来的
-    page:""
+    page: ""
   },
   // 输入查询条件 
-  bindInputCompanyName(e){
+  bindInputCompanyName(e) {
     this.setData({
-      companyName:e.detail.value
+      "searchParams.companyName": e.detail.value
     })
   },
   // 查询
-  search(){
+  search() {
-    const param = {
+    this.data.searchParams.pageNo = 1
-      companyName:this.data.companyName
+    this.loadData()
-    }
-    this.loadData(param)
   },
   // 重置
-  reset(){
+  reset() {
     this.setData({
-      companyName:''
+      'searchParams.companyName': ''
     })
     this.search()
   },
   // 创建新的企业 
-  addCompany() {
+  addCompany(e) {
     wx.navigateTo({
-      url: '../addCompany/addCompany',
+      url: `../addCompany/addCompany?prepage=${e.currentTarget.dataset.prepage}`,
     })
   },
   // 加载企业列表
-  loadData(param) {  
+  loadData() {
-    signUpApi.companyList(param).then(res => {
+    signUpApi.companyList(this.data.searchParams).then(res => {
-      if(res.success){
+      if (res.success) {
-        this.setData({
+        // 搜索时，把原数据清空，重新筛选
-          dataSource:res.result.records
+        if (this.data.searchParams.pageNo === 1) {
-        })
+          this.setData({
+            dataSource: []
+          })
+        }
+        if (res.result.records && res.result.records.length) {
+          this.setData({
+            dataSource: [...this.data.dataSource,...res.result.records]
+          })
+        }
       }
     }).catch(err => {
       wx.showToast({
@@ -60,30 +68,30 @@ Page({
     })
   },
   // 选中的企业
-  selectedItem(e){
+  selectedItem(e) {
     const that = this
-   // 带过去的信息
+    // 带过去的信息
-   let selectedCompany = JSON.stringify(e.currentTarget.dataset.company) 
+    let selectedCompany = JSON.stringify(e.currentTarget.dataset.company)
     wx.showModal({
       title: '提示',
       content: '是否选中该企业',
       success: function (res) {
         if (res.confirm) {
           //这里是点击了确定以后
-          if(that.data.page === 'guoji'){
+          if (that.data.page === 'guoji') {
             wx.navigateTo({
               url: `../signUpPageGuoji/signUpPageGuoji?company=${selectedCompany}`,
             })
-            console.log('that.data.page',that.data.page);
+            console.log('that.data.page', that.data.page);
-          }else{
+          } else {
             wx.navigateTo({
               url: `../signUpPage/signUpPage?company=${selectedCompany}`,
             })
           }
           // 在选中企业后 将选中的企业信息存入缓存中 保证新建企业联系人的时候的回显 与参数传id
           wx.setStorage({
-            key:'selectedCompany',
+            key: 'selectedCompany',
-            data:selectedCompany
+            data: selectedCompany
           })
         } else {
           //这里是点击了取消以后
@@ -96,9 +104,9 @@ Page({
    */
   onLoad: function (options) {
     console.log(options);
-    if(options.page){
+    if (options.page) {
       this.setData({
-        page:options.page
+        page: options.page
       })
     }
     this.loadData()
@@ -144,6 +152,8 @@ Page({
    */
   onReachBottom: function () {
 
+    this.data.searchParams.pageNo++
+    this.loadData()
   },
 
   /**

pages/companyList/companyList.wxml

@@ -3,8 +3,8 @@
   <!-- 查询begin -->
   <view class="search-box">
     <view class="input">
-      <input bindinput="bindInputCompanyName" value="{{companyName}}" placeholder="请输入企业名称" />
+      <input bindinput="bindInputCompanyName" value="{{searchParams.companyName}}" placeholder="请输入企业名称" />
-      <text class="clear-input" wx:if="{{!!companyName}}" bindtap="reset">x</text>
+      <text class="clear-input" wx:if="{{!!searchParams.companyName}}" bindtap="reset">x</text>
     </view>
     <button class="btn-search" bindtap="search">查询</button>
   </view>
@@ -19,12 +19,12 @@
 
 
   <view class="list-wrap" wx:if="{{dataSource.length === 0}}" class="no-data">
-  	<text>暂无数据</text>
+    <text>暂无数据</text>
   </view>
   <!-- 列表end -->
 </view>
 
 
-<view class="create-company">
+<view class="create-company color-green" bindtap="addCompany" data-prepage="{{page}}">
-  <text class="color-green" bindtap="addCompany"> 没找到本企业?点此创建</text>
+  没找到本企业?点此创建
 </view>

pages/companyList/companyList.wxss

@@ -51,23 +51,24 @@
   margin: 20rpx;
   border: 1px solid #eee;
   border-bottom: none;
-
+  border-radius: 4px;
 }
 .list-item {
   word-break:break-all;
-  line-height: 60rpx;
+  line-height: 80rpx;
   padding: 10rpx;
   border-bottom: 1px solid #eee;
 }
 /* 新建企业  */
 .create-company {
   width: 100%;
-  position: fixed;
+  position: relative;
-  height: 40rpx;
+  height: 80rpx;
-  line-height: 40rpx;
+  line-height: 50rpx;
   text-align: center;
   border-top: 1px solid #eee;
   padding: 20rpx;
+  box-sizing: border-box;
   bottom: 0;
 }
 .bg-f5 {

pages/personList/personList.js

@@ -6,11 +6,12 @@ Page({
    * 页面的初始数据
    */
   data: {
-    // 用户查询input
-    name: '',
     // 列表查询条件
     queryParam: {
-      companyId: ''
+      companyId: '',
+      pageNo: 1,
+      pageSize: 10,
+      name: ''
     },
     // 数据
     dataSource: [],
@@ -22,28 +23,26 @@ Page({
   // 输入查询条件
   bindInputName(e) {
     this.setData({
-      name: e.detail.value
+      "queryParam.name": e.detail.value
     })
   },
   // 查询
   search() {
-    const param = {
+    this.data.queryParam.pageNo = 1
-      companyId: '1448106910856052737',
+    this.loadData()
-      name: this.data.name
-    }
-    this.loadData(param)
   },
   // 重置
   reset() {
     this.setData({
-      name: ''
+      'queryParam.name': ''
     })
     this.search()
   },
   // 创建新的联系人
-  addPerson() {
+  addPerson(e) {
+    console.log(e);
     wx.navigateTo({
-      url: '../addPerson/addPerson',
+      url: `../addPerson/addPerson?prepage=${e.currentTarget.dataset.prepage}`,
     })
   },
   // 选中联系人
@@ -103,12 +102,20 @@ Page({
     })
   },
   // 加载联系人列表
-  loadData(param) {
+  loadData() {
-    signUpApi.personList(param).then(res => {
+    signUpApi.personListNolimit(this.data.queryParam).then(res => {
       if (res.success) {
-        this.setData({
+           // 搜索时，把原数据清空，重新筛选
-          dataSource: res.result
+           if(this.data.queryParam.pageNo === 1) {
-        })
+            this.setData({
+              dataSource: []
+            })
+          }
+          if(res.result && res.result.length){
+            this.setData({
+              dataSource: [...this.data.dataSource, ...res.result]
+            })
+          }
       }
     }).catch(err => {
       wx.showToast({
@@ -129,7 +136,7 @@ Page({
       selectType:options.selectType,
       page:options.page
     })
-    this.loadData(this.data.queryParam)
+    this.loadData()
   },
 
   /**
@@ -171,7 +178,8 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-
+    this.data.searchParams.pageNo++
+    this.loadData()
   },
 
   /**

pages/personList/personList.wxml

@@ -4,8 +4,8 @@
   <!-- 查询begin -->
   <view class="search-box">
     <view class="input">
-      <input bindinput="bindInputName" value="{{name}}" placeholder="请输入用户名称" />
+      <input bindinput="bindInputName" value="{{queryParam.name}}" placeholder="请输入用户名称" />
-      <text class="clear-input" wx:if="{{!!name}}" bindtap="reset">x</text>
+      <text class="clear-input" wx:if="{{!!queryParam.name}}" bindtap="reset">x</text>
     </view>
     <button class="btn-search" bindtap="search">查询</button>
   </view>
@@ -19,13 +19,13 @@
   </view>
 
 
-  <view class="list-wrap" wx:if="{{dataSource.length === 0}}" class="no-data">
+  <view class="list-wrap" wx:if="{{dataSource.length === 0}}" class="no-data" >
   	<text>暂无数据</text>
   </view>
   <!-- 列表end -->
 </view>
 
 
-<view class="create-company">
+<view class="create-company color-green" data-prepage="{{page}}" bindtap="addPerson"> 
-  <text class="color-green" bindtap="addPerson"> 没找到联系人?点此创建</text>
+  没找到联系人?点此创建
 </view>

pages/personList/personList.wxss

@@ -51,6 +51,7 @@
   margin: 20rpx;
   border: 1px solid #eee;
   border-bottom: none;
+  border-radius: 4px;
 
 }
 .list-item {
@@ -62,12 +63,13 @@
 /* 新建企业  */
 .create-company {
   width: 100%;
-  position: fixed;
+  position: relative;
-  height: 40rpx;
+  height: 80rpx;
-  line-height: 40rpx;
+  line-height: 50rpx;
   text-align: center;
   border-top: 1px solid #eee;
   padding: 20rpx;
+  box-sizing: border-box;
   bottom: 0;
 }
 .bg-f5 {