diff --git a/app.json b/app.json
index b650123..43142a3 100644
--- a/app.json
+++ b/app.json
@@ -10,9 +10,7 @@
"pages/market/index",
"pages/user/index",
"pages/coupon/detail/index",
- "pages/shop/detail/index",
"pages/rushToBuy/index",
- "pages/shop/index/index",
"pages/couponorder/index/index",
"pages/couponorder/detail/index",
"pages/cardorder/index/index",
@@ -50,20 +48,20 @@
"list": [
{
"pagePath": "pages/index/index",
- "iconPath": "assets/img/home-n.png",
- "selectedIconPath": "assets/img/home-y.png",
+ "iconPath": "assets/images/home-n.png",
+ "selectedIconPath": "assets/images/home-y.png",
"text": "首页"
},
{
"pagePath": "pages/passCar/passCar",
- "iconPath": "assets/img/pass1.png",
- "selectedIconPath": "assets/img/pass0.png",
+ "iconPath": "assets/images/pass1.png",
+ "selectedIconPath": "assets/images/pass0.png",
"text": "停车"
},
{
"pagePath": "pages/user/index",
- "iconPath": "assets/img/user-n.png",
- "selectedIconPath": "assets/img/user-y.png",
+ "iconPath": "assets/images/user-n.png",
+ "selectedIconPath": "assets/images/user-y.png",
"text": "我的"
}
]
diff --git a/assets/img/home-n.png b/assets/images/home-n.png
similarity index 100%
rename from assets/img/home-n.png
rename to assets/images/home-n.png
diff --git a/assets/img/home-y.png b/assets/images/home-y.png
similarity index 100%
rename from assets/img/home-y.png
rename to assets/images/home-y.png
diff --git a/assets/img/pass0.png b/assets/images/pass0.png
similarity index 100%
rename from assets/img/pass0.png
rename to assets/images/pass0.png
diff --git a/assets/img/pass1.png b/assets/images/pass1.png
similarity index 100%
rename from assets/img/pass1.png
rename to assets/images/pass1.png
diff --git a/assets/img/user-n.png b/assets/images/user-n.png
similarity index 100%
rename from assets/img/user-n.png
rename to assets/images/user-n.png
diff --git a/assets/img/user-y.png b/assets/images/user-y.png
similarity index 100%
rename from assets/img/user-y.png
rename to assets/images/user-y.png
diff --git a/assets/img/act.png b/assets/img/act.png
deleted file mode 100644
index b42ba83..0000000
Binary files a/assets/img/act.png and /dev/null differ
diff --git a/assets/img/active.gif b/assets/img/active.gif
deleted file mode 100644
index 74ce8f1..0000000
Binary files a/assets/img/active.gif and /dev/null differ
diff --git a/assets/img/add.png b/assets/img/add.png
deleted file mode 100644
index a5b5646..0000000
Binary files a/assets/img/add.png and /dev/null differ
diff --git a/assets/img/addr-white.png b/assets/img/addr-white.png
deleted file mode 100644
index a4b14df..0000000
Binary files a/assets/img/addr-white.png and /dev/null differ
diff --git a/assets/img/addr.png b/assets/img/addr.png
deleted file mode 100644
index 15707fa..0000000
Binary files a/assets/img/addr.png and /dev/null differ
diff --git a/assets/img/addresslogo.png b/assets/img/addresslogo.png
deleted file mode 100644
index c340b57..0000000
Binary files a/assets/img/addresslogo.png and /dev/null differ
diff --git a/assets/img/alipay.png b/assets/img/alipay.png
deleted file mode 100644
index c7f053b..0000000
Binary files a/assets/img/alipay.png and /dev/null differ
diff --git a/assets/img/banner.png b/assets/img/banner.png
deleted file mode 100644
index 1d1c837..0000000
Binary files a/assets/img/banner.png and /dev/null differ
diff --git a/assets/img/bg.png b/assets/img/bg.png
deleted file mode 100644
index 5e02618..0000000
Binary files a/assets/img/bg.png and /dev/null differ
diff --git a/assets/img/cardicon.png b/assets/img/cardicon.png
deleted file mode 100644
index 3535b8c..0000000
Binary files a/assets/img/cardicon.png and /dev/null differ
diff --git a/assets/img/che.png b/assets/img/che.png
deleted file mode 100644
index 713203c..0000000
Binary files a/assets/img/che.png and /dev/null differ
diff --git a/assets/img/choice.png b/assets/img/choice.png
deleted file mode 100644
index 67c2a3b..0000000
Binary files a/assets/img/choice.png and /dev/null differ
diff --git a/assets/img/choiced.png b/assets/img/choiced.png
deleted file mode 100644
index dd28e45..0000000
Binary files a/assets/img/choiced.png and /dev/null differ
diff --git a/assets/img/clock.png b/assets/img/clock.png
deleted file mode 100644
index 31327e8..0000000
Binary files a/assets/img/clock.png and /dev/null differ
diff --git a/assets/img/closed.png b/assets/img/closed.png
deleted file mode 100644
index edbb13e..0000000
Binary files a/assets/img/closed.png and /dev/null differ
diff --git a/assets/img/coupon.png b/assets/img/coupon.png
deleted file mode 100644
index 3660dfa..0000000
Binary files a/assets/img/coupon.png and /dev/null differ
diff --git a/assets/img/ding.png b/assets/img/ding.png
deleted file mode 100644
index d41daf7..0000000
Binary files a/assets/img/ding.png and /dev/null differ
diff --git a/assets/img/dingdan.png b/assets/img/dingdan.png
deleted file mode 100644
index aceab06..0000000
Binary files a/assets/img/dingdan.png and /dev/null differ
diff --git a/assets/img/down-white.png b/assets/img/down-white.png
deleted file mode 100644
index 99ab22a..0000000
Binary files a/assets/img/down-white.png and /dev/null differ
diff --git a/assets/img/down.png b/assets/img/down.png
deleted file mode 100644
index 8d13587..0000000
Binary files a/assets/img/down.png and /dev/null differ
diff --git a/assets/img/edit.png b/assets/img/edit.png
deleted file mode 100644
index dfca640..0000000
Binary files a/assets/img/edit.png and /dev/null differ
diff --git a/assets/img/fail.png b/assets/img/fail.png
deleted file mode 100644
index 698614a..0000000
Binary files a/assets/img/fail.png and /dev/null differ
diff --git a/assets/img/fenxiang.png b/assets/img/fenxiang.png
deleted file mode 100644
index 863fa33..0000000
Binary files a/assets/img/fenxiang.png and /dev/null differ
diff --git a/assets/img/game.png b/assets/img/game.png
deleted file mode 100644
index 7341f09..0000000
Binary files a/assets/img/game.png and /dev/null differ
diff --git a/assets/img/gift.png b/assets/img/gift.png
deleted file mode 100644
index 2a7aeb8..0000000
Binary files a/assets/img/gift.png and /dev/null differ
diff --git a/assets/img/gou.png b/assets/img/gou.png
deleted file mode 100644
index 2b84bc8..0000000
Binary files a/assets/img/gou.png and /dev/null differ
diff --git a/assets/img/grade.png b/assets/img/grade.png
deleted file mode 100644
index a170886..0000000
Binary files a/assets/img/grade.png and /dev/null differ
diff --git a/assets/img/grade1.png b/assets/img/grade1.png
deleted file mode 100644
index fb46d54..0000000
Binary files a/assets/img/grade1.png and /dev/null differ
diff --git a/assets/img/grade2.png b/assets/img/grade2.png
deleted file mode 100644
index 82fa38d..0000000
Binary files a/assets/img/grade2.png and /dev/null differ
diff --git a/assets/img/grade3.png b/assets/img/grade3.png
deleted file mode 100644
index e79e36a..0000000
Binary files a/assets/img/grade3.png and /dev/null differ
diff --git a/assets/img/growthbg.png b/assets/img/growthbg.png
deleted file mode 100644
index fe24210..0000000
Binary files a/assets/img/growthbg.png and /dev/null differ
diff --git a/assets/img/headbg.png b/assets/img/headbg.png
deleted file mode 100644
index a07ef0a..0000000
Binary files a/assets/img/headbg.png and /dev/null differ
diff --git a/assets/img/jian.png b/assets/img/jian.png
deleted file mode 100644
index 5d06dab..0000000
Binary files a/assets/img/jian.png and /dev/null differ
diff --git a/assets/img/jilu.png b/assets/img/jilu.png
deleted file mode 100644
index 977b9e0..0000000
Binary files a/assets/img/jilu.png and /dev/null differ
diff --git a/assets/img/line.png b/assets/img/line.png
deleted file mode 100644
index d93cec0..0000000
Binary files a/assets/img/line.png and /dev/null differ
diff --git a/assets/img/lines.png b/assets/img/lines.png
deleted file mode 100644
index 19d913e..0000000
Binary files a/assets/img/lines.png and /dev/null differ
diff --git a/assets/img/liness.png b/assets/img/liness.png
deleted file mode 100644
index 814ffa4..0000000
Binary files a/assets/img/liness.png and /dev/null differ
diff --git a/assets/img/loading.gif b/assets/img/loading.gif
deleted file mode 100644
index 9a046e8..0000000
Binary files a/assets/img/loading.gif and /dev/null differ
diff --git a/assets/img/loading1.gif b/assets/img/loading1.gif
deleted file mode 100644
index 52d7d29..0000000
Binary files a/assets/img/loading1.gif and /dev/null differ
diff --git a/assets/img/location.png b/assets/img/location.png
deleted file mode 100644
index b88babd..0000000
Binary files a/assets/img/location.png and /dev/null differ
diff --git a/assets/img/logo.png b/assets/img/logo.png
deleted file mode 100644
index f4d3142..0000000
Binary files a/assets/img/logo.png and /dev/null differ
diff --git a/assets/img/mine.png b/assets/img/mine.png
deleted file mode 100644
index 5a35ca7..0000000
Binary files a/assets/img/mine.png and /dev/null differ
diff --git a/assets/img/myspeacial.jpg b/assets/img/myspeacial.jpg
deleted file mode 100644
index 464cf0f..0000000
Binary files a/assets/img/myspeacial.jpg and /dev/null differ
diff --git a/assets/img/new.png b/assets/img/new.png
deleted file mode 100644
index 6e048bb..0000000
Binary files a/assets/img/new.png and /dev/null differ
diff --git a/assets/img/orbg.png b/assets/img/orbg.png
deleted file mode 100644
index f0a7883..0000000
Binary files a/assets/img/orbg.png and /dev/null differ
diff --git a/assets/img/park.png b/assets/img/park.png
deleted file mode 100644
index 78528a3..0000000
Binary files a/assets/img/park.png and /dev/null differ
diff --git a/assets/img/parkCoupon.png b/assets/img/parkCoupon.png
deleted file mode 100644
index 8f4449d..0000000
Binary files a/assets/img/parkCoupon.png and /dev/null differ
diff --git a/assets/img/phone.png b/assets/img/phone.png
deleted file mode 100644
index daf2ec8..0000000
Binary files a/assets/img/phone.png and /dev/null differ
diff --git a/assets/img/platebg.png b/assets/img/platebg.png
deleted file mode 100644
index cd0d7b8..0000000
Binary files a/assets/img/platebg.png and /dev/null differ
diff --git a/assets/img/qidai.png b/assets/img/qidai.png
deleted file mode 100644
index a22b3f2..0000000
Binary files a/assets/img/qidai.png and /dev/null differ
diff --git a/assets/img/qrcode.png b/assets/img/qrcode.png
deleted file mode 100644
index e8d8988..0000000
Binary files a/assets/img/qrcode.png and /dev/null differ
diff --git a/assets/img/quan.png b/assets/img/quan.png
deleted file mode 100644
index 554943d..0000000
Binary files a/assets/img/quan.png and /dev/null differ
diff --git a/assets/img/quans.png b/assets/img/quans.png
deleted file mode 100644
index 3ee3af6..0000000
Binary files a/assets/img/quans.png and /dev/null differ
diff --git a/assets/img/ques_bg.png b/assets/img/ques_bg.png
deleted file mode 100644
index 5695fd7..0000000
Binary files a/assets/img/ques_bg.png and /dev/null differ
diff --git a/assets/img/ques_gou.png b/assets/img/ques_gou.png
deleted file mode 100644
index 8a1492d..0000000
Binary files a/assets/img/ques_gou.png and /dev/null differ
diff --git a/assets/img/quesimg01.png b/assets/img/quesimg01.png
deleted file mode 100644
index 03a3c57..0000000
Binary files a/assets/img/quesimg01.png and /dev/null differ
diff --git a/assets/img/redirect.png b/assets/img/redirect.png
deleted file mode 100644
index f0d9fcf..0000000
Binary files a/assets/img/redirect.png and /dev/null differ
diff --git a/assets/img/right.png b/assets/img/right.png
deleted file mode 100644
index 494d3a8..0000000
Binary files a/assets/img/right.png and /dev/null differ
diff --git a/assets/img/rule.png b/assets/img/rule.png
deleted file mode 100644
index a5aa5ff..0000000
Binary files a/assets/img/rule.png and /dev/null differ
diff --git a/assets/img/shanchu-gray.png b/assets/img/shanchu-gray.png
deleted file mode 100644
index 782e2e8..0000000
Binary files a/assets/img/shanchu-gray.png and /dev/null differ
diff --git a/assets/img/shanchu.png b/assets/img/shanchu.png
deleted file mode 100644
index cbbeb8e..0000000
Binary files a/assets/img/shanchu.png and /dev/null differ
diff --git a/assets/img/shang.png b/assets/img/shang.png
deleted file mode 100644
index 3619914..0000000
Binary files a/assets/img/shang.png and /dev/null differ
diff --git a/assets/img/share.png b/assets/img/share.png
deleted file mode 100644
index 62c9257..0000000
Binary files a/assets/img/share.png and /dev/null differ
diff --git a/assets/img/spcode.png b/assets/img/spcode.png
deleted file mode 100644
index 087c10f..0000000
Binary files a/assets/img/spcode.png and /dev/null differ
diff --git a/assets/img/spphone.png b/assets/img/spphone.png
deleted file mode 100644
index 073c1bb..0000000
Binary files a/assets/img/spphone.png and /dev/null differ
diff --git a/assets/img/succ.png b/assets/img/succ.png
deleted file mode 100644
index c497750..0000000
Binary files a/assets/img/succ.png and /dev/null differ
diff --git a/assets/img/success.png b/assets/img/success.png
deleted file mode 100644
index 945dde7..0000000
Binary files a/assets/img/success.png and /dev/null differ
diff --git a/assets/img/sucsess.png b/assets/img/sucsess.png
deleted file mode 100644
index ca4a0e1..0000000
Binary files a/assets/img/sucsess.png and /dev/null differ
diff --git a/assets/img/tel.jpg b/assets/img/tel.jpg
deleted file mode 100644
index 773ec83..0000000
Binary files a/assets/img/tel.jpg and /dev/null differ
diff --git a/assets/img/tel.png b/assets/img/tel.png
deleted file mode 100644
index cb79a99..0000000
Binary files a/assets/img/tel.png and /dev/null differ
diff --git a/assets/img/telicon.png b/assets/img/telicon.png
deleted file mode 100644
index 85808bc7..0000000
Binary files a/assets/img/telicon.png and /dev/null differ
diff --git a/assets/img/wechat.png b/assets/img/wechat.png
deleted file mode 100644
index 9e7af87..0000000
Binary files a/assets/img/wechat.png and /dev/null differ
diff --git a/assets/img/wenti.png b/assets/img/wenti.png
deleted file mode 100644
index c9218bf..0000000
Binary files a/assets/img/wenti.png and /dev/null differ
diff --git a/assets/img/wm01.jpg b/assets/img/wm01.jpg
deleted file mode 100644
index d3a2369..0000000
Binary files a/assets/img/wm01.jpg and /dev/null differ
diff --git a/assets/img/wm02.jpg b/assets/img/wm02.jpg
deleted file mode 100644
index 7dddd5d..0000000
Binary files a/assets/img/wm02.jpg and /dev/null differ
diff --git a/assets/img/wm03.jpg b/assets/img/wm03.jpg
deleted file mode 100644
index 50ecc7a..0000000
Binary files a/assets/img/wm03.jpg and /dev/null differ
diff --git a/components/banner/index.js b/components/banner/index.js
index 6cd60e2..c71447e 100644
--- a/components/banner/index.js
+++ b/components/banner/index.js
@@ -14,7 +14,8 @@ Component({
* 组件的初始数据
*/
data: {
- swiperCurrent: 0
+ swiperCurrent: 0,
+ bannerUrl: wx.getStorageSync('imgurl').banner.url
},
/**
diff --git a/components/banner/index.wxml b/components/banner/index.wxml
index 0c16fe0..9d5d521 100644
--- a/components/banner/index.wxml
+++ b/components/banner/index.wxml
@@ -1,5 +1,5 @@
-
+
diff --git a/components/discountCard/index.js b/components/discountCard/index.js
index 450422a..79fb058 100644
--- a/components/discountCard/index.js
+++ b/components/discountCard/index.js
@@ -14,7 +14,9 @@ Component({
* 组件的初始数据
*/
data: {
- swiperCurrent: 0
+ swiperCurrent: 0,
+ // discountcardUrl: wx.getStorageSync('imgurl').discountcard.url,
+ discountcardUrl: ''
},
/**
diff --git a/components/discountCard/index.wxml b/components/discountCard/index.wxml
index 2b872e5..feac05e 100644
--- a/components/discountCard/index.wxml
+++ b/components/discountCard/index.wxml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/pages/addPark/addPark.js b/pages/addPark/addPark.js
index 3bd8afd..e59daa1 100644
--- a/pages/addPark/addPark.js
+++ b/pages/addPark/addPark.js
@@ -6,6 +6,8 @@ Page({
* 页面的初始数据
*/
data: {
+ shanchuGrayUrl: wx.getStorageSync('imgurl').shanchuGray.url,
+ shanchuUrl: wx.getStorageSync('imgurl').shanchu.url,
title: '京',
numFir: '',
numSco: '',
diff --git a/pages/addPark/addPark.wxml b/pages/addPark/addPark.wxml
index b580b13..9068a87 100644
--- a/pages/addPark/addPark.wxml
+++ b/pages/addPark/addPark.wxml
@@ -20,7 +20,7 @@
-
+
{{item}}
@@ -30,7 +30,7 @@
-
+
{{item}}
{{item}}
@@ -41,7 +41,7 @@
-
+
{{item}}
{{item}}
@@ -53,7 +53,7 @@
-
+
{{item}}
{{item}}
diff --git a/pages/cardListDetail/cardListDetail.js b/pages/cardListDetail/cardListDetail.js
index 7ce0f87..d7fda2f 100644
--- a/pages/cardListDetail/cardListDetail.js
+++ b/pages/cardListDetail/cardListDetail.js
@@ -5,6 +5,9 @@ const util = require("../../utils/util");
Page({
data: {
+ fenxiangUrl: wx.getStorageSync('imgurl').fenxiang.url,
+ clockUrl: wx.getStorageSync('imgurl').clock.url,
+ teljpgUrl: wx.getStorageSync('imgurl').teljpg.url,
data: {
title: null
},
@@ -342,56 +345,56 @@ Page({
if (err.code == "2011") {
wx.showToast({
title: "商户信息没找到",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "2013") {
wx.showToast({
title: "商户信息禁用",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "3000") {
wx.showToast({
title: "库存不足",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "3001") {
wx.showToast({
title: "领取达到上限",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "3002") {
wx.showToast({
title: "订单失败",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "3003") {
wx.showToast({
title: "订单不存在",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "3004") {
wx.showToast({
title: "订单不存在",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "4003") {
wx.showToast({
title: "卡券已作废",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
diff --git a/pages/cardListDetail/cardListDetail.wxml b/pages/cardListDetail/cardListDetail.wxml
index 9bc7994..967030a 100644
--- a/pages/cardListDetail/cardListDetail.wxml
+++ b/pages/cardListDetail/cardListDetail.wxml
@@ -7,13 +7,13 @@
-
+
-
+
距结束还剩 :
@@ -67,7 +67,7 @@
{{item.merchantName}}
{{item.addr}}{{item.buildingName}}{{item.floorName}}
-
+
diff --git a/pages/cardorder/detail/index.js b/pages/cardorder/detail/index.js
index 18d5fb3..f70c984 100644
--- a/pages/cardorder/detail/index.js
+++ b/pages/cardorder/detail/index.js
@@ -6,6 +6,12 @@ let app = getApp();
Page({
data: {
code: "",
+ lineUrl: wx.getStorageSync('imgurl').line.url,
+ wm01Url: wx.getStorageSync('imgurl').wm01.url,
+ wm02Url: wx.getStorageSync('imgurl').wm02.url,
+ wm03Url: wx.getStorageSync('imgurl').wm03.url,
+ teljpgUrl: wx.getStorageSync('imgurl').teljpg.url,
+ newUrl: wx.getStorageSync('imgurl').new.url,
data: {
salePrice: null,
price: null,
diff --git a/pages/cardorder/detail/index.wxml b/pages/cardorder/detail/index.wxml
index 4c97d78..3914dde 100644
--- a/pages/cardorder/detail/index.wxml
+++ b/pages/cardorder/detail/index.wxml
@@ -18,11 +18,11 @@
有效期至:
{{expiredTime}}
-
+
-
-
-
+
+
+
@@ -49,13 +49,13 @@
{{item.addr}}{{item.buildingName}}{{item.floorName}}
-
+
-
+
实付金额:
@@ -95,6 +95,6 @@
-
+
\ No newline at end of file
diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js
index 85d5844..a3ae00f 100644
--- a/pages/cardorder/index/index.js
+++ b/pages/cardorder/index/index.js
@@ -4,6 +4,9 @@ const Http = require("../../../utils/HttpBasics");
let app = getApp();
Page({
data: {
+ couponUrl: wx.getStorageSync('imgurl').coupon.url,
+ linessUrl: wx.getStorageSync('imgurl').liness.url,
+ loadingUrl: wx.getStorageSync('imgurl').loading.url,
tabs: [{
key: 4,
name: "使用中"
diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml
index 5ecb16b..a2ee80b 100644
--- a/pages/cardorder/index/index.wxml
+++ b/pages/cardorder/index/index.wxml
@@ -5,7 +5,7 @@
-
+
请您敬请期待
我们正在筹备一大波优惠活动
@@ -30,7 +30,7 @@
-
+
有效期至:
{{item.expiredTime}}
@@ -38,7 +38,7 @@
- {{content}}
+ {{content}}
\ No newline at end of file
diff --git a/pages/cartest/cartest.js b/pages/cartest/cartest.js
index d74b03a..4cbe109 100644
--- a/pages/cartest/cartest.js
+++ b/pages/cartest/cartest.js
@@ -5,7 +5,7 @@ Page({
* 页面的初始数据
*/
data: {
-
+ qidaiUrl: wx.getStorageSync('imgurl').qidai.url,
},
/**
diff --git a/pages/cartest/cartest.wxml b/pages/cartest/cartest.wxml
index d50ad19..0fa3972 100644
--- a/pages/cartest/cartest.wxml
+++ b/pages/cartest/cartest.wxml
@@ -1,5 +1,5 @@
-
+
智慧停车即将上线
敬请期待
\ No newline at end of file
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 781f8c7..70851f1 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -5,6 +5,13 @@ const util = require("../../../utils/util");
Page({
data: {
+ fenxiangUrl: wx.getStorageSync('imgurl').fenxiang.url,
+ clockUrl: wx.getStorageSync('imgurl').clock.url,
+ teljpgUrl: wx.getStorageSync('imgurl').teljpg.url,
+ closedUrl: wx.getStorageSync('imgurl').closed.url,
+ quesGouUrl: wx.getStorageSync('imgurl').ques_gou.url,
+ headbgUrl: wx.getStorageSync('imgurl').headbg.url,
+ quesBgUrl: wx.getStorageSync('imgurl').ques_bg.url,
data: {
title: null
},
@@ -347,56 +354,56 @@ Page({
if (err.code == "2011") {
wx.showToast({
title: "商户信息没找到",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "2013") {
wx.showToast({
title: "商户信息禁用",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "3000") {
wx.showToast({
title: "库存不足",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "3001") {
wx.showToast({
title: "领取达到上限",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "3002") {
wx.showToast({
title: "订单失败",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "3003") {
wx.showToast({
title: "订单不存在",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "3004") {
wx.showToast({
title: "订单不存在",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
} else if (err.code == "4003") {
wx.showToast({
title: "卡券已作废",
- image: "./../../../assets/img/fail.png",
+ image: wx.getStorageSync('imgurl').fail.url,
duration: 2000,
mask: false
});
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 9c40712..6a6fdf0 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -7,13 +7,13 @@
-
+
-
+
距结束还剩 :
@@ -67,7 +67,7 @@
{{item.merchantName}}
{{item.addr}}{{item.buildingName}}{{item.floorName}}
-
+
@@ -94,10 +94,10 @@
-
-
-
-
+
+
+
+
{{questionnaire.title}}
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index 18d5fb3..f70c984 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -6,6 +6,12 @@ let app = getApp();
Page({
data: {
code: "",
+ lineUrl: wx.getStorageSync('imgurl').line.url,
+ wm01Url: wx.getStorageSync('imgurl').wm01.url,
+ wm02Url: wx.getStorageSync('imgurl').wm02.url,
+ wm03Url: wx.getStorageSync('imgurl').wm03.url,
+ teljpgUrl: wx.getStorageSync('imgurl').teljpg.url,
+ newUrl: wx.getStorageSync('imgurl').new.url,
data: {
salePrice: null,
price: null,
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index 4c97d78..a9665af 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -18,11 +18,11 @@
有效期至:
{{expiredTime}}
-
+
-
-
-
+
+
+
@@ -49,13 +49,13 @@
{{item.addr}}{{item.buildingName}}{{item.floorName}}
-
+
-
+
实付金额:
@@ -95,6 +95,6 @@
-
+
\ No newline at end of file
diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js
index 08ccbaa..d3915ee 100644
--- a/pages/couponorder/index/index.js
+++ b/pages/couponorder/index/index.js
@@ -4,6 +4,9 @@ const Http = require("../../../utils/HttpBasics");
let app = getApp();
Page({
data: {
+ couponUrl: wx.getStorageSync('imgurl').coupon.url,
+ linessUrl: wx.getStorageSync('imgurl').liness.url,
+ loadingUrl: wx.getStorageSync('imgurl').loading.url,
tabs: [{
key: 0,
name: "未使用"
diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml
index 15ef3f7..e7358bb 100644
--- a/pages/couponorder/index/index.wxml
+++ b/pages/couponorder/index/index.wxml
@@ -5,7 +5,7 @@
-
+
请您敬请期待
我们正在筹备一大波优惠活动
@@ -30,7 +30,7 @@
查看
-
+
有效期至:
{{item.expiredTime}}
@@ -38,7 +38,7 @@
- {{content}}
+ {{content}}
\ No newline at end of file
diff --git a/pages/discountCardList/discountCardList.js b/pages/discountCardList/discountCardList.js
index a783e76..a6b2c46 100644
--- a/pages/discountCardList/discountCardList.js
+++ b/pages/discountCardList/discountCardList.js
@@ -4,6 +4,8 @@ const Http = require("../../utils/HttpBasics");
let app = getApp();
Page({
data: {
+ couponUrl: wx.getStorageSync('imgurl').coupon.url,
+ loadingUrl: wx.getStorageSync('imgurl').loading.url,
tabs: [],
list: [],
current: "0",
diff --git a/pages/discountCardList/discountCardList.wxml b/pages/discountCardList/discountCardList.wxml
index 4c8e352..54f0f06 100644
--- a/pages/discountCardList/discountCardList.wxml
+++ b/pages/discountCardList/discountCardList.wxml
@@ -6,7 +6,7 @@
-
+
请您敬请期待
我们正在筹备一大波优惠活动
@@ -27,6 +27,6 @@
- {{content}}
+ {{content}}
\ No newline at end of file
diff --git a/pages/game/index.wxml b/pages/game/index.wxml
index 68dceb6..9f2ecf2 100644
--- a/pages/game/index.wxml
+++ b/pages/game/index.wxml
@@ -1,2 +1 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/grade/grade.js b/pages/grade/grade.js
index fb53dd8..664582d 100644
--- a/pages/grade/grade.js
+++ b/pages/grade/grade.js
@@ -7,7 +7,13 @@ Page({
* 页面的初始数据
*/
data: {
- src:'./../../../assets/img/grade.png'
+ src: wx.getStorageSync('imgurl').grade.url,
+ actUrl: wx.getStorageSync('imgurl').act.url,
+ gradeUrl: wx.getStorageSync('imgurl').grade.url,
+ grade1Url: wx.getStorageSync('imgurl').grade1.url,
+ grade2Url: wx.getStorageSync('imgurl').grade2.url,
+ grade3Url: wx.getStorageSync('imgurl').grade3.url,
+ growthbgUrl: wx.getStorageSync('imgurl').growthbg.url,
},
/**
diff --git a/pages/grade/grade.wxml b/pages/grade/grade.wxml
index 632c22e..7362c67 100644
--- a/pages/grade/grade.wxml
+++ b/pages/grade/grade.wxml
@@ -16,11 +16,11 @@
-
-
-
-
-
+
+
+
+
+
{{item.level}}
{{item.points}}成长值
@@ -37,9 +37,9 @@
-
+
暂无配置信息
-
+
\ No newline at end of file
diff --git a/pages/index/coupons/index.js b/pages/index/coupons/index.js
index 4bc7201..c4a0f46 100644
--- a/pages/index/coupons/index.js
+++ b/pages/index/coupons/index.js
@@ -22,6 +22,8 @@ Component({
* 组件的初始数据
*/
data: {
+ actUrl: wx.getStorageSync('imgurl').act.url,
+ loadingUrl: wx.getStorageSync('imgurl').loading.url,
tabs: [],
list: [],
flag: "",
diff --git a/pages/index/coupons/index.wxml b/pages/index/coupons/index.wxml
index c13001a..8fa4f32 100644
--- a/pages/index/coupons/index.wxml
+++ b/pages/index/coupons/index.wxml
@@ -4,10 +4,10 @@
-
+
请您敬请期待
我们正在筹备一大波优惠活动
- {{content}}
+ {{content}}
{{loadingtext}}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index daa3c6c..3e29366 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -1,9 +1,11 @@
const Http = require("../../utils/HttpBasics");
+const imgurl = require("../../utils/imgurl");
const config = require("../../config/config");
let app = getApp();
Page({
data: {
+ newUrl: wx.getStorageSync('imgurl').new.url,
market: app.globalData.market,
list: [],
loading: true,
@@ -75,6 +77,7 @@ Page({
* 生命周期函数--监听页面初次渲染完成
*/
onLoad: function (options) {
+ wx.setStorageSync('imgurl', imgurl)
if (options.played == "true") {
this.setData({
played: true
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 37cfcef..6d0ac54 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -7,7 +7,7 @@
-
+
diff --git a/pages/index/rushToBuy/index.js b/pages/index/rushToBuy/index.js
index e5d7926..7f7e07a 100644
--- a/pages/index/rushToBuy/index.js
+++ b/pages/index/rushToBuy/index.js
@@ -13,6 +13,7 @@ Component({
* 组件的初始数据
*/
data: {
+ jianUrl: wx.getStorageSync('imgurl').jian.url,
list: [],
total:''
},
diff --git a/pages/index/rushToBuy/index.wxml b/pages/index/rushToBuy/index.wxml
index b36c8da..84bd708 100644
--- a/pages/index/rushToBuy/index.wxml
+++ b/pages/index/rushToBuy/index.wxml
@@ -1,5 +1,5 @@
- 限时抢购查看全部
+ 限时抢购查看全部
diff --git a/pages/managelicenseplate/managelicenseplate.js b/pages/managelicenseplate/managelicenseplate.js
index dbbf948..7ecd791 100644
--- a/pages/managelicenseplate/managelicenseplate.js
+++ b/pages/managelicenseplate/managelicenseplate.js
@@ -6,6 +6,7 @@ Page({
* 页面的初始数据
*/
data: {
+ addUrl: wx.getStorageSync('imgurl').add.url,
carList: []
},
initUsrCarList: function() {
diff --git a/pages/managelicenseplate/managelicenseplate.wxml b/pages/managelicenseplate/managelicenseplate.wxml
index 2e5a078..93be7f9 100644
--- a/pages/managelicenseplate/managelicenseplate.wxml
+++ b/pages/managelicenseplate/managelicenseplate.wxml
@@ -18,6 +18,6 @@
- 我的爱车
+ 我的爱车
车辆入场后,才能绑车牌
\ No newline at end of file
diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js
index d577d36..1402b70 100644
--- a/pages/order/detail/index.js
+++ b/pages/order/detail/index.js
@@ -7,6 +7,10 @@ Page({
* 页面的初始数据
*/
data: {
+ succUrl: wx.getStorageSync('imgurl').succ.url,
+ spcodeUrl: wx.getStorageSync('imgurl').spcode.url,
+ teljpgUrl: wx.getStorageSync('imgurl').teljpg.url,
+ newUrl: wx.getStorageSync('imgurl').new.url,
showModalStatus: false,
flag: 0,
order: null,
@@ -177,7 +181,7 @@ Page({
wx.showToast({
title: "支付成功",
duration: 2000,
- image: "./../../../assets/img/success.png",
+ image: wx.getStorageSync('imgurl').success.url,
});
}
},
@@ -201,7 +205,7 @@ Page({
wx.showToast({
title: "购买成功",
duration: 2000,
- image: "./../../../assets/img/success.png",
+ image: wx.getStorageSync('imgurl').success.url,
mask: false,
success: function () {
wx.showLoading({
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 7d8945f..d42eca5 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -1,6 +1,6 @@
-
+
领取成功,请尽快到门店使用
付款成功,请尽快到门店使用
@@ -46,7 +46,7 @@
{{order.couponOrderId}}
-
+
@@ -70,7 +70,7 @@
适用门店列表
- {{item.merchantName}} {{item.buildingName}}{{item.floorName}}
+ {{item.merchantName}} {{item.buildingName}}{{item.floorName}}
@@ -79,7 +79,7 @@
-
+
\ No newline at end of file
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index a26fcd7..9ac5d1d 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -5,6 +5,8 @@ let app = getApp();
Page({
data: {
+ dingdanUrl: wx.getStorageSync('imgurl').dingdan.url,
+ loadingUrl: wx.getStorageSync('imgurl').loading.url,
tabs: [{
key: "all",
name: "全部"
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index 8c52b17..862bf93 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -56,12 +56,12 @@
-
+
您还没有相关订单
再忙,也要记得买点什么犒赏自己~
- {{content}}
+ {{content}}
\ No newline at end of file
diff --git a/pages/orderquanma/index.js b/pages/orderquanma/index.js
index 90fd2a2..9818e71 100644
--- a/pages/orderquanma/index.js
+++ b/pages/orderquanma/index.js
@@ -4,6 +4,10 @@ let config = require("../../config/config.js");
let app = getApp();
Page({
data: {
+ lineUrl: wx.getStorageSync('imgurl').line.url,
+ wm01Url: wx.getStorageSync('imgurl').wm01.url,
+ wm02Url: wx.getStorageSync('imgurl').wm02.url,
+ wm03Url: wx.getStorageSync('imgurl').wm03.url,
code: "",
//存储计时器
setInter: "",
diff --git a/pages/orderquanma/index.wxml b/pages/orderquanma/index.wxml
index 4e58b98..55cff2b 100644
--- a/pages/orderquanma/index.wxml
+++ b/pages/orderquanma/index.wxml
@@ -1,7 +1,7 @@
{{title}}
{{subtitle}}
-
+
-
-
-
+
+
+
@@ -24,7 +24,7 @@
兑换码:{{code}}
-
+
购买须知:
diff --git a/pages/passCar/choicecoupon/choicecoupon.js b/pages/passCar/choicecoupon/choicecoupon.js
index f4524a9..c33b652 100644
--- a/pages/passCar/choicecoupon/choicecoupon.js
+++ b/pages/passCar/choicecoupon/choicecoupon.js
@@ -4,6 +4,10 @@ const app = getApp();
const Http = require("../../../utils/HttpBasics");
Page({
data: {
+ couponUrl: wx.getStorageSync('imgurl').coupon.url,
+ gouUrl: wx.getStorageSync('imgurl').gou.url,
+ linessUrl: wx.getStorageSync('imgurl').liness.url,
+ loadingUrl: wx.getStorageSync('imgurl').loading.url,
list: [],
current: "0",
current_scroll: "0",
diff --git a/pages/passCar/choicecoupon/choicecoupon.wxml b/pages/passCar/choicecoupon/choicecoupon.wxml
index dc0a363..8cd65ce 100644
--- a/pages/passCar/choicecoupon/choicecoupon.wxml
+++ b/pages/passCar/choicecoupon/choicecoupon.wxml
@@ -1,7 +1,7 @@
-
+
请您敬请期待
我们正在筹备一大波优惠活动
@@ -12,7 +12,7 @@
温馨提示:请离场前使用优惠券
-
+
@@ -27,7 +27,7 @@
-
+
有效期至:
{{item.expiredTime}}
@@ -36,7 +36,7 @@
- {{content}}
+ {{content}}
\ No newline at end of file
diff --git a/pages/passCar/couponList/couponList.js b/pages/passCar/couponList/couponList.js
index 5aaa087..54ac05b 100644
--- a/pages/passCar/couponList/couponList.js
+++ b/pages/passCar/couponList/couponList.js
@@ -4,6 +4,9 @@ const app = getApp();
const Http = require("../../../utils/HttpBasics");
Page({
data: {
+ couponUrl: wx.getStorageSync('imgurl').coupon.url,
+ linessUrl: wx.getStorageSync('imgurl').liness.url,
+ loadingUrl: wx.getStorageSync('imgurl').loading.url,
tabs: [
{
key: 0,
diff --git a/pages/passCar/couponList/couponList.wxml b/pages/passCar/couponList/couponList.wxml
index 6eca002..cb6d550 100644
--- a/pages/passCar/couponList/couponList.wxml
+++ b/pages/passCar/couponList/couponList.wxml
@@ -5,7 +5,7 @@
-
+
请您敬请期待
我们正在筹备一大波优惠活动
@@ -30,7 +30,7 @@
查看
-
+
有效期至:
{{item.expiredTime}}
@@ -38,7 +38,7 @@
- {{content}}
+ {{content}}
\ No newline at end of file
diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js
index 1b89fed..aded7c0 100644
--- a/pages/passCar/passCar.js
+++ b/pages/passCar/passCar.js
@@ -4,6 +4,13 @@ let Util = require("../../utils/util");
let app = getApp();
Page({
data: {
+ parkUrl: wx.getStorageSync('imgurl').park.url,
+ jianUrl: wx.getStorageSync('imgurl').jian.url,
+ addUrl: wx.getStorageSync('imgurl').add.url,
+ quanUrl: wx.getStorageSync('imgurl').quan.url,
+ cheUrl: wx.getStorageSync('imgurl').che.url,
+ ruleUrl: wx.getStorageSync('imgurl').rule.url,
+ wentiUrl: wx.getStorageSync('imgurl').wenti.url,
park: null,
carList: [],
payList: [],
diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml
index cc256b8..3d37832 100644
--- a/pages/passCar/passCar.wxml
+++ b/pages/passCar/passCar.wxml
@@ -1,7 +1,7 @@
- 我的爱车
+ 我的爱车
车辆入场后,才能绑车牌
-
+
我的停车券
-
+
-
+
车辆管理
-
+
-
+
缴费规则
-
+
-
+
常见问题
-
+
diff --git a/pages/rushToBuy/index.js b/pages/rushToBuy/index.js
index f3280a4..01ef8fd 100644
--- a/pages/rushToBuy/index.js
+++ b/pages/rushToBuy/index.js
@@ -7,6 +7,8 @@ Page({
* 页面的初始数据
*/
data: {
+ linesUrl: wx.getStorageSync('imgurl').lines.url,
+ loadingUrl: wx.getStorageSync('imgurl').loading.url,
list: [],
page: 1,
allow_load: true,
diff --git a/pages/rushToBuy/index.wxml b/pages/rushToBuy/index.wxml
index 3148eb6..18e96a6 100644
--- a/pages/rushToBuy/index.wxml
+++ b/pages/rushToBuy/index.wxml
@@ -16,7 +16,7 @@
-
+
距结束:
@@ -37,6 +37,6 @@
- {{content}}
+ {{content}}
\ No newline at end of file
diff --git a/pages/shop/detail/index.js b/pages/shop/detail/index.js
deleted file mode 100644
index daae2ca..0000000
--- a/pages/shop/detail/index.js
+++ /dev/null
@@ -1,65 +0,0 @@
-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/shop/detail/index.json b/pages/shop/detail/index.json
deleted file mode 100644
index 8077922..0000000
--- a/pages/shop/detail/index.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "usingComponents": {
-
- },
- "navigationBarTitleText": "店铺详情"
- }
\ No newline at end of file
diff --git a/pages/shop/detail/index.wxml b/pages/shop/detail/index.wxml
deleted file mode 100644
index 8120c1a..0000000
--- a/pages/shop/detail/index.wxml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-
-
-
-
- 门店优惠
-
-
-
-
-
- 黑椒牛排
-
-
- ¥1.00
- 59.00
-
-
- 已售16张
- 购买
-
-
-
-
-
-
-
- 黑椒牛排
-
-
- ¥1.00
- 59.00
-
-
- 已售16张
- 购买
-
-
-
-
-
-
-
- 黑椒牛排
-
-
- ¥1.00
- 59.00
-
-
- 已售16张
- 购买
-
-
-
-
-
-
-
- 黑椒牛排
-
-
- ¥1.00
- 59.00
-
-
- 已售16张
- 购买
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/shop/detail/index.wxss b/pages/shop/detail/index.wxss
deleted file mode 100644
index 1ea9253..0000000
--- a/pages/shop/detail/index.wxss
+++ /dev/null
@@ -1,174 +0,0 @@
-.spdetailContainer{
- width: 100%;
- height: 100%;
- background: #eee;
-}
-.spheader{
- width: 100%;
- height: 186rpx;
- background: #fff;
- display: flex;
- flex-direction: row;
-}
-.spheaderL{
- flex: 1;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-.spheaderM{
- flex: 2;
- display: flex;
- flex-direction: column;
- justify-content: left;
- align-self: center;
-}
-.shopname{
- font-size: 31rpx;
- color: #000;
-}
-.shopaddress{
- font-size: 22rpx;
- color: #B8B8B8;
- margin-top: 20rpx;
-}
-.spheaderR{
- flex: 1;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-.splogo{
- width: 150rpx;
- height: 150rpx;
-}
-.spcode{
- width: 100rpx;
- height: 100rpx;
-}
-.spheaderNext{
- width: 100%;
- height: 150rpx;
- background: #fff;
- display: flex;
- flex-direction: column;
- padding-top: 10rpx;
-}
-.NextTop{
- margin-left: 30rpx;
- font-size: 30rpx;
- color: #000;
-}
-.NextBottom{
- margin-top: 23rpx;
- display: flex;
- flex-direction: row;
- margin-left: 30rpx;
-}
-.addresslogo{
- width: 20rpx;
- height: 20rpx;
-}
-.spphone{
- width: 44rpx;
- height: 44rpx;
-}
-.NextBottomL{
- flex: 1;
- color: #c0c0c0;
- font-size: 22rpx;
- align-self: center;
-}
-.NextBottomM{
- flex: 3.5;
- justify-content: left;
- font-size:22rpx;
- color: #00C0FF;
- align-self: center;
- border-top-width: 2rpx;
- border-color: #00C0FF;
-}
-.NextBottomR{
- flex: .5
-}
-.storeDiscount{
- width: 100%;
- height: auto;
- background: #fff;
- margin-top: 30rpx
-}
-.storeDiscountTitle{
- width: 100%;
- height: 87rpx;
- line-height: 87rpx;
-}
-.storeDiscountTitle text{
- margin-left: 30rpx;
- font-size:28rpx;
- color: #000;
- border-bottom: 1px solid #fff;
-}
-.storeDiscountCon{
- width: 100%;
- height: auto;
- background: #fff;
- flex-direction: column;
-}
-.storeDiscountConItem{
- width: 100%;
- height: 244rpx;
- display: flex;
- flex-direction: row;
-}
-.ConItemL{
- flex: 1;
- align-self: center;
-}
-.foodpng{
- width: 248rpx;
- height: 184rpx;
- margin-left: 30rpx;
-}
-.ConItemR{
- margin-top: 22rpx;
- flex: 4;
- padding-left: 20rpx;
-}
-.ConItemRT{
- color: #000;
- font-size: 30rpx;
-}
-.ConItemRM{
- margin-top: 10rpx;
-}
-.presentPrice{
- font-size: 36rpx;
- color: #FF3434;
- margin-right: 20rpx;
-}
-.originalPrice{
- font-size: 24rpx;
- color: #B4B4B4;
- text-decoration: line-through;
-}
-.ConItemRB{
- margin-top: 35rpx;
-}
-.soldnum{
- color: #585858;
- font-size: 22rpx;
-}
-.buy{
- margin-left: 215rpx;
- background: #00C0FF;
- color: #fff;
- font-size: 28rpx;
- width: 114rpx;
- height: 50rpx;
- line-height: 50rpx;
- text-align: center;
- border-radius: 10rpx;
- display: inline-block;
-
-}
-
diff --git a/pages/shop/index/index.js b/pages/shop/index/index.js
deleted file mode 100644
index 96ed282..0000000
--- a/pages/shop/index/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-Page({
- data: {
- tabs: [{
- key: 1,
- name: "全部"
- },
- {
- key: 2,
- name: "待付款"
- },
- {
- key: 3,
- name: "已完成"
- }
- ],
- list: [
- {
- key: '1',
- data: [
- {
- name: '111'
- }
- ]
- },
- {
- key: '2',
- data: [
- {
- name: '222'
- }
- ]
- },
- {
- key: '3',
- data: [
- {
- name: '333'
- }
- ]
- }
- ],
- current: '',
- current_scroll: '1'
- },
- handleChange({ detail }) {
- this.setData({
- current: detail.key
- });
- },
- handleChangeScroll({ detail }) {
- this.setData({
- current_scroll: detail.key
- });
- },
-})
\ No newline at end of file
diff --git a/pages/shop/index/index.json b/pages/shop/index/index.json
deleted file mode 100644
index ea5b72c..0000000
--- a/pages/shop/index/index.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "usingComponents": {
- "i-tab": "../../../dist/tab/index",
- "i-tabs": "../../../dist/tabs/index",
- "c-coupons": "../../../components/coupons/index"
- },
- "navigationBarTitleText": "我的订单"
-}
\ No newline at end of file
diff --git a/pages/shop/index/index.wxml b/pages/shop/index/index.wxml
deleted file mode 100644
index 097d025..0000000
--- a/pages/shop/index/index.wxml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/shop/index/index.wxss b/pages/shop/index/index.wxss
deleted file mode 100644
index 20eee2f..0000000
--- a/pages/shop/index/index.wxss
+++ /dev/null
@@ -1,15 +0,0 @@
-.market {
- width: 100%;
- height: 100%;
-}
-
-.tabs {
- width: 100% !important;
- height: 88rpx;
- text-align: center;
-}
-
-.i-tab {
- width: 30% !important;
- display: inline-block;
-}
\ No newline at end of file
diff --git a/pages/specialcourtesy/specialcourtesy.js b/pages/specialcourtesy/specialcourtesy.js
index 89032bb..b99ec7c 100644
--- a/pages/specialcourtesy/specialcourtesy.js
+++ b/pages/specialcourtesy/specialcourtesy.js
@@ -6,7 +6,8 @@ Page({
* 页面的初始数据
*/
data: {
-
+ myspeacialUrl: wx.getStorageSync('imgurl').myspeacial.url,
+ teliconUrl: wx.getStorageSync('imgurl').telicon.url,
},
/**
diff --git a/pages/specialcourtesy/specialcourtesy.wxml b/pages/specialcourtesy/specialcourtesy.wxml
index 4d798aa..5d4f7f0 100644
--- a/pages/specialcourtesy/specialcourtesy.wxml
+++ b/pages/specialcourtesy/specialcourtesy.wxml
@@ -1,5 +1,5 @@
以下为商城会员对应门店的优惠折扣
@@ -16,7 +16,7 @@
diff --git a/pages/user/index.js b/pages/user/index.js
index 1df19af..f466d66 100644
--- a/pages/user/index.js
+++ b/pages/user/index.js
@@ -7,6 +7,16 @@ Page({
* 页面的初始数据
*/
data: {
+ bannerUrl: wx.getStorageSync('imgurl').banner.url,
+ redirectUrl: wx.getStorageSync('imgurl').redirect.url,
+ qrcodeUrl: wx.getStorageSync('imgurl').qrcode.url,
+ editUrl: wx.getStorageSync('imgurl').edit.url,
+ activeUrl: wx.getStorageSync('imgurl').active.url,
+ dingUrl: wx.getStorageSync('imgurl').ding.url,
+ quansUrl: wx.getStorageSync('imgurl').quans.url,
+ cardiconUrl: wx.getStorageSync('imgurl').cardicon.url,
+ cheUrl: wx.getStorageSync('imgurl').che.url,
+ giftUrl: wx.getStorageSync('imgurl').gift.url,
canIUse: wx.canIUse('official-account'),
flag: 'hidden',
score:'0',
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index d9fb425..3650f22 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -1,6 +1,6 @@
-
+
@@ -10,25 +10,25 @@
{{levelName}}
成长值{{score}}
-
+
-
+
-
+
编辑
-
+
- 我的订单
+ 我的订单
查看全部
@@ -54,7 +54,7 @@
- 我的券包
+ 我的券包
@@ -64,7 +64,7 @@
- 我的卡包
+ 我的卡包
@@ -74,7 +74,7 @@
- 智能停车
+ 智能停车
@@ -84,7 +84,7 @@
- 特享礼遇
+ 特享礼遇
diff --git a/utils/imgurl.js b/utils/imgurl.js
new file mode 100644
index 0000000..e181e58
--- /dev/null
+++ b/utils/imgurl.js
@@ -0,0 +1,326 @@
+module.exports={
+ 'act':{
+ 'url':'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/act.png',
+ 'name':''
+ },
+ 'active': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/active.gif',
+ 'name': ''
+ },
+ 'add': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/add.png',
+ 'name': ''
+ },
+ 'addr-white': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/addr-white.png',
+ 'name': ''
+ },
+ 'addr': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/addr.png',
+ 'name': ''
+ },
+ 'addresslogo': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/addresslogo.png',
+ 'name': ''
+ },
+ 'alipay': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/alipay.png',
+ 'name': ''
+ },
+ 'banner': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/banner.png',
+ 'name': ''
+ },
+ 'bg': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/bg.png',
+ 'name': ''
+ },
+ 'cardicon': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/cardicon.png',
+ 'name': ''
+ },
+ 'che': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/che.png',
+ 'name': ''
+ },
+ 'choice': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/choice.png',
+ 'name': ''
+ },
+ 'choiced': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/choiced.png',
+ 'name': ''
+ },
+ 'clock': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/clock.png',
+ 'name': ''
+ },
+ 'closed': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/closed.png',
+ 'name': ''
+ },
+ 'coupon': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/coupon.png',
+ 'name': ''
+ },
+ 'ding': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/ding.png',
+ 'name': ''
+ },
+ 'dingdan': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/dingdan.png',
+ 'name': ''
+ },
+ 'down-white': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/down-white.png',
+ 'name': ''
+ },
+ 'down': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/down.png',
+ 'name': ''
+ },
+ 'edit': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/edit.png',
+ 'name': ''
+ },
+ 'fail': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/fail.png',
+ 'name': ''
+ },
+ 'fenxiang': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/fenxiang.png',
+ 'name': ''
+ },
+ 'game': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/game.png',
+ 'name': ''
+ },
+ 'gift': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/gift.png',
+ 'name': ''
+ },
+ 'gou': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/gou.png',
+ 'name': ''
+ },
+ 'grade': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/grade.png',
+ 'name': ''
+ },
+ 'grade1': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/grade1.png',
+ 'name': ''
+ },
+ 'grade2': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/grade2.png',
+ 'name': ''
+ },
+ 'grade3': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/grade3.png',
+ 'name': ''
+ },
+ 'growthbg': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/growthbg.png',
+ 'name': ''
+ },
+ 'headbg': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/headbg.png',
+ 'name': ''
+ },
+ 'home-n': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/home-n.png',
+ 'name': ''
+ },
+ 'home-y': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/home-y.png',
+ 'name': ''
+ },
+ 'jian': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/jian.png',
+ 'name': ''
+ },
+ 'jilu': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/jilu.png',
+ 'name': ''
+ },
+ 'line': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/line.png',
+ 'name': ''
+ },
+ 'lines': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/lines.png',
+ 'name': ''
+ },
+ 'liness': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/liness.png',
+ 'name': ''
+ },
+ 'loading': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/loading.gif',
+ 'name': ''
+ },
+ 'loading1': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/loading1.gif',
+ 'name': ''
+ },
+ 'location': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/location.png',
+ 'name': ''
+ },
+ 'logo': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/logo.png',
+ 'name': ''
+ },
+ 'mine': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/mine.png',
+ 'name': ''
+ },
+ 'myspeacial': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/myspeacial.jpg',
+ 'name': ''
+ },
+ 'new': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/new.png',
+ 'name': ''
+ },
+ 'orbg': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/orbg.png',
+ 'name': ''
+ },
+ 'park': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/park.png',
+ 'name': ''
+ },
+ 'parkCoupon': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/parkCoupon.png',
+ 'name': ''
+ },
+ 'pass0': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/pass0.png',
+ 'name': ''
+ },
+ 'pass1': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/pass1.png',
+ 'name': ''
+ },
+ 'phone': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/phone.png',
+ 'name': ''
+ },
+ 'platebg': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/platebg.png',
+ 'name': ''
+ },
+ 'qidai': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/qidai.png',
+ 'name': ''
+ },
+ 'qrcode': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/qrcode.png',
+ 'name': ''
+ },
+ 'quan': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/quan.png',
+ 'name': ''
+ },
+ 'quans': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/quans.png',
+ 'name': ''
+ },
+ 'ques_bg': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/ques_bg.png',
+ 'name': ''
+ },
+ 'ques_gou': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/ques_gou.png',
+ 'name': ''
+ },
+ 'quesimg01': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/quesimg01.png',
+ 'name': ''
+ },
+ 'redirect': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/redirect.png',
+ 'name': ''
+ },
+ 'right': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/right.png',
+ 'name': ''
+ },
+ 'rule': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/rule.png',
+ 'name': ''
+ },
+ 'shanchuGray': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/shanchu-gray.png',
+ 'name': ''
+ },
+ 'shanchu': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/shanchu.png',
+ 'name': ''
+ },
+ 'shang': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/shang.png',
+ 'name': ''
+ },
+ 'share': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/share.png',
+ 'name': ''
+ },
+ 'spcode': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spcode.png',
+ 'name': ''
+ },
+ 'spphone': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spphone.png',
+ 'name': ''
+ },
+ 'succ': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/succ.png',
+ 'name': ''
+ },
+ 'success': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/success.png',
+ 'name': ''
+ },
+ 'teljpg': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/tel.jpg',
+ 'name': ''
+ },
+ 'telpng': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/tel.png',
+ 'name': ''
+ },
+ 'telicon': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/telicon.png',
+ 'name': ''
+ },
+ 'user-n': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/user-n.png',
+ 'name': ''
+ },
+ 'user-y': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/user-y.png',
+ 'name': ''
+ },
+ 'wechat': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/wechat.png',
+ 'name': ''
+ },
+ 'wenti': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/wenti.png',
+ 'name': ''
+ },
+ 'wm01': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/wm01.jpg',
+ 'name': ''
+ },
+ 'wm02': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/wm02.jpg',
+ 'name': ''
+ },
+ 'wm03': {
+ 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/wm03.jpg',
+ 'name': ''
+ }
+}
\ No newline at end of file
diff --git a/utils/staticImg.js b/utils/staticImg.js
deleted file mode 100644
index 08fde6a..0000000
--- a/utils/staticImg.js
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports={
- 'act':{
- 'url':'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/act.png',
- 'name':''
- },
- 'active': {
- 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/active.gif',
- 'name': ''
- },
- 'add': {
- 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/add.png',
- 'name': ''
- },
- 'addr-white': {
- 'url': 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/addr-white.png',
- 'name': ''
- }
-}
\ No newline at end of file