Browse Source

修改倒计时不显示,以及微信支付的问题

master
anhaogxs 4 years ago
parent
commit
3b76e7754b
  1. 170
      components/CountDown.vue
  2. 2
      pages/activity/BargainRecord/index.vue
  3. 2
      pages/activity/GroupDetails/index.vue
  4. 5
      pages/activity/GroupRule/index.vue
  5. 9
      pages/order/OrderSubmission/index.vue

170
components/CountDown.vue

@ -12,93 +12,101 @@
</view> </view>
</template> </template>
<script> <script>
export default { export default {
name: "CountDown", name: 'CountDown',
props: { props: {
// //
tipText: { tipText: {
type: String, type: String,
default: "倒计时" default: '倒计时',
}, },
dayText: { dayText: {
type: String, type: String,
default: "天" default: '天',
}, },
hourText: { hourText: {
type: String, type: String,
default: "时" default: '时',
},
minuteText: {
type: String,
default: "分"
},
secondText: {
type: String,
default: "秒"
},
datatime: {
type: Number,
default: 0
},
isDay: {
type: Boolean,
default: true
}
}, },
data: function () { minuteText: {
return { type: String,
day: "00", default: '分',
hour: "00",
minute: "00",
second: "00"
};
}, },
created: function () { secondText: {
this.show_time(); type: String,
default: '秒',
}, },
mounted: function () {}, datatime: {},
methods: { isDay: {
show_time: function () { type: Boolean,
let that = this; default: true,
},
},
data: function () {
return {
time: null,
day: '00',
hour: '00',
minute: '00',
second: '00',
}
},
created: function () {
this.show_time()
},
mounted: function () {},
methods: {
show_time: function () {
let that = this
function runTime() { if (parseInt(this.datatime).length == 13) {
// //
let intDiff = that.datatime - Date.parse(new Date()) / 1000; // console.log('毫秒')
let day = 0, this.datatime = this.datatime / 1000
hour = 0, } else if (parseInt(this.datatime).length == 10) {
minute = 0, console.log('秒')
second = 0; //
if (intDiff > 0) { } else {
// //
if (that.isDay === true) { console.log('时间')
day = Math.floor(intDiff / (60 * 60 * 24)); this.datatime = Date.parse(this.datatime) / 1000
} else { }
day = 0;
} function runTime() {
hour = Math.floor(intDiff / (60 * 60)) - day * 24; console.log(that.datatime)
minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60; //
second = let intDiff = that.datatime - Date.parse(new Date()) / 1000 //
Math.floor(intDiff) - let day = 0,
day * 24 * 60 * 60 - hour = 0,
hour * 60 * 60 - minute = 0,
minute * 60; second = 0
if (hour <= 9) hour = "0" + hour; if (intDiff > 0) {
if (minute <= 9) minute = "0" + minute; //
if (second <= 9) second = "0" + second; if (that.isDay === true) {
that.day = day; day = Math.floor(intDiff / (60 * 60 * 24))
that.hour = hour;
that.minute = minute;
that.second = second;
} else { } else {
that.day = "00"; day = 0
that.hour = "00";
that.minute = "00";
that.second = "00";
} }
hour = Math.floor(intDiff / (60 * 60)) - day * 24
minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60
second = Math.floor(intDiff) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60
if (hour <= 9) hour = '0' + hour
if (minute <= 9) minute = '0' + minute
if (second <= 9) second = '0' + second
that.day = day
that.hour = hour
that.minute = minute
that.second = second
} else {
that.day = '00'
that.hour = '00'
that.minute = '00'
that.second = '00'
} }
runTime();
setInterval(runTime, 1000);
} }
} runTime()
}; setInterval(runTime, 1000)
},
},
}
</script> </script>

2
pages/activity/BargainRecord/index.vue

