From 2f02d40c50d57853f2224fb90898a45d48a1658c Mon Sep 17 00:00:00 2001 From: chenbiao Date: Thu, 12 May 2022 10:56:15 +0800 Subject: [PATCH] add 登录页面数据接口联调 --- common/common.js | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages.json | 35 +++++++++-------------------------- pages/index/index.vue | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------- 3 files changed, 183 insertions(+), 298 deletions(-) diff --git a/common/common.js b/common/common.js index bc1e39e..affd0a4 100644 --- a/common/common.js +++ b/common/common.js @@ -24,14 +24,21 @@ var serverUrl = "https://bus.jycrtc.com"; // const app_id = '0eca8f5373ca4866aec2f8e9d9367104'; // const deviceInfo = 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E'; +//江阴微信小程序appid +const hs_wxPay_appId = 'wxadb8caee05ab2981'; // 江阴慧停车 wxadb8caee05ab2981 + + +// 江阴慧停车orgId +const public_orgId = '10107'; + //黄石微信小程序appid // 测试环境 wx1e9b2b7f35d7da83 // 正式环境 wxbee319d15de03201 -const hs_wxPay_appId = 'wxbee319d15de03201'; +// const hs_wxPay_appId = 'wxbee319d15de03201'; // 黄石orgId -const public_orgId = '10079'; +// const public_orgId = '10079'; // 无锡orgId // const public_orgId = '10005'; @@ -52,213 +59,83 @@ const SetToken = uni.getStorageSync("globalUser").token; // const SetToken = '17d135c3af364ad890772eeebda97096'; - - -//通过车牌查询待缴费（不能查历史单） -const ParkingwaitingPayUrl= serverUrl +"/queryParkOrder/queryParkingByCarNumber"; - -//通过车牌查询历史欠费单 -const ParkingrecoderUrl= serverUrl +"/queryParkOrder/queryParkingRecordPageByCarNumbers"; - -// 银联支付的下单接口 -const doPayUrl= serverUrl +"/unionpay/doPay"; -// 订单创建接口-doOrderCreate -const doOrderCreate = serverUrl +"/unionpay/doOrderCreate" - - -//停车场接口 -const ParkingLotsUrl= serverUrl +"/park/queryParkingLots"; - -//查询停车场列表(地图形式) -const ParkingLotsSearchUrl= serverUrl +"/park/queryParkingLotsByParkName"; - -//查询停车场列表(列表形式) -const ParkingLotsListUrl= serverUrl +"/park/queryParkingLots"; - -//查询停车场详情 -const ParkingLotsInfoUrl= serverUrl +"/park/queryParkingLotByPlNo"; - - -//查询单个订单 -const billQueryUrl= serverUrl +"/queryParkOrder/billQuery"; - -//个人账户支付-new -const accountPayUrl= serverUrl +"/appAccountPay/accountPay"; - - -//微信支付信息获取 -const getwxpayinfoUrl= serverUrl +"/weixinpay/publicUnifiedOrder"; - -//获取openid -const getOpenidUrl= serverUrl +"/weixinPublicPay/getSmallRoutineOpenIdByCode"; - -//小程序一键登录 -const smallRoutineLoginUrl= serverUrl +"/weixinPublicPay/smallRoutineLogin"; - -//退出、登出 -const userLogoutUrl= serverUrl +"/user/logout"; - -//根据OrgId查询组织信息 -const queryOrgInfoByOrgIdUrl= serverUrl +"/appOrg/queryOrgInfoByOrgId"; - - -//个人充值金额列表 -const getAmountPrivilegeUrl= serverUrl +"/appAcctRecharge/getAccountRechargeAmountPrivilege"; - -//账户余额查询 -const getAccoutBalanceUrl= serverUrl +"/appAcctRecharge/getAccoutBalance"; - -//账户充值-微信 -const getwxPayUnifiedorderUrl= serverUrl +"/weixinpay/unifiedOrder"; - -//账户明细 -const getAccountDetailsUrl= serverUrl +"/appAcctRecharge/queryAccountDetailsForPage"; - - -//获取反馈建议 问题类型 -const getFeedbackTypeUrl= serverUrl +"/suggest/getFeedbackType"; - -//提交反馈建议 -const saveFeedbackAndSuggestUrl= serverUrl +"/suggest/saveFeedbackAndSuggest"; - -//自动扣款开关-查询 -const getDirectDebitOpenOrCloseUrl= serverUrl +"/acctNoSecret/getDirectDebitOpenOrClose"; -//自动扣款开关-修改 -const updateDirectDebitOpenOrCloseUrl= serverUrl +"/acctNoSecret/updateDirectDebitOpenOrClose"; - -//个人卡券列表 -const getCouponPersonUrl= serverUrl +"/couponPerson/getCouponPerson"; -//绑定卡券 -const bindCouponPersonUrl= serverUrl +"/couponPerson/bindingPersonCoupon"; - - -//根据用户停车数据查询该客户可用的卡劵 -const getCouponPersonAvailableUrl= serverUrl +"/couponPerson/getCouponPersonAvailable"; - - -//车辆信息查询 -const queryUserCarsUrl= serverUrl +"/user/car/queryUserCars"; - -//车辆信息维护 -const userCarsInfoEditUrl= serverUrl +"/user/car/userCarsInfoEdit"; - -//修改个人基本信息 -const updateCustPersonBaseInfoUrl= serverUrl +"/user/updateCustPersonBaseInfo"; - -//查询个人基本信息 -const queryCustPersonBaseInfoUrl= serverUrl +"/user/queryCustPersonBaseInfo"; - - - -//上传个人头像 -const uploadHeadPicUrl= serverUrl +"/user/uploadHeadPic"; - -//查询停车场-会员卡-根据orgID -const queryVipCardListByOrgIdUrl= serverUrl +"/parkvip/queryVipCardListByOrgId"; -//查询某个停车场的 具体的会员卡信息 -const queryVipCardByPlNoUrl= serverUrl +"/parkvip/queryVipCardByPlNo"; -//0009、会员卡购买续费 -const createVipCardOrderUrl= serverUrl +"/vip/createVipCardOrder"; -// 搜索有会员卡的停车场 -const queryVipCardListByPlNameUrl= serverUrl +"/parkvip/queryVipCardListByPlName"; -// 查询用户已购买的会员卡 -const queryVipCardsByCustIdUrl= serverUrl +"/parkvip/queryVipCardsByCustId"; - -// 查询用户已购买的会员卡 -const userPersoGetCouponAndOpenUrl= serverUrl +"/couponPerson/userPersoGetCouponAndOpen"; - -// 零元支付 -const zeroPayUrl= serverUrl +"/appAccountPay/zeroPay"; - -// 我的提问 -const queryTdCCustSuggestForAPP= serverUrl +"/suggest/queryTdCCustSuggestForAPP"; - -// 查询某个停车场的 具体的会员卡信息 -const queryVipCardMsgByCardNo= serverUrl +"/parkvip/queryVipCardMsgByCardNo"; - -// // 用户意见建议及回复查看 -// const queryTdCCustSuggestForAPP= serverUrl +"/suggest/queryTdCCustSuggestForAPP"; -// 用户意见建议-详情列表 -const queryTdCCustSuggestDetail= serverUrl +"/suggest/queryTdCCustSuggestDetail"; - - // ----江阴项目 接口---- // 商户登录 -const userLogin= serverUrl +"/business/h5/index/login"; +const userLogin = serverUrl + "/business/h5/index/login"; // 商户退出登录 -const userLoginout= serverUrl +"/business/h5/index/logout"; +const userLoginout = serverUrl + "/business/h5/index/logout"; // 商户关于我们 -const useraboutUs= serverUrl +"/business/h5/index/aboutUs"; +const useraboutUs = serverUrl + "/business/h5/index/aboutUs"; // -const requestSign = function(inputData){ +const requestSign = function(inputData) { var jsonList = inputData; - jsonList.sign_type = "md5"; - jsonList.app_id = "0eca8f5373ca4866aec2f8e9d9367104"; - jsonList.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E"; - jsonList.salt = getSalt(); - jsonList.token = getGlobalUser("globalUser").token; - // jsonList.token = '84b5a8edb5974f7989e7888b9f48a765'; + jsonList.sign_type = "md5"; + jsonList.app_id = "0eca8f5373ca4866aec2f8e9d9367104"; + jsonList.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E"; + jsonList.salt = getSalt(); + jsonList.token = getGlobalUser("globalUser").token; + // jsonList.token = '84b5a8edb5974f7989e7888b9f48a765'; var arrData = []; - for(var key in jsonList){ + for (var key in jsonList) { var obj = {}; - // console.log("key = "+key); - // // obj[key] =jsonList[key]; - obj.keyname = key; - obj.value = jsonList[key]; - // console.log(obj); - arrData.push(obj); + // console.log("key = "+key); + // // obj[key] =jsonList[key]; + obj.keyname = key; + obj.value = jsonList[key]; + // console.log(obj); + arrData.push(obj); } - var sign = getSign(arrData); - jsonList.sign =sign; - return jsonList; + var sign = getSign(arrData); + jsonList.sign = sign; + return jsonList; } //获取sign -var getSign = function(objb){ - var compare = function (obj1, obj2) { - var val1 = obj1.keyname; - var val2 = obj2.keyname; - if (val1 < val2) { - return -1; - } else if (val1 > val2) { - return 1; - } else { - return 0; - } +var getSign = function(objb) { + var compare = function(obj1, obj2) { + var val1 = obj1.keyname; + var val2 = obj2.keyname; + if (val1 < val2) { + return -1; + } else if (val1 > val2) { + return 1; + } else { + return 0; + } } objb.sort(compare); var strmd5 = '14318527b13840c2a4af63fef52c2d6e'; - for(var i=0;i'+strmd5); + // console.log('strmd5-------->'+strmd5); strmd5 = md5(strmd5); - strmd5 =strmd5.toUpperCase(); + strmd5 = strmd5.toUpperCase(); return strmd5; } //获取盐值 -var getSalt = function(){ - var len = parseInt(32); +var getSalt = function() { + var len = parseInt(32); var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; var maxPos = $chars.length; var pwd = ''; -　　 for (var i = 0; i < len; i++) { -　　 　　　　pwd += $chars.charAt(Math.floor(Math.random() * maxPos)); -　　 } + for (var i = 0; i < len; i++) { + pwd += $chars.charAt(Math.floor(Math.random() * maxPos)); + } // console.log(pwd); -　　 return pwd; + return pwd; } var getGlobalUser = function(key) { @@ -270,67 +147,21 @@ var getGlobalUser = function(key) { } } -// common.sayHi(); -const sayHi = function(){ - console.log('hi'); -} - -export default{ - doPayUrl, - doOrderCreate, - ParkingwaitingPayUrl, - ParkingrecoderUrl, - ParkingLotsUrl, - ParkingLotsSearchUrl, - ParkingLotsListUrl, - ParkingLotsInfoUrl, - billQueryUrl, - accountPayUrl, - getwxpayinfoUrl, - getOpenidUrl, - smallRoutineLoginUrl, - userLogoutUrl, - queryOrgInfoByOrgIdUrl, - getAmountPrivilegeUrl, - getAccoutBalanceUrl, - getwxPayUnifiedorderUrl, - getAccountDetailsUrl, - getFeedbackTypeUrl, - saveFeedbackAndSuggestUrl, - getDirectDebitOpenOrCloseUrl, - updateDirectDebitOpenOrCloseUrl, - getCouponPersonUrl, - queryUserCarsUrl, - userCarsInfoEditUrl, - updateCustPersonBaseInfoUrl, - queryCustPersonBaseInfoUrl, - - uploadHeadPicUrl, - getCouponPersonAvailableUrl, - bindCouponPersonUrl, - queryVipCardListByOrgIdUrl, - queryVipCardByPlNoUrl, - createVipCardOrderUrl, - queryVipCardListByPlNameUrl, - queryVipCardsByCustIdUrl, - userPersoGetCouponAndOpenUrl, - zeroPayUrl, +export default { + // deviceInfo, hs_wxPay_appId, public_orgId, appName, ACompany, BCompany, - appVerson, + appVerson, SetToken, - queryVipCardMsgByCardNo, - queryTdCCustSuggestForAPP, - queryTdCCustSuggestDetail, requestSign, - sayHi, + // 接口 userLogin, userLoginout, useraboutUs, diff --git a/pages.json b/pages.json index 4e3ad1a..b44e113 100644 --- a/pages.json +++ b/pages.json @@ -14,6 +14,12 @@ "pages": [ // pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "商户管理" + } + }, + { "path": "pages/businessCard/printCard", "style": { "navigationBarTitleText": "商户卡券打印" @@ -113,12 +119,7 @@ "navigationBarTitleText": "账单详情" } }, - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "商户管理" - } - }, { + { "path": "pages/login/login", "style": { "navigationBarTitleText": "商户中心", @@ -256,7 +257,7 @@ ], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "停车小码头", + "navigationBarTitleText": "江阴慧停车", "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8", "pageOrientation": "portrait", @@ -268,24 +269,6 @@ "navigationBarTextStyle": "black", "navigationBarBackgroundColor": "#F1F1F1" } - }, - "tabBar": { - "color": "#7A7E83", - "selectedColor": "#007AFF", - "borderStyle": "black", - "backgroundColor": "#FFF", - "list": [{ - "pagePath": "pages/tabBar/component/component", - "iconPath": "static/component.png", - "selectedIconPath": "static/componentHL.png", - "text": "内置组件" - }, - { - "pagePath": "pages/tabBar/extUI/extUI", - "iconPath": "static/extui.png", - "selectedIconPath": "static/extuiHL.png", - "text": "扩展组件" - } - ] } + } diff --git a/pages/index/index.vue b/pages/index/index.vue index 224cda9..2e4b7b4 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,66 +1,93 @@