wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

帮助中心

Browse Source
main
fanfan 7 months ago
parent 92dd501e9e
commit b47fc32654
5 changed files with 44 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      manifest.json
  2. 41
      pages/activity/seckill.vue
  3. 3
      pages/news/rules/index.vue
  4. 4
      pages/order/detail.vue
  5. 6
      pages/order/index.vue

4
manifest.json
Unescape View File

@ -92,11 +92,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
<<<<<<< HEAD
"appid" : "wxe843b6d7a4bd3389",
=======
"appid" : "wxa3127ed5c3542a28", "appid" : "wxa3127ed5c3542a28",
>>>>>>> beac19d5a037464834b39080367b0ebe8183fee7
"libVersion" : "latest", "libVersion" : "latest",
"setting" : { "setting" : {
// 是否检查安全域名和 TLS 版本 // 是否检查安全域名和 TLS 版本

41
pages/activity/seckill.vue
Unescape View File

@ -9,7 +9,10 @@
<view class="limitTitle"> <view class="limitTitle">
<image src="/static/seckill/limit.png" mode="" class="img"></image> <image src="/static/seckill/limit.png" mode="" class="img"></image>
</view> </view>
<view class="time" v-if="tabbar.length"> <view class="time" v-if="tabbar.length">
<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="timeItem" v-for="(item,index) in tabbar" :key="index">
<view class="num"> <view class="num">
{{item.active_time}} {{item.active_time}}
@ -18,8 +21,10 @@
{{item.status_text}} {{item.status_text}}
</view> </view>
</view> </view>
</view> </view>
</scroll-view>
</view>
</view> </view>
<view class="main"> <view class="main">
<view class="over" v-if="tabbar.length"> <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', background: 'url(https://www.royaum.com.cn/static/rank/rank1.png) center top no-repeat',
backgroundSize: '100% auto', backgroundSize: '100% auto',
}, },
backgroundImg:'', backgroundImg: '',
} }
}, },
/** /**
@ -159,8 +164,8 @@
.then(result => { .then(result => {
app.tabbar = result.data.tabbar; app.tabbar = result.data.tabbar;
app.goodsList = result.data.goodsList.data app.goodsList = result.data.goodsList.data
if(app.goodsList && app.goodsList.length > 0){ if (app.goodsList && app.goodsList.length > 0) {
app.goodsList.map(a=>{ app.goodsList.map(a => {
a.original_price = Number(a.original_price) a.original_price = Number(a.original_price)
a.seckill_price_max = Number(a.seckill_price_max) a.seckill_price_max = Number(a.seckill_price_max)
a.seckill_price_min = Number(a.seckill_price_min) a.seckill_price_min = Number(a.seckill_price_min)
@ -244,9 +249,12 @@
// 跳转到秒杀商品详情 // 跳转到秒杀商品详情
handleTargetGoods(sharpGoodsId) { 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({ 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 ? '结束' : '开始')
}) })
}, },
@ -325,13 +333,18 @@
.time { .time {
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%; padding: 0 24rpx;
justify-content: space-around; align-items: center;
z-index: 30; z-index: 30;
.typeList {
white-space: nowrap;
}
.timeItem { .timeItem {
margin-right: 15rpx;
.num { .num {
width: 150rpx; width: 135rpx;
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
@ -342,7 +355,7 @@
} }
.desc { .desc {
width: 150rpx; width: 135rpx;
height: 36rpx; height: 36rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 62rpx 62rpx 62rpx 62rpx; border-radius: 62rpx 62rpx 62rpx 62rpx;
@ -412,6 +425,7 @@
.goodsList { .goodsList {
overflow: hidden; overflow: hidden;
.goodItem { .goodItem {
width: 686rpx; width: 686rpx;
height: 342rpx; height: 342rpx;
@ -422,10 +436,12 @@
padding: 48rpx 32rpx 36rpx 0; padding: 48rpx 32rpx 36rpx 0;
margin: 0 auto; margin: 0 auto;
margin-top: 22rpx; margin-top: 22rpx;
.itemImg { .itemImg {
width: 258rpx; width: 258rpx;
height: 258rpx; height: 258rpx;
margin-right: 10rpx; margin-right: 10rpx;
.goodsImg { .goodsImg {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -456,6 +472,7 @@
.info { .info {
display: flex; display: flex;
.price { .price {
height: 40rpx; height: 40rpx;
font-size: 28rpx; font-size: 28rpx;
@ -474,6 +491,7 @@
background-image: url('https://www.royaum.com.cn/static/seckill/bottom.png'); background-image: url('https://www.royaum.com.cn/static/seckill/bottom.png');
background-size: 100% 100%; background-size: 100% 100%;
margin: 0 12rpx 0 14rpx; margin: 0 12rpx 0 14rpx;
.delText { .delText {
width: 132rpx; width: 132rpx;
text-align: center; text-align: center;
@ -520,7 +538,8 @@
font-weight: 500; font-weight: 500;
color: #FF423D; color: #FF423D;
margin-left: 26rpx; margin-left: 26rpx;
text{
text {
font-size: 36rpx; font-size: 36rpx;
} }
} }

3
pages/news/rules/index.vue
Unescape View File

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

4
pages/order/detail.vue
Unescape View File

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

6
pages/order/index.vue
Unescape View File

@ -54,15 +54,15 @@
<view class="mask" @click="changeMenu(index)"> <view class="mask" @click="changeMenu(index)">
</view> </view>
<view class="menulist"> <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)"> @click="onInvoicing(item.order_id,item)">
申请开票 申请开票
</view> </view>
<view class="" @click="onDelete(item.order_id)" <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>
<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)"> @click="onCancel(item.order_id)">
取消订单 取消订单
</view> </view>

Write Preview
Loading…
Cancel
Save