Merge branch 'master' of http://git.lcpcp.cc/root/lcoco

manifest.json

@@ -42,7 +42,8 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {
@@ -59,7 +60,8 @@
             "sdkConfigs" : {
                 "ad" : {},
                 "maps" : {},
-                "geolocation" : {}
+                "geolocation" : {},
+                "oauth" : {}
             },
             "icons" : {
                 "android" : {

pages.json

@@ -391,7 +391,7 @@
     "list": [
       {
         "name": "列表调试",
-        "path": "pages/index/index",
+        "path": "pages/login/index",
         "query": ""
       }
     ]

pages/circle/recommended.vue

@@ -1,22 +1,248 @@
 <template>
-	<view class="flex-common-css ">
-		<Nav ></Nav>
-		<view class="recommended-content">
-			
-		</view>
+	<view class="flex-common-css">
+		<Nav class="nav-class" :bgckgroundBox="!isScroll?'transparent':'#fff'" :titleColor="isScroll?'#000':'#fff'">
+		</Nav>
+		<scroll-view :scroll-y="true" class="list-scroll" @scroll="scroll" @scrolltolower="scrolltolower">
+			<view class="head-bg-img">
+				<image class="bg-img" src="@/static/img/circle/1.png" mode=""></image>
+				<view class="head-title">
+					<view class="head-title-l">
+						<image class="head-title-l-img sys-radius-12" src="@/static/img/circle/1.png" mode=""></image>
+						<view class="head-title-l-name">
+							<view class="head-title-l-name-one">
+								<image class="icon" src="@/static/img/circle/1.png" mode=""></image>
+								<view class="sys-size-36 sys-weight-600 sys-color-white">
+									圈子标题名称
+								</view>
+							</view>
+							<view class="sys-size-28 sys-color-white">
+								815.4w人在这里
+							</view>
+						</view>
+					</view>
+					<view
+						class="head-title-r sys-height-56 sys-color-black sys-size-28 sys-background-gray-f sys-radius-12">
+						加入
+					</view>
+				</view>
+				<view class="placeholder-box">
+					<view class="placeholder"></view>
+				</view>
+			</view>
+			<view class="topic-box">
+				<view class="topic-title sys-color-black sys-weight-600 sys-size-28">
+					热聊话题
+				</view>
+				<scroll-view scroll-x="true" class="topic-list">
+						<view class="list sys-background-gray-6f sys-radius-20" v-for="(item,index) in listData"
+							:key="index">
+							<view class="list-left">
+								<image class="list-img sys-radius-12" :src="item.img" mode=""></image>
+								<view class="list-text">
+									<view class="sys-size-32 sys-weight-600 sys-color-black">
+										{{item.name}}
+									</view>
+									<view class="sys-color-gray-9 sys-size-24">
+										{{item.num}}w人在看
+									</view>
+								</view>
+							</view>
+							<view class="goto-img sys-background-gray-E0 sys-radius-round">
+								<uni-icons type="right" size="12" color="#666"></uni-icons>
+							</view>
+						</view>
+				</scroll-view>
+			</view>
+			<my-praise class="my-praise" :tagNum="1"></my-praise>
+		</scroll-view>
 	</view>
 </template>
 
 <script>
+	import MyPraise from "@/pages/my/model/my-praise";
 	export default {
-		components: {},
+		components: {
+			MyPraise,
+		},
 		data() {
-			return {};
+			return {
+				isScroll: false,
+				listData: [{
+					'img': '/static/img/temporary/1.png',
+					'name': '今天最想吃什么',
+					'num': '10.6'
+				}, {
+					'img': '/static/img/temporary/1.png',
+					'name': '今天最想吃什么',
+					'num': '10.6'
+				}, {
+					'img': '/static/img/temporary/1.png',
+					'name': '今天最想吃什么',
+					'num': '10.6'
+				}, {
+					'img': '/static/img/temporary/1.png',
+					'name': '今天最想吃什么',
+					'num': '10.6'
+				}],
+			};
 		},
 		mounted() {},
-		methods: {},
+		methods: {
+			scroll(e) {
+				if (e.detail.scrollTop > 50) {
+					this.isScroll = true
+				} else {
+					this.isScroll = false
+				}
+			},
+			scrolltolower() {
+				console.log('触底');
+			}
+		},
 	}
 </script>
 
 <style lang="scss" scoped>
+	.nav-class {
+		position: absolute;
+		left: 0;
+		top: 0;
+	}
+
+	.list-scroll {
+		width: 100%;
+		flex: 1;
+		overflow: auto;
+	}
+
+	.head-bg-img {
+		width: 100%;
+		height: 380rpx;
+		position: relative;
+
+		.bg-img {
+			width: 100%;
+			height: 100%;
+		}
+
+		.head-title {
+			width: 100%;
+			height: auto;
+			position: absolute;
+			left: 0;
+			bottom: 40rpx;
+			display: flex;
+			justify-content: space-between;
+			box-sizing: border-box;
+			padding: 0 26rpx 0 32rpx;
+
+			.head-title-l {
+				display: flex;
+				align-items: center;
+
+				.head-title-l-img {
+					width: 120rpx;
+					height: 120rpx;
+					margin: 0 24rpx 0 0;
+				}
+
+				.head-title-l-name {
+					display: flex;
+					flex-direction: column;
+
+					.head-title-l-name-one {
+						display: flex;
+						align-items: center;
+						margin: 0 0 22rpx 0;
+
+						.icon {
+							width: 40rpx;
+							height: 40rpx;
+							margin: 0 8rpx 0 0;
+						}
+					}
+
+					.head-title-l-name-two {}
+				}
+			}
+
+			.head-title-r {
+				padding: 0 32rpx;
+				box-sizing: border-box;
+			}
+		}
+
+		.placeholder-box {
+			width: 100%;
+			height: 20rpx;
+			// background: #333;
+			position: absolute;
+			bottom: 0;
+
+			.placeholder {
+				width: 100%;
+				height: 100%;
+				border-radius: 32rpx 32rpx 0 0;
+				background: #fff;
+			}
+		}
+	}
+
+	.topic-box {
+		width: 100%;
+		height: auto;
+		display: flex;
+		flex-direction: column;
+
+		.topic-title {
+			margin: 0 0 24rpx 32rpx;
+		}
+
+		.topic-list {
+			width: 100%;
+			padding: 0 12rpx;
+			display: flex;
+			align-items: center;
+			white-space: nowrap;
+			box-sizing: border-box;
+
+			.list {
+				display: inline-block;
+				width: 476rpx;
+				height: 138rpx;
+				// display: flex;
+				margin: 0 12rpx;
+				padding: 18rpx;
+				box-sizing: border-box;
+				align-items: center;
+				justify-content: space-between;
+				position: relative;
+				flex: 1;
+
+				.list-left {
+					display: flex;
+					align-items: center;
+
+					.list-img {
+						width: 104rpx;
+						height: 104rpx;
+						margin: 0 20rpx 0 0;
+					}
+
+					.list-text {}
+				}
+
+				.goto-img {
+					width: 32rpx;
+					height: 32rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					position: absolute;
+					right: 32rpx;
+					top: 40%;
+				}
+			}
+		}
+	}
 </style>

pages/login/model/loginAgreement.vue

@@ -24,6 +24,9 @@ export default {
     type:{
       type: Number,
       default:1
+    },
+    value:{
+      default: false
     }
   },
   data() {
@@ -33,11 +36,12 @@ export default {
   },
   watch: {},
   mounted() {
-
+      this.isCheck=this.value
   },
   methods: {
     setIsCheck(){
       this.isCheck=!this.isCheck
+      this.$emit('input',this.isCheck)
     }
   }
 }
@@ -51,14 +55,14 @@ export default {
   align-items: center;
 
 }
-.data-agreement .agreement-img{
+ .agreement-img{
   width: 24rpx;
   height: 24rpx;
   border-radius: 4rpx;
   margin-right: 6rpx;
   /*border: 2rpx solid #FFFFFF;*/
 }
-.data-agreement .agreement-text{
+ .agreement-text{
   line-height: 24rpx;
   margin-left: 6rpx;
 }

pages/login/model/loginContent.nvue

@@ -14,7 +14,7 @@
         <image class="but-img" src="/static/img/login/login-but.png" mode="aspectFill"></image>
       </view>
       <view class="agreement-item">
-        <login-agreement ></login-agreement>
+        <login-agreement v-model="isCheck"></login-agreement>
       </view>
 
 
@@ -24,6 +24,7 @@
 
 <script>
 import LoginAgreement from "@/pages/login/model/loginAgreement";
+import tools from "@/service/tools";
 
 export default {
   name: "loginContent",
@@ -31,24 +32,51 @@ export default {
   props: {},
   data() {
     return {
-      windowWidth:750
+      windowWidth:750,
+      isCheck:false,
+      isPreLogin:false
     }
   },
   watch: {},
   onLoad(query) {
+    //#ifdef APP-NVUE
+    // uni.preLogin({
+    //   provider: 'univerify',
+    //   success(){  //预登录成功
+    //     // 显示一键登录选项
+    //     this.isPreLogin=true
+    //   },
+    //   fail(res){  // 预登录失败
+    //     // 不显示一键登录选项（或置灰）
+    //     // 根据错误信息判断失败原因，如有需要可将错误提交给统计服务器
+    //     console.log(res)
+    //     console.log(res.errCode)
+    //     console.log(res.errMsg)
+    //   }
+    // })
+    //#endif
+
   },
   mounted() {
-    // let  width = uni.getSystemInfoSync().windowWidth;
-    // this.windowWidth=width*2
-    // tools.success('width:'+width)
-    // console.log('width:'+width)
+
   },
   methods: {
 
     goToLogin(){
-      uni.navigateTo({
-        'url':'/pages/login/localPhoneLogin'
-      })
+      if(!this.isCheck){
+        tools.error('请阅读并同意协议')
+        return false
+      }
+      if(this.isPreLogin){
+        uni.navigateTo({
+          'url':'/pages/login/localPhoneLogin'
+        })
+      }else {
+        uni.navigateTo({
+          'url':'/pages/login/otherPhoneLogin'
+        })
+      }
+
     }
   }
 }
@@ -66,30 +94,30 @@ export default {
   /*background: #fff;*/
 }
 
-.login-content .data{
+ .data{
   position: absolute;
   /*width: 100vw;*/
   height: 528rpx;
   bottom: 0;
   left: 0;
 }
-.login-content .data .data-img{
+ .data-img{
   /*width: 100vw;*/
   height: 124rpx;
 }
-.login-content .data-img .img{
+ .img{
   /*margin-left: calc((100vw - 124rpx) / 2);*/
   height: 124rpx;
   width: 124rpx;
   border-radius: 24rpx;
 }
-.login-content .data .data-text{
+ .data-text{
   margin-top: 24rpx;
   padding: 0 78rpx;
   line-height: 44rpx;
 
 }
-.login-content .data .data-text .text-content{
+ .text-content{
   //width: calc( 100vw - 156rpx );
   font-size: 24rpx;
   color: #FFFFFF;
@@ -97,7 +125,7 @@ export default {
   white-space: pre-wrap;
   word-wrap: break-word;
 }
-.login-content .data .data-but{
+ .data-but{
   width: 590rpx;
   box-sizing: border-box;
   margin:64rpx 78rpx 0 78rpx ;
@@ -114,7 +142,7 @@ export default {
   /*-webkit-text-fill-color: transparent;*/
 
 }
-.data-but .but-img{
+ .but-img{
   width: 590rpx;
   height: 88rpx;
   border-radius: 200rpx;

pages/my/model/my-praise.vue

@@ -182,7 +182,7 @@ export default {
 .my-praise-box{
 	.publish-box {
 		width: 100%;
-		height: auto;
+		// height: 100%;
 		display: flex;
 		border-top: 20rpx solid #FAFAFA;
 		border-bottom: 20rpx solid #FAFAFA;

static/css/sys.css

@@ -127,6 +127,12 @@
 .sys-background-gray-9{
   background-color: #999999;
 }
+.sys-background-gray-6f{
+  background-color: #F6F6F6;
+}
+.sys-background-gray-E0{
+  background-color: #E0E0E0;
+}
 .sys-background-green{
   background-color: #12CE87;
 }
@@ -159,6 +165,9 @@
 .sys-radius-200{
   border-radius: 200rpx;
 }
+.sys-radius-20{
+  border-radius: 20rpx;
+}
 .sys-radius-16{
   border-radius: 16rpx;
 }
@@ -214,5 +223,9 @@ overflow: hidden;
   height: 34rpx;
   line-height: 34rpx;
 }
+.sys-height-56{
+  height: 56rpx;
+  line-height: 56rpx;
+}