| @@ -1,3 +1,4 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'; | |||||
| const util = require("../../../utils/util.js"); | const util = require("../../../utils/util.js"); | ||||
| const config = require("../../../config/config.js"); | const config = require("../../../config/config.js"); | ||||
| const Http = require("../../../utils/HttpBasics"); | const Http = require("../../../utils/HttpBasics"); | ||||
| @@ -5,6 +6,7 @@ let app = getApp(); | |||||
| const imgurl = require("../../../utils/imgurl"); | const imgurl = require("../../../utils/imgurl"); | ||||
| Page({ | Page({ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| noCoupon: imgurl.noCoupon.url, | noCoupon: imgurl.noCoupon.url, | ||||
| couponUrl: imgurl.coupon.url, | couponUrl: imgurl.coupon.url, | ||||
| linessUrl: imgurl.liness.url, | linessUrl: imgurl.liness.url, | ||||
| @@ -1,7 +1,8 @@ | |||||
| { | { | ||||
| "usingComponents": { | "usingComponents": { | ||||
| "i-tab": "../../../dist/tab/index", | "i-tab": "../../../dist/tab/index", | ||||
| "i-tabs": "../../../dist/tabs/index" | |||||
| "i-tabs": "../../../dist/tabs/index", | |||||
| "navbar": "../../../components/navbar/navbar" | |||||
| }, | }, | ||||
| "navigationBarTitleText": "我的卡包", | "navigationBarTitleText": "我的卡包", | ||||
| "navigationBarBackgroundColor": "#F4F5F9" | "navigationBarBackgroundColor": "#F4F5F9" | ||||
| @@ -1,10 +1,11 @@ | |||||
| <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> | |||||
| <view class="market" wx:if="{{showPage}}"> | |||||
| <!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> --> | |||||
| <navbar home back text="我的卡包" color="#3c3c3c"></navbar> | |||||
| <view class="market" wx:if="{{showPage}}" style="padding-top:{{navigationBarHeight}}"> | |||||
| <!-- 卡包 我的优惠券 --> | <!-- 卡包 我的优惠券 --> | ||||
| <i-tabs class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll"> | |||||
| <i-tabs style="top:{{navigationBarHeight}}" class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll"> | |||||
| <i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab> | <i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab> | ||||
| </i-tabs> | </i-tabs> | ||||
| <view style='padding-top:120rpx;'> | |||||
| <view style='padding:120rpx 0 90rpx;'> | |||||
| <view class="nocoupon" wx:if="{{list.length==0}}"> | <view class="nocoupon" wx:if="{{list.length==0}}"> | ||||
| <image src="{{noCoupon}}" mode="widthFix" /> | <image src="{{noCoupon}}" mode="widthFix" /> | ||||
| <text class="txt001">请您敬请期待</text> | <text class="txt001">请您敬请期待</text> | ||||
| @@ -15,7 +16,11 @@ | |||||
| </view> | </view> | ||||
| <view class='section' wx:for='{{list}}' wx:key='{{index}}'> | <view class='section' wx:for='{{list}}' wx:key='{{index}}'> | ||||
| <view class='mms' style='background:{{item.background}}'> | |||||
| <!-- <view class='mms' style='background:{{item.background}}'> --> | |||||
| <view class='mms'> | |||||
| <view class="gray-bg"></view> | |||||
| <image class="cover-img" src="{{item.coverImg}}" /> | |||||
| <image src="{{canTransferred}}" wx-if='{{item.supportTransfer==1&&!item.showImg}}' class='cantransferred' mode="aspectFill"/> | <image src="{{canTransferred}}" wx-if='{{item.supportTransfer==1&&!item.showImg}}' class='cantransferred' mode="aspectFill"/> | ||||
| <view class='detail_msg'> | <view class='detail_msg'> | ||||
| <view class='info'> | <view class='info'> | ||||
| @@ -29,7 +34,8 @@ | |||||
| <text>{{item.title}}</text> | <text>{{item.title}}</text> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view hover-class='active' bindtap='gotoPay' data-remainingAmount="{{item.remainingAmount/100}}" data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}" wx:if="{{item.couponOrderStatus==4}}" class="btns" style='color:{{item.background}}!important'>扫一扫付款</view> | |||||
| <!-- <view hover-class='active' bindtap='gotoPay' data-remainingAmount="{{item.remainingAmount/100}}" data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}" wx:if="{{item.couponOrderStatus==4}}" class="btns" style='color:{{item.background}}!important'>扫一扫付款</view> --> | |||||
| <view hover-class='active' bindtap='gotoPay' data-remainingAmount="{{item.remainingAmount/100}}" data-cardId="{{item.id}}" data-couponorderstatus="{{item.couponOrderStatus}}" wx:if="{{item.couponOrderStatus==4}}" class="btns">扫一扫付款</view> | |||||
| <view hover-class='active' bindtap='gotoBuy' wx:if="{{item.couponOrderStatus!=4}}" style='color:rgba(179,180,181,1);' class="btns clearfix">再次购买</view> | <view hover-class='active' bindtap='gotoBuy' wx:if="{{item.couponOrderStatus!=4}}" style='color:rgba(179,180,181,1);' class="btns clearfix">再次购买</view> | ||||
| <text class='txtstatus' wx:if="{{item.couponOrderStatus == 5}}">已过期</text> | <text class='txtstatus' wx:if="{{item.couponOrderStatus == 5}}">已过期</text> | ||||
| <text class='txtstatus' wx:if="{{item.couponOrderStatus == 6}}">余额已用完</text> | <text class='txtstatus' wx:if="{{item.couponOrderStatus == 6}}">余额已用完</text> | ||||
| @@ -42,9 +48,10 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='userule' bindtap='userule' wx:if="{{list.length>0}}">使用规则</view> | |||||
| <view class="loading" wx:if="{{loading}}"> | <view class="loading" wx:if="{{loading}}"> | ||||
| <image src="{{loadingUrl}}" mode="widthFix"></image>{{content}} | <image src="{{loadingUrl}}" mode="widthFix"></image>{{content}} | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='userule' bindtap='userule' wx:if="{{list.length>0}}">使用规则</view> | |||||
| </view> | </view> | ||||
| @@ -9,7 +9,7 @@ | |||||
| height: 88rpx; | height: 88rpx; | ||||
| text-align: center; | text-align: center; | ||||
| position: fixed; | position: fixed; | ||||
| top: 0; | |||||
| /* top: 136rpx; */ | |||||
| left: 0; | left: 0; | ||||
| right: 0; | right: 0; | ||||
| z-index: 100000; | z-index: 100000; | ||||
| @@ -23,24 +23,49 @@ | |||||
| .section { | .section { | ||||
| position: relative; | position: relative; | ||||
| width: 710rpx; | |||||
| height: 240rpx; | |||||
| margin: 0 auto 20rpx; | |||||
| padding: 20rpx 0; | |||||
| border-radius: 16rpx; | |||||
| background: #fff; | |||||
| } | } | ||||
| .mms { | .mms { | ||||
| position: relative; | position: relative; | ||||
| width: 690rpx; | |||||
| width: 670rpx; | |||||
| background: #fff; | background: #fff; | ||||
| height: 238rpx; | height: 238rpx; | ||||
| margin: 0 auto 30rpx; | margin: 0 auto 30rpx; | ||||
| border-radius: 16rpx; | |||||
| box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | ||||
| } | } | ||||
| .cover-img { | |||||
| position: absolute; | |||||
| left: 0; | |||||
| top: 0; | |||||
| width: 100%; | |||||
| height: 100%; | |||||
| z-index: 0; | |||||
| } | |||||
| .gray-bg { | |||||
| width: 100%; | |||||
| height: 100%; | |||||
| position: absolute; | |||||
| left: 0; | |||||
| top: 0; | |||||
| z-index: 10; | |||||
| background: rgba(0,0,0,.4); | |||||
| } | |||||
| .yu { | .yu { | ||||
| display: inline-block !important; | display: inline-block !important; | ||||
| font-size: 30rpx!important; | font-size: 30rpx!important; | ||||
| } | } | ||||
| .expiretime { | .expiretime { | ||||
| width: 250rpx; | width: 250rpx; | ||||
| } | } | ||||
| @@ -119,7 +144,7 @@ | |||||
| .btns { | .btns { | ||||
| position: absolute; | position: absolute; | ||||
| right: 25rpx; | right: 25rpx; | ||||
| bottom: 25rpx; | |||||
| bottom: -12rpx; | |||||
| text-align: center; | text-align: center; | ||||
| font-size: 28rpx; | font-size: 28rpx; | ||||
| width: 250rpx !important; | width: 250rpx !important; | ||||
| @@ -127,11 +152,13 @@ | |||||
| line-height: 61rpx; | line-height: 61rpx; | ||||
| background: rgba(255, 255, 255, 1); | background: rgba(255, 255, 255, 1); | ||||
| border-radius: 30rpx; | border-radius: 30rpx; | ||||
| z-index: 100; | |||||
| color: #FD832D!important; | |||||
| } | } | ||||
| .active { | .active { | ||||
| color: #fff; | color: #fff; | ||||
| opacity: 0.6; | |||||
| opacity: 0.9; | |||||
| } | } | ||||
| .txt1 { | .txt1 { | ||||
| @@ -189,7 +216,7 @@ | |||||
| } | } | ||||
| .active { | .active { | ||||
| opacity: 0.6; | |||||
| /* opacity: 0.6; */ | |||||
| } | } | ||||
| .nav { | .nav { | ||||
| @@ -217,9 +244,10 @@ | |||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| margin-left: 25rpx; | margin-left: 25rpx; | ||||
| text-align: left; | text-align: left; | ||||
| } | } | ||||
| .txt2{ | .txt2{ | ||||
| opacity:0.5; | |||||
| /* opacity: .99; */ | |||||
| margin-top: 36rpx; | margin-top: 36rpx; | ||||
| } | } | ||||
| .imgicon { | .imgicon { | ||||
| @@ -258,11 +286,18 @@ | |||||
| font-size: 28rpx; | font-size: 28rpx; | ||||
| font-family: PingFang-SC-Regular; | font-family: PingFang-SC-Regular; | ||||
| font-weight: 400; | font-weight: 400; | ||||
| color: rgba(2, 192, 255, 1); | |||||
| color: #FD832D; | |||||
| /* opacity: .99; */ | |||||
| line-height: 44rpx; | line-height: 44rpx; | ||||
| margin-top: 30rpx; | margin-top: 30rpx; | ||||
| padding-bottom: 30rpx; | |||||
| background: #fff; | background: #fff; | ||||
| position: fixed; | |||||
| bottom: 0; | |||||
| left: 0; | |||||
| width: 100%; | |||||
| height: 80rpx; | |||||
| line-height: 80rpx; | |||||
| z-index: 100; | |||||
| } | } | ||||
| .yue text:nth-of-type(1){ | .yue text:nth-of-type(1){ | ||||
| margin-right: 6rpx; | margin-right: 6rpx; | ||||
| @@ -300,3 +335,9 @@ button::after{ border: none; } | |||||
| bottom: 0; | bottom: 0; | ||||
| margin: auto; | margin: auto; | ||||
| } | } | ||||
| .detail_msg { | |||||
| position: absolute; | |||||
| left: 0; | |||||
| z-index: 100; | |||||
| } | |||||
| @@ -1,3 +1,4 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||||
| const util = require("../../../utils/util.js"); | const util = require("../../../utils/util.js"); | ||||
| const config = require("../../../config/config.js"); | const config = require("../../../config/config.js"); | ||||
| const Http = require("../../../utils/HttpBasics"); | const Http = require("../../../utils/HttpBasics"); | ||||
| @@ -5,6 +6,7 @@ const imgurl = require("../../../utils/imgurl"); | |||||
| let app = getApp(); | let app = getApp(); | ||||
| Page({ | Page({ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| couponUrl: imgurl.noCoupon.url, | couponUrl: imgurl.noCoupon.url, | ||||
| linessUrl: imgurl.liness.url, | linessUrl: imgurl.liness.url, | ||||
| loadingUrl: imgurl.loading.url, | loadingUrl: imgurl.loading.url, | ||||
| @@ -1,7 +1,8 @@ | |||||
| { | { | ||||
| "usingComponents": { | "usingComponents": { | ||||
| "i-tab": "../../../dist/tab/index", | "i-tab": "../../../dist/tab/index", | ||||
| "i-tabs": "../../../dist/tabs/index" | |||||
| "i-tabs": "../../../dist/tabs/index", | |||||
| "navbar": "../../../components/navbar/navbar" | |||||
| }, | }, | ||||
| "navigationBarTitleText": "我的券包", | "navigationBarTitleText": "我的券包", | ||||
| "navigationBarBackgroundColor": "#F4F5F9" | "navigationBarBackgroundColor": "#F4F5F9" | ||||
| @@ -1,7 +1,8 @@ | |||||
| <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> | |||||
| <view class="market" wx:if="{{showPage}}"> | |||||
| <!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> --> | |||||
| <navbar home back text="我的券包" background="#F4F5F9"></navbar> | |||||
| <view class="market" wx:if="{{showPage}}" style="padding-top:{{navigationBarHeight}}"> | |||||
| <!-- 券包 我的优惠券 --> | <!-- 券包 我的优惠券 --> | ||||
| <i-tabs class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll"> | |||||
| <i-tabs style="top:{{navigationBarHeight}}" class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll"> | |||||
| <i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab> | <i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab> | ||||
| </i-tabs> | </i-tabs> | ||||
| <view style='padding-top:120rpx;'> | <view style='padding-top:120rpx;'> | ||||
| @@ -35,7 +35,7 @@ button::after{ border: none; } | |||||
| height: 88rpx; | height: 88rpx; | ||||
| text-align: center; | text-align: center; | ||||
| position: fixed; | position: fixed; | ||||
| top: 0; | |||||
| /* top: 0; */ | |||||
| left: 0; | left: 0; | ||||
| right: 0; | right: 0; | ||||
| z-index: 100000; | z-index: 100000; | ||||
| @@ -1,3 +1,4 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||||
| let config = require("../../../config/config.js"); | let config = require("../../../config/config.js"); | ||||
| let Http = require("../../../utils/HttpBasics"); | let Http = require("../../../utils/HttpBasics"); | ||||
| const util = require("../../../utils/util"); | const util = require("../../../utils/util"); | ||||
| @@ -5,6 +6,7 @@ let app = getApp(); | |||||
| const imgurl = require("../../../utils/imgurl"); | const imgurl = require("../../../utils/imgurl"); | ||||
| Page({ | Page({ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| noOrdersUrl: imgurl.noOrders.url, | noOrdersUrl: imgurl.noOrders.url, | ||||
| loadingUrl: imgurl.loading.url, | loadingUrl: imgurl.loading.url, | ||||
| wmhome: imgurl.wmhome.url, | wmhome: imgurl.wmhome.url, | ||||
| @@ -1,7 +1,8 @@ | |||||
| { | { | ||||
| "usingComponents": { | "usingComponents": { | ||||
| "i-tab": "../../../dist/tab/index", | "i-tab": "../../../dist/tab/index", | ||||
| "i-tabs": "../../../dist/tabs/index" | |||||
| "i-tabs": "../../../dist/tabs/index", | |||||
| "navbar": "../../../components/navbar/navbar" | |||||
| }, | }, | ||||
| "navigationBarTitleText": "我的订单", | "navigationBarTitleText": "我的订单", | ||||
| "navigationBarBackgroundColor": "#F4F5F9" | "navigationBarBackgroundColor": "#F4F5F9" | ||||
| @@ -1,6 +1,7 @@ | |||||
| <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> | |||||
| <view class="market"> | |||||
| <i-tabs class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll"> | |||||
| <!-- <button class='goback' bindtap='goback'><image src='{{wmhome}}' mode="widthFix"></image></button> --> | |||||
| <navbar home back text="我的订单"></navbar> | |||||
| <view class="market" style="padding-top:{{navigationBarHeight}}"> | |||||
| <i-tabs style="top:{{navigationBarHeight}}" class='tabs' current="{{ current_scroll }}" scroll bindchange="handleChangeScroll"> | |||||
| <i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab> | <i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab> | ||||
| </i-tabs> | </i-tabs> | ||||
| <view style='padding-top:90rpx;'> | <view style='padding-top:90rpx;'> | ||||
| @@ -8,7 +8,7 @@ | |||||
| position: fixed; | position: fixed; | ||||
| width: 100% !important; | width: 100% !important; | ||||
| height: 96rpx; | height: 96rpx; | ||||
| top: 0; | |||||
| /* top: 0; */ | |||||
| left: 0; | left: 0; | ||||
| right: 0; | right: 0; | ||||
| text-align: center; | text-align: center; | ||||
| @@ -431,14 +431,15 @@ Page({ | |||||
| that.initUsrCarList(); | that.initUsrCarList(); | ||||
| }) | }) | ||||
| .catch(err => { | .catch(err => { | ||||
| console.log(err) | |||||
| wx.showToast({ | |||||
| // title: err.message, | |||||
| title: '未查到', | |||||
| icon: 'none', | |||||
| duration: 2000, | |||||
| mask: false | |||||
| }); | |||||
| if (err.message!=undefined) { | |||||
| wx.showToast({ | |||||
| title: err.message, | |||||
| icon: 'none', | |||||
| duration: 2000, | |||||
| mask: false | |||||
| }); | |||||
| } | |||||
| }) | }) | ||||
| }, | }, | ||||
| /** | /** | ||||