Sfoglia il codice sorgente

js部分提示问题修改

wangdy 8 anni fa
parent
commit
e6367b281a
24 ha cambiato i file con 31 aggiunte e 31 eliminazioni
  1. 1 1
      src/main/webapp/resources/js/admin/controllers/AuditRealAuthCtrl.js
  2. 1 1
      src/main/webapp/resources/js/admin/controllers/SecQuestionCtrl.js
  3. 1 1
      src/main/webapp/resources/js/admin/controllers/bankInfo/AuditBankInfoCtrl.js
  4. 1 1
      src/main/webapp/resources/js/admin/controllers/checkMoney/creditCardAdminCtrl.js
  5. 1 1
      src/main/webapp/resources/js/prod/controllers/ApplySampleCtrl.js
  6. 1 1
      src/main/webapp/resources/js/prod/controllers/OrderEnsureCtrl.js
  7. 1 1
      src/main/webapp/resources/js/prod/controllers/OrderEnsureCtrlWithMultiCurrency.js
  8. 1 1
      src/main/webapp/resources/js/prod/controllers/ProofingCtrl.js
  9. 1 1
      src/main/webapp/resources/js/prod/controllers/WastageCtrl.js
  10. 2 2
      src/main/webapp/resources/js/usercenter/controllers/MyOrderToDoCtrl.js
  11. 1 1
      src/main/webapp/resources/js/usercenter/controllers/addressAdminCtrl.js
  12. 1 1
      src/main/webapp/resources/js/usercenter/controllers/creditCardAdminCtrl.js
  13. 2 2
      src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js
  14. 1 1
      src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_home_ctrl.js
  15. 2 2
      src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_invoice_record_ctrl.js
  16. 1 1
      src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_logistics_ctrl.js
  17. 2 2
      src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_no_invoice_ctrl.js
  18. 1 1
      src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_order_ctrl.js
  19. 2 2
      src/main/webapp/resources/js/usercenter/controllers/forstore/pay_center_ctrl.js
  20. 1 1
      src/main/webapp/resources/js/usercenter/controllers/forstore/shipping_address_edit_ctrl.js
  21. 1 1
      src/main/webapp/resources/js/vendor/controllers/ShippedCtrl.js
  22. 1 1
      src/main/webapp/resources/js/vendor/controllers/creditCardAdminCtrl.js
  23. 2 2
      src/main/webapp/resources/js/vendor/controllers/forstore/pay_center_ctrl.js
  24. 2 2
      src/main/webapp/resources/js/vendor/controllers/forstore/vendor_invoice_ctrl.js

+ 1 - 1
src/main/webapp/resources/js/admin/controllers/AuditRealAuthCtrl.js

@@ -17,7 +17,7 @@ define(['app/app'], function (app) {
           params.total(data.totalElements);
           params.total(data.totalElements);
           $defer.resolve(data.content);
           $defer.resolve(data.content);
         }, function (response) {
         }, function (response) {
-          toaster.pop('error', '获取账户信息失败');
+          toaster.pop('error', '获取账户信息失败 ', response.data);
         });
         });
       }
       }
     });
     });

+ 1 - 1
src/main/webapp/resources/js/admin/controllers/SecQuestionCtrl.js

@@ -15,7 +15,7 @@ define(['app/app'], function (app) {
           params.total(data.totalElements);
           params.total(data.totalElements);
           $defer.resolve(data.content);
           $defer.resolve(data.content);
         }, function (response) {
         }, function (response) {
-          toaster.pop('error', '获取账户信息失败');
+          toaster.pop('error', '获取账户信息失败 ', response.data);
         });
         });
       }
       }
     });
     });

+ 1 - 1
src/main/webapp/resources/js/admin/controllers/bankInfo/AuditBankInfoCtrl.js

@@ -45,7 +45,7 @@ define(['app/app'], function (app) {
                     params.total(data.totalElements);
                     params.total(data.totalElements);
                     $defer.resolve(data.content);
                     $defer.resolve(data.content);
                 }, function (response) {
                 }, function (response) {
-                    toaster.pop('error', '获取账户信息失败');
+                    toaster.pop('error', '获取账户信息失败 ', response.data);
                 });
                 });
             }
             }
         });
         });

