no message

pages/addOrEdit/addOrEdit.vue

@@ -14,7 +14,7 @@
 				<view class="body_box">
 					<view class="body_box_key">身份证号</view>
 					<view class="body_box_value">
-						<input class="input" type="text" placeholder="请输入身份证号" v-model="identity" />
+						<input class="input" type="text" placeholder="请输入身份证号" maxlength="18" v-model="identity" />
 					</view>
 				</view>
 
@@ -64,6 +64,9 @@ export default {
 	methods: {
 		// 确定按钮点击回调
 		handleSub() {
+			const reName = /^[\u4e00-\u9fa5]{2,4}$/
+			const rePhone = /^[1][3,4,5,7,8,9][0-9]{9}$/
+			const reIdentity = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
 			if (!this.name) {
 				uni.showToast({
 					title: '请输入姓名',
@@ -72,6 +75,13 @@ export default {
 				})
 				return
 			}
+			if (!reName.test(this.name)) {
+				uni.showToast({
+					title: '姓名格式有误',
+					icon: 'none'
+				})
+				return
+			}
 			if (!this.identity) {
 				uni.showToast({
 					title: '请输入身份证号',
@@ -80,6 +90,13 @@ export default {
 				})
 				return
 			}
+			if (!reIdentity.test(this.identity)) {
+				uni.showToast({
+					title: '身份证号码格式有误',
+					icon: 'none'
+				})
+				return
+			}
 			if (!this.phone) {
 				uni.showToast({
 					title: '请输入联系电话',
@@ -88,6 +105,13 @@ export default {
 				})
 				return
 			}
+			if (!rePhone.test(this.phone)) {
+				uni.showToast({
+					title: '电话号码格式有误',
+					icon: 'none'
+				})
+				return
+			}
 			if (this.type === '1') {
 				// 添加
 				this.add()

pages/affirmOrder/affirmOrder.vue

@@ -190,6 +190,8 @@ export default {
 		},
 		// 提交订单按钮回调
 		async goPagePay() {
+			const reName = /^[\u4e00-\u9fa5]{2,4}$/
+			const rePhone = /^[1][3,4,5,7,8,9][0-9]{9}$/
 			if (!this.clientName) {
 				uni.showToast({
 					title: '请输入住客姓名',
@@ -198,6 +200,13 @@ export default {
 				})
 				return
 			}
+			if (!reName.test(this.clientName)) {
+				uni.showToast({
+					title: '姓名格式有误',
+					icon: 'none'
+				})
+				return
+			}
 			if (!this.clientPhone) {
 				uni.showToast({
 					title: '请输入联系电话',
@@ -206,6 +215,13 @@ export default {
 				})
 				return
 			}
+			if (!rePhone.test(this.clientPhone)) {
+				uni.showToast({
+					title: '电话号码格式有误',
+					icon: 'none'
+				})
+				return
+			}
 
 			const res = await this.$myRequest({
 				url: '/mhotel/abkcreateOrder.action',

pages/detail/detail.vue

@@ -120,6 +120,10 @@
 							<view class="body_title">{{ roomInfo.hName }}</view>
 							<view class="body_tags">
 								<view class="tags_item">
+									<img class="img" src="../../static/index/place.png" />
+									{{ roomInfo.hAreas }}㎡
+								</view>
+								<view class="tags_item">
 									<img class="img" src="../../static/index/bed.png" />
 									1张大床房
 								</view>
@@ -128,10 +132,6 @@
 									wifi免费
 								</view>
 								<view class="tags_item">
-									<img class="img" src="../../static/index/place.png" />
-									{{ roomInfo.hAreas }}㎡
-								</view>
-								<view class="tags_item">
 									<img class="img" src="../../static/index/window.png" />
 									窗户位于走廊/窗户较小
 								</view>
@@ -231,8 +231,7 @@ export default {
 			const res = await this.$myRequest({
 				url: '/mhotel/ahpgetHouseByHotelId.action',
 				data: {
-					// hotelId: this.hotelId,
-					hotelId: 2,
+					hotelId: this.hotelId,
 					queryStartTime: this.queryStartTime,
 					queryEndTime: this.queryEndTime
 				}
@@ -305,7 +304,6 @@ export default {
 		},
 		// 点击 订 预定 按钮回调
 		goPageAffOrder(item) {
-			console.log(this.defaultDateMultiple)
 			let flag = uni.getStorageSync('openid')
 			if (flag) {
 				if (item.remainRooms) {

pages/index/index.vue

@@ -83,9 +83,15 @@ export default {
 							if (res[key] === 'accept') {
 								uni.showToast({
 									title: '订阅成功',
-									icon: 'success'
+									icon: 'success',
+									mask: true
 								})
 							} else if (res[key] === 'reject') {
+								uni.showToast({
+									title: '订阅失败',
+									icon: 'none',
+									mask: true
+								})
 							}
 						}
 					},

pages/pay/pay.vue

@@ -43,7 +43,7 @@
 		</view>
 
 		<!-- 提交订单区域 -->
-		<view class="btn" @click="handleSub">支付</view>
+		<view class="btn" @click="handleSub">确认支付</view>
 	</view>
 </template>
 
@@ -54,7 +54,9 @@ export default {
 			isChecked: true,
 			info: {},
 			// 倒计时时间（毫秒）
-			countDownTime: 1000 * 60 * 15
+			countDownTime: 1000 * 60 * 15,
+			// 订单进度模版id
+			templateOrder: 'ERU1ZY9IqwNkDxWyFJvo5VSE7ua-wey3SqhZgjqLDtU'
 		}
 	},
 	onLoad(options) {
@@ -64,26 +66,47 @@ export default {
 		console.log(this.info)
 	},
 	methods: {
-		// 点击支付按钮回调
-		handleSub() {
+		// 点击确认支付按钮回调
+		async handleSub() {
 			if (this.isChecked) {
-				// const res = await this.$myRequest({
-				// 	url: '/mhotel/abkcreateOrder.action',
-				// 	data: {
-				// 		houseId: this.info.detaliInfo.item.id,
-				// 		startTime: this.info.detaliInfo.queryStartTime,
-				// 		endTime: this.info.detaliInfo.queryEndTime,
-				// 		houseOrderNumber: this.info.houseOrderNumber,
-				// 		userName: this.info.userName,
-				// 		userPhone: this.info.userPhone,
-				// 		userId: uni.getStorageSync('userInfo').id
-				// 	}
-				// })
+				const res = await this.$myRequest({
+					url: '/mhotel/abkpay.action',
+					data: {
+						open_id: uni.getStorageSync('openid'),
+						bookingId: this.info.orderNo
+					}
+				})
 				// console.log(res)
-				// 1 支付成功  2 支付失败
-				// uni.navigateTo({
-				// 	url: '/pages/payStatus/payStatus?status=1'
-				// })
+				if (res.code === 200) {
+					uni.requestPayment({
+						provider: 'wxpay',
+						timeStamp: res.data.timeStamp,
+						nonceStr: res.data.nonceStr,
+						package: 'prepay_id=' + res.data.prepay_id,
+						signType: res.data.signType,
+						paySign: res.data.paySign,
+						success: (res) => {
+							if (res.errMsg == 'requestPayment:ok') {
+								uni.navigateTo({
+									url: '/pages/payStatus/payStatus?status=1'
+								})
+							} else {
+								uni.navigateTo({
+									url: '/pages/payStatus/payStatus?status=2'
+								})
+							}
+						},
+						fail: (err) => {
+							if (err.errMsg === 'requestPayment:fail cancel') {
+								uni.showToast({
+									title: '支付已取消',
+									icon: 'none',
+									mask: true
+								})
+							}
+						}
+					})
+				}
 			} else {
 				uni.showToast({
 					title: '请选择支付方式',

pages/payStatus/payStatus.vue

@@ -21,15 +21,54 @@ export default {
 		this.status = options.status
 		console.log(this.status)
 	},
+	onUnload() {
+		this.handleClickBtn()
+	},
 	methods: {
 		// 点击底部按钮回调
 		handleClickBtn() {
 			if (this.status === '1') {
-				uni.switchTab({
-					url: '/pages/home/home'
-				})
+				// 返回主页
+				this.getMessage()
 			} else if (this.status === '2') {
+				// 重新支付
+				uni.navigateBack(1)
 			}
+		},
+		// 订阅消息
+		getMessage() {
+			uni.requestSubscribeMessage({
+				tmplIds: [this.templateOrder],
+				success: (res) => {
+					for (let key in res) {
+						if (res[key] === 'accept') {
+							uni.showToast({
+								title: '订阅成功',
+								icon: 'success',
+								mask: true
+							})
+						} else if (res[key] === 'reject') {
+							uni.showToast({
+								title: '订阅失败',
+								icon: 'none',
+								mask: true
+							})
+						}
+					}
+					setTimeout(() => {
+						uni.switchTab({
+							url: '/pages/home/home'
+						})
+					}, 1500)
+				},
+				fail: (res) => {
+					console.log(2)
+					console.log(res)
+					uni.switchTab({
+						url: '/pages/home/home'
+					})
+				}
+			})
 		}
 	}
 }

pages/shopInfo/shopInfo.vue

@@ -19,6 +19,12 @@
 				<view class="btn_item type2" @click="handleAgain">重新绑定</view>
 			</view>
 		</view>
+
+		<view class="msg" @click="handleGoMsg">
+			点击查看
+			<text>数据中台</text>
+			<img src="../../static/index/right.png" />
+		</view>
 	</view>
 </template>
 
@@ -51,6 +57,9 @@ export default {
 			uni.navigateTo({
 				url: `/pages/binding/binding?status=${this.type}`
 			})
+		},
+		handleGoMsg() {
+			console.log(111)
 		}
 	}
 }
@@ -138,5 +147,20 @@ export default {
 			}
 		}
 	}
+
+	.msg {
+		margin-top: 33rpx;
+		font-size: 28rpx;
+
+		text {
+			margin: 0 10rpx;
+			color: #096562;
+		}
+
+		img {
+			width: 13rpx;
+			height: 20rpx;
+		}
+	}
 }
 </style>

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

@@ -9680,7 +9680,7 @@ var myRequest = function myRequest(options) {
           resolve(res.data);
         } else {
           uni.showToast({
-            title: "请求数据失败",
+            title: res.data.message,
             icon: "none",
             mask: true
           });

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

@@ -209,6 +209,9 @@ var _default = {
   methods: {
     // 确定按钮点击回调
     handleSub: function handleSub() {
+      var reName = /^[\u4e00-\u9fa5]{2,4}$/;
+      var rePhone = /^[1][3,4,5,7,8,9][0-9]{9}$/;
+      var reIdentity = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
       if (!this.name) {
         uni.showToast({
           title: '请输入姓名',
@@ -217,6 +220,13 @@ var _default = {
         });
         return;
       }
+      if (!reName.test(this.name)) {
+        uni.showToast({
+          title: '姓名格式有误',
+          icon: 'none'
+        });
+        return;
+      }
       if (!this.identity) {
         uni.showToast({
           title: '请输入身份证号',
@@ -225,6 +235,13 @@ var _default = {
         });
         return;
       }
+      if (!reIdentity.test(this.identity)) {
+        uni.showToast({
+          title: '身份证号码格式有误',
+          icon: 'none'
+        });
+        return;
+      }
       if (!this.phone) {
         uni.showToast({
           title: '请输入联系电话',
@@ -233,6 +250,13 @@ var _default = {
         });
         return;
       }
+      if (!rePhone.test(this.phone)) {
+        uni.showToast({
+          title: '电话号码格式有误',
+          icon: 'none'
+        });
+        return;
+      }
       if (this.type === '1') {
         // 添加
         this.add();

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

@@ -379,13 +379,15 @@ var _default = {
     goPagePay: function goPagePay() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var res, info;
+        var reName, rePhone, res, info;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                reName = /^[\u4e00-\u9fa5]{2,4}$/;
+                rePhone = /^[1][3,4,5,7,8,9][0-9]{9}$/;
                 if (_this.clientName) {
-                  _context.next = 3;
+                  _context.next = 5;
                   break;
                 }
                 uni.showToast({
@@ -394,9 +396,19 @@ var _default = {
                   mask: true
                 });
                 return _context.abrupt("return");
-              case 3:
+              case 5:
+                if (reName.test(_this.clientName)) {
+                  _context.next = 8;
+                  break;
+                }
+                uni.showToast({
+                  title: '姓名格式有误',
+                  icon: 'none'
+                });
+                return _context.abrupt("return");
+              case 8:
                 if (_this.clientPhone) {
-                  _context.next = 6;
+                  _context.next = 11;
                   break;
                 }
                 uni.showToast({
@@ -405,8 +417,18 @@ var _default = {
                   mask: true
                 });
                 return _context.abrupt("return");
-              case 6:
-                _context.next = 8;
+              case 11:
+                if (rePhone.test(_this.clientPhone)) {
+                  _context.next = 14;
+                  break;
+                }
+                uni.showToast({
+                  title: '电话号码格式有误',
+                  icon: 'none'
+                });
+                return _context.abrupt("return");
+              case 14:
+                _context.next = 16;
                 return _this.$myRequest({
                   url: '/mhotel/abkcreateOrder.action',
                   data: {
@@ -419,7 +441,7 @@ var _default = {
                     userId: uni.getStorageSync('userInfo').id
                   }
                 });
-              case 8:
+              case 16:
                 res = _context.sent;
                 // console.log(res)
                 if (res.code === 200) {
@@ -435,7 +457,7 @@ var _default = {
                     url: "/pages/pay/pay?info=".concat(info)
                   });
                 }
-              case 10:
+              case 18:
               case "end":
                 return _context.stop();
             }

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

@@ -134,9 +134,9 @@ var render = function () {
   var m3 = __webpack_require__(/*! ../../static/index/phone.png */ 135)
   var g0 = _vm.list.length
   var m4 = g0 ? __webpack_require__(/*! ../../static/index/close.png */ 136) : null
-  var m5 = g0 ? __webpack_require__(/*! ../../static/index/bed.png */ 137) : null
-  var m6 = g0 ? __webpack_require__(/*! ../../static/index/wifi.png */ 138) : null
-  var m7 = g0 ? __webpack_require__(/*! ../../static/index/place.png */ 139) : null
+  var m5 = g0 ? __webpack_require__(/*! ../../static/index/place.png */ 139) : null
+  var m6 = g0 ? __webpack_require__(/*! ../../static/index/bed.png */ 137) : null
+  var m7 = g0 ? __webpack_require__(/*! ../../static/index/wifi.png */ 138) : null
   var m8 = g0 ? __webpack_require__(/*! ../../static/index/window.png */ 140) : null
   var m9 = g0 ? __webpack_require__(/*! ../../static/index/phone2.png */ 141) : null
   var m10 = !g0 ? __webpack_require__(/*! ../../static/images/noData.png */ 49) : null
@@ -442,8 +442,7 @@ var _default = {
                 return _this2.$myRequest({
                   url: '/mhotel/ahpgetHouseByHotelId.action',
                   data: {
-                    // hotelId: this.hotelId,
-                    hotelId: 2,
+                    hotelId: _this2.hotelId,
                     queryStartTime: _this2.queryStartTime,
                     queryEndTime: _this2.queryEndTime
                   }
@@ -526,7 +525,6 @@ var _default = {
     },
     // 点击 订 预定 按钮回调
     goPageAffOrder: function goPageAffOrder(item) {
-      console.log(this.defaultDateMultiple);
       var flag = uni.getStorageSync('openid');
       if (flag) {
         if (item.remainRooms) {

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

@@ -226,9 +226,16 @@ var _default = {
               if (res[key] === 'accept') {
                 uni.showToast({
                   title: '订阅成功',
-                  icon: 'success'
+                  icon: 'success',
+                  mask: true
                 });
-              } else if (res[key] === 'reject') {}
+              } else if (res[key] === 'reject') {
+                uni.showToast({
+                  title: '订阅失败',
+                  icon: 'none',
+                  mask: true
+                });
+              }
             }
           },
           fail: function fail(res) {

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

@@ -169,10 +169,13 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 52));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 54));
 //
 //
 //
@@ -228,7 +231,9 @@ var _default = {
       isChecked: true,
       info: {},
       // 倒计时时间（毫秒）
-      countDownTime: 1000 * 60 * 15
+      countDownTime: 1000 * 60 * 15,
+      // 订单进度模版id
+      templateOrder: 'ERU1ZY9IqwNkDxWyFJvo5VSE7ua-wey3SqhZgjqLDtU'
     };
   },
   onLoad: function onLoad(options) {
@@ -238,32 +243,74 @@ var _default = {
     console.log(this.info);
   },
   methods: {
-    // 点击支付按钮回调
+    // 点击确认支付按钮回调
     handleSub: function handleSub() {
-      if (this.isChecked) {
-        // const res = await this.$myRequest({
-        // 	url: '/mhotel/abkcreateOrder.action',
-        // 	data: {
-        // 		houseId: this.info.detaliInfo.item.id,
-        // 		startTime: this.info.detaliInfo.queryStartTime,
-        // 		endTime: this.info.detaliInfo.queryEndTime,
-        // 		houseOrderNumber: this.info.houseOrderNumber,
-        // 		userName: this.info.userName,
-        // 		userPhone: this.info.userPhone,
-        // 		userId: uni.getStorageSync('userInfo').id
-        // 	}
-        // })
-        // console.log(res)
-        // 1 支付成功  2 支付失败
-        // uni.navigateTo({
-        // 	url: '/pages/payStatus/payStatus?status=1'
-        // })
-      } else {
-        uni.showToast({
-          title: '请选择支付方式',
-          icon: 'none'
-        });
-      }
+      var _this = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var res;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                if (!_this.isChecked) {
+                  _context.next = 7;
+                  break;
+                }
+                _context.next = 3;
+                return _this.$myRequest({
+                  url: '/mhotel/abkpay.action',
+                  data: {
+                    open_id: uni.getStorageSync('openid'),
+                    bookingId: _this.info.orderNo
+                  }
+                });
+              case 3:
+                res = _context.sent;
+                // console.log(res)
+                if (res.code === 200) {
+                  uni.requestPayment({
+                    provider: 'wxpay',
+                    timeStamp: res.data.timeStamp,
+                    nonceStr: res.data.nonceStr,
+                    package: 'prepay_id=' + res.data.prepay_id,
+                    signType: res.data.signType,
+                    paySign: res.data.paySign,
+                    success: function success(res) {
+                      if (res.errMsg == 'requestPayment:ok') {
+                        uni.navigateTo({
+                          url: '/pages/payStatus/payStatus?status=1'
+                        });
+                      } else {
+                        uni.navigateTo({
+                          url: '/pages/payStatus/payStatus?status=2'
+                        });
+                      }
+                    },
+                    fail: function fail(err) {
+                      if (err.errMsg === 'requestPayment:fail cancel') {
+                        uni.showToast({
+                          title: '支付已取消',
+                          icon: 'none',
+                          mask: true
+                        });
+                      }
+                    }
+                  });
+                }
+                _context.next = 8;
+                break;
+              case 7:
+                uni.showToast({
+                  title: '请选择支付方式',
+                  icon: 'none'
+                });
+              case 8:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
     },
     // 点击支付方式回调
     handleChange: function handleChange() {

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

@@ -163,14 +163,54 @@ var _default = {
     this.status = options.status;
     console.log(this.status);
   },
+  onUnload: function onUnload() {
+    this.handleClickBtn();
+  },
   methods: {
     // 点击底部按钮回调
     handleClickBtn: function handleClickBtn() {
       if (this.status === '1') {
-        uni.switchTab({
-          url: '/pages/home/home'
-        });
-      } else if (this.status === '2') {}
+        // 返回主页
+        this.getMessage();
+      } else if (this.status === '2') {
+        // 重新支付
+        uni.navigateBack(1);
+      }
+    },
+    // 订阅消息
+    getMessage: function getMessage() {
+      uni.requestSubscribeMessage({
+        tmplIds: [this.templateOrder],
+        success: function success(res) {
+          for (var key in res) {
+            if (res[key] === 'accept') {
+              uni.showToast({
+                title: '订阅成功',
+                icon: 'success',
+                mask: true
+              });
+            } else if (res[key] === 'reject') {
+              uni.showToast({
+                title: '订阅失败',
+                icon: 'none',
+                mask: true
+              });
+            }
+          }
+          setTimeout(function () {
+            uni.switchTab({
+              url: '/pages/home/home'
+            });
+          }, 1500);
+        },
+        fail: function fail(res) {
+          console.log(2);
+          console.log(res);
+          uni.switchTab({
+            url: '/pages/home/home'
+          });
+        }
+      });
     }
   }
 };

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

@@ -103,11 +103,13 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var m0 = __webpack_require__(/*! ../../static/my/shopImg3.png */ 237)
+  var m1 = __webpack_require__(/*! ../../static/index/right.png */ 133)
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
         m0: m0,
+        m1: m1,
       },
     }
   )
@@ -174,6 +176,12 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -202,6 +210,9 @@ var _default = {
       uni.navigateTo({
         url: "/pages/binding/binding?status=".concat(this.type)
       });
+    },
+    handleGoMsg: function handleGoMsg() {
+      console.log(111);
     }
   }
 };

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

@@ -95,4 +95,16 @@
   color: #fff;
   background-color: #096562;
 }
+.container .msg.data-v-aa1199f4 {
+  margin-top: 33rpx;
+  font-size: 28rpx;
+}
+.container .msg text.data-v-aa1199f4 {
+  margin: 0 10rpx;
+  color: #096562;
+}
+.container .msg ._img.data-v-aa1199f4 {
+  width: 13rpx;
+  height: 20rpx;
+}
 

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

@@ -9,7 +9,7 @@
       "list": [
         {
           "name": "",
-          "pathName": "pages/my/my",
+          "pathName": "pages/shopInfo/shopInfo",
           "query": "",
           "launchMode": "default",
           "scene": null

util/api.js

@@ -19,7 +19,7 @@ export const myRequest = (options) => {
 					resolve(res.data)
 				} else {
 					uni.showToast({
-						title: "请求数据失败",
+						title: res.data.message,
 						icon: "none",
 						mask: true
 					})