文字显示等调整

src/packageGoods/components/exchange-popup/exchange-popup.vue

@@ -8,7 +8,12 @@
 						<image class="image-goods" :src="payInfo.picUrl" mode="aspectFit"></image>
 					</view>
 					<view class="goods-left-content flex">
+						<!-- #ifdef MP-ALIPAY -->
+						<view class="goods-left-content__titletwo ells-one">{{ detailInfo.title }}</view>
+						<!-- #endif -->
+						<!-- #ifndef MP-ALIPAY -->
 						<view class="goods-left-content__title ells-one">{{ detailInfo.title }}</view>
+						<!-- #endif -->
 						<view class="goods-left-content__coin flex">
 							<image class="image-coin" src="../../../static/public/goods_coin.png" mode="scaleToFill"></image>
 							<view>× {{ payInfo.exValue }}</view>
@@ -209,6 +214,13 @@
 						height: 30rpx;
 						overflow: hidden;
 					}
+					&__titletwo {
+						font-size: 30rpx;
+						height: 28rpx;
+						line-height: 30rpx;
+						font-weight: bold;
+						overflow: hidden;
+					}
 					
 					&__coin {
 						color: #FA822C;

src/packageGoods/components/purchase-popup/purchase-popup.vue

@@ -8,7 +8,12 @@
 						<image class="image-goods" :src="payInfo.picUrl" mode="aspectFit"></image>
 					</view>
 					<view class="goods-left-content flex">
+						<!-- #ifdef MP-ALIPAY -->
+						<view class="goods-left-content__titletwo ells-one">{{ detailInfo.title }}</view>
+						<!-- #endif -->
+						<!-- #ifndef MP-ALIPAY -->
 						<view class="goods-left-content__title ells-one">{{ detailInfo.title }}</view>
+						<!-- #endif -->
 						<view class="goods-left-content__price">￥{{ $numberFormat(payInfo.price) }}</view>
 					</view>
 				</view>
@@ -199,6 +204,14 @@
 						font-weight: bold;
 					}
 					
