From d2b53131b256bd5c3a3d18bc3d99cbb3b49c1eff Mon Sep 17 00:00:00 2001 From: liudan <18634735655@163.com> Date: Fri, 13 Oct 2023 18:46:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api.js | 9 + pages.json | 36 ++- pages/ConfirmOrder/ConfirmOrder.scss | 23 +- pages/ConfirmOrder/ConfirmOrder.vue | 41 ++-- pages/MyOrderList/MyOrderList.scss | 91 +------- pages/MyOrderList/MyOrderList.vue | 14 +- pages/fenxiao/fans.vue | 1 - pages/fenxiao/fansOrder.vue | 287 +++++++++++++++++++++++ pages/fenxiao/fenxiao.vue | 13 +- pages/my/my.vue | 51 +---- pages/qianggou/productDetails.vue | 18 +- pages/warehouse/buy.vue | 328 +++++++++++---------------- pages/warehouse/sell.vue | 316 ++++++++++++++++++++++++++ 13 files changed, 835 insertions(+), 393 deletions(-) create mode 100644 pages/fenxiao/fansOrder.vue create mode 100644 pages/warehouse/sell.vue diff --git a/common/api.js b/common/api.js index b4140b4..26e46f9 100644 --- a/common/api.js +++ b/common/api.js @@ -44,6 +44,10 @@ export const getUserCommissionList = (params, config = {custom: { auth: true }}) export const getUserFansStatistic = (params, config = {custom: { auth: true }}) => http.post('/api/user/getUserFansStatistic', params, config); //粉丝列表 export const getUserFansList = (params, config = {custom: { auth: true }}) => http.post('/api/user/getUserFansList', params, config); +//粉丝订单统计 +export const getUserFansOrderStatistic = (params, config = {custom: { auth: true }}) => http.post('/api/user/getUserFansOrderStatistic', params, config); +//粉丝订单列表 +export const getUserFansOrderList = (params, config = {custom: { auth: true }}) => http.post('/api/user/getUserFansOrderList', params, config); //收益统计 export const getUserProfitStatistic = (params, config = {custom: { auth: true }}) => http.post('/api/user/getUserProfitStatistic', params, config); //收益列表 @@ -54,4 +58,9 @@ export const getWarehouseList = (params, config = {custom: { auth: true }}) => h export const getGoodsList = (params, config = {custom: { auth: true }}) => http.post('/api/order/getGoodsList', params, config); //商品详情 export const getgoodsDetail = (params, config = {custom: { auth: true }}) => http.post('/api/order/goodsDetail', params, config); +//买方订单 +export const getBuyerOrderList = (params, config = {custom: { auth: true }}) => http.get('/api/order/getBuyerOrderList', {params}, config); +//卖方订单 +export const getSellerOrderList = (params, config = {custom: { auth: true }}) => http.get('/api/order/getSellerOrderList', {params}, config); + diff --git a/pages.json b/pages.json index db9b654..65a08c2 100644 --- a/pages.json +++ b/pages.json @@ -155,6 +155,14 @@ "onReachBottomDistance":100 } }, + { + "path" : "pages/fenxiao/fansOrder", + "style" : { + "navigationBarTitleText": "粉丝订单", + "navigationBarBackgroundColor": "#FFFFFF", + "onReachBottomDistance":100 + } + }, { "path" : "pages/shouyi/shouyi", "style" : { @@ -195,16 +203,33 @@ { "path" : "pages/MyOrderList/MyOrderList", "style" : { - "navigationStyle":"custom" + "navigationBarTitleText": "我的订单", + "navigationBarBackgroundColor": "#FFFFFF" } }, { "path" : "pages/warehouse/buy", "style" : { "navigationBarTitleText": "买方仓库", - "navigationBarBackgroundColor": "#FFFFFF" + "navigationBarBackgroundColor": "#FFFFFF", + "onReachBottomDistance":100 } }, + { + "path" : "pages/warehouse/sell", + "style" : { + "navigationBarTitleText": "卖方仓库", + "navigationBarBackgroundColor": "#FFFFFF", + "onReachBottomDistance":100 + } + }, + { + "path" : "pages/ConfirmOrder/ConfirmOrder", + "style" : { + "navigationBarTitleText": "确认订单", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, @@ -247,13 +272,6 @@ "navigationBarTitleText": "发现" } } - ,{ - "path" : "pages/ConfirmOrder/ConfirmOrder", - "style" : { - "navigationBarTitleText": "填写订单", - "navigationBarBackgroundColor": "#FFFFFF" - } - } ,{ "path" : "pages/CashierDesk/CashierDesk", "style" : { diff --git a/pages/ConfirmOrder/ConfirmOrder.scss b/pages/ConfirmOrder/ConfirmOrder.scss index 26ebc45..c2e86be 100644 --- a/pages/ConfirmOrder/ConfirmOrder.scss +++ b/pages/ConfirmOrder/ConfirmOrder.scss @@ -1,29 +1,16 @@ .page{ - position: absolute; - left: 0; - top: 0; - width: 100%; - // height: 100%; - background-color: #f6f6f6; - padding-bottom: 180rpx; + } /* 地址 */ .address-data{ position: relative; padding: 10rpx 4%; background-color: #FFFFFF; - border-radius: 0 0 20rpx 20rpx; + margin:0 24rpx; overflow: hidden; - .bar{ - position: absolute; - left: 0; - bottom: 0; - width: 100%; - height: 10rpx; - background-color: #CCCCCC; - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-size: 72rpx 72rpx; - } + border:1px solid red; + margin-top:24rpx; + border-radius: 8rpx; .address-list{ width: 100%; .list{ diff --git a/pages/ConfirmOrder/ConfirmOrder.vue b/pages/ConfirmOrder/ConfirmOrder.vue index 18e0bf1..1460693 100644 --- a/pages/ConfirmOrder/ConfirmOrder.vue +++ b/pages/ConfirmOrder/ConfirmOrder.vue @@ -4,22 +4,21 @@ - 黑龙江哈尔滨市道里区城区 + 张三 + 178****8888 - 爱建路1333号 + 黑龙江哈尔滨市道里区城区 - 张三 - 178****8888 + 爱建路1333号 + (如果快递不方便接收，您可以选择暂时寄存服务) - - - + @@ -187,20 +186,20 @@ url: '/pages/CashierDesk/CashierDesk', }) }, - /** - * 跳转点击 - * @param {String} type 跳转类型 - */ - onSkip(type){ - switch (type){ - case 'address': - uni.navigateTo({ - url: '/pages/AddressList/AddressList', - }) - break; - } - } - } + + onSkip(type){ + switch (type){ + case 'address': + uni.navigateTo({ + url: '/pages/AddressList/AddressList', + }) + break; + } + } + }, + onLoad(){ + console.log(uni.getStorageSync('qgPro'),"lldd") + }, } diff --git a/pages/MyOrderList/MyOrderList.scss b/pages/MyOrderList/MyOrderList.scss index b2bd684..320456f 100644 --- a/pages/MyOrderList/MyOrderList.scss +++ b/pages/MyOrderList/MyOrderList.scss @@ -6,85 +6,6 @@ height: 100%; background-color: #f6f6f6; } -/* 顶部返回 */ -.head-back{ - position: fixed; - left: 0; - top: 0; - z-index: 10; - display: flex; - align-items: center; - justify-content: center; - width: 100%; - height: 100rpx; - background-color: #FFFFFF; - /* #ifdef APP-PLUS */ - height: calc(50rpx + var(--status-bar-height)); - padding-top: var(--status-bar-height); - /* #endif */ - /* #ifdef MP */ - height: 150rpx; - padding-top: 20rpx; - /* #endif */ - .back{ - position: absolute; - left: 0; - top: 0; - /* #ifdef APP-PLUS */ - padding-top: var(--status-bar-height); - /* #endif */ - /* #ifdef MP */ - padding-top: 20rpx; - /* #endif */ - display: flex; - align-items: center; - justify-content: center; - width: 100rpx; - height: 100%; - text{ - width: 20rpx; - height: 20rpx; - border-left: 2rpx solid #555555; - border-bottom: 2rpx solid #555555; - transform: rotate(45deg); - } - } - .title{ - display: flex; - align-items: center; - text{ - font-size: 28rpx; - color: #222222; - } - } - .more-icon{ - position: absolute; - right: 0; - top: 0; - /* #ifdef APP-PLUS */ - right: 0rpx; - padding-top: var(--status-bar-height); - /* #endif */ - /* #ifdef MP */ - right: 220rpx; - padding-top: 20rpx; - /* #endif */ - display: flex; - align-items: center; - height: 100%; - .icon-list{ - display: flex; - align-items: center; - justify-content: center; - width: 80rpx; - height: 100%; - text{ - font-size: 34rpx; - color: #222222; - } - } - } -} /* 订单tab */ .order-tab{ @@ -98,8 +19,8 @@ display: flex; align-items: center; width: 100%; - height: 100rpx; - background-color: #FFFFFF; + height: 90rpx; + background: rgb(35, 96, 48); .tab{ position: relative; display: flex; @@ -109,12 +30,13 @@ height: 80%; text{ font-size: 26rpx; - color: #959595; + color: #4D9A5E; } } .action{ text{ - color: #222222; + color: #fff; + font-weight: bold; } .line{ position: absolute; @@ -122,7 +44,8 @@ bottom: 0; width: 60rpx; height: 6rpx; - background: linear-gradient(to right,$base,#f6f6f6); + background: #fff; + border-radius:3px; transform: translate(-50%,0); } } diff --git a/pages/MyOrderList/MyOrderList.vue b/pages/MyOrderList/MyOrderList.vue index 36dbffb..df923a6 100644 --- a/pages/MyOrderList/MyOrderList.vue +++ b/pages/MyOrderList/MyOrderList.vue @@ -1,18 +1,6 @@ @@ -71,7 +71,7 @@ export default { status:null, updatetime:null, warehouse_id:null, - } + }, }; }, onLoad(params) { @@ -81,13 +81,19 @@ export default { methods: { getDetailsHandle(id){ getgoodsDetail({id:id}).then(res=>{ - console.log(res,"99") this.swiperList.push({ url: res.data.image }) this.detailsObj = Object.assign({},this.detailsObj,res.data) }) - } + }, + buyHandle(){ + uni.setStorageSync('qgPro',this.detailsObj) + uni.navigateTo({ + url:'/pages/ConfirmOrder/ConfirmOrder' + }) + }, + } }; diff --git a/pages/warehouse/buy.vue b/pages/warehouse/buy.vue index 60d712f..9ca7f65 100644 --- a/pages/warehouse/buy.vue +++ b/pages/warehouse/buy.vue @@ -1,111 +1,117 @@ @@ -136,91 +141,12 @@ height: 100%; background-color: #f6f6f6; } -/* 顶部返回 */ -.head-back{ - position: fixed; - left: 0; - top: 0; - z-index: 10; - display: flex; - align-items: center; - justify-content: center; - width: 100%; - height: 100rpx; - background-color: #FFFFFF; - /* #ifdef APP-PLUS */ - height: calc(50rpx + var(--status-bar-height)); - padding-top: var(--status-bar-height); - /* #endif */ - /* #ifdef MP */ - height: 150rpx; - padding-top: 20rpx; - /* #endif */ - .back{ - position: absolute; - left: 0; - top: 0; - /* #ifdef APP-PLUS */ - padding-top: var(--status-bar-height); - /* #endif */ - /* #ifdef MP */ - padding-top: 20rpx; - /* #endif */ - display: flex; - align-items: center; - justify-content: center; - width: 100rpx; - height: 100%; - text{ - width: 20rpx; - height: 20rpx; - border-left: 2rpx solid #555555; - border-bottom: 2rpx solid #555555; - transform: rotate(45deg); - } - } - .title{ - display: flex; - align-items: center; - text{ - font-size: 28rpx; - color: #222222; - } - } - .more-icon{ - position: absolute; - right: 0; - top: 0; - /* #ifdef APP-PLUS */ - right: 0rpx; - padding-top: var(--status-bar-height); - /* #endif */ - /* #ifdef MP */ - right: 220rpx; - padding-top: 20rpx; - /* #endif */ - display: flex; - align-items: center; - height: 100%; - .icon-list{ - display: flex; - align-items: center; - justify-content: center; - width: 80rpx; - height: 100%; - text{ - font-size: 34rpx; - color: #222222; - } - } - } -} /* 订单tab */ .order-tab{ position: fixed; left: 0; - top: 100rpx; + top: 88rpx; /* #ifdef APP-PLUS */ top: calc(50rpx + var(--status-bar-height)); /* #endif */ @@ -228,8 +154,8 @@ display: flex; align-items: center; width: 100%; - height: 100rpx; - background-color: #FFFFFF; + height: 90rpx; + background: rgb(35, 96, 48); .tab{ position: relative; display: flex; @@ -239,12 +165,13 @@ height: 80%; text{ font-size: 26rpx; - color: #959595; + color: #4D9A5E; } } .action{ text{ - color: #222222; + color: #fff; + font-weight: bold; } .line{ position: absolute; @@ -252,7 +179,8 @@ bottom: 0; width: 60rpx; height: 6rpx; - background: linear-gradient(to right,$base,#f6f6f6); + background: #fff; + border-radius:3px; transform: translate(-50%,0); } } @@ -260,15 +188,14 @@ /* 订单列表 */ .order-list{ - width: 100%; - margin-top: 250rpx; - text-align: center; + margin:0 24rpx; + margin-top:110rpx; /* #ifdef APP-PLUS */ margin-top: calc(170rpx + var(--status-bar-height)); /* #endif */ .list{ padding: 0 4%; - min-height: 400rpx; + min-height: 390rpx; background-color: #FFFFFF; border-radius: 20rpx; margin-bottom: 20rpx; @@ -277,14 +204,14 @@ align-items: center; justify-content: space-between; width: 100%; - height: 100rpx; + height: 80rpx; + border-bottom: 1px solid #eaeaee; .title{ display: flex; align-items: center; text{ font-size: 26rpx; - font-weight: bold; - color: #222222; + color: gray; } } .status{ @@ -294,23 +221,21 @@ font-size: 26rpx; color: $base; } - .del{ - padding: 10rpx; - font-size: 34rpx; - color: #222222; - background-color: #f6f6f6; - border-radius: 100%; - margin-left: 20rpx; - } + } } .goods-list{ width: 100%; + .cangku{ + text-align: left; + color:gray; + padding:10rpx 0 0 0; + } .goods{ display: flex; align-items: center; width: 100%; - height: 200rpx; + height: 180rpx; .thumb{ display: flex; align-items: center; @@ -324,11 +249,12 @@ } .item{ display: flex; - align-items: center; - width: 70%; + flex-direction: column; + justify-content: space-around; + margin-left:20rpx; + width: 100%; height: 100%; .goods-name{ - width: 70%; text{ font-size: 26rpx; color: #555555; @@ -337,10 +263,8 @@ .goods-price{ display: flex; align-items: center; - justify-content: flex-end; - width: 30%; text{ - color: #222222; + color: $base; } .min{ font-size: 26rpx; @@ -355,26 +279,38 @@ .status-btn{ display: flex; align-items: center; - justify-content: flex-end; + justify-content: space-between; width: 100%; - height: 100rpx; - .btn{ - padding: 10rpx 30rpx; - border: 2rpx solid #EEEEEE; - border-radius: 100rpx; - margin-left: 20rpx; - text{ - font-size: 26rpx; - color: #555555; - } + .btnGroup{ + display: flex; + align-items: center; + justify-content: space-between; } - .action{ - border: 2rpx solid $base; - text{ - color: $base; - } + .btn{ + background-color: $base; + padding: 10rpx 10rpx; + border-radius: 10rpx; + font-size: 24rpx; + color: #ffffff; + text-align: center; + margin-left:10rpx; + } + } } } +.empty{ + text-align: center; + margin-top:30%; + image{ + width:40%; + height:auto; + } + .emptyText{ + text-align: center; + font-size: 26rpx; + color:gray; + } +} diff --git a/pages/warehouse/sell.vue b/pages/warehouse/sell.vue new file mode 100644 index 0000000..99f09dc --- /dev/null +++ b/pages/warehouse/sell.vue @@ -0,0 +1,316 @@ + + + + +