| 
																	
																	
																		
																	
																	
																 | 
																@@ -306,7 +306,14 @@ Page({ | 
															
														
														
													
														
															
																 | 
																 | 
																     */ | 
																 | 
																 | 
																     */ | 
															
														
														
													
														
															
																 | 
																 | 
																    let that = this; | 
																 | 
																 | 
																    let that = this; | 
															
														
														
													
														
															
																 | 
																 | 
																    if (orderGroupId == 0) { | 
																 | 
																 | 
																    if (orderGroupId == 0) { | 
															
														
														
													
														
															
																 | 
																 | 
																      data.orderGroupId = orderGroupId | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      data.orderGroupId = orderGroupId, | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      that.setData({ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        isFromSpell:true | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      }) | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																    }else{ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      that.setData({ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																        isFromSpell: false | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																      }) | 
															
														
														
													
														
															
																 | 
																 | 
																    } | 
																 | 
																 | 
																    } | 
															
														
														
													
														
															
																 | 
																 | 
																    Http.get({ | 
																 | 
																 | 
																    Http.get({ | 
															
														
														
													
														
															
																 | 
																 | 
																        url: config.api.checkPhoneStatus, | 
																 | 
																 | 
																        url: config.api.checkPhoneStatus, | 
															
														
														
													
												
													
														
															
																| 
																	
																		
																	
																	
																		
																	
																	
																 | 
																@@ -393,9 +400,16 @@ Page({ | 
															
														
														
													
														
															
																 | 
																 | 
																            success: function (res) { | 
																 | 
																 | 
																            success: function (res) { | 
															
														
														
													
														
															
																 | 
																 | 
																              console.log(res.confirm) | 
																 | 
																 | 
																              console.log(res.confirm) | 
															
														
														
													
														
															
																 | 
																 | 
																              if (res.confirm) { | 
																 | 
																 | 
																              if (res.confirm) { | 
															
														
														
													
														
															
																 | 
																 | 
																                wx.navigateTo({ | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																                  url: '/pages/order/index/index?id=all', | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																                }) | 
																 | 
																 | 
																 | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																                console.log(that.data.isFromSpell) | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																                if (that.data.isFromSpell){ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																                  wx.navigateTo({ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																                    url: '/pages/spellGroup/spellGroup?from=myspellList', | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																                  }) | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																                }else{ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																                  wx.navigateTo({ | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																                    url: '/pages/order/index/index?id=all', | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																                  }) | 
															
														
														
													
														
															
																 | 
																 | 
																 | 
																 | 
																 | 
																                } | 
															
														
														
													
														
															
																 | 
																 | 
																              } | 
																 | 
																 | 
																              } | 
															
														
														
													
														
															
																 | 
																 | 
																            } | 
																 | 
																 | 
																            } | 
															
														
														
													
														
															
																 | 
																 | 
																          }) | 
																 | 
																 | 
																          }) | 
															
														
														
													
												
													
														
															
																| 
																	
																		
																	
																	
																	
																 | 
																
  |