```

feat(app-navigation): 更新导航组件API接口和UI样式

- 更改扫码获取设备详情的API接口，使用新的充电桩编码查询接口
- 更新设备状态字段映射，从旧的deviceStatus改为status
- 调整导航组件的样式格式，统一空格和换行
- 修复设备信息查询的参数传递问题

fix(App.vue): 注释自动登录逻辑避免重复登录

- 注释掉微信小程序环境下的自动登录代码
- 防止用户信息存在时重复触发登录接口

style(manifest.json): 格式化配置文件空格

- 统一manifest.json文件的键值对格式
- 调整缩进和空格格式，提高可读性

refactor(charging): 优化充电页面数据获取和状态管理

- 将订单状态判断从orderInfo.status改为deviceInfo.orderStatus
- 移除旧的statInfo统计信息对象，直接使用deviceInfo数据
- 更新充电页面UI元素的图片资源链接
- 实现轮询机制替代定时查询订单状态
- 移除过时的定时器逻辑，简化代码结构
- 更新设备详情、订单编号等字段映射关系
```

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/MarsCodeWorkspaceAppSettings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="com.codeverse.userSettings.MarscodeWorkspaceAppSettingsState">
+    <option name="progress" value="1.0" />
+  </component>
+</project>

.idea/charge_miniapp.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/charge_miniapp.iml" filepath="$PROJECT_DIR$/.idea/charge_miniapp.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

App.vue

