ios/DolphinEnglishStudent.git

			@@ -29,6 +29,7 @@
			@IBOutlet weak var label_footNeedCoin: UILabel!

			private var viewModel = MarketContentViewModel()
			private var recipientId:Int? // 地址ID

			required init(viewModel:MarketContentViewModel) {
			super.init(nibName: nil, bundle: nil)
			@@ -49,11 +50,19 @@

			Services.addressList().subscribe(onNext: {[weak self]result in
			self?.viewModel.address.accept(result.data ?? [])

			if result.data?.count == 0{
			self?.label_address.text = "新建收货地址"
			self?.label_address_info.isHidden = true
			return
			}

			if let first = result.data?.filter({$0.isDefault == 1}).first{
			self?.label_address.text = first.address
			self?.label_address_info.text = first.recipient + "｜" + first.recipientPhone
			self?.recipientId = first.id
			}else{
			self?.label_address.text = "新建收货地址"
			self?.label_address.text = "选择收货地址"
			self?.label_address_info.isHidden = true
			}
			}).disposed(by: disposeBag)
			@@ -86,15 +95,23 @@
			}

			@IBAction func addressAction(_ sender: Any) {
			if viewModel.address.value.filter({$0.isDefault == 1}).count > 0{
			let vc = AddressManageVC(type: .choose)
			vc.title = "地址管理"
			push(vc: vc)
			}else{

			if viewModel.address.value.count == 0{
			let vc = AddressManageVC(type: .handle)
			vc.title = "地址管理"
			push(vc: vc)
			return
			}

			let vc = AddressManageVC(type: .choose)
			vc.title = "地址管理"
			vc.chooseAddress {[weak self] m in
			self?.label_address.text = m.address
			self?.label_address_info.text = m.recipient + "｜" + m.recipientPhone
			self?.recipientId = m.id
			self?.label_address_info.isHidden = false
			}
			push(vc: vc)
			}

			@IBAction func addNumAction(_ sender: UIButton) {
			@@ -114,10 +131,16 @@

			@IBAction func exchangeAction(_ sender: UIButton) {

			guard viewModel.address.value.filter({$0.isDefault == 1}).count != 0 else{
			CommonAlertView.show(content: "请先设置收货地址") {
			let vc = AddressManageVC(type: .handle)
			guard recipientId != nil else{
			CommonAlertView.show(content: "请先选择收货地址") {
			let vc = AddressManageVC(type: .choose)
			vc.title = "地址管理"
			vc.chooseAddress {[weak self] m in
			self?.label_address.text = m.address
			self?.label_address_info.text = m.recipient + "｜" + m.recipientPhone
			self?.recipientId = m.id
			self?.label_address_info.isHidden = false
			}
			self.push(vc: vc)
			}
			return
			@@ -127,9 +150,9 @@
			let goodsId = self.viewModel.detailModel.value!.good!.id
			let num = self.viewModel.number.value
			let orderNumber = self.viewModel.detailModel.value?.orderNumber ?? ""
			let recipientId = self.viewModel.detailModel.value?.recipient?.id ?? 0
			let recipientId = self.recipientId

			Services.goodsExchangeStudy(goodsId: goodsId, number: num, orderNumber: orderNumber, recipientId: recipientId, remark: self.textView_remark.text!).subscribe(onNext: {_ in
			Services.goodsExchangeStudy(goodsId: goodsId, number: num, orderNumber: orderNumber, recipientId: recipientId!, remark: self.textView_remark.text!).subscribe(onNext: {_ in
			let vc = ExchangeResultVC(resultType: .success)
			vc.title = "商品详情"
			self.push(vc: vc)