From 0c02f1bf5f00e6de2c379dc121047b84a5b7c153 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 29 七月 2024 17:50:46 +0800
Subject: [PATCH] ‘’
---
wechat_staff/components/disRealpic/index.js | 7
wechat_jiaxuan/pages/userinfo/index.wxml | 2
wechat_staff/pages/store/staff.less | 36 ++++-
wechat_staff/pages/promotion/index.less | 2
wechat_jiaxuan/components/disProduct/index.less | 3
wechat_jiaxuan/components/disRealpic/index.less | 3
wechat_staff/pages/kefu/fond.js | 4
wechat_staff/utils/request.js | 21 ++-
wechat_jiaxuan/app.wxss | 3
wechat_staff/pages/kefu/fond.wxss | 27 ++--
wechat_jiaxuan/pages/detailDis/product.wxml | 2
wechat_jiaxuan/pages/detailDis/product.wxss | 17 ++
wechat_staff/components/detailFooter/index.wxss | 23 +--
wechat_staff/components/disProduct/index.less | 3
wechat_staff/components/disRealpic/index.json | 4
wechat_staff/pages/promotion/index.wxss | 1
wechat_staff/components/videoPlay/index.wxss | 12 +
wechat_staff/components/disRealpic/index.less | 4
wechat_jiaxuan/components/idCard/index.less | 2
wechat_staff/pages/detailDis/product.wxml | 2
wechat_staff/components/detailFooter/index.less | 23 +--
/dev/null | 59 ---------
wechat_jiaxuan/pages/detailDis/product.less | 3
wechat_jiaxuan/components/idCard/index.wxss | 2
wechat_staff/pages/store/staff.wxss | 38 ++++-
wechat_staff/pages/detailDis/product.less | 1
wechat_jiaxuan/components/disRealpic/index.wxss | 4
wechat_jiaxuan/components/videoPlay/index.wxss | 12 +
wechat_jiaxuan/utils/request.js | 9 +
wechat_staff/pages/kefu/fond.less | 23 +--
wechat_jiaxuan/components/disProduct/index.wxss | 3
wechat_staff/components/disRealpic/index.wxml | 2
32 files changed, 190 insertions(+), 167 deletions(-)
diff --git a/wechat_jiaxuan/app.wxss b/wechat_jiaxuan/app.wxss
index 42eeaf6..6f32364 100644
--- a/wechat_jiaxuan/app.wxss
+++ b/wechat_jiaxuan/app.wxss
@@ -2,6 +2,9 @@
view,text,scroll-view,image{
box-sizing: border-box;
}
+.swiper{
+ box-sizing: border-box;
+}
page{
background-color: #fff;
--themeColor:#B08771;
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index e7bd521..ad224c1 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -178,6 +178,9 @@
width: 242rpx;
flex-shrink: 0;
margin-bottom: 32rpx;
+ &:nth-last-child(1){
+ margin-right: auto;
+ }
.img_wrap {
width: 242rpx;
border-radius: 8rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index c937e3c..f962c68 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -164,6 +164,9 @@
flex-shrink: 0;
margin-bottom: 32rpx;
}
+.main_content .main_right .goods_list .item:nth-last-child(1) {
+ margin-right: auto;
+}
.main_content .main_right .goods_list .item .img_wrap {
width: 242rpx;
border-radius: 8rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index d73de13..52cb01f 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -150,6 +150,9 @@
.item {
width: 324rpx;
margin-bottom: 32rpx;
+ &:nth-last-child(1){
+ margin-right: auto;
+ }
.img_wrap {
width: 100%;
height: 182rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 911a199..6b1da18 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -132,11 +132,13 @@
flex-wrap: wrap;
justify-content: space-around;
}
-
.main_content .goods_list .item {
width: 324rpx;
margin-bottom: 32rpx;
}
+.main_content .goods_list .item:nth-last-child(1) {
+ margin-right: auto;
+}
.main_content .goods_list .item .img_wrap {
width: 100%;
height: 182rpx;
diff --git a/wechat_jiaxuan/components/idCard/index.less b/wechat_jiaxuan/components/idCard/index.less
index e89bf2d..6bb6291 100644
--- a/wechat_jiaxuan/components/idCard/index.less
+++ b/wechat_jiaxuan/components/idCard/index.less
@@ -39,7 +39,7 @@
font-size: 20rpx;
color: #333333;
.icon{
- margin-bottom: 4rpx;
+ margin-bottom: 6rpx;
width: 44rpx;
height: 44rpx;
}
diff --git a/wechat_jiaxuan/components/idCard/index.wxss b/wechat_jiaxuan/components/idCard/index.wxss
index 7372383..672e603 100644
--- a/wechat_jiaxuan/components/idCard/index.wxss
+++ b/wechat_jiaxuan/components/idCard/index.wxss
@@ -38,7 +38,7 @@
color: #333333;
}
.user .btns .item .icon {
- margin-bottom: 4rpx;
+ margin-bottom: 6rpx;
width: 44rpx;
height: 44rpx;
}
diff --git a/wechat_jiaxuan/components/videoPlay/index.less b/wechat_jiaxuan/components/videoPlay/index.less
deleted file mode 100644
index e89bf2d..0000000
--- a/wechat_jiaxuan/components/videoPlay/index.less
+++ /dev/null
@@ -1,59 +0,0 @@
-.user {
- width: 750rpx;
- padding: 0 40rpx;
- height: 148rpx;
- background: #FFFFFF;
- border-radius: 8rpx;
- padding: 0 30rpx;
- display: flex;
- align-items: center;
- .content {
- flex: 1;
-
- .name {
- font-size: 30rpx;
- margin-bottom: 12rpx;
- }
-
- .desc {
- font-size: 24rpx;
- color: #999999;
- }
- }
-
- .avatar {
- width: 80rpx;
- height: 80rpx;
- border-radius: 50%;
- margin-right: 24rpx;
- }
-
- .btns{
- display: flex;
- .item{
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- margin-left: 70rpx;
- font-size: 20rpx;
- color: #333333;
- .icon{
- margin-bottom: 4rpx;
- width: 44rpx;
- height: 44rpx;
- }
- }
- }
- .btn {
- width: 118rpx;
- height: 56rpx;
- line-height: 52rpx;
- text-align: center;
- background: var(--themeColor);
- border-radius: 8rpx;
- font-weight: 500;
- font-size: 26rpx;
- color: #fff;
- }
-}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/videoPlay/index.wxss b/wechat_jiaxuan/components/videoPlay/index.wxss
index 205694c..0330f3e 100644
--- a/wechat_jiaxuan/components/videoPlay/index.wxss
+++ b/wechat_jiaxuan/components/videoPlay/index.wxss
@@ -5,15 +5,17 @@
left: 0;
width: 100%;
height: 100%;
- background-color: rgba(0, 0, 0, 0.2);
+ background-color: rgba(0, 0, 0, 0.5);
z-index: 9999;
}
.video_content .video{
position: fixed;
border-radius: 8rpx;
- top: 50%;
- left: 75rpx;
- transform: translate(0, -50%);
- width: 600rpx;
+ top: 40%;
+ left: 0;
+ width: 750rpx;
z-index: 10000;
+}
+video{
+ width: 750rpx;
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/product.less b/wechat_jiaxuan/pages/detailDis/product.less
index a0f2291..1e95095 100644
--- a/wechat_jiaxuan/pages/detailDis/product.less
+++ b/wechat_jiaxuan/pages/detailDis/product.less
@@ -92,13 +92,14 @@
border-radius: 16rpx 16rpx 0rpx 0rpx;
background-color: #fff;
margin-bottom: 20rpx;
+ overflow: hidden;
.title {
font-weight: 500;
font-size: 36rpx;
margin-bottom: 16rpx;
}
.desc {
-
+ line-height: 40rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 26rpx;
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
index becec78..0ad9ce2 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxml
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -10,7 +10,7 @@
</swiper-item>
</block>
</swiper>
- <view class="indicator">{{current}}/{{info.bannerImgList.length}}</view>
+ <view class="indicator">{{current + 1}}/{{info.bannerImgList.length}}</view>
</view>
<view class="main_content">
<view class="title">{{ info.title }}</view>
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxss b/wechat_jiaxuan/pages/detailDis/product.wxss
index b323e2b..6a6dba3 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxss
+++ b/wechat_jiaxuan/pages/detailDis/product.wxss
@@ -85,6 +85,7 @@
border-radius: 16rpx 16rpx 0rpx 0rpx;
background-color: #fff;
margin-bottom: 20rpx;
+ overflow: hidden;
}
.main_content .title {
font-weight: 500;
@@ -92,6 +93,7 @@
margin-bottom: 16rpx;
}
.main_content .desc {
+ line-height: 40rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 26rpx;
@@ -161,6 +163,7 @@
}
.video .img_wrap .img {
width: 100%;
+ height: 376rpx;
}
.video .img_wrap .play {
position: absolute;
@@ -175,6 +178,14 @@
border-radius: 30rpx;
font-size: 26rpx;
color: rgba(255, 255, 255, 0.8);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.video .img_wrap .play .icon {
+ width: 14rpx;
+ height: 16rpx;
+ margin-left: 14rpx;
}
.detail {
padding: 52rpx 40rpx 40rpx;
@@ -187,13 +198,13 @@
}
.detail .line {
display: flex;
- height: 32rpx;
- margin-bottom: 24rpx;
+ margin-bottom: 20rpx;
}
.detail .line .label {
- width: auto;
+ width: 120rpx;
font-size: 24rpx;
color: #666666;
+ flex-shrink: 0;
}
.detail .line .val {
flex: 1;
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
index 37ebd4d..7af2c4b 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxml
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -5,7 +5,7 @@
<view class="line">
<view class="label">鏄电О</view>
<view class="val">
- <input bindchange="getNickName" value="{{ nickname }}" maxlength="{{ 18 }}" type="nickname"/>
+ <input bindchange="getNickName" value="{{ nickname }}" maxlength="{{ 10 }}" type="nickname"/>
</view>
</view>
<view class="line">
diff --git a/wechat_jiaxuan/utils/request.js b/wechat_jiaxuan/utils/request.js
index 7d2a0ea..d111b6c 100644
--- a/wechat_jiaxuan/utils/request.js
+++ b/wechat_jiaxuan/utils/request.js
@@ -1,10 +1,10 @@
import { baseUrl } from "./config"
-import { wxLoginCustomer } from '../api/index'
-
+let number = 0
export function request(options){
let loading = options.loading || '1' // 榛樿鍊�1鏄剧ず锛屽惁鍒欎笉鏄剧ず
if(loading == '1'){
wx.showLoading()
+ number ++
}
return new Promise(resolve => {
wx.request({
@@ -40,7 +40,10 @@
},
complete() {
if(loading == '1'){
- wx.hideLoading()
+ number --
+ if(number == 0){
+ wx.hideLoading()
+ }
}
}
})
diff --git a/wechat_staff/components/detailFooter/index.less b/wechat_staff/components/detailFooter/index.less
index a058cab..2f543cf 100644
--- a/wechat_staff/components/detailFooter/index.less
+++ b/wechat_staff/components/detailFooter/index.less
@@ -103,44 +103,43 @@
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, .2);
z-index: 99999;
.img1{
image{
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
}
.content{
- width: 600rpx;
- height: 308rpx;
- padding: 26rpx 0 40rpx;
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
background: rgba(255,255,255,0.8);
border-radius: 16rpx;
margin-top: 24rpx;
text-align: center;
.title{
font-weight: 500;
- font-size: 30rpx;
- margin-bottom: 20rpx;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
}
.line{
- font-size: 26rpx;
+ font-size: 24rpx;
color: #333333;
- line-height: 36rpx;
+ line-height: 28rpx;
}
}
.btns{
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
.btn{
width: 160rpx;
- height: 88rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
diff --git a/wechat_staff/components/detailFooter/index.wxss b/wechat_staff/components/detailFooter/index.wxss
index d156385..08d0458 100644
--- a/wechat_staff/components/detailFooter/index.wxss
+++ b/wechat_staff/components/detailFooter/index.wxss
@@ -99,20 +99,19 @@
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, 0.2);
z-index: 99999;
}
.card_wrap .img1 image {
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
.card_wrap .content {
- width: 600rpx;
- height: 308rpx;
- padding: 26rpx 0 40rpx;
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
background: rgba(255, 255, 255, 0.8);
border-radius: 16rpx;
margin-top: 24rpx;
@@ -120,23 +119,23 @@
}
.card_wrap .content .title {
font-weight: 500;
- font-size: 30rpx;
- margin-bottom: 20rpx;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
}
.card_wrap .content .line {
- font-size: 26rpx;
+ font-size: 24rpx;
color: #333333;
- line-height: 36rpx;
+ line-height: 28rpx;
}
.card_wrap .btns {
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
}
.card_wrap .btns .btn {
width: 160rpx;
- height: 88rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index 3bcef18..053bfce 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -177,6 +177,9 @@
width: 242rpx;
flex-shrink: 0;
margin-bottom: 32rpx;
+ &:nth-last-child(1){
+ margin-right: auto;
+ }
.img_wrap {
width: 242rpx;
border-radius: 8rpx;
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index 000c3d7..fe2f8ef 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -66,9 +66,10 @@
},
videoClick(e) {
const { videourl } = e.currentTarget.dataset
- wx.previewMedia({
- sources: [{ url: videourl, type: 'video' }]
- })
+ let videoPlay = this.selectComponent('.videoPlay');
+ if(videoPlay){
+ videoPlay.startPlayVideo(videourl,this );
+ }
},
priviewFull(e){
const item = e.currentTarget.dataset.item
diff --git a/wechat_staff/components/disRealpic/index.json b/wechat_staff/components/disRealpic/index.json
index e8cfaaf..b2baa38 100644
--- a/wechat_staff/components/disRealpic/index.json
+++ b/wechat_staff/components/disRealpic/index.json
@@ -1,4 +1,6 @@
{
"component": true,
- "usingComponents": {}
+ "usingComponents": {
+ "videoPlay": "/components/videoPlay/index"
+ }
}
\ No newline at end of file
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index e1320db..2fea38a 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -149,7 +149,9 @@
.item {
width: 324rpx;
margin-bottom: 32rpx;
-
+ &:nth-last-child(1){
+ margin-right: auto;
+ }
.img_wrap {
width: 100%;
height: 182rpx;
diff --git a/wechat_staff/components/disRealpic/index.wxml b/wechat_staff/components/disRealpic/index.wxml
index f8a9367..87210e4 100644
--- a/wechat_staff/components/disRealpic/index.wxml
+++ b/wechat_staff/components/disRealpic/index.wxml
@@ -65,5 +65,5 @@
</view>
</view>
-
+ <videoPlay class="videoPlay"/>
</view>
\ No newline at end of file
diff --git a/wechat_staff/components/videoPlay/index.less b/wechat_staff/components/videoPlay/index.less
deleted file mode 100644
index e89bf2d..0000000
--- a/wechat_staff/components/videoPlay/index.less
+++ /dev/null
@@ -1,59 +0,0 @@
-.user {
- width: 750rpx;
- padding: 0 40rpx;
- height: 148rpx;
- background: #FFFFFF;
- border-radius: 8rpx;
- padding: 0 30rpx;
- display: flex;
- align-items: center;
- .content {
- flex: 1;
-
- .name {
- font-size: 30rpx;
- margin-bottom: 12rpx;
- }
-
- .desc {
- font-size: 24rpx;
- color: #999999;
- }
- }
-
- .avatar {
- width: 80rpx;
- height: 80rpx;
- border-radius: 50%;
- margin-right: 24rpx;
- }
-
- .btns{
- display: flex;
- .item{
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- margin-left: 70rpx;
- font-size: 20rpx;
- color: #333333;
- .icon{
- margin-bottom: 4rpx;
- width: 44rpx;
- height: 44rpx;
- }
- }
- }
- .btn {
- width: 118rpx;
- height: 56rpx;
- line-height: 52rpx;
- text-align: center;
- background: var(--themeColor);
- border-radius: 8rpx;
- font-weight: 500;
- font-size: 26rpx;
- color: #fff;
- }
-}
\ No newline at end of file
diff --git a/wechat_staff/components/videoPlay/index.wxss b/wechat_staff/components/videoPlay/index.wxss
index 205694c..0330f3e 100644
--- a/wechat_staff/components/videoPlay/index.wxss
+++ b/wechat_staff/components/videoPlay/index.wxss
@@ -5,15 +5,17 @@
left: 0;
width: 100%;
height: 100%;
- background-color: rgba(0, 0, 0, 0.2);
+ background-color: rgba(0, 0, 0, 0.5);
z-index: 9999;
}
.video_content .video{
position: fixed;
border-radius: 8rpx;
- top: 50%;
- left: 75rpx;
- transform: translate(0, -50%);
- width: 600rpx;
+ top: 40%;
+ left: 0;
+ width: 750rpx;
z-index: 10000;
+}
+video{
+ width: 750rpx;
}
\ No newline at end of file
diff --git a/wechat_staff/pages/detailDis/product.less b/wechat_staff/pages/detailDis/product.less
index e9accae..f257c46 100644
--- a/wechat_staff/pages/detailDis/product.less
+++ b/wechat_staff/pages/detailDis/product.less
@@ -81,6 +81,7 @@
margin-bottom: 16rpx;
}
.desc {
+ line-height: 40rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 26rpx;
diff --git a/wechat_staff/pages/detailDis/product.wxml b/wechat_staff/pages/detailDis/product.wxml
index 23a49bb..9384c24 100644
--- a/wechat_staff/pages/detailDis/product.wxml
+++ b/wechat_staff/pages/detailDis/product.wxml
@@ -10,7 +10,7 @@
</swiper-item>
</block>
</swiper>
- <view class="indicator">{{current}}/{{info.bannerImgList.length}}</view>
+ <view class="indicator">{{current + 1}}/{{info.bannerImgList.length}}</view>
</view>
<view class="main_content">
<view class="title">{{ info.title }}</view>
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index b65bae5..c8f7322 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -8,7 +8,9 @@
data: {
bottomLift: 0,
checkAll: false,
- enjoyList: []
+ enjoyList: [],
+ leftIcon: '<<',
+ rightIcon: '>>',
},
/**
diff --git a/wechat_staff/pages/kefu/fond.less b/wechat_staff/pages/kefu/fond.less
index 66841f3..45dc26f 100644
--- a/wechat_staff/pages/kefu/fond.less
+++ b/wechat_staff/pages/kefu/fond.less
@@ -154,44 +154,43 @@
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, .2);
z-index: 99999;
.img1{
image{
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
}
.content{
- width: 600rpx;
- height: 308rpx;
- padding: 26rpx 0 40rpx;
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
background: rgba(255,255,255,0.8);
border-radius: 16rpx;
margin-top: 24rpx;
text-align: center;
.title{
font-weight: 500;
- font-size: 30rpx;
- margin-bottom: 20rpx;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
}
.line{
- font-size: 26rpx;
+ font-size: 24rpx;
color: #333333;
- line-height: 36rpx;
+ line-height: 28rpx;
}
}
.btns{
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
.btn{
width: 160rpx;
- height: 88rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
diff --git a/wechat_staff/pages/kefu/fond.wxss b/wechat_staff/pages/kefu/fond.wxss
index 8e14f9c..3409a37 100644
--- a/wechat_staff/pages/kefu/fond.wxss
+++ b/wechat_staff/pages/kefu/fond.wxss
@@ -41,10 +41,8 @@
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
- -webkit-line-clamp: 2;
- white-space: break-spaces;
+ -webkit-line-clamp: 2;
-webkit-box-orient: vertical;
- word-break: break-word;
}
.date_item .line .content .time {
font-size: 24rpx;
@@ -155,20 +153,19 @@
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, 0.2);
z-index: 99999;
}
.card_wrap .img1 image {
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
.card_wrap .content {
- width: 600rpx;
- height: 308rpx;
- padding: 26rpx 0 40rpx;
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
background: rgba(255, 255, 255, 0.8);
border-radius: 16rpx;
margin-top: 24rpx;
@@ -176,23 +173,23 @@
}
.card_wrap .content .title {
font-weight: 500;
- font-size: 30rpx;
- margin-bottom: 20rpx;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
}
.card_wrap .content .line {
- font-size: 26rpx;
+ font-size: 24rpx;
color: #333333;
- line-height: 36rpx;
+ line-height: 28rpx;
}
.card_wrap .btns {
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
}
.card_wrap .btns .btn {
width: 160rpx;
- height: 88rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
diff --git a/wechat_staff/pages/promotion/index.less b/wechat_staff/pages/promotion/index.less
index eb092e4..f2470b9 100644
--- a/wechat_staff/pages/promotion/index.less
+++ b/wechat_staff/pages/promotion/index.less
@@ -15,7 +15,7 @@
background: #F7F7F7;
border-radius: 8rpx;
padding: 34rpx 40rpx 40rpx;
-
+ margin-bottom: 40rpx;
.time {
font-weight: 500;
font-size: 30rpx;
diff --git a/wechat_staff/pages/promotion/index.wxss b/wechat_staff/pages/promotion/index.wxss
index 43ca9b7..40ab03e 100644
--- a/wechat_staff/pages/promotion/index.wxss
+++ b/wechat_staff/pages/promotion/index.wxss
@@ -13,6 +13,7 @@
background: #F7F7F7;
border-radius: 8rpx;
padding: 34rpx 40rpx 40rpx;
+ margin-bottom: 40rpx;
}
.content .time {
font-weight: 500;
diff --git a/wechat_staff/pages/store/staff.less b/wechat_staff/pages/store/staff.less
index 0888924..3518d95 100644
--- a/wechat_staff/pages/store/staff.less
+++ b/wechat_staff/pages/store/staff.less
@@ -204,25 +204,43 @@
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, .2);
- z-index: 999;
+ z-index: 99999;
.img1{
image{
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
}
+ .content{
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
+ background: rgba(255,255,255,0.8);
+ border-radius: 16rpx;
+ margin-top: 24rpx;
+ text-align: center;
+ .title{
+ font-weight: 500;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
+ }
+ .line{
+ font-size: 24rpx;
+ color: #333333;
+ line-height: 28rpx;
+ }
+ }
.btns{
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
.btn{
- width: 290rpx;
- height: 88rpx;
+ width: 160rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
@@ -231,8 +249,10 @@
color: #fff;
}
.save{
+ width: 420rpx;
+ margin-left: 20rpx;
border: none;
background: linear-gradient( 180deg, #E0B49C 0%, #B68B74 100%);
}
}
-}
+}
\ No newline at end of file
diff --git a/wechat_staff/pages/store/staff.wxss b/wechat_staff/pages/store/staff.wxss
index dffb74d..cae38d7 100644
--- a/wechat_staff/pages/store/staff.wxss
+++ b/wechat_staff/pages/store/staff.wxss
@@ -105,7 +105,6 @@
font-size: 40rpx;
display: flex;
}
-
.guide .title {
font-weight: 500;
font-size: 32rpx;
@@ -188,30 +187,47 @@
color: #999999;
text-align: center;
}
-
.card_wrap {
position: fixed;
border-radius: 8rpx;
top: 50%;
- left: 75rpx;
+ left: 95rpx;
transform: translate(0, -50%);
- width: 600rpx;
+ width: 560rpx;
background-color: rgba(0, 0, 0, 0.2);
- z-index: 999;
+ z-index: 99999;
}
.card_wrap .img1 image {
- width: 600rpx;
+ width: 560rpx;
border-radius: 8rpx ;
}
+.card_wrap .content {
+ width: 560rpx;
+ padding: 24rpx 0 16rpx;
+ background: rgba(255, 255, 255, 0.8);
+ border-radius: 16rpx;
+ margin-top: 24rpx;
+ text-align: center;
+}
+.card_wrap .content .title {
+ font-weight: 500;
+ font-size: 28rpx;
+ margin-bottom: 12rpx;
+}
+.card_wrap .content .line {
+ font-size: 24rpx;
+ color: #333333;
+ line-height: 28rpx;
+}
.card_wrap .btns {
- margin-top: 30rpx;
+ margin-top: 24rpx;
display: flex;
justify-content: space-between;
width: 100%;
}
.card_wrap .btns .btn {
- width: 290rpx;
- height: 88rpx;
+ width: 160rpx;
+ height: 72rpx;
border-radius: 8rpx;
border: 2rpx solid #FFFFFF;
display: flex;
@@ -220,6 +236,8 @@
color: #fff;
}
.card_wrap .btns .save {
+ width: 420rpx;
+ margin-left: 20rpx;
border: none;
background: linear-gradient(180deg, #E0B49C 0%, #B68B74 100%);
-}
\ No newline at end of file
+}
diff --git a/wechat_staff/utils/request.js b/wechat_staff/utils/request.js
index 2eda17e..87ecfb4 100644
--- a/wechat_staff/utils/request.js
+++ b/wechat_staff/utils/request.js
@@ -1,8 +1,10 @@
-import { baseUrl } from "./config"
-export function request(options){
+import { baseUrl } from "./config"
+let number = 0
+export function request(options) {
let loading = options.loading || '1' // 榛樿鍊�1鏄剧ず锛屽惁鍒欎笉鏄剧ず
- if(loading == '1'){
+ if (loading == '1') {
wx.showLoading()
+ number++
}
return new Promise(resolve => {
wx.request({
@@ -18,7 +20,7 @@
if (res.data.code === 200) {
resolve(res.data || true)
} else {
- if(res.data.code && (res.data.code == 5112 || res.data.code == 5111)){
+ if (res.data.code && (res.data.code == 5112 || res.data.code == 5111)) {
wx.navigateTo({
url: '/pages/login/index',
})
@@ -30,18 +32,21 @@
}
},
fail(err) {
- console.log('err', err);
+ console.log('err', err)
err.message && wx.showToast({
title: err.message || '鍙戠敓閿欒',
icon: 'none'
})
},
complete() {
- if(loading == '1'){
- wx.hideLoading()
+ if (loading == '1') {
+ number--
+ if (number == 0) {
+ wx.hideLoading()
+ }
}
}
})
- } )
+ })
}
--
Gitblit v1.9.3