no message

pages/recharge/recharge.vue

@@ -49,7 +49,7 @@
 			// 系统正在维护...
 			if (this.test == 'weihuzhong') {
 				uni.redirectTo({
-					url: '/pages/index/index'
+					url: '../../pages/index/index'
 				})
 
 				return;

pages/reshui/reshui.vue

@@ -343,7 +343,7 @@
 							this.stu_number = userinfo.card_number
 						} else {
 							uni.navigateTo({
-								url: '/pages/index/index?from=' + options.from
+								url: '../../pages/index/index?from=' + options.from
 							})
 
 							uni.showToast({
@@ -440,7 +440,7 @@
 						});
 
 						uni.navigateTo({
-							url: '/pages/index/index?from=' + options.from
+							url: '../../pages/index/index?from=' + options.from
 						})
 					}
 				} else if (res.data.mess == '未查询到用户信息') {
@@ -453,11 +453,11 @@
 
 					if (options && typeof(options.from) != 'undefined' && typeof(options.from) != '') {
 						uni.navigateTo({
-							url: '/pages/index/index?from=' + options.from
+							url: '../../pages/index/index?from=' + options.from
 						})
 					} else {
 						uni.redirectTo({
-							url: '/pages/index/index?from=0'
+							url: '../../pages/index/index?from=0'
 						});
 					}
 				}

pagesAir/accountBalance/accountBalance.vue

