diff --git a/api/behalfAdmin.js b/api/behalfAdmin.js index 03facbd..6a75488 100644 --- a/api/behalfAdmin.js +++ b/api/behalfAdmin.js @@ -17,3 +17,11 @@ export function behalfAdminOrderList(data) { return request.get("behalf_admin/order_list", data); } +/** + * 订单统计 + * + */ +export function behalfAdminNumber(data) { + return request.get("behalf_admin/number", data); +} + diff --git a/components/addInvoicing/index.vue b/components/addInvoicing/index.vue index 511dc88..b4b350b 100644 --- a/components/addInvoicing/index.vue +++ b/components/addInvoicing/index.vue @@ -331,7 +331,7 @@ }); if(value.receipt_type == '增值税专用发票'){ if (!value.bank_name) return that.$util.Tips({ - title: '请填写开户行' + title: '请填写银行卡号' }); if (!value.bank_code) return that.$util.Tips({ title: '请填写银行账号' diff --git a/pages.json b/pages.json index 936c716..c0f9721 100644 --- a/pages.json +++ b/pages.json @@ -235,10 +235,21 @@ } ,{ - "path" : "pages/replace_replenishment/index", + "path" : "pages/replace_replenishment/replace", "style" : { - "navigationBarTitleText": "代发补货", + "navigationBarTitleText": "代发订单", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ff5c2d", + "navigationBarTextStyle": "white" + } + + }, + { + "path" : "pages/replace_replenishment/replenishment", + "style" : + { + "navigationBarTitleText": "补货订单", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ff5c2d", "navigationBarTextStyle": "white" diff --git a/pages/index/index.vue b/pages/index/index.vue index 12b5b10..1878894 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -277,8 +277,8 @@ - 开户行名称: - 开户银行名称: + @@ -293,8 +293,8 @@ - 开户行: - 银行卡号: + @@ -768,7 +768,7 @@ title: '请输入银行账户姓名' }); if (!value.bank_opening) return that.$util.Tips({ - title: '请输入开户行' + title: '请输入银行卡号' }); if (value.bank_front.length == 0) return that.$util.Tips({ @@ -1639,6 +1639,7 @@ background-color: #d9d9d9; text-align: center; padding-top: 80rpx; + flex-shrink: 0; .content-top_txt { font-size: 18rpx; @@ -1666,6 +1667,7 @@ padding-left: 30rpx; position: relative; padding-top: 80rpx; + flex: 1; .content-right-one { display: flex; @@ -1694,7 +1696,8 @@ height: 70rpx; line-height: 70rpx; border-radius: 20rpx 20rpx; - left: 50%; + right: 50%; + transform: translate(50%, 0); color: #ffffff; background-color: #00a1f1; text-align: center; diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue index 7e48a2a..a4fdcfc 100644 --- a/pages/margin/margin.vue +++ b/pages/margin/margin.vue @@ -49,6 +49,7 @@ paymerchant, marginlist } from '@/api/api.js' +import { Toast } from '../../libs/uniApi' export default { data() { return { @@ -130,7 +131,7 @@ // console.log('用户点击确定'); paymerchant().then((res) => { - + console.log(res); uni.requestPayment({ provider: 'wxpay', orderInfo: res.data @@ -146,12 +147,13 @@ this.$util.Tips({ title: '支付失败' }); - console.log('fail:' + JSON.stringify(err)); } }); }).catch((err) => { - console.log(err) + this.$util.Tips({ + title: err + }); }) } else if (res.cancel) { console.log('用户点击取消'); diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index bb8dee9..9bcae82 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -224,12 +224,12 @@ 供应链批发 - + 代发订单 - + 补货订单 @@ -459,8 +459,8 @@ - 开户行名称: - 开户银行名称: + @@ -476,8 +476,8 @@ - 开户行: - 银行卡号: + @@ -766,7 +766,7 @@ title: '请输入银行账户姓名' }); if (!value.bank_opening) return that.$util.Tips({ - title: '请输入开户行' + title: '请输入银行卡号' }); if (value.bank_front.length == 0) return that.$util.Tips({ diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index 05ac23d..73c15ef 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -525,7 +525,7 @@ category_id: this.cloudList[this.current]?.category_id || "", order: this.type, keyword: this.keyword, - page_num: this.page_num + page: this.page_num }).then(res => { // console.log(res.data.list[0].product_id, this.goodsList[0].product_id) @@ -793,7 +793,7 @@ category_id: this.cloudList[this.current]?.category_id || "", order: this.type, keyword: this.keyword, - page_num: this.page_num + page: this.page_num }).then(res => { this.goodsList = res.data.list diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue index 30ab4e0..9d2cfa0 100644 --- a/pages/nongKe/cloud_entrepot/indexa.vue +++ b/pages/nongKe/cloud_entrepot/indexa.vue @@ -457,7 +457,7 @@ category_id: this.cloudList[this.current].category_id, order: this.type, keyword: this.keyword, - // page_num: this.page_num + // page: this.page_num }).then(res => { this.goodsList = res.data.list diff --git a/pages/replace_replenishment/index.vue b/pages/replace_replenishment/replace.vue similarity index 93% rename from pages/replace_replenishment/index.vue rename to pages/replace_replenishment/replace.vue index 5e74f3d..b797c3c 100644 --- a/pages/replace_replenishment/index.vue +++ b/pages/replace_replenishment/replace.vue @@ -19,26 +19,26 @@ 搜索我的订单 - + 全部 - {{orderData.orderCount+len || 0}} + - + 待发货 {{orderData.noPostage || 0}} - + 待收货 {{orderData.noDeliver || 0}} - + - + @@ -263,6 +263,9 @@ + + 去发货 + 查看详情 @@ -385,7 +388,8 @@ refundList } from '@/api/order.js'; import{ - behalfAdminOrderList + behalfAdminOrderList, + behalfAdminNumber } from "@/api/behalfAdmin.js" import { getUserInfo @@ -424,7 +428,7 @@ presellProList: [], //定金预售订单 presellOrderCount: 0, orderData: {}, //订单详细统计 - orderStatus: -1, //订单状态 + orderStatus: 'all', //订单状态 page: 1, limit: 20, receivingshow: false, @@ -500,16 +504,16 @@ }, methods: { arrlist() { + + // refundList({ + // product_type: 98, + // type: 0, + // page: 1, + // limit: 1500 - refundList({ - product_type: 98, - type: 0, - page: 1, - limit: 1500 - - }).then(res => { - this.len = res.data.list.length - }) + // }).then(res => { + // this.len = res.data.list.length + // }) }, // 后退 returns() { @@ -585,10 +589,8 @@ */ getOrderData: function() { let that = this; - orderData({ - product_type: 98 - }).then(res => { - // console.log(res.data) + behalfAdminNumber().then(res => { + console.log(res.data) that.$set(that, 'orderData', res.data); }) }, @@ -744,20 +746,13 @@ * 切换类型 */ statusClick: function(status) { - - if (status == 5) { - uni.navigateTo({ - url: '/pages/users/refund/list?type=98' - }) - } else { - if (status == this.orderStatus) return; + if (status == this.orderStatus) return; this.orderStatus = status; this.loadend = false; this.loading = false; this.page = 1; this.$set(this, 'orderList', []); this.getOrderList(); - } }, /** * 获取订单列表 @@ -768,56 +763,29 @@ if (that.loading) return; that.loading = true; that.loadTitle = "加载更多"; + // console.log('点击'); + // console.log(that.isReady); if (that.isReady) { that.isReady = false - if (that.orderStatus == -1) { - behalfAdminOrderList({ - page: that.page, - limit: that.limit, - }).then(res => { - that.isReady = true; - let list = res.data.list || []; - let loadend = list.length < that.limit; - // console.log(that.orderList) - that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that - .orderList); - that.$set(that, 'orderList', that.orderList); - // console.log(that.orderList) - that.getProductCount(); - that.loadend = loadend; - that.loading = false; - that.loadTitle = loadend ? "我也是有底线的" : '加载更多'; - that.page = that.page + 1 - }) - } else { - let arr; - if (that.orderStatus > -1) { - arr = that.orderStatus - } else { - arr = '' - } - getOrderList({ - status: arr, - page: that.page, - limit: that.limit, - product_type: 98 - }).then(res => { - let list = res.data.list || []; - let loadend = list.length < that.limit; - that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that - .orderList); - that.$set(that, 'orderList', that.orderList); - that.getProductCount(); - that.loadend = loadend; - that.loading = false; - that.loadTitle = loadend ? "我也是有底线的" : '加载更多'; - that.page = that.page + 1; - that.isReady = true; - }).catch(err => { - that.loading = false; - that.loadTitle = "加载更多"; - }) - } + behalfAdminOrderList({ + page: that.page, + limit: that.limit, + status: that.orderStatus + }).then(res => { + let list = res.data.list || []; + let loadend = list.length < that.limit; + // console.log(that.orderList) + that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that + .orderList); + that.$set(that, 'orderList', that.orderList); + // console.log(that.orderList) + that.getProductCount(); + that.loadend = loadend; + that.loading = false; + that.loadTitle = loadend ? "我也是有底线的" : '加载更多'; + that.page = that.page + 1; + that.isReady = true; + }) } }, /** @@ -1327,4 +1295,10 @@ font-size: 23rpx; } } + + .all{ + display: flex; + align-items: center; + + } \ No newline at end of file diff --git a/pages/replace_replenishment/replenishment.vue b/pages/replace_replenishment/replenishment.vue new file mode 100644 index 0000000..b2acd96 --- /dev/null +++ b/pages/replace_replenishment/replenishment.vue @@ -0,0 +1,197 @@ + + + \ No newline at end of file diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue index 147faab..eb10b4b 100644 --- a/pages/users/embody/embody.vue +++ b/pages/users/embody/embody.vue @@ -51,10 +51,10 @@ 当前可提现金额: ￥{{extract_money}},冻结佣金：￥{{userInfo.lock_brokerage}} + class="price">￥{{extract_money}}, 冻结金额: ￥{{lock_money}} - 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 + 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额 @@ -92,10 +92,10 @@ 当前可提现金额: ￥{{extract_money}},冻结佣金：￥{{userInfo.lock_brokerage}} + class="price">￥{{extract_money}},冻结金额: ￥{{lock_money}} - 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 + 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额 @@ -141,11 +141,11 @@ 当前可提现金额: ￥{{extract_money}},冻结佣金：￥{{userInfo.lock_brokerage}} - - - 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 - + class="price">￥{{extract_money}}, 冻结金额: ￥{{lock_money}} + + + 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额 + @@ -194,6 +194,8 @@ data() { return { extract_money:"", + lock_money: "", + lock_time: "", mode: { bank_address: "", bank_code: "", @@ -279,6 +281,8 @@ this.mode.bank_name = res.data.financial_bank_bank this.mode.bank_address = res.data.financial_bank_branch this.extract_money=res.data.extract_money + this.lock_money = res.data.lock_money + this.lock_time = res.data.lock_time console.log(this.extract_money) } catch (err) { //TODO handle the exception diff --git a/pages/users/user_invoice_form/index.vue b/pages/users/user_invoice_form/index.vue index d38bd44..4dccdf4 100644 --- a/pages/users/user_invoice_form/index.vue +++ b/pages/users/user_invoice_form/index.vue @@ -208,7 +208,7 @@ } if(this.receipt_type == 2){ if (!formData.bank_name) return this.$util.Tips({ - title: '请输入开户行' + title: '请输入银行卡号' }); if (!formData.bank_code) return this.$util.Tips({