浏览代码

[订单详情][修改][样式]

[订单待付款][修改][图片]
tags/河北版C.8.1.01
hurui 5 年前
父节点
当前提交
9362bbe4fb
共有 8 个文件被更改,包括 149 次插入68 次删除
  1. +3
    -0
      pages/order/detail/index.js
  2. +38
    -17
      pages/order/detail/index.wxml
  3. +93
    -45
      pages/order/detail/index.wxss
  4. +1
    -1
      pages/order/index/index.js
  5. +3
    -3
      pages/order/index/index.wxml
  6. +2
    -1
      pages/orderquanma/index.json
  7. +1
    -1
      pages/orderquanma/index.wxss
  8. +8
    -0
      utils/imgurl.js

+ 3
- 0
pages/order/detail/index.js 查看文件

@@ -10,6 +10,7 @@ Page({
data: {
succUrl: imgurl.succ.url,
spcodeUrl: imgurl.spcode.url,
rDetailUrl: imgurl.rDetail.url,
teljpgUrl: imgurl.teljpg.url,
newUrl: imgurl.new1.url,
weixinTitle: imgurl.weixinTitle.url,
@@ -79,6 +80,8 @@ Page({
console.log(res, 444444444444444444)
}
},

powerDrawer: function (e) {
let that = this;
console.log(e)


+ 38
- 17
pages/order/detail/index.wxml 查看文件

@@ -1,8 +1,6 @@
<view class='order' wx:if="{{showPage}}">
<view wx:if="{{order.orderStatus==1}}" class='tips'>
<image class='success' src='{{succUrl}}' mode='widthFix'></image>
<!-- <text wx:if="{{order.salePrice/100==0}}">领取成功,请尽快到门店使用</text>
<text wx:if="{{order.salePrice/100!=0}}">付款成功,请尽快到门店使用</text> -->
<view wx:if="{{order.salePrice/100==0}}" class='msg' >
<text>领取成功</text>
<text>请尽快到门店使用,有效期至{{}}</text>
@@ -13,14 +11,34 @@
</view>
</view>
<view class='section'>
<view class='sectionTit'>
<text>{{order.title}}</text>
<view>
<text>{{item.title}}</text>
<text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text>
<text class='wait' wx:if="{{item.orderStatus==10}}">拼团中</text>
<text class='sucess' wx:if="{{item.orderStatus==3}}">待退款</text>
<text class='close' wx:if="{{item.orderStatus==2}}">交易关闭</text>
<text class='close' wx:if="{{item.orderStatus==6}}">砍价中</text>
<text class='sucess' wx:if="{{item.orderStatus==7}}">砍价成功</text>
<text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text>
<text class='close' wx:if="{{item.orderStatus==9}}">砍价取消</text>
<text class='close' wx:if="{{item.orderStatus==12}}">拼团已过期</text>
<text class='close' wx:if="{{item.orderStatus==12}}">拼团失败</text>
<text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text>
<text class='close' wx:if="{{item.orderStatus==4}}">已退款</text>
<text class='wait' wx:if="{{item.orderStatus==5}}">退款失败</text>
<text class='sucess' wx:if="{{item.orderStatus==11}}">拼团成功</text>
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&item.type!=50&&item.type!=51}}">免费领取</text>
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&(item.type==50||item.type==51)}}">积分兑换</text>
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">付款成功</text>
</view>
</view>
<view class='detail_msg'>
<view class='logo'>
<image mode='aspectFill' src='{{order.coverImg}}'></image>
</view>
<view class='info'>
<view>
<text>{{order.title}}</text>
</view>
<view>
<text>{{order.subTitle}}</text>
</view>
@@ -43,36 +61,39 @@
只有支付完成的时
才显示兑换码
-->
<view wx:if="{{order.orderStatus==1&&order.type!=100&&order.type!=5}}" data-couponOrderStatus="{{order.couponOrderStatus}}" data-title="{{order.title}}" data-subtitle="{{order.subTitle}}" data-remark="{{order.remark}}" data-quancode="{{order.couponOrderId}}" data-validstatus="{{order.validStatus}}" bindtap="powerDrawer">
<view style="width:86%;clear: both;">
<text>兑换码</text>
<view wx:if="{{order.orderStatus==1&&order.type!=100&&order.type!=5}}" data-couponOrderStatus="{{order.couponOrderStatus}}" data-title="{{order.title}}" data-subtitle="{{order.subTitle}}" data-remark="{{order.remark}}" data-quancode="{{order.couponOrderId}}" data-validstatus="{{order.validStatus}}" bindtap="powerDrawer" class='dhCode'>
<view style="width:86%;clear: both;" >
<text class="fl">兑换码</text>
<text class="fr" wx:if="{{order.validStatus!=0}}">{{order.couponOrderId}}</text>
</view>
<view>
<image class="spcode" src="{{spcodeUrl}}" mode='widthFix'></image>
<image class="rArrow" src="{{rDetailUrl}}" mode='widthFix'></image>
</view>
</view>
<view>
<!-- <view>
<text>下单时间</text>
<text class='fr'>{{createDate}}</text>
</view>

