分销码切换为线上版本

App.vue

@@ -4,23 +4,6 @@
 	export default {
 		onLaunch: function(options) {
 			console.log('App Launch')
-			// 判断用户是否通过分销码进入------------------------------------------------------
-			if (options.scene === 1011|| options.scene === 1012||options.scene === 1013) {
-				const decodedUrl = decodeURIComponent(options.query.q);
-				const urlParts = decodedUrl.split('?');
-				if (urlParts.length > 1) {
-					const queryParams = urlParts[1];
-					const paramPairs = queryParams.split('&');
-					const resultObj = {};
-					paramPairs.forEach(pair => {
-						const [key, value] = pair.split('=');
-						resultObj[key] = value;
-					});
-					const adminUserId = resultObj['adminUserId'];
-					uni.setStorageSync('ADMIN_USERID', adminUserId);
-					console.info(uni.getStorageSync('ADMIN_USERID'),'---用户通过扫码进入')
-				}
-			}
 		},
 		onShow: function(options) {
 			// 判断用户是否通过分销码进入------------------------------------------------------
@@ -36,6 +19,9 @@
 						resultObj[key] = value;
 					});
 					const adminUserId = resultObj['adminUserId'];
+					const frimId = resultObj['frimId'];
+					console.log(frimId,'----企业用户');
+					uni.setStorageSync('FRIM_ID',frimId)
 					uni.setStorageSync('ADMIN_USERID', adminUserId);
 					console.info(uni.getStorageSync('ADMIN_USERID'),'---用户通过扫码进入')
 				}

pages/Invite-staff/Invite-staff.css

@@ -1,6 +1,7 @@
 ax-body {
 	display: block;
 	height: 100%;
+	/* background-color: rgb(35, 111, 248); */
 }
 
 .invite-staff-bg {
@@ -16,7 +17,7 @@ ax-body {
 	width: 100%;
 }
 .invite-staff-box{
-	margin-top: 230rpx;
+	margin-top:60rpx;
 	text-align: center;
 }
 .invite-staff-box .attend-card-box{
@@ -37,7 +38,8 @@ ax-body {
 	border-radius: 50%;
 }
 .invite-staff-box .attend-card-box .card-img-box image {
-	width: 680rpx;
+	width:100%;
+	border-radius: 10rpx;
 }
 .invite-staff-box .attend-card-box .card-qrcode-box{
 	position: absolute;

pages/Invite-staff/Invite-staff.vue

@@ -34,8 +34,8 @@
 		data() {
 			return {
 				bg_img: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/yzBqSYi5PEsId74406272837cf072c83825d28c270d3.png/1.png',
-				card_img: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/nCHfvld10tLIbce45895fa953e8be335bfb17c9ab29b.png/1.png',
-				avatar_img:'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/IBN033tZBgCeb082e48d7fc55ab5c8e84b890c41f169.png/1.png',
+				card_img: '/static/img/enterprise_playbil.jpg',
+				// avatar_img:'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/IBN033tZBgCeb082e48d7fc55ab5c8e84b890c41f169.png/1.png',
 				isImageLoaded: false,
 				userinfo:{}
 			}
@@ -82,18 +82,18 @@
 						})
 					})
 					// 二维码
-					await this.$refs.rCanvas.drawImage({
-						url:'/static/img/1111.png',
-						x:134,
-						y:0,
-						w: 50,
-						h: 50
-					}).catch(err_msg => {
-						uni.showToast({
-							title: err_msg,
-							icon: "none"
-						})
-					})
+					// await this.$refs.rCanvas.drawImage({
+					// 	url:'/static/img/1111.png',
+					// 	x:134,
+					// 	y:0,
+					// 	w: 50,
+					// 	h: 50
+					// }).catch(err_msg => {
+					// 	uni.showToast({
+					// 		title: err_msg,
+					// 		icon: "none"
+					// 	})
+					// })
 					//文字
 					await this.$refs.rCanvas.drawText({
 						text:this.userinfo.nickName?userinfo.nickName:'匿名用户',

pages/coupon-buy/coupon-buy.vue

@@ -89,7 +89,6 @@
 					return;
 				}
 
-
 				this.$api.base("post", "/orderApi/addOrder", {
 					levelId: this.coupons.data[this.coupons.index].id
 				}, {}).then(addRes => {
@@ -117,7 +116,6 @@
 								fail: (err) => {
 									console.log('fail:', err);
 									//注册一个用户取消支付的事件
-
 								}
 							});
 

pages/index/index.css

@@ -383,17 +383,21 @@ app-navigation {
 }
 
 .list .item .price .value {
-	font-size: 24px;
+	font-size: 20px;
 	font-weight: bold;
 }
 
 .list .item .price .unit {
-	margin-left: 10px;
+	margin-left: 6rpx;
+	font-weight: bold;
+	font-size: 12px;
+	margin-left: 6rpx;
 }
 
 .card-bottom-text {
 	font-weight: bold;
 	font-size: 20px;
+	color:#FF5D50;
 }
 
 .card-bottom-text .mini-text {
@@ -402,7 +406,7 @@ app-navigation {
 }
 
 .operation-price-btn {
-	margin-left: 20rpx;
+	margin-left:10rpx;
 	width: 140rpx;
 	height: 40rpx;
 	background: #FF6457;

pages/index/index.vue

@@ -100,20 +100,21 @@
 										</view>
 									</view>
 									<view class="price">
-										<view class="app-flex middle" style="color: #FF5D50;" v-if="!isOperation">
+										<!-- v-if="user_info.firmId===null" -->
+										<view class="app-flex middle" style="color: #FF5D50;">
 											<text class="value">{{item.params.nowPrice?item.params.nowPrice.toFixed(4):"0.0000"}}</text>
 											<text class="unit">元/度</text>
 										</view>
-										<view class="app-flex middle" v-else>
+<!-- 										<view class="app-flex middle" v-else>
 											<view class="card-bottom-text">
-												<text>1.0026</text>
+												<text>{{item.params.firmPrice.toFixed(4)}}</text>
 												<text class="mini-text">元/度</text>
 											</view>
 											<view class="operation-price-btn">
 												企业专享价
 											</view>
 											<view class="ordinary-price">{{item.params.nowPrice?item.params.nowPrice.toFixed(4):"0.0000"}}</view>
-										</view>
+										</view> -->
 										<view>{{item.params.priceShow}}</view>
 									</view>
 								</view>
@@ -163,14 +164,17 @@
 				}
 				
 			}
+			// this.user_info=this.$app.storage.get('USER_INFO')
 		},
 		mounted() {
 			this.setListHeight();
 			this.setAppNavigationHeight();
+			this.get_frimid()
+			this.get_userinfo()
 		},
 		data() {
 			return {
-				isOperation:false,
+				user_info:{},
 				// 导航栏高度
 				appNavigationHeight: 0,
 				// 页面滚动锁
@@ -240,9 +244,47 @@
 			};
 		},
 		methods: {
+			get_userinfo(){
+				this.$api.base("post", "/userApi/getUserAccount", {}, {}).then(res => {
+					this.user_info = res.accountInfo
+					this.$app.storage.set('USER_INFO', res.accountInfo);
+				})
+			},
+			// 企业用户扫码进入
+			get_frimid(){
+				if(this.$app.storage.get('FRIM_ID')){
+					if(this.$app.storage.get('USER_TOKEN')){
+						this.$api.base("post","/userApi/add-firm-user?firmId="+parseInt(this.$app.storage.get('FRIM_ID')),{},{error: false}).then(res=>{
+							this.$app.popup.alert(res.msg);
+							this.get_userinfo()
+							setTimeout(()=>{
+								this.$app.storage.remove('FRIM_ID')
+							},500)
+						}).catch(err=>{
+							this.$app.popup.alert(err.msg)
+							setTimeout(()=>{
+								this.$app.storage.remove('FRIM_ID')
+							},500)
+						})
+					}else{
+						uni.showModal({
+							title:'未登录',
+							content:'你还未进行登录，请去登录',
+							showCancel:false,
+							success:function(res) {
+								if(res.confirm){
+									uni.navigateTo({
+										url:'/pages/login/login'
+									})
+								}
+							}
+						})
+					}
+
+				}
+			},
 			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 ){

pages/login/login.vue

@@ -55,8 +55,8 @@
 			},
 			onGetPhoneNumber(e) {
 				console.log(e);
-				let channelUrl='http://192.168.110.241:9120/zs/channel/admin/'
-				// let channelUrl='https://channel-api.zonelife.cn/zs/channel/admin/'
+				// let channelUrl='http://192.168.110.241:9120/zs/channel/admin/'
+				let channelUrl='https://channel-api.zonelife.cn/zs/channel/admin/'
 				if (e.detail.code) {
 					this.$api.base("post", '/userApi/getPhone', {
 						code: e.detail.code
@@ -76,13 +76,28 @@
 								},
 								success: (res) => {
 									console.info(res.data,'----扫码接口调用');
-									this.$app.storage.remove('ADMIN_USERID')
+									setTimeout(()=>{
+										this.$app.storage.remove('ADMIN_USERID')
+									},500)
 								},
 								fail(err) {
 									console.log(err,'----错误信息');
 								}
 							});
 						}