@ -14,7 +14,7 @@
:hourText="' 时 '" :hourText="' 时 '"
:minuteText="' 分 '" :minuteText="' 分 '"
:secondText="' 秒'" :secondText="' 秒'"
:datatime="item.datatime/1000" :datatime="item.datatime"
></count-down> ></count-down>
<view class="money font-color-red"> <view class="money font-color-red">
已砍至 已砍至

2
pages/activity/GroupDetails/index.vue

@ -72,7 +72,7 @@
<text class="font-color-red" v-text="item.count"></text> <text class="font-color-red" v-text="item.count"></text>
<text>人成团</text> <text>人成团</text>
</view> </view>
<count-down :isDay="true" :tipText="'剩余 '" :dayText="' 天 '" :hourText="' : '" :minuteText="' : '" :secondText="' '" :datatime="item.stopTime / 1000"></count-down> <count-down :isDay="true" :tipText="'剩余 '" :dayText="' 天 '" :hourText="' : '" :minuteText="' : '" :secondText="' '" :datatime="item.stopTime"></count-down>
</view> </view>
<view class="spellBnt" @click="groupRule(item.id)"> <view class="spellBnt" @click="groupRule(item.id)">
去拼单 去拼单

5
pages/activity/GroupRule/index.vue

@ -19,8 +19,9 @@
<view class="tui-group__box tui-mtop__20"> <view class="tui-group__box tui-mtop__20">
<tui-divider backgroundColor="#fff" width="70%" gradual > <tui-divider backgroundColor="#fff" width="70%" gradual >
<view class="tui-divider__content"> <view class="tui-divider__content">
<text v-if="pinkBool == 0">拼团失败</text> <text v-if="pinkBool == 0">进行中</text>
<text v-if="pinkBool == 1">拼团成功</text> <text v-if="pinkBool == 1">拼团成功</text>
<text v-if="pinkBool == -1">拼团失败</text>
</view> </view>
</tui-divider> </tui-divider>
<view class="tui-group__title" v-if="pinkBool == 0"> <view class="tui-group__title" v-if="pinkBool == 0">
@ -30,7 +31,7 @@
</view> </view>
<view class="tui-group-countdown" v-if="pinkBool == 0"> <view class="tui-group-countdown" v-if="pinkBool == 0">
<view class="tui-countdown-right">剩余</view> <view class="tui-countdown-right">剩余</view>
<count-down :isDay="true" :tipText="'倒计时 '" :dayText="' 天 '" :hourText="' 时 '" :minuteText="' 分 '" :secondText="' 秒'" :datatime="pinkT.stopTime / 1000"></count-down> <count-down :isDay="true" :tipText="'倒计时 '" :dayText="' 天 '" :hourText="' 时 '" :minuteText="' 分 '" :secondText="' 秒'" :datatime="pinkT.stopTime"></count-down>
<view class="tui-countdown-left">结束</view> <view class="tui-countdown-left">结束</view>
</view> </view>
<view class="tui-user__box"> <view class="tui-user__box">

9
pages/order/OrderSubmission/index.vue

@ -306,15 +306,13 @@ export default {
useIntegral() { useIntegral() {
this.computedPrice() this.computedPrice()
}, },
$yroute(n) {
if (n.name === NAME) this.getCartInfo()
},
shipping_type() { shipping_type() {
this.computedPrice() this.computedPrice()
}, },
}, },
onShow: function() { onLoad: function() {
let that = this let that = this
console.log('loadddddddd')
this.$store.dispatch('getUser', true) this.$store.dispatch('getUser', true)
that.getCartInfo() that.getCartInfo()
console.log(that.$yroute) console.log(that.$yroute)
@ -402,7 +400,8 @@ export default {
this.storeSelfMention = res.data.storeSelfMention this.storeSelfMention = res.data.storeSelfMention
this.computedPrice() this.computedPrice()
}) })
.catch(() => { .catch((error) => {
console.log(error)
uni.showToast({ uni.showToast({
title: '加载订单数据失败', title: '加载订单数据失败',
icon: 'none', icon: 'none',

Loading…
Cancel
Save