zm/nuttyreading-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单发货相关调整

Browse Source
This commit is contained in:
@fawn-nine
2023-10-27 15:51:16 +08:00
parent cdc801e32f
commit 75b5c6ae0f
9 changed files with 23940 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/baseUrl.js
View File

@@ -6,10 +6,11 @@ if (process.env.NODE_ENV === 'development') {
// socketUrl = "ws://localhost:6001/"; // socketUrl = "ws://localhost:6001/";
// baseUrl = "https://twin-ui.com/demo/"; // baseUrl = "https://twin-ui.com/demo/";
// baseUrl = "http://59.110.212.44:9200/pb/"; // baseUrl = "http://59.110.212.44:9200/pb/";
// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境 baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
// baseUrl = "https://api.nuttyreading.com/"; // 线上正式 // baseUrl = "https://api.nuttyreading.com/"; // 线上正式
// baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑 // baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑
baseUrl = "http://192.168.110.38:9200/pb/"; // 吴春磊笔记本1 // baseUrl = "http://192.168.110.110:9200/pb/";
// baseUrl = "http://192.168.110.38:9200/pb/"; // 吴春磊笔记本1
// socketUrl = "ws://8.129.186.35:6001/"; // socketUrl = "ws://8.129.186.35:6001/";
} else if (process.env.NODE_ENV === 'production') { } else if (process.env.NODE_ENV === 'production') {
// 生产环境11 // 生产环境11

9
pages.json
View File

@@ -476,6 +476,15 @@
} }
} }
} }
,{
"path" : "pages/bookShop/deliverLIst",
"style" :
{
"navigationBarTitleText": "快递列表",
"enablePullDownRefresh": false
}
}
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",

136
pages/bookShop/deliverDetail.vue
View File

