Commit 3d60bab7c083775e1bc68e242c697a5084c3c5d2

Authored by 刘淇
1 parent de23b5ec

下拉框箭头

common/uni.css
... ... @@ -1853,4 +1853,8 @@ checkbox-group label {
1853 1853 .marginAuto{
1854 1854 width: 100%;
1855 1855 margin: 0 auto;
  1856 +}
  1857 +
  1858 +.marginRightArrow{
  1859 + margin-right: 10px;
1856 1860 }
1857 1861 \ No newline at end of file
... ...
pages/parkPay/parkPay.vue
1 1 <template>
2   - <view>
3   -
4   - <!-- <view class="order-time">
5   - 剩余支付时间: {{appOrderTimeout}}
6   - </view> -->
7   -
8   - <view class="order-title">
9   - 订单详情
10   - </view>
11   - <view class="order-info">
12   - 车牌号:{{mycarNumber | tranNull}}
13   - </view>
14   - <view class="order-line"></view>
15   - <view class="order-info">
16   - 停车场:{{parkName | tranNull}}
17   - </view>
18   - <view class="order-line"></view>
19   - <view class="order-info">
20   - 进场时间:{{parkInTime | tranNull}}
21   - </view>
22   - <view class="order-line"></view>
23   - <view class="order-info">
24   - 停车时间:{{staytime | timeFormatter}}
25   - </view>
26   - <view class="order-line"></view>
27   - <view class="order-info">
28   - 总计费用:{{due |toFixed2}}元
29   - </view>
30   - <view class="order-line"></view>
31   -
32   - <view class="flex-row-justify-between">
33   - <view class="order-info">
34   - 支付金额
35   - </view>
36   - <view class="flex-row-justify-end">
37   - <view class="order-info" style="font-weight:bold;font-size:17px ;">
38   - {{orderFee | toFixed2}}
39   - </view>
40   - <view class="order-info" style="margin-right: 50upx;margin-left: 0px;">
41   - 元
42   - </view>
43   - </view>
44   - </view>
45   -
46   - <view class="order-line-bold"></view>
47   -
48   - <view class="order-title">
49   - 支付方法
50   - </view>
51   - <view class="order-line"></view>
52   -
53   - <view class="orderwaysview">
54   - <!--<image src="../../static/orderInfo/orderinfo-wechat.png" class="orderways"></image>-->
55   - <view class="order-info" style="margin-left: 15px;">
56   - 商户余额
57   - </view>
58   - <image src="../../static/orderInfo/orderinfo-sel.png" class="orderwaysSel"></image>
59   -
60   - </view>
61   -
62   - <view class="order-line"></view>
63   - <button @click="payClick" class="button-sp-area" type="primary" plain="true">确认支付</button>
64   -
65   - </view>
  2 + <view>
  3 + <view v-show="showFlag" style="padding: 20px; text-align: center">
  4 + 该车没有停放在该车场
  5 + </view>
  6 + <view v-else>
  7 + <!-- <view class="order-time">
  8 + 剩余支付时间: {{appOrderTimeout}}
  9 + </view> -->
  10 +
  11 + <view class="order-title">
  12 + 订单详情
  13 + </view>
  14 + <view class="order-info">
  15 + 车牌号:{{mycarNumber | tranNull}}
  16 + </view>
  17 + <view class="order-line"></view>
  18 + <view class="order-info">
  19 + 停车场:{{parkName | tranNull}}
  20 + </view>
  21 + <view class="order-line"></view>
  22 + <view class="order-info">
  23 + 进场时间:{{parkInTime | tranNull}}
  24 + </view>
  25 + <view class="order-line"></view>
  26 + <view class="order-info">
  27 + 停车时间:{{staytime | timeFormatter}}
  28 + </view>
  29 + <view class="order-line"></view>
  30 + <view class="order-info">
  31 + 总计费用:{{due |toFixed2}}元
  32 + </view>
  33 + <view class="order-line"></view>
  34 +
  35 + <view class="flex-row-justify-between">
  36 + <view class="order-info">
  37 + 支付金额
  38 + </view>
  39 + <view class="flex-row-justify-end">
  40 + <view class="order-info" style="font-weight:bold;font-size:17px ;">
  41 + {{orderFee | toFixed2}}
  42 + </view>
  43 + <view class="order-info" style="margin-right: 50upx;margin-left: 0px;">
  44 + 元
  45 + </view>
  46 + </view>
  47 + </view>
  48 +
  49 + <view class="order-line-bold"></view>
  50 +
  51 + <view class="order-title">
  52 + 支付方法
  53 + </view>
  54 + <view class="order-line"></view>
  55 +
  56 + <view class="orderwaysview">
  57 + <!--<image src="../../static/orderInfo/orderinfo-wechat.png" class="orderways"></image>-->
  58 + <view class="order-info" style="margin-left: 15px;">
  59 + 商户余额
  60 + </view>
  61 + <image src="../../static/orderInfo/orderinfo-sel.png" class="orderwaysSel"></image>
  62 +
  63 + </view>
  64 +
  65 + <view class="order-line"></view>
  66 + <button @click="payClick" class="button-sp-area" type="primary" plain="true">确认支付</button>
  67 + </view>
  68 +
  69 +
  70 +
  71 + </view>
66 72 </template>
67 73  
68 74 <script>
69   - export default {
70   - data() {
71   - return {
72   - businessId: '',
73   - orderId: '',
74   - mycarNumber: '',
75   - parkName: '',
76   - parkInTime: '',
77   - staytime: '',
78   - due: '',
79   - orderFee: '',
80   - // appOrderTimeout:'0',
81   - totalFee: '', //应收
82   - }
83   - },
84   - onLoad(params) {
85   - wx.showShareMenu({
86   - withShareTicket: true
87   - })
88   - this.mycarNumber = params.carNumber;
89   - let indexInfo = uni.getStorageSync("indexInfo");
90   - this.businessId = indexInfo.businessId;
91   - console.log(this.mycarNumber, this.businessId)
92   - this.getbBillQueryInfo();
93   - },
94   - onShow() {
95   -
96   - },
97   - methods: {
98   -
99   - payClick() {
100   - let that = this;
101   - let paramsData = {
102   - payType: '35',
103   - paySrcType: '101',
104   - orderId: that.orderId,
105   - payFee: that.orderFee,
106   -
107   - }
108   - // 获取 接口
109   - that.$myRequest({
110   - url: that.$common.accountPay,
111   - method: 'POST',
112   - data: that.$common.requestSign(paramsData)
113   - }).then(res => {
114   - console.log('余额支付:' + res)
115   - uni.showToast({
116   - title: "支付成功",
117   - icon: 'success',
118   - duration: 2000
119   - });
120   - setTimeout(function() {
121   - let pages = getCurrentPages(); //当前页
122   - let beforePage = pages[pages.length - 2];
123   - uni.navigateBack({
124   - success: function() {
125   - beforePage.onLoad();
126   - }
127   - })
128   - }, 2000);
129   -
130   - })
131   - },
132   -
133   - getbBillQueryInfo() {
134   - let that = this
135   - let paramsData = {
136   - carNumber: that.mycarNumber,
137   - pageNum: '1',
138   - pageSize: '10',
139   - businessId: that.businessId,
140   - parkState: '10',
141   -
142   - }
143   - // 获取 接口
144   - that.$myRequest({
145   - url: that.$common.queryParkingRecordByCarNumbers,
146   - method: 'POST',
147   - data: that.$common.requestSign(paramsData)
148   - }).then(res => {
149   - console.log(res.data.dataList[0])
150   - let data = res.data.dataList[0]
151   -
152   - that.parkName = data.parkName;
153   - that.parkInTime = data.parkInTime;
154   - that.staytime = data.parkDuration;
155   - that.due = data.totalFee;
156   - that.orderFee = data.unPayFee;
157   - that.orderId = data.orderId;
158   -
159   - })
160   -
161   - },
162   - }
163   -
164   - }
  75 +export default {
  76 + data() {
  77 + return {
  78 + businessId: '',
  79 + orderId: '',
  80 + mycarNumber: '',
  81 + parkName: '',
  82 + parkInTime: '',
  83 + staytime: '',
  84 + due: '',
  85 + orderFee: '',
  86 + // appOrderTimeout:'0',
  87 + totalFee: '', //应收
  88 + showFlag: false,
  89 + }
  90 + },
  91 + onLoad(params) {
  92 + wx.showShareMenu({
  93 + withShareTicket: true
  94 + })
  95 + this.mycarNumber = params.carNumber;
  96 + let indexInfo = uni.getStorageSync("indexInfo");
  97 + this.businessId = indexInfo.businessId;
  98 + console.log(this.mycarNumber, this.businessId)
  99 + this.getbBillQueryInfo();
  100 + },
  101 + onShow() {
  102 +
  103 + },
  104 + methods: {
  105 + payClick() {
  106 + let that = this;
  107 + let paramsData = {
  108 + payType: '35',
  109 + paySrcType: '101',
  110 + orderId: that.orderId,
  111 + payFee: that.orderFee,
  112 + }
  113 + // 获取 接口
  114 + that.$myRequest({
  115 + url: that.$common.accountPay,
  116 + method: 'POST',
  117 + data: that.$common.requestSign(paramsData)
  118 + }).then(res => {
  119 + console.log('余额支付:' + res)
  120 + uni.showToast({
  121 + title: "支付成功",
  122 + icon: 'success',
  123 + duration: 2000
  124 + });
  125 + setTimeout(function () {
  126 + let pages = getCurrentPages(); //当前页
  127 + let beforePage = pages[pages.length - 2];
  128 + uni.navigateBack({
  129 + success: function () {
  130 + beforePage.onLoad();
  131 + }
  132 + })
  133 + }, 2000);
  134 + })
  135 + },
  136 + getbBillQueryInfo() {
  137 + let that = this
  138 + let paramsData = {
  139 + carNumber: that.mycarNumber,
  140 + pageNum: '1',
  141 + pageSize: '10',
  142 + businessId: that.businessId,
  143 + parkState: '10',
  144 + }
  145 + // 获取 接口
  146 + that.$myRequest({
  147 + url: that.$common.queryParkingRecordByCarNumbers,
  148 + method: 'POST',
  149 + data: that.$common.requestSign(paramsData)
  150 + }).then(res => {
  151 + console.log(res.data.dataList[0])
  152 + if (res.data.dataList.length > 0) {
  153 + let data = res.data.dataList[0]
  154 + that.parkName = data.parkName;
  155 + that.parkInTime = data.parkInTime;
  156 + that.staytime = data.parkDuration;
  157 + that.due = data.totalFee;
  158 + that.orderFee = data.unPayFee;
  159 + that.orderId = data.orderId;
  160 + that.showFlag = false
  161 + } else {
  162 + that.showFlag = true
  163 + }
  164 + })
  165 + },
  166 + }
  167 +}
165 168 </script>
166 169  
167 170 <style scoped lang="scss">
168   - .order-time {
169   - padding: 5px 0;
170   - background: #f0ad4e;
171   - text-align: center;
172   - color: #fff;
173   - }
174   -
175   - .order-title {
176   - font-size: 18px;
177   - margin-left: 16px;
178   - margin-top: 15px;
179   - font-weight: bold;
180   - color: #404040;
181   - }
182   -
183   - .order-info {
184   - font-size: 14px;
185   - margin-left: 15px;
186   - margin-top: 12px;
187   - color: #404040;
188   - }
189   -
190   - .order-line {
191   - background: #D9D9D9;
192   - height: 1px;
193   - margin-top: 12px;
194   - margin-left: 15px;
195   - padding: 0px;
196   - overflow: hidden;
197   - /* 透明度 */
198   - opacity: 0.5;
199   - }
200   -
201   - .order-line-bold {
202   - background: #FAFAFA;
203   - height: 12px;
204   - margin-top: 12px;
205   - padding: 0px;
206   - overflow: hidden;
207   - }
208   -
209   - .flex-row-justify-between {
210   - display: flex;
211   - flex-direction: row;
212   - justify-content: space-between;
213   - }
214   -
215   - .flex-row-justify-end {
216   - display: flex;
217   - flex-direction: row;
218   - /* 水平对齐*/
219   - align-items: baseline;
220   -
221   - }
222   -
223   - .order-discount {
224   - color: #C8C7CC;
225   - margin-right: 20 upx;
226   - /* margin-right: 12px ; */
227   - /* margin-top:12px ; */
228   -
229   - }
230   -
231   - .orderwaysview {
232   - display: flex;
233   - flex-direction: row;
234   - }
235   -
236   - .orderways {
237   - width: 18px;
238   - height: 18px;
239   - margin-left: 15px;
240   - margin-top: 14px;
241   - }
242   -
243   - .orderwaysSel {
244   - width: 16px;
245   - height: 16px;
246   - margin-left: auto;
247   - margin-right: 14px;
248   - margin-top: 14px;
249   - /* justify-content:flex-end; */
250   - }
251   -
252   - .button-sp-area {
253   - margin: 0 auto;
254   - width: 60%;
255   - margin-top: 40px;
256   -
257   - }
  171 + .order-time {
  172 + padding: 5px 0;
  173 + background: #f0ad4e;
  174 + text-align: center;
  175 + color: #fff;
  176 + }
  177 +
  178 + .order-title {
  179 + font-size: 18px;
  180 + margin-left: 16px;
  181 + margin-top: 15px;
  182 + font-weight: bold;
  183 + color: #404040;
  184 + }
  185 +
  186 + .order-info {
  187 + font-size: 14px;
  188 + margin-left: 15px;
  189 + margin-top: 12px;
  190 + color: #404040;
  191 + }
  192 +
  193 + .order-line {
  194 + background: #D9D9D9;
  195 + height: 1px;
  196 + margin-top: 12px;
  197 + margin-left: 15px;
  198 + padding: 0px;
  199 + overflow: hidden;
  200 + /* 透明度 */
  201 + opacity: 0.5;
  202 + }
  203 +
  204 + .order-line-bold {
  205 + background: #FAFAFA;
  206 + height: 12px;
  207 + margin-top: 12px;
  208 + padding: 0px;
  209 + overflow: hidden;
  210 + }
  211 +
  212 + .flex-row-justify-between {
  213 + display: flex;
  214 + flex-direction: row;
  215 + justify-content: space-between;
  216 + }
  217 +
  218 + .flex-row-justify-end {
  219 + display: flex;
  220 + flex-direction: row;
  221 + /* 水平对齐*/
  222 + align-items: baseline;
  223 +
  224 + }
  225 +
  226 + .order-discount {
  227 + color: #C8C7CC;
  228 + margin-right: 20 upx;
  229 + /* margin-right: 12px ; */
  230 + /* margin-top:12px ; */
  231 +
  232 + }
  233 +
  234 + .orderwaysview {
  235 + display: flex;
  236 + flex-direction: row;
  237 + }
  238 +
  239 + .orderways {
  240 + width: 18px;
  241 + height: 18px;
  242 + margin-left: 15px;
  243 + margin-top: 14px;
  244 + }
  245 +
  246 + .orderwaysSel {
  247 + width: 16px;
  248 + height: 16px;
  249 + margin-left: auto;
  250 + margin-right: 14px;
  251 + margin-top: 14px;
  252 + /* justify-content:flex-end; */
  253 + }
  254 +
  255 + .button-sp-area {
  256 + margin: 0 auto;
  257 + width: 60%;
  258 + margin-top: 40px;
  259 +
  260 + }
258 261 </style>
... ...
pages/rechargeDetail/rechargeDetail.vue
... ... @@ -13,6 +13,10 @@
13 13 <view class="uni-input">{{kindArray[index].kindName}}</view>
14 14 </picker>
15 15 </view>
  16 +
  17 + <view class="marginRightArrow">
  18 + <uni-icons type="forward" size="14" color="#999"></uni-icons>
  19 + </view>
16 20 </view>
17 21 </view>
18 22  
... ... @@ -26,6 +30,9 @@
26 30 <view class="uni-input">{{arrayWay[indexWay].typeName}}</view>
27 31 </picker>
28 32 </view>
  33 + <view class="marginRightArrow">
  34 + <uni-icons type="forward" size="14" color="#999"></uni-icons>
  35 + </view>
29 36 </view>
30 37 </view>
31 38  
... ... @@ -40,6 +47,9 @@
40 47 <view class="uni-input">{{beginDate}}</view>
41 48 </picker>
42 49 </view>
  50 + <view class="marginRightArrow">
  51 + <uni-icons type="forward" size="14" color="#999"></uni-icons>
  52 + </view>
43 53 </view>
44 54 </view>
45 55  
... ... @@ -53,6 +63,9 @@
53 63 <view class="uni-input">{{overDate}}</view>
54 64 </picker>
55 65 </view>
  66 + <view class="marginRightArrow">
  67 + <uni-icons type="forward" size="14" color="#999"></uni-icons>
  68 + </view>
56 69 </view>
57 70 </view>
58 71  
... ...