From 8ea2db50f9a841629f7b2fe1c794f272a21c5a7f Mon Sep 17 00:00:00 2001 From: zdx <731335498@qq.com> Date: Tue, 29 Dec 2020 17:16:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=89=8D=E5=A4=87?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/home.js | 25 + app.json | 5 + components/company/activeList/activeList.js | 2 +- components/company/noticeList/noticeList.js | 46 +- pages/home/index.js | 24 +- pages/shortVideo/index.js | 2 +- pages/user/companyMine/companyOrder.js | 114 ++++- pages/user/companyMine/companyOrder.wxml | 61 ++- pages/user/companyMine/companyOrder.wxss | 97 +++- pages/user/companyMine/companyOrder1 (2).js | 108 ---- pages/user/companyMine/companyOrder1 (2).wxml | 54 -- pages/user/companyMine/companyOrder1 (2).wxss | 154 ------ .../projectDetail/projectDetail.js | 136 +++++ .../projectDetail/projectDetail.json | 6 + .../projectDetail/projectDetail.wxml | 140 ++++++ .../projectDetail/projectDetail.wxss | 467 ++++++++++++++++++ .../projectDetailFunds/projectDetailFunds.js | 56 +++ .../projectDetailFunds.json | 6 + .../projectDetailFunds.wxml | 64 +++ .../projectDetailFunds.wxss | 467 ++++++++++++++++++ .../user/companyMine/projectPay/projectPay.js | 76 +++ .../projectPay.json} | 2 +- .../companyMine/projectPay/projectPay.wxml | 41 ++ .../companyMine/projectPay/projectPay.wxss | 116 +++++ .../projectRefund/mall_refund.wxml | 87 ++++ .../projectRefund/projectRefund.js | 131 +++++ .../projectRefund/projectRefund.json | 6 + .../projectRefund/projectRefund.wxml | 89 ++++ .../projectRefund/projectRefund.wxss | 223 +++++++++ .../user/companyMine/refundInfo/refundInfo.js | 27 + .../companyMine/refundInfo/refundInfo.json | 6 + .../companyMine/refundInfo/refundInfo.wxml | 24 + .../companyMine/refundInfo/refundInfo.wxss | 69 +++ project.config.json | 186 ++++--- static/images/wl.png | Bin 0 -> 10332 bytes 35 files changed, 2658 insertions(+), 459 deletions(-) delete mode 100644 pages/user/companyMine/companyOrder1 (2).js delete mode 100644 pages/user/companyMine/companyOrder1 (2).wxml delete mode 100644 pages/user/companyMine/companyOrder1 (2).wxss create mode 100644 pages/user/companyMine/projectDetail/projectDetail.js create mode 100644 pages/user/companyMine/projectDetail/projectDetail.json create mode 100644 pages/user/companyMine/projectDetail/projectDetail.wxml create mode 100644 pages/user/companyMine/projectDetail/projectDetail.wxss create mode 100644 pages/user/companyMine/projectDetailFunds/projectDetailFunds.js create mode 100644 pages/user/companyMine/projectDetailFunds/projectDetailFunds.json create mode 100644 pages/user/companyMine/projectDetailFunds/projectDetailFunds.wxml create mode 100644 pages/user/companyMine/projectDetailFunds/projectDetailFunds.wxss create mode 100644 pages/user/companyMine/projectPay/projectPay.js rename pages/user/companyMine/{companyOrder1 (2).json => projectPay/projectPay.json} (71%) create mode 100644 pages/user/companyMine/projectPay/projectPay.wxml create mode 100644 pages/user/companyMine/projectPay/projectPay.wxss create mode 100644 pages/user/companyMine/projectRefund/mall_refund.wxml create mode 100644 pages/user/companyMine/projectRefund/projectRefund.js create mode 100644 pages/user/companyMine/projectRefund/projectRefund.json create mode 100644 pages/user/companyMine/projectRefund/projectRefund.wxml create mode 100644 pages/user/companyMine/projectRefund/projectRefund.wxss create mode 100644 pages/user/companyMine/refundInfo/refundInfo.js create mode 100644 pages/user/companyMine/refundInfo/refundInfo.json create mode 100644 pages/user/companyMine/refundInfo/refundInfo.wxml create mode 100644 pages/user/companyMine/refundInfo/refundInfo.wxss create mode 100644 static/images/wl.png diff --git a/apis/interfaces/home.js b/apis/interfaces/home.js index bb9cf4a..21c21c3 100644 --- a/apis/interfaces/home.js +++ b/apis/interfaces/home.js @@ -153,8 +153,29 @@ const signed = (active_id) => req({ method: "POST" }) +// 获取项目订单 +const orderList = (url, page) => req({ + url: url, + data: { + page: page + } +}) + +//订单-详情 +const getOrderInfo = (orderId) => req({ + url: "crowdorders/" + orderId +}) +// 退款售后详情 +const getRefundInfo = (refundId) => req({ + url: "refunds/" + refundId +}) + +// 退款进度查询 +const getRefundLogsInfo = (refundId) => req({ + url: "refunds/" + refundId + '/logs' +}) export default ({ @@ -178,4 +199,8 @@ export default ({ users, // 更多员工列表 userActives, //活动列表 signed, //活动签到 + orderList, //获取项目订单 + getOrderInfo, //根id 获取订单详情 + getRefundInfo, //根id 获取退款详情 + getRefundLogsInfo,//退款进度查询 }) \ No newline at end of file diff --git a/app.json b/app.json index 2d38440..1a2cebf 100644 --- a/app.json +++ b/app.json @@ -32,6 +32,11 @@ "pages/user/companyMine/myActives/myActives", "pages/user/companyMine/focusedProject/focusedProject", "pages/user/companyMine/companyOrder", + "pages/user/companyMine/projectPay/projectPay", + "pages/user/companyMine/projectRefund/projectRefund", + "pages/user/companyMine/projectDetailFunds/projectDetailFunds", + "pages/user/companyMine/refundInfo/refundInfo", + "pages/user/companyMine/projectDetail/projectDetail", "pages/home/index", "pages/home/companyInfo/companyInfo", "pages/home/noticeDetail/noticeDetail", diff --git a/components/company/activeList/activeList.js b/components/company/activeList/activeList.js index 69ccd2e..8781d8b 100644 --- a/components/company/activeList/activeList.js +++ b/components/company/activeList/activeList.js @@ -34,7 +34,7 @@ Component({ */ actives(){ if(this.data.has_more){ - wx.$api.companyModule.actives('company',this.data.company_id,this.data.page).then(res=>{ + wx.$api.companyModule.actives('company',wx.getStorageSync('company_id'),this.data.page).then(res=>{ console.log(res) if(res.page.has_more){ this.setData({ diff --git a/components/company/noticeList/noticeList.js b/components/company/noticeList/noticeList.js index 8ae19d5..6ed0eeb 100644 --- a/components/company/noticeList/noticeList.js +++ b/components/company/noticeList/noticeList.js @@ -11,10 +11,10 @@ Component({ * 组件的初始数据 */ data: { - lists:[],//列表 - company_id:wx.getStorageSync('company_id'), - page:1, - has_more:true, + lists: [], //列表 + company_id: wx.getStorageSync('company_id'), + page: 1, + has_more: true, }, /** @@ -24,34 +24,34 @@ Component({ /** * 跳转到详情 */ - toUrl(e){ + toUrl(e) { wx.navigateTo({ - url: '/pages/home/noticeDetail/noticeDetail?id='+e.currentTarget.dataset.id, + url: '/pages/home/noticeDetail/noticeDetail?id=' + e.currentTarget.dataset.id, }) }, /** * 企业活动列表 */ - actives(){ - if(this.data.has_more){ - wx.$api.companyModule.dynamics(this.data.company_id,this.data.page).then(res=>{ + actives() { + if (this.data.has_more) { + wx.$api.companyModule.dynamics(wx.getStorageSync('company_id'), this.data.page).then(res => { console.log(res) - if(res.page.has_more){ + var lists = this.data.lists.concat(res.data); + if (res.page.has_more) { this.setData({ - has_more:true, - page:this.data.page+1, - }) - }else{ - this.setData({ - has_more:false - }) - } - var lists=this.data.lists.concat(res.data); - this.setData({ - lists:lists + has_more: true, + page: this.data.page + 1, }) + } else { + this.setData({ + has_more: false + }) + } + this.setData({ + lists: lists }) - } + }) + } } } -}) +}) \ No newline at end of file diff --git a/pages/home/index.js b/pages/home/index.js index efdf1dc..656ce8c 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -5,13 +5,21 @@ Page({ */ data: { selectMenuId: 0, //默认是企业信息0 视频1 活动2 项目筹集3 - company_id: wx.getStorageSync('company_id'), //企业Id, + company_id: '', //企业Id, info: '', //企业信息 loaded: false }, - onLoad(e) {}, - onShow() { - this.company(wx.getStorageSync('company_id')) + onLoad(e) { + var that = this + wx.getStorage({ + key: 'company_id', + success(res) { + that.company(e.companyId) + that.setData({ + company_id:res.data + }) + } + }) }, onUnload: function () { wx.removeStorageSync('company_id') @@ -55,19 +63,19 @@ Page({ /** * 请求项目筹集分类接口 */ - company() { + company(id) { wx.showLoading({ title: 'title', mask: 'true' }) - wx.$api.companyModule.company(this.data.company_id, this.data.page).then(res => { + wx.$api.companyModule.company(id, this.data.page).then(res => { this.setData({ info: res, loaded: true, }) wx.hideLoading({}) }).catch(res => { - if(res.status_code=='404'){ + if (res.status_code == '404') { // this.company(wx.getStorageSync('company_id')) } }) @@ -86,7 +94,7 @@ Page({ */ goMall(e) { console.log('1111') - wx.navigateTo({ + wx.switchTab({ url: '/pages/mall/index', }) } diff --git a/pages/shortVideo/index.js b/pages/shortVideo/index.js index 663caa9..e62b2a6 100644 --- a/pages/shortVideo/index.js +++ b/pages/shortVideo/index.js @@ -78,7 +78,7 @@ Page({ */ goCompany(e) { wx.navigateTo({ - url: '/pages/home/index' , + url: '/pages/home/index?companyId='+e.currentTarget.dataset.id , }) wx.setStorageSync('company_id', e.currentTarget.dataset.id) } diff --git a/pages/user/companyMine/companyOrder.js b/pages/user/companyMine/companyOrder.js index ad3f62e..d398546 100644 --- a/pages/user/companyMine/companyOrder.js +++ b/pages/user/companyMine/companyOrder.js @@ -5,23 +5,125 @@ Page({ * 页面的初始数据 */ data: { - type: 0, //全部0 待付款1 待发货2 待收货3 退款/售后4 - company_id:wx.getStorageSync('company_id') + state: 'index', //全部index 待付款unpaid 待发货 paid 待收货delive 退款/售后refund + lists: [], //列表 + page: 1, + has_more: true, }, onLoad() { - + this.orderList(); }, /** * 点击按钮触发事件 */ menuSelect: function (e) { - console.log(e.currentTarget.dataset.id); - if (this.data.type != e.currentTarget.dataset.id) { + if (this.data.state != e.currentTarget.dataset.state) { this.setData({ - type: e.currentTarget.dataset.id + state: e.currentTarget.dataset.state, + page: 1, + lists: [], + has_more: true + }) + this.orderList() + } + }, + // 全部index 待付款 unpaid 待发货 paid 待收货 delive 退款/售后 refund + orderList() { + var url = 'crowdorders' + if (this.data.state == 'index') { + url = 'crowdorders' + } else if (this.data.state == 'unpaid') { + url = 'crowdorders/unpaid' + } else if (this.data.state == 'paid') { + url = 'crowdorders/paid' + } else if (this.data.state == 'delive') { + url = 'crowdorders/delivered ' + } else if (this.data.state == 'refund') { + url = 'refunds/crowdfunds' + } + wx.$api.companyModule.orderList(url, this.data.page).then(res => { + console.log(res) + setTimeout(() => { + wx.hideLoading({}) + }, 1000); + var lists = this.data.lists.concat(res.data) + if (res.page.has_more) { + this.setData({ + has_more: res.page.has_more, + page: this.data.page + 1, + lists: lists + }) + } else { + this.setData({ + has_more: res.page.has_more, + lists: lists + }) + } + }) + }, + // 触底加载更多 + onReachBottom() { + if (this.data.has_more) { + this.orderList(); + } else { + wx.showToast({ + icon: 'none', + title: '没有更多', }) } }, + /** + * 订单支付 + */ + orderPay(e) { + let orderId = e.currentTarget.dataset.orderid + wx.navigateTo({ + url: './projectPay/projectPay?orderid=' + orderId, + }) + }, + + /** + * 取消订单 + */ + orderDelete(e) { + wx.showModal({ + title: '提示', + content: '是否确认取消订单', + success: res => { + if (res.confirm) { + wx.showLoading({ + title: '取消中', + }) + let orderId = e.currentTarget.dataset.orderid + wx.$api.order.cancel(orderId).then(res => { + // 获取列表 + this.setData({ + lists: [], + has_more: true, + page: 1 + }) + this.orderList() + }) + } + } + }) + }, + + /** + * 签收订单 + */ + orderSign(e) { + let orderId = e.currentTarget.dataset.orderid + wx.$api.order.sign(orderId).then(res => { + // 获取列表 + this.setData({ + lists: [], + has_more: true, + page: 1 + }) + this.orderList() + }) + }, }) \ No newline at end of file diff --git a/pages/user/companyMine/companyOrder.wxml b/pages/user/companyMine/companyOrder.wxml index 62557c5..359d76c 100644 --- a/pages/user/companyMine/companyOrder.wxml +++ b/pages/user/companyMine/companyOrder.wxml @@ -1,36 +1,57 @@ - 全部 + 全部 - + 待付款 - + 待发货 - + 待收货 - + 退款/售后 - - - 2020-11-22 13:30:00 待付款 - - - - 亲自跑到义乌，待会今年就新鲜上线亲自跑到义乌，待会今年就新鲜上线￥60.00 - 小饼干*4 + + + + {{item.created_at}} {{item.state_text}} + + + + {{item.items[0].title}}￥{{item.items[0].price}} + + {{item.items[0].value}} x {{item.items[0].qty}} + + + + 共 {{item.items[0].qty}} 件商品 实付:￥ {{item.items[0].price}} + + 项目结束时间：{{item.crowdfund_end_at}} - - 共1件商品 实付:￥202.00 - 项目结束时间：2020-10-29 + + 取消订单 + + 立即付款 + 立即签收 + + 订单详情 + 订单详情(退) + 申请退款 - - 取消订单 - 立即付款 - + + + + + 暂无订单 \ No newline at end of file diff --git a/pages/user/companyMine/companyOrder.wxss b/pages/user/companyMine/companyOrder.wxss index 9d81f53..24f941a 100644 --- a/pages/user/companyMine/companyOrder.wxss +++ b/pages/user/companyMine/companyOrder.wxss @@ -1,9 +1,17 @@ +page { + padding-top: 100rpx; +} + /* 滚动菜单 */ .scroll_menu { background-color: #fff; box-shadow: 0 0rpx 10px rgba(0, 0, 0, 0.1); font-size: 28rpx; margin-bottom: 20rpx; + position: fixed; + top: 0; + left: 0; + width: 100%; } .scroll-view_H { @@ -34,6 +42,7 @@ /* 列表 */ .lists { background-color: #fff; + margin-top: 10rpx; } .top { @@ -42,8 +51,8 @@ } .top image { - width: 150rpx; - height: 150rpx; + width: 90rpx; + height: 90rpx; border-radius: 10rpx; } @@ -55,6 +64,8 @@ align-items: center; box-sizing: border-box; padding: 20rpx 30rpx; + font-size: 26rpx; + color: #999; } .top .ctime span { @@ -84,4 +95,86 @@ text-overflow: ellipsis; white-space: nowrap; width: 400rpx; +} + +.top .mt10 { + margin-top: 10rpx; +} + +.top .title .num { + font-size: 32rpx; + color: #333; + font-weight: 600; +} + +.total { + display: flex; + flex-direction: column; + justify-content: flex-end; + align-items: flex-end; + box-sizing: border-box; + font-size: 24rpx; + padding: 10rpx 30rpx; + border-bottom: solid 1rpx #f9f9f9; +} + +.total .num { + color: #000; + font-weight: 600; +} + +.total .time { + color: #999; + font-weight: normal; + margin-top: 10rpx; +} + +.bottom { + display: flex; + flex-direction: row; + justify-content: flex-end; + align-items: center; + box-sizing: border-box; + padding: 20rpx 30rpx; + font-size: 26rpx; +} + +.bottom .pay { + background-color: #378fff; + color: #fff; + padding: 10rpx 30rpx; + border-radius: 50rpx; + margin-left: 10rpx; +} + +.bottom .cancel { + background-color: #f9f9f9; + color: #333; + padding: 10rpx 30rpx; + border-radius: 50rpx; + margin-left: 10rpx; +} + +.bottom .sign { + background-color: #3677a5; + color: #fff; + padding: 10rpx 30rpx; + margin-left: 10rpx; + border-radius: 50rpx; +} + +.bottom .refund { + background-color: #227586; + color: #fff; + padding: 10rpx 30rpx; + margin-left: 10rpx; + border-radius: 50rpx; +} + +.bottom .detail { + background-color: #246cb6; + color: #fff; + padding: 10rpx 30rpx; + margin-left: 10rpx; + border-radius: 50rpx; } \ No newline at end of file diff --git a/pages/user/companyMine/companyOrder1 (2).js b/pages/user/companyMine/companyOrder1 (2).js deleted file mode 100644 index c5230ab..0000000 --- a/pages/user/companyMine/companyOrder1 (2).js +++ /dev/null @@ -1,108 +0,0 @@ -/* - * 手太欠 - * 企获客商城 - */ - -const app = getApp() -Page({ - - /** - * 页面的初始数据 - */ - data: { - stateType : 'all', //订单类型 - orderArr : [], //订单列表 - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad (options) {}, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - if(wx.getStorageSync("token") == ""){ - wx.navigateTo({ - url: '/pages/login/login' - }) - return - } - - // 获取订单列表 - this.orderInfo() - }, - - /** - * 订单tab - */ - orderTab(e){ - this.setData({ - stateType: e.currentTarget.dataset.state - }) - this.orderInfo() - }, - - /** - * 订单列表 - */ - orderInfo(){ - let stateType = this.data.stateType - - if(stateType == 'all') { - wx.$api.order.index().then(res=>{ - this.setData({ - orderArr : res.data - }) - }) - } else if(stateType == 'unpaid') { - wx.$api.order.unpaid().then(res=>{ - this.setData({ - orderArr : res.data - }) - }) - } else if(stateType == 'paid') { - wx.$api.order.paid().then(res=>{ - this.setData({ - orderArr : res.data - }) - }) - } else if(stateType == 'delive') { - wx.$api.order.delive().then(res=>{ - this.setData({ - orderArr : res.data - }) - }) - } else if(stateType == 'refunds') { - wx.$api.order.refund().then(res=>{ - this.setData({ - orderArr : res.data - }) - }) - } - - }, - - /** - * 订单支付 - */ - orderPay(e){ - let orderId = e.currentTarget.dataset.orderid - wx.navigateTo({ - url: '/pages/mall/mall_pay/mall_pay?orderid=' + orderId, - }) - - }, - - /** - * 取消订单 - */ - orderDelete(e) { - let orderId = e.currentTarget.dataset.orderid - wx.$api.orders.cancel(orderId).then(res=>{ - // 获取列表 - this.orderInfo() - }) - }, -}) \ No newline at end of file diff --git a/pages/user/companyMine/companyOrder1 (2).wxml b/pages/user/companyMine/companyOrder1 (2).wxml deleted file mode 100644 index c9599bf..0000000 --- a/pages/user/companyMine/companyOrder1 (2).wxml +++ /dev/null @@ -1,54 +0,0 @@ - - - - 全部 - - - 待支付 - - - 待发货 - - - 待收货 - - - 已完成 - - - - - - - - {{goods.orderid}} - - - - {{goods.state_text}} - - - - - - {{item.title}} - - ¥{{item.price}} - 共{{item.qty}}件 - - - - - 立即支付 - 取消订单 - 订单详情 - - - - - - - 暂无订单 - \ No newline at end of file diff --git a/pages/user/companyMine/companyOrder1 (2).wxss b/pages/user/companyMine/companyOrder1 (2).wxss deleted file mode 100644 index 9ed17b8..0000000 --- a/pages/user/companyMine/companyOrder1 (2).wxss +++ /dev/null @@ -1,154 +0,0 @@ - -page { - background-color: #eee; -} - -/* 订单tab */ -.order-tab{ - position: fixed; - left: 0; - top: 0; - width: 100%; - display: flex; - height: 80rpx; - line-height: 80rpx; - z-index: 9; - background: white; -} - -.order-tab-item{ - font-size: 28rpx; - width: 20%; - text-align: center; - border-bottom: solid 2rpx #f7f7f7; - color: #464854; - background: white; - position: relative; -} - -.order-tab-item:after { - position: absolute; - content: ''; - left: calc(50% - 30rpx); - bottom: 0; - background-color: transparent; - width: 60rpx; - height: 8rpx; - border-radius: 50rpx; - color: #666666; -} - -.order-tab-item.active{ - color:#000; - font-weight: 600; -} - -.order-tab-item.active:after { - background-color: #378fff; -} - -/* 订单列表 */ -.order-content{ - border-bottom: solid 100rpx transparent; - padding: 80rpx 0 20rpx 0; -} - -.order-list { - background-color: white; - margin: 30rpx 0; -} - -.order-company { - display: flex; - line-height: 50rpx; - margin-bottom: 20rpx; - padding: 20rpx 30rpx; - box-sizing: border-box; -} - -.order-company-name { - font-weight: 600; - flex: 1; - display: flex; -} - -.order-logo { - width: 50rpx; - height: 50rpx; - margin-right: 20rpx; -} - -.order-arrow { - width: 28rpx; - height: 28rpx; - margin: 10rpx 0 10rpx 20rpx; -} - -.order-company-state { - color: #378fff; -} - -.order-goods { - position: relative; - padding: 0 30rpx; - box-sizing: border-box; -} - -.order-goods-img { - width: 160rpx; - height: 160rpx; - border-radius: 10rpx; -} - -.order-goods-text { - position: absolute; - padding-left: 220rpx; - padding-right: 30rpx; - right: 0; - top: 0; - left: 0; - width: 100%; - box-sizing: border-box; -} - -.order-goods-name { - height: 80rpx; - margin-bottom: 30rpx; -} - -.order-goods-price { - display: flex; - font-size: 28rpx; - color: #999999; -} - -.order-goods-price text { - flex: 1; - display: block; - font-size: 32rpx; - color: #000; -} - -.order-footer { - border-top: 2rpx solid #eee; - margin-top: 20rpx; - padding: 30rpx; - overflow: hidden; -} - -.order-footer-btn { - margin-left: 20rpx; - height: 60rpx; - line-height: 56rpx; - box-sizing: border-box; - border: solid 1rpx #dddddd; - padding: 0 20rpx; - font-size: 26rpx; - border-radius: 40rpx; - float: right; -} - -.order-footer-btn-back { - border-color: #378fff; - color: #378fff; -} diff --git a/pages/user/companyMine/projectDetail/projectDetail.js b/pages/user/companyMine/projectDetail/projectDetail.js new file mode 100644 index 0000000..190b771 --- /dev/null +++ b/pages/user/companyMine/projectDetail/projectDetail.js @@ -0,0 +1,136 @@ +/* + * 手太欠 + * 企获客商城 + */ + +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + logisticsPop: false, //物流弹出框状态 + orderData: '', //商品详情 + orderId: '' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.setData({ + orderId: options.orderId + }) + this.orderData(options.orderId) + }, + + /** + * 订单详情 + */ + orderData(orderId) { + wx.$api.companyModule.getOrderInfo(orderId).then(res => { + console.log(res) + this.setData({ + orderData: res + }) + }) + }, + + /** + * 物流弹出 + */ + logisticsShow() { + this.setData({ + logisticsPop: !this.data.logisticsPop + }) + }, + + /** + * 物流隐藏 + */ + logisticsHide() { + this.setData({ + logisticsPop: !this.data.logisticsPop + }) + }, + + /** + * 返回订单 + */ + orderRun() { + wx.navigateBack({ + delta: 1, + }) + }, + + /** + * 订单支付 + */ + orderPay(e) { + let orderId = e.currentTarget.dataset.orderid + wx.navigateTo({ + url: '../projectPay/projectPay?orderid=' + orderId, + }) + }, + + /** + * 取消订单 + */ + orderDelete(e) { + let orderId = e.currentTarget.dataset.orderid + wx.showModal({ + title: '提示', + content: '是否确认取消订单', + success: res => { + if (res.confirm) { + wx.showLoading({ + title: '取消中', + }) + wx.$api.order.cancel(orderId).then(res => { + console.log(res); + wx.showToast({ + title: '取消成功', + icon:'none', + duration:1000 + }) + setTimeout(() => { + this.orderData(this.data.orderId) + }, 1000); + }) + } + } + }) + }, + + + /** + * 签收订单 + */ + orderSign(e) { + let orderId = e.currentTarget.dataset.orderid + wx.showModal({ + title: '提示', + content: '是否确认签收订单', + success: res => { + if (res.confirm) { + wx.showLoading({ + title: '签收中', + }) + wx.$api.order.sign(orderId).then(res => { + console.log(res); + wx.showToast({ + title: '签收成功', + icon:'none', + duration:1000 + }) + setTimeout(() => { + this.orderData(this.data.orderId) + }, 1000); + }) + } + } + }) + + }, +}) \ No newline at end of file diff --git a/pages/user/companyMine/projectDetail/projectDetail.json b/pages/user/companyMine/projectDetail/projectDetail.json new file mode 100644 index 0000000..107724e --- /dev/null +++ b/pages/user/companyMine/projectDetail/projectDetail.json @@ -0,0 +1,6 @@ +{ + "usingComponents" : {}, + "navigationBarTitleText" : "订单详情", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#378fff" +} \ No newline at end of file diff --git a/pages/user/companyMine/projectDetail/projectDetail.wxml b/pages/user/companyMine/projectDetail/projectDetail.wxml new file mode 100644 index 0000000..ec39a89 --- /dev/null +++ b/pages/user/companyMine/projectDetail/projectDetail.wxml @@ -0,0 +1,140 @@ + + + + {{orderData.state_text}} + + + + + + {{orderData.express.name}}{{orderData.express.mobile}} + + + + + {{orderData.express.address}} + + + + + {{orderData.created_at}} {{orderData.state_text}} + + + + {{orderData.items[0].title}}￥{{orderData.items[0].price}} + + {{orderData.items[0].value}} x {{orderData.items[0].qty}} + + + + 共 {{orderData.items[0].qty}} 件商品 实付:￥ + {{orderData.items[0].price}} + + 项目结束时间：{{orderData.crowdfund_end_at}} + + 应付￥{{orderData.items[0].price}} + + 实付￥{{orderData.items[0].price}} + + + + + 订单详情 + {{orderData.orderid}} + {{orderData.created_at}} + {{orderData.paid_at}} + {{orderData.deliver_at}} + {{orderData.receive_at}} + {{orderData.remark || '暂无'}} + + + 物流信息 + {{orderData.express.company}} + {{orderData.express.number}} + + + + + + + + + 取消订单 + + + 立即支付 + + + 立即签收 + + 申请退款 + + 返回订单 + + + + + + + + + + + + 收货地址：黑龙江省哈尔滨市测试区域测试地址123 + + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】 + + + 您的快件由【青岛】准备发往【上海】111 + + + \ No newline at end of file diff --git a/pages/user/companyMine/projectDetail/projectDetail.wxss b/pages/user/companyMine/projectDetail/projectDetail.wxss new file mode 100644 index 0000000..62c3b3b --- /dev/null +++ b/pages/user/companyMine/projectDetail/projectDetail.wxss @@ -0,0 +1,467 @@ +/* + * 手太欠 + * 企获客商城 + */ +image { + height: auto; +} + +page { + background-color: #f1f1f1; +} + +.orderData { + border-bottom: solid 110rpx transparent; +} + +/* 订单地址 */ +.orderCont { + margin-top: -30rpx; +} + +.orderSite { + background-color: white; + border-radius: 20rpx; + margin-bottom: 20rpx; + padding: 20rpx 0; +} + +.orderSite-laebl { + display: flex; + padding: 10rpx 30rpx; + box-sizing: border-box; +} + +.orderSite-laebl image { + width: 34rpx; + height: 34rpx; + margin: 4rpx 20rpx 0 0; +} + +.orderSite-laeb-name { + font-weight: 600; +} + +.orderSite-laeb-name text { + padding-left: 30rpx; +} + +.orderSite-laeb-address { + font-size: 28rpx; + color: #666666; +} + +/* 订单商品 */ +.orderGoods, +.orderLabel { + background-color: white; + border-radius: 20rpx; + margin: 20rpx 0; + padding: 20rpx 0; +} + +.orderLabel .title { + font-weight: 600; + padding-left: 30rpx; +} + +.orderGoods { + padding: 30rpx; + box-sizing: border-box; +} + +.orderGoods-company { + display: flex; + line-height: 50rpx; + font-weight: 600; + margin-bottom: 40rpx; +} + +.orderGoods-logo { + width: 50rpx; + height: 50rpx; + margin-right: 20rpx; +} + +.orderGoods-arrow { + width: 28rpx; + height: 28rpx; + margin: 10rpx 0 10rpx 20rpx; +} + +.orderGoods-goods-li { + position: relative; + border-bottom: solid 1rpx #f2f2f2; + min-height: 160rpx; + background: white; +} + +.orderGoods-goods-li:last-child { + border-bottom: none; +} + +.orderGoods-img { + position: absolute; + top: 0; + left: 0; + height: 200rpx; + width: 200rpx; + border-radius: 10rpx; + background: #f5f6fa; +} + +.orderGoods-body { + padding-left: 240rpx; +} + +.orderGoods-params { + font-size: 28rpx; + color: #999999; + margin-top: 10rpx; +} + +.orderGoods-name { + text-emphasis: none; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.orderGoods-price { + color: #e92344; + margin-top: 20rpx; +} + +/* 订单标签 */ + +.order-total { + border-top: 2rpx solid #eee; + border-bottom: 2rpx solid #eee; +} + +.order-total-li { + padding: 20rpx 30rpx; + display: flex; + position: relative; +} + +.order-total-name { + flex: 1; +} + +.order-total-li text { + color: #999; +} + +.coupon-picker-red { + color: #ea4e2f; +} + +.order-input { + padding: 20rpx 30rpx 0 30rpx; + position: relative; + font-size: 28rpx; +} + +/* .order-input label { + width: 220rpx; + position: absolute; + left: 30rpx; + top: 0; + display: flex; + color: #666666; +} */ + +.order-input image { + width: 36rpx; + height: 36rpx; + margin: 24rpx 20rpx 0 0; +} + +.order-input text { + padding-left: 20rpx; + font-size: 28rpx; +} + + +/* 订单状态 */ +.orderBack { + display: flex; + flex-direction: row; + justify-content: start; + align-items: center; + background-image: linear-gradient(to left, #378fff, #378fff); + color: #fff; + text-align: center; + padding: 50rpx 0 70rpx; + font-size: 34rpx; +} + +.orderBack image { + width: 120rpx; + vertical-align: middle; + margin-right: 30rpx; +} + +/* 底部工具栏 */ +.orderFooter { + position: fixed; + bottom: 0; + left: 0; + right: 0; + border-top: solid 1rpx #f2f2f2; + padding-top: 17rpx; + padding-right: 30rpx; + padding-left: 30rpx; + height: 90rpx; + background: white; + display: flex; + flex-wrap: wrap; + flex-direction: row-reverse; +} + +.orderFooter-btn { + margin-left: 20rpx; + height: 60rpx; + line-height: 60rpx; + box-sizing: border-box; + border: solid 1rpx #747788; + padding: 0 20rpx; + font-size: 26rpx; + border-radius: 40rpx; + margin-top: 10rpx; +} + +.orderFooter-btn-back { + border-color: #eb532a; + color: #eb532a; +} + + +/* 物流信息 */ +.logistics-back { + position: fixed; + width: 100%; + height: 100%; + left: 0; + top: 0; + background-color: rgba(0, 0, 0, .7); + z-index: 101; + display: none; +} + +.logistics-back.active { + display: block; +} + +.logistics-cont { + position: fixed; + width: 100%; + background-color: white; + left: 0; + bottom: -100%; + z-index: 102; + border-radius: 20rpx 20rpx 0 0; + padding: 90rpx 30rpx 30rpx; + box-sizing: border-box; + transition: .2s; + height: 40vh; +} + +.logistics-cont.active { + bottom: 0; +} + +.logistics-close { + position: absolute; + right: 20rpx; + top: 20rpx; + z-index: 103; + width: 45rpx; + height: 45rpx; +} + +.logistics-list, +.logistics-title { + position: relative; + padding-left: 80rpx; + padding-right: 20rpx; +} + +.logistics-list::before, +.logistics-title::before { + position: absolute; + left: 30rpx; + top: 0; + content: ""; + width: 2rpx; + height: 100%; + background: #eeeeee; + z-index: 2; +} + +.logistics-list { + height: calc(100% - 80rpx); + overflow-y: scroll; +} + +.logistics-title { + font-size: 30rpx; +} + +.logistics-label { + position: relative; + padding-top: 20rpx; + padding-bottom: 20rpx; + font-size: 26rpx; + color: #aeaeae; + border-bottom: solid 2rpx #f2f2f2; +} + +.logistics-label:nth-child(1) { + color: #000; + font-weight: 600; + font-size: 30rpx; +} + +.logistics-label::before { + position: absolute; + left: -58rpx; + top: calc(50% - 7rpx); + content: ""; + width: 14rpx; + height: 14rpx; + border: solid 2rpx #fff; + background: #c1c1c1; + z-index: 9; + border-radius: 50%; +} + + +.logistics-label:nth-child(1)::before { + border: solid 2rpx #dd3835; + background: #dd3835; +} + + +.logistics-label:nth-child(1)::after { + position: absolute; + left: 0rpx; + top: 0; + content: ""; + width: 2rpx; + height: calc(50% - 7rpx); + background: #fff; + z-index: 3; + border-radius: 50%; +} + +.logistics-title-icon { + width: 60rpx; + height: 60rpx; + border-radius: 50%; + background-color: #dddddd; + position: absolute; + left: 0; + z-index: 102; + top: 0; +} + +.logistics-title-icon image { + width: 34rpx; + height: 34rpx; + margin: 13rpx; +} + +.top { + font-size: 28rpx; + color: #333; +} + +.top image { + width: 90rpx; + height: 90rpx; + border-radius: 10rpx; +} + +.top .ctime { + width: 100%; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + box-sizing: border-box; + padding: 0 0 20rpx 0; + font-size: 26rpx; + color: #999; +} + +.top .ctime span { + color: #666; +} + +.top .content { + padding: 20rpx 0; + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: flex-start; + box-sizing: border-box; +} + +.top .title { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + box-sizing: border-box; +} + +.top .title .title1 { + overflow: hidden; + display: inline-block; + text-overflow: ellipsis; + white-space: nowrap; + width: 400rpx; +} + +.top .mt10 { + margin-top: 10rpx; +} + +.top .title .num { + font-size: 32rpx; + color: #333; + font-weight: 600; +} + +.total { + display: flex; + flex-direction: column; + justify-content: flex-end; + align-items: flex-end; + box-sizing: border-box; + font-size: 24rpx; + padding: 10rpx 0 20rpx 0; + border-bottom: solid 1rpx #f9f9f9; +} + +.total .num { + color: #000; + font-weight: 600; +} + +.total .time { + color: #999; + font-weight: normal; + margin-top: 10rpx; +} + +.pt10 { + padding-top: 20rpx; +} + +.num2 { + color: #000; + font-weight: 400; +} \ No newline at end of file diff --git a/pages/user/companyMine/projectDetailFunds/projectDetailFunds.js b/pages/user/companyMine/projectDetailFunds/projectDetailFunds.js new file mode 100644 index 0000000..362d550 --- /dev/null +++ b/pages/user/companyMine/projectDetailFunds/projectDetailFunds.js @@ -0,0 +1,56 @@ +/* + * 手太欠 + * 企获客商城 + */ + +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + logisticsPop: false, //物流弹出框状态 + orderData: '', //商品详情 + refundId: '' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.setData({ + refundId: options.orderId + }) + this.orderData(options.refundId) + }, + + /** + * 订单详情 + */ + orderData(refundId) { + wx.$api.companyModule.getRefundInfo(refundId).then(res => { + console.log(res) + this.setData({ + orderData: res + }) + }) + }, + /** + * 退款记录 + */ + refunds(e) { + wx.navigateTo({ + url: '/pages/user/companyMine/refundInfo/refundInfo?refundId='+e.currentTarget.dataset.refundid, + }) + }, + /** + * 返回订单 + */ + orderRun() { + wx.navigateBack({ + delta: 1, + }) + }, + +}) \ No newline at end of file diff --git a/pages/user/companyMine/projectDetailFunds/projectDetailFunds.json b/pages/user/companyMine/projectDetailFunds/projectDetailFunds.json new file mode 100644 index 0000000..107724e --- /dev/null +++ b/pages/user/companyMine/projectDetailFunds/projectDetailFunds.json @@ -0,0 +1,6 @@ +{ + "usingComponents" : {}, + "navigationBarTitleText" : "订单详情", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#378fff" +} \ No newline at end of file diff --git a/pages/user/companyMine/projectDetailFunds/projectDetailFunds.wxml b/pages/user/companyMine/projectDetailFunds/projectDetailFunds.wxml new file mode 100644 index 0000000..198abc6 --- /dev/null +++ b/pages/user/companyMine/projectDetailFunds/projectDetailFunds.wxml @@ -0,0 +1,64 @@ + + + + {{orderData.state.remark}} + + + + + + {{orderData.express.name}}{{orderData.express.mobile}} + + + + + {{orderData.express.address}} + + + + + {{orderData.created_at}} {{orderData.state_text}} + + + + {{orderData.items[0].title}}￥{{orderData.items[0].price}} + + {{orderData.items[0].value}} x {{orderData.items[0].qty}} + + + + 共 {{orderData.items[0].qty}} 件商品 实付:￥ + {{orderData.items[0].price}} + + 项目结束时间：{{orderData.order.crowdfund_end_at}} + + 应付￥{{orderData.items[0].price}} + + 实付￥{{orderData.items[0].price}} + + + + + 订单详情 + + {{orderData.orderid}} + + {{orderData.created_at}} + + {{orderData.order.paid_at}} + {{orderData.remark || '暂无'}} + + + + + + + + 返回订单 + + 退款进度 + + diff --git a/pages/user/companyMine/projectDetailFunds/projectDetailFunds.wxss b/pages/user/companyMine/projectDetailFunds/projectDetailFunds.wxss new file mode 100644 index 0000000..62c3b3b --- /dev/null +++ b/pages/user/companyMine/projectDetailFunds/projectDetailFunds.wxss @@ -0,0 +1,467 @@ +/* + * 手太欠 + * 企获客商城 + */ +image { + height: auto; +} + +page { + background-color: #f1f1f1; +} + +.orderData { + border-bottom: solid 110rpx transparent; +} + +/* 订单地址 */ +.orderCont { + margin-top: -30rpx; +} + +.orderSite { + background-color: white; + border-radius: 20rpx; + margin-bottom: 20rpx; + padding: 20rpx 0; +} + +.orderSite-laebl { + display: flex; + padding: 10rpx 30rpx; + box-sizing: border-box; +} + +.orderSite-laebl image { + width: 34rpx; + height: 34rpx; + margin: 4rpx 20rpx 0 0; +} + +.orderSite-laeb-name { + font-weight: 600; +} + +.orderSite-laeb-name text { + padding-left: 30rpx; +} + +.orderSite-laeb-address { + font-size: 28rpx; + color: #666666; +} + +/* 订单商品 */ +.orderGoods, +.orderLabel { + background-color: white; + border-radius: 20rpx; + margin: 20rpx 0; + padding: 20rpx 0; +} + +.orderLabel .title { + font-weight: 600; + padding-left: 30rpx; +} + +.orderGoods { + padding: 30rpx; + box-sizing: border-box; +} + +.orderGoods-company { + display: flex; + line-height: 50rpx; + font-weight: 600; + margin-bottom: 40rpx; +} + +.orderGoods-logo { + width: 50rpx; + height: 50rpx; + margin-right: 20rpx; +} + +.orderGoods-arrow { + width: 28rpx; + height: 28rpx; + margin: 10rpx 0 10rpx 20rpx; +} + +.orderGoods-goods-li { + position: relative; + border-bottom: solid 1rpx #f2f2f2; + min-height: 160rpx; + background: white; +} + +.orderGoods-goods-li:last-child { + border-bottom: none; +} + +.orderGoods-img { + position: absolute; + top: 0; + left: 0; + height: 200rpx; + width: 200rpx; + border-radius: 10rpx; + background: #f5f6fa; +} + +.orderGoods-body { + padding-left: 240rpx; +} + +.orderGoods-params { + font-size: 28rpx; + color: #999999; + margin-top: 10rpx; +} + +.orderGoods-name { + text-emphasis: none; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.orderGoods-price { + color: #e92344; + margin-top: 20rpx; +} + +/* 订单标签 */ + +.order-total { + border-top: 2rpx solid #eee; + border-bottom: 2rpx solid #eee; +} + +.order-total-li { + padding: 20rpx 30rpx; + display: flex; + position: relative; +} + +.order-total-name { + flex: 1; +} + +.order-total-li text { + color: #999; +} + +.coupon-picker-red { + color: #ea4e2f; +} + +.order-input { + padding: 20rpx 30rpx 0 30rpx; + position: relative; + font-size: 28rpx; +} + +/* .order-input label { + width: 220rpx; + position: absolute; + left: 30rpx; + top: 0; + display: flex; + color: #666666; +} */ + +.order-input image { + width: 36rpx; + height: 36rpx; + margin: 24rpx 20rpx 0 0; +} + +.order-input text { + padding-left: 20rpx; + font-size: 28rpx; +} + + +/* 订单状态 */ +.orderBack { + display: flex; + flex-direction: row; + justify-content: start; + align-items: center; + background-image: linear-gradient(to left, #378fff, #378fff); + color: #fff; + text-align: center; + padding: 50rpx 0 70rpx; + font-size: 34rpx; +} + +.orderBack image { + width: 120rpx; + vertical-align: middle; + margin-right: 30rpx; +} + +/* 底部工具栏 */ +.orderFooter { + position: fixed; + bottom: 0; + left: 0; + right: 0; + border-top: solid 1rpx #f2f2f2; + padding-top: 17rpx; + padding-right: 30rpx; + padding-left: 30rpx; + height: 90rpx; + background: white; + display: flex; + flex-wrap: wrap; + flex-direction: row-reverse; +} + +.orderFooter-btn { + margin-left: 20rpx; + height: 60rpx; + line-height: 60rpx; + box-sizing: border-box; + border: solid 1rpx #747788; + padding: 0 20rpx; + font-size: 26rpx; + border-radius: 40rpx; + margin-top: 10rpx; +} + +.orderFooter-btn-back { + border-color: #eb532a; + color: #eb532a; +} + + +/* 物流信息 */ +.logistics-back { + position: fixed; + width: 100%; + height: 100%; + left: 0; + top: 0; + background-color: rgba(0, 0, 0, .7); + z-index: 101; + display: none; +} + +.logistics-back.active { + display: block; +} + +.logistics-cont { + position: fixed; + width: 100%; + background-color: white; + left: 0; + bottom: -100%; + z-index: 102; + border-radius: 20rpx 20rpx 0 0; + padding: 90rpx 30rpx 30rpx; + box-sizing: border-box; + transition: .2s; + height: 40vh; +} + +.logistics-cont.active { + bottom: 0; +} + +.logistics-close { + position: absolute; + right: 20rpx; + top: 20rpx; + z-index: 103; + width: 45rpx; + height: 45rpx; +} + +.logistics-list, +.logistics-title { + position: relative; + padding-left: 80rpx; + padding-right: 20rpx; +} + +.logistics-list::before, +.logistics-title::before { + position: absolute; + left: 30rpx; + top: 0; + content: ""; + width: 2rpx; + height: 100%; + background: #eeeeee; + z-index: 2; +} + +.logistics-list { + height: calc(100% - 80rpx); + overflow-y: scroll; +} + +.logistics-title { + font-size: 30rpx; +} + +.logistics-label { + position: relative; + padding-top: 20rpx; + padding-bottom: 20rpx; + font-size: 26rpx; + color: #aeaeae; + border-bottom: solid 2rpx #f2f2f2; +} + +.logistics-label:nth-child(1) { + color: #000; + font-weight: 600; + font-size: 30rpx; +} + +.logistics-label::before { + position: absolute; + left: -58rpx; + top: calc(50% - 7rpx); + content: ""; + width: 14rpx; + height: 14rpx; + border: solid 2rpx #fff; + background: #c1c1c1; + z-index: 9; + border-radius: 50%; +} + + +.logistics-label:nth-child(1)::before { + border: solid 2rpx #dd3835; + background: #dd3835; +} + + +.logistics-label:nth-child(1)::after { + position: absolute; + left: 0rpx; + top: 0; + content: ""; + width: 2rpx; + height: calc(50% - 7rpx); + background: #fff; + z-index: 3; + border-radius: 50%; +} + +.logistics-title-icon { + width: 60rpx; + height: 60rpx; + border-radius: 50%; + background-color: #dddddd; + position: absolute; + left: 0; + z-index: 102; + top: 0; +} + +.logistics-title-icon image { + width: 34rpx; + height: 34rpx; + margin: 13rpx; +} + +.top { + font-size: 28rpx; + color: #333; +} + +.top image { + width: 90rpx; + height: 90rpx; + border-radius: 10rpx; +} + +.top .ctime { + width: 100%; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + box-sizing: border-box; + padding: 0 0 20rpx 0; + font-size: 26rpx; + color: #999; +} + +.top .ctime span { + color: #666; +} + +.top .content { + padding: 20rpx 0; + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: flex-start; + box-sizing: border-box; +} + +.top .title { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + box-sizing: border-box; +} + +.top .title .title1 { + overflow: hidden; + display: inline-block; + text-overflow: ellipsis; + white-space: nowrap; + width: 400rpx; +} + +.top .mt10 { + margin-top: 10rpx; +} + +.top .title .num { + font-size: 32rpx; + color: #333; + font-weight: 600; +} + +.total { + display: flex; + flex-direction: column; + justify-content: flex-end; + align-items: flex-end; + box-sizing: border-box; + font-size: 24rpx; + padding: 10rpx 0 20rpx 0; + border-bottom: solid 1rpx #f9f9f9; +} + +.total .num { + color: #000; + font-weight: 600; +} + +.total .time { + color: #999; + font-weight: normal; + margin-top: 10rpx; +} + +.pt10 { + padding-top: 20rpx; +} + +.num2 { + color: #000; + font-weight: 400; +} \ No newline at end of file diff --git a/pages/user/companyMine/projectPay/projectPay.js b/pages/user/companyMine/projectPay/projectPay.js new file mode 100644 index 0000000..ef36842 --- /dev/null +++ b/pages/user/companyMine/projectPay/projectPay.js @@ -0,0 +1,76 @@ +/* + * 手太欠 + * 企获客商城 + */ + +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + orderData: '', //订单详情 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + console.log(options.orderid) + this.orderInfo(options.orderid) + }, + + /** + * 订单支付 + */ + orderInfo(orderId) { + wx.$api.order.paymen(orderId).then(res => { + this.setData({ + orderData: res + }) + }) + }, + + /** + * 订单支付 + */ + payment() { + // 获取code + wx.login({ + success: res => { + wx.$api.mall.wechat({ + code: res.code, + trade_no: this.data.orderData.trade_no + }).then(res => { + let payInfo = JSON.parse(res) + wx.requestPayment({ + timeStamp: payInfo.timeStamp, + nonceStr: payInfo.nonceStr, + package: payInfo.package, + paySign: payInfo.paySign, + signType: payInfo.signType, + success: res => { + if (res.errMsg == "requestPayment:ok") { + wx.showToast({ + title: '支付成功', + icon: 'success' + }) + setTimeout(() => { + wx.navigateBack({ + delta: 0, + }) + }, 2000) + } + }, + fail: res => { + wx.navigateBack({ + delta: 0, + }) + } + }) + }) + } + }) + } +}) \ No newline at end of file diff --git a/pages/user/companyMine/companyOrder1 (2).json b/pages/user/companyMine/projectPay/projectPay.json similarity index 71% rename from pages/user/companyMine/companyOrder1 (2).json rename to pages/user/companyMine/projectPay/projectPay.json index 8d21f2a..f2cc8ef 100644 --- a/pages/user/companyMine/companyOrder1 (2).json +++ b/pages/user/companyMine/projectPay/projectPay.json @@ -1,6 +1,6 @@ { "usingComponents": {}, - "navigationBarTitleText": "项目预购", + "navigationBarTitleText": "订单支付", "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#378fff" } \ No newline at end of file diff --git a/pages/user/companyMine/projectPay/projectPay.wxml b/pages/user/companyMine/projectPay/projectPay.wxml new file mode 100644 index 0000000..40ee927 --- /dev/null +++ b/pages/user/companyMine/projectPay/projectPay.wxml @@ -0,0 +1,41 @@ + + + 订单信息 + + + 订单编号 + {{orderData.trade_no}} + + + 商品总价 + ￥{{orderData.amount}} + + + 运费 + ￥{{orderData.freight}} + + + 应付总价 + + ￥{{orderData.total}} + + + + + 支付方式 + + + + + + 微信支付 + + + + + + + + + 立即支付 + \ No newline at end of file diff --git a/pages/user/companyMine/projectPay/projectPay.wxss b/pages/user/companyMine/projectPay/projectPay.wxss new file mode 100644 index 0000000..85f425b --- /dev/null +++ b/pages/user/companyMine/projectPay/projectPay.wxss @@ -0,0 +1,116 @@ +/* + * 手太欠 + * 企获客商城 + */ + +page { + background-color: #f7f7f7; +} + +.order-content { + border-bottom: solid 100rpx transparent; +} + +/* 订单支付 */ + +.order-title { + font-weight: 600; + padding: 30rpx; +} + +.order-total { + background: white; + margin-bottom: 30rpx; + border-top: 2rpx solid #eee; + border-bottom: 2rpx solid #eee; +} + +.order-total-number { + border-bottom: 2rpx solid #eee; + line-height: 54rpx; +} + +.order-total-li { + padding: 20rpx 30rpx; + display: flex; + position: relative; +} + +.order-total-name { + flex: 1; +} + +.order-total-li text { + color: #999; +} + +.coupon-picker-red { + color: #378fff; +} + +.order-total-textarea { + width: 200rpx; + height: 80rpx; +} + + +.order-total-li textarea { + line-height: 50rpx; + height: 100rpx; +} + + +/* 支付类型 */ + +.payContList { + border-top: 2rpx solid #eee; + border-bottom: 2rpx solid #eee; + padding: 30rpx; + background: #fff; +} + +.payContList-label { + height: 60rpx; + line-height: 60rpx; + display: flex; +} + +.payContList-label-name { + flex: 1; + display: flex; +} + +.payContList-label-img { + width: 60rpx; + height: 60rpx; + margin-right: 20rpx; +} + + +/* 支付按钮 */ + +.address-footer{ + position: fixed; + bottom: 0; + left: 0; + right: 0; + padding-left: 30rpx; + padding-right: 30rpx; + background: white; + border-top: 2rpx solid #eeeeee; + z-index: 9; + height: 130rpx; +} + +.address-footer text{ + display: block; + width: 100%; + line-height: 90rpx; + height: 90rpx; + margin: 20rpx 0; + text-align: center; + background: #378fff; + font-size: 30rpx; + color: white; + border-radius: 60rpx; +} diff --git a/pages/user/companyMine/projectRefund/mall_refund.wxml b/pages/user/companyMine/projectRefund/mall_refund.wxml new file mode 100644 index 0000000..7a7f197 --- /dev/null +++ b/pages/user/companyMine/projectRefund/mall_refund.wxml @@ -0,0 +1,87 @@ +
+ + + + + + + {{item.title}} + {{item.value}} + 单价：{{item.price}} X {{item.qty}} + + + + + + + + 商品总金额 + + + + 运费 + + + + 优惠券抵扣 + + + + 实际支付金额 + + + + + + + + 退款金额 + + + + + + 选择退款原因 + + + {{refundTitle[refundIndex].remark}} + + + + + + + 退款类型 + + + + + + 退款原因 + + + + + + 添加图片 + + + + × + + + + + 添加图片 + + + + + + + + + + +
\ No newline at end of file diff --git a/pages/user/companyMine/projectRefund/projectRefund.js b/pages/user/companyMine/projectRefund/projectRefund.js new file mode 100644 index 0000000..a383a51 --- /dev/null +++ b/pages/user/companyMine/projectRefund/projectRefund.js @@ -0,0 +1,131 @@ +/* + * 手太欠 + * 企获客商城 + */ + +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + orderId : '', //商品id + orderData : '', //退货商品 + refundTitle : [], //退货理由 + refundType : '', //退货类型 + refundIndex : 0, //退货理由index + title : '', //退款原因 + typeIndex : 0, //退货类型index + imgs : [], //图片页面显示 + paths : [], //图片上传服务器 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.setData({ + orderId: options.orderId + }) + wx.$api.order.goosRefund(options.orderId).then(res => { + console.log(res) + this.setData({ + orderData : res.order, + refundTitle : res.refund_title, + refundType : res.refund_type + }) + }) + + }, + + /** + *选择退款原因 + */ + refundChange(e) { + this.setData({ + refundIndex : e.detail.value + }) + }, + + /** + * 上传图片 + */ + + formUploadFile(){ + let count = 9 - this.data.imgs.length + wx.chooseImage({ + count : count, + success : res=>{ + // 上传图片 + if (res.tempFilePaths){ + let pathArr = res.tempFilePaths + wx.showLoading({ + title: '上传中', + }) + for (let i = 0; i < pathArr.length; i++){ + wx.$api.file.uploadImg(pathArr[i], {}).then(res=>{ + let imgArr = this.data.imgs, + pathArr = this.data.paths + imgArr.push(res.showpath) + pathArr.push(res.path) + this.setData({ + imgs : imgArr, + paths: pathArr + }) + }) + + if (i == pathArr.length - 1) { + wx.hideLoading() + } + } + }else{ + wx.showToast({ + title: '上传图片失败', + icon : 'none' + }) + } + } + }) + }, + + /** + * 删除图片 + */ + removeImg(e){ + let imgArr = this.data.imgs, + pathArr = this.data.paths, + index = e.currentTarget.dataset.index + + imgArr.splice(index, 1) + pathArr.splice(index, 1) + + this.setData({ + imgs : imgArr, + paths : pathArr + }) + }, + + /** + * 申请退货 + */ + refundSign(e) { + let refundTitle = this.data.refundTitle, + refundIndex = this.data.refundIndex, + remark = e.detail.value.remark, + paths = this.data.paths + + console.log(paths) + + wx.$api.order.formRefund(this.data.orderId,{ + title : refundTitle[refundIndex].title, + remark : remark, + type : 1, + pictures: paths + }).then(res => { + wx.redirectTo({ + url: '/pages/mall/mall_order/mall_order', + }) + }) + }, +}) \ No newline at end of file diff --git a/pages/user/companyMine/projectRefund/projectRefund.json b/pages/user/companyMine/projectRefund/projectRefund.json new file mode 100644 index 0000000..9c82d2e --- /dev/null +++ b/pages/user/companyMine/projectRefund/projectRefund.json @@ -0,0 +1,6 @@ +{ + "usingComponents" : {}, + "navigationBarTitleText": "申请退款", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#378fff" +} \ No newline at end of file diff --git a/pages/user/companyMine/projectRefund/projectRefund.wxml b/pages/user/companyMine/projectRefund/projectRefund.wxml new file mode 100644 index 0000000..9ee3d65 --- /dev/null +++ b/pages/user/companyMine/projectRefund/projectRefund.wxml @@ -0,0 +1,89 @@ +
+ + + + + + + {{item.title}} + {{item.value}} + 单价：{{item.price}} X {{item.qty}} + + + + + + + + 商品总金额 + + + + 运费 + + + + 优惠券抵扣 + + + + 实际支付金额 + + + + + + + + 退款金额 + + + + + + 选择退款原因 + + + {{refundTitle[refundIndex].remark}} + + + + + + + 退款类型 + + + + + + 退款原因 + + + + + + 添加图片 + + + + × + + + + + 添加图片 + + + + + + + + + + +
+ +1111111111 \ No newline at end of file diff --git a/pages/user/companyMine/projectRefund/projectRefund.wxss b/pages/user/companyMine/projectRefund/projectRefund.wxss new file mode 100644 index 0000000..0559a9a --- /dev/null +++ b/pages/user/companyMine/projectRefund/projectRefund.wxss @@ -0,0 +1,223 @@ +.refund-content { + padding-bottom: 190rpx; +} + +.refund-goods { + background-color: white; +} + +.refund-good { + position: relative; + padding: 15rpx 30rpx; + min-height: 198rpx; +} + +.refund-good::before { + position: absolute; + left: 30rpx; + right: 0; + height: 1rpx; + bottom: 1rpx; + content: " "; + background-color: #f5f5f5; + z-index: 9; +} + +.refund-good-cover { + height: 178rpx; + width: 178rpx; + background: #f6f6f6; + position: absolute; + left: 30rpx; + top: 15rpx; +} + +.refund-good-info { + padding-left: 198rpx; +} + +.refund-good-title { + font-weight: bold; + margin: 15rpx 0; + font-size: 32rpx; +} + +.refund-good-value { + line-height: 40rpx; + font-size: 28rpx; + color: gray; +} + +.refund-good-price { + line-height: 40rpx; + color: gray; + font-size: 28rpx; + padding-top: 10rpx; +} + +.refund-good-price text { + color: #378fff; + font-weight: bold; + font-size: 32rpx; +} + +/* 统计信息 */ +.refundTitle-item { + display: flex; +} + +.refundTitle-item picker { + flex: 1; + text-align: right; + color: #000; +} + +.refund-statistical { + background: white; +} + +.refund-statistical-item { + position: relative; + padding: 0 30rpx; + line-height: 90rpx; + color: gray; +} + +.refund-statistical-item::before { + position: absolute; + left: 30rpx; + right: 0; + height: 1rpx; + bottom: 1rpx; + content: " "; + background-color: #f5f5f5; + z-index: 9; +} + +.refund-statistical-item:last-child::before { + display: none; +} + +.refund-statistical-item-label { + position: absolute; + right: 30rpx; + top: 0; + width: 300rpx; + text-align: right; + color: #000; +} + +/* 退款 */ +.refund-info { + margin-top: 20rpx; +} + +.refund-info-item-label { + color: #378fff; + font-weight: bold; +} + +.refund-info-item-text { + padding: 30rpx 30rpx 30rpx 30rpx; +} + +.refund-info-item-textarea { + width: 100%; + height: 150rpx; + margin-top: 20rpx; +} + +/* footer */ +.refund-footer { + background: white; + position: fixed; + bottom: 0; + left: 0; + right: 0; + padding: 20rpx 30rpx 30rpx 30rpx; + width: 100%; + box-sizing: border-box; + z-index: 9999; +} + +.refund-footer-btn[size="mini"] { + background: #378fff; + width: 100%; + height: 90rpx; + line-height: 90rpx; + color: white; + font-size: 32rpx; +} + + +/* 多图上传 */ + +.issue-info-img { + padding: 20rpx 0; + display: flex; + flex-wrap: wrap; + margin: 0 -10rpx; +} + +.issue-info-img-itme { + width: calc(33.33% - 20rpx); + padding-top: calc(33.33% - 20rpx); + box-sizing: border-box; + position: relative; + margin: 10rpx; +} + +.issue-info-img-itme>image { + width: 100%; + height: calc(100% - 20rpx); + height: -webkit-calc(100% - 20rpx); + position: absolute; + top: 10rpx; + left: 0; +} + +.issue-info-img-remove { + position: absolute; + z-index: 5; + top: -5rpx; + right: -6rpx; + height: 36rpx; + width: 36rpx; + text-align: center; + line-height: 34rpx; + background: #ec202c; + color: white; + font-size: 28rpx; + font-weight: bold; + border-radius: 50%; +} + +.issue-info-img-add { + position: absolute; + top: 10rpx; + bottom: 10rpx; + width: 100%; + left: 0; + text-align: center; + background: #f3f4f8; + color: #8d8d8d; + font-size: 24rpx; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-box-pack: center; +} + +.issue-info-img-add image { + width: 100rpx; + height: 100rpx; + vertical-align: bottom; + margin-bottom: 15rpx; + margin-top: 15rpx; +} + +.issue-info-img-hint { + line-height: 60rpx; + color: #666; + font-size: 26rpx; + padding: 0 30rpx 15rpx 30rpx; +} diff --git a/pages/user/companyMine/refundInfo/refundInfo.js b/pages/user/companyMine/refundInfo/refundInfo.js new file mode 100644 index 0000000..7464f96 --- /dev/null +++ b/pages/user/companyMine/refundInfo/refundInfo.js @@ -0,0 +1,27 @@ +// pages/user/companyMine/refundInfo/refundInfo.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + info:[],//进度 + }, + onLoad: function (options) { + this.setData({ + refundId: options.refundId + }) + this.getInfo() + }, + /** + * 进度详情 + */ + getInfo() { + wx.$api.companyModule.getRefundLogsInfo(this.data.refundId).then(res => { + console.log(res) + this.setData({ + info: res + }) + }) + }, +}) \ No newline at end of file diff --git a/pages/user/companyMine/refundInfo/refundInfo.json b/pages/user/companyMine/refundInfo/refundInfo.json new file mode 100644 index 0000000..0edf41d --- /dev/null +++ b/pages/user/companyMine/refundInfo/refundInfo.json @@ -0,0 +1,6 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "退款进度", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#378fff" +} \ No newline at end of file diff --git a/pages/user/companyMine/refundInfo/refundInfo.wxml b/pages/user/companyMine/refundInfo/refundInfo.wxml new file mode 100644 index 0000000..6774ae3 --- /dev/null +++ b/pages/user/companyMine/refundInfo/refundInfo.wxml @@ -0,0 +1,24 @@ + + + + + + + + {{item.state_text}} + 处理时间：{{item.created_at}} + + + + + + {{item.state_text}} + 处理时间：{{item.created_at}} + 退款类型：仅退款 + 退款金额：￥{{item.refund_total}} + 退款原因：{{item.title}} + 退款描述：{{item.remark}} + + + + \ No newline at end of file diff --git a/pages/user/companyMine/refundInfo/refundInfo.wxss b/pages/user/companyMine/refundInfo/refundInfo.wxss new file mode 100644 index 0000000..5debacd --- /dev/null +++ b/pages/user/companyMine/refundInfo/refundInfo.wxss @@ -0,0 +1,69 @@ +/* pages/user/companyMine/refundInfo/refundInfo.wxss */ +.content { + padding: 120rpx 30rpx; + background-color: #fff; +} + +.item { + display: flex; + flex-direction: row; + justify-content: start; + align-items: flex-start; + box-sizing: border-box; +} + +.left { + width: 30rpx; + height: 30rpx; + background-color: #378fff; + border-radius: 50%; + position: relative; + top: 6rpx; + z-index: 3; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + box-sizing: border-box; + color: #fff; + font-size: 24rpx; +} + +.right { + margin-left: 30rpx; + z-index: 3; + position: relative; +} + +.title { + color: #333; + font-weight: 600; + font-size: 30rpx; +} + +.time { + color: #999; + font-size: 24rpx; + margin-top: 6rpx; +} + +.line { + background-color: #378fff; + height: 172rpx; + width: 1rpx; + position: relative; + left: -16rpx; + top: 6rpx; + z-index: 2; + opacity: 0.3; +} + +.detail { + color: #666; + font-size: 24rpx; + margin-top: 10rpx; +} + +.mt20 { + margin-top: 30rpx; +} \ No newline at end of file diff --git a/project.config.json b/project.config.json index 87dc3de..ba5ae06 100644 --- a/project.config.json +++ b/project.config.json @@ -1,91 +1,115 @@ { - "description": "项目配置文件", - "packOptions": { - "ignore": [] + "description": "项目配置文件", + "packOptions": { + "ignore": [] + }, + "setting": { + "urlCheck": true, + "es6": true, + "enhance": false, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": false, + "coverView": true, + "nodeModules": true, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "useMultiFrameRuntime": false, + "useApiHook": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" }, - "setting": { - "urlCheck": true, - "es6": true, - "enhance": false, - "postcss": true, - "preloadBackgroundData": false, - "minified": true, - "newFeature": false, - "coverView": true, - "nodeModules": true, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "uglifyFileName": false, - "checkInvalidKey": true, - "checkSiteMap": true, - "uploadWithSourceMap": true, - "compileHotReLoad": false, - "useMultiFrameRuntime": false, - "useApiHook": true, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "enableEngineNative": false, - "bundle": false, - "useIsolateContext": true, - "useCompilerModule": true, - "userConfirmedUseCompilerModuleSwitch": false, - "userConfirmedBundleSwitch": false, - "packNpmManually": false, - "packNpmRelationList": [], - "minifyWXSS": true + "enableEngineNative": false, + "bundle": false, + "useIsolateContext": true, + "useCompilerModule": true, + "userConfirmedUseCompilerModuleSwitch": false, + "userConfirmedBundleSwitch": false, + "packNpmManually": false, + "packNpmRelationList": [], + "minifyWXSS": true + }, + "compileType": "miniprogram", + "libVersion": "2.14.0", + "appid": "wxd931d03dfe955254", + "projectname": "%E5%88%9B%E5%BB%BA%E4%B8%80%E4%B8%AA%E5%B0%8F%E7%A8%8B%E5%BA%8F", + "debugOptions": { + "hidedInDevtools": [] + }, + "scripts": {}, + "isGameTourist": false, + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, + "condition": { + "plugin": { + "list": [] }, - "compileType": "miniprogram", - "libVersion": "2.14.0", - "appid": "wxd931d03dfe955254", - "projectname": "%E5%88%9B%E5%BB%BA%E4%B8%80%E4%B8%AA%E5%B0%8F%E7%A8%8B%E5%BA%8F", - "debugOptions": { - "hidedInDevtools": [] + "game": { + "list": [] }, - "scripts": {}, - "isGameTourist": false, - "simulatorType": "wechat", - "simulatorPluginLibVersion": {}, - "condition": { - "plugin": { - "list": [] + "gamePlugin": { + "list": [] + }, + "miniprogram": { + "list": [ + { + "name": "登录", + "pathName": "pages/login/login", + "query": "", + "scene": null }, - "game": { - "list": [] + { + "name": "搜索", + "pathName": "pages/company/search/search", + "query": "", + "scene": null }, - "gamePlugin": { - "list": [] + { + "name": "商城", + "pathName": "pages/mall/index", + "query": "", + "scene": null }, - "miniprogram": { - "list": [ - { - "name": "登录", - "pathName": "pages/login/login", - "query": "", - "scene": null - }, - { - "name": "搜索", - "pathName": "pages/company/search/search", - "query": "", - "scene": null - }, - { - "name": "商城", - "pathName": "pages/mall/index", - "query": "", - "scene": null - }, - { - "name": "pages/user/index", - "pathName": "pages/user/index", - "query": "", - "scene": null - } - ] + { + "name": "pages/user/index", + "pathName": "pages/user/index", + "query": "", + "scene": null + }, + { + "name": "pages/user/companyMine/companyOrder", + "pathName": "pages/user/companyMine/companyOrder", + "query": "orderid=20201229132338964625", + "scene": null + }, + { + "name": "pages/user/companyMine/companyOrder", + "pathName": "pages/user/companyMine/companyOrder", + "query": "orderid=20201229132338964625", + "scene": null + }, + { + "name": "pages/user/companyMine/projectDetail/projectDetail", + "pathName": "pages/user/companyMine/projectDetail/projectDetail", + "query": "orderid=20201229132338964625", + "scene": null + }, + { + "name": "pages/user/companyMine/refundInfo/refundInfo", + "pathName": "pages/user/companyMine/refundInfo/refundInfo", + "query": "orderid=20201229132338964625", + "scene": null } + ] } + } } \ No newline at end of file diff --git a/static/images/wl.png b/static/images/wl.png new file mode 100644 index 0000000000000000000000000000000000000000..4615a01d483e2479913758e7c75d528b4cefd636 GIT binary patch literal 10332 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 Date: Tue, 29 Dec 2020 17:30:39 +0800 Subject: [PATCH 2/3] asd --- app.json | 3 -- project.config.json | 120 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 project.config.json diff --git a/app.json b/app.json index 76012b8..406141c 100644 --- a/app.json +++ b/app.json @@ -34,9 +34,6 @@ "pages/live/index", "pages/ticket/goods/goods", "pages/ticket/index", - "pages/user/companyMine/myActives/myActives", - "pages/user/companyMine/focusedProject/focusedProject", - "pages/user/companyMine/companyOrder", "pages/user/companyMine/projectPay/projectPay", "pages/user/companyMine/projectRefund/projectRefund", "pages/user/companyMine/projectDetailFunds/projectDetailFunds", diff --git a/project.config.json b/project.config.json new file mode 100644 index 0000000..eb21eb3 --- /dev/null +++ b/project.config.json @@ -0,0 +1,120 @@ +{ + "description": "项目配置文件", + "packOptions": { + "ignore": [] + }, + "setting": { + "urlCheck": true, + "es6": true, + "enhance": false, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": true, + "coverView": true, + "nodeModules": true, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "useMultiFrameRuntime": false, + "useApiHook": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "enableEngineNative": false, + "bundle": false, + "useIsolateContext": true, + "useCompilerModule": false, + "userConfirmedUseCompilerModuleSwitch": false, + "userConfirmedBundleSwitch": false, + "packNpmManually": false, + "packNpmRelationList": [], + "minifyWXSS": true + }, + "compileType": "miniprogram", + "libVersion": "2.13.2", + "appid": "wx49efb36db851933d", + "projectname": "%E8%A1%8C%E4%B8%9A%E7%89%88Saas", + "debugOptions": { + "hidedInDevtools": [] + }, + "isGameTourist": false, + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, + "condition": { + "plugin": { + "list": [] + }, + "game": { + "list": [] + }, + "gamePlugin": { + "list": [] + }, + "miniprogram": { + "list": [ + { + "name": "登录", + "pathName": "pages/login/login", + "query": "", + "scene": null + }, + { + "name": "搜索", + "pathName": "pages/company/search/search", + "query": "", + "scene": null + }, + { + "name": "商城", + "pathName": "pages/mall/index", + "query": "", + "scene": null + }, + { + "name": "pages/user/index", + "pathName": "pages/user/index", + "query": "", + "scene": null + }, + { + "name": "pages/user/companyMine/companyOrder", + "pathName": "pages/user/companyMine/companyOrder", + "query": "orderid=20201229132338964625", + "scene": null + }, + { + "name": "pages/user/companyMine/companyOrder", + "pathName": "pages/user/companyMine/companyOrder", + "query": "orderid=20201229132338964625", + "scene": null + }, + { + "name": "pages/user/companyMine/projectDetail/projectDetail", + "pathName": "pages/user/companyMine/projectDetail/projectDetail", + "query": "orderid=20201229132338964625", + "scene": null + }, + { + "name": "pages/user/companyMine/refundInfo/refundInfo", + "pathName": "pages/user/companyMine/refundInfo/refundInfo", + "query": "orderid=20201229132338964625", + "scene": null + }, + { + "name": "pages/home/index", + "pathName": "pages/home/index", + "query": "orderid=20201229132338964625", + "scene": null + } + ] + } + } +} \ No newline at end of file From 29f807609fc9402537e03c7397fb96baef5be565 Mon Sep 17 00:00:00 2001 From: zdx <731335498@qq.com> Date: Tue, 29 Dec 2020 17:42:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/company/projectRaise/projectRaise.js | 4 ++-- pages/home/index.js | 12 ++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/components/company/projectRaise/projectRaise.js b/components/company/projectRaise/projectRaise.js index 89fdc96..81e623e 100644 --- a/components/company/projectRaise/projectRaise.js +++ b/components/company/projectRaise/projectRaise.js @@ -52,7 +52,7 @@ Component({ * 请求项目筹集分类接口 */ crowdfundcategory(company_id){ - wx.$api.companyModule.crowdfundcategory(company_id).then(res=>{ + wx.$api.companyModule.crowdfundcategory(wx.getStorageSync('company_id')).then(res=>{ console.log(res) this.setData({ categoryList:res, @@ -67,7 +67,7 @@ Component({ */ crowdfunds(){ if(this.data.has_more){ - wx.$api.companyModule.crowdfunds(this.data.company_id,this.data.category_id,this.data.page).then(res=>{ + wx.$api.companyModule.crowdfunds(wx.getStorageSync('company_id'),this.data.category_id,this.data.page).then(res=>{ console.log(res) if(res.page.has_more){ this.setData({ diff --git a/pages/home/index.js b/pages/home/index.js index 656ce8c..691ca70 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -11,15 +11,7 @@ Page({ }, onLoad(e) { var that = this - wx.getStorage({ - key: 'company_id', - success(res) { - that.company(e.companyId) - that.setData({ - company_id:res.data - }) - } - }) + that.company() }, onUnload: function () { wx.removeStorageSync('company_id') @@ -68,7 +60,7 @@ Page({ title: 'title', mask: 'true' }) - wx.$api.companyModule.company(id, this.data.page).then(res => { + wx.$api.companyModule.company(wx.getStorageSync('company_id'), this.data.page).then(res => { this.setData({ info: res, loaded: true,