Bladeren bron

no message

xiaoxin 2 jaren geleden
bovenliggende
commit
ab7a652a21
4 gewijzigde bestanden met toevoegingen van 87 en 88 verwijderingen
  1. 81 82
      manifest.json
  2. 2 2
      pages/home/home.vue
  3. 2 2
      pages/index/index.vue
  4. 2 2
      util/api.js

+ 81 - 82
manifest.json

@@ -1,83 +1,82 @@
 {
 {
-    "name" : "校车预约",
-    "appid" : "__UNI__43F49FA",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    "app-plus" : {
-        /* 5+App特有相关 */
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "nvueStyleCompiler" : "uni-app",
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {},
-        /* 模块配置 */
-        "distribute" : {
-            /* 应用发布信息 */
-            "android" : {
-                /* android打包配置 */
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios" : {},
-            /* ios打包配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-weixin" : {
-        /* 小程序特有相关 */
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "vueVersion" : "3",
-    "h5" : {
-        "title" : "校车预约",
-        "devServer" : {
-            "disableHostCheck" : true,
-            "proxy" : {
-                "/carstop/carbook" : {
-                    //目标接口域名
-                    // "target" : "https://chtech.ncjti.edu.cn/carstop/carbook",
-                    // "target": "http://192.168.161.220:8088/carBook",
-                    "target" : "https://chtech.ncjti.edu.cn/testingServertomcat/carbook/",
-                    //是否跨域
-                    "changeOrigin" : true,
-                    // 设置支持https协议的代理
-                    "secure" : false
-                }
-            }
-        },
-        "router" : {
-            "base" : "/testingServertomcat/dist5/"
-        }
-    }
-}
-// "base": "/carstop/dist5/"
-
+	"name": "校车预约",
+	"appid": "__UNI__43F49FA",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	"app-plus": {
+		/* 5+App特有相关 */
+		"usingComponents": true,
+		"nvueCompiler": "uni-app",
+		"nvueStyleCompiler": "uni-app",
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"modules": {},
+		/* 模块配置 */
+		"distribute": {
+			/* 应用发布信息 */
+			"android": {
+				/* android打包配置 */
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			"ios": {},
+			/* ios打包配置 */
+			"sdkConfigs": {}
+		}
+	},
+	/* SDK配置 */
+	"quickapp": {},
+	/* 快应用特有相关 */
+	"mp-weixin": {
+		/* 小程序特有相关 */
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"vueVersion": "3",
+	"h5": {
+		"title": "校车预约",
+		"devServer": {
+			"disableHostCheck": true,
+			"proxy": {
+				"/carstop/carbook": {
+					//目标接口域名
+					"target": "https://chtech.ncjti.edu.cn/carstop/carbook",
+					// "target": "http://192.168.161.220:8088/carBook",
+					// "target" : "https://chtech.ncjti.edu.cn/testingServertomcat/carbook/",
+					//是否跨域
+					"changeOrigin": true,
+					// 设置支持https协议的代理
+					"secure": false
+				}
+			}
+		},
+		"router": {
+			// "base" : "/testingServertomcat/dist5/"
+			"base": "/carstop/dist5/"
+		}
+	}
+}

+ 2 - 2
pages/home/home.vue

@@ -103,7 +103,7 @@ import { filterIdentity } from '@/util/filterIdentity.js'
 
 
 onLoad(() => {
 onLoad(() => {
 	if (isWeixin()) {
 	if (isWeixin()) {
-		filterIdentity()
+		// filterIdentity()
 		card_number.value = uni.getStorageSync('bus_card_number')
 		card_number.value = uni.getStorageSync('bus_card_number')
 	} else {
 	} else {
 		uni.redirectTo({
 		uni.redirectTo({
@@ -535,7 +535,7 @@ const handlePhone = (phone) => {
 			padding: 37rpx 100rpx 32rpx 30rpx;
 			padding: 37rpx 100rpx 32rpx 30rpx;
 			margin: 0 auto 20rpx;
 			margin: 0 auto 20rpx;
 			width: 690rpx;
 			width: 690rpx;
-			height: 224rpx;
+			min-height: 224rpx;
 			border-radius: 24rpx;
 			border-radius: 24rpx;
 
 
 			.item-time {
 			.item-time {

+ 2 - 2
pages/index/index.vue

@@ -13,10 +13,10 @@ const APPKEY = '4AA7B3944BDF3739'
 const ocode = '1015730314'
 const ocode = '1015730314'
 
 
 // 线上地址
 // 线上地址
-// const URL = 'https://chtech.ncjti.edu.cn/carstop/carbook/appopenid.action'
+const URL = 'https://chtech.ncjti.edu.cn/carstop/carbook/appopenid.action'
 
 
 // 测试地址
 // 测试地址
-const URL = 'https://chtech.ncjti.edu.cn/testingServertomcat/carbook/appopenid.action'
+// const URL = 'https://chtech.ncjti.edu.cn/testingServertomcat/carbook/appopenid.action'
 
 
 // 本地地址
 // 本地地址
 // const URL = 'http://192.168.161.220:8088/carBook/appopenid.action'
 // const URL = 'http://192.168.161.220:8088/carBook/appopenid.action'

+ 2 - 2
util/api.js

@@ -1,5 +1,5 @@
-// const BASE_URL = "/carstop/carbook"
-const BASE_URL = "/testingServertomcat/carbook/"
+const BASE_URL = "/carstop/carbook"
+// const BASE_URL = "/testingServertomcat/carbook/"
 
 
 export const myRequest = (options) => {
 export const myRequest = (options) => {
 	uni.showLoading({
 	uni.showLoading({