From 8e644896cdd616d7f6c734f56a9cc642e20ee0cb Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 31 七月 2024 15:49:50 +0800
Subject: [PATCH] lll
---
wechat_jiaxuan/pages/detailDis/product.wxml | 6 +-
wechat_jiaxuan/pages/store/staff.wxss | 17 +++-----
wechat_staff/pages/index/index.less | 6 +--
wechat_staff/pages/productVideo/index.wxml | 4 +-
wechat_staff/project.private.config.json | 2
wechat_jiaxuan/pages/store/staff.less | 17 +++-----
wechat_staff/pages/index/index.wxml | 4 +-
wechat_jiaxuan/pages/productVideo/index.wxml | 4 +-
wechat_jiaxuan/pages/store/staff.wxml | 2
wechat_staff/pages/index/index.wxss | 4 +-
wechat_jiaxuan/pages/index/index.wxml | 4 +-
wechat_staff/pages/detailDis/product.wxml | 4 +-
12 files changed, 31 insertions(+), 43 deletions(-)
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index bc895d5..f5bb0eb 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -21,11 +21,11 @@
<!-- video -->
<view wx:if="{{ info.video }}" class="video">
<view class="title">浜у搧瑙嗛</view>
- <view class="img_wrap">
+ <view bindtap="playVideo" class="img_wrap">
<image class="img" src="{{ info.coverImage }}" mode="widthFix"></image>
- <view class="play">
+ <view class="play">
<view>鎾斁</view>
- <image bindtap="playVideo" src="../../static/icon/ic_play.png" class="icon"></image>
+ <image src="../../static/icon/ic_play.png" class="icon"></image>
</view>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index ba176f8..c9640b7 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -56,9 +56,9 @@
</view>
<image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
</view>
- <view class="video_wrap">
+ <view bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="video_wrap">
<image class="img" src="{{ productVideo[0].coverImage }}" mode="aspectFill"></image>
- <image bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="play" src="../../static/icon/ic_play.png"></image>
+ <image class="play" src="../../static/icon/ic_play.png"></image>
</view>
</view>
<!-- 鏀荤暐 -->
diff --git a/wechat_jiaxuan/pages/productVideo/index.wxml b/wechat_jiaxuan/pages/productVideo/index.wxml
index f481144..13f53e4 100644
--- a/wechat_jiaxuan/pages/productVideo/index.wxml
+++ b/wechat_jiaxuan/pages/productVideo/index.wxml
@@ -15,9 +15,9 @@
<!-- content -->
<view class="content" >
<view wx:for="{{ dataList }}" class="item">
- <view class="img_wrap">
+ <view bindtap="itemClick" data-videourl="{{ item.videoUrl }}" data-id="{{ item.id }}" class="img_wrap">
<image class="img" src="{{ item.coverImage }}" mode="aspectFill"></image>
- <image bindtap="itemClick" data-videourl="{{ item.videoUrl }}" data-id="{{ item.id }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
+ <image class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
</view>
<view class="title">{{ item.title }}</view>
diff --git a/wechat_jiaxuan/pages/store/staff.less b/wechat_jiaxuan/pages/store/staff.less
index 8eb931e..c4fe07c 100644
--- a/wechat_jiaxuan/pages/store/staff.less
+++ b/wechat_jiaxuan/pages/store/staff.less
@@ -2,21 +2,15 @@
width: 750rpx;
height: 400rpx;
background-color: #333333;
- position: fixed;
- top: 0;
- left: 0;
+ position: relative;
z-index: -1;
}
-page{
- overflow-y: hidden;
-}
-.app{
- overflow-y: hidden;
-}
.container {
- padding: 26rpx 40rpx;
+ padding: 0rpx 40rpx 140rpx;
+ position: relative;
+ bottom: 70rpx;
+ z-index: 1;
.avatar {
- margin-top: 300rpx;
width: 140rpx;
height: 140rpx;
border-radius: 50%;
@@ -157,6 +151,7 @@
height: 100rpx;
position: fixed;
bottom: 0;
+ z-index: 999;
left: 0rpx;
width: 750rpx;
padding: 0rpx 40rpx;
diff --git a/wechat_jiaxuan/pages/store/staff.wxml b/wechat_jiaxuan/pages/store/staff.wxml
index 15b07f6..30e825c 100644
--- a/wechat_jiaxuan/pages/store/staff.wxml
+++ b/wechat_jiaxuan/pages/store/staff.wxml
@@ -51,7 +51,7 @@
</view>
</view>
<!-- footer -->
- <view bindtap="makePhone" class="footer" style="bottom: {{bottomLift}}px;">
+ <view bindtap="makePhone" class="footer" style="bottom: {{bottomLift + 6}}px;">
<view class="btn">
<image src="../../static/icon/call.png" mode="widthFix"></image>
<view>鑱旂郴TA</view>
diff --git a/wechat_jiaxuan/pages/store/staff.wxss b/wechat_jiaxuan/pages/store/staff.wxss
index ac60b6c..5a009ea 100644
--- a/wechat_jiaxuan/pages/store/staff.wxss
+++ b/wechat_jiaxuan/pages/store/staff.wxss
@@ -2,22 +2,16 @@
width: 750rpx;
height: 400rpx;
background-color: #333333;
- position: fixed;
- top: 0;
- left: 0;
+ position: relative;
z-index: -1;
}
-page {
- overflow-y: hidden;
-}
-.app {
- overflow-y: hidden;
-}
.container {
- padding: 26rpx 40rpx;
+ padding: 0rpx 40rpx 140rpx;
+ position: relative;
+ bottom: 70rpx;
+ z-index: 1;
}
.container .avatar {
- margin-top: 300rpx;
width: 140rpx;
height: 140rpx;
border-radius: 50%;
@@ -145,6 +139,7 @@
height: 100rpx;
position: fixed;
bottom: 0;
+ z-index: 999;
left: 0rpx;
width: 750rpx;
padding: 0rpx 40rpx;
diff --git a/wechat_staff/pages/detailDis/product.wxml b/wechat_staff/pages/detailDis/product.wxml
index edf23cc..1c26f22 100644
--- a/wechat_staff/pages/detailDis/product.wxml
+++ b/wechat_staff/pages/detailDis/product.wxml
@@ -20,11 +20,11 @@
<!-- video -->
<view wx:if="{{ info.video }}" class="video">
<view class="title">浜у搧瑙嗛</view>
- <view class="img_wrap">
+ <view bindtap="playVideo" class="img_wrap">
<image class="img" src="{{ info.coverImage }}" mode="aspectFill"></image>
<view class="play">
<view>鎾斁</view>
- <image bindtap="playVideo" src="../../static/icon/ic_play.png" class="icon"></image>
+ <image src="../../static/icon/ic_play.png" class="icon"></image>
</view>
</view>
</view>
diff --git a/wechat_staff/pages/index/index.less b/wechat_staff/pages/index/index.less
index a0812da..51fc4ff 100644
--- a/wechat_staff/pages/index/index.less
+++ b/wechat_staff/pages/index/index.less
@@ -22,7 +22,7 @@
.everyday {
width: 670rpx;
height: 466rpx;
- margin: 160rpx 40rpx 0rpx 40rpx;
+ margin: 160rpx 40rpx 30rpx 40rpx;
background: linear-gradient(180deg, #F2E7E1 0%, #FEFEFD 30%, #FFFFFF 100%), #FFFFFF;
box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(176, 135, 113, 0.2);
border-radius: 8rpx;
@@ -115,13 +115,11 @@
}
// 浜у搧瑙嗛
.product_video {
- padding: 40rpx 40rpx;
+ padding: 40rpx 40rpx 44rpx;
background-color: #fff;
-
.video_wrap {
width: 670rpx;
position: relative;
-
.play {
width: 60rpx;
position: absolute;
diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index 318b28f..de6e867 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -62,9 +62,9 @@
</view>
<image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
</view>
- <view class="video_wrap">
+ <view bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="video_wrap">
<image class="img" src="{{ productVideo[0].coverImage }}" mode="aspectFill"></image>
- <image bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
+ <image class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
</view>
</view>
<!-- 鏀荤暐 -->
diff --git a/wechat_staff/pages/index/index.wxss b/wechat_staff/pages/index/index.wxss
index 49987e6..1575ecc 100644
--- a/wechat_staff/pages/index/index.wxss
+++ b/wechat_staff/pages/index/index.wxss
@@ -22,7 +22,7 @@
.everyday {
width: 670rpx;
height: 466rpx;
- margin: 160rpx 40rpx 0rpx 40rpx;
+ margin: 160rpx 40rpx 30rpx 40rpx;
background: linear-gradient(180deg, #F2E7E1 0%, #FEFEFD 30%, #FFFFFF 100%), #FFFFFF;
box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(176, 135, 113, 0.2);
border-radius: 8rpx;
@@ -107,7 +107,7 @@
margin-top: 20rpx;
}
.product_video {
- padding: 40rpx 40rpx;
+ padding: 40rpx 40rpx 44rpx;
background-color: #fff;
}
.product_video .video_wrap {
diff --git a/wechat_staff/pages/productVideo/index.wxml b/wechat_staff/pages/productVideo/index.wxml
index b9ef53a..b3ea2c8 100644
--- a/wechat_staff/pages/productVideo/index.wxml
+++ b/wechat_staff/pages/productVideo/index.wxml
@@ -16,9 +16,9 @@
<!-- content -->
<view class="content">
<view wx:for="{{ dataList }}" class="item">
- <view class="img_wrap">
+ <view bindtap="itemClick" data-videourl="{{ item.videoUrl }}" data-id="{{ item.id }}" class="img_wrap">
<image class="img" src="{{ item.coverImage }}" mode="widthFix"></image>
- <image bindtap="itemClick" data-videourl="{{ item.videoUrl }}" data-id="{{ item.id }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
+ <image class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
</view>
<view class="title">{{ item.title }}</view>
diff --git a/wechat_staff/project.private.config.json b/wechat_staff/project.private.config.json
index 02f370f..ddc3435 100644
--- a/wechat_staff/project.private.config.json
+++ b/wechat_staff/project.private.config.json
@@ -24,7 +24,7 @@
},
{
"name": "",
- "pathName": "pages/login/index",
+ "pathName": "pages/userinfo/index",
"query": "",
"launchMode": "default",
"scene": null
--
Gitblit v1.9.3