diff --git a/api/partner.js b/api/partner.js index 84abfd7..a7ddcde 100644 --- a/api/partner.js +++ b/api/partner.js @@ -5,7 +5,6 @@ const getPartner = '/dealer/get-one' //经销商信息 const getPackageList = '/new-install/packages' //套餐购买列表 -const getMasterList = '/master/list' //师傅列表 const createNewOrder = '/new-install/create' //创建新装工单 const phoneSearch = '/customer/phone-search' //搜索客户电话 @@ -21,10 +20,18 @@ const getUninstallInfo = '/uninstall/one' //拆除工单详情 const getPartList = '/part_replace/list' //更换工单列表 const getPartInfo = '/part_replace/one' //更换工单详情 -const masterSelect = '/master/select' //更换工单详情 +const masterSelect = '/master/select' //师傅 +const getMasterList = '/master/list' //师傅列表 +const createMaster = '/master/create' + +const getOrderPairList = '/order-repair/list' +const getOrderPairListInfo = '/order-repair/one' const assignPartReplaceMaster = '/part_replace/assign' //指派 const apiArr = { + createMaster, + getOrderPairList, + getOrderPairListInfo, masterSelect, getproductList, assignPartReplaceMaster, diff --git a/api/pay.js b/api/pay.js index a8beaf0..915d566 100644 --- a/api/pay.js +++ b/api/pay.js @@ -5,9 +5,11 @@ const queryPayByWechat = '/wechat/water/query_pay' //查询交易结果 const HsqueryPay = '/lakala/hs-preorder' //预下单 const HsqueryPayByWechat = '/lakala/hs-trade-query' //查询交易结果 +const payFail = '/wechat/water/pay-order-fail' //订单支付取消或失败 const PayJs = { pay, + payFail, queryPay, HsqueryPay, HsqueryPayByWechat, diff --git a/packages/WaterPurifier/pages/Buyfilter/Buyfilter.js b/packages/WaterPurifier/pages/Buyfilter/Buyfilter.js index 0b95c5a..a548131 100644 --- a/packages/WaterPurifier/pages/Buyfilter/Buyfilter.js +++ b/packages/WaterPurifier/pages/Buyfilter/Buyfilter.js @@ -7,389 +7,405 @@ import { areaList } from '../../data/index'; Page({ - /** - * 页面的初始数据 - */ - data: { - s: app.system.statusBarHeight, // 状态栏高度 - n: (app.menu.top - app.system.statusBarHeight) * 2 + app.menu.height, // 导航栏高度 - t: app.menu.top, // 胶囊局顶部距离 - h: app.menu.height, // 胶囊高度 - checked:true, - areaList, - show:false, //弹出层 + /** + * 页面的初始数据 + */ + data: { + s: app.system.statusBarHeight, // 状态栏高度 + n: (app.menu.top - app.system.statusBarHeight) * 2 + app.menu.height, // 导航栏高度 + t: app.menu.top, // 胶囊局顶部距离 + h: app.menu.height, // 胶囊高度 + checked: true, + areaList, + show: false, //弹出层 - name:"", - phone:"", - area:"", - address:"", - message:"", + name: "", + phone: "", + area: "", + address: "", + message: "", - page_num:1, - page_size:10, - flag:false, - PartsList:[], - currentId:[], - currentName:[], - price:0, + page_num: 1, + page_size: 10, + flag: false, + PartsList: [], + currentId: [], + currentName: [], + price: 0, - orderMsg:"",//订单信息 - GoodsMsg:"",//商户信息 - }, + orderMsg: "",//订单信息 + GoodsMsg: "",//商户信息 + }, - ipt1(e){ - let that = this - that.setData({ - name:e.detail.value - }) - }, - ipt2(e){ - let that = this - that.setData({ - phone:e.detail.value - }) - }, - ipt3(e){ - let that = this - that.setData({ - address:e.detail.value - }) - }, - ipt4(e){ - let that = this - that.setData({ - message:e.detail.value - }) - }, - - onChange(e){ - console.log(e); - let that = this - let PartsList = that.data.PartsList - let currentId = that.data.currentId - let currentName = that.data.currentName - let price = that.data.price - currentId = [] - currentName = [] - PartsList[e.currentTarget.dataset.idx].checked = !PartsList[e.currentTarget.dataset.idx].checked - price = 0 - PartsList.forEach(item=>{ - if(item.checked){ - // price += item.unit_price - price = util.floatCalculate(price,item.unit_price,'+=') - currentId.push(item.parts_id) - currentName.push(item.parts_name) - } - }) - that.setData({ - PartsList, - currentId, - currentName, - price - }) - }, - - getPartsByid(){ - wx.showLoading({ - title: '加载中...', - }) - let that = this - util.postUrl(apiArr.getdeviceListByid,{ - device_id:Number(wx.getStorageSync('device_id')), - page_num:that.data.page_num, - page_size:that.data.page_size - },res=>{ - wx.hideLoading() - console.log(res,'resss'); - let flag - if(res.rows){ - res.rows.forEach(item=>{ - item.checked = false - }) - if( res.rows.length == that.data.page_size){ - flag = true - }else{ - flag = false - } - res.rows.forEach(item=>{ - item.parts_icon = util.img_url + item.parts_icon - }) - that.setData({ - PartsList:that.data.PartsList.concat(res.rows || []), - flag, - page_size:that.data.page_size + 1 - }) - } - }) - }, - - createDeriveOrder(){ - let that = this - if(that.data.currentId.length == 0){ - wx.showToast({ - title: '请选择商品', - icon:"none" - }) - return - } - - if(!that.data.name){ - wx.showToast({ - title: '请填写收货人', - icon:"none" - }) - return - } - if(!that.data.phone){ - wx.showToast({ - title: '请填写收货人电话', - icon:"none" - }) - return - } - - if(!util.isPhone(that.data.phone)){ - wx.showToast({ - title: '请填写正确电话', - icon:"none" - }) - return - } - - - if(!that.data.area){ - wx.showToast({ - title: '请选择所在地区', - icon:"none" - }) - return - } - - if(!that.data.address){ - wx.showToast({ - title: '请填写详情地址', - icon:"none" - }) - return - } - let parts_ids = that.data.currentId.join() - - util.postUrl(apiArr.createDeviceOrder,{ - device_id:Number(wx.getStorageSync('device_id')), - region:that.data.area, - address:that.data.address, - parts_ids, - total_price:String(that.data.price), - customer_name:that.data.name, - customer_phone:that.data.phone, - user_id:Number(wx.getStorageSync('userId')), - is_up_door:1 - },res=>{ - that.setData({ - orderMsg:res - }) - that.getGoodsMsg() - }) - }, - - //获取商户id - getGoodsMsg(){ - let that = this - util.postUrl(apiArr.getCurrentShopMsg,{ - dealer_id:Number(that.data.orderMsg.DealerId), - user_id:Number(wx.getStorageSync('userId')), - shop_id:Number(wx.getStorageSync('shopId')), - },res=>{ + ipt1(e) { + let that = this that.setData({ - GoodsMsg:res + name: e.detail.value + }) + }, + ipt2(e) { + let that = this + that.setData({ + phone: e.detail.value + }) + }, + ipt3(e) { + let that = this + that.setData({ + address: e.detail.value + }) + }, + ipt4(e) { + let that = this + that.setData({ + message: e.detail.value + }) + }, + + onChange(e) { + console.log(e); + let that = this + let PartsList = that.data.PartsList + let currentId = that.data.currentId + let currentName = that.data.currentName + let price = that.data.price + currentId = [] + currentName = [] + PartsList[e.currentTarget.dataset.idx].checked = !PartsList[e.currentTarget.dataset.idx].checked + price = 0 + PartsList.forEach(item => { + if (item.checked) { + // price += item.unit_price + price = util.floatCalculate(price, item.unit_price, '+=') + currentId.push(item.parts_id) + currentName.push(item.parts_name) + } + }) + that.setData({ + PartsList, + currentId, + currentName, + price + }) + }, + + getPartsByid() { + wx.showLoading({ + title: '加载中...', + }) + let that = this + util.postUrl(apiArr.getdeviceListByid, { + device_id: Number(wx.getStorageSync('device_id')), + page_num: that.data.page_num, + page_size: that.data.page_size + }, res => { + wx.hideLoading() + console.log(res, 'resss'); + let flag + if (res.rows) { + res.rows.forEach(item => { + item.checked = false + }) + if (res.rows.length == that.data.page_size) { + flag = true + } else { + flag = false + } + res.rows.forEach(item => { + item.parts_icon = util.img_url + item.parts_icon + }) + that.setData({ + PartsList: that.data.PartsList.concat(res.rows || []), + flag, + page_size: that.data.page_size + 1 + }) + } + }) + }, + + createDeriveOrder() { + let that = this + if (that.data.currentId.length == 0) { + wx.showToast({ + title: '请选择商品', + icon: "none" + }) + return + } + + if (!that.data.name) { + wx.showToast({ + title: '请填写收货人', + icon: "none" + }) + return + } + if (!that.data.phone) { + wx.showToast({ + title: '请填写收货人电话', + icon: "none" + }) + return + } + + if (!util.isPhone(that.data.phone)) { + wx.showToast({ + title: '请填写正确电话', + icon: "none" + }) + return + } + + + if (!that.data.area) { + wx.showToast({ + title: '请选择所在地区', + icon: "none" + }) + return + } + + if (!that.data.address) { + wx.showToast({ + title: '请填写详情地址', + icon: "none" + }) + return + } + let parts_ids = that.data.currentId.join() + + util.postUrl(apiArr.createDeviceOrder, { + device_id: Number(wx.getStorageSync('device_id')), + region: that.data.area, + address: that.data.address, + parts_ids, + total_price: String(that.data.price), + customer_name: that.data.name, + customer_phone: that.data.phone, + user_id: Number(wx.getStorageSync('userId')), + is_up_door: 1 + }, res => { + that.setData({ + orderMsg: res + }) + that.getGoodsMsg() + }) + }, + + //获取商户id + getGoodsMsg() { + let that = this + util.postUrl(apiArr.getCurrentShopMsg, { + dealer_id: Number(that.data.orderMsg.DealerId), + user_id: Number(wx.getStorageSync('userId')), + shop_id: Number(wx.getStorageSync('shopId')), + }, res => { + that.setData({ + GoodsMsg: res + }) + + that.pay() + }) + }, + + pay() { + let that = this + + let parts_ids = that.data.currentId.join() + let subject = that.data.currentName.join() + + util.postUrl2(PayJs.pay, { + address: that.data.area + that.data.address, + goods_id: parts_ids, + merchant_no: that.data.GoodsMsg.merchant_no, + out_trade_no: that.data.orderMsg.OrderNo, + quantity: 1, + remark: that.data.message, + subject, + term_no: that.data.GoodsMsg.term_no, + total_amount: String(that.data.price * 100), + user: String(wx.getStorageSync('userId')), + user_id: wx.getStorageSync('openId') + }, res => { + const { resp_data, msg } = res.data.data + console.log(res, 'ssss'); + if (msg == '成功') { + wx.requestPayment({ + timeStamp: String(resp_data.acc_resp_fields.time_stamp), + nonceStr: String(resp_data.acc_resp_fields.nonce_str), + package: String(resp_data.acc_resp_fields.package), + signType: String(resp_data.acc_resp_fields.sign_type), + paySign: String(resp_data.acc_resp_fields.pay_sign), + success(res) { + that.queryPay() + }, + fail(fal) { + if(fal.errMsg == 'requestPayment:fail cancel'){ + that.payFail(2) + }else{ + that.payFail(1) + } + } + }) + } + }) + }, + + payFail(e) { + let that = this + util.postUrl(PayJs.payFail, { + order_id: that.data.orderMsg.OrderId, + type: "3", + state: e, + }, res => { + console.log(res); + }) + }, + + + queryPay() { + let that = this + util.postUrl2(PayJs.queryPay, { + merchant_no: that.data.GoodsMsg.merchant_no, + term_no: that.data.GoodsMsg.term_no, + out_trade_no: that.data.orderMsg.OrderNo + }, res => { + if (res.statusCode == '200') { + // wx.requestSubscribeMessage({ + // tmplIds:["5yPg-WOoP9-9ZU1fHjC4zg1KNaPWb76K87JzzKb58f0"] + // }) + wx.showToast({ + title: '支付成功！', + }) + } else { + wx.showToast({ + title: res.msg, + }) + } + }) + }, + + + account() { + wx.navigateTo({ + url: '../payList/payList', + }) + }, + + onClose(e) { + let that = this + that.setData({ + show: false + }) + }, + + changeShow() { + let that = this + that.setData({ + show: true }) - that.pay() - }) -}, + }, -pay(){ - let that = this - - let parts_ids = that.data.currentId.join() - let subject = that.data.currentName.join() - - util.postUrl2(PayJs.pay,{ - address:that.data.area + that.data.address, - goods_id:parts_ids, - merchant_no:that.data.GoodsMsg.merchant_no, - out_trade_no:that.data.orderMsg.OrderNo, - quantity:1, - remark:that.data.message, - subject, - term_no:that.data.GoodsMsg.term_no, - total_amount:String(that.data.price * 100), - user:String(wx.getStorageSync('userId')), - user_id:wx.getStorageSync('openId') - },res=>{ - const {resp_data,msg} = res.data.data - console.log(res,'ssss'); - if(msg == '成功'){ - wx.requestPayment({ - timeStamp:String(resp_data.acc_resp_fields.time_stamp), - nonceStr:String(resp_data.acc_resp_fields.nonce_str), - package:String(resp_data.acc_resp_fields.package), - signType:String(resp_data.acc_resp_fields.sign_type), - paySign:String(resp_data.acc_resp_fields.pay_sign), - success(res){ - that.queryPay() - }, - fail(fal){ - console.log(fal); - } - }) + //选择地区 + AreaConfirm(e) { + let that = this + let area = '' + if (e.detail.values[0].name == e.detail.values[1].name) { + area = e.detail.values[1].name + e.detail.values[2].name + } else { + area = e.detail.values[0].name + e.detail.values[1].name + e.detail.values[2].name } - }) -}, -queryPay(){ - let that = this - util.postUrl2(PayJs.queryPay,{ - merchant_no:that.data.GoodsMsg.merchant_no, - term_no:that.data.GoodsMsg.term_no, - out_trade_no:that.data.orderMsg.OrderNo - },res=>{ - if(res.statusCode == '200'){ - // wx.requestSubscribeMessage({ - // tmplIds:["5yPg-WOoP9-9ZU1fHjC4zg1KNaPWb76K87JzzKb58f0"] - // }) - wx.showToast({ - title: '支付成功！', - }) - }else{ - wx.showToast({ - title: res.msg, - }) + that.setData({ + show: false, + area + }) + + + }, + //取消 + cancel(e) { + let that = this + that.setData({ + show: false + }) + }, + onShareAppMessage() { + return { + title: '人人爱净水', // 分享卡片标题（必填） + path: '/pages/water_filter/water_filter', // 用户点击后跳转的路径（可选，默认当前页） + imageUrl: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/share.png' // 自定义图片（可选，比例建议 5:4） } - }) -}, - - - account(){ - wx.navigateTo({ - url: '../payList/payList', - }) - }, - - onClose(e){ - let that = this - that.setData({ - show:false - }) - }, - - changeShow(){ - let that = this - that.setData({ - show:true - }) - - }, - - //选择地区 - AreaConfirm(e){ - let that = this - let area = '' - if(e.detail.values[0].name == e.detail.values[1].name){ - area = e.detail.values[1].name + e.detail.values[2].name - }else{ - area = e.detail.values[0].name + e.detail.values[1].name + e.detail.values[2].name - } - - that.setData({ - show:false, - area - }) - - - }, - //取消 - cancel(e){ - let that = this - that.setData({ - show:false - }) - }, - onShareAppMessage(){ - return { - title: '人人爱净水', // 分享卡片标题（必填） - path: '/pages/water_filter/water_filter', // 用户点击后跳转的路径（可选，默认当前页） - imageUrl: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/share.png' // 自定义图片（可选，比例建议 5:4） - } -}, -onShareTimeline() { - return { - title: '人人爱净水', // 自定义标题 - query: '', // 自定义页面路径中的参数 - imageUrl: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/share.png' // 自定义分享图片路径 - } -}, - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - let that= this - that.getPartsByid() - wx.showShareMenu({ - withShareTicket: true, - menus: ['shareAppMessage', 'shareTimeline'] - }) - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - let that = this - if(that.data.flag){ + }, + onShareTimeline() { + return { + title: '人人爱净水', // 自定义标题 + query: '', // 自定义页面路径中的参数 + imageUrl: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/share.png' // 自定义分享图片路径 + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let that = this that.getPartsByid() + wx.showShareMenu({ + withShareTicket: true, + menus: ['shareAppMessage', 'shareTimeline'] + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + let that = this + if (that.data.flag) { + that.getPartsByid() + } + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + } - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } }) \ No newline at end of file diff --git a/packages/WaterPurifier/pages/Recharge/Recharge.js b/packages/WaterPurifier/pages/Recharge/Recharge.js index 9fc1103..6bb5cdb 100644 --- a/packages/WaterPurifier/pages/Recharge/Recharge.js +++ b/packages/WaterPurifier/pages/Recharge/Recharge.js @@ -214,7 +214,12 @@ Page({ that.queryPay() }, fail(fal) { - console.log(fal); + console.log(fal.errMsg); + if(fal.errMsg == 'requestPayment:fail cancel'){ + that.payFail(2) + }else{ + that.payFail(1) + } } }) } @@ -259,6 +264,17 @@ Page({ }) }, + payFail(e){ + let that = this + util.postUrl(PayJs.payFail,{ + order_id:that.data.orderMsg.order_id, + type:"2", + state:e, + },res=>{ + console.log(res); + }) + }, + changeShow() { let that = this that.setData({ diff --git a/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.js b/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.js index 4f35319..bb4b593 100644 --- a/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.js +++ b/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.js @@ -58,6 +58,8 @@ Page({ selectPackage: "" }, + + changeTab(e) { console.log(e); let that = this @@ -172,7 +174,11 @@ Page({ that.queryPay() }, fail(fal) { - console.log(fal); + if(fal.errMsg == 'requestPayment:fail cancel'){ + that.payFail(2) + }else{ + that.payFail(1) + } } }) } @@ -180,6 +186,17 @@ Page({ }) }, + payFail(e) { + let that = this + util.postUrl(PayJs.payFail, { + order_id: that.data.orderMsg.order_id, + type: "2", + state: e, + }, res => { + console.log(res); + }) + }, + //查询支付结果 queryPay() { let that = this diff --git a/packages/WaterPurifier/pages/device/deviceList/deviceList.js b/packages/WaterPurifier/pages/device/deviceList/deviceList.js index 62fcc0c..09f9e27 100644 --- a/packages/WaterPurifier/pages/device/deviceList/deviceList.js +++ b/packages/WaterPurifier/pages/device/deviceList/deviceList.js @@ -1,5 +1,6 @@ let util = require("../../../../../utils/util") const apiArr = require('../../../../../api/water_filter') +const apiArr2 = require('../../../../../api/partner') // packages/WaterPurifier/pages/device/deviceList/deviceList.js Page({ @@ -10,8 +11,9 @@ Page({ data: { option1: [ { text: '全部', value: 0 }, - { text: '正常', value: 1 }, - { text: '离线', value: 2 }, + { text: '已安装', value: 1 }, + { text: '空闲', value: 2 }, + { text: '已拆机', value: 3 }, ], option2: [ { text: '全部', value: 0 }, @@ -23,8 +25,11 @@ Page({ { text: '制水故障', value: 6 }, { text: '关机', value: 7 }, { text: '已欠费', value: 8 }, - { text: '已还库', value: 9 }, + { text: '在库', value: 9 }, + { text: '激活失败', value: 10 }, ], + + stateType: { 1: '正常', 2: '报废', @@ -34,7 +39,7 @@ Page({ 6: '制水故障', 7: '关机', 8: '已欠费', - 9: '已还库', + 9: '在库', }, value1: 0, value2: 'a', @@ -64,7 +69,12 @@ Page({ url: `../deviceDesc/deviceDesc?device_id=${e.currentTarget.dataset.device_id}`, }) }, - + addWorkOrders() { + console.log(123123); + wx.navigateTo({ + url: '/packages/partner/pages/newWorkOrder/newWorkOrder', + }) + }, // 网络状态选择 headerNetWorkClick(e) { console.log('e', e); @@ -113,7 +123,7 @@ Page({ if (networkStatus) { param = { ...param, - network_status: networkStatus + install_status: networkStatus } } if (status) { @@ -123,20 +133,23 @@ Page({ } } - util.postUrl(apiArr.deviceList, param, res => { + util.postUrl(apiArr2.deviceList, param, res => { wx.hideLoading() let flag = false - if (res.rows && res.rows.length == that.data.page_size) { + if (res.list && res.list.length == that.data.page_size) { + console.log(123); flag = true } else { + console.log(456); flag = false } that.setData({ - deviceList: that.data.deviceList.concat(res.rows || []), + deviceList: that.data.deviceList.concat(res.list || []), total: res.total, flag, page_num: that.data.page_num + 1 }) + console.log(that.data.flag); }) }, diff --git a/packages/WaterPurifier/pages/device/deviceList/deviceList.wxml b/packages/WaterPurifier/pages/device/deviceList/deviceList.wxml index 0ab6f3a..2347e3f 100644 --- a/packages/WaterPurifier/pages/device/deviceList/deviceList.wxml +++ b/packages/WaterPurifier/pages/device/deviceList/deviceList.wxml @@ -5,14 +5,14 @@ 设备总数：{{total}} - + - + @@ -20,10 +20,6 @@ 设备编码：{{item.device_code}} - - 设备型号 - {{item.product_name}} - 客户姓名 {{item.customer_name}} @@ -40,9 +36,16 @@ 设备状态 {{stateType[item.status]}} + + 安装状态 + 已安装 + 空闲 + 已拆机 + + 设备地址 - {{item.region + item.address}} + {{item.address}} @@ -54,6 +57,8 @@ +新增 +