帮助中心

main
fanfan 7 months ago
parent 92dd501e9e
commit b47fc32654
  1. 4
      manifest.json
  2. 57
      pages/activity/seckill.vue
  3. 3
      pages/news/rules/index.vue
  4. 4
      pages/order/detail.vue
  5. 6
      pages/order/index.vue

@ -92,11 +92,7 @@
"quickapp" : {},
/* */
"mp-weixin" : {
<<<<<<< HEAD
"appid" : "wxe843b6d7a4bd3389",
=======
"appid" : "wxa3127ed5c3542a28",
>>>>>>> beac19d5a037464834b39080367b0ebe8183fee7
"libVersion" : "latest",
"setting" : {
// TLS

@ -9,17 +9,22 @@
<view class="limitTitle">
<image src="/static/seckill/limit.png" mode="" class="img"></image>
</view>
<view class="time" v-if="tabbar.length">
<view class="timeItem" v-for="(item,index) in tabbar" :key="index">
<view class="num">
{{item.active_time}}
</view>
<view class="desc">
{{item.status_text}}
<scroll-view class="typeList" scroll-x="true">
<view class="" style="display: flex;">
<view class="timeItem" v-for="(item,index) in tabbar" :key="index">
<view class="num">
{{item.active_time}}
</view>
<view class="desc">
{{item.status_text}}
</view>
</view>
</view>
</view>
</scroll-view>
</view>
</view>
<view class="main">
<view class="over" v-if="tabbar.length">
@ -125,7 +130,7 @@
background: 'url(https://www.royaum.com.cn/static/rank/rank1.png) center top no-repeat',
backgroundSize: '100% auto',
},
backgroundImg:'',
backgroundImg: '',
}
},
/**
@ -159,8 +164,8 @@
.then(result => {
app.tabbar = result.data.tabbar;
app.goodsList = result.data.goodsList.data
if(app.goodsList && app.goodsList.length > 0){
app.goodsList.map(a=>{
if (app.goodsList && app.goodsList.length > 0) {
app.goodsList.map(a => {
a.original_price = Number(a.original_price)
a.seckill_price_max = Number(a.seckill_price_max)
a.seckill_price_min = Number(a.seckill_price_min)
@ -244,13 +249,16 @@
//
handleTargetGoods(sharpGoodsId) {
let count_down_time = new Date(this.tabbar[this.curTabIndex].count_down_time.replace(/-/g, '/')).getTime()-new Date().getTime()
let count_down_time = new Date(this.tabbar[this.curTabIndex].count_down_time.replace(/-/g, '/'))
.getTime() - new Date().getTime()
uni.navigateTo({
url: '/pages/goods/detail?goodsId=' + sharpGoodsId+"&isSeckill="+true+'&isBuy='+count_down_time+'&seckillText='+(this.tabbar[this.curTabIndex].status == this.ActiveStatusEnum.STATE_BEGIN.value ? '结束' : '开始' )
url: '/pages/goods/detail?goodsId=' + sharpGoodsId + "&isSeckill=" + true + '&isBuy=' +
count_down_time + '&seckillText=' + (this.tabbar[this.curTabIndex].status == this
.ActiveStatusEnum.STATE_BEGIN.value ? '结束' : '开始')
})
},
//
setWxofficialShareData() {
this.updateShareCardData({
@ -325,13 +333,18 @@
.time {
display: flex;
align-items: center;
width: 100%;
justify-content: space-around;
padding: 0 24rpx;
align-items: center;
z-index: 30;
.typeList {
white-space: nowrap;
}
.timeItem {
margin-right: 15rpx;
.num {
width: 150rpx;
width: 135rpx;
font-size: 28rpx;
font-weight: 500;
color: #FFFFFF;
@ -342,7 +355,7 @@
}
.desc {
width: 150rpx;
width: 135rpx;
height: 36rpx;
background: #FFFFFF;
border-radius: 62rpx 62rpx 62rpx 62rpx;
@ -412,6 +425,7 @@
.goodsList {
overflow: hidden;
.goodItem {
width: 686rpx;
height: 342rpx;
@ -422,10 +436,12 @@
padding: 48rpx 32rpx 36rpx 0;
margin: 0 auto;
margin-top: 22rpx;
.itemImg {
width: 258rpx;
height: 258rpx;
margin-right: 10rpx;
.goodsImg {
width: 100%;
height: 100%;
@ -456,6 +472,7 @@
.info {
display: flex;
.price {
height: 40rpx;
font-size: 28rpx;
@ -474,6 +491,7 @@
background-image: url('https://www.royaum.com.cn/static/seckill/bottom.png');
background-size: 100% 100%;
margin: 0 12rpx 0 14rpx;
.delText {
width: 132rpx;
text-align: center;
@ -520,7 +538,8 @@
font-weight: 500;
color: #FF423D;
margin-left: 26rpx;
text{
text {
font-size: 36rpx;
}
}

@ -3,8 +3,7 @@
<view class="header">
<u-navbar is-back="false" :title="title" ></u-navbar>
</view>
<view class="content">
<rich-text :nodes="strings"></rich-text>
<view class="content" v-html="strings">
</view>
</view>
</template>

@ -148,7 +148,7 @@
v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
</view>
<view class="cancel" @click="onCancel(order.order_id)"
v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.PENDING.value">
取消订单
</view>
</view>
@ -273,7 +273,7 @@
v-if="order.order_status == OrderStatusEnum.COMPLETED.value">
删除订单
</view>
<view class="" v-if="order.pay_status == PayStatusEnum.PENDING.value" @click="onCancel(order.order_id)">
<view class="" v-if="order.order_status == OrderStatusEnum.NORMAL.value && order.pay_status == PayStatusEnum.PENDING.value" @click="onCancel(order.order_id)">
取消订单
</view>
</view>

@ -54,15 +54,15 @@
<view class="mask" @click="changeMenu(index)">
</view>
<view class="menulist">
<view class="" v-if="item.order_status == OrderStatusEnum.COMPLETED.value"
<view class="" v-if="item.order_status == OrderStatusEnum.COMPLETED.value &&item.pay_status == PayStatusEnum.SUCCESS.value"
@click="onInvoicing(item.order_id,item)">
申请开票
</view>
<view class="" @click="onDelete(item.order_id)"
v-if="item.order_status == OrderStatusEnum.COMPLETED.value">
v-if="item.order_status == OrderStatusEnum.COMPLETED.value && item.pay_status == PayStatusEnum.SUCCESS.value">
删除订单
</view>
<view class="" v-if="item.pay_status == PayStatusEnum.PENDING.value"
<view class="" v-if="item.pay_status == PayStatusEnum.PENDING.value && item.order_status == OrderStatusEnum.NORMAL.value"
@click="onCancel(item.order_id)">
取消订单
</view>

Loading…
Cancel
Save