线下扫码兑奖流程修改，奖品页标题显示两行

src/packageGoods/goods/list.vue

@@ -5,7 +5,7 @@
 		<view class="fixed-top">
 			<!-- 搜索 -->
 			<view class="fixed-top-search flex">
-				<u-input v-model="title" @confirm="pageList()" confirmType="search" placeholder="请输入商品名称" border="none" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" />
+				<u-input v-model="title" @confirm="getList()" confirmType="search" placeholder="请输入商品名称" border="none" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399" />
 			</view>
 			<!-- 选择 -->
 			<view class="fixed-top-choice flex">
@@ -86,19 +86,20 @@
 				this.tagIds = opthios.tagIds
 				this.categoryId = Number(opthios.categoryId)
 			}
+			this.getList()
 		},
 		
 		onShow() {
-			this.pageList()
+			// this.pageList()
 		},
 		
 		methods: {
-			pageList() {
-				this.pageNum = 1
-				this.total = 0
-				this.list = []
-				this.getList()
-			},
+			// pageList() {
+			// 	this.pageNum = 1
+			// 	this.total = 0
+			// 	this.list = []
+			// 	this.getList()
+			// },
 			
 			// 商品列表
 			getList() {
@@ -149,7 +150,7 @@
 					this.priceShow = !this.priceShow
 					this.priceSort = this.priceShow ? 1 : 2
 				}
-				this.pageList()
+				this.getList()
 			},
 		},
 		

src/packageGoods/order/logistics.vue

@@ -51,11 +51,11 @@
 		
 		<!-- 物流信息 -->
 		<view class="logistics" v-if="deliverListData[listIndex][0].companyName && logistics!==''">
-			<!-- <u-steps current="0" direction="column" dot activeColor="#F9822C">
+			<u-steps current="0" direction="column" dot activeColor="#F9822C">
 				<u-steps-item :desc="item.context" :title="item.status + '  ' + item.time"
 					v-for="(item,index) in logistics">
 				</u-steps-item>
-			</u-steps> -->
+			</u-steps>
 		</view>
 		<view class="logistics" v-else-if="deliverListData[listIndex][0].companyName">
 			<view style="color: #b1b1b1;">

src/packageOther/about/index.vue

@@ -4,7 +4,7 @@
 		<view class="about">
 			<view class="flex about-logo">
 				<image src="../../static/public/logo.png" mode="scaleToFill"></image>
-				<view class="edition">v 2.1.1</view>
+				<view class="edition">v 2.1.2</view>
 			</view>
 			<view class="about-action">
 				<u-cell-group :border="false">

src/packagePrize/choice/index.vue

@@ -31,8 +31,8 @@
 					<view class="info flex" @click="selectPrize(index)">
 						<image :src="item.picUrl" mode="aspectFill"></image>
 						<view class="info-content flex">
-							<view class="info-content__title ells-one" v-if="item.prizeType && item.prizeType.value != 'coin'">{{ item.title }}</view>
-							<view class="info-content__title ells-one" v-else>盲豆</view>
+							<view class="info-content__title ells" v-if="item.prizeType && item.prizeType.value != 'coin'">{{ item.title }}</view>
+							<view class="info-content__title ells" v-else>盲豆</view>
 							<view class="info-content__price" v-if="item.prizeType && item.prizeType.value != 'coin'">￥{{ $numberFormat(item.value) }}</view>
 							<view class="info-content__price" v-else>{{ item.value }}个</view>
 						</view>

src/pages/lucky/index.vue

@@ -9,7 +9,8 @@
 					</view>
 					<view class="luck-info-content flex">
 						<view class="luck-info-content-num">
-							<image src="../../static/lucky/lucky_gkmp.png" mode="scaleToFill"></image>
+							<!-- <image src="../../static/lucky/lucky_gkmp.png" mode="scaleToFill" ></image> -->
+							<image src="../../static/lucky/zi.png" mode="scaleToFill"></image>
 						</view>
 						<view class="luck-info-content-img">
 							<view class="luck-info-content-img-word">
@@ -32,10 +33,11 @@
 							</view>
 						</view>
 						<view class="luck-info-content-btn" @click="pay" v-if="info.status == 1 && info.salePrice != 0">
-							支付{{ info.salePrice / 100 }}元 立即刮开盲票</view>
-						<view class="luck-info-content-btn" @click="payDetail"
-							v-else-if="info.status == 1 && info.salePrice == 0">收下盲票，立即刮开盲票</view>
-						<view class=" code" v-else>开奖啦!</view>
+							支付{{ info.salePrice / 100 }}元 立即购买并刮奖</view>
+						<view class="luck-info-content-btn" style="width: 500rpx;" @click="payDetail"
+							v-else-if="info.status == 1 && info.salePrice == 0">收下盲票，立即刮奖</view>
+						<!-- <view class=" code" v-else>开奖啦!</view> -->
+						<view class="luck-info-content-btn" style="width: 500rpx;" @click="toChoice" v-if="Choice">领取奖品</view>
 					</view>
 					<view class="luck-info-close flex">
 						<navigator open-type="exit" target="miniProgram" hover-class="none"
@@ -98,6 +100,8 @@
 				status: 2,
 				showAction: false,
 				infoimg: false,
+				Choice: false,
+				ChoiceData: '',
 			};
 		},
 
@@ -112,6 +116,8 @@
 				this.serialNo = obj.id
 				this.getDetail()
 			}
+			this.serialNo = 'TXH00173-0001-0000006'
+			this.getDetail()
 		},
 
 		methods: {
@@ -134,7 +140,6 @@
 								uni.redirectTo({
 									url: `/packagePrize/choice/index?id=${ res.data.ticketId }&type=offLine`
 								})
-
 							} else {
 								this.luckyShow = true
 								uni.showModal({
@@ -188,9 +193,8 @@
 							setTimeout(() => {
 								this.infoimg = true
 								setTimeout(() => {
-									uni.redirectTo({
-										url: `/packagePrize/choice/index?id=${ res.data.ticketId }&type=offLine`
-									})
+									this.ChoiceData = res.data.ticketId
+									this.Choice = true
 								}, 500)
 							}, 500)
 						} else {
@@ -211,9 +215,9 @@
 										setTimeout(() => {
 											this.infoimg = true
 											setTimeout(() => {
-												uni.redirectTo({
-													url: `/packagePrize/choice/index?id=${ res.data.ticketId }&type=offLine`
-												})
+												this.ChoiceData = res.data.ticketId
+												this.Choice = true
+												
 											}, 500)
 										}, 500)
 									}
@@ -229,6 +233,13 @@
 					uni.hideLoading();
 				})
 			},
+			
+			//跳转奖品页
+			toChoice(){
+				uni.redirectTo({
+					url: `/packagePrize/choice/index?id=${ this.ChoiceData }&type=offLine`
+				})
+			},
 
 			close() {
 				this.payShow = false