|
@@ -8,9 +8,12 @@ Page({
|
|
|
* 页面的初始数据
|
|
* 页面的初始数据
|
|
|
*/
|
|
*/
|
|
|
data: {
|
|
data: {
|
|
|
|
|
+ form:{},
|
|
|
prods:[],
|
|
prods:[],
|
|
|
totalPrice:0, // 订单总金额
|
|
totalPrice:0, // 订单总金额
|
|
|
- address:""
|
|
|
|
|
|
|
+ showRemark: false,
|
|
|
|
|
+ address:"",
|
|
|
|
|
+ remark:""
|
|
|
},
|
|
},
|
|
|
// 获取地址列表
|
|
// 获取地址列表
|
|
|
getAddressList(){
|
|
getAddressList(){
|
|
@@ -32,9 +35,27 @@ Page({
|
|
|
url: '/pages/my/addressManage/addressManage?moldify=true',
|
|
url: '/pages/my/addressManage/addressManage?moldify=true',
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
|
|
+ inputChange(e){
|
|
|
|
|
+ let key = e.currentTarget.dataset.key;
|
|
|
|
|
+ let value = e.detail.value;
|
|
|
|
|
+ this.setData({
|
|
|
|
|
+ remark:value
|
|
|
|
|
+ })
|
|
|
|
|
+ },
|
|
|
// 确认订单
|
|
// 确认订单
|
|
|
submitOrder(){
|
|
submitOrder(){
|
|
|
|
|
+
|
|
|
|
|
+ if(this.data.showRemark && !this.data.remark){
|
|
|
|
|
+ wx.showToast({
|
|
|
|
|
+ title: "请输入微博名",
|
|
|
|
|
+ icon:"none",
|
|
|
|
|
+ duration:3000
|
|
|
|
|
+ })
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
let data = {
|
|
let data = {
|
|
|
|
|
+ remark:this.data.remark,
|
|
|
orderItemDTOS:this.data.orderItemDTOS,
|
|
orderItemDTOS:this.data.orderItemDTOS,
|
|
|
userAddressId:this.data.address.userAddressId
|
|
userAddressId:this.data.address.userAddressId
|
|
|
}
|
|
}
|
|
@@ -79,13 +100,19 @@ Page({
|
|
|
let total = 0;
|
|
let total = 0;
|
|
|
let orderItemDTOS = [];
|
|
let orderItemDTOS = [];
|
|
|
list.forEach(item=>{
|
|
list.forEach(item=>{
|
|
|
|
|
+ console.log(item);
|
|
|
total += item.quantity*item.price;
|
|
total += item.quantity*item.price;
|
|
|
orderItemDTOS.push({
|
|
orderItemDTOS.push({
|
|
|
cartsId:item.cartsId,
|
|
cartsId:item.cartsId,
|
|
|
mercProdId:item.mercProdId,
|
|
mercProdId:item.mercProdId,
|
|
|
prodAttrId:item.prodAttrId,
|
|
prodAttrId:item.prodAttrId,
|
|
|
count:item.quantity
|
|
count:item.quantity
|
|
|
- })
|
|
|
|
|
|
|
+ });
|
|
|
|
|
+ if (item.thirdIdConfirmFlag==="Y") {
|
|
|
|
|
+ this.setData({
|
|
|
|
|
+ showRemark : true
|
|
|
|
|
+ })
|
|
|
|
|
+ }
|
|
|
})
|
|
})
|
|
|
this.setData({
|
|
this.setData({
|
|
|
prods:list,
|
|
prods:list,
|