Merge branch 'master' of http://gitlab.mints-id.com/android/uniapp_vedio

vedio/components/coin-popup/coin-popup.vue

@@ -10,10 +10,20 @@
 					</view>
 					<view style="display: flex;flex-direction: column;align-items: center;margin-bottom: 20rpx;">
 						<view style="font-size: 38rpx;color: black;">超多精彩好剧一键解锁</view>
-						<view style="display: flex;flex-direction: row;margin-top: 10rpx;">
-							<view style="font-size: 28rpx;color: #644238;margin-top: 12rpx;">账户余额：</view>
-							<view style="font-size: 42rpx;color: red;font-weight: 777;">{{userBean.point}}</view>
-							<view style="font-size: 28rpx;color: #644238;margin-top: 12rpx;margin-left: 6rpx;">看点</view>
+						<view class="flex">
+							<view v-if="point>0" style="display: flex;flex-direction: row;margin-top: 10rpx;">
+								<view style="font-size: 28rpx;color: #644238;margin-top: 12rpx;">解锁本集：</view>
+								<view style="font-size: 42rpx;color: red;font-weight: 777;">{{point}}</view>
+								<view style="font-size: 28rpx;color: #644238;margin-top: 12rpx;margin-left: 6rpx;">看点
+								</view>
+							</view>
+							<view v-if="point>0" style="width: 60rpx;"></view>
+							<view style="display: flex;flex-direction: row;margin-top: 10rpx;">
+								<view style="font-size: 28rpx;color: #644238;margin-top: 12rpx;">账户余额：</view>
+								<view style="font-size: 42rpx;color: red;font-weight: 777;">{{userBean.point}}</view>
+								<view style="font-size: 28rpx;color: #644238;margin-top: 12rpx;margin-left: 6rpx;">看点
+								</view>
+							</view>
 						</view>
 					</view>
 					<view class="section">
@@ -67,6 +77,10 @@
 			show: {
 				type: Boolean,
 				default: false
+			},
+			point: {
+				type: [Number, String],
+				default: 0
 			}
 		},
 		data() {
@@ -172,7 +186,7 @@
 
 <style lang="scss">
 	.body {
-		padding: 20rpx 0 30rpx 0;
+		padding: 10rpx 0 30rpx 0;
 		border-radius: 20rpx 20rpx 0 0;
 		background-color: white;
 		display: flex;

vedio/pagesC/video/newVideoDetail.vue

@@ -106,7 +106,7 @@
 				</swiper>
 			</view>
 		</uni-popup>
-		<coin-popup :show="showCoinPop" @close="showCoinPop = false" @paySuccess="paySuccess">
+		<coin-popup :show="showCoinPop" :point="data.point" @close="showCoinPop = false" @paySuccess="paySuccess">
 		</coin-popup>
 	</view>
 </template>