|
@@ -23,28 +23,28 @@
|
|
|
<view class="list_1">
|
|
<view class="list_1">
|
|
|
<view class="l">
|
|
<view class="l">
|
|
|
<text class="iconfont icon-shangdian"></text>
|
|
<text class="iconfont icon-shangdian"></text>
|
|
|
- <text>{{item.shop_name}}</text>
|
|
|
|
|
|
|
+ <text>{{shop[0].shop_name}}</text>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
<view class="list_2">
|
|
<view class="list_2">
|
|
|
<view class="l">
|
|
<view class="l">
|
|
|
- <image class="image" :src="item.goods[0].file&&item.goods[0].file.length>0?item.goods[0].file[0].url:''"
|
|
|
|
|
|
|
+ <image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''"
|
|
|
mode=""></image>
|
|
mode=""></image>
|
|
|
</view>
|
|
</view>
|
|
|
<view class="c">
|
|
<view class="c">
|
|
|
<view class="name">
|
|
<view class="name">
|
|
|
- {{item.goods[0].goods_name}}
|
|
|
|
|
|
|
+ {{item.goods_name}}
|
|
|
</view>
|
|
</view>
|
|
|
<view class="Spec">
|
|
<view class="Spec">
|
|
|
- 规格:{{item.goods[0].goodsSpec_name}}
|
|
|
|
|
|
|
+ 规格:{{item.goodsSpec_name}}
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
<view class="r">
|
|
<view class="r">
|
|
|
<view class="price">
|
|
<view class="price">
|
|
|
- ¥{{item.goods[0].money}}
|
|
|
|
|
|
|
+ ¥{{item.money}}
|
|
|
</view>
|
|
</view>
|
|
|
<view class="num">
|
|
<view class="num">
|
|
|
- ×{{item.goods[0].num}}
|
|
|
|
|
|
|
+ ×{{item.num}}
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
@@ -55,13 +55,13 @@
|
|
|
</view>
|
|
</view>
|
|
|
<view class="other">
|
|
<view class="other">
|
|
|
<view class="other_1">运费</view>
|
|
<view class="other_1">运费</view>
|
|
|
- <view class="other_2" v-if="!item.goods[0].freight==0">￥{{item.goods[0].freight}}</view>
|
|
|
|
|
|
|
+ <view class="other_2" v-if="!item.freight==0">￥{{item.freight}}</view>
|
|
|
<view class="other_2" v-else>包邮</view>
|
|
<view class="other_2" v-else>包邮</view>
|
|
|
</view>
|
|
</view>
|
|
|
<view class="other">
|
|
<view class="other">
|
|
|
<view class="other_1">订单备注</view>
|
|
<view class="other_1">订单备注</view>
|
|
|
<view class="other_3">
|
|
<view class="other_3">
|
|
|
- <input type="text" v-model="item.goods[0].remarks" placeholder="选填,可填写您与卖家达成一致的要求" />
|
|
|
|
|
|
|
+ <input type="text" v-model="item.remarks" placeholder="选填,可填写您与卖家达成一致的要求" />
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
@@ -120,6 +120,7 @@
|
|
|
key: '',
|
|
key: '',
|
|
|
address: {},
|
|
address: {},
|
|
|
orderList: [],
|
|
orderList: [],
|
|
|
|
|
+ shop:[],
|
|
|
goods_total:0,
|
|
goods_total:0,
|
|
|
// 收货地址
|
|
// 收货地址
|
|
|
addressList: [],
|
|
addressList: [],
|
|
@@ -213,7 +214,8 @@
|
|
|
})
|
|
})
|
|
|
if (arr.errcode == '0') {
|
|
if (arr.errcode == '0') {
|
|
|
that.$set(that, `address`, arr.data.address);
|
|
that.$set(that, `address`, arr.data.address);
|
|
|
- that.$set(that, `orderList`, arr.data.goodsData);
|
|
|
|
|
|
|
+ that.$set(that, `orderList`, arr.data.goodsData[0].goods);
|
|
|
|
|
+ that.$set(that, `shop`, arr.data.goodsData);
|
|
|
var total_freight=0;
|
|
var total_freight=0;
|
|
|
for (let val of arr.data.goodsData[0].goods) {
|
|
for (let val of arr.data.goodsData[0].goods) {
|
|
|
total_freight=total_freight+val.freight
|
|
total_freight=total_freight+val.freight
|
