no message

manifest.json

@@ -56,5 +56,10 @@
         },
         "usingComponents" : true
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "base" : "/jiaofei/waterH5/"
+        }
+    }
 }

pages.json

@@ -1,9 +1,16 @@
 {
 	"pages": [{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "授权中",
+				"navigationStyle": "custom"
+			}
+		}, {
 			"path": "pages/home/home",
 			"style": {
 				"navigationBarTitleText": "黄家湖水费缴纳",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -14,21 +21,6 @@
 			}
 		},
 		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "授权中",
-				"navigationStyle": "custom"
-			}
-		}
-		, {
-			"path": "pages/pay/pay",
-			"style": {
-				"navigationBarTitleText": "支付订单",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
 			"path": "pages/bill/bill",
 			"style": {
 				"navigationBarTitleText": "订单列表",

pages/bill/bill.vue

@@ -298,13 +298,34 @@
 				maxH: "",
 				// 弹窗标题
 				popTitle: "",
+				// 反馈提交图片参数
+				imgs: []
 			};
 		},
 		onLoad() {
+			// 判断是否存在card_number，不存在则重新授权
+			this.getAuthorization();
 			this.getData()
 			this.getTime()
 		},
 		methods: {
+			getAuthorization() {
+				let card_number = localStorage.getItem("card_number");
+				let studentName = localStorage.getItem("studentName");
+				let openId = localStorage.getItem("openId");
+				if (!card_number || !studentName || !openId) {
+					uni.showModal({
+						title: "提示",
+						content: "请先领取校园卡或授权后再进行相关操作",
+						showCancel: false,
+						success: () => {
+							uni.reLaunch({
+								url: "/pages/index/index",
+							});
+						},
+					});
+				}
+			},
 			// 获取账单列表数据
 			async getData() {
 				let res = await this.$myRequest({
@@ -339,8 +360,6 @@
 			select(e) {
 				e.tempFiles.forEach((item) => {
 					TranslateImage.translate(item.path, ((res) => {
-						// 先清空图片数组
-						this.valiFormData.feedbackImg = []
 						// 判断图片大小是否过大
 						if (Number(res.size) > 1000000) {
 							uni.showModal({
@@ -357,10 +376,13 @@
 
 						// 上传图片
 						uni.uploadFile({
-							url: `http://192.168.161.34:9999/tuitionpayment/feedbackmsg/uploadImage`,
+							url: `https://chtech.ncjti.edu.cn/jiaofei/jiaofei-api/tuitionpayment/feedbackmsg/uploadImage`,
 							filePath: res.url,
 							name: 'images',
 							success: (uploadFileRes) => {
+								// 收集提交请求所需要的图片参数数据
+								this.imgs.push((JSON.parse(uploadFileRes.data).data))
+
 								const path = item.path;
 								this.valiFormData.feedbackImg.push({
 									url: path,
@@ -379,7 +401,7 @@
 			handleDelete(e) {
 				const num = this.valiFormData.feedbackImg.findIndex(v => v.path === e.tempFilePath);
 				this.valiFormData.feedbackImg.splice(num, 1);
-				// console.log(this.valiFormData.feedbackImg);
+				this.imgs.splice(num, 1);
 			},
 			// 筛选框数据改变回调
 			onchange(e) {
@@ -405,18 +427,18 @@
 
 			// 订单反馈按钮回调
 			async handleFeedback(item) {
-				console.log();
 				this.popTitle = item.title
 				this.valiFormData.feedbackPersonName = "";
 				this.valiFormData.feedbackPersonPhone = "";
 				this.valiFormData.feedbackRoom = "";
 				this.valiFormData.feedbackInfo = "";
 				this.valiFormData.feedbackImg = [];
+				this.imgs = []
 
 				let res = await this.$myRequest({
 					url: "/wechat/getUserNameTele",
 					data: {
-						cardNumber: localStorage.card_number || "360721199802141618",
+						cardNumber: localStorage.card_number,
 					},
 				});
 
@@ -436,11 +458,7 @@
 					.then(async (res) => {
 						// 如果上传了图片,处理图片参数字段
 						if (res.feedbackImg.length) {
-							let temList = []
-							res.feedbackImg.forEach((ele) => {
-								temList.push(ele.url)
-							})
-							res.image = temList.join(";")
+							res.image = this.imgs.join(";")
 						}
 						res.feedbackItemName = "水费缴纳"
 
@@ -500,8 +518,8 @@
 						payCount: "1",
 						notPaySize: 0,
 						nowRealPayAmount: item.realPayAmount,
-						payerCardNumber: localStorage.card_number || "360721199802141618",
-						payerName: localStorage.studentName || "陈志斌"
+						payerCardNumber: localStorage.card_number,
+						payerName: localStorage.studentName
 					}
 				})
 				// console.log(res);
@@ -516,7 +534,7 @@
 					url: `/payorder/${item.payForIdentify}/create`,
 					method: "post",
 					data: {
-						id: item.id,
+						id: item.payinfoId,
 						studentNo: item.payForIdentify,
 						itemName: item.payItem,
 						payYear: item.payYear,
@@ -524,11 +542,11 @@
 						dorm: item.dorm,
 						payOrderLoan: item.payOrderLoan,
 						orderNotice: item.orderNotice,
-						payCount: "1",
+						payCount: "2",
 						notPaySize: 0,
 						nowRealPayAmount: item.nowPayAmount,
-						payerCardNumber: localStorage.card_number || "360721199802141618",
-						payerName: localStorage.studentName || "陈志斌"
+						payerCardNumber: localStorage.card_number,
+						payerName: localStorage.studentName
 					},
 				});
 				// console.log(res);
@@ -552,6 +570,7 @@
 						orderNo: this.orderNo,
 						openId: localStorage.openId,
 						secondOrderNo: "",
+						payment: "2"
 					},
 				});
 				// console.log(res);

pages/home/home.vue

@@ -16,12 +16,13 @@
 		<view class="bill">
 			<!-- 筛选框区域 -->
 			<view class="choose">
-				<view class="time">
-					<uni-data-select :clear="false" placeholder="请选择时间" :localdata="time_range" @change="changeTime">
+				<view class="time" v-if="isShow">
+					<uni-data-select :clear="false" :placeholder="time_value+''" :localdata="time_range"
+						@change="changeTime">
 					</uni-data-select>
 				</view>
-				<view class="type">
-					<uni-data-select :clear="false" placeholder="请选择支付状态" :localdata="type_range" @change="changeType">
+				<view class="type" v-if="isShow">
+					<uni-data-select :clear="false" placeholder="全部" :localdata="type_range" @change="changeType">
 					</uni-data-select>
 				</view>
 			</view>
@@ -29,7 +30,7 @@
 			<!-- 没有账单时展示的内容 -->
 			<view class="null" v-if="!list.length">
 				<img src="../../static/null.png">
-				<span>暂无账单,请选择条件查询</span>
+				<span>暂无账单</span>
 			</view>
 
 			<!-- 有账单时展示的内容 -->
@@ -105,7 +106,7 @@
 
 		<!-- 悬浮按钮区域 -->
 		<view v-if="roomSelect!='请选择宿舍'" class="suspend_button" @click="goBill" @touchstart="down"
-			@touchmove.prevent="move" @touchend="end">
+			@touchmove.prevent.stop="move" @touchend="end">
 			订单查询
 		</view>
 
@@ -272,9 +273,14 @@
 				},
 				//农商行地址
 				notifyUrl: "https://chtech.ncjti.edu.cn/jiaofei/jiaofei-api/tuitionpayment/pay/jxnxs/notify/",
+				// 反馈提交图片参数
+				imgs: []
 			};
 		},
 		onLoad() {
+			// 判断是否存在card_number，不存在则重新授权
+			this.getAuthorization();
+
 			// 如果之前已经选择过宿舍,则从缓存中读取
 			if (localStorage.room) {
 				this.roomSelect = "黄家湖" + localStorage.room
@@ -282,7 +288,25 @@
 				this.getTimeList()
 			}
 		},
+
 		methods: {
+			getAuthorization() {
+				let card_number = localStorage.getItem("card_number");
+				let studentName = localStorage.getItem("studentName");
+				let openId = localStorage.getItem("openId");
+				if (!card_number || !studentName || !openId) {
+					uni.showModal({
+						title: "提示",
+						content: "请先领取校园卡或授权后再进行相关操作",
+						showCancel: false,
+						success: () => {
+							uni.reLaunch({
+								url: "/pages/index/index",
+							});
+						},
+					});
+				}
+			},
 			// 获取账单列表数据
 			async getData() {
 				if (!this.time_value) {
@@ -320,8 +344,6 @@
 			select(e) {
 				e.tempFiles.forEach((item) => {
 					TranslateImage.translate(item.path, ((res) => {
-						// 先清空图片数组
-						this.valiFormData.feedbackImg = []
 						// 判断图片大小是否过大
 						if (Number(res.size) > 1000000) {
 							uni.showModal({
@@ -336,10 +358,13 @@
 						});
 						// 上传图片
 						uni.uploadFile({
-							url: `http://192.168.161.34:9999/tuitionpayment/feedbackmsg/uploadImage`,
+							url: `https://chtech.ncjti.edu.cn/jiaofei/jiaofei-api/tuitionpayment/feedbackmsg/uploadImage`,
 							filePath: res.url,
 							name: 'images',
 							success: (uploadFileRes) => {
+								// 收集提交请求所需要的图片参数数据
+								this.imgs.push((JSON.parse(uploadFileRes.data).data))
+								// 处理前端页面预览图片的数据
 								const path = item.path;
 								this.valiFormData.feedbackImg.push({
 									url: path,
@@ -358,7 +383,7 @@
 			handleDelete(e) {
 				const num = this.valiFormData.feedbackImg.findIndex(v => v.path === e.tempFilePath);
 				this.valiFormData.feedbackImg.splice(num, 1);
-				// console.log(this.valiFormData.feedbackImg);
+				this.imgs.splice(num, 1);
 			},
 			// 订单反馈按钮弹窗
 			async handleFeedback(item) {
@@ -368,11 +393,12 @@
 				this.valiFormData.feedbackRoom = "";
 				this.valiFormData.feedbackInfo = "";
 				this.valiFormData.feedbackImg = [];
+				this.imgs = [];
 
 				let res = await this.$myRequest({
 					url: "/wechat/getUserNameTele",
 					data: {
-						cardNumber: localStorage.card_number || "360721199802141618",
+						cardNumber: localStorage.card_number,
 					},
 				});
 				// console.log(res);
@@ -391,11 +417,7 @@
 					.then(async (res) => {
 						// 如果上传了图片,处理图片参数字段
 						if (res.feedbackImg.length) {
-							let temList = []
-							res.feedbackImg.forEach((ele) => {
-								temList.push(ele.url)
-							})
-							res.image = temList.join(";")
+							res.image = this.imgs.join(";")
 						}
 						res.feedbackItemName = "水费缴纳"
 
@@ -480,8 +502,8 @@
 						payCount: "1",
 						notPaySize: 0,
 						nowRealPayAmount: item.realPayAmount,
-						payerCardNumber: localStorage.card_number || "360721199802141618",
-						payerName: localStorage.studentName || "陈志斌"
+						payerCardNumber: localStorage.card_number,
+						payerName: localStorage.studentName
 					}
 				})
 				// console.log(res);
@@ -507,8 +529,8 @@
 						payCount: "1",
 						notPaySize: 0,
 						nowRealPayAmount: item.realPayAmount,
-						payerCardNumber: localStorage.card_number || "360721199802141618",
-						payerName: localStorage.studentName || "陈志斌"
+						payerCardNumber: localStorage.card_number,
+						payerName: localStorage.studentName
 					},
 				});
 				// console.log(res);
@@ -532,6 +554,7 @@
 						orderNo: this.orderNo,
 						openId: localStorage.openId,
 						secondOrderNo: "",
+						payment: "2"
 					},
 				});
 				// console.log(res);
@@ -662,14 +685,35 @@
 					phoneNumber: '82293462'
 				});
 			},
-		}
+			// 下拉刷新
+			onPullDownRefresh() {
+				if (localStorage.room) {
+					this.roomSelect = "黄家湖" + localStorage.room
+					this.getData()
+					this.getTimeList()
+				}
+				setTimeout(() => {
+					uni.stopPullDownRefresh();
+				}, 1500)
+			},
+		},
+		computed: {
+			// 计算出缓存中是否存在宿舍号
+			isShow() {
+				if (localStorage.room) {
+					return true
+				} else {
+					return false
+				}
+			}
+		},
 	}
 </script>
 
 <style lang="scss" scoped>
 	.container {
 		overflow: auto;
-		height: 100vh;
+		min-height: 100vh;
 		background-image: url(../../static/bg.png);
 		background-size: 100% 100%;
 
@@ -900,7 +944,8 @@
 	}
 
 	::v-deep .uni-select__input-placeholder {
-		color: #fff;
+		font-size: 28rpx;
+		color: #3a3a3a;
 	}
 
 	::v-deep .uniui-bottom::before {

pages/index/index.vue

@@ -9,8 +9,8 @@
 		data() {
 			return {
 				//线上服务器域名
-				// homeUrl: "https://chtech.ncjti.edu.cn/jiaofei/jiaofei-api",
-				homeUrl: "http://192.168.161.34:9999",
+				homeUrl: "https://chtech.ncjti.edu.cn/jiaofei/jiaofei-api",
+				// homeUrl: "http://192.168.161.34:9999",
 			}
 		},
 		onLoad() {
@@ -20,15 +20,13 @@
 		methods: {
 			//获取cardNumber
 			loginFilter() {
-				// let card_number = localStorage.getItem("card_number")
 				let card_number = localStorage.card_number
 				if (!card_number) {
 					let cardNumber = this.getQueryString("cardNumber");
 					if (!cardNumber) {
 						window.location.href =
-							`https://open.wecard.qq.com/connect/oauth/authorize?app_key=580DBB565097446B&response_type=code&scope=snsapi_userinfo&ocode=1015730314&redirect_uri=${this.homeUrl}/tuitionpayment/wechat/weixiao/auth/hjh/&connect=curLogin&state=${this.homeUrl}/tuitionpayment/wechat/weixiao/auth/hjh`;
+							`https://open.wecard.qq.com/connect/oauth/authorize?app_key=580DBB565097446B&response_type=code&scope=snsapi_userinfo&ocode=1015730314&redirect_uri=${this.homeUrl}/tuitionpayment/wechat/weixiao/auth/hjh/&connect=curLogin&state=${this.homeUrl}/tuitionpayment/wechat/weixiao/auth/hjh/`;
 					} else {
-						// localStorage.setItem("card_number", cardNumber)
 						localStorage.card_number = cardNumber
 						this.getStudentName()
 					}
@@ -39,13 +37,12 @@
 
 			// 获取学生姓名
 			getStudentName() {
-				// let studentName = localStorage.getItem("studentName")
 				let studentName = localStorage.studentName
 				if (!studentName) {
 					let studentName = this.getQueryString("name");
 					if (!studentName) {
 						window.location.href =
-							`https://open.wecard.qq.com/connect/oauth/authorize?app_key=580DBB565097446B&response_type=code&scope=snsapi_userinfo&ocode=1015730314&redirect_uri=${this.homeUrl}/tuitionpayment/wechat/weixiao/auth/hjh/&connect=curLogin&state=${this.homeUrl}/tuitionpayment/wechat/weixiao/auth/hjh`;
+							`https://open.wecard.qq.com/connect/oauth/authorize?app_key=580DBB565097446B&response_type=code&scope=snsapi_userinfo&ocode=1015730314&redirect_uri=${this.homeUrl}/tuitionpayment/wechat/weixiao/auth/hjh/&connect=curLogin&state=${this.homeUrl}/tuitionpayment/wechat/weixiao/auth/hjh/`;
 					} else {
 						localStorage.studentName = studentName
 						this.getOpenId()
@@ -55,23 +52,6 @@
 				}
 			},
 
-			// 获取学生手机号
-			// getStudentPhone() {
-			// 	let studentPhone = localStorage.studentPhone
-			// 	if (!studentPhone) {
-			// 		let studentPhone = this.getQueryString("name");
-			// 		if (!studentPhone) {
-			// 			window.location.href =
-			// 				`https://open.wecard.qq.com/connect/oauth/authorize?app_key=580DBB565097446B&response_type=code&scope=snsapi_userinfo&ocode=1015730314&redirect_uri=${this.homeUrl}/tuitionpayment/wechat/weixiao/auth/&connect=curLogin&state=${this.homeUrl}/tuitionpayment/wechat/weixiao/auth/`;
-			// 		} else {
-			// 			localStorage.studentPhone = studentPhone
-			// 			this.getOpenId()
-			// 		}
-			// 	} else {
-			// 		this.getOpenId()
-			// 	}
-			// },
-
 			//获取openId
 			getOpenId() {
 				// 从缓存获取openId，如果有的话

pages/pay/pay.vue

@@ -1,151 +0,0 @@
-<template>
-	<view class="container">
-		<view class="body">
-			<view class="form">
-
-				<view class="form_item">
-					<view class="form_item_key">收费单位</view>
-					<view class="form_item_value">南昌交通学院</view>
-				</view>
-
-				<view class="form_item">
-					<view class="form_item_key">宿舍</view>
-					<view class="form_item_value">{{room}}</view>
-				</view>
-
-				<view class="form_item">
-					<view class="form_item_key">时间</view>
-					<view class="form_item_value">{{info.title}}</view>
-				</view>
-
-				<view class="form_item">
-					<view class="form_item_key">上月表数</view>
-					<view class="form_item_value">{{info.last}}</view>
-				</view>
-
-				<view class="form_item">
-					<view class="form_item_key">本月表数</view>
-					<view class="form_item_value">{{info.current}}</view>
-				</view>
-
-				<view class="form_item">
-					<view class="form_item_key">用量</view>
-					<view class="form_item_value">{{info.use}}</view>
-				</view>
-
-				<view class="form_item">
-					<view class="form_item_key">补助吨数</view>
-					<view class="form_item_value">{{info.sub}}</view>
-				</view>
-
-				<view class="form_item">
-					<view class="form_item_key">实付款</view>
-					<view class="form_item_value">￥{{info.money}}</view>
-				</view>
-
-				<view class="info">
-					备注：{{info.notes}}
-				</view>
-
-				<view class="foot_button">
-					<button type="primary" @click="handlePay">支付</button>
-				</view>
-
-				<view class="foot_button bottom">
-					<button type="primary" plain @click="goBack">返回</button>
-				</view>
-
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				// 宿舍号
-				room: "",
-				// 账单数据
-				info: {},
-			};
-		},
-		onLoad(options) {
-			// 获取宿舍号
-			this.room = localStorage.room
-			// 从上一个页面获取账单数据
-			this.info = JSON.parse(options.info)
-			// 切割多余的字符
-			let index = this.info.title.indexOf("月", 0)
-			this.info.title = this.info.title.substring(0, index + 1)
-			console.log(this.info);
-		},
-		methods: {
-			handlePay() {
-				// console.log(123);
-				console.log("支付");
-			},
-			// 返回按钮回调
-			goBack() {
-				uni.redirectTo({
-					url: "/pages/home/home"
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.container {
-		width: 100%;
-		min-height: 100vh;
-		background-image: url(../../static/bg.png);
-		background-size: 100% 100%;
-
-		.body {
-			margin: 0 30rpx;
-			padding: 60rpx 0;
-
-			.form {
-				border-radius: 5px;
-				background-color: #fff;
-
-				.form_item {
-					display: flex;
-					align-items: center;
-					margin-left: 40rpx;
-					line-height: 100rpx;
-					border-bottom: 1px solid #D9D9D9;
-
-					.form_item_key {
-						width: 160rpx;
-						font-size: 32rpx;
-						color: #808080;
-						text-align-last: justify;
-					}
-
-					.form_item_value {
-						margin-left: 60rpx;
-						font-size: 32rpx;
-						font-weight: bold;
-					}
-				}
-
-				.info {
-					margin: 0 40rpx;
-					font-size: 24rpx;
-					color: #808080;
-				}
-
-				.foot_button {
-					margin-top: 30rpx;
-					padding: 0 40rpx;
-				}
-
-				.bottom {
-					padding-bottom: 50rpx;
-				}
-			}
-		}
-	}
-</style>

pages/select/select.vue

@@ -102,9 +102,28 @@
 			};
 		},
 		mounted() {
+			// 判断是否存在card_number，不存在则重新授权
+			this.getAuthorization();
 			this.getBuild()
 		},
 		methods: {
+			getAuthorization() {
+				let card_number = localStorage.getItem("card_number");
+				let studentName = localStorage.getItem("studentName");
+				let openId = localStorage.getItem("openId");
+				if (!card_number || !studentName || !openId) {
+					uni.showModal({
+						title: "提示",
+						content: "请先领取校园卡或授权后再进行相关操作",
+						showCancel: false,
+						success: () => {
+							uni.reLaunch({
+								url: "/pages/index/index",
+							});
+						},
+					});
+				}
+			},
 			// 获取楼栋数据
 			async getBuild() {
 				let res = await this.$myRequest({

unpackage/dist/build/h5/static/customicons.css

@@ -0,0 +1,20 @@
+@font-face {
+  font-family: "customicons"; /* Project id 2878519 */
+  src:url('/static/customicons.ttf') format('truetype');
+}
+
+.customicons {
+  font-family: "customicons" !important;
+}
+
+.youxi:before {
+  content: "\e60e";
+}
+
+.wenjian:before {
+  content: "\e60f";
+}
+
+.zhuanfa:before {
+  content: "\e610";
+}

util/api.js

@@ -1,7 +1,7 @@
 // 线上地址
-// const BASE_URL = "https://chtech.ncjti.edu.cn/jiaofei/jiaofei-api/tuitionpayment"
+const BASE_URL = "https://chtech.ncjti.edu.cn/jiaofei/jiaofei-api/tuitionpayment"
 // 本地地址
-const BASE_URL = "http://192.168.161.34:9999/tuitionpayment"
+// const BASE_URL = "http://192.168.161.34:9999/tuitionpayment"
 export const myRequest = (options) => {
 	uni.showLoading({
 		title: "加载中",
@@ -13,7 +13,7 @@ export const myRequest = (options) => {
 			method: options.method || "GET",
 			data: options.data || {},
 			header: {
-				'card_number': localStorage.getItem("card_number") || "360721199802141618"
+				'card_number': localStorage.getItem("card_number")
 			},
 			success: (res) => {
 				uni.hideLoading();