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

商品自提点区分店长与用户信息展示

Browse Source
version/0412
fanfan 9 months ago
parent 207504da6e
commit 3996e159f7
4 changed files with 111 additions and 17 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. 100
      pages/news3/shopOrderDetails.vue
  2. 19
      pages/order/detail.vue
  3. 3
      pages/order/index.vue
  4. 6
      pages/sureOrder/index.vue

100
pages/news3/shopOrderDetails.vue
Unescape View File

@ -34,7 +34,7 @@
</view> </view>
<!-- 收货地址 --> <!-- 收货地址 -->
<view class="shipping-address" v-if="orderInfo.address"> <view class="shipping-address" v-if="orderInfo.address&&orderInfo.delivery_type == 10">
<view class="name-phone"> <view class="name-phone">
<text>{{orderInfo.address.name}}</text> <text>{{orderInfo.address.name}}</text>
<text style="margin-left: 50rpx;">{{orderInfo.address.phone}}</text> <text style="margin-left: 50rpx;">{{orderInfo.address.phone}}</text>
@ -43,6 +43,22 @@
<text>{{orderInfo.address.region.province}}{{orderInfo.address.region.city}}{{orderInfo.address.region.region}}{{orderInfo.address.detail}}</text> <text>{{orderInfo.address.region.province}}{{orderInfo.address.region.city}}{{orderInfo.address.region.region}}{{orderInfo.address.detail}}</text>
</view> </view>
</view> </view>
<view class="consignee" v-if="orderInfo &&orderInfo.delivery_type == 20">
<view class="conLeft">
<view class="thr">
<view class="peo">提货人</view>
<view class="name">{{ orderInfo.ziti_address.linkman }}</view>
</view>
<view class="thr">
<view class="peo">手机号</view>
<view class="name">{{ orderInfo.ziti_address.phone }}</view>
</view>
<view class="thr">
<view class="peo">到店时间</view>
<view class="name">{{ orderInfo.to_store_time }}</view>
</view>
</view>
</view>
<!-- 订单商品 --> <!-- 订单商品 -->
<view class="order-goods"> <view class="order-goods">
<view class="goods-list"> <view class="goods-list">
@ -256,7 +272,7 @@
return { return {
status: 1, status: 1,
orderInfo: '', orderInfo: '',
order_id:'', order_id: '',
audit_status: 20, audit_status: 20,
audit_notes: '', audit_notes: '',
deleteShow: false, deleteShow: false,
@ -277,7 +293,7 @@
const app = this const app = this
OrderApi.detail(this.order_id) OrderApi.detail(this.order_id)
.then(result => { .then(result => {
this.orderInfo=result.data.order this.orderInfo = result.data.order
}) })
}, },
// 联系商家 // 联系商家
@ -676,7 +692,7 @@
border-radius: 4px; border-radius: 4px;
.goods-list { .goods-list {
padding: 30upx 40upx 0 40upx; padding: 15upx 40upx 0 40upx;
.list { .list {
display: flex; display: flex;
@ -1136,4 +1152,80 @@
} }
} }
} }
.consignee {
width: 100%;
// height: 200rpx;
background: #FFFFFF;
border-radius: 10rpx 10rpx 10rpx 10rpx;
opacity: 1;
margin: 12rpx 0 0 0rpx;
display: flex;
justify-content: space-between;
padding: 24rpx 36rpx 6rpx 32rpx;
.conLeft {
.thr {
overflow: hidden;
// display: flex;
width: 474rpx;
// height: 34rpx;
font-size: 24rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
color: #838383;
line-height: 34rpx;
margin-bottom: 20rpx;
// justify-content: flex-start;
.peo {
width: 150rpx;
float: left;
}
.name {
color: #333;
float: left;
word-wrap: break-word;
width: 300rpx;
}
}
}
.conRight {
font-family: PingFang SC, PingFang SC;
font-weight: 600;
color: #F21A1C;
display: flex;
flex-direction: column;
align-items: center;
.code {
height: 34rpx;
font-size: 24rpx;
line-height: 34rpx;
margin-bottom: 8rpx;
}
.codeNum {
width: 80rpx;
height: 78rpx;
image {
width: 100%;
height: 100%;
}
}
.openCode {
height: 28rpx;
font-size: 20rpx;
font-weight: 400;
color: #848484;
line-height: 23rpx;
margin-top: 4rpx;
}
}
}
</style> </style>

19
pages/order/detail.vue
Unescape View File

