From 9364edef73d98fa6339c8e506ffa83fb02bef54a Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 4 Nov 2023 09:31:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/store.js | 9 +
pages/nongKe/gather/select_warehouse.vue | 1754 +++++++++++++---------
pages/product/addGoods/index.vue | 8 +-
pages/users/order_confirm/index.vue | 28 +-
4 files changed, 1083 insertions(+), 716 deletions(-)
diff --git a/api/store.js b/api/store.js
index 3659801..db41fe0 100644
--- a/api/store.js
+++ b/api/store.js
@@ -7,6 +7,15 @@ import request from "@/utils/request.js";
export function microSeachBarCode(data) {
return request.get('micro/seach_bar_code', data);
}
+
+/**
+ * 添加商品库审核
+ *
+ */
+export function microProductAdd(data) {
+ return request.post('micro/product_add', data);
+}
+
/**
* 获取收款二维码
* @returns {*}
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index c6fdf24..52b6b47 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -1,800 +1,1148 @@
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
-
- {{ item.store_name }}
- ¥{{ item.price }}
- 加入店铺
-
-
-
-
-
-
- 商品条码：
-
-
- 商品名称：
-
-
- 编辑商品价格：
-
-
- 编辑商品库存：
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 名称:
+ {{ item.store_name }}
+
+
+
+ 规格:
+
+ 无
+
+
+ 参考价格:
+ {{item.price||'0.00'}}(元)
+
+
+
+
+ 品牌:
+ {{item.trademark||'无'}}
+
+
+ 分类:
+ {{item.goods_type||'无'}}
+
+
+
+
+ 厂商:
+ {{item.manu_name||'无'}}
+
+
+
+
+ 厂商地址:
+ {{item.manu_address||'无'}}
+
+
+
+
+ 备注:
+
+
+
+ 无
+
+
+
+
+
+
+
+
+ 加入店铺
+
+
+
+
+
+
+ 请选择产品图片:
+ 刷新: 3次
+
+
+
+
+
+
+
+ 请选择产品图片:
+
+
+
+
+
+
+
+ 请选择产品图片:
+
+
+
+
+
+
+
+
+
+
+
+ 商品条码：
+
+
+ 商品名称：
+
+
+ 编辑商品价格：
+
+
+ 编辑商品库存：
+
+
+
+
+
+
+
+
+
+
-
- 是否添加到你的仓库中?
-
+
+ 完善商品信息
+
+ 名称:
+
+
+
价格:
-
+
库存:
-
- 取消
- 确定
-
-
+
+ 规格:
+
+
+
+ 品牌:
+
+
+
+ 取消
+ 确定
+
+
-
-
-
-
- 取消
- 搜索
-
-
-
+
+
+
+
+ 取消
+ 搜索
+
+
+
+
-
+
\ No newline at end of file
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index d05d363..d769f6e 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -513,7 +513,13 @@
// 获取品牌
this.brand = (await categoryBrandlist(this.merId)).data;
// 获取平台分类
- this.platformClassificationData = (await categoryList(this.merId)).data;
+ let { data } = await categoryList(this.merId);
+ data.forEach((item1)=>{
+ item1.children.forEach((item2)=>{
+ item2.children = null;
+ })
+ })
+ this.platformClassificationData = data;
// 数据回显
},
//获取送货方式信息
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 547cbbe..927ef09 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -716,13 +716,6 @@
// this.getAgreement();
let _this = this
this.textareaStatus = true;
- if (this.isLogin && this.toPay == false && !this.orderPay) {
- this.getaddressInfo();
- this.$nextTick(function() {
- this.$refs.addressWindow.getAddressList();
- this.getUserInfo()
- })
- }
uni.setStorage({
key: 'invoice_Data',
data: {},
@@ -742,6 +735,13 @@
uni.$off('handClick');
})
that.invoice.invoice = false
+ if (this.isLogin && this.toPay == false && !this.orderPay) {
+ this.getaddressInfo();
+ this.$nextTick(function() {
+ this.$refs.addressWindow.getAddressList();
+ this.getUserInfo()
+ })
+ }
},
/**
* 生命周期函数--监听页面隐藏
@@ -1187,12 +1187,16 @@
if (that.addressInfo.real_name) {
that.textareaStatus = false;
that.address.address = true;
- that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this
- .pinkId + '&couponId=' + this.couponId;
+ // that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this
+ // .pinkId + '&couponId=' + this.couponId;
+ that.pagesUrl = '/pages/users/user_address_list/index'
} else {
- uni.navigateTo({
- url: `/pages/users/user_address/index?cartId=${this.cartId}`,
- });
+ // uni.navigateTo({
+ // url: `/pages/users/user_address/index?cartId=${this.cartId}`,
+ // });
+ uni.navigateTo({
+ url: `pages/users/user_address_list/index`,
+ });
}
},
/**