Commit 2f02d40c50d57853f2224fb90898a45d48a1658c

Authored by chenbiao
1 parent 94c1687f

add 登录页面数据接口联调

common/common.js
... ... @@ -24,14 +24,21 @@ var serverUrl = "https://bus.jycrtc.com";
24 24 // const app_id = '0eca8f5373ca4866aec2f8e9d9367104';
25 25 // const deviceInfo = 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E';
26 26  
  27 +//江阴微信小程序appid
  28 +const hs_wxPay_appId = 'wxadb8caee05ab2981'; // 江阴慧停车 wxadb8caee05ab2981
  29 +
  30 +
  31 +// 江阴慧停车orgId
  32 +const public_orgId = '10107';
  33 +
27 34 //黄石微信小程序appid
28 35  
29 36 // 测试环境 wx1e9b2b7f35d7da83
30 37 // 正式环境 wxbee319d15de03201
31   -const hs_wxPay_appId = 'wxbee319d15de03201';
  38 +// const hs_wxPay_appId = 'wxbee319d15de03201';
32 39  
33 40 // 黄石orgId
34   -const public_orgId = '10079';
  41 +// const public_orgId = '10079';
35 42 // 无锡orgId
36 43 // const public_orgId = '10005';
37 44  
... ... @@ -52,213 +59,83 @@ const SetToken = uni.getStorageSync("globalUser").token;
52 59  
53 60 // const SetToken = '17d135c3af364ad890772eeebda97096';
54 61  
55   -
56   -
57   -//通过车牌查询待缴费(不能查历史单)
58   -const ParkingwaitingPayUrl= serverUrl +"/queryParkOrder/queryParkingByCarNumber";
59   -
60   -//通过车牌查询历史欠费单
61   -const ParkingrecoderUrl= serverUrl +"/queryParkOrder/queryParkingRecordPageByCarNumbers";
62   -
63   -// 银联支付的下单接口
64   -const doPayUrl= serverUrl +"/unionpay/doPay";
65   -// 订单创建接口-doOrderCreate
66   -const doOrderCreate = serverUrl +"/unionpay/doOrderCreate"
67   -
68   -
69   -//停车场接口
70   -const ParkingLotsUrl= serverUrl +"/park/queryParkingLots";
71   -
72   -//查询停车场列表(地图形式)
73   -const ParkingLotsSearchUrl= serverUrl +"/park/queryParkingLotsByParkName";
74   -
75   -//查询停车场列表(列表形式)
76   -const ParkingLotsListUrl= serverUrl +"/park/queryParkingLots";
77   -
78   -//查询停车场详情
79   -const ParkingLotsInfoUrl= serverUrl +"/park/queryParkingLotByPlNo";
80   -
81   -
82   -//查询单个订单
83   -const billQueryUrl= serverUrl +"/queryParkOrder/billQuery";
84   -
85   -//个人账户支付-new
86   -const accountPayUrl= serverUrl +"/appAccountPay/accountPay";
87   -
88   -
89   -//微信支付信息获取
90   -const getwxpayinfoUrl= serverUrl +"/weixinpay/publicUnifiedOrder";
91   -
92   -//获取openid
93   -const getOpenidUrl= serverUrl +"/weixinPublicPay/getSmallRoutineOpenIdByCode";
94   -
95   -//小程序一键登录
96   -const smallRoutineLoginUrl= serverUrl +"/weixinPublicPay/smallRoutineLogin";
97   -
98   -//退出、登出
99   -const userLogoutUrl= serverUrl +"/user/logout";
100   -
101   -//根据OrgId查询组织信息
102   -const queryOrgInfoByOrgIdUrl= serverUrl +"/appOrg/queryOrgInfoByOrgId";
103   -
104   -
105   -//个人充值金额列表
106   -const getAmountPrivilegeUrl= serverUrl +"/appAcctRecharge/getAccountRechargeAmountPrivilege";
107   -
108   -//账户余额查询
109   -const getAccoutBalanceUrl= serverUrl +"/appAcctRecharge/getAccoutBalance";
110   -
111   -//账户充值-微信
112   -const getwxPayUnifiedorderUrl= serverUrl +"/weixinpay/unifiedOrder";
113   -
114   -//账户明细
115   -const getAccountDetailsUrl= serverUrl +"/appAcctRecharge/queryAccountDetailsForPage";
116   -
117   -
118   -//获取反馈建议 问题类型
119   -const getFeedbackTypeUrl= serverUrl +"/suggest/getFeedbackType";
120   -
121   -//提交反馈建议
122   -const saveFeedbackAndSuggestUrl= serverUrl +"/suggest/saveFeedbackAndSuggest";
123   -
124   -//自动扣款开关-查询
125   -const getDirectDebitOpenOrCloseUrl= serverUrl +"/acctNoSecret/getDirectDebitOpenOrClose";
126   -//自动扣款开关-修改
127   -const updateDirectDebitOpenOrCloseUrl= serverUrl +"/acctNoSecret/updateDirectDebitOpenOrClose";
128   -
129   -//个人卡券列表
130   -const getCouponPersonUrl= serverUrl +"/couponPerson/getCouponPerson";
131   -//绑定卡券
132   -const bindCouponPersonUrl= serverUrl +"/couponPerson/bindingPersonCoupon";
133   -
134   -
135   -//根据用户停车数据查询该客户可用的卡劵
136   -const getCouponPersonAvailableUrl= serverUrl +"/couponPerson/getCouponPersonAvailable";
137   -
138   -
139   -//车辆信息查询
140   -const queryUserCarsUrl= serverUrl +"/user/car/queryUserCars";
141   -
142   -//车辆信息维护
143   -const userCarsInfoEditUrl= serverUrl +"/user/car/userCarsInfoEdit";
144   -
145   -//修改个人基本信息
146   -const updateCustPersonBaseInfoUrl= serverUrl +"/user/updateCustPersonBaseInfo";
147   -
148   -//查询个人基本信息
149   -const queryCustPersonBaseInfoUrl= serverUrl +"/user/queryCustPersonBaseInfo";
150   -
151   -
152   -
153   -//上传个人头像
154   -const uploadHeadPicUrl= serverUrl +"/user/uploadHeadPic";
155   -
156   -//查询停车场-会员卡-根据orgID
157   -const queryVipCardListByOrgIdUrl= serverUrl +"/parkvip/queryVipCardListByOrgId";
158   -//查询某个停车场的 具体的会员卡信息
159   -const queryVipCardByPlNoUrl= serverUrl +"/parkvip/queryVipCardByPlNo";
160   -//0009、会员卡购买续费
161   -const createVipCardOrderUrl= serverUrl +"/vip/createVipCardOrder";
162   -// 搜索有会员卡的停车场
163   -const queryVipCardListByPlNameUrl= serverUrl +"/parkvip/queryVipCardListByPlName";
164   -// 查询用户已购买的会员卡
165   -const queryVipCardsByCustIdUrl= serverUrl +"/parkvip/queryVipCardsByCustId";
166   -
167   -// 查询用户已购买的会员卡
168   -const userPersoGetCouponAndOpenUrl= serverUrl +"/couponPerson/userPersoGetCouponAndOpen";
169   -
170   -// 零元支付
171   -const zeroPayUrl= serverUrl +"/appAccountPay/zeroPay";
172   -
173   -// 我的提问
174   -const queryTdCCustSuggestForAPP= serverUrl +"/suggest/queryTdCCustSuggestForAPP";
175   -
176   -// 查询某个停车场的 具体的会员卡信息
177   -const queryVipCardMsgByCardNo= serverUrl +"/parkvip/queryVipCardMsgByCardNo";
178   -
179   -// // 用户意见建议及回复查看
180   -// const queryTdCCustSuggestForAPP= serverUrl +"/suggest/queryTdCCustSuggestForAPP";
181   -// 用户意见建议-详情列表
182   -const queryTdCCustSuggestDetail= serverUrl +"/suggest/queryTdCCustSuggestDetail";
183   -
184   -
185 62 // ----江阴项目 接口----
186 63 // 商户登录
187   -const userLogin= serverUrl +"/business/h5/index/login";
  64 +const userLogin = serverUrl + "/business/h5/index/login";
