| @@ -6,6 +6,9 @@ Page({ | |||
| * 页面的初始数据 | |||
| */ | |||
| data: { | |||
| orangeImg: imgurl.orange.url, | |||
| blueImg: imgurl.blue.url, | |||
| grayImg: imgurl.gray.url, | |||
| bannerUrl: imgurl.banner.url, | |||
| loadingUrl: imgurl.loading.url, | |||
| bargaincancel: imgurl.bargaincancel.url, | |||
| @@ -13,7 +13,7 @@ | |||
| bindload=""></image> | |||
| <view class="fl ri" hover-class="none" hover-stop-propagation="false"> | |||
| <text class="txt01">{{item.title}}</text> | |||
| <text class="txt02">{{item.subTitle}}</text> | |||
| <!-- <text class="txt02">{{item.subTitle}}</text> --> | |||
| <view class="txt04">可砍至¥<text class="money">{{item.salePriceStr}}</text><text class="txt03">原价{{item.priceStr}}</text></view> | |||
| </view> | |||
| <view class="botton" wx:if="{{item.remainInventory != 0}}" hover-class="none" hover-stop-propagation="false">发起砍价</view> | |||
| @@ -26,11 +26,15 @@ | |||
| <!-- 我的砍价 --> | |||
| <view class="list mybargain" style='padding-bottom:120rpx;' wx:if="{{mybargain&&lists.length>0}}" hover-class="none" hover-stop-propagation="false"> | |||
| <view class="listitem clearfix" wx:for="{{lists}}" wx:key="index" zhover-stop-propagation="false"> | |||
| <image class="frImg" wx:if="{{item.orderStatus == 6&&todayDate<=item.pressEndDate}}" src="{{orangeImg}}" mode="aspectFill" lazy-load="true"><text>进行中</text></image> | |||
| <image class="frImg" wx:if="{{item.orderStatus == 7}}" src="{{blueImg}}" mode="aspectFill" lazy-load="true"><text>已完成</text></image> | |||
| <image class="frImg" wx:if="{{item.orderStatus == 8||item.orderStatus == 6&&todayDate>item.pressEndDate}}" src="{{grayImg}}" mode="aspectFill" lazy-load="true"><text>已失效</text></image> | |||
| <image class="fl" src="{{item.coverImg}}" mode="aspectFill" lazy-load="true"></image> | |||
| <view class="fl ri" hover-class="none" hover-stop-propagation="false"> | |||
| <text class="txt01">{{item.title}}</text> | |||
| <text class="txt02">{{item.subTitle}}</text> | |||
| <view class="txt04 mr txt004" wx:if="{{item.orderStatus !=7}}">已砍至¥ <text class='money'>{{item.salePrice/100}}</text><text class="txt03">原价{{item.priceStr}}</text></view> | |||
| <!-- <text class="txt02">{{item.subTitle}}</text> --> | |||
| <view class="txt04 mr txt004" wx:if="{{item.orderStatus !=7}}">已砍至¥ <text class='money'>{{item.price/100-(item.price/100-item.salePrice/100-item.pressCurrentValue/100)}}</text><text class="txt03">原价{{item.price/100}}</text></view> | |||
| <!-- <text class="txt04 mr" wx:if="{{item.orderStatus == 6&&todayDate<=item.pressEndDate}}">{{item.pressCurrentValue/100}}元</text> --> | |||
| <text class="txt04 mr" wx:if="{{item.orderStatus == 7}}">已砍价到底价:{{item.salePrice/100}}元</text> | |||
| </view> | |||
| @@ -55,8 +59,8 @@ | |||
| <view wx:if="{{item.orderStatus != 8}}" > | |||
| <view class='line'></view> | |||
| <view class='pt_progress' > | |||
| <progress percent="60" stroke-width="6" activeColor="#FE4614" /> | |||
| <text class='msg' wx:if="{{item.orderStatus == 6}}">还差5人即享最低</text> | |||
| <progress percent="{{(item.pressCurrentNum/item.pressLimitNum)*100}}" stroke-width="6" activeColor="#FD7E2B" /> | |||
| <text class='msg' wx:if="{{item.orderStatus == 6}}">还差{{item.pressLimitNum-item.pressCurrentNum}}人即享最低</text> | |||
| <text class='msg' wx:if="{{item.orderStatus == 7}}">已至底价</text> | |||
| </view> | |||
| </view> | |||
| @@ -15,7 +15,9 @@ page{ | |||
| height: 142rpx!important; | |||
| border-radius: 10rpx; | |||
| overflow: hidden; | |||
| margin-top:10rpx; | |||
| margin-top:10rpx; | |||
| word-wrap: break-word; | |||
| word-break: break-all; | |||
| } | |||
| .listitem .icon{ | |||
| width: 140rpx; | |||
| @@ -41,7 +43,7 @@ page{ | |||
| text-overflow: ellipsis; | |||
| overflow: hidden; | |||
| font-weight: bold; | |||
| margin-top: 10rpx; | |||
| /* margin-top: 10rpx; */ | |||
| } | |||
| .ri .txt02 { | |||
| @@ -53,7 +55,7 @@ page{ | |||
| color: rgba(140, 140, 140, 1); | |||
| } | |||
| .ri .txt03 { | |||
| margin-left: 10rpx; | |||
| /* margin-left: 10rpx; */ | |||
| display: inline-block!important; | |||
| font-size:24rpx; | |||
| text-decoration:line-through; | |||
| @@ -61,16 +63,36 @@ page{ | |||
| } | |||
| .ri .txt04 { | |||
| width: 100%; | |||
| font-size:30rpx; | |||
| font-size:26rpx; | |||
| color:rgba(253,131,45,1); | |||
| line-height:44rpx; | |||
| margin-top: 20rpx; | |||
| height: 50rpx; | |||
| /* margin-top: 10rpx; */ | |||
| } | |||
| .frImg{ | |||
| height: 78rpx; | |||
| width: 78rpx; | |||
| position: absolute; | |||
| right: 0; | |||
| top: 0; | |||
| } | |||
| .frImg text{ | |||
| transform: rotate(45deg); | |||
| color: #FFFFFF; | |||
| font-size: 18rpx; | |||
| position: absolute; | |||
| right: 0; | |||
| top: 18rpx; | |||
| } | |||
| .money{ | |||
| display: inline-block!important; | |||
| font-size:50rpx; | |||
| font-weight:500; | |||
| color:rgba(253,131,45,1); | |||
| display: inline-block!important; | |||
| font-size:40rpx; | |||
| font-weight:500; | |||
| color:rgba(253,131,45,1); | |||
| width:150rpx; | |||
| overflow:hidden; | |||
| white-space: nowrap; | |||
| text-overflow: ellipsis; | |||
| } | |||
| .listitem{ | |||
| position: relative; | |||
| @@ -89,17 +111,19 @@ page{ | |||
| .pt_progress{ | |||
| padding:0,16rpx; | |||
| line-height: 56rpx; | |||
| height: 56rpx; | |||
| color: #FD782D; | |||
| } | |||
| .msg{ | |||
| float: right; | |||
| font-size: 28rpx; | |||
| margin-top: 8rpx; | |||
| } | |||
| progress{ | |||
| display:inline-block; | |||
| border-radius:60rpx; | |||
| overflow:hidden; | |||
| width: 436rpx; | |||
| width: 380rpx; | |||
| } | |||
| .botton{ | |||
| position: absolute; | |||
| @@ -914,8 +914,8 @@ Page({ | |||
| if (that.data.dispressEndDate){ | |||
| wx.showModal({ | |||
| title: '提示', | |||
| content: "您有未支付砍价订单,请先进行支付", | |||
| confirmText:"去支付", | |||
| content: "您有未支付订单,请到“我的-我的砍价”进行支付", | |||
| confirmText:"我的砍价", | |||
| success: function (res) { | |||
| if (res.confirm) { | |||
| wx.navigateTo({ | |||
| @@ -1,12 +1,14 @@ | |||
| const util = require("../../utils/util.js"); | |||
| const Http = require("../../utils/HttpBasics"); | |||
| const config = require("../../config/config"); | |||
| const imgurl = require("../../utils/imgurl"); | |||
| Page({ | |||
| /** | |||
| * 页面的初始数据 | |||
| */ | |||
| data: { | |||
| chevronUrl: imgurl.chevron.url, | |||
| date: '1988-03-12', | |||
| flag: 1, | |||
| flagsex: 0, | |||
| @@ -10,6 +10,7 @@ | |||
| <input wx:if="{{flag==1}}" class='input' placeholder='请输入生日' disabled/> | |||
| <view wx:if="{{flag==2}}" class="picker"> {{date}}</view> | |||
| </picker> | |||
| <image class="rArrow" src="{{chevronUrl}}" mode='widthFix'></image> | |||
| </view> | |||
| <view class="section section_gap"> | |||
| <text>性别</text> | |||
| @@ -19,10 +20,12 @@ | |||
| </radio> | |||
| </radio-group> | |||
| </view> | |||
| <view class='address' bindtap='address'> | |||
| <view class='address sec' bindtap='address'> | |||
| <text>住址</text> | |||
| <view class='names' wx:if="{{address}}">{{address}}</view> | |||
| <view class='names' wx:if="{{!address}}">请选择地址</view> | |||
| <image class="rArrow" src="{{chevronUrl}}" mode='widthFix'></image> | |||
| </view> | |||
| <button class='btn' formType="submit" hover-class='active'>修改会员资料</button> | |||
| <button class='btn' wx:if="{{!username}}" formType="submit" hover-class='active' style='background:#CECECE' >完成</button> | |||
| <button class='btn' wx:if="{{username}}" formType="submit" hover-class='active' style='background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);'>完成</button> | |||
| </form> | |||
| @@ -1,3 +1,12 @@ | |||
| .rArrow{ | |||
| position: absolute; | |||
| right: 26rpx; | |||
| height:20rpx; | |||
| width: 20rpx; | |||
| margin: auto; | |||
| bottom: 30rpx; | |||
| } | |||
| input { | |||
| width:600rpx; | |||
| display: inline-block; | |||
| @@ -31,6 +40,7 @@ input { | |||
| display: inline-block; | |||
| font-size: 32rpx; | |||
| color: #999; | |||
| width: 620rpx; | |||
| } | |||
| radio { | |||
| @@ -51,14 +61,13 @@ radio { | |||
| margin-right: 20rpx; | |||
| } | |||
| .btn{ | |||
| width: 400rpx; | |||
| width: 456rpx; | |||
| color: #fff; | |||
| margin-top: 60rpx; | |||
| height: 86rpx; | |||
| line-height: 86rpx; | |||
| margin-top: 466rpx; | |||
| height: 92rpx; | |||
| line-height: 92rpx; | |||
| text-align: center; | |||
| border-radius:60rpx; | |||
| background: #00c0ff; | |||
| border-radius:32rpx; | |||
| font-size: 32rpx; | |||
| } | |||
| .active{ | |||
| @@ -10,7 +10,7 @@ Page({ | |||
| data: { | |||
| succUrl: imgurl.succ.url, | |||
| spcodeUrl: imgurl.spcode.url, | |||
| rDetailUrl: imgurl.rDetail.url, | |||
| chevronUrl: imgurl.chevron.url, | |||
| teljpgUrl: imgurl.teljpg.url, | |||
| newUrl: imgurl.new1.url, | |||
| weixinTitle: imgurl.weixinTitle.url, | |||
| @@ -68,7 +68,7 @@ | |||
| </view> | |||
| <view> | |||
| <image class="spcode" src="{{spcodeUrl}}" mode='widthFix'></image> | |||
| <image class="rArrow" src="{{rDetailUrl}}" mode='widthFix'></image> | |||
| <image class="rArrow" src="{{chevronUrl}}" mode='widthFix'></image> | |||
| </view> | |||
| </view> | |||
| <!-- <view> | |||
| @@ -222,10 +222,11 @@ page { | |||
| } | |||
| .rArrow{ | |||
| position: absolute; | |||
| right: 0; | |||
| height:88rpx; | |||
| width: 380rpx; | |||
| right: 26rpx; | |||
| height:20rpx; | |||
| width: 20rpx; | |||
| margin: auto; | |||
| bottom: 30rpx; | |||
| } | |||
| /*mask*/ | |||
| @@ -1,6 +1,6 @@ | |||
| <view class="couponbg"> | |||
| <view class="title">{{title}}</view> | |||
| <view class="subtitle">{{subtitle}}</view> | |||
| <!-- <view class="subtitle">{{subtitle}}</view> --> | |||
| <image class='line' src='{{lineUrl}}' mode="widthFix"></image> | |||
| <!-- | |||
| @@ -16,7 +16,7 @@ page { | |||
| .title { | |||
| line-height: 36rpx; | |||
| text-align: center; | |||
| padding-top: 67rpx; | |||
| padding-top: 54rpx; | |||
| font-size: 32rpx; | |||
| color: #1f2d3d; | |||
| letter-spacing: 0; | |||
| @@ -296,8 +296,8 @@ module.exports = { | |||
| 'url': baseUrl + 'spcode.png', | |||
| 'name': '' | |||
| }, | |||
| 'rDetail': { | |||
| 'url': baseUrl + 'rDetail.png', | |||
| 'chevron': { | |||
| 'url': baseUrl + 'chevron.png', | |||
| 'name': '' | |||
| }, | |||
| 'spphone': { | |||
| @@ -588,5 +588,17 @@ module.exports = { | |||
| 'wmintegral': { | |||
| 'url': baseUrl + "wmintegral1.png", | |||
| 'name': '积分商城' | |||
| }, | |||
| 'orange': { | |||
| 'url': baseUrl + "orange.png", | |||
| 'name': '积分商城' | |||
| }, | |||
| 'blue': { | |||
| 'url': baseUrl + "blue.png", | |||
| 'name': '积分商城' | |||
| }, | |||
| 'gray': { | |||
| 'url': baseUrl + "gray.png", | |||
| 'name': '积分商城' | |||
| } | |||
| } | |||