@ -41,13 +41,17 @@
<view class="consignee" v-if="order.delivery_type == DeliveryTypeEnum.EXTRACT.value"> <view class="consignee" v-if="order.delivery_type == DeliveryTypeEnum.EXTRACT.value">
<view class="conLeft"> <view class="conLeft">
<view class="thr"> <view class="thr">
<view class="peo">提货人</view> <view class="peo">门店名称</view>
<view class="name">{{ order.extract_shop.linkman }}</view> <view class="name">{{ order.extract_shop.shop_name }}</view>
</view> </view>
<view class="thr"> <view class="thr">
<view class="peo">手机号</view> <view class="peo">门店电话</view>
<view class="name">{{ order.extract_shop.phone }}</view> <view class="name">{{ order.extract_shop.phone }}</view>
</view> </view>
<view class="thr">
<view class="peo">门店地址</view>
<view class="name">{{ order.extract_shop.full_address }}</view>
</view>
<view class="thr"> <view class="thr">
<view class="peo">营业时间</view> <view class="peo">营业时间</view>
<view class="name">{{ order.extract_shop.shop_hours }}</view> <view class="name">{{ order.extract_shop.shop_hours }}</view>
@ -56,12 +60,8 @@
<view class="peo">到店时间</view> <view class="peo">到店时间</view>
<view class="name">{{ order.to_store_time }}</view> <view class="name">{{ order.to_store_time }}</view>
</view> </view>
<!-- <view class="thr">
<view class="peo">预计到店时间</view>
<view class="name">2023-12-20 09:15</view>
</view> -->
</view> </view>
<view class="conRight" @click="openCode"> <view class="conRight" @click="openCode" v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_type == DeliveryTypeEnum.EXTRACT.value">
<view class="code"> <view class="code">
核销码 核销码
</view> </view>
@ -290,8 +290,7 @@
v-if="order.pay_status == PayStatusEnum.PENDING.value &&order.order_status == OrderStatusEnum.NORMAL.value"> v-if="order.pay_status == PayStatusEnum.PENDING.value &&order.order_status == OrderStatusEnum.NORMAL.value">
立即支付 立即支付
</view> </view>
<view class="buyAgain" @click="onQrcodeImage(order.order_id)" v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_type == DeliveryTypeEnum.EXTRACT.value <view class="buyAgain" @click="onQrcodeImage(order.order_id)" v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_type == DeliveryTypeEnum.EXTRACT.value">
&& order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
核销码 核销码
</view> </view>
<view class="buyAgain" @click="handleTargetExpress(order.order_id)" <view class="buyAgain" @click="handleTargetExpress(order.order_id)"

3
pages/order/index.vue
Unescape View File

@ -73,8 +73,7 @@
v-if="item.order_status == OrderStatusEnum.COMPLETED.value || (item.pay_status == PayStatusEnum.PENDING.value&&item.order_status == OrderStatusEnum.NORMAL.value)"> v-if="item.order_status == OrderStatusEnum.COMPLETED.value || (item.pay_status == PayStatusEnum.PENDING.value&&item.order_status == OrderStatusEnum.NORMAL.value)">
更多</view> 更多</view>
<view class="b"> <view class="b">
<view class="n" v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_type == DeliveryTypeEnum.EXTRACT.value <view class="n" v-if="item.pay_status == PayStatusEnum.SUCCESS.value && item.delivery_type == DeliveryTypeEnum.EXTRACT.value"
&& item.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value"
@click="onExtractQRCode(item.order_id)">核销码 @click="onExtractQRCode(item.order_id)">核销码
</view> </view>
<view class="n" <view class="n"

6
pages/sureOrder/index.vue
Unescape View File

@ -626,7 +626,6 @@
this.$navTo('pages/order/index', {}, 'redirectTo') this.$navTo('pages/order/index', {}, 'redirectTo')
}, 1000) }, 1000)
}, },
// 表单提交的数据 // 表单提交的数据
getFormData() { getFormData() {
const app = this const app = this
@ -643,6 +642,11 @@
expect_receive_time: app.buyType == 'sm'?app.timer : '', expect_receive_time: app.buyType == 'sm'?app.timer : '',
is_street_take: app.buyType == 'zq'?(app.is_street_take?1:0) : '', is_street_take: app.buyType == 'zq'?(app.is_street_take?1:0) : '',
to_store_time: app.buyType == 'zq'?app.timer : '', to_store_time: app.buyType == 'zq'?app.timer : '',
ziti_address:app.buyType=='zq'?({
shopId: app.selectedShopId || 0,
linkman: app.linkman,
phone: app.phone,
}):''
} }
// 获取不同模式的参数 // 获取不同模式的参数
const modeParam = getModeParam(options.mode, options) const modeParam = getModeParam(options.mode, options)

Write Preview
Loading…
Cancel
Save