+ 1 - 1
src/main/webapp/resources/js/admin/controllers/checkMoney/creditCardAdminCtrl.js

@@ -45,7 +45,7 @@ define(['app/app'], function(app) {
 					account.filterAccount = hideBankFilter(account.number);
 					account.filterAccount = hideBankFilter(account.number);
 				})
 				})
 			}, function(response) {
 			}, function(response) {
-				toaster.pop('error', '获取账户信息失败');
+				toaster.pop('error', '获取账户信息失败 '+ response.data);
 			})
 			})
 		}
 		}
 		loadAccount();
 		loadAccount();

+ 1 - 1
src/main/webapp/resources/js/prod/controllers/ApplySampleCtrl.js

@@ -187,7 +187,7 @@ define([ 'app/app' ], function(app) {
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		$modalInstance.close(data);
 	    		$modalInstance.close(data);
 	    	}, function(res){
 	    	}, function(res){
-	    		toaster.pop('error', '系统错误 ', '保存收货地址失败');
+	    		toaster.pop('error', '保存收货地址失败 ', res.data);
 	    	});
 	    	});
 	    }
 	    }
 	    
 	    

+ 1 - 1
src/main/webapp/resources/js/prod/controllers/OrderEnsureCtrl.js

@@ -1134,7 +1134,7 @@ define([ 'app/app' ], function(app) {
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		$modalInstance.close(data);
 	    		$modalInstance.close(data);
 	    	}, function(res){
 	    	}, function(res){
-	    		toaster.pop('error', '系统错误 ', '保存收货地址失败');
+	    		toaster.pop('error', '保存收货地址失败', res.data);
 	    	});
 	    	});
 	    };
 	    };
 	    
 	    

+ 1 - 1
src/main/webapp/resources/js/prod/controllers/OrderEnsureCtrlWithMultiCurrency.js

@@ -1044,7 +1044,7 @@ define([ 'app/app' ], function(app) {
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		$modalInstance.close(data);
 	    		$modalInstance.close(data);
 	    	}, function(res){
 	    	}, function(res){
-	    		toaster.pop('error', '系统错误 ', '保存收货地址失败');
+	    		toaster.pop('error', '保存收货地址失败', res.data);
 	    	});
 	    	});
 	    }
 	    }
 	    
 	    

+ 1 - 1
src/main/webapp/resources/js/prod/controllers/ProofingCtrl.js

@@ -171,7 +171,7 @@ define([ 'app/app' ], function(app) {
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		$modalInstance.close(data);
 	    		$modalInstance.close(data);
 	    	}, function(res){
 	    	}, function(res){
-	    		toaster.pop('error', '系统错误 ', '保存收货地址失败');
+	    		toaster.pop('error', '保存收货地址失败', res.data);
 	    	});
 	    	});
 	    }
 	    }
 	    
 	    

+ 1 - 1
src/main/webapp/resources/js/prod/controllers/WastageCtrl.js

@@ -122,7 +122,7 @@ define([ 'app/app' ], function(app) {
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		$modalInstance.close(data);
 	    		$modalInstance.close(data);
 	    	}, function(res){
 	    	}, function(res){
-	    		toaster.pop('error', '系统错误 ', '保存收货地址失败');
+	    		toaster.pop('error', '保存收货地址失败 ', res.data);
 	    	});
 	    	});
 	    }
 	    }
 	    
 	    

+ 2 - 2
src/main/webapp/resources/js/usercenter/controllers/MyOrderToDoCtrl.js

@@ -109,7 +109,7 @@ define([ 'app/app' ], function(app) {
 				$scope.yrscAccount = data;
 				$scope.yrscAccount = data;
 			}
 			}
 		}, function(response) {
 		}, function(response) {
-			toaster.pop('error', '获取账户信息失败');
+			toaster.pop('error', '获取账户信息失败 ', response.data);
 		});
 		});
 		
 		
 		// 获取优软商城对私账户的信息
 		// 获取优软商城对私账户的信息
