diff --git a/app.json b/app.json
index d81440b..08add4c 100644
--- a/app.json
+++ b/app.json
@@ -3,6 +3,7 @@
"pages/index/index",
"index/index",
"index/searchbar",
+ "pages/store/index",
"index/passCar",
"index/user",
"pages/searchbar/searchbar",
diff --git a/components/store/index.js b/components/store/index.js
index f164d79..72c7bcb 100644
--- a/components/store/index.js
+++ b/components/store/index.js
@@ -57,6 +57,13 @@ Component({
wx.makePhoneCall({
phoneNumber: e.target.dataset.merchantlinkphone
});
+ },
+ gotoDoorLists(){
+ console.log(this.properties.merchantVoList)
+ let merchantVoList = JSON.stringify(this.properties.merchantVoList);
+ wx.navigateTo({
+ url: '/pages/store/index?merchantVoList=' + merchantVoList,
+ })
}
},
ready: function () {
diff --git a/components/store/index.wxml b/components/store/index.wxml
index 53728ab..3e76743 100644
--- a/components/store/index.wxml
+++ b/components/store/index.wxml
@@ -1,4 +1,4 @@
-适用门店
+
+
+
+
+ 适用门店
+
+
+ 查看
+
+
\ No newline at end of file
diff --git a/components/store/index.wxss b/components/store/index.wxss
index 2d504bd..552f82a 100644
--- a/components/store/index.wxss
+++ b/components/store/index.wxss
@@ -73,4 +73,47 @@
margin: auto;
width: 50rpx;
height: 50rpx;
+}
+
+
+
+.notes view:nth-child(1) {
+ height: 87rpx;
+ line-height: 87rpx;
+ background: #fff;
+ border-top: 1px solid #f9f9f9;
+}
+
+.notes {
+ width:100%;
+ background: #FFF;
+ padding-bottom: 30rpx;
+}
+.active {
+ opacity: 0.6;
+}
+
+.notes view:nth-child(1) text {
+ color: #333;
+ letter-spacing: 0;
+ font-size: 30rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+}
+.notes view:nth-child(1) {
+ width: 92%;
+ margin: 0 auto;
+}
+.notes view:nth-child(2) {
+ display: flex;
+ flex-direction: column;
+ width: 92%;
+ margin: 0 auto;
+}
+
+.notes view:nth-child(2)>text {
+ font-size: 24rpx;
+ color: #919191;
+ letter-spacing: 0;
+ line-height: 42rpx;
}
\ No newline at end of file
diff --git a/index/passCar.wxml b/index/passCar.wxml
index cb0e1a8..6a561fb 100644
--- a/index/passCar.wxml
+++ b/index/passCar.wxml
@@ -1,157 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.carNumber}}
-
-
-
-
-
-
-
-
-
-
- 入场时间:
- {{stopFees.entranceTime}}
-
-
- 停车时长:
- {{timecha}}
-
-
-
-
- 券优惠券:
-
- {{quantitle}}
- {{totalTicketNum}}张可用
-
-
-
-
-
- 待缴费用:
- {{stopFees.remainingFee}}元
-
-
-
-
- 立即支付
-
- 立即支付
-
-
-
- 立即支付
-
-
-
-
-
-
-
- 添加车牌
-
- 车辆入场后,才能绑车牌
-
-
-
-
- 我的停车券
-
-
-
-
-
-
-
- 车辆管理
-
-
-
-
-
-
-
- 缴费规则
-
-
-
-
-
-
-
- 常见问题
-
-
-
-
-
-
-
+
智慧停车即将上线
敬请期待
-
-
-
-
-
-
-
- 请您敬请期待
- 我们正在筹备一大波优惠活动
-
-
-
-
-
- 停车券
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
- {{item.subTitle}}
-
-
- 售价:{{item.salePrice/100}}元{{item.price/100}}元
- {{item.price/100}}小时
-
-
-
-
-
- 有效期至:
- {{item.expiredTime}}
-
-
-
-
-
- {{content}}
-
-
\ No newline at end of file
diff --git a/index/store/index.js b/index/store/index.js
new file mode 100644
index 0000000..f4c69e5
--- /dev/null
+++ b/index/store/index.js
@@ -0,0 +1,66 @@
+// index/store/index.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/index/store/index.js.js b/index/store/index.js.js
new file mode 100644
index 0000000..0bf9c83
--- /dev/null
+++ b/index/store/index.js.js
@@ -0,0 +1,66 @@
+// index/store/index.js.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/index/store/index.js.json b/index/store/index.js.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/index/store/index.js.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/index/store/index.js.wxml b/index/store/index.js.wxml
new file mode 100644
index 0000000..41b5e43
--- /dev/null
+++ b/index/store/index.js.wxml
@@ -0,0 +1,2 @@
+
+index/store/index.js.wxml
diff --git a/index/store/index.js.wxss b/index/store/index.js.wxss
new file mode 100644
index 0000000..3143cab
--- /dev/null
+++ b/index/store/index.js.wxss
@@ -0,0 +1 @@
+/* index/store/index.js.wxss */
\ No newline at end of file
diff --git a/index/store/index.json b/index/store/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/index/store/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/index/store/index.wxml b/index/store/index.wxml
new file mode 100644
index 0000000..403ff0e
--- /dev/null
+++ b/index/store/index.wxml
@@ -0,0 +1,2 @@
+
+index/store/index.wxml
diff --git a/index/store/index.wxss b/index/store/index.wxss
new file mode 100644
index 0000000..4476875
--- /dev/null
+++ b/index/store/index.wxss
@@ -0,0 +1 @@
+/* index/store/index.wxss */
\ No newline at end of file
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index baab053..cb209c5 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -93,7 +93,7 @@
-
+
购买须知
diff --git a/pages/index/store/index.js b/pages/index/store/index.js
new file mode 100644
index 0000000..190df23
--- /dev/null
+++ b/pages/index/store/index.js
@@ -0,0 +1,66 @@
+// pages/index/store/index.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/index/store/index.json b/pages/index/store/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/index/store/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/index/store/index.wxml b/pages/index/store/index.wxml
new file mode 100644
index 0000000..791095d
--- /dev/null
+++ b/pages/index/store/index.wxml
@@ -0,0 +1,2 @@
+
+pages/index/store/index.wxml
diff --git a/pages/index/store/index.wxss b/pages/index/store/index.wxss
new file mode 100644
index 0000000..748f64b
--- /dev/null
+++ b/pages/index/store/index.wxss
@@ -0,0 +1 @@
+/* pages/index/store/index.wxss */
\ No newline at end of file
diff --git a/pages/store/index.js b/pages/store/index.js
new file mode 100644
index 0000000..7e6a05f
--- /dev/null
+++ b/pages/store/index.js
@@ -0,0 +1,74 @@
+const imgurl = require("../../utils/imgurl");
+const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
+
+Page({
+ /**
+ * 组件的初始数据
+ */
+ data: {
+ navigationBarHeight,
+ teljpgUrl: imgurl.teljpg.url,
+ showMore: true,
+ more: "点击查看更多",
+ hidden: "hidden",
+ height: "",
+ merchantVoList:[]
+ },
+ /**
+ * 跳转到门店列表的详情页面
+ */
+ gotoDetail(e) {
+ wx.navigateTo({
+ url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
+ })
+ },
+ // 点击查看更多
+ more: function () {
+ let that = this;
+ if (that.data.more == '点击查看更多') {
+ this.setData({
+ hidden: "",
+ height: 'auto!important',
+ more: "点击收起",
+ showMore: true
+ })
+ } else {
+ that.setData({
+ hidden: "hidden",
+ height: 4 * 140 + 'rpx',
+ more: "点击查看更多",
+ showMore: true
+ })
+ }
+ },
+ phone: function (e) {
+ let that = this;
+ wx.makePhoneCall({
+ phoneNumber: e.target.dataset.merchantlinkphone
+ });
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ if (options.merchantVoList){
+ this.setData({
+ merchantVoList: JSON.parse(options.merchantVoList)
+ })
+ let merchantVoList = this.data.merchantVoList;
+ if (merchantVoList.length > 0) {
+ if (merchantVoList.length <= 4) {
+ this.setData({
+ height: merchantVoList.length * 140 + 'rpx',
+ showMore: false,
+ hidden: "hidden"
+ })
+ } else if (merchantVoList && merchantVoList.length > 4) {
+ this.setData({
+ height: 4 * 140 + 'rpx'
+ })
+ }
+ }
+ }
+ }
+})
diff --git a/pages/store/index.json b/pages/store/index.json
new file mode 100644
index 0000000..540604a
--- /dev/null
+++ b/pages/store/index.json
@@ -0,0 +1,8 @@
+{
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#F4F5F9",
+ "navigationBarTextStyle": "black",
+ "usingComponents": {
+ "navbar": "../../../../components/navbar/navbar"
+ }
+}
\ No newline at end of file
diff --git a/pages/store/index.wxml b/pages/store/index.wxml
new file mode 100644
index 0000000..2f53ffb
--- /dev/null
+++ b/pages/store/index.wxml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+ {{item.merchantName}}
+
+
+ {{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}
+ ,
+
+
+
+
+
+
+{{more}}
\ No newline at end of file
diff --git a/pages/store/index.wxss b/pages/store/index.wxss
new file mode 100644
index 0000000..552f82a
--- /dev/null
+++ b/pages/store/index.wxss
@@ -0,0 +1,119 @@
+.applyshop {
+ font-size: 30rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+ text-indent: 1em;
+ color: #333;
+ background: #fff;
+}
+
+.posi {
+ position: relative;
+ width: 100%;
+ background: #FFF;
+}
+.posi_logo {
+ position: relative;
+ width: 92%;
+ display: flex;
+ padding: 20rpx 0;
+ background: #fff;
+ margin: 0 auto;
+}
+
+.posi_logo view:nth-child(1) {
+ border-radius: 16rpx;
+}
+
+.posi_logo view:nth-child(1) image {
+ display: block;
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 16rpx;
+ margin-right: 16rpx;
+ border: 1px solid #e5e5e5;
+}
+.name{
+ font-size: 32rpx;
+ color: #333;
+ letter-spacing: 0;
+ width: 500rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+.posi_logo view:nth-child(2) view {
+ font-size: 32rpx;
+ color: #333;
+ letter-spacing: 0;
+}
+
+.shopVoList {
+ display: flex !important;
+ padding-left: 0 !important;
+ flex-direction: row !important;
+}
+
+.shopVoList text {
+ font-size: 20rpx !important;
+ color: #b8b8b8 !important;
+}
+.bottom{
+ background: #fff;
+ color: #666;
+ text-align: center;
+ padding: 20rpx 0;
+ font-size: 32rpx;
+}
+.tel {
+ position: absolute;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+ width: 50rpx;
+ height: 50rpx;
+}
+
+
+
+.notes view:nth-child(1) {
+ height: 87rpx;
+ line-height: 87rpx;
+ background: #fff;
+ border-top: 1px solid #f9f9f9;
+}
+
+.notes {
+ width:100%;
+ background: #FFF;
+ padding-bottom: 30rpx;
+}
+.active {
+ opacity: 0.6;
+}
+
+.notes view:nth-child(1) text {
+ color: #333;
+ letter-spacing: 0;
+ font-size: 30rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+}
+.notes view:nth-child(1) {
+ width: 92%;
+ margin: 0 auto;
+}
+.notes view:nth-child(2) {
+ display: flex;
+ flex-direction: column;
+ width: 92%;
+ margin: 0 auto;
+}
+
+.notes view:nth-child(2)>text {
+ font-size: 24rpx;
+ color: #919191;
+ letter-spacing: 0;
+ line-height: 42rpx;
+}
\ No newline at end of file