轮播图

pages/bluetooth/bluetooth.vue

@@ -60,6 +60,7 @@ const datas = require("../../static/etcUtil/datas.js");
 const bluetoothUtil = require("../../static/etcUtil/index.js");
 
 const state = reactive({
+  fee:"",
   cardId: "",
   showPopup: false, //显示激活成功提示
   curDeviceId: "", //当前选中的设备ID
@@ -100,6 +101,7 @@ onReady(() => {
 onLoad((option) => {
   routeType.value = option.routeType ? option.routeType : "1";
   state.cardId = option.cardId;
+  state.fee = option.fee;
 });
 
 /*
@@ -506,7 +508,7 @@ const connectSuccess = (res) => {
       });
     } else if (routeType.value == "2") {
       uni.navigateTo({
-        url: `/pages/recharge/recharge?connectSuccess=1&&cardId=${state.cardId}`,
+        url: `/pages/recharge/recharge?connectSuccess=1&&cardId=${state.cardId}&&fee=${state.fee}`,
       });
     }else if(routeType.value == "3"){
 		

pages/index/index.vue

@@ -411,14 +411,15 @@
 		};
 
 		//调用方式
-		// request(querySwiper, options).then((res) => {
-		// 		console.log(stringToJson(res.bizContent));
-		// 		const data = stringToJson(res.bizContent)
-		// 		state.swiperList = data.swipers ?? []
-		// 	})
-		// 	.catch((err) => {
-		// 		console.log(err);
-		// 	});
+		request(querySwiper, options).then((res) => {
+				console.log(stringToJson(res.bizContent));
+				const data = stringToJson(res.bizContent)
+				console.log("轮播图",data)
+				state.swiperList = data.swipers ?? []
+			})
+			.catch((err) => {
+				console.log(err);
+			});
 
 	};
 

pages/order/order.vue

@@ -1,13 +1,13 @@
 <!-- 订单列表2 -->
 <template>
 	<filter>
-		<empty-view v-if="!data.login" mode="permission" content="请先登录再查看订单" btnTxt="立即登录"
+		<empty-view v-if="!data.login" mode="permission"  content="请先登录再查看订单" btnTxt="立即登录"
 			@btnClick="$util.navTo('/login/login')">
 		</empty-view>
 
 		<view class="list-wrapper" v-else>
 			<order-tabbar ref="tabbarRef" :tabs="data.tabsList" v-model:curIndex="data.tabIndex"
-				v-if="data.tabsList.length > 0"></order-tabbar>
+				v-if="data.tabsList.length > 0" ></order-tabbar>
 
 			<order-list-item ref="mescrollItem" :index="data.tabIndex" :refresh="data.refresh">
 			</order-list-item>
@@ -20,6 +20,7 @@
 	import orderListItem from "./components/order-list-item";
 	import useOrderList from "@/composables/order/useOrderList";
     import filter from '@/components/filter/filter.vue';
+	
 	const {
 		data,
 		tabbarRef

pages/recharge/recharge.vue

@@ -144,12 +144,17 @@
 		state.cardId = option.cardId;
 		state.connectSuccess = option.connectSuccess;
 		state.orderNum = getItem("orderNum");
+		// 金额回填，本来是好的，但是他跳转了，跳转过来就得刷新页面，所以就是默认的5000
+		if(state.fee){
+			state.fee=option.fee
+		}
 		//跳转过来走圈存流程
 		if (state.connectSuccess === "1") {
 			/*读卡*/
 			getCardId();
 		}
 		quanCheckAction().then((val: any) => {
+			console.log("圈层检测val",val)
 			//如果 圈层检测正常
 			if (val.chargeStatus === 1) {
 				console.log(`进行充值检测`);
@@ -179,7 +184,7 @@
 			success: () => {
 				//走蓝牙进行修复
 				uni.navigateTo({
-					url: `/pages/bluetooth/bluetooth?routeType=2&&cardId=${state.cardId}`,
+					url: `/pages/bluetooth/bluetooth?routeType=2&&cardId=${state.cardId}&&fee=${state.fee}`,
 				});
 			},
 			fail: () => {}
@@ -585,6 +590,7 @@
 		return new Promise(async (resolve, reject) => {
 			const res = await request(cardCzPayResultCheck, options);
 			const data = stringToJson(res.bizContent);
+			console.log("充值检测",data)
 			resolve(data);
 		}).catch((error) => {
 			reject(error);
@@ -685,7 +691,7 @@
 			const data = stringToJson(res.bizContent);
 			if (data.tradeState === "SUCCESS")
 				uni.navigateTo({
-					url: `/pages/bluetooth/bluetooth?routeType=2&&cardId=${state.cardId}`,
+					url: `/pages/bluetooth/bluetooth?routeType=2&&cardId=${state.cardId}&&fee=${state.fee}`,
 				});
 
 			console.log(data);

subpackage/applyCard/essential-information.vue

@@ -191,6 +191,7 @@ const goToAddAddress = () => {
   });
 };
 const editAddress = (val) => {
+	console.log("val",val)
   uni.navigateTo({
     url: `/subpackage/applyCard/editAddress?content=` + JSON.stringify(val),
   });
@@ -202,10 +203,12 @@ const carNumber = (val: any) => {
 };
 
 const addressSelected = (val: any) => {
+	console.log("val",val)
   state.data = {
     ...state.data,
     ...val,
   };
+  console.log("state.data.address",state.data.address)
   state.show = false;
 };
 const nextAction = () => {

subpackage/personal-center/trajectory/index.vue

@@ -0,0 +1,9 @@
+<template>
+	111
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

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

@@ -9,6 +9,8 @@
 		  type="map"
 		  :opts="state.opts"
 		  :chartData="state.chartData"
+		  :canvas2d="true"
+		  canvasId="pVNxVgTQDlKlgMCPbMtJrifnZlluhrNf"
 		/>
 	  </view>
 	<view class="describe">
@@ -26,7 +28,7 @@
 	import {stringToJson} from "@/utils/network/encryption.js";
 	import { onLoad} from "@dcloudio/uni-app";
 	import mapChina from "@/datas/mapChina.json";
-	import qiun from "@/subpackage/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: {