@@ -4,8 +4,6 @@ | |||
"index/searchbar", | |||
"pages/index/index", | |||
"index/user", | |||
"pages/mainOrder/mainOrder", | |||
"pages/detailOrder/detailOrder", | |||
"pages/couponorder/index/index", | |||
"pages/couponorder/detail/index", | |||
"pages/coupon/detail/index", | |||
@@ -128,7 +128,7 @@ Component({ | |||
tt.requestSubscribeMessage({ | |||
tmplIds: tmplIds, | |||
success(res) { | |||
console.log("我重复订阅") | |||
console.log("我重复订阅",res) | |||
let _statue = null | |||
tmplIds.map((item, index) => { //判读用户是否点击了确定 | |||
if (res[item] == "accept") { | |||
@@ -139,11 +139,6 @@ Component({ | |||
Http.post({ | |||
url: config.api.wxMsg | |||
}).then(res => { | |||
tt.setStorageSync({ | |||
key: 'ifShowTab', | |||
data: true, | |||
}) | |||
console.log(res) | |||
}) | |||
return | |||
@@ -14,5 +14,6 @@ | |||
"navigationBarBackgroundColor": "#fff", | |||
"navigationBarTextStyle": "black", | |||
"navigationBarTitleText": "首页" | |||
} | |||
@@ -111,6 +111,7 @@ Page({ | |||
// }); | |||
}, | |||
onShow: function (options) { | |||
this.setData({ | |||
mouldType:app.globalData.mouldType | |||
}) | |||
@@ -958,6 +958,7 @@ Page({ | |||
url: config.api.checkPhoneStatus, | |||
data: {} | |||
}).then(res => { | |||
console.log(tt.canIUse('createOrder'),"版本号" ); | |||
// 发起砍价 | |||
if (discount == 'discount') { | |||
var data = { | |||
@@ -79,18 +79,14 @@ | |||
<text class='throgh' tt:if="{{data.unit==0&&data.type!=50&&data.type!=51}}">{{priceAndStockObj.price/100}}元</text> | |||
<text tt:if="{{data.unit==1&&data.type!=50&&data.type!=51}}">{{priceAndStockObj.price/100}}小时</text> | |||
<!-- <text class='rest' tt:if="{{data.autoRefund == 1}}"> | |||
<text class='time refound'><text class="use">过期不退款</text></text> | |||
</text> --> | |||
</view> | |||
<view class="fl" tt:if="{{data.type==8}}"> | |||
<text class="pri01">{{priceAndStockObj.salePrice/100}}</text> | |||
<text class='presslimit' tt:if="{{data.type==8}}"><text>{{data.pressLimitNum+'人可砍至底价'}}</text></text> | |||
<text class='throgh'>{{priceAndStockObj.price/100}}元</text> | |||
<!-- <text class='rest' tt:if="{{data.autoRefund == 1}}"> | |||
<text class='time refound'><text class="use">过期不退款</text></text> | |||
</text> --> | |||
</view> | |||
</view> | |||
@@ -99,37 +95,9 @@ | |||
<view class="sellBox"> {{'已售'+(priceAndStockObj.inventory-priceAndStockObj.remainInventory)+'|'+'库存'+priceAndStockObj.remainInventory}}</view> | |||
</view> | |||
<!-- <view class='rest' tt:if="{{data.validType==2}}">自领取之日起 | |||
<text class='time'>{{validDays}}</text>天内有效 | |||
<text class="use">(请在有效期内使用)</text> | |||
</view> | |||
<view class='rest' tt:if="{{data.validType==1&&data.type!=10}}"> | |||
<text class='time'>{{validStartDate}}至{{validEndDate}}</text> | |||
</view> | |||
<view class='rest' tt:if="{{data.type==5}}"> | |||
<text class='time'>当次有效</text> | |||
</view> --> | |||
<!-- <view class='rest' tt:if="{{data.type==1}}"> | |||
<text class='txt01'>使用条件:</text> | |||
<text class='time'>满{{data.usePriceStr}}元可用</text> | |||
</view> | |||
<view class='rest' tt:if="{{data.sendType!=3&&mouldType!=1}}"> | |||
<view class='quan'></view> | |||
<text class='time'>限购{{data.useLimitQuantity}}张</text> | |||
<text class='timess' tt:if='{{limitCondition==1}}'>(仅限新用户活动)</text> | |||
<text class='timess' | |||
tt:if='{{limitCondition==2&&(minLimit||minLimit==0)&&maxLimit}}'>({{minLimit}}-{{maxLimit}}成长值)</text> | |||
<text class='timess' tt:if='{{limitCondition==2&&minLimit&&!maxLimit}}'>(大于{{minLimit}}成长值)</text> | |||
<text class="restNum fr">剩余<text>{{data.remainInventory}}张</text></text> | |||
</view> --> | |||
</view> | |||
</view> | |||
<!-- 适用门店 --> | |||
<!-- <store merchantVoList="{{merchantVoList}}" tt:if="{{data.type!=12}}"></store> --> | |||
<!-- 券包子券样式 --> | |||
<!-- <view class="childText">购买须知</view> --> | |||
<view class="childBox"> | |||
<view class="childItem" tt:for="{{data.giftCouponList}}" bindtap="gochild" data-id="{{item.id}}" | |||
tt:key="{{index}}"> | |||
@@ -191,25 +159,25 @@ | |||
<text class='btnTxt'>首页</text> | |||
</button> | |||
<button bindtap="gotopay" disabled='{{showbutton}}' hover-class='active' class='buy' | |||
tt:if="{{data.type!=11&&data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100!=0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}"> | |||
tt:if="{{data.type!=11&&data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100!=0&&priceAndStockObj.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}"> | |||
<text class='txt'>{{priceAndStockObj.salePrice/100}}元</text>马上购买</button> | |||
<button tt:if="{{data.type==11&&data.remainInventory!=0}}" bindtap="gohome" | |||
<button tt:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" | |||
data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="2" | |||
class="home">配送到家 | |||
</button> | |||
<button tt:if="{{data.type==11&&data.remainInventory!=0}}" bindtap="gohome" | |||
<button tt:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" | |||
data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="1" | |||
class="arrive">到店自提 | |||
</button> | |||
<button bindtap="gotopay" disabled='{{showbutton}}' class='buy' | |||
tt:if="{{data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100==0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">免费领取</button> | |||
tt:if="{{data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100==0&&priceAndStockObj.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">免费领取</button> | |||
<button bindtap="gotopay" disabled='{{showbutton}}' class='buy' data-type='{{data.type}}' | |||
tt:if="{{data.type==51&&data.remainInventory!=0||data.type==50&&data.remainInventory!=0}}">马上兑换</button> | |||
tt:if="{{data.type==51&&priceAndStockObj.remainInventory!=0||data.type==50&&priceAndStockObj.remainInventory!=0}}">马上兑换</button> | |||
<button class='buy buyHr' disabled='true' | |||
tt:if="{{data.sendType!=3&&(data.remainInventory==0&&endtime!='活动已结束'||data.remainInventory==0&&data.type==8)}}">已售罄</button> | |||
tt:if="{{data.sendType!=3&&(priceAndStockObj.remainInventory==0&&endtime!='活动已结束'||priceAndStockObj.remainInventory==0&&data.type==8)}}">已售罄</button> | |||
<button class='buy' disabled='true' | |||
tt:if="{{data.remainInventory==0&&data.type==50||data.remainInventory==0&&data.type==51}}">已兑完</button> | |||
tt:if="{{priceAndStockObj.remainInventory==0&&data.type==50||priceAndStockObj.remainInventory==0&&data.type==51}}">已兑完</button> | |||
<button class='buy' disabled='true' tt:if="{{endtime=='活动已结束'&&data.activityStatus!=0}}">活动已结束</button> | |||
<button class='buy' disabled='true' tt:if="{{total_micro_second<=0&&data.activityStatus!=0}}">活动已结束</button> | |||
<button id='noBuy' disabled='true' tt:if="{{data.activityStatus==0}}">活动未开始</button> | |||
@@ -223,29 +191,29 @@ | |||
<view class="qsOriginal">¥{{priceAndStockObj.price/100}}</view> | |||
<button bindtap="gotopay" disabled='{{showbutton}}' hover-class='active' class='buyX' | |||
tt:if="{{data.type!=11&&data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100!=0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}"> | |||
tt:if="{{data.type!=11&&data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100!=0&&priceAndStockObj.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}"> | |||
马上购买</button> | |||
<button tt:if="{{data.type==11&&data.remainInventory!=0}}" bindtap="gohome" | |||
<button tt:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" | |||
data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="2" | |||
class="home">配送到家 | |||
</button> | |||
<button tt:if="{{data.type==11&&data.remainInventory!=0}}" bindtap="gohome" | |||
<button tt:if="{{data.type==11&&priceAndStockObj.remainInventory!=0}}" bindtap="gohome" | |||
data-couponchannelid="{{couponChannelId}}" data-couponid="{{couponId}}" data-shippingtype="1" | |||
class="arrive">到店自提 | |||
</button> | |||
<button bindtap="gotopay" disabled='{{showbutton}}' class='buyX' | |||
tt:if="{{data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100==0&&data.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">免费领取</button> | |||
tt:if="{{data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100==0&&priceAndStockObj.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}">免费领取</button> | |||
<button bindtap="gotopay" disabled='{{showbutton}}' class='buyX' data-type='{{data.type}}' | |||
tt:if="{{data.type==51&&data.remainInventory!=0||data.type==50&&data.remainInventory!=0}}">马上兑换</button> | |||
tt:if="{{data.type==51&&priceAndStockObj.remainInventory!=0||data.type==50&&priceAndStockObj.remainInventory!=0}}">马上兑换</button> | |||
<button class='buyX buyHr' disabled='true' | |||
tt:if="{{data.sendType!=3&&(data.remainInventory==0&&endtime!='活动已结束'||data.remainInventory==0&&data.type==8)}}">已售罄</button> | |||
tt:if="{{data.sendType!=3&&(priceAndStockObj.remainInventory==0&&endtime!='活动已结束'||priceAndStockObj.remainInventory==0&&data.type==8)}}">已售罄</button> | |||
<button class='buyX' disabled='true' | |||
tt:if="{{data.remainInventory==0&&data.type==50||data.remainInventory==0&&data.type==51}}">已兑完</button> | |||
tt:if="{{priceAndStockObj.remainInventory==0&&data.type==50||priceAndStockObj.remainInventory==0&&data.type==51}}">已兑完</button> | |||
<button class='buyX' disabled='true' tt:if="{{endtime=='活动已结束'&&data.activityStatus!=0}}">活动已结束</button> | |||
<button class='buyX' disabled='true' tt:if="{{total_micro_second<=0&&data.activityStatus!=0}}">活动已结束</button> | |||
<button id='buyX' disabled='true' tt:if="{{data.activityStatus==0}}">活动未开始</button> | |||
<!-- <view class="sell">已售出<span class="sellP">{{data.inventory-data.remainInventory}}</span>件</view> --> | |||
<!-- <view class="sell">已售出<span class="sellP">{{data.inventory-priceAndStockObj.remainInventory}}</span>件</view> --> | |||
<button class="serviceBox" open-type="contact"> | |||
<view class="fuwuLogoBox f" > | |||
<image class="itemLogo" src="../../../assets/images/service1.png" /> | |||
@@ -255,7 +223,7 @@ | |||
</form> | |||
</view> | |||
<view tt:if="{{data.remainInventory!=0&&data.type==8}}" class="btns clearfix" hover-class="none" | |||
<view tt:if="{{priceAndStockObj.remainInventory!=0&&data.type==8}}" class="btns clearfix" hover-class="none" | |||
hover-stop-propagation="false"> | |||
<button class='goback' bindtap='goback'> | |||
<image src='{{homeSelectedO}}' mode="widthFix"></image> | |||
@@ -1,205 +0,0 @@ | |||
const app = getApp() | |||
const navigationBarHeight = (getApp().statusBarHeight + 50) + "px" | |||
const Http = require("../../utils/HttpBasics"); | |||
let config = require("../../config/config.js"); | |||
const util = require("../../utils/util") | |||
Page({ | |||
data: { | |||
navigationBarHeight, | |||
ifPay:true, | |||
orderId:"", | |||
detailObj:{}, | |||
createDate:"", | |||
mystatus: '', | |||
}, | |||
updetail(){ | |||
Http.get({ | |||
url:config.api.orderDetail, | |||
data:{ | |||
orderId: this.data.orderId | |||
} | |||
}).then(res=>{ | |||
console.log(res); | |||
let createDate = util.formatTime(res.data.createDate, "yyyy-MM-dd hh:mm:ss"); | |||
this.setData({ | |||
detailObj:res.data, | |||
createDate: createDate | |||
}) | |||
}).catch(err => { | |||
tt.showToast({ | |||
title: err.message ? err.message : err.data, // 内容 | |||
icon: "none" | |||
}); | |||
}) | |||
}, | |||
/** | |||
* 支付订单更新 | |||
*/ | |||
payOrderUpdate(orderId, payOrderId, status, reason, type, _this, composeOrderType) { | |||
let that = this; | |||
Http.post({ | |||
url: config.api.payOrderUpdate, | |||
data: { | |||
payOrderId: payOrderId, | |||
composeOrderId: orderId, | |||
status: status, | |||
reason: reason | |||
} | |||
}).then(res => { | |||
tt.hideLoading(); | |||
if(!type&&type!="free"){ | |||
tt.showToast({ | |||
title: "购买成功", | |||
duration: 2000, | |||
mask: false, | |||
success: function () { | |||
tt.showLoading({ | |||
title: "加载中..." | |||
}); | |||
setTimeout(function () { | |||
tt.hideLoading(); | |||
}, 1600); | |||
setTimeout(() => { | |||
let url = "" | |||
if (_this.data.orderFlag){ | |||
tt.redirectTo({ | |||
url: `/pages/detailOrder/detailOrder?orderId=${orderId}&dingdan=order` | |||
}); | |||
}else{ | |||
tt.redirectTo({ | |||
url: `/pages/detailOrder/detailOrder?orderId=${orderId}` | |||
}); | |||
} | |||
}, 1600); | |||
} | |||
}); | |||
} else if (type == 'free'){ | |||
tt.redirectTo({ | |||
url: `/pages/detailOrder/detailOrder?orderId=${orderId}` | |||
}); | |||
} | |||
}).catch(err => { | |||
console.log(err); | |||
if (!type) { | |||
setTimeout(function () { | |||
_this.payOrderUpdate(orderId, payOrderId, status, reason, type, _this, composeOrderType); | |||
}, 2000) | |||
} | |||
}) | |||
}, | |||
powerDrawer: function (e) { | |||
let that = this; | |||
console.log(e) | |||
// couponOrderStatus | |||
// 0 未使用 | |||
// 1 已使用 | |||
// 2 已过期 | |||
// 3 已经退款 | |||
if (that.data.mystatus == "" || that.data.mystatus == undefined) { | |||
tt.navigateTo({ | |||
url: `/pages/orderquanma/orderquanma?quancode=${ | |||
e.currentTarget.dataset.quancode | |||
}&title=${e.currentTarget.dataset.title}&subtitle=${ | |||
e.currentTarget.dataset.subtitle | |||
}&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${ | |||
e.currentTarget.dataset.couponorderstatus}&validstatus=${e.currentTarget.dataset.validstatus} | |||
&contentType=${that.data.contentType}` | |||
}); | |||
} else { | |||
tt.navigateTo({ | |||
url: `/pages/orderquanma/orderquanma?quancode=${ | |||
e.currentTarget.dataset.quancode | |||
}&title=${e.currentTarget.dataset.title}&subtitle=${ | |||
e.currentTarget.dataset.subtitle | |||
}&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${ | |||
that.data.mystatus}&validstatus=${e.currentTarget.dataset.validstatus} | |||
&contentType=${that.data.contentType}` | |||
}); | |||
} | |||
}, | |||
gotopay() { | |||
let that = this; | |||
Http.get({//判断是否授权抖音 | |||
url: config.api.checkPhoneStatus, | |||
}).then(res => { | |||
Http.post({ | |||
url: config.api.payOrderCreate, | |||
data: { | |||
orderId: that.data.detailObj.id, | |||
composeOrderType: that.data.detailObj.composeOrderType | |||
} | |||
}).then(payres => { | |||
tt.hideLoading(); | |||
tt.pay({ | |||
service: 5, | |||
orderInfo: { | |||
order_id: payres.data.orderId, | |||
order_token: payres.data.token, | |||
}, | |||
success(suRes) { | |||
if(suRes.code==0){ | |||
tt.showLoading({ | |||
title: '订单正在处理中...', | |||
}) | |||
that.payOrderUpdate(that.data.detailObj.id,payres.data.outOrderNo,1,"","",that,that.data.detailObj.composeOrderType) | |||
} else if (res.code === 1) { | |||
tt.showToast({ | |||
title: '支付超时', // 内容 | |||
icon: "none" | |||
}); | |||
} else if (res.code === 2) { | |||
tt.showToast({ | |||
title: '支付失败', // 内容 | |||
icon: "none" | |||
}); | |||
} else if (res.code === 3) { | |||
tt.showToast({ | |||
title: '支付关闭', // 内容 | |||
icon: "none" | |||
}); | |||
} else if (res.code === 4) { | |||
tt.showToast({ | |||
title: '支付取消', // 内容 | |||
icon: "none" | |||
}); | |||
} else if (res.code === 9) { | |||
tt.showToast({ | |||
title: '订单状态开发者自行获取', // 内容 | |||
icon: "none" | |||
}); | |||
} | |||
}, | |||
fail(res) { | |||
console.log(123); | |||
// handle fail | |||
}, | |||
}) | |||
}).catch(err => { | |||
tt.showToast({ | |||
title: err.message ? err.message : err.data, // 内容 | |||
icon: "none" | |||
}); | |||
}) | |||
}) | |||
// .catch(err => { | |||
// if (err.code == 11005) { | |||
// this.setData({ | |||
// showPhoem: true | |||
// }) | |||
// } | |||
// }) | |||
}, | |||
onLoad: function (options) { | |||
console.log(options.orderId); | |||
this.setData({ | |||
orderId:options.orderId | |||
}) | |||
this.updetail() | |||
} | |||
}) |
@@ -1,9 +0,0 @@ | |||
{ | |||
"navigationBarTitleText": "订单详情", | |||
"navigationBarBackgroundColor": "#fff", | |||
"navigationBarTextStyle": "black", | |||
"usingComponents": { | |||
"navbar": "../../components/navbar/navbar", | |||
"store":"../../components/store/index" | |||
} | |||
} |
@@ -1,57 +0,0 @@ | |||
<view class="BoxBg"> | |||
<!-- <navbar back home text="订单详情" background='#fff' color="#000"></navbar> | |||
<view style="height:{{navigationBarHeight}} "></view> --> | |||
<view class="ifPay" tt:if="{{detailObj.orderStatus==1}}"> | |||
<image class='yueImg' src='../../assets/itemImg/succ.png' mode='widthFix'></image> | |||
<view class="statusPayText">支付成功</view> | |||
</view> | |||
<view class="hie" tt:elss></view> | |||
<view class="commodityBox"> | |||
<view class="commodityTitle">{{detailObj.title}}</view> | |||
<view class="imgNanText"> | |||
<!-- <view class="commodityImgBox"></view> --> | |||
<image class='commodityImgBox' src='{{detailObj.coverImg}}' mode='widthFix'></image> | |||
<view class="commodityData"> | |||
<view class="commodityName">{{createDate}}</view> | |||
</view> | |||
</view> | |||
</view> | |||
<view class="orderBox" tt:if="{{detailObj.orderStatus==1}}" bindtap="powerDrawer" data-couponOrderStatus="{{detailObj.couponOrderStatus}}" data-title="{{detailObj.title}}" data-subtitle="{{detailObj.subTitle}}" data-remark="{{detailObj.remark}}" data-quancode="{{detailObj.couponOrderId}}" | |||
data-validstatus="{{detailObj.validStatus}}"> | |||
<view class="rqBox"> | |||
<view class="text">兑换码:</view> | |||
<view class="rqCode">{{detailObj.couponOrderId}}</view> | |||
<image class="goQr" src="../../assets/itemImg/chevron.png" mode='widthFix'></image> | |||
<image class="rqImg" src="../../assets/itemImg/spcode.png" mode='widthFix'></image> | |||
</view> | |||
</view> | |||
<view class="orderNumBox"> | |||
<view class="orderNum"> | |||
<view class="numText">订单编号:</view> | |||
<view class="num">{{detailObj.orderNumber}}</view> | |||
</view> | |||
</view> | |||
<view class="orderNumBox1"> | |||
<view class="orderNum"> | |||
<view class="numText">实付金额:</view> | |||
<view class="money">{{detailObj.payment/100}}元</view> | |||
<view class="moneyiIcn">¥</view> | |||
</view> | |||
</view> | |||
<!-- <view class="orderNumBox1"> | |||
<view class="shop">适用门店</view> | |||
<view class="shopbox"> | |||
<view class="shopImg"></view> | |||
<view class="shopDetailsBox"> | |||
<view class="shopName">百利</view> | |||
<view class="floor">A座一层--A2827</view> | |||
</view> | |||
<view class="phoneImg"></view> | |||
</view> | |||
</view> --> | |||
<store merchantVoObj="{{detailObj.merchantVoList[0]}}"></store> | |||
<view class="payBtn" tt:if="{{detailObj.orderStatus==0&&detailObj.salePrice!=0}}" bindtap="gotopay">立即支付</view> | |||
</view> |
@@ -1,186 +0,0 @@ | |||
/* d:\fumaolianke\ttFmC\tt富茂C\pages\detailOrder\detailOrder.ttss */ | |||
.ifPay{ | |||
background-color:#2c8dff; | |||
overflow: hidden; | |||
color: #fff; | |||
} | |||
.yueImg{ | |||
float: left; | |||
width: 40rpx; | |||
height: 40rpx; | |||
/* background-color: #fff; */ | |||
margin: 20rpx; | |||
} | |||
.statusPayText{ | |||
float: left; | |||
margin-top: 20rpx; | |||
font-size: 30rpx; | |||
/* font-family: PingFangSC-Regular; */ | |||
} | |||
.commodityBox{ | |||
background-color: #fff; | |||
/* margin-top: 20rpx; */ | |||
overflow: hidden; | |||
} | |||
.commodityTitle{ | |||
margin: 20rpx; | |||
font-size: 32rpx; | |||
} | |||
.imgNanText{ | |||
overflow: hidden; | |||
} | |||
.commodityImgBox{ | |||
margin: 20rpx; | |||
width: 140rpx; | |||
height: 140rpx; | |||
background-color: aqua; | |||
float: left; | |||
} | |||
.commodityData{ | |||
float: left; | |||
/* width: 520rpx; */ | |||
} | |||
.commodityName{ | |||
margin-top: 20rpx; | |||
font-size: 28rpx; | |||
} | |||
.commodityName::before{ | |||
content: "下单时间:"; | |||
font-size: 26rpx; | |||
color: #999; | |||
} | |||
.orderBox{ | |||
overflow: hidden; | |||
margin-top: 20rpx; | |||
background-color: #fff; | |||
overflow: hidden; | |||
border-bottom: 1rpx solid #f4f5f9; | |||
} | |||
.text{ | |||
margin: 20rpx; | |||
float: left; | |||
font-size: 30rpx; | |||
} | |||
.rqCode{ | |||
float: left; | |||
font-size: 30rpx; | |||
margin-top: 20rpx; | |||
} | |||
.rqImg{ | |||
float: right; | |||
width: 50rpx; | |||
height: 50rpx; | |||
/* background-color: aqua; */ | |||
margin-top: 20rpx; | |||
margin-right: 20rpx; | |||
} | |||
.goQr{ | |||
float: right; | |||
width: 20rpx; | |||
height: 20rpx; | |||
/* background-color: aqua; */ | |||
margin-top: 26rpx; | |||
margin-right: 40rpx; | |||
} | |||
.orderNumBox{ | |||
background-color: #fff; | |||
overflow: hidden; | |||
border-bottom: 1rpx solid #f4f5f9; | |||
} | |||
.orderNumBox1{ | |||
background-color: #fff; | |||
overflow: hidden; | |||
} | |||
.orderNum{ | |||
overflow: hidden; | |||
} | |||
.numText{ | |||
margin: 20rpx; | |||
float: left; | |||
font-size: 30rpx; | |||
color: #999; | |||
} | |||
.num{ | |||
float: right; | |||
font-size: 30rpx; | |||
margin-top: 20rpx; | |||
margin-right: 50rpx; | |||
} | |||
.moneyiIcn{ | |||
margin-top: 20rpx; | |||
color: #fd782d ; | |||
font-size: 22rpx; | |||
float: right; | |||
line-height: 44rpx; | |||
margin-right: 4rpx; | |||
} | |||
.money{ | |||
float: right; | |||
font-size: 30rpx; | |||
margin-top: 20rpx; | |||
margin-right: 50rpx; | |||
color: #fd782d ; | |||
} | |||
.shop{ | |||
margin: 20rpx; | |||
font-size: 32rpx; | |||
} | |||
.shopbox{ | |||
margin-top: 60rpx; | |||
overflow: hidden; | |||
} | |||
.shopImg{ | |||
margin-left: 20rpx; | |||
margin-bottom: 20rpx; | |||
width: 110rpx; | |||
height: 110rpx; | |||
background-color: #fd782d; | |||
float: left; | |||
} | |||
.shopDetailsBox{ | |||
float: left; | |||
margin-left: 20rpx; | |||
} | |||
.shopName{ | |||
margin-top: 10rpx; | |||
font-size: 32rpx; | |||
} | |||
.floor{ | |||
margin-top: 10rpx; | |||
font-size: 24rpx !important; | |||
color: #b8b8b8 !important; | |||
} | |||
.phoneImg{ | |||
margin-top: 20rpx; | |||
float:right; | |||
margin-right: 50rpx; | |||
width: 70rpx; | |||
height: 70rpx; | |||
border-radius: 50%; | |||
background-color: #fd782d; | |||
} | |||
.payBtn{ | |||
position: fixed; | |||
width: 90%; | |||
height: 80rpx; | |||
left: 5%; | |||
line-height: 80rpx; | |||
text-align: center; | |||
color: #fff; | |||
background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%); | |||
font-size: 32rpx; | |||
border-radius: 50rpx; | |||
bottom: 5%; | |||
} | |||
.hie{ | |||
height: 20rpx; | |||
} | |||
@@ -12,7 +12,7 @@ Page({ | |||
noDataFlag: false, | |||
businePageNum: 1, | |||
businessData: null, | |||
// Lsit:[] | |||
Lsit:[], | |||
}, | |||
getCouponChannelList(key) { | |||
if (app.globalData.token) { | |||
@@ -157,7 +157,7 @@ Page({ | |||
//获取券列表的价格和库存(列表接口有缓存通过这个来获取) str 列表数组里面的所有id | |||
getPriceAndStock(str) { | |||
return | |||
console.log(str); | |||
Http.get({ | |||
url: config.api.batchCouponPriceAndStock, | |||
@@ -2,7 +2,7 @@ | |||
<!-- <view style="height:{{navigationBarHeight}};line-height: {{navLineHeight}}; " class="title">直播商品</view> --> | |||
<!-- <view style="height:{{navigationBarHeight}};"></view> --> | |||
<view class="LsitBox" > | |||
<view tt:for="{{businessData}}" bindtap="goDetail" data-couponid="{{item.couponId}}" data-id="{{item.id}}" class="wBox"> | |||
<view tt:for="{{Lsit}}" bindtap="goDetail" data-couponid="{{item.couponId}}" data-id="{{item.id}}" class="wBox"> | |||
<view class="itemBox"> | |||
<view class="imgBox"> | |||
@@ -20,12 +20,13 @@ | |||
<view class="throgh">{{item.priceStr}}元</view> | |||
<view class="discount1" tt:if="{{item.salePriceStr!=0}}">{{item.discount}}折</view> | |||
</view> | |||
<!-- <view class="progressBox"> | |||
<view class="progressBox"> | |||
<view class="schedule" style="width:{{item.percent}};"></view> | |||
<view class="scheduleText">已售{{item.sale}}份</view> | |||
</view> --> | |||
</view> | |||
<!-- <view class="discount">享{{item.discount}}折</view> --> | |||
<view class="goPay">{{item.salePriceStr!=0?"立即抢购":"免费领取"}}</view> | |||
<view class="goPay" tt:if="{{item.remainInventory!=0}}">{{item.salePriceStr!=0?"立即抢购":"免费领取"}}</view> | |||
<view class="noPay" tt:if="{{item.remainInventory==0}}">已售空</view> | |||
</view> | |||
</view> | |||
</view> | |||
@@ -60,21 +60,21 @@ | |||
.titleName{ | |||
color: #402e1e; | |||
font-family: "PingFangSC-Regular"; | |||
font-weight: 600; | |||
font-weight: 700; | |||
width: 100%; | |||
font-size: 28rpx; | |||
font-size: 26rpx; | |||
display: -webkit-box; | |||
-webkit-line-clamp: 1; | |||
-webkit-box-orient: vertical; | |||
overflow: hidden; | |||
text-overflow: ellipsis; | |||
margin: 20rpx 0 0 0; | |||
margin: 16rpx 0 0 0; | |||
/* height: 80rpx; */ | |||
} | |||
.subTitleC{ | |||
color: #402e1e; | |||
font-size: 24rpx; | |||
margin: 6rpx 0 0 0; | |||
font-size: 20rpx; | |||
/* margin: 6rpx 0 0 0; */ | |||
display: -webkit-box; | |||
-webkit-line-clamp: 1; | |||
-webkit-box-orient: vertical; | |||
@@ -83,8 +83,8 @@ | |||
} | |||
.subTitle{ | |||
color: #a6a6a6; | |||
font-size: 24rpx; | |||
margin: 6rpx 0 0 0; | |||
font-size: 20rpx; | |||
/* margin: 6rpx 0 0 0; */ | |||
display: -webkit-box; | |||
-webkit-line-clamp: 1; | |||
-webkit-box-orient: vertical; | |||
@@ -93,17 +93,17 @@ | |||
} | |||
.priceBox{ | |||
overflow: hidden; | |||
margin-top: 6rpx; | |||
margin-bottom: 10rpx; | |||
margin-top: 4rpx; | |||
/* margin-bottom: 10rpx; */ | |||
} | |||
.rmb{ | |||
color: #d5af67; | |||
font-size: 24rpx; | |||
font-size: 22rpx; | |||
line-height: 40rpx; | |||
float: left; | |||
} | |||
.pri01{ | |||
font-size: 28rpx; | |||
font-size: 26rpx; | |||
color: #d5af67; | |||
letter-spacing: 0; | |||
line-height: 40rpx; | |||
@@ -114,30 +114,29 @@ | |||
text-decoration: line-through; | |||
margin-left: 10rpx; | |||
color: #999 !important; | |||
line-height: 40rpx; | |||
font-size: 24rpx; | |||
line-height: 38rpx; | |||
font-size: 22rpx; | |||
float: left; | |||
} | |||
.progressBox{ | |||
height: 30rpx; | |||
height: 26rpx; | |||
width: 240rpx; | |||
overflow: hidden; | |||
border-radius: 20rpx; | |||
background-color: #d8d8d8; | |||
margin-top: 16rpx; | |||
margin-top: 4rpx; | |||
position: relative; | |||
} | |||
.schedule{ | |||
float: left; | |||
height: 30rpx; | |||
height: 26rpx; | |||
border-radius: 20rpx; | |||
text-align: center; | |||
color: #fff; | |||
height: 30rpx; | |||
font-size: 24rpx; | |||
background-color: #d5af67; | |||
} | |||
.scheduleText{ | |||
line-height: 26rpx; | |||
position: absolute; | |||
top: 0; | |||
left: 20rpx; | |||
@@ -153,7 +152,7 @@ | |||
} | |||
.discount1{ | |||
float: left; | |||
font-size: 20rpx; | |||
font-size: 18rpx; | |||
border: #d5af67 1px solid; | |||
color: #d5af67; | |||
border-radius: 20rpx; | |||
@@ -173,6 +172,18 @@ | |||
padding: 12rpx 16rpx; | |||
border-radius: 40rpx; | |||
} | |||
.noPay{ | |||
position: absolute; | |||
bottom: 6rpx; | |||
right: 0rpx; | |||
background-color: #a6a6a6; | |||
color: #fff; | |||
font-size: 24rpx; | |||
text-align: center; | |||
line-height: 28rpx; | |||
padding: 12rpx 16rpx; | |||
border-radius: 40rpx; | |||
} | |||
.noDet{ | |||
text-align: center; | |||
line-height: 40rpx; | |||
@@ -1,125 +0,0 @@ | |||
const app = getApp() | |||
const navigationBarHeight = (getApp().statusBarHeight + 50) + "px" | |||
const Http = require("../../utils/HttpBasics"); | |||
let config = require("../../config/config.js"); | |||
const util = require("../../utils/util") | |||
Page({ | |||
data: { | |||
navigationBarHeight, | |||
boatLsit:[ | |||
{ | |||
name:"全部", | |||
value:"all" | |||
}, | |||
{ | |||
name:"待付款", | |||
value:"0" | |||
}, | |||
{ | |||
name:"已完成", | |||
value:"1" | |||
}, | |||
], | |||
boatFlag:"all", | |||
content:"", | |||
loading: false, //"上拉加载"的变量,默认false,隐藏 | |||
pageNum:1, | |||
allow_load: true, | |||
list:[] | |||
}, | |||
setBoatFlag(e){ | |||
let index = e.currentTarget.dataset.index | |||
console.log(index); | |||
this.setData({ | |||
boatFlag:index, | |||
pageNum:1, | |||
allow_load: true, | |||
}) | |||
this.getList() | |||
}, | |||
getList(){ | |||
let that = this | |||
if (that.data.allow_load) { | |||
that.setData({ | |||
loading: true, | |||
content: '小主,我在玩命加载中...' | |||
}) | |||
Http.get({ | |||
url:config.api.orderList, | |||
data:{ | |||
pageNum:that.data.pageNum, | |||
pageSize: 10, | |||
orderStatus:that.data.boatFlag=="all"?"":that.data.boatFlag, | |||
paymentType: 0, | |||
} | |||
}).then(res=>{ | |||
if(that.data.pageNum==1){ | |||
that.setData({ | |||
list: [] | |||
}) | |||
} | |||
let tempArr= that.data.list | |||
tempArr.map(item=>{ | |||
item.createDate = util.formatTime(item.createDate, "yyyy-MM-dd hh:mm:ss"); | |||
}) | |||
if(that.data.pageNum>=res.data.pages){ | |||
that.setData({ | |||
allow_load: false | |||
}) | |||
} | |||
if(that.data.pageNum>1){//分页 | |||
that.setData({ | |||
list:[...tempArr ,...res.data.list], | |||
loading:false | |||
}) | |||
}else{ | |||
let tempLsit = res.data.list | |||
tempLsit.map(item=>{ | |||
item.createDate = util.formatTime(item.createDate, "yyyy-MM-dd hh:mm:ss"); | |||
}) | |||
that.setData({ | |||
list: tempLsit, | |||
loading:false | |||
}) | |||
} | |||
}).catch(err => { | |||
that.setData({ | |||
loading:false | |||
}) | |||
tt.showToast({ | |||
title: err.message ? err.message : err.data, // 内容 | |||
icon: "none" | |||
}); | |||
}) | |||
}else { | |||
that.setData({ | |||
loading: true, | |||
content: "——— 再拉裤子就掉了啦 ———" | |||
}) | |||
setTimeout(function () { | |||
that.setData({ | |||
loading: false, | |||
}) | |||
}, 1400) | |||
} | |||
}, | |||
onLoad: function (options) { | |||
// this.getList() | |||
}, | |||
onReachBottom(){//触底 | |||
console.log(111); | |||
this.setData({ | |||
pageNum:this.data.pageNum+1 | |||
}) | |||
this.getList() | |||
}, | |||
onShow:function(){ | |||
this.getList() | |||
} | |||
}) |
@@ -1,8 +0,0 @@ | |||
{ | |||
"navigationBarBackgroundColor": "#fff", | |||
"navigationBarTextStyle": "black", | |||
"navigationBarTitleText": "我的订单", | |||
"usingComponents": { | |||
"navbar": "../../components/navbar/navbar" | |||
} | |||
} |
@@ -1,64 +0,0 @@ | |||
<view class="BoxBg"> | |||
<!-- <navbar back home text="我的订单" background='#fff' color="#000"></navbar> | |||
<view style="height:{{navigationBarHeight}} "></view> --> | |||
<view class="boatBoxf" style="top:{{navigationBarHeight}}" > | |||
<view class="boatBox" > | |||
<view class="boatItemBox" tt:for="{{boatLsit}}" tt:key="index" bindtap="setBoatFlag" data-index="{{item.value}}"> | |||
<view class="{{boatFlag==item.value?'boatTitleA':'boatTitle'}}">{{item.name}}</view> | |||
<view class="boatA" tt:if="{{boatFlag==item.value}}"></view> | |||
</view> | |||
</view> | |||
</view> | |||
<view style="height:96rpx "></view> | |||
<view class="orderListBox" tt:for="{{list}}" tt:key="{{index}}"> | |||
<view class="titleBox"> | |||
<view class="orderName">{{item.title}}</view> | |||
<!-- <view class="payStatus">已支付</view> --> | |||
<text class='wait' tt:if="{{item.orderStatus==0}}">等待付款</text> | |||
<!-- <text class='wait' tt:if="{{item.orderStatus==10}}">拼团中</text> --> | |||
<text class='sucess' tt:if="{{item.orderStatus==3}}">待退款</text> | |||
<text class='close' tt:if="{{item.orderStatus==2}}">交易关闭</text> | |||
<!-- <text class='close' tt:if="{{item.orderStatus==6}}">砍价中</text> --> | |||
<!-- <text class='sucess' tt:if="{{item.orderStatus==7}}">砍价成功</text> --> | |||
<!-- <text class='close' tt:if="{{item.orderStatus==8}}">砍价失败</text> --> | |||
<!-- <text class='close' tt:if="{{item.orderStatus==9}}">砍价取消</text> --> | |||
<!-- <text class='close' tt:if="{{item.orderStatus==12}}">拼团已过期</text> --> | |||
<!-- <text class='close' tt:if="{{item.orderStatus==12}}">拼团失败</text> --> | |||
<!-- <text class='close' tt:if="{{item.orderStatus==8}}">砍价失败</text> --> | |||
<text class='close' tt:if="{{item.orderStatus==4}}">已退款</text> | |||
<text class='wait' tt:if="{{item.orderStatus==5}}">退款失败</text> | |||
<!-- <text class='sucess' tt:if="{{item.orderStatus==11}}">拼团成功</text> --> | |||
<text class='sucess' tt:if="{{item.orderStatus==1&&item.salePrice==0&&item.type!=50&&item.type!=51}}">免费领取</text> | |||
<!-- <text class='sucess' tt:if="{{item.orderStatus==1&&item.salePrice==0&&(item.type==50||item.type==51)}}">积分兑换</text> --> | |||
<text class='sucess' tt:if="{{item.orderStatus==1&&item.salePrice!=0}}">付款成功</text> | |||
<!-- <view class="stayPay">待支付</view> --> | |||
</view> | |||
<view class="orderDetail"> | |||
<view class="orderImgBox"> | |||
<image mode="aspectFill" style="width: 100%; height:100%;border-radius: 12rpx;" src="{{item.coverImg}}" /> | |||
</view> | |||
<view class="orderDataBox"> | |||
<view class="fTitle">{{item.subTitle}}</view> | |||
<view class="face">{{item.price/100}}元</view> | |||
<view class="creationDate">{{item.createDate}}</view> | |||
</view> | |||
</view> | |||
<view class="practicalPayBox"> | |||
<view class="practicalText">实付金额:</view> | |||
<view class="practicalPay">{{item.payment/100}}元</view> | |||
<navigator class="orderLook" tt:if="{{item.orderStatus==1||item.orderStatus==11}}" url="/pages/detailOrder/detailOrder?orderId={{item.id}}" hover-class="navigator-hover" open-type="navigate">去查看</navigator> | |||
<navigator class="goPay" tt:if="{{item.orderStatus==0 || item.orderStatus==7}}" url="/pages/detailOrder/detailOrder?orderId={{item.id}}" hover-class="navigator-hover" open-type="navigate">去支付</navigator> | |||
<!-- <view class="goPay">去支付</view> --> | |||
</view> | |||
</view> | |||
<view class="dingdan" tt:if="{{list.length==0}}"> | |||
<image src="../../assets/itemImg/noOrders.png" mode="widthFix"></image> | |||
<text>您还没有相关订单</text> | |||
<text>再忙,也要记得买点什么犒赏自己~</text> | |||
</view> | |||
<view class="loading" tt:if="{{loading}}"> | |||
<image src="../../assets/itemImg/loading.gif" mode="widthFix"></image>{{content}} | |||
</view> | |||
</view> |
@@ -1,221 +0,0 @@ | |||
.boatBox{ | |||
width: 100% !important; | |||
height: 96rpx; | |||
display: flex; | |||
justify-content: space-around; | |||
background-color: #fff; | |||
} | |||
.boatBoxf{ | |||
width: 100% !important; | |||
position: fixed; | |||
top: 0; | |||
left: 0; | |||
} | |||
.boatTitle{ | |||
font-size: 30rpx; | |||
text-align: center; | |||
height: 80rpx; | |||
line-height: 80rpx; | |||
color: #999; | |||
} | |||
.boatTitleA{ | |||
font-size: 32rpx; | |||
text-align: center; | |||
height: 80rpx; | |||
line-height: 80rpx; | |||
font-weight: 500; | |||
} | |||
.boatA{ | |||
width: 80rpx; | |||
height: 6rpx; | |||
background-color: #fb3e5c; | |||
margin: 0 auto; | |||
border-radius: 10rpx; | |||
} | |||
.orderListBox{ | |||
width: 100%; | |||
margin-top: 20rpx; | |||
background-color: #fff; | |||
} | |||
.titleBox{ | |||
overflow: hidden; | |||
font-size: 30rpx; | |||
} | |||
.orderName{ | |||
float: left; | |||
margin: 20rpx; | |||
} | |||
.payStatus{ | |||
float: right; | |||
margin: 20rpx; | |||
} | |||
.stayPay{ | |||
float: right; | |||
color: #FD832D; | |||
margin: 20rpx; | |||
} | |||
.orderDetail{ | |||
overflow: hidden; | |||
} | |||
.orderImgBox{ | |||
float: left; | |||
width: 140rpx; | |||
height: 140rpx; | |||
background-color: #fb3e5c; | |||
border-radius: 12rpx; | |||
margin-left: 20rpx; | |||
} | |||
.orderDataBox{ | |||
float: left; | |||
width: 520rpx; | |||
margin-left: 20rpx; | |||
font-size: 28rpx; | |||
} | |||
.fTitle{ | |||
height: 46rpx; | |||
height: 46rpx; | |||
} | |||
.face{ | |||
height: 46rpx; | |||
height: 46rpx; | |||
} | |||
.face::before{ | |||
content: "面额:"; | |||
font-size: 26rpx; | |||
color: #999; | |||
; | |||
} | |||
.creationDate{ | |||
height: 46rpx; | |||
height: 46rpx; | |||
} | |||
.creationDate::before{ | |||
content: "下单时间:"; | |||
font-size: 26rpx; | |||
color: #999; | |||
} | |||
.practicalPayBox{ | |||
/* height: 60rpx; */ | |||
overflow: hidden; | |||
line-height: 70rpx; | |||
font-size: 28rpx; | |||
border-top: #e6e6e6 1rpx solid; | |||
margin-top: 10rpx; | |||
} | |||
.practicalText{ | |||
font-size: 26rpx; | |||
float: left; | |||
margin-left: 20rpx; | |||
} | |||
.practicalPay{ | |||
color: #fb3e5c; | |||
float: left; | |||
font-size: 28rpx; | |||
} | |||
.orderLook{ | |||
float: right; | |||
margin-right: 20rpx; | |||
height: 50rpx; | |||
color: #fff; | |||
line-height: 50rpx; | |||
border-radius: 40rpx; | |||
background: linear-gradient(130deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%); | |||
margin-top: 10rpx; | |||
margin-bottom: 10rpx; | |||
padding: 0 20rpx; | |||
} | |||
.goPay{ | |||
float: right; | |||
margin-right: 20rpx; | |||
height: 50rpx; | |||
color: #fff; | |||
line-height: 50rpx; | |||
border-radius: 40rpx; | |||
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||
margin-bottom: 10rpx; | |||
margin-top: 10rpx; | |||
padding: 0 20rpx; | |||
} | |||
.loading { | |||
text-align: center; | |||
height: 80rpx; | |||
line-height: 80rpx; | |||
font-size: 26rpx; | |||
color: #999; | |||
} | |||
.loading image { | |||
width: 60rpx; | |||
height: 60rpx; | |||
vertical-align: middle; | |||
margin-right: 10rpx; | |||
} | |||
.dingdan { | |||
margin-top: 33rpx; | |||
} | |||
.dingdan text:nth-of-type(1) { | |||
display: block; | |||
font-size: 34rpx; | |||
color: #333; | |||
letter-spacing: 0; | |||
text-align: center; | |||
} | |||
.dingdan text:nth-of-type(2) { | |||
display: block; | |||
font-size: 28rpx; | |||
color: #999; | |||
letter-spacing: 0; | |||
text-align: center; | |||
} | |||
.dingdan image { | |||
display: block; | |||
width: 300rpx; | |||
height: 300rpx; | |||
margin: 0 auto 16rpx; | |||
} | |||
.wait{ | |||
display: inline-block; | |||
width: 123rpx !important; | |||
overflow: visible!important; | |||
font-size: 28rpx; | |||
color: #FD832D; | |||
letter-spacing: 0; | |||
text-align: right; | |||
line-height: 28rpx!important; | |||
float: right; | |||
margin: 20rpx; | |||
} | |||
.sucess { | |||
display: inline-block; | |||
width: 123rpx !important; | |||
/* overflow: hidden; */ | |||
font-family:PingFangSC-Regular; | |||
font-size: 28rpx; | |||
font-weight:400; | |||
color: #2C8DFF; | |||
letter-spacing: 0; | |||
text-align: right; | |||
line-height: 26px; | |||
float: right; | |||
margin: 20rpx; | |||
} | |||
.close { | |||
display: inline-block; | |||
width: 123rpx !important; | |||
overflow: hidden; | |||
font-size: 28rpx; | |||
color: #999; | |||
letter-spacing: 0; | |||
text-align: right; | |||
line-height: 28rpx; | |||
float: right; | |||
margin: 20rpx; | |||
} |
@@ -33,6 +33,15 @@ | |||
"scene": "990001", | |||
"launchFrom": "scan", | |||
"location": "qr_code" | |||
}, | |||
{ | |||
"id": 1653894805719, | |||
"name": "pages/main/index", | |||
"pathName": "pages/main/index", | |||
"query": "type=dt&orderId=1111", | |||
"scene": "990001", | |||
"launchFrom": "scan", | |||
"location": "qr_code" | |||
} | |||
] | |||
} | |||