最新

login/login.vue

@@ -209,12 +209,22 @@ const reqLogin = (code:string, data:object) => {
 	  console.log(typeof(result));
     fetchToken(result.code).then((data:any) => {
 		console.log("登录",data);
+	  subscribeMessages();
       msg("登录成功！");
       uni.$emit("refreshOrder");
       uni.navigateBack();
     });
   });
 };
+// 订阅消息
+const subscribeMessages=()=>{
+	uni.requestSubscribeMessage({
+	  tmplIds: ['aNr4T2JEtaLtR9dihM2w3NAznz4bFMkutVZCbaSTjxg'],
+	  success (res) { 
+		  console.log("订阅消息",res)
+	  }
+	})
+}
 </script>
 
 <style lang="scss" scoped>

login/register-step3.vue

@@ -41,7 +41,7 @@ const state = reactive({
   password: "", //密码
   phone: "", //手机号
   code: "", //验证码
-  pwdHint: "密码不少于8位，必须同时包含数字、大小写字母和特殊符号",
+  pwdHint: "密码不少于10位，必须同时包含数字、大小写字母和特殊符号",
 });
 
 onLoad((options) => {

pages/recharge/recharge.vue

@@ -28,8 +28,7 @@
 		<view class="btn btn-primary" @click="rechargeAction">立即充值</view>
 		
 	</view>
-	<!-- routeType=2&&cardId=${state.cardId} -->
-	<bluetooth :routeType="2" :cardId="state.cardId"  v-if="state.isShowBlue" @submit="getParams"></bluetooth>
+	<!-- <bluetooth :routeType="2" :cardId="state.cardId"  v-if="state.isShowBlue" @submit="getParams"></bluetooth> -->
 </template>
 
 <script setup lang="ts">
@@ -71,7 +70,7 @@
 		StorageKeys,
 		setItem
 	} from "@/utils/storage";
-	const bluetooth=require("../../components/bluetooth/bluetooth")
+	// const bluetooth=require("../../components/bluetooth/bluetooth")
 	const datas = require("../../static/etcUtil/datas.js");
 	const bluetoothUtil = require("../../static/etcUtil/index.js");
 	const cmd = require("../../static/etcUtil/cmdConfig.js");

pages/user/user.vue

@@ -32,8 +32,12 @@
 						<view class="panel-text"><text class="num" v-if="state.carNumber">{{state.carNumber}}</text><text class="num" v-else>0</text><text class="txt">辆</text></view>
 						<text class="type">车辆</text>
 					</view>
+					<!-- <view class="panel-item" @click="$util.navTo('/subpackage/personal-center/vehicle-information', true)">
+						<view class="panel-text"><text class="num">{{state.userVehicleInfoSumQueryVo.vehicleSum}}</text><text class="txt">辆</text></view>
+						<text class="type">车辆</text>
+					</view> -->
 					<view class="panel-item">
-						<text class="num">5</text>
+						<text class="num">{{state.userVehicleInfoSumQueryVo.orderStatus0}}</text>
 						<text class="type">待办</text>
 					</view>
 					<view class="panel-item">
@@ -139,7 +143,8 @@
 							<text class="val">{{state.monthFlowingVo.num}}次</text>
 						</view>
 					</view>
-					<view class="detail" @click="$util.navTo('/subpackage/personal-center/trajectory/trajectory', true)">查看通行轨迹</view>
+					<!-- <view class="detail" @click="$util.navTo('/subpackage/personal-center/trajectory/trajectory', true)">查看通行轨迹</view> -->
+					<view class="detail">查看通行轨迹</view>
 				</view>
 			</view>
 			<view class="cars box">
@@ -231,7 +236,11 @@
 		},
 		vehicleManageList: [],
 		list:'',  //车辆信息
-		carNumber:''  //车辆数量
+		carNumber:''  ,//车辆数量
+		userVehicleInfoSumQueryVo:{
+			vehicleSum: 0,
+			orderStatus0:0
+		},//车数量 ,代办数量
 	});
 	onMounted(() => {
 		const res = uni.getMenuButtonBoundingClientRect();
@@ -277,7 +286,7 @@ const queryCarMsg = () => {
 				}
 				state.list=data;
 				state.carNumber=data.length
-				console.log("state.list",state.list)
+				console.log("state.list",state.list,data.length)
 			})
 			.catch((err) => {
 			});