</view> -->
<view>
<text>订单编号</text>
<text>订单编号</text>
<text>{{order.orderNumber}}</text>
</view>
<view>
<!-- <view>
<text wx:if="{{order.type == 8}}">原价</text>
<text wx:if="{{order.type != 8}}">面额</text>
<text class="jine1" wx:if="{{order.unit==0}}">{{order.price/100}}元</text>
<text class="jine1" wx:if="{{order.unit==1}}">{{order.price/100}}小时</text>
</view>
</view> -->
<view>
<text>订单金额</text>
<text class="jine">{{order.payment/100}}元</text>
<text>实付金额:</text>
<text class='RMB'>¥</text>
<text class="jine">{{order.payment/100}}</text>
</view>
</view>
<view class='classifShop'>
<view class="clearfix" bindtap='showDoorList'>
<text>适用门店:</text>
<text>适用门店</text>
</view>
<view wx:if="{{order.merchantVoList.length>=1}}" wx:for="{{order.merchantVoList}}" wx:key="{{index}}">
<view class='merchantVoList'>


+ 93
- 45
pages/order/detail/index.wxss 查看文件

@@ -2,6 +2,7 @@
button::after{ border: none; }
page {
height: auto !important;
background: #F4F5F9;
}

.order {
@@ -18,68 +19,78 @@ page {

.tips {
width: 92%;
height: 120rpx;
height: 100rpx;
background: #2C8DFF;
color: #fff;
padding: 0 4%;
/* line-height: 88rpx; */
padding: 20rpx 4% 0;
}

.merchantName {
color: #666!important;
color: #3C3C3C!important;
margin-left: 160rpx;
font-size: 28rpx;
}

.tips view{
}
.tips view:nth-child(2) {
font-size: 32rpx;
padding-left: 16rpx;
float: left;
width: 100%;
}

.tips view:nth-child(1) {
width: 32rpx;
width: 100%;
height: 32rpx;
background: #fff;
border-radius: 50%;
color: #00c0ff;
line-height: 32rpx;
text-align: center;
/* display: inline-block; */
font-size: 28rpx;
}
.msg text{
width: 32rpx;
.msg text:nth-child(1){
width: 90%;
font-size: 28rpx;
float: left;
}

.msg text:nth-child(2){
font-size: 24rpx;
float: left;
margin-left: 35rpx;
}

.section {
margin-top: 2%;
/* margin-top: 2%; */
background: #FFFFFF;
}

.detail_msg {
width: 92%;
background: #fff;
display: flex;
margin: 0 4%;
margin-top: 30rpx;
padding-bottom: 30rpx;
margin-top: 10rpx;
padding-bottom: 42rpx;
border-bottom: 1rpx solid #eee;
}

.logo {
display: block;
width: 180rpx;
height: 180rpx;
width: 120rpx;
height: 120rpx;
border-radius: 16rpx;
}

.logo image {
width: 180rpx;
height: 180rpx;
width: 120rpx;
height: 120rpx;
border-radius: 16rpx;
}

.sectionTit{
padding-top: 30rpx;
width:92%;
margin:0 4%;
font-size: 30rpx;
color: #3C3C3C;
}
.info view:nth-child(1) {
display: flex;
justify-content: space-between;
@@ -135,40 +146,63 @@ page {
padding-left: 18rpx;
text-decoration: line-through;
}

.dhCode{
position: relative;
height: 96rpx;
line-height: 96rpx;
border-bottom: 1rpx solid #F4F5F9;
padding-left: 5%;
padding-right: 5%;
}
.classif {
width: 92%;
padding-left: 4%;
padding-right: 4%;
background: #FFFFFF;
width: 100%;
margin-top: 20rpx;
}
.classifShop{
background: #FFFFFF;
width: 100%;
margin-top: 20rpx;
}
.classifShop >view{
font-size: 28rpx;
color: #A6A6A6;
position: relative;
height: 150rpx;
line-height: 150rpx;
display: flex;
justify-content: space-between;
padding-left: 5%;
padding-right: 5%;
}
.classifShop >view:nth-child(1){
height: 88rpx!important;
line-height:94rpx;
}

.classif > view {
.classif > view:nth-child(2),.classif > view:nth-child(3){
position: relative;
height: 94rpx;
line-height: 94rpx;
display: flex;
justify-content: space-between;
padding-left: 5%;
padding-right: 5%;
/* border-bottom: 1rpx solid #eee; */
}

.classif > view text {
font-size: 30rpx;
}

.classif > view text:nth-child(2) {
color: #b8b8b8;
font-size: 30rpx;
margin-left:80rpx;
font-size: 28rpx;
color: #3C3C3C;
}
.classif > view text:nth-child(1) {
font-size: 28rpx;
color: #A6A6A6;
}

.classif > view:nth-child(1) {
display: block;
}

.classif > view:nth-child(1) text:nth-child(2) {
padding-left: 15rpx;
}

.classif > view:nth-child(3) view text:nth-child(2) {
padding-left: 15rpx;
}
@@ -179,11 +213,19 @@ page {

.spcode {
position: absolute;
right: 0;
right: 70rpx;
bottom: 0;
top: 0;
margin: auto;
width: 50rpx;
z-index: 1;
}
.rArrow{
position: absolute;
right: 0;
height:88rpx;
width: 380rpx;
margin: auto;
}

/*mask*/
@@ -296,10 +338,11 @@ radio {

.fl {
float: left;
color: #3C3C3C!important;
}

.fr {
float: right;
float: left;
}

.clearfix:after {
@@ -369,9 +412,14 @@ radio {
width: 350rpx;
height: 350rpx;
}

.RMB{
color: #FD782D !important;
font-size: 24rpx !important;
position: absolute;
right: 65rpx
}
.jine {
color: #f96563 !important;
color: #FD782D !important;
font-size: 36rpx !important;
font-weight: 400 !important;
}
@@ -427,7 +475,7 @@ radio {
}

.merchantVoList .tel {
width: 40rpx;
width: 76rpx;
position: absolute;
top: 0;
bottom: 0;
@@ -447,7 +495,7 @@ radio {
border-radius: 61rpx;
}
.merchantImgUrl{
width: 60rpx;
width: 120rpx;
position: absolute;
top: 0;
bottom: 0;


+ 1
- 1
pages/order/index/index.js 查看文件

@@ -5,7 +5,7 @@ let app = getApp();
const imgurl = require("../../../utils/imgurl");
Page({
data: {
dingdanUrl: imgurl.dingdan.url,
noOrdersUrl: imgurl.noOrders.url,
loadingUrl: imgurl.loading.url,
wmhome: imgurl.wmhome.url,
wmdiscount: imgurl.wmdiscount.url,


+ 3
- 3
pages/order/index/index.wxml 查看文件

@@ -7,8 +7,8 @@
<view wx:for='{{list}}' wx:if="{{list.length!=0}}" class='section' wx:key='{{index}}' >
<view class='detail_top'>
<view>
<image wx:if="{{item.orderStatus == 6 || item.orderStatus == 7 || item.orderStatus == 8 || item.orderStatus == 9}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image>
<image wx:if="{{item.orderStatus == 1&& item.type == 8}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image>
<!-- <image wx:if="{{item.orderStatus == 6 || item.orderStatus == 7 || item.orderStatus == 8 || item.orderStatus == 9}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image> -->
<!-- <image wx:if="{{item.orderStatus == 1&& item.type == 8}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image> -->
<text>{{item.title}}</text>
<text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text>
<text class='wait' wx:if="{{item.orderStatus==10}}">拼团中</text>
@@ -74,7 +74,7 @@
</view>
</view>
<view class="dingdan" wx:if="{{list.length==0}}">
<image src="{{dingdanUrl}}" mode="widthFix"></image>
<image src="{{noOrdersUrl}}" mode="widthFix"></image>
<text>您还没有相关订单</text>
<text>再忙,也要记得买点什么犒赏自己~</text>
</view>


+ 2
- 1
pages/orderquanma/index.json 查看文件

@@ -1,3 +1,4 @@
{
"navigationBarTitleText": "优惠券"
"navigationBarTitleText": "兑换码",
"navigationBarBackgroundColor": "#FD832D"
}

+ 1
- 1
pages/orderquanma/index.wxss 查看文件

@@ -1,6 +1,6 @@
@import "../../app.wxss";
page {
background: #02c0ff;
background:linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
}

.couponbg {


+ 8
- 0
utils/imgurl.js 查看文件

@@ -84,6 +84,10 @@ module.exports = {
'url': baseUrl + 'dingdan.png',
'name': ''
},
'noOrders': {
'url': baseUrl + 'noOrders.png',
'name': ''
},
'down-white': {
'url': baseUrl + 'down-white.png',
'name': ''
@@ -292,6 +296,10 @@ module.exports = {
'url': baseUrl + 'spcode.png',
'name': ''
},
'rDetail': {
'url': baseUrl + 'rDetail.png',
'name': ''
},
'spphone': {
'url': baseUrl + 'spphone.png',
'name': ''


正在加载...
取消
保存