From e1beceff7be12cbd0e18dddd3beaaf3ee7b1b41b Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Tue, 13 Jun 2023 12:41:00 +0800
Subject: [PATCH] 二维码保存图片

---
 common/common.js                        |   6 ++++++
 pages.json                              | 544 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages/businessCard/printCard.vue        |   2 +-
 pages/parkRecordList/parkRecordList.vue | 449 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages/revisePwd/revisePwd.vue           | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/setting/setting.vue               | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------
 6 files changed, 802 insertions(+), 554 deletions(-)
 create mode 100644 pages/revisePwd/revisePwd.vue

diff --git a/common/common.js b/common/common.js
index 14f44a8..9ffc44a 100644
--- a/common/common.js
+++ b/common/common.js
@@ -21,6 +21,10 @@ const SetToken = uni.getStorageSync("globalUser").token;
 // ----江阴项目 接口----
 //  商户登录
 const userLogin = serverUrl + "/business/h5/index/login";
+//  修改密码
+const changePassword = serverUrl + "/business/h5/index/changePassword";
+
+
 //  获取已登录商户用户信息
 const indexInfo = serverUrl + "/business/h5/index/info";
 //  商户退出登录
@@ -326,7 +330,9 @@ export default {
   queryCustInvoiceHistoryList,
   //  重发邮件
   resendInvoiceMail,
+	//   修改密码
 
+  changePassword,
 	//陈彪接口
 	rechargeList,
 	walletKindType,
diff --git a/pages.json b/pages.json
index b39819d..365eb6c 100644
--- a/pages.json
+++ b/pages.json
@@ -1,280 +1,268 @@
 {
-	"leftWindow": {
-		"path": "windows/left-window.vue",
-		"style": {
-			"width": "350px"
-		}
-	},
-	"topWindow": {
-		"path": "windows/top-window.vue",
-		"style": {
-			"height": "60px"
-		}
-	},
-	"pages": [
-		// pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "商户管理"
-			}
-		},
-		{
-			"path": "pages/businessCard/cardDetail",
-			"style": {
-				"navigationBarTitleText": "商户卡券明细",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/businessCard/businessCard",
-			"style": {
-				"navigationBarTitleText": "商户卡券"
-			}
-		},
-
-
-
-		{
-			"path": "pages/businessCard/buyCard",
-			"style": {
-				"navigationBarTitleText": "商户卡券购买"
-			}
-		},
-
-
-
-		{
-			"path": "pages/businessCard/provideCard",
-			"style": {
-				"navigationBarTitleText": "商户卡券发放"
-			}
-		},
-		{
-			"path": "pages/businessCard/printCard",
-			"style": {
-				"navigationBarTitleText": "商户卡券打印"
-			}
-		},
-
-
-
-
-
-		{
-			"path": "pages/rechargeDetail/rechargeDetail",
-			"style": {
-				"navigationBarTitleText": "余额明细",
-				"enablePullDownRefresh": true
-			}
-
-		},
-
-		{
-			"path": "pages/parkRecordList/parkRecordList",
-			"style": {
-				"navigationBarTitleText": "停车记录"
-			}
-		},
-
-		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "商户中心",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path": "pages/businessCard/cardPrint",
-			"style": {
-				"navigationBarTitleText": "卡券打印"
-			}
-		},
-
-
-
-		{
-			"path": "pages/parkRecordList/recordDetail",
-			"style": {
-				"navigationBarTitleText": "订单详情"
-			}
-		},
-
-		{
-			"path": "pages/parkPay/parkPay",
-			"style": {
-				"navigationBarTitleText": "支付"
-			}
-		},
-		{
-			"path": "pages/inputCarNumber/inputCarNumber",
-			"style": {
-				"navigationBarTitleText": "停车缴费"
-			}
-		},
-		{
-			"path": "pages/moneyRecharge/moneyRecharge",
-			"style": {
-				"navigationBarTitleText": "我的钱包"
-			}
-		},
-		{
-			"path": "pages/tabBar/component/component",
-			"style": {
-				"navigationBarTitleText": "内置组件",
-				"app-plus": {
-					"bounce": "vertical",
-					"titleNView": {
-						"buttons": [{
-							"text": "\ue534",
-							"fontSrc": "/static/uni.ttf",
-							"fontSize": "22px",
-							"color": "#FFFFFF"
-						}]
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/tabBar/extUI/extUI",
-			"style": {
-				"navigationBarTitleText": "扩展组件",
-				"app-plus": {
-					"titleNView": {
-						"buttons": [{
-							"text": "\ue534",
-							"fontSrc": "/static/uni.ttf",
-							"fontSize": "22px",
-							"color": "#FFFFFF"
-						}]
-					}
-				}
-			}
-		},
-
-		{
-			"path": "pages/rechargeDetail/outDetail",
-			"style": {
-				"navigationBarTitleText": "账单详情"
-			}
-		},
-		 {
-			"path": "pages/setting/setting",
-			"style": {
-				"navigationBarTitleText": "设置",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/manuals/manuals",
-			"style": {
-				"navigationBarTitleText": "使用指南",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/aboutOur/aboutOur",
-			"style": {
-				"navigationBarTitleText": "关于我们",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path": "pages/invoiceClaim/invoiceClaim",
-			"style": {
-				"navigationBarTitleText": "发票申领",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/billing/billing",
-			"style": {
-				"navigationBarTitleText": "发票申领",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/invoiceRecord/invoiceRecord",
-			"style": {
-				"navigationBarTitleText": "开票历史",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/invoiceForm/invoiceForm",
-			"style": {
-				"navigationBarTitleText": "开票历史",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/elecRecord/elecRecord",
-			"style": {
-				"navigationBarTitleText": "电子包含记录",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/invoicePreview/invoicePreview",
-			"style": {
-				"navigationBarTitleText": "发票预览",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/invoiceInformation/invoiceInformation",
-			"style": {
-				"navigationBarTitleText": "开票信息确认",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/invoiceTitle/invoiceTitle",
-			"style": {
-				"navigationBarTitleText": "发票抬头",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/companyMsg/companyMsg",
-			"style": {
-				"navigationBarTitleText": "详情",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/addTitle/addTitle",
-			"style": {
-				"navigationBarTitleText": "添加抬头",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/editTitle/editTitle",
-			"style": {
-				"navigationBarTitleText": "编辑抬头",
-				"enablePullDownRefresh": false
-			}
-
-		}
-    ],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "江阴慧停车",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8",
-		"pageOrientation": "portrait",
-		"mp-360": {
-			"navigationStyle": "custom"
-		},
-		"h5": {
-			"maxWidth": 1190,
-			"navigationBarTextStyle": "black",
-			"navigationBarBackgroundColor": "#F1F1F1"
-		}
-	}
-
+  "leftWindow": {
+    "path": "windows/left-window.vue",
+    "style": {
+      "width": "350px"
+    }
+  },
+  "topWindow": {
+    "path": "windows/top-window.vue",
+    "style": {
+      "height": "60px"
+    }
+  },
+  "pages": [
+    // pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+
+    {
+      "path": "pages/index/index",
+      "style": {
+        "navigationBarTitleText": "商户管理"
+      }
+    },
+    {
+      "path": "pages/businessCard/cardDetail",
+      "style": {
+        "navigationBarTitleText": "商户卡券明细",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/businessCard/businessCard",
+      "style": {
+        "navigationBarTitleText": "商户卡券"
+      }
+    },
+    {
+      "path": "pages/businessCard/buyCard",
+      "style": {
+        "navigationBarTitleText": "商户卡券购买"
+      }
+    },
+    {
+      "path": "pages/businessCard/provideCard",
+      "style": {
+        "navigationBarTitleText": "商户卡券发放"
+      }
+    },
+    {
+      "path": "pages/businessCard/printCard",
+      "style": {
+        "navigationBarTitleText": "商户卡券打印"
+      }
+    },
+    {
+      "path": "pages/rechargeDetail/rechargeDetail",
+      "style": {
+        "navigationBarTitleText": "余额明细",
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path": "pages/parkRecordList/parkRecordList",
+      "style": {
+        "navigationBarTitleText": "停车记录"
+      }
+    },
+    {
+      "path": "pages/login/login",
+      "style": {
+        "navigationBarTitleText": "商户中心",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/businessCard/cardPrint",
+      "style": {
+        "navigationBarTitleText": "卡券打印"
+      }
+    },
+    {
+      "path": "pages/parkRecordList/recordDetail",
+      "style": {
+        "navigationBarTitleText": "订单详情"
+      }
+    },
+    {
+      "path": "pages/parkPay/parkPay",
+      "style": {
+        "navigationBarTitleText": "支付"
+      }
+    },
+    {
+      "path": "pages/inputCarNumber/inputCarNumber",
+      "style": {
+        "navigationBarTitleText": "停车缴费"
+      }
+    },
+    {
+      "path": "pages/moneyRecharge/moneyRecharge",
+      "style": {
+        "navigationBarTitleText": "我的钱包"
+      }
+    },
+    {
+      "path": "pages/tabBar/component/component",
+      "style": {
+        "navigationBarTitleText": "内置组件",
+        "app-plus": {
+          "bounce": "vertical",
+          "titleNView": {
+            "buttons": [
+              {
+                "text": "\ue534",
+                "fontSrc": "/static/uni.ttf",
+                "fontSize": "22px",
+                "color": "#FFFFFF"
+              }
+            ]
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/tabBar/extUI/extUI",
+      "style": {
+        "navigationBarTitleText": "扩展组件",
+        "app-plus": {
+          "titleNView": {
+            "buttons": [
+              {
+                "text": "\ue534",
+                "fontSrc": "/static/uni.ttf",
+                "fontSize": "22px",
+                "color": "#FFFFFF"
+              }
+            ]
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/rechargeDetail/outDetail",
+      "style": {
+        "navigationBarTitleText": "账单详情"
+      }
+    },
+    {
+      "path": "pages/setting/setting",
+      "style": {
+        "navigationBarTitleText": "设置",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/revisePwd/revisePwd",
+      "style": {
+        "navigationBarTitleText": "修改登录密码",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/manuals/manuals",
+      "style": {
+        "navigationBarTitleText": "使用指南",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/aboutOur/aboutOur",
+      "style": {
+        "navigationBarTitleText": "关于我们",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/invoiceClaim/invoiceClaim",
+      "style": {
+        "navigationBarTitleText": "发票申领",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/billing/billing",
+      "style": {
+        "navigationBarTitleText": "发票申领",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/invoiceRecord/invoiceRecord",
+      "style": {
+        "navigationBarTitleText": "开票历史",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/invoiceForm/invoiceForm",
+      "style": {
+        "navigationBarTitleText": "开票历史",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/elecRecord/elecRecord",
+      "style": {
+        "navigationBarTitleText": "电子包含记录",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/invoicePreview/invoicePreview",
+      "style": {
+        "navigationBarTitleText": "发票预览",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/invoiceInformation/invoiceInformation",
+      "style": {
+        "navigationBarTitleText": "开票信息确认",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/invoiceTitle/invoiceTitle",
+      "style": {
+        "navigationBarTitleText": "发票抬头",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/companyMsg/companyMsg",
+      "style": {
+        "navigationBarTitleText": "详情",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/addTitle/addTitle",
+      "style": {
+        "navigationBarTitleText": "添加抬头",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/editTitle/editTitle",
+      "style": {
+        "navigationBarTitleText": "编辑抬头",
+        "enablePullDownRefresh": false
+      }
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "江阴慧停车",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8",
+    "pageOrientation": "portrait",
+    "mp-360": {
+      "navigationStyle": "custom"
+    },
+    "h5": {
+      "maxWidth": 1190,
+      "navigationBarTextStyle": "black",
+      "navigationBarBackgroundColor": "#F1F1F1"
+    }
+  }
 }
diff --git a/pages/businessCard/printCard.vue b/pages/businessCard/printCard.vue
index 87f7ec0..a9c23b8 100644
--- a/pages/businessCard/printCard.vue
+++ b/pages/businessCard/printCard.vue
@@ -14,7 +14,7 @@
 
         <view class=" uni-card text-center" style="padding: 10px 0">
             <image :src="qrUrl" style="width: 300px;height:300px;margin: 0 auto;"
-                   @longpress="savePosterPath(qrUrl)"></image>
+                   show-menu-by-longpress='1'></image>
         </view>
 
         <view style="padding: 5px 10px">长按上面二维码可以保存为图片</view>
diff --git a/pages/parkRecordList/parkRecordList.vue b/pages/parkRecordList/parkRecordList.vue
index 993b31b..dab3c84 100644
--- a/pages/parkRecordList/parkRecordList.vue
+++ b/pages/parkRecordList/parkRecordList.vue
@@ -1,200 +1,265 @@
 <template>
-	<view>
-		<!--<view class="uni-title uni-common-pl">日期选择器</view>-->
-		<uni-notice-bar scrollable backgroundColor="#f0ad4e" color="#fff" single :text="detailText | tranNull">
-		</uni-notice-bar>
-
-		<view class="uni-list">
-			<view class="uni-list-cell">
-				<view class="uni-list-cell-left">
-					开始时间
-				</view>
-				<view class="uni-list-cell-db">
-					<picker mode="date" :value="startTime" :start="startDate" :end="endDate"
-						@change="bindStartDateChange">
-						<view class="uni-input">{{startTime}}</view>
-					</picker>
-				</view>
-			</view>
-
-			<view class="uni-list-cell">
-				<view class="uni-list-cell-left">
-					结束时间
-				</view>
-				<view class="uni-list-cell-db">
-					<picker mode="date" :value="endTime" :start="startDate" :end="endDate" @change="bindDateChange">
-						<view class="uni-input">{{endTime}}</view>
-					</picker>
-				</view>
-			</view>
-		</view>
-
-		<view v-if="recordList.length>0">
-			<view class="parkRecordWrap" v-for="(i, index) in recordList" @click="toRecordDetail(i)">
-				<view>
-					{{i.plName}}
-				</view>
-				<view class="recordCon">
-					<text>{{i.carNumber}}</text>
-					<!--<text>{{i.parkOutTime}}</text>-->
-					<uni-dateformat :date="i.parkOutTime" format="yyyy-MM-dd hh:mm:ss"></uni-dateformat>
-				</view>
-				<view class="recordCon">
-					<text>实收:{{ $common.moneyFormat(i.orderActFee) }}</text>
-					<text>应收:{{ $common.moneyFormat(i.orderTotalFee) }}</text>
-				</view>
-			</view>
-
-		</view>
-
-
-		<view v-else>
-			<image class="marginAuto" src="../../static/vipcard/novipcard.png" mode="aspectFit"></image>
-			<view class="text-center">
-				暂无停车记录
-			</view>
-
-		</view>
-
-
-	</view>
+    <view>
+        <!--<view class="uni-title uni-common-pl">日期选择器</view>-->
+        <uni-notice-bar scrollable backgroundColor="#f0ad4e" color="#fff" single :text="detailText | tranNull">
+        </uni-notice-bar>
+
+        <view class="uni-list">
+            <view class="uni-list-cell">
+                <view class="uni-list-cell-left">
+                    开始时间
+                </view>
+                <view class="uni-list-cell-db">
+                    <picker mode="date" :value="startTime" :start="startDate" :end="endDate"
+                            @change="bindStartDateChange">
+                        <view class="uni-input">{{startTime}}</view>
+                    </picker>
+                </view>
+            </view>
+
+            <view class="uni-list-cell">
+                <view class="uni-list-cell-left">
+                    结束时间
+                </view>
+                <view class="uni-list-cell-db">
+                    <picker mode="date" :value="endTime" :start="startDate" :end="endDate" @change="bindDateChange">
+                        <view class="uni-input">{{endTime}}</view>
+                    </picker>
+                </view>
+            </view>
+        </view>
+
+        <view v-if="recordList.length>0">
+            <view class="parkRecordWrap" v-for="(i, index) in recordList" @click="toRecordDetail(i)">
+                <view>
+                    {{i.plName}}
+                </view>
+                <view class="recordCon">
+                    <text>{{i.carNumber}}</text>
+                    <!--<text>{{i.parkOutTime}}</text>-->
+                    <uni-dateformat :date="i.parkOutTime" format="yyyy-MM-dd hh:mm:ss"></uni-dateformat>
+                </view>
+                <view class="recordCon">
+                    <text>实收:{{ $common.moneyFormat(i.orderActFee) }}</text>
+                    <text>应收:{{ $common.moneyFormat(i.orderTotalFee) }}</text>
+                </view>
+            </view>
+
+        </view>
+
+
+        <view v-else>
+            <image class="marginAuto" src="../../static/vipcard/novipcard.png" mode="aspectFit"></image>
+            <view class="text-center">
+                暂无停车记录
+            </view>
+
+        </view>
+
+
+    </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			const currentDate = this.getDate({
-				format: true
-			})
-			return {
-				detailText: '',
-				startTime: currentDate,
-				endTime: currentDate,
-				mycarNumber: '',
-				userIsLogin: false,
-				// shownoFlag: 0,
-				recordList: [],
-			}
-		},
-		onLoad(params) {
-			wx.showShareMenu({
-				withShareTicket: true
-			})
-			console.log("params.record : " + params.record);
-			this.getCouponSummary();
-			this.getBusinessParkOrderByBusIdForPage()
-		},
-		onShow() {
-			var me = this;
-			var userInfo = me.getGlobalUser("globalUser");
-			if (userInfo != null) {
-				me.userIsLogin = true;
-			} else {
-				me.userIsLogin = false;
-			}
-		},
-		// 过滤器
-		filters: {},
-		//计算属性
-		computed: {
-			startDate() {
-				return this.getDate('start');
-			},
-			endDate() {
-				return this.getDate('end');
-			}
-		},
-		methods: {
-			getCouponSummary() {
-				let that = this;
-				let data = {
-					businessId: uni.getStorageSync("indexInfo").businessId,
-					startTime: that.startTime,
-					endTime: that.endTime
-				};
-				console.log(data)
-				that.$myRequest({
-					url: that.$common.parkingCouponSummary,
-					method: 'POST',
-					data: that.$common.requestSign(data)
-				}).then(res => {
-			
-					let data = res.data;
-					that.detailText = data.totalFeeSummary+' '+data.actFeeSummary+' '+data.dicountFeeSummary;
-			
-				})
-			
-			},
-			// 通过商户ID查询停车记录信息
-			getBusinessParkOrderByBusIdForPage() {
-				let that = this
-				let paramsData = {
-					businessId: uni.getStorageSync("indexInfo").businessId,
-					startTime: that.startTime,
-					endTime: that.endTime
-				}
-				// 首页信息获取 接口
-				that.$myRequest({
-					url: that.$common.getBusinessParkOrderByBusIdForPage,
-					method: 'POST',
-					data: that.$common.requestSign(paramsData)
-				}).then(res => {
-					this.recordList = res.data.dataList
-				})
-			},
-			toRecordDetail: function(i) {
-				// console.log(orderId)
-				uni.navigateTo({
-					url: '../parkRecordList/recordDetail?optionData=' + JSON.stringify(i)
-				});
-
-			},
-			bindStartDateChange: function(e) {
-				this.startTime = e.detail.value
-				this.getCouponSummary();
-				this.getBusinessParkOrderByBusIdForPage()
-			},
-			bindDateChange: function(e) {
-				this.endTime = e.detail.value
-				this.getCouponSummary();
-				this.getBusinessParkOrderByBusIdForPage()
-			},
-			getDate(type) {
-				const date = new Date();
-				let year = date.getFullYear();
-				let month = date.getMonth() + 1;
-				let day = date.getDate();
-				if (type === 'start') {
-					year = year - 60;
-				} else if (type === 'end') {
-					year = year + 2;
-				}
-				month = month > 9 ? month : '0' + month;
-				day = day > 9 ? day : '0' + day;
-				return `${year}-${month}-${day}`;
-			},
-		}
-	}
+export default {
+  data() {
+    const currentDate = this.getDate({
+      format: true
+    })
+    return {
+      detailText: '',
+      startTime: currentDate,
+      endTime: currentDate,
+      mycarNumber: '',
+      userIsLogin: false,
+      // shownoFlag: 0,
+      recordList: [],
+      pageNum: 1,//当前页
+      pageSize: 10,//每页条数
+      totalPages: '1', // 总条数
+      status: 'no-more',
+      refreshIfNeeded: false,
+    }
+  },
+  onLoad(params) {
+    wx.showShareMenu({
+      withShareTicket: true
+    })
+    console.log("params.record : " + params.record);
+    this.getCouponSummary();
+    this.getBusinessParkOrderByBusIdForPage()
+  },
+  onShow() {
+    var me = this;
+    var userInfo = me.getGlobalUser("globalUser");
+    if (userInfo != null) {
+      me.userIsLogin = true;
+    } else {
+      me.userIsLogin = false;
+    }
+
+
+    var pages = getCurrentPages(); // 获取当前页面栈
+    var currentPage = pages[pages.length - 1]; // 当前页面
+    if (currentPage.data.refreshIfNeeded) {
+      console.log('show')
+      currentPage.data.refreshIfNeeded = false;
+      this.pageNum = 1//当前页
+      this.pageSize = 10//每页条数
+      this.recordList = []
+      this.status = 'no-more'
+      this.getBusinessParkOrderByBusIdForPage(); // 当前页面 method中的方法，用来刷新当前页面
+    }
+
+  },
+  // 过滤器
+  filters: {},
+  // 下拉刷新触发
+  onPullDownRefresh(val) {
+    console.log('下拉刷新触发')
+    this.pageNum = 1
+    this.pageSize = this.pageSize
+    this.totalPages = 1
+    this.recordList = []
+    this.getBusinessParkOrderByBusIdForPage()
+  },
+  // 上拉加载触发
+  onReachBottom() {
+    console.log('上拉加载触发')
+    console.log(this.totalPages)
+    console.log(this.recordList.length)
+    if (this.totalPages == this.recordList.length) {
+      this.status = 'no-more'
+      return
+    } else {
+      this.pageNum++;
+      this.getBusinessParkOrderByBusIdForPage()
+    }
+  },
+  //计算属性
+  computed: {
+    startDate() {
+      return this.getDate('start');
+    },
+    endDate() {
+      return this.getDate('end');
+    }
+  },
+  methods: {
+    getCouponSummary() {
+      let that = this;
+      let data = {
+        businessId: uni.getStorageSync("indexInfo").businessId,
+        startTime: that.startTime,
+        endTime: that.endTime
+      };
+      console.log(data)
+      that.$myRequest({
+        url: that.$common.parkingCouponSummary,
+        method: 'POST',
+        data: that.$common.requestSign(data)
+      }).then(res => {
+        let data = res.data;
+        that.detailText = data.totalFeeSummary + ' ' + data.actFeeSummary + ' ' + data.dicountFeeSummary;
+      })
+    },
+    // 通过商户ID查询停车记录信息
+    getBusinessParkOrderByBusIdForPage() {
+      let that = this
+      that.status = 'loading'
+      let paramsData = {
+        businessId: uni.getStorageSync("indexInfo").businessId,
+        startTime: that.startTime,
+        endTime: that.endTime,
+        pageNum: that.pageNum,
+        pageSize: that.pageSize
+      }
+      // 首页信息获取 接口
+      that.$myRequest({
+        url: that.$common.getBusinessParkOrderByBusIdForPage,
+        method: 'POST',
+        data: that.$common.requestSign(paramsData)
+      }).then(res => {
+        // this.recordList = res.data.dataList
+
+        if (res.data.dataList.length > 0) {
+          if (res.data.pageTotals < 10) {
+            that.status = 'no-more'
+          } else {
+            that.status = 'more'
+            console.log('more')
+          }
+        } else {
+          that.status = 'no-more'
+        }
+        that.totalPages = res.data.pageTotals;
+        that.recordList = that.recordList.concat(res.data.dataList)
+        // console.log(that.recordList.length)
+
+
+      })
+    },
+    toRecordDetail: function (i) {
+      // console.log(orderId)
+      uni.navigateTo({
+        url: '../parkRecordList/recordDetail?optionData=' + JSON.stringify(i)
+      });
+    },
+    bindStartDateChange: function (e) {
+      this.pageNum = 1
+      this.pageSize = this.pageSize
+      this.totalPages = 1
+      this.recordList = []
+      this.startTime = e.detail.value
+      this.getCouponSummary();
+      this.getBusinessParkOrderByBusIdForPage()
+    },
+    bindDateChange: function (e) {
+      this.pageNum = 1
+      this.pageSize = this.pageSize
+      this.totalPages = 1
+      this.recordList = []
+
+      this.endTime = e.detail.value
+      this.getCouponSummary();
+      this.getBusinessParkOrderByBusIdForPage()
+    },
+    getDate(type) {
+      const date = new Date();
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      let day = date.getDate();
+      if (type === 'start') {
+        year = year - 60;
+      } else if (type === 'end') {
+        year = year + 2;
+      }
+      month = month > 9 ? month : '0' + month;
+      day = day > 9 ? day : '0' + day;
+      return `${year}-${month}-${day}`;
+    },
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	.parkRecordWrap {
-		padding: 5px 40px 5px 15px;
-		border-bottom: 1px solid #ccc;
-		position: relative;
-
-		:after {
-			content: '>';
-			position: absolute;
-			top: 20px;
-			right: 5px;
-			font-size: 18px;
-		}
-	}
-
-	.recordCon {
-		color: #999;
-		display: flex;
-		justify-content: space-between;
-	}
+    .parkRecordWrap {
+        padding: 5px 40px 5px 15px;
+        border-bottom: 1px solid #ccc;
+        position: relative;
+
+        :after {
+            content: '>';
+            position: absolute;
+            top: 20px;
+            right: 5px;
+            font-size: 18px;
+        }
+    }
+
+    .recordCon {
+        color: #999;
+        display: flex;
+        justify-content: space-between;
+    }
 </style>
diff --git a/pages/revisePwd/revisePwd.vue b/pages/revisePwd/revisePwd.vue
new file mode 100644
index 0000000..59937df
--- /dev/null
+++ b/pages/revisePwd/revisePwd.vue
@@ -0,0 +1,192 @@
+<template>
+    <view>
+        <view class="setting-content">
+            <!--<uni-list>-->
+            <!--<uni-list-item title="关于我们" clickable @click="toAboutOur" showArrow></uni-list-item>-->
+            <!--<uni-list-item title="修改登录密码" clickable @click="toAboutOur" showArrow></uni-list-item>-->
+            <!--<uni-list-item title="清除缓存" clickable @click="cleanStorage" ></uni-list-item>-->
+            <!--</uni-list>-->
+
+
+            <uni-section title="修改登录密码" type="line">
+                <view class="example" style="padding: 0 15px;">
+                    <!-- 基础表单校验 -->
+                    <uni-forms ref="valiForm" :rules="rules" :modelValue="valiFormData" label-width="100">
+                        <uni-forms-item label="原登录密码" required name="oldPwd">
+                            <uni-easyinput v-model="valiFormData.oldPwd" placeholder="请输入原登录密码"/>
+                        </uni-forms-item>
+                        <uni-forms-item label="新登录密码" required name="newPwd">
+                            <uni-easyinput v-model="valiFormData.newPwd" placeholder="请输入新登录密码"/>
+                        </uni-forms-item>
+                        <uni-forms-item label="新登录密码" required name="newPwdAga">
+                            <uni-easyinput v-model="valiFormData.newPwdAga" placeholder="请再次输入新登录密码"/>
+                        </uni-forms-item>
+                    </uni-forms>
+
+                </view>
+            </uni-section>
+
+
+            <view class="uni-padding-wrap uni-common-mt">
+                <button type="warn" @click="submit('valiForm')">确定修改</button>
+            </view>
+
+        </view>
+
+    </view>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      // 校验表单数据
+      valiFormData: {
+        oldPwd: '',
+        newPwd: '',
+        newPwdAga: '',
+      },
+      // 校验规则
+      rules: {
+        oldPwd: {
+          rules: [{
+            required: true,
+            errorMessage: '原密码不能为空'
+          }, {
+            minLength: 6,
+            errorMessage: '请输入大于六位数',
+          }
+          ]
+        },
+        newPwd: {
+          rules: [{
+            required: true,
+            errorMessage: '新密码不能为空'
+          }, {
+              minLength: 6,
+              errorMessage: '请输入大于六位数',
+            }
+          ]
+        },
+        newPwdAga: {
+          rules: [{
+            required: true,
+            errorMessage: '新密码不能为空'
+          }, {
+              minLength: 6,
+              errorMessage: '请输入大于六位数',
+            }
+          ]
+        }
+      },
+    }
+  },
+  methods: {
+    submit(ref) {
+      let that = this;
+      this.$refs[ref].validate().then(res => {
+        if(this.valiFormData.newPwd !== this.valiFormData.newPwdAga){
+          uni.showToast({
+            icon:'none',
+            title: `两次输入的新密码不一样`
+          })
+          return
+        }
+        // uni.getStorageSync("indexInfo").userName
+
+        let changePassword = this.$common.changePassword;
+        let jsondata = {
+          userCode:  uni.getStorageSync("indexInfo").userCode,
+          oldPassWord: this.valiFormData.oldPwd,
+          newPassWord: this.valiFormData.newPwdAga,
+        };
+        uni.request({
+          url: changePassword,
+          data: JSON.stringify(this.$common.requestSign(jsondata)),
+          dataType: "json",
+          method: "POST",
+          success: (res) => {
+            console.log(res)
+            if (res.data.code == 0) {
+              uni.showToast({
+                icon:'none',
+                title: `修改成功`
+              })
+              that.loginOut();
+            }else{
+              uni.showToast({
+                icon:'none',
+                title: res.data.message
+              })
+
+            }
+          }
+        })
+
+      }).catch(err => {
+        console.log('err', err);
+      })
+    },
+    toAboutOur() {
+      uni.navigateTo({
+        url: '../aboutOur/aboutOur'
+      });
+    },
+    cleanStorage() {
+      uni.clearStorageSync();
+      uni.showToast({
+        title: "清理缓存成功",
+        mask: false,
+        duration: 2000
+      })
+    },
+    loginOutAlert() {
+      let that = this;
+      uni.showModal({
+        title: '提示',
+        content: '是否确定退出登录？',
+        success: (res) => {
+          if (res.confirm) {
+            that.loginOut();
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        }
+      })
+    },
+    loginOut() {
+      let that = this;
+      that.$myRequest({
+        url: that.$common.userLoginout,
+        method: 'POST',
+        data: that.$common.requestSign()
+      }).then(res => {
+        // 获取真实数据之前，务必判断状态是否为200
+        console.log('退出：' + JSON.stringify(res));
+        if (res.code == 0) {
+          uni.clearStorageSync();
+          uni.reLaunch({
+            url: "../index/index"
+          })
+          uni.hideLoading();
+        } else {
+          uni.clearStorageSync();
+          uni.reLaunch({
+            url: "../index/index"
+          })
+          uni.hideLoading();
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+    .setting-content {
+        background-color: #f6f6f6;
+        height: 100vh;
+
+    }
+</style>
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index a502954..f200956 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -1,94 +1,91 @@
 <template>
-	<view>
-		<view class="setting-content">
-			<uni-list>
-				<uni-list-item title="关于我们" clickable @click="toAboutOur" showArrow></uni-list-item>
-				<uni-list-item title="清除缓存" clickable @click="cleanStorage" ></uni-list-item>
-			</uni-list>
+    <view>
+        <view class="setting-content">
+            <uni-list>
+                <uni-list-item title="关于我们" clickable @click="toAboutOur" showArrow></uni-list-item>
+                <uni-list-item title="修改登录密码" clickable @click="toRevisePwd" showArrow></uni-list-item>
+                <uni-list-item title="清除缓存" clickable @click="cleanStorage"></uni-list-item>
+            </uni-list>
 
-			<view class="uni-padding-wrap uni-common-mt">
-				<button type="warn" @click="loginOutAlert">退出登录</button>
-			</view>
+            <view class="uni-padding-wrap uni-common-mt">
+                <button type="warn" @click="loginOutAlert">退出登录</button>
+            </view>
 
-		</view>
+        </view>
 
-	</view>
+    </view>
 </template>
 
 <script>
-	
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			toAboutOur() {
-				uni.navigateTo({
-					url: '../aboutOur/aboutOur'
-				
-				});			
-			},
-			cleanStorage() {
-				uni.clearStorageSync();
-				uni.showToast({
-					title: "清理缓存成功",
-					mask: false,
-					duration:2000
-				})
-			},
-			loginOutAlert(){
-				let that = this;
-				uni.showModal({
-					title:'提示',
-					content:'是否确定退出登录？',
-					success: (res) => {
-						if(res.confirm){
-							that.loginOut();
-						}else if(res.cancel){
-							console.log('用户点击取消')
-						}
-					}
-				})
-				
-			},
-			loginOut(){
-				let that = this;
-				that.$myRequest({
-					url: that.$common.userLoginout,
-					method: 'POST',
-					data: that.$common.requestSign()
-				}).then(res => {
-						// 获取真实数据之前，务必判断状态是否为200
-						console.log('退出：' + JSON.stringify(res));
-						if (res.code == 0) {
-							
-							uni.clearStorageSync();						
-							uni.reLaunch({
-								url: "../index/index"
-							})
-							uni.hideLoading();
-							
-						} else {
-							
-							uni.clearStorageSync();						
-							uni.reLaunch({
-								url: "../index/index"
-							})						
-							uni.hideLoading();
-							
-						}
-					
-				})
-			}
-		}
-	}
+
+export default {
+  data() {
+    return {}
+  },
+  methods: {
+    toRevisePwd() {
+      uni.navigateTo({
+        url: '../revisePwd/revisePwd'
+      });
+    },
+    toAboutOur() {
+      uni.navigateTo({
+        url: '../aboutOur/aboutOur'
+      });
+    },
+    cleanStorage() {
+      uni.clearStorageSync();
+      uni.showToast({
+        title: "清理缓存成功",
+        mask: false,
+        duration: 2000
+      })
+    },
+    loginOutAlert() {
+      let that = this;
+      uni.showModal({
+        title: '提示',
+        content: '是否确定退出登录？',
+        success: (res) => {
+          if (res.confirm) {
+            that.loginOut();
+          } else if (res.cancel) {
+            console.log('用户点击取消')
+          }
+        }
+      })
+    },
+    loginOut() {
+      let that = this;
+      that.$myRequest({
+        url: that.$common.userLoginout,
+        method: 'POST',
+        data: that.$common.requestSign()
+      }).then(res => {
+        // 获取真实数据之前，务必判断状态是否为200
+        console.log('退出：' + JSON.stringify(res));
+        if (res.code == 0) {
+          uni.clearStorageSync();
+          uni.reLaunch({
+            url: "../index/index"
+          })
+          uni.hideLoading();
+        } else {
+          uni.clearStorageSync();
+          uni.reLaunch({
+            url: "../index/index"
+          })
+          uni.hideLoading();
+        }
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss">
-	.setting-content {
-		background-color: #f6f6f6;
-		height: 100vh;
-	}
+    .setting-content {
+        background-color: #f6f6f6;
+        height: 100vh;
+    }
 </style>
--
libgit2 0.21.4