mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

名称修改

Browse Source
This commit is contained in:
1154079537 2024-05-13 17:29:57 +08:00
parent 9c6784a67d
commit 68b29d2fb7
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pages/order_details/index.vue
View File

@ -126,19 +126,21 @@
</view> </view>
</view> </view>
</view> </view>
<view class="merchant line1" v-if="orderInfo.merchant && orderInfo.order_type != 1" <view class="merchant" v-if="orderInfo.merchant && orderInfo.order_type != 1"
@click="goStore(orderInfo.mer_id)"> @click="goStore(orderInfo.mer_id)">
{{orderInfo.merchant.mer_name}} <text class="merchant_name line1">{{orderInfo.merchant.mer_name}}</text>
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</view> </view>
<block v-if="cartInfo.length>0"> <block v-if="cartInfo.length>0">
<orderGoods :orderData='orderInfo' :pay_type="orderInfo.pay_type" :status="orderInfo.status" :evaluate='orderInfo.status' <orderGoods :orderData='orderInfo' :pay_type="orderInfo.pay_type" :status="orderInfo.status"
:activityType='orderInfo.activity_type' :sale_type="sale_type" :orderId="order_id" :cartInfo="cartInfo" :jump="true"> :evaluate='orderInfo.status' :activityType='orderInfo.activity_type' :sale_type="sale_type"
:orderId="order_id" :cartInfo="cartInfo" :jump="true">
</orderGoods> </orderGoods>
<block <block
v-if="orderInfo.order_type == 1 && orderInfo.takeOrderList && orderInfo.takeOrderList.length > 0" v-if="orderInfo.order_type == 1 && orderInfo.takeOrderList && orderInfo.takeOrderList.length > 0"
v-for="(item,index) in orderInfo.takeOrderList" :key="index"> v-for="(item,index) in orderInfo.takeOrderList" :key="index">
<orderGoods :orderData='item' :pay_type="orderInfo.pay_type" :status="orderInfo.status" :evaluate='item.status' :activityType='item.activity_type' :sale_type="sale_type" <orderGoods :orderData='item' :pay_type="orderInfo.pay_type" :status="orderInfo.status"
:evaluate='item.status' :activityType='item.activity_type' :sale_type="sale_type"
:orderId="item.order_id" :cartInfo="item.orderProduct" :jump="true"></orderGoods> :orderId="item.order_id" :cartInfo="item.orderProduct" :jump="true"></orderGoods>
</block> </block>
</block> </block>
@ -288,7 +290,8 @@
</view> </view>
<view class='item acea-row row-between' v-if='orderInfo.platform_coupon_price > 0'> <view class='item acea-row row-between' v-if='orderInfo.platform_coupon_price > 0'>
<view>平台优惠抵扣：</view> <view>平台优惠抵扣：</view>
<view class='conter' style="width: auto;color: #F55726;">-￥{{orderInfo.platform_coupon_price}}</view> <view class='conter' style="width: auto;color: #F55726;">-￥{{orderInfo.platform_coupon_price}}
</view>
</view> </view>
<view class='item acea-row row-between' v-if='orderInfo.integral'> <view class='item acea-row row-between' v-if='orderInfo.integral'>
<view>积分抵扣：</view> <view>积分抵扣：</view>
@ -942,7 +945,8 @@
}).then(res => { }).then(res => {
let cart_id = res.data.cart_id.join(',') let cart_id = res.data.cart_id.join(',')
return uni.navigateTo({ return uni.navigateTo({
url: '/pages/users/order_confirm/index?cartId=' + cart_id + '&sale_type=' + this.sale_type url: '/pages/users/order_confirm/index?cartId=' + cart_id + '&sale_type=' +
this.sale_type
}); });
}).catch(err => { }).catch(err => {
that.$util.Tips({ that.$util.Tips({
@ -1054,6 +1058,7 @@
} }
.merchant { .merchant {
display: flex;
width: 100%; width: 100%;
height: 86rpx; height: 86rpx;
padding: 0 30rpx; padding: 0 30rpx;
@ -1065,6 +1070,12 @@
box-sizing: border-box; box-sizing: border-box;
background-color: #fff; background-color: #fff;
.merchant_name {
display: inline-block;
overflow: hidden;
max-width: 700rpx;
}
.iconfont { .iconfont {
margin-top: 6rpx; margin-top: 6rpx;
font-size: 22rpx; font-size: 22rpx;