@@ -102,7 +102,7 @@
 							this.id_card = userinfo.id_card
 						} else {
 							uni.navigateTo({
-								url: '/pages/index/index?from=' + options.from
+								url: '../../pages/index/index?from=' + options.from
 							})
 
 							uni.showToast({

pagesAir/addAir/addAir.vue

@@ -149,7 +149,7 @@
 							this.user_name = userinfo.name
 						} else {
 							uni.navigateTo({
-								url: '/pages/index/index?from=' + options.from
+								url: '../../pages/index/index?from=' + options.from
 							})
 
 							uni.showToast({

pagesAir/rechargeRecord/rechargeRecord.vue

@@ -95,7 +95,7 @@
 							this.id_card = userinfo.id_card
 						} else {
 							uni.navigateTo({
-								url: '/pages/index/index?from=' + options.from
+								url: '../../pages/index/index?from=' + options.from
 							})
 
 							uni.showToast({

pagesAir/shareAir/shareAir.vue

@@ -402,7 +402,7 @@
 							this.id_card = userinfo.id_card
 						} else { // 还没有需要跳转到首页进行获取
 							uni.navigateTo({
-								url: '/pages/index/index?from=' + options.from
+								url: '../../pages/index/index?from=' + options.from
 							})
 
 							uni.showToast({
@@ -495,11 +495,11 @@
 
 					if (options && typeof(options.from) != 'undefined' && typeof(options.from) != '') {
 						uni.navigateTo({
-							url: '/pages/index/index?from=' + options.from
+							url: '../../pages/index/index?from=' + options.from
 						})
 					} else {
 						uni.redirectTo({
-							url: '/pages/index/index?from=0'
+							url: '../../pages/index/index?from=0'
 						});
 					}
 				}

pagesAir/stdBookMgr/stdBookMgr.vue

@@ -125,7 +125,7 @@
 							this.id_card = userinfo.id_card
 						} else {
 							uni.navigateTo({
-								url: '/pages/index/index?from=' + options.from
+								url: '../../pages/index/index?from=' + options.from
 							})
 
 							uni.showToast({

pagesElectric/dfxq/dfxq.vue

@@ -77,11 +77,14 @@
 		},
 		onLoad(options) {
 			try {
-				// console.log(options);
-				this.stu_number = options.card_number;
-				this.roomSelect = options.roomSelect;
-				// this.stu_number = this.$store.state.userInfo.card_number
-				// this.roomSelect = this.$store.state.building.roomSelect
+				this.stu_number = uni.getStorageSync('stu_number');
+				this.roomSelect = uni.getStorageSync('roomSelect');
+				if (this.stu_number == '' || this.roomSelect == '' || typeof(this.stu_number) == 'undefined' || typeof(this
+						.roomSelect) == 'undefined') {
+					// console.log(options);
+					this.stu_number = options.card_number;
+					this.roomSelect = options.roomSelect;
+				}
 
 				if (this.stu_number == '' || this.roomSelect == '' || typeof(this.stu_number) == 'undefined' || typeof(this
 						.roomSelect) == 'undefined') {
@@ -98,7 +101,7 @@
 							this.roomSelect = userinfo.campus + userinfo.dorm_number
 						} else {
 							uni.redirectTo({
-								url: '/pages/index/index'
+								url: '../../pages/index/index'
 							})
 
 							uni.showToast({

pagesElectric/jiaofei/jiaofei.vue

@@ -54,6 +54,7 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 export default {
 	data() {
 		return {
@@ -154,6 +155,61 @@ export default {
 						this.img_url = tmpData[i].url
 						tf = true
 					}
+=======
+	export default {
+		data() {
+			return {
+				roomSelect: '', //校区宿舍号
+				remainElec: 0.00.toFixed(2), //剩余电量
+				add_class: '', //增加class属性
+				amount: '',
+				sub_appid: '', //商户号
+				xiaofei_items: '', // 消费记录
+				dorm_number: '', //栋宿舍号
+				stu_number: '',
+				compus: '', //校区
+				ceshi: 'code',
+				test: this.$store.state.test,
+				img_url: ''
+			}
+		},
+		onLoad(options) {
+			// console.log(options);
+			if (typeof(options.from) != 'undefined' && options.from == 2) {
+				wx.navigateTo({
+					url: '../../pages/index/index?from=' + options.from
+				});
+				return;
+			}
+			// 系统正在维护...
+			if (this.test == 'weihuzhong') {
+				wx.redirectTo({
+					url: '../../pages/index/index'
+				});
+				return;
+			}
+			// 测试环境
+			if (this.test) {
+				this.amount = 0.01;
+			}
+			// 获取基本信息
+			this.get_base_info(options, 'onLoad');
+			this.get_img();
+		},
+		onShow() {
+			// 获取基本信息
+			// this.get_base_info('options', 'onShow')
+			// 获取电量
+			if (this.$store.state.building.roomSelect != '') {
+				// 如果是选择宿舍号返回
+				this.roomSelect = this.$store.state.building.roomSelect;
+				this.add_class = this.$store.state.building.add_class;
+				this.dorm_number = this.$store.state.building.dorm_number;
+				
+				this.add_class = 1;
+				if (this.roomSelect && typeof(this.roomSelect) != 'undefined') {
+					this.getDianLiang();
+>>>>>>> 6053889f3dfa6311a84f90e852b785418b4083da
 				}
 
 				if (tf == false) {
@@ -252,6 +308,7 @@ export default {
 				console.log(e)
 			}
 
+<<<<<<< HEAD
 			// 初始化参数
 			this.$store.state.building.add_class = 0
 
@@ -270,19 +327,300 @@ export default {
 						if (param == 'comfirm') {
 							// 组合地址，发起支付
 							_this.jsapi(res.code)
+=======
+				if (this.roomSelect == '' || typeof this.roomSelect == 'undefined') {
+					uni.showToast({
+						title: '请再次选择宿舍',
+						icon: 'success'
+					})
+				} else {
+					uni.navigateTo({
+						url: '../dfxq/dfxq?rooSelect=' + this.roomSelect + '&card_number=' + this.stu_number,
+						success: function(res) {
+						}
+					});
+				}
+
+			},
+			/**
+			 * 水费详情页面
+			 */
+			sfxq_click() {
+				if (this.haveSelectRoom()) {
+					return;
+				}
+
+				if (this.roomSelect == '' || typeof this.roomSelect == 'undefined') {
+					uni.showToast({
+						title: '请再次选择宿舍',
+						icon: 'success'
+					})
+				} else {
+					uni.navigateTo({
+						url: '../sfxq/sfxq?rooSelect=' + this.roomSelect + '&card_number=' + this.stu_number,
+						success: function(res) {
+						}
+					});
+				}
+			},
+			/**
+			 * 跳转到ad页面
+			 */
+			ad_redirect() {
+				uni.navigateTo({
+					url: 'ad_dianfei'
+				})
+			},
+			/**
+			 * 获取基本信息
+			 */
+			get_base_info(options, param) {
+				try {
+					if (this.stu_number == '' || typeof(this.stu_number) == 'undefined') {
+						// 获取学号
+						this.stu_number = this.$store.state.userInfo.card_number
+					}
+
+					if (this.stu_number == '' || typeof(this.stu_number) == 'undefined') {
+						const userinfo = uni.getStorageSync('userinfo_storage_key')
+						if (userinfo) {
+							this.stu_number = userinfo.card_number
+>>>>>>> 6053889f3dfa6311a84f90e852b785418b4083da
 						} else {
 							// 请求服务器，获得openid
 							_this.getOpenId(options, res.code)
 						}
+<<<<<<< HEAD
 					} else {
+=======
+					}
+				} catch (e) {
+					console.log(e);
+				}
+				
+				// 初始化参数
+				this.$store.state.building.add_class = 0;
+
+				// 获取code
+				this.getCode(options, param)
+			},
+			/**
+			 * 获取code
+			 */
+			getCode(options, param) {
+				// console.log(options, param)
+				var _this = this;
+				uni.login({
+					success: (res) => {
+						if (res.code) {
+							if (param == 'comfirm') {
+								// 组合地址，发起支付
+								_this.jsapi(res.code)
+							} else {
+								// 请求服务器，获得openid
+								_this.getOpenId(options, res.code)
+							}
+						} else {
+							uni.showToast({
+								title: res.errMsg,
+								icon: 'none'
+							});
+
+							// 跳转到首页
+							uni.redirectTo({
+								url: '../../pages/index/index?from=0'
+							});
+						}
+					}
+				})
+			},
+			/**
+			 * 请求服务器，获得openid
+			 */
+			async getOpenId(options, param_code) {
+				// console.log(options, param_code)
+				var _this = this;
+				if (param_code != '') {
+					const res = await this.$myRequest({
+						host: _this.ceshi,
+						url: '/HotWaters/wpget_stu.action',
+						method: 'POST',
+						header: {
+							'content-type': 'application/x-www-form-urlencoded'
+						},
+						data: {
+							code: param_code
+						}
+					})
+
+					// console.log('获得openid', res);
+					if (res.data.mess == '返回成功') {
+						if (!(this.$store.state.building.roomSelect && typeof this.$store.state.building.roomSelect !=
+								'undefined')) {
+							// 栋宿舍号
+							this.dorm_number = res.data.info[0].build + res.data.info[0].dom
+							// 校区
+							this.compus = res.data.info[0].campus
+							// 填充校区宿舍号
+							if (typeof(this.dorm_number.split('栋')[1]) == 'undefined') {
+								this.roomSelect = this.compus + ''
+							} else {
+								this.roomSelect = this.compus + this.dorm_number.split('栋')[1]
+							}
+							// 存储选择
+							this.$store.state.building.roomSelect = this.roomSelect
+							// 样式
+							this.add_class = 1
+						}
+						
+						// 请求选定的月份消费记录
+						this.getDianLiang()
+					} else if (res.data.mess == '未查询到用户信息') {
+						// 数据库中 未查询到用户信息，就清除本地存储
+						uni.removeStorageSync('userinfo_storage_key');
+
+>>>>>>> 6053889f3dfa6311a84f90e852b785418b4083da
 						uni.showToast({
 							title: res.errMsg,
 							icon: 'none'
 						})
 
 						// 跳转到首页
+<<<<<<< HEAD
 						uni.redirectTo({
 							url: '../../pages/index/index?from=0'
+=======
+						if (options && typeof(options.from) != 'undefined' && typeof(options.from) != '') {
+							uni.navigateTo({
+								url: '../../pages/index/index?from=' + options.from
+							})
+						} else {
+							uni.redirectTo({
+								url: '../../pages/index/index/index?from=0'
+							});
+						}
+					}
+
+					if (this.roomSelect == '' || typeof this.roomSelect == 'undefined' || !this.roomSelect) {
+						const userinfo = uni.getStorageSync('userinfo_storage_key')
+						if (userinfo && typeof(userinfo) != 'undefined' && typeof(userinfo.campus) != 'undefined' &&
+							typeof(userinfo.dorm_number) != 'undefined' && userinfo.campus != '' && userinfo
+							.dorm_number != '') {
+							this.roomSelect = userinfo.campus + userinfo.dorm_number
+						} else {
+							this.roomSelect = '请选择宿舍号'
+						}
+					}
+				} else {
+					uni.showToast({
+						title: 'code为空！',
+						icon: 'success'
+					});
+				}
+			},
+			/**
+			 * 取得电费额度
+			 */
+			async getDianLiang() {
+				var _this = this;
+				if (this.roomSelect != '' && typeof(this.roomSelect) != 'undefined') {
+					const res = await this.$myRequest({
+						host: _this.ceshi,
+						url: '/HotWaters/buildoverElec.action',
+						method: 'POST',
+						header: {
+							'content-type': 'application/x-www-form-urlencoded'
+						},
+						data: {
+							'roomSelect': _this.roomSelect
+						}
+					})
+
+					// console.log('取得电费额度', res);
+					if (res.data.mess == '0') {
+						setTimeout(() => {
+							_this.remainElec = res.data.amount.toFixed(2)
+						}, 30);
+					} else {
+						this.remainElec = 0.00.toFixed(2)
+					}
+				} else {
+					uni.showToast({
+						title: '请先选择宿舍号，\n再查询详情 或 充值',
+						icon: 'none',
+						duration: 3000
+					});
+				}
+			},
+
+			//跳转到选择页面
+			navigateToSelect() {
+				uni.navigateTo({
+					url: '../select/select',
+				});
+			},
+			// 是否选择了宿舍号
+			haveSelectRoom() {
+				if (this.roomSelect == '请选择宿舍') {
+					uni.showToast({
+						title: '请选择宿舍',
+						icon: 'success'
+					})
+					return true
+				}
+				
+				uni.setStorageSync('roomSelect', this.roomSelect);
+				uni.setStorageSync('stu_number', this.stu_number);
+
+				return false
+			},
+
+			//跳转到台账页面
+			navigateToShow(e) {
+				if (this.haveSelectRoom()) {
+					return
+				}
+
+				if (this.roomSelect == '' || typeof this.roomSelect == 'undefined') {
+					uni.showToast({
+						title: '请再次选择宿舍号',
+						icon: 'success'
+					})
+				} else {
+					uni.navigateTo({
+						url: '../show/show?rooSelect=' + this.roomSelect + '&card_number=' + this.stu_number,
+						success: function(res) {
+						}
+					});
+				}
+			},
+
+			/**
+			 * 增加固定金额
+			 */
+			add_money(e) {
+				this.amount = e.currentTarget.dataset.item
+			},
+			/**
+			 * 确认宿舍号
+			 */
+			confirm_room(op) {
+				// 检查房间号
+				if (this.roomSelect == '' || this.roomSelect == '请选择宿舍号') {
+					uni.showToast({
+						title: '请选择宿舍号',
+						icon: 'success'
+					})
+					return
+				}
+				// 输入金额进行充值
+				if (op == 'input_money') {
+					//判断输入是否为空或不是数字
+					if (this.amount == '' || this.amount == null || this.amount == 0) {
+						uni.showToast({
+							title: '请输入充值金额',
+							duration: 2000
+>>>>>>> 6053889f3dfa6311a84f90e852b785418b4083da
 						})
 					}
 				}

pagesElectric/sfxq/sfxq.vue

@@ -77,25 +77,28 @@
 		},
 		onLoad(options) {
 			try {
-				// console.log(options);
-				this.stu_number = options.card_number;
-				this.roomSelect = options.roomSelect;
-				// this.stu_number = this.$store.state.userInfo.card_number
-				// this.roomSelect = this.$store.state.building.roomSelect
+				this.stu_number = uni.getStorageSync('stu_number');
+				this.roomSelect = uni.getStorageSync('roomSelect');
+				if (this.stu_number == '' || this.roomSelect == '' || typeof(this.stu_number) == 'undefined' || typeof(this
+						.roomSelect) == 'undefined') {
+					// console.log(options);
+					this.stu_number = options.card_number;
+					this.roomSelect = options.roomSelect;
+				}
 
-				if (this.stu_number == '' || this.roomSelect == '' || typeof(this.stu_number) == 'undefined' || typeof(this.roomSelect) == 'undefined') {
+				if (this.stu_number == '' || this.roomSelect == '' || typeof this.stu_number == 'undefined' || typeof this.roomSelect == 'undefined') {
 					// 获取学号
 					this.stu_number = this.$store.state.userInfo.card_number
 					this.roomSelect = this.$store.state.building.roomSelect
 
-					if (this.stu_number == '' || this.roomSelect == '' || typeof(this.stu_number) == 'undefined' || typeof(this.roomSelect) == 'undefined') {
+					if (this.stu_number == '' || this.roomSelect == '' || typeof this.stu_number == 'undefined' || typeof this.roomSelect == 'undefined') {
 						const userinfo = uni.getStorageSync('userinfo_storage_key')
 						if (userinfo) {
 							this.stu_number = userinfo.card_number
 							this.roomSelect = userinfo.campus + userinfo.dorm_number
 						} else {
 							uni.redirectTo({
-								url: '/pages/index/index'
+								url: '../../pages/index/index'
 							})
 
 							uni.showToast({
@@ -259,7 +262,7 @@
 							totalMoney
 						});
 					}
-					
+
 					this.tableData = tableData.filter(function(item, index, self) {
 						return index === self.findIndex(function(t) {
 							return t.dataTime === item.dataTime && t.totalPower === item.totalPower && t.totalMoney === item.totalMoney;

pagesElectric/show/show.vue

@@ -103,12 +103,14 @@
 		},
 		onLoad(options) {
 			try {
-				// console.log(options);
-				// 获取学号
-				this.roomSelect = options.rooSelect;
-				this.stu_number = options.card_number;
-				// this.stu_number = this.$store.state.userInfo.card_number
-				// this.roomSelect = this.$store.state.building.roomSelect
+				this.stu_number = uni.getStorageSync('stu_number');
+				this.roomSelect = uni.getStorageSync('roomSelect');
+				if (this.stu_number == '' || this.roomSelect == '' || typeof(this.stu_number) == 'undefined' || typeof(this
+						.roomSelect) == 'undefined') {
+					// console.log(options);
+					this.stu_number = options.card_number;
+					this.roomSelect = options.roomSelect;
+				}
 
 				if (this.stu_number == '' || this.roomSelect == '' || typeof this.stu_number == 'undefined' || typeof this.roomSelect == 'undefined') {
 					const userinfo = uni.getStorageSync('userinfo_storage_key')
@@ -117,7 +119,7 @@
 						this.roomSelect = userinfo.campus + userinfo.dorm_number
 					} else {
 						uni.redirectTo({
-							url: '/pages/index/index'
+							url: '../../pages/index/index'
 						})
 
 						uni.showToast({

pagesWater/reshuiDetails/reshuiDetails.vue

@@ -58,7 +58,7 @@
 						this.roomSelect = userinfo.campus + userinfo.dorm_number
 					} else {
 						uni.redirectTo({
-							url: '/pages/index/index'
+							url: '../../pages/index/index'
 						})
 
 						uni.showToast({