sys 2 жил өмнө
parent
commit
d36b20898f

+ 129 - 14
components/dgex-tantan/dgex-tantan.vue

@@ -19,8 +19,8 @@
 					}]">
 					 <!-- 加载图片会闪屏 双if避免 -->
 					<template v-if="currentIndex + visible >= index && currentIndex <= index">
-            <view  class="tantan-slide-img-box"   :style="{height: winHeigh + 'px'}">
-              <view :animation="animationData">
+            <view  :animation="animationData" class="tantan-slide-img-box"   :style="{height: winHeigh + 'px'}">
+              <view >
                 <image  class="tantan-slide-img" v-show="imgIndex===imgKey" v-for="(img,imgIndex) in item.images"   :style="{height: winHeigh + 'px'}"  mode="aspectFill" :src="img" ></image>
               </view>
 
@@ -28,8 +28,35 @@
                 <view class="slide-img-click-item" @click.stop="setImgKey(item,0)"></view>
                 <view class="slide-img-click-item" @click.stop="setImgKey(item,1)"></view>
               </view>
+              <view class="img-num-list" >
+                <view class="num-item" :class="{'num-item-default':imgIndex===imgKey}" v-for="(img,imgIndex) in item.images"></view>
+              </view>
+              <view class="slide-data">
+                <!--                用户个性消息-->
+                <view class="on-line-box">
+                  <image  class="on-line-img"     mode="aspectFill" src="/static/img/index/on-line.png" ></image>
+                  <view class="on-line-text sys-color-black-0 sys-weight-400">当前在线</view>
+                </view>
+                <view class="user-data">
+                  <text class="user-item sys-color-white sys-weight-600">Maple</text>
+                  <text class="user-item sys-color-white sys-weight-600">,</text>
+                  <text class="user-item sys-color-white sys-weight-600">19</text>
+                </view>
+                <view class="user-city">
+                  <text class="city-item sys-color-yellow sys-weight-600">17.16</text>
+                  <text class="city-item sys-color-white sys-weight-400">km</text>
+                  <text class="city-item sys-color-white sys-weight-600">重庆市九龙坡</text>
+                </view>
+                <view class="open-wechat">
+                  <image  class="open-wechat-img"     mode="aspectFill" src="/static/img/index/wechat.png" ></image>
+                  <view class="open-wechat-text sys-color-white sys-weight-400">yxk********</view>
+                  <image  class="lock-wechat-img"     mode="aspectFill" src="/static/img/index/lock.png" ></image>
+                </view>
+              </view>
             </view>
 
+
+
 						<view v-if="index === currentIndex">
 							<view class="tantan-slide-box-icon tantan-slide-box-dislike"
 								:style="{
@@ -131,13 +158,10 @@
         }
       },
       setOverturnImg(item){
-        // tools.success('one')
-        // return;
         let animation = uni.createAnimation({
           duration: 100,
           timingFunction: 'ease',
         })
-
         animation.rotateY(3).scale(1.01).step()
         item.image=item.images[this.imgKey]
         tools.vibrate()
@@ -160,12 +184,13 @@
         let overturnNum=1
        let overturnServe=setInterval(()=>{
           ++overturnNum
+         // console.log('overturnNum:'+overturnNum)
          if(overturnNum>4){
            clearInterval(overturnServe)
          }else {
           let overturnType=(overturnNum%2===1)?1:2
            if(overturnType===1){
-             animation.rotateY(3).step()
+             animation.rotateY(-5).step()
              tools.vibrate()
            }else {
              animation.rotateY(0).step()
@@ -340,12 +365,12 @@
 	.tantan-slide-box-dislike {
 		right: 50rpx;
 	}
-	.tantan-slide-img-box {
-		position: relative;
-		will-change: transform;
-		width: 100%;
-		height: 100%;
-		border-radius: 40rpx;
+  .tantan-slide-img-box {
+    position: relative;
+    will-change: transform;
+    width: 100%;
+    height: 100%;
+    border-radius: 40rpx;
     background-repeat: no-repeat;//不平铺
     background-position: center center;//居中
     background-size: cover;//随容器大小
@@ -370,10 +395,100 @@
         width: 50%;
         height: 100%;
       }
-
+    }
+    .img-num-list{
+      z-index: 101;
+      position: absolute;
+      width: calc(100vw - 32rpx);
+      top: 32rpx;
+      left: 0;
+      display: flex;
+      justify-content: center;
+      .num-item{
+        border-radius: 50%;
+        width: 8rpx;
+        height: 8rpx;
+        background: rgba(255,255,255,0.4);
+        margin-right: 6rpx;
+        transition: .5s ease;
+      }
+      .num-item-default{
+        width: 48rpx;
+        border-radius: 20rpx;
+        background: #FFFFFF;
+      }
 
     }
-	}
+    .slide-data{
+      position: absolute;
+      left: 28rpx;
+      bottom: 32rpx;
+      z-index: 101;
+      .on-line-box{
+        max-width: 160rpx;
+        border-radius: 12rpx;
+        background: #FFFFFF;
+        display: flex;
+        justify-content: center;
+        padding: 4rpx 18rpx;
+        margin-bottom: 24rpx;
+        .on-line-img{
+          width: 24rpx;
+          height: 24rpx;
+          margin-top: 10rpx;
+          margin-right: 8rpx;
+        }
+        .on-line-text{
+          height: 44rpx;
+          line-height: 44rpx;
+          font-size: 24rpx;
+        }
+      }
+      .user-data{
+        .user-item{
+          font-size: 48rpx;
+        }
+      }
+      .user-city{
+        margin-top: 16rpx;
+        height:44rpx;
+        display:table-cell;
+        vertical-align:bottom;
+        .city-item{
+          margin-right: 14rpx;
+          font-size: 24rpx;
+        }
+        .city-item:first-child{
+          font-size: 36rpx;
+        }
+      }
+      .open-wechat{
+        margin-top: 32rpx;
+        display: flex;
+        justify-content: space-between;
+        padding: 8rpx;
+        background: rgba(0,0,0,0.5);
+        border-radius: 200rpx;
+        .open-wechat-img{
+          width: 64rpx;
+          height: 64rpx;
+        }
+        .open-wechat-text{
+          height: 64rpx;
+          line-height: 64rpx;
+          margin-left: 18rpx;
+          margin-right: 40rpx;
+          font-size: 28rpx;
+        }
+        .lock-wechat-img{
+          width: 76rpx;
+          height: 64rpx;
+        }
+      }
+    }
+  }
+
+
 
 
 

+ 2 - 2
pages/index/model/index-nav.vue

@@ -91,7 +91,7 @@
 @import url("/components/static/css/en-common.css") ;
 
   .header {
-    width: 100vw;
+    width: calc(100vw - 72rpx);
     position: fixed;
     left: 0;
     top: 0;
@@ -100,7 +100,7 @@
     justify-content: space-between;
     height: 88rpx;
     padding: 12rpx 36rpx;
-    box-sizing: border-box;
+    //box-sizing: border-box;
     background-color: #fff;
     .header-left{
       padding: 10rpx 0;

+ 3 - 0
static/css/sys.css

@@ -34,6 +34,9 @@
 .sys-color-gray-3{
   color: #333333;
 }
+.sys-color-yellow{
+  color: #FFC107;
+}
 /*背景颜色*/
 .sys-background-black{
   background-color: #141414;

BIN
static/img/index/lock.png


BIN
static/img/index/on-line.png


BIN
static/img/index/wechat.png