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-10 17:41:07 +08:00
parent 96f7e499db
commit 9a5afe03d3
15 changed files with 575 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pages/bookShop/commodityDetail.vue
View File

@@ -109,10 +109,10 @@
</u-row>
</view>
<!-- <view class="commodityIntroduce" v-html="productInfo.productDetails"> -->
<view class="commodityIntroduce">
<view class="commodityIntroduce">
<view v-if="productInfo.productDetails">
<rich-text v-if="productInfo.productDetails" class="xiangqing"
:nodes="productInfo.productDetails|formatRichText"></rich-text>
<rich-text v-if="productInfo.productDetails" class="xiangqing"
:nodes="productInfo.productDetails|formatRichText" ></rich-text>
</view>
</view>
</view>
@@ -206,7 +206,6 @@
<music-play :playData="playData"></music-play>
</view>
</template>
<script>
import musicPlay from '@/components/music.vue'
import emojiList1 from '../../bkhumor-emojiplus/emoji/biaoqin.js'
@@ -214,7 +213,7 @@
import {
mapState
} from 'vuex';
import loginVue from '../user/login.vue';
import loginVue from '../user/login.vue';
export default {
data() {
return {
@@ -270,7 +269,7 @@
components: {
musicPlay
},
methods: {
methods: {
gotoDetail(item) {
// console.log(item,'gotoDetail')
uni.navigateTo({
@@ -682,7 +681,7 @@
}
},
formatRichText(html) { //控制小程序中图片大小
formatRichText(html) { //控制图片大小
let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');

125
pages/bookShop/orderLCont.vue
View File

@@ -35,6 +35,10 @@
<view class="orderList">
<view class="orderItem">
<!-- <view class="guoqi flexbox" v-if="orderContet.orderStatus==0 && orderContet.overTime > 0">
<text>剩余支付时间：</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>
</view> -->
<view class="orderContent" v-for="(item,index) in orderContet.products" :key="index"
@click="goDetail(item.productId)" v-if="orderContet.products!=''">
<image :src="item.image" mode=""></image>
@@ -106,7 +110,7 @@
<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="opCan" @click="goPay">去支付</view>
<view v-if="orderContet.orderStatus==0" class="opCan" @click="goPay(orderContet)">去支付</view>
<view class="opCan" @click="kefu">联系客服</view>
@@ -174,7 +178,7 @@
import $http from '@/config/requestConfig.js';
import {
setPay,
setPayAssign
setPayAssign,setWXPay
} from '@/config/utils';
import {
mapState
@@ -245,7 +249,12 @@
...mapState(['userInfo']),
},
methods: {
methods: {
// 倒计时回调
countDown(){
console.log('重新刷新订单')
this.getOrderList()
},
// 获得输入的表情数组
handleEmj(i) {
console.log(i,'i---------');
@@ -523,7 +532,11 @@
.post(`book/buyorder/appGetOrderInfo/${this.orderType}?orderId=${this.orderID}`)
.then(res => {
console.log('res+++',res)
this.orderContet = res.buyOrder
var seconds = res.buyOrder.timestamp + 30 * 60 + 2 // 过期时间
var nowSeconds = Math.floor(new Date().getTime() / 1000);
res.buyOrder.overTime = seconds - nowSeconds
this.orderContet = res.buyOrder
this.userRecordid = res.userRecordid
this.productIDs = res.buyOrder.products.map(item => {
return item.productId
@@ -538,9 +551,8 @@
} else if (this.orderContet.orderStatus == 3) {
this.titleStat = '已完成'
}
// if (this.orderType == 2) {
// this.getdeliverDetails()
// }
console.log(this.orderContet,'订单详情')
})
},
// 获取物流
@@ -592,28 +604,84 @@
// 支付
goPay() {
setPay({
typePay: 'alipay',
subject: 'order',
totalAmount: this.orderContet.realMoney,
type: 2,
relevanceoid: this.orderContet.orderSn,
customerId: this.userInfo.id,
}, res => {
if (res.success) {
uni.showToast({
title: "支付成功"
});
} else {
uni.showToast({
title: "支付失败",
icon: "none",
image: '../../static/icon/ic_close.png'
});
goPay(payItem) {
console.log(payItem,'订单数据')
if(payItem.paymentMethod == 2){
console.log('阿里支付')
setPay({
typePay: 'alipay',
subject: 'order',
totalAmount: payItem.realMoney,
type: 2,
relevanceoid: payItem.orderSn,
customerId: this.userInfo.id,
}, 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) {
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'
});
}
}
})
}
this.getOrderList()
})
}else if(payItem.paymentMethod == 3){
// 苹果充值
console.log('苹果二次支付')
if(this.isAndorid){
uni.showModal({
title:'提示',
showCancel:false,
content:'很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单'
})
}else{
this.iphonepay(payItem)
}
}
},
// 商品内容跳转
@@ -627,6 +695,7 @@
</script>
<style lang="scss" scoped>
.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;}
.starGray{ background : url(../../static/icon/star_greey.png) no-repeat; background-size: contain; }
.starLight{ background : url(../../static/icon/star_light.png) no-repeat; background-size: contain;}

50
pages/bookShop/orderList.vue
View File

@@ -10,12 +10,17 @@
:class="orderListTab==item.value?'ordStyle':''">{{item.name}}</view>
</view>
<view class="orderList">
<view class="orderList" v-if="orderList.length > 0">
<view class="orderItem" v-for="(ifex,inten) in orderList">
<text class="orderState orderState0" v-if="ifex.orderStatus==0">待支付</text>
<text class="orderState orderState1" v-if="ifex.orderStatus==1">待发货</text>
<text class="orderState orderState2" v-if="ifex.orderStatus==2">待收货</text>
<text class="orderState orderState3" v-if="ifex.orderStatus==3">已完成</text>
<text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text>
<view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0">
<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>
</view>
<view class="flexbox orderSn">
<text class="">订单编号: {{ifex.orderSn}}</text>
</view>
@@ -72,6 +77,9 @@
</view>
</view>
</view>
<view class="" v-else style=" margin-top: 250rpx;">
<u-divider text="暂无列表数据"></u-divider>
</view>
<z-navigation></z-navigation>
<music-play :playData="playData"></music-play>
</view>
@@ -106,7 +114,11 @@ import {
}, {
name: '已完成',
value: 3
}],
},{
name: '已超时',
value: 5
},
],
orderListTab: 9,
orderList: [],
iapChannel:{},
@@ -119,6 +131,8 @@ import {
this.getOrderList()
this.checkIapOrders() //检查未完成的苹果支付订单
this.getOS()
// this.countDown()
},
computed: {
...mapState(['userInfo']),
@@ -133,6 +147,11 @@ import {
},
methods: {
...mapMutations(['setUserInfo']),
// 倒计时回调
countDown(){
console.log('重新刷新订单')
this.getOrderList()
},
// 获得操作系统
getOS(){
let oprateOs = ''
@@ -171,8 +190,17 @@ import {
getOrderList() {
this.$http
.post(`book/buyorder/appUserGetlist?userId=${this.userInfo.id}&orderStatus=${this.orderListTab}`)
.then(res => {
.then(res => {
res.page.list.forEach((item,index) => {
var seconds = item.timestamp + 30 * 60 + 2 // 过期时间 30分钟+2
// var seconds = item.timestamp + 30 + 2 // 过期时间 30秒
var nowSeconds = Math.floor(new Date().getTime() / 1000); // 单位秒
item.overTime = seconds - nowSeconds
// console.log(item.overTime,'item.overTime')
})
this.orderList = res.page.list
console.log(this.orderList,'订单列表')
})
},
@@ -510,16 +538,15 @@ import {
<style lang="scss" scoped>
@import '@/style/mixin.scss';
.guoqi{ font-size: 28rpx; align-items: center; color: red; float: right; line-height: 40rpx;}
.flexbox{display: flex;}
.orderTabs {
margin: 100rpx 0 0 0;
width: 100%;
padding: 0 3% 3% 3%;
.orderTabs {
margin: 60rpx 0 0 0;
width: 100%;
padding: 30rpx 3% 3% 3%;
// padding-top: 100rpx;
position: fixed;
top: 80rpx;
top: 80rpx;
background-color: #fff;
z-index: 100;
@@ -566,6 +593,7 @@ import {
.orderState1{background-color: #409eff;}
.orderState2{background-color: #f56c6c;}
.orderState3{background-color: #67c23a;}
.orderState5{background-color: #787878;}
.orderContent {
margin-bottom: 20rpx;

16
pages/comments/commentsList.vue
View File

@@ -1,5 +1,7 @@
<template>
<view class="container">
<!-- 公共组件-每个页面必须引入 -->
<public-module></public-module>
<view class="header">
<!-- 顶部导航栏 -->
<z-nav-bar title="书评列表"></z-nav-bar>
@@ -138,7 +140,7 @@
import musicPlay from '@/components/music.vue'
import { data } from 'jquery';
import {
mapState
mapState, mapMutations
} from 'vuex';
export default {
data() {
@@ -216,6 +218,7 @@ import { data } from 'jquery';
...mapState(['userInfo']),
},
methods: {
...mapMutations(['setLoadingShow']),
setData(e) {
this.contentShow = e
this.getBookList(this.commentsListTab, true)
@@ -292,9 +295,10 @@ import { data } from 'jquery';
},
getBookList(flag, tushuflag){
// 根据tab不同，获取最新书评、最热书评、书集列表
uni.showLoading({
title: '加载中'
});
// uni.showLoading({
// title: '加载中'
// });
var httpurl = ""
if(flag == 1){
httpurl = "forum/articles/getForumsNew?page=" + this.newestpage + '&limit=10'
@@ -351,8 +355,8 @@ import { data } from 'jquery';
this.status = 1
} else {
this.status = 0
}
uni.hideLoading();
}
// uni.hideLoading();
}).catch((e)=>{
console.log(e,'e')
})

7
pages/peanut/home.vue
View File

@@ -366,7 +366,8 @@
},
//方法
methods: {
...mapMutations(['setUserInfo']),
...mapMutations(['setUserInfo']),
// ...mapMutations(['setLoadingShow']),
// 获取商品标签
getTags() {
this.loadingNow = false
@@ -408,8 +409,8 @@
}else{
this.tjProList = []
this.totalPage = 0
}
}).catch(e => {
}
}).catch(e => {
console.log(e,'e')
});
},