|
@@ -6,26 +6,29 @@
|
|
<view class="grid"></view>
|
|
<view class="grid"></view>
|
|
<!-- 订单列表 -->
|
|
<!-- 订单列表 -->
|
|
<view class="order-list">
|
|
<view class="order-list">
|
|
- <view class="order-section" v-for="(shopInfo, shopInfoIndex) in goodsData" :key="shopInfoIndex">
|
|
|
|
- <!-- 供应商 -->
|
|
|
|
- <view class="origin">
|
|
|
|
- <image class="cover" :src="shopInfo.logo"></image> <view class="name">{{ shopInfo.name }}</view>
|
|
|
|
- </view>
|
|
|
|
- <!-- 商品列表 -->
|
|
|
|
- <view class="goods-list">
|
|
|
|
- <!-- 商品信息 -->
|
|
|
|
- <view class="order-goods" v-for="goods in shopInfo.productList" :key="goods.productId">
|
|
|
|
- <cm-order-prodcut :goods-data="goods"></cm-order-prodcut>
|
|
|
|
|
|
+ <view v-for="(shopInfo, shopInfoIndex) in goodsData" :key="shopInfoIndex">
|
|
|
|
+ <view class="line"></view>
|
|
|
|
+ <view class="order-section">
|
|
|
|
+ <!-- 供应商 -->
|
|
|
|
+ <view class="origin">
|
|
|
|
+ <image class="cover" :src="shopInfo.logo"></image> <view class="name">{{ shopInfo.name }}</view>
|
|
|
|
+ </view>
|
|
|
|
+ <!-- 商品列表 -->
|
|
|
|
+ <view class="goods-list">
|
|
|
|
+ <!-- 商品信息 -->
|
|
|
|
+ <view class="order-goods" v-for="goods in shopInfo.productList" :key="goods.productId">
|
|
|
|
+ <cm-order-prodcut :goods-data="goods"></cm-order-prodcut>
|
|
|
|
+ </view>
|
|
|
|
+ </view>
|
|
|
|
+ <!-- 合计 -->
|
|
|
|
+ <!-- <view class="total-price">
|
|
|
|
+ <text>合计:</text> <text class="price">¥{{ shopInfo.shopTotalPrice | formatPrice }}</text>
|
|
|
|
+ </view> -->
|
|
|
|
+ <!-- 留言 -->
|
|
|
|
+ <view class="remark">
|
|
|
|
+ <view class="label">留言:</view>
|
|
|
|
+ <input class="control" type="text" v-model="shopInfo.note" placeholder="请输入内容" />
|
|
</view>
|
|
</view>
|
|
- </view>
|
|
|
|
- <!-- 合计 -->
|
|
|
|
- <view class="total-price">
|
|
|
|
- <text>合计:</text> <text class="price">¥{{ shopInfo.shopTotalPrice | formatPrice }}</text>
|
|
|
|
- </view>
|
|
|
|
- <!-- 留言 -->
|
|
|
|
- <view class="remark">
|
|
|
|
- <view class="label">留言:</view>
|
|
|
|
- <input class="control" type="text" v-model="shopInfo.note" placeholder="请输入内容" />
|
|
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -46,6 +49,8 @@
|
|
<view class="grid"></view>
|
|
<view class="grid"></view>
|
|
<cm-order-freight-section></cm-order-freight-section>
|
|
<cm-order-freight-section></cm-order-freight-section>
|
|
|
|
|
|
|
|
+ <view class="grid"></view>
|
|
|
|
+
|
|
<!-- 提交导航 -->
|
|
<!-- 提交导航 -->
|
|
<cm-order-submit-nav :orderInfo="submitOrderInfo" @commit="orderSubmit"></cm-order-submit-nav>
|
|
<cm-order-submit-nav :orderInfo="submitOrderInfo" @commit="orderSubmit"></cm-order-submit-nav>
|
|
|
|
|
|
@@ -464,6 +469,13 @@ export default {
|
|
background: #f7f7f7;
|
|
background: #f7f7f7;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+.line{
|
|
|
|
+ width: 702rpx;
|
|
|
|
+ height: 1rpx;
|
|
|
|
+ margin: 0 auto;
|
|
|
|
+ background: #f7f7f7;
|
|
|
|
+}
|
|
|
|
+
|
|
.order-list {
|
|
.order-list {
|
|
background: #fff;
|
|
background: #fff;
|
|
|
|
|
|
@@ -512,7 +524,7 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
.remark {
|
|
.remark {
|
|
- padding: 0 24rpx;
|
|
|
|
|
|
+ padding: 24rpx 24rpx 0;
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
align-items: center;
|
|
align-items: center;
|