From 29153eeb59e9826c0d82b411d815a0cb46dddec7 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Fri, 18 Aug 2023 18:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=AE=A1=E7=90=86=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=20=E5=AE=8C=E6=88=90=E5=88=97=E8=A1=A8=20=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E7=BC=96=E8=BE=91=E3=80=81=E6=8B=92?= =?UTF-8?q?=E7=BB=9D=E3=80=81=E5=90=8C=E6=84=8F=E3=80=81=E7=AD=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20=EF=BC=8C=E4=BA=A4=E6=98=93=E5=A4=A7=E5=8E=85?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=E5=8F=8A=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/release.js | 43 ++ api/trading-floor.js | 17 +- components/shoppinglist/shoppinglist.vue | 25 +- pages/goods_details/index.vue | 2 +- pages/order_details/index.vue | 55 +-- pages/releaseManagement/index.vue | 426 +++++++++++++------ pages/supply_chains/supply_chains.vue | 2 +- pages/trading_hall/adddiscounts/index.vue | 88 +++- pages/trading_hall/product_details/index.vue | 4 - pages/trading_hall/transfer_goods/index.vue | 101 +++-- pages/users/order_confirm/index.vue | 2 +- pages/users/trading_hall/index.vue | 109 +++-- 12 files changed, 607 insertions(+), 267 deletions(-) create mode 100644 api/release.js diff --git a/api/release.js b/api/release.js new file mode 100644 index 0000000..3b53a12 --- /dev/null +++ b/api/release.js @@ -0,0 +1,43 @@ +// +---------------------------------------------------------------------- +// | CRMEB [ CRMEB赋能开发者，助力企业发展 ] +// +---------------------------------------------------------------------- +// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved. +// +---------------------------------------------------------------------- +// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 +// +---------------------------------------------------------------------- +// | Author: CRMEB Team +// +---------------------------------------------------------------------- +import request from "@/utils/request.js"; + +/** + * 获取发布管理转售商品列表 + * @param numType boolean true 购物车数量,false=购物车产品数量 + */ +export function getResale(data) { + return request.get("community/resale/lst", data); +} + +/** + * 清除发布管理转售商品 + * @param object ids + */ +export function getResaledelete(id) { + return request.post('community/resale/delete/'+ id); +} + + +/** + * 用户是否同意转售商品折扣价 + * @param object ids + */ +export function getResalecheck(id,data) { + return request.post('community/resale/check/'+ id,data); +} + +/** + * 获取转售商品详情 + * @param object ids + */ +export function getResaleid(id) { + return request.get('community/resale/' + id); +} diff --git a/api/trading-floor.js b/api/trading-floor.js index 1c80359..3ab9887 100644 --- a/api/trading-floor.js +++ b/api/trading-floor.js @@ -9,6 +9,7 @@ // +---------------------------------------------------------------------- import request from "@/utils/request.js"; + /** * 调货列表 * @@ -71,7 +72,17 @@ export function getCommunityaddCart(data) { //商品宝贝详情 export function getProductDetail(id) { - return request.get('store/product/detail/' + id, { - noAuth: true - }); + return request.get('store/product/detail/' + id, + ); +} +//获取转售商品详情 +export function getresaleDetail(id) { + return request.get('community/resale/' + id, + ); +} + +//编辑转售商品 +export function getresaleEdit(id,data) { + return request.post('community/resale/edit/' + id,data + ); } \ No newline at end of file diff --git a/components/shoppinglist/shoppinglist.vue b/components/shoppinglist/shoppinglist.vue index 5357014..3b921a9 100644 --- a/components/shoppinglist/shoppinglist.vue +++ b/components/shoppinglist/shoppinglist.vue @@ -55,19 +55,19 @@ 出售价格 出售数量 - + :isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)" > + :min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true" + :isMin="true" index="11" @eventChange="numberChange($event,i)" > @@ -169,9 +169,10 @@ }, methods: { //价格 - producrprice(e, i) { + producrprice(e, i,item) { + this.bought[i].price = e.detail.value - + this.$set(item, 'check',false); }, // picker修改事件 bindPickerChange: function(e, storage, num) { @@ -193,9 +194,10 @@ }, numberChange(data, i) { this.peicenumber = data.number; - this.bought[i].num = data.number + this.bought[i].number = data.number }, + tabs(index) { this.isActive = index this.$set(this.whereb, 'keyword', ''); @@ -255,7 +257,7 @@ that.checkedArr.forEach((val, i) => { if (item.product_id == val.product_id) { that.$set(item, 'check', true); - that.$set(item, 'num', val.num); + that.$set(item, 'number', val.number); that.$set(item, 'price', val.price); } }) @@ -274,9 +276,9 @@ this.$set(item, 'check', !item.check); if (item.check) { if (this.peicenumber == 0) { - item.num = 1 + item.number = 1 } - + if (!item.product_attr_unique) { item.product_attr_unique = item.attrValue[0].unique } @@ -291,6 +293,7 @@ }, /*确定提交*/ submit() { + this.$emit('getProduct', this.checkedArr); }, diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index f04bae6..c93aac7 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -585,7 +585,7 @@ ])), }, onLoad(options) { - console.log(options) + // console.log(options) this.referer = options.referer if (options.product_type) { this.product_type = options.product_type diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index f14ff1a..e835ad6 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -303,7 +303,8 @@ 查看物流 - 取件码 + + 已收货 { - // this.receivingshow = false - // return that.$util.Tips({ - // title: '成功收货', - // icon: 'success' - // }, function() { - - // that.getOrderInfo(); - // }); - // }).catch(err => { - // this.receivingshow = false - // return that.$util.Tips({ - // title: err - // }); + // uni.showModal({ + // title: '取件码', + // content: item.logistics_code, + // success: function(res) { + // if (res.confirm) { + // // console.log('用户点击确定'); + // } else if (res.cancel) { + // // console.log('用户点击取消'); + // } + // } // }) + let that = this; + orderTake(that.order_id).then(res => { + this.receivingshow = false + return that.$util.Tips({ + title: '成功收货', + icon: 'success' + }, function() { + + that.getOrderInfo(); + }); + }).catch(err => { + this.receivingshow = false + return that.$util.Tips({ + title: err + }); + }) }, /** * diff --git a/pages/releaseManagement/index.vue b/pages/releaseManagement/index.vue index 90cc1d0..05b1be2 100644 --- a/pages/releaseManagement/index.vue +++ b/pages/releaseManagement/index.vue @@ -7,140 +7,223 @@ - - - - - - - - 超级无敌一级棒乌龙山马龙尖茶... - - - - ￥ 100.00 - - - 类型:调货 - - - - - - + + - + - 超级无敌一级棒乌龙山马龙尖茶... + {{item.title}} - ￥ 100.00 + ￥ {{item.discount_price}} - - 结算价:￥100.00 + + 类型:调货 + + + 类型:打折 - - - 类型:调货 - + + + + + 编辑 - + + + + 删除 + + + 编辑 + + + + + + 删除 + + + 编辑 + + + + + + 拒绝 + + + + 同意 + + + + + + + + + - - - ￥ 100.00 + + + {{item.title}} - - 结算价:￥100.00 + + + ￥ {{item.discount_price}} + + + 结算价:￥{{item.discount_price}} + + + + + 类型:调货 + + + 类型:打折 + + + + 编辑 + - - 类型:调货 + + + + + + + 删除 + + + 编辑 + + + + + + 删除 + + + 编辑 + + + + + + 拒绝 + + + + 同意 - --> - - - - - - - - 超级无敌一级棒乌龙山马龙尖茶... - - - - ￥ 100.00 + + + + + + + + - - 类型:调货 + + + {{item.title}} + + + + + 类型:调货 + + + 类型:打折 + + + + + + + 编辑 + + + + + + + + + 删除 + + + 编辑 + + + + + + 删除 + + + 编辑 + + + + + + 拒绝 + + + + 同意 + + - - - 编辑 - - - - - - - - 删除 - - - 编辑 - - - - - - 删除 - - - 编辑 - - - - - - 拒绝 - - - - 同意 - - - + @@ -150,6 +233,15 @@