Merge branch 'master' of http://140.143.224.240:8100/hooloo/mp/user

orderSubPackage/pages/settlement/index.vue

@@ -216,15 +216,20 @@ export default {
 		messageAndSave() {
 			wx.requestSubscribeMessage({
 				tmplIds: ['1uErx-15S-3vuopXSvvsxCeM_Jd-1iZC-nXzd2yW3QU', 'Q4HDwBEvpTXpwtZktqWm4SZOTEuQK1x48xjqjD2GqyM', 'Fu_CPIXa0cnJ4EDdVKqFQ3qqKJccMqt2oorI5mfNq74'],
-				success: () => {
+				success: (res) => {
+					const finalValue = Object.values(res).indexOf('reject')
+					if(finalValue===-1){
 						uni.setStorageSync('isMessage', 'true')
 						User.setAllow(1)
 						this.saveReserve()
-				},
-				fail: () => {
+					}else{
 						User.setAllow(2)
 						this.saveReserve()
 					}
+				},
+				fail: (err) => {
+					console.log(err);
+				}
 			})
 		},
 		//结算组装数据发起订单