20251107更换主机

pages/coupons/coupons.css

@@ -116,10 +116,11 @@ ax-body>>>.ax-custom-title {
 	text-align: center;
 	margin-left: 30rpx;
 	margin-top: 24rpx;
-	width: 280rpx;
+	width: 300rpx;
 }
 
 .coupons-title {
+	width:300rpx;
 	font-weight: 800;
 	font-size: 28rpx;
 	color: #222222;
@@ -139,10 +140,12 @@ ax-body>>>.ax-custom-title {
 
 .coupons-right {
 	margin-top: 58rpx;
-	margin-left:50rpx;
+	margin-left:40rpx;
 }
 
 .coupons-dayrules {
+	width: 150rpx;
+	height: 60rpx;
 	font-size: 20rpx;
 	color: #AAAAAA;
 }

pages/coupons/coupons.vue

@@ -15,13 +15,13 @@
 						<view class="left-rules">满{{item.usePrice}}元可用</view>
 					</view>
 					<view class="coupons-center">
-						<view class="coupons-title">{{item.name}}</view>
+						<view class="coupons-title textHidden">{{item.name||''}}</view>
 						<view class="coupons-valid" v-if="currentIndex==0">有效期：领取后{{item.failureTime}}天</view>
 						<view class="coupons-valid" v-else>{{item.validEndTime}}到期</view>
 						<view class="coupons-range">平台所有充电桩可用</view>
 					</view>
 					<view class="coupons-right">
-						<view class="coupons-dayrules" v-if="currentIndex===0">{{item.description}}</view>
+						<view class="coupons-dayrules textHidden" v-if="currentIndex===0">{{item.description}}</view>
 						<view class="coupons-getbtn" v-if="currentIndex===0" @click="get_coupons(item)">立即领取</view>
 						<view class="coupons-getbtn" v-if="currentIndex===2" @click="goto_orderDetail(item)">查看订单</view>
 					</view>
@@ -60,11 +60,11 @@
 					id: 3
 				}],
 				toBeclaimedCoupons: [],
-				totalNumber:0,
+				totalNumber: 0,
 				form_submit: {
 					pageNum: 1,
-					pageSize:10,
-					status:1,
+					pageSize: 10,
+					status: 1,
 				}
 			};
 		},
