暂存

App.vue

@@ -5,20 +5,23 @@
 		onLaunch: function() {
 			console.log('App Launch');
 			// #ifdef APP-PLUS
+			    var isIos = (plus.os.name == "iOS")
 			    var version = plus.runtime.versionCode
-				console.log('版本号',version)
-				NET.request(API.getAppVersion, {}, 'GET').then(res => {
-					console.log('获取res')
-					try {
-						console.log('进入try',res)
-						if (version != res.data.version) {
-							console.log('判断版本号')
-							plus.runtime.openURL( res.data.url) 
+				console.log('版本号',version,isIos)
+				if (!isIos) {
+					NET.request(API.getAppVersion, {}, 'GET').then(res => {
+						console.log('获取res')
+						try {
+							console.log('进入try',res)
+							if (version != res.data.version) {
+								console.log('判断版本号')
+								plus.runtime.openURL( res.data.url) 
+							}
+						} catch (e) {
+							console.log('版本号错误', e)
 						}
-					} catch (e) {
-						console.log('版本号错误', e)
-					}
-				})
+					})
+				}
 			// #endif
 		},
 		onShow: function() {

pages/index/index.vue

@@ -364,9 +364,9 @@
 									uni.setStorage({
 										key: 'iosLoginData',
 										data: {
-											email: info.appleInfo.email,
-											fullname: info.appleInfo.fullname,
-											user: info.appleInfo.user
+											email: info.userInfo.email,
+											fullname: info.userInfo.fullName.familyName || '匿名用户',
+											user: info.userInfo.openId
 										}
 									})
 									that.iosLoginData = uni.getStorageSync("iosLoginData")

pagesMedia/liveDetail.nvue

@@ -20,10 +20,10 @@
 							<!-- #ifdef MP-WEIXIN -->
 								<text class="iconfont good-check-iconfont" :class="item.check ? 'iconqueding' : 'iconfeigouxuan'" ></text>
 							<!-- #endif -->
-							</view>
 							<!-- #ifdef APP-PLUS -->
 								<text class="nvue-iconfont good-check-iconfont" :style="{fontFamily:'nvueIconfont'}">{{item.check ? '&#xe626;' : '&#xe646;'}}</text>
 							<!-- #endif -->
+							</view>
 						</view>
 						<view class="good-card2">
 							<view class="goods-img-box2">
@@ -45,6 +45,7 @@
 				</scroll-view>
 			</view>
 		</uni-popup>
+		<u-top-tips ref="uTips"></u-top-tips>
 	</view>
 </template>
 
@@ -135,6 +136,15 @@
 
 			this.init();
 		},
+		//  #ifdef APP-PLUS
+		beforeCreate() {
+		  let domModule = weex.requireModule('dom');
+		  domModule.addRule('fontFace',{
+			'fontFamily': "nvueIconfont",
+			'src': "url('https://at.alicdn.com/t/font_2119167_43jbldmjpr3.ttf')"
+		  })
+		},
+		// #endif
 		onUnload() {
 			this.exitRoom();
 		},
@@ -278,6 +288,7 @@
 			},
 			//  勾选商品
 			checkGoods(site) {
+				console.log(site)
 				site.check = !site.check
 			}
 		},
@@ -350,18 +361,17 @@
 		font-size: 15px;
 		font-family: PingFang SC;
 	}
-	// 商户端直播样式，暂时在用户端里调试
 	.good-check {
 		width: 30px;
-		height: 104px;
-		line-height: 104px;
+		height: 114px;
+		line-height: 114px;
 		margin-right: 10px;
 	}
 	.good-check-iconfont {
 		font-size: 40px;
 		text-align: center;
 		color: #51A539;
-		line-height: 104px;
+		line-height: 114px;
 	}
 	
 	.good-box2 {
@@ -377,7 +387,7 @@
 	
 	.goods-row2 {
 		width: 700rpx;
-		height: 104px;
+		height: 114px;
 		display: flex;
 		flex-direction: row;
 		flex-wrap: nowrap;
@@ -396,8 +406,8 @@
 	}
 	
 	.goods-img2 {
-		width: 104px;
-		height: 104px;
+		width: 114px;
+		height: 114px;
 		object-fit: cover;
 	}