diff --git a/api/shop/profitLog.js b/api/shop/profitLog.js new file mode 100644 index 0000000..dbb2b74 --- /dev/null +++ b/api/shop/profitLog.js @@ -0,0 +1,11 @@ +import http from '@/websoft/api/index.js'; +// api地址 +const api = { + list: '/shop/profit-log/page', +} + +// 商品评价列表 +export const list = (params, option) => { + return http.get(api.list, {params}, option) +} + diff --git a/config.js b/config.js index 7d26c80..391541d 100755 --- a/config.js +++ b/config.js @@ -3,10 +3,10 @@ module.exports = { name: "云芯威BMS", // 生产环境 // apiUrl: "https://server.gxwebsoft.com/api", - apiUrl: "https://open.gxwebsoft.com/api", + // apiUrl: "https://open.gxwebsoft.com/api", // 开发环境 // apiUrl: "http://127.0.0.1:8081/api", - // apiUrl: "http://127.0.0.1:9090/api", + apiUrl: "http://127.0.0.1:9090/api", // apiUrl: "http://chatgpt.wsdns.cn/api", uploadUrl: 'https://file.wsdns.cn', fileUrl: 'https://file.wsdns.cn', diff --git a/pages.json b/pages.json index b326a0d..e726a86 100755 --- a/pages.json +++ b/pages.json @@ -55,7 +55,7 @@ "path": "pages/index/index", "style": { "navigationBarTitleText": "安博驰", - "enablePullDownRefresh": true + "enablePullDownRefresh": false } }, { "path": "pages/user/user", @@ -476,6 +476,24 @@ } } + ,{ + "path" : "pages/saleman/profir-log/profir-log", + "style" : + { + "navigationBarTitleText": "我的收益", + "enablePullDownRefresh": true + } + + } + ,{ + "path" : "pages/saleman/saleman", + "style" : + { + "navigationBarTitleText": "分销中心", + "enablePullDownRefresh": false + } + + } ], "globalStyle": { // #ifdef H5 diff --git a/pages/checkout/checkout.vue b/pages/checkout/checkout.vue index bde288e..2ca6b30 100644 --- a/pages/checkout/checkout.vue +++ b/pages/checkout/checkout.vue @@ -103,7 +103,7 @@ - + 立即下单 @@ -142,7 +142,7 @@ mode: 'range', month: 6, agree: false, - dealerId: '', + dealerPhone: '', price: { batteryRent: 300, batteryDeposit: 300, @@ -235,7 +235,7 @@ }, onBuy(){ const app = this - const { record,dealerId } = this + const { record,dealerPhone } = this let total = 0.0 // 未登录状态 if(!uni.getStorageSync('userId')) { @@ -271,7 +271,7 @@ batteryInsurance: record.batteryInsurance, orderSource: record.equipmentCategory, orderSourceId: record.goodsId, - dealerId + dealerPhone }).then(res => { const { orderId } = res.data app.$success("下单成功") diff --git a/pages/order/detail.vue b/pages/order/detail.vue index a8847bd..173a37c 100755 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -34,6 +34,7 @@ 待支付 待绑定 已完成 + 退租中 已退租 @@ -588,9 +589,11 @@ 查看电池 我要续费 + v-if="equipmentGoods.equipmentCategory != '10' && !orderEnd">我要续费 我要退租 + v-if="equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 21">我要退租 + 取消退租 @@ -694,7 +697,8 @@ orderPrice2: 0, priceTitle3: '电池保险', orderPrice3: 0, - freeTitle: '续费金额' + freeTitle: '续费金额', + orderEnd: false, // 是否已完成分期 } }, @@ -740,6 +744,7 @@ if (result.data.equipment) { app.equipmentId = result.data.equipment.equipmentId } + // 项目显示 app.priceTitle1 = null app.priceTitle2 = null @@ -804,6 +809,9 @@ .then(res => { console.log(res); app.renewOrderList = res.data; + if(res.data.length >= app.equipmentGoods.periods){ + app.orderEnd = true + } // 计算逾期 res.data.map((d, index) => { const setTime = new Date(d.expirationTime); @@ -977,6 +985,8 @@ batteryInsurance: order.batteryInsurance, orderSource: order.orderSource, orderSourceId: order.goodsId, + equipmentId: order.equipmentId, + dealerPhone:order.dealerPhone, comments: '续租订单' + order.orderNo }).then(res => { const { diff --git a/pages/order/index.vue b/pages/order/index.vue index 9f8baa5..63f6ded 100755 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -16,6 +16,7 @@ 待支付 待绑定 已完成 + 退租中 已退租 @@ -350,6 +351,7 @@ } app.where.userId = uni.getStorageSync('userId'); app.where.isRenew = 0; + app.where.isApp = true; pageOrder(app.where).then(res => { app.list = res.data.list const curPageLen = res.data.list.length diff --git a/pages/saleman/profir-log/profir-log.vue b/pages/saleman/profir-log/profir-log.vue new file mode 100644 index 0000000..a42477c --- /dev/null +++ b/pages/saleman/profir-log/profir-log.vue @@ -0,0 +1,76 @@ + + + + + \ No newline at end of file diff --git a/pages/saleman/saleman.vue b/pages/saleman/saleman.vue new file mode 100644 index 0000000..41325ff --- /dev/null +++ b/pages/saleman/saleman.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/pages/user/user.vue b/pages/user/user.vue index cd23649..5b85c99 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -180,6 +180,8 @@ const service = [ {id: 'get_order',name: '订单管理',icon: 'qpdingdan',type: 'link',url: 'pages/order/index'}, {id: 'equipment',name: '设备管理',icon: 'shouhuodizhi',type: 'link',url: 'pages/user/equipment/index'}, + {id: 'saleman',name: '收益明细',icon: 'shouhuodizhi',type: 'link',url: 'pages/saleman/profir-log/profir-log'}, + {id: 'withdraw_kog',name: '提现记录',icon: 'shouhuodizhi',type: 'link',url: 'package/dealer/withdraw/apply'}, {id: 'help',name: '使用帮助',icon: 'bangzhu',type: 'link',url: 'pages/help/index'}, {id: 'administration',name: '关于我们',icon: 'sy-yh',type: 'link',url: 'pages/help/about'}, ]