|
|
@@ -3,12 +3,12 @@
|
|
|
<!-- 地址 -->
|
|
|
<view class="address" @click="toadd">
|
|
|
<view class="u-flex u-row-between">
|
|
|
- <view class="add">102 Huangjiao Road,</view>
|
|
|
+ <view class="add" v-if="addinfo">{{addinfo.full_address}}</view>
|
|
|
<u-icon name="arrow-right" size='16'></u-icon>
|
|
|
</view>
|
|
|
- <view class="info">
|
|
|
- <text>Curtis Morris</text>
|
|
|
- <text style="margin-left: 20rpx;">041***8314</text>
|
|
|
+ <view class="info" v-if="addinfo">
|
|
|
+ <text>{{addinfo.name}}</text>
|
|
|
+ <text style="margin-left: 20rpx;">{{replacePhoneToStar(addinfo.mobile)}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 商品 -->
|
|
|
@@ -29,14 +29,15 @@
|
|
|
<view class="">
|
|
|
<text class="money">¥</text>
|
|
|
<text class="money"
|
|
|
- style="font-size: 34rpx;">{{goodinfo.is_discount==1? Number(sku_info.price)*Number(value):Number(sku_info.discount_price)*Number(value)}}</text>
|
|
|
+ style="font-size: 34rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*1000)*Number(value*1000))/1000000:(Number(sku_info.discount_price*1000)*Number(value)*1000)/1000000}}</text>
|
|
|
</view>
|
|
|
<u-number-box v-model="value">
|
|
|
<!-- <view class="bu"> -->
|
|
|
<view slot="minus" class="">
|
|
|
<u-icon name="minus" size="12"></u-icon>
|
|
|
</view>
|
|
|
- <text slot="input" style="width: 40px;text-align: center;" class="input">{{value}}</text>
|
|
|
+ <input slot="input" v-model="value" style="width: 40px;text-align: center;"
|
|
|
+ class="input"></input>
|
|
|
<view slot="plus" class="">
|
|
|
<u-icon name="plus" size="12"></u-icon>
|
|
|
</view>
|
|
|
@@ -50,7 +51,7 @@
|
|
|
<view class="logistics u-flex u-row-between">
|
|
|
<text style="font-weight: 600;">{{i18n.flow}}</text>
|
|
|
<view class="u-flex" @click="show = true">
|
|
|
- <text class="change">{{i18n.selection}}</text>
|
|
|
+ <text class="change">{{containname1?type1+' | '+containname1 :i18n.selection}}</text>
|
|
|
<u-icon name="arrow-right" size='16'></u-icon>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -79,7 +80,8 @@
|
|
|
</view>
|
|
|
<view class="money" style="color: #F83224;font-size: 20rpx;">
|
|
|
<text>¥</text>
|
|
|
- <text style="font-size: 28rpx;">{{item.is_discount==0?item.discount_price.slice(0,-3):item.price.slice(0,-3)}}</text>
|
|
|
+ <text
|
|
|
+ style="font-size: 28rpx;">{{item.is_discount==0?item.discount_price.slice(0,-3):item.price.slice(0,-3)}}</text>
|
|
|
<text>{{item.is_discount==0?item.discount_price.slice(-3):item.price.slice(-3)}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -92,47 +94,52 @@
|
|
|
<view class="u-flex u-row-between" style='margin-bottom:40rpx'>
|
|
|
<view class="name">{{i18n.Commodityamount}}</view>
|
|
|
<view class="money">
|
|
|
- ¥{{goodinfo.is_discount==1? Number(sku_info.price)*Number(value):Number(sku_info.discount_price)*Number(value)}}
|
|
|
+ ¥{{goodinfo.is_discount==1? (Number(sku_info.price*100)*Number(value*100))/10000:(Number(sku_info.discount_price*100)*Number(value*100))/10000}}
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="u-flex u-row-between">
|
|
|
<view class="name">{{i18n.Grosscommodityweight}}</view>
|
|
|
<view class="money">{{Number(sku_info.weight)*value}}kg</view>
|
|
|
</view>
|
|
|
- <view class="back u-flex">
|
|
|
+ <view class="back u-flex" v-if="containname1">
|
|
|
<image src="static/images/warning.png" style="width: 32rpx;height: 32rpx;" mode=""></image>
|
|
|
- <text style="margin-left: 12rpx;">{{i18n.buy}}378-380kg{{i18n.price}}¥21，{{i18n.morefavorable}}</text>
|
|
|
+ <text
|
|
|
+ style="margin-left: 12rpx;">{{i18n.buy}}{{min_weight}}-{{max_weight}}kg{{i18n.price}}¥{{unit_fee}}，{{i18n.morefavorable}}</text>
|
|
|
</view>
|
|
|
- <view class="u-flex u-row-between" style='margin-bottom:40rpx'>
|
|
|
+ <view class="u-flex u-row-between" style='margin-bottom:40rpx;margin-top: 20rpx;'>
|
|
|
<view class="name">{{i18n.Costperkilogram}}</view>
|
|
|
- <view class="money">需先选择货运方式</view>
|
|
|
+ <view class="money">{{containname1?unit_price:'需先选择货运方式'}}</view>
|
|
|
</view>
|
|
|
<view class="u-flex u-row-between">
|
|
|
<view class="name">{{i18n.freight}}</view>
|
|
|
- <view class="money">需先选择货运方式</view>
|
|
|
+ <view class="money">{{containname1?sum:'需先选择货运方式'}}</view>
|
|
|
</view>
|
|
|
<view class="zong u-flex u-row-right">
|
|
|
<view class="">
|
|
|
<text class="small">{{i18n.subtotal}}</text>
|
|
|
<text class="mon">¥</text>
|
|
|
- <text class="mon" style="font-size: 40rpx;">2642.5</text>
|
|
|
+ <text class="mon"
|
|
|
+ style="font-size: 40rpx;">{{goodinfo.is_discount==1? (Number(sku_info.price*100)*Number(value*100))/10000:(Number(sku_info.discount_price*100)*Number(value*100))/10000}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="" style="height: 166rpx;"></view>
|
|
|
<view class="btn u-flex u-row-right">
|
|
|
<view class="">
|
|
|
- <text class="kg">{{i18n.Atotalof}}39kg,</text>
|
|
|
+ <text class="kg">{{i18n.Atotalof}}{{Number(sku_info.weight) * value}}kg,</text>
|
|
|
<text>{{i18n.total}}:</text>
|
|
|
<text class="money" style="font-size: 28rpx;">¥</text>
|
|
|
- <text class="money" style="font-weight: bold;">2792.5</text>
|
|
|
+ <text class="money" v-if="goodinfo.is_discount==1"
|
|
|
+ style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.price)*Number(value)*10000))/10000}}</text>
|
|
|
+ <text class="money" v-if="goodinfo.is_discount==0"
|
|
|
+ style="font-weight: bold;">{{(Number(sum*10000+ Number(sku_info.discount_price)*Number(value)*10000))/10000}}</text>
|
|
|
</view>
|
|
|
<view class="order" @click="topay">
|
|
|
{{i18n.Submitorder}}
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 跨境物流 -->
|
|
|
- <u-popup :show="show" @close="close" @open="open" mode="bottom" closeIconPos='top-right' round='28'>
|
|
|
+ <u-popup :show="show" @close="close" mode="bottom" closeIconPos='top-right' round='28'>
|
|
|
<view style="padding: 40rpx 28rpx;box-sizing:border-box;">
|
|
|
<view class="u-flex u-row-between">
|
|
|
<view class="" style="width: 28px;height: 28px;"></view>
|
|
|
@@ -143,7 +150,7 @@
|
|
|
</view>
|
|
|
<view class="u-flex u-row-between" style="margin-top: 60rpx;flex-wrap: wrap;">
|
|
|
<view :class="index==idx?'active':'unactive'" v-for="(item,idx) in containerList"
|
|
|
- @click="change(idx)"
|
|
|
+ @click="change(item,idx)"
|
|
|
style="display: flex;flex-direction: column;align-items: center;justify-content: center;margin-bottom: 28rpx;position: relative;">
|
|
|
<image v-if="index==idx" src="static/images/change.png"
|
|
|
style="width: 36rpx;height: 32rpx;position: absolute;top: 0;right: 0;" mode=""></image>
|
|
|
@@ -151,15 +158,16 @@
|
|
|
<view class="logname" v-if="language =='en-US'">{{item.name_en}}</view>
|
|
|
<view class="logname" v-if="language =='es-ES'">{{item.name_es}}</view>
|
|
|
<view class="logname" v-if="language =='it-IT'">{{item.name_ita}}</view>
|
|
|
- <view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view>
|
|
|
+ <!-- <view class="wei">¥{{goodinfo.cate==0?item.normal_delivery_fee:item.special_delivery_fee}}/kg</view> -->
|
|
|
+ <view class="wei">¥{{item.unit_price}}/kg</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="nextto" @click="next">{{i18n.next}}</view>
|
|
|
</view>
|
|
|
</u-popup>
|
|
|
<!-- 跨境物流下一步 -->
|
|
|
- <u-popup :safeAreaInsetTop='true' :show="show1" @close="close" @open="open" mode="bottom"
|
|
|
- closeIconPos='top-right' round='28' bgColor='#F4F4F4'>
|
|
|
+ <u-popup :safeAreaInsetTop='true' :show="show1" @close="close" mode="bottom" closeIconPos='top-right' round='28'
|
|
|
+ bgColor='#F4F4F4'>
|
|
|
<view style="padding: 40rpx 28rpx;box-sizing:border-box;position: relative;">
|
|
|
<view class="u-flex u-row-between">
|
|
|
<view class="" style="width: 28px;height: 28px;"></view>
|
|
|
@@ -169,9 +177,10 @@
|
|
|
<u-icon name="close" @click="close" color="background: #333333;" size="28"></u-icon>
|
|
|
</view>
|
|
|
<scroll-view :scroll-y="true" style="500rpx">
|
|
|
- <view class="transport" style="margin-top: 32rpx;" @click="activea(idx)" v-for="(item,idx) in 5">
|
|
|
+ <view class="transport" style="margin-top: 32rpx;" @click="activea(item,idx)"
|
|
|
+ v-for="(item,idx) in containlist" v-if="item.sum !=0">
|
|
|
<view class="u-flex u-row-between">
|
|
|
- <text class="yundate">{{i18n.Shipmentdate}} 2023-12-09</text>
|
|
|
+ <text class="yundate">{{i18n.Shipmentdate}} {{item.begin_date}}</text>
|
|
|
<image v-if="datechan==idx" src="/pageA/static/images/active.png"
|
|
|
style="width: 36rpx;height: 36rpx;" mode=""></image>
|
|
|
<image v-else src="/pageA/static/images/unactive.png" style="width: 36rpx;height: 36rpx;"
|
|
|
@@ -179,13 +188,16 @@
|
|
|
</view>
|
|
|
<view class="u-flex u-row-between" style="margin-top: 28rpx;">
|
|
|
<view class="chest">
|
|
|
- <text>2号海运柜</text>
|
|
|
+ <text v-if="language =='zh-CN'">{{item.name_cn}}</text>
|
|
|
+ <text v-if="language =='en-US'">{{item.name_en}}</text>
|
|
|
+ <text v-if="language =='es-ES'">{{item.name_es}}</text>
|
|
|
+ <text v-if="language =='it-IT'">{{item.name_ita}}</text>
|
|
|
<text style="margin: 0 16rpx;">|</text>
|
|
|
- <text>{{i18n.Estimatedtimeofarrival}}22{{i18n.Workingday}}</text>
|
|
|
+ <text>{{i18n.Estimatedtimeofarrival}}{{item.transport_days}}{{i18n.Workingday}}</text>
|
|
|
</view>
|
|
|
<view class="mone">
|
|
|
<text>¥</text>
|
|
|
- <text style="font-size: 32rpx;">1820</text>
|
|
|
+ <text style="font-size: 32rpx;">{{item.sum}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -214,14 +226,29 @@
|
|
|
swiptlist: [], //推荐列表
|
|
|
language: 'zh-CN',
|
|
|
containerList: [], //列表
|
|
|
- province_id:'',
|
|
|
- transport_type_id:''
|
|
|
+ province_id: '',
|
|
|
+ transport_type_id: '',
|
|
|
+ containlist: [],
|
|
|
+ containid: '', //货柜id
|
|
|
+ containname: '', //货柜名称
|
|
|
+ type: '', //货运方式名称
|
|
|
+ containname1: '',
|
|
|
+ type1: '',
|
|
|
+ sum: '',
|
|
|
+ unit_price: '',
|
|
|
+ recommend_weight: '',
|
|
|
+ sum1: '',
|
|
|
+ unit_price1: '',
|
|
|
+ recommend_weight1: '',
|
|
|
+ max_weight: '',
|
|
|
+ min_weight: '',
|
|
|
+ unit_fee: '',
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
i18n() {
|
|
|
return this.$t('index')
|
|
|
- }
|
|
|
+ },
|
|
|
},
|
|
|
onLoad(options) {
|
|
|
// url: '/pageA/order?sku=' + this.sku_info + '&value=' + this.value+'&goodinfo='+this.goodinfo
|
|
|
@@ -237,46 +264,114 @@
|
|
|
this.language = uni.getStorageSync('language')
|
|
|
}
|
|
|
this.recommend()
|
|
|
- this.container()
|
|
|
+ // this.container()
|
|
|
},
|
|
|
methods: {
|
|
|
+ //正则匹配手机号
|
|
|
+ replacePhoneToStar: function(phone) {
|
|
|
+ if (phone) {
|
|
|
+ return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //推荐重量
|
|
|
+ recommendweight() {
|
|
|
+ uni.$u.http.get('/api/express-order/recommend-container', {
|
|
|
+ params: {
|
|
|
+ container_id: this.containid,
|
|
|
+ type: this.goodinfo.cate == 0 ? 'normal' : 'special'
|
|
|
+ }
|
|
|
+ }).then((res) => {
|
|
|
+ console.log(res);
|
|
|
+ this.max_weight = res.max_weight
|
|
|
+ this.min_weight = res.min_weight
|
|
|
+ this.unit_fee = res.unit_fee
|
|
|
+ }).catch(() => {
|
|
|
+
|
|
|
+ })
|
|
|
+ },
|
|
|
//货运类型列表
|
|
|
- container() {
|
|
|
+ transport() {
|
|
|
uni.$u.http.get('/api/transport-type', {
|
|
|
params: {
|
|
|
province_id: this.province_id,
|
|
|
}
|
|
|
}).then((res) => {
|
|
|
this.containerList = res
|
|
|
- this.transport_type_id = res.id
|
|
|
+ this.transport_type_id = res[0].id
|
|
|
+ if (this.language == 'zh-CN') {
|
|
|
+ this.type = res[0].name_cn
|
|
|
+ }
|
|
|
+ if (this.language == 'en-US') {
|
|
|
+ this.type = res[0].name_en
|
|
|
+ }
|
|
|
+ if (this.language == 'es-ES') {
|
|
|
+ this.type = res[0].name_es
|
|
|
+ }
|
|
|
+ if (this.language == 'it-IT') {
|
|
|
+ this.type = res[0].name_ita
|
|
|
+ }
|
|
|
}).catch(() => {
|
|
|
-
|
|
|
+
|
|
|
})
|
|
|
},
|
|
|
//跳转到填写地址
|
|
|
- toadd(){
|
|
|
+ toadd() {
|
|
|
+ var that = this
|
|
|
uni.navigateTo({
|
|
|
- url:'/pageC/addressManagement/addressManagement'
|
|
|
+ url: '/pageC/addressManagement/addressManagement',
|
|
|
+ events: {
|
|
|
+ getadd(res) {
|
|
|
+ console.log(res);
|
|
|
+ that.addinfo = res
|
|
|
+ that.province_id = res.province_id
|
|
|
+ // console.log(res);
|
|
|
+ that.transport()
|
|
|
+ }
|
|
|
+ }
|
|
|
})
|
|
|
},
|
|
|
//货柜列表
|
|
|
container() {
|
|
|
- uni.$u.http.get('/api/container', {
|
|
|
+ uni.$u.http.get('/api/container-base', {
|
|
|
params: {
|
|
|
is_page: 0,
|
|
|
province_id: this.province_id,
|
|
|
- transport_type_id:this.transport_type_id
|
|
|
+ transport_type_id: this.transport_type_id,
|
|
|
+ weight: Number(this.sku_info.weight) * this.value,
|
|
|
+ type: this.goodinfo.cate == 0 ? 'normal' : 'special'
|
|
|
}
|
|
|
}).then((res) => {
|
|
|
-
|
|
|
+ // this.containlist = res
|
|
|
+ this.containlist = []
|
|
|
+ res.forEach((item) => {
|
|
|
+ if (item.sum != 0) {
|
|
|
+ this.containlist.push(item)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.sum = this.containlist[0].sum
|
|
|
+ this.unit_price = this.containlist[0].unit_price
|
|
|
+ this.recommend_weight = this.containlist[0].recommend_weight
|
|
|
+ this.containid = this.containlist[0].id
|
|
|
+ if (this.language == 'zh-CN') {
|
|
|
+ this.containname = this.containlist[0].name_cn
|
|
|
+ }
|
|
|
+ if (this.language == 'en-US') {
|
|
|
+ this.containname = this.containlist[0].name_en
|
|
|
+ }
|
|
|
+ if (this.language == 'es-ES') {
|
|
|
+ this.containname = this.containlist[0].name_es
|
|
|
+ }
|
|
|
+ if (this.language == 'it-IT') {
|
|
|
+ this.containname = this.containlist[0].name_ita
|
|
|
+ }
|
|
|
}).catch(() => {
|
|
|
|
|
|
})
|
|
|
},
|
|
|
//商品推荐
|
|
|
recommend() {
|
|
|
- uni.$u.http.post('/api/goods/recommend',{
|
|
|
- keyword:''
|
|
|
+ uni.$u.http.post('/api/goods/recommend', {
|
|
|
+ keyword: ''
|
|
|
}).then((res) => {
|
|
|
// this.swiptlist = res.reduce((a, b) => {
|
|
|
// let lastIndex = a.length - 1
|
|
|
@@ -294,19 +389,51 @@
|
|
|
|
|
|
})
|
|
|
},
|
|
|
- change(index) {
|
|
|
+ change(item, index) {
|
|
|
+ this.transport_type_id = item.id
|
|
|
this.index = index
|
|
|
+ if (this.language == 'zh-CN') {
|
|
|
+ this.type = item.name_cn
|
|
|
+ }
|
|
|
+ if (this.language == 'en-US') {
|
|
|
+ this.type = item.name_en
|
|
|
+ }
|
|
|
+ if (this.language == 'es-ES') {
|
|
|
+ this.type = item.name_es
|
|
|
+ }
|
|
|
+ if (this.language == 'it-IT') {
|
|
|
+ this.type = item.name_ita
|
|
|
+ }
|
|
|
},
|
|
|
next() {
|
|
|
this.show = false
|
|
|
this.show1 = true
|
|
|
+ this.type1 = this.type
|
|
|
+ this.container()
|
|
|
},
|
|
|
- activea(idx) {
|
|
|
+ activea(item, idx) {
|
|
|
this.datechan = idx
|
|
|
+ this.sum = item.sum
|
|
|
+ this.unit_price = item.unit_price
|
|
|
+ this.recommend_weight = item.recommend_weight
|
|
|
+ if (this.language == 'zh-CN') {
|
|
|
+ this.containname = item.name_cn
|
|
|
+ }
|
|
|
+ if (this.language == 'en-US') {
|
|
|
+ this.containname = item.name_en
|
|
|
+ }
|
|
|
+ if (this.language == 'es-ES') {
|
|
|
+ this.containname = item.name_es
|
|
|
+ }
|
|
|
+ if (this.language == 'it-IT') {
|
|
|
+ this.containname = item.name_ita
|
|
|
+ }
|
|
|
},
|
|
|
//确定
|
|
|
confirm() {
|
|
|
this.show1 = false
|
|
|
+ this.containname1 = this.containname
|
|
|
+ this.recommendweight()
|
|
|
},
|
|
|
// 取消
|
|
|
close() {
|
|
|
@@ -315,8 +442,22 @@
|
|
|
},
|
|
|
//提交订单
|
|
|
topay() {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pageA/payorder'
|
|
|
+ uni.$u.http.post('/api/order', {
|
|
|
+ address_id: this.addinfo.id, //3 是 String 地址ID
|
|
|
+ goods_id: this.goodinfo.id, //65 是 String 商品id
|
|
|
+ goods_num: this.value, //2 是 String 商品数量
|
|
|
+ sku_item_id: this.sku_info.id, //60 是 String 规格id
|
|
|
+ cart_ids: '', //8,9 是 String 购物车id
|
|
|
+ remark: '', //备注 是 String 备注
|
|
|
+ merchant_goods_id: this.goodinfo.merchant_goods_id, //39 是 String 团长商品id
|
|
|
+ container_id: this.containid, //1 是 String 货柜id
|
|
|
+ share_merchant_id: '', // 是 String 分享团长id 分享商品的时候传
|
|
|
+ belong: 0 //0 是 String 商品归属 0团长 1平台自营 2团长发布或者分享的平台自营商品、供应链商品
|
|
|
+ }).then((res) => {
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pageA/payorder?sum=' + this.sum
|
|
|
+ })
|
|
|
+ }).catch(() => {
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
@@ -441,9 +582,10 @@
|
|
|
text-align: right;
|
|
|
font-style: normal;
|
|
|
overflow: hidden;
|
|
|
- width: 220rpx ;
|
|
|
+ width: 220rpx;
|
|
|
white-space: nowrap;
|
|
|
text-overflow: ellipsis;
|
|
|
+ text-align: center;
|
|
|
}
|
|
|
|
|
|
.wei {
|
|
|
@@ -577,7 +719,7 @@
|
|
|
padding: 22rpx 16rpx;
|
|
|
box-sizing: border-box;
|
|
|
margin-top: 10rpx;
|
|
|
- margin-bottom: 20rpx;
|
|
|
+ // margin-bottom: 20rpx;
|
|
|
}
|
|
|
|
|
|
.name {
|
zhaogongxue
