diff --git a/components/print/index.js b/components/print/index.js index 9f4e328..7c37c9c 100644 --- a/components/print/index.js +++ b/components/print/index.js @@ -158,9 +158,9 @@ printerJobs.setSize(1, 1).print(this.delNode(data1.goodsList[i].specs)); } printerJobs.setSize(2, 2); - printerJobs.setAlign('lt').text('¥ ',data1.goodsList[i].price); + printerJobs.setAlign('lt').text('¥'+data1.goodsList[i].price); - printerJobs.text(" "); + printerJobs.text(" "); printerJobs.print('X' + data1.goodsList[i].quantity); @@ -175,7 +175,7 @@ printerJobs.setSize(1, 1).print(printerUtil.fillLine('-', 1, 32)); - printerJobs.setAlign('lt').print('商品取到后,如有任何商品问题,请及时联系商家和平台,客服将为您服务,客服电话 15533910775,谢谢您的惠顾'); + printerJobs.setAlign('lt').print('商品取到后,如有任何商品问题,请及时联系商家和平台,客服将为您服务,谢谢您的惠顾'); printerJobs.lineFeed(3); diff --git a/components/tab-bar/delivery.vue b/components/tab-bar/delivery.vue index 16ee60d..490630e 100644 --- a/components/tab-bar/delivery.vue +++ b/components/tab-bar/delivery.vue @@ -39,6 +39,7 @@ {{'#' + item.numberCode}} + 秒杀 {{item.createTime | formatISOTime}} @@ -289,6 +290,9 @@ isFaceDeliveryOrder(item) { return !!item && item.deliveryType == 1 && item.orderType == 3 }, + isSeckillOrder(item) { + return !!item && item.seckillOrder == 1 + }, handleStartDateChange(e) { const value = e.detail.value if (this.searchForm.endDate && value > this.searchForm.endDate) { @@ -930,6 +934,19 @@ padding-bottom: 16rpx; border-bottom: 1px solid #eef2ef; } + .seckill-order-tag { + display: inline-block; + height: 42rpx; + line-height: 42rpx; + padding: 0 16rpx; + margin: 0 0 8rpx 10rpx; + border-radius: 999rpx; + background: linear-gradient(90deg, #ff3d2e, #ff9d2f); + color: #fff; + font-size: 24rpx; + font-weight: 800; + } + .group-order-code { flex: 1; color: #00231C; diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue index 47b6bcb..419c76d 100644 --- a/components/tab-bar/myCenter.vue +++ b/components/tab-bar/myCenter.vue @@ -122,20 +122,20 @@ }, logOut() { uni.clearStorage() - // this.getRegistrationID() + this.getRegistrationID() getApp().globalData.userinfo = '' uni.reLaunch({ url: '../login/login' }) }, - // getRegistrationID() { //获取registerID - // jpushModule.getRegistrationID(result => { - // let registerID = result.registerID + getRegistrationID() { //获取registerID + jpushModule.getRegistrationID(result => { + let registerID = result.registerID - // uni.setStorageSync("registerID", registerID) + uni.setStorageSync("registerID", registerID) - // }) - // }, + }) + }, navigatorTo(e){ let url = "" if(e=='addgoods'){