188 65  
189 66 // 商户退出登录
190   -const userLoginout= serverUrl +"/business/h5/index/logout";
  67 +const userLoginout = serverUrl + "/business/h5/index/logout";
191 68  
192 69 // 商户关于我们
193   -const useraboutUs= serverUrl +"/business/h5/index/aboutUs";
  70 +const useraboutUs = serverUrl + "/business/h5/index/aboutUs";
194 71  
195 72  
196 73  
197 74 //
198   -const requestSign = function(inputData){
  75 +const requestSign = function(inputData) {
199 76  
200 77 var jsonList = inputData;
201   - jsonList.sign_type = "md5";
202   - jsonList.app_id = "0eca8f5373ca4866aec2f8e9d9367104";
203   - jsonList.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E";
204   - jsonList.salt = getSalt();
205   - jsonList.token = getGlobalUser("globalUser").token;
206   - // jsonList.token = '84b5a8edb5974f7989e7888b9f48a765';
  78 + jsonList.sign_type = "md5";
  79 + jsonList.app_id = "0eca8f5373ca4866aec2f8e9d9367104";
  80 + jsonList.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E";
  81 + jsonList.salt = getSalt();
  82 + jsonList.token = getGlobalUser("globalUser").token;
  83 + // jsonList.token = '84b5a8edb5974f7989e7888b9f48a765';
207 84  
208 85 var arrData = [];
209   - for(var key in jsonList){
  86 + for (var key in jsonList) {
210 87 var obj = {};
211   - // console.log("key = "+key);
212   - // // obj[key] =jsonList[key];
213   - obj.keyname = key;
214   - obj.value = jsonList[key];
215   - // console.log(obj);
216   - arrData.push(obj);
  88 + // console.log("key = "+key);
  89 + // // obj[key] =jsonList[key];
  90 + obj.keyname = key;
  91 + obj.value = jsonList[key];
  92 + // console.log(obj);
  93 + arrData.push(obj);
217 94 }
218   - var sign = getSign(arrData);
219   - jsonList.sign =sign;
220   - return jsonList;
  95 + var sign = getSign(arrData);
  96 + jsonList.sign = sign;
  97 + return jsonList;
221 98 }
222 99  
223 100  
224 101 //获取sign
225   -var getSign = function(objb){
226   - var compare = function (obj1, obj2) {
227   - var val1 = obj1.keyname;
228   - var val2 = obj2.keyname;
229   - if (val1 < val2) {
230   - return -1;
231   - } else if (val1 > val2) {
232   - return 1;
233   - } else {
234   - return 0;
235   - }
  102 +var getSign = function(objb) {
  103 + var compare = function(obj1, obj2) {
  104 + var val1 = obj1.keyname;
  105 + var val2 = obj2.keyname;
  106 + if (val1 < val2) {
  107 + return -1;
  108 + } else if (val1 > val2) {
  109 + return 1;
  110 + } else {
  111 + return 0;
  112 + }
236 113 }
237 114 objb.sort(compare);
238 115 var strmd5 = '14318527b13840c2a4af63fef52c2d6e';
239   - for(var i=0;i<objb.length;i++){
240   - if(objb[i].value != null&&objb[i].value != ''){
241   - strmd5 += objb[i].keyname+objb[i].value;
242   - }
  116 + for (var i = 0; i < objb.length; i++) {
  117 + if (objb[i].value != null && objb[i].value != '') {
  118 + strmd5 += objb[i].keyname + objb[i].value;
  119 + }
243 120 }
244 121 strmd5 += '14318527b13840c2a4af63fef52c2d6e';
245   - // console.log('strmd5-------->'+strmd5);
  122 + // console.log('strmd5-------->'+strmd5);
246 123 strmd5 = md5(strmd5);
247   - strmd5 =strmd5.toUpperCase();
  124 + strmd5 = strmd5.toUpperCase();
248 125 return strmd5;
249 126 }
250 127  
251 128 //获取盐值
252   -var getSalt = function(){
253   - var len = parseInt(32);
  129 +var getSalt = function() {
  130 + var len = parseInt(32);
254 131 var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
255 132 var maxPos = $chars.length;
256 133 var pwd = '';
257   -   for (var i = 0; i < len; i++) {
258   -       pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
259   -   }
  134 + for (var i = 0; i < len; i++) {
  135 + pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
  136 + }
260 137 // console.log(pwd);
261   -   return pwd;
  138 + return pwd;
262 139 }
263 140  
264 141 var getGlobalUser = function(key) {
... ... @@ -270,67 +147,21 @@ var getGlobalUser = function(key) {
270 147 }
271 148 }
272 149  
273   -// common.sayHi();
274   -const sayHi = function(){
275   - console.log('hi');
276   -}
277   -
278 150  
279   -export default{
280   - doPayUrl,
281   - doOrderCreate,
282   - ParkingwaitingPayUrl,
283   - ParkingrecoderUrl,
284   - ParkingLotsUrl,
285   - ParkingLotsSearchUrl,
286   - ParkingLotsListUrl,
287   - ParkingLotsInfoUrl,
288   - billQueryUrl,
289   - accountPayUrl,
290   - getwxpayinfoUrl,
291   - getOpenidUrl,
292   - smallRoutineLoginUrl,
293   - userLogoutUrl,
294   - queryOrgInfoByOrgIdUrl,
295   - getAmountPrivilegeUrl,
296   - getAccoutBalanceUrl,
297   - getwxPayUnifiedorderUrl,
298   - getAccountDetailsUrl,
299   - getFeedbackTypeUrl,
300   - saveFeedbackAndSuggestUrl,
301   - getDirectDebitOpenOrCloseUrl,
302   - updateDirectDebitOpenOrCloseUrl,
303   - getCouponPersonUrl,
304   - queryUserCarsUrl,
305   - userCarsInfoEditUrl,
306   - updateCustPersonBaseInfoUrl,
307   - queryCustPersonBaseInfoUrl,
308   -
309   - uploadHeadPicUrl,
310   - getCouponPersonAvailableUrl,
311   - bindCouponPersonUrl,
312   - queryVipCardListByOrgIdUrl,
313   - queryVipCardByPlNoUrl,
314   - createVipCardOrderUrl,
315   - queryVipCardListByPlNameUrl,
316   - queryVipCardsByCustIdUrl,
317   - userPersoGetCouponAndOpenUrl,
318   - zeroPayUrl,
319 151  
  152 +export default {
  153 +
320 154 // deviceInfo,
321 155 hs_wxPay_appId,
322 156 public_orgId,
323 157 appName,
324 158 ACompany,
325 159 BCompany,
326   - appVerson,
  160 + appVerson,
327 161 SetToken,
328   - queryVipCardMsgByCardNo,
329   - queryTdCCustSuggestForAPP,
330   - queryTdCCustSuggestDetail,
331 162 requestSign,
332   - sayHi,
333 163  
  164 + // 接口
334 165 userLogin,
335 166 userLoginout,
336 167 useraboutUs,
... ...
pages.json
... ... @@ -14,6 +14,12 @@
14 14 "pages": [
15 15 // pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
16 16 {
  17 + "path": "pages/index/index",
  18 + "style": {
  19 + "navigationBarTitleText": "商户管理"
  20 + }
  21 + },
  22 + {
17 23 "path": "pages/businessCard/printCard",
18 24 "style": {
19 25 "navigationBarTitleText": "商户卡券打印"
... ... @@ -113,12 +119,7 @@
113 119 "navigationBarTitleText": "账单详情"
114 120 }
115 121 },
116   - {
117   - "path": "pages/index/index",
118   - "style": {
119   - "navigationBarTitleText": "商户管理"
120   - }
121   - }, {
  122 + {
122 123 "path": "pages/login/login",
123 124 "style": {
124 125 "navigationBarTitleText": "商户中心",
... ... @@ -256,7 +257,7 @@
256 257 ],
257 258 "globalStyle": {
258 259 "navigationBarTextStyle": "black",
259   - "navigationBarTitleText": "停车小码头",
  260 + "navigationBarTitleText": "江阴慧停车",
260 261 "navigationBarBackgroundColor": "#F8F8F8",
261 262 "backgroundColor": "#F8F8F8",
262 263 "pageOrientation": "portrait",
... ... @@ -268,24 +269,6 @@
268 269 "navigationBarTextStyle": "black",
269 270 "navigationBarBackgroundColor": "#F1F1F1"
270 271 }
271   - },
272   - "tabBar": {
273   - "color": "#7A7E83",
274   - "selectedColor": "#007AFF",
275   - "borderStyle": "black",
276   - "backgroundColor": "#FFF",
277   - "list": [{
278   - "pagePath": "pages/tabBar/component/component",
279   - "iconPath": "static/component.png",
280   - "selectedIconPath": "static/componentHL.png",
281   - "text": "内置组件"
282   - },
283   - {
284   - "pagePath": "pages/tabBar/extUI/extUI",
285   - "iconPath": "static/extui.png",
286   - "selectedIconPath": "static/extuiHL.png",
287   - "text": "扩展组件"
288   - }
289   - ]
290 272 }
  273 +
291 274 }
... ...
pages/index/index.vue
1 1 <template>
2   - <view class="bg-white">
3   - <view class="index-top">
4   - <view v-if="userIsLogin">
5   - <view style="z-index: 2;">
6   - <image src="http://122.152.205.72:88/group1/M00/00/05/CpoxxFw_-5-AFyVyAABLIH8xBTw233.png"
7   - class="face"></image>
8   - <view class="username">张三</view>
  2 + <view>
  3 + <view class="login-content">
  4 + <view>
  5 + <image class="logo" src="/static/logo.png"></image>
  6 + <view>
  7 + <view class="title">{{appName}}</view>
  8 + <view class="title-msg">{{apptitle}}</view>
  9 + </view>
  10 + </view>
  11 + <view class="uni-common-mt paddinglr30">
  12 + <view class="uni-form-item uni-column">
  13 + <input class="uni-input" type="text" v-model="username" placeholder="请输入用户名" />
  14 + </view>
  15 + <view class="uni-form-item uni-column">
  16 + <input class="uni-input" password type="text" v-model="password" placeholder="请输入密码" />
9 17 </view>
10   -
11 18 </view>
12   - <view class="set-wapper" v-if="userIsLogin">
13   - <image src="../../static/me/settings.png" class="settings" @tap="toSetting"></image>
  19 +
  20 + <view class="paddinglr30 uni-common-mt">
  21 + <button type="primary" @click="login">登录</button>
14 22 </view>
  23 + <view class="uni-common-mt login-foot">
  24 + 点击”登录“,即表示你同意《商户用户协议》
  25 + </view>
15 26 </view>
16   - <view class="index-menu">
17   - <view class="uni-padding-wrap uni-common-mt">
18   -
19   - <view class="uni-flex uni-row">
20   - <view class="flex-item">
21   - <view class="">
22   - <image src="../../static/me/me-parkrecord.png" class="index-icon"></image>
23   - </view>
24   - <view class="index-title">停车缴费</view>
  27 + <view class="bg-white" v-if="userIsLogin">
  28 + <view class="index-top">
  29 + <view>
  30 + <view style="z-index: 2;">
  31 + <image src="http://122.152.205.72:88/group1/M00/00/05/CpoxxFw_-5-AFyVyAABLIH8xBTw233.png"
  32 + class="face"></image>
  33 + <view class="username">张三</view>
25 34 </view>
26   - <view class="flex-item">
27   - <view class="">
28   - <image src="../../static/me/me-recoder.png" class="index-icon"></image>
  35 +
  36 + </view>
  37 + <view class="set-wapper">
  38 + <image src="../../static/me/settings.png" class="settings" @tap="toSetting"></image>
  39 + </view>
  40 + </view>
  41 + <view class="index-menu">
  42 + <view class="uni-padding-wrap uni-common-mt">
  43 +
  44 + <view class="uni-flex uni-row">
  45 + <view class="flex-item">
  46 + <view class="">
  47 + <image src="../../static/me/me-parkrecord.png" class="index-icon"></image>
  48 + </view>
  49 + <view class="index-title">停车缴费</view>
29 50 </view>
30   - <view class="index-title">停车记录</view>
31   - </view>
32   - <view class="flex-item">
33   - <view class="">
34   - <image src="../../static/me/me-balance.png" class="index-icon"></image>
  51 + <view class="flex-item">
  52 + <view class="">
  53 + <image src="../../static/me/me-recoder.png" class="index-icon"></image>
  54 + </view>
  55 + <view class="index-title">停车记录</view>
35 56 </view>
36   - <view class="index-title">我的钱包</view>
37   - </view>
38   -
39   - </view>
40   - <view class="uni-flex uni-row">
41   - <view class="flex-item">
42   - <view class="">
43   - <image src="../../static/me/me-coupon.png" class="index-icon"></image>
  57 + <view class="flex-item">
  58 + <view class="">
  59 + <image src="../../static/me/me-balance.png" class="index-icon"></image>
  60 + </view>
  61 + <view class="index-title">我的钱包</view>
44 62 </view>
45   - <view class="index-title">卡券管理</view>
  63 +
46 64 </view>
47   - <view class="flex-item" @click="toInvoicePage">
48   - <view class="">
49   - <image src="../../static/me/me-fapao.png" class="index-icon"></image>
  65 + <view class="uni-flex uni-row">
  66 + <view class="flex-item">
  67 + <view class="">
  68 + <image src="../../static/me/me-coupon.png" class="index-icon"></image>
  69 + </view>
  70 + <view class="index-title">卡券管理</view>
50 71 </view>
51   - <view class="index-title">发票申领</view>
52   - </view>
53   - <view class="flex-item" @click="toRatingPage">
54   - <view class="">
55   - <image src="../../static/me/me-aboutus.png" class="index-icon"></image>
  72 + <view class="flex-item" @click="toInvoicePage">
  73 + <view class="">
  74 + <image src="../../static/me/me-fapao.png" class="index-icon"></image>
  75 + </view>
  76 + <view class="index-title">发票申领</view>
  77 + </view>
  78 + <view class="flex-item" @click="toRatingPage">
  79 + <view class="">
  80 + <image src="../../static/me/me-aboutus.png" class="index-icon"></image>
  81 + </view>
  82 + <view class="index-title">信用等级</view>
56 83 </view>
57   - <view class="index-title">信用等级</view>
58 84 </view>
59 85 </view>
60 86 </view>
  87 +
61 88 </view>
62   -
63 89 </view>
  90 +
64 91 </template>
65 92  
66 93 <script>
... ... @@ -70,13 +97,20 @@
70 97 export default {
71 98 data() {
72 99 return {
73   - userIsLogin: true,
  100 + userIsLogin: false,
  101 + appName: '江阴慧停车',
  102 + apptitle: '江阴慧停车·智慧便捷',
  103 + username:'',
  104 + password:'',
74 105 }
75 106 },
76 107 onLoad() {
77 108  
78 109 },
79 110 methods: {
  111 + login(){
  112 +
  113 + },
80 114 toSetting() {
81 115 uni.navigateTo({
82 116 url: '../setting/setting'
... ... @@ -100,6 +134,43 @@
100 134 </script>
101 135  
102 136 <style lang="scss">
  137 + .page {
  138 + width: 100%;
  139 + height: 100%;
  140 + display: flex;
  141 + justify-content: center;
  142 + position: relative;
  143 +
  144 + }
  145 +
  146 + .login-content {
  147 + background-color: #f6f6f6;
  148 + text-align: center;
  149 + height: 100vh;
  150 + }
  151 +
  152 + .logo {
  153 + height: 200upx;
  154 + width: 200upx;
  155 + margin-top: 200upx;
  156 + }
  157 +
  158 + .title {
  159 + font-size: 32upx;
  160 + color: #000;
  161 + font-weight: 400;
  162 + }
  163 +
  164 + .title-msg {
  165 + font-size: 26upx;
  166 + color: #8d8d8d;
  167 + }
  168 +
  169 + .login-foot{
  170 + font-size: 26upx;
  171 +
  172 + }
  173 + // 首页
103 174 .index-top {
104 175 height: 200upx;
105 176 background-color: #2d7bf7;
... ...