程志平 3 éve
szülő
commit
c02775cb16

+ 1 - 1
App.vue

@@ -18,7 +18,7 @@
 <style>
 	/*每个页面公共css */
 	@font-face {
-	  font-family: "iconfont"; /* Project id 2649342 */
+	  font-family: 'iconfont';  /* Project id 2649342 */
 	  src: url('//at.alicdn.com/t/font_2649342_ejw0s9epmuw.woff2?t=1627727529329') format('woff2'),
 	       url('//at.alicdn.com/t/font_2649342_ejw0s9epmuw.woff?t=1627727529329') format('woff'),
 	       url('//at.alicdn.com/t/font_2649342_ejw0s9epmuw.ttf?t=1627727529329') format('truetype');

+ 15 - 5
pages/reshui/reshui.vue

@@ -3,11 +3,13 @@
 		<view class="container">
 			<view class="header">
 				<view class="scan" @tap="scan()" hover-class="scan_hover">
-					<text class="iconfont icon-saoma"></text>
+					<!-- <text class="iconfont icon-saoma"></text> -->
+					<image :src="require('./images/icon-saoma.png')" style="width: 118rpx;" mode="aspectFit"></image>
 					<text>扫码连接</text>
 				</view>
 				<view class="qinshihao">
-					<text class="iconfont icon-zhuye"></text>
+					<!-- <text class="iconfont icon-zhuye"></text> -->
+					<image :src="require('./images/icon-zhuye.png')" style="width: 28rpx; margin-right: 8rpx;" mode="aspectFit"></image>
 					<text class="dormtxt">{{dorm_number || '宿舍未知'}}</text>
 				</view>
 			</view>
@@ -30,7 +32,10 @@
 					</view>
 					<view class="start_payamount" @tap="chongzhi_yemian()" hover-class="scan_hover">
 						<text>点击充值</text>
-						<text class="iconfont icon-dayuhao"></text>
+						<image :src="require('./images/icon-dayuhao.png')"
+							style="width: 26rpx; margin-left: 10rpx; padding-top: 3rpx; opacity: 0.6;" mode="aspectFit">
+						</image>
+						<!-- <text class="iconfont icon-dayuhao"></text> -->
 					</view>
 				</view>
 				<view class="start_bot">
@@ -60,7 +65,10 @@
 						@change="bindDateChange">
 						<view class="uni-input">
 							<text>{{date}}</text>
-							<text class="iconfont icon-arrow-down"></text>
+							<!-- <text class="iconfont icon-arrow-down"></text> -->
+							<image :src="require('./images/icon-arrow-down.png')"
+								style="width: 26rpx;" mode="aspectFit">
+							</image>
 						</view>
 					</picker>
 				</view>
@@ -1452,7 +1460,7 @@
 							title: '字节码为空!'
 						});
 					}
-					
+
 					if (typeof this.stu_number == 'undefined' || this.stu_number == '') {
 						uni.showToast({
 							icon: 'none',
@@ -1602,6 +1610,7 @@
 					top: 20rpx;
 					right: 30rpx;
 					font-size: 28rpx;
+					height: 38rpx;
 
 					.icon-zhuye {
 						margin-right: 10rpx;
@@ -1729,6 +1738,7 @@
 					.uni-input {
 						display: flex;
 						align-items: center;
+						height: 58rpx;
 
 						text:nth-child(1) {
 							margin-right: 10rpx;

+ 5 - 2
pagesAir/rechargeRecord/rechargeRecord.vue

@@ -5,7 +5,10 @@
 			<picker mode="date" :value="date" fields="month" :start="startDate" :end="endDate" @change="bindDateChange">
 				<view class="uni-input">
 					<text>{{date}}</text>
-					<text class="iconfont icon-arrow-down"></text>
+					<image :src="require('./images/icon-arrow-down.png')"
+						style="width: 30rpx; height: 38rpx;" mode="aspectFit">
+					</image>
+					<!-- <text class="iconfont icon-arrow-down"></text> -->
 				</view>
 			</picker>
 		</view>
@@ -197,7 +200,7 @@
 				display: flex;
 				justify-content: space-around;
 				align-items: center;
-				width: 200rpx;
+				width: 180rpx;
 				height: 60rpx;
 				border: 2rpx solid #CCCCCC;
 				border-radius: 6rpx;

+ 3 - 3
pagesElectric/jiaofei/jiaofei.vue

@@ -555,7 +555,7 @@
 				})
 
 				// console.log(res);
-				if (res.statusCode == 200 && res.data.sub_openid && res.data.sub_openid != '') {
+				if (res.data.code == 200 && res.data.sub_openid && res.data.sub_openid != '') {
 					wx.requestPayment({
 						appId: res.data.appId,
 						timeStamp: res.data.timeStamp,
@@ -586,8 +586,8 @@
 					});
 				} else {
 					uni.showToast({
-						title: '未获得支付参数',
-						icon: 'success',
+						title: res.data.message,
+						icon: 'none',
 						duration: 3000
 					});
 				}

+ 13 - 7
pagesElectric/show/show.css

@@ -93,14 +93,20 @@ page {
 	width: 132upx;
 }
 
-.uni-input {
-	margin-left: 32upx;
-	margin-top: 40.1upx;
-
+.select-date {
+	display: flex;
+	flex-direction: column;
+	justify-content: flex-start;
+	height: 68rpx;
 }
 
-.uni-input-label {
-	font-size: 40upx;
+.uni-input {
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+	margin-left: 32upx;
+	padding-top: 20rpx;
+	height: 38rpx;
 }
 
 .picker-item-logo {
@@ -165,7 +171,7 @@ page {
 }
 
 .uni-input-label {
-	margin-right: 15rpx;
+	margin-right: 10rpx;
 	font-size: 32rpx;
 }
 

+ 4 - 1
pagesElectric/show/show.vue

@@ -29,7 +29,10 @@
 				<picker mode="date" fields="month" :start="startDate" :end="endDate" @change="bindDateChange">
 					<view class="uni-input">
 						<text class="uni-input-label">{{date}}</text>
-						<text class="iconfont icon-arrow-down"></text>
+						<image :src="require('./images/icon-arrow-down.png')"
+							style="width: 30rpx; height: 38rpx;" mode="aspectFit">
+						</image>
+						<!-- <text class="iconfont icon-arrow-down"></text> -->
 					</view>
 				</picker>
 				<view class="uni-list">