From 11c5647ae51c3af640b20ab12059b0ec5a3f39dd Mon Sep 17 00:00:00 2001 From: liluo293254 Date: Fri, 7 Aug 2026 08:47:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=B9=B6=E7=A7=BB=E9=99=A4=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=99=BB=E5=BD=95=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增 config/env.js 管理 local/test/prod 网关，清理调试登录与页面联调相关改动。 --- api/api.js | 14 +- api/pay.js | 3 +- api/water_filter.js | 7 +- app.js | 41 +- app.json | 19 +- component/clientFooter/index.js | 99 +- component/masterFooter/index.js | 99 +- component/partnerFooter/index.js | 99 +- component/search/index.js | 2 + component/search/index.wxml | 40 +- component/tabularCard/index.js | 5 +- component/tabularCard/index.wxml | 60 +- config/env.js | 55 + .../pages/Addfriend/Addfriend.js | 275 +-- .../pages/Buyfilter/Buyfilter.js | 821 +++---- .../pages/Maintenance/Maintenance.js | 367 +-- .../pages/Maintenance/Maintenance.wxml | 100 +- .../MaintenanceInfo/MaintenanceInfo.wxml | 84 +- .../WaterPurifier/pages/Recharge/Recharge.js | 821 +++---- .../pages/RechargeRecord/RechargeRecord.js | 575 ++--- .../pages/RechargeRecord/RechargeRecord.wxml | 140 +- .../pages/device/deviceDesc/deviceDesc.js | 13 +- .../pages/device/deviceDesc/deviceDesc.wxml | 418 ++-- .../pages/device/deviceList/deviceList.js | 523 ++-- .../pages/device/deviceList/deviceList.wxml | 132 +- .../pages/device/inventory/inventory.wxml | 248 +- .../pages/device/myDevice/myDevice.wxml | 76 +- packages/WaterPurifier/pages/filter/filter.js | 809 +++---- .../WaterPurifier/pages/filter/filter.wxml | 184 +- .../filterChangeList/filterChangeList.js | 549 ++--- .../pages/orderDesc/orderDesc.wxml | 120 +- .../WaterPurifier/pages/payList/payList.wxml | 100 +- packages/WaterPurifier/pages/repair/repair.js | 1253 +++++----- .../WaterPurifier/pages/repair/repair.wxml | 226 +- .../pages/shareDerive/shareDerive.js | 337 +-- .../shareWaterFilter/shareWaterFilter.js | 725 +++--- .../shareWaterFilter/shareWaterFilter.wxml | 274 +-- packages/WaterPurifier/pages/upKeep/upKeep.js | 695 +++--- .../WaterPurifier/pages/upKeep/upKeep.wxml | 250 +- .../pages/water_filter/water_filter.js | 713 +++--- .../pages/water_filter/water_filter.wxml | 350 +-- packages/master/PersonCen/index.js | 351 +-- packages/master/deviceInfo/index.js | 8 +- packages/master/deviceInfo/index.wxml | 376 +-- packages/master/masterIndex/index.js | 259 +- packages/master/masterInfo/index.js | 323 +-- packages/master/order/index.js | 803 +++---- packages/master/order/index.wxml | 528 ++-- packages/master/orderDesc/index.js | 1453 +++++------ packages/master/orderDesc/index.wxml | 1028 ++++---- packages/partner/pages/OrderMsg/OrderMsg.js | 605 ++--- .../pages/OrderMsgInfo/OrderMsgInfo.js | 1471 ++++++------ packages/partner/pages/WorkOrder/WorkOrder.js | 695 +++--- .../partner/pages/WorkOrder/WorkOrder.wxml | 226 +- .../pages/chooseDevice/chooseDevice.wxml | 96 +- packages/partner/pages/desk/desk.js | 399 ++-- packages/partner/pages/desk/desk.wxml | 172 +- packages/partner/pages/device/device.js | 603 ++--- packages/partner/pages/device/device.wxml | 166 +- .../partner/pages/deviceDesc/deviceDesc.js | 11 +- .../partner/pages/deviceDesc/deviceDesc.wxml | 594 ++--- .../pages/distributor/distributor.wxml | 200 +- packages/partner/pages/editAdmin/editAdmin.js | 389 +-- packages/partner/pages/income/income.js | 313 +-- packages/partner/pages/income/income.wxml | 140 +- packages/partner/pages/invite/invite.wxml | 58 +- packages/partner/pages/login/login.wxml | 78 +- .../marketingOrder1/marketingOrder1.wxml | 128 +- .../marketingOrder2/marketingOrder2.wxml | 130 +- packages/partner/pages/master/master.js | 303 +-- packages/partner/pages/mine/mine.js | 411 ++-- packages/partner/pages/mine/mine.wxml | 122 +- packages/partner/pages/order1/order1.wxml | 130 +- packages/partner/pages/order2/order2.wxml | 112 +- packages/partner/pages/partner.js | 467 ++-- packages/partner/pages/partner.wxml | 132 +- .../partner/pages/partsOrder/partsOrder.js | 557 ++--- .../partner/pages/partsOrder/partsOrder.wxml | 266 +-- .../pages/purchaseGoods/purchaseGoods.js | 906 +++---- .../pages/purchaseGoods/purchaseGoods.wxml | 320 +-- packages/partner/pages/ranking/ranking.js | 201 +- packages/partner/pages/ranking/ranking.wxml | 52 +- .../partner/pages/removeOrder/removeOrder.js | 537 ++--- .../pages/removeOrder/removeOrder.wxml | 236 +- packages/partner/pages/team/team.js | 225 +- packages/partner/pages/team/team.wxml | 94 +- packages/user/community/list.wxml | 120 +- .../user/coupon/component/couponCard/index.js | 3 +- .../coupon/component/couponCard/index.wxml | 38 +- packages/user/coupon/index.wxml | 42 +- packages/user/goPay/index.wxml | 118 +- packages/user/marketing/index.js | 249 +- packages/user/marketing/index.wxml | 114 +- packages/user/points/detail.wxml | 68 +- packages/user/points/sign.wxml | 80 +- packages/user/share/index.js | 303 +-- packages/user/share/index.wxss | 104 +- packages/user/transactionDetail/index.wxml | 114 +- packages/user/transactionRecord/index.js | 533 ++--- packages/user/transactionRecord/index.wxml | 56 +- packages/user/userInfo/index.js | 273 +-- packages/user/userInfo/index.wxml | 202 +- pages/MasterLogin/MasterLogin.wxml | 66 +- pages/chooseCommunity/chooseCommunity.wxml | 68 +- pages/chooseEntrance/chooseEntrance.wxss | 68 +- pages/device/device.js | 213 +- pages/device/device.wxml | 92 +- pages/filterChange/filterChange.js | 513 ++-- pages/filterChange/filterChange.wxml | 130 +- pages/info/info.js | 465 ++-- pages/info/info.wxml | 144 +- pages/login/login.wxml | 100 +- pages/newLogin/newLogin.js | 4 +- pages/newLogin/newLogin.json | 6 +- pages/newLogin/newLogin.wxml | 209 +- pages/newLogin/newLogin.wxss | 286 +-- pages/newOrderListDesc/index.js | 161 +- pages/phoneGo/phoneGo.wxml | 22 +- pages/share/share.js | 183 +- pages/share/share.wxml | 44 +- pages/share/share.wxss | 142 +- pages/water_filter/water_filter.js | 2127 +++++++++-------- pages/water_filter/water_filter.json | 4 +- pages/water_filter/water_filter.wxml | 685 +++--- project.config.json | 128 +- utils/inject-static.js | 41 + utils/util.js | 61 +- 127 files changed, 18476 insertions(+), 18298 deletions(-) create mode 100644 config/env.js create mode 100644 utils/inject-static.js diff --git a/api/api.js b/api/api.js index f77def7..d29bef3 100644 --- a/api/api.js +++ b/api/api.js @@ -1,14 +1,12 @@ -const host = 'https://api.hshuishang.com/api/v1'; - - -// 水机 -const httpUserUrl = host + '/waters'; +// 与 utils/util.js 共用同一基址，避免生产/测试混用 +const util = require('../utils/util.js') +const host = (util.server_url || 'https://test.hshuishang.com/api/v1').replace(/\/$/, '') +const httpUserUrl = host + '/waters' const apiAddr = { - host:host, - // 处理主办激活请求 + host: host, board_activation: httpUserUrl + '/board-activation', } -module.exports = apiAddr; \ No newline at end of file +module.exports = apiAddr diff --git a/api/pay.js b/api/pay.js index 915d566..97a8232 100644 --- a/api/pay.js +++ b/api/pay.js @@ -1,7 +1,8 @@ const pay = '/lakala/preorder' //预下单 const queryPay = '/lakala/trade-query' //查询交易结果 -const queryPayByWechat = '/wechat/water/query_pay' //查询交易结果 +const queryPayByWechat = '/lakala/trade-query' // 原 /wechat/water/query_pay 不存在，统一走拉卡拉查单 + const HsqueryPay = '/lakala/hs-preorder' //预下单 const HsqueryPayByWechat = '/lakala/hs-trade-query' //查询交易结果 diff --git a/api/water_filter.js b/api/water_filter.js index 0f7f5fc..e39a8f3 100644 --- a/api/water_filter.js +++ b/api/water_filter.js @@ -10,13 +10,15 @@ const getdeviceListByid = '/wechat/water/device/parts-list' //根据id获取可 const createDeviceOrder = '/wechat/water/device/parts-buy' //创建配件购买订单 -const changeOrderState = '/wechat/water/device/pay-parts-buy' //变更滤芯订单状态 +const changeOrderState = '/wechat/water/pay-order-fail' // 已废弃 pay-parts-buy；失败回写请用 payFail / PayJs.payFail + const getOrderPayList = '/wechat/water/device/parts-buy-list' //滤芯购买记录 const getFilterChangeList = '/wechat/water/dealer/part-replace-list' //滤芯购买记录 -const resetFilter = '/waters/reset-filter' //重置滤芯 +const resetFilter = '/waters/reset-filter' // 经销商/师傅重置（管理端 JWT / atoken） +const resetFilterUser = '/wechat/water/device/reset-filter' // 用户重置（wechat 域 / ctoken） // const getUserBanlance = '/wechat/water/device/balance' //我的余额 @@ -220,6 +222,7 @@ const apiArr = { getOrderPayList, getFilterChangeList, resetFilter, + resetFilterUser, // getUserBanlance, getTotalBanlance, getOrderBuyList, diff --git a/app.js b/app.js index d6fd713..3f7ae19 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,8 @@ -import apiArr from './api/water_filter'; import util from './utils/util'; import apiAddr from '/api/base'; +// Page 注入 staticUrl（不包装 Component，避免 Vant wx://not-found） +require('./utils/inject-static.js') + App({ globalData: { @@ -14,42 +16,15 @@ App({ isShare: false, // 用于判断是否来源于分享 nav_list:[], foot_width:'20%', - appid: 'wx1addb25675dd8e70' + appid: 'wx77b22c0a0018e580', // 与 project.config.json 一致 + staticUrl: util.static_url, }, + // 社区页脚导航已废弃：原 apiArr.footer / successfn 未定义，启动必崩，故短路 getFootNav() { - console.log(789789); - let that = this; - // util.postUrl(apiArr.footer,{},res=>{ - // that.globalData.nav_list = res; - // that.globalData.foot_width = (100 / res.length).toFixed(2) + '%'; - // }) - wx.request({ - url: apiArr.footer, - data: {}, - method: 'POST', - header: { - 'content-type': 'application/x-www-form-urlencoded' - }, - success: f => { - console.log('successddd'); - if (f.data.code == "-101" || f.data.code == "-102") { - successfn(f.data); - } else if (f.data.code == "-103") { - successfn(f.data); - } else { - successfn(f.data); - } - }, - error: f => { - console.log('error'); - wx.showToast({ - title: '系统繁忙', - icon: 'none' - }) - } - }) + this.globalData.nav_list = [] + this.globalData.foot_width = '20%' }, onLaunch(options) { let that = this; diff --git a/app.json b/app.json index 29f7c74..24899fe 100644 --- a/app.json +++ b/app.json @@ -129,6 +129,7 @@ } ], "requiredPrivateInfos": [ + "getLocation" ], "window": { "backgroundTextStyle": "light", @@ -158,16 +159,16 @@ "van-datetime-picker": "/miniprogram_npm/vant-weapp/datetime-picker/index", "van-popup": "/miniprogram_npm/vant-weapp/popup/index", "van-circle": "/miniprogram_npm/vant-weapp/circle/index", - "van-checkbox": "/miniprogram_npm/vant-weapp/checkbox", - "van-checkbox-group": "/miniprogram_npm/vant-weapp/checkbox-group", + "van-checkbox": "/miniprogram_npm/vant-weapp/checkbox/index", + "van-checkbox-group": "/miniprogram_npm/vant-weapp/checkbox-group/index", "van-area": "/miniprogram_npm/vant-weapp/area/index", - "van-dropdown-menu": "/miniprogram_npm/vant-weapp/dropdown-menu", - "van-dropdown-item": "/miniprogram_npm/vant-weapp/dropdown-item", - "van-notice-bar": "/miniprogram_npm/vant-weapp/notice-bar", - "van-empty": "/miniprogram_npm/vant-weapp/empty", - "van-picker": "/miniprogram_npm/vant-weapp/picker", - "van-radio": "/miniprogram_npm/vant-weapp/radio", - "van-radio-group": "/miniprogram_npm/vant-weapp/radio-group", + "van-dropdown-menu": "/miniprogram_npm/vant-weapp/dropdown-menu/index", + "van-dropdown-item": "/miniprogram_npm/vant-weapp/dropdown-item/index", + "van-notice-bar": "/miniprogram_npm/vant-weapp/notice-bar/index", + "van-empty": "/miniprogram_npm/vant-weapp/empty/index", + "van-picker": "/miniprogram_npm/vant-weapp/picker/index", + "van-radio": "/miniprogram_npm/vant-weapp/radio/index", + "van-radio-group": "/miniprogram_npm/vant-weapp/radio-group/index", "van-stepper": "/miniprogram_npm/vant-weapp/stepper/index" }, "sitemapLocation": "sitemap.json", diff --git a/component/clientFooter/index.js b/component/clientFooter/index.js index 8aaacb6..be0ace3 100644 --- a/component/clientFooter/index.js +++ b/component/clientFooter/index.js @@ -1,50 +1,51 @@ -import apiAddr from '../../api/base'; -import { setData } from '../../utils/index'; - -Component({ - - /** - * 组件的属性列表 - */ - properties: { - - }, - - /** - * 组件的初始数据 - */ - data: { - nav_list:[ - { - url:"/pages/water_filter/water_filter", - nav_name:"设备", - photo:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/water_filter/deviceIcon.png" - }, - { - url:"/pages/info/info", - nav_name:"我的", - photo:"https://zhsq.hshuishang.com/attachs/navigation/2024/12/23/6768c0b16ce89.png" - }, - ], - foot_width:'50%', - }, - - /** - * 组件的方法列表 - */ - methods: { - jump(e){ - console.log(e); - wx.redirectTo({ - url: e.currentTarget.dataset.url, - }) - }, - - }, - - lifetimes: { - attached: function () { - // 组件被添加到页面节点树时执行 - }, - }, +import apiAddr from '../../api/base'; +import { setData } from '../../utils/index'; + +const __staticUrl = require('../../config/env.js').static_url +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + nav_list:[ + { + url:"/pages/water_filter/water_filter", + nav_name:"设备", + photo:(__staticUrl + '/water_filter/deviceIcon.png') + }, + { + url:"/pages/info/info", + nav_name:"我的", + photo:(__staticUrl + '/person/Group_309.png') + }, + ], + foot_width:'50%', + }, + + /** + * 组件的方法列表 + */ + methods: { + jump(e){ + console.log(e); + wx.redirectTo({ + url: e.currentTarget.dataset.url, + }) + }, + + }, + + lifetimes: { + attached: function () { + // 组件被添加到页面节点树时执行 + }, + }, }) \ No newline at end of file diff --git a/component/masterFooter/index.js b/component/masterFooter/index.js index 1c16fcd..da63f4c 100644 --- a/component/masterFooter/index.js +++ b/component/masterFooter/index.js @@ -1,50 +1,51 @@ -import apiAddr from '../../api/base'; -import { setData } from '../../utils/index'; - -Component({ - - /** - * 组件的属性列表 - */ - properties: { - - }, - - /** - * 组件的初始数据 - */ - data: { - nav_list:[ - { - url:"/packages/master/masterIndex/index", - nav_name:"首页", - photo:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/water_filter/partner/partner_icon3.png?1" - }, - { - url:"/packages/master/PersonCen/index", - nav_name:"我的", - photo:"https://zhsq.hshuishang.com/attachs/navigation/2024/12/23/6768c0b16ce89.png" - }, - ], - foot_width:'50%', - }, - - /** - * 组件的方法列表 - */ - methods: { - - jump(e){ - wx.redirectTo({ - url: e.currentTarget.dataset.url, - }) - }, - - }, - - lifetimes: { - attached: function () { - // 组件被添加到页面节点树时执行 - }, - }, +import apiAddr from '../../api/base'; +import { setData } from '../../utils/index'; + +const __staticUrl = require('../../config/env.js').static_url +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + nav_list:[ + { + url:"/packages/master/masterIndex/index", + nav_name:"首页", + photo:(__staticUrl + '/water_filter/partner/partner_icon3.png?1') + }, + { + url:"/packages/master/PersonCen/index", + nav_name:"我的", + photo:(__staticUrl + '/person/Group_309.png') + }, + ], + foot_width:'50%', + }, + + /** + * 组件的方法列表 + */ + methods: { + + jump(e){ + wx.redirectTo({ + url: e.currentTarget.dataset.url, + }) + }, + + }, + + lifetimes: { + attached: function () { + // 组件被添加到页面节点树时执行 + }, + }, }) \ No newline at end of file diff --git a/component/partnerFooter/index.js b/component/partnerFooter/index.js index ba08694..d710487 100644 --- a/component/partnerFooter/index.js +++ b/component/partnerFooter/index.js @@ -1,50 +1,51 @@ -import apiAddr from '../../api/base'; -import { setData } from '../../utils/index'; - -Component({ - - /** - * 组件的属性列表 - */ - properties: { - - }, - - /** - * 组件的初始数据 - */ - data: { - nav_list:[ - { - url:"/packages/partner/pages/partner", - nav_name:"首页", - photo:"https://wechat-img-file.oss-cn-beijing.aliyuncs.com/water_filter/partner/partner_icon3.png?1" - }, - { - url:"/packages/partner/pages/mine/mine", - nav_name:"我的", - photo:"https://zhsq.hshuishang.com/attachs/navigation/2024/12/23/6768c0b16ce89.png" - }, - ], - foot_width:'50%', - }, - - /** - * 组件的方法列表 - */ - methods: { - - jump(e){ - wx.redirectTo({ - url: e.currentTarget.dataset.url, - }) - }, - - }, - - lifetimes: { - attached: function () { - // 组件被添加到页面节点树时执行 - }, - }, +import apiAddr from '../../api/base'; +import { setData } from '../../utils/index'; + +const __staticUrl = require('../../config/env.js').static_url +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + nav_list:[ + { + url:"/packages/partner/pages/partner", + nav_name:"首页", + photo:(__staticUrl + '/water_filter/partner/partner_icon3.png?1') + }, + { + url:"/packages/partner/pages/mine/mine", + nav_name:"我的", + photo:(__staticUrl + '/person/Group_309.png') + }, + ], + foot_width:'50%', + }, + + /** + * 组件的方法列表 + */ + methods: { + + jump(e){ + wx.redirectTo({ + url: e.currentTarget.dataset.url, + }) + }, + + }, + + lifetimes: { + attached: function () { + // 组件被添加到页面节点树时执行 + }, + }, }) \ No newline at end of file diff --git a/component/search/index.js b/component/search/index.js index 432bf48..5718751 100644 --- a/component/search/index.js +++ b/component/search/index.js @@ -1,5 +1,6 @@ import { doNavigateWithUser } from '../../utils/helper'; import apiAddr from '../../api/base'; +const env = require('../../config/env.js') const app = getApp(); Component({ @@ -15,6 +16,7 @@ Component({ * 组件的初始数据 */ data: { + staticUrl: env.static_url, qqmap_key: app.initQQMapKey(), address: '定位中', selectKeyWord: '', diff --git a/component/search/index.wxml b/component/search/index.wxml index 7f1f64a..26e9782 100644 --- a/component/search/index.wxml +++ b/component/search/index.wxml @@ -1,21 +1,21 @@ - - - - {{address}} - - - - - - - - - + + + + {{address}} + + + + + + + + + \ No newline at end of file diff --git a/component/tabularCard/index.js b/component/tabularCard/index.js index b3a53f4..7377e7c 100644 --- a/component/tabularCard/index.js +++ b/component/tabularCard/index.js @@ -1,6 +1,6 @@ import { doNavigateWithUser } from '../../utils/helper'; import { isObjEmpty } from '../../utils/index'; -import { img_url } from '../../utils/util'; +import { static_url } from '../../utils/util'; Component({ @@ -32,7 +32,8 @@ Component({ * 组件的初始数据 */ data: { - picUrl: img_url, + picUrl: static_url, + staticUrl: static_url, }, /** diff --git a/component/tabularCard/index.wxml b/component/tabularCard/index.wxml index 3453861..bce503a 100644 --- a/component/tabularCard/index.wxml +++ b/component/tabularCard/index.wxml @@ -1,31 +1,31 @@ - - - - - {{item.name}} - {{item.distance}} - - 物业公司：{{item.shop.shop_name}} - - - - {{item.addr}} - - - - - - - 导航 - - - - 电话 - - - 前往预定 - 进入小区 - 选择小区 - - + + + + + {{item.name}} + {{item.distance}} + + 物业公司：{{item.shop.shop_name}} + + + + {{item.addr}} + + + + + + + 导航 + + + + 电话 + + + 前往预定 + 进入小区 + 选择小区 + + \ No newline at end of file diff --git a/config/env.js b/config/env.js new file mode 100644 index 0000000..45e9c61 --- /dev/null +++ b/config/env.js @@ -0,0 +1,55 @@ +/** + * 净水机小程序环境（仅本小程序） + * + * APP_ENV: + * local — 本机 8120（需开发者工具勾选「不校验合法域名」） + * test — 测试网关 + * prod — 生产网关（正式版 / 体验版发版必须用 prod） + * + * 静态资源：统一 https://static.hshuishang.com + */ +const APP_ENV = 'local' // local | test | prod（正式/体验版必须 prod；本机联调改为 local） + +const STATIC_URL = 'https://static.hshuishang.com' +const ALIYUN_OSS_URL = 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com' + +const API = { + local: { + server_url: 'http://127.0.0.1:8120/api/v1', + api_host: 'http://127.0.0.1:8120', + }, + test: { + server_url: 'https://test.hshuishang.com/api/v1', + api_host: 'https://test.hshuishang.com', + }, + prod: { + server_url: 'https://api.hshuishang.com/api/v1', + api_host: 'https://api.hshuishang.com', + }, +} + +if (!API[APP_ENV]) { + throw new Error('config/env.js: APP_ENV must be local|test|prod, got ' + APP_ENV) +} + +const api = API[APP_ENV] +const USE_LOCAL = APP_ENV === 'local' + +module.exports = { + APP_ENV, + USE_LOCAL, + STATIC_URL, + CDN: { + development: { static_url: STATIC_URL, aliyun_oss_url: ALIYUN_OSS_URL }, + production: { static_url: STATIC_URL, aliyun_oss_url: ALIYUN_OSS_URL }, + }, + ENV: { + local: { ...API.local, static_url: STATIC_URL, aliyun_oss_url: ALIYUN_OSS_URL }, + test: { ...API.test, static_url: STATIC_URL, aliyun_oss_url: ALIYUN_OSS_URL }, + prod: { ...API.prod, static_url: STATIC_URL, aliyun_oss_url: ALIYUN_OSS_URL }, + }, + server_url: api.server_url, + img_url: api.api_host, + static_url: STATIC_URL, + aliyun_oss_url: ALIYUN_OSS_URL, +} diff --git a/packages/WaterPurifier/pages/Addfriend/Addfriend.js b/packages/WaterPurifier/pages/Addfriend/Addfriend.js index f26b30d..cc4d4c6 100644 --- a/packages/WaterPurifier/pages/Addfriend/Addfriend.js +++ b/packages/WaterPurifier/pages/Addfriend/Addfriend.js @@ -1,138 +1,139 @@ -let util = require('../../../../utils/util') -let apiArr = require('../../../../api/water_filter') -// packages/WaterPurifier/pages/Addfriend/Addfriend.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - save() { - wx.downloadFile({ - url: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/water_filter/customer.jpg', - success(res) { - if (res.statusCode === 200) { - const tempFilePath = res.tempFilePath; // 获取临时文件路径 - - // 保存图片到相册 - wx.saveImageToPhotosAlbum({ - filePath: tempFilePath, - success() { - wx.showToast({ - title: '保存成功', - icon: 'success', - }); - }, - fail(err) { - console.error('保存失败', err); - wx.showToast({ - title: '保存失败，请重试', - icon: 'none', - }); - }, - }); - } - }, - fail(err) { - console.error('下载失败', err); - wx.showToast({ - title: '下载失败，请重试', - icon: 'none', - }); - }, - }); - }, - - getServerInfo() { - let that = this - util.postUrl(apiArr.cusGetServerInfo, { - device_id:wx.getStorageSync('device_id') - }, res => { - res.qr_code = res.qr_code.startsWith('http') ? res.qr_code : util.img_url + res.qr_code - console.log(res.qr_code); - that.setData({ - serverInfo: res - }) - }) - }, - call(){ - let that = this - wx.makePhoneCall({ - phoneNumber: that.data.serverInfo.customer_phone, - }) - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - wx.showShareMenu({ - withShareTicket: true, - menus: ['shareAppMessage', 'shareTimeline'] - }) - this.getServerInfo() - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - 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' // 自定义分享图片路径 - } - }, +let util = require('../../../../utils/util') +let apiArr = require('../../../../api/water_filter') +// packages/WaterPurifier/pages/Addfriend/Addfriend.js +const __staticUrl = require('../../../../config/env.js').static_url +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + save() { + wx.downloadFile({ + url: (__staticUrl + '/water_filter/customer.jpg'), + success(res) { + if (res.statusCode === 200) { + const tempFilePath = res.tempFilePath; // 获取临时文件路径 + + // 保存图片到相册 + wx.saveImageToPhotosAlbum({ + filePath: tempFilePath, + success() { + wx.showToast({ + title: '保存成功', + icon: 'success', + }); + }, + fail(err) { + console.error('保存失败', err); + wx.showToast({ + title: '保存失败，请重试', + icon: 'none', + }); + }, + }); + } + }, + fail(err) { + console.error('下载失败', err); + wx.showToast({ + title: '下载失败，请重试', + icon: 'none', + }); + }, + }); + }, + + getServerInfo() { + let that = this + util.postUrl(apiArr.cusGetServerInfo, { + device_id:wx.getStorageSync('device_id') + }, res => { + res.qr_code = res.qr_code.startsWith('http') ? res.qr_code : util.img_url + res.qr_code + console.log(res.qr_code); + that.setData({ + serverInfo: res + }) + }) + }, + call(){ + let that = this + wx.makePhoneCall({ + phoneNumber: that.data.serverInfo.customer_phone, + }) + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + wx.showShareMenu({ + withShareTicket: true, + menus: ['shareAppMessage', 'shareTimeline'] + }) + this.getServerInfo() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + return { + title: '人人爱净水', // 分享卡片标题（必填） + path: '/pages/water_filter/water_filter', // 用户点击后跳转的路径（可选，默认当前页） + imageUrl: (__staticUrl + '/share.png') // 自定义图片（可选，比例建议 5:4） + } + }, + onShareTimeline() { + return { + title: '人人爱净水', // 自定义标题 + query: '', // 自定义页面路径中的参数 + imageUrl: (__staticUrl + '/share.png') // 自定义分享图片路径 + } + }, }) \ No newline at end of file diff --git a/packages/WaterPurifier/pages/Buyfilter/Buyfilter.js b/packages/WaterPurifier/pages/Buyfilter/Buyfilter.js index a548131..d1fac8e 100644 --- a/packages/WaterPurifier/pages/Buyfilter/Buyfilter.js +++ b/packages/WaterPurifier/pages/Buyfilter/Buyfilter.js @@ -1,411 +1,412 @@ -let util = require('../../../../utils/util') -let apiArr = require('../../../../api/water_filter') -let PayJs = require('../../../../api/pay') - -const app = getApp() -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, //弹出层 - - name: "", - phone: "", - area: "", - address: "", - message: "", - - page_num: 1, - page_size: 10, - flag: false, - PartsList: [], - currentId: [], - currentName: [], - price: 0, - - 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 => { - 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 - }) - - }, - - //选择地区 - 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) { - that.getPartsByid() - } - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } +let util = require('../../../../utils/util') +let apiArr = require('../../../../api/water_filter') +let PayJs = require('../../../../api/pay') + +const app = getApp() +import { areaList } from '../../data/index'; + +const __staticUrl = require('../../../../config/env.js').static_url +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, //弹出层 + + name: "", + phone: "", + area: "", + address: "", + message: "", + + page_num: 1, + page_size: 10, + flag: false, + PartsList: [], + currentId: [], + currentName: [], + price: 0, + + 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 => { + 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.order_no || that.data.orderMsg.OrderNo + }, res => { + if (res.statusCode == '200') { + wx.showToast({ + title: '支付成功！', + }) + setTimeout(() => { + wx.navigateBack({ delta: 1 }) + }, 800) + } 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 + }) + + }, + + //选择地区 + 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: (__staticUrl + '/share.png') // 自定义图片（可选，比例建议 5:4） + } + }, + onShareTimeline() { + return { + title: '人人爱净水', // 自定义标题 + query: '', // 自定义页面路径中的参数 + imageUrl: (__staticUrl + '/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() { + + } }) \ No newline at end of file diff --git a/packages/WaterPurifier/pages/Maintenance/Maintenance.js b/packages/WaterPurifier/pages/Maintenance/Maintenance.js index 386e287..1a104f1 100644 --- a/packages/WaterPurifier/pages/Maintenance/Maintenance.js +++ b/packages/WaterPurifier/pages/Maintenance/Maintenance.js @@ -1,184 +1,185 @@ -const apiArr = require("~/api/water_filter"); -import util, { postUrl } from '../../../../utils/util'; - -const app = getApp() - -// pages/water_filter/Maintenance/Maintenance.js -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, // 胶囊高度 - tabIndex: 1, - - status: '0', //0全部，1待处理 2处理中 3已完成 - page_num: 1, - page_size: 10, - isLoading: false, // 是否正在加载 - hasMore: true, // 是否还有更多数据 - statusType: "", - BxList: [] //报修列表 - }, - async changeTab(e) { - console.log(e); - let that = this - that.setData({ - status: e.target.dataset.index - }) - const statusType = e.target.dataset.index; - this.setData({ - BxList: [], - page_num: 1, - statusType - }) - that.getBxList(statusType); - }, - - repair() { - let that = this - wx.navigateTo({ - url: '../repair/repair', - }) - }, - - handleInfoClick(e) { - wx.navigateTo({ - url: `../MaintenanceInfo/MaintenanceInfo?repairId=${e.currentTarget.dataset.id}`, - }) - }, - - //报修列表 - getBxList(statusType) { - let that = this - const { page_size, page_num, BxList } = this.data; - let params = {}; - if (statusType === '0') { - params = { - page_size: page_size, - page_num: page_num, - user_id: Number(wx.getStorageSync('userId')) - } - } else { - params = { - page_size: page_size, - page_num: page_num, - status: Number(statusType), - user_id: Number(wx.getStorageSync('userId')) - } - } - wx.showLoading({ - title: '加载中...', - mask: true - }) - postUrl(apiArr.BXList, params, res => { - wx.hideLoading() - if (res.rows) { - res.rows.forEach(item => { - item.product_icon = util.img_url + item.product_icon - item.create_time = item.create_time.slice(0, 16) - if (item.fault_imgs) { - item.fault_imgs = util.img_url + item.fault_imgs - } - }) - } - if (that.data.page_num == 1) { - that.setData({ - BxList: [] - }) - } - this.setData({ - BxList: BxList.concat(res.rows || []), - total: res.total, - page_num: page_num + 1, - isLoading: false, - hasMore: res.total === this.data.page_size, - }) - }) - }, - - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - // let that = this - // that.getBxList() - wx.showShareMenu({ - withShareTicket: true, - menus: ['shareAppMessage', 'shareTimeline'] - }) - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - let that = this; - that.setData({ - page_num: 1, - flag: false, - BxList: [] - }) - setTimeout(() => { - that.getBxList(that.data.statusType) - }, 10) - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - 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' // 自定义分享图片路径 - } - }, +const apiArr = require("~/api/water_filter"); +import util, { postUrl } from '../../../../utils/util'; + +const app = getApp() + +// pages/water_filter/Maintenance/Maintenance.js +const __staticUrl = require('../../../../config/env.js').static_url +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, // 胶囊高度 + tabIndex: 1, + + status: '0', //0全部，1待处理 2处理中 3已完成 + page_num: 1, + page_size: 10, + isLoading: false, // 是否正在加载 + hasMore: true, // 是否还有更多数据 + statusType: "", + BxList: [] //报修列表 + }, + async changeTab(e) { + console.log(e); + let that = this + that.setData({ + status: e.target.dataset.index + }) + const statusType = e.target.dataset.index; + this.setData({ + BxList: [], + page_num: 1, + statusType + }) + that.getBxList(statusType); + }, + + repair() { + let that = this + wx.navigateTo({ + url: '../repair/repair', + }) + }, + + handleInfoClick(e) { + wx.navigateTo({ + url: `../MaintenanceInfo/MaintenanceInfo?repairId=${e.currentTarget.dataset.id}`, + }) + }, + + //报修列表 + getBxList(statusType) { + let that = this + const { page_size, page_num, BxList } = this.data; + let params = {}; + if (statusType === '0') { + params = { + page_size: page_size, + page_num: page_num, + user_id: Number(wx.getStorageSync('userId')) + } + } else { + params = { + page_size: page_size, + page_num: page_num, + status: Number(statusType), + user_id: Number(wx.getStorageSync('userId')) + } + } + wx.showLoading({ + title: '加载中...', + mask: true + }) + postUrl(apiArr.BXList, params, res => { + wx.hideLoading() + if (res.rows) { + res.rows.forEach(item => { + item.product_icon = util.img_url + item.product_icon + item.create_time = item.create_time.slice(0, 16) + if (item.fault_imgs) { + item.fault_imgs = util.img_url + item.fault_imgs + } + }) + } + if (that.data.page_num == 1) { + that.setData({ + BxList: [] + }) + } + this.setData({ + BxList: BxList.concat(res.rows || []), + total: res.total, + page_num: page_num + 1, + isLoading: false, + hasMore: res.total === this.data.page_size, + }) + }) + }, + + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + // let that = this + // that.getBxList() + wx.showShareMenu({ + withShareTicket: true, + menus: ['shareAppMessage', 'shareTimeline'] + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + let that = this; + that.setData({ + page_num: 1, + flag: false, + BxList: [] + }) + setTimeout(() => { + that.getBxList(that.data.statusType) + }, 10) + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + return { + title: '人人爱净水', // 分享卡片标题（必填） + path: '/pages/water_filter/water_filter', // 用户点击后跳转的路径（可选，默认当前页） + imageUrl: (__staticUrl + '/share.png') // 自定义图片（可选，比例建议 5:4） + } + }, + onShareTimeline() { + return { + title: '人人爱净水', // 自定义标题 + query: '', // 自定义页面路径中的参数 + imageUrl: (__staticUrl + '/share.png') // 自定义分享图片路径 + } + }, }) \ No newline at end of file diff --git a/packages/WaterPurifier/pages/Maintenance/Maintenance.wxml b/packages/WaterPurifier/pages/Maintenance/Maintenance.wxml index aba1ddc..c924dc7 100644 --- a/packages/WaterPurifier/pages/Maintenance/Maintenance.wxml +++ b/packages/WaterPurifier/pages/Maintenance/Maintenance.wxml @@ -1,51 +1,51 @@ - - - - - - 全部 - 待处理 - 处理中 - 已完成 - 已撤销 - - - - - - - - - - {{item.device_code}} - - 提交时间：{{item.create_time}} - - - 期望上门：{{item.appointment_time}} - - - 待处理 - 已完成 - 处理中 - 已撤销 - - - - - - - - 我要报修 - + + + + + + 全部 + 待处理 + 处理中 + 已完成 + 已撤销 + + + + + + + + + + {{item.device_code}} + + 提交时间：{{item.create_time}} + + + 期望上门：{{item.appointment_time}} + + + 待处理 + 已完成 + 处理中 + 已撤销 + + + + + + + + 我要报修 + \ No newline at end of file diff --git a/packages/WaterPurifier/pages/MaintenanceInfo/MaintenanceInfo.wxml b/packages/WaterPurifier/pages/MaintenanceInfo/MaintenanceInfo.wxml index c760c41..d3f1474 100644 --- a/packages/WaterPurifier/pages/MaintenanceInfo/MaintenanceInfo.wxml +++ b/packages/WaterPurifier/pages/MaintenanceInfo/MaintenanceInfo.wxml @@ -1,43 +1,43 @@ - - - - - - 设备信息 - 设备编码: {{repairInfo.device_code}} - - - 故障信息 - 报修单号{{repairInfo.repair_no}} - 故障描述{{repairInfo.fault_desc}} - 报修人 {{repairInfo.customer_name}} - - - - 报修人电话 - {{repairInfo.repairman_phone}} - - - - - - - - - 报修地址 - {{repairInfo.region}}{{repairInfo.address}} - - - - - - - 报修时间{{repairInfo.create_time}} - - - - - - - + + + + + + 设备信息 + 设备编码: {{repairInfo.device_code}} + + + 故障信息 + 报修单号{{repairInfo.repair_no}} + 故障描述{{repairInfo.fault_desc}} + 报修人 {{repairInfo.customer_name}} + + + + 报修人电话 + {{repairInfo.repairman_phone}} + + + + + + + + + 报修地址 + {{repairInfo.region}}{{repairInfo.address}} + + + + + + + 报修时间{{repairInfo.create_time}} + + + + + + + \ No newline at end of file diff --git a/packages/WaterPurifier/pages/Recharge/Recharge.js b/packages/WaterPurifier/pages/Recharge/Recharge.js index 6bb5cdb..3acef5b 100644 --- a/packages/WaterPurifier/pages/Recharge/Recharge.js +++ b/packages/WaterPurifier/pages/Recharge/Recharge.js @@ -1,411 +1,412 @@ -let util = require('../../../../utils/util') -let apiArr = require('../../../../api/water_filter') -import { areaList } from '../../data/index'; - -let PayJs = require('../../../../api/pay') - -// pages/water_filter/Recharge/Recharge.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - name: "", - phone: "", - area: "", - address: "", - show: false, - areaList, - - active: 0, - page_size: 10, - page_num: 1, - flag: false, - packageList: [], - price: 0, - selectPackage: { - discounted_price: 0 - }, - orderMsg: "", - goodsMsg: "", - currentDevice: '' - }, - //充值记录 - RechargeRecord() { - let that = this - wx.navigateTo({ - url: '../RechargeRecord/RechargeRecord', - }) - }, - changelog(e) { - let that = this - that.setData({ - active: e.currentTarget.dataset.catlog - }) - }, - - getPackageList() { - wx.showLoading({ - title: '加载中...', - mask: true - }) - let that = this - that.setData({ - currentDevice: wx.getStorageSync('currentDevice') - }) - - util.postUrl(apiArr.getpackageList, { - device_id: that.data.currentDevice.device_id - }, res => { - wx.hideLoading() - res.package_icon = util.img_url + res.package_icon - that.setData({ - packageList: res - }) - }) - }, - - - onChange(e) { - let that = this - let packageList = that.data.packageList - let selectPackage = that.data.selectPackage - - packageList.checked = e.detail - - if (e.detail) { - selectPackage.discounted_price = packageList.suggested_price - } else { - selectPackage.discounted_price = 0 - } - - that.setData({ - packageList, - selectPackage - }) - }, - - account2() { - let that = this - if (that.data.selectPackage.discounted_price == '0') { - wx.showToast({ - title: '请选择套餐', - icon: "none" - }) - return - } - util.postUrl(apiArr.createPackageOrder, { - device_id: that.data.currentDevice.device_id, - package_id: that.data.packageList.package_id - }, res => { - - that.setData({ - orderMsg: res - }) - that.getGoodsMsg() - - }) - }, - - account() { - let that = this - console.log(that.data.selectPackage); - if (that.data.selectPackage.discounted_price == '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 - } - util.postUrl(apiArr.createPackageOrder, { - billing_method: Number(that.data.packageList.package_type), - is_new: 1, - order_name: that.data.packageList.package_name, - total_price: Number(that.data.packageList.suggested_price), - package_id: that.data.packageList.package_id, - device_customer_name: that.data.name, - device_customer_phone: that.data.phone, - device_customer_addr: that.data.area + that.data.address, - user_id: Number(wx.getStorageSync('userId')) - }, res => { - console.log(res, '1123213'); - that.setData({ - orderMsg: res - }) - that.getGoodsMsg() - }) - }, - //获取商户id - getGoodsMsg() { - let that = this - util.postUrl(apiArr.getCurrentShopMsg, { - dealer_id: Number(that.data.packageList.dealer_id), - user_id: Number(wx.getStorageSync('userId')), - shop_id: Number(wx.getStorageSync('shopId')), - }, res => { - that.setData({ - goodsMsg: res - }) - that.pay() - }) - }, - //预支付 - pay() { - let that = this - util.postUrl2(PayJs.pay, { - address: that.data.area + that.data.address, - goods_id: that.data.orderMsg.order_id, - remark: "", - subject: that.data.orderMsg.order_name, - term_no: that.data.goodsMsg.term_no, - total_amount: String(that.data.packageList.suggested_price * 100), - // total_amount:String(1), - user: String(wx.getStorageSync('userId')), - merchant_no: that.data.goodsMsg.merchant_no, - out_trade_no: String(that.data.orderMsg.order_no), - user_id: wx.getStorageSync('openId') - }, res => { - const { resp_data, msg } = res.data.data - 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.errMsg); - if(fal.errMsg == 'requestPayment:fail cancel'){ - that.payFail(2) - }else{ - that.payFail(1) - } - } - }) - } - - }) - }, - - //查询支付结果 - 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.order_no - }, res => { - if (res.statusCode == '200') { - wx.showToast({ - title: '支付成功！', - }) - - // wx.requestSubscribeMessage({ - // tmplIds: ["2BX7Zh5ccLzmHvvbCHuPWiaoZQyDCGfziCruxUct_EU"], - // success(res) { - // if (res['2BX7Zh5ccLzmHvvbCHuPWiaoZQyDCGfziCruxUct_EU'] === 'accept') { - // console.log('用户同意订阅'); - // // 调用后端接口保存用户订阅状态 - // } - // }, - // }) - - setTimeout(() => { - wx.navigateBack({ - delta: 1 - }) - }, 1500) - - } else { - wx.showToast({ - title: res.msg, - }) - } - }) - }, - - 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({ - 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 - }) - }, - - 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 - }) - }, - - onShareTimeline() { - return { - title: '人人爱净水', // 自定义标题 - query: '', // 自定义页面路径中的参数 - imageUrl: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/share.png' // 自定义分享图片路径 - } - }, - onShareAppMessage() { - return { - title: '人人爱净水', // 分享卡片标题（必填） - path: '/pages/water_filter/water_filter', // 用户点击后跳转的路径（可选，默认当前页） - imageUrl: 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/share.png' // 自定义图片（可选，比例建议 5:4） - } - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - let that = this - that.setData({ - phone: wx.getStorageSync('phone') - }) - that.getPackageList() - wx.showShareMenu({ - withShareTicket: true, - menus: ['shareAppMessage', 'shareTimeline'] - }) - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - let that = this - if (that.data.flag) { - that.getPackageList() - } - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } +let util = require('../../../../utils/util') +let apiArr = require('../../../../api/water_filter') +import { areaList } from '../../data/index'; + +let PayJs = require('../../../../api/pay') + +// pages/water_filter/Recharge/Recharge.js +const __staticUrl = require('../../../../config/env.js').static_url +Page({ + + /** + * 页面的初始数据 + */ + data: { + name: "", + phone: "", + area: "", + address: "", + show: false, + areaList, + + active: 0, + page_size: 10, + page_num: 1, + flag: false, + packageList: [], + price: 0, + selectPackage: { + discounted_price: 0 + }, + orderMsg: "", + goodsMsg: "", + currentDevice: '' + }, + //充值记录 + RechargeRecord() { + let that = this + wx.navigateTo({ + url: '../RechargeRecord/RechargeRecord', + }) + }, + changelog(e) { + let that = this + that.setData({ + active: e.currentTarget.dataset.catlog + }) + }, + + getPackageList() { + wx.showLoading({ + title: '加载中...', + mask: true + }) + let that = this + that.setData({ + currentDevice: wx.getStorageSync('currentDevice') + }) + + util.postUrl(apiArr.getpackageList, { + device_id: that.data.currentDevice.device_id + }, res => { + wx.hideLoading() + res.package_icon = util.img_url + res.package_icon + that.setData({ + packageList: res + }) + }) + }, + + + onChange(e) { + let that = this + let packageList = that.data.packageList + let selectPackage = that.data.selectPackage + + packageList.checked = e.detail + + if (e.detail) { + selectPackage.discounted_price = packageList.suggested_price + } else { + selectPackage.discounted_price = 0 + } + + that.setData({ + packageList, + selectPackage + }) + }, + + account2() { + let that = this + if (that.data.selectPackage.discounted_price == '0') { + wx.showToast({ + title: '请选择套餐', + icon: "none" + }) + return + } + util.postUrl(apiArr.createPackageOrder, { + device_id: that.data.currentDevice.device_id, + package_id: that.data.packageList.package_id + }, res => { + + that.setData({ + orderMsg: res + }) + that.getGoodsMsg() + + }) + }, + + account() { + let that = this + console.log(that.data.selectPackage); + if (that.data.selectPackage.discounted_price == '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 + } + util.postUrl(apiArr.createPackageOrder, { + billing_method: Number(that.data.packageList.package_type), + is_new: 1, + order_name: that.data.packageList.package_name, + total_price: Number(that.data.packageList.suggested_price), + package_id: that.data.packageList.package_id, + device_customer_name: that.data.name, + device_customer_phone: that.data.phone, + device_customer_addr: that.data.area + that.data.address, + user_id: Number(wx.getStorageSync('userId')) + }, res => { + console.log(res, '1123213'); + that.setData({ + orderMsg: res + }) + that.getGoodsMsg() + }) + }, + //获取商户id + getGoodsMsg() { + let that = this + util.postUrl(apiArr.getCurrentShopMsg, { + dealer_id: Number(that.data.packageList.dealer_id), + user_id: Number(wx.getStorageSync('userId')), + shop_id: Number(wx.getStorageSync('shopId')), + }, res => { + that.setData({ + goodsMsg: res + }) + that.pay() + }) + }, + //预支付 + pay() { + let that = this + util.postUrl2(PayJs.pay, { + address: that.data.area + that.data.address, + goods_id: that.data.orderMsg.order_id, + remark: "", + subject: that.data.orderMsg.order_name, + term_no: that.data.goodsMsg.term_no, + total_amount: String(that.data.packageList.suggested_price * 100), + // total_amount:String(1), + user: String(wx.getStorageSync('userId')), + merchant_no: that.data.goodsMsg.merchant_no, + out_trade_no: String(that.data.orderMsg.order_no), + user_id: wx.getStorageSync('openId') + }, res => { + const { resp_data, msg } = res.data.data + 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.errMsg); + if(fal.errMsg == 'requestPayment:fail cancel'){ + that.payFail(2) + }else{ + that.payFail(1) + } + } + }) + } + + }) + }, + + //查询支付结果 + 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.order_no + }, res => { + if (res.statusCode == '200') { + wx.showToast({ + title: '支付成功！', + }) + + // wx.requestSubscribeMessage({ + // tmplIds: ["2BX7Zh5ccLzmHvvbCHuPWiaoZQyDCGfziCruxUct_EU"], + // success(res) { + // if (res['2BX7Zh5ccLzmHvvbCHuPWiaoZQyDCGfziCruxUct_EU'] === 'accept') { + // console.log('用户同意订阅'); + // // 调用后端接口保存用户订阅状态 + // } + // }, + // }) + + setTimeout(() => { + wx.navigateBack({ + delta: 1 + }) + }, 1500) + + } else { + wx.showToast({ + title: res.msg, + }) + } + }) + }, + + 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({ + 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 + }) + }, + + 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 + }) + }, + + onShareTimeline() { + return { + title: '人人爱净水', // 自定义标题 + query: '', // 自定义页面路径中的参数 + imageUrl: (__staticUrl + '/share.png') // 自定义分享图片路径 + } + }, + onShareAppMessage() { + return { + title: '人人爱净水', // 分享卡片标题（必填） + path: '/pages/water_filter/water_filter', // 用户点击后跳转的路径（可选，默认当前页） + imageUrl: (__staticUrl + '/share.png') // 自定义图片（可选，比例建议 5:4） + } + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let that = this + that.setData({ + phone: wx.getStorageSync('phone') + }) + that.getPackageList() + wx.showShareMenu({ + withShareTicket: true, + menus: ['shareAppMessage', 'shareTimeline'] + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + let that = this + if (that.data.flag) { + that.getPackageList() + } + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } }) \ No newline at end of file diff --git a/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.js b/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.js index c8d8c1f..1787441 100644 --- a/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.js +++ b/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.js @@ -1,288 +1,289 @@ -// pages/water_filter/RechargeRecord/RechargeRecord.js -const app = getApp() -let util = require('../../../../utils/util') -let apiArr = require('../../../../api/water_filter') -let PayJs = require('../../../../api/pay') - - -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, // 胶囊高度 - page_num: 1, - page_size: 10, - flag: false, - List: [], - currentDevice:"", - tab: [ - { - name: "全部", - type: "0" - }, - { - name: "待支付", - type: "1" - }, - { - name: "已支付", - type: "4" - }, - { - name: "已取消", - type: "5" - }, - ], - state: 0, - selectPackage: "" - }, - - - - changeTab(e) { - console.log(e); - let that = this - that.setData({ - state: e.currentTarget.dataset.tab, - flag: false, - page_num: 1, - List: [] - }) - that.getPayList() - }, - - getPayList() { - let that = this - wx.showLoading({ - title: '加载中...', - mask:true - }) - util.postUrl(apiArr.getOrderBuyList, { - page_num: that.data.page_num, - page_size: that.data.page_size, - status: that.data.state, - user_id: Number(wx.getStorageSync('userId')), - dealer_id:that.data.currentDevice.dealer_id - }, res => { - wx.hideLoading() - if (res.rows) { - let flag - if (res.rows.length == that.data.page_size) { - flag = true - } else { - flag = false - } - res.rows.forEach(item => { - console.log(item, 'item'); - if (item.part_list) { - item.part_ids = item.part_list.map(items => items.parts_id).join(',') - } - }) - that.setData({ - flag, - List: that.data.List.concat(res.rows || []), - page_num: that.data.page_num + 1 - }) - } - }) - }, - - pay2(e) { - let that = this - that.setData({ - selectPackage: e.currentTarget.dataset.item - }) - that.pay3() - }, - - pay3() { - let that = this - util.postUrl(apiArr.createPackageOrder, { - - device_id:that.data.currentDevice.device_id, - package_id:that.data.currentDevice.package_id - - }, res => { - console.log(res,'asdasd'); - that.setData({ - orderMsg: res - }) - console.log(that.data.orderMsg.order_no); - that.getGoodsMsg() - }) - }, - - //获取商户id - getGoodsMsg() { - let that = this - util.postUrl(apiArr.getCurrentShopMsg, { - dealer_id: Number(that.data.selectPackage.dealer_id), - shop_id: Number(wx.getStorageSync('shopId')), - }, res => { - that.setData({ - goodsMsg: res - }) - that.pay() - }) - }, - //预支付 - pay() { - let that = this - util.postUrl2(PayJs.pay, { - address: '', - goods_id: that.data.orderMsg.order_name, - remark: "", - subject: that.data.orderMsg.order_name, - term_no: that.data.goodsMsg.term_no, - total_amount:String(that.data.selectPackage.total_price * 100), - // total_amount: String(1), - user: String(wx.getStorageSync('userId')), - merchant_no: that.data.goodsMsg.merchant_no, - out_trade_no: String(that.data.orderMsg.order_no), - user_id: wx.getStorageSync('openId'), - }, res => { - const { resp_data, msg } = res.data.data - 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.order_id, - type: "2", - 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.showToast({ - title: '支付成功！', - }) - that.setData({ - flag: false, - page_num: 1, - List: [] - }) - this.getPayList() - } else { - wx.showToast({ - title: res.msg, - }) - } - }) - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - let that = this - that.setData({ - currentDevice:wx.getStorageSync('currentDevice') - }) - that.getPayList() - wx.showShareMenu({ - withShareTicket: true, - menus: ['shareAppMessage', 'shareTimeline'] - }) - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - let that = this - if (that.data.flag) { - that.getPayList() - } - }, - - /** - * 用户点击右上角分享 - */ - 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' // 自定义分享图片路径 - } - }, +// pages/water_filter/RechargeRecord/RechargeRecord.js +const app = getApp() +let util = require('../../../../utils/util') +let apiArr = require('../../../../api/water_filter') +let PayJs = require('../../../../api/pay') + + +const __staticUrl = require('../../../../config/env.js').static_url +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, // 胶囊高度 + page_num: 1, + page_size: 10, + flag: false, + List: [], + currentDevice:"", + tab: [ + { + name: "全部", + type: "0" + }, + { + name: "待支付", + type: "1" + }, + { + name: "已支付", + type: "4" + }, + { + name: "已取消", + type: "5" + }, + ], + state: 0, + selectPackage: "" + }, + + + + changeTab(e) { + console.log(e); + let that = this + that.setData({ + state: e.currentTarget.dataset.tab, + flag: false, + page_num: 1, + List: [] + }) + that.getPayList() + }, + + getPayList() { + let that = this + wx.showLoading({ + title: '加载中...', + mask:true + }) + util.postUrl(apiArr.getOrderBuyList, { + page_num: that.data.page_num, + page_size: that.data.page_size, + status: that.data.state, + user_id: Number(wx.getStorageSync('userId')), + dealer_id:that.data.currentDevice.dealer_id + }, res => { + wx.hideLoading() + if (res.rows) { + let flag + if (res.rows.length == that.data.page_size) { + flag = true + } else { + flag = false + } + res.rows.forEach(item => { + console.log(item, 'item'); + if (item.part_list) { + item.part_ids = item.part_list.map(items => items.parts_id).join(',') + } + }) + that.setData({ + flag, + List: that.data.List.concat(res.rows || []), + page_num: that.data.page_num + 1 + }) + } + }) + }, + + pay2(e) { + let that = this + that.setData({ + selectPackage: e.currentTarget.dataset.item + }) + that.pay3() + }, + + pay3() { + let that = this + util.postUrl(apiArr.createPackageOrder, { + + device_id:that.data.currentDevice.device_id, + package_id:that.data.currentDevice.package_id + + }, res => { + console.log(res,'asdasd'); + that.setData({ + orderMsg: res + }) + console.log(that.data.orderMsg.order_no); + that.getGoodsMsg() + }) + }, + + //获取商户id + getGoodsMsg() { + let that = this + util.postUrl(apiArr.getCurrentShopMsg, { + dealer_id: Number(that.data.selectPackage.dealer_id), + shop_id: Number(wx.getStorageSync('shopId')), + }, res => { + that.setData({ + goodsMsg: res + }) + that.pay() + }) + }, + //预支付 + pay() { + let that = this + util.postUrl2(PayJs.pay, { + address: '', + goods_id: that.data.orderMsg.order_name, + remark: "", + subject: that.data.orderMsg.order_name, + term_no: that.data.goodsMsg.term_no, + total_amount:String(that.data.selectPackage.total_price * 100), + // total_amount: String(1), + user: String(wx.getStorageSync('userId')), + merchant_no: that.data.goodsMsg.merchant_no, + out_trade_no: String(that.data.orderMsg.order_no), + user_id: wx.getStorageSync('openId'), + }, res => { + const { resp_data, msg } = res.data.data + 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.order_id, + type: "2", + 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.order_no, + + }, res => { + if (res.statusCode == '200') { + wx.showToast({ + title: '支付成功！', + }) + that.setData({ + flag: false, + page_num: 1, + List: [] + }) + this.getPayList() + } else { + wx.showToast({ + title: res.msg, + }) + } + }) + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let that = this + that.setData({ + currentDevice:wx.getStorageSync('currentDevice') + }) + that.getPayList() + wx.showShareMenu({ + withShareTicket: true, + menus: ['shareAppMessage', 'shareTimeline'] + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + let that = this + if (that.data.flag) { + that.getPayList() + } + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + return { + title: '人人爱净水', // 分享卡片标题（必填） + path: '/pages/water_filter/water_filter', // 用户点击后跳转的路径（可选，默认当前页） + imageUrl: (__staticUrl + '/share.png') // 自定义图片（可选，比例建议 5:4） + } + }, + onShareTimeline() { + return { + title: '人人爱净水', // 自定义标题 + query: '', // 自定义页面路径中的参数 + imageUrl: (__staticUrl + '/share.png') // 自定义分享图片路径 + } + }, }) \ No newline at end of file diff --git a/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.wxml b/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.wxml index 8cbdeb5..8c54d89 100644 --- a/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.wxml +++ b/packages/WaterPurifier/pages/RechargeRecord/RechargeRecord.wxml @@ -1,70 +1,70 @@ - - - - - - {{item.name}} - - - - - - - - 待支付 - 已支付 - 已取消 - 其他 - - - - - 订单名称 - {{item.order_name}} - - - 订单编号 - {{item.order_no}} - - - 套餐名称 - {{item.package_name}} - - - 支付方式 - {{item.order_source == 1?'微信支付':'线下'}} - - - 计费模式 - {{item.billing_method == 1?'时长':'流量'}} - - - 金额 - ￥{{item.total_price}} - - - 支付时间 - {{item.pay_time}} - - - - - 去支付 - - - - - - - - + + + + + + {{item.name}} + + + + + + + + 待支付 + 已支付 + 已取消 + 其他 + + + + + 订单名称 + {{item.order_name}} + + + 订单编号 + {{item.order_no}} + + + 套餐名称 + {{item.package_name}} + + + 支付方式 + {{item.order_source == 1?'微信支付':'线下'}} + + + 计费模式 + {{item.billing_method == 1?'时长':'流量'}} + + + 金额 + ￥{{item.total_price}} + + + 支付时间 + {{item.pay_time}} + + + + + 去支付 + + + + + + + + diff --git a/packages/WaterPurifier/pages/device/deviceDesc/deviceDesc.js b/packages/WaterPurifier/pages/device/deviceDesc/deviceDesc.js index 7e3de02..717622f 100644 --- a/packages/WaterPurifier/pages/device/deviceDesc/deviceDesc.js +++ b/packages/WaterPurifier/pages/device/deviceDesc/deviceDesc.js @@ -166,10 +166,11 @@ Page({ }) }, replay(e) { + const that = this wx.showLoading({ title: '重置中...', }) - util.postUrl4(apiArr.resetFilter, { + util.postUrl(apiArr.resetFilterUser, { part_id: e.currentTarget.dataset.item.id, device_id: e.currentTarget.dataset.item.device_id, }, res => { @@ -180,10 +181,10 @@ Page({ title: '重置成功！', icon: "none" }) - that.getfilterList() + that.getInfo() } else { wx.showToast({ - title: res.msg, + title: res.msg || '重置失败', icon: "none" }) } @@ -440,7 +441,7 @@ Page({ } wx.showModal({ title: '提示', - content: '确定要将设备转时长吗？请在设备通电开机的状态下进行操作', + content: '【厂商已废弃】计费模式切换(type=08)默认已拦截。确定仍要转时长？请在设备通电开机状态下操作；紧急需服务端开启 allow_deprecated_iot_cmd。', complete: (res) => { if (res.cancel) { } @@ -493,7 +494,7 @@ Page({ } wx.showModal({ title: '提示', - content: '确定要设备转流量吗？请在设备通电开机的状态下进行操作', + content: '【厂商已废弃】计费模式切换(type=08)默认已拦截。确定仍要转流量？请在设备通电开机状态下操作；紧急需服务端开启 allow_deprecated_iot_cmd。', complete: (res) => { if (res.cancel) { } @@ -530,7 +531,7 @@ Page({ let that = this wx.showModal({ title: '提示', - content: '是否确认设置为零售模式？此操作请在设备通电开机的状态下进行操作', + content: '【厂商已废弃】计费模式切换(type=08)默认已拦截。确定仍设为零售？请在设备通电开机状态下操作；紧急需服务端开启 allow_deprecated_iot_cmd。', complete: (res) => { if (res.cancel) { diff --git a/packages/WaterPurifier/pages/device/deviceDesc/deviceDesc.wxml b/packages/WaterPurifier/pages/device/deviceDesc/deviceDesc.wxml index 0cf3d96..33256a6 100644 --- a/packages/WaterPurifier/pages/device/deviceDesc/deviceDesc.wxml +++ b/packages/WaterPurifier/pages/device/deviceDesc/deviceDesc.wxml @@ -1,209 +1,209 @@ - - - - - - - - - {{currentDevice.region + currentDevice.address}} - - - - - - - - 净化前 - 水质TDS值 - {{currentDevice.raw_water_value}} - PPM - - - - - - - 净化后 - 水质TDS值 - {{currentDevice.purification_water_value}} - PPM - - - - - - - 净化前水质：极好 - 净化前水质：良好 - 净化前水质：正常 - 净化前水质：较差 - 净化前水质：极差 - - - 净化后水质：极好 - 净化后水质：良好 - 净化后水质：正常 - 净化后水质：较差 - 净化后水质：极差 - - - - - - - - - - 我的设备 - - {{currentDevice.product_name}} - - - - - 开机 - 关机 - 制水故障 - 漏水故障 - 主板故障 - - - - - {{currentDevice.network_status == '1'?'在线':'离线'}} - - - - - - 编号：{{currentDevice.device_code}} - - - 已服务{{currentDevice.difDay}}天 - - - - 已服务0天 - - - - - - 剩余天数 - {{ currentDevice.remainDay}} - 天 - - - - 已欠费 - - - - - - 剩余天数 - 0 - 天 - - - - - - - - - - 滤芯寿命 - 滤芯寿命用水量和使用时间来综合计算 - - - - - - {{item.parts_name}} - - - - - - {{item.percentageDay}}% - - - - {{item.percentageCapacity}}% - - - - - {{item.percentageDay}}% - - - - - 重置 - - - - - - - - - - 用水量 - - - - - 累计用水量 - {{currentDevice.cumulative_filtration_flow}}L - - - 今日用水量 - {{currentDevice.today}}L - - - 昨日用水量 - {{currentDevice.yesterday}}L - - - - - - - - - - - - - - - - - - 拆机 - - - - - - - - - - - - - 取消 - 确定 - - - 备注: - - - - - - + + + + + + + + + {{currentDevice.region + currentDevice.address}} + + + + + + + + 净化前 + 水质TDS值 + {{currentDevice.raw_water_value}} + PPM + + + + + + + 净化后 + 水质TDS值 + {{currentDevice.purification_water_value}} + PPM + + + + + + + 净化前水质：极好 + 净化前水质：良好 + 净化前水质：正常 + 净化前水质：较差 + 净化前水质：极差 + + + 净化后水质：极好 + 净化后水质：良好 + 净化后水质：正常 + 净化后水质：较差 + 净化后水质：极差 + + + + + + + + + + 我的设备 + + {{currentDevice.product_name}} + + + + + 开机 + 关机 + 制水故障 + 漏水故障 + 主板故障 + + + + + {{currentDevice.network_status == '1'?'在线':'离线'}} + + + + + + 编号：{{currentDevice.device_code}} + + + 已服务{{currentDevice.difDay}}天 + + + + 已服务0天 + + + + + + 剩余天数 + {{ currentDevice.remainDay}} + 天 + + + + 已欠费 + + + + + + 剩余天数 + 0 + 天 + + + + + + + + + + 滤芯寿命 + 滤芯寿命用水量和使用时间来综合计算 + + + + + + {{item.parts_name}} + + + + + + {{item.percentageDay}}% + + + + {{item.percentageCapacity}}% + + + + + {{item.percentageDay}}% + + + + + 重置 + + + + + + + + + + 用水量 + + + + + 累计用水量 + {{currentDevice.cumulative_filtration_flow}}L + + + 今日用水量 + {{currentDevice.today}}L + + + 昨日用水量 + {{currentDevice.yesterday}}L + + + + + + + + + + + + + + + + + + 拆机 + + + + + + + + + + + + + 取消 + 确定 + + + 备注: + + + + + + diff --git a/packages/WaterPurifier/pages/device/deviceList/deviceList.js b/packages/WaterPurifier/pages/device/deviceList/deviceList.js index 979b444..5dd256c 100644 --- a/packages/WaterPurifier/pages/device/deviceList/deviceList.js +++ b/packages/WaterPurifier/pages/device/deviceList/deviceList.js @@ -1,262 +1,263 @@ -let util = require("../../../../../utils/util") -const apiArr = require('../../../../../api/water_filter') -const apiArr2 = require('../../../../../api/partner') - -// packages/WaterPurifier/pages/device/deviceList/deviceList.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - option1: [ - { text: '全部', value: 0 }, - { text: '已安装', value: 1 }, - { text: '待启用', value: 2 }, - { text: '已拆机', value: 3 }, - ], - option2: [ - { text: '全部', value: 0 }, - { text: '在用', value: 1 }, - { text: '待启用', value: 2 }, - { text: '关机', value: 3 }, - { text: '已拆机', value: 4 }, - { text: '漏水', value: 5 }, - { text: '制水故障', value: 6 } - ], - stateType: { - 1: '在用', - 2: '待启用', - 3: '关机', - 4: '已拆机', - 5: '漏水', - 6: '制水故障', - 7: '报废', - 8: '已欠费', - 9: '在库', - 10: '激活失败' - }, - value1: 0, - value2: 0, - nav_list: {}, - foot_width: "", - - searchText: "",//搜索文字 - page_num: 1, - page_size: 10, - flag: false, - total: '', - deviceList: [], - dropdownOpen:false, - text2:"设备状态：全部" - }, - onDropdownOpen() { - console.log(123); - this.setData({ dropdownOpen: true }); - }, - onDropdownClose() { - this.setData({ dropdownOpen: false }); - }, - ipt1(e) { - let that = this - that.setData({ - searchText: e.detail.value, - }) - }, - - deviceDesc(e) { - wx.navigateTo({ - 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); - this.setData({ - value1: e.detail, - value2: 0, - page_num: 1, - deviceList: [] - }); - if (e.detail == 0) { - this.getDeviceList(0); - return; - } - this.getDeviceList(e.detail); - }, - - // 设备管理选择 - headerEquipmentClick(e) { - let that = this - let text2 = '' - if(e.detail == 0){ - text2 = '设备状态：全部' - }else if(e.detail == 1){ - text2 = '设备状态：在用' - }else if(e.detail == 2){ - text2 = '设备状态：待启用' - }else if(e.detail == 3){ - text2 = '设备状态：关机' - }else if(e.detail == 4){ - text2 = '设备状态：已拆机' - }else if(e.detail == 5){ - text2 = '设备状态：漏水' - }else if(e.detail == 6){ - text2 = '设备状态：制水故障' - }else if(e.detail == 7){ - text2 = '设备状态：报废' - }else if(e.detail == 8){ - text2 = '设备状态：已欠费' - }else if(e.detail == 9){ - text2 = '设备状态：在库' - }else if(e.detail == 10){ - text2 = '设备状态：激活失败' - } - this.setData({ - value2: e.detail, - page_num: 1, - deviceList: [], - text2 - }); - if (e.detail == 0) { - this.getDeviceList(0); - return; - } - this.getDeviceList(e.detail); - }, - - search2(){ - let that=this - that.setData({ - deviceList:[], - flag:false, - page_num:1 - }) - that.getDeviceList(that.data.value2) - }, - getDeviceList(status) { - wx.showLoading({ - title: '加载中', - mask: true - }) - let that = this - let admin = wx.getStorageSync('admin') - let param = { - page_size: that.data.page_size, - page_num: that.data.page_num, - search: that.data.searchText, - info_id: wx.getStorageSync('info_id'), - status: Number(status), - }; - - util.postUrl(apiArr.masterDeviceList, param, res => { - wx.hideLoading() - let flag = false - 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 || []), - total: res.total, - flag, - page_num: that.data.page_num + 1 - }) - console.log(that.data.flag); - }) - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - this.getDeviceList(0); - wx.showShareMenu({ - withShareTicket: true, - menus: ['shareAppMessage', 'shareTimeline'] - }) - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - let that = this - that.setData({ - flag:false, - page_num:1, - total:0, - searchText:"", - value1:"", - value2:"", - deviceList:[] - }) - that.getDeviceList(0); - wx.stopPullDownRefresh(); - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - let that = this - if (that.data.flag) { - that.getDeviceList( that.data.value2) - } - }, - - /** - * 用户点击右上角分享 - */ - 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' // 自定义分享图片路径 - } - }, +let util = require("../../../../../utils/util") +const apiArr = require('../../../../../api/water_filter') +const apiArr2 = require('../../../../../api/partner') + +// packages/WaterPurifier/pages/device/deviceList/deviceList.js +const __staticUrl = require('../../../../../config/env.js').static_url +Page({ + + /** + * 页面的初始数据 + */ + data: { + option1: [ + { text: '全部', value: 0 }, + { text: '已安装', value: 1 }, + { text: '待启用', value: 2 }, + { text: '已拆机', value: 3 }, + ], + option2: [ + { text: '全部', value: 0 }, + { text: '在用', value: 1 }, + { text: '待启用', value: 2 }, + { text: '关机', value: 3 }, + { text: '已拆机', value: 4 }, + { text: '漏水', value: 5 }, + { text: '制水故障', value: 6 } + ], + stateType: { + 1: '在用', + 2: '待启用', + 3: '关机', + 4: '已拆机', + 5: '漏水', + 6: '制水故障', + 7: '报废', + 8: '已欠费', + 9: '在库', + 10: '激活失败' + }, + value1: 0, + value2: 0, + nav_list: {}, + foot_width: "", + + searchText: "",//搜索文字 + page_num: 1, + page_size: 10, + flag: false, + total: '', + deviceList: [], + dropdownOpen:false, + text2:"设备状态：全部" + }, + onDropdownOpen() { + console.log(123); + this.setData({ dropdownOpen: true }); + }, + onDropdownClose() { + this.setData({ dropdownOpen: false }); + }, + ipt1(e) { + let that = this + that.setData({ + searchText: e.detail.value, + }) + }, + + deviceDesc(e) { + wx.navigateTo({ + 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); + this.setData({ + value1: e.detail, + value2: 0, + page_num: 1, + deviceList: [] + }); + if (e.detail == 0) { + this.getDeviceList(0); + return; + } + this.getDeviceList(e.detail); + }, + + // 设备管理选择 + headerEquipmentClick(e) { + let that = this + let text2 = '' + if(e.detail == 0){ + text2 = '设备状态：全部' + }else if(e.detail == 1){ + text2 = '设备状态：在用' + }else if(e.detail == 2){ + text2 = '设备状态：待启用' + }else if(e.detail == 3){ + text2 = '设备状态：关机' + }else if(e.detail == 4){ + text2 = '设备状态：已拆机' + }else if(e.detail == 5){ + text2 = '设备状态：漏水' + }else if(e.detail == 6){ + text2 = '设备状态：制水故障' + }else if(e.detail == 7){ + text2 = '设备状态：报废' + }else if(e.detail == 8){ + text2 = '设备状态：已欠费' + }else if(e.detail == 9){ + text2 = '设备状态：在库' + }else if(e.detail == 10){ + text2 = '设备状态：激活失败' + } + this.setData({ + value2: e.detail, + page_num: 1, + deviceList: [], + text2 + }); + if (e.detail == 0) { + this.getDeviceList(0); + return; + } + this.getDeviceList(e.detail); + }, + + search2(){ + let that=this + that.setData({ + deviceList:[], + flag:false, + page_num:1 + }) + that.getDeviceList(that.data.value2) + }, + getDeviceList(status) { + wx.showLoading({ + title: '加载中', + mask: true + }) + let that = this + let admin = wx.getStorageSync('admin') + let param = { + page_size: that.data.page_size, + page_num: that.data.page_num, + search: that.data.searchText, + info_id: wx.getStorageSync('info_id'), + status: Number(status), + }; + + util.postUrl(apiArr.masterDeviceList, param, res => { + wx.hideLoading() + let flag = false + 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 || []), + total: res.total, + flag, + page_num: that.data.page_num + 1 + }) + console.log(that.data.flag); + }) + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.getDeviceList(0); + wx.showShareMenu({ + withShareTicket: true, + menus: ['shareAppMessage', 'shareTimeline'] + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + let that = this + that.setData({ + flag:false, + page_num:1, + total:0, + searchText:"", + value1:"", + value2:"", + deviceList:[] + }) + that.getDeviceList(0); + wx.stopPullDownRefresh(); + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + let that = this + if (that.data.flag) { + that.getDeviceList( that.data.value2) + } + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + return { + title: '人人爱净水', // 分享卡片标题（必填） + path: '/pages/water_filter/water_filter', // 用户点击后跳转的路径（可选，默认当前页） + imageUrl: (__staticUrl + '/share.png') // 自定义图片（可选，比例建议 5:4） + } + }, + onShareTimeline() { + return { + title: '人人爱净水', // 自定义标题 + query: '', // 自定义页面路径中的参数 + imageUrl: (__staticUrl + '/share.png') // 自定义分享图片路径 + } + }, }) \ No newline at end of file diff --git a/packages/WaterPurifier/pages/device/deviceList/deviceList.wxml b/packages/WaterPurifier/pages/device/deviceList/deviceList.wxml index 957a3be..bf63d7c 100644 --- a/packages/WaterPurifier/pages/device/deviceList/deviceList.wxml +++ b/packages/WaterPurifier/pages/device/deviceList/deviceList.wxml @@ -1,67 +1,67 @@ - - - - - - 设备总数：{{total}} - - - - - - - - - - - - - - - - - - - 设备编码：{{item.device_code}} - - 客户姓名 - {{item.customer_info.name}} - - - 客户手机 - {{item.customer_info.phone}} - - - 网络状态 - {{item.network_status == '1'?'正常':'离线'}} - - - 设备状态 - {{stateType[item.status]}} - - - 安装状态 - 已安装 - 空闲 - 已拆机 - - - - 设备地址 - {{item.region}}{{item.address}} - - - - - - - - - - - - - - -