+						if(this.$app.storage.get('FRIM_ID')){
+							this.$api.base("post","/userApi/add-firm-user?firmId="+parseInt(this.$app.storage.get('FRIM_ID')),{},{error: false}).then(res=>{
+								this.$app.popup.alert(res.msg);
+								setTimeout(()=>{
+									this.$app.storage.remove('FRIM_ID')
+								},500)
+								console.log(res,'----企业用户通过扫码进入');
+							}).catch(err=>{
+							setTimeout(()=>{
+								this.$app.storage.remove('FRIM_ID')
+							},500)
+						})
+						}
 						this.$app.url.back()
 					});
 				}

pages/my/my.css

@@ -39,6 +39,10 @@ app-navigation{
 	margin-right: 10px;
 }
 .user-name{
+	display: flex;
+	align-items: center;
+}
+.user-name-text{
 	font-size: 18px;
 	font-weight: bold;
 }
@@ -64,7 +68,14 @@ app-navigation{
 .get-phone-number::after{
 	display: none;
 }
-
+.enterprise-name-card{
+	margin-left: 10rpx;
+	padding: 10rpx;
+	background-color:rgba(62, 182, 248, 0.3);
+	border-radius: 8rpx;
+	font-size: 22rpx;
+	color: #181818;
+}
 /* 统计卡 */
 .sta-card{
 	flex: 1;
@@ -163,4 +174,38 @@ app-navigation{
 .act-item.about .icon{
 	width: 40px;
 	height: 40px;
+}
+.playbil-box{
+	position: relative;
+}
+
+.playbil-box .playbil-bg{
+	width:600rpx;
+}
+.enterprise-name{
+	width: 600rpx;
+	text-align: center;
+	font-size: 22rpx;
+	position: absolute;
+	top: 610rpx;
+	color:rgb(33, 111, 247);
+}
+.playbil-qrcode{
+	position: absolute;
+	left:170rpx;
+	top: 280rpx;
+	width: 260rpx;
+	height: 260rpx;
+}
+.enterprise-user{
+	position: absolute;
+	width: 600rpx;
+	text-align: center;
+	top: 880rpx;
+	font-size: 22rpx;
+	color: #fff;
+}
+.enterprise-tips{
+	font-size: 28rpx;
+	color: #ff0004;
 }

pages/my/my.vue

@@ -1,8 +1,10 @@
 <template>
 	<ax-body>
 		<template #title></template>
-		<view class="page-background"><image src="@/static/img/my-bg.svg" mode="widthFix"></image></view>
-		
+		<view class="page-background">
+			<image src="@/static/img/my-bg.svg" mode="widthFix"></image>
+		</view>
+
 		<!-- 主内容 -->
 		<view class="main">
 			<!-- 用户信息 -->
@@ -10,9 +12,13 @@
 				<view class="app-flex middle">
 					<image src="@/static/img/user-avatar.svg" class="user-avatar"></image>
 					<view>
-						<view class="user-name">{{userinfo.nickName?userinfo.nickName:'匿名'}}</view>
+						<view class="user-name">
+							<view class="user-name-text">{{userinfo.nickName?userinfo.nickName:'匿名'}}</view>
+							<view class="enterprise-name-card" v-if="userinfo.firmInfoName">{{userinfo.firmInfoName}}</view>
+						</view>
 						<view class="user-phone" v-if="userinfo.phone">{{userinfo.phone?userinfo.phone:'未获取手机'}}</view>
-						<button v-if="!userinfo.phone" @getphonenumber="onGetPhoneNumber" open-type="getPhoneNumber" class="get-phone-number">授权并登录</button>
+						<button v-if="!userinfo.phone" @getphonenumber="onGetPhoneNumber" open-type="getPhoneNumber"
+							class="get-phone-number">授权并登录</button>
 					</view>
 				</view>
 				<!-- <image src="@/static/img/seting.svg" class="seting-icon"></image> -->
@@ -34,7 +40,7 @@
 				</view>
 			</view>
 			<view @click="$app.url.goto('/pages/coupon-buy/coupon-buy')" class="buy">购买充电券</view>
-			
+
 			<!-- 常用工具 -->
 			<view class="card">
 				<view class="card-title">常用工具</view>
@@ -57,7 +63,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<!-- 更多功能 -->
 			<view class="card">
 				<view class="card-title">更多功能</view>
@@ -70,110 +76,257 @@
 						<image src="@/static/img/my-icon05.svg" class="icon"></image>
 						<view class="name">隐私条例</view>
 					</view>
-<!-- 					<view class="act-item" @click="$app.url.goto('/pages/Invite-staff/Invite-staff')">
+					<view class="act-item" @click="openFilter()" v-if="userinfo.firmType==1">
 						<image src="@/static/img/my-icon06.svg" class="icon"></image>
 						<view class="name">邀请员工</view>
-					</view> -->
+					</view>
 				</view>
 			</view>
 		</view>
-		
+		<ax-popup ref="filter" position="" maskType="black" maskEnable maskClose>
+			<view class="playbil-box" @click="editPlaybil">
+				<image class="playbil-bg" :src="playbil_img" mode="widthFix"></image>
+				<image class="playbil-qrcode" :src="qrCode" mode=""></image>
+				<view class="enterprise-name">
+					中数未来控股（深圳）有限责任公司
+				</view>
+				<view class="enterprise-user">{{userinfo.nickName?userinfo.nickName:'匿名用户'}}</view>
+				<view class="enterprise-tips">*点击图片进行分享或保存</view>
+			</view>
+		</ax-popup>
+		<r-canvas ref="rCanvas"></r-canvas>
 		<!-- 导航栏 -->
 		<app-navigation active="my"></app-navigation>
 	</ax-body>
 </template>
 
 <script>
+	import rCanvas from "@/components/r-canvas/r-canvas.vue"
+	import $config from '@/static/js/config.js';
 	export default {
 		data() {
 			return {
-				userinfo:{}
+				userinfo: {},
+				playbil_img: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/XVsEVGuCCbNv4aee36cc2f76e7050f62ebad3080ad88.jpg/1.jpg',
+				qrCode: null,
 			}
 		},
 		onShow() {
 			this.getMyAccount()
 		},
+		mounted() {},
 		methods: {
-			refund(){
-				this.$app.popup.confirm("退款按照购券记录进行逐笔退款，可能产生多笔退款到账记录，请注意查收。","退款说明").then(confirm=>{
-					if(confirm){
-						this.$api.base("post",'/orderApi/refund',{}).then(res=>{
-							if(res.code==0){
-								this.$app.popup.alert('退款成功!').then(()=>{
+			openFilter() {
+				this.$refs.filter.open();
+				this.get_qrCode()
+			},
+			get_qrCode() {
+				uni.showLoading()
+				uni.request({
+					url: $config.url.request + '/userApi/get-invite-qr',
+					method: 'GET',
+					responseType: 'arraybuffer',
+					header: {
+						'content-type': 'application/json',
+						'token': uni.getStorageSync($config.keyname.userToken)
+					},
+					data: {},
+					success: (res) => {
+						uni.hideLoading()
+						const arrayBuffer = res.data;
+						const base64 = wx.arrayBufferToBase64(arrayBuffer);
+						this.qrCode = 'data:image/png;base64,' + base64;
+					},
+					fail(err) {
+						uni.showToast({
+							icon: "error",
+							title: '获取二维码失败' + err
+						})
+					}
+				});
+			},
+			// 操作图片
+			editPlaybil() {
+				// console.log(this.$refs.filter);
+				this.get_downloadImg()
+			},
+			async get_downloadImg() {
+				uni.showLoading()
+				this.$nextTick(async () => {
+					await this.$refs.rCanvas.init({
+						canvas_id: "rCanvas"
+					})
+					await this.$refs.rCanvas.setCanvasWidth(300)
+					await this.$refs.rCanvas.setCanvasHeight(515)
+					// 背景卡片
+					await this.$refs.rCanvas.drawImage({
+						url: this.playbil_img,
+						x: 0,
+						y: 30,
+						w: 300,
+						h: 515
+					}).catch(err_msg => {
+						uni.showToast({
+							title: err_msg,
+							icon: "none"
+						})
+					})
+					// 二维码
+					await this.$refs.rCanvas.drawImage({
+						url: this.qrCode,
+						x: 85,
+						y: 176,
+						w: 130,
+						h: 130
+					}).catch(err_msg => {
+						uni.showToast({
+							title: err_msg,
+							icon: "none"
+						})
+					})
+					//文字
+					await this.$refs.rCanvas.drawText({
+						text: '中数未来控股（深圳）有限责任公司',
+						max_width: 0,
+						x: 56,
+						y: 348,
+						font_color: "#216ff7",
+						font_size: 10
+					}).catch(err_msg => {
+						uni.showToast({
+							title: err_msg,
+							icon: "none"
+						})
+					})
+					await this.$refs.rCanvas.drawText({
+						text: this.userinfo.nickName ? userinfo.nickName : '匿名用户',
+						max_width: 0,
+						x: 122,
+						y: 486,
+						font_color: "#ffffff",
+						font_size: 12
+					}).catch(err_msg => {
+						uni.showToast({
+							title: err_msg,
+							icon: "none"
+						})
+					})
+					// 生成海报
+					await this.$refs.rCanvas.draw((res) => {
+						//res.tempFilePath：生成成功，返回base64图片
+						uni.hideLoading()
+						uni.showShareImageMenu({
+							path: res.tempFilePath,
+							success: (res) => console.log('分享成功', res),
+							fail: (err) => console.error('分享失败', err),
+						});
+						// this.$refs.rCanvas.saveImage(res.tempFilePath)
+					})
+				})
+			},
+			refund() {
+				this.$app.popup.confirm("退款按照购券记录进行逐笔退款，可能产生多笔退款到账记录，请注意查收。", "退款说明").then(confirm => {
+					if (confirm) {
+						this.$api.base("post", '/orderApi/refund', {}).then(res => {
+							if (res.code == 0) {
+								this.$app.popup.alert('退款成功!').then(() => {
 									this.getMyAccount()
 								});
-							}else{
+							} else {
 								this.$app.popup.alert(res.msg);
 							}
 						});
-						
-						
+
+
 					}
 				});;
 			},
-			openPrivacyContract(){
+			openPrivacyContract() {
 				uni.openPrivacyContract();
 			},
 			// 打开客服
-			customerService(){
+			customerService() {
 				const cs = this.$config.customerService;
-				this.$app.act.customerService(cs.id,cs.url).catch(err=>{
+				this.$app.act.customerService(cs.id, cs.url).catch(err => {
 					console.log(err);
 					this.$app.popup.alert('客服中心失联啦,请联系管理员!');
 				});
 			},
-			getMyAccount(){
-				let channelUrl='http://192.168.110.241:9120/zs/channel/admin/'
-				// let channelUrl='https://channel-api.zonelife.cn/zs/channel/admin/'
-				this.$api.base("post","/userApi/getUserAccount",{},{}).then(res=>{
+			getMyAccount() {
+				// let channelUrl = 'http://192.168.110.241:9120/zs/channel/admin/'
+				let channelUrl='https://channel-api.zonelife.cn/zs/channel/admin/'
+				this.$api.base("post", "/userApi/getUserAccount", {}, {}).then(res => {
 					this.userinfo = res.accountInfo
+					this.$app.storage.set('USER_INFO', res.accountInfo);
 					// 识别用户是否通过分销码进入小程序
-					if(uni.getStorageSync('ADMIN_USERID')){
-							uni.request({
-								url:channelUrl+'ums/umsAdminUser/distributionBindUser',
-								method: 'POST',
-								header: {
-									'content-type': 'application/json'
-								},
-								data: {
-									userId: uni.getStorageSync('USER_INFO').id,
-									adminUserId:parseInt(uni.getStorageSync('ADMIN_USERID')),
-								},
-								success: (res) => {
-									console.info(res.data,'----扫码接口调用');
+					if (uni.getStorageSync('ADMIN_USERID')) {
+						uni.request({
+							url: channelUrl + 'ums/umsAdminUser/distributionBindUser',
+							method: 'POST',
+							header: {
+								'content-type': 'application/json'
+							},
+							data: {
+								userId: uni.getStorageSync('USER_INFO').id,
+								adminUserId: parseInt(uni.getStorageSync('ADMIN_USERID')),
+							},
+							success: (res) => {
+								setTimeout(()=>{
 									this.$app.storage.remove('ADMIN_USERID')
-								},
-								fail(err) {
-									console.log(err,'----错误信息');
-								}
-							});
+								},500)
+							},
+							fail(err) {
+								console.log(err, '----错误信息');
+							}
+						});
 					}
 				})
 			},
-			onGetPhoneNumber(e){
-				if(e.detail.code){
-					this.$api.base("post",'/userApi/getPhone',{code:e.detail.code}).then(res=>{
-						this.$app.storage.set('USER_INFO',res.userInfo);
+			get_firmId() {
+				if(this.$app.storage.get('FRIM_ID')){
+					this.$api.base("post", "/userApi/add-firm-user?firmId=" + parseInt(this.$app.storage.get('FRIM_ID')), {}, {
+						error: false
+					}).then(res => {
+						this.$app.popup.alert(res.msg);
+						setTimeout(() => {
+							this.$app.storage.remove('FRIM_ID')
+						}, 500)
+						console.log(res, '----企业用户通过扫码进入');
+					}).catch(err => {
+						setTimeout(() => {
+							this.$app.storage.remove('FRIM_ID')
+						}, 500)
+					})
+				}
+			},
+			onGetPhoneNumber(e) {
+				if (e.detail.code) {
+					this.$api.base("post", '/userApi/getPhone', {
+						code: e.detail.code
+					}).then(res => {
+						this.$app.storage.set('USER_INFO', res.userInfo);
 						this.getMyAccount();
+						this.get_firmId()
 					});
 				}
-				
+
 			},
 		}
 	}
 </script>
 
 <style scoped>
-@import url("my.css");
-.refund_btn{
-	position: absolute;
-	font-size: 14px;
-	color: #fff;
-	background-color: #3EB6F8;
-	padding: 2px 8px;
-	border-radius: 10px 0 0 10px;
-	bottom: 5px;
-	right: 0;
-	z-index: 99;
-}
-</style>
+	@import url("my.css");
+
+	.refund_btn {
+		position: absolute;
+		font-size: 14px;
+		color: #fff;
+		background-color: #3EB6F8;
+		padding: 2px 8px;
+		border-radius: 10px 0 0 10px;
+		bottom: 5px;
+		right: 0;
+		z-index: 99;
+	}
+</style>

pages/site-more/site-more.vue

@@ -43,21 +43,22 @@
 						<view class="value">{{item.time}}</view>
 					</view>
 					<view class="info">
-						<view class="row" v-if="!isOperation">
+						<!-- v-if="user_info.firmId===null" -->
+						<view class="row">
 							<view class="name">抵扣券电价</view>
 							<view ><text class="value" >{{(item.price).toFixed(4)}}</text><text class="unit" >{{item.unit}}</text></view>
 						</view>
-						<view class="operation-price-box" v-else>
+<!-- 						<view class="operation-price-box" v-else>
 							<view class="operation-price">
 								<text class="operation-symbol">￥</text>
-								<text>1.2099</text>
+								<text>{{(item.firmPrice).toFixed(4)}}</text>
 							</view>
 							<view class="mini-text">元/度</view>
 							<view class="operation-price-btn">
 								企业专享价
 							</view>
 							<view class="ordinary-price">{{(item.price).toFixed(4)}}</view>
-						</view>
+						</view> -->
 						<!-- <view class="row">
 							<view class="name">服务费</view>
 							<view><text class="value">{{(item.addServicePrice+item.servicePrice).toFixed(4)}}</text><text class="unit">{{item.unit}}</text></view>
@@ -93,7 +94,7 @@
 		},
 		data() {
 			return {
-				isOperation:false,
+				user_info:this.$app.storage.get('USER_INFO'),
 				another: false,
 				listHeight: 0,
 				prices:{

pages/site/site.vue

@@ -42,24 +42,25 @@
 						<view class="text">当前价</view>
 						<image src="@/static/img/site-bg05.svg" class="bg" mode="heightFix"></image>
 					</view>
-					<view class="price-wrap" v-if="!isOperation">
+					<!-- v-if="user_info.firmId===null" -->
+					<view class="price-wrap">
 						<view class="price">
 							<text class="symbol">￥</text>
 							<text>{{nowPriceTime.price?parseFloat(nowPriceTime.price).toFixed(4):"0.0000"}}</text>
 						</view>
 						<view class="unit">元/度</view>
 					</view>
-					<view class="price-wrap" v-else>
+<!-- 					<view class="price-wrap" v-else>
 						<view class="operation-price">
 							<text class="operation-symbol">￥</text>
-							<text>{{nowPriceTime.price?parseFloat(nowPriceTime.price).toFixed(4):"0.0000"}}</text>
+							<text>{{parseFloat(nowPriceTime.firmPrice).toFixed(4)}}</text>
 						</view>
 						<view class="mini-text">元/度</view>
 						<view class="operation-price-btn">
 							企业专享价
 						</view>
 						<view class="ordinary-price">{{nowPriceTime.price?parseFloat(nowPriceTime.price).toFixed(4):"0.0000"}}</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<!-- 充电终端 -->
@@ -104,7 +105,9 @@
 				<view class="price-wrap">
 					<view class="price">
 						<text class="symbol">￥</text>
+						<!-- v-if="nowPriceTime.firmPrice===null" -->
 						<text>{{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>
 				</view>
@@ -138,7 +141,7 @@
 		},
 		data() {
 			return {
-				isOperation:false,
+				user_info:this.$app.storage.get('USER_INFO'),
 				mainHeight: 0,
 				tops:["../../static/img/$temp-site.png"],
 				another: false,

pages/terminal/terminal.vue

@@ -244,7 +244,6 @@
 					//获取个人账户信息
 					this.$api.base("post", "/chargeApi/getUserAccount", {}, {}).then(res => {
 						this.accountInfo.balance = res.userAccount.balance;
-
 					})
 				} else {
 					//获取集团账户信息

static/js/config.js

@@ -7,7 +7,7 @@ const config = {};
 config.url = {
 	// API请求基础URL
 	request : 'https://charge.hub.zswlgz.com/',
-	// request : 'http://172.16.0.88:8081/',
+	// request : 'http://192.168.1.34:80/',
 	// request : 'http://120.78.228.211:8866/',
 	// 上传地址
 	upload : 'http://127.0.0.1:3000/upload/',

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

@@ -1 +1 @@
-<ax-body vue-id="28e7cf80-1" blank="0" title class="data-v-4dd1fc70" bind:__l="__l" vue-slots="{{['default']}}"><view class="invite-staff-bg data-v-4dd1fc70"><image src="{{bg_img}}" mode="widthFix" class="data-v-4dd1fc70"></image></view><view class="invite-staff-box data-v-4dd1fc70"><view data-event-opts="{{[['longpress',[['longpressTap',['$event']]]]]}}" class="attend-card-box data-v-4dd1fc70" bindlongpress="__e"><view class="userinfo-box data-v-4dd1fc70"><image class="user-avatar data-v-4dd1fc70" src="{{avatar_img}}" mode></image><view class="user-nikename data-v-4dd1fc70">{{userinfo.nickName?userinfo.nickName:'匿名'}}</view></view><view class="card-img-box data-v-4dd1fc70"><image src="{{card_img}}" mode="widthFix" class="data-v-4dd1fc70"></image></view><view class="card-qrcode-box data-v-4dd1fc70"></view><view class="tips-text data-v-4dd1fc70">长按识别二维码</view></view><view class="bottom-tips-text data-v-4dd1fc70"><image src="/static/img/tips-icon.svg" mode class="data-v-4dd1fc70"></image><text class="data-v-4dd1fc70">长按上方海报发送给好友</text></view></view><r-canvas vue-id="{{('28e7cf80-2')+','+('28e7cf80-1')}}" data-ref="rCanvas" class="data-v-4dd1fc70 vue-ref" bind:__l="__l"></r-canvas></ax-body>
+<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 +1 @@
-ax-body.data-v-4dd1fc70{display:block;height:100%}.invite-staff-bg.data-v-4dd1fc70{position:fixed;top:0;left:0;right:0;z-index:-1000}.invite-staff-bg image.data-v-4dd1fc70{display:block;width:100%}.invite-staff-box.data-v-4dd1fc70{margin-top:230rpx;text-align:center}.invite-staff-box .attend-card-box.data-v-4dd1fc70{position:relative;left:24rpx;width:700rpx;height:800rpx}.invite-staff-box .attend-card-box .userinfo-box.data-v-4dd1fc70{position:absolute;top:-50rpx;width:100%}.invite-staff-box .attend-card-box .userinfo-box .user-avatar.data-v-4dd1fc70{width:120rpx;height:120rpx;border-radius:50%}.invite-staff-box .attend-card-box .card-img-box image.data-v-4dd1fc70{width:680rpx}.invite-staff-box .attend-card-box .card-qrcode-box.data-v-4dd1fc70{position:absolute;top:328rpx;width:100%}.invite-staff-box .attend-card-box .card-qrcode-box .card-qrcode.data-v-4dd1fc70{width:200rpx;height:200rpx}.invite-staff-box .attend-card-box .tips-text.data-v-4dd1fc70{position:absolute;width:100%;top:678rpx;font-size:28rpx;color:#181818}.invite-staff-box .bottom-tips-text.data-v-4dd1fc70{display:flex;align-items:center;justify-content:center}.invite-staff-box .bottom-tips-text image.data-v-4dd1fc70{width:48rpx;height:48rpx}.invite-staff-box .bottom-tips-text text.data-v-4dd1fc70{font-size:28rpx;color:#2b303a;margin-left:12rpx}
+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/login/login.wxml

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

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

@@ -1 +1 @@
-.page-background.data-v-3099ed61{display:block;position:fixed;top:0;left:0;width:100%;height:100%}.body.data-v-3099ed61{display:flex;flex-direction:column;width:100%;height:100%;position:relative;z-index:1}.title.data-v-3099ed61{display:flex;align-items:center;justify-content:space-between;padding:20px;padding-bottom:0;color:#2b303a}.title .h1.data-v-3099ed61{font-size:30px}.title .h2.data-v-3099ed61{font-size:20px}.title .logo.data-v-3099ed61{width:76px}.logo-wrap.data-v-3099ed61{flex:1;display:flex;align-items:center;justify-content:center}.logo-wrap .bg.data-v-3099ed61{width:100%}.footer.data-v-3099ed61{font-size:14px;color:#999;padding:0 35px 80px 35px}.submit.data-v-3099ed61{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-3099ed61::after{display:none}.submit[disabled].data-v-3099ed61{background-color:#ddd}.submit text + text.data-v-3099ed61{margin-left:10px}.submit text.ax.data-v-3099ed61{font-size:30px}.cancel.data-v-3099ed61{font-size:12px;text-align:center;margin:15px 0}.agreement.data-v-3099ed61{display:flex;align-items:center;justify-content:center;flex-wrap:wrap;text-align:center}.agreement .mask.data-v-3099ed61{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-3099ed61{color:#fff;font-size:10px}.agreement .mask.active.data-v-3099ed61{background-color:#3eb6f8}.agreement .mask.active .ax.data-v-3099ed61{display:block}.agreement .em.data-v-3099ed61{color:#3eb6f8}
+.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}

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

@@ -2,6 +2,8 @@
   "navigationBarTitleText": "个人中心",
   "usingComponents": {
     "ax-body": "/components/ax-body/ax-body",
+    "ax-popup": "/components/ax-popup/ax-popup",
+    "r-canvas": "/components/r-canvas/r-canvas",
     "app-navigation": "/components/app-navigation/app-navigation"
   }
 }

unpackage/dist/build/mp-weixin/static/js/config.js

@@ -7,7 +7,7 @@ const config = {};
 config.url = {
 	// API请求基础URL
 	request : 'https://charge.hub.zswlgz.com/',
-	// request : 'http://172.16.0.88:8081/',
+	// request : 'http://192.168.1.34:80/',
 	// request : 'http://120.78.228.211:8866/',
 	// 上传地址
 	upload : 'http://127.0.0.1:3000/upload/',

unpackage/dist/dev/mp-weixin/common/main.js

@@ -110,6 +110,8 @@ var _app = _interopRequireDefault(__webpack_require__(/*! static/js/app.js */ 34
 var _default = {
   onLaunch: function onLaunch(options) {
     console.log('App Launch');
+  },
+  onShow: function onShow(options) {
     // 判断用户是否通过分销码进入------------------------------------------------------
     if (options.scene === 1011 || options.scene === 1012 || options.scene === 1013) {
       var decodedUrl = decodeURIComponent(options.query.q);
@@ -126,28 +128,9 @@ var _default = {
           resultObj[key] = value;
         });
         var adminUserId = resultObj['adminUserId'];
-        uni.setStorageSync('ADMIN_USERID', adminUserId);
-        console.info(uni.getStorageSync('ADMIN_USERID'), '---用户通过扫码进入');
-      }
-    }
-  },
-  onShow: function onShow(options) {
-    // 判断用户是否通过分销码进入------------------------------------------------------
-    if (options.scene === 1011 || options.scene === 1012 || options.scene === 1013) {
-      var decodedUrl = decodeURIComponent(options.query.q);
-      var urlParts = decodedUrl.split('?');
-      if (urlParts.length > 1) {
-        var queryParams = urlParts[1];
-        var paramPairs = queryParams.split('&');
-        var resultObj = {};
-        paramPairs.forEach(function (pair) {
-          var _pair$split3 = pair.split('='),
-            _pair$split4 = (0, _slicedToArray2.default)(_pair$split3, 2),
-            key = _pair$split4[0],
-            value = _pair$split4[1];
-          resultObj[key] = value;
-        });
-        var adminUserId = resultObj['adminUserId'];
+        var frimId = resultObj['frimId'];
+        console.log(frimId, '----企业用户');
+        uni.setStorageSync('FRIM_ID', frimId);
         uni.setStorageSync('ADMIN_USERID', adminUserId);
         console.info(uni.getStorageSync('ADMIN_USERID'), '---用户通过扫码进入');
       }

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -42,20 +42,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 

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

@@ -1,6 +1,7 @@
 ax-body.data-v-41679986 {
 	display: block;
 	height: 100%;
+	/* background-color: rgb(35, 111, 248); */
 }
 .invite-staff-bg.data-v-41679986 {
 	position: fixed;
@@ -14,7 +15,7 @@ ax-body.data-v-41679986 {
 	width: 100%;
 }
 .invite-staff-box.data-v-41679986{
-	margin-top: 230rpx;
+	margin-top:60rpx;
 	text-align: center;
 }
 .invite-staff-box .attend-card-box.data-v-41679986{
@@ -35,7 +36,8 @@ ax-body.data-v-41679986 {
 	border-radius: 50%;
 }
 .invite-staff-box .attend-card-box .card-img-box image.data-v-41679986 {
-	width: 680rpx;
+	width:100%;
+	border-radius: 10rpx;
 }
 .invite-staff-box .attend-card-box .card-qrcode-box.data-v-41679986{
 	position: absolute;

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 178))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 186))
     },
     appNavigation: function () {
-      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 185))
+      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 193))
     },
   }
 } catch (e) {
@@ -143,18 +143,10 @@ var render = function () {
       : null
   var l1 = _vm.__map(_vm.list.data, function (item, index) {
     var $orig = _vm.__get_orig(item)
-    var g1 =
-      !_vm.isOperation && item.params.nowPrice
-        ? item.params.nowPrice.toFixed(4)
-        : null
-    var g2 =
-      !!_vm.isOperation && item.params.nowPrice
-        ? item.params.nowPrice.toFixed(4)
-        : null
+    var g1 = item.params.nowPrice ? item.params.nowPrice.toFixed(4) : null
     return {
       $orig: $orig,
       g1: g1,
-      g2: g2,
     }
   })
   if (!_vm._isMounted) {
@@ -364,6 +356,7 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
 
 var bmap = __webpack_require__(/*! static/js/bmap-wx.js */ 49);
 var _default = {
@@ -406,6 +399,7 @@ var _default = {
                   _this.getDeviceInfo(device_no);
                 }
               }
+              // this.user_info=this.$app.storage.get('USER_INFO')
             case 5:
             case "end":
               return _context.stop();
@@ -417,10 +411,12 @@ var _default = {
   mounted: function mounted() {
     this.setListHeight();
     this.setAppNavigationHeight();
+    this.get_frimid();
+    this.get_userinfo();
   },
   data: function data() {
     return {
-      isOperation: false,
+      user_info: {},
       // 导航栏高度
       appNavigationHeight: 0,
       // 页面滚动锁
@@ -521,18 +517,59 @@ var _default = {
   },
 
   methods: {
-    getDeviceInfo: function getDeviceInfo(sn) {
+    get_userinfo: function get_userinfo() {
       var _this2 = this;
+      this.$api.base("post", "/userApi/getUserAccount", {}, {}).then(function (res) {
+        _this2.user_info = res.accountInfo;
+        _this2.$app.storage.set('USER_INFO', res.accountInfo);
+      });
+    },
+    // 企业用户扫码进入
+    get_frimid: function get_frimid() {
+      var _this3 = this;
+      if (this.$app.storage.get('FRIM_ID')) {
+        if (this.$app.storage.get('USER_TOKEN')) {
+          this.$api.base("post", "/userApi/add-firm-user?firmId=" + parseInt(this.$app.storage.get('FRIM_ID')), {}, {
+            error: false
+          }).then(function (res) {
+            _this3.$app.popup.alert(res.msg);
+            _this3.get_userinfo();
+            setTimeout(function () {
+              _this3.$app.storage.remove('FRIM_ID');
+            }, 500);
+          }).catch(function (err) {
+            _this3.$app.popup.alert(err.msg);
+            setTimeout(function () {
+              _this3.$app.storage.remove('FRIM_ID');
+            }, 500);
+          });
+        } else {
+          uni.showModal({
+            title: '未登录',
+            content: '你还未进行登录，请去登录',
+            showCancel: false,
+            success: function success(res) {
+              if (res.confirm) {
+                uni.navigateTo({
+                  url: '/pages/login/login'
+                });
+              }
+            }
+          });
+        }
+      }
+    },
+    getDeviceInfo: function getDeviceInfo(sn) {
+      var _this4 = this;
       this.$api.base("post", "/chargeApi/checkDevicesBySn", {
         "sn": sn
       }, {}).then(function (res) {
-        console.log("设备信息：", res);
         var item = res.device;
         //设备状态 0：离网1：空闲2：占用（未充电）3：占用（充电中）4：占用（预约锁定）255：故障
         if (item.deviceStatus == 0 || item.deviceStatus == 255) {
           return;
         }
-        _this2.$app.url.goto('/pages/terminal/terminal?deviceId=' + item.id + "&deviceStatus=" + item.deviceStatus);
+        _this4.$app.url.goto('/pages/terminal/terminal?deviceId=' + item.id + "&deviceStatus=" + item.deviceStatus);
       });
     },
     getQueryParams: function getQueryParams(url, key) {
@@ -553,11 +590,11 @@ var _default = {
     },
     // 打开客服
     customerService: function customerService() {
-      var _this3 = this;
+      var _this5 = this;
       var cs = this.$config.customerService;
       this.$app.act.customerService(cs.id, cs.url).catch(function (err) {
         console.log(err);
-        _this3.$app.popup.alert('客服中心失联啦,请联系管理员!');
+        _this5.$app.popup.alert('客服中心失联啦,请联系管理员!');
       });
     },
     // 查询许可
@@ -593,17 +630,17 @@ var _default = {
     },
     // 更新位置
     updateLocation: function updateLocation() {
-      var _this4 = this;
+      var _this6 = this;
       this.getLocation().then(function (res) {
-        _this4.location.value = [res.longitude, res.latitude].join(',');
-        _this4.getStations(res.longitude, res.latitude);
-        _this4.$app.storage.set('USER_LOCATION', _this4.location.value);
-        return _this4.reverseGeocoder([res.latitude, res.longitude].join(','));
+        _this6.location.value = [res.longitude, res.latitude].join(',');
+        _this6.getStations(res.longitude, res.latitude);
+        _this6.$app.storage.set('USER_LOCATION', _this6.location.value);
+        return _this6.reverseGeocoder([res.latitude, res.longitude].join(','));
       });
     },
     // 获取定位
     getLocation: function getLocation() {
-      var _this5 = this;
+      var _this7 = this;
       return new Promise(function (resolve, reject) {
         // this.loading.visible = true;
         if (uni.getLocation) {
@@ -615,7 +652,7 @@ var _default = {
               console.log(err);
               console.log('定位失败');
               // this.location.visible = true;
-              _this5.getStations("", "");
+              _this7.getStations("", "");
             },
             complete: function complete() {}
           });
@@ -629,7 +666,7 @@ var _default = {
       });
     },
     reverseGeocoder: function reverseGeocoder(latlon) {
-      var _this6 = this;
+      var _this8 = this;
       console.log(latlon);
       var lat = latlon.split(",")[0];
       var lng = latlon.split(",")[1];
@@ -644,9 +681,9 @@ var _default = {
           location: latlon,
           success: function success(res) {
             var code = res.originalData.result.addressComponent.adcode.substr(0, 4);
-            for (var i = 0; i < _this6.city.data.length; i++) {
-              if (_this6.city.data[i].areaCode == code) {
-                _this6.city.index = i;
+            for (var i = 0; i < _this8.city.data.length; i++) {
+              if (_this8.city.data[i].areaCode == code) {
+                _this8.city.index = i;
                 break;
               }
             }
@@ -659,9 +696,9 @@ var _default = {
       });
     },
     getBanners: function getBanners() {
-      var _this7 = this;
+      var _this9 = this;
       this.$api.base("post", "/userApi/getBanners", {}, {}).then(function (res) {
-        _this7.banners = res.banners;
+        _this9.banners = res.banners;
       });
     },
     convertBdToTx: function convertBdToTx(lng, lat) {
@@ -680,35 +717,35 @@ var _default = {
       };
     },
     getStations: function getStations(lng, lat) {
-      var _this8 = this;
+      var _this10 = this;
       this.$api.base("post", "/chargeApi/getStations", {
         order: this.sorts.index,
         lat: lat,
         lng: lng
       }, {}).then(function (res) {
         res.stationList.forEach(function (i) {
-          var txPoint = _this8.convertBdToTx(i.lng, i.lat);
+          var txPoint = _this10.convertBdToTx(i.lng, i.lat);
           i.lng = txPoint.lng;
           i.lat = txPoint.lat;
         });
-        _this8.list.data = res.stationList;
+        _this10.list.data = res.stationList;
         if (res.discountInfo) {
-          _this8.discountInfo = res.discountInfo;
+          _this10.discountInfo = res.discountInfo;
         }
       });
     },
     // 设定导航栏高度
     setAppNavigationHeight: function setAppNavigationHeight() {
-      var _this9 = this;
+      var _this11 = this;
       this.$nextTick(function () {
-        uni.createSelectorQuery().in(_this9).select("#app-navigation").boundingClientRect(function (data) {
-          _this9.appNavigationHeight = data.height;
+        uni.createSelectorQuery().in(_this11).select("#app-navigation").boundingClientRect(function (data) {
+          _this11.appNavigationHeight = data.height;
         }).exec();
       });
     },
     // 设置列表高度
     setListHeight: function setListHeight() {
-      var _this10 = this;
+      var _this12 = this;
       this.$app.act.selectorQuery(this, "#list-box,#roller", true).then(function (res) {
         var win = uni.getWindowInfo();
         var roller = res.find(function (i) {
@@ -717,7 +754,7 @@ var _default = {
         var list = res.find(function (i) {
           return i.id == 'list-box';
         });
-        _this10.list.height = win.windowHeight - list.top - _this10.appNavigationHeight + roller.height;
+        _this12.list.height = win.windowHeight - list.top - _this12.appNavigationHeight + roller.height;
       });
     },
     // 版头加载完成

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -334,22 +334,26 @@ app-navigation {
 	box-shadow: 0 0 5px rgba(0, 0, 0, 0.05);
 }
 .list .item .price .value {
-	font-size: 24px;
+	font-size: 20px;
 	font-weight: bold;
 }
 .list .item .price .unit {
-	margin-left: 10px;
+	margin-left: 6rpx;
+	font-weight: bold;
+	font-size: 12px;
+	margin-left: 6rpx;
 }
 .card-bottom-text {
 	font-weight: bold;
 	font-size: 20px;
+	color:#FF5D50;
 }
 .card-bottom-text .mini-text {
 	margin-left: 6rpx;
 	font-size: 12px;
 }
 .operation-price-btn {
-	margin-left: 20rpx;
+	margin-left:10rpx;
 	width: 140rpx;
 	height: 40rpx;
 	background: #FF6457;

unpackage/dist/dev/mp-weixin/pages/map/map.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 178))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 186))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 192))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 200))
     },
     appNavigation: function () {
-      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 185))
+      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 193))
     },
   }
 } catch (e) {

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

@@ -2,6 +2,8 @@
   "navigationBarTitleText": "个人中心",
   "usingComponents": {
     "ax-body": "/components/ax-body/ax-body",
+    "ax-popup": "/components/ax-popup/ax-popup",
+    "r-canvas": "/components/r-canvas/r-canvas",
     "app-navigation": "/components/app-navigation/app-navigation"
   }
 }

unpackage/dist/dev/mp-weixin/pages/my/my.wxss

@@ -1,3 +1,16 @@
+
+.r-canvas{
+	-webkit-transform-origin: 0 0;
+	        transform-origin: 0 0;
+}
+.r-canvas-component{
+	overflow: hidden;
+}
+.r-canvas-component.hidden{
+	position: fixed;
+	top:-5000rpx;
+}
+
 ax-body.data-v-0be17cc6{
 	display: block;
 	height: 100%;
@@ -36,6 +49,10 @@ app-navigation.data-v-0be17cc6{
 	margin-right: 10px;
 }
 .user-name.data-v-0be17cc6{
+	display: flex;
+	align-items: center;
+}
+.user-name-text.data-v-0be17cc6{
 	font-size: 18px;
 	font-weight: bold;
 }
@@ -61,6 +78,14 @@ app-navigation.data-v-0be17cc6{
 .get-phone-number.data-v-0be17cc6::after{
 	display: none;
 }
+.enterprise-name-card.data-v-0be17cc6{
+	margin-left: 10rpx;
+	padding: 10rpx;
+	background-color:rgba(62, 182, 248, 0.3);
+	border-radius: 8rpx;
+	font-size: 22rpx;
+	color: #181818;
+}
 
 /* 统计卡 */
 .sta-card.data-v-0be17cc6{
@@ -160,7 +185,40 @@ app-navigation.data-v-0be17cc6{
 	width: 40px;
 	height: 40px;
 }
-.refund_btn.data-v-0be17cc6{
+.playbil-box.data-v-0be17cc6{
+	position: relative;
+}
+.playbil-box .playbil-bg.data-v-0be17cc6{
+	width:600rpx;
+}
+.enterprise-name.data-v-0be17cc6{
+	width: 600rpx;
+	text-align: center;
+	font-size: 22rpx;
+	position: absolute;
+	top: 610rpx;
+	color:rgb(33, 111, 247);
+}
+.playbil-qrcode.data-v-0be17cc6{
+	position: absolute;
+	left:170rpx;
+	top: 280rpx;
+	width: 260rpx;
+	height: 260rpx;
+}
+.enterprise-user.data-v-0be17cc6{
+	position: absolute;
+	width: 600rpx;
+	text-align: center;
+	top: 880rpx;
+	font-size: 22rpx;
+	color: #fff;
+}
+.enterprise-tips.data-v-0be17cc6{
+	font-size: 28rpx;
+	color: #ff0004;
+}
+.refund_btn.data-v-0be17cc6 {
 	position: absolute;
 	font-size: 14px;
 	color: #fff;

unpackage/dist/dev/mp-weixin/pages/web/web.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/web/web"],{
 
-/***/ 164:
+/***/ 172:
 /*!***************************************************************************************!*\
   !*** E:/zswl/code/charge_miniapp/charge_miniapp/main.js?{"page":"pages%2Fweb%2Fweb"} ***!
   \***************************************************************************************/
@@ -13,7 +13,7 @@
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 __webpack_require__(/*! uni-pages */ 26);
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
-var _web = _interopRequireDefault(__webpack_require__(/*! ./pages/web/web.vue */ 165));
+var _web = _interopRequireDefault(__webpack_require__(/*! ./pages/web/web.vue */ 173));
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 createPage(_web.default);
@@ -21,7 +21,7 @@ createPage(_web.default);
 
 /***/ }),
 
-/***/ 165:
+/***/ 173:
 /*!********************************************************************!*\
   !*** E:/zswl/code/charge_miniapp/charge_miniapp/pages/web/web.vue ***!
   \********************************************************************/
@@ -30,8 +30,8 @@ createPage(_web.default);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./web.vue?vue&type=template&id=aed5e5a0& */ 166);
-/* harmony import */ var _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./web.vue?vue&type=script&lang=js& */ 168);
+/* harmony import */ var _web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./web.vue?vue&type=template&id=aed5e5a0& */ 174);
+/* harmony import */ var _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./web.vue?vue&type=script&lang=js& */ 176);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 39);
 
@@ -60,7 +60,7 @@ component.options.__file = "pages/web/web.vue"
 
 /***/ }),
 
-/***/ 166:
+/***/ 174:
 /*!***************************************************************************************************!*\
   !*** E:/zswl/code/charge_miniapp/charge_miniapp/pages/web/web.vue?vue&type=template&id=aed5e5a0& ***!
   \***************************************************************************************************/
@@ -69,7 +69,7 @@ component.options.__file = "pages/web/web.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=template&id=aed5e5a0& */ 167);
+/* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=template&id=aed5e5a0& */ 175);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_template_id_aed5e5a0___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -82,7 +82,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 167:
+/***/ 175:
 /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/zswl/code/charge_miniapp/charge_miniapp/pages/web/web.vue?vue&type=template&id=aed5e5a0& ***!
   \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -118,7 +118,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 168:
+/***/ 176:
 /*!*********************************************************************************************!*\
   !*** E:/zswl/code/charge_miniapp/charge_miniapp/pages/web/web.vue?vue&type=script&lang=js& ***!
   \*********************************************************************************************/
@@ -127,14 +127,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=script&lang=js& */ 169);
+/* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./web.vue?vue&type=script&lang=js& */ 177);
 /* harmony import */ var _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_F_edgedownload_HBuilderX_4_29_2024093009_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_web_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 169:
+/***/ 177:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/zswl/code/charge_miniapp/charge_miniapp/pages/web/web.vue?vue&type=script&lang=js& ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -182,5 +182,5 @@ exports.default = _default;
 
 /***/ })
 
-},[[164,"common/runtime","common/vendor"]]]);
+},[[172,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/web/web.js.map

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -8,6 +8,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "订单详情",
+          "pathName": "pages/order-detail/order-detail",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "pages/login/login",
           "pathName": "pages/login/login",