Commit 895a1aac authored by lujunye's avatar lujunye

修改规格非必填项显示形式

parent 10380765
...@@ -98,7 +98,7 @@ class AppDelegate: UIResponder,UIApplicationDelegate,UNUserNotificationCenterDel ...@@ -98,7 +98,7 @@ class AppDelegate: UIResponder,UIApplicationDelegate,UNUserNotificationCenterDel
} }
// 接受数据 // 接受数据
func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) { func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
print("1",userInfo)
JPUSHService.handleRemoteNotification(userInfo) JPUSHService.handleRemoteNotification(userInfo)
completionHandler(.newData) completionHandler(.newData)
...@@ -106,6 +106,7 @@ class AppDelegate: UIResponder,UIApplicationDelegate,UNUserNotificationCenterDel ...@@ -106,6 +106,7 @@ class AppDelegate: UIResponder,UIApplicationDelegate,UNUserNotificationCenterDel
// 接受数据 // 接受数据
func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any]) { func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any]) {
print("2",userInfo)
JPUSHService.handleRemoteNotification(userInfo) JPUSHService.handleRemoteNotification(userInfo)
} }
......
...@@ -740,10 +740,19 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -740,10 +740,19 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
dict = guiGeArr.first dict = guiGeArr.first
} }
cell.tempLbl.text = "冷藏:-"
if dict.wenDu.count > 0 {
cell.tempLbl.text = "冷藏:\(dict.wenDu)℃" cell.tempLbl.text = "冷藏:\(dict.wenDu)℃"
}
cell.weightLbl.text = "重量(kg):- kg"
if dict.weight.count > 0 {
cell.weightLbl.text = "重量(kg):\(dict.weight)kg" cell.weightLbl.text = "重量(kg):\(dict.weight)kg"
}
cell.guiGeLbl.text = "规格:\(dict.guiGe)" cell.guiGeLbl.text = "规格:\(dict.guiGe)"
cell.danWeiLbl.text = "单位:-"
if dict.danWei.count > 0 {
cell.danWeiLbl.text = "单位:\(dict.danWei)" cell.danWeiLbl.text = "单位:\(dict.danWei)"
}
cell.sellPriceLbl.text = "售价:¥\(dict.price)" cell.sellPriceLbl.text = "售价:¥\(dict.price)"
return cell return cell
......
...@@ -389,10 +389,19 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl ...@@ -389,10 +389,19 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
dict = guiGeArr.first dict = guiGeArr.first
} }
cell.tempLbl.text = "冷藏:-"
if dict.wenDu.count > 0 {
cell.tempLbl.text = "冷藏:\(dict.wenDu)℃" cell.tempLbl.text = "冷藏:\(dict.wenDu)℃"
}
cell.weightLbl.text = "重量(kg):- kg"
if dict.weight.count > 0 {
cell.weightLbl.text = "重量(kg):\(dict.weight)kg" cell.weightLbl.text = "重量(kg):\(dict.weight)kg"
}
cell.guiGeLbl.text = "规格:\(dict.guiGe)" cell.guiGeLbl.text = "规格:\(dict.guiGe)"
cell.danWeiLbl.text = "单位:-"
if dict.danWei.count > 0 {
cell.danWeiLbl.text = "单位:\(dict.danWei)" cell.danWeiLbl.text = "单位:\(dict.danWei)"
}
cell.sellPriceLbl.text = "售价:¥\(dict.price)" cell.sellPriceLbl.text = "售价:¥\(dict.price)"
return cell return cell
......
...@@ -150,22 +150,23 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl ...@@ -150,22 +150,23 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
HUD.flash(.label("请输入规格"), delay: 1.2) HUD.flash(.label("请输入规格"), delay: 1.2)
return return
} }
if weight.count == 0 { // if weight.count == 0 {
HUD.flash(.label("请输入重量"), delay: 1.2) // HUD.flash(.label("请输入重量"), delay: 1.2)
return // return
} // }
if isPurnNumber(str: weight) == false { // if isPurnNumber(str: weight) == false {
HUD.flash(.label("请输入正确的重量"), delay: 1.2) // HUD.flash(.label("请输入正确的重量"), delay: 1.2)
return // return
} // }
if wenDu.count == 0 {
HUD.flash(.label("请选择温藏"), delay: 1.2) // if wenDu.count == 0 {
return // HUD.flash(.label("请选择温藏"), delay: 1.2)
} // return
if danWei.count == 0 { // }
HUD.flash(.label("请选择单位"), delay: 1.2) // if danWei.count == 0 {
return // HUD.flash(.label("请选择单位"), delay: 1.2)
} // return
// }
if isYuShouSetting { if isYuShouSetting {
if isPurnNumber(str: yuShouPrice) == false{ if isPurnNumber(str: yuShouPrice) == false{
HUD.flash(.label("请输入正确的预售价格"), delay: 1.2) HUD.flash(.label("请输入正确的预售价格"), delay: 1.2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment