From 6d311b2cb69108036a89d72134ee303e47763ffa Mon Sep 17 00:00:00 2001
From: lanzhihui <503792708@qq.com>
Date: Mon, 23 Sep 2024 16:49:17 +0800
Subject: [PATCH] update

---
 src/components/cu-custom.wpy          | 15 +++++++---
 src/pages/users/degreeCertificate.wpy | 41 ++++++++++++++++++---------
 src/pages/users/myOrderList.wpy       |  2 +-
 src/pages/users/schools.wpy           |  8 ++++--
 4 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/components/cu-custom.wpy b/src/components/cu-custom.wpy
index 96a66fa..c838caf 100644
--- a/src/components/cu-custom.wpy
+++ b/src/components/cu-custom.wpy
@@ -107,7 +107,7 @@
       CustomBar: 0,
       Custom: 0,
       modalName: '', // 是否弹框
-      prevPage: '',  // 是否有上个页面
+      prevPage: {},  // 是否有上个页面
       token: '',
       searchValue: ''
     },
@@ -119,10 +119,17 @@
     ready() {
       console.log(this.handleIndex, '---')
       let pages = getCurrentPages()
-        console.log(pages, 'pages==')
       this.token = wx.getStorageSync('token')
-      let prevPage = pages[pages.length - 2]  // 上一个页面
-      this.prevPage = prevPage
+        console.log(pages[pages.length - 2], '3333')
+      let prevListPage = pages[pages.length - 2]  // 上一个页面
+        console.log(prevListPage, '44444')
+        if (prevListPage) {
+            this.prevPage = true
+        } else {
+            this.prevPage = false
+        }
+      // this.prevPage = prevListPage
+        console.log('55555')
         console.log(this.prevPage, 'prevPage=')
       try {
         var systemInfo = wx.getSystemInfoSync()
diff --git a/src/pages/users/degreeCertificate.wpy b/src/pages/users/degreeCertificate.wpy
index 1c8f786..d2da5ef 100644
--- a/src/pages/users/degreeCertificate.wpy
+++ b/src/pages/users/degreeCertificate.wpy
@@ -72,7 +72,7 @@
             <view class="inputBox animation-slide-bottom" style="animation-delay: 0.1s;">
                 <view class="font_28 textStyle bold">毕业院校</view>
                 <view catchtap="handleScroll">
-                    <input value="{{school}}" disabled type="text" class="inputStyle font_30" readonly placeholder="请输入你的毕业院校" />
+                    <input :value="school" ref="inputRef" disabled type="text" class="inputStyle font_30" readonly placeholder="请输入你的毕业院校" />
                 </view>
             </view>
             <view class="inputBox animation-slide-bottom" style="animation-delay: 0.1s;">
@@ -209,7 +209,7 @@
             manner: ['毕业证/学位证书照片', '国内学信网在线认证'],
             degreeIndex: '',
             mannerIndex: 0,
-            school: '',
+            school: '999',
             attestation: '',
             ShowDegree: false,
             init: false,
@@ -225,14 +225,24 @@
             accomplish: '',
             anew: 1,
             up: '',
-            choosePicsShow: false
+            choosePicsShow: false,
+            inputRef: null
         },
 
-        onShow() {
+        onShow(e) {
+            if (e && e.school) {
+                this.school = e.school
+            }
+        // console.log(this, 'this.school')
             // this.getTempId()
             // this.initPageData()
             // this.$parent.getTracker(this.$root.$name, this.config.navigationBarTitleText)
         },
+        // observers: {
+        //     'school': function (school) {
+        //         console.log(school, '9999')
+        //     }
+        // },
 
         // onShareAppMessage(res) {
         //   return this.$parent.onShareAppMessage(this.config.navigationBarTitleText)
@@ -281,13 +291,16 @@
         },
 
         onPullDownRefresh() {
-            this.initPageData()
-        },
-        show(e) {
-            this.school = e
+            // this.initPageData()
         },
+        // show(e) {
+        //     console.log(e, '999')
+        //     this.school = e
+        // },
         methods: {
-
+            onInput(e) {
+                console.log(e, 'eeee==2333=')
+            },
 // 初始化页面数据
             initPageData() {
                 this.$get({url: `${service.host}/user/approve/profile`}).then(({code, data}) => {
@@ -357,6 +370,7 @@
                       degree: vm.degree[vm.degreeIndex]
                       // eca_type: vm.mannerIndex
                   }
+                  // console.log(vm, 'vn===')
                 // 在线认证
                 if (vm.mannerIndex == 1) {
                     data = {
@@ -384,6 +398,7 @@
                     }
                 }
                 if (vm.mannerIndex == 0) {
+                    console.log(vm.educate_photo, vm.school, vm.degree[vm.degreeIndex])
                     if (!vm.educate_photo || !vm.school || !vm.degree[vm.degreeIndex]) {
                         return vm.$showToast('请完善表单信息!')
                     }
@@ -436,11 +451,11 @@
             },
             hideModal(e) {
                 this.modalName = ''
-            },
-            UpLoadImage(value) {
-                this.educate_photo = value
-                wx.hideLoading()
             }
+            // UpLoadImage(value) {
+            //     this.educate_photo = value
+            //     wx.hideLoading()
+            // }
         }
     })
 </script>
diff --git a/src/pages/users/myOrderList.wpy b/src/pages/users/myOrderList.wpy
index 498a9c7..186b700 100644
--- a/src/pages/users/myOrderList.wpy
+++ b/src/pages/users/myOrderList.wpy
@@ -1,7 +1,7 @@
 <template>
   <view class="myOrderList">
     <view style="background:#f8f8f8;height:{{windowHeight}}px;">
-        <cuCustom  :bgColor="bgVip"  isCustom="{{true}}">
+        <cuCustom  isCustom="{{true}}">
             <view slot="backText">返回</view>
             <view slot="content">我的订单</view>
         </cuCustom>
diff --git a/src/pages/users/schools.wpy b/src/pages/users/schools.wpy
index 05e586e..f619031 100644
--- a/src/pages/users/schools.wpy
+++ b/src/pages/users/schools.wpy
@@ -55,8 +55,12 @@
                 //     school: e.currentTarget.dataset.title,
                 // })
                 // prevPage.data.school = e.currentTarget.dataset.title
-          // prevPage.show(e.$wx.currentTarget.dataset.title)
-            prevPage.setData({school: e.$wx.currentTarget.dataset.title})
+
+            let data = prevPage.data.school
+            console.log(prevPage, 'prevPage---')
+            data = e.$wx.currentTarget.dataset.title
+            prevPage.setData({school: data})
+            prevPage.onShow({school: data})
             wx.navigateBack({
                 delta: 1
             })