wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商家备注

Browse Source
h5
fanfan 4 months ago
parent 533b033655
commit a7e34a2e17
3 changed files with 1375 additions and 1238 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      ext.json
  2. 87
      pages/news3/shopOrderDetails.vue
  3. 80
      pages/order/detail.vue

2
ext.json
Unescape View File

@ -1,6 +1,6 @@
{
"extEnable": true,
"extAppid": "wx9f7e94fe11dc0c23",
"extAppid": "wxa3127ed5c3542a28",
"ext": {
"store_id": 10048
}

87
pages/news3/shopOrderDetails.vue
Unescape View File

@ -65,7 +65,8 @@
<!-- <view class="orderInfo">
<text>订单号：{{orderInfo.order_no}}</text>
</view> -->
<view class="list" v-for="(item,index) in orderInfo.goods" :key="index" @click="handleTargetGoods(item.goods_id)">
<view class="list" v-for="(item,index) in orderInfo.goods" :key="index"
@click="handleTargetGoods(item.goods_id)">
<image :src="item.goods_image" mode="aspectFill" class="thumb"></image>
<view class="item">
<view class="title">{{item.goods_name}}</view>
@ -74,7 +75,8 @@
<text class="num">x{{item.total_num}}</text>
<view>
<text class="moneyFlag">¥</text>
<text class="numText">{{item.total_pay_price?Number(item.total_pay_price):item.total_pay_price}}</text>
<text
class="numText">{{item.total_pay_price?Number(item.total_pay_price):item.total_pay_price}}</text>
</view>
</view>
</view>
@ -182,10 +184,20 @@
{{orderInfo.pay_method_text}}
</view>
</view>
<view class="list" v-if="orderInfo.remark">
<view class="title">订单备注:</view>
<view class="content">
{{orderInfo.remark}}
<view class="remarkTitle" v-if="orderInfo.merchant.length>0">
<view class="total">
商家备注：
</view>
<view style="overflow: hidden;">
<view class="merchant" v-for="(item, idx) in orderInfo.merchant">
<view class="merchantImg">
<image @click="previewImage(idxs,item.image_url)" :src="img.preview_url"
v-for="(img, idxs) in item.image_url" mode=""></image>
</view>
<view class="remarks">
{{item.remark}}
</view>
</view>
</view>
</view>
</view>
@ -202,8 +214,10 @@
<view class="btn"
v-show="!orderInfo.order_refund_id&&orderInfo.delivery_type==10&&orderInfo.order_status==10&&orderInfo.pay_status==20&&orderInfo.delivery_status==10&&userInfo.user_type == 40"
@click="goJump('/pages/news3/sendOutGoods',orderInfo,2)">发货</view>
<view class="del" v-show="orderInfo.audit_status==0&&userInfo.user_type == 40" @click="refuseOrder(orderInfo,20)">拒绝</view>
<view class="btn" v-show="orderInfo.audit_status==0&&userInfo.user_type == 40" @click="refuseOrder(orderInfo,10)">同意</view>
<view class="del" v-show="orderInfo.audit_status==0&&userInfo.user_type == 40"
@click="refuseOrder(orderInfo,20)">拒绝</view>
<view class="btn" v-show="orderInfo.audit_status==0&&userInfo.user_type == 40"
@click="refuseOrder(orderInfo,10)">同意</view>
<view class="del" @click="onDelete(orderInfo)"
v-show="(!orderInfo.order_refund_id&&orderInfo.order_status==30&&orderInfo.pay_status==20&&orderInfo.delivery_status==20)||(!orderInfo.order_refund_id&&orderInfo.order_status==20&&orderInfo.pay_status==10&&orderInfo.delivery_status==10)">
删除订单</view>
@ -292,6 +306,16 @@
this.getOrderDetail(this.order_id)
},
methods: {
previewImage(index, list) {
let newList=[]
list.forEach(item => {
newList.push(item.preview_url)
});
uni.previewImage({
current: index, // 当前显示图片索引
urls: newList, // 需要预览的图片http链接列表
});
},
// 跳转到商品详情页面
handleTargetGoods(goodsId) {
uni.redirectTo({
@ -1238,4 +1262,51 @@
}
}
}
.remarkTitle {
overflow: hidden;
margin-bottom: 20rpx;
.total {
float: left;
font-size: 24rpx;
color: #7E7E7E;
}
.merchantImg {
width: 100%;
display: flex;
flex-wrap: wrap;
flex-direction: row;
min-height: 100rpx;
}
.merchantImg image {
width: 100rpx;
height: 100rpx;
margin: 0 20rpx 20rpx 0;
}
.merchant {
margin-top: 5rpx;
overflow: hidden;
border-top: 1rpx solid #F4F4F4;
padding: 20rpx 0;
.remarks {
font-size: 24rpx;
font-weight: 500;
color: #1E1E1E;
line-height: 34rpx;
}
}
.merchant:nth-child(1) {
padding-top: 0;
border-top: none;
}
}
</style>

80
pages/order/detail.vue
Unescape View File

@ -185,7 +185,7 @@
</view>
</view> -->
<view class="orderTitle" v-if="order.delivery_status == DeliveryStatusEnum.DELIVERED.value">
<view class="total" v-if="order.delivery[0].delivery_method != DeliveryMethodEnum.UNWANTED.value">
<view class="total">
物流公司：
</view>
<view class="price">
@ -208,14 +208,23 @@
{{order.pay_time}}
</view>
</view>
<!-- <view class="orderTitle" v-if="order.receipt_time">
<view class="remarkTitle" v-if="order.merchant.length>0">
<view class="total">
期待配送时间：
商家备注：
</view>
<view style="overflow: hidden;">
<view class="merchant" v-for="(item, idx) in order.merchant">
<view class="merchantImg">
<image @click="previewImage(idxs,item.image_url)" :src="img.preview_url"
v-for="(img, idxs) in item.image_url" mode=""></image>
</view>
<view class="remark">
{{item.remark}}
</view>
</view>
</view>
<view class="price">
{{order.receipt_time}}
</view>
</view> -->
<view class="line">
</view>
<view class="amount">
@ -464,6 +473,16 @@
}
},
methods: {
previewImage(index, list) {
let newList = []
list.forEach(item => {
newList.push(item.preview_url)
});
uni.previewImage({
current: index, // 当前显示图片索引
urls: newList, // 需要预览的图片http链接列表
});
},
onCopyLink(str) {
uni.setClipboardData({
data: str, // 这里是个坑接受字符串类型 value转化为字符串
@ -700,7 +719,8 @@
// 点击去退款
onRefund(orderId, order, item) {
uni.navigateTo({
url: '/pages/order/refund/index?orderId=' + orderId + '&order=' + encodeURIComponent(JSON.stringify(order)) +
url: '/pages/order/refund/index?orderId=' + orderId + '&order=' + encodeURIComponent(JSON
.stringify(order)) +
"&deliveryStatus=" + item.delivery_status + '&receiptStatus=' + item.receipt_status
})
},
@ -1579,4 +1599,50 @@
font-size: 36rpx;
}
}
.remarkTitle {
overflow: hidden;
margin-bottom: 20rpx;
.total {
float: left;
font-size: 24rpx;
color: #7E7E7E;
}
.merchantImg {
width: 100%;
display: flex;
flex-wrap: wrap;
flex-direction: row;
min-height: 100rpx;
}
.merchantImg image {
width: 100rpx;
height: 100rpx;
margin: 0 20rpx 20rpx 0;
}
.merchant {
margin-top: 5rpx;
overflow: hidden;
border-top: 1rpx solid #F4F4F4;
padding: 20rpx 0;
.remark {
font-size: 24rpx;
font-weight: 500;
color: #1E1E1E;
line-height: 34rpx;
}
}
.merchant:nth-child(1) {
padding-top: 0;
border-top: none;
}
}
</style>

Write Preview
Loading…
Cancel
Save