diff --git a/common/config.js b/common/config.js index 2c09f72..90f45b7 100644 --- a/common/config.js +++ b/common/config.js @@ -1,14 +1,18 @@ const mode = 'production'; //devLocal:本地测试、devOnline:线上测试、production:生产环境 let ROOTPATH = ''; //域名 +let base = "https://agent.xfgshop.com" switch (mode) { + // https://agenttest.xfgshop.com + // https://agent.xfgshop.com case 'devLocal': - ROOTPATH = "https://agent.xfgshop.com" + ROOTPATH = base + break; case 'devOnline': - ROOTPATH = "https://agent.xfgshop.com" + ROOTPATH = base break; case 'production': - ROOTPATH = "https://agent.xfgshop.com" + ROOTPATH = base break; default: throw new Error('未配置环境'); diff --git a/packages/change/change.vue b/packages/change/change.vue index 189ae2a..d2beee8 100644 --- a/packages/change/change.vue +++ b/packages/change/change.vue @@ -76,7 +76,11 @@ } this.$u.api.getCard(this.form).then(res => { if(res.available_dates.length===0){ - toast(this.dateFalse,4000) + if(!isNull(res.card.sku.help)){ + toast(res.card.sku.help,4000) + }else{ + toast(this.dateFalse,4000) + } return } let open_date = res.card.sku.open?res.card.sku.open:false @@ -94,8 +98,6 @@ toast(this.dateFalse,4000) } return - }else{ - } // } diff --git a/packages/myorder/infoconfirm.vue b/packages/myorder/infoconfirm.vue index 947816d..6d5199a 100644 --- a/packages/myorder/infoconfirm.vue +++ b/packages/myorder/infoconfirm.vue @@ -3,8 +3,20 @@ - + + + + + + + + + {{details.sku?details.sku.name:''}} {{details.sku?details.sku.specs:''}} @@ -99,17 +111,18 @@ line-height: 42rpx; } .imgbox{ - width: 150rpx; - height:150rpx; + // width: 150rpx; + // height:150rpx; margin: 0 auto; - border-radius: 10rpx; - border: 1px solid #ba8b45; - overflow: hidden; + + // overflow: hidden; margin-bottom: 14rpx; } .imgbox image{ width: 150rpx; height:150rpx; + border-radius: 10rpx; + border: 1px solid #ba8b45; vertical-align: middle; } .confirmpicinfo .pictitle{ diff --git a/packages/myorder/myorder.vue b/packages/myorder/myorder.vue index c2ba2d3..c7eb15f 100644 --- a/packages/myorder/myorder.vue +++ b/packages/myorder/myorder.vue @@ -25,10 +25,23 @@ - - + + + + + + + + + + {{item.sku?item.sku.name:''}} @@ -258,16 +271,17 @@ } .orderimg { - border: 1rpx solid rgba(186, 139, 69, .6); - border-radius: 10rpx; - overflow: hidden; - width: 150rpx; - height: 150rpx; + + // overflow: hidden; + // width: 150rpx; + // height: 150rpx; background: #fff; text-align: center; } - .orderimg image { + .orderimg image { + border: 1rpx solid rgba(186, 139, 69, .6); + border-radius: 10rpx; width: 100%; height: 100%; vertical-align: middle; diff --git a/packages/order/order.vue b/packages/order/order.vue index f015555..ace7b25 100644 --- a/packages/order/order.vue +++ b/packages/order/order.vue @@ -13,10 +13,22 @@ {{cardInfo.sku?cardInfo.sku.name:''}} - - + + + + + + + + + {{cardInfo.sku?cardInfo.sku.specs:''}} @@ -135,10 +147,20 @@ - - - + + + + + + + + + + {{cardInfo.sku?cardInfo.sku.name:''}} {{cardInfo.sku?cardInfo.sku.specs:''}} @@ -838,8 +860,8 @@ margin-bottom: 40rpx; image { - width: 150rpx; - height: 150rpx; + width: 200rpx; + height: 120rpx; border: 1px solid #ba8b45; border-radius: 10rpx; margin-right: 20rpx; @@ -1017,19 +1039,21 @@ } .imgbox { - width: 150rpx; - height: 150rpx; + width: 200rpx; + // height: 120rpx; margin: 0 auto; - border-radius: 10rpx; - border: 1px solid #ba8b45; - overflow: hidden; + // border-radius: 10rpx; + // border: 1px solid #ba8b45; + // overflow: hidden; margin-bottom: 14rpx; } .imgbox image { - width: 150rpx; - height: 150rpx; - vertical-align: middle; + width: 200rpx; + height: 120rpx; + vertical-align: middle; + border-radius: 10rpx; + border: 1px solid #ba8b45; } .confirmpicinfo .pictitle {