BF-202210271038\Administrator %!s(int64=2) %!d(string=hai) anos
pai
achega
58424aefcc
Modificáronse 4 ficheiros con 112 adicións e 52 borrados
  1. 0 12
      App.vue
  2. 52 3
      manifest.json
  3. 1 1
      pages.json
  4. 59 36
      pages/login/model/loginContent.nvue

+ 0 - 12
App.vue

@@ -16,16 +16,4 @@ export default {
 /*每个页面公共css */
 @import "./static/css/sys.css";
 
-
-checkbox .wx-checkbox-input {
-  border-radius: 50% !important;
-}
-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  background: linear-gradient(129deg, #f0695b 0%, #ed301d 100%);
-  border: 1px solid rgb(239, 74, 57);
-  box-shadow: 0px 2px 3px rgba(239, 74, 57, 0.16);
-}
-uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
-  border-color: #d1d1d1;
-}
 </style>

+ 52 - 3
manifest.json

@@ -17,7 +17,11 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Camera" : {},
+            "Barcode" : {},
+            "VideoPlayer" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -41,9 +45,54 @@
                 ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false,
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "上传照片",
+                    "NSPhotoLibraryAddUsageDescription" : "保存海报",
+                    "NSCameraUsageDescription" : "拍照",
+                    "NSMicrophoneUsageDescription" : "发送语音",
+                    "NSLocationWhenInUseUsageDescription" : "获取当前位置信息"
+                }
+            },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {},
+                "maps" : {},
+                "geolocation" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
         }
     },
     /* 快应用特有相关 */

+ 1 - 1
pages.json

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

+ 59 - 36
pages/login/model/loginContent.nvue

@@ -1,24 +1,31 @@
 <template>
   <view class="login-content" @touchmove.stop.prevent>
-    <view class="content-data">
-
-      <view class="data">
-        <view class="data-img">
-          <image class="img" src="@/static/img/common/logo.png" mode="aspectFill"></image>
-        </view>
-        <view class="data-text">
+    <view class="data">
+      <view class="data-img">
+        <image :style="{'margin-left':((windowWidth-124)/2)+'rpx'}" class="img" src="/static/img/common/logo.png" mode="aspectFill"></image>
+      </view>
+      <view class="data-text">
+        <text class="text-content" :style="{'width':(windowWidth-156)+'rpx'}">
           ICOCO是为了人们摆脱自己单身的生活 而去结交 认识他人的过程一个网络交友平台
+        </text>
+      </view>
+      <view class="data-but" >
+        <!--          开始ICOCO-->
+        <image class="but-img" src="/static/img/login/login-but.png" mode="aspectFill"></image>
+      </view>
+      <view class="data-agreement">
+        <image class="agreement-img" @click="setIsCheck" :src="'/static/img/login/check-'+(isCheck?'ok':'no')+'.png'" mode="aspectFill"></image>
+        <view class="agreement-text" @click="setIsCheck">
+          <text class="text-item sys-size-24 sys-color-white">我已阅读并同意</text>
+        </view>
+        <view class="agreement-text ">
+          <text class="text-item sys-size-24 sys-color-green">《用户协议》</text>
         </view>
-        <view class="data-but">
-<!--          开始ICOCO-->
-          <image class="but-img" src="@/static/img/login/login-but.png" mode="aspectFill"></image>
+        <view class="agreement-text ">
+          <text class="text-item sys-size-24 sys-color-white">和</text>
         </view>
-        <view class="data-agreement">
-          <image class="agreement-img" @click="setIsCheck" :src="'/static/img/login/check-'+(isCheck?'ok':'no')+'.png'" mode="aspectFill"></image>
-          <view class="agreement-text sys-size-24 sys-color-white">我已阅读并同意</view>
-          <view class="agreement-text sys-size-24 sys-color-green">《用户协议》</view>
-          <view class="agreement-text sys-size-24 sys-color-white">和</view>
-          <view class="agreement-text sys-size-24 sys-color-green">《隐私政策》</view>
+        <view class="agreement-text ">
+          <text class="text-item sys-size-24 sys-color-green">《隐私政策》</text>
         </view>
       </view>
     </view>
@@ -26,18 +33,26 @@
 </template>
 
 <script>
+import tools from "@/service/tools";
+
 export default {
   name: "loginContent",
   components: {},
   props: {},
   data() {
     return {
-      isCheck:false
+      isCheck:false,
+      windowWidth:750
     }
   },
   watch: {},
+  onLoad(query) {
+  },
   mounted() {
-
+    // let  width = uni.getSystemInfoSync().windowWidth;
+    // this.windowWidth=width*2
+    // tools.success('width:'+width)
+    // console.log('width:'+width)
   },
   methods: {
     setIsCheck(){
@@ -47,7 +62,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .login-content{
   z-index: 100;
   position: fixed;
@@ -55,38 +70,43 @@ export default {
   top: 0;
   right: 0;
   bottom: 0;
-  background-color: rgba(0, 0, 0, 0);
+  /*background-color: rgba(0, 0, 0, 0);*/
+  /*background: #fff;*/
 }
-.content-data{
-  width: 100vw;
-  height: 100vh;
-  position: relative;
-}
-.content-data .data{
+
+.login-content .data{
   position: absolute;
-  width: 100vw;
-  height: calc(528rpx + env(safe-area-inset-bottom)) ;
+  /*width: 100vw;*/
+  height: 528rpx;
   bottom: 0;
   left: 0;
 }
-.content-data .data .data-img{
-  width: 100vw;
+.login-content .data .data-img{
+  /*width: 100vw;*/
   height: 124rpx;
 }
-.content-data .data-img .img{
-  margin-left: calc((100vw - 124rpx) / 2);
+.login-content .data-img .img{
+  /*margin-left: calc((100vw - 124rpx) / 2);*/
   height: 124rpx;
   width: 124rpx;
   border-radius: 24rpx;
 }
-.content-data .data .data-text{
+.login-content .data .data-text{
   margin-top: 24rpx;
   padding: 0 78rpx;
-  font-size: 28rpx;
   line-height: 44rpx;
+
+}
+.login-content .data .data-text .text-content{
+  //width: calc( 100vw - 156rpx );
+  font-size: 24rpx;
   color: #FFFFFF;
+  display:inline-block;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  height: auto;
 }
-.content-data .data .data-but{
+.login-content .data .data-but{
   margin:64rpx 78rpx 0 78rpx ;
   border-radius: 200rpx;
   /*background:#FFFFFF ;*/
@@ -104,13 +124,16 @@ export default {
 .data-but .but-img{
   height: 88rpx;
   border-radius: 200rpx;
-  width: calc(100vw - 156rpx);
+  /*width: calc(100vw - 156rpx);*/
 }
 
 .data-agreement{
   margin-top: 40rpx;
   display: flex;
+  flex-direction:row;
   justify-content: center;
+  align-items: center;
+
 }
 .data-agreement .agreement-img{
   width: 24rpx;