@@ -2,33 +2,35 @@
<view class=""> <view class="">
<view class="header"> <view class="header">
<!-- 顶部导航栏 --> <!-- 顶部导航栏 -->
<z-nav-bar title="物流详情" bgColor="red"></z-nav-bar> <z-nav-bar title="物流详情"></z-nav-bar>
</view> </view>
<view v-if="deliverList.length > 0"> <view v-if="deliverDetails.length > 0">
<u-tabs active-color="#2979ff" inactive-color="#606266" bar-height="6" bar-width="40" <!-- <u-tabs active-color="#2979ff" inactive-color="#606266" bar-height="6" bar-width="40"
name="name" :list="deliverList" :is-scroll="false" :current="current" @change="tabchange"></u-tabs> name="name" :list="deliverList" :is-scroll="false" :current="current" @change="tabchange"></u-tabs> -->
<view class="deliverCntent"> <view class="deliverCntent">
<view class="" v-for="(list, index1) in deliverDetails" :key="index1"> <view class="">
<view v-show="index1 == current">
<view class="kuaidiItem">{{list.ShipperName}} {{list.LogisticCode}} <u-tag @click="copyData(list.LogisticCode)" class="copyCode" text="复制" plain type="success" /></view> <view class="kuaidiItem">{{expressCompanyName}} {{expressOrderSn}}
<view class="item" v-for="(item, index) in list.Traces"> <u-tag @click="copyData(expressOrderSn)" class="copyCode" text="复制" plain type="success" /></view>
<view v-for="(item, index) in deliverDetails" :class="['item',index == 0 ? 'first':'' ]">
<view class="flexbox"> <view class="flexbox">
<view class="img_icon "></view> <view class="img_icon "></view>
<view class="wuliu"> <view class="wuliu">
<view class="time">{{item.AcceptTime}}</view> <view class="time">{{item.acceptTime}}</view>
<view class="content">{{item.AcceptStation}}</view> <view class="content">{{item.acceptStation}}</view>
</view> </view>
</view> </view>
</view> </view>
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="quesheng" v-else> <view class="quesheng" v-else>
<image src="../../static/icon/kongbai.png" ></image> <image src="../../static/icon/kongbai.png" ></image>
<text>- 暂无物流信息 -</text> <text>- 暂无物流信息 -</text>
</view> </view>
<music-play :playData="playData"></music-play> <music-play :playData="playData"></music-play>
<public-module></public-module>
<!-- <u-loading color="red" :show="loading"></u-loading> --> <!-- <u-loading color="red" :show="loading"></u-loading> -->
</view> </view>
</template> </template>
@@ -50,16 +52,30 @@
deliverDetails: [{ deliverDetails: [{
Traces: [] Traces: []
}], }],
express:{}, // 面单
consignee:{}, // 收件人信息
expressOrderSn:'', // 运单号
expressCompanyCode:'', //快递编码
expressCompanyName:'' ,// 快递公司
orderSn : '',
current: 0, current: 0,
deliverList: [], deliverList: [],
deliverDetailsLength: null deliverDetailsLength: null,
orderContet:{},
sheetList:[]
} }
}, },
onLoad(e) { onLoad(e) {
this.orderId = e.objId this.expressOrderSn = e.expressOrderSn
this.expressCompanyCode = e.expressCompanyCode
this.expressCompanyName = e.expressCompanyName
//this.express = e.express
//this.consignee = e.consignee
console.log(e,'传入的参数')
this.orderSn = e.orderSn
}, },
onShow() { onShow() {
this.getdeliverDetails() this.getOrderList()
}, },
computed: { computed: {
...mapState(['userInfo']), ...mapState(['userInfo']),
@@ -67,7 +83,60 @@
components:{ components:{
musicPlay musicPlay
}, },
methods: { methods: {
// 获取订单列表
getOrderList() {
console.log('this.orderType',this.orderType)
this.$http
// .get(`book/buyOrder/getOrderInfo?orderId=${this.orderID}`)
.get(`/book/buyOrder/orderDetail?orderSn=${this.orderSn}`)
.then(res => {
console.log('订单详情',res)
var seconds = res.result.timestamp + 30 * 60 + 2 // 过期时间
var nowSeconds = Math.floor(new Date().getTime() / 1000);
res.result.overTime = seconds - nowSeconds
this.orderContet = res.result
//this.userRecordid = res.userRecordid
this.productIDs = res.result.goodsList.map(item => {
return item.buyOrderProductId
})
// console.log(this.orderContet,'this.orderContet')
if (this.orderContet.orderStatus == 0) {
this.titleStat = '待支付'
} else if (this.orderContet.orderStatus == 1) {
this.titleStat = '待发货'
} else if (this.orderContet.orderStatus == 2) {
this.titleStat = '待收货'
} else if (this.orderContet.orderStatus == 3) {
this.titleStat = '已完成'
}
if(parseInt(this.orderContet.orderStatus) >= 2){
this.getdeliverDetails()
// 查询快递信息
// this.getSheetInfo()
}
console.log(this.orderContet,'订单详情')
})
},
// getSheetInfo(){
// console.log('查询快递信息')
// this.$http
// .get(`express/getPrintTemplateList?expressOrderSn=${this.orderSn}`)
// .then(res => {
// if(res.code == 0){
// this.sheetList = res.result.data
// console.log(res,'面单信息')
// this.getdeliverDetails()
// }
// }).catch(e => {
// console.log('e',e)
// })
// },
// 复制到剪切板 // 复制到剪切板
copyData(data){ copyData(data){
uni.setClipboardData({ uni.setClipboardData({
@@ -84,21 +153,30 @@
// 获取物流 // 获取物流
getdeliverDetails() { getdeliverDetails() {
this.deliverList = [] this.deliverList = []
var strLength = this.orderContet.consignee.consigneeMobile.length
var subMobile = this.orderContet.consignee.consigneeMobile.substring(strLength-4,strLength)
// this.expressOrderSn = 'SF1504651506851'
// this.expressCompanyCode = 'SF'
// subMobile = '9277'
uni.showLoading() uni.showLoading()
this.$http this.$http
.post(`/book/buyOrder/queryFMS?orderId=${this.orderId}`) //.post(`/book/buyOrder/queryFMS?orderId=${this.orderId}`)
.get(`/book/buyOrder/queryExpress?expressOrderSn=${this.expressOrderSn}&expressCompanyCode=${this.expressCompanyCode}&customerName=${subMobile}`)
.then(res => { .then(res => {
console.log(res, '物流信息') console.log(res, '物流信息')
if (res && res.code === 0) { if (res && res.code === 0) {
uni.hideLoading() uni.hideLoading()
this.deliverDetails = res.rntStr // this.deliverDetails = res.result.traces
// console.log(res.rntStr,'物流信息') console.log(res.result.traces,'物流信息')
res.rntStr.forEach((item, index) => { // res.rntStr.forEach((item, index) => {
item.Traces = item.Traces.reverse() this.deliverDetails = res.result.traces.reverse()
//console.log(item) // item.Traces = item.Traces.reverse()
this.deliverList.push({'name':item.ShipperName}) // //console.log(item)
}) // this.deliverList.push({'name':item.ShipperName})
// })
} }
}).catch(e => {
console.log(e,'e')
}) })
}, },
@@ -154,8 +232,7 @@
.item { .item {
padding-left: 10px; padding-left: 10px;
position: relative; position: relative;
} }
.item:before { .item:before {
display: inline-block; display: inline-block;
width: 10px; width: 10px;
@@ -173,18 +250,19 @@
font-size: 28rpx; font-size: 28rpx;
margin-bottom: 5px margin-bottom: 5px
} }
.first{
color: #55aa7f;
}
.content { .content {
padding-bottom: 14px; padding-bottom: 14px;
} }
} }
.flexbox { .flexbox {
display: flex; display: flex;
} }
.img_icon { .img_icon {
padding-right: 5px; padding-right: 30rpx;
} }
.moreBtnF { .moreBtnF {

22
pages/bookShop/deliverLIst.vue Normal file
View File

@@ -0,0 +1,22 @@
<template>
<view>
快递列表页面
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>

211
pages/bookShop/orderLCont.vue
View File

@@ -2,46 +2,39 @@
<view class=""> <view class="">
<!-- 公共组件-每个页面必须引入 --> <!-- 公共组件-每个页面必须引入 -->
<public-module></public-module> <public-module></public-module>
<z-nav-bar :title="titleStat"></z-nav-bar> <z-nav-bar title="订单详情"></z-nav-bar>
<!-- <view class="deliverCntent" v-if="orderType == 2"> <view class="adDefault" v-if="consigneeShow">
<view v-if="deliverDetails">
<view v-for="(item, index) in deliverDetails[0].Traces">
<view class="flexbox" v-if="index == 0">
<view class="img_icon "><img width="20px" src="../../static/icon/icon-truck.svg" alt=""></view>
<view class="wuliu">
<view class="content">{{item.AcceptStation}}</view>
<view class="time">{{item.AcceptTime}}</view>
</view>
</view>
</view>
</view>
</view> -->
<view class="adDefault" v-if="orderContet.products!=''">
<view class="defalTop"> <view class="defalTop">
<text class="userName"> <text class="userName">
{{orderContet.shippingUser}} {{orderContet.consignee.consigneeName}}
</text> </text>
<text class="userTel"> <text class="userTel">
{{orderContet.userPhone}} {{orderContet.consignee.consigneeMobile}}
</text> </text>
</view> </view>
<view class="defalBottom"> <view class="defalBottom">
<text class="userAddress"> <text class="userAddress">
{{orderContet.province}} {{orderContet.city}} {{orderContet.district}} {{orderContet.address}} {{orderContet.consignee.province}} {{orderContet.consignee.city}} {{orderContet.consignee.county}} {{orderContet.consignee.address}}
</text> </text>
</view> </view>
<u-icon name="map" color="#aaa" size="25" class="defalLeft"></u-icon> <u-icon name="map" color="#aaa" size="25" class="defalLeft"></u-icon>
</view> </view>
<view class="orderList"> <view class="orderList" v-if="consigneeShow">
<view class="" v-if="sheetList.length > 1" style="background-color: rgb(113, 213, 161); margin-bottom: 20rpx; border-radius: 20rpx; color: #fff; font-size: 28rpx; padding: 10rpx;">
订单已被拆分成 {{sheetList.length}} 个包裹
</view>
<view class="orderItem"> <view class="orderItem">
<!-- <view class="guoqi flexbox" v-if="orderContet.orderStatus==0 && orderContet.overTime > 0"> <view class="" style="position: relative; height: 120rpx;">
<text>剩余支付时间：</text> <text class="orderState orderState0" v-if="orderContet.orderStatus==0">待支付</text>
<uni-countdown background-color="#ff5500" color="#ffffff" :font-size="14" :show-day="false" :hour="0" :minute="0" :second="orderContet.overTime" @timeup="countDown"></uni-countdown> <text class="orderState orderState1" v-if="orderContet.orderStatus==1">待发货</text>
</view> --> <text class="orderState orderState2" v-if="orderContet.orderStatus==2">待收货</text>
<view class="orderContent" v-for="(item,index) in orderContet.products" :key="index" <text class="orderState orderState3" v-if="orderContet.orderStatus==3">已完成</text>
@click="goDetail(item.productId)" v-if="orderContet.products!=''"> <text class="orderState orderState5" v-if="orderContet.orderStatus==5">已超时</text>
<image :src="item.image" mode=""></image> </view>
<view class="orderContent" v-for="(item,index) in orderContet.goodsList" :key="index"
@click="goDetail(item.productId)" v-if="orderContet.goodsList.length > 0">
<image :src="item.productImage" mode=""></image>
<view class="itemJian"> <view class="itemJian">
<view class="orderTitle"> <view class="orderTitle">
<text>{{item.productName}}</text> <text>{{item.productName}}</text>
@@ -53,6 +46,7 @@
</view> </view>
<br clear="both"> <br clear="both">
</view> </view>
<!-- <view class="orderOper" v-if="orderContet.orderStatus=='3'"> --> <!-- <view class="orderOper" v-if="orderContet.orderStatus=='3'"> -->
<view class="orderOper" v-if="item.orderStatus == 3"> <view class="orderOper" v-if="item.orderStatus == 3">
<view style="width: 100%; text-align: right;"> <view style="width: 100%; text-align: right;">
@@ -78,19 +72,20 @@
</view> </view>
<view class="orderallpri"> <view class="orderallpri">
<span style="color: #666;margin-right: 10rpx;float: left;">商品总价 : </span> <span style="color: #666;margin-right: 10rpx;float: left;">商品总价 : </span>
<span>￥</span>{{orderContet.orderMoney}} <span>￥</span>{{orderContet.orderPrice}}
</view> </view>
<view class="orderReal"> <view class="orderReal">
<span style="color: #666;margin-right: 10rpx;float: left;">运费 : </span> <span style="color: #666;margin-right: 10rpx;float: left;">运费 : </span>
<span>￥</span>{{orderContet.shippingMoney}} <span>￥</span>{{orderContet.shippingPrice}}
</view> </view>
<view class="orderReal"> <view class="orderReal">
<span style="color: #666;margin-right: 10rpx;float: left;">优惠券 : </span> <span style="color: #666;margin-right: 10rpx;float: left;">优惠券 : </span>
<b style="color: #dd3c0c;"><span>-￥</span>{{orderContet.districtMoney}}</b> <b v-if="orderContet.coupon.couponAmount" style="color: #dd3c0c;"><span>-￥</span>{{orderContet.coupon.couponAmount}}</b>
<b v-else style="color: #dd3c0c;"><span>-￥</span>0</b>
</view> </view>
<view class="orderReal"> <view class="orderReal">
<span style="color: #666;margin-right: 10rpx;float: left;">实付款 : </span> <span style="color: #666;margin-right: 10rpx;float: left;">实付款 : </span>
<b style="color: #dd3c0c;"><span>￥</span>{{orderContet.realMoney}}</b> <b style="color: #dd3c0c;"><span>￥</span>{{orderContet.realPrice}}</b>
</view> </view>
<view class="orderYunf"> <view class="orderYunf">
<span style="color: #666;margin-right: 10rpx;float: left;">订单编号 : </span> <span style="color: #666;margin-right: 10rpx;float: left;">订单编号 : </span>
@@ -100,19 +95,26 @@
<span style="color: #666;margin-right: 10rpx;float: left;">创建时间 : </span> <span style="color: #666;margin-right: 10rpx;float: left;">创建时间 : </span>
<text style="font-size: 24rpx;color: #666;">{{orderContet.createTime}}</text> <text style="font-size: 24rpx;color: #666;">{{orderContet.createTime}}</text>
</view> </view>
<view class="orderReal" v-if="orderContet.orderStatus >= 1 && orderContet.orderStatus != 5">
<span style="color: #666;margin-right: 10rpx;float: left;">付款时间 : </span>
<text style="font-size: 24rpx;color: #666;">{{orderContet.paymentDate}}</text>
</view>
<view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5">
<span style="color: #666;margin-right: 10rpx;float: left;">发货时间 : </span>
<text style="font-size: 24rpx;color: #666;">{{orderContet.shippingTime}}</text>
</view>
<view class="orderOper"> <view class="orderOper">
<view style="width: 100%; text-align: right;"> <view style="width: 100%; text-align: right;">
<!-- <u-button text="" type="success" plain ></u-button> <!-- <u-button text="" type="success" plain ></u-button>
<u-button text="" type="primary" plain > <u-button text="" type="primary" plain >
</u-button> --> </u-button> -->
<view v-if="orderContet.orderStatus==2" class="opFix" @click="onPageJump(orderID)">查看物流</view> <view v-if="orderContet.orderStatus>=2 && sheetList.length > 0 && orderContet.orderStatus != 5" class="opFix" @click="seeExpressDetail(orderContet)">查看物流</view>
<view v-if="orderContet.orderStatus==2" class="opCan" @click="OverOrder" >确认收货</view> <view v-if="orderContet.orderStatus==2" class="opCan" @click="OverOrder" >确认收货</view>
<view v-if="orderContet.orderStatus==0" class="opFix" @click="canceOrder">取消订单</view> <view v-if="orderContet.orderStatus==0" class="opFix" @click="canceOrder">取消订单</view>
<view v-if="orderContet.orderStatus==0" class="opCan" @click="goPay(orderContet)">去支付</view> <view v-if="orderContet.orderStatus==0" class="opCan" @click="goPay(orderContet)">去支付</view>
<view class="opCan" @click="kefu">联系客服</view> <view class="opCan" @click="kefu">联系客服</view>
</view> </view>
@@ -121,7 +123,7 @@
</view> </view>
<!-- 对话框 --> <!-- 对话框 -->
<u-popup :show="pingjiaShow" :round="10" @close="closePingjia"> <u-popup :show="pingjiaShow" :round="10" @close="closePingjia">
<view class="tanchu"> <view class="tanchu" >
<view class="dp_title" v-if="pjType != 'zhuiping'">添加评价</view> <view class="dp_title" v-if="pjType != 'zhuiping'">添加评价</view>
<view class="dp_title" v-else>添加追评</view> <view class="dp_title" v-else>添加追评</view>
@@ -168,6 +170,19 @@
</view> </view>
</view> </view>
</u-popup> </u-popup>
<u-popup mode="bottom" :show="sheetListShow" :round="10" @close="sheetListShow=false">
<view class="tanchu expresslist" style="height: 500rpx; overflow-y: scroll;">
<view class="title">
请选择要查看包裹
</view>
<view class="list">
<view class="item" v-for="(item,index) in sheetList" @click="seeExpressDetails(item)">
包裹 {{index+1}}
</view>
</view>
</view>
</u-popup>
<music-play :playData="playData"></music-play> <music-play :playData="playData"></music-play>
</view> </view>
</template> </template>
@@ -217,7 +232,7 @@
logisticsData: [], // 快递信息列表 logisticsData: [], // 快递信息列表
titleStat: '', titleStat: '',
orderID: 0, orderID: 0,
orderSn:null, orderSn:'',
orderType: '', orderType: '',
orderContet: {}, orderContet: {},
deliverDetails: [{ deliverDetails: [{
@@ -227,7 +242,9 @@
emoji:[], emoji:[],
Files:[], Files:[],
pjType:'', pjType:'',
sheetList: [], // 面单数据
consigneeShow: false,
sheetListShow:false,
} }
}, },
onLoad(e) { onLoad(e) {
@@ -237,9 +254,11 @@
this.orderSn = e.orderSn this.orderSn = e.orderSn
console.log(this.orderID,'this.orderID') console.log(this.orderID,'this.orderID')
}, },
onHide() {
this.sheetList= []
},
onShow() { onShow() {
this.getOrderList() this.getOrderList()
}, },
components:{ components:{
emotion, emotion,
@@ -250,6 +269,12 @@
}, },
methods: { methods: {
seeExpressDetails(item){
console.log(item,'item')
uni.navigateTo({
url: "./deliverDetail?orderSn=" + this.orderContet.orderSn + "&expressOrderSn=" + item.expressOrderSn + "&expressCompanyCode="+item.expressCompanyCode + "&expressCompanyName="+item.expressCompanyName
})
},
// 倒计时回调 // 倒计时回调
countDown(){ countDown(){
console.log('重新刷新订单') console.log('重新刷新订单')
@@ -483,6 +508,18 @@
} }
}) })
}, },
// 查看物流
seeExpressDetail(item){
console.log(item, this.sheetList.length)
if(this.sheetList.length > 1){
this.sheetListShow = true
}else if(this.sheetList.length == 1){
// 直接展示详情
uni.navigateTo({
url: "./deliverDetail?orderSn=" + item.orderSn + "&expressOrderSn=" + this.sheetList[0].expressOrderSn + "&expressCompanyCode="+this.sheetList[0].expressCompanyCode + "&expressCompanyName="+this.sheetList[0].expressCompanyName
})
}
},
onPageJump(item) { onPageJump(item) {
uni.navigateTo({ uni.navigateTo({
url: "./deliverDetail?objId=" + item url: "./deliverDetail?objId=" + item
@@ -529,17 +566,19 @@
getOrderList() { getOrderList() {
console.log('this.orderType',this.orderType) console.log('this.orderType',this.orderType)
this.$http this.$http
.get(`book/buyOrder/getOrderInfo?orderId=${this.orderID}`) // .get(`book/buyOrder/getOrderInfo?orderId=${this.orderID}`)
.get(`/book/buyOrder/orderDetail?orderSn=${this.orderSn}`)
.then(res => { .then(res => {
console.log('订单详情',res) console.log('订单详情',res)
var seconds = res.result.timestamp + 30 * 60 + 2 // 过期时间 var seconds = res.result.timestamp + 30 * 60 + 2 // 过期时间
var nowSeconds = Math.floor(new Date().getTime() / 1000); var nowSeconds = Math.floor(new Date().getTime() / 1000);
res.result.overTime = seconds - nowSeconds res.result.overTime = seconds - nowSeconds
this.orderContet = res.result this.orderContet = res.result
this.userRecordid = res.userRecordid this.consigneeShow = true
this.productIDs = res.result.products.map(item => { //this.userRecordid = res.userRecordid
return item.productId this.productIDs = res.result.goodsList.map(item => {
return item.buyOrderProductId
}) })
// console.log(this.orderContet,'this.orderContet') // console.log(this.orderContet,'this.orderContet')
if (this.orderContet.orderStatus == 0) { if (this.orderContet.orderStatus == 0) {
@@ -552,29 +591,62 @@
this.titleStat = '已完成' this.titleStat = '已完成'
} }
if(parseInt(this.orderContet.orderStatus) >= 2){
// 查询快递信息
// this.getSheetInfo()
if(this.orderContet.goodsList.length > 0){
this.sheetList = []
// console.log('存在商品数据', this.orderContet.goodsList.length)
// var ids = []
// ids.push(this.orderContet.goodsList[0].expressInfo.expressOrderSn)
// this.sheetList.push(this.orderContet.goodsList[0].expressInfo)
// for (let index = 1; index < this.orderContet.goodsList.length; index++) {
// // if (!ids.includes(this.orderContet.goodsList[index].expressInfo.expressOrder)) {
// ids.push(this.orderContet.goodsList[index].expressInfo.expressOrderSn)
// this.sheetList.push(this.orderContet.goodsList[index].expressInfo)}
// console.log(this.orderContet.goodsList[index].expressInfo.expressOrderSn,'expressOrderSn')
// // }
// console.log(ids,this.sheetList,'this.sheetList')
}
}
console.log(this.orderContet,'订单详情') console.log(this.orderContet,'订单详情')
}) })
}, },
// getSheetInfo(){
// console.log('查询快递信息')
// this.$http
// .get(`express/getPrintTemplateList?expressOrderSn=${this.orderSn}`)
// .then(res => {
// if(res.code == 0){
// this.sheetList = res.result.data
// console.log(res,'面单信息')
// }
// }).catch(e => {
// console.log('e',e)
// })
// },
// 获取物流 // 获取物流
getdeliverDetails() { // getdeliverDetails() {
this.$http // this.$http
.post(`/book/buyOrder/queryFMS?orderId=${this.orderID}`) // .post(`/book/buyOrder/queryFMS?orderId=${this.orderID}`)
.then(res => { // .then(res => {
if (res && res.code === 0) { // if (res && res.code === 0) {
console.log(res, '物流信息') // console.log(res, '物流信息')
// if(res.msg.indexOf('暂未查到物流信息') == -1){ // // if(res.msg.indexOf('暂未查到物流信息') == -1){
// this. // // this.
// } // // }
res.rntStr.forEach(item => { // res.rntStr.forEach(item => {
item.Traces = item.Traces.reverse() // item.Traces = item.Traces.reverse()
}) // })
this.deliverDetails = res.rntStr // this.deliverDetails = res.rntStr
this.deliverDetailsLength = this.deliverDetails[0].Traces.length // this.deliverDetailsLength = this.deliverDetails[0].Traces.length
} else { // } else {
} // }
}) // })
}, // },
// 取消订单 // 取消订单
canceOrder() { canceOrder() {
uni.showModal({ uni.showModal({
@@ -695,6 +767,23 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.expresslist{font-size: 28rpx; color: #666;
.title{text-align: center;}
.item{padding: 30rpx; border-bottom: 1px solid #eee;}
}
.orderState { color: #fff;
position: absolute; left: 0; top: 20rpx;
padding:10rpx; border-radius: 0 24rpx 24rpx 0;
font-size: 26rpx;
// font-weight: bold;
color: #fff;
}
.orderState0{background-color: #e6a23c;}
.orderState1{background-color: #409eff;}
.orderState2{background-color: #f56c6c;}
.orderState3{background-color: #67c23a;}
.orderState5{background-color: #787878;}
.guoqi{ font-size: 28rpx; align-items: center; color: red; float: right; line-height: 40rpx;} .guoqi{ font-size: 28rpx; align-items: center; color: red; float: right; line-height: 40rpx;}
.star{display: inline-block; width: 20px; height: 20px; margin-right: 10rpx;} .star{display: inline-block; width: 20px; height: 20px; margin-right: 10rpx;}
.starGray{ background : url(../../static/icon/star_greey.png) no-repeat; background-size: contain; } .starGray{ background : url(../../static/icon/star_greey.png) no-repeat; background-size: contain; }

592
pages/bookShop/orderList.vue
View File

@@ -11,28 +11,30 @@
</view> </view>
<view class="orderList" v-if="orderList.length > 0"> <view class="orderList" v-if="orderList.length > 0">
<view class="orderItem" v-for="(ifex,inten) in orderList"> <view class="orderItem" v-for="(ifex,inten) in orderList" @click="goOrdiCont(ifex)" :key="inten">
<text class="orderState orderState0" v-if="ifex.orderStatus==0">待支付</text> <text class="orderState orderState0" v-if="ifex.orderStatus==0">待支付</text>
<text class="orderState orderState1" v-if="ifex.orderStatus==1">待发货</text> <text class="orderState orderState1" v-if="ifex.orderStatus==1">待发货</text>
<text class="orderState orderState2" v-if="ifex.orderStatus==2">待收货</text> <text class="orderState orderState2" v-if="ifex.orderStatus==2">待收货</text>
<text class="orderState orderState3" v-if="ifex.orderStatus==3">已完成</text> <text class="orderState orderState3" v-if="ifex.orderStatus==3">已完成</text>
<text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text> <text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text>
<view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0"> <view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0">
<text>剩余支付时间：</text> <text>剩余支付时间：</text>
<uni-countdown background-color="#ff5500" color="#ffffff" :font-size="14" :show-day="false" :hour="0" :minute="0" :second="ifex.overTime" @timeup="countDown"></uni-countdown> <uni-countdown background-color="#ff5500" color="#ffffff" :font-size="14" :show-day="false"
:hour="0" :minute="0" :second="ifex.overTime" @timeup="countDown"></uni-countdown>
</view> </view>
<view class="flexbox orderSn"> <view class="flexbox orderSn">
<text class="">订单编号: {{ifex.orderSn}}</text> <text class="">订单编号: {{ifex.orderSn}}</text>
</view> </view>
<view class="orderContent" :key="index" v-if="ifex.orderType=='order'" <view class="orderContent" :key="index" v-if="ifex.orderType=='order'"
v-for="(item,index) in ifex.products" @click="goOrdiCont(ifex)"> v-for="(item,index) in ifex.productList">
<image :src="item.image" mode=""></image> <image :src="item.product.productImages" mode=""></image>
<view class="itemJian"> <view class="itemJian">
<view class="orderTitle"> <view class="orderTitle">
<text>{{item.productName}}</text> <text>{{item.product.productName}}</text>
</view> </view>
<view class="orderPrice"> <view class="orderPrice">
<text style="color: #f56c6c;">￥</text><text style="font-weight: bold; color: #f56c6c;">{{item.productPrice}}</text><br> <text style="color: #f56c6c;">￥</text><text
style="font-weight: bold; color: #f56c6c;">{{item.product.price}}</text><br>
<text style="color: #bbbbbb;font-size: 20rpx;margin-right: 10rpx;">X</text> <text style="color: #bbbbbb;font-size: 20rpx;margin-right: 10rpx;">X</text>
<text style="color: #bbbbbb;">{{item.quantity}}</text> <text style="color: #bbbbbb;">{{item.quantity}}</text>
</view> </view>
@@ -47,7 +49,8 @@
<text>天医币充值</text> <text>天医币充值</text>
</view> </view>
<view class="orderPrice"> <view class="orderPrice">
<text style="color: #f56c6c;">￥</text><text style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text> <text style="color: #f56c6c;">￥</text><text
style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
</view> </view>
<br clear="both"> <br clear="both">
</view> </view>
@@ -60,28 +63,37 @@
<text>会员充值</text> <text>会员充值</text>
</view> </view>
<view class="orderPrice"> <view class="orderPrice">
<text style="color: #f56c6c;">￥</text><text style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text> <text style="color: #f56c6c;">￥</text><text
style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
</view> </view>
<br clear="both"> <br clear="both">
</view> </view>
<br clear="both"> <br clear="both">
</view> </view>
<view class="orderReal"> <view class="orderReal">
<span style="color: #999; float: left; font-size: 12px;">下单时间：{{ifex.createTime}}</span> <span style="color: #999; float: left; font-size: 12px;">下单时间：{{ifex.createTime}}</span>
<span style="color: #999;margin-right: 10rpx;">实付款 : </span> <span style="color: #999;margin-right: 10rpx;">实付款 : </span>
<span style=" color: #f56c6c;">￥</span><text style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text> <span style=" color: #f56c6c;">￥</span><text
style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
</view> </view>
<view class="orderOper" v-if="ifex.orderStatus==0"> <view class="orderOper" v-if="ifex.orderStatus==0">
<view class="opFix" @click="canceOrder(ifex)">取消订单</view> <view class="opFix" @click.stop="canceOrder(ifex)">取消订单</view>
<view class="opCan" @click="goPay(ifex)">去支付</view> <view class="opCan" @click="goPay(ifex)">去支付</view>
</view> </view>
</view> </view>
<view v-if="status==0" style="text-align: center;">
<u-loading-icon style="display: inline-block;"></u-loading-icon>
<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
</view>
<view v-if="status==1" style="padding-bottom: 20rpx;">
<u-divider text="全部加载完成"></u-divider>
</view>
</view> </view>
<view class="" v-else style=" margin-top: 250rpx;"> <view class="" v-else style=" margin-top: 250rpx;">
<u-divider text="暂无列表数据"></u-divider> <u-divider text="暂无订单数据"></u-divider>
</view> </view>
<z-navigation></z-navigation> <z-navigation></z-navigation>
<music-play :playData="playData"></music-play> <music-play :playData="playData"></music-play>
</view> </view>
</template> </template>
@@ -90,18 +102,20 @@
import $http from '@/config/requestConfig.js'; import $http from '@/config/requestConfig.js';
import { import {
setPay, setPay,
setPayAssign,setWXPay setPayAssign,
setWXPay
} from '@/config/utils'; } from '@/config/utils';
import { import {
mapState,mapMutations mapState,
mapMutations
} from 'vuex'; } from 'vuex';
export default { export default {
data() { data() {
return { return {
playData:{}, playData: {},
orderTabs: [{ orderTabs: [{
name: '全部', name: '全部',
value: 9 value: null
}, { }, {
name: '待支付', name: '待支付',
value: 0 value: 0
@@ -114,57 +128,84 @@ import {
}, { }, {
name: '已完成', name: '已完成',
value: 3 value: 3
},{ }, {
name: '已超时', name: '已超时',
value: 5 value: 5
}, }, ],
], orderListTab: null,
orderListTab: 9,
orderList: [], orderList: [],
iapChannel:{}, iapChannel: {},
checking:false, // 正在检测 checking: false, // 正在检测
ComplateRequestArr:null, ComplateRequestArr: null,
isAndorid:true isAndorid: true,
status: 3, // 加载状态
totalPage: 0,
page: 1
} }
}, },
onHide() {
this.orderList = [],
this.page = 1
this.totalPage = 0
this.orderListTab = null
},
onShow() { onShow() {
this.getOrderList() this.getOrderList()
this.checkIapOrders() //检查未完成的苹果支付订单 this.checkIapOrders() //检查未完成的苹果支付订单
this.getOS() this.getOS()
// this.countDown() // this.countDown()
}, },
computed: { computed: {
...mapState(['userInfo']), ...mapState(['userInfo']),
}, },
// 下拉刷新 // 下拉刷新
onPullDownRefresh() { onPullDownRefresh() {
this.orderList = [],
this.page = 1
this.totalPage = 0
this.getOrderList() this.getOrderList()
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
components:{ onReachBottom() {
musicPlay console.log('到底了')
if (this.page < this.totalPage) {
this.page++
// console.log('加载',this.page)
this.status = 0
this.getOrderList()
} else {
this.status = 1
console.log('加载完成了', this.page)
return
}
},
components: {
musicPlay
}, },
methods: { methods: {
...mapMutations(['setUserInfo']), ...mapMutations(['setUserInfo']),
// 倒计时回调 // 倒计时回调
countDown(){ countDown() {
console.log('重新刷新订单') console.log('重新刷新订单')
this.getOrderList() this.totalPage = 0
this.page = 1
this.orderList = []
this.getOrderList()
}, },
// 获得操作系统 // 获得操作系统
getOS(){ getOS() {
let oprateOs = '' let oprateOs = ''
oprateOs = uni.getSystemInfoSync().platform oprateOs = uni.getSystemInfoSync().platform
console.log(oprateOs) console.log(oprateOs)
if(oprateOs == 'android'){ if (oprateOs == 'android') {
this.isAndorid = true this.isAndorid = true
}else{ } else {
this.isAndorid = false this.isAndorid = false
} }
}, },
checkIapOrders() { checkIapOrders() {
const that = this const that = this
// 如果ios已经绑定支付信息，就直接支付，如果没有绑定，就需要先绑定 // 如果ios已经绑定支付信息，就直接支付，如果没有绑定，就需要先绑定
console.log('检测支付环境...') console.log('检测支付环境...')
plus.payment.getChannels((channels) => { plus.payment.getChannels((channels) => {
@@ -178,47 +219,74 @@ import {
} }
} }
}) })
}, },
// 切换订单状态 // 切换订单状态
orderTabCLi(e) { orderTabCLi(e) {
this.orderListTab = e this.orderListTab = e
this.totalPage = 0
this.page = 1
this.orderList = []
this.getOrderList() this.getOrderList()
}, },
// 获取订单列表 // 获取订单列表
getOrderList() { getOrderList() {
this.$http let data = {
.post(`book/buyOrder/getMyOrderList?userId=${this.userInfo.id}&orderStatus=${this.orderListTab}`) "userId": "",
.then(res => { "orderStatus": this.orderListTab,
res.page.list.forEach((item,index) => { "page": this.page,
var seconds = item.timestamp + 30 * 60 + 2 // 过期时间 30分钟+2 "limit": 10,
'userId': this.userInfo.id
}
$http.request({
// url: "book/buyOrder/orderList",
url: "book/buyOrder/getUserOrderList",
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
data,
header: { //默认 无 说明：请求头
'Content-Type': 'application/json'
},
}).then(res => {
if (res.code == 0) {
res.page.records.forEach((item, index) => {
var seconds = item.timestamp + 30 * 60 + 2 // 过期时间 30分钟+2
// var seconds = item.timestamp + 30 + 2 // 过期时间 30秒 // var seconds = item.timestamp + 30 + 2 // 过期时间 30秒
var nowSeconds = Math.floor(new Date().getTime() / 1000); // 单位秒 var nowSeconds = Math.floor(new Date().getTime() / 1000); // 单位秒
item.overTime = seconds - nowSeconds item.overTime = seconds - nowSeconds
// console.log(item.overTime,'item.overTime') // console.log(item.overTime,'item.overTime')
}) })
this.orderList = res.page.list this.orderList = this.orderList.concat(res.page.records)
console.log(this.orderList,'订单列表') this.totalPage = res.page.pages
}) if (res.page.pages == this.page) {
this.status = 1
} else {
this.status = 3
}
console.log(this.orderList, '订单列表')
}
})
}, },
// 订单详情 // 订单详情
goOrdiCont(e) { goOrdiCont(e) {
console.log(e, 'e')
//let orderId = e.orderId ? e.orderId : e.id
uni.navigateTo({ uni.navigateTo({
url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus + '&orderSn=' + e.orderSn url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus + '&orderSn=' + e.orderSn
}); });
}, },
// 跳转到支付页面 // 跳转到支付页面
goPay1(e){ goPay1(e) {
console.log(e,'goPay1') console.log(e, 'goPay1')
uni.navigateTo({ uni.navigateTo({
url: '../peanut/reCharge?orderSn=' + e.orderSn url: '../peanut/reCharge?orderSn=' + e.orderSn
}); });
}, },
// 取消订单 // 取消订单
canceOrder(e) { canceOrder(e) {
uni.showModal({ uni.showModal({
@@ -237,6 +305,9 @@ import {
icon: 'none', icon: 'none',
title: '取消订单成功' title: '取消订单成功'
}) })
this.page = 1
this.totalPage = 0
this.orderList = []
this.getOrderList() this.getOrderList()
}) })
} }
@@ -246,91 +317,94 @@ import {
// 支付 // 支付
goPay(payItem) { goPay(payItem) {
console.log(payItem,'payItem') console.log(payItem, 'payItem')
if(payItem.paymentMethod == 2){ if (payItem.paymentMethod == 2) {
console.log('阿里支付') console.log('阿里支付')
setPay({ setPay({
typePay: 'alipay', typePay: 'alipay',
subject: 'order', subject: 'order',
totalAmount: payItem.realMoney, totalAmount: payItem.realMoney,
type: 2, type: 2,
relevanceoid: payItem.orderSn, relevanceoid: payItem.orderSn,
customerId: this.userInfo.id, customerId: this.userInfo.id,
}, res => { }, res => {
if (res.success) {
uni.showToast({
title: "支付成功"
});
} else {
uni.showToast({
title: "支付失败",
icon: "none",
image: '../../static/icon/ic_close.png'
});
}
this.getOrderList()
})
} else if(payItem.paymentMethod == 1){
console.log('微信支付')
// console.log(this.isAndorid)
if(this.isAndorid == false){
uni.showModal({
title: '提示',
content: '很抱歉，苹果系统暂不支持微信支付',
showCancel:false
})
return false
}else{
let data1={
orderSn:payItem.orderSn,
buyOrderId: null,
totalAmount: payItem.realMoney
}
console.log(data1,'data1')
setWXPay(data1,res => {
if (res.success) { if (res.success) {
uni.showToast({ uni.showToast({
title: "支付成功" title: "支付成功"
}); });
} else { } else {
console.log(res)
if(res.data.errMsg.indexOf('User canceled') != -1){
uni.showToast({
title: "用户取消支付",
icon: "none",
image: '../../static/icon/ic_close.png'
});
}else{
uni.showToast({ uni.showToast({
title: "支付失败", title: "支付失败",
icon: "none", icon: "none",
image: '../../static/icon/ic_close.png' image: '../../static/icon/ic_close.png'
}); });
}
} }
this.orderList = [],
this.page = 1
this.totalPage = 0
this.getOrderList()
}) })
} else if (payItem.paymentMethod == 1) {
console.log('微信支付')
// console.log(this.isAndorid)
if (this.isAndorid == false) {
uni.showModal({
title: '提示',
content: '很抱歉，苹果系统暂不支持微信支付',
showCancel: false
})
return false
} else {
let data1 = {
orderSn: payItem.orderSn,
buyOrderId: null,
totalAmount: payItem.realMoney
}
console.log(data1, 'data1')
setWXPay(data1, res => {
if (res.success) {
uni.showToast({
title: "支付成功"
});
} else {
console.log(res)
if (res.data.errMsg.indexOf('User canceled') != -1) {
uni.showToast({
title: "用户取消支付",
icon: "none",
image: '../../static/icon/ic_close.png'
});
} else {
uni.showToast({
title: "支付失败",
icon: "none",
image: '../../static/icon/ic_close.png'
});
}
}
})
}
} else if (payItem.paymentMethod == 3) {
// 苹果充值
console.log('苹果二次支付')
if (this.isAndorid) {
uni.showModal({
title: '提示',
showCancel: false,
content: '很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单'
})
} else {
this.iphonepay(payItem)
}
} }
}else if(payItem.paymentMethod == 3){
// 苹果充值
console.log('苹果二次支付')
if(this.isAndorid){
uni.showModal({
title:'提示',
showCancel:false,
content:'很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单'
})
}else{
this.iphonepay(payItem)
}
}
}, },
iphonepay(payItem) { iphonepay(payItem) {
console.log(this.userInfo.restoreFlag,'this.userInfo.restoreFlag') console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
if(this.ComplateRequestArr == null || this.ComplateRequestArr == [] ){ if (this.ComplateRequestArr == null || this.ComplateRequestArr == []) {
this.requestOrder(payItem) this.requestOrder(payItem)
}else{ } else {
uni.showModal({ uni.showModal({
title:'提示', title: '提示',
showCancel: false, showCancel: false,
content: '您的账户存在未完成的支付订单，请稍后重启app留意账户变动。', content: '您的账户存在未完成的支付订单，请稍后重启app留意账户变动。',
}) })
@@ -345,16 +419,16 @@ import {
// console.log(productId, 88888888) // console.log(productId, 88888888)
// ['xxxxx'] 是平台申请拿到的内购商品的id // ['xxxxx'] 是平台申请拿到的内购商品的id
let IAPOrders = [] let IAPOrders = []
IAPOrders.push(payItem.productId+'') IAPOrders.push(payItem.productId + '')
console.log(IAPOrders, 'IAPOrders') console.log(IAPOrders, 'IAPOrders')
// 新建订单 // 新建订单
that.iapChannel.requestOrder(IAPOrders, function(event) { that.iapChannel.requestOrder(IAPOrders, function(event) {
// uni.hideLoading() // uni.hideLoading()
console.log(event, 'event') console.log(event, 'event')
for (var index in event) { for (var index in event) {
var OrderItem = event[index] var OrderItem = event[index]
// console.log(OrderItem, 'OrderItem') // console.log(OrderItem, 'OrderItem')
console.log(OrderItem.productid,'OrderItem.productid') console.log(OrderItem.productid, 'OrderItem.productid')
that.topay(payItem) that.topay(payItem)
} }
}, function(erroemsg) { }, function(erroemsg) {
@@ -364,97 +438,103 @@ import {
}) })
}) })
}, },
topay(payItem) { topay(payItem) {
const that = this const that = this
uni.hideLoading() uni.hideLoading()
// var restoreFlag = true; // 调用支付接口时标记 restoreFlag = true , 实际应用请将标记存储在 storage 中 // var restoreFlag = true; // 调用支付接口时标记 restoreFlag = true , 实际应用请将标记存储在 storage 中
this.setUserInfo({restoreFlag:true}); this.setUserInfo({
console.log(this.userInfo,'更新后的用户信息') restoreFlag: true
});
console.log(this.userInfo, '更新后的用户信息')
plus.payment.request(that.iapChannel, { plus.payment.request(that.iapChannel, {
productid: payItem.productId, productid: payItem.productId,
username: payItem.orderSn, // 用户标识/订单标识 username: payItem.orderSn, // 用户标识/订单标识
manualFinishTransaction: true // 3.5.1+ 支持，设置此参数后需要开发者主动关闭订单，参见下面的关闭订单方法 finishTransaction() manualFinishTransaction: true // 3.5.1+ 支持，设置此参数后需要开发者主动关闭订单，参见下面的关闭订单方法 finishTransaction()
}, function(result) { }, function(result) {
// restoreFlag = false; // 支付成功清除标记 restoreFlag = false // restoreFlag = false; // 支付成功清除标记 restoreFlag = false
that.transaction = result that.transaction = result
// 支付成功，result 为 IAP商品交易信息对象 IAPTransaction 需将返回的支付凭证传给后端进行二次认证 // 支付成功，result 为 IAP商品交易信息对象 IAPTransaction 需将返回的支付凭证传给后端进行二次认证
that.iapCheck(result) that.iapCheck(result)
}, function(e) { }, function(e) {
if(e.errCode == 2){ if (e.errCode == 2) {
// 用户未绑定支付方式，app内支付流程结束，系统弹出框引导用户绑定支付方式，此过程将跳转到系统应用 AppStore 进行绑定支付方式，绑定成功同步支付成功，用户成功付款 // 用户未绑定支付方式，app内支付流程结束，系统弹出框引导用户绑定支付方式，此过程将跳转到系统应用 AppStore 进行绑定支付方式，绑定成功同步支付成功，用户成功付款
plus.runtime.openURL("https://apps.apple.com/account/billing"); plus.runtime.openURL("https://apps.apple.com/account/billing");
}else{ } else {
// restoreFlag = false; // 支付失败清楚标记 // restoreFlag = false; // 支付失败清楚标记
that.finishTransaction(result); that.finishTransaction(result);
//console.log('订单关闭后的用户信息', that.userInfo); //console.log('订单关闭后的用户信息', that.userInfo);
// console.log(e) // console.log(e)
//console.log(e.message) //console.log(e.message)
} }
}); });
}, },
// 查询未关闭订单 // 查询未关闭订单
restoreComplateRequest(){ restoreComplateRequest() {
let that = this let that = this
console.log('检测未完成订单') console.log('检测未完成订单')
// console.log(that.iapChannel,'this.iapChannel') // console.log(that.iapChannel,'this.iapChannel')
that.iapChannel.restoreComplateRequest({ that.iapChannel.restoreComplateRequest({
manualFinishTransaction: true manualFinishTransaction: true
}, function(results) { }, function(results) {
console.log('进入restoreComplateRequest') console.log('进入restoreComplateRequest')
// if(!that.checking){ // if(!that.checking){
// that.checking = true // that.checking = true
// console.log(that.checking) // console.log(that.checking)
// results 格式为数组存放恢复的IAP商品交易信息对象 IAPTransaction，通用需将返回的支付凭证传给后端进行二次认证 // results 格式为数组存放恢复的IAP商品交易信息对象 IAPTransaction，通用需将返回的支付凭证传给后端进行二次认证
that.ComplateRequestArr = results that.ComplateRequestArr = results
console.log(that.ComplateRequestArr,'未完成订单数组') console.log(that.ComplateRequestArr, '未完成订单数组')
if(results && results.length>0){ if (results && results.length > 0) {
results.map((item,index)=>{ results.map((item, index) => {
// "0"为正在支付；"1"为支付成功；"2"为支付失败；"3"为支付已恢复。 // "0"为正在支付；"1"为支付成功；"2"为支付失败；"3"为支付已恢复。
if(item.transactionState == '1'){ if (item.transactionState == '1') {
// 已经支付，但是没有走逻辑的内购订单 // 已经支付，但是没有走逻辑的内购订单
that.iapCheck(item,index) that.iapCheck(item, index)
}else{ } else {
// 其他状态的内购订单 // 其他状态的内购订单
that.finishTransaction(item) that.finishTransaction(item)
} }
}) })
}else{ } else {
this.setUserInfo({restoreFlag:false}); this.setUserInfo({
console.log('无未处理订单，可以拉起新的支付') restoreFlag: false
} });
// } console.log('无未处理订单，可以拉起新的支付')
}); }
// }
});
}, },
// 关闭交易订单 // 关闭交易订单
finishTransaction(trans,index){ finishTransaction(trans, index) {
this.iapChannel.finishTransaction(trans, (success) => { this.iapChannel.finishTransaction(trans, (success) => {
console.log('关闭订单成功',index); console.log('关闭订单成功', index);
if(index == this.ComplateRequestArr.length-1){ // 最后一个支付订单 if (index == this.ComplateRequestArr.length - 1) { // 最后一个支付订单
this.setUserInfo({restoreFlag:false}); this.setUserInfo({
restoreFlag: false
});
console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag') console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
} }
}, (fail) => { }, (fail) => {
console.log('关闭订单失败'); console.log('关闭订单失败');
}); });
}, },
iapCheck(result,index) { iapCheck(result, index) {
const that = this const that = this
console.log('进入后台验证') console.log('进入后台验证')
let data = { let data = {
transactionId: result.transactionIdentifier, // 支付交易id transactionId: result.transactionIdentifier, // 支付交易id
customerOid: that.userInfo.id, customerOid: that.userInfo.id,
productId: result.payment.productid, // 产品id productId: result.payment.productid, // 产品id
orderId: result.payment.username, // 系统订单号 orderId: result.payment.username, // 系统订单号
receiptData: result.transactionReceipt ,// 苹果返回收据 receiptData: result.transactionReceipt, // 苹果返回收据
loadAnimate:'none', // 请求加载动画 loadAnimate: 'none', // 请求加载动画
} }
console.log(data,'data') console.log(data, 'data')
$http.request({ $http.request({
url: "/Ipa/veri", url: "/Ipa/veri",
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
@@ -463,54 +543,54 @@ import {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
}).then(res => { }).then(res => {
console.log(JSON.stringify(res)) console.log(JSON.stringify(res))
console.log(res.code) console.log(res.code)
if(res.code == 0){ if (res.code == 0) {
// uni.hideLoading() // uni.hideLoading()
console.log('充值订单已处理，请留意账户金额变动....') console.log('充值订单已处理，请留意账户金额变动....')
// 服务器验证票据有效后在客户端关闭订单 // 服务器验证票据有效后在客户端关闭订单
that.finishTransaction(result,index) that.finishTransaction(result, index)
}else if(res.code == 200){ // 重复验证订单 } else if (res.code == 200) { // 重复验证订单
console.log('重复验证....') console.log('重复验证....')
that.finishTransaction(result,index) that.finishTransaction(result, index)
} }
}).catch(e => { }).catch(e => {
console.log('支付验证失败，进入轮询程序...') console.log('支付验证失败，进入轮询程序...')
that.getIapPayResult(result,index) that.getIapPayResult(result, index)
}) })
console.log('--------------') console.log('--------------')
}, },
// 轮询验证支付结果 // 轮询验证支付结果
getIapPayResult(result,index){ getIapPayResult(result, index) {
// let interval = null // let interval = null
this.ComplateRequestInterval = setTimeout(() => { this.ComplateRequestInterval = setTimeout(() => {
if(this.maxTimes <= 3){ if (this.maxTimes <= 3) {
this.iapCheck(result,index) this.iapCheck(result, index)
console.log('执行1', this.maxTimes,this.ComplateRequestInterval) console.log('执行1', this.maxTimes, this.ComplateRequestInterval)
this.maxTimes += 1 this.maxTimes += 1
}else{ } else {
this.maxTimes = 0 this.maxTimes = 0
console.log('停止轮询', this.maxTimes,this.ComplateRequestInterval, this.maxTimes) console.log('停止轮询', this.maxTimes, this.ComplateRequestInterval, this.maxTimes)
this.checking = false this.checking = false
this.saveErrorIapOrder(result,index) this.saveErrorIapOrder(result, index)
clearTimeout(this.ComplateRequestInterval) clearTimeout(this.ComplateRequestInterval)
} }
},10000) }, 10000)
}, },
// 轮询失败接口 // 轮询失败接口
saveErrorIapOrder(result,index){ saveErrorIapOrder(result, index) {
console.log('提交到充值问题单里面...') console.log('提交到充值问题单里面...')
let data = { let data = {
transactionId : result.transactionIdentifier, transactionId: result.transactionIdentifier,
failureflag: 1, failureflag: 1,
orderId:result.payment.username, orderId: result.payment.username,
receiptData:result.transactionReceipt, receiptData: result.transactionReceipt,
productId:result.payment.productid, productId: result.payment.productid,
customerOid:this.userInfo.id customerOid: this.userInfo.id
} }
$http.request({ $http.request({
url: "Ipa/failure", url: "Ipa/failure",
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
@@ -519,17 +599,17 @@ import {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
}).then(res => { }).then(res => {
console.log(JSON.stringify(res)) console.log(JSON.stringify(res))
if(res.code == 200){ if (res.code == 200) {
console.log('提交成功，关闭订单') console.log('提交成功，关闭订单')
this.finishTransaction(result,index) this.finishTransaction(result, index)
} }
}).catch(e => { }).catch(e => {
console.log(e) console.log(e)
if(e.statusCode == 0){ // 重复提交，直接关闭订单 if (e.statusCode == 0) { // 重复提交，直接关闭订单
this.finishTransaction(result,index) this.finishTransaction(result, index)
} }
}) })
}, },
} }
@@ -538,21 +618,32 @@ import {
<style lang="scss" scoped> <style lang="scss" scoped>
@import '@/style/mixin.scss'; @import '@/style/mixin.scss';
.guoqi{ font-size: 28rpx; align-items: center; color: red; float: right; line-height: 40rpx;}
.flexbox{display: flex;} .guoqi {
.orderTabs { font-size: 28rpx;
align-items: center;
color: red;
float: right;
line-height: 40rpx;
}
.flexbox {
display: flex;
}
.orderTabs {
margin: 60rpx 0 0 0; margin: 60rpx 0 0 0;
width: 100%; width: 100%;
padding: 30rpx 3% 3% 3%; padding: 30rpx 3% 3% 3%;
// padding-top: 100rpx; // padding-top: 100rpx;
position: fixed; position: fixed;
top: 80rpx; top: 80rpx;
background-color: #fff; background-color: #fff;
z-index: 100; z-index: 100;
view { view {
border-radius: 20rpx; border-radius: 20rpx;
border:1px solid #d0d0d0 ; border: 1px solid #d0d0d0;
display: inline-block; display: inline-block;
padding: 20rpx 0; padding: 20rpx 0;
margin: 0 6rpx; margin: 0 6rpx;
@@ -580,20 +671,49 @@ import {
background-color: #fff; background-color: #fff;
border-radius: 30rpx; border-radius: 30rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
.orderSn{font-size: 26rpx; color: #999; padding-bottom: 20rpx; border-bottom: 1px solid #eee; margin-top: 60rpx; margin-bottom: 30rpx;}
.orderState { color: #fff; .orderSn {
font-size: 26rpx;
position: absolute; left: 0; top: 20rpx; color: #999;
padding:10rpx; border-radius: 0 24rpx 24rpx 0; padding-bottom: 20rpx;
font-size: 26rpx; border-bottom: 1px solid #eee;
margin-top: 60rpx;
margin-bottom: 30rpx;
}
.orderState {
color: #fff;
position: absolute;
left: 0;
top: 20rpx;
padding: 10rpx;
border-radius: 0 24rpx 24rpx 0;
font-size: 26rpx;
// font-weight: bold; // font-weight: bold;
color: #fff; color: #fff;
} }
.orderState0{background-color: #e6a23c;}
.orderState1{background-color: #409eff;} .orderState0 {
.orderState2{background-color: #f56c6c;} background-color: #e6a23c;
.orderState3{background-color: #67c23a;} }
.orderState5{background-color: #787878;}
.orderState1 {
background-color: #409eff;
}
.orderState2 {
background-color: #f56c6c;
}
.orderState3 {
background-color: #67c23a;
}
.orderState5 {
background-color: #787878;
}
.orderContent { .orderContent {
margin-bottom: 20rpx; margin-bottom: 20rpx;
@@ -663,4 +783,4 @@ import {
} }
} }
} }
</style> </style>

35
pages/bookShop/settlement.vue
View File

@@ -21,7 +21,7 @@
</view> </view>
<view class="defalBottom"> <view class="defalBottom">
<text class="userAddress"> <text class="userAddress">
{{adressMoRen.province}} {{adressMoRen.city}} {{adressMoRen.county}} {{adressMoRen.useraddress}} {{adressMoRen.province}} {{adressMoRen.city}} {{adressMoRen.county}} {{adressMoRen.detailAddress}}
</text> </text>
</view> </view>
@@ -56,8 +56,8 @@
优惠券 优惠券
<u-icon name="arrow-right" color="#aaa" size="18" class="yqRight"></u-icon> <u-icon name="arrow-right" color="#aaa" size="18" class="yqRight"></u-icon>
<text class="dagnqian" <text class="dagnqian"
v-if="youhuiList.length>0&&youhuiContent.id==undefined">当前可选{{this.youhuiList.length}}张</text> v-if="youhuiList.length>0">当前可选{{this.youhuiList.length}}张</text>
<text class="dagnqian" v-if="youhuiList.length==0&&youhuiContent.id==undefined" <text class="dagnqian" v-else
style="background-color: #999;">暂无优惠券</text> style="background-color: #999;">暂无优惠券</text>
<text class="dagnqian" v-if="youhuiContent.id!=undefined"> <text class="dagnqian" v-if="youhuiContent.id!=undefined">
- ￥{{youhuiContent.coupons.couponAmount}}</text> - ￥{{youhuiContent.coupons.couponAmount}}</text>
@@ -151,7 +151,7 @@
<view class="addrContentBottom"> <view class="addrContentBottom">
<view class="userAddress"> <view class="userAddress">
{{item.province}} {{item.city}} {{item.county}} {{item.province}} {{item.city}} {{item.county}}
{{item.useraddress}} {{item.detailAddress}}
</view> </view>
</view> </view>
</view> </view>
@@ -166,7 +166,7 @@
<u-popup :show="youhuiShow" :round="10" @close="youhuiShow=false"> <u-popup :show="youhuiShow" :round="10" @close="youhuiShow=false">
<view class="tanchu"> <view class="tanchu">
<view class="dp_title">请选择优惠券</view> <view class="dp_title">请选择优惠券</view>
<view style="max-height: 1000rpx;overflow-y: scroll;"> <view style="max-height: 1000rpx;overflow-y: scroll;" v-if="youhuiList.length > 0">
<view :class="youhuiIndex === index ? 'youhuiItem youItem_style' : 'youhuiItem'" <view :class="youhuiIndex === index ? 'youhuiItem youItem_style' : 'youhuiItem'"
v-for="(item,index) in youhuiList" :key="index" @click="choseYouhui(index)"> v-for="(item,index) in youhuiList" :key="index" @click="choseYouhui(index)">
<view style="width: 25%;color:#fd6004;text-align: center;"> <view style="width: 25%;color:#fd6004;text-align: center;">
@@ -189,8 +189,11 @@
</view> </view>
<br clear="both"> <br clear="both">
</view> </view>
<view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view>
</view> </view>
<view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view> <view class="" v-else>
<u-divider text="暂无可用优惠券哦"></u-divider>
</view>
</view> </view>
</u-popup> </u-popup>
@@ -357,7 +360,7 @@
this.addressList = res.list this.addressList = res.list
// console.log(this.addressList,'地址列表') // console.log(this.addressList,'地址列表')
this.adressMoRen = this.addressList[this.adressMoRIndex] this.adressMoRen = this.addressList[this.adressMoRIndex]
// console.log(this.adressMoRen, '默认') console.log(this.adressMoRen, '默认')
if(this.adressMoRen != {}){ if(this.adressMoRen != {}){
// console.log('运费之前') // console.log('运费之前')
this.getYunFei() this.getYunFei()
@@ -459,7 +462,8 @@
console.log(key,'this.adressMoRen.areaidpath') console.log(key,'this.adressMoRen.areaidpath')
$http.request({ $http.request({
url: "book/buyOrder/calculateTransportPrice/", // url: "book/buyOrder/calculateTransportPrice/",
url: "book/buyOrder/calculateTransportPrice",
// url: "book/buyorder/getTransPrice/" + this.adressMoRen.areaidpath + "?" + dataToString, // url: "book/buyorder/getTransPrice/" + this.adressMoRen.areaidpath + "?" + dataToString,
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
data:{ data:{
@@ -473,11 +477,10 @@
}).then(res => { }).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.farePrice = res.result this.farePrice = res.result
}else{ console.log('需要的运费',res.result)
this.farePrice = 0 this.allPrice()
} }
console.log('需要的运费',res.result)
this.allPrice()
}) })
}, },
@@ -613,13 +616,13 @@
couponName: youPre.coupons.name, //优惠券名称 couponName: youPre.coupons.name, //优惠券名称
districtMoney: youPre.coupons.amount, //优惠金额 districtMoney: youPre.coupons.amount, //优惠金额
orderStatus: 0, //订单状态 orderStatus: 0, //订单状态
products: xiaBiao, //订单列表 productList: xiaBiao, //订单列表商品
orderType: "order", //订单类型 orderType: "order", //订单类型
addressId:this.adressMoRen.id // 地址ID addressId:this.adressMoRen.id // 地址ID
} }
$http.request({ $http.request({
// url: "book/buyorder/save", // url: "book/buyOrder/buySave",
url: "book/buyOrder/buySave", url: "book/buyOrder/placeOrder",
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
data, data,
header: { //默认 无 说明：请求头 header: { //默认 无 说明：请求头

48
pages/user/addAddress.vue
View File

@@ -20,9 +20,8 @@
<u-form-item label="所在地区 :" prop=""> <u-form-item label="所在地区 :" prop="">
<view class="add_arrow" @click="addreShow=true">{{addressForm.areaidpathtext}}</view> <view class="add_arrow" @click="addreShow=true">{{addressForm.areaidpathtext}}</view>
<u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName" <u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName"
@confirm="addconfirm" @change="changeHandler"></u-picker> @confirm="addconfirm" @change="changeHandler" ></u-picker>
</u-form-item> </u-form-item>
<u-form-item label="详细地址 :" prop="useraddress"> <u-form-item label="详细地址 :" prop="useraddress">
<u-input type="string" v-model="addressForm.useraddress" placeholder="小区楼栋/乡村名称" clearable <u-input type="string" v-model="addressForm.useraddress" placeholder="小区楼栋/乡村名称" clearable
border="surround" /> border="surround" />
@@ -45,18 +44,26 @@
@confirm="deleteSub"> @confirm="deleteSub">
</u-modal> </u-modal>
<music-play :playData="playData"></music-play> <music-play :playData="playData"></music-play>
<!-- 公共组件-每个页面必须引入 -->
<public-module></public-module>
</view> </view>
</template> </template>
<script> <script>
import musicPlay from '@/components/music.vue' import musicPlay from '@/components/music.vue'
import $http from '@/config/requestConfig.js'; import $http from '@/config/requestConfig.js';
import addressList1 from "@/static/json/address.json"
import { import {
mapState mapState
} from 'vuex'; } from 'vuex';
export default { export default {
data() { data() {
return { return {
// array: ['中国', '美国', '巴西', '日本'],
// indexp:0,
// indexq:0,
// indexc:0,
playData:{}, playData:{},
addreShow: false, //是否显示 addreShow: false, //是否显示
columns: [], //省份数据显示，三级联动需要三维数组，展示初始数据 columns: [], //省份数据显示，三级联动需要三维数组，展示初始数据
@@ -119,6 +126,7 @@
} }
}, },
onLoad(e) { onLoad(e) {
this.addressList = addressList1
if (e.type == 0) { if (e.type == 0) {
this.navName = '添加地址' this.navName = '添加地址'
this.isShowDel = false this.isShowDel = false
@@ -129,9 +137,10 @@
this.getAddress() this.getAddress()
} }
this.initDataPicker() //初始化省份列表 this.initDataPicker() //初始化省份列表
}, },
onShow() { onShow() {
}, },
computed: { computed: {
...mapState(['userInfo']), ...mapState(['userInfo']),
@@ -142,15 +151,15 @@
components:{ components:{
musicPlay musicPlay
}, },
methods: { methods: {
// 三级联动 // 三级联动
initDataPicker() { initDataPicker() {
this.$http // console.log(this.addressList,'addressList')
.post('api/province/getProvince') // this.$http
.then(res => { // .post('api/province/getProvince')
if (res.code == 0) { // .then(res => {
this.addressList = res.provinceEntity // if (res.code == 0) {
// this.addressList = res.provinceEntity
//此处的province主要用作数据的初始化，即刚打开就需要进行展示的数据，这个跟第一条省份数据相关，我的第一条是北京市，所以需要columns中的三维数组，第一维度是省份数据数组，第二维度是市数据数组，第三维度是区数据数组 //此处的province主要用作数据的初始化，即刚打开就需要进行展示的数据，这个跟第一条省份数据相关，我的第一条是北京市，所以需要columns中的三维数组，第一维度是省份数据数组，第二维度是市数据数组，第三维度是区数据数组
let province = []; //初始数据需要展示的省份 let province = []; //初始数据需要展示的省份
let province1 = [{ let province1 = [{
@@ -208,7 +217,7 @@
this.columns.push(province1); this.columns.push(province1);
this.columns.push(province2); this.columns.push(province2);
// console.log(6666666,this.columns)
// 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组 // 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组
// 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据 // 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据
@@ -237,11 +246,14 @@
this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市 this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市
}); });
}; // };
}) // }).catch(e => {
// console.log(e,'e')
// })
}, },
changeHandler(e) { //城市选择时触发 changeHandler(e) { //城市选择时触发
console.log(e,'变化了',this.columnData, this.columnDatas)
this.addressChanged = true this.addressChanged = true
const { const {
columnIndex, //当前选择的列，省 / 市 / 区 columnIndex, //当前选择的列，省 / 市 / 区
@@ -253,7 +265,8 @@
} = e; } = e;
// 当第一列值发生变化时，变化第二列和第三列的值（省份变更，市和区跟着变更） // 当第一列值发生变化时，变化第二列和第三列的值（省份变更，市和区跟着变更）
if (columnIndex === 0) { // 判断当前变更的是省还是市还是区 if (columnIndex === 0) { // 判断当前变更的是省还是市还是区
// picker为选择器this实例，变化第二列对应的选项 // picker为选择器this实例，变化第二列对应的选项
picker.setColumnValues(1, this.columnData[ picker.setColumnValues(1, this.columnData[
index]); //设置市为该省下面的所有市，index是当前省在省份数组的下标，对应市数组中的下表就是 该省下面的所有市 的数据 index]); //设置市为该省下面的所有市，index是当前省在省份数组的下标，对应市数组中的下表就是 该省下面的所有市 的数据
picker.setColumnValues(2, this.columnDatas[index][0]); // 设置区域为该省下面第一个市下面的所有区域 picker.setColumnValues(2, this.columnDatas[index][0]); // 设置区域为该省下面第一个市下面的所有区域
@@ -265,6 +278,7 @@
}, },
addconfirm(e) { //点击确定按钮 addconfirm(e) { //点击确定按钮
console.log(e,'选中的值')
this.addressChanged = true this.addressChanged = true
this.addreShow = false; this.addreShow = false;
this.addressForm.areaidpathtext = e.value[0].UName + '-' + e.value[1].UName + '-' + e.value[2].UName this.addressForm.areaidpathtext = e.value[0].UName + '-' + e.value[1].UName + '-' + e.value[2].UName
@@ -402,6 +416,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.flexbox{display: flex;}
.selectAdd{ justify-content: space-between;
.addItem{ display: block;width: 30%}
}
.add_arrow { .add_arrow {
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;

23241
static/json/address.json Normal file
View File

File diff suppressed because it is too large Load Diff