From 7868120e5a449760f81caac6f2e3c75924964268 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 10 九月 2024 16:04:48 +0800
Subject: [PATCH] update 优惠券和合伙人
---
sub_pages/customer/coupon/coupon-self.vue | 2
sub_pages/partner/delivery/delivery.vue | 81 ++++++++++++++++----------
sub_pages/partner/delivery/delivery-supplier-detail-list.vue | 76 +++++++++++++++---------
sub_pages/customer/shopping/confirm.vue | 7 +-
4 files changed, 102 insertions(+), 64 deletions(-)
diff --git a/sub_pages/customer/coupon/coupon-self.vue b/sub_pages/customer/coupon/coupon-self.vue
index fa6a535..6039b35 100644
--- a/sub_pages/customer/coupon/coupon-self.vue
+++ b/sub_pages/customer/coupon/coupon-self.vue
@@ -86,7 +86,7 @@
this.getList()
},
-onReachBottom() {
+ onReachBottom() {
this.getMore()
},
methods: {
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index f496ad4..dfb1796 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -25,7 +25,8 @@
if (this.cache_coupon.couponDiscountType === 'zero') {
return this.cache_coupon.couponDiscountValue || 0
} else if (this.cache_coupon.minOrderAmount && this.cache_coupon.minOrderAmount > 0) {
- var total = ((dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) || 0)
+ var total = ((this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this.current_transport.fee ||
+ 0) || 0)
.toFixed(2)
if (total >= this.cache_coupon.minOrderAmount) {
return this.cache_coupon.couponDiscountValue || 0
@@ -471,8 +472,8 @@
{{ (current_transport.fee || 0) }}
</view>
</view>
- <view class="desc flex">
- <view>优惠:</view>
+ <view class="desc flex" v-if="cache_coupon&&cache_coupon.id">
+ <view>优惠({{cache_coupon.couponDiscountType=='zero'?'无门槛':(cache_coupon.minOrderAmount?(`满￥${cache_coupon.minOrderAmount}可用`):'无门槛')}},优惠￥{{cache_coupon.couponDiscountValue||'0'}}):</view>
<view class="m-l-a m-r-0 text-right">
-{{ coupon_fee || 0 }}
</view>
diff --git a/sub_pages/partner/delivery/delivery-supplier-detail-list.vue b/sub_pages/partner/delivery/delivery-supplier-detail-list.vue
index 80d3589..cc1755d 100644
--- a/sub_pages/partner/delivery/delivery-supplier-detail-list.vue
+++ b/sub_pages/partner/delivery/delivery-supplier-detail-list.vue
@@ -7,7 +7,7 @@
stationId: '',
stationName: '',
statusStr: '',
- status: '',
+ status: 'ARRIVED,PENDING',
warehouseLocationCode: '',
},
show_select_station: false,
@@ -45,6 +45,16 @@
}
],
target_levels: [],
+ tabs: [{
+ name: '待质检',
+ status: 'ARRIVED,PENDING',
+ },
+ {
+ name: '已质检',
+ status: 'CHECKED',
+ },
+ ],
+ flg: '0',
}
},
onLoad(options) {
@@ -62,19 +72,19 @@
this.getList()
- this.$http.request('get', '/api/code/value', {
- params: {
- type: 'DELIVERY_ORDER_STATUS'
- }
- }).then(res => {
- var data = res.data || []
- this.status_columns = [data || []]
- this.status_columns[0].unshift({
- label: '全部',
- value: ''
- })
- console.log('status_columns', this.status_columns)
- })
+ // this.$http.request('get', '/api/code/value', {
+ // params: {
+ // type: 'DELIVERY_ORDER_STATUS'
+ // }
+ // }).then(res => {
+ // var data = res.data || []
+ // this.status_columns = [data || []]
+ // this.status_columns[0].unshift({
+ // label: '全部',
+ // value: ''
+ // })
+ // console.log('status_columns', this.status_columns)
+ // })
this.$http.request('get', '/api/code/value', {
params: {
type: 'FLOWER_LEVEL'
@@ -94,7 +104,7 @@
uni.stopPullDownRefresh()
},
methods: {
-
+
callTel(tel) {
if (tel) {
uni.makePhoneCall({
@@ -298,7 +308,11 @@
}
},
-
+ changeTab(flg) {
+ this.flg = '' + flg
+ this.query.status = this.tabs[flg].status
+ this.refreshList()
+ },
}
}
</script>
@@ -306,9 +320,19 @@
<!-- 列表页面 -->
<view class="page-delivery">
<view class="p15" style="min-height: calc(100vh - 260rpx);">
- <view class="search-container m-t-12 flex" v-if="!query.supplierId">
- <view class="flex1 input">
+ <top-tabs :tabs="tabs" :flg="flg" @change="changeTab" type="coupon">
+
+ </top-tabs>
+ <view class="search-container m-t-15 flex" v-if="!query.supplierId">
+ <view class="flex1 input m-r-5">
<u-input placeholder="请输入供应商名称" v-model="query.supplierName">
+ <template slot="suffix">
+ <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
+ </template>
+ </u-input>
+ </view>
+ <view class="flex1 input m-l-5">
+ <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
<template slot="suffix">
<uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
</template>
@@ -316,21 +340,15 @@
</view>
</view>
- <view class="search-container m-t-12 flex">
- <view class="flex1 input">
- <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
- <template slot="suffix">
- <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
- </template>
- </u-input>
- </view>
- <view class="component-filter-container p10 bg-white m-l-10">
+ <!-- <view class="search-container m-t-12 flex"> -->
+
+ <!-- <view class="component-filter-container p10 bg-white m-l-10">
<view class="flex1" @click="show_select_status=true">
配送单状态:{{ query.statusStr || '全部' }}
<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
</view>
- </view>
- </view>
+ </view> -->
+ <!-- </view> -->
<no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>
diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue
index 5a71d6b..7219977 100644
--- a/sub_pages/partner/delivery/delivery.vue
+++ b/sub_pages/partner/delivery/delivery.vue
@@ -7,7 +7,7 @@
stationId: '',
stationName: '',
statusStr: '',
- status: '',
+ status: 'ARRIVED,PENDING',
warehouseLocationCode: '',
date: '',
},
@@ -18,6 +18,16 @@
status_columns: [],
show_time_picker_time: false,
tmp_picker_time: new Date(),
+ flg: '0',
+ tabs: [{
+ name: '待质检',
+ status: 'ARRIVED,PENDING',
+ },
+ {
+ name: '已质检',
+ status: 'CHECKED',
+ },
+ ],
}
},
onLoad(options) {
@@ -35,19 +45,19 @@
// var data = res.data
// this.columns_station = [data || []]
// })
- this.$http.request('get', '/api/code/value', {
- params: {
- type: 'DELIVERY_ORDER_STATUS'
- }
- }).then(res => {
- var data = res.data || []
- this.status_columns = [data || []]
- this.status_columns[0].unshift({
- label: '全部',
- value: ''
- })
- console.log('status_columns', this.status_columns)
- })
+ // this.$http.request('get', '/api/code/value', {
+ // params: {
+ // type: 'DELIVERY_ORDER_STATUS'
+ // }
+ // }).then(res => {
+ // var data = res.data || []
+ // this.status_columns = [data || []]
+ // this.status_columns[0].unshift({
+ // label: '全部',
+ // value: ''
+ // })
+ // console.log('status_columns', this.status_columns)
+ // })
},
onReachBottom() {
@@ -61,13 +71,13 @@
methods: {
async select_time_picker_time(e) {
console.log('select_time_picker_time', e)
- var vv = e.value
+ var vv = e.value && new Date(e.value) || new Date()
// if (vv) {
// vv = vv.replace('aN:', '00:')
// }
// var time = new Date(`2023-8-21 ${vv}:00`)
this.show_time_picker_time = false
- this.query.date = vv || ''
+ this.query.date = this.$util.toDate(vv) || ''
},
changeSelecrRange() {
this.selecttoday = !this.selecttoday
@@ -130,7 +140,12 @@
// tmp.$forceUpdate()
// }, 500)
}
- }
+ },
+ changeTab(flg) {
+ this.flg = '' + flg
+ this.query.status = this.tabs[flg].status
+ this.refreshList()
+ },
}
}
</script>
@@ -138,9 +153,19 @@
<!-- 列表页面 -->
<view class="page-delivery">
<view class="p15" style="min-height: calc(100vh - 260rpx);">
- <view class="search-container m-t-12 flex">
- <view class="flex1 input">
+ <top-tabs :tabs="tabs" :flg="flg" @change="changeTab" type="coupon">
+
+ </top-tabs>
+ <view class="search-container m-t-15 flex">
+ <view class="flex1 input m-r-5">
<u-input placeholder="请输入供应商名称" v-model="query.supplierName">
+ <template slot="suffix">
+ <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
+ </template>
+ </u-input>
+ </view>
+ <view class="flex1 input m-l-5">
+ <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
<template slot="suffix">
<uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
</template>
@@ -148,22 +173,16 @@
</view>
</view>
- <view class="search-container m-t-12 flex">
- <view class="flex1 input">
- <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
- <template slot="suffix">
- <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
- </template>
- </u-input>
- </view>
- <view class="component-filter-container p10 bg-white m-l-10">
+ <!-- <view class="search-container m-t-12 flex"> -->
+
+ <!-- <view class="component-filter-container p10 bg-white m-l-10">
<view class="flex1" @click="show_select_status=true">
配送单状态:{{ query.statusStr || '全部' }}
<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
</view>
- </view>
- </view>
- <view class="m-t-12 m-b-12" class="flex">
+ </view> -->
+ <!-- </view> -->
+ <view class="m-t-12 m-b-12 flex">
<view class="" v-if="!selecttoday" :class="[query.date?'':'desc-gray']"
@click="show_time_picker_time=true">
<!-- 选择日期 -->
--
Gitblit v1.9.3