@@ -73,7 +73,7 @@
 		},
 		onReachBottom(e) {
 			this.form_submit.pageNum++
-			if(this.totalNumber>this.toBeclaimedCoupons.length){
+			if (this.totalNumber > this.toBeclaimedCoupons.length) {
 				this.get_TobeclaimedCoupons()
 			}
 		},
@@ -84,9 +84,10 @@
 		methods: {
 			handleTabClick(e) {
 				this.currentIndex = e.id;
-				this.form_submit.status=e.id
-				this.toBeclaimedCoupons=[]
+				this.form_submit.status = e.id
+				this.toBeclaimedCoupons = []
 				this.get_TobeclaimedCoupons()
+				this.get_statistical()
 			},
 			get_TobeclaimedCoupons() {
 				if (this.currentIndex == 0) {
@@ -94,45 +95,57 @@
 						this.toBeclaimedCoupons = res.list
 					})
 				} else {
-					this.$api.base("post",`/couponApi/list-user?pageNum=${this.form_submit.pageNum}&pageSize=${this.form_submit.pageSize}&status=${this.form_submit.status}`,{}, {}).then(res => {
-						this.totalNumber=res.total
-						if(this.form_submit.pageNum==1){
+					this.$api.base("post",
+						`/couponApi/list-user?pageNum=${this.form_submit.pageNum}&pageSize=${this.form_submit.pageSize}&status=${this.form_submit.status}`, {}, {}
+						).then(res => {
+						this.totalNumber = res.total
+						if (this.form_submit.pageNum == 1) {
 							this.toBeclaimedCoupons = res.rows
-						}else{
-							this.toBeclaimedCoupons=[...this.toBeclaimedCoupons,...res.rows]
+						} else {
+							this.toBeclaimedCoupons = [...this.toBeclaimedCoupons, ...res.rows]
 						}
 					})
 				}
 
 			},
-			get_statistical(){
+			get_statistical() {
 				// 数据映射
 				const idToKeyMap = {
-				  0: 'list-pending',
-				  1: 'list-unused',
-				  2: 'list-used',
-				  3: 'list-overdue'
+					0: 'list-pending',
+					1: 'list-unused',
+					2: 'list-used',
+					3: 'list-overdue'
 				};
 				this.$api.base("post", "/couponApi/statistical", {}, {}).then(res => {
 					this.tabsList.forEach(tab => {
-					  const key = idToKeyMap[tab.id];
-					  tab.count = res.data[key] || 0;
+						const key = idToKeyMap[tab.id];
+						tab.count = res.data[key] || 0;
 					});
 				})
 			},
-			goto_orderDetail(e){
+			goto_orderDetail(e) {
 				uni.navigateTo({
-					url:`/pages/order-detail/order-detail?orderId=${e.useOrderId}`
+					url: `/pages/order-detail/order-detail?orderId=${e.useOrderId}`
 				})
 			},
-			get_coupons(e){
-				this.$api.base("post", "/couponApi/receive", {templateId:e.id}, {}).then(res => {
-					if(res.code==0){
-						this.get_statistical()
-						this.get_TobeclaimedCoupons()
-						this.$app.popup.toast('领取成功')
-					}
-				})
+			get_coupons(e) {
+				if (e.dayReceiveCount > e.totalCount) return this.$app.popup.toast('您来慢了~该优惠券已被领完')
+				uni.showLoading({
+					mask:true
+				});
+				let timer = setInterval(() => {
+					clearInterval(timer)
+					this.$api.base("post", "/couponApi/receive", {
+						templateId: e.id
+					}, {}).then(res => {
+						uni.hideLoading()
+						if (res.code == 0) {
+							this.get_statistical()
+							this.get_TobeclaimedCoupons()
+							this.$app.popup.toast('领取成功')
+						}
+					})
+				}, 100);
 			}
 		}
 	};

pages/index/index.css

@@ -483,11 +483,12 @@ app-navigation {
 	width: 50rpx;
 	height: 50rpx;
 	border-radius: 50%;
-	border: 4rpx solid #3EB6F8;
+	border: 2rpx solid #133a4f;
 	color: #fff;
-	font-size: 30rpx;
+	font-size:28rpx;
 	font-weight: bold;
 	text-align: center;
+	line-height: 50rpx;
 }
 
 .ad-image {

pages/index/index.vue

@@ -134,10 +134,10 @@
 		</view>
 		<ax-popup ref="filter" position="" maskType="black" maskEnable maskClose>
 			<view class="ad-popup">
-				<view class="close-get" @click="$refs.filter.close()">X</view>
+				<view class="close-get" @click="closeAd">X</view>
 				<swiper class="ad-swiper" :autoplay="true" :interval="3000" :duration="1000">
 					<swiper-item class="ad-swiper-item" v-for="(item,index) in adBanner" :key="index">
-						<image class="ad-image" :src="showImg(item.picture)" mode="widthFix"></image>
+						<image class="ad-image" :src="showImg(item.picture)" @click="goImgLink(item)" mode="widthFix"></image>
 					</swiper-item>
 				</swiper>
 			</view>
@@ -181,10 +181,13 @@
 				}
 				
 			}
+			if(this.closeAdvertising){
+				this.getAdswiper()
+			}
 			// this.user_info=this.$app.storage.get('USER_INFO')
 		},
 		mounted() {
-			if(this.adBanner.length>0){
+			if(this.adBanner.length>0&&!this.$app.storage.get('AD_STATUS')){
 				this.$refs.filter.open();
 			}
 			this.setListHeight();
@@ -192,6 +195,7 @@
 			this.get_frimid()
 			this.get_userinfo()
 			this.get_paymentMsg()
+			this.getBanners()
 		},
 		data() {
 			return {
@@ -233,13 +237,16 @@
 						{text:'黔西南',areaCode:"5223"},
 					]
 				},
-				discountInfo:null
+				discountInfo:null,
+				closeAdvertising:false
 			}
 		},
 		onShow() {
-			this.getBanners()
 			this.getAdswiper()
 		},
+		onHide() {
+			this.$app.storage.remove('AD_STATUS')
+		},
 		computed:{
 			StyleSheet(){
 				return {
@@ -268,6 +275,12 @@
 			};
 		},
 		methods: {
+			closeAd(){
+				this.closeAdvertising=true
+				this.$refs.filter.close()
+				this.$app.storage.set('AD_STATUS',this.closeAdvertising);
+			},
+			
 			get_userinfo(){
 				this.$api.base("post", "/userApi/getUserAccount", {}, {error:false}).then(res => {
 					this.user_info = res.accountInfo
@@ -332,6 +345,9 @@
 			showImg(img){
 				return this.$config.url.request+img
 			},
+			goImgLink(e){
+				this.$app.url.goto(e.skipUrl);	
+			},
 			// 打开客服
 			customerService(){
 				const cs = this.$config.customerService;

pages/my/my.css

@@ -1,63 +1,89 @@
-ax-body{
+ax-body {
 	display: block;
 	height: 100%;
 	background: #F6FAFF;
 }
 
-app-navigation{
+app-navigation {
 	position: fixed;
 	left: 0;
 	right: 0;
 	bottom: 0;
 }
 
-.page-background{
+.page-background {
 	position: fixed;
 	top: 0;
 	left: 0;
 	right: 0;
 	z-index: 0;
 }
-.page-background image{
+
+.page-background image {
 	display: block;
 	width: 100%;
 }
 
-.main{
+.main {
 	position: relative;
 	z-index: 1;
 }
 
 /* 用户卡 */
-.user-card{
+.user-card {
 	padding: 20px 0;
 	position: relative;
 }
-.user-avatar{
+
+.user-avatar {
 	display: block;
 	width: 50px;
 	height: 50px;
 	margin-right: 10px;
 }
-.user-name{
+
+.user-name {
 	display: flex;
 	align-items: center;
 }
-.user-name-text{
+
+.user-name-text {
 	font-size: 18px;
 	font-weight: bold;
 }
-.user-phone{
+
+.user-phone {
 	font-size: 12px;
 	margin-top: 5px;
 }
-.seting-icon{
+
+.seting-icon-box {
 	position: absolute;
 	right: 0;
-	width:100rpx;
+	display: flex;
+	align-items: center;
+	right: -20rpx;
+}
+
+.seting-icon-box .img-icon {
+	position: absolute;
+	right: 110rpx;
+	width: 100rpx;
 	height: 100rpx;
 }
-.get-phone-number{
+
+.seting-icon-box .tips-text {
+	width: 146rpx;
+	height: 44rpx;
+	background: linear-gradient(259deg, #F75441 0%, #FCB83C 100%);
+	border-radius: 22rpx 0rpx 0rpx 22rpx;
+	font-size: 28rpx;
+	color: #FFFFFF;
+	text-align: center;
+	line-height: 44rpx;
+}
+
+.get-phone-number {
 	display: inline-flex;
 	height: unset;
 	border: none;
@@ -68,19 +94,22 @@ app-navigation{
 	padding: 0;
 	margin: 0;
 }
-.get-phone-number::after{
+
+.get-phone-number::after {
 	display: none;
 }
-.enterprise-name-card{
+
+.enterprise-name-card {
 	margin-left: 10rpx;
 	padding: 10rpx;
-	background-color:rgba(62, 182, 248, 0.3);
+	background-color: rgba(62, 182, 248, 0.3);
 	border-radius: 8rpx;
 	font-size: 22rpx;
 	color: #181818;
 }
+
 /* 统计卡 */
-.sta-card{
+.sta-card {
 	flex: 1;
 	display: flex;
 	align-items: center;
@@ -93,7 +122,8 @@ app-navigation{
 	position: relative;
 	overflow: hidden;
 }
-.sta-card::before{
+
+.sta-card::before {
 	content: '';
 	display: block;
 	position: absolute;
@@ -104,22 +134,26 @@ app-navigation{
 	box-shadow: 0 8px 8px #fff inset;
 	background-color: transparent !important;
 }
-.sta-card + .sta-card{
+
+.sta-card+.sta-card {
 	margin-left: 10px;
 }
-.sta-card .value{
+
+.sta-card .value {
 	font-size: 24px;
 	font-weight: bold;
 	position: relative;
 	z-index: 3;
 }
-.sta-card .name{
+
+.sta-card .name {
 	font-size: 12px;
 	color: #aaa;
 	position: relative;
 	z-index: 3;
 }
-.sta-card .bg{
+
+.sta-card .bg {
 	position: absolute;
 	top: 0;
 	right: 0;
@@ -127,7 +161,7 @@ app-navigation{
 	z-index: 2;
 }
 
-.buy{
+.buy {
 	display: flex;
 	align-items: center;
 	justify-content: center;
@@ -135,27 +169,30 @@ app-navigation{
 	border-radius: 8px;
 	font-size: 14px;
 	margin-top: 15px;
-	background: linear-gradient(to right,#8FF8FB,#47AEFF);
+	background: linear-gradient(to right, #8FF8FB, #47AEFF);
 }
 
 /* 卡片 */
-.card{
+.card {
 	background-color: #fff;
 	border-radius: 8px;
 	margin-top: 15px;
 	box-shadow: 0 1px 8px rgba(122, 168, 222, 0.1);
 }
-.card-title{
+
+.card-title {
 	padding: 10px 20px 0 20px;
 	font-weight: bold;
 }
-.act-wrap{
+
+.act-wrap {
 	display: flex;
 	align-items: flex-end;
 	width: 100%;
 	padding: 15px 0px;
 }
-.act-item{
+
+.act-item {
 	display: inline-flex;
 	align-items: center;
 	justify-content: space-between;
@@ -163,44 +200,52 @@ app-navigation{
 	width: 25%;
 	height: 50px;
 }
-.act-item .icon{
+
+.act-item .icon {
 	display: block;
 	width: 30px;
 	height: 30px;
 }
-.act-item .name{
+
+.act-item .name {
 	font-size: 12px;
 }
-.act-item.about{
+
+.act-item.about {
 	height: auto;
 }
-.act-item.about .icon{
+
+.act-item.about .icon {
 	width: 40px;
 	height: 40px;
 }
-.playbil-box{
+
+.playbil-box {
 	position: relative;
 }
 
-.playbil-box .playbil-bg{
-	width:600rpx;
+.playbil-box .playbil-bg {
+	width: 600rpx;
 }
-.enterprise-name{
+
+.enterprise-name {
 	width: 600rpx;
 	text-align: center;
 	font-size: 22rpx;
 	position: absolute;
 	top: 610rpx;
-	color:rgb(33, 111, 247);
+	color: rgb(33, 111, 247);
 }
-.playbil-qrcode{
+
+.playbil-qrcode {
 	position: absolute;
-	left:170rpx;
+	left: 170rpx;
 	top: 280rpx;
 	width: 260rpx;
 	height: 260rpx;
 }
-.enterprise-user{
+
+.enterprise-user {
 	position: absolute;
 	width: 600rpx;
 	text-align: center;
@@ -208,7 +253,8 @@ app-navigation{
 	font-size: 22rpx;
 	color: #fff;
 }
-.enterprise-tips{
+
+.enterprise-tips {
 	text-align: center;
 	font-size: 28rpx;
 	color: #ff0004;

pages/my/my.vue

@@ -13,25 +13,29 @@
 					<image src="@/static/img/user-avatar.svg" class="user-avatar"></image>
 					<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 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>
+						<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>
 					</view>
 				</view>
-				<image src="@/static/img/Coupons.png" class="seting-icon" @click="$app.url.goto('/pages/coupons/coupons')"></image>
+				<view class="seting-icon-box" @click="$app.url.goto('/pages/coupons/coupons')">
+					<image class="img-icon" src="@/static/img/Coupons.png"></image>
+					<view class="tips-text">优惠券</view>
+				</view>
 			</view>
 			<!-- 统计卡 -->
 			<view class="app-flex c-between">
 				<view class="sta-card">
-					<view class="value">{{userinfo.integralNum}}</view>
+					<view class="value">{{ userinfo.integralNum }}</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.params.balance}}</view>
+					<view class="value">{{ userinfo.params.balance }}</view>
 					<view class="name">可抵扣余量</view>
 					<image src="@/static/img/my-sta-bg03.png" mode="heightFix" class="bg"></image>
 					<view class="refund_btn" @click="refund">
@@ -77,7 +81,7 @@
 						<view class="name">隐私条例</view>
 					</view>
 					<!-- firmUserType===1管理员，2普通用户 -->
-					<view class="act-item" @click="openFilter()" v-if="userinfo.firmUserType===1">
+					<view class="act-item" @click="openFilter()" v-if="userinfo.firmUserType === 1">
 						<image src="@/static/img/my-icon06.svg" class="icon"></image>
 						<view class="name">邀请员工</view>
 					</view>
@@ -89,9 +93,9 @@
 				<image class="playbil-bg" :src="playbil_img" mode="widthFix"></image>
 				<image class="playbil-qrcode" :src="qrCode" mode=""></image>
 				<view class="enterprise-name">
-					{{userinfo.firmInfoName}}
+					{{ userinfo.firmInfoName }}
 				</view>
-				<view class="enterprise-user">{{userinfo.nickName?userinfo.nickName:'匿名用户'}}</view>
+				<view class="enterprise-user">{{ userinfo.nickName ? userinfo.nickName : '匿名用户' }}</view>
 				<view class="enterprise-tips">*点击图片进行分享或保存</view>
 			</view>
 		</ax-popup>
@@ -102,231 +106,269 @@
 </template>
 
 <script>
-	import rCanvas from "@/components/r-canvas/r-canvas.vue"
-	import $config from '@/static/js/config.js';
-	export default {
-		data() {
-			return {
-				userinfo: {},
-				playbil_img: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/XVsEVGuCCbNv4aee36cc2f76e7050f62ebad3080ad88.jpg/1.jpg',
-				qrCode: null,
-			}
+import rCanvas from "@/components/r-canvas/r-canvas.vue"
+import $config from '@/static/js/config.js';
+export default {
+	data() {
+		return {
+			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: {
+		openFilter() {
+			this.$refs.filter.open();
+			this.get_qrCode()
 		},
-		onShow() {
-			this.getMyAccount()
+		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) => {
+					console.log(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
+					})
+				}
+			});
 		},
-		mounted() {},
-		methods: {
-			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
-						})
-					}
-				});
-			},
+		// 单独下载二维码
+		// downloadQRCode() {
+		// 	const qrCodeUrl = this.qrCode; // base64 图片数据
+		// 	// 将 base64 转换为本地文件
+		// 	const fsm = uni.getFileSystemManager();
+		// 	const fileName = Date.now() + '.png';
+		// 	const filePath = uni.env.USER_DATA_PATH + '/' + fileName;
+		// 	fsm.writeFile({
+		// 		filePath: filePath,
+		// 		data: qrCodeUrl.slice(22), // 去掉 "data:image/png;base64," 前缀
+		// 		encoding: 'base64',
+		// 		success: () => {
+		// 			// 保存到相册
+		// 			uni.saveImageToPhotosAlbum({
+		// 				filePath: filePath,
+		// 				success: () => {
+		// 					uni.showToast({
+		// 						title: '保存成功',
+		// 						icon: 'success'
+		// 					});
+		// 				},
+		// 				fail: (err) => {
+		// 					console.error('保存失败', err);
+		// 					uni.showToast({
+		// 						title: '保存失败',
+		// 						icon: 'none'
+		// 					});
+		// 				}
+		// 			});
+		// 		},
+		// 		fail: (err) => {
+		// 			console.error('写入文件失败', err);
+		// 			uni.showToast({
+		// 				title: '下载失败',
+		// 				icon: 'none'
+		// 			});
+		// 		}
+		// 	});
+		// },
 			// 操作图片
 			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"
-						})
+			// 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.drawText({
-						text:this.userinfo.firmInfoName?this.userinfo.firmInfoName:'默认企业',
-						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.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: this.userinfo.nickName ?this.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.drawText({
+					text: this.userinfo.firmInfoName ? this.userinfo.firmInfoName : '默认企业',
+					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.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)
+				})
+				await this.$refs.rCanvas.drawText({
+					text: this.userinfo.nickName ? this.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"
 					})
 				})
-			},
-			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 {
-								this.$app.popup.alert(res.msg);
-							}
-						});
-
-
-					}
-				});;
-			},
-			openPrivacyContract() {
-				uni.openPrivacyContract();
-			},
-			// 打开客服
-			customerService() {
-				const cs = this.$config.customerService;
-				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", {}, {error:false}).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) => {
-								setTimeout(()=>{
-									this.$app.storage.remove('ADMIN_USERID')
-								},500)
-							},
-							fail(err) {
-								console.log(err, '----错误信息');
-							}
-						});
-					}
+				// 生成海报
+				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)
 				})
-			},
-			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)
-					}).catch(err => {
-						setTimeout(() => {
-							this.$app.storage.remove('FRIM_ID')
-						}, 500)
-					})
+			})
+		},
+		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 {
+							this.$app.popup.alert(res.msg);
+						}
+					});
 				}
-			},
-			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()
+			});;
+		},
+		openPrivacyContract() {
+			uni.openPrivacyContract();
+		},
+		// 打开客服
+		customerService() {
+			const cs = this.$config.customerService;
+			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", {}, { error: false }).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) => {
+							setTimeout(() => {
+								this.$app.storage.remove('ADMIN_USERID')
+							}, 500)
+						},
+						fail(err) {
+							console.log(err, '----错误信息');
+						}
 					});
 				}
+			})
+		},
+		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)
+				}).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");
+@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;
-	}
+.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/order-detail/order-detail.vue

@@ -89,6 +89,10 @@
 				<!-- <view class="cell"><view class="lable">电费</view><view class="contet">{{orderInfo.thirdPartyElecfee?orderInfo.thirdPartyElecfee.toFixed(4):"0.0000"}}元</view></view>
 				<view class="cell"><view class="lable">服务费</view><view class="contet">{{clcaServicePrice(orderInfo)}}元</view></view> -->
 				<view class="hr"></view>
+				<view class="cell">
+					<view class="lable">订单金额</view>
+					<view class="contet sum">{{(orderInfo.discountMoney+orderInfo.firmPrice+orderInfo.couponPrice+orderInfo.realCost).toFixed(4)||"0.0000"}}元</view>
+				</view>
 				<view class="cell" v-if="orderInfo.discountMoney">
 					<view class="lable">{{orderInfo.discountDes}}</view>
 					<view class="contet sum">-{{orderInfo.discountMoney?orderInfo.discountMoney.toFixed(4):"0.0000"}}元
@@ -103,7 +107,7 @@
 					<view class="contet sum">-{{orderInfo.couponPrice?orderInfo.couponPrice.toFixed(4):"0.0000"}}元</view>
 				</view>
 				<view class="cell">
-					<view class="lable">实际结算费用</view>
+					<view class="lable">实际付款</view>
 					<view class="contet sum">{{orderInfo.realCost?orderInfo.realCost.toFixed(4):"0.0000"}}元</view>
 				</view>
 			</view>

pages/recharge-log/recharge-log.vue

@@ -16,6 +16,7 @@
 							<view>|</view>
 							<view class="check-backTaxAmount" @click="topage_order(item)">查看超充订单</view>
 						</view>
+						<view v-if="item.ZTBackMoney">返回智停端补缴金额：{{item.ZTBackMoney}}</view>
 						<view v-if="item.backTaxAmount&&item.backTax===0">可抵扣余量：{{item.orderMoney-item.backTaxAmount}}元</view>
 						<view v-if="item.orderStatus!=2">退款时间：{{item.refundTime}}</view>
 						<view v-if="item.orderStatus!=2">退款金额：{{item.refundMoney}}元</view>

static/css/app.css

@@ -1,26 +1,30 @@
 @import 'vars.css';
 
-page{
+page {
 	width: 100%;
 	height: 100%;
 	color: #2B303A;
 	font-size: var(--global-size);
 	box-sizing: border-box;
 }
-view,text,scroll-view{
+
+view,
+text,
+scroll-view {
 	box-sizing: border-box;
 }
-icon{
+
+icon {
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
 }
 
->>> ax-custom-title .title{
+>>>ax-custom-title .title {
 	font-size: 18px;
 }
 
-#root{
+#root {
 	width: 100%;
 	height: 100%;
 	background-color: var(--global-background);
@@ -30,51 +34,57 @@ icon{
 
 /* 占位符样式 */
 .app-placeholder,
-.app-placeholder::placeholder{
+.app-placeholder::placeholder {
 	color: #ccc;
 }
 
 /* 分组标题 */
-.app-group-title{
+.app-group-title {
 	padding: 10px;
 	text-align: center;
 	color: var(--font-des);
 }
 
 /* 状态栏 */
-.app-status-bar{
+.app-status-bar {
 	min-height: 34px;
 	background-color: var(--global-background);
 }
 
 /* 弹性盒子模型 */
-.app-flex-one{
+.app-flex-one {
 	flex: 1;
 }
-.app-flex{
+
+.app-flex {
 	display: flex;
 }
-.app-flex.middle{
+
+.app-flex.middle {
 	align-items: center;
 }
-.app-flex.c-center{
+
+.app-flex.c-center {
 	align-items: center;
 	justify-content: center;
 }
-.app-flex.c-between{
+
+.app-flex.c-between {
 	align-items: center;
 	justify-content: space-between;
 }
-.app-flex.c-around{
+
+.app-flex.c-around {
 	align-items: center;
 	justify-content: space-around;
 }
-.app-flex.column{
+
+.app-flex.column {
 	flex-direction: column;
 }
 
 /* 标题栏 */
-.app-title-bar{
+.app-title-bar {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
@@ -84,7 +94,8 @@ icon{
 	background-color: var(--global-background);
 	font-size: 16px;
 }
-.app-title-bar .icon-item{
+
+.app-title-bar .icon-item {
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
@@ -92,18 +103,25 @@ icon{
 	width: 30px;
 	height: 30px;
 }
-.app-title-bar .icon-item.back{
+
+.app-title-bar .icon-item.back {
 	font-size: 24px;
 	transform: scaleX(-100%);
 }
 
 /* 隐藏滚动条 */
-scroll-view.app-hide-scrollbar >>> ::-webkit-scrollbar,
-.app-hide-scrollbar::-webkit-scrollbar{
+scroll-view.app-hide-scrollbar>>> ::-webkit-scrollbar,
+.app-hide-scrollbar::-webkit-scrollbar {
 	display: none;
 }
 
 /* 不可选择 */
-.app-unselectable{
+.app-unselectable {
 	user-select: none;
+}
+/* 超出显示省略号 */
+.textHidden {
+	overflow: hidden !important;
+	white-space: nowrap !important;
+	text-overflow: ellipsis !important;
 }

static/js/api.js

@@ -205,6 +205,8 @@ api.login = function(data){
 	return new Promise(async (resolve,reject)=>{
 		const code = await api.userCode();
 		api.post($config.api.login,{...data||{},code}).then(async res=>{
+			// console.log('data数据:',...data);
+			// console.log('code数据:',code);
 			uni.setStorageSync($config.keyname.userToken,res?.token);
 			uni.setStorageSync($config.keyname.userInfo,res?.userInfo);
 			resolve(res.token);

static/js/app.js

@@ -377,6 +377,7 @@ app.act = class appAct{
 			});
 		});
 	}
+	
 }
 
 module.exports = app;

static/js/config.js

@@ -6,8 +6,9 @@ const config = {};
 // 地址类
 config.url = {
 	// API请求基础URL
-	// request : 'https://charge.hub.zswlgz.com/',
-	request : 'http://192.168.1.34:80/',
+	request : 'https://charge.hub.zswlgz.com/',
+	// request : 'http://192.168.110.3:80/',
+	// request : 'http://192.168.1.253:80/',
 	// request : 'http://120.78.228.211:8866/',
 	// request : 'https://charge.dev.hub.zswlgz.com/',
 	// 上传地址

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

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

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

@@ -1 +1 @@
-ax-body.data-v-66ee39cb .ax-body{background-color:#f5f7fb}.data-v-66ee39cb .ax-custom-title{background-color:#fff}.page-background.data-v-66ee39cb{display:block;position:fixed;top:0;left:0;width:100%;height:100%}.body.data-v-66ee39cb{display:flex;flex-direction:column;width:100%;height:100%;padding:10px 0;overflow:auto;position:relative;z-index:1}.list .item + .item.data-v-66ee39cb{margin-top:10px}.list .item.data-v-66ee39cb{display:block;background-color:#fff;border-radius:10px;padding:20px 10px}.list .item .title.data-v-66ee39cb{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-66ee39cb{font-size:16px;font-weight:700}.list .item .title .state.data-v-66ee39cb{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-66ee39cb:before{content:"";display:inline-block;width:4px;height:4px;border-radius:100%;background-color:#fff;margin-right:5px}.list .item .cell.data-v-66ee39cb{font-size:12px;color:#aaa;line-height:26px}.backTaxAmount.data-v-66ee39cb{display:flex;align-items:center;gap:10rpx}.check-backTaxAmount.data-v-66ee39cb{color:#f05000}.list .loadmore.data-v-66ee39cb{display:flex;align-items:center;justify-content:center;font-size:12px;color:#aaa;height:60px}.nothing.data-v-66ee39cb{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-66ee39cb{display:block;width:25vw;margin-bottom:10px}
+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}

unpackage/dist/build/mp-weixin/project.config.json

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,20 +9,28 @@
     "postcss": true,
     "minified": true,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.6.6",
+  "libVersion": "",
   "appid": "wx9894a01b9e92c368",
   "projectname": "chargingPile",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
+    }
   }
 }

unpackage/dist/build/mp-weixin/static/css/app.css

@@ -1,26 +1,30 @@
 @import 'vars.css';
 
-page{
+page {
 	width: 100%;
 	height: 100%;
 	color: #2B303A;
 	font-size: var(--global-size);
 	box-sizing: border-box;
 }
-view,text,scroll-view{
+
+view,
+text,
+scroll-view {
 	box-sizing: border-box;
 }
-icon{
+
+icon {
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
 }
 
->>> ax-custom-title .title{
+>>>ax-custom-title .title {
 	font-size: 18px;
 }
 
-#root{
+#root {
 	width: 100%;
 	height: 100%;
 	background-color: var(--global-background);
@@ -30,51 +34,57 @@ icon{
 
 /* 占位符样式 */
 .app-placeholder,
-.app-placeholder::placeholder{
+.app-placeholder::placeholder {
 	color: #ccc;
 }
 
 /* 分组标题 */
-.app-group-title{
+.app-group-title {
 	padding: 10px;
 	text-align: center;
 	color: var(--font-des);
 }
 
 /* 状态栏 */
-.app-status-bar{
+.app-status-bar {
 	min-height: 34px;
 	background-color: var(--global-background);
 }
 
 /* 弹性盒子模型 */
-.app-flex-one{
+.app-flex-one {
 	flex: 1;
 }
-.app-flex{
+
+.app-flex {
 	display: flex;
 }
-.app-flex.middle{
+
+.app-flex.middle {
 	align-items: center;
 }
-.app-flex.c-center{
+
+.app-flex.c-center {
 	align-items: center;
 	justify-content: center;
 }
-.app-flex.c-between{
+
+.app-flex.c-between {
 	align-items: center;
 	justify-content: space-between;
 }
-.app-flex.c-around{
+
+.app-flex.c-around {
 	align-items: center;
 	justify-content: space-around;
 }
-.app-flex.column{
+
+.app-flex.column {
 	flex-direction: column;
 }
 
 /* 标题栏 */
-.app-title-bar{
+.app-title-bar {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
@@ -84,7 +94,8 @@ icon{
 	background-color: var(--global-background);
 	font-size: 16px;
 }
-.app-title-bar .icon-item{
+
+.app-title-bar .icon-item {
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
@@ -92,18 +103,25 @@ icon{
 	width: 30px;
 	height: 30px;
 }
-.app-title-bar .icon-item.back{
+
+.app-title-bar .icon-item.back {
 	font-size: 24px;
 	transform: scaleX(-100%);
 }
 
 /* 隐藏滚动条 */
-scroll-view.app-hide-scrollbar >>> ::-webkit-scrollbar,
-.app-hide-scrollbar::-webkit-scrollbar{
+scroll-view.app-hide-scrollbar>>> ::-webkit-scrollbar,
+.app-hide-scrollbar::-webkit-scrollbar {
 	display: none;
 }
 
 /* 不可选择 */
-.app-unselectable{
+.app-unselectable {
 	user-select: none;
+}
+/* 超出显示省略号 */
+.textHidden {
+	overflow: hidden !important;
+	white-space: nowrap !important;
+	text-overflow: ellipsis !important;
 }

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

@@ -205,6 +205,8 @@ api.login = function(data){
 	return new Promise(async (resolve,reject)=>{
 		const code = await api.userCode();
 		api.post($config.api.login,{...data||{},code}).then(async res=>{
+			// console.log('data数据:',...data);
+			// console.log('code数据:',code);
 			uni.setStorageSync($config.keyname.userToken,res?.token);
 			uni.setStorageSync($config.keyname.userInfo,res?.userInfo);
 			resolve(res.token);

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

@@ -377,6 +377,7 @@ app.act = class appAct{
 			});
 		});
 	}
+	
 }
 
 module.exports = app;

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

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

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

@@ -2455,25 +2455,27 @@ page{
 	--global-shadow: 0 0 10px rgba(0,0,0,0.1);
 	--global-background: #fff;
 }
-page{
+page {
 	width: 100%;
 	height: 100%;
 	color: #2B303A;
 	font-size: var(--global-size);
 	box-sizing: border-box;
 }
-view,text,scroll-view{
+view,
+text,
+scroll-view {
 	box-sizing: border-box;
 }
-icon{
+icon {
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
 }
- ax-custom-title .title{
+ ax-custom-title .title {
 	font-size: 18px;
 }
-#root{
+#root {
 	width: 100%;
 	height: 100%;
 	background-color: var(--global-background);
@@ -2481,51 +2483,51 @@ icon{
 	overflow: auto;
 }
 /* 占位符样式 */
-.app-placeholder::-webkit-input-placeholder{
+.app-placeholder::-webkit-input-placeholder {
 	color: #ccc;
 }
 .app-placeholder,
-.app-placeholder::placeholder{
+.app-placeholder::placeholder {
 	color: #ccc;
 }
 /* 分组标题 */
-.app-group-title{
+.app-group-title {
 	padding: 10px;
 	text-align: center;
 	color: var(--font-des);
 }
 /* 状态栏 */
-.app-status-bar{
+.app-status-bar {
 	min-height: 34px;
 	background-color: var(--global-background);
 }
 /* 弹性盒子模型 */
-.app-flex-one{
+.app-flex-one {
 	flex: 1;
 }
-.app-flex{
+.app-flex {
 	display: flex;
 }
-.app-flex.middle{
+.app-flex.middle {
 	align-items: center;
 }
-.app-flex.c-center{
+.app-flex.c-center {
 	align-items: center;
 	justify-content: center;
 }
-.app-flex.c-between{
+.app-flex.c-between {
 	align-items: center;
 	justify-content: space-between;
 }
-.app-flex.c-around{
+.app-flex.c-around {
 	align-items: center;
 	justify-content: space-around;
 }
-.app-flex.column{
+.app-flex.column {
 	flex-direction: column;
 }
 /* 标题栏 */
-.app-title-bar{
+.app-title-bar {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
@@ -2535,7 +2537,7 @@ icon{
 	background-color: var(--global-background);
 	font-size: 16px;
 }
-.app-title-bar .icon-item{
+.app-title-bar .icon-item {
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
@@ -2543,19 +2545,25 @@ icon{
 	width: 30px;
 	height: 30px;
 }
-.app-title-bar .icon-item.back{
+.app-title-bar .icon-item.back {
 	font-size: 24px;
 	-webkit-transform: scaleX(-100%);
 	        transform: scaleX(-100%);
 }
 /* 隐藏滚动条 */
 scroll-view.app-hide-scrollbar ::-webkit-scrollbar,
-.app-hide-scrollbar::-webkit-scrollbar{
+.app-hide-scrollbar::-webkit-scrollbar {
 	display: none;
 }
 /* 不可选择 */
-.app-unselectable{
+.app-unselectable {
 	-webkit-user-select: none;
 	        user-select: none;
 }
+/* 超出显示省略号 */
+.textHidden {
+	overflow: hidden !important;
+	white-space: nowrap !important;
+	text-overflow: ellipsis !important;
+}
 

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

@@ -9896,6 +9896,8 @@ api.login = function (data) {
                     while (1) {
                       switch (_context5.prev = _context5.next) {
                         case 0:
+                          // console.log('data数据:',...data);
+                          // console.log('code数据:',code);
                           uni.setStorageSync(_config.default.keyname.userToken, res === null || res === void 0 ? void 0 : res.token);
                           uni.setStorageSync(_config.default.keyname.userInfo, res === null || res === void 0 ? void 0 : res.userInfo);
                           resolve(res.token);
@@ -10933,8 +10935,9 @@ var config = {};
 // 地址类
 config.url = {
   // API请求基础URL
-  // request : 'https://charge.hub.zswlgz.com/',
-  request: 'http://192.168.1.34:80/',
+  request: 'https://charge.hub.zswlgz.com/',
+  // request : 'http://192.168.110.3:80/',
+  // request : 'http://192.168.1.253:80/',
   // request : 'http://120.78.228.211:8866/',
   // request : 'https://charge.dev.hub.zswlgz.com/',
   // 上传地址

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

@@ -240,6 +240,7 @@ var _default = {
       this.form_submit.status = e.id;
       this.toBeclaimedCoupons = [];
       this.get_TobeclaimedCoupons();
+      this.get_statistical();
     },
     get_TobeclaimedCoupons: function get_TobeclaimedCoupons() {
       var _this = this;
@@ -281,15 +282,23 @@ var _default = {
     },
     get_coupons: function get_coupons(e) {
       var _this3 = this;
-      this.$api.base("post", "/couponApi/receive", {
-        templateId: e.id
-      }, {}).then(function (res) {
-        if (res.code == 0) {
-          _this3.get_statistical();
-          _this3.get_TobeclaimedCoupons();
-          _this3.$app.popup.toast('领取成功');
-        }
+      if (e.dayReceiveCount > e.totalCount) return this.$app.popup.toast('您来慢了~该优惠券已被领完');
+      uni.showLoading({
+        mask: true
       });
+      var timer = setInterval(function () {
+        clearInterval(timer);
+        _this3.$api.base("post", "/couponApi/receive", {
+          templateId: e.id
+        }, {}).then(function (res) {
+          uni.hideLoading();
+          if (res.code == 0) {
+            _this3.get_statistical();
+            _this3.get_TobeclaimedCoupons();
+            _this3.$app.popup.toast('领取成功');
+          }
+        });
+      }, 100);
     }
   }
 };

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

@@ -103,9 +103,10 @@ ax-body .ax-custom-title {
 	text-align: center;
 	margin-left: 30rpx;
 	margin-top: 24rpx;
-	width: 280rpx;
+	width: 300rpx;
 }
 .coupons-title {
+	width:300rpx;
 	font-weight: 800;
 	font-size: 28rpx;
 	color: #222222;
@@ -122,9 +123,11 @@ ax-body .ax-custom-title {
 }
 .coupons-right {
 	margin-top: 58rpx;
-	margin-left:50rpx;
+	margin-left:40rpx;
 }
 .coupons-dayrules {
+	width: 150rpx;
+	height: 60rpx;
 	font-size: 20rpx;
 	color: #AAAAAA;
 }

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

@@ -216,9 +216,6 @@ var render = function () {
     _vm.e7 = function ($event) {
       return _vm.$app.url.goto("/pages/map/map", false)
     }
-    _vm.e8 = function ($event) {
-      return _vm.$refs.filter.close()
-    }
   }
   _vm.$mp.data = Object.assign(
     {},
@@ -466,8 +463,11 @@ var _default = {
                   _this.getDeviceInfo(device_no);
                 }
               }
+              if (_this.closeAdvertising) {
+                _this.getAdswiper();
+              }
               // this.user_info=this.$app.storage.get('USER_INFO')
-            case 5:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -476,7 +476,7 @@ var _default = {
     }))();
   },
   mounted: function mounted() {
-    if (this.adBanner.length > 0) {
+    if (this.adBanner.length > 0 && !this.$app.storage.get('AD_STATUS')) {
       this.$refs.filter.open();
     }
     this.setListHeight();
@@ -484,6 +484,7 @@ var _default = {
     this.get_frimid();
     this.get_userinfo();
     this.get_paymentMsg();
+    this.getBanners();
   },
   data: function data() {
     return {
@@ -550,13 +551,16 @@ var _default = {
           areaCode: "5223"
         }]
       },
-      discountInfo: null
+      discountInfo: null,
+      closeAdvertising: false
     };
   },
   onShow: function onShow() {
-    this.getBanners();
     this.getAdswiper();
   },
+  onHide: function onHide() {
+    this.$app.storage.remove('AD_STATUS');
+  },
   computed: {
     StyleSheet: function StyleSheet() {
       return {
@@ -591,6 +595,11 @@ var _default = {
   },
 
   methods: {
+    closeAd: function closeAd() {
+      this.closeAdvertising = true;
+      this.$refs.filter.close();
+      this.$app.storage.set('AD_STATUS', this.closeAdvertising);
+    },
     get_userinfo: function get_userinfo() {
       var _this2 = this;
       this.$api.base("post", "/userApi/getUserAccount", {}, {
@@ -664,6 +673,9 @@ var _default = {
     showImg: function showImg(img) {
       return this.$config.url.request + img;
     },
+    goImgLink: function goImgLink(e) {
+      this.$app.url.goto(e.skipUrl);
+    },
     // 打开客服
     customerService: function customerService() {
       var _this5 = this;

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

@@ -423,11 +423,12 @@ app-navigation {
 	width: 50rpx;
 	height: 50rpx;
 	border-radius: 50%;
-	border: 4rpx solid #3EB6F8;
+	border: 2rpx solid #133a4f;
 	color: #fff;
-	font-size: 30rpx;
+	font-size:28rpx;
 	font-weight: bold;
 	text-align: center;
+	line-height: 50rpx;
 }
 .ad-image {
 	margin-top: 10rpx;

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

@@ -298,6 +298,10 @@ var _config = _interopRequireDefault(__webpack_require__(/*! @/static/js/config.
 //
 //
 //
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -319,7 +323,7 @@ var _default = {
       var _this = this;
       uni.showLoading();
       uni.request({
-        url: _config.default.url.request + '/userApi/get-invite-qr',
+        url: _config.default.url.request + 'userApi/get-invite-qr',
         method: 'GET',
         responseType: 'arraybuffer',
         header: {
@@ -328,6 +332,7 @@ var _default = {
         },
         data: {},
         success: function success(res) {
+          console.log(res);
           uni.hideLoading();
           var arrayBuffer = res.data;
           var base64 = wx.arrayBufferToBase64(arrayBuffer);
@@ -341,6 +346,45 @@ var _default = {
         }
       });
     },
+    // 单独下载二维码
+    // downloadQRCode() {
+    // 	const qrCodeUrl = this.qrCode; // base64 图片数据
+    // 	// 将 base64 转换为本地文件
+    // 	const fsm = uni.getFileSystemManager();
+    // 	const fileName = Date.now() + '.png';
+    // 	const filePath = uni.env.USER_DATA_PATH + '/' + fileName;
+    // 	fsm.writeFile({
+    // 		filePath: filePath,
+    // 		data: qrCodeUrl.slice(22), // 去掉 "data:image/png;base64," 前缀
+    // 		encoding: 'base64',
+    // 		success: () => {
+    // 			// 保存到相册
+    // 			uni.saveImageToPhotosAlbum({
+    // 				filePath: filePath,
+    // 				success: () => {
+    // 					uni.showToast({
+    // 						title: '保存成功',
+    // 						icon: 'success'
+    // 					});
+    // 				},
+    // 				fail: (err) => {
+    // 					console.error('保存失败', err);
+    // 					uni.showToast({
+    // 						title: '保存失败',
+    // 						icon: 'none'
+    // 					});
+    // 				}
+    // 			});
+    // 		},
+    // 		fail: (err) => {
+    // 			console.error('写入文件失败', err);
+    // 			uni.showToast({
+    // 				title: '下载失败',
+    // 				icon: 'none'
+    // 			});
+    // 		}
+    // 	});
+    // },
     // 操作图片
     editPlaybil: function editPlaybil() {
       // console.log(this.$refs.filter);

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

@@ -11,63 +11,80 @@
 	top:-5000rpx;
 }
 
-ax-body.data-v-0be17cc6{
+ax-body.data-v-0be17cc6 {
 	display: block;
 	height: 100%;
 	background: #F6FAFF;
 }
-app-navigation.data-v-0be17cc6{
+app-navigation.data-v-0be17cc6 {
 	position: fixed;
 	left: 0;
 	right: 0;
 	bottom: 0;
 }
-.page-background.data-v-0be17cc6{
+.page-background.data-v-0be17cc6 {
 	position: fixed;
 	top: 0;
 	left: 0;
 	right: 0;
 	z-index: 0;
 }
-.page-background image.data-v-0be17cc6{
+.page-background image.data-v-0be17cc6 {
 	display: block;
 	width: 100%;
 }
-.main.data-v-0be17cc6{
+.main.data-v-0be17cc6 {
 	position: relative;
 	z-index: 1;
 }
 
 /* 用户卡 */
-.user-card.data-v-0be17cc6{
+.user-card.data-v-0be17cc6 {
 	padding: 20px 0;
 	position: relative;
 }
-.user-avatar.data-v-0be17cc6{
+.user-avatar.data-v-0be17cc6 {
 	display: block;
 	width: 50px;
 	height: 50px;
 	margin-right: 10px;
 }
-.user-name.data-v-0be17cc6{
+.user-name.data-v-0be17cc6 {
 	display: flex;
 	align-items: center;
 }
-.user-name-text.data-v-0be17cc6{
+.user-name-text.data-v-0be17cc6 {
 	font-size: 18px;
 	font-weight: bold;
 }
-.user-phone.data-v-0be17cc6{
+.user-phone.data-v-0be17cc6 {
 	font-size: 12px;
 	margin-top: 5px;
 }
-.seting-icon.data-v-0be17cc6{
+.seting-icon-box.data-v-0be17cc6 {
 	position: absolute;
 	right: 0;
-	width:100rpx;
+	display: flex;
+	align-items: center;
+	right: -20rpx;
+}
+.seting-icon-box .img-icon.data-v-0be17cc6 {
+	position: absolute;
+	right: 110rpx;
+	width: 100rpx;
 	height: 100rpx;
 }
-.get-phone-number.data-v-0be17cc6{
+.seting-icon-box .tips-text.data-v-0be17cc6 {
+	width: 146rpx;
+	height: 44rpx;
+	background: linear-gradient(259deg, #F75441 0%, #FCB83C 100%);
+	border-radius: 22rpx 0rpx 0rpx 22rpx;
+	font-size: 28rpx;
+	color: #FFFFFF;
+	text-align: center;
+	line-height: 44rpx;
+}
+.get-phone-number.data-v-0be17cc6 {
 	display: inline-flex;
 	height: unset;
 	border: none;
@@ -78,20 +95,20 @@ app-navigation.data-v-0be17cc6{
 	padding: 0;
 	margin: 0;
 }
-.get-phone-number.data-v-0be17cc6::after{
+.get-phone-number.data-v-0be17cc6::after {
 	display: none;
 }
-.enterprise-name-card.data-v-0be17cc6{
+.enterprise-name-card.data-v-0be17cc6 {
 	margin-left: 10rpx;
 	padding: 10rpx;
-	background-color:rgba(62, 182, 248, 0.3);
+	background-color: rgba(62, 182, 248, 0.3);
 	border-radius: 8rpx;
 	font-size: 22rpx;
 	color: #181818;
 }
 
 /* 统计卡 */
-.sta-card.data-v-0be17cc6{
+.sta-card.data-v-0be17cc6 {
 	flex: 1;
 	display: flex;
 	align-items: center;
@@ -104,7 +121,7 @@ app-navigation.data-v-0be17cc6{
 	position: relative;
 	overflow: hidden;
 }
-.sta-card.data-v-0be17cc6::before{
+.sta-card.data-v-0be17cc6::before {
 	content: '';
 	display: block;
 	position: absolute;
@@ -115,29 +132,29 @@ app-navigation.data-v-0be17cc6{
 	box-shadow: 0 8px 8px #fff inset;
 	background-color: transparent !important;
 }
-.sta-card + .sta-card.data-v-0be17cc6{
+.sta-card+.sta-card.data-v-0be17cc6 {
 	margin-left: 10px;
 }
-.sta-card .value.data-v-0be17cc6{
+.sta-card .value.data-v-0be17cc6 {
 	font-size: 24px;
 	font-weight: bold;
 	position: relative;
 	z-index: 3;
 }
-.sta-card .name.data-v-0be17cc6{
+.sta-card .name.data-v-0be17cc6 {
 	font-size: 12px;
 	color: #aaa;
 	position: relative;
 	z-index: 3;
 }
-.sta-card .bg.data-v-0be17cc6{
+.sta-card .bg.data-v-0be17cc6 {
 	position: absolute;
 	top: 0;
 	right: 0;
 	height: 100%;
 	z-index: 2;
 }
-.buy.data-v-0be17cc6{
+.buy.data-v-0be17cc6 {
 	display: flex;
 	align-items: center;
 	justify-content: center;
@@ -145,27 +162,27 @@ app-navigation.data-v-0be17cc6{
 	border-radius: 8px;
 	font-size: 14px;
 	margin-top: 15px;
-	background: linear-gradient(to right,#8FF8FB,#47AEFF);
+	background: linear-gradient(to right, #8FF8FB, #47AEFF);
 }
 
 /* 卡片 */
-.card.data-v-0be17cc6{
+.card.data-v-0be17cc6 {
 	background-color: #fff;
 	border-radius: 8px;
 	margin-top: 15px;
 	box-shadow: 0 1px 8px rgba(122, 168, 222, 0.1);
 }
-.card-title.data-v-0be17cc6{
+.card-title.data-v-0be17cc6 {
 	padding: 10px 20px 0 20px;
 	font-weight: bold;
 }
-.act-wrap.data-v-0be17cc6{
+.act-wrap.data-v-0be17cc6 {
 	display: flex;
 	align-items: flex-end;
 	width: 100%;
 	padding: 15px 0px;
 }
-.act-item.data-v-0be17cc6{
+.act-item.data-v-0be17cc6 {
 	display: inline-flex;
 	align-items: center;
 	justify-content: space-between;
@@ -173,43 +190,43 @@ app-navigation.data-v-0be17cc6{
 	width: 25%;
 	height: 50px;
 }
-.act-item .icon.data-v-0be17cc6{
+.act-item .icon.data-v-0be17cc6 {
 	display: block;
 	width: 30px;
 	height: 30px;
 }
-.act-item .name.data-v-0be17cc6{
+.act-item .name.data-v-0be17cc6 {
 	font-size: 12px;
 }
-.act-item.about.data-v-0be17cc6{
+.act-item.about.data-v-0be17cc6 {
 	height: auto;
 }
-.act-item.about .icon.data-v-0be17cc6{
+.act-item.about .icon.data-v-0be17cc6 {
 	width: 40px;
 	height: 40px;
 }
-.playbil-box.data-v-0be17cc6{
+.playbil-box.data-v-0be17cc6 {
 	position: relative;
 }
-.playbil-box .playbil-bg.data-v-0be17cc6{
-	width:600rpx;
+.playbil-box .playbil-bg.data-v-0be17cc6 {
+	width: 600rpx;
 }
-.enterprise-name.data-v-0be17cc6{
+.enterprise-name.data-v-0be17cc6 {
 	width: 600rpx;
 	text-align: center;
 	font-size: 22rpx;
 	position: absolute;
 	top: 610rpx;
-	color:rgb(33, 111, 247);
+	color: rgb(33, 111, 247);
 }
-.playbil-qrcode.data-v-0be17cc6{
+.playbil-qrcode.data-v-0be17cc6 {
 	position: absolute;
-	left:170rpx;
+	left: 170rpx;
 	top: 280rpx;
 	width: 260rpx;
 	height: 260rpx;
 }
-.enterprise-user.data-v-0be17cc6{
+.enterprise-user.data-v-0be17cc6 {
 	position: absolute;
 	width: 600rpx;
 	text-align: center;
@@ -217,7 +234,7 @@ app-navigation.data-v-0be17cc6{
 	font-size: 22rpx;
 	color: #fff;
 }
-.enterprise-tips.data-v-0be17cc6{
+.enterprise-tips.data-v-0be17cc6 {
 	text-align: center;
 	font-size: 28rpx;
 	color: #ff0004;

unpackage/dist/dev/mp-weixin/pages/order-detail/order-detail.js

@@ -139,18 +139,25 @@ var render = function () {
       : null
   var m1 = _vm.getOrderStatus(_vm.orderInfo.status)
   var g2 =
+    (
+      _vm.orderInfo.discountMoney +
+      _vm.orderInfo.firmPrice +
+      _vm.orderInfo.couponPrice +
+      _vm.orderInfo.realCost
+    ).toFixed(4) || "0.0000"
+  var g3 =
     _vm.orderInfo.discountMoney && _vm.orderInfo.discountMoney
       ? _vm.orderInfo.discountMoney.toFixed(4)
       : null
-  var g3 =
+  var g4 =
     _vm.orderInfo.firmPrice && _vm.orderInfo.firmPrice
       ? _vm.orderInfo.firmPrice.toFixed(4)
       : null
-  var g4 =
+  var g5 =
     _vm.orderInfo.couponPrice && _vm.orderInfo.couponPrice
       ? _vm.orderInfo.couponPrice.toFixed(4)
       : null
-  var g5 = _vm.orderInfo.realCost ? _vm.orderInfo.realCost.toFixed(4) : null
+  var g6 = _vm.orderInfo.realCost ? _vm.orderInfo.realCost.toFixed(4) : null
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
       return _vm.$app.url.goto("/pages/coupon-buy/coupon-buy")
@@ -168,6 +175,7 @@ var render = function () {
         g3: g3,
         g4: g4,
         g5: g5,
+        g6: g6,
       },
     }
   )
@@ -327,6 +335,10 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
 var _default = {
   onLoad: function onLoad(opts) {
     console.log("启动充值页面的参数：", opts);

unpackage/dist/dev/mp-weixin/pages/recharge-log/recharge-log.js

@@ -219,6 +219,7 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   onLoad: function onLoad() {
     this.loadData();

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

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,15 +9,10 @@
     "postcss": true,
     "minified": true,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.6.5",
+  "libVersion": "",
   "appid": "wx9894a01b9e92c368",
   "projectname": "chargingPile",
   "condition": {
@@ -38,9 +32,5 @@
       "current": -1,
       "list": []
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
   }
 }

unpackage/dist/dev/mp-weixin/static/css/app.css

@@ -1,26 +1,30 @@
 @import 'vars.css';
 
-page{
+page {
 	width: 100%;
 	height: 100%;
 	color: #2B303A;
 	font-size: var(--global-size);
 	box-sizing: border-box;
 }
-view,text,scroll-view{
+
+view,
+text,
+scroll-view {
 	box-sizing: border-box;
 }
-icon{
+
+icon {
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
 }
 
->>> ax-custom-title .title{
+>>>ax-custom-title .title {
 	font-size: 18px;
 }
 
-#root{
+#root {
 	width: 100%;
 	height: 100%;
 	background-color: var(--global-background);
@@ -30,51 +34,57 @@ icon{
 
 /* 占位符样式 */
 .app-placeholder,
-.app-placeholder::placeholder{
+.app-placeholder::placeholder {
 	color: #ccc;
 }
 
 /* 分组标题 */
-.app-group-title{
+.app-group-title {
 	padding: 10px;
 	text-align: center;
 	color: var(--font-des);
 }
 
 /* 状态栏 */
-.app-status-bar{
+.app-status-bar {
 	min-height: 34px;
 	background-color: var(--global-background);
 }
 
 /* 弹性盒子模型 */
-.app-flex-one{
+.app-flex-one {
 	flex: 1;
 }
-.app-flex{
+
+.app-flex {
 	display: flex;
 }
-.app-flex.middle{
+
+.app-flex.middle {
 	align-items: center;
 }
-.app-flex.c-center{
+
+.app-flex.c-center {
 	align-items: center;
 	justify-content: center;
 }
-.app-flex.c-between{
+
+.app-flex.c-between {
 	align-items: center;
 	justify-content: space-between;
 }
-.app-flex.c-around{
+
+.app-flex.c-around {
 	align-items: center;
 	justify-content: space-around;
 }
-.app-flex.column{
+
+.app-flex.column {
 	flex-direction: column;
 }
 
 /* 标题栏 */
-.app-title-bar{
+.app-title-bar {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
@@ -84,7 +94,8 @@ icon{
 	background-color: var(--global-background);
 	font-size: 16px;
 }
-.app-title-bar .icon-item{
+
+.app-title-bar .icon-item {
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
@@ -92,18 +103,25 @@ icon{
 	width: 30px;
 	height: 30px;
 }
-.app-title-bar .icon-item.back{
+
+.app-title-bar .icon-item.back {
 	font-size: 24px;
 	transform: scaleX(-100%);
 }
 
 /* 隐藏滚动条 */
-scroll-view.app-hide-scrollbar >>> ::-webkit-scrollbar,
-.app-hide-scrollbar::-webkit-scrollbar{
+scroll-view.app-hide-scrollbar>>> ::-webkit-scrollbar,
+.app-hide-scrollbar::-webkit-scrollbar {
 	display: none;
 }
 
 /* 不可选择 */
-.app-unselectable{
+.app-unselectable {
 	user-select: none;
+}
+/* 超出显示省略号 */
+.textHidden {
+	overflow: hidden !important;
+	white-space: nowrap !important;
+	text-overflow: ellipsis !important;
 }

unpackage/dist/dev/mp-weixin/static/js/api.js

@@ -205,6 +205,8 @@ api.login = function(data){
 	return new Promise(async (resolve,reject)=>{
 		const code = await api.userCode();
 		api.post($config.api.login,{...data||{},code}).then(async res=>{
+			// console.log('data数据:',...data);
+			// console.log('code数据:',code);
 			uni.setStorageSync($config.keyname.userToken,res?.token);
 			uni.setStorageSync($config.keyname.userInfo,res?.userInfo);
 			resolve(res.token);

unpackage/dist/dev/mp-weixin/static/js/app.js

@@ -377,6 +377,7 @@ app.act = class appAct{
 			});
 		});
 	}
+	
 }
 
 module.exports = app;

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

@@ -6,8 +6,9 @@ const config = {};
 // 地址类
 config.url = {
 	// API请求基础URL
-	// request : 'https://charge.hub.zswlgz.com/',
-	request : 'http://192.168.1.34:80/',
+	request : 'https://charge.hub.zswlgz.com/',
+	// request : 'http://192.168.110.3:80/',
+	// request : 'http://192.168.1.253:80/',
 	// request : 'http://120.78.228.211:8866/',
 	// request : 'https://charge.dev.hub.zswlgz.com/',
 	// 上传地址