@@ -295,10 +304,12 @@ const queryCarMsg = () => {
 		request(userInfoIndex, options)
 			.then((res) => {
 				let data = stringToJson(res.bizContent)
-				console.log(data);
 				state.accountInfoVo = data.accountInfoVo;
 				state.monthFlowingVo = data.monthFlowingVo;
-				state.vehicleManageList = data.monthFlowingVo
+				state.vehicleManageList = data.monthFlowingVo;
+				state.userVehicleInfoSumQueryVo.vehicleSum= JSON.parse(JSON.stringify(data.userVehicleInfoSumQueryVo)).vehicleSum;
+				state.userVehicleInfoSumQueryVo.orderStatus0= JSON.parse(JSON.stringify(data.userVehicleInfoSumQueryVo)).orderStatus0;
+				console.log("获取用户信息",state.userVehicleInfoSumQueryVo.vehicleSum,state.userVehicleInfoSumQueryVo.orderStatus0);
 				queryCarMsg();
 			})
 			.catch((err) => {

stores/user.js

@@ -56,7 +56,7 @@ export const useUserStore = defineStore("userStore", {
 					deviceId: "",
 					code: code,
 					loginSource: "69af303ba2eb4608a099163f0d2a5dbd",
-					'wxOpenid':wechatAppID,
+					'wxOpenid':getItem("QYorder")["openid"],
 				},
 				method: "POST",
 				showLoading: false,

subpackage/applyCard/car-release.vue

@@ -309,24 +309,7 @@
 			transferLogs: [],
 		},
 		actionSheetShow: false,
-		actionSheetList: [
-			{
-				text: "普通车",
-				value: 0,
-			},
-			{
-				text: "道路运输证经营范围仅有“货物专用运输(集装箱) ”的牵引车办理J类型集装箱",
-				value: 24,
-			},
-			{
-				text: "道路运输证经营范围不含“货物专用运输(集装箱)”的牵引车",
-				value: 27,
-			},
-			{
-				text: '道路运输证经营范围除“货物专用运输 (集装 箱)"外，还有“普通货运”等其他项目的牵引车办理J2类型集装箱',
-				value: 28,
-			},
-		],
+		actionSheetList: [],
 		form: {
 			orderId: "", //订单ID
 			man: "", //所有人
@@ -369,7 +352,7 @@
 		},
 		vehiclePlateColor: undefined,
 		orderId: "",
-		type: undefined, //标记来源是否登录 1为未登录数据 - 需要新增地址
+		// type: undefined, //标记来源是否登录 1为未登录数据 - 需要新增地址
 		show: false,
 		isMyPeopple: true,
 		outlineL: "",
@@ -380,11 +363,35 @@
 	});
 	onLoad((option : any) => {
 		state.form.orderId = option.orderId;
-		state.type = option.type;
+		// state.type = option.type;
+		state.form.type = option.type;
 		state.vehiclePlateColor = option.vehiclePlateColor;
 		state.isSign=option.isSign
 		console.log("option",option)
 		getGlobalParam();
+		if(option.type==1){
+			state.actionSheetList=[{
+				text: "普通车",
+				value: 0,
+			}]
+		}else{
+			state.actionSheetList=[{
+				text: "普通车",
+				value: 0,
+			},
+			{
+				text: "道路运输证经营范围仅有“货物专用运输(集装箱) ”的牵引车办理J类型集装箱",
+				value: 24,
+			},
+			{
+				text: "道路运输证经营范围不含“货物专用运输(集装箱)”的牵引车",
+				value: 27,
+			},
+			{
+				text: '道路运输证经营范围除“货物专用运输 (集装 箱)"外，还有“普通货运”等其他项目的牵引车办理J2类型集装箱',
+				value: 28,
+			}]
+		}
 	});
 
 	//外廓尺寸输入框

subpackage/applyCard/choice-product.vue

@@ -116,7 +116,7 @@ onLoad((option: any) => {
   // });
 
   var data = {
-    productType: state.type,
+    type: state.type,
 	source:'WECHAT'  //请求方来源
   };
   const options = {

subpackage/applyCard/essential-information.vue

@@ -260,11 +260,11 @@ const nextAction = () => {
 			console.log(result);
 			if (state.data.userType == 1) {
 			  uni.navigateTo({
-			    url: `/subpackage/applyCard/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isSign}`,
+			    url: `/subpackage/applyCard/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isSign}&type=${state.data.type}`,
 			  });
 			} else {
 			  uni.navigateTo({
-			    url: `/subpackage/applyCard/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isSign}`,
+			    url: `/subpackage/applyCard/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isSign}&type=${state.data.type}`,
 			  });
 			}
 			

subpackage/applyCard/opening-account-people.vue

@@ -307,6 +307,7 @@
 		vehiclePlateColor: undefined,
 		isMyPeopple: true,
 		isSign:'',
+		type:1,
 		isEnableOther:true,  //小程序是否支持他人办理
 		isEnableBook:true,  //他人办理时是否上传委托书
 		isEnableInfo:true,  //小程序信息带出
@@ -377,7 +378,7 @@
 						// let result = stringToJson(res.bizContent);
 						console.log(res);
 						uni.redirectTo({
-							url: `/subpackage/applyCard/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=1&isSign=${state.isSign}`,
+							url: `/subpackage/applyCard/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&isSign=${state.isSign}`,
 						});
 					});
 				}
@@ -396,7 +397,7 @@
 				// let result = stringToJson(res.bizContent);
 				console.log(res);
 				uni.redirectTo({
-					url: `/subpackage/applyCard/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&isSign=${state.isSign}`,
+					url: `/subpackage/applyCard/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&isSign=${state.isSign}`,
 				});
 			});
 		}
