From 49ced9fdb8f7049f28d2627f57bf73154fb40d13 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Thu, 30 May 2024 18:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E6=AC=BE=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E9=AA=8C=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                      | 27 +++-------------------
 .../enroll/signContract/signContract.vue           |  6 +++++
 pages/indexEntry/theory/theory.vue                 |  2 +-
 pages/mineEntry/refund/comp/myform.vue             |  2 +-
 pages/tabbar/learnCar/comp/subject2.vue            |  2 +-
 pages/tabbar/learnCar/comp/subject3.vue            |  2 +-
 6 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/manifest.json b/manifest.json
index 328187c..6521008 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "洛阳学车",
     "appid" : "__UNI__3347C6E",
     "description" : "",
-    "versionName" : "1.2.6",
-    "versionCode" : 126,
+    "versionName" : "1.2.8",
+    "versionCode" : 128,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -150,27 +150,6 @@
             }
         },
         "nativePlugins" : {
-            "KJ-TencentLocation" : {
-                "andorid_key" : "BPMBZ-VSKE3-MC23F-O3KZO-AZGI7-PXFJI",
-                "__plugin_info__" : {
-                    "name" : "腾讯定位、定位反作弊、伪定位、后台定位、单次或持续定位、场景定位(双端) - [试用版，仅用于自定义调试基座]",
-                    "description" : "支持获取oaid、腾讯定位、定位反作弊、伪定位、后台定位、单次或持续定位、场景定位、请试用合适再购买、请试用合适再购买、请试用合适再购买",
-                    "platforms" : "Android,iOS",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=12983",
-                    "android_package_name" : "",
-                    "ios_bundle_id" : "",
-                    "isCloud" : true,
-                    "bought" : 0,
-                    "pid" : "12983",
-                    "parameters" : {
-                        "andorid_key" : {
-                            "des" : "配置andoridApiKey，ios的在init方法里设置apiKey",
-                            "key" : "TencentMapSDK",
-                            "value" : ""
-                        }
-                    }
-                }
-            },
             "Ocr-FaceDetectModule" : {
                 "__plugin_info__" : {
                     "name" : "Ocr-FaceDetectModule",
@@ -225,7 +204,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://192.168.1.43:8318/",
+                    "target" : "http://192.168.1.40:8318/",
                     // "target" : "http://123.6.232.1:8099/",
                     "changeOrigin" : true,
                     "secure" : true,
diff --git a/pages/indexEntry/enroll/signContract/signContract.vue b/pages/indexEntry/enroll/signContract/signContract.vue
index e18cad9..3115555 100644
--- a/pages/indexEntry/enroll/signContract/signContract.vue
+++ b/pages/indexEntry/enroll/signContract/signContract.vue
@@ -93,12 +93,16 @@
 			
 			// 查询签约状态
 			async getContractStatusFn() {
+				uni.showLoading({
+					title: '正在查询签约状态...'
+				})
 				const {
 					data: res
 				} = await getContractStatus({
 					studentId: this.studentId,
 					trainingApplyId: this.trainingApplyId
 				})
+				uni.hideLoading()
 				console.log(res)
 				if (res.flowStatus == 2) {
 					uni.navigateTo({
@@ -107,6 +111,8 @@
 					if (res.flowStatus > 2) {
 						this.$u.toast('合同已撤销或过期')
 					}
+				}else {
+					this.$u.toast('签约状态没返回')
 				}
 			}
 		}
diff --git a/pages/indexEntry/theory/theory.vue b/pages/indexEntry/theory/theory.vue
index c1b3299..450fb43 100644
--- a/pages/indexEntry/theory/theory.vue
+++ b/pages/indexEntry/theory/theory.vue
@@ -31,7 +31,7 @@
 			}
 		},
 		onLoad(options) {
-			if(options.type) this.currentId = options.type
+			// if(options.type) this.currentId = options.type
 		},
 		methods: {
 			changeNav(item) {
diff --git a/pages/mineEntry/refund/comp/myform.vue b/pages/mineEntry/refund/comp/myform.vue
index e2bbac9..e6bc2a1 100644
--- a/pages/mineEntry/refund/comp/myform.vue
+++ b/pages/mineEntry/refund/comp/myform.vue
@@ -202,7 +202,7 @@
 				getLoginCode({
 					// codeType: 1,
 					mobile: this.FormData.mobile,
-					scene: 1,
+					scene: 31,
 				}).then(()=>{
 					// 获取验证码
 					var time = 60;
diff --git a/pages/tabbar/learnCar/comp/subject2.vue b/pages/tabbar/learnCar/comp/subject2.vue
index a4e8b1d..360feaa 100644
--- a/pages/tabbar/learnCar/comp/subject2.vue
+++ b/pages/tabbar/learnCar/comp/subject2.vue
@@ -3,7 +3,7 @@
 
 		<!-- 学习状态 -->
 		<view class="learnStatus">
-			<view class="card mt20">
+			<view class="card mt20" v-if="vuex_userInfo.trainProcess">
 				<view class="flex-b">
 					<view class="lab">实操预约</view>
 					<view class="link-arrow"
diff --git a/pages/tabbar/learnCar/comp/subject3.vue b/pages/tabbar/learnCar/comp/subject3.vue
index 17314f3..0d04262 100644
--- a/pages/tabbar/learnCar/comp/subject3.vue
+++ b/pages/tabbar/learnCar/comp/subject3.vue
@@ -3,7 +3,7 @@
 		
 		<!-- 学习状态 -->
 		<view class="learnStatus">
-			<view class="card mt20">
+			<view class="card mt20" v-if="vuex_userInfo.trainProcess">
 				<view class="flex-b" >
 					<view class="lab">实操预约</view>
 					<view class="link-arrow" @click="$goPage('/pages/carEntry/operaAppointment/operaAppointment?subject=3')">