Merge branch 'zfb' into 'dev'

Zfb

See merge request quanshu/mp-ui-user!36

src/packageGoods/goods/list.vue

@@ -21,7 +21,7 @@
 					<text>销量</text>
 				</view>
 				<view class="fixed-top-choice-item flex" :class="{ 'action': choiceIndex == 3 }" @click="changeChice(3)">
-					<text>价格</text>
+					<text>盲豆价格</text>
 					<view class="icon flex" v-if="choiceIndex == 3">
 						<image src="../static/list_up.png" mode="scaleToFill" v-if="priceShow" />
 						<image src="../static/list_down.png" mode="scaleToFill" v-else />
@@ -50,7 +50,7 @@
 						
 						<view class="content-coin flex">
 							<view class="content-coin__left flex">
-								<image src="../../static/public/goods_coin.png" mode=""></image>
+								<image src="../../static/public/goods_coin.png" mode="scaleToFill"></image>
 								<view class="num"><text>×</text>{{ item.exchangePrice }}</view>
 							</view>
 							<view class="content-coin__right" v-if="item.originPrice">{{ item.originPrice }}</view>
@@ -63,7 +63,7 @@
 		</view>
 		<view class="flex empty" v-if="!list.length">
 			<view class="center">
-				<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode=""></image>
+				<image class="center-img" src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/nodata_3.png" mode="scaleToFill"></image>
 				<view class="center-font">还没有商品</view>
 			</view>
 		</view>
@@ -166,7 +166,7 @@
 			if (this.total > this.pageNum * 20) {
 				setTimeout(() => {
 					++this.pageNum
-					this.pageList()
+					this.getList()
 				}, 500)
 			} else {
 				uni.$u.toast('已经到底了')

src/packagePrize/choice/index.vue

@@ -31,8 +31,15 @@
 					<view class="info flex" @click="selectPrize(index)">
 						<image :src="item.picUrl" mode="aspectFill"></image>
 						<view class="info-content flex">
+							<!-- #ifdef MP-ALIPAY -->
+							<view class="info-content__titletwo ells" v-if="item.prizeType && item.prizeType.value != 'coin'">{{ item.title }}</view>
+							<view class="info-content__titletwo ells" v-else>盲豆</view>
+							<!-- #endif -->
+							<!-- #ifndef MP-ALIPAY -->
 							<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>
+							<!-- #endif -->
+							
 							<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>
@@ -405,6 +412,13 @@
 							font-size: 30rpx;
 							line-height: 35rpx;
 						}
+						&__titletwo {
+							width: 100%;
+							height: 67rpx;
+							font-size: 30rpx;
+							line-height: 35rpx;
+							overflow: hidden;
+						}
 						
 						&__price {
 							font-weight: bold;

src/packagePrize/ticket/index.vue

@@ -36,7 +36,12 @@
 						<view class="bottom-btn" @click="toChoice(item)">立即兑奖</view>
 					</view>
 					<view class="bottom" v-else>
+						<!-- #ifdef MP-ALIPAY -->
+						<view class="bottom-pricetwo ells-one">奖品：<text>{{ item.prizeInfo || '-' }}</text></view>
+						<!-- #endif -->
+						<!-- #ifndef MP-ALIPAY -->
 						<view class="bottom-price ells-one">奖品：<text>{{ item.prizeInfo || '-' }}</text></view>
+						<!-- #endif -->
 					</view>
 				</view>
 			</view>
@@ -246,6 +251,16 @@
 							color: #F9822C ;
 						}
 					}
+					&-pricetwo {
+						height: 25rpx;
+						overflow: hidden;
+						font-size: 26rpx;
+						line-height: 26rpx;
+						
+						text {
+							color: #F9822C ;
+						}
+					}
 					
 					&-btn {
 						width: 220rpx;

src/pages/core/index.vue

@@ -30,7 +30,7 @@
 						<view class="num">{{ initData.coinNum ? `${ initData.coinNum }` : '--' }}</view>
 					</view>
 					<view class="fixed-top-screen-content__item flex" @click="changeScreen(1)">
-						<view class="title">价格</view>
+						<view class="title">盲豆价格</view>
 						<view class="select flex" v-if="screenIndex == 1">
 							<image src="../../static/core/core_up.png" mode="scaleToFill" v-if="priceShow" />
 							<image src="../../static/core/core_down.png" mode="scaleToFill" v-else />