diff --git a/assets/img/loading.gif b/assets/img/loading.gif index 52d7d29..9a046e8 100644 Binary files a/assets/img/loading.gif and b/assets/img/loading.gif differ diff --git a/assets/img/loading1.gif b/assets/img/loading1.gif new file mode 100644 index 0000000..52d7d29 Binary files /dev/null and b/assets/img/loading1.gif differ diff --git a/components/banner/index.wxml b/components/banner/index.wxml index 7e18828..bacefba 100644 --- a/components/banner/index.wxml +++ b/components/banner/index.wxml @@ -1,9 +1,11 @@ - - - + + + + + - + diff --git a/components/banner/index.wxss b/components/banner/index.wxss index 7a972cb..6bf9449 100644 --- a/components/banner/index.wxss +++ b/components/banner/index.wxss @@ -6,7 +6,7 @@ margin:-126rpx auto 0; border-radius:16rpx; z-index: 10000; - box-shadow: 0 6px 20px 0 rgba(0,0,0,0.30); + box-shadow: 0 6px 20px 0 rgba(0,0,0,0.15); } .index-slide, swiper-item @@ -34,7 +34,7 @@ margin: 0 8rpx; width: 12rpx; height: 12rpx; - background: #fff; + background: #b6b6b7; border-radius: 50%; transition: all .6s; } diff --git a/config/config.js b/config/config.js index 600b16a..4bf7899 100755 --- a/config/config.js +++ b/config/config.js @@ -1,8 +1,7 @@ var config = { - name: "富茂科技", // url: "https://ciformall.youlane.cn/C/api", url:"https://c.malls.iformall.com/C/api", - //url: "http://31adc9ce.ngrok.io/C/api", + // url: "http://31adc9ce.ngrok.io/C/api", api: { /** * 接口用途:login @@ -136,11 +135,17 @@ var config = { /** * 获得成长值 */ - getScore:'/user/userinfo' + getScore:'/user/userinfo', + /** + * 小程序分享 + * title + * 描述 + */ + getWeapNote:'/mall/getWeapNote' }, weapp: { - AppId: "wx649b3be73c1afe47" + AppId: "wxea71200db93d756b" }, ErrorCode: { NICK_NOT_AUTH: 11004, diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml index a0ce8c5..bb9f70e 100644 --- a/pages/bannerdetail/index.wxml +++ b/pages/bannerdetail/index.wxml @@ -2,7 +2,7 @@ diff --git a/pages/bannerdetail/index.wxss b/pages/bannerdetail/index.wxss index 9b8d9d7..558e487 100644 --- a/pages/bannerdetail/index.wxss +++ b/pages/bannerdetail/index.wxss @@ -22,8 +22,8 @@ page { } .banner image { - width: 100%; - display: block; + width: 750rpx; + height: 280rpx; } .act { diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss index fb7b5be..83bc9ce 100644 --- a/pages/couponorder/detail/index.wxss +++ b/pages/couponorder/detail/index.wxss @@ -7,6 +7,8 @@ page { background: #02c0ff; + height: auto !important; + padding-bottom: 20rpx; } .panel, .zhuangtai image { @@ -134,7 +136,8 @@ page { padding-top: 92rpx; line-height: 45rpx; } -.line{ + +.line { height: 10rpx; display: block; width: 100%; @@ -202,7 +205,7 @@ page { .posi_logo { width: 92%; - padding: 30rpx 4%; + padding: 30rpx 4% 0; display: flex; position: relative; z-index: 100; @@ -249,10 +252,15 @@ page { font-size: 24rpx; color: #b8b8b8; padding-top: 10rpx; + width: 386rpx; + white-space: wrap; + text-overflow: ellipsis; + overflow: hidden; + height: 78rpx; } .tit { - padding: 24rpx 0 0; + padding: 53rpx 0 0; text-indent: 30rpx; font-size: 24rpx; color: #919191; diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index 1954d85..db5a9f4 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -73,8 +73,6 @@ Page({ res.data.list.map(file => { file.expiredTime = util.fmtDate(file.expiredTime); }); - - setTimeout(function () { that.setData({ loading: false diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss index 8f63fba..c495914 100644 --- a/pages/couponorder/index/index.wxss +++ b/pages/couponorder/index/index.wxss @@ -29,7 +29,7 @@ height: 170rpx !important; background: #fff; padding: 30rpx 0 0; - margin: 0 auto 30rpx; + margin: 0 auto 40rpx; border-radius: 16rpx; border-top: 8rpx solid #02b7ff; box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); @@ -166,8 +166,8 @@ } .loading image { - width: 40rpx; - height: 40rpx; + width: 60rpx; + height: 60rpx; vertical-align: middle; margin-right: 10rpx; } diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js index f26ae5a..f97b579 100755 --- a/pages/getphoneInfo/index.js +++ b/pages/getphoneInfo/index.js @@ -10,6 +10,7 @@ Page({ onLoad: function(options) { var that = this; console.log(options); + that.setData({ couponChannelId: options.couponChannelId, couponId: options.couponId @@ -25,8 +26,12 @@ Page({ that.setData({ mallImgUrl: res.data.mallImgUrl }); + wx.setNavigationBarTitle({ + title: res.data.mallName + }) }); }, + getPhoneNumber: function(e) { var that = this; var iv = e.detail.iv; @@ -50,8 +55,7 @@ Page({ icon: "success", success: function(res) { wx.redirectTo({ - url: - "/pages/coupon/detail/index?couponChannelId=" + + url: "/pages/coupon/detail/index?couponChannelId=" + that.data.couponChannelId + "&couponId=" + that.data.couponId + @@ -68,4 +72,4 @@ Page({ } ); } -}); +}); \ No newline at end of file diff --git a/pages/getphoneInfo/index.json b/pages/getphoneInfo/index.json index 4ffde00..2303215 100755 --- a/pages/getphoneInfo/index.json +++ b/pages/getphoneInfo/index.json @@ -1,3 +1,3 @@ { - "navigationBarTitleText": "富茂链客" + "navigationBarTitleText": "" } \ No newline at end of file diff --git a/pages/getphoneInfo/index.wxss b/pages/getphoneInfo/index.wxss index a587283..3a11eb4 100755 --- a/pages/getphoneInfo/index.wxss +++ b/pages/getphoneInfo/index.wxss @@ -7,8 +7,8 @@ } .login-logo { - width: 283rpx; - height: 326rpx; + width: 320rpx; + height: 320rpx; } .login-logo>image { diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js index c6c3a37..19c9b4c 100755 --- a/pages/getuserinfo/index.js +++ b/pages/getuserinfo/index.js @@ -17,6 +17,9 @@ Page({ that.setData({ mallImgUrl: res.data.mallImgUrl }); + wx.setNavigationBarTitle({ + title: res.data.mallName + }) }); }, diff --git a/pages/getuserinfo/index.json b/pages/getuserinfo/index.json index 4ffde00..2303215 100755 --- a/pages/getuserinfo/index.json +++ b/pages/getuserinfo/index.json @@ -1,3 +1,3 @@ { - "navigationBarTitleText": "富茂链客" + "navigationBarTitleText": "" } \ No newline at end of file diff --git a/pages/index/coupons/index.wxml b/pages/index/coupons/index.wxml index 14666ad..a9cf615 100644 --- a/pages/index/coupons/index.wxml +++ b/pages/index/coupons/index.wxml @@ -4,7 +4,6 @@ - 请您敬请期待 我们正在筹备一大波优惠活动 diff --git a/pages/index/coupons/index.wxss b/pages/index/coupons/index.wxss index 4f80b8d..fd2f4c4 100644 --- a/pages/index/coupons/index.wxss +++ b/pages/index/coupons/index.wxss @@ -1,5 +1,6 @@ .index-coupons { height: 820rpx; + margin-top: 30rpx; } .loading { @@ -11,8 +12,8 @@ } .loading image { - width: 40rpx; - height: 40rpx; + width: 60rpx; + height: 60rpx; vertical-align: middle; margin-right: 10rpx; } diff --git a/pages/index/index.js b/pages/index/index.js index 0e52184..ce82542 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -6,6 +6,8 @@ Page({ market: app.globalData.market, list: [], swiperCurrent: 0, + title:'', + desc:'', scrollTop: 0, page: 1 // 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 }, @@ -28,11 +30,26 @@ Page({ var scene = decodeURIComponent(options.scene); that.setData({ scene:scene - }) + }); console.log(that.data.scene) console.log(scene); app.getLocation(); that.userLogin(); + Http.get({ + url: config.api.getWeapNote, + data: { + appId: config.weapp.AppId, + } + }) + .then(res=>{ + console.log(res.data.weapNote); + let weapNote = JSON.parse(res.data.weapNote); + console.log(weapNote.firstpage); + that.setData({ + desc: weapNote.firstpage.desc, + title: weapNote.firstpage.title + }) + }) }, onShow:function(){ let num = wx.getStorageSync('couponNum'); @@ -40,7 +57,7 @@ Page({ wx.showTabBarRedDot({ index: 2 }) - } + }; }, /** * 下拉刷新 @@ -232,8 +249,8 @@ Page({ // 用户点击右上角分享 onShareAppMessage: function() { return { - title: "富茂链客", - desc: "分享个小程序,希望你喜欢", + title: this.data.title, + desc: this.data.desc, success: function(res) { wx.showToast({ title: "分享成功", diff --git a/pages/index/rushToBuy/index.wxss b/pages/index/rushToBuy/index.wxss index 3c60ce5..9aa697b 100644 --- a/pages/index/rushToBuy/index.wxss +++ b/pages/index/rushToBuy/index.wxss @@ -32,7 +32,7 @@ .index-scroll-view .commodity { display: inline-block; - margin: 16rpx 30rpx 30rpx; + margin: 16rpx 30rpx 0; margin-right: 0; overflow: hidden; position: relative; diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index d8fc161..09f03b9 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -66,6 +66,6 @@ - + diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 03bb987..aaae773 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -67,7 +67,6 @@ width: 100%; } - .info view:nth-child(1) text { font-size: 30rpx; color: #000; @@ -91,7 +90,6 @@ color: #b8b8b8; } - .payment { width: 92%; height: 120rpx; @@ -358,19 +356,22 @@ radio { background: #fff; position: fixed; padding-top: 10rpx; - height: 98rpx; - bottom: 0rpx; + height: 94rpx; + bottom: 30rpx; left: 0; right: 0; } .buy { background: #00c0ff; - height: 88rpx; - width: 98%; + height: 94rpx; + width: 670rpx; margin: 0 auto; color: #fff; font-size: 36rpx; - line-height: 88rpx; - border-radius: 6rpx; + line-height: 94rpx; + border-radius: 61rpx; } +.active{ + opacity: .6; +} \ No newline at end of file diff --git a/pages/order/index/index.js b/pages/order/index/index.js index f0fb7ca..45e1094 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -116,11 +116,12 @@ Page({ }); } }); - } else { + } + else { console.log("加载完成allow_load设置成false"); that.setData({ loading: true, - ccontent: "——— 再拉裤子就掉了啦 ———" + content: "——— 再拉裤子就掉了啦 ———" }) setTimeout(function () { that.setData({ diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml index a8972a9..5f6a2ee 100644 --- a/pages/order/index/index.wxml +++ b/pages/order/index/index.wxml @@ -14,8 +14,8 @@ 等待付款 待退款 交易关闭 - 已退款 - 退款失败 + 已退款 + 退款失败 免费领取 付款成功 @@ -47,9 +47,9 @@ - + 退款失败 diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss index 6334be3..91cf568 100644 --- a/pages/order/index/index.wxss +++ b/pages/order/index/index.wxss @@ -228,8 +228,8 @@ } .loading image { - width: 40rpx; - height: 40rpx; + width: 60rpx; + height: 60rpx; vertical-align: middle; margin-right: 10rpx; } diff --git a/pages/orderquanma/index.wxml b/pages/orderquanma/index.wxml index 43051ac..5fb6a61 100644 --- a/pages/orderquanma/index.wxml +++ b/pages/orderquanma/index.wxml @@ -11,9 +11,9 @@ --> - - - + + + diff --git a/pages/orderquanma/index.wxss b/pages/orderquanma/index.wxss index 753069b..b407697 100644 --- a/pages/orderquanma/index.wxss +++ b/pages/orderquanma/index.wxss @@ -37,12 +37,13 @@ page { } .panel, .zhuangtai image { - width: 600rpx; - background-color: #fff; - margin: 22rpx auto 0; - padding: 0; - position: relative; - z-index: 10000000000; + width:600rpx; +display:block; +border-radius:10rpx; +margin:38rpx auto 0; +padding:0; +z-index:10000000000; + } .pane2 { diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 2533873..fe7c18f 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -10,7 +10,9 @@ Page({ addCar: null, tcq: 2, flag: "", - extraData: {} + extraData: {}, + desc:'', + title:'' }, /*车牌动态样式 */ changeStyle: function() { @@ -26,6 +28,21 @@ Page({ onLoad: function(options) { var that = this; that.getList(); + Http.get({ + url: config.api.getWeapNote, + data: { + appId: config.weapp.AppId, + } + }) + .then(res => { + console.log(res.data.weapNote); + let weapNote = JSON.parse(res.data.weapNote); + console.log(weapNote.carpage); + that.setData({ + desc: weapNote.carpage.desc, + title: weapNote.carpage.title + }) + }) }, onShow: function(options) { @@ -331,8 +348,8 @@ Page({ // 用户点击右上角分享 onShareAppMessage: function () { return { - title: "富茂链客", - desc: "分享个小程序,希望你喜欢", + title: this.data.title, + desc: this.data.desc, success: function (res) { wx.showToast({ title: "分享成功", diff --git a/pages/rushToBuy/index.wxss b/pages/rushToBuy/index.wxss index 28b9d4d..c660294 100644 --- a/pages/rushToBuy/index.wxss +++ b/pages/rushToBuy/index.wxss @@ -14,8 +14,8 @@ color: #999; } .loading image { - width: 40rpx; - height: 40rpx; + width: 60rpx; + height: 60rpx; vertical-align: middle; margin-right: 10rpx; } @@ -143,13 +143,14 @@ bottom: 0; right: 30rpx; width: 140rpx; - height: 60rpx; - line-height: 60rpx; + height: 58rpx; + line-height: 58rpx; text-align: center; background: #ff4949; border-radius: 60rpx; color: #fff; font-size: 28rpx; + border: 2rpx solid #ff4949; } .sale { @@ -167,5 +168,10 @@ } .active { - opacity: 0.6; + background: #fff; + width: 140rpx; + height: 58rpx; + line-height: 58rpx; + color: #ff4949; + border: 2rpx solid #ff4949; } diff --git a/pages/user/index.js b/pages/user/index.js index 7a69e5a..36e4f63 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -11,7 +11,7 @@ Page({ // "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg" // } flag: 'hidden', - score:'' + score:'0' }, navigateTo() { wx.navigateTo({ diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 905721c..ca517ce 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -67,7 +67,7 @@ - 版本号:2.0.5 + 版本号:2.0.6 \ No newline at end of file diff --git a/pages/user/index.wxss b/pages/user/index.wxss index 5ac88d7..ad0963e 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -111,12 +111,13 @@ } .chengzhang1 .view { - font-size: 48rpx; + font-size: 44rpx; color: #01bffe; line-height: 67rpx; } .chengzhang1 text { + text-align: center; font-size: 24rpx; color: #333; line-height: 33rpx;