@@ -469,6 +470,7 @@
 		state.vehiclePlateColor = option.vehiclePlateColor;
 		state.form.opId = getItem('openId')??'';
 		state.isSign=option.isSign;
+		state.type=option.type;
 		//state.fromOrder = option.fromOrder //是否来自订单-修改资料
 		getGlobalParam(); //全局配置数据
 	});

subpackage/personal-center/trajectory/trajectory-map.vue

@@ -7,8 +7,8 @@
 	    /> -->
 		<qiun
 		  type="map"
-		  :opts="state.opts"
 		  :chartData="state.chartData"
+		  :opts="state.opts"
 		  :canvas2d="true"
 		  canvasId="pVNxVgTQDlKlgMCPbMtJrifnZlluhrNf"
 		/>
@@ -26,9 +26,10 @@
 	import { reactive } from "vue";
 	import {request} from "@/utils/network/request.js";
 	import {stringToJson} from "@/utils/network/encryption.js";
-	import { onLoad} from "@dcloudio/uni-app";
+	import { onLoad,onMounted} from "@dcloudio/uni-app";
 	import mapChina from "@/datas/mapChina.json";
-	import qiun from "../../service/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
+	import qiun from "../../service/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue"
+	// import qiun from "/service/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
 	const state = reactive({
 		chartData: {},
 		opts: {

subpackage/service/statistics/index.vue

@@ -232,6 +232,7 @@
 				.then((res) => {
 					tools.hideLoadingAlert();
 					this.dataAll = stringToJson(res.bizContent);
+					console.log("this.dataAll",this.dataAll)
 					this.dealPieData(stringToJson(res.bizContent)); //处理饼状图数据
 					this.getPieData(this.pieDataAll[0]); //饼状图展示
 					this.dealLineData(stringToJson(res.bizContent)); //处理折线图数据
@@ -288,6 +289,7 @@
 				}
 				this.pieDataAll.push(pieDataItem2);
 			}
+			console.log("this.pieDataAll",this.pieDataAll)
 		},
 		dealLineData(data){
 			// 全部

utils/network/api.js

@@ -7,7 +7,7 @@ export const envs = {
 	//开发环境配置
 	development: {
 		baseUrl: "192.168.100.63:8087",
-		// baseUrl: "222.85.144.89:19002",
+		// baseUrl: "qtzl.etcjz.cn",
 	},
 	//生产环境配置
 	production: {

utils/network/request.js

@@ -30,6 +30,7 @@ export function request(code, options = {}) {
 		rbacSource: 'MINI_PROGRAM'
 	}
 	//Url 地址 /api/interfaceMidGroundIn
+	// options.url = 'https://' + envs[process.env.NODE_ENV].baseUrl + '/api/interfaceMidGroundIn'
 	options.url = 'http://' + envs[process.env.NODE_ENV].baseUrl + '/ifzt/api/interfaceMidGroundIn'
 	//判断baseUri是否为空
 	if (options.baseUrl) {