@@ -118,7 +118,7 @@ define([ 'app/app' ], function(app) {
 				$scope.yrscPerAccount = data[0];
 				$scope.yrscPerAccount = data[0];
 			}
 			}
 		}, function(response) {
 		}, function(response) {
-			toaster.pop('error', '获取账户信息失败');
+			toaster.pop('error', '获取账户信息失败 ', response.data);
 		});
 		});
 		
 		
 		// 根据当前状态获取对应的状态码值
 		// 根据当前状态获取对应的状态码值

+ 1 - 1
src/main/webapp/resources/js/usercenter/controllers/addressAdminCtrl.js

@@ -137,7 +137,7 @@ define(['app/app'], function(app) {
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		$modalInstance.close(data);
 	    		$modalInstance.close(data);
 	    	}, function(res){
 	    	}, function(res){
-	    		toaster.pop('error', '系统错误 ', '保存收货地址失败');
+	    		toaster.pop('error', '保存收货地址失败 ', res.data);
 	    	});
 	    	});
 	    }
 	    }
 	    
 	    

+ 1 - 1
src/main/webapp/resources/js/usercenter/controllers/creditCardAdminCtrl.js

@@ -31,7 +31,7 @@ define(['app/app'], function(app) {
 					account.filterAccount = hideBankFilter(account.number);
 					account.filterAccount = hideBankFilter(account.number);
 				})
 				})
 			}, function(response) {
 			}, function(response) {
-				toaster.pop('error', '获取账户信息失败');
+				toaster.pop('error', '获取账户信息失败 ', response.data);
 			})
 			})
 		}
 		}
 		loadAccount();
 		loadAccount();

+ 2 - 2
src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js

@@ -432,8 +432,8 @@ define(['app/app'], function (app) {
                     }, address, function (data) {
                     }, address, function (data) {
                       toaster.pop('success', '成功 ', '保存收货地址成功');
                       toaster.pop('success', '成功 ', '保存收货地址成功');
                       $modalInstance.close(data);
                       $modalInstance.close(data);
-                    }, function () {
-                      toaster.pop('error', '系统错误 ', '保存收货地址失败');
+                    }, function (res) {
+                      toaster.pop('error', '保存收货地址失败 ', res.data);
                     });
                     });
                   };
                   };
 
 

+ 1 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_home_ctrl.js

@@ -327,7 +327,7 @@ define(['app/app', 'calendar'], function(app) {
                 toaster.pop('success', '成功 ', '保存收货地址成功');
                 toaster.pop('success', '成功 ', '保存收货地址成功');
                 $modalInstance.close(data);
                 $modalInstance.close(data);
             }, function(res){
             }, function(res){
-                toaster.pop('error', '系统错误 ', '保存收货地址失败');
+                toaster.pop('error', '保存收货地址失败', res.data);
             });
             });
         };
         };
 
 

+ 2 - 2
src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_invoice_record_ctrl.js

@@ -56,8 +56,8 @@ define([ 'app/app' ], function(app) {
                         $defer.resolve(page.content);
                         $defer.resolve(page.content);
                         //划分数据
                         //划分数据
                         $scope.billData = page.content;
                         $scope.billData = page.content;
-                    }, function () {
-                        toaster.pop('error', '获取开票记录失败');
+                    }, function (response) {
+                        toaster.pop('error', '获取开票记录失败 ', response.data);
                     });
                     });
                 }
                 }
             });
             });

+ 1 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_logistics_ctrl.js

@@ -365,7 +365,7 @@ define(['app/app', 'calendar'], function(app) {
 				toaster.pop('success', '成功 ', '保存收货地址成功');
 				toaster.pop('success', '成功 ', '保存收货地址成功');
 				$modalInstance.close(data);
 				$modalInstance.close(data);
 			}, function(){
 			}, function(){
-				toaster.pop('error', '系统错误 ', '保存收货地址失败');
+				toaster.pop('error', '保存收货地址失败', res.data);
 			});
 			});
 		};
 		};
 
 

+ 2 - 2
src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_no_invoice_ctrl.js

