From 0dabf05bfe9df453ffd394e2f280f878c848942a Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 04 十二月 2024 13:19:32 +0800
Subject: [PATCH] 1.客服电话 2.订单优惠券自动选择 3.合伙人送货详情等
---
sub_pages/customer/shopping/shopping.vue | 14
sub_pages/partner/delivery/delivery-home.vue | 2
pages/home/supplier-home.vue | 4
pages.json | 6
sub_pages/partner/order-manage/order-manage.vue | 446 +++++++++++++++++++++++++++--
sub_pages/customer/setup/account-self.vue | 2
sub_pages/customer/shopping/confirm.vue | 148 ++++++---
sub_pages/partner/order-manage/order-manage-settlement-op-detail.vue | 197 +++++++++++++
pages/order/order-detail.vue | 19 +
sub_pages/customer/setup/setup.vue | 2
sub_pages/supplier/customer_service/customer_service.vue | 7
pages/user/supplier-user.vue | 2
12 files changed, 739 insertions(+), 110 deletions(-)
diff --git a/pages.json b/pages.json
index d5f5488..df0f057 100644
--- a/pages.json
+++ b/pages.json
@@ -373,6 +373,12 @@
}
},
{
+ "path": "order-manage/order-manage-settlement-op-detail",
+ "style": {
+ "navigationBarTitleText": "送货单质检操作明细"
+ }
+ },
+ {
"path": "markup-config/markup-config",
"style": {
"navigationBarTitleText": "加价配置",
diff --git a/pages/home/supplier-home.vue b/pages/home/supplier-home.vue
index 6204421..a0920f1 100644
--- a/pages/home/supplier-home.vue
+++ b/pages/home/supplier-home.vue
@@ -183,14 +183,14 @@
<view class="order-desc tg">订单统计</view>
</view>
- <view class="nav row margin-tb"
+ <!-- <view class="nav row margin-tb"
@click="goto('/sub_pages/supplier/order-settlement/order-settlement',true)">
<view class="img-c">
<image class="icon margin-bottom order-icon zdjs"
src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/7b/7b7ed1488fd64f6fa9bc6b557f141f37user-icon-zdjs.png" mode="scaleToFill" />
</view>
<view class="order-desc tg">账单结算</view>
- </view>
+ </view> -->
<view class="nav row margin-tb" @click="toFlowManage" v-if="selftype==='supplier'">
<view class="img-c">
<image class="icon margin-bottom order-icon spgl"
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index cbc4434..4acc628 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -120,6 +120,7 @@
})
},
+
methods: {
// 商品评论
commentButtonClick(){
@@ -222,9 +223,23 @@
async callTel() {
await this.$message.confirm('是否拨打客服电话')
uni.makePhoneCall({
- phoneNumber: '15974805814'
+ phoneNumber: '19288780072'
});
},
+
+ async getTelNum(){
+ this.$http.request('get', '/api/code/value', {
+ params: {
+ type: 'customer_service_hotline'
+ }
+ }).then(res => {
+ var data = res.data;
+
+ console.log(data)
+
+ })
+ },
+
async getItemList() {
this.$message.showLoading()
const {
@@ -785,7 +800,7 @@
<view class="flex m-t-12">
<view class="flex1 w-fit m-auto icon-view" @click.stop="callTel">
<image src="/static/common/icon-call.png" class="icon icon-call m-r-10 img100"></image>
- 拨打15974805814
+ 拨打19288780072
</view>
<view class="flex1 w-fit m-auto icon-view flex flex-wrap-normal" open-type="contact">
<image src="/static/common/icon-wx.png" class="icon icon-call m-t-2 m-r-10 img100"></image>
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index a49fa3b..3b3f4a5 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -548,7 +548,7 @@
tcode: '',
inviterName: '',
// StatusBar:0,
- tel: '15974805814',
+ tel: '19288780072',
tj: {},
tj_order: {},
cacheUserId: '',
diff --git a/sub_pages/customer/setup/account-self.vue b/sub_pages/customer/setup/account-self.vue
index e434d91..74da144 100644
--- a/sub_pages/customer/setup/account-self.vue
+++ b/sub_pages/customer/setup/account-self.vue
@@ -34,7 +34,7 @@
tcode: '',
inviterName: '',
// StatusBar:0,
- tel: '15974805814',
+ tel: '19288780072',
tj: {},
tj_order: {},
cacheUserId: '',
diff --git a/sub_pages/customer/setup/setup.vue b/sub_pages/customer/setup/setup.vue
index 7d03152..d22265a 100644
--- a/sub_pages/customer/setup/setup.vue
+++ b/sub_pages/customer/setup/setup.vue
@@ -63,7 +63,7 @@
tcode: '',
inviterName: '',
// StatusBar:0,
- tel: '15974805814',
+ tel: '19288780072',
tj: {},
tj_order: {},
cacheUserId: '',
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index bed5b0a..21bfa34 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -36,16 +36,14 @@
let tmpCoupon = res.data;
if (tmpCoupon) {
if(this.cache_coupon_select_cancel==0){
- console.log("自动为您选择优惠最大的优惠券")
await this.$store.dispatch('cache_coupon_select', tmpCoupon);
this.dto.couponRecordId = tmpCoupon.id;
this.dto.couponRecordStr = tmpCoupon.couponName;
setTimeout(() => {
this.$message.showToast('自动为您选择优惠最大的优惠券')
- }, 2000)
+ }, 1000)
}else{
- console.log("清空")
await this.$store.dispatch('cache_coupon_select', {});
this.dto.couponRecordId ="";
this.dto.couponRecordStr = "";
@@ -113,7 +111,17 @@
await this.$store.dispatch('cache_coupon_select_cancel', 0)
},
- onShow() {
+ async onShow() {
+
+ // 查看当前合伙人
+ await this.getPartnerInfo()
+
+ // 根据地址获取运输方式
+ if (this.address.id) {
+ await this.loadTransportList()
+ this.cacheAddressId = this.address.id
+ }
+
// 获取当前用户为使用的优惠券
// this.getSuitableCouponAuto()
//优惠券
@@ -134,6 +142,11 @@
}
this.dto.goodsRecordIdListStr = names.join(',')
}
+
+
+
+
+
},
onLoad(options) {
// console.log('dto',options)
@@ -156,10 +169,7 @@
value: ''
})
})
- if (this.address.id) {
- this.loadTransportList()
- this.cacheAddressId = this.address.id
- }
+
//
//先获取直接的全部地址
// @ApiModelProperty(value = "订单商品")
@@ -167,27 +177,7 @@
// @ApiModelProperty(value = "打包费")
// private BigDecimal packing;
- // 两种情况,我合伙人是A,我进入页面前改成了B,我进去后还是获取了A——可以通过
-
- if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
- // 考虑一下，由后台实时获取，如果获取的合伙人id不一样，那么就刷新当前用户信息。
-
- this.$http.request('get', '/api/current/customer/partner', {
- params: {
- // id: this.currentInfo.customerDTO.partnerId
- }
- }).then(async res => {
- if (res.code == 0) {
- this.partnerInfo = res.data || {}
- if (this.partnerInfo.id !== this.currentInfo.customerDTO.partnerId) {
- //刷新用户信息
- await this.$store.dispatch('getCurrentInfo')
- }
- }
- })
-
-
- }
+
},
data() {
@@ -214,6 +204,8 @@
partnerInfo: {},
isShowFlag:true,
+ transportExistsFlag:true,
+
}
},
watch: {
@@ -232,6 +224,28 @@
}
},
methods: {
+
+ getPartnerInfo(){
+ // 两种情况,我合伙人是A,我进入页面前改成了B,我进去后还是获取了A——可以通过
+ // console.log(this.currentInfo.customerDTO.partnerId)
+ // if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
+ // 考虑一下，由后台实时获取，如果获取的合伙人id不一样，那么就刷新当前用户信息。
+
+ this.$http.request('get', '/api/current/customer/partner', {
+ params: {
+ // id: this.currentInfo.customerDTO.partnerId
+ }
+ }).then(async res => {
+ if (res.code == 0) {
+ this.partnerInfo = res.data || {}
+ if (this.partnerInfo.id !== this.currentInfo.customerDTO.partnerId) {
+ //刷新用户信息
+ await this.$store.dispatch('getCurrentInfo')
+ }
+ }
+ })
+ // }
+ },
async getSuitableCouponAuto(){
//1.提交订单后，根据订单的商品金额，判断是否达到优惠券使用条件，如果达到，自动选择面值最大的优惠券，用户也可以在优惠券自己切换优惠券或不使用优惠券
@@ -272,12 +286,12 @@
this.dto.specialNeeds = e.value[0].value
},
async loadTransportList() {
- if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
- return
- }
+ // debugger;
+ // if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) {
+ // return
+ // }
let that = this;
- // console.log('address', that.address, that.cacheAddressId)
- if (that.address && that.address.id && that.cacheAddressId !== that.address.id) {
+ // if (that.address && that.address.id && that.cacheAddressId !== that.address.id) {
that.$message.showLoading()
const {
code,
@@ -289,11 +303,18 @@
}
})
that.$message.hideLoading()
- that.transportList = []
+ this.transportList = []
if (code === 0) {
- that.transportList = data || []
+ this.transportList = data || []
+ console.log("this.transportList")
+ console.log(this.transportList)
+ if(this.transportList && this.transportList.length>0){
+ this.transportExistsFlag=true
+ }else{
+ this.transportExistsFlag=false
+ }
}
- }
+ // }
},
async submitOrder() {
@@ -476,31 +497,42 @@
<!-- 查看商品列表，和选择运费 -->
<view class="br-4 transform-container m-t-12 p10"
- v-if="!currentInfo.customerDTO||!currentInfo.customerDTO.partnerId">
- <view class="title">
- <view>运输方式：</view>
- <view class="flex transform-list flex-wrap-normal">
- <view v-for="(transform,index) of transportList"
- :class="[transform.id===dto.transportId?'cur':'']" :key="index" class="transform-item"
- @click="()=>{
- dto.transportId = transform.id;
- current_transport = transform
- }">
- <view class="title">{{ transform.name }}</view>
- <view class="price">￥{{ transform.fee }}</view>
+ v-if="!(partnerInfo&&partnerInfo.id)&&(!currentInfo.customerDTO||!currentInfo.customerDTO.partnerId)">
+ <view v-if="(address.id || cacheAddressId)&& transportExistsFlag" >
+ <view class="title">
+ <view>运输方式：</view>
+ <view class="flex transform-list flex-wrap-normal">
+ <view v-for="(transform,index) of transportList"
+ :class="[transform.id===dto.transportId?'cur':'']" :key="index" class="transform-item"
+ @click="()=>{
+ dto.transportId = transform.id;
+ current_transport = transform
+ }">
+ <view class="title">{{ transform.name }}</view>
+ <view class="price">￥{{ transform.fee }}</view>
+ </view>
+ </view>
+ </view>
+ <view class="m-t-20" v-if="true">
+ <view class="desc-red">
+ 10kg以下的零买订单将收取打包费，花店建议购满20kg， 可选冷链物流
+ </view>
+ <view class="desc">
+ <!-- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)， -->
+ 第一次下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时送货到店。
+ <!-- 优势:价格便宜，顺丰配送 -->
+ <!-- 弊端:订单必须是5kg以内 -->
</view>
</view>
</view>
- <view class="m-t-20" v-if="true">
- <view class="desc-red">
- 10kg以下的零买订单将收取打包费，花店建议购满20kg， 可选冷链物流
+ <view v-else>
+ <view class="title">
+ <view>运输方式：</view>
+ <view style="text-align:center;color:gray;">
+ 平台没有运输方式
+ </view>
</view>
- <view class="desc">
- <!-- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)， -->
- 第一次下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时送货到店。
- <!-- 优势:价格便宜，顺丰配送 -->
- <!-- 弊端:订单必须是5kg以内 -->
- </view>
+
</view>
</view>
diff --git a/sub_pages/customer/shopping/shopping.vue b/sub_pages/customer/shopping/shopping.vue
index fc4b6a7..88fa17c 100644
--- a/sub_pages/customer/shopping/shopping.vue
+++ b/sub_pages/customer/shopping/shopping.vue
@@ -7,8 +7,9 @@
</view>
<view class="flex top-kf">
<image class="icon-clock m-r-6" src="../../../static/common/icon-kf.png"></image>
- <view class="name">
- 15974805814
+ <image class="icon-clock m-r-6 m-t-2" src="../../../static/common/icon-call.png"></image>
+ <view class="name" @click.stop="callTel">
+ {{tel}}
</view>
<view class="m-l-a m-r-0">
<uni-icons v-if="list&&list.length>0" type="trash" size="28" @click="batchDelete"></uni-icons>
@@ -93,7 +94,7 @@
export default {
data() {
return {
- tel: '15974805814',
+ tel: '19288780072',
ids: [],
checkall: false,
options1: [{
@@ -133,6 +134,13 @@
},
},
methods: {
+
+ async callTel() {
+ await this.$message.confirm('是否拨打客服电话')
+ uni.makePhoneCall({
+ phoneNumber: this.tel //仅为示例
+ });
+ },
async batchDelete() {
// /api/customer/flower/cart/delete/batch
diff --git a/sub_pages/partner/delivery/delivery-home.vue b/sub_pages/partner/delivery/delivery-home.vue
index 94b7c91..503832a 100644
--- a/sub_pages/partner/delivery/delivery-home.vue
+++ b/sub_pages/partner/delivery/delivery-home.vue
@@ -99,7 +99,7 @@
tcode: '',
inviterName: '',
// StatusBar:0,
- tel: '15974805814',
+ tel: '19288780072',
tj: {},
cacheUserId: '',
diff --git a/sub_pages/partner/order-manage/order-manage-settlement-op-detail.vue b/sub_pages/partner/order-manage/order-manage-settlement-op-detail.vue
new file mode 100644
index 0000000..d0d7131
--- /dev/null
+++ b/sub_pages/partner/order-manage/order-manage-settlement-op-detail.vue
@@ -0,0 +1,197 @@
+<script>
+ export default {
+ data() {
+ return {
+ dto: {
+
+ },
+ orderItemId: '',
+ op: '',
+ opStr: ''
+ };
+ },
+ async onLoad(options) {
+ this.orderItemId = options.orderItemId || ''
+ this.op = options.op || ''
+ this.opStr = options.opStr || ''
+ if (this.opStr) {
+ uni.setNavigationBarTitle({
+ title: this.opStr
+ })
+ }
+
+ await this.init()
+
+ },
+
+ methods: {
+ async init() {
+ var apitype = 'supplier'
+ // #ifdef PUB_CUSTOMER
+ apitype = 'customer'
+ // #endif
+
+ this.$message.showLoading()
+ const {
+ data
+ } = await this.$http.request('get', `/api/${apitype}/delivery/mine/list/check/info/` + this.op, {
+ params: {
+ orderItemId: this.orderItemId
+ }
+ })
+
+ this.$message.hideLoading()
+ if (data) {
+ var t = data || {}
+ // if (!t.pictures) {
+ // t.pictures = []
+ // } else {
+ // try {
+ // t.pictures = JSON.parse(t.pictures) || []
+ // } catch (e) {
+ // console.log('parse arriveImages', e)
+ // }
+ // }
+ this.dto = {
+ ...this.dto,
+ ...t
+ }
+ }
+ },
+
+
+
+ }
+ }
+</script>
+<template>
+ <view class="delivery-detail-page bg-white p20">
+ <no-data v-if="!dto.id" style="width: 100%;"></no-data>
+
+ <view v-if="dto.id">
+ <view class="delivery-info p10 flex">
+ <view class="flex1">
+ <view class="name">质检时间：{{ dto.checkTime || '-'}}</view>
+ <view class="name">质检人：{{ dto.createName || '-'}}</view>
+ <view class="name">审核状态：{{ dto.auditStatusStr || '-'}}</view>
+ <view class="name">备注：{{ dto.remarks || '-'}}</view>
+
+
+ <view class="line-gray"></view>
+ <view class="name" v-if="dto.targetLevel">降级等级：{{ dto.targetLevelStr || dto.targetLevel || '-'}}
+ </view>
+
+ <!-- <view class="name" v-if="dto.type">处理类型：{{ dto.type || '-'}}</view> -->
+ <view class="name">处理数量：{{ dto.num || '-' }}</view>
+
+ <view class="name">
+ 扣款金额/每扎：￥{{ (dto.deductAmount&&parseFloat(dto.deductAmount)||0)/(dto.num&&parseInt(dto.num)||1).toFixed(2) || '-'}}
+ </view>
+
+ <view class="name">扣款金额：￥{{ dto.deductAmount || '-'}}</view>
+
+ </view>
+ </view>
+
+
+ </view>
+
+ <view class="p10" style="margin-top: 0rpx;padding-top: 0rpx;" v-if="dto.pictureList&&dto.pictureList.length>0">
+ <view class="line-gray"></view>
+
+ <view class="m-r-0">
+ <view>图片:</view>
+ </view>
+ <view class="flex">
+ <view class="m-t-12 m-r-10 " v-for="(timg,index) of dto.pictureList" :key="index">
+ <image class="arrive-img" :src="timg" @click.stop="previewImg(timg)">
+ </image>
+ </view>
+ </view>
+ </view>
+
+ </view>
+
+ </view>
+</template>
+
+<style lang="scss" scoped>
+ .delivery-detail-page {
+ font-weight: 400;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ min-height: 99vh;
+
+ .arrive-img {
+ width: 96rpx;
+ height: 96rpx;
+ border-radius: 4rpx;
+ border: 2rpx dashed #CECECE;
+ }
+
+ .delivery-order-item {
+ .title {
+ font-weight: 600;
+ font-size: 28rpx;
+ color: #000000;
+ line-height: 40rpx;
+
+ .level {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #20613D;
+ line-height: 40rpx;
+ margin-left: 20rpx;
+ }
+ }
+
+ .buttons {
+ display: flex;
+
+ .button {
+ margin: 0 auto;
+ width: 98rpx;
+ line-height: 48rpx;
+ border-radius: 24rpx;
+ border: 2rpx solid #CECECE;
+ text-align: center;
+ font-size: 24rpx;
+ color: #666666;
+ line-height: 34rpx;
+ }
+
+ .button-0 {
+ color: #fff;
+ border: 2rpx solid #20613D;
+ background: #20613D;
+ }
+ }
+
+ .flower-img {
+ width: 128rpx;
+ height: 118rpx;
+ min-width: 128rpx;
+ min-height: 118rpx;
+ }
+
+ }
+
+
+ .delivery-info {
+ // padding: 10rpx;
+
+
+
+ .station {
+ height: 50rpx;
+ background: #C6E8D4;
+ border-radius: 4rpx;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
+ min-width: 110rpx;
+
+ line-height: 50rpx;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/sub_pages/partner/order-manage/order-manage.vue b/sub_pages/partner/order-manage/order-manage.vue
index 8e9de6d..a21409f 100644
--- a/sub_pages/partner/order-manage/order-manage.vue
+++ b/sub_pages/partner/order-manage/order-manage.vue
@@ -1,66 +1,190 @@
<template>
<view class="list-container order-settlement supplier">
<view class="component-tab-container m-t-12">
- <view class="tab-item" :class="[tabIndex===0?'cur':'']" @click="changeIndex(0)">全部</view>
- <view class="tab-item" :class="[tabIndex===1?'cur':'']" @click="changeIndex(1)">待配送</view>
- <view class="tab-item" :class="[tabIndex===2?'cur':'']" @click="changeIndex(2)">待收货</view>
+ <view class="tab-item" :class="[tabIndex === 0 ? 'cur' : '']" @click="changeIndex(0)">全部</view>
+ <view class="tab-item" :class="[tabIndex === 1 ? 'cur' : '']" @click="changeIndex(1)">待配送</view>
+ <view class="tab-item" :class="[tabIndex === 2 ? 'cur' : '']" @click="changeIndex(2)">待收货</view>
</view>
<view class="p15" style="min-height: calc(100vh - 160rpx);">
- <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
- <view v-for="(item,index) in list" :key="index" class="m-b-24 order-settlement-list list-container"
- @click.stop="toDetail(item)">
+ <no-data v-if="!list || list.length == 0" style="width: 100%;"></no-data>
+
+ <view v-for="(dto, index) in list" :key="index" class="m-t-12">
+ <view class="order-item list-item">
+ <view class="title flex">
+ <view>
+ 订单：{{ dto.orderNo }}
+ </view>
+ <!-- <view class="status t-red m-l-a m-r-0">￥{{ dto.paymentAmount || dto.totalAmount || '0' }}</view> -->
+ <view class="status t-red m-l-a m-r-0">{{ dto.paymentAmount || '' }}</view>
+ </view>
+ <view class="flex">
+ <view class="desc flex flex1">
+ <view class="label">
+ 订单状态:
+ </view>
+ <view class="value">{{ dto.statusBackendStr }}</view>
+ </view>
+ <view class="desc flex flex1">
+ <view class="label">
+ 支付时间:
+ </view>
+ <view class="value">{{ dto.paymentTime || '-' }}</view>
+ </view>
+ </view>
+
+ <view class="flex">
+ <view class="desc flex flex1">
+ <view class="label">
+ 收货人:
+ </view>
+ <view class="value">{{ dto.customer || '-' }}</view>
+ </view>
+ <view class="desc flex flex1">
+ <view class="label">
+ 收货人手机号码:
+ </view>
+ <view class="value">{{ dto.customerTel || '-' }}</view>
+ </view>
+ </view>
+ <view class="flex">
+ <view class="desc flex flex1">
+ <view class="label">
+ 收货地址:
+ </view>
+ <view class="value">{{ dto.customerAddress }}</view>
+ </view>
+ </view>
+
+
+ <view class="flower-info m-b-5 m-t-8 br-4" v-for="(item, j) of dto.items" :key="j">
+ <!-- <view class="line-gray"></view> -->
+ <!-- <view class="supplier-name w-fit m-l-0 m-r-a" @click.stop="openbrand(item)"> -->
+ <view class="supplier-name w-fit m-l-0 m-r-a" >
+ <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
+ {{ item.supplierName || '' }} >
+ </view>
+ <view class="flex m-t-12 flex-wrap-normal">
+ <!-- @click="previewImg(item.flowerCover)" -->
+ <image class="flower-img img100 m-r-6" :src="item.flowerCover" >
+ </image>
+ <!-- <view class="flex1" @click.stop="toFlowerDetail(item)"> -->
+ <view class="flex1">
+
+ <view class=" flex">
+ <view class="title flex flex1">
+ <!-- <span class="level">{{ item.flowerCategory }}</span> -->
+ <span class="m-r-10" >{{ item.flowerName }}</span>
+ <span class="level" >{{ item.flowerLevelStr }}</span>
+ <view class="m-l-a m-r-10 flex">
+ <view class="m-r-10 button-icon" @click="toOrderItemDetail(item, 'lack', '缺货')" v-if="item.lackNum">
+ 缺货<uni-icons type="right" size="14" color="#ffffff"></uni-icons>
+ </view>
+ <view class="m-r-10 button-icon" @click="toOrderItemDetail(item, 'reduce', '降级')"
+ v-if="item.reduceNum">
+ 降级<uni-icons type="right" size="14" color="#ffffff"></uni-icons>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="each-list" >
+ <view class="each-item">
+ <view class="label">颜色</view>
+ <view class="value">{{ item.flowerColor || '-' }}</view>
+
+ </view>
+ <view class="each-item">
+ <view class="label">规格</view>
+ <view class="value">{{ item.flowerUnit || '-' }}</view>
+ </view>
+
+ <view class="each-item">
+ <view class="label">数量</view>
+ <view class="value">{{ item.num || 0 }}</view>
+
+ </view>
+ <view class="each-item">
+ <view class="label">售价</view>
+ <view class="value">￥{{ item.price || 0 }}</view>
+
+ </view>
+ <view class="each-item">
+ <view class="label">商品总金额</view>
+ <view class="value">￥{{ item.total || 0 }}</view>
+
+ </view>
+ </view>
+ </view>
+ </view>
+
+ </view>
+ <view class="line-gray"></view>
+
+ <view class="flex buttons">
+ <view class="button button-1 m-l-a m-r-0" @click="toDetail(dto)">订单详情</view>
+ </view>
+ </view>
+ </view>
+<!--
+ <view v-for="(item, index) in list" :key="index" class="m-b-24 order-settlement-list list-container">
<view class="order-settlement-item list-item">
<view class="title flex">
<view>
- 订单：{{ item.orderNo }}
+ 订单:{{ item.orderNo }}
</view>
<view class="status t-red m-l-a m-r-0">{{ item.paymentAmount || '' }}</view>
</view>
<view class="flex">
- <view class="desc flex flex1">
- <view class="label">
- 订单状态:
- </view>
- <view class="value">{{ item.statusBackendStr }}</view>
- </view>
- <view class="desc flex flex1">
- <view class="label">
- 支付时间:
- </view>
- <view class="value">{{ item.paymentTime||'-' }}</view>
- </view>
- </view>
- <ivew class="flex">
- <view class="desc flex flex1">
- <view class="label">
- 收货人:
- </view>
- <view class="value">{{ item.customer ||'-'}}</view>
- </view>
- <view class="desc flex flex1">
- <view class="label">
- 收货人手机号码:
- </view>
- <view class="value">{{ item.customerTel ||'-'}}</view>
- </view>
- </ivew>
+ <view class="desc flex flex1">
+ <view class="label">
+ 订单状态:
+ </view>
+ <view class="value">{{ item.statusBackendStr }}</view>
+ </view>
+ <view class="desc flex flex1">
+ <view class="label">
+ 支付时间:
+ </view>
+ <view class="value">{{ item.paymentTime || '-' }}</view>
+ </view>
+ </view>
+ <view class="flex">
+ <view class="desc flex flex1">
+ <view class="label">
+ 收货人:
+ </view>
+ <view class="value">{{ item.customer || '-' }}</view>
+ </view>
+ <view class="desc flex flex1">
+ <view class="label">
+ 收货人手机号码:
+ </view>
+ <view class="value">{{ item.customerTel || '-' }}</view>
+ </view>
+ </view>
<view class="desc flex">
<view class="label">
收货地址:
</view>
- <view class="value">{{ item.customerAddress ||'-'}}</view>
+ <view class="value">{{ item.customerAddress || '-' }}</view>
</view>
-
+ <view class="flex" style="justify-content: flex-end;">
+ <view class="m-r-0 gwc" @click.stop="toDetail(item)">
+ 订单详情
+ </view>
+ </view>
+
<view class="button-green-1" v-if="false">确认配送完成</view>
</view>
</view>
+ -->
+
</view>
<!-- 判断是否到底了，自动吧 -->
- <footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
+ <footer-msg :more="page.total > 0 && page.total > page.current * page.size"></footer-msg>
</view>
</template>
@@ -90,10 +214,16 @@
uni.stopPullDownRefresh()
},
methods: {
+
+ toOrderItemDetail(item, op, opstr) {
+ uni.navigateTo({
+ url: `/sub_pages/partner/order-manage/order-manage-settlement-op-detail?opStr=${opstr}&op=${op}&orderItemId=${item.id || item.orderItemId}`
+ })
+ },
toDetail(item) {
// 订单详情页面
uni.navigateTo({
- url: 'pages/order/order-detail?id=' + item.id
+ url: '/pages/order/order-detail?id=' + item.id
})
},
changeIndex(index) {
@@ -135,7 +265,8 @@
color: var(--topiccolor);
}
}
- .desc{
+
+ .desc {
font-weight: 400;
font-size: 24rpx;
color: #666666;
@@ -203,4 +334,241 @@
}
}
}
+
+.gwc {
+ width: 168rpx;
+ height: 48rpx;
+ border-radius: 30rpx;
+ border: 2rpx solid #20613D;
+ font-size: 24rpx;
+ color: #20613D;
+ line-height: 48rpx;
+ text-align: center;
+}
+</style>
+
+<style lang="scss" scoped>
+ .list-container {
+ padding: 24rpx 30rpx;
+
+ .order-item {
+ margin-bottom: 20rpx;
+ padding: 28rpx;
+ background-color: #fff;
+ border-radius: 8rpx;
+
+ .title {
+ font-weight: 600;
+ font-size: 28rpx;
+ color: #000000;
+ line-height: 40rpx;
+
+ .status {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #20613D;
+ line-height: 40rpx;
+ }
+ }
+
+ .desc {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #666666;
+ line-height: 34rpx;
+ }
+
+
+ .line {
+ height: 2rpx solid #EEEEEE;
+ margin-top: 16rpx;
+ margin-bottom: 16rpx;
+ }
+
+ .buttons {
+ display: flex;
+ margin-left: auto;
+ width: fit-content;
+
+ .button {
+ // width: 216rpx;
+ padding: 10rpx 20rpx;
+ line-height: 34rpx;
+ font-size: 24rpx;
+ height: 34rpx;
+ background: #20613D;
+ text-align: center;
+ border-radius: 30rpx;
+ min-width: 80rpx;
+
+ }
+
+ .button-1 {
+ background: #fff;
+ color: #333;
+ border: 2rpx solid #333;
+
+ }
+
+ .button-0 {
+ color: #fff;
+ border: 2rpx solid #20613D;
+ }
+ }
+
+ .flower-info {
+ padding: 0rpx;
+
+ background: #FFFFFF;
+ border-radius: 8rpx;
+
+ .supplier-name {
+ border-bottom: 2rpx solid #EEEEEE;
+ font-weight: 600;
+ font-size: 28rpx;
+ color: #000000;
+ padding-bottom: 10rpx;
+ line-height: 40rpx;
+
+ .icon-dp {
+ width: 27rpx;
+ height: 27rpx;
+ display: inline-block;
+ vertical-align: middle;
+ }
+ }
+
+ .title {
+ font-weight: 600;
+ font-size: 28rpx;
+ color: #000000;
+ line-height: 40rpx;
+ flex: 1;
+
+ .level {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #20613D;
+ line-height: 40rpx;
+ margin-right: 20rpx;
+ }
+
+ .button-icon {
+ color: #fff;
+ padding-left: 10rpx;
+ padding-right: 10rpx;
+ background-color: darkred;
+ }
+ }
+
+ .flower-img {
+ width: 128rpx;
+ height: 118rpx;
+ min-width: 128rpx;
+ min-height: 118rpx;
+
+
+ }
+
+ .each-list {
+ display: flex;
+ flex-wrap: wrap;
+ margin-top: 6rpx;
+
+ .each-item {
+ min-width: 40%;
+ max-width: 50%;
+ text-align: center;
+ margin-left: 0rpx;
+ margin-right: auto;
+ display: flex;
+
+ .label {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #666666;
+ text-align: left;
+ padding-right: 10rpx;
+ }
+
+ .label::after {
+ content: ": "
+ }
+
+ .value {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #666666;
+ }
+ }
+ }
+
+ }
+
+
+ }
+
+ .status-list {
+ overflow-x: scroll;
+
+ .status-each {
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #666666;
+ line-height: 40rpx;
+ margin: 0 auto;
+ //min-width: ;
+ // padding-left: 10rpx;
+ // padding-right: 10rpx;
+ width: fit-content;
+ min-width: 120rpx;
+ text-align: center;
+ }
+
+ .status-each.cur {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #20613D;
+ // line-height: 44rpx;
+ }
+
+ .status-each:first-child {
+ margin-left: 0
+ }
+
+ .status-each:last-child {
+ margin-right: 0;
+ }
+ }
+
+ .order-top {
+ position: relative;
+ min-height: 182rpx;
+ background: #E1F0E7;
+ border-radius: 8rpx;
+ padding: 45rpx 35rpx;
+
+ .title {
+ font-weight: 600;
+ font-size: 30rpx;
+ color: #000000;
+ line-height: 42rpx;
+ }
+
+ .desc {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #666666;
+ line-height: 34rpx;
+ }
+
+ .image {
+ position: absolute;
+ right: 0rpx;
+ width: 288rpx;
+ height: 148rpx;
+ bottom: 0rpx;
+ }
+ }
+ }
</style>
\ No newline at end of file
diff --git a/sub_pages/supplier/customer_service/customer_service.vue b/sub_pages/supplier/customer_service/customer_service.vue
index a8334a1..99809d7 100644
--- a/sub_pages/supplier/customer_service/customer_service.vue
+++ b/sub_pages/supplier/customer_service/customer_service.vue
@@ -14,7 +14,8 @@
<view slot="title" class="title" >我的客服</view>
<view slot="label">
<button open-type="contact" class="component-button-contact" @handleContact="handleContact">
- 客服电话：<span class="topic-gray">{{ tel }}</span>
+ 客服电话：<image class="icon-clock m-r-6 m-t-2" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/26/269f62d09013429596acc9be4be8a1bcicon-call.png"></image>
+ <span class="topic-gray" @click.stop="callTel">{{ tel }}</span>
</button>
</view>
<view slot="value" >
@@ -125,7 +126,7 @@
tcode: '',
inviterName: '',
// StatusBar:0,
- tel: '15974805814',
+ tel: '19288780072',
tj: {},
tj_order: {},
cacheUserId: '',
@@ -157,6 +158,8 @@
uni.stopPullDownRefresh()
},
methods: {
+
+
async bindPartnerUser(userId, name) {
// await this.$message.confirm(`确定要绑定${name}合伙人吗?`)
//调用接口绑定
--
Gitblit v1.9.3