From ba6fe53d97201c2cf577a1fb0906c819ea3cae33 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 30 七月 2024 00:05:20 +0800
Subject: [PATCH] 1
---
sub_pages/supplier/order-settlement/order-settlement-detail.vue | 87 +++++++++++++++++++++++++++--
sub_pages/customer/shopping/shopping.vue | 19 ++++--
sub_pages/customer/shopping/confirm.vue | 6 +
pages/user/address/address.vue | 10 ++
pages/user/supplier-user.vue | 24 +++++++
5 files changed, 129 insertions(+), 17 deletions(-)
diff --git a/pages/user/address/address.vue b/pages/user/address/address.vue
index 8ba9669..3766107 100644
--- a/pages/user/address/address.vue
+++ b/pages/user/address/address.vue
@@ -249,8 +249,14 @@
this.$message.showLoading()
var {
code
- } = await this.$http.request('post', '/api/address/set/default/' +
- item.id, {})
+ } = await this.$http.request('post', '/api/address/set/default/'+item.id, {
+ data:{
+ id:item.id
+ },
+ params:{
+ id:item.id
+ }
+ })
this.$message.hideLoading()
if (code === 0) {
for (var dto of this.list) {
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index ed93c6b..9150b88 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -44,7 +44,8 @@
<!-- getUserProfile -->
{{ '点击登陆' }}
</view>
- <image class="icon-setting" src="../../static/common/icon-setting.png" mode="aspectFit"></image>
+ <image class="icon-setting" @click="toInfo"
+ src="../../static/common/icon-setting.png" mode="aspectFit"></image>
</view>
<!-- #ifdef PUB_CUSTOMER -->
<view class="customer-info-records">
@@ -306,7 +307,26 @@
await this.$store.dispatch('getCurrentInfo')
uni.stopPullDownRefresh()
},
- methods: {
+ methods: {
+ toInfo(){
+ var url = ''
+ if(this.currentInfo.id){
+ // #ifdef PUB_CUSTOMER
+ url = '/sub_pages/customer/customer-info/customer-info'
+ // #endif
+ // #ifdef PUB_PARTNER
+ url = '/sub_pages/partner/partner-info/partner-info'
+ // #endif
+ // #ifdef PUB_SUPPLIER
+ url = '/sub_pages/supplier/supplier-info/supplier-info'
+ // #endif
+ if(url){
+ uni.navigateTo({
+ url:url
+ })
+ }
+ }
+ },
getTj() {
// /api/supplier/delivery
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index e4483f2..9bb416c 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -37,6 +37,10 @@
value: ''
})
})
+ if(this.address.id){
+ this.loadTransportList()
+ this.cacheAddressId = this.address.id
+ }
//先获取直接的全部地址
// @ApiModelProperty(value = "订单商品")
// private List<FlowerCartListDTO> flowers;
@@ -242,7 +246,7 @@
</view>
<view class="p10 bg-white m-t-20 br-4">
- <view class="form-item ">
+ <view class="form-item flex ">
<view class="label">特殊需求</view>
<!-- <view class="m-l-a m-r-0 flex1">
<view class="m-t-12 m-b-12">
diff --git a/sub_pages/customer/shopping/shopping.vue b/sub_pages/customer/shopping/shopping.vue
index 20252e0..3ff5488 100644
--- a/sub_pages/customer/shopping/shopping.vue
+++ b/sub_pages/customer/shopping/shopping.vue
@@ -30,9 +30,9 @@
<image class="img img100 m-r-6 br-4" :src="dto.url||dto.cover"></image>
<view class="flex1">
<view class="title"><span class="m-r-5"
- style="display: inline-block;">{{item.categoryStr||''}}</span><span
- v-if="item.levelStr" class="m-r-5"
- style="display: inline-block;">{{ item.levelStr || '' }}</span>{{ dto.name || '-' }}
+ style="display: inline-block;">{{dto.categoryStr||''}}</span><span
+ v-if="dto.levelStr" class="m-r-5"
+ style="display: inline-block;">{{ dto.levelStr || '' }}</span>{{ dto.name || '-' }}
</view>
<view class="price">
{{ dto.price || '-' }}元/扎
@@ -174,8 +174,8 @@
this.ids.splice(this.ids.indexOf(item.id), 1)
}
for (var i = 0; i < this.list.length; i++) {
- if (this.list[i].id === item.supplierId) {
- this.list[i].splice(i, 1)
+ if (this.list[i].supplierId === item.supplierId) {
+ // this.list[i].flowerList.splice(i, 1)
if (this.list[i].flowerList.length === 1) {
if (this.ids.indexOf('supplier@' + this.list[i].supplierId) >= 0) {
this.ids.splice(this.ids.indexOf('supplier@' + this.list[i].supplierId), 1)
@@ -186,16 +186,18 @@
//只需要清楚这个元素
var k = -1
for (var j = 0; j < this.list[i].flowerList.length; j++) {
- if (this.list[i][j].id === item.id) {
+ if (this.list[i].flowerList[j].id === item.id) {
k = j;
break
}
}
this.list[i].flowerList.splice(k, 1)
}
+ this.$forceUpdate()
break
}
}
+ console.log('this.list',this.list)
}
},
@@ -270,6 +272,11 @@
this.$message.hideLoading()
if (code === 0) {
dto.num += addnum
+ if (dto.num < 1) {
+ //id删除清空，并且
+ await this.clickSwipeButton(dto)
+ // await this.init()
+ }
}
},
async init() {
diff --git a/sub_pages/supplier/order-settlement/order-settlement-detail.vue b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
index e2defe2..d51ec47 100644
--- a/sub_pages/supplier/order-settlement/order-settlement-detail.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
@@ -1,5 +1,7 @@
<template>
<view class="list-container order-sale supplier p20">
+
+
<view class="m-b-24 order-sale-list list-container">
<view class="order-sale-item br-4 m-t-12 list-item bg-white">
<view class="title flex">
@@ -9,10 +11,10 @@
</view>
</view>
<view class="line"></view>
- <view class="form">
+ <!-- <view class="form">
<view class="flex">
<view class="form-item flex1">
- <view class="label">结算单价/均价</view>
+ <view class="label">结算单价</view>
<view class="value">￥{{dto.price||'0.00'}}</view>
</view>
<view class="form-item flex1">
@@ -50,6 +52,45 @@
<view class="value">{{dto.stationFee}}</view>
</view>
</view>
+ </view> -->
+ <view class="tj-container-p">
+ <view class="tj-container flex">
+ <view class="tj-each flex1">
+ <view class="value">￥{{dto.price||'0.00'}}</view>
+ <view class="label">结算单价</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.flowerNum||'0.00'}}</view>
+ <view class="label">商品数量</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.orderNum}}</view>
+ <view class="label">订单数量</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.customerNum}}</view>
+ <view class="label">买家数量</view>
+ </view>
+ </view>
+
+ <view class="tj-container m-t-12 flex">
+ <view class="tj-each flex1">
+ <view class="value">{{dto.serviceFee}}</view>
+ <view class="label">服务费</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.salesFee}}</view>
+ <view class="label">售后理赔</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.checkFee}}</view>
+ <view class="label">质检扣款</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.stationFee}}</view>
+ <view class="label">集货站运费</view>
+ </view>
+ </view>
</view>
<view class="line"></view>
@@ -67,7 +108,7 @@
</view>
</view>
</view>
-
+
<view class="m-b-24 order-sale-list list-container">
<view class="order-sale-item br-4 m-t-12 list-item bg-white">
<view class="title flex">
@@ -111,9 +152,9 @@
</view>
</view>
</view>
-
+
</view>
-
+
</view>
</view>
</view>
@@ -150,7 +191,7 @@
if (code == 0) {
this.dto = {
...data,
- details:data.details||[]
+ details: data.details || []
}
}
@@ -161,6 +202,40 @@
</script>
<style lang="scss" scope>
+ .order-sale {
+ .tj-container-p {
+ background: #E6F2EB;
+ padding: 30rpx;
+
+ .tj-container {
+ // height: 148rpx;
+ background: #FFFFFF;
+ border-radius: 8rpx;
+ padding-top: 16rpx;
+ padding-bottom: 16rpx;
+
+ .tj-each {
+ text-align: center;
+
+ .label {
+ margin-top: 16rpx;
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #000000;
+ line-height: 34rpx;
+ }
+
+ .value {
+ font-weight: 400;
+ font-size: 32rpx;
+ color: #CF0000;
+ line-height: 44rpx;
+ }
+ }
+ }
+ }
+ }
+
.order-sale-list {
.order-sale-item {
margin-bottom: 20rpx;
--
Gitblit v1.9.3