From b181a9ea2a8d0afd13f444e79d1d467ad2bdd147 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Mon, 15 Jan 2024 17:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=20=E8=B5=B7=E8=8D=89?=
 =?UTF-8?q?=E7=BB=84=E6=8A=A5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                      |   5 +++--
 assets/images/qicaozu-new.png | Bin 0 -> 3231 bytes
 assets/js/http/userApi.js     |   5 ++++-
 pages/contacts/contacts.js    |  18 +++++++++++++-----
 pages/contacts/contacts.wxml  |   2 +-
 5 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 assets/images/qicaozu-new.png

diff --git a/app.json b/app.json
index a4425f0..a91933a 100644
--- a/app.json
+++ b/app.json
@@ -37,8 +37,9 @@
     "pages/councilDetail/councilDetail",
     "pages/guestEditSignUpinfo/guestEditSignUpInfo",
     "pages/invoice/invoice",
-    "pages/contacts/contacts"
-
+    "pages/contacts/contacts",
+    "pages/signUpDraftTeamEntrance/signUpDraftTeamEntrance",
+    "pages/signUpDraftTeamPage/signUpDraftTeamPage"
   ],
   "window":{
     "backgroundTextStyle": "dark",
diff --git a/assets/images/qicaozu-new.png b/assets/images/qicaozu-new.png
new file mode 100644
index 0000000000000000000000000000000000000000..8351adc98761ab875c801004f13ad8b6a6f35fdf
GIT binary patch
literal 3231
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
RDk}g0002ovPDHLkV1mR(5Rw1@

literal 0
HcmV?d00001

diff --git a/assets/js/http/userApi.js b/assets/js/http/userApi.js
index b1f4271..c7451c5 100644
--- a/assets/js/http/userApi.js
+++ b/assets/js/http/userApi.js
@@ -95,7 +95,10 @@ const UserApi = {
   getDraftContactsInfo: (params) => http.get(`${URL_CONFIG}drafting/payDraftingGroupSubitem/getItemById`, params),
   // 起草组联系人提交
   editDraftContactsInfo: (params) => http.post(`${URL_CONFIG}drafting/payDraftingGroupSubitem/editCompany`, params),
-
+  // 通过id查起草组信息(无权限接口)
+  getDraftGroupInfoById: (params) => http.get(`${URL_CONFIG}drafting/payDraftingGroup/applyQueryById`, params),
+  // 起草组报名(无权限接口)
+  draftingGroupRegistration: (params) => http.post(`${URL_CONFIG}/drafting/payDraftingGroupSubitem/addByQRCode`, params)
 }
 
 export default UserApi
diff --git a/pages/contacts/contacts.js b/pages/contacts/contacts.js
index 0dd471d..eb7ba56 100644
--- a/pages/contacts/contacts.js
+++ b/pages/contacts/contacts.js
@@ -83,8 +83,17 @@ Page({
   },
   // 提交
   formSubmit(e) {
+    // 企业联系人1必填
+    if (!this.data.personList[0].contactsId) {
+      wx.showToast({
+        title: '请选择企业联系人1',
+        icon: 'none',
+        duration: 2000
+      })
+      return
+    }
     // 企业联系人不能重复
-    const personIds = this.data.personList.map(item => item.contactsId)
+    const personIds = this.data.personList.filter(item => item.contactsId).map(item => item.contactsId)
     if (Array.from(new Set(personIds)).length !== personIds.length) {
       wx.showToast({
         title: '请选择不同的联系人',
@@ -105,7 +114,7 @@ Page({
       // 工作组
       case 'work':
         // 联络人列表
-        params.payWorkingGroupSubItemContactsList = this.data.personList
+        params.payWorkingGroupSubItemContactsList = this.data.personList.filter(item => item.contactsId)
         UserApi.editWorkContactsInfo(params).then(res => {
           if (res.success) {
             wx.showToast({
@@ -134,7 +143,7 @@ Page({
       // 起草组
       case 'draft':
         // 联络人列表
-        params.payDraftingGroupSubItemContactsList = this.data.personList
+        params.payDraftingGroupSubItemContactsList = this.data.personList.filter(item => item.contactsId)
         UserApi.editDraftContactsInfo(params).then(res => {
           if (res.success) {
             wx.showToast({
@@ -161,7 +170,6 @@ Page({
         })
         break
     }
-    UserApi.editWorkContactsInfo
   },
   goBack(){
     wx.navigateBack()
@@ -254,7 +262,7 @@ Page({
   /**
    * 声明周期函数--监听页面显示
    */
-  onShow: function () {    
+  onShow: function () {
     console.log('选择的用户', this.data.selectedPersonIndex, this.data.selectedPerson);
     if (this.data.selectedPersonIndex !== null && this.data.selectedPersonIndex !== undefined) {
       const { id, name } = this.data.selectedPerson || {}
diff --git a/pages/contacts/contacts.wxml b/pages/contacts/contacts.wxml
index 0aa9f60..cb1028a 100644
--- a/pages/contacts/contacts.wxml
+++ b/pages/contacts/contacts.wxml
@@ -51,7 +51,7 @@
       
       <!-- 备注 -->
       <view class="form-item textarea">
-        <text class="item-label validate">备注</text>
+        <text class="item-label">备注</text>
         <textarea placeholder="请输入备注" name="remarks" value="{{model.remarks}}" maxlength="200" />
       </view>