@@ -49,7 +49,7 @@ export default {
 		// 自动登录用户-------------------------------------------------------------------
 		//#ifdef MP-WEIXIN
 		const userInfo = $app.storage.get("USER_INFO");
-		if (!userInfo) $api.login();
+		// if (!userInfo) $api.login();
 		//#endif
 	},
 	onHide: function () {

components/app-navigation/app-navigation.vue

@@ -20,77 +20,77 @@
 
 <script>
 import { url } from '../../static/js/app';
-	export default {
-		name:"app-navigation",
-		props:{
-			// 激活对象
-			active:{type:String,default:""}
+export default {
+	name: "app-navigation",
+	props: {
+		// 激活对象
+		active: { type: String, default: "" }
+	},
+	computed: {
+		myIcon() {
+			return `../../static/img/appnav-my${this.active == 'my' ? '.active' : ''}.svg`;
 		},
-		computed:{
-			myIcon(){
-				return `../../static/img/appnav-my${this.active == 'my'?'.active':''}.svg`;
-			},
-			homeIcon(){
-				return `../../static/img/appnav-home${this.active == 'home'?'.active':''}.svg`;
-			}
-		},
-		methods:{
-			act(name){
-				if(name == this.active) return;
-				var url = '';
-				switch (name){
-					case 'home':
-						url = '/pages/index/index';
+		homeIcon() {
+			return `../../static/img/appnav-home${this.active == 'home' ? '.active' : ''}.svg`;
+		}
+	},
+	methods: {
+		act(name) {
+			if (name == this.active) return;
+			var url = '';
+			switch (name) {
+				case 'home':
+					url = '/pages/index/index';
 					break;
-					case 'my':
-						url = '/pages/my/my';
+				case 'my':
+					url = '/pages/my/my';
 					break;
+			}
+			if (url) uni.reLaunch({ url });
+		},
+		//扫一扫
+		sacn() {
+			this.$app.act.scan().then(res => {
+				var paramObj = this.getUrlParams(res.result);
+				if (!paramObj || !paramObj.connectorCode) {
+					this.$app.popup.alert("二维码不正确。", "温馨提示！");
+					return;
 				}
-				if(url) uni.reLaunch({url});
-			},
-			//扫一扫
-			sacn(){
-				this.$app.act.scan().then(res=>{
-					var paramObj = this.getUrlParams(res.result);
-					if(!paramObj || !paramObj.connectorCode){
-						this.$app.popup.alert("二维码不正确。","温馨提示！");
-						return;
-					}
-					this.getDeviceInfo(paramObj.connectorCode);
-				})
-			},
-			getUrlParams(url) {
-			  const paramsRegex = /[?&]+([^=&]+)=([^&]*)/gi;
-			  const params = {};
-			  let match;
-			  while (match = paramsRegex.exec(url)) {
-			    params[match[1]] = match[2];
-			  }
-			  return params;
-			},
-			//通过充电桩编码（sn）获取设备详情
-			getDeviceInfo(sn){
-				this.$api.base("post","/chargeApi/checkDevicesBySn",{"sn":sn},{}).then(res=>{
-					console.log("设备信息：",res)
-					var item = res.device;
-					//设备状态 0：离网1：空闲2：占用（未充电）3：占用（充电中）4：占用（预约锁定）255：故障
-					if(item.deviceStatus == 0 || item.deviceStatus == 255 ){
-						return;
-					}
-					this.$app.url.goto('/pages/terminal/terminal?deviceId='+item.id+"&deviceStatus="+item.deviceStatus);
-				})
+				this.getDeviceInfo(paramObj.connectorCode);
+			})
+		},
+		getUrlParams(url) {
+			const paramsRegex = /[?&]+([^=&]+)=([^&]*)/gi;
+			const params = {};
+			let match;
+			while (match = paramsRegex.exec(url)) {
+				params[match[1]] = match[2];
 			}
+			return params;
+		},
+		//通过充电桩编码（sn）获取设备详情
+		getDeviceInfo(sn) {
+			this.$api.base("get", "/applet/v1/station/connector/detail", { "connectorCode": sn }, {}).then(res => {
+				console.log("设备信息：", res)
+				if (res.data.status == 0 || res.data.status == 255) {
+					return;
+				}
+				this.$app.url.goto('/pages/terminal/terminal?deviceId=' + res.data.connectorCode + "&deviceStatus=" + res.data
+					.status);
+			})
 		}
 	}
+}
 </script>
 
 <style scoped>
-.app-navigation{
+.app-navigation {
 	background-color: #fff;
 	border-radius: 15px 15px 0 0;
 	filter: drop-shadow(0 -3px 6px rgba(0, 0, 0, 0.05));
 }
-.app-navigation .__body{
+
+.app-navigation .__body {
 	display: flex;
 	align-items: center;
 	justify-content: space-around;
@@ -98,32 +98,37 @@ import { url } from '../../static/js/app';
 	padding: 10px;
 	padding-bottom: 0;
 }
-.scan{
+
+.scan {
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
 	width: 60px;
 	height: 60px;
 	border-radius: 100pc;
-	background-image: linear-gradient(to right,#8FF8FB,#47AEFF);
+	background-image: linear-gradient(to right, #8FF8FB, #47AEFF);
 	box-shadow: 0 3px 6px #00BFE1 inset;
 	border: 3px solid #fff;
 	position: absolute;
 	transform: translateY(-10px);
 }
-.scan > .icon-scan{
+
+.scan>.icon-scan {
 	display: block;
 	width: 22.5px;
 	height: 22.5px;
 }
-.scan-placeholder{
+
+.scan-placeholder {
 	width: 60px;
 }
-.nav-item > .name{
+
+.nav-item>.name {
 	font-size: 10px;
 	margin-top: 4px;
 }
-.nav-item > .icon{
+
+.nav-item>.icon {
 	display: block;
 	width: 22px;
 	height: 22px;

manifest.json

@@ -1,28 +1,28 @@
 {
-    "name": "chargingPile",
-    "appid": "__UNI__C0ABCC1",
-    "description": "共享充电桩小程序",
-    "versionName": "1.0.0",
-    "versionCode": "100",
-    "transformPx": false,
+    "name" : "chargingPile",
+    "appid" : "__UNI__C0ABCC1",
+    "description" : "共享充电桩小程序",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
     /* 5+App特有相关 */
-    "app-plus": {
-        "usingComponents": true,
-        "nvueStyleCompiler": "uni-app",
-        "compilerVersion": 3,
-        "splashscreen": {
-            "alwaysShowBeforeRender": true,
-            "waiting": true,
-            "autoclose": true,
-            "delay": 0
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
         },
         /* 模块配置 */
-        "modules": {},
+        "modules" : {},
         /* 应用发布信息 */
-        "distribute": {
+        "distribute" : {
             /* android打包配置 */
-            "android": {
-                "permissions": [
+            "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\"/>",
@@ -41,63 +41,61 @@
                 ]
             },
             /* ios打包配置 */
-            "ios": {},
+            "ios" : {},
             /* SDK配置 */
-            "sdkConfigs": {}
+            "sdkConfigs" : {}
         }
     },
     /* 快应用特有相关 */
-    "quickapp": {},
+    "quickapp" : {},
     /* 小程序特有相关 */
-    "mp-weixin": {
-        "appid": "wx9894a01b9e92c368",
-        "setting": {
-            "urlCheck": false,
-            "es6": true,
-            "postcss": true,
-            "minified": true
+    "mp-weixin" : {
+        "appid" : "wx9894a01b9e92c368",
+        "setting" : {
+            "urlCheck" : false,
+            "es6" : true,
+            "postcss" : true,
+            "minified" : true
         },
-        "usingComponents": true,
-        "permission": {
-            "scope.userFuzzyLocation": {
-                "desc": "提供周边线下服务商"
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userFuzzyLocation" : {
+                "desc" : "提供周边线下服务商"
             },
-            "scope.userLocation": {
-                "desc": "提供周边线下服务商" // 高速公路行驶持续后台定位
+            "scope.userLocation" : {
+                "desc" : "提供周边线下服务商" // 高速公路行驶持续后台定位
             }
         },
-        "requiredPrivateInfos": [
-            "getLocation"
-        ],
-        "lazyCodeLoading": "requiredComponents"
+        "requiredPrivateInfos" : [ "getLocation" ],
+        "lazyCodeLoading" : "requiredComponents"
     },
-    "h5": {
-        "devServer": {
-            "disableHostCheck": true,
-            "proxy": {
-                "/api": {
-                    "target": "https://charge.hub.zswlgz.com/",
-                    "changeOrigin": true,
-                    "secure": false,
-                    "ws": false,
-                    "pathRewrite": {
-                        "^/api": ""
+    "h5" : {
+        "devServer" : {
+            "disableHostCheck" : true,
+            "proxy" : {
+                "/api" : {
+                    "target" : "https://charge.hub.zswlgz.com/",
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "ws" : false,
+                    "pathRewrite" : {
+                        "^/api" : ""
                     }
                 }
             }
         }
     },
-    "mp-alipay": {
-        "usingComponents": true
+    "mp-alipay" : {
+        "usingComponents" : true
     },
-    "mp-baidu": {
-        "usingComponents": true
+    "mp-baidu" : {
+        "usingComponents" : true
     },
-    "mp-toutiao": {
-        "usingComponents": true
+    "mp-toutiao" : {
+        "usingComponents" : true
     },
-    "uniStatistics": {
-        "enable": false
+    "uniStatistics" : {
+        "enable" : false
     },
-    "vueVersion": "2"
-}
+    "vueVersion" : "2"
+}

pages/charging/charging.css

@@ -1,316 +1,325 @@
 >>> ax-custom-title {
-	z-index: 9999 !important;
-}
-.page-background{
-	display: block;
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-}
-.body{
-	display: flex;
-	flex-direction: column;
-	width: 100%;
-	height: 100%;
-	position: relative;
-	z-index: 1;
+  z-index: 9999 !important;
+}
+.page-background {
+  display: block;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+.body {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  z-index: 1;
 }
 /* 退出中 */
-.exiting{
-	content: '正在结束';
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	color: #fff;
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	font-size: 14px;
-	overflow: hidden;
-	z-index: 999999;
-}
-.exiting.lock{
-	color: #3EB6F8;
-}
-.exiting .icon{
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 14vw;
-	margin-bottom: 10px;
-	color: inherit;
-}
-@keyframes show-long-press{
-	0%{opacity: 0;}
-	100%{opacity: 1;}
-}
-.exiting > .mask{
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background-color: rgba(0, 0, 0, 0.45);
-	backdrop-filter: blur(10px);
-	transform-origin: top;
-	animation: show-long-press 300ms ease;
-}
-.exiting > .contet{
-	position: relative;
-	z-index: 1;
-}
-.exiting .exiting-title{
-	font-weight: bold;
-	font-size: 18px;
-	transform: translateY(-100%);
-}
-.exiting .close{
-	transform: translateY(150%);
-	border: 1px solid #fff;
-	border-radius: 100px;
-	padding: 5px 15px;
+.exiting {
+  content: "正在结束";
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  font-size: 14px;
+  overflow: hidden;
+  z-index: 999999;
+}
+.exiting.lock {
+  color: #3eb6f8;
+}
+.exiting .icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14vw;
+  margin-bottom: 10px;
+  color: inherit;
+}
+@keyframes show-long-press {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+.exiting > .mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.45);
+  backdrop-filter: blur(10px);
+  transform-origin: top;
+  animation: show-long-press 300ms ease;
+}
+.exiting > .contet {
+  position: relative;
+  z-index: 1;
+}
+.exiting .exiting-title {
+  font-weight: bold;
+  font-size: 18px;
+  transform: translateY(-100%);
+}
+.exiting .close {
+  transform: translateY(150%);
+  border: 1px solid #fff;
+  border-radius: 100px;
+  padding: 5px 15px;
 }
 
 /* 计时器 */
-.timer{
-	text-align: center;
+.timer {
+  text-align: center;
 }
-.timer .value{
-	color: #3EB6F8;
-	font-size: 30px;
-	font-weight: bold;
+.timer .value {
+  color: #3eb6f8;
+  font-size: 30px;
+  font-weight: bold;
 }
-.timer .name{
-	font-weight: bold;
-	margin-top: 5px;
+.timer .name {
+  font-weight: bold;
+  margin-top: 5px;
 }
 /* 主图 */
-.host-graph{
-	margin-top: 20px;
-	height: 800rpx;
+.host-graph {
+  margin-top: 20px;
+  height: 800rpx;
 }
-.host-graph .image{
-	margin-left: -180rpx;
-	width: 80vw;
+.host-graph .image {
+  margin-left: -180rpx;
+  width: 80vw;
 }
 
 /* 主参数 */
-.parameter-info-box{
-	background: linear-gradient( 180deg, rgba(255,255,255,0) 0%, rgba(255,255,255,0.72) 43%, #FFFFFF 100%);
-	border-radius: 32rpx;
-	margin: 20rpx;
-}
-.parameter{
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 0 10px;
-	margin: 0 20px;
-	margin-top: 10px;
-}
-.parameter .param{
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-}
-.parameter .param .value{
-	margin-top: 24rpx;
-	font-size: 20px;
-	font-weight: bold;
-}
-.parameter .param .name{
-	font-size: 14px;
-	color: #aaa;
-	margin-top: 7px;
-}
-.end-charge-box{}
-.end-charge{
-	margin: auto;
-	margin-top: 32rpx;
-	margin-bottom: 36rpx;
-	width: 192rpx;
-	height: 76rpx;
-	background: linear-gradient( 99deg, #8FF8FB 0%, #47AEFF 100%);
-	border-radius: 16rpx;
-	font-weight: 800;
-	font-size: 28rpx;
-	color: #2B303A;
-	text-align: center;
-	line-height: 76rpx;
-}
-.end-charge::after{
-	display: none;
+.parameter-info-box {
+  background: linear-gradient(
+    180deg,
+    rgba(255, 255, 255, 0) 0%,
+    rgba(255, 255, 255, 0.72) 43%,
+    #ffffff 100%
+  );
+  border-radius: 32rpx;
+  margin: 20rpx;
+}
+.parameter {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 10px;
+  margin: 0 20px;
+  margin-top: 10px;
+}
+.parameter .param {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+.parameter .param .value {
+  margin-top: 24rpx;
+  font-size: 20px;
+  /* font-weight: bold; */
+}
+.parameter .param .name {
+  font-size: 14px;
+  color: #aaa;
+  margin-top: 7px;
+}
+.end-charge-box {
+}
+.end-charge {
+  margin: auto;
+  margin-top: 32rpx;
+  margin-bottom: 36rpx;
+  width: 192rpx;
+  height: 76rpx;
+  background: linear-gradient(99deg, #8ff8fb 0%, #47aeff 100%);
+  border-radius: 16rpx;
+  font-weight: 800;
+  font-size: 28rpx;
+  color: #2b303a;
+  text-align: center;
+  line-height: 76rpx;
+}
+.end-charge::after {
+  display: none;
 }
 
 /* 统计栏 */
-.statbar{
-	display: flex;
-	align-items: center;
-	justify-content: space-around;
-	height: 80px;
-	padding: 0 10px;
-	border-radius: 8px;
-	margin: 15px 20px;
-	background-color: #F2F8FF;
-	box-shadow: 0 3px 6px rgba(122, 168, 222, 0.3);
-	/* overflow: hidden; */
-	position: relative;
-}
-.statbar::before{
-	content: '';
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	box-shadow: 0 8px 8px #fff inset;
-}
-.statbar .sta{
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-}
-.statbar .sta .value{
-	color: #3EB6F8;
-	font-size: 24px;
-	font-weight: bold;
-}
-.statbar .sta .name{
-	font-size: 14px;
-	font-weight: bold;
-}
-.split{
-	display: block;
-	height: 60rpx;
-	border-left: 1px solid #E5F1FF;
+.statbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  height: 80px;
+  padding: 0 10px;
+  border-radius: 8px;
+  margin: 15px 20px;
+  background-color: #f2f8ff;
+  box-shadow: 0 3px 6px rgba(122, 168, 222, 0.3);
+  /* overflow: hidden; */
+  position: relative;
+}
+.statbar::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  box-shadow: 0 8px 8px #fff inset;
+}
+.statbar .sta {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+.statbar .sta .value {
+  color: #3eb6f8;
+  font-size: 24px;
+  font-weight: bold;
+}
+.statbar .sta .name {
+  font-size: 14px;
+  font-weight: bold;
+}
+.split {
+  display: block;
+  height: 60rpx;
+  border-left: 1px solid #e5f1ff;
 }
 
 /* 主信息 */
-.info{
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	background-color: #fff;
-	border-radius: 16px 16px 0 0;
-	padding: 10px;
-	box-sizing: border-box;
-}
-.info .cell{
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	font-size: 14px;
-	height: 32px;
-	padding: 0 10px;
-}
-.info .cell .contet{
-	color: #aaa;
-}
-.info .tips{
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 12px;
-	color: #aaa;
-}
-.info .end{
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 14px;
-	border-radius: 8px;
-	height: 50px;
-	background: linear-gradient(to right,#8FF8FB,#47AEFF);
-}
-.info .end::after{
-	display: none;
-}
-.info .end[disabled]{
-	background: #ddd;
-	color: #aaa;
+.info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  border-radius: 16px 16px 0 0;
+  padding: 10px;
+  box-sizing: border-box;
+}
+.info .cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  height: 32px;
+  padding: 0 10px;
+}
+.info .cell .contet {
+  color: #aaa;
+}
+.info .tips {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 12px;
+  color: #aaa;
+}
+.info .end {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  border-radius: 8px;
+  height: 50px;
+  background: linear-gradient(to right, #8ff8fb, #47aeff);
+}
+.info .end::after {
+  display: none;
+}
+.info .end[disabled] {
+  background: #ddd;
+  color: #aaa;
 }
 
+.countdown-ring {
+  --countdown-ring-size: 150px;
+  --countdown-ring-color: var(--color-red);
+  --countdown-ring-duration: 2s;
 
-.countdown-ring{
-	--countdown-ring-size: 150px;
-	--countdown-ring-color: var(--color-red);
-	--countdown-ring-duration: 2s;
-	
-	display: flex;
-	width: var(--countdown-ring-size);
-	height: var(--countdown-ring-size);
-	border-radius: 100%;
-	position: relative;
-}
-.countdown-ring > ._button{
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-	flex-wrap: wrap;
-	width: calc(var(--countdown-ring-size) - 35px);
-	height: calc(var(--countdown-ring-size) - 35px);
-	color: #fff;
-	font-size: 18px;
-	font-weight: bold;
-	background-color: var(--countdown-ring-color);
-	border-radius: 100%;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%,-50%);
-}
-.countdown-ring > ._half{
-	flex: 1;
-	height: var(--countdown-ring-size);
-	overflow: hidden;
-	position: relative;
-	z-index: 1;
-}
-.countdown-ring > ._half::after{
-	content: '';
-	display: block;
-	width: var(--countdown-ring-size);
-	height: var(--countdown-ring-size);
-	border: 8px solid transparent;
-	border-radius: 100%;
-	box-sizing: border-box;
-	position: absolute;
-	top: 0;
-	transform: rotate(-135deg);
-}
-.countdown-ring > ._half.left::after{
-	left: 0;
-	border-bottom-color: var(--countdown-ring-color);
-	border-left-color: var(--countdown-ring-color);
-}
-.countdown-ring > ._half.right::after{
-	right: 0;
-	border-top-color: var(--countdown-ring-color);
-	border-right-color: var(--countdown-ring-color);
-}
-.countdown-ring.active > ._half.left::after{
-	animation: show calc(var(--countdown-ring-duration) / 2) linear 1;
-	animation-delay: calc(var(--countdown-ring-duration) / 2);
-	animation-fill-mode: forwards;
-}
-.countdown-ring.active > ._half.right::after{
-	transform: rotate(45deg);
-	animation: show calc(var(--countdown-ring-duration) / 2) linear 1;
+  display: flex;
+  width: var(--countdown-ring-size);
+  height: var(--countdown-ring-size);
+  border-radius: 100%;
+  position: relative;
+}
+.countdown-ring > ._button {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  flex-wrap: wrap;
+  width: calc(var(--countdown-ring-size) - 35px);
+  height: calc(var(--countdown-ring-size) - 35px);
+  color: #fff;
+  font-size: 18px;
+  font-weight: bold;
+  background-color: var(--countdown-ring-color);
+  border-radius: 100%;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+.countdown-ring > ._half {
+  flex: 1;
+  height: var(--countdown-ring-size);
+  overflow: hidden;
+  position: relative;
+  z-index: 1;
+}
+.countdown-ring > ._half::after {
+  content: "";
+  display: block;
+  width: var(--countdown-ring-size);
+  height: var(--countdown-ring-size);
+  border: 8px solid transparent;
+  border-radius: 100%;
+  box-sizing: border-box;
+  position: absolute;
+  top: 0;
+  transform: rotate(-135deg);
+}
+.countdown-ring > ._half.left::after {
+  left: 0;
+  border-bottom-color: var(--countdown-ring-color);
+  border-left-color: var(--countdown-ring-color);
+}
+.countdown-ring > ._half.right::after {
+  right: 0;
+  border-top-color: var(--countdown-ring-color);
+  border-right-color: var(--countdown-ring-color);
+}
+.countdown-ring.active > ._half.left::after {
+  animation: show calc(var(--countdown-ring-duration) / 2) linear 1;
+  animation-delay: calc(var(--countdown-ring-duration) / 2);
+  animation-fill-mode: forwards;
+}
+.countdown-ring.active > ._half.right::after {
+  transform: rotate(45deg);
+  animation: show calc(var(--countdown-ring-duration) / 2) linear 1;
 }
 
-@keyframes show{
-	0%{
-		transform: rotate(-135deg);
-	}
-	100%{
-		transform: rotate(45deg);
-	}
-}
+@keyframes show {
+  0% {
+    transform: rotate(-135deg);
+  }
+  100% {
+    transform: rotate(45deg);
+  }
+}

pages/charging/charging.vue

@@ -18,27 +18,27 @@
 				</view>
 				<view @click="exiting.visible = false" class="mask"></view>
 			</view>
-			<view v-if="orderInfo.status == 0" class="timer">
+			<view v-if="deviceInfo.orderStatus == 1" class="timer">
 				<view class="value" style="font-size: 22px;">充电正在启动中......</view>
 				<view v-if="isShowBtn" class="name" style="color: red;font-size: 14px;">长时间无法启动可点击“长按结束充电”按钮结束订单。</view>
 			</view>
 			<!-- 主图 -->
 			<view class="app-flex c-center host-graph">
-				<image src="@/static/img/charging-01.png" mode="widthFix" class="image"></image>
+				<image
+					src="https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/9ca38a2aa5784e06b9cac31587b188b3.png"
+					mode="widthFix" class="image"></image>
 			</view>
 			<!-- 主参数 -->
 			<view class="parameter-info-box">
 				<!-- 充电动画 -->
-				<!-- v-if="orderInfo.status == 1" -->
-				<view class="charge-loading-box">
+				<view class="charge-loading-box" v-if="deviceInfo.orderStatus == 2">
 					<view class="charge-loading">
 						<image class="charge-icon" src="../../static/img/charge_loading.svg" mode=""></image>
 						<view class="c-loading"></view>
 					</view>
 				</view>
 				<!-- 计时器 -->
-				<!-- v-if="orderInfo.status == 1" -->
-				<view class="timer">
+				<view class="timer" v-if="deviceInfo.orderStatus == 2">
 					<view class="value">{{ timer.text }}</view>
 					<view class="name">充电时间</view>
 				</view>
@@ -50,7 +50,7 @@
 					<view class="split"></view>
 					<view class="param">
 						<view class="name">电压V</view>
-						<view class="value">{{ getVolt() || '0' }}</view>
+						<view class="value">{{ deviceInfo.voltage || '0' }}</view>
 					</view>
 					<view class="split"></view>
 					<view class="param">
@@ -60,48 +60,36 @@
 					<view class="split"></view>
 					<view class="param">
 						<view class="name">电量/度</view>
-						<view class="value">{{ statInfo.electricity || '0' }}</view>
+						<view class="value">{{ deviceInfo.totalPower || '0' }}</view>
 					</view>
 					<view class="split"></view>
 					<view class="param">
 						<view class="name">费用/元</view>
-						<view class="value">{{ statInfo.cost || '0' }}</view>
+						<view class="value">{{ deviceInfo.totalMoney || '0' }}</view>
 					</view>
 				</view>
 				<view class="end-charge-box">
 					<button @click="exiting.visible = true" :disabled="!isShowBtn" class="end-charge">结束充电</button>
 				</view>
 			</view>
-			<!-- 统计兰 -->
-			<!-- 			<view class="statbar">
-				<view class="sta">
-					<view class="value">{{statInfo.electricity}}</view>
-					<view class="name">电量/度</view>
-				</view>
-				<view class="split"></view>
-				<view class="sta">
-					<view class="value">{{statInfo.cost}}</view>
-					<view class="name">费用/元</view>
-				</view>
-			</view> -->
 			<!-- 信息 -->
 			<view id="info" class="info">
 				<view>
 					<view class="cell">
 						<view class="lable">订单编号</view>
-						<view class="contet">{{ orderInfo.id }}</view>
+						<view class="contet">{{ deviceInfo.chargeOrderNo }}</view>
 					</view>
 					<view class="cell">
 						<view class="lable">终端编号</view>
-						<view class="contet">{{ deviceInfo.deviceNo }}</view>
+						<view class="contet">{{ deviceInfo.connectorCode }}</view>
 					</view>
 					<view class="cell">
 						<view class="lable">充电电站</view>
-						<view class="contet">{{ deviceInfo.thirdPartyStationName }}</view>
+						<view class="contet">{{ deviceInfo.stationName }}</view>
 					</view>
 					<view class="cell">
 						<view class="lable">充电终端</view>
-						<view class="contet">{{ deviceInfo.deviceName }}</view>
+						<view class="contet">{{ deviceInfo.connectorName }}</view>
 					</view>
 				</view>
 				<view class="tips">账单信息可能会有所延迟，具体以实际结算为准</view>
@@ -123,7 +111,7 @@ export default {
 	},
 	onShow() {
 		this.getDeviceInfo();
-		this.getOrderInfo();
+		// this.getOrderInfo();
 	},
 	data() {
 		return {
@@ -137,16 +125,7 @@ export default {
 				text: '00：00：00',
 				isSatrt: false,
 			},
-			orderTimer: {
-				id: 0,
-				isSatrt: false,
-				timeInterval: 10, //每隔多少秒查询一次订单(单位秒:s)
-			},
-			statInfo: {
-				electricity: 0,
-				cost: 0
-			}, //统计信息，电量，费用
-			nowPriceTime: {}, //当前价格时间段信息
+			pollingTimer: null, //轮询定时器ID
 			deviceInfo: {}, //充电桩的信息
 			orderInfo: {
 				id: 1
@@ -157,92 +136,67 @@ export default {
 	destroyed() {
 		console.log("关闭页面了。。。。。。")
 		//关闭页面了，要清除定时器
+		this.stopPolling();
 		clearInterval(this.timer.id);
-		clearInterval(this.orderTimer.id);
 	},
 	methods: {
-		//获取设备的详情信息
-		getDeviceInfo(deviceId) {
-			this.$api.base("post", "/chargeApi/getDevicesDetial", {
-				"deviceId": this.deviceInfo.id
-			}, {}).then(res => {
-				this.deviceInfo = res.device;
-				this.nowPriceTime = res.nowPriceTime;
-
-			})
-		},
-		//是否显示长按结束按钮
-		isShowEendBtn(orderTime) {
-			var t1 = new Date(orderTime).getTime();
-			var t2 = new Date().getTime();
-			var t = (t2 - t1) / 1000; //单位秒
-			if (t >= 60 || this.orderInfo.status == 1) {
-				//启动时间大于一分钟，可以显示长按结束按钮
-				this.isShowBtn = true;
-			}
-		},
-		//查询订单详情并进行订单状态的检测
-		getOrderInfo() {
-			this.$api.base("post", "/chargeApi/queryIsSuccessStop", {
-				"id": this.orderInfo.id
-			}, {
-				loading: false
+		//获取设备的详情信息（含轮询）
+		getDeviceInfo(showLoading = true) {
+			this.$api.base("get", "/applet/v1/station/charging-cost", {}, {
+				loading: showLoading
 			}).then(res => {
-				this.orderInfo = res.obj.orderInfo;
-				this.timer.start = res.obj.orderInfo.startTime.replaceAll("-", "/");
-				this.isShowEendBtn(res.obj.orderInfo.startTime.replaceAll("-", "/"));
-				//充电的度数
-				if (this.orderInfo.totalCharge != null) {
-					this.statInfo.electricity = this.orderInfo.totalCharge;
-				}
-
-				//费用
-				let cost = (this.statInfo.electricity * this.nowPriceTime.price).toFixed(2);
-				if (!isNaN(cost) && this.orderInfo.thirdPartyElecfee == 0) {
-					//如果后台，第三方返回的电费是0按照自己的方式进行计算
-					this.statInfo.cost = cost
-				}
-				if (!isNaN(this.orderInfo.realCost) && this.orderInfo.thirdPartyElecfee > 0) {
-					//如果后台有返回第三方的电费，取后台计算的值
-					this.statInfo.cost = this.orderInfo.realCost.toFixed(4);
-				}
+				this.deviceInfo = res.data;
 
-				if (this.orderInfo.status == 3 || this.orderInfo.status == 5) {
+				// 检查订单状态，已完成或已结束则跳转订单详情
+				if (res.data.orderStatus == 3 || res.data.orderStatus == 5) {
 					uni.hideLoading();
+					this.stopPolling();
 					clearInterval(this.timer.id);
-					clearInterval(this.orderTimer.id);
-					this.$app.url.goto('/pages/order-detail/order-detail?orderId=' + this.orderInfo.id, false);
+					this.$app.url.goto('/pages/order-detail/order-detail?orderId=' + res.data.chargeOrderId, false);
 					return;
 				}
-				if (this.orderInfo.status == 1 && !this.timer.isSatrt) {
-					//状态为充电中
+
+				// 充电中状态，启动计时器
+				if (res.data.orderStatus == 2 && !this.timer.isSatrt) {
 					this.startup();
 				}
-				if (!this.orderTimer.isSatrt) {
-					this.orderTimer.isSatrt = true;
-					//开启定时器每隔5s查询订单
-					this.startCheckOrderTimer();
-				}
 
+				// 检查是否显示结束按钮
+				this.checkShowEndBtn(res.data.startTime);
+
+				// 启动轮询
+				this.startPolling();
 			})
 		},
-		getVolt() {
-			if (!this.deviceInfo.power) {
-				return 0;
+		//启动轮询定时器，每5秒查询一次
+		startPolling() {
+			if (this.pollingTimer) return; // 已启动则不重复
+			this.pollingTimer = setInterval(() => {
+				this.getDeviceInfo(false);
+			}, 5000);
+		},
+		//停止轮询
+		stopPolling() {
+			if (this.pollingTimer) {
+				clearInterval(this.pollingTimer);
+				this.pollingTimer = null;
 			}
-			var v = this.deviceInfo.power / this.deviceInfo.current * 1000;
-			return v;
 		},
-		//启动检测订单的定时器,每隔5S
-		startCheckOrderTimer() {
-			clearInterval(this.orderTimer.id);
-			this.orderTimer.id = setInterval(() => {
-				this.getOrderInfo(this.orderInfo.id)
-			}, this.orderTimer.timeInterval * 1000);
+		//检查是否显示长按结束按钮
+		checkShowEndBtn(orderTime) {
+			if (!orderTime) return;
+			const t1 = new Date(orderTime.replace(/-/g, '/')).getTime();
+			const t2 = Date.now();
+			const diffSeconds = (t2 - t1) / 1000;
+			// 启动时间大于60秒或状态为充电中，显示结束按钮
+			if (diffSeconds >= 60 || this.deviceInfo.orderStatus == 2) {
+				this.isShowBtn = true;
+			}
 		},
 		// 启动定时器
 		startup() {
-			const start = new Date(this.timer.start);
+			// 使用 this.deviceInfo.startTime 替代 this.timer.start
+			const start = new Date(this.deviceInfo.startTime);
 			const obj = {
 				hour: 0,
 				minute: 0,
@@ -256,16 +210,6 @@ export default {
 				obj.second = Math.floor(diff / 1000 % 60);
 				this.timer.text =
 					`${String(obj.hour).padStart(2, '0')}：${String(obj.minute).padStart(2, '0')}：${String(obj.second).padStart(2, '0')}`;
-				//console.log(diff,Math.floor(diff / 1000 ))
-				/* //计算在该功率下，
-				var mill = diff / 1000;//充电时间秒
-				if(!this.deviceInfo.power){
-					return;
-				}
-				//充电的度数
-				this.statInfo.electricity = (this.deviceInfo.power/3600 * mill).toFixed(2);
-				//费用
-				this.statInfo.cost = (this.statInfo.electricity * this.nowPriceTime.price).toFixed(2); */
 			}
 			clearInterval(this.timer.id);
 			this.timer.id = setInterval(handle, 1000);
@@ -273,26 +217,24 @@ export default {
 		},
 		// 退出充电
 		exit() {
-			/* this.$app.popup.toast("测试环境，请等待自动结束")
-						return; */
 			this.$api.base("post", "/applet/v1/charge/stopCharge", {
-				"chargeOrderId": 1234
+				"chargeOrderNo": this.deviceInfo.chargeOrderNo
 			}, {}).then(res => {
 				this.exiting.lock = false;
-				clearInterval(this.orderTimer.id);
-				this.orderTimer.isSatrt = false;
-				this.orderTimer.timeInterval = 2;
+				this.stopPolling();
+
+				// 显示结算中loading
 				this.$app.popup.loading(true, {
 					title: "结算中，请稍候",
 					timeout: 120 * 1000
-				})
-				setTimeout(() => {
-					this.getOrderInfo(this.orderInfo.id)
-				}, 2000)
+				});
 
-				/* clearInterval(this.timer.id);
-				clearInterval(this.orderTimer.id);
-				this.$app.url.goto('/pages/order-detail/order-detail?orderId='+this.orderInfo.id,false); */
+				// 2秒后开始轮询查询订单状态
+				setTimeout(() => {
+					this.getDeviceInfo(false);
+				}, 2000);
+			}).catch(() => {
+				this.exiting.lock = false;
 			})
 		},
 		// 长按动画结束

pages/coupon-buy/coupon-buy.css

@@ -1,477 +1,497 @@
 @font-face {
-	font-family: "ysbth";
-	src: url('ysbth.ttf') format('truetype');
+  font-family: "ysbth";
+  src: url("ysbth.ttf") format("truetype");
 }
 
 ax-body {
-	display: block;
-	height: 100%;
-	background: #F6FAFF;
+  display: block;
+  height: 100%;
+  background: #f6faff;
 }
 
 .body {
-	position: relative;
-	z-index: 1;
-	background: linear-gradient( 180deg, #6DEEED 0%, #C4FFFF 8%, #FFFFFF 37%, #F5F7FB 100%);
-	padding: 0 20rpx 0 20rpx;
+  position: relative;
+  z-index: 1;
+  background: linear-gradient(
+    180deg,
+    #6deeed 0%,
+    #c4ffff 8%,
+    #ffffff 37%,
+    #f5f7fb 100%
+  );
+  padding: 0 20rpx 0 20rpx;
 }
 
 /* 页面背景 */
 .page-background {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	z-index: 0;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 0;
 }
 
 .page-background image {
-	display: block;
-	width: 100%;
-	/* transform: scaleY(-100%); */
+  display: block;
+  width: 100%;
+  /* transform: scaleY(-100%); */
 }
 
 /* 统计卡 */
 .sta-card {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-	height: 78px;
-	border-radius: 8px;
-	background: #FFFFFF;
-	position: relative;
-	overflow: hidden;
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  height: 78px;
+  border-radius: 8px;
+  background: #ffffff;
+  position: relative;
+  overflow: hidden;
 }
 
 .sta-card::before {
-	content: '';
-	display: block;
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	box-shadow: 0 8px 8px #fff inset;
-	background-color: transparent !important;
+  content: "";
+  display: block;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  box-shadow: 0 8px 8px #fff inset;
+  background-color: transparent !important;
 }
 
-.sta-card+.sta-card {
-	margin-left: 10px;
+.sta-card + .sta-card {
+  margin-left: 10px;
 }
 
 .sta-card .value {
-	font-size: 24px;
-	font-weight: bold;
-	position: relative;
-	z-index: 3;
+  font-size: 24px;
+  font-weight: bold;
+  position: relative;
+  z-index: 3;
 }
 
 .sta-card .name {
-	font-size: 12px;
-	color: #aaa;
-	position: relative;
-	z-index: 3;
+  font-size: 12px;
+  color: #aaa;
+  position: relative;
+  z-index: 3;
 }
 
 .sta-card .bg {
-	position: absolute;
-	top: 0;
-	right: 0;
-	height: 100%;
-	z-index: 2;
+  position: absolute;
+  top: 0;
+  right: 0;
+  height: 100%;
+  z-index: 2;
 }
 
 .overflow-payment {
-	position: absolute;
-	width: 176rpx;
-	height: 40rpx;
-	background: #FF4D3A;
-	border-radius: 8rpx;
-	font-size: 24rpx;
-	color: #FFFFFF;
-	text-align: center;
-	top: 0;
-	right: 0;
-	z-index: 9999;
+  position: absolute;
+  width: 176rpx;
+  height: 40rpx;
+  background: #ff4d3a;
+  border-radius: 8rpx;
+  font-size: 24rpx;
+  color: #ffffff;
+  text-align: center;
+  top: 0;
+  right: 0;
+  z-index: 9999;
 }
 
 /* 卡片 */
 .card {
-	border-radius: 16px;
-	padding: 15px 0;
-	margin-top: 10px;
+  border-radius: 16px;
+  padding: 15px 0;
+  margin-top: 10px;
 }
 
 .card .title {
-	/* 	display: flex;
+  /* 	display: flex;
 	align-items: flex-end;
 	justify-content: space-between; */
-	margin-bottom: 20px;
-	font-weight: bold;
+  margin-bottom: 20px;
+  font-weight: bold;
 }
 
 .title-text {
-	font-weight: normal;
-	font-size: 26rpx;
-	color: #666;
+  font-weight: normal;
+  font-size: 26rpx;
+  color: #666;
 }
 
 .card .title .more {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-weight: normal;
-	font-size: 14px;
-	color: #aaa;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: normal;
+  font-size: 14px;
+  color: #aaa;
 }
 
 .card .title .more .icon {
-	margin-left: 5px;
+  margin-left: 5px;
 }
 
 /* 温馨提示 */
 .tips .li {
-	font-size: 14px;
-	color: #666;
+  font-size: 14px;
+  color: #666;
 }
 
-.tips .li+.li {
-	margin-top: 7px;
+.tips .li + .li {
+  margin-top: 7px;
 }
 
 /* 优惠券 */
 .coupons {
-	display: grid;
-	grid-template-columns: 1fr 1fr 1fr;
-	gap: 10px;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  gap: 10px;
 }
 
 .coupons .item {
-	--item-bg: #3eb6f8;
-	--item-bg-active: #0093e4;
-	--coupon-bg: #fff;
-	--coupon-bg-active: #3ab8ff;
-	--font-color: #3eb6f8;
-	--font-color-active: #fff;
+  --item-bg: #3eb6f8;
+  --item-bg-active: #0093e4;
+  --coupon-bg: #fff;
+  --coupon-bg-active: #3ab8ff;
+  --font-color: #3eb6f8;
+  --font-color-active: #fff;
 
-	padding: 5px;
-	height: 150px;
-	border-radius: 10px;
-	background-color: var(--item-bg);
-	color: var(--font-color);
+  padding: 5px;
+  height: 150px;
+  border-radius: 10px;
+  background-color: var(--item-bg);
+  color: var(--font-color);
 }
 
 .coupons .item .coupon {
-	display: flex;
-	flex-direction: column;
-	width: 100%;
-	height: 100%;
-	overflow: hidden;
-	border-radius: 10px;
-	filter: drop-shadow(0 1px 6px rgba(102, 102, 102, 0.3));
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  border-radius: 10px;
+  filter: drop-shadow(0 1px 6px rgba(102, 102, 102, 0.3));
 }
 
 .coupons .item .coupon .top {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-	background-color: var(--coupon-bg);
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  background-color: var(--coupon-bg);
 }
 
 .coupons .item .coupon .top .value {
-	font-size: 36px;
-	font-weight: bold;
+  font-size: 36px;
+  font-weight: bold;
 }
 
 .coupons .item .coupon .top .unit {
-	font-size: 14px;
+  font-size: 14px;
 }
 
 .coupons .item .coupon .bottom {
-	text-align: center;
-	font-size: 14px;
-	background-color: var(--coupon-bg);
-	padding: 10px;
+  text-align: center;
+  font-size: 14px;
+  background-color: var(--coupon-bg);
+  padding: 10px;
 }
 
 .coupons .item .coupon .middle {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	height: 10px;
-	position: relative;
-	overflow: hidden;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 10px;
+  position: relative;
+  overflow: hidden;
 }
 
 .coupons .item .coupon .middle::before {
-	content: '';
-	display: block;
-	width: 50%;
-	height: 10px;
-	background: radial-gradient(circle 10px at left, transparent 5px, var(--coupon-bg) 50%);
+  content: "";
+  display: block;
+  width: 50%;
+  height: 10px;
+  background: radial-gradient(
+    circle 10px at left,
+    transparent 5px,
+    var(--coupon-bg) 50%
+  );
 }
 
 .coupons .item .coupon .middle::after {
-	content: '';
-	display: block;
-	width: 50%;
-	height: 10px;
-	background: radial-gradient(circle 10px at right, transparent 5px, var(--coupon-bg) 50%);
+  content: "";
+  display: block;
+  width: 50%;
+  height: 10px;
+  background: radial-gradient(
+    circle 10px at right,
+    transparent 5px,
+    var(--coupon-bg) 50%
+  );
 }
 
 .coupons .item .coupon .middle .line {
-	position: absolute;
-	top: 50%;
-	left: 10px;
-	right: 10px;
-	border-top: 1px dashed var(--font-color);
+  position: absolute;
+  top: 50%;
+  left: 10px;
+  right: 10px;
+  border-top: 1px dashed var(--font-color);
 }
 
 .coupons .item.active {
-	background-color: var(--item-bg-active);
-	color: var(--font-color-active);
+  background-color: var(--item-bg-active);
+  color: var(--font-color-active);
 }
 
 .coupons .item.active .coupon .middle .line {
-	border-color: var(--font-color-active);
+  border-color: var(--font-color-active);
 }
 
 .coupons .item.active .coupon .top,
 .coupons .item.active .coupon .bottom {
-	background-color: var(--coupon-bg-active);
+  background-color: var(--coupon-bg-active);
 }
 
 .coupons .item.active .coupon .middle::before {
-	background: radial-gradient(circle 10px at left, transparent 5px, var(--coupon-bg-active) 50%);
+  background: radial-gradient(
+    circle 10px at left,
+    transparent 5px,
+    var(--coupon-bg-active) 50%
+  );
 }
 
 .coupons .item.active .coupon .middle::after {
-	background: radial-gradient(circle 10px at right, transparent 5px, var(--coupon-bg-active) 50%);
+  background: radial-gradient(
+    circle 10px at right,
+    transparent 5px,
+    var(--coupon-bg-active) 50%
+  );
 }
-.new-coupons-box{
-	display: grid;
-	grid-template-columns: 1fr 1fr 1fr;
-	gap: 10px;
+.new-coupons-box {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  gap: 10px;
 }
 .new-coupons {
-	background: url('/static/img/not-coupons-bg.png');
-	width: 220rpx;
-	height: 136rpx;
-	background-size: cover; /* 确保图片覆盖整个元素 */
-	background-position: center;
-	text-align: center;
-}
-.newCouponsActive{
-	background: url('/static/img/coupons-bg.png');
-	width: 220rpx;
-	height: 136rpx;
-	background-size: cover; /* 确保图片覆盖整个元素 */
-	background-position: center;
-	text-align: center;
-}
-.new-coupons-price{
-	font-weight: bold;
-	font-size: 24rpx;
-	color: #2B303A;
-	height: 74rpx;
-	line-height: 74rpx;
-}
-.new-coupons-unit{
-	font-size: 22rpx;
-	font-weight: normal;
-}
-.new-coupons-text{
-	font-weight: 400;
-	font-size: 28rpx;
-	color: #2B303A;
-	font-family: 'ysbth';
-	height: 56rpx;
-	line-height: 56rpx;
+  background: url("https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/476414ae25134fb28e8d65038f107ab5.png");
+  width: 220rpx;
+  height: 136rpx;
+  background-size: cover; /* 确保图片覆盖整个元素 */
+  background-position: center;
+  text-align: center;
+}
+.newCouponsActive {
+  background: url("https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/720bda57444b4f8281f1ceb93e3e5efb.png");
+  width: 220rpx;
+  height: 136rpx;
+  background-size: cover; /* 确保图片覆盖整个元素 */
+  background-position: center;
+  text-align: center;
+}
+.new-coupons-price {
+  font-weight: bold;
+  font-size: 24rpx;
+  color: #2b303a;
+  height: 74rpx;
+  line-height: 74rpx;
+}
+.new-coupons-unit {
+  font-size: 22rpx;
+  font-weight: normal;
+}
+.new-coupons-text {
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #2b303a;
+  font-family: "ysbth";
+  height: 56rpx;
+  line-height: 56rpx;
 }
 .pay-type {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 
 .pay-type .icon {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 20px;
-	height: 20px;
-	font-size: 14px;
-	margin-right: 5px;
-	border-radius: 100pc;
-	background-color: #04BE02;
-	color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  font-size: 14px;
+  margin-right: 5px;
+  border-radius: 100pc;
+  background-color: #04be02;
+  color: #fff;
 }
 
 .footer {
-	position: fixed;
-	left: 10px;
-	right: 10px;
-	bottom: 0;
+  position: fixed;
+  left: 10px;
+  right: 10px;
+  bottom: 0;
 }
 
 .pay {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	height: 50px;
-	font-size: 14px;
-	margin-top: 20px;
-	border-radius: 8px;
-	color: #2B303A;
-	background: linear-gradient(to right, #8FF8FB, #47AEFF);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 50px;
+  font-size: 14px;
+  margin-top: 20px;
+  border-radius: 8px;
+  color: #2b303a;
+  background: linear-gradient(to right, #8ff8fb, #47aeff);
 }
 
 .pay::after {
-	content: unset;
-	display: none;
+  content: unset;
+  display: none;
 }
 
 .pay[disabled] {
-	text-shadow: unset;
-	background: #ddd;
+  text-shadow: unset;
+  background: #ddd;
 }
 
-
 .coupon-item {
-	--item-color: #D6F3FF;
-	font-family: 'ysbth';
-	color: #2B303A;
-	background-color: var(--item-color);
-	border-radius: 8px;
-	text-align: center;
-	padding: 0 8px;
-	position: relative;
-	margin-bottom: 10px;
+  --item-color: #d6f3ff;
+  font-family: "ysbth";
+  color: #2b303a;
+  background-color: var(--item-color);
+  border-radius: 8px;
+  text-align: center;
+  padding: 0 8px;
+  position: relative;
+  margin-bottom: 10px;
 }
 
 .coupon-item .ticket {
-	background-color: #F2F8FF;
-	border-radius: 8px;
-	margin-top: -10px;
-	box-shadow: 0 -1px 6px rgba(122, 168, 222, 0.1);
+  background-color: #f2f8ff;
+  border-radius: 8px;
+  margin-top: -10px;
+  box-shadow: 0 -1px 6px rgba(122, 168, 222, 0.1);
 }
 
 .coupon-item .ticket .value {
-	display: flex;
-	align-items: flex-end;
-	justify-content: center;
-	padding-top: 10px;
-	color: #2B303A;
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+  padding-top: 10px;
+  color: #2b303a;
 }
 
 .coupon-item .ticket .value .val {
-	display: inline-block;
-	font-size: 18px;
-	font-weight: bold;
-	transform: translateY(2px);
-	margin-right: 2px;
+  display: inline-block;
+  font-size: 18px;
+  font-weight: bold;
+  transform: translateY(2px);
+  margin-right: 2px;
 }
 
 .coupon-item .ticket .value .unit {
-	font-size: 12px;
+  font-size: 12px;
 }
 
 .coupon-item .ticket .line-wrap {
-	display: flex;
-	align-items: center;
-	position: relative;
-	height: 16px;
+  display: flex;
+  align-items: center;
+  position: relative;
+  height: 16px;
 }
 
 .coupon-item .ticket .line-wrap .line {
-	flex: 1;
-	height: 1px;
-	border-top: 1px dashed #aaa;
+  flex: 1;
+  height: 1px;
+  border-top: 1px dashed #aaa;
 }
 
 .coupon-item .ticket .line-wrap .circle {
-	width: 16px;
-	height: 16px;
-	border-radius: 100%;
-	background-color: var(--item-color);
+  width: 16px;
+  height: 16px;
+  border-radius: 100%;
+  background-color: var(--item-color);
 }
 
 .coupon-item .ticket .line-wrap view:first-child {
-	transform: translateX(-50%);
+  transform: translateX(-50%);
 }
 
 .coupon-item .ticket .line-wrap view:last-child {
-	transform: translateX(50%);
+  transform: translateX(50%);
 }
 
 .coupon-item .ticket .margin {
-	height: 15px;
+  height: 15px;
 }
 
 .coupon-item .trapezium {
-	width: 100%;
-	height: 10px;
-	position: relative;
-	overflow: hidden;
-	margin-top: -10px;
+  width: 100%;
+  height: 10px;
+  position: relative;
+  overflow: hidden;
+  margin-top: -10px;
 }
 
 .coupon-item .trapezium::after {
-	content: '';
-	display: block;
-	width: 50%;
-	height: 10px;
-	position: absolute;
-	left: 0;
-	bottom: 0;
-	transform: skewX(-15deg) translateX(0.3em);
-	border-radius: 10px 0 0 0;
-	background-color: var(--item-color);
+  content: "";
+  display: block;
+  width: 50%;
+  height: 10px;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  transform: skewX(-15deg) translateX(0.3em);
+  border-radius: 10px 0 0 0;
+  background-color: var(--item-color);
 }
 
 .coupon-item .trapezium::before {
-	content: '';
-	display: block;
-	width: 50%;
-	height: 10px;
-	position: absolute;
-	right: 0;
-	bottom: 0;
-	transform: skewX(15deg) translateX(-0.3em);
-	border-radius: 0 10px 0 0;
-	background-color: var(--item-color);
+  content: "";
+  display: block;
+  width: 50%;
+  height: 10px;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  transform: skewX(15deg) translateX(-0.3em);
+  border-radius: 0 10px 0 0;
+  background-color: var(--item-color);
 }
 
 .coupon-item .text {
-	margin-top: -8px;
-	position: relative;
-	z-index: 3;
+  margin-top: -8px;
+  position: relative;
+  z-index: 3;
 }
 
 .coupon-item.active {
-	--item-color: #47AEFF !important;
+  --item-color: #47aeff !important;
 }
 
 .coupon-item.active .ticket .value {
-	color: #47AEFF;
+  color: #47aeff;
 }
 
 .coupon-item.active .text {
-	color: #fff;
+  color: #fff;
 }
 
 .payment-tips {
-	width: 702rpx;
-	height: 72rpx;
-	background: #FFF6E8;
-	border-radius: 16rpx;
-	font-size: 24rpx;
-	color: #FAB04D;
-	line-height: 72rpx;
-	text-align: center;
-}
+  width: 702rpx;
+  height: 72rpx;
+  background: #fff6e8;
+  border-radius: 16rpx;
+  font-size: 24rpx;
+  color: #fab04d;
+  line-height: 72rpx;
+  text-align: center;
+}

pages/coupon-buy/coupon-buy.vue

@@ -8,12 +8,12 @@
 			<!-- 统计卡 -->
 			<view class="app-flex c-between">
 				<view class="sta-card">
-					<view class="value">{{ userinfo.integralNum }}</view>
+					<view class="value">{{ userinfo.integral }}</view>
 					<view class="name">我的积分</view>
 					<image src="@/static/img/my-sta-bg01.png" mode="heightFix" class="bg"></image>
 				</view>
 				<view class="sta-card">
-					<view class="value">{{ userinfo.balance }}</view>
+					<view class="value">{{ userinfo.accountBalance }}</view>
 					<view class="name">可抵扣余量</view>
 					<image src="@/static/img/my-sta-bg03.png" mode="heightFix" class="bg"></image>
 					<view class="overflow-payment" v-if="order_info != null" @click="topage_order">
@@ -109,8 +109,8 @@ export default {
 	onShow() {
 		this.getMyAccount()
 		this.getLevel()
-		this.select_orderstatus()
-		this.get_orderPayment()
+		// this.select_orderstatus()
+		// this.get_orderPayment()
 	},
 	onLoad(options) {
 		this.payment = options.payment
@@ -148,13 +148,14 @@ export default {
 				})
 				return
 			}
-			this.$api.base("post", "/applet/v1/order/createOrder", {
+			this.$api.base("post", "/applet/v1/wft/order/createOrder", {
 				levelId: this.coupons.data[this.coupons.index].id
 			}, {}).then(addRes => {
 				console.log(addRes, '创建订单返回');
 				if (addRes.data.orderId) {
-					this.$api.base("put", `/applet/v1/order/payOrder/${addRes.data.orderId}`, {}, {}).then(res => {
-						var payInfo = JSON.parse(res.wx.wx.pay_info)
+					this.$api.base("put", `/applet/v1/wft/order/payOrder/${addRes.data.orderId}`, {}, {}).then(res => {
+						var payInfo = JSON.parse(res.data.params.pay_info)
+						console.log(payInfo, '11');
 						uni.requestPayment({
 							provider: 'wxpay',
 							timeStamp: payInfo.timeStamp,
@@ -164,15 +165,36 @@ export default {
 							paySign: payInfo.paySign,
 							success: (res) => {
 								console.log('success:', res);
-								//注册一个用户支付成功后点确定的事件
-								this.$app.popup.alert('支付成功', '温馨提示', {
-									showCancel: false
-								}).then(() => {
-									this.$app.url.back()
-								});
+								// 查询支付状态
+								this.$api.base("get", `/applet/v1/wft/order/query/${addRes.data.orderNo}`, {}, {}).then(queryRes => {
+									console.log(queryRes, '查询订单返回');
+									if (queryRes.data) {
+										setTimeout(() => {
+											this.$app.popup.alert('支付成功', '温馨提示', {
+												showCancel: false
+											}).then(() => {
+												this.$app.url.back()
+											});
+										}, 1000)
+									} else {
+										this.$app.popup.alert('支付失败，请稍后重试', '温馨提示', {
+											showCancel: false
+										}).then(() => {
+											this.$app.url.back()
+										});
+									}
+								})
 							},
 							fail: (err) => {
 								console.log('fail:', err);
+								this.$api.base("put", `/applet/v1/wft/order/closeOrder/${addRes.data.orderNo}`, {}, {}).then(cancelRes => {
+									console.log(cancelRes, '取消订单返回');
+									if (cancelRes.data) {
+										this.$app.popup.alert('支付已取消', '温馨提示', {
+											showCancel: false
+										});
+									}
+								});
 								//注册一个用户取消支付的事件
 							}
 						});

pages/index/index.vue

@@ -51,7 +51,9 @@
 									</view>
 								</view>
 								<view class="charge-text-dsc">特惠价限时购买</view>
-								<image class="charge-coupon-img" src="/static/img/buy-charge.png" mode=""></image>
+								<image class="charge-coupon-img"
+									src="https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/ab13df2fa29e47f4ab7073310589b005.png"
+									mode=""></image>
 							</view>
 							<view class="">
 								<view class="order-center" @click="$app.url.goto('/pages/order/order')">
@@ -123,7 +125,7 @@
 											</view>
 										</view>
 										<view class="parkade">
-											<view class="txt">{{ item.tips }}</view>
+											<view class="txt">{{ item.tips || '' }}</view>
 										</view>
 										<view class="app-flex c-between info">
 											<view class="app-flex middle">
@@ -162,7 +164,9 @@
 				</view>
 			</scroll-view>
 			<view class="concat-father" @click="customerService()">
-				<image class="concat-icon" src="/static/img/concat.png" mode=""></image>
+				<image class="concat-icon"
+					src="https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/818d10965318468496abbbdef97e908d.png"
+					mode=""></image>
 			</view>
 		</view>
 		<ax-popup ref="filter" position="" maskType="black" maskEnable maskClose>
@@ -231,7 +235,6 @@ export default {
 		// #endif
 		this.setAppNavigationHeight();
 		this.get_frimid()
-		this.get_userinfo()
 		// this.get_paymentMsg()
 		this.getBanners()
 	},
@@ -337,7 +340,7 @@ export default {
 		return {
 			title: "用券充天天都享会员价", // 标题
 			path: "/pages/index/index", // 分享路径
-			imageUrl: '../../static/img/share.jpg', // 分享图
+			imageUrl: 'https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/7eda17a802dd49e39f8c6bb3d0f1aa4e.jpg', // 分享图
 			desc: '用券充天天都享会员价'
 		};
 	},
@@ -345,7 +348,7 @@ export default {
 		return {
 			title: "用券充天天都享会员价", // 标题
 			path: "/pages/index/index", // 分享路径
-			imageUrl: '../../static/img/share.jpg' // 分享图
+			imageUrl: 'https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/7eda17a802dd49e39f8c6bb3d0f1aa4e.jpg' // 分享图
 		};
 	},
 	methods: {
@@ -354,15 +357,6 @@ export default {
 			this.$refs.filter.close()
 			this.$app.storage.set('AD_STATUS', this.closeAdvertising);
 		},
-
-		get_userinfo() {
-			this.$api.base("get", "/applet/v1/user/getUserInfo", {}, {
-				error: false
-			}).then(res => {
-				this.user_info = res.data
-				this.$app.storage.set('USER_INFO', res.data);
-			})
-		},
 		// 企业用户扫码进入
 		get_frimid() {
 			if (this.$app.storage.get('FRIM_ID')) {
@@ -400,16 +394,15 @@ export default {
 			}
 		},
 		getDeviceInfo(sn) {
-			this.$api.base("post", "/chargeApi/checkDevicesBySn", {
-				"sn": sn
+			this.$api.base("get", "/applet/v1/station/connector/detail", {
+				"connectorCode": sn
 			}, {}).then(res => {
-				var item = res.device;
 				//设备状态 0：离网1：空闲2：占用（未充电）3：占用（充电中）4：占用（预约锁定）255：故障
-				if (item.deviceStatus == 0 || item.deviceStatus == 255) {
+				if (res.data.status == 0 || res.data.status == 255) {
 					return;
 				}
-				this.$app.url.goto('/pages/terminal/terminal?deviceId=' + item.id + "&deviceStatus=" + item
-					.deviceStatus);
+				this.$app.url.goto('/pages/terminal/terminal?deviceId=' + res.data.connectorCode + "&deviceStatus=" + res.data
+					.status);
 			})
 		},
 		getQueryParams(url, key) {
@@ -487,6 +480,8 @@ export default {
 		updateLocation() {
 			this.getLocation().then(res => {
 				this.location.value = [res.longitude, res.latitude].join(',');
+				this.get_userinfo()
+
 				this.getStations(res.longitude, res.latitude)
 				this.$app.storage.set('USER_LOCATION', this.location.value);
 				return this.reverseGeocoder([res.latitude, res.longitude].join(','))
@@ -508,6 +503,7 @@ export default {
 						(error) => {
 							console.log('H5定位失败', error);
 							this.getStations("", "");
+							this.get_userinfo()
 						}
 					);
 				} else {
@@ -524,6 +520,7 @@ export default {
 							console.log(err)
 							console.log('定位失败');
 							this.getStations("", "")
+							this.get_userinfo()
 						}
 					})
 				} else {
@@ -613,6 +610,14 @@ export default {
 				}
 			})
 		},
+		get_userinfo() {
+			this.$api.base("get", "/applet/v1/user/getUserInfo", {}, {
+				error: false
+			}).then(res => {
+				this.user_info = res.data
+				this.$app.storage.set('USER_INFO', res.data);
+			})
+		},
 		// 设定导航栏高度
 		setAppNavigationHeight() {
 			this.$nextTick(() => {

pages/map/map.vue

@@ -151,7 +151,7 @@ export default {
 		return {
 			title: "用券充天天都享会员价", // 标题
 			path: "/pages/index/index", // 分享路径
-			imageUrl: '../../static/img/share.jpg', // 分享图
+			imageUrl: 'https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/7eda17a802dd49e39f8c6bb3d0f1aa4e.jpg', // 分享图
 			desc: '用券充天天都享会员价'
 		};
 	},
@@ -159,7 +159,7 @@ export default {
 		return {
 			title: "用券充天天都享会员价", // 标题
 			path: "/pages/index/index", // 分享路径
-			imageUrl: '../../static/img/share.jpg' // 分享图
+			imageUrl: 'https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/7eda17a802dd49e39f8c6bb3d0f1aa4e.jpg', // 分享图
 		};
 	},
 	methods: {

pages/my/my.vue

@@ -24,7 +24,9 @@
 					</view>
 				</view>
 				<view class="seting-icon-box" @click="$app.url.goto('/pages/coupons/coupons')">
-					<image class="img-icon" src="@/static/img/Coupons.png"></image>
+					<image class="img-icon"
+						src="https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/d76e9bad8597403c9816d481aafd88d3.png">
+					</image>
 					<view class="tips-text">优惠券</view>
 				</view>
 			</view>
@@ -34,12 +36,12 @@
 				<view class="statistics-dataInfo">
 					<view class="dataInfo-left">
 						<view class="left-text">我的积分</view>
-						<view class="left-number">{{ userinfo.integralNum }}</view>
+						<view class="left-number">{{ userinfo.integral }}</view>
 					</view>
 					<view class="dataInfo-line"></view>
 					<view class="dataInfo-left">
 						<view class="left-text">可抵扣余量</view>
-						<view class="left-number">{{ userinfo.balance }}</view>
+						<view class="left-number">{{ userinfo.accountBalance }}</view>
 						<view class="left-refund-btn" @click="refund">
 							退还
 						</view>

pages/new-site/new-site.vue

@@ -242,11 +242,15 @@ export default {
 
 		getStationsInfo() {
 			let location = this.$app.storage.get('USER_LOCATION')
+			console.log(parseInt(this.stationInfo.stationId), 'stationId');
+			console.log(location.split(",")[0], 'longitude');
+			console.log(location.split(",")[1], 'latitude');
 			this.$api.base("get", "/applet/v1/station/detail", {
 				stationId: parseInt(this.stationInfo.stationId),
-				longitude: location.split(",")[0],
-				latitude: location.split(",")[1]
+				longitude: location.split(",")[0] || 0,
+				latitude: location.split(",")[1] || 0
 			}, {}).then(res => {
+				console.log("电站详情：", res)
 				res.data.pictures = JSON.parse(res.data.pictures)
 				const countMapping = {
 					'空闲': res.data.idleCount,
@@ -340,10 +344,10 @@ export default {
 		// 跳转充电终端
 		goTerminal(item) {
 			//设备状态 0：离网1：空闲2：占用（未充电）3：占用（充电中）4：占用（预约锁定）255：故障
-			if (item.deviceStatus == 0 || item.deviceStatus == 255) {
+			if (item.status == 0 || item.status == 255) {
 				return;
 			}
-			this.$app.url.goto('/pages/terminal/terminal?deviceId=' + item.connectorId + "&deviceStatus=" + item.status);
+			this.$app.url.goto('/pages/terminal/terminal?deviceId=' + item.connectorCode + "&deviceStatus=" + item.status);
 		},
 		//去查看全部电站
 		toDeiceAll() {
@@ -376,9 +380,9 @@ export default {
 		},
 		//通过充电桩编码（sn）获取设备详情
 		getDeviceInfo(sn) {
-			this.$api.base("post", "/chargeApi/checkDevicesBySn", { "sn": sn }, {}).then(res => {
+			this.$api.base("get", "/applet/v1/station/connector/detail", { "connectorCode": sn }, {}).then(res => {
 				console.log("设备信息：", res)
-				this.goTerminal(res.device);
+				this.goTerminal(res.data);
 			})
 		}
 	}

pages/recharge-log/recharge-log.vue

@@ -10,7 +10,7 @@
 					</view>
 					<view class="cell">
 						<view>订单编号：{{ item.orderNo }}</view>
-						<view>购券时间：{{ item.payTime }}</view>
+						<view>购券时间：{{ item.createTime }}</view>
 						<view>实付金额：{{ item.orderMoney }}元</view>
 						<view class="backTaxAmount" v-if="item.backTaxAmount && item.backTax === 0">
 							<view class="">超充金额：{{ item.backTaxAmount }}元</view>
@@ -62,6 +62,10 @@ export default {
 				return "已退款"
 			} else if (status == 5) {
 				return "退款中"
+			} else if (status == 3) {
+				return "已取消"
+			} else if (status == 1) {
+				return "待支付"
 			}
 		},
 		loadData(append) {

pages/site-more/site-more.vue

@@ -6,7 +6,7 @@
 				<view class="">
 					<view class="title">{{ stationInfo.stationName }}</view>
 					<!-- <view class="subtitle" v-html="stationInfo.parkTips"></view> -->
-					<view class="subtitle">{{ stationInfo.tips }}</view>
+					<view class="subtitle">{{ stationInfo.tips || '' }}</view>
 				</view>
 				<image class="site-more-topIcon" src="/static/img/site-more-topicon.png" mode=""></image>
 			</view>
@@ -184,10 +184,10 @@ export default {
 		// 跳转充电终端
 		goTerminal(item) {
 			//设备状态 0：离网1：空闲2：占用（未充电）3：占用（充电中）4：占用（预约锁定）255：故障
-			if (item.deviceStatus == 0 || item.deviceStatus == 255) {
+			if (item.status == 0 || item.status == 255) {
 				return;
 			}
-			this.$app.url.goto('/pages/terminal/terminal?deviceId=' + item.connectorId + "&deviceStatus=" + item.status);
+			this.$app.url.goto('/pages/terminal/terminal?deviceId=' + item.connectorCode + "&deviceStatus=" + item.status);
 		},
 		//扫一扫
 		sacn() {
@@ -211,9 +211,9 @@ export default {
 		},
 		//通过充电桩编码（sn）获取设备详情
 		getDeviceInfo(sn) {
-			this.$api.base("post", "/chargeApi/checkDevicesBySn", { "sn": sn }, {}).then(res => {
+			this.$api.base("get", "/applet/v1/station/connector/detail", { "snconnectorCode": sn }, {}).then(res => {
 				console.log("设备信息：", res)
-				this.goTerminal(res.device);
+				this.goTerminal(res.data);
 			})
 		}
 	}

pages/site/site.vue

@@ -43,7 +43,8 @@
 						<image src="@/static/img/site-bg05.svg" class="bg" mode="heightFix"></image>
 					</view>
 					<!-- v-if="user_info.firmId===null" -->
-					<view class="price-wrap" v-if="user_info.firmId === null || $app.storage.get('USER_INFO').firmType === 0">
+					<view class="price-wrap"
+						v-if="user_info.firmId === null || $app.storage.get('USER_INFO').firmType === 0">
 						<view class="price">
 							<text class="symbol">￥</text>
 							<text>{{ nowPriceTime.price ? parseFloat(nowPriceTime.price).toFixed(4) : "0.0000" }}</text>
@@ -117,8 +118,8 @@
 					<view class="price">
 						<text class="symbol">￥</text>
 						<!-- v-if="nowPriceTime.firmPrice===null" -->
-						<text
-							v-if="nowPriceTime.firmPrice === null || $app.storage.get('USER_INFO').firmType === 0">{{ nowPriceTime.price ? nowPriceTime.price.toFixed(4) : "0.0000" }}</text>
+						<text v-if="nowPriceTime.firmPrice === null || $app.storage.get('USER_INFO').firmType === 0">{{
+							nowPriceTime.price ? nowPriceTime.price.toFixed(4) : "0.0000" }}</text>
 						<text v-else>{{ parseFloat(nowPriceTime.firmPrice).toFixed(4) }}</text>
 					</view>
 					<view class="unit">{{ nowPriceTime.unit }}</view>
@@ -348,7 +349,7 @@ export default {
 		},
 		//通过充电桩编码（sn）获取设备详情
 		getDeviceInfo(sn) {
-			this.$api.base("post", "/chargeApi/checkDevicesBySn", { "sn": sn }, {}).then(res => {
+			this.$api.base("post", "/chargeApi/checkDevicesBySn", { "connectorCode": sn }, {}).then(res => {
 				console.log("设备信息：", res)
 				this.goTerminal(res.device);
 			})

pages/terminal/terminal.vue

@@ -4,7 +4,9 @@
 		<view class="body" :class="{ visit }">
 			<!-- 主图 -->
 			<view class="app-flex c-center host-graph">
-				<image src="@/static/img/charging-01.png" mode="widthFix" class="image"></image>
+				<image
+					src="https://national-motion.oss-cn-beijing.aliyuncs.com/20251230/9ca38a2aa5784e06b9cac31587b188b3.png"
+					mode="widthFix" class="image"></image>
 			</view>
 			<!-- 主参数 -->
 			<view class="parameter">
@@ -34,7 +36,7 @@
 						:style="{ backgroundImage: `url(${personal == 1 ? selectedImg : defaultImg})` }">
 						<view class="coupon-title">充电抵扣券</view>
 						<view class="price-info">
-							<view class="price-numer">{{ accountInfo.balance }}</view>
+							<view class="price-numer">{{ userInfo.accountBalance }}</view>
 							<view class="price-text">剩余可抵扣充电余量</view>
 						</view>
 						<view class="shop-coupon-btn"
@@ -94,7 +96,7 @@
 					</view>
 					<view class="cell">
 						<view class="lable">停车参考</view>
-						<view class="contet">{{ deviceInfo.parkingTips }}</view>
+						<view class="contet">{{ deviceInfo.parkingTips || '--' }}</view>
 					</view>
 				</view>
 			</view>
@@ -158,7 +160,6 @@ export default {
 		 */
 		this.deviceId = opts.deviceId
 		this.deviceStatus = opts.deviceStatus
-
 	},
 	onShow() {
 		this.queryInChange(this.deviceId, this.deviceStatus);
@@ -166,6 +167,7 @@ export default {
 		 * 刷新用户信息
 		 */
 		this.userInfo = this.$app.storage.get(this.$config.keyname.userInfo);
+		console.log(this.userInfo, '获取到的用户信息');
 		if (!this.userInfo.phone) {
 			this.$app.url.goto('/pages/login/login')
 			return;
@@ -187,7 +189,7 @@ export default {
 		// })
 	},
 	mounted() {
-		this.get_paymentMsg()
+		// this.get_paymentMsg()
 		setTimeout(() => {
 			if (this.payment_msg != null) {
 				this.$refs.filter.open()
@@ -227,12 +229,13 @@ export default {
 				this.visit = true;
 			}
 			this.getDeviceInfo(deviceId); //获取设备、站的详情信息
-			this.getAccountInfo(); //获取账户信息
+			// this.getAccountInfo(); //获取账户信息
+			this.checkedStartStatus(); //查询订单状态
 		},
 		//获取设备的详情信息
 		getDeviceInfo(deviceId) {
 			this.$api.base("get", "/applet/v1/station/connector/detail", {
-				"connectorId": deviceId
+				"connectorCode": deviceId
 			}, {}).then(res => {
 				this.deviceInfo = res.data;
 				this.nowPriceTime = res.nowPriceTime;
@@ -350,58 +353,46 @@ export default {
 				equipmentId: this.deviceInfo.equipmentId,
 				stationId: this.deviceInfo.stationId,
 				couponId: null,
-				equipAuthSeq: '',
-				connectorId: ''
+				// equipAuthSeq: '',
+				connectorId: this.deviceInfo.connectorCode,
 			}
 			this.$api.base("post", "/applet/v1/charge/invokeCharge", obj, {}).then(res => {
+				console.log(res, '返回数据');
 				//下单成功，并进行了订单预充值
-				this.orderInfo = res.orderInfo;
-				if (res.flg && res.flg == 1) {
-					//用户有充电中的订单
+				this.orderInfo = res.data;
+				if (res.code == "00000") {
+					this.$app.url.goto('/pages/charging/charging?chargeOrderNo=' + res.data.chargeOrderNo + "&deviceId=" +
+						this.deviceInfo.id, false);
+				} else {
+					this.$app.popup.alert(res.msg, "温馨提示");
+				}
+				// if (res.flg && res.flg == 1) {
+				// 	//用户有充电中的订单
+				// 	this.$app.popup.confirm("您有一个进行中充电订单，不可再次启动。", null, {
+				// 		showCancel: false,
+				// 		confirmText: "查看订单"
+				// 	}).then(cres => {
+				// 		this.$app.url.goto('/pages/charging/charging?orderId=' + this.orderInfo.id +
+				// 			"&deviceId=" + this.deviceInfo.id, false);
+				// 	});
+				// } else {
+				// 	//正常启动充电订单
+				// 	this.$app.url.goto('/pages/charging/charging?orderId=' + this.orderInfo.id + "&deviceId=" +
+				// 		this.deviceInfo.id, false);
+				// }
+			})
+		},
+		// 查询订单
+		checkedStartStatus() {
+			this.$api.base("get", "/applet/v1/station/charging-cost", {}, {}).then(res => {
+				if (res.data.orderStatus == 2) {
 					this.$app.popup.confirm("您有一个进行中充电订单，不可再次启动。", null, {
 						showCancel: false,
 						confirmText: "查看订单"
 					}).then(cres => {
-						this.$app.url.goto('/pages/charging/charging?orderId=' + this.orderInfo.id +
+						this.$app.url.goto('/pages/charging/charging?chargeOrderNo=' + res.data.chargeOrderNo +
 							"&deviceId=" + this.deviceInfo.id, false);
 					});
-				} else {
-					//正常启动充电订单
-					this.$app.url.goto('/pages/charging/charging?orderId=' + this.orderInfo.id + "&deviceId=" +
-						this.deviceInfo.id, false);
-				}
-			})
-		},
-		// 延迟5s查询一下订单，看看是否真的启动成功
-		checkedStartStatus() {
-			this.$api.base("post", "/chargeApi/checkedStartStatus", {
-				"id": this.orderInfo.id
-			}, {}).then(res => {
-
-				if (res.code == 0) {
-					var respObj = res.obj;
-					if (respObj.code == 200) {
-						if (respObj.status == 1) {
-							uni.hideLoading();
-							//状态为1说明正常启动
-							this.$app.url.goto('/pages/charging/charging?orderId=' + this.orderInfo.id +
-								"&deviceId=" + this.deviceInfo.id, false);
-						} else {
-							//其他状态，说明充电桩，未启动。或其他问题，需要再次进行进行验证
-							if (this.checkNum < 20) {
-								this.checkNum = this.checkNum + 1;
-								//延迟2s查询一下订单，看看是否真的启动成功
-								setTimeout(() => this.checkedStartStatus(), 2000);
-							}
-						}
-
-					} else {
-						uni.hideLoading();
-						this.$app.popup.alert(respObj.msg, "温馨提示");
-					}
-
-				} else {
-					uni.hideLoading();
 				}
 			})
 		},

static/js/api.js

@@ -153,6 +153,7 @@ api.base = function (method, url, data, opts) {
               // 刷新失败，执行登录
               if (!isLoginPromptShown) {
                 isLoginPromptShown = true;
+                // 清除登录缓存
                 $app.popup
                   .confirm(
                     `服务器响应失败\r\n${err.data.msg},点击确定去登录`,
@@ -164,6 +165,7 @@ api.base = function (method, url, data, opts) {
                   .then((confirmed) => {
                     isLoginPromptShown = false;
                     if (confirmed) {
+                      uni.clearStorage();
                       uni.navigateTo({ url: "/pages/login/login" });
                     }
                   });

static/js/config.js

@@ -11,8 +11,9 @@ config.url = {
   // request : 'http://192.168.110.3:80/',
   // request : 'http://192.168.1.253:80/',
   // request : 'http://120.78.228.211:8866/',
-  request: "http://192.168.0.11:8989/",
-  // request: "http://192.168.0.217:8989/",
+  // request: "http://192.168.0.11:8989/",
+  // request: "https://cd.admin.zswlgz.com/",
+  request: "http://192.168.0.217:8989/",
   // request : 'https://charge.dev.hub.zswlgz.com/',
   // 上传地址
   upload: "http://127.0.0.1:3000/upload/",

unpackage/dist/build/mp-weixin/app.json

@@ -14,11 +14,11 @@
     "pages/feedback/feedback",
     "pages/order/order",
     "pages/search/search",
-    "pages/Invite-staff/Invite-staff",
     "pages/coupons/coupons",
     "pages/web/web",
     "pages/feedback-reply/feedback-reply",
-    "pages/banner-page/banner-page"
+    "pages/banner-page/banner-page",
+    "pages/new-site/new-site"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/build/mp-weixin/components/app-navigation/app-navigation.wxml

@@ -1 +1 @@
-<view class="app-navigation data-v-3e1fb9a0"><view class="__body data-v-3e1fb9a0"><view data-event-opts="{{[['tap',[['act',['home']]]]]}}" class="nav-item data-v-3e1fb9a0" bindtap="__e"><image class="icon data-v-3e1fb9a0" src="{{homeIcon}}"></image><view class="name data-v-3e1fb9a0">首页</view></view><view data-event-opts="{{[['tap',[['sacn']]]]}}" class="scan data-v-3e1fb9a0" bindtap="__e"><image class="icon-scan data-v-3e1fb9a0" src="/static/img/appnav-scan.svg.svg"></image></view><view class="scan-placeholder data-v-3e1fb9a0"></view><view data-event-opts="{{[['tap',[['act',['my']]]]]}}" class="nav-item data-v-3e1fb9a0" bindtap="__e"><image class="icon data-v-3e1fb9a0" src="{{myIcon}}"></image><view class="name data-v-3e1fb9a0">我的</view></view></view><ax-ios-indicator vue-id="e37c8b7c-1" min="10" class="data-v-3e1fb9a0" bind:__l="__l"></ax-ios-indicator></view>
+<view class="app-navigation data-v-c6e80730"><view class="__body data-v-c6e80730"><view data-event-opts="{{[['tap',[['act',['home']]]]]}}" class="nav-item data-v-c6e80730" bindtap="__e"><image class="icon data-v-c6e80730" src="{{homeIcon}}"></image><view class="name data-v-c6e80730">首页</view></view><view data-event-opts="{{[['tap',[['sacn']]]]}}" class="scan data-v-c6e80730" bindtap="__e"><image class="icon-scan data-v-c6e80730" src="/static/img/appnav-scan.svg.svg"></image></view><view class="scan-placeholder data-v-c6e80730"></view><view data-event-opts="{{[['tap',[['act',['my']]]]]}}" class="nav-item data-v-c6e80730" bindtap="__e"><image class="icon data-v-c6e80730" src="{{myIcon}}"></image><view class="name data-v-c6e80730">我的</view></view></view><ax-ios-indicator vue-id="e37c8b7c-1" min="10" class="data-v-c6e80730" bind:__l="__l"></ax-ios-indicator></view>

unpackage/dist/build/mp-weixin/components/app-navigation/app-navigation.wxss

@@ -1 +1 @@
-.app-navigation.data-v-3e1fb9a0{background-color:#fff;border-radius:15px 15px 0 0;-webkit-filter:drop-shadow(0 -3px 6px rgba(0,0,0,.05));filter:drop-shadow(0 -3px 6px rgba(0,0,0,.05))}.app-navigation .__body.data-v-3e1fb9a0{display:flex;align-items:center;justify-content:space-around;position:relative;padding:10px;padding-bottom:0}.scan.data-v-3e1fb9a0{display:inline-flex;align-items:center;justify-content:center;width:60px;height:60px;border-radius:100pc;background-image:linear-gradient(90deg,#8ff8fb,#47aeff);box-shadow:0 3px 6px #00bfe1 inset;border:3px solid #fff;position:absolute;-webkit-transform:translateY(-10px);transform:translateY(-10px)}.scan > .icon-scan.data-v-3e1fb9a0{display:block;width:22.5px;height:22.5px}.scan-placeholder.data-v-3e1fb9a0{width:60px}.nav-item > .name.data-v-3e1fb9a0{font-size:10px;margin-top:4px}.nav-item > .icon.data-v-3e1fb9a0{display:block;width:22px;height:22px}
+.app-navigation.data-v-c6e80730{background-color:#fff;border-radius:15px 15px 0 0;-webkit-filter:drop-shadow(0 -3px 6px rgba(0,0,0,.05));filter:drop-shadow(0 -3px 6px rgba(0,0,0,.05))}.app-navigation .__body.data-v-c6e80730{display:flex;align-items:center;justify-content:space-around;position:relative;padding:10px;padding-bottom:0}.scan.data-v-c6e80730{display:inline-flex;align-items:center;justify-content:center;width:60px;height:60px;border-radius:100pc;background-image:linear-gradient(90deg,#8ff8fb,#47aeff);box-shadow:0 3px 6px #00bfe1 inset;border:3px solid #fff;position:absolute;-webkit-transform:translateY(-10px);transform:translateY(-10px)}.scan>.icon-scan.data-v-c6e80730{display:block;width:22.5px;height:22.5px}.scan-placeholder.data-v-c6e80730{width:60px}.nav-item>.name.data-v-c6e80730{font-size:10px;margin-top:4px}.nav-item>.icon.data-v-c6e80730{display:block;width:22px;height:22px}

unpackage/dist/build/mp-weixin/components/ax-body/ax-body.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/ax-body/ax-body"],{"805c":function(t,n,e){},"881f":function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return o}));var o={axCustomTitle:function(){return Promise.all([e.e("common/vendor"),e.e("components/ax-custom-title/ax-custom-title")]).then(e.bind(null,"6da2"))},axIosIndicator:function(){return e.e("components/ax-ios-indicator/ax-ios-indicator").then(e.bind(null,"2348"))}},i=function(){var t=this.$createElement,n=(this._self._c,this.__get_style([this.StyleSheet]));this.$mp.data=Object.assign({},{$root:{s0:n}})},u=[]},8839:function(t,n,e){"use strict";e.r(n);var o=e("881f"),i=e("b496");for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);e("d169");var a=e("828b"),c=Object(a["a"])(i["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],void 0);n["default"]=c.exports},b496:function(t,n,e){"use strict";e.r(n);var o=e("eb2d"),i=e.n(o);for(var u in o)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(u);n["default"]=i.a},d169:function(t,n,e){"use strict";var o=e("805c"),i=e.n(o);i.a},eb2d:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={name:"ax-body",props:{blank:{type:[Number,String],default:10},hideIndicatorArea:{type:Boolean,default:!1}},mounted:function(){var n=this;t.createSelectorQuery().in(this).select(".__root").boundingClientRect((function(t){t&&n.$emit("init",t)})).exec()},computed:{StyleSheet:function(){return{"--blank":"".concat(Number(this.blank)||0,"px")}}}};n.default=e}).call(this,e("df3c")["default"])}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/ax-body/ax-body"],{"0f18":function(t,n,e){"use strict";e.r(n);var o=e("2baf"),i=e.n(o);for(var a in o)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=i.a},"2baf":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={name:"ax-body",props:{blank:{type:[Number,String],default:10},hideIndicatorArea:{type:Boolean,default:!1}},mounted:function(){var n=this;t.createSelectorQuery().in(this).select(".__root").boundingClientRect((function(t){t&&n.$emit("init",t)})).exec()},computed:{StyleSheet:function(){return{"--blank":"".concat(Number(this.blank)||0,"px")}}}};n.default=e}).call(this,e("df3c")["default"])},"3cf9":function(t,n,e){"use strict";e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}));var o={axCustomTitle:function(){return Promise.all([e.e("common/vendor"),e.e("components/ax-custom-title/ax-custom-title")]).then(e.bind(null,"90a4"))},axIosIndicator:function(){return e.e("components/ax-ios-indicator/ax-ios-indicator").then(e.bind(null,"6075"))}},i=function(){var t=this.$createElement,n=(this._self._c,this.__get_style([this.StyleSheet]));this.$mp.data=Object.assign({},{$root:{s0:n}})},a=[]},"87b5":function(t,n,e){},d2e5:function(t,n,e){"use strict";var o=e("87b5"),i=e.n(o);i.a},e199:function(t,n,e){"use strict";e.r(n);var o=e("3cf9"),i=e("0f18");for(var a in i)["default"].indexOf(a)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(a);e("d2e5");var u=e("828b"),c=Object(u["a"])(i["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],void 0);n["default"]=c.exports}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/ax-body/ax-body-create-component',
     {
         'components/ax-body/ax-body-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("8839"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("e199"))
         })
     },
     [['components/ax-body/ax-body-create-component']]

unpackage/dist/build/mp-weixin/components/ax-ios-indicator/ax-ios-indicator.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/ax-ios-indicator/ax-ios-indicator"],{"0158":function(t,e,n){"use strict";n.r(e);var i=n("c07f"),a=n.n(i);for(var r in i)["default"].indexOf(r)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(r);e["default"]=a.a},2348:function(t,e,n){"use strict";n.r(e);var i=n("c729"),a=n("0158");for(var r in a)["default"].indexOf(r)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(r);n("6a74");var u=n("828b"),c=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"aa69d142",null,!1,i["a"],void 0);e["default"]=c.exports},"354e":function(t,e,n){},"6a74":function(t,e,n){"use strict";var i=n("354e"),a=n.n(i);a.a},c07f:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"ax-ios-indicator",props:{offset:{type:[Number,String],default:10},min:{type:[Number,String],default:0}},computed:{height:function(){var e=t.getSystemInfoSync(),n=e.screenHeight-e.safeArea.bottom-(Number(this.offset)||0);return Math.max(Number(this.min)||0,n)},style:function(){return{height:"".concat(this.height,"px")}}}};e.default=n}).call(this,n("df3c")["default"])},c729:function(t,e,n){"use strict";n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){}));var i=function(){var t=this.$createElement,e=(this._self._c,this.__get_style([this.style]));this.$mp.data=Object.assign({},{$root:{s0:e}})},a=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/ax-ios-indicator/ax-ios-indicator"],{"25d8":function(t,e,n){"use strict";var i=n("4f16"),a=n.n(i);a.a},"4f16":function(t,e,n){},6075:function(t,e,n){"use strict";n.r(e);var i=n("7d80"),a=n("a63a");for(var r in a)["default"].indexOf(r)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(r);n("25d8");var u=n("828b"),o=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"aa69d142",null,!1,i["a"],void 0);e["default"]=o.exports},"7d80":function(t,e,n){"use strict";n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){}));var i=function(){var t=this.$createElement,e=(this._self._c,this.__get_style([this.style]));this.$mp.data=Object.assign({},{$root:{s0:e}})},a=[]},a63a:function(t,e,n){"use strict";n.r(e);var i=n("d71e"),a=n.n(i);for(var r in i)["default"].indexOf(r)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(r);e["default"]=a.a},d71e:function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"ax-ios-indicator",props:{offset:{type:[Number,String],default:10},min:{type:[Number,String],default:0}},computed:{height:function(){var e=t.getSystemInfoSync(),n=e.screenHeight-e.safeArea.bottom-(Number(this.offset)||0);return Math.max(Number(this.min)||0,n)},style:function(){return{height:"".concat(this.height,"px")}}}};e.default=n}).call(this,n("df3c")["default"])}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/ax-ios-indicator/ax-ios-indicator-create-component',
     {
         'components/ax-ios-indicator/ax-ios-indicator-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("2348"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("6075"))
         })
     },
     [['components/ax-ios-indicator/ax-ios-indicator-create-component']]

unpackage/dist/build/mp-weixin/components/ax-popup/ax-popup.js

@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/ax-popup/ax-popup"],{"09cf":function(t,e,i){},2734:function(t,e,i){"use strict";i.r(e);var n=i("432e"),s=i.n(n);for(var o in n)["default"].indexOf(o)<0&&function(t){i.d(e,t,(function(){return n[t]}))}(o);e["default"]=s.a},"432e":function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"ax-popup",emits:["open","opened","close","closed","mask"],props:{position:{type:String,default:""},maskEnable:{type:Boolean,default:!1},maskType:{type:String,default:""},maskBlur:{type:[Number,String],default:0},maskClose:{type:Boolean,default:!1}},data:function(){return{visible:!1,closing:!1}},computed:{CssSheet:function(){return[this.position,this.maskType,this.closing?"close":""]},StyleSheet:function(){return{"--mask-blur":"blur(".concat(this.maskBlur,"px)")}}},methods:{animationend:function(t){1==this.visible&&0==this.closing?this.$emit("opened"):(this.visible=!1,this.closing=!1,this.$emit("closed"))},mask:function(){this.maskClose&&this.close(),this.$emit("mask")},close:function(){this.closing=!0,this.$emit("close")},open:function(){this.visible=!0,this.closing=!1,this.$emit("open")}}};e.default=n},4393:function(t,e,i){"use strict";i.r(e);var n=i("666b"),s=i("2734");for(var o in s)["default"].indexOf(o)<0&&function(t){i.d(e,t,(function(){return s[t]}))}(o);i("5989");var u=i("828b"),a=Object(u["a"])(s["default"],n["b"],n["c"],!1,null,"7c1b6b93",null,!1,n["a"],void 0);e["default"]=a.exports},5989:function(t,e,i){"use strict";var n=i("09cf"),s=i.n(n);s.a},"666b":function(t,e,i){"use strict";i.d(e,"b",(function(){return n})),i.d(e,"c",(function(){return s})),i.d(e,"a",(function(){}));var n=function(){var t=this.$createElement,e=(this._self._c,this.visible?this.__get_style([this.StyleSheet]):null);this.$mp.data=Object.assign({},{$root:{s0:e}})},s=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/ax-popup/ax-popup"],{"01ce":function(t,e,i){"use strict";i.d(e,"b",(function(){return n})),i.d(e,"c",(function(){return s})),i.d(e,"a",(function(){}));var n=function(){var t=this.$createElement,e=(this._self._c,this.visible?this.__get_style([this.StyleSheet]):null);this.$mp.data=Object.assign({},{$root:{s0:e}})},s=[]},"3e8e":function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={name:"ax-popup",emits:["open","opened","close","closed","mask"],props:{position:{type:String,default:""},maskEnable:{type:Boolean,default:!1},maskType:{type:String,default:""},maskBlur:{type:[Number,String],default:0},maskClose:{type:Boolean,default:!1}},data:function(){return{visible:!1,closing:!1}},computed:{CssSheet:function(){return[this.position,this.maskType,this.closing?"close":""]},StyleSheet:function(){return{"--mask-blur":"blur(".concat(this.maskBlur,"px)")}}},methods:{animationend:function(t){1==this.visible&&0==this.closing?this.$emit("opened"):(this.visible=!1,this.closing=!1,this.$emit("closed"))},mask:function(){this.maskClose&&this.close(),this.$emit("mask")},close:function(){this.closing=!0,this.$emit("close")},open:function(){this.visible=!0,this.closing=!1,this.$emit("open")}}};e.default=n},"49c3":function(t,e,i){"use strict";i.r(e);var n=i("01ce"),s=i("7480");for(var o in s)["default"].indexOf(o)<0&&function(t){i.d(e,t,(function(){return s[t]}))}(o);i("bad1");var a=i("828b"),u=Object(a["a"])(s["default"],n["b"],n["c"],!1,null,"7c1b6b93",null,!1,n["a"],void 0);e["default"]=u.exports},7480:function(t,e,i){"use strict";i.r(e);var n=i("3e8e"),s=i.n(n);for(var o in n)["default"].indexOf(o)<0&&function(t){i.d(e,t,(function(){return n[t]}))}(o);e["default"]=s.a},"932e":function(t,e,i){},bad1:function(t,e,i){"use strict";var n=i("932e"),s=i.n(n);s.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/ax-popup/ax-popup-create-component',
     {
         'components/ax-popup/ax-popup-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("4393"))
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("49c3"))
         })
     },
     [['components/ax-popup/ax-popup-create-component']]

unpackage/dist/build/mp-weixin/components/r-canvas/r-canvas.js

@@ -1,10 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/r-canvas/r-canvas"],{"2fe5":function(n,t,e){"use strict";var u=e("8817"),a=e.n(u);a.a},4528:function(n,t,e){"use strict";e.r(t);var u=e("72f0"),a=e("ee5b");for(var c in a)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(c);e("2fe5");var r=e("828b"),f=Object(r["a"])(a["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);t["default"]=f.exports},"72f0":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},8817:function(n,t,e){},c496:function(n,t,e){"use strict";var u=e("47a9");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a=u(e("47cc")),c={mixins:[a.default]};t.default=c},ee5b:function(n,t,e){"use strict";e.r(t);var u=e("c496"),a=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=a.a}}]);
-;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
-    'components/r-canvas/r-canvas-create-component',
-    {
-        'components/r-canvas/r-canvas-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('df3c')['createComponent'](__webpack_require__("4528"))
-        })
-    },
-    [['components/r-canvas/r-canvas-create-component']]
-]);

unpackage/dist/build/mp-weixin/components/r-canvas/r-canvas.wxml

@@ -1 +0,0 @@
-<view><view class="{{['r-canvas-component',(hidden)?'hidden':'']}}" style="{{'width:'+(canvas_width/scale+'px')+';'+('height:'+(canvas_height/scale+'px')+';')}}"><block wx:if="{{canvas_id}}"><canvas class="r-canvas" style="{{'width:'+(canvas_width+'px')+';'+('height:'+(canvas_height+'px')+';')+('transform:'+('scale('+r_canvas_scale+')')+';')}}" canvas-id="{{canvas_id}}" id="{{canvas_id}}"></canvas></block></view></view>

unpackage/dist/build/mp-weixin/components/r-canvas/r-canvas.wxss

@@ -1 +0,0 @@
-.r-canvas{-webkit-transform-origin:0 0;transform-origin:0 0}.r-canvas-component{overflow:hidden}.r-canvas-component.hidden{position:fixed;top:-5000rpx}

unpackage/dist/build/mp-weixin/pages/Invite-staff/Invite-staff.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "邀请员工",
-  "usingComponents": {
-    "ax-body": "/components/ax-body/ax-body",
-    "r-canvas": "/components/r-canvas/r-canvas"
-  }
-}

unpackage/dist/build/mp-weixin/pages/Invite-staff/Invite-staff.wxml

@@ -1 +0,0 @@
-<ax-body vue-id="28e7cf80-1" blank="0" title class="data-v-700cfa61" bind:__l="__l" vue-slots="{{['default']}}"><view class="invite-staff-bg data-v-700cfa61"><image src="{{bg_img}}" mode="widthFix" class="data-v-700cfa61"></image></view><view class="invite-staff-box data-v-700cfa61"><view data-event-opts="{{[['longpress',[['longpressTap',['$event']]]]]}}" class="attend-card-box data-v-700cfa61" bindlongpress="__e"><view class="userinfo-box data-v-700cfa61"><image class="user-avatar data-v-700cfa61" src="{{avatar_img}}" mode></image><view class="user-nikename data-v-700cfa61">{{userinfo.nickName?userinfo.nickName:'匿名'}}</view></view><view class="card-img-box data-v-700cfa61"><image src="{{card_img}}" mode="widthFix" class="data-v-700cfa61"></image></view><view class="card-qrcode-box data-v-700cfa61"></view><view class="tips-text data-v-700cfa61">长按识别二维码</view></view><view class="bottom-tips-text data-v-700cfa61"><image src="/static/img/tips-icon.svg" mode class="data-v-700cfa61"></image><text class="data-v-700cfa61">长按上方海报发送给好友</text></view></view><r-canvas vue-id="{{('28e7cf80-2')+','+('28e7cf80-1')}}" data-ref="rCanvas" class="data-v-700cfa61 vue-ref" bind:__l="__l"></r-canvas></ax-body>

unpackage/dist/build/mp-weixin/pages/Invite-staff/Invite-staff.wxss

@@ -1 +0,0 @@
-ax-body.data-v-700cfa61{display:block;height:100%}.invite-staff-bg.data-v-700cfa61{position:fixed;top:0;left:0;right:0;z-index:-1000}.invite-staff-bg image.data-v-700cfa61{display:block;width:100%}.invite-staff-box.data-v-700cfa61{margin-top:60rpx;text-align:center}.invite-staff-box .attend-card-box.data-v-700cfa61{position:relative;left:24rpx;width:700rpx;height:800rpx}.invite-staff-box .attend-card-box .userinfo-box.data-v-700cfa61{position:absolute;top:-50rpx;width:100%}.invite-staff-box .attend-card-box .userinfo-box .user-avatar.data-v-700cfa61{width:120rpx;height:120rpx;border-radius:50%}.invite-staff-box .attend-card-box .card-img-box image.data-v-700cfa61{width:100%;border-radius:10rpx}.invite-staff-box .attend-card-box .card-qrcode-box.data-v-700cfa61{position:absolute;top:328rpx;width:100%}.invite-staff-box .attend-card-box .card-qrcode-box .card-qrcode.data-v-700cfa61{width:200rpx;height:200rpx}.invite-staff-box .attend-card-box .tips-text.data-v-700cfa61{position:absolute;width:100%;top:678rpx;font-size:28rpx;color:#181818}.invite-staff-box .bottom-tips-text.data-v-700cfa61{display:flex;align-items:center;justify-content:center}.invite-staff-box .bottom-tips-text image.data-v-700cfa61{width:48rpx;height:48rpx}.invite-staff-box .bottom-tips-text text.data-v-700cfa61{font-size:28rpx;color:#2b303a;margin-left:12rpx}

unpackage/dist/build/mp-weixin/pages/banner-page/banner-page.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/banner-page/banner-page"],{"16f5":function(n,e,a){"use strict";a.d(e,"b",(function(){return c})),a.d(e,"c",(function(){return u})),a.d(e,"a",(function(){return t}));var t={axBody:function(){return a.e("components/ax-body/ax-body").then(a.bind(null,"8839"))}},c=function(){var n=this.$createElement;this._self._c},u=[]},"2d73":function(n,e,a){"use strict";var t=a("e2b0"),c=a.n(t);c.a},"2f4e":function(n,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={data:function(){return{image_bgs:"https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/aDqt1XamIpNIbb02da799fbd9ab857ecb59304bdeb45.jpg/1.jpg",image_bg:"https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/bMb4w0IRfi5Md70c3a069a1db244bfea4f227e60f837.jpg/1.jpg"}}}},a19a:function(n,e,a){"use strict";a.r(e);var t=a("2f4e"),c=a.n(t);for(var u in t)["default"].indexOf(u)<0&&function(n){a.d(e,n,(function(){return t[n]}))}(u);e["default"]=c.a},c21f:function(n,e,a){"use strict";(function(n,e){var t=a("47a9");a("2acb");t(a("3240"));var c=t(a("f06d"));n.__webpack_require_UNI_MP_PLUGIN__=a,e(c.default)}).call(this,a("3223")["default"],a("df3c")["createPage"])},e2b0:function(n,e,a){},f06d:function(n,e,a){"use strict";a.r(e);var t=a("16f5"),c=a("a19a");for(var u in c)["default"].indexOf(u)<0&&function(n){a.d(e,n,(function(){return c[n]}))}(u);a("2d73");var r=a("828b"),f=Object(r["a"])(c["default"],t["b"],t["c"],!1,null,"8b00678e",null,!1,t["a"],void 0);e["default"]=f.exports}},[["c21f","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/banner-page/banner-page"],{"01dd":function(n,e,t){"use strict";var a=t("b007"),u=t.n(a);u.a},1288:function(n,e,t){"use strict";t.r(e);var a=t("63cb"),u=t("fffb");for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t("01dd");var r=t("828b"),f=Object(r["a"])(u["default"],a["b"],a["c"],!1,null,"8b00678e",null,!1,a["a"],void 0);e["default"]=f.exports},"60d2":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={data:function(){return{image_bgs:"https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/aDqt1XamIpNIbb02da799fbd9ab857ecb59304bdeb45.jpg/1.jpg",image_bg:"https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/bMb4w0IRfi5Md70c3a069a1db244bfea4f227e60f837.jpg/1.jpg"}}}},"63cb":function(n,e,t){"use strict";t.d(e,"b",(function(){return u})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return a}));var a={axBody:function(){return t.e("components/ax-body/ax-body").then(t.bind(null,"e199"))}},u=function(){var n=this.$createElement;this._self._c},c=[]},a785:function(n,e,t){"use strict";(function(n,e){var a=t("47a9");t("6a42");a(t("3240"));var u=a(t("1288"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},b007:function(n,e,t){},fffb:function(n,e,t){"use strict";t.r(e);var a=t("60d2"),u=t.n(a);for(var c in a)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(c);e["default"]=u.a}},[["a785","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/charging/charging.json

@@ -1,7 +1,6 @@
 {
   "navigationBarTitleText": "正在充电",
   "usingComponents": {
-    "ax-body": "/components/ax-body/ax-body",
-    "ax-ios-indicator": "/components/ax-ios-indicator/ax-ios-indicator"
+    "ax-body": "/components/ax-body/ax-body"
   }
 }

unpackage/dist/build/mp-weixin/pages/coupons/coupons.json

@@ -1,6 +1,6 @@
 {
   "navigationBarTitleText": "优惠券",
-  "navigationStyle": "default",
-  "backgroundColorTop": "#fff",
-  "usingComponents": {}
+  "usingComponents": {
+    "ax-body": "/components/ax-body/ax-body"
+  }
 }

unpackage/dist/build/mp-weixin/pages/feedback-reply/feedback-reply.wxml

@@ -1 +1 @@
-<ax-body vue-id="1c771940-1" bind:__l="__l" vue-slots="{{['default']}}"><view class="page-background"><image src="/static/img/my-bg.svg" mode="widthFix"></image></view><view class="body app-hide-scrollbar root"><block wx:if="{{$root.g0}}"><view class="list"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item"><view class="mask"></view><view class="mask-box"><view>{{item.$orig.createTime}}</view><view>{{item.m0}}</view></view><view class="card"><view><text>{{item.$orig.problemDescribe}}</text><block wx:if="{{item.$orig.filesUrl}}"><text data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({item:item.$orig})}}" class="item-pic" bindtap="__e">查看附件</text></block></view><block wx:if="{{item.$orig.reply}}"><view class="reply"><text class="start-label">答复:</text><text>{{item.$orig.reply}}</text></view></block></view></view></block></view></block><block wx:else><view class="nothing-wrap"><view class="ax ax-iconblock i-kongshuju icon"></view><view>暂无数据</view></view></block></view></ax-body>
+<ax-body vue-id="1c771940-1" bind:__l="__l" vue-slots="{{['default']}}"><view class="page-background"><image src="/static/img/my-bg.svg" mode="widthFix"></image></view><view class="body app-hide-scrollbar root"><block wx:if="{{$root.g0}}"><view class="list"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item"><view class="mask"></view><view class="mask-box"><view>{{item.$orig.createTime}}</view><view>{{item.m0}}</view></view><view class="card"><view><text>{{item.$orig.description}}</text><block wx:if="{{item.$orig.images}}"><text data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({item:item.$orig})}}" class="item-pic" bindtap="__e">查看附件</text></block></view><block wx:if="{{item.$orig.reply}}"><view class="reply"><text class="start-label">答复:</text><text>{{item.$orig.reply}}</text></view></block></view></view></block></view></block><block wx:else><view class="nothing-wrap"><view class="ax ax-iconblock i-kongshuju icon"></view><view>暂无数据</view></view></block></view></ax-body>

unpackage/dist/build/mp-weixin/pages/login/login.wxml

@@ -1 +1 @@
-<ax-body vue-id="35a7246c-1" blank="0" hideIndicatorArea="{{true}}" class="data-v-01c08332" bind:__l="__l" vue-slots="{{['default']}}"><image class="page-background data-v-01c08332" src="/static/img/page-bg01.png"></image><view class="body data-v-01c08332"><view class="title data-v-01c08332"><view class="data-v-01c08332"><view class="h1 data-v-01c08332">您好!</view><view class="h2 data-v-01c08332">欢迎使用中数电动</view></view><image class="logo data-v-01c08332" src="/static/img/logo.svg" mode="widthFix"></image></view><view class="logo-wrap data-v-01c08332"><image class="bg data-v-01c08332" src="/static/img/login-bg.svg" mode="widthFix"></image></view><view class="footer data-v-01c08332" style="padding-left:0;padding-right:0;"><button class="submit data-v-01c08332" style="margin-left:35px;width:calc(100% - 70px);" open-type="getPhoneNumber" disabled="{{!agreement}}" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e"><text class="ax ax-iconblock i-weixin data-v-01c08332"></text><text class="data-v-01c08332">微信用户一键登录</text></button><view class="cancel data-v-01c08332">取消返回</view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="agreement data-v-01c08332" style="font-size:17px;" bindtap="__e"><view class="{{['mask','data-v-01c08332',(agreement)?'active':'']}}"><text class="ax ax-iconline i-select data-v-01c08332"></text></view><text class="data-v-01c08332">我已阅读并理解和同意</text><text data-event-opts="{{[['tap',[['checkPrivacy']]]]}}" class="em data-v-01c08332" catchtap="__e">《隐私政策协议》</text></view></view></view></ax-body>
+<ax-body vue-id="35a7246c-1" blank="0" hideIndicatorArea="{{true}}" class="data-v-4fdad700" bind:__l="__l" vue-slots="{{['default']}}"><image class="page-background data-v-4fdad700" src="/static/img/page-bg01.png"></image><view class="body data-v-4fdad700"><view class="title data-v-4fdad700"><view class="data-v-4fdad700"><view class="h1 data-v-4fdad700">您好!</view><view class="h2 data-v-4fdad700">欢迎使用中数电动</view></view><image class="logo data-v-4fdad700" src="/static/img/logo.svg" mode="widthFix"></image></view><view class="logo-wrap data-v-4fdad700"><image class="bg data-v-4fdad700" src="/static/img/login-bg.svg" mode="widthFix"></image></view><view class="footer data-v-4fdad700" style="padding-left:0;padding-right:0;"><button class="submit data-v-4fdad700" style="margin-left:35px;width:calc(100% - 70px);" open-type="getPhoneNumber" disabled="{{!agreement}}" data-event-opts="{{[['getphonenumber',[['onGetPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e"><text class="ax ax-iconblock i-weixin data-v-4fdad700"></text><text class="data-v-4fdad700">微信用户一键登录</text></button><view data-event-opts="{{[['tap',[['cancelLogin',['$event']]]]]}}" class="cancel data-v-4fdad700" bindtap="__e">取消登录</view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="agreement data-v-4fdad700" style="font-size:17px;" bindtap="__e"><view class="{{['mask','data-v-4fdad700',(agreement)?'active':'']}}"><text class="ax ax-iconline i-select data-v-4fdad700"></text></view><text class="data-v-4fdad700">我已阅读并理解和同意</text><text data-event-opts="{{[['tap',[['checkPrivacy']]]]}}" class="em data-v-4fdad700" catchtap="__e">《隐私政策协议》</text></view></view></view></ax-body>

unpackage/dist/build/mp-weixin/pages/login/login.wxss

@@ -1 +1 @@
-.page-background.data-v-01c08332{display:block;position:fixed;top:0;left:0;width:100%;height:100%}.body.data-v-01c08332{display:flex;flex-direction:column;width:100%;height:100%;position:relative;z-index:1}.title.data-v-01c08332{display:flex;align-items:center;justify-content:space-between;padding:20px;padding-bottom:0;color:#2b303a}.title .h1.data-v-01c08332{font-size:30px}.title .h2.data-v-01c08332{font-size:20px}.title .logo.data-v-01c08332{width:76px}.logo-wrap.data-v-01c08332{flex:1;display:flex;align-items:center;justify-content:center}.logo-wrap .bg.data-v-01c08332{width:100%}.footer.data-v-01c08332{font-size:14px;color:#999;padding:0 35px 80px 35px}.submit.data-v-01c08332{display:flex;align-items:center;justify-content:center;width:100%;height:50px;font-size:inherit;border-radius:100pc;background-color:#04c262;color:#fff}.submit.data-v-01c08332::after{display:none}.submit[disabled].data-v-01c08332{background-color:#ddd}.submit text + text.data-v-01c08332{margin-left:10px}.submit text.ax.data-v-01c08332{font-size:30px}.cancel.data-v-01c08332{font-size:12px;text-align:center;margin:15px 0}.agreement.data-v-01c08332{display:flex;align-items:center;justify-content:center;flex-wrap:wrap;text-align:center}.agreement .mask.data-v-01c08332{display:inline-flex;align-items:center;justify-content:center;width:1em;height:1em;font-size:16px;border-radius:100%;border:2px solid #3eb6f8;vertical-align:middle;margin-right:10px}.agreement .mask .ax.data-v-01c08332{color:#fff;font-size:10px}.agreement .mask.active.data-v-01c08332{background-color:#3eb6f8}.agreement .mask.active .ax.data-v-01c08332{display:block}.agreement .em.data-v-01c08332{color:#3eb6f8}
+.page-background.data-v-4fdad700{display:block;position:fixed;top:0;left:0;width:100%;height:100%}.body.data-v-4fdad700{display:flex;flex-direction:column;width:100%;height:100%;position:relative;z-index:1}.title.data-v-4fdad700{display:flex;align-items:center;justify-content:space-between;padding:20px;padding-bottom:0;color:#2b303a}.title .h1.data-v-4fdad700{font-size:30px}.title .h2.data-v-4fdad700{font-size:20px}.title .logo.data-v-4fdad700{width:76px}.logo-wrap.data-v-4fdad700{flex:1;display:flex;align-items:center;justify-content:center}.logo-wrap .bg.data-v-4fdad700{width:100%}.footer.data-v-4fdad700{font-size:14px;color:#999;padding:0 35px 80px 35px}.submit.data-v-4fdad700{display:flex;align-items:center;justify-content:center;width:100%;height:50px;font-size:inherit;border-radius:100pc;background-color:#04c262;color:#fff}.submit.data-v-4fdad700::after{display:none}.submit[disabled].data-v-4fdad700{background-color:#ddd}.submit text + text.data-v-4fdad700{margin-left:10px}.submit text.ax.data-v-4fdad700{font-size:30px}.cancel.data-v-4fdad700{font-size:12px;text-align:center;margin:15px 0}.agreement.data-v-4fdad700{display:flex;align-items:center;justify-content:center;flex-wrap:wrap;text-align:center}.agreement .mask.data-v-4fdad700{display:inline-flex;align-items:center;justify-content:center;width:1em;height:1em;font-size:16px;border-radius:100%;border:2px solid #3eb6f8;vertical-align:middle;margin-right:10px}.agreement .mask .ax.data-v-4fdad700{color:#fff;font-size:10px}.agreement .mask.active.data-v-4fdad700{background-color:#3eb6f8}.agreement .mask.active .ax.data-v-4fdad700{display:block}.agreement .em.data-v-4fdad700{color:#3eb6f8}

unpackage/dist/build/mp-weixin/pages/my/my.json

@@ -3,7 +3,11 @@
   "usingComponents": {
     "ax-body": "/components/ax-body/ax-body",
     "ax-popup": "/components/ax-popup/ax-popup",
-    "r-canvas": "/components/r-canvas/r-canvas",
+    "l-painter": "/uni_modules/lime-painter/components/l-painter/l-painter",
+    "l-painter-view": "/uni_modules/lime-painter/components/l-painter-view/l-painter-view",
+    "l-painter-image": "/uni_modules/lime-painter/components/l-painter-image/l-painter-image",
+    "l-painter-qrcode": "/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode",
+    "l-painter-text": "/uni_modules/lime-painter/components/l-painter-text/l-painter-text",
     "app-navigation": "/components/app-navigation/app-navigation"
   }
 }

unpackage/dist/build/mp-weixin/pages/new-site/new-site.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "站点详情",
+  "usingComponents": {
+    "ax-body": "/components/ax-body/ax-body"
+  }
+}

unpackage/dist/build/mp-weixin/pages/recharge-log/recharge-log.wxss

@@ -1 +1 @@
-ax-body.data-v-008919a2 .ax-body{background-color:#f5f7fb}.data-v-008919a2 .ax-custom-title{background-color:#fff}.page-background.data-v-008919a2{display:block;position:fixed;top:0;left:0;width:100%;height:100%}.body.data-v-008919a2{display:flex;flex-direction:column;width:100%;height:100%;padding:10px 0;overflow:auto;position:relative;z-index:1}.list .item + .item.data-v-008919a2{margin-top:10px}.list .item.data-v-008919a2{display:block;background-color:#fff;border-radius:10px;padding:20px 10px}.list .item .title.data-v-008919a2{display:flex;align-items:center;justify-content:space-between;border-bottom:1px solid #f0f0f0;padding-bottom:10px;margin-bottom:10px}.list .item .title .name.data-v-008919a2{font-size:16px;font-weight:700}.list .item .title .state.data-v-008919a2{display:flex;align-items:center;justify-content:center;width:74px;height:22px;font-size:14px;color:#fff;background-color:#4edc86;border-radius:100px 0 0 0;margin-right:-10px}.list .item .title .state.data-v-008919a2:before{content:"";display:inline-block;width:4px;height:4px;border-radius:100%;background-color:#fff;margin-right:5px}.list .item .cell.data-v-008919a2{font-size:12px;color:#aaa;line-height:26px}.backTaxAmount.data-v-008919a2{display:flex;align-items:center;gap:10rpx}.check-backTaxAmount.data-v-008919a2{color:#f05000}.list .loadmore.data-v-008919a2{display:flex;align-items:center;justify-content:center;font-size:12px;color:#aaa;height:60px}.nothing.data-v-008919a2{display:flex;align-items:center;justify-content:center;flex-direction:column;width:100%;height:100%;background-color:#fff;border-radius:16px;box-shadow:0 0 10px rgba(0,0,0,.1);font-size:14px;color:#ccc}.nothing .icon.data-v-008919a2{display:block;width:25vw;margin-bottom:10px}
+ax-body.data-v-291133dc .ax-body{background-color:#f5f7fb}.data-v-291133dc .ax-custom-title{background-color:#fff}.page-background.data-v-291133dc{display:block;position:fixed;top:0;left:0;width:100%;height:100%}.body.data-v-291133dc{display:flex;flex-direction:column;width:100%;height:100%;padding:10px 0;overflow:auto;position:relative;z-index:1}.list .item + .item.data-v-291133dc{margin-top:10px}.list .item.data-v-291133dc{display:block;background-color:#fff;border-radius:10px;padding:20px 10px}.list .item .title.data-v-291133dc{display:flex;align-items:center;justify-content:space-between;border-bottom:1px solid #f0f0f0;padding-bottom:10px;margin-bottom:10px}.list .item .title .name.data-v-291133dc{font-size:16px;font-weight:700}.list .item .title .state.data-v-291133dc{display:flex;align-items:center;justify-content:center;width:74px;height:22px;font-size:14px;color:#fff;background-color:#4edc86;border-radius:100px 0 0 0;margin-right:-10px}.list .item .title .state.data-v-291133dc:before{content:"";display:inline-block;width:4px;height:4px;border-radius:100%;background-color:#fff;margin-right:5px}.list .item .cell.data-v-291133dc{font-size:12px;color:#aaa;line-height:26px}.backTaxAmount.data-v-291133dc{display:flex;align-items:center;gap:10rpx}.check-backTaxAmount.data-v-291133dc{color:#f05000}.list .loadmore.data-v-291133dc{display:flex;align-items:center;justify-content:center;font-size:12px;color:#aaa;height:60px}.nothing.data-v-291133dc{display:flex;align-items:center;justify-content:center;flex-direction:column;width:100%;height:100%;background-color:#fff;border-radius:16px;box-shadow:0 0 10px rgba(0,0,0,.1);font-size:14px;color:#ccc}.nothing .icon.data-v-291133dc{display:block;width:25vw;margin-bottom:10px}