diff --git a/assets/images/icon001.png b/assets/images/icon001.png index db635b5..bb7a14f 100644 Binary files a/assets/images/icon001.png and b/assets/images/icon001.png differ diff --git a/assets/images/icon002.png b/assets/images/icon002.png index f66189d..bfca772 100644 Binary files a/assets/images/icon002.png and b/assets/images/icon002.png differ diff --git a/assets/images/icon003.png b/assets/images/icon003.png index 10d43d5..617f69a 100644 Binary files a/assets/images/icon003.png and b/assets/images/icon003.png differ diff --git a/config/config.js b/config/config.js index 98502ba..006b46a 100755 --- a/config/config.js +++ b/config/config.js @@ -1,9 +1,9 @@ var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; var appId = extConfig.appId; var config = { - // url: "https://ciformall.youlane.cn/C/api", + url: "https://ciformall.youlane.cn/C/api", // url:"https://c.malls.iformall.com/C/api", - url:'https://ctest.malls.iformall.com/C/api', + // url:'https://ctest.malls.iformall.com/C/api', // url:'http://10.100.33.68:7000/C/api', // url: 'http://10.100.30.172:7000/C/api', api: { @@ -199,7 +199,7 @@ var config = { }, weapp: { - AppId: "wx649b3be73c1afe47" + AppId: "wxea71200db93d756b" }, ErrorCode: { diff --git a/pages/actdetail/actdetail.js b/pages/actdetail/actdetail.js index 30be395..f0f8259 100644 --- a/pages/actdetail/actdetail.js +++ b/pages/actdetail/actdetail.js @@ -61,10 +61,4 @@ Page({ }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss index 67f7141..f5b218b 100644 --- a/pages/cardorder/index/index.wxss +++ b/pages/cardorder/index/index.wxss @@ -29,14 +29,14 @@ width: 690rpx; background: #fff; height: 238rpx; - margin: 0 auto 40rpx; + margin: 0 auto 30rpx; border-radius: 16rpx; box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); } .yu { display: inline-block !important; - font-size: 30rpx; + font-size: 30rpx!important; } .expiretime { @@ -45,15 +45,14 @@ .expiretime text { display: block; - width: 262rpx; font-size: 30rpx; - font-family: PingFang-SC-Medium; font-weight: 500; white-space: nowrap; - text-align: center; + text-align: right; text-overflow: ellipsis; overflow: hidden; margin-top: 35rpx; + margin-right: 10rpx; color: rgba(255, 255, 255, 1); } @@ -99,16 +98,17 @@ text-overflow: ellipsis; overflow: hidden; margin-bottom: 10rpx; - margin-top: 38rpx; + margin-top: 23rpx; text-align: left; } .info >view view:nth-child(2) { + display: inline-block; + width: 220rpx; font-size: 26rpx; color: #fff; letter-spacing: 0; margin-top: 6rpx; - display: inline-block; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; @@ -117,8 +117,8 @@ .btns { position: absolute; - right: 30rpx; - bottom: 53rpx; + right: 25rpx; + bottom: 25rpx; text-align: center; font-size: 28rpx; width: 250rpx !important; @@ -126,7 +126,6 @@ line-height: 61rpx; background: rgba(255, 255, 255, 1); border-radius: 30rpx; - margin-top: 32rpx !important; } .active { @@ -217,6 +216,7 @@ font-size: 24rpx; margin-left: 25rpx; text-align: left; + margin-top: 36rpx; } .txt2{ opacity:0.5; diff --git a/pages/cardorder/userule/userule.js b/pages/cardorder/userule/userule.js index 960fe0c..f7b3f44 100644 --- a/pages/cardorder/userule/userule.js +++ b/pages/cardorder/userule/userule.js @@ -56,11 +56,4 @@ Page({ onReachBottom: function () { }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/pages/cartest/cartest.js b/pages/cartest/cartest.js index a9d7c63..8473827 100644 --- a/pages/cartest/cartest.js +++ b/pages/cartest/cartest.js @@ -58,10 +58,4 @@ Page({ }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/pages/externallinks/index.js b/pages/externallinks/index.js index e41b4e2..7473c59 100644 --- a/pages/externallinks/index.js +++ b/pages/externallinks/index.js @@ -60,10 +60,4 @@ Page({ }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/pages/freeBannerDetail/index.js b/pages/freeBannerDetail/index.js index 45a5895..4918821 100644 --- a/pages/freeBannerDetail/index.js +++ b/pages/freeBannerDetail/index.js @@ -68,10 +68,4 @@ Page({ }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/pages/index/gameentry/gentry.js b/pages/index/gameentry/gentry.js index a3185cf..bf984d5 100644 --- a/pages/index/gameentry/gentry.js +++ b/pages/index/gameentry/gentry.js @@ -56,11 +56,4 @@ Page({ onReachBottom: function () { }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 0416ed5..584da92 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -48,8 +48,8 @@ page { margin: 0 auto; } .section >view image { - width: 73rpx; - height: 74rpx; + width: 80rpx; + height: 80rpx; margin-bottom: 14rpx; } .section text { diff --git a/pages/market/index.js b/pages/market/index.js index 370adb4..8cead1f 100644 --- a/pages/market/index.js +++ b/pages/market/index.js @@ -55,11 +55,4 @@ Page({ onReachBottom: function () { }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index a85fe53..cb92770 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -259,8 +259,4 @@ Page({ */ onReachBottom: function () {}, - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () {} }); \ No newline at end of file diff --git a/pages/park/park.js b/pages/park/park.js index b6f7bed..95cf889 100644 --- a/pages/park/park.js +++ b/pages/park/park.js @@ -133,11 +133,4 @@ Page({ onReachBottom: function () { }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) diff --git a/pages/paySuccess/paySuccess.js b/pages/paySuccess/paySuccess.js index cdff52e..29b6df3 100644 --- a/pages/paySuccess/paySuccess.js +++ b/pages/paySuccess/paySuccess.js @@ -64,11 +64,4 @@ Page({ onReachBottom: function () { }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/pages/payrule/payrule.js b/pages/payrule/payrule.js index 4541ddc..4a66e87 100644 --- a/pages/payrule/payrule.js +++ b/pages/payrule/payrule.js @@ -59,10 +59,4 @@ Page({ }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/pages/ques/ques.js b/pages/ques/ques.js index b0b8373..e99be43 100644 --- a/pages/ques/ques.js +++ b/pages/ques/ques.js @@ -56,11 +56,4 @@ Page({ onReachBottom: function () { }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/pages/rushToBuy/index.js b/pages/rushToBuy/index.js index 06bb6e2..0980339 100644 --- a/pages/rushToBuy/index.js +++ b/pages/rushToBuy/index.js @@ -146,9 +146,4 @@ Page({ that.data.page++; that.getList(that.data.page); }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () {} }); \ No newline at end of file diff --git a/pages/scanPay/scanPay.js b/pages/scanPay/scanPay.js index 2973606..0097ce9 100644 --- a/pages/scanPay/scanPay.js +++ b/pages/scanPay/scanPay.js @@ -200,11 +200,4 @@ Page({ onReachBottom: function() { }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function() { - - } }) \ No newline at end of file diff --git a/pages/scanPay/scanPay.wxss b/pages/scanPay/scanPay.wxss index 7f6a956..94dbfea 100644 --- a/pages/scanPay/scanPay.wxss +++ b/pages/scanPay/scanPay.wxss @@ -35,7 +35,6 @@ } .money .icon{ font-size:38rpx; - font-family:PingFang-SC-Medium; font-weight:500; color:rgba(51,51,51,1); } @@ -87,7 +86,6 @@ line-height: 75rpx; text-align: center; font-size:30rpx; - font-family:PingFang-SC-Medium; font-weight:500; color:rgba(255,255,255,1); } diff --git a/pages/specialcourtesy/specialcourtesy.js b/pages/specialcourtesy/specialcourtesy.js index b994563..b63e75c 100644 --- a/pages/specialcourtesy/specialcourtesy.js +++ b/pages/specialcourtesy/specialcourtesy.js @@ -75,11 +75,4 @@ Page({ onReachBottom: function () { }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/pages/success/index.js b/pages/success/index.js index daae2ca..3b83aad 100644 --- a/pages/success/index.js +++ b/pages/success/index.js @@ -55,11 +55,4 @@ Page({ onReachBottom: function () { }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } }) \ No newline at end of file diff --git a/project.config.json b/project.config.json index 2970aaf..4e30ca0 100644 --- a/project.config.json +++ b/project.config.json @@ -13,7 +13,7 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wx649b3be73c1afe47", + "appid": "wxea71200db93d756b", "projectname": "C", "isGameTourist": false, "condition": {