From 871030f037d9dd8033ca4d5f9c236ee5ea2ffd04 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 10 Nov 2023 18:02:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/behalfAdmin.js | 8 ++ pages/nongKe/supply_chain/merchant.vue | 13 ++- pages/product/addGoods/index.vue | 103 ++++++++++++------------ pages/replace_replenishment/replace.vue | 30 ++++++- 4 files changed, 99 insertions(+), 55 deletions(-) diff --git a/api/behalfAdmin.js b/api/behalfAdmin.js index 6a75488..97aa8ec 100644 --- a/api/behalfAdmin.js +++ b/api/behalfAdmin.js @@ -25,3 +25,11 @@ export function behalfAdminNumber(data) { return request.get("behalf_admin/number", data); } +/** + * 生成二维码 + * + */ +export function behalfAdminCode(data) { + return request.get("behalf_admin/code", data); +} + diff --git a/pages/nongKe/supply_chain/merchant.vue b/pages/nongKe/supply_chain/merchant.vue index b2b44c6..ca6ee3c 100644 --- a/pages/nongKe/supply_chain/merchant.vue +++ b/pages/nongKe/supply_chain/merchant.vue @@ -18,7 +18,7 @@ - + @@ -35,7 +35,7 @@ 订货价: {{' '+item.price}} - 加入购物单 + @@ -242,6 +242,15 @@ } }, + /** + * 跳转到产品详情 + */ + navToGoodsDetails(item){ + console.log(item); + uni.navigateTo({ + url: `pages/goods_details/index?id=${item.product_id}&referer=` + }) + }, /* * 加入购物车 */ diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue index 412b305..59ff2c7 100644 --- a/pages/product/addGoods/index.vue +++ b/pages/product/addGoods/index.vue @@ -91,57 +91,58 @@ - - + + + 规格选择 + + + + + + + 选择规格 + + + {{ setFormData.specifica }} + 去选择 + + + + + + + 价格设置 + + + {{setFormData.setSpecificaValue}} + 去设置 + + + + + + 价格设置 + + + {{setFormData.setSpecificaValue2}} + 去设置 + + + + + --> + + @@ -606,7 +607,7 @@ this .setFormData.slider_image ]; - this.setFormData.cate_name = editGoodsDetils.storeCategory.cate_name; // 平台分类回显 + this.setFormData.cate_name = editGoodsDetils?.storeCategory?.cate_name; // 平台分类回显 this.setFormData.mer_cate_name = editGoodsDetils.merCateId ? editGoodsDetils.merCateId.map( item => item .category && item.category.cate_name).join(',') : ''; diff --git a/pages/replace_replenishment/replace.vue b/pages/replace_replenishment/replace.vue index b797c3c..0526529 100644 --- a/pages/replace_replenishment/replace.vue +++ b/pages/replace_replenishment/replace.vue @@ -264,7 +264,7 @@ - 去发货 + 去发货 查看详情 @@ -362,6 +362,15 @@ 取消 + + + 请把二维码展示给取货人员 + + + + + + @@ -389,7 +398,8 @@ } from '@/api/order.js'; import{ behalfAdminOrderList, - behalfAdminNumber + behalfAdminNumber, + behalfAdminCode } from "@/api/behalfAdmin.js" import { getUserInfo @@ -411,6 +421,7 @@ import { HTTP_REQUEST_URL } from '@/config/app'; +import { Toast } from '../../libs/uniApi'; export default { components: { payment, @@ -424,6 +435,8 @@ loading: false, //是否加载中 loadend: false, //是否加载完毕 loadTitle: '加载更多', //提示语 + popUpShow: false, //二维码弹窗 + payCodeUrl: '', //二维码地址 orderList: [], //订单数组 presellProList: [], //定金预售订单 presellOrderCount: 0, @@ -693,6 +706,19 @@ } // #endif }, + /** + * 去发货 + */ + consignment: function(order_id) { + this.popUpShow = true; + behalfAdminCode({ + order_id + }).then((res)=>{ + this.payCodeUrl = res.data.qrcode; + }).catch((e)=>{ + Toast(e) + }) + }, /** * 提示 */