no message

components/en-utils/en-nav/en-nav.vue

@@ -129,7 +129,7 @@
     position: fixed;
     left: 0;
     top: 0;
-    z-index: 999999;
+    z-index: 99999;
     .flexbox {
       display: flex;
       justify-content: space-between;

components/en-utils/en-popup/en-popup.vue

@@ -3,7 +3,10 @@
     <uni-popup ref="popup" @change="setTabBar" type="bottom" :mask-background-color="maskBackgroundColor">
       <view class="popup-box" v-show="showTop">
         <view class="popup-title" @click="close">
-          <image class="popup-close" src="/static/img/common/close.png"></image>
+          <view class="popup-close">
+            <image class="popup-close-img" src="/static/img/common/close.png" mode="widthFix" ></image>
+          </view>
+
         </view>
         <slot name="popupInfo"></slot>
       </view>
@@ -52,16 +55,20 @@ export default {
 <style scoped lang="scss">
 .popup-box{
   background: #FFFFFF;
-  border-radius: 20rpx 20rpx 0 0;
+  border-radius: 30rpx 30rpx 0 0;
   box-shadow: 0px -8px 20px 0px rgba(0,0,0,0.04);
-  padding: 28rpx 32rpx 50rpx 32rpx;
-  z-index: 100;
+  padding: 42rpx 32rpx calc(16rxp + env(safe-area-inset-bottom));
+  z-index: 999999;
   .popup-title{
-    padding: 20rpx;
+    padding: 20rpx 0;
+    width: 100%;
     .popup-close{
-      margin: 0 auto;
-      width: 82rpx;
-      height: 10rpx;
+      width: 72rpx;
+      margin: auto;
+      border-radius: 30rpx;
+      .popup-close-img{
+        width: 72rpx;
+      }
     }
   }
 }

pages/login/model/loginContent.nvue

@@ -13,7 +13,10 @@
         <!--          开始ICOCO-->
         <image class="but-img" src="/static/img/login/login-but.png" mode="aspectFill"></image>
       </view>
-      <login-agreement ></login-agreement>
+      <view class="agreement-item">
+        <login-agreement ></login-agreement>
+      </view>
+
 
     </view>
   </view>
@@ -116,7 +119,9 @@ export default {
   /*width: calc(100vw - 156rpx);*/
   margin-bottom: 40rpx;
 }
-
+.agreement-item{
+  margin-left:122rpx;
+}
 
 
 </style>

pages/perfect/cards.vue

@@ -11,7 +11,7 @@
           <text class="sys-color-green">真实照片</text>
           <text class="sys-color-gray-9">，否则部分功能可能会受限</text>
         </view>
-        <view class="card-img" :style="{'height':'calc(100vh - '+navHeight+'px  - 278rpx - 270rpx - env(safe-area-inset-bottom)'}">
+        <view class="card-img" @click="openPopup" :style="{'height':'calc(100vh - '+navHeight+'px  - 278rpx - 270rpx - env(safe-area-inset-bottom)'}">
           <view class="add-box">
             <image class="add-img" src="/static/img/common/add.png" mode="aspectFill"></image>
           </view>
@@ -25,6 +25,42 @@
         <view class="login-but sys-color-white sys-background-black sys-selected-but" @click="setNextStep" :class="{'sys-unselected-but':!isOK}">下一步</view>
       </view>
     </view>
+    <en-popup ref="cardPopup">
+      <template v-slot:popupInfo="{pagingData}">
+        <view class="img-popup">
+          <view class="popup-title sys-weight-600 sys-color-black">上传清晰的本人照片</view>
+          <view class="popup-text sys-color-gray-9 ">
+            展示你真实有趣的一面
+          </view>
+          <view class="popup-img">
+            <view class="popup-item">
+              <image class="item-img" src="/static/img/perfect/img3.png" mode="widthFix"></image>
+              <view class="item-describe">
+                <image class="describe-img" src="/static/img/perfect/ok.png" mode="widthFix"></image>
+                <view class="describe-text sys-color-white sys-weight-600" >半身/全身</view>
+              </view>
+            </view>
+            <view class="popup-item">
+              <image class="item-img" src="/static/img/perfect/img1.png" mode="widthFix"></image>
+              <view class="item-describe">
+                <image class="describe-img" src="/static/img/perfect/no.png" mode="widthFix"></image>
+                <view class="describe-text sys-color-white sys-weight-600" >怼脸自拍</view>
+              </view>
+            </view>
+            <view class="popup-item">
+              <image class="item-img" src="/static/img/perfect/img2.png" mode="widthFix"></image>
+              <view class="item-describe">
+                <image class="describe-img" src="/static/img/perfect/no.png" mode="widthFix"></image>
+                <view class="describe-text sys-color-white sys-weight-600" >网红非人</view>
+              </view>
+            </view>
+
+          </view>
+          <view class="popup-but sys-color-white sys-background-black sys-selected-but" >从相册中选择</view>
+        </view>
+      </template>
+
+    </en-popup>
   </view>
 </template>
 
@@ -33,8 +69,9 @@
 import EnNav from "@/components/en-utils/en-nav/en-nav";
 import tools from "@/service/tools";
 import LoginAgreement from "@/pages/login/model/loginAgreement";
+import EnPopup from "@/components/en-utils/en-popup/en-popup";
 export default {
-  components: {LoginAgreement, EnNav},
+  components: {EnPopup, LoginAgreement, EnNav},
   data() {
     return {
       navHeight:40,
@@ -48,6 +85,9 @@ export default {
 
   },
   methods: {
+    openPopup(){
+      this.$refs.cardPopup.open()
+    },
     setNextStep(){
       if(this.isOK){
         uni.navigateTo({
@@ -74,56 +114,111 @@ export default {
 
 <style scoped lang="scss">
 @import "/static/css/shake.css";
-.login-box{
-  padding: 82rpx 80rpx 0 80rpx;
-  box-sizing: border-box;
-  position: relative;
-  .login-top{
-    .login-title{
-      padding-bottom: 24rpx;
-      .title-item{
-        font-size: 48rpx;
+.pass-box{
+  .login-box{
+    padding: 82rpx 80rpx 0 80rpx;
+    box-sizing: border-box;
+    position: relative;
+    .login-top{
+      .login-title{
+        padding-bottom: 24rpx;
+        .title-item{
+          font-size: 48rpx;
+        }
       }
-    }
-    .card-text{
-      padding-bottom: 16rpx;
-      text{
-        font-size: 28rpx;
+      .card-text{
+        padding-bottom: 16rpx;
+        text{
+          font-size: 28rpx;
+        }
       }
-    }
-    .card-img{
-      width: calc(100vw - 160rpx);
-      background: #F6F6F6;
-      border-radius: 20rpx;
-      position: relative;
-      .add-box{
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%,-50%);
-        .add-img{
-          margin: auto auto;
-          width: 84rpx;
-          height: 84rpx;
+      .card-img{
+        width: calc(100vw - 160rpx);
+        background: #F6F6F6;
+        border-radius: 20rpx;
+        position: relative;
+        .add-box{
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          transform: translate(-50%,-50%);
+          .add-img{
+            margin: auto auto;
+            width: 84rpx;
+            height: 84rpx;
+          }
         }
+
+      }
+      .card-agreement{
+        margin-top: 32rpx;
       }
 
     }
-    .card-agreement{
-      margin-top: 32rpx;
+    .login-bottom{
+      padding-bottom: calc(58rpx + env(safe-area-inset-bottom));
+      position: absolute;
+      bottom: 0;
+      left: 68rpx;
+      width:calc(100vw - 136rpx);
+      .login-but{
+        margin-top: 120rpx;
+      }
     }
 
   }
-  .login-bottom{
-    padding-bottom: calc(58rpx + env(safe-area-inset-bottom));
-    position: absolute;
-    bottom: 0;
-    left: 68rpx;
-    width:calc(100vw - 136rpx);
-    .login-but{
-      margin-top: 120rpx;
+  .img-popup{
+    margin-top: 40rpx;
+    padding: 0 32rpx calc(58rpx + env(safe-area-inset-bottom)) 32rpx;
+    .popup-title{
+      font-size: 36rpx;
+    }
+    .popup-text{
+      padding: 16rpx 0 32rpx;
+      font-size: 28rpx;
+    }
+    .popup-img{
+      display: flex;
+      justify-content: space-between;
+      .popup-item{
+        display: inline-block;
+        margin-right:10rpx;
+        position: relative;
+        .item-img{
+          border-radius: 16rpx;
+          width: calc((100vw - 80rpx)/3);
+          height: 276rpx;
+        }
+        .item-describe{
+          position: absolute;
+          left: 32rpx;
+          bottom: 20rpx;
+          width: calc((100vw - 80rpx)/3 - 64rpx);
+          height: 36rpx;
+          border-radius: 200rpx;
+          background: rgba(0,0,0,0.6);
+          display: flex;
+          justify-content: flex-start;
+          .describe-img{
+            width: 36rpx;
+            height: 36rpx;
+          }
+          .describe-text{
+            margin-left: 8rpx;
+            font-size: 24rpx;
+            line-height: 36rpx;
+          }
+        }
+      }
+      .popup-item:nth-of-type(3n+0){
+        margin-right:0;
+      }
+    }
+    .popup-but{
+      margin-top: 58rpx;
     }
   }
 }
 
+
 </style>

uni_modules/uni-popup/components/uni-popup/uni-popup.vue

@@ -195,7 +195,8 @@
 					this.safeAreaInsets = screenHeight - safeArea.bottom
 					// #endif
 					// #ifndef MP-WEIXIN
-					this.safeAreaInsets = safeAreaInsets.bottom
+					// this.safeAreaInsets = safeAreaInsets.bottom
+					this.safeAreaInsets = 0
 					// #endif
 				} else {
 					this.safeAreaInsets = 0