lilei vor 2 Jahren
Ursprung
Commit
150fc44265
3 geänderte Dateien mit 25 neuen und 9 gelöschten Zeilen
  1. 1 1
      api/rewardRule.js
  2. 8 0
      api/shelf.js
  3. 16 8
      pagesA/digitalShelf/choosePartResult.vue

+ 1 - 1
api/rewardRule.js

@@ -28,4 +28,4 @@ export const getRewardRollList = (params) => {
     data: params,
     method: 'post'
   })
-}
+}

+ 8 - 0
api/shelf.js

@@ -298,4 +298,12 @@ export const savePriceShowEmployee = (params) => {
     data: params,
     method: 'post'
   })
+}
+// 下单后是否有红包奖励
+export const rewardOrderFindBySn = (params) => {
+  return request({
+    url: `shelf/rewardOrder/findByOrderSn`,
+    data: params,
+    method: 'post'
+  })
 }

+ 16 - 8
pagesA/digitalShelf/choosePartResult.vue

@@ -9,8 +9,8 @@
 						<text>{{statusText}}</text>
 					</view>
 					<view class="messageText" v-html="info&&info.shelfOrder&&info.shelfOrder.remindMessage||''"></view>
-					<view class="messageText" v-if="info&&info.shelfOrder&&info.shelfOrder.totalRewardAmount&&!showMask">
-						您已获得<text>{{info.shelfOrder.totalRewardAmount}}</text>元红包奖励,可在“更多-红包奖励”中查看
+					<view class="messageText" v-if="redPacketData&&redPacketData.totalRewardAmount&&!showMask">
+						您已获得<text>{{redPacketData.totalRewardAmount}}</text>元红包奖励,可在“更多-红包奖励”中查看
 					</view>
 					<!-- <view class="button-group"> -->
 						<!-- <button :hover-stop-propagation="true" @click="toScan" v-if="state == 1&&partList.length" class="back" size="mini">扫码拿货</button> -->
@@ -126,7 +126,7 @@
 				<view style="position: relative;">
 					<u-image src="/pagesA/static/hb.png" width="700" height="657" @click="showMask=false"></u-image>
 					<view style="font-size: 60rpx;color:#fff;position: absolute;top:50%;text-align: center;width: 100%;">
-						{{info&&info.shelfOrder&&info.shelfOrder.totalRewardAmount||'0.00'}} <text style="font-size: 26rpx;margin-left: 10rpx;">元</text>
+						{{redPacketData&&redPacketData.totalRewardAmount||'0.00'}} <text style="font-size: 26rpx;margin-left: 10rpx;">元</text>
 					</view>
 				</view>
 			</view>
@@ -137,7 +137,7 @@
 <script>
 	import uniIcons from "@/components/uni-icons/uni-icons.vue"
 	import moment from 'moment'
-	import { findBySnShelfOrder, takeGoods } from '@/api/shelf'
+	import { findBySnShelfOrder, takeGoods, rewardOrderFindBySn } from '@/api/shelf'
 	export default {
 	   name: 'choosePartResult',
 	   components: {
@@ -155,6 +155,7 @@
 			   current: 0,
 			   shelfOrderSn: '',
 			   showMask: false,
+			   redPacketData: null
 		   }
 	   },
 	   onLoad(option) { 
@@ -170,10 +171,8 @@
 			  this.shelfOrderSn = this.info.shelfOrder ? this.info.shelfOrder.shelfOrderSn : '';
 			  this.current = this.partList.length ? 0 : 1;
 			  
-			  // 有红包活动
-			  if(this.info.shelfOrder && this.info.shelfOrder.totalRewardAmount){
-				  this.showMask = true
-			  }
+			  // 是否有红包活动奖励
+			  this.getOrderRedReward()
 		  }else{
 			  this.statusText = '拿货失败'
 			  this.statusIcon = 'close-circle'
@@ -218,6 +217,15 @@
 			 	url:"/pagesA/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+this.shelfOrderSn
 			 })
 		 },
+		 // 盘点是否有红包奖励
+		 getOrderRedReward(){
+			 rewardOrderFindBySn({orderSn:this.shelfOrderSn}).then(res => {
+				 if(res.status == 200 && res.data){
+				 	this.showMask = true
+					this.redPacketData = res.data
+				 }
+			 })
+		 },
 		 // 一键拿货
 		 onceQh(item,index){
 		 	const _this = this