diff --git a/api/admin.js b/api/admin.js
index ee0a969..a50ca9e 100644
--- a/api/admin.js
+++ b/api/admin.js
@@ -15,6 +15,7 @@ import request from "@/utils/request.js";
export function getStatisticsInfo() {
return request.get("admin/order/statistics", {}, { login: true });
}
+
/**
* 订单月统计
*/
@@ -33,6 +34,12 @@ export function getAdminOrderList(where) {
export function setAdminOrderPrice(merId, id, data) {
return request.post("admin/" + merId + "/price/" + id, data, { login: true });
}
+/**
+ * 同意先货后款
+ */
+export function postconfirm(merId, data) {
+ return request.post("admin/" + merId + "/confirm" , data, { login: true });
+}
/**
* 订单备注
*/
diff --git a/api/product.js b/api/product.js
index b820836..002e2d7 100644
--- a/api/product.js
+++ b/api/product.js
@@ -13,7 +13,12 @@ import request from "@/utils/request.js";
* 获取商品详情
*/
export const getProductDetailsAPI = (data) => request.get('micro/product_details', data)
-
+/**
+ * 线下导入
+ */
+export function postImport(merid,data) {
+ return request.post(`server/${merid}/product/stockIn`, data);
+}
/**
* 获取商户基本信息 http://127.0.0.1:8324/api/store/merchant/info?id=4
*/
diff --git a/pages.json b/pages.json
index 5995e80..d0147b8 100644
--- a/pages.json
+++ b/pages.json
@@ -249,12 +249,24 @@
"navigationBarTitleText": "忘记密码"
}
},
+ {
+ "path": "online_warehousing/index",
+ "style": {
+ "navigationBarTitleText": "采购订单"
+ }
+ },
{
"path": "user_setting/index",
"style": {
"navigationBarTitleText": "设置"
}
},
+ {
+ "path": "supply_procurement/index",
+ "style": {
+ "navigationBarTitleText": "供货采购"
+ }
+ },
//协议,关于
{
"path": "user_about/index",
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 0841f47..8b16c4d 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -137,10 +137,19 @@
支付
¥{{ item.pay_price }} (邮费 ¥{{ item.pay_postage}})
+
+ 共1件商品,结算周期到期后付款¥100
+
+
+ 同意
+
+
+ 拒绝
+
一键改价
@@ -196,7 +205,8 @@
setOfflinePay,
setOrderRefund,
refundOrderReceive,
- setRefundMark
+ setRefundMark,
+ postconfirm
} from "@/api/admin";
import Loading from '@/components/Loading/index'
import PriceChange from '@/components/PriceChange/index'
@@ -249,6 +259,16 @@
this.getIndex();
},
methods: {
+ //同意先货后款订单
+ tongyi(id,number){
+ let data={
+ id:id,
+ type:number
+ }
+ postconfirm(this.merId,data).then(res=>{
+ console.log(res);
+ })
+ },
handleSearch() {
this.loaded = false;
this.where.page = 1;
@@ -631,7 +651,7 @@
.pos-order-list .list .item .operation .bnt {
font-size: 28upx;
color: #5c5c5c;
- width: 170upx;
+ width: 160upx;
height: 60upx;
border-radius: 30upx;
border: 1px solid #bbb;
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 87c764a..ec28b9a 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -64,7 +64,8 @@
我的店铺
+ @click="navigator(`/pages/users/supply_procurement/index?type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)">
+
供货采购
diff --git a/pages/nongKe/supply_chain/shopping_trolley.vue b/pages/nongKe/supply_chain/shopping_trolley.vue
index fea09f7..d6fc4a6 100644
--- a/pages/nongKe/supply_chain/shopping_trolley.vue
+++ b/pages/nongKe/supply_chain/shopping_trolley.vue
@@ -568,7 +568,7 @@
})
if (selectValue.length > 0) {
uni.navigateTo({
- url: '/pages/users/order_confirm/index?product_type=98&cartId=' + selectValue.join(',')
+ url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}`
});
} else {
return this.$util.Tips({
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 2d45244..65570f4 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -289,7 +289,8 @@
merList: [], //商户分类
product_type: 0,
show:false,
- image: '' //图片
+ image: '' ,//图片,
+ credit_buy:'',//支持先货后款
};
},
onLoad(options) {
@@ -298,6 +299,7 @@
if (options.street_id != undefined) {
this.sotreParam.street_id = options.street_id
}
+ this.credit_buy=options.credit_buy
this.sotreParam.type_id = options.type_id
this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
this.sotreParam.category_id = options.cate_id && options.cate_id.split(',').toString() || ''
@@ -496,7 +498,8 @@
order: this.sotreParam.order,
category_id: this.sotreParam.category_id,
type_id: this.sotreParam.type_id,
- street_id: this.sotreParam.street_id
+ street_id: this.sotreParam.street_id,
+ credit_buy:this.credit_buy
}
if (this.latitude) {
rqData.location = this.latitude + ',' + this.longitude
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 21a50ad..2d7372e 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -260,11 +260,11 @@
实付款:
¥{{orderInfo.pay_price}}
-
+
结算周期到期后付款 ¥100.00
-
+
结算周期:30天 日利率:0.05%
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index 723857f..b010383 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -71,6 +71,9 @@
¥{{goods.cart_info.productPresellAttr.presell_price}}x{{goods.product_num}}
+
+ 立即付款
+
@@ -94,6 +97,9 @@
¥{{goods.cart_info.productAttr.price}}
x{{goods.product_num}}
+
+ 立即付款
+
@@ -125,6 +131,11 @@
商品总额:
¥{{orderInfo.total_price}}
+
+ 支付方式:
+ 先货后款
+
+
@@ -150,9 +161,17 @@
实付款:
- ¥{{orderInfo.pay_price}}
+ 先货后款 : ¥{{orderInfo.pay_price}}
+ ¥{{orderInfo.pay_price}}
+
+ 结算周期到期后付款 ¥{{orderInfo.pay_price}}
+
+
+
+ 结算周期:30天 日利率:0.05%
+
-
+
-
+
+
+
+
+
+
+ 下单时实付¥0,确认收货后将开始计算结算周期,结算周期内按照订单金额付款。如未在结算周期内付款平台将在xx天xx小时后计息。
+
+
+
-
+
\ No newline at end of file
diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue
new file mode 100644
index 0000000..fad0721
--- /dev/null
+++ b/pages/users/online_warehousing/index.vue
@@ -0,0 +1,276 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{item.merchant.mer_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{items.cart_info.product.store_name}}
+
+ ¥{{items.cart_info.product.price}}
+ x {{items.product_num}}
+
+ 立即导入
+
+
+
+
+
+
+ 共1件商品,总金额
+ ¥{{items.product_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 45e5100..f340e6c 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -188,6 +188,11 @@
¥{{ item.order.pay_price }}
¥{{ item.order.org_price}}
+
+
+ 实付
+ ¥0.00
+
@@ -379,7 +384,11 @@