+					&__titletwo {
+						overflow: hidden;
+						height: 28rpx;
+						font-size: 30rpx;
+						line-height: 30rpx;
+						font-weight: bold;
+					}
+					
 					&__price {
 						color: #FA822C;
 						font-size: 26rpx;

src/packageGoods/goods/list.vue

@@ -41,7 +41,13 @@
 						<image :src="item.picUrl" mode="aspectFit"></image>
 					</view>
 					<view class="content">
+						<!-- #ifdef MP-ALIPAY -->
+						<view class="content-titletwo ells-one">{{ item.title }}</view>
+						<!-- #endif -->
+						<!-- #ifndef MP-ALIPAY -->
 						<view class="content-title ells-one">{{ item.title }}</view>
+						<!-- #endif -->
+						
 						<view class="content-coin flex">
 							<view class="content-coin__left flex">
 								<image src="../../static/public/goods_coin.png" mode=""></image>
@@ -259,13 +265,19 @@
 						font-size: 28rpx;
 						line-height: 28rpx;
 						font-weight: bold;
-						margin-bottom: 30rpx;
+					}
+					&-titletwo {
+						height: 27rpx;
+						font-size: 28rpx;
+						line-height: 28rpx;
+						font-weight: bold;
 					}
 					
 					&-coin {
 						height: 34rpx;
 						font-size: 24rpx;
 						justify-content: space-between;
+						margin-top: 30rpx;
 						margin-bottom: 24rpx;
 						
 						&__left {

src/packagePrize/rolling/index.vue

@@ -73,8 +73,15 @@
 				<view class="prize-info-content">
 					<view class="prize-info-content-price" v-if="prizeInfo.prizeType && prizeInfo.prizeType.value != 'coin'"><text>¥</text>{{ $numberFormat(prizeInfo.value) }}</view>
 					<view class="prize-info-content-price" v-else>{{ prizeInfo.value }}个</view>
+					<!-- #ifdef MP-ALIPAY -->
+					<view class="prize-info-content-titletwo ells-one" v-if="prizeInfo.prizeType && prizeInfo.prizeType.value != 'coin'">{{ prizeInfo.title }}</view>
+					<view class="prize-info-content-titletwo" v-else>盲豆</view>
+					<!-- #endif -->
+					<!-- #ifndef MP-ALIPAY -->
 					<view class="prize-info-content-title ells-one" v-if="prizeInfo.prizeType && prizeInfo.prizeType.value != 'coin'">{{ prizeInfo.title }}</view>
 					<view class="prize-info-content-title" v-else>盲豆</view>
+					<!-- #endif -->
+					
 					<view class="prize-info-content-btn flex">
 						<view class="prize-info-content-btn-content flex" v-if="isTry == 0">
 							<image src="../../packagePrize/static/rolling_btn.png" mode="aspectFit"></image>
@@ -499,6 +506,14 @@
 								text-align: center;
 								margin-bottom: 20rpx;
 							}
+							&-titletwo {
+								width: 100%;
+								line-height: 26rpx;
+								height: 25rpx;
+								font-size: 26rpx;
+								text-align: center;
+								margin: 8rpx 28rpx 0 0;
+							}
 
 							&-price {
 								width: 100%;

src/pages.json

@@ -9,7 +9,11 @@
 			}
 		},
 		{
-			"path": "pages/core/index"
+			"path": "pages/core/index",
+			"style": {
+				"titlePenetrate":"YES"
+			}
+			
 		},
 		{
 			"path": "pages/user/index",

src/pages/core/index.vue

@@ -122,7 +122,12 @@
 						<image :src="item.picUrl" mode="aspectFit"></image>
 					</view>
 					<view class="content">
+						<!-- #ifdef MP-ALIPAY -->
+						<view class="content-titletwo ells-one">{{ item.title }}</view>
+						<!-- #endif -->
+						<!-- #ifndef MP-ALIPAY -->
 						<view class="content-title ells-one">{{ item.title }}</view>
+						<!-- #endif -->
 						<view class="content-coin flex">
 							<view class="content-coin__left flex">
 								<image src="../../static/public/goods_coin.png" mode="scaleToFill"></image>
@@ -815,13 +820,23 @@
 						font-size: 28rpx;
 						line-height: 28rpx;
 						font-weight: bold;
-						margin-bottom: 30rpx;
+						// margin-bottom: 30rpx;
+						overflow: hidden;
+					}
+					&-titletwo {
+						height: 27rpx;
+						font-size: 28rpx;
+						line-height: 28rpx;
+						font-weight: bold;
+						// margin-bottom: 30rpx;
+						overflow: hidden;
 					}
 					
 					&-coin {
 						height: 34rpx;
 						font-size: 24rpx;
 						justify-content: space-between;
+						margin-top: 30rpx;
 						margin-bottom: 24rpx;
 						
 						&__left {

src/pages/login/index.vue

@@ -16,6 +16,9 @@
 			<!-- #ifdef MP-ALIPAY -->
 			<!-- <button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="checked">支付宝登录</button>
 			<button @click="getPhoneNumber" v-else>支付宝登录</button> -->
+			<view class="login-btn">
+			<button if="canIUseAuthButton" open-type="getAuthorize" @getAuthorize="onGetAuthorize" @error="onAuthError" scope='phoneNumber'>支付宝登录</button>
+			</view>
 			<!-- #endif -->
 			<!-- #ifndef MP-ALIPAY -->
 			<view class="login-btn">
@@ -56,10 +59,10 @@
 			return {
 				authShow: false,
 				token: '',
-				checked: true
+				checked: true,
+				canIUseAuthButton: my.canIUse('button.open-type.getAuthorize')
 			};
 		},
-		
 		methods: {
 			getPhoneNumber(e) {
 				let _this = this
@@ -182,7 +185,30 @@
 					uni.hideLoading();
 				})
 			},
-		}
+			onAuthError(e) {
+				console.log(e);
+			},
+			onGetAuthorize(e){
+				 my.getPhoneNumber({
+				    success: (res) => {
+				        let encryptedData = res.response;
+				        console.log(encryptedData);
+						$http.post('/api/v1/mp/user/aliAuth/mobile', {
+							encryptedData,
+							identity: 1,
+							noToken: true
+						}).then(res=>{
+							console.log(res);
+						})
+				    },
+				    fail: (res) => {
+				        console.log(res);
+				        console.log('getPhoneNumber_fail');
+				    },
+				  });
+				console.log(e);
+			},
+		},
 	}
 </script>