From 4b2dbc1be50d06094c9c1ec90ed38acefe644cf1 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 11 Sep 2023 11:56:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A7=94=E6=89=98=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E5=8F=8Atabar=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/sale.js | 16 ++-
pages.json | 24 ++--
.../delegation_details/index.vue | 61 +++++-----
.../initiateDelegation/index.vue | 96 ++++++++++------
.../receivedCommission/index.vue | 17 ++-
pages/order_pay_status/index.vue | 11 ++
pages/supply_chains/supply_chains.vue | 107 +++++++++++++-----
static/tabbar_icon/a-a.png | Bin 3995 -> 4650 bytes
static/tabbar_icon/a.png | Bin 2080 -> 1446 bytes
static/tabbar_icon/b-a.png | Bin 4042 -> 4771 bytes
static/tabbar_icon/b.png | Bin 2174 -> 2656 bytes
static/tabbar_icon/c-a.png | Bin 4914 -> 4873 bytes
static/tabbar_icon/c.png | Bin 1882 -> 1625 bytes
static/tabbar_icon/d-a.png | Bin 4335 -> 3750 bytes
static/tabbar_icon/d.png | Bin 4070 -> 2193 bytes
static/tabbar_icon/e-a.png | Bin 3867 -> 4903 bytes
static/tabbar_icon/e.png | Bin 2696 -> 2267 bytes
17 files changed, 214 insertions(+), 118 deletions(-)
diff --git a/api/sale.js b/api/sale.js
index a11ed19..c7e5ce8 100644
--- a/api/sale.js
+++ b/api/sale.js
@@ -35,8 +35,22 @@ export function checkchain(id,data) {
export function finishchain(id,data) {
return request.post("community/entrust/apply/finish/"+id, data);
}
-
+//商家申请结束委托
+export function finishentrust(id,data) {
+ return request.post("community/entrust/finish/"+id, data);
+}
//委托商品加入购物车
export function addEntrustCart(data) {
return request.post("community/entrust/addEntrustCart", data);
+}
+
+
+//获取委托商品详情
+export function entrustdetail(id) {
+ return request.get("community/entrust/"+id);
+}
+
+//编辑委托商品详情
+export function editentrust(id,data) {
+ return request.post("community/entrust/edit/"+id, data);
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 397cbbd..19b254a 100644
--- a/pages.json
+++ b/pages.json
@@ -1611,16 +1611,16 @@
},
{
"pagePath": "pages/plant_release/index",
- "iconPath": "static/tabbar_icon/d.png",
- "selectedIconPath": "static/tabbar_icon/d-a.png",
- "text": "发布",
- "visible": false
+ "iconPath": "static/tabbar_icon/c.png",
+ "selectedIconPath": "static/tabbar_icon/c-a.png",
+ "text": "发布"
+
},
{
"pagePath": "pages/supply_chains/supply_chains",
- "iconPath": "static/tabbar_icon/c.png",
- "selectedIconPath": "static/tabbar_icon/c-a.png",
+ "iconPath": "static/tabbar_icon/d.png",
+ "selectedIconPath": "static/tabbar_icon/d-a.png",
"text": "供应"
},
{
@@ -1629,16 +1629,8 @@
"selectedIconPath": "static/tabbar_icon/e-a.png",
"text": "我的"
}
- ],
- "midButton": {
- "width": "68px",
- "height": "70px",
- "iconWidth": "48px",
- "selectedColor": "#E93323",
- "pagePath": "pages/plant_release/index",
- "iconPath": "static/tabbar_icon/d.png",
- "text": "发布"
- }
+ ]
+
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 05b293a..6d24b4c 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -10,7 +10,9 @@
{{objinfo.mer_status==0?"待处理":""||objinfo.mer_status==2?"已拒绝":""||objinfo.mer_status==1?"已接受":""}}
- 2020-07-07 14:14:14
+
+ {{objinfo.entrust_start_date}}
@@ -37,12 +39,12 @@
-
+
委托方:
-
+
{{objinfo.mer_info.mer_name}}
@@ -50,7 +52,7 @@
被委托方:
-
+
{{objinfo.entrust_mer_info.mer_name}}
@@ -92,7 +94,7 @@
是否结束委托:
- {{objinfo.entrust_finish==0?'未结束':""||objinfo.entrust_finish==1?'已结束':""||objinfo.entrust_finish==2?'商家拒绝':""||objinfo.entrust_finish==3?'申请':""}}
+ {{objinfo.entrust_finish==0?'未结束':""||objinfo.entrust_finish==1?'已结束':""||objinfo.entrust_finish==2?'商家拒绝':""||objinfo.entrust_finish==3?'申请':""}}
@@ -100,7 +102,7 @@
拒绝原因:
- {{objinfo.entrust_finish_refusal}}
+ {{objinfo.entrust_finish_refusal}}
@@ -122,7 +124,7 @@
-
+
@@ -150,12 +152,12 @@
img: require('@/static/images/wtt2.png')
}
],
-type:0,
+ type: 0,
}
},
onLoad(e) {
this.list(e.id)
- this.type=e.type
+ this.type = e.type
},
onShow() {
@@ -164,25 +166,27 @@ type:0,
list(id) {
entrustdetail(id).then((res) => {
-
+console.log(res.data)
this.objinfo = res.data
})
},
-
- submit(item){
- 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()
- })
- }
-
- })
+
+ submit(item) {
+ 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()
+ })
+ }
+
+ })
}
}
@@ -192,9 +196,10 @@ type:0,
\ No newline at end of file
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index 5ade2bd..d4ac509 100644
--- a/pages/commissionedSales/initiateDelegation/index.vue
+++ b/pages/commissionedSales/initiateDelegation/index.vue
@@ -17,7 +17,7 @@
{{item.title}}
- 委托周期:{{item.credit_buy}}
+ 委托周期:{{item.entrust_day}}
@@ -25,11 +25,11 @@
-
+
待处理
-
@@ -51,10 +51,10 @@
已接受
-
+
结束委托
-
+
详情
@@ -166,17 +166,17 @@
结束委托申请处理
-
- 结算周期: 30天
+
+ 结算周期: {{obj.mer_info.settle_cycle}}天
-
- 利息比例: 0.05%
+
+ 利息比例: {{obj.mer_info.interest_rate}}%
-
+
拒绝
-
+
接受
@@ -197,19 +197,19 @@
结束委托申请处理
-
- 结算周期: 30天
+
+ 结算周期: {{obj.mer_info.settle_cycle}}天
-
- 利息比例: 0.05%
+
+ 利息比例: {{obj.mer_info.interest_rate}}%
拒绝原因：
-
+
-
+
接受
@@ -228,7 +228,8 @@
import {
entrustlist,
finishchain,
- checkchain
+ checkchain,
+ finishentrust
} from '@/api/sale.js'
export default {
components: {
@@ -290,7 +291,8 @@
}
],
- obj: {}
+ obj: {},
+ refuseds:''
}
},
onLoad() {
@@ -330,7 +332,7 @@
this.activeItem = e.name; //当前class类名
this.tabTitle = e.name; //当前选的标签名
this.where.page = 1
- this.orderList=[]
+ this.orderList = []
this.where.status = e.type
this.commislist()
},
@@ -354,18 +356,18 @@
this.$refs.bindmobile3.close()
},
//提交订单
-
- order(item){
- if(item.mer_status==0&&entrust_order_id!=0){
- uni.navigateTo({
- url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id
- })
- }else{
- this.$util.Tips({
- title:'商家还没同意该订单',
- icon: 'err'
- })
- }
+
+ order(item) {
+ if (item.mer_status == 0 && entrust_order_id != 0) {
+ uni.navigateTo({
+ url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id
+ })
+ } else {
+ this.$util.Tips({
+ title: '商家还没同意该订单',
+ icon: 'err'
+ })
+ }
},
//详情
@@ -386,15 +388,41 @@
},
//结束委托
- closingorder() {
- this.$refs.bindmobile1.open()
+ closingorder(item) {
+ console.log(item)
+ this.obj=item
+ this.$refs.bindmobile2.open()
// this.$refs.bindmobile3.open()
},
+ //拒绝申请委托
+ refused() {
+ this.$refs.bindmobile2.close()
+ setTimeout(() => {
+ this.$refs.bindmobile3.open()
+ }, 1000)
+ },
// 已拒绝
declined() {
// this.$refs.bindmobile2.open()
this.$refs.bindmobile3.open()
},
+ agree(item){
+ finishentrust(item.community_id,{
+ status: 2,
+ refusal:this.refuseds
+ }).then(res => {
+
+ this.$util.Tips({
+ title: res.message,
+ icon: 'success'
+ })
+ this.orderList = []
+ this.tabTitle = "tabTwo"
+ this.$refs.bindmobile2.close()
+ this.$refs.bindmobile3.close()
+ this.commislist()
+ })
+ },
//删除订单
deleteOrder(item) {
checkchain(item.community_id, {
diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index 63e69da..0e6775a 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -51,7 +51,7 @@
- 结束委托
+ 申请结束委托
-
-
-
详情
@@ -370,9 +367,9 @@
url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
})
},
- //结束委托申请
+ //申请结束委托申请
deteragrss(item) {
- console.log(item)
+
finishchain(item.community_id, {
status: 1
}).then((res) => {
@@ -384,9 +381,9 @@
this.orderList = []
this.tabTitle = "tabTwo"
this.commislist()
- this.$refs.bindmobile1.colse()
- }).catch((err)=>{
-
+ this.$refs.bindmobile1.close()
+ }).catch((err) => {
+ this.$refs.bindmobile1.close()
this.$util.Tips({
title: err,
icon: 'error'
@@ -428,7 +425,7 @@
this.orderList = []
this.tabTitle = "tabOne"
this.commislist()
- this.$refs.bindmobile1.colse()
+ this.$refs.bindmobile.close()
})
},
//审核通过 同意
diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue
index 71d610f..a28f466 100644
--- a/pages/order_pay_status/index.vue
+++ b/pages/order_pay_status/index.vue
@@ -232,6 +232,17 @@
})
}
+ } else if (this.product_type == 99) {
+ if(val==1){
+ uni.navigateTo({
+ url: `/pages/users/order_list/relase?status=1&product_type=${this.product_type}`
+ })
+ }else{
+ uni.navigateTo({
+ url: `/pages/users/order_list/relase?status=0&product_type=${this.product_type}`
+ })
+ }
+
} else {
if(val==1){
uni.navigateTo({
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 5ab73b6..8255da7 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -14,7 +14,11 @@
+
+
+
+
@@ -70,8 +74,6 @@
-
-