From 09905b43ec2a249ef0e6057d148b8620cfaa1506 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期二, 26 三月 2024 10:47:38 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 packageDomain/pages/sampleBookList/applicationForm/index.js |   60 ++++++++++++++++++++++++++++--------------------------------
 1 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.js b/packageDomain/pages/sampleBookList/applicationForm/index.js
index 8cd51e5..3153c29 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.js
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.js
@@ -9,6 +9,7 @@
       workInfo: null,
       schoolName: "",
       courseName: "",
+      detailedAddress: ""
     },
     contactInfo: {
       fullName: "",
@@ -36,26 +37,22 @@
       })
       if (this.data.userInfo.role == 'Teacher') {
         this.setData({
-          teacherInfo: {
-            schoolName: JSON.parse(this.data.userInfo.data).schoolName,
-            courseName: JSON.parse(this.data.userInfo.data).courseName,
-          },
-          contactInfo: {
-            fullName: JSON.parse(this.data.userInfo.data).fullName,
-            phone: JSON.parse(this.data.userInfo.data).phone,
-            detailedAddress: JSON.parse(this.data.userInfo.data).detailedAddress
-          }
+          'teacherInfo.schoolName': JSON.parse(this.data.userInfo.data).schoolName,
+          'teacherInfo.courseName': JSON.parse(this.data.userInfo.data).courseName,
+          'contactInfo.fullName': JSON.parse(this.data.userInfo.data).fullName,
+          'contactInfo.phone': JSON.parse(this.data.userInfo.data).phone,
+          'contactInfo.detailedAddress': JSON.parse(this.data.userInfo.data).detailedAddress,
         })
       }
       if (wx.getStorageSync("paperBookList")) {
         this.setData({
-          paperBookList: JSON.parse(wx.getStorageSync("paperBookList")),
-          bookList: JSON.parse(wx.getStorageSync("paperBookList"))
+          paperBookList: wx.getStorageSync("paperBookList"),
+          bookList: wx.getStorageSync("paperBookList")
         })
       }
       if (wx.getStorageSync("electronicBookList")) {
         this.setData({
-          electronicBookList: JSON.parse(wx.getStorageSync("electronicBookList"))
+          electronicBookList: wx.getStorageSync("electronicBookList")
         })
       }
       this.getSelectBookCount();
@@ -90,9 +87,7 @@
     app.MG.resource.getCmsTypeByRefCode({ refCodes: ['jsek_electronicSampleBook'] }).then((res) => {
       this.setData({
         description: res[0].description,
-        teacherInfo: {
-          workInfo: res[0].cmsTypeLinks[0].children
-        },
+        'teacherInfo.workInfo': res[0].cmsTypeLinks[0].children,
       })
     })
   },
@@ -104,11 +99,10 @@
         if (res && res.length > 0) {
           this.setData({
             description: res[0].description,
-            teacherInfo: {
-              workInfo: res[0].cmsTypeLinks[0].children
-            },
+            'teacherInfo.workInfo': res[0].cmsTypeLinks[0].children,
           })
         }
+        console.log(this.data.teacherInfo.workInfo, 333)
       })
   },
   //鑾峰彇褰撳墠宸茬敵璇锋鏁帮紙鐢靛瓙锛�
@@ -173,7 +167,7 @@
         }
         applyInfo = {
           ticketRefCodeOrGuid: 'electronicSampleBookapplyNum',
-          roleId: userStore.userInfo.roleId,
+          roleId: that.data.userInfo.roleId,
           refType: 'applyBook'
         }
       } else {
@@ -185,12 +179,13 @@
           })
           return
         }
+
         const mailAddress = JSON.stringify(that.data.contactInfo)
         that.setData({
-          teacherInfo: {
-            detailedAddress: mailAddress,
-          }
+          'teacherInfo.detailedAddress': mailAddress
         })
+        console.log(that.data.teacherInfo.workInfo, 345)
+
         data = {
           topicIdOrRefCode: 'applyEntityBook',
           name: that.data.userInfo.name || '',
@@ -222,14 +217,13 @@
               })
               wx.setStorageSync("paperBookList", that.data.paperBookList);
             }
-
             wx.showModal({
               title: '鎻愮ず锛�', //鎻愮ず鐨勬爣棰�
               content: '鎮ㄧ殑鏍蜂功鐢宠宸叉彁浜わ紝绠＄悊鍛樺鏍镐腑锛佺敵璇风姸鎬佸湪銆愪釜浜轰腑蹇冣�旀牱涔︾敵璇枫�戜腑鏌ヨ銆�', //鎻愮ず鐨勫唴瀹�
               success: function (res) {
                 if (res.confirm) {
                   wx.navigateTo({
-                    url: "/packagePersonal/pages/sampleBooks/index",
+                    url: "/packagePersonal/pages/sampleBooks/index?stateTab=1&tabActive=" + that.data.active,
                   });
                 } else if (res.cancel) {
                 }
@@ -257,25 +251,27 @@
       success: function (res) {
         if (res.confirm) {
           if (that.data.active == '1') {
-            that.data.electronicBookList.forEach((obj, index) => {
+            let eList = that.data.electronicBookList;
+            eList.forEach((obj, index) => {
               if (obj.id == item.id) {
-                that.data.electronicBookList.splice(index, 1);
+                eList.splice(index, 1);
               }
             })
             that.setData({
-              bookList: that.data.electronicBookList
+              bookList: eList
             })
-            wx.setStorageSync("electronicBookList", that.data.electronicBookList);
+            wx.setStorageSync("electronicBookList", eList);
           } else {
-            that.data.paperBookList.forEach((obj, index) => {
+            let pList = that.data.paperBookList;
+            pList.forEach((obj, index) => {
               if (obj.id == item.id) {
-                that.data.paperBookList.splice(index, 1);
+                pList.splice(index, 1);
               }
             })
             that.setData({
-              bookList: this.data.paperBookList
+              bookList: pList
             })
-            wx.setStorageSync("paperBookList", that.data.paperBookList);
+            wx.setStorageSync("paperBookList", pList);
           }
         } else if (res.cancel) {
         }

--
Gitblit v1.9.1