Merge branch 'master' of http://192.168.40.220/dmc/jz_applet

datas/credentialType.js

@@ -69,7 +69,7 @@ export const credentialType = [{
 ];
 
 //获取证件类型名称
-export const getCredentialType = (id: number) => {
+export const getCredentialType = (id) => {
 	let types = credentialType.filter(item => item.id == id);
 	return types[0].type
 }

datas/vehiclePlateColor.js

@@ -41,7 +41,7 @@ export const vehiclePlateColor = [{
 ]
 
 //获取车牌颜色	
-export const getVehiclePlateColor = (id: number) => {
+export const getVehiclePlateColor = (id) => {
 	let colors = vehiclePlateColor.filter(item => item.id == id);
 	return colors[0].color
 }

datas/vehicleType.js

@@ -42,7 +42,7 @@ export const vehicleType = [
 	}
 ];
 //获取车辆类型	
-export const getVehicleType = (id: number) => {
+export const getVehicleType = (id) => {
 	let types = vehicleType.filter(item => item.id == id);
 	return types[0].title
 }

pages/app/sign.vue

@@ -64,7 +64,7 @@
 		uni.login({
 			provider: "weixin",
 			success: function(e) {
-				wx.request({
+				uni.request({
 					url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`,
 					success: (res: any) => {
 						state.openid = res.data.openid;

pages/index/index.vue

@@ -400,7 +400,7 @@ import { navTo,confirm } from "../../utils/utils";
 	}
 
 	.banner swiper {
-		height: 568rpx;
+		height: 470rpx;
 		width: 750rpx;
 	}
 

utils/network/request.js

@@ -35,8 +35,8 @@ export function request(code, options = {}) {
 	}
 	//Url 地址
 	//options.url = envs[process.env.NODE_ENV].baseUrl || '' + options.url
-	options.url = 'http://192.168.100.63:8087/ifzt/api/interfaceMidGroundIn'
-	// options.url = 'http://222.85.144.89:19002/ifzt/api/interfaceMidGroundIn'
+	// options.url = 'http://192.168.100.63:8087/ifzt/api/interfaceMidGroundIn'
+	options.url = 'http://222.85.144.89:19002/ifzt/api/interfaceMidGroundIn'
 	//判断baseUri是否为空
 	if (options.baseUrl) {
 		options.url = options.baseUrl