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

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

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;