From 7ad87803616f816c5b6eae9e0b57b0eccbcffab1 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 26 Oct 2023 18:42:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A7=94=E6=89=98=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/admin/delivery/index.vue | 8 +-
pages/admin/financial_management/index.vue | 2 +-
pages/admin/orderList/index.vue | 2 +-
.../delegation_details/index.vue | 12 +-
.../initiateDelegation/index.vue | 200 ++++++++-------
.../receivedCommission/index.vue | 232 +++++++++++-------
pages/margin/margin.vue | 14 +-
pages/moreProject/moreProject.vue | 8 +-
pages/releaseManagement/index.vue | 2 +-
pages/store/entryProcess/entryProcess.vue | 18 +-
10 files changed, 286 insertions(+), 212 deletions(-)
diff --git a/pages/admin/delivery/index.vue b/pages/admin/delivery/index.vue
index c67d8ac..6ff4819 100644
--- a/pages/admin/delivery/index.vue
+++ b/pages/admin/delivery/index.vue
@@ -213,10 +213,10 @@
type: 2,
title: "送货"
},
- {
- type: 3,
- title: "无需物流"
- }
+ // {
+ // type: 3,
+ // title: "无需物流"
+ // }
],
splitList: [
{
diff --git a/pages/admin/financial_management/index.vue b/pages/admin/financial_management/index.vue
index 751c9a5..7fb54bb 100644
--- a/pages/admin/financial_management/index.vue
+++ b/pages/admin/financial_management/index.vue
@@ -54,7 +54,7 @@
- 履约保证金额(元)
+ 履约押金额(元)
{{
userInfo.deposit || 0.0
}}
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 7a44a64..56ac315 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -169,7 +169,7 @@
一键改价
订单备注
- 去发货
委托方:
-
+
{{objinfo.mer_info.mer_name}}
@@ -52,7 +52,7 @@
被委托方:
-
+
{{objinfo.entrust_mer_info.mer_name}}
@@ -61,22 +61,22 @@
委托周期:
- {{objinfo.entrust_day}}
+ {{objinfo.entrust_day}}天
结算周期:
-
- {{objinfo.mer_info.settle_cycle}}
+
+ {{objinfo.mer_info.settle_cycle}}天
结算利息:
-
+
{{objinfo.mer_info.interest_rate}}%
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index d26b645..6e75e04 100644
--- a/pages/commissionedSales/initiateDelegation/index.vue
+++ b/pages/commissionedSales/initiateDelegation/index.vue
@@ -10,82 +10,92 @@
-
+
-
-
- {{item.title}}
-
-
- 委托周期:{{item.entrust_day}}
-
-
-
-
-
-
-
-
- 待处理
-
-
-
-
- 编辑
-
-
-
- 删除
-
-
-
- 详情
-
-
-
-
-
- 已接受
-
-
-
- 结束委托
-
-
-
- 详情
-
-
-
-
-
- 已拒绝
-
-
-
-
- 详情
-
-
-
-
-
- 已完成
-
-
-
- 删除
-
-
-
- 详情
-
+
+
+
+ {{item.title}}
+
+
+
+
+ 待处理
+
+
+
+
+ 已接受
+
+
+
+
+ 已拒绝
+
+
+
+
+ 已完成
+
+
+
+
+
+
+
+ 委托周期:{{item.entrust_day}}天
+
+
+
+
+
+ 编辑
+
+
+
+ 删除
+
+
+
+ 详情
+
+
+
+
+
+
+ 结束委托
+
+
+
+ 详情
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+ 删除
+
+
+
+ 详情
+
+
+
+
+
@@ -101,6 +111,7 @@
+
@@ -176,7 +187,7 @@
拒绝
-
+
接受
@@ -406,9 +417,9 @@
// this.$refs.bindmobile2.open()
this.$refs.bindmobile3.open()
},
- agree(item) {
+ agree(item, status=2) {
finishentrust(item.community_id, {
- status: 2,
+ status: status,
refusal: this.refuseds
}).then(res => {
@@ -485,7 +496,6 @@
.content {
height: 100vh;
position: relative;
-
}
.content_top {
@@ -503,7 +513,7 @@
opacity: 1;
display: flex;
position: fixed;
- position: absolute;
+ // position: absolute;
bottom: 84rpx;
left: 50%;
margin-left: -347rpx;
@@ -551,6 +561,7 @@
.content-one {
+ width: 100%;
display: flex;
padding-bottom: 23rpx;
@@ -598,12 +609,31 @@
}
}
+
+ .content-text{
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ .text-bottom{
+ display: flex;
+ justify-content: space-between;
+ }
+ .one-txt-a{
+ flex: 1;
+ font-size: 30rpx;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 限制为三行 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
}
.content-two_oneq {
- position: absolute;
- right: 20rpx;
+ flex-shrink: 0;
text-align: right;
.content-two-edita {
@@ -642,7 +672,7 @@
display: flex;
justify-content: space-between;
- margin-top: 47rpx;
+ // margin-top: 47rpx;
.contentgn_a {
font-size: 32rpx;
@@ -676,7 +706,7 @@
.content-two_one {
-
+ flex-shrink: 0;
text-align: right;
@@ -716,7 +746,7 @@
display: flex;
justify-content: space-between;
- margin-top: 47rpx;
+ // margin-top: 47rpx;
.contentgn_a {
font-size: 32rpx;
diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index 729a4b2..57c6bdb 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -7,99 +7,108 @@
-
-
+
-
-
- {{item.title}}
-
-
- 委托周期:{{item.entrust_day}}
-
-
-
- {{item.entrust_finish==0?'未申请结束委托':""||item.entrust_finish==1?'委托已结束':""||item.entrust_finish==2?'商家拒绝结束委托':""||item.entrust_finish==3?'结束委托申请中':""}}
-
+
+
+
+ {{item.title}}
+
+
+
+
+ 待处理
+
+
+
+
+ 已接受
+
+
+
+
+ 已拒绝
+
+
+
+
+ 已完成
+
+
+
+
+
+
+
+ 委托周期:{{item.entrust_day}}天
+
+
+
+
+
+ 处理
+
+
+
+ 详情
+
+
+
+
+
+
+
+ 申请结束
+
+
+ 已结束
+
+
+ 被拒绝
+
+
+ 申请中
+
+
+
+
+ 去下单
+
+
+
+
+ 详情
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
-
-
-
- 待处理
-
-
-
- 处理
-
-
-
-
-
- 详情
-
-
-
-
-
- 已接受
-
-
-
- 申请结束委托
-
-
-
- 去下单
-
-
-
-
- 详情
-
-
-
-
-
- 已拒绝
-
-
-
-
- 详情
-
-
-
-
-
- 已完成
-
-
-
-
- 详情
-
-
-
-
-
-
+
@@ -228,7 +237,8 @@
import {
entrustlist,
finishchain,
- checkchain
+ checkchain,
+ addEntrustCart
} from '@/api/sale.js'
export default {
components: {
@@ -365,9 +375,23 @@
},
//下单
order(item) {
- uni.navigateTo({
- url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
- })
+ // uni.navigateTo({
+ // url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
+ // })
+ addEntrustCart({
+ community_id: item.community_id
+ }).then(res => {
+ if (res.status == 200) {
+ this.$util.Tips({
+ title: res.message,
+ icon: 'success'
+ })
+ uni.navigateTo({
+ url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
+ })
+ }
+
+ })
},
//申请结束委托申请
deteragrss(item) {
@@ -471,8 +495,8 @@
.content-one {
+ width: 100%;
display: flex;
-
padding-bottom: 23rpx;
.content-one-img {
@@ -480,6 +504,7 @@
height: 148rpx;
margin-right: 28rpx;
border: 1px solid;
+ flex-shrink: 0;
image {
width: 100%;
@@ -488,7 +513,7 @@
}
.content-one-txt {
-
+ flex: 1;
.txt-b-a {
font-size: 32rpx;
@@ -518,13 +543,32 @@
}
}
+
+ .content-text{
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ .text-bottom{
+ display: flex;
+ justify-content: space-between;
+ }
+ .one-txt-a{
+ flex: 1;
+ font-size: 30rpx;
+ display: -webkit-box;
+ -webkit-line-clamp: 2; /* 限制为三行 */
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
}
.content-two_oneq {
- position: absolute;
- right: 20rpx;
text-align: right;
+ flex-shrink: 0;
.content-two-edita {
@@ -562,7 +606,7 @@
display: flex;
justify-content: space-between;
- margin-top: 47rpx;
+ // margin-top: 47rpx;
.contentgn_a {
font-size: 32rpx;
@@ -596,7 +640,7 @@
.content-two_one {
-
+ flex-shrink: 0;
text-align: right;
@@ -636,7 +680,7 @@
display: flex;
justify-content: space-between;
- margin-top: 47rpx;
+ // margin-top: 47rpx;
.contentgn_a {
font-size: 32rpx;
diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index 1977c0c..05135bd 100644
--- a/pages/margin/margin.vue
+++ b/pages/margin/margin.vue
@@ -3,13 +3,13 @@
- 店铺保证金信息
+ 店铺押金信息
- 已缴纳保证金
+ 已缴纳押金
{{merchant_Data.paid_margin}}
- 剩余缴纳保证金
+ 剩余缴纳押金
{{merchant_Data.unpaid_margin}}
@@ -106,7 +106,7 @@
});
},
- //获取保证金信息
+ //获取押金信息
decimal() {
merchant({
id: this.mer_id
@@ -114,17 +114,17 @@
this.merchant_Data = res.data
});
},
- //缴纳保证金
+ //缴纳押金
paydecimal() {
if (this.merchant_Data.is_margin != 1) {
this.$util.Tips({
- title: '暂时无需缴纳保证金'
+ title: '暂时无需缴纳押金'
});
} else {
let that = this
uni.showModal({
title: '提示',
- content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
+ content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳押金',
success: (res) => {
if (res.confirm) {
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 07be676..63a4857 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -78,7 +78,7 @@
- 保证缴纳金
+ 押金缴纳
@@ -186,7 +186,7 @@
- 保证缴纳金
+ 押金缴纳
@@ -361,7 +361,7 @@
- 保证缴纳金
+ 押金缴纳
@@ -817,7 +817,7 @@
},
- //保证金缴纳
+ //押金缴纳
paydecimal() {
if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
diff --git a/pages/releaseManagement/index.vue b/pages/releaseManagement/index.vue
index e3b682d..4f26452 100644
--- a/pages/releaseManagement/index.vue
+++ b/pages/releaseManagement/index.vue
@@ -25,7 +25,7 @@
￥ {{item.total_price}}
-
结算价:￥{{item.discount_price}}
diff --git a/pages/store/entryProcess/entryProcess.vue b/pages/store/entryProcess/entryProcess.vue
index 517cd73..ceb1686 100644
--- a/pages/store/entryProcess/entryProcess.vue
+++ b/pages/store/entryProcess/entryProcess.vue
@@ -39,14 +39,14 @@
- 签署里海云《履约保证金协议》
+ 签署里海云《履约押金协议》
- 1.完成签署履约保证金协议2023-05-08 13:15完成
+ 1.完成签署履约押金协议2023-05-08 13:15完成
- 1、签署里海云《履约保证金协议》
- 请详细阅读里海云履约保证金协议，并充分理解内容后进行电子签名。
+ 1、签署里海云《履约押金协议》
+ 请详细阅读里海云履约押金协议，并充分理解内容后进行电子签名。
签署协议
跳过
@@ -58,16 +58,16 @@
- 缴纳履约保证金
+ 缴纳履约押金
- 1.完成履约保证金缴纳 2023-05-08 13:15完成
+ 1.完成履约押金缴纳 2023-05-08 13:15完成
- 1、缴纳履约保证金
- 线上缴纳履约保证金，完成保证金审核后签约完成。
+ 1、缴纳履约押金
+ 线上缴纳履约押金，完成押金审核后签约完成。
- 缴纳履约保证金
+ 缴纳履约押金
跳过