@@ -77,8 +77,8 @@ define([ 'app/app' ], function(app) {
                         angular.forEach($scope.orderData, function (item) {
                         angular.forEach($scope.orderData, function (item) {
                             item.checked = false;
                             item.checked = false;
                         })
                         })
-                    }, function () {
-                        toaster.pop('error', '获取未开票订单信息失败');
+                    }, function (response) {
+                        toaster.pop('error', '获取未开票订单信息失败 ', response.data);
                     });
                     });
                 }
                 }
             });
             });

+ 1 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_order_ctrl.js

@@ -201,7 +201,7 @@ define(['app/app'], function (app) {
 				});
 				});
 
 
 			}, function(response) {
 			}, function(response) {
-				toaster.pop('error', '获取订单失败,请重新刷新界面,' + response.data);
+				toaster.pop('error', '获取订单失败 ' + response.data);
 			});
 			});
 		};
 		};
 
 

+ 2 - 2
src/main/webapp/resources/js/usercenter/controllers/forstore/pay_center_ctrl.js

@@ -115,8 +115,8 @@ define(['app/app'], function(app) {
 
 
 					params.total(page.totalElements);
 					params.total(page.totalElements);
 					$defer.resolve(page.content);
 					$defer.resolve(page.content);
-				}, function() {
-					toaster.pop('error', '获取账户信息失败');
+				}, function(error) {
+					toaster.pop('error', '获取账户信息失败 '+ error.data);
 				});
 				});
 			}
 			}
 		});
 		});

+ 1 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/shipping_address_edit_ctrl.js

@@ -247,7 +247,7 @@ define(['app/app'], function(app) {
 				toaster.pop('success', '成功 ', '保存收货地址成功');
 				toaster.pop('success', '成功 ', '保存收货地址成功');
 				$modalInstance.close(data);
 				$modalInstance.close(data);
 			}, function(res){
 			}, function(res){
-				toaster.pop('error', '系统错误 ', '保存收货地址失败');
+				toaster.pop('error', '保存收货地址失败 ', res.data);
 			});
 			});
 		}
 		}
 
 

+ 1 - 1
src/main/webapp/resources/js/vendor/controllers/ShippedCtrl.js

@@ -275,7 +275,7 @@ define(['app/app'], function(app) {
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		toaster.pop('success', '成功 ', '保存收货地址成功');
 	    		$modalInstance.close(data);
 	    		$modalInstance.close(data);
 	    	}, function(res){
 	    	}, function(res){
-	    		toaster.pop('error', '系统错误 ', '保存收货地址失败');
+	    		toaster.pop('error','保存收货地址失败 ', res.data);
 	    	});
 	    	});
 	    }
 	    }
 	    
 	    

+ 1 - 1
src/main/webapp/resources/js/vendor/controllers/creditCardAdminCtrl.js

@@ -14,7 +14,7 @@ define(['app/app'], function(app) {
 					account.filterAccount = hideBankFilter(account.number);
 					account.filterAccount = hideBankFilter(account.number);
 				})
 				})
 			}, function(response) {
 			}, function(response) {
-				toaster.pop('error', '获取账户信息失败');
+				toaster.pop('error', '获取账户信息失败 '+ response.data);
 			})
 			})
 		}
 		}
 		loadAccount();
 		loadAccount();

+ 2 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/pay_center_ctrl.js

@@ -96,8 +96,8 @@ define(['app/app'], function(app) {
 
 
                     params.total(page.totalElements);
                     params.total(page.totalElements);
                     $defer.resolve(page.content);
                     $defer.resolve(page.content);
-                }, function() {
-                    toaster.pop('error', '获取账户信息失败');
+                }, function(response) {
+                    toaster.pop('error', '获取账户信息失败 ', response.data);
                 });
                 });
             }
             }
         });
         });

+ 2 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_invoice_ctrl.js

@@ -73,8 +73,8 @@ define([ 'app/app' ], function(app) {
                             item.area = temAddr[0]+'  '+temAddr[1]+'  '+temAddr[2]
                             item.area = temAddr[0]+'  '+temAddr[1]+'  '+temAddr[2]
                             item.checked = false
                             item.checked = false
                         })
                         })
-                    }, function () {
-                        toaster.pop('error', '获取开票记录失败');
+                    }, function (response) {
+                        toaster.pop('error', '获取开票记录失败 ', response.data);
                     });
                     });
                 }
                 }
             });
             });