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/addDelegation/index.vue b/pages/commissionedSales/addDelegation/index.vue
index 86619ff..d2da49e 100644
--- a/pages/commissionedSales/addDelegation/index.vue
+++ b/pages/commissionedSales/addDelegation/index.vue
@@ -1,12 +1,9 @@
-
-
-
+
+
-
-
-
-
-
@@ -98,20 +88,8 @@
return {
value1: 1,
value2: "",
- options1: [{
- text: "Shenzhen1",
- value: 1
- }, {
+ options1: [],
- text: "Shenzhen2",
- value: 2
- }, {
-
-
- text: "Shenzhen3",
- value: 3
- }],
- date: 1,
productList: [],
info: {
startDate: '',
@@ -122,6 +100,14 @@
selected: [],
showMonth: false
},
+ formData: {
+ entrust_mer_id: '',
+ entrust_day: 15,
+ is_type: "4",
+ product_info: [],
+ content: ''
+ },
+ type: ''
};
},
computed: {
@@ -287,6 +273,10 @@
background: #F5F5F5;
}
+ .content {
+ height: 100vh;
+ position: relative;
+ }
.release_content {
@@ -531,6 +521,10 @@
}
.release_btn {
- margin-top: 100rpx;
+
+ position: absolute;
+ bottom: 150rpx;
+ left: 50%;
+ margin-left: -347rpx;
}
\ No newline at end of file
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 05b293a..3cf0d27 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,7 +39,7 @@
-
+
委托方:
@@ -92,15 +94,15 @@
是否结束委托:
- {{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?'申请':""}}
拒绝原因:
-
- {{objinfo.entrust_finish_refusal}}
+
+ {{objinfo.entrust_finish_refusal}}
@@ -112,7 +114,7 @@
-
+
@@ -122,7 +124,7 @@
-
+
@@ -150,39 +152,49 @@
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() {
},
methods: {
-
+ //商品详情
list(id) {
entrustdetail(id).then((res) => {
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()
- })
- }
-
- })
+ //商品宝贝详情
+ Merchbaby(item) {
+ uni.navigateTo({
+ url: `/pages/goods_details/index?id=${item.product_id}`
+ })
+
+ },
+
+ //提交购物车
+ 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 +204,10 @@ type:0,
\ No newline at end of file
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index 4615473..d26b645 100644
--- a/pages/commissionedSales/initiateDelegation/index.vue
+++ b/pages/commissionedSales/initiateDelegation/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -14,10 +14,10 @@
- {{item.content}}
+ {{item.title}}
- 委托周期:{{item.day}}
+ 委托周期:{{item.entrust_day}}
@@ -25,12 +25,11 @@
-
+
待处理
-
-
@@ -47,62 +46,62 @@
-
-
-
+
已接受
-
-
+
结束委托
+
+
+ 详情
+
+
+
+
+
+ 已拒绝
+
+
+
+
+ 详情
+
+
+
+
+
+ 已完成
+
+
+
+ 删除
+
详情
-
-
-
-
- 已拒绝
-
-
-
- 删除
-
-
-
- 详情
-
-
+
+
+
+
-
-
-
-
- 已完成
-
-
-
- 删除
-
-
-
- 详情
-
-
+
+ 新增委托
-
-
+
+
-
@@ -114,19 +113,16 @@
委托申请处理
- 结算周期: 30天
-
-
+ 结算周期: {{obj.settle_cycle}}天
- 利息比例: 0.05%
+ 利息比例: {{obj.interest_rate}}%
-
-
+
拒绝
-
+
接受
@@ -136,7 +132,6 @@
-
@@ -156,15 +151,11 @@
-
-
-
-
@@ -175,20 +166,17 @@
结束委托申请处理
-
- 结算周期: 30天
-
-
+
+ 结算周期: {{obj.mer_info.settle_cycle}}天
-
- 利息比例: 0.05%
+
+ 利息比例: {{obj.mer_info.interest_rate}}%
-
-
+
拒绝
-
+
接受
@@ -209,24 +197,19 @@
结束委托申请处理
-
- 结算周期: 30天
-
-
+
+ 结算周期: {{obj.mer_info.settle_cycle}}天
+
+
+ 利息比例: {{obj.mer_info.interest_rate}}%
- 利息比例: 0.05%
-
-
-
拒绝原因：
-
-
+
-
-
+
接受
@@ -242,34 +225,44 @@