From d5592767654f4fc59b572bab54de1d9202d994ea Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 30 七月 2024 15:11:35 +0800
Subject: [PATCH] ‘’
---
wechat_jiaxuan/pages/userinfo/index.wxml | 2
wechat_staff/pages/index/index.wxss | 5
wechat_staff/pages/store/staff.less | 14 +
wechat_jiaxuan/components/disProduct/index.less | 9
wechat_staff/components/buoyClient/index.less | 1
wechat_jiaxuan/app.js | 9 +
wechat_jiaxuan/pages/store/staff.wxss | 15 +
wechat_jiaxuan/pages/auth/auth.less | 1
wechat_jiaxuan/pages/store/staff.less | 14 +
wechat_staff/pages/kefu/select.wxml | 2
wechat_jiaxuan/pages/auth/auth.wxss | 1
wechat_staff/components/disRealpic/index.less | 9
wechat_jiaxuan/pages/index/index.less | 1
wechat_staff/pages/store/staff.wxml | 5
wechat_staff/pages/detailDis/product.wxss | 23 ++
wechat_jiaxuan/components/authCard/authCard.wxss | 5
wechat_jiaxuan/pages/design/design.js | 4
wechat_jiaxuan/pages/detailDis/realpic.less | 5
wechat_staff/pages/work/index.wxml | 3
wechat_staff/components/disProduct/index.wxss | 10
wechat_jiaxuan/pages/consult/consult.json | 3
wechat_jiaxuan/pages/store/info.wxml | 7
wechat_staff/pages/detailDis/product.less | 5
wechat_jiaxuan/pages/index/index.wxss | 3
wechat_staff/components/disRealpic/index.wxss | 10
wechat_staff/pages/consult/consult.js | 5
wechat_staff/pages/consult/consult.json | 3
wechat_staff/components/disRealpic/index.js | 9
wechat_staff/pages/detailDis/case.wxss | 5
wechat_staff/pages/index/index.wxml | 6
wechat_staff/pages/detailDis/realpic.less | 5
wechat_jiaxuan/pages/store/info.less | 6
wechat_jiaxuan/components/disRealpic/index.less | 10
wechat_staff/pages/kefu/fond.js | 11 -
wechat_staff/pages/work/index.less | 14 +
wechat_staff/pages/consult/detail.js | 2
wechat_jiaxuan/project.config.json | 2
wechat_jiaxuan/pages/detailDis/product.wxss | 10 +
wechat_staff/pages/consult/detail.wxss | 5
wechat_jiaxuan/components/authCard/authCard.less | 5
wechat_staff/components/disProduct/index.less | 10
wechat_jiaxuan/pages/consult/consult.js | 5
wechat_jiaxuan/pages/detailDis/realpic.wxss | 5
wechat_jiaxuan/pages/store/staff.wxml | 6
wechat_staff/pages/login/index.js | 25 ++
wechat_jiaxuan/pages/consult/detail.wxss | 5
wechat_staff/components/detailFooter/index.js | 2
wechat_jiaxuan/pages/index/index.js | 10
wechat_jiaxuan/pages/detailDis/product.js | 3
wechat_staff/pages/index/index.less | 5
wechat_jiaxuan/pages/userinfo/index.js | 14 -
wechat_jiaxuan/pages/consult/detail.less | 5
wechat_staff/pages/detailDis/realpic.wxss | 5
wechat_staff/pages/detailDis/case.less | 5
wechat_jiaxuan/pages/detailDis/case.wxss | 5
wechat_jiaxuan/pages/detailDis/product.less | 10 +
wechat_jiaxuan/pages/detailDis/case.less | 5
wechat_staff/pages/consult/detail.less | 5
wechat_staff/pages/store/staff.wxss | 14 +
wechat_jiaxuan/pages/index/index.wxml | 2
wechat_jiaxuan/components/disRealpic/index.wxss | 11
wechat_jiaxuan/components/disProduct/index.wxss | 9
wechat_staff/pages/work/index.wxss | 13 +
wechat_staff/components/buoyClient/index.wxss | 1
wechat_jiaxuan/pages/store/info.wxss | 6
65 files changed, 304 insertions(+), 146 deletions(-)
diff --git a/wechat_jiaxuan/app.js b/wechat_jiaxuan/app.js
index 4bb2f46..50a7179 100644
--- a/wechat_jiaxuan/app.js
+++ b/wechat_jiaxuan/app.js
@@ -27,10 +27,17 @@
wx.login({
timeout: 5000,
success: (res) => {
+ var userId = null
+ if (op.query.scene) {
+ let temp = op.query.scene.split('_')
+ userId = temp[2]
+ }
if (res.code) {
//鍙戣捣缃戠粶璇锋眰
wxLoginCustomer({
- code: res.code
+ code: res.code,
+ userId
+
}).then(res => {
wx.setStorageSync('token', res.data.token)
this.globalData.token = res.data.token
diff --git a/wechat_jiaxuan/components/authCard/authCard.less b/wechat_jiaxuan/components/authCard/authCard.less
index 7e5f7c9..be32644 100644
--- a/wechat_jiaxuan/components/authCard/authCard.less
+++ b/wechat_jiaxuan/components/authCard/authCard.less
@@ -64,9 +64,10 @@
display: flex;
align-items: center;
font-weight: 600;
- font-size: 36rpx;
+ font-size: 34rpx;
.icon{
width: 36rpx;
+ height: 36rpx;
margin-right: 12rpx;
}
@@ -111,6 +112,7 @@
margin-right: 20rpx;
image{
width: 36rpx;
+ height: 36rpx;
}
}
.text{
@@ -133,6 +135,7 @@
color: #999999;
.icon{
width: 24rpx;
+ height: 24rpx;
}
}
.right{
diff --git a/wechat_jiaxuan/components/authCard/authCard.wxss b/wechat_jiaxuan/components/authCard/authCard.wxss
index 94cc6a7..10eae7f 100644
--- a/wechat_jiaxuan/components/authCard/authCard.wxss
+++ b/wechat_jiaxuan/components/authCard/authCard.wxss
@@ -65,10 +65,11 @@
display: flex;
align-items: center;
font-weight: 600;
- font-size: 36rpx;
+ font-size: 34rpx;
}
.wrap2 .header .left .name .icon {
width: 36rpx;
+ height: 36rpx;
margin-right: 12rpx;
}
.wrap2 .header .left .desc {
@@ -113,6 +114,7 @@
}
.wrap2 .list .item .name .icon image {
width: 36rpx;
+ height: 36rpx;
}
.wrap2 .list .item .name .text {
flex: 1;
@@ -135,6 +137,7 @@
}
.wrap2 .list .item .addr .left .icon {
width: 24rpx;
+ height: 24rpx;
}
.wrap2 .list .item .addr .right {
display: flex;
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index ad224c1..24d8f07 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -169,17 +169,16 @@
.goods_list {
height: calc( 100% - 182rpx);
width: 590rpx;
- display: flex;
- flex-wrap: wrap;
box-sizing: border-box;
- justify-content: space-between;
padding: 12rpx 40rpx;
.item {
+ float: left;
width: 242rpx;
flex-shrink: 0;
+ margin-right: 26rpx;
margin-bottom: 32rpx;
- &:nth-last-child(1){
- margin-right: auto;
+ &:nth-of-type(2n){
+ margin-right: 0;
}
.img_wrap {
width: 242rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index f962c68..9b4d36d 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -153,19 +153,18 @@
.main_content .main_right .goods_list {
height: calc(100% - 182rpx);
width: 590rpx;
- display: flex;
- flex-wrap: wrap;
box-sizing: border-box;
- justify-content: space-between;
padding: 12rpx 40rpx;
}
.main_content .main_right .goods_list .item {
+ float: left;
width: 242rpx;
flex-shrink: 0;
+ margin-right: 26rpx;
margin-bottom: 32rpx;
}
-.main_content .main_right .goods_list .item:nth-last-child(1) {
- margin-right: auto;
+.main_content .main_right .goods_list .item:nth-of-type(2n) {
+ margin-right: 0;
}
.main_content .main_right .goods_list .item .img_wrap {
width: 242rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index 7343f39..e5dedc9 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -143,15 +143,13 @@
padding: 12rpx 40rpx;
height: calc( 100% - 188rpx);
box-sizing: border-box;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-around;
-
.item {
width: 324rpx;
+ float: left;
+ margin-right: 22rpx;
margin-bottom: 32rpx;
- &:nth-last-child(1){
- margin-right: auto;
+ &:nth-of-type(2n){
+ margin-right: 0;
}
.img_wrap {
width: 100%;
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 1e48bc7..ef192a3 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -128,16 +128,15 @@
padding: 12rpx 40rpx;
height: calc(100% - 188rpx);
box-sizing: border-box;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-around;
}
.main_content .goods_list .item {
width: 324rpx;
+ float: left;
+ margin-right: 22rpx;
margin-bottom: 32rpx;
}
-.main_content .goods_list .item:nth-last-child(1) {
- margin-right: auto;
+.main_content .goods_list .item:nth-of-type(2n) {
+ margin-right: 0;
}
.main_content .goods_list .item .img_wrap {
width: 100%;
@@ -160,7 +159,7 @@
left: 16rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
- width:52rpx;
+ width: 52rpx;
height: 46rpx;
background: rgba(0, 0, 0, 0.54);
border-radius: 8rpx;
diff --git a/wechat_jiaxuan/pages/auth/auth.less b/wechat_jiaxuan/pages/auth/auth.less
index d7e8f3e..1caee13 100644
--- a/wechat_jiaxuan/pages/auth/auth.less
+++ b/wechat_jiaxuan/pages/auth/auth.less
@@ -48,6 +48,7 @@
}
.btns{
position: fixed;
+ bottom: 6px;
padding: 20rpx 0rpx;
width: 100%;
z-index: 999;
diff --git a/wechat_jiaxuan/pages/auth/auth.wxss b/wechat_jiaxuan/pages/auth/auth.wxss
index 5b3e3d2..fca9641 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxss
+++ b/wechat_jiaxuan/pages/auth/auth.wxss
@@ -49,6 +49,7 @@
}
.modal .btns {
position: fixed;
+ bottom: 6px;
padding: 20rpx 0rpx;
width: 100%;
z-index: 999;
diff --git a/wechat_jiaxuan/pages/consult/consult.js b/wechat_jiaxuan/pages/consult/consult.js
index 618063a..769b437 100644
--- a/wechat_jiaxuan/pages/consult/consult.js
+++ b/wechat_jiaxuan/pages/consult/consult.js
@@ -35,11 +35,6 @@
})
}
},
- onPullDownRefresh: function () {
- console.log('涓嬫媺鍒锋柊');
- this.setData({ dataList: [], pageNum: 1, total: 0 })
- this.getList()
- },
getCate() {
getCatalogList({catalogCode: 'product_info'}).then(res => {
this.setData({ category: res.data })
diff --git a/wechat_jiaxuan/pages/consult/consult.json b/wechat_jiaxuan/pages/consult/consult.json
index 27ca13f..1fc1ce6 100644
--- a/wechat_jiaxuan/pages/consult/consult.json
+++ b/wechat_jiaxuan/pages/consult/consult.json
@@ -2,6 +2,5 @@
"usingComponents": {
"idCard": "../../components/idCard/index"
},
- "navigationBarTitleText": "璧勮",
- "enablePullDownRefresh": true
+ "navigationBarTitleText": "璧勮"
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/consult/detail.less b/wechat_jiaxuan/pages/consult/detail.less
index 648d682..951043a 100644
--- a/wechat_jiaxuan/pages/consult/detail.less
+++ b/wechat_jiaxuan/pages/consult/detail.less
@@ -6,6 +6,11 @@
font-size: 44rpx;
color: #222222;
margin-bottom: 12rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display:-webkit-box;
+ -webkit-box-orient:vertical;
+ -webkit-line-clamp:2;
}
.datetime {
diff --git a/wechat_jiaxuan/pages/consult/detail.wxss b/wechat_jiaxuan/pages/consult/detail.wxss
index 3a1d393..773064d 100644
--- a/wechat_jiaxuan/pages/consult/detail.wxss
+++ b/wechat_jiaxuan/pages/consult/detail.wxss
@@ -6,6 +6,11 @@
font-size: 44rpx;
color: #222222;
margin-bottom: 12rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.main_content .datetime {
margin-bottom: 32rpx;
diff --git a/wechat_jiaxuan/pages/design/design.js b/wechat_jiaxuan/pages/design/design.js
index fa92172..9db973d 100644
--- a/wechat_jiaxuan/pages/design/design.js
+++ b/wechat_jiaxuan/pages/design/design.js
@@ -80,9 +80,7 @@
title: '鎶ュ悕鎴愬姛'
})
setTimeout(() => {
- wx.switchTab({
- url: '/pages/index/index',
- })
+ wx.navigateBack()
}, 1000)
})
},
diff --git a/wechat_jiaxuan/pages/detailDis/case.less b/wechat_jiaxuan/pages/detailDis/case.less
index e557cfb..e57e9b4 100644
--- a/wechat_jiaxuan/pages/detailDis/case.less
+++ b/wechat_jiaxuan/pages/detailDis/case.less
@@ -6,6 +6,11 @@
font-size: 44rpx;
color: #222222;
margin: 32rpx 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display:-webkit-box;
+ -webkit-box-orient:vertical;
+ -webkit-line-clamp:2;
}
.time {
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxss b/wechat_jiaxuan/pages/detailDis/case.wxss
index 2a30896..a52f5de 100644
--- a/wechat_jiaxuan/pages/detailDis/case.wxss
+++ b/wechat_jiaxuan/pages/detailDis/case.wxss
@@ -6,6 +6,11 @@
font-size: 44rpx;
color: #222222;
margin: 32rpx 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.container .time {
font-size: 26rpx;
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index 16e0b4c..c65744e 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -1,6 +1,7 @@
import {
getProductInfo,
- actionDo
+ actionDo,
+ getMemberInfo
} from '../../api/index'
Page({
/**
diff --git a/wechat_jiaxuan/pages/detailDis/product.less b/wechat_jiaxuan/pages/detailDis/product.less
index 383004d..0dffc97 100644
--- a/wechat_jiaxuan/pages/detailDis/product.less
+++ b/wechat_jiaxuan/pages/detailDis/product.less
@@ -97,16 +97,21 @@
font-weight: 500;
font-size: 36rpx;
margin-bottom: 16rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display:-webkit-box;
+ -webkit-box-orient:vertical;
+ -webkit-line-clamp:2;
}
.desc {
- line-height: 40rpx;
+ line-height: 36rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 26rpx;
}
.text {
- line-height: 48rpx;
+ line-height: 36rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 40rpx;
@@ -290,6 +295,7 @@
margin-right: 48rpx;
.icon {
width: 44rpx;
+ height: 44rpx;
}
}
}
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxss b/wechat_jiaxuan/pages/detailDis/product.wxss
index dee868f..8eec784 100644
--- a/wechat_jiaxuan/pages/detailDis/product.wxss
+++ b/wechat_jiaxuan/pages/detailDis/product.wxss
@@ -91,15 +91,20 @@
font-weight: 500;
font-size: 36rpx;
margin-bottom: 16rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.main_content .desc {
- line-height: 40rpx;
+ line-height: 36rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 26rpx;
}
.main_content .text {
- line-height: 48rpx;
+ line-height: 36rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 40rpx;
@@ -268,6 +273,7 @@
}
.footer .item .icon {
width: 44rpx;
+ height: 44rpx;
}
.share_modal .btns {
min-height: 320rpx;
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.less b/wechat_jiaxuan/pages/detailDis/realpic.less
index 892765f..7d8b695 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.less
+++ b/wechat_jiaxuan/pages/detailDis/realpic.less
@@ -8,6 +8,11 @@
font-size: 44rpx;
color: #222222;
margin: 32rpx 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display:-webkit-box;
+ -webkit-box-orient:vertical;
+ -webkit-line-clamp:2;
}
.desc{
margin-top: 24rpx;
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxss b/wechat_jiaxuan/pages/detailDis/realpic.wxss
index 0f17618..dc8fc20 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.wxss
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxss
@@ -9,6 +9,11 @@
font-size: 44rpx;
color: #222222;
margin: 32rpx 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.container .desc {
margin-top: 24rpx;
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index d63bb12..3c1ace0 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -233,9 +233,13 @@
})
},
bannerbindload(e) {
- const height = e.detail.height
+ const {
+ height,
+ width
+ } = e.detail
+ let activeHeight = height * 670 / width
this.setData({
- bannerImgHeight: height
+ bannerImgHeight: activeHeight
})
},
consultbindload(e) {
@@ -245,7 +249,7 @@
} = e.detail
let activeHeight = height * 670 / width
this.setData({
- consultImgHeight: activeHeight
+ consultImgHeight: activeHeight + 100
})
},
consultClick(e) {
diff --git a/wechat_jiaxuan/pages/index/index.less b/wechat_jiaxuan/pages/index/index.less
index 84b775d..e2f6d33 100644
--- a/wechat_jiaxuan/pages/index/index.less
+++ b/wechat_jiaxuan/pages/index/index.less
@@ -49,6 +49,7 @@
}
}
.consult_wrap{
+ height: 476rpx;
.wx-swiper-dots.wx-swiper-dots-horizontal {
position: absolute;
right: 0;
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index 15d324e..ba176f8 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -105,7 +105,7 @@
</view>
<image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
</view>
- <swiper class="consult_swiper consult_wrap" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" style="height:{{consultImgHeight + 100 }}rpx" duration="{{ bannerSwiperOption.duration }}">
+ <swiper class="consult_swiper consult_wrap" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" duration="{{ bannerSwiperOption.duration }}">
<block wx:for="{{ consultList }}" wx:key="index">
<swiper-item data-id="{{ item }}" bindtap="consultClick">
<image bindload="consultbindload" mode="aspectFill" src="{{ item.coverImage }}"></image>
diff --git a/wechat_jiaxuan/pages/index/index.wxss b/wechat_jiaxuan/pages/index/index.wxss
index 69d919c..eee9c7f 100644
--- a/wechat_jiaxuan/pages/index/index.wxss
+++ b/wechat_jiaxuan/pages/index/index.wxss
@@ -45,6 +45,9 @@
.container .consult_swiper .wx-swiper-dot.wx-swiper-dot-active {
background: #666666;
}
+.container .consult_wrap {
+ height: 476rpx;
+}
.container .consult_wrap .wx-swiper-dots.wx-swiper-dots-horizontal {
position: absolute;
right: 0;
diff --git a/wechat_jiaxuan/pages/store/info.less b/wechat_jiaxuan/pages/store/info.less
index 5378b2b..c5208fa 100644
--- a/wechat_jiaxuan/pages/store/info.less
+++ b/wechat_jiaxuan/pages/store/info.less
@@ -3,7 +3,6 @@
z-index: 999;
width: 670rpx;
margin: 40rpx auto 48rpx;
- height: 170rpx;
background: #FFFFFF;
box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.2);
border-radius: 8rpx;
@@ -55,7 +54,8 @@
margin-bottom: 38rpx;
}
.list {
- height: calc( 100% - 600rpx );
+ height: calc( 100% - 420rpx );
+ padding-bottom: 160rpx;
.item {
width: 670rpx;
height: 148rpx;
@@ -119,6 +119,8 @@
align-items: center;
height: 100rpx;
position: fixed;
+ background-color: #fff;
+ z-index: 999;
bottom: 0;
left: 0rpx;
width: 750rpx;
diff --git a/wechat_jiaxuan/pages/store/info.wxml b/wechat_jiaxuan/pages/store/info.wxml
index 177b8c9..5b5c16e 100644
--- a/wechat_jiaxuan/pages/store/info.wxml
+++ b/wechat_jiaxuan/pages/store/info.wxml
@@ -7,7 +7,12 @@
<view class="container">
<view class="header">
<view class="name">{{ info.name }}</view>
- <!-- <view class="desc">鍏ㄥ眿瀹氬埗銆佹暣浣撳帹鎴裤�佹湪闂ㄥ鏉裤�佸崼闃冲畾鍒�</view> -->
+ <view wx:if="{{ info.seqNameList && info.seqNameList.length > 0 }}" class="desc">
+ <block wx:for="{{info.seqNameList}}">
+ <text>{{ item }}</text>
+ <text wx:if="{{ index != info.seqNameList.length - 1 }}">銆�</text>
+ </block>
+ </view>
<view class="addr">{{ info.distanceStr || '--' }}锝渰{ info.address || '--' }}</view>
</view>
<view class="main_content">
diff --git a/wechat_jiaxuan/pages/store/info.wxss b/wechat_jiaxuan/pages/store/info.wxss
index da3c36a..f354fb5 100644
--- a/wechat_jiaxuan/pages/store/info.wxss
+++ b/wechat_jiaxuan/pages/store/info.wxss
@@ -3,7 +3,6 @@
z-index: 999;
width: 670rpx;
margin: 40rpx auto 48rpx;
- height: 170rpx;
background: #FFFFFF;
box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.2);
border-radius: 8rpx;
@@ -53,7 +52,8 @@
margin-bottom: 38rpx;
}
.main_content .list {
- height: calc(100% - 600rpx);
+ height: calc(100% - 420rpx);
+ padding-bottom: 160rpx;
}
.main_content .list .item {
width: 670rpx;
@@ -111,6 +111,8 @@
align-items: center;
height: 100rpx;
position: fixed;
+ background-color: #fff;
+ z-index: 999;
bottom: 0;
left: 0rpx;
width: 750rpx;
diff --git a/wechat_jiaxuan/pages/store/staff.less b/wechat_jiaxuan/pages/store/staff.less
index 8d23bb3..b497d5d 100644
--- a/wechat_jiaxuan/pages/store/staff.less
+++ b/wechat_jiaxuan/pages/store/staff.less
@@ -7,11 +7,13 @@
left: 0;
z-index: -1;
}
-
+.app{
+ overflow-y: hidden;
+}
.container {
padding: 26rpx 40rpx;
.avatar {
- margin-top: 260rpx;
+ margin-top: 300rpx;
width: 140rpx;
height: 140rpx;
border-radius: 50%;
@@ -110,8 +112,12 @@
font-weight: 600;
font-size: 40rpx;
display: flex;
- align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
- justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
+ align-items: center;
+ .icon{
+ position: relative;
+ bottom: 4rpx;
+ margin-left: 6rpx;
+ }
}
}
}
diff --git a/wechat_jiaxuan/pages/store/staff.wxml b/wechat_jiaxuan/pages/store/staff.wxml
index 611f7fb..15b07f6 100644
--- a/wechat_jiaxuan/pages/store/staff.wxml
+++ b/wechat_jiaxuan/pages/store/staff.wxml
@@ -1,4 +1,4 @@
-<view>
+<view class="app">
<!-- <navBar></navBar> -->
<image src="../../static/images/design_banner@2x.png" mode="widthFix" class="bg_wrap"></image>
<view class="container">
@@ -25,7 +25,9 @@
<view class="card">
<image src="../../static/images/mingpian_bg_kehu.png" class="bg"></image>
<view>鏈嶅姟瀹㈡埛</view>
- <view class="num" wx:if="{{ info.costomerNum || info.costomerNum == 0 }}">{{ info.costomerNum || '--' }}+</view>
+ <view class="num" wx:if="{{ info.costomerNum || info.costomerNum == 0 }}">{{ info.costomerNum || '--' }}
+ <text class="icon">+</text>
+ </view>
<view wx:else class="num">--</view>
</view>
</view>
diff --git a/wechat_jiaxuan/pages/store/staff.wxss b/wechat_jiaxuan/pages/store/staff.wxss
index 3118704..448a4fd 100644
--- a/wechat_jiaxuan/pages/store/staff.wxss
+++ b/wechat_jiaxuan/pages/store/staff.wxss
@@ -33,7 +33,7 @@
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
- -webkit-line-clamp: 2;
+ -webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.container .desc .icon {
@@ -56,7 +56,8 @@
.name_wrap .left {
flex: 1;
display: flex;
- align-items: flex-end;
+ align-items: center;
+ margin-top: 12rpx;
}
.name_wrap .left .name {
font-weight: 600;
@@ -101,9 +102,13 @@
margin-top: 8rpx;
font-weight: 600;
font-size: 40rpx;
- display: flex;
- align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
- justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
+ display: flex;
+ align-items: center;
+}
+.static .card .num .icon {
+ padding-bottom: 6rpx;
+ font-weight: 400;
+ margin-left: 6rpx;
}
.guide .title {
font-weight: 500;
diff --git a/wechat_jiaxuan/pages/userinfo/index.js b/wechat_jiaxuan/pages/userinfo/index.js
index b153030..4efa7d6 100644
--- a/wechat_jiaxuan/pages/userinfo/index.js
+++ b/wechat_jiaxuan/pages/userinfo/index.js
@@ -69,7 +69,6 @@
})
editMember({
...addr,
- imgurl: imgurl || '',
name: name || '',
nickname: nickname || '',
phone: phone || '',
@@ -78,6 +77,7 @@
longitude: longitude || '',
district: district || '',
housearea: housearea || '',
+ imgurl: imgurl || null,
housetype: houseType.val1 + '-' + houseType.val2 + '-' + houseType.val3 + '-' + houseType.val4 + '-' + houseType.val5
}).then(res => {
wx.setStorageSync('member', res.data)
@@ -142,15 +142,10 @@
areaName: names[2],
}
this.setData({ addr })
- },
- bindRegionChange(e) {
- console.log('picker鍙戦�侀�夋嫨鏀瑰彉锛屾惡甯﹀�间负', e.detail.value)
- const temp = e.detail.value
- this.setData({
- region: e.detail.value
- })
+ console.log('addr', this.data.addr);
},
getBindchooseavatar(e) {
+ console.log('e', e);
var that = this
if (e.detail.avatarUrl) {
wx.uploadFile({
@@ -166,6 +161,7 @@
imgurl: data.data.imgaddr,
imgurlFull: data.data.url,
})
+ console.log('imgurlFull', this.data);
}
})
}
@@ -183,7 +179,7 @@
})
},
getNickName(e) {
- this.setData({ nikname: e.detail.value })
+ this.setData({ nickname: e.detail.value })
},
changeAddr() {
// console.log('鐐瑰嚮浜�');
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
index 0d35875..7c4e1ce 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxml
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -23,7 +23,7 @@
<view class="label">鍩庡競</view>
<view class="val">
<view class="df_ac" style="width: 100%">
- <picker class="picker" mode="region" value="{{ addr }}" bindchange="bindRegionChange" bindchange="positionChange">
+ <picker class="picker" mode="region" value="{{ addr }}" bindchange="positionChange">
<view class="picker_wrap">
<view class="text placeholder9" hidden="{{ addr.cityName }}">璇烽�夋嫨鍦板潃</view>
<view class="text" hidden="{{ !addr.cityName }}">
diff --git a/wechat_jiaxuan/project.config.json b/wechat_jiaxuan/project.config.json
index 6f2d575..40f12a2 100644
--- a/wechat_jiaxuan/project.config.json
+++ b/wechat_jiaxuan/project.config.json
@@ -1,5 +1,5 @@
{
- "appid": "wx208dd1edc0be24ee",
+ "appid": "wxcd2b89fd2ff065f8",
"compileType": "miniprogram",
"libVersion": "3.4.10",
"packOptions": {
diff --git a/wechat_staff/components/buoyClient/index.less b/wechat_staff/components/buoyClient/index.less
index 14b9a4e..58e3953 100644
--- a/wechat_staff/components/buoyClient/index.less
+++ b/wechat_staff/components/buoyClient/index.less
@@ -33,6 +33,7 @@
}
image{
width: 48rpx;
+ height: 48rpx;
margin-bottom: 12rpx;
}
}
diff --git a/wechat_staff/components/buoyClient/index.wxss b/wechat_staff/components/buoyClient/index.wxss
index 95f9728..91ca881 100644
--- a/wechat_staff/components/buoyClient/index.wxss
+++ b/wechat_staff/components/buoyClient/index.wxss
@@ -34,6 +34,7 @@
}
.item image {
width: 48rpx;
+ height: 48rpx;
margin-bottom: 12rpx;
}
.app {
diff --git a/wechat_staff/components/detailFooter/index.js b/wechat_staff/components/detailFooter/index.js
index b26816a..dc9afb0 100644
--- a/wechat_staff/components/detailFooter/index.js
+++ b/wechat_staff/components/detailFooter/index.js
@@ -38,7 +38,7 @@
]
const { info, path} = this.data
wx.navigateToMiniProgram({
- appId: 'wx208dd1edc0be24ee',
+ appId: 'wxcd2b89fd2ff065f8',
path: `${map[path]}?origin=b&id=${info.id}&userId=${wx.getStorageSync('member').id}`,
envVersion: 'trial'
})
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index 053bfce..ad081d9 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -168,17 +168,15 @@
.goods_list {
height: calc( 100% - 182rpx);
width: 590rpx;
- display: flex;
- flex-wrap: wrap;
box-sizing: border-box;
- justify-content: space-between;
padding: 12rpx 40rpx;
.item {
width: 242rpx;
- flex-shrink: 0;
+ float: left;
margin-bottom: 32rpx;
- &:nth-last-child(1){
- margin-right: auto;
+ margin-right: 26rpx;
+ &:nth-of-type(2n){
+ margin-right: 0;
}
.img_wrap {
width: 242rpx;
diff --git a/wechat_staff/components/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index 8b5593c..16e97e6 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/components/disProduct/index.wxss
@@ -151,16 +151,17 @@
.main_content .main_right .goods_list {
height: calc(100% - 182rpx);
width: 590rpx;
- display: flex;
- flex-wrap: wrap;
box-sizing: border-box;
- justify-content: space-between;
padding: 12rpx 40rpx;
}
.main_content .main_right .goods_list .item {
width: 242rpx;
- flex-shrink: 0;
+ float: left;
margin-bottom: 32rpx;
+ margin-right: 26rpx;
+}
+.main_content .main_right .goods_list .item:nth-of-type(2n) {
+ margin-right: 0;
}
.main_content .main_right .goods_list .item .img_wrap {
width: 242rpx;
@@ -185,7 +186,6 @@
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
-
}
.main_content .main_right .goods_list .item .info {
display: flex;
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index aa2ca72..46e5615 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -76,7 +76,7 @@
let videoPlay = this.selectComponent('.videoPlay');
if(videoPlay){
videoPlay.startPlayVideo(videourl,this );
- }
+ }
},
priviewFull(e){
const item = e.currentTarget.dataset.item
@@ -109,9 +109,10 @@
const item = e.currentTarget.dataset.item
console.log('item', item);
if(item.openType == 'video'){
- wx.previewMedia({
- sources: [{ url: item.openContent, type: 'video' }]
- })
+ let videoPlay = this.selectComponent('.videoPlay');
+ if(videoPlay){
+ videoPlay.startPlayVideo(item.openContent,this );
+ }
}
if(item.openType == 'link'){
wx.navigateTo({
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index f50c0d6..d509c70 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -143,14 +143,13 @@
padding: 12rpx 40rpx;
height: calc( 100% - 188rpx);
box-sizing: border-box;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-around;
.item {
width: 324rpx;
margin-bottom: 32rpx;
- &:nth-last-child(1){
- margin-right: auto;
+ float: left;
+ margin-right: 22rpx;
+ &:nth-of-type(2n){
+ margin-right: 0;
}
.img_wrap {
width: 100%;
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index 81aea67..b7793c6 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -128,13 +128,15 @@
padding: 12rpx 40rpx;
height: calc(100% - 188rpx);
box-sizing: border-box;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-around;
}
.main_content .goods_list .item {
width: 324rpx;
margin-bottom: 32rpx;
+ float: left;
+ margin-right: 22rpx;
+}
+.main_content .goods_list .item:nth-of-type(2n) {
+ margin-right: 0;
}
.main_content .goods_list .item .img_wrap {
width: 100%;
@@ -157,7 +159,7 @@
left: 16rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
- width:52rpx;
+ width: 52rpx;
height: 46rpx;
background: rgba(0, 0, 0, 0.54);
border-radius: 8rpx;
diff --git a/wechat_staff/pages/consult/consult.js b/wechat_staff/pages/consult/consult.js
index af3189c..d4ed9bb 100644
--- a/wechat_staff/pages/consult/consult.js
+++ b/wechat_staff/pages/consult/consult.js
@@ -22,11 +22,6 @@
onLoad(options) {
this.getCate()
},
- onPullDownRefresh: function () {
- console.log('涓嬫媺鍒锋柊');
- this.setData({ dataList: [], pageNum: 1, total: 0 })
- this.getList()
- },
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, pageNum } = this.data
diff --git a/wechat_staff/pages/consult/consult.json b/wechat_staff/pages/consult/consult.json
index beb0e95..0fb9dcb 100644
--- a/wechat_staff/pages/consult/consult.json
+++ b/wechat_staff/pages/consult/consult.json
@@ -2,6 +2,5 @@
"usingComponents": {
"buoyClient": "../../components/buoyClient/index"
},
- "navigationBarTitleText": "璧勮",
- "enablePullDownRefresh": true
+ "navigationBarTitleText": "璧勮"
}
\ No newline at end of file
diff --git a/wechat_staff/pages/consult/detail.js b/wechat_staff/pages/consult/detail.js
index 76b9b92..7d9f427 100644
--- a/wechat_staff/pages/consult/detail.js
+++ b/wechat_staff/pages/consult/detail.js
@@ -24,7 +24,7 @@
},
handleDesign() {
wx.navigateToMiniProgram({
- appId: 'wx208dd1edc0be24ee',
+ appId: 'wxcd2b89fd2ff065f8',
path: `/pages/consult/detail?id=${this.data.info.id}&origin=b&userId=${wx.getStorageSync('member').id}`,
envVersion: 'trial'
})
diff --git a/wechat_staff/pages/consult/detail.less b/wechat_staff/pages/consult/detail.less
index c56eb09..8412c50 100644
--- a/wechat_staff/pages/consult/detail.less
+++ b/wechat_staff/pages/consult/detail.less
@@ -6,6 +6,11 @@
font-size: 44rpx;
color: #222222;
margin-bottom: 12rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display:-webkit-box;
+ -webkit-box-orient:vertical;
+ -webkit-line-clamp:2;
}
.datetime {
diff --git a/wechat_staff/pages/consult/detail.wxss b/wechat_staff/pages/consult/detail.wxss
index 463d76f..026f58f 100644
--- a/wechat_staff/pages/consult/detail.wxss
+++ b/wechat_staff/pages/consult/detail.wxss
@@ -6,6 +6,11 @@
font-size: 44rpx;
color: #222222;
margin-bottom: 12rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.main_content .datetime {
margin-bottom: 32rpx;
diff --git a/wechat_staff/pages/detailDis/case.less b/wechat_staff/pages/detailDis/case.less
index 00eee15..095aea7 100644
--- a/wechat_staff/pages/detailDis/case.less
+++ b/wechat_staff/pages/detailDis/case.less
@@ -6,6 +6,11 @@
font-size: 44rpx;
color: #222222;
margin: 32rpx 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display:-webkit-box;
+ -webkit-box-orient:vertical;
+ -webkit-line-clamp:2;
}
.time {
diff --git a/wechat_staff/pages/detailDis/case.wxss b/wechat_staff/pages/detailDis/case.wxss
index d2799ac..f5c86e0 100644
--- a/wechat_staff/pages/detailDis/case.wxss
+++ b/wechat_staff/pages/detailDis/case.wxss
@@ -6,6 +6,11 @@
font-size: 44rpx;
color: #222222;
margin: 32rpx 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.container .time {
font-size: 26rpx;
diff --git a/wechat_staff/pages/detailDis/product.less b/wechat_staff/pages/detailDis/product.less
index 6051637..d1870da 100644
--- a/wechat_staff/pages/detailDis/product.less
+++ b/wechat_staff/pages/detailDis/product.less
@@ -79,6 +79,11 @@
font-weight: 500;
font-size: 36rpx;
margin-bottom: 16rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display:-webkit-box;
+ -webkit-box-orient:vertical;
+ -webkit-line-clamp:2;
}
.desc {
line-height: 40rpx;
diff --git a/wechat_staff/pages/detailDis/product.wxss b/wechat_staff/pages/detailDis/product.wxss
index 43a9d47..497791a 100644
--- a/wechat_staff/pages/detailDis/product.wxss
+++ b/wechat_staff/pages/detailDis/product.wxss
@@ -72,13 +72,19 @@
font-weight: 500;
font-size: 36rpx;
margin-bottom: 16rpx;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.main_content .desc {
+ line-height: 40rpx;
font-size: 26rpx;
color: #555555;
margin-bottom: 26rpx;
}
-.main_content .text {
+.main_content .text {
line-height: 48rpx;
font-size: 26rpx;
color: #555555;
@@ -171,6 +177,16 @@
padding: 52rpx 40rpx 40rpx;
background-color: #fff;
}
+.detail .fold {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 84rpx;
+ margin-top: 20rpx;
+}
+.detail .fold .icon {
+ margin-left: 12rpx;
+}
.detail .title {
font-weight: 600;
font-size: 36rpx;
@@ -178,10 +194,11 @@
}
.detail .line {
display: flex;
- margin-bottom: 20rpx;
+ padding: 24rpx 0 26rpx;
+ border-bottom: 1rpx dashed #E5E5E5;
}
.detail .line .label {
- width: auto;
+ width: 120rpx;
font-size: 24rpx;
color: #666666;
flex-shrink: 0;
diff --git a/wechat_staff/pages/detailDis/realpic.less b/wechat_staff/pages/detailDis/realpic.less
index 446fd0d..d7cc0e4 100644
--- a/wechat_staff/pages/detailDis/realpic.less
+++ b/wechat_staff/pages/detailDis/realpic.less
@@ -8,6 +8,11 @@
font-size: 44rpx;
color: #222222;
margin: 32rpx 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display:-webkit-box;
+ -webkit-box-orient:vertical;
+ -webkit-line-clamp:2;
}
.desc{
margin-top: 24rpx;
diff --git a/wechat_staff/pages/detailDis/realpic.wxss b/wechat_staff/pages/detailDis/realpic.wxss
index c689a98..78a2737 100644
--- a/wechat_staff/pages/detailDis/realpic.wxss
+++ b/wechat_staff/pages/detailDis/realpic.wxss
@@ -9,6 +9,11 @@
font-size: 44rpx;
color: #222222;
margin: 32rpx 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
}
.container .desc {
margin-top: 24rpx;
diff --git a/wechat_staff/pages/index/index.less b/wechat_staff/pages/index/index.less
index d71b1cf..a0812da 100644
--- a/wechat_staff/pages/index/index.less
+++ b/wechat_staff/pages/index/index.less
@@ -2,7 +2,6 @@
position: fixed;
z-index: 10000;
width: 100%;
- height: 206rpx;
background-color: white;
}
.search_wrap {
@@ -16,13 +15,14 @@
margin-left: 40rpx;
.icon {
width: 28rpx;
+ height: 28rpx;
margin-right: 18rpx;
}
}
.everyday {
width: 670rpx;
height: 466rpx;
- margin: 206rpx 40rpx 0rpx 40rpx;
+ margin: 160rpx 40rpx 0rpx 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;
@@ -87,6 +87,7 @@
top: 0;
left: 0;
width: 76rpx;
+ height: 32rpx;
}
}
diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index e850ee5..318b28f 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -1,12 +1,12 @@
<view class="container" >
- <view class="search_fix">
- <view style="height: {{clientTop - 2}}px;"></view>
+ <view style="height: {{ clientHeight + clientTop + 6}}px;" class="search_fix">
+ <view style="height: {{clientTop - 3}}px;"></view>
<view class="search_wrap">
<image class="icon" src="../../static/home_ic_search@2x.png" mode="widthFix"></image>
<input model:value="{{ searchValue }}" placeholder="鎼滅储" type="text" />
</view>
</view>
- <view class="everyday" >
+ <view class="everyday" style="margin-top: {{ clientHeight + clientTop + 20}}px;">
<view class="header" bindtap="promotionClick">
<view class="title">姣忔棩涓婃柊</view>
<view class="more">
diff --git a/wechat_staff/pages/index/index.wxss b/wechat_staff/pages/index/index.wxss
index 4b1d745..49987e6 100644
--- a/wechat_staff/pages/index/index.wxss
+++ b/wechat_staff/pages/index/index.wxss
@@ -2,7 +2,6 @@
position: fixed;
z-index: 10000;
width: 100%;
- height: 206rpx;
background-color: white;
}
.search_wrap {
@@ -17,12 +16,13 @@
}
.search_wrap .icon {
width: 28rpx;
+ height: 28rpx;
margin-right: 18rpx;
}
.everyday {
width: 670rpx;
height: 466rpx;
- margin: 206rpx 40rpx 0rpx 40rpx;
+ margin: 160rpx 40rpx 0rpx 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;
@@ -84,6 +84,7 @@
top: 0;
left: 0;
width: 76rpx;
+ height: 32rpx;
}
.func_lsit {
display: flex;
diff --git a/wechat_staff/pages/kefu/fond.js b/wechat_staff/pages/kefu/fond.js
index c8f7322..0761903 100644
--- a/wechat_staff/pages/kefu/fond.js
+++ b/wechat_staff/pages/kefu/fond.js
@@ -103,7 +103,6 @@
}
})
})
-
let map = [
'/pages/detailDis/product',
'/pages/detailDis/case',
@@ -111,13 +110,9 @@
]
console.log(info.id)
wx.navigateToMiniProgram({
- appId: 'wx208dd1edc0be24ee',
- path: map[info.joinType],
- envVersion: 'trial',
- extraData: {
- id: info.id,
- origin: 'b'
- }
+ appId: 'wxcd2b89fd2ff065f8',
+ path: `${map[info.joinType]}?origin=b&id=${info.id}&userId=${wx.getStorageSync('member').id}`,
+ envVersion: 'trial'
})
},
handleDown() {
diff --git a/wechat_staff/pages/kefu/select.wxml b/wechat_staff/pages/kefu/select.wxml
index 1dfd008..a9a4f8f 100644
--- a/wechat_staff/pages/kefu/select.wxml
+++ b/wechat_staff/pages/kefu/select.wxml
@@ -76,7 +76,7 @@
</view>
</scroll-view>
<!-- footer -->
- <view class="footer" style="padding-bottom: {{bottomLift}}px;">
+ <view class="footer" style="padding-bottom: {{bottomLift + 7}}px;">
<view class="btns">
<view class="btn" bindtap="handleSub">纭鍏宠仈</view>
</view>
diff --git a/wechat_staff/pages/login/index.js b/wechat_staff/pages/login/index.js
index 90f7f48..084b641 100644
--- a/wechat_staff/pages/login/index.js
+++ b/wechat_staff/pages/login/index.js
@@ -64,6 +64,25 @@
code,
phone
} = this.data
+ if (!this.data.agreementFalg) {
+ return wx.showToast({
+ title: '璇峰厛闃呰骞跺悓鎰忕浉鍏冲崗璁�',
+ icon: 'none'
+ })
+ }
+ if (phone.length != 11) {
+ return wx.showToast({
+ title: '璇疯緭鍏ユ纭殑鎵嬫満鍙�',
+ icon: 'none'
+ })
+ }
+ if (!code) {
+ return wx.showToast({
+ title: '璇疯緭鍏ラ獙璇佺爜',
+ icon: 'none'
+ })
+ }
+
loginByPhone({
code,
phone
@@ -98,12 +117,6 @@
})
},
changeStatus() {
- if (!this.data.agreementFalg) {
- return wx.showToast({
- title: '璇峰厛闃呰骞跺悓鎰忕浉鍏冲崗璁�',
- icon: 'none'
- })
- }
this.setData({
status: '1'
})
diff --git a/wechat_staff/pages/store/staff.less b/wechat_staff/pages/store/staff.less
index 4922b43..65a4393 100644
--- a/wechat_staff/pages/store/staff.less
+++ b/wechat_staff/pages/store/staff.less
@@ -7,12 +7,14 @@
left: 0;
z-index: -1;
}
-
+.app{
+ overflow-y: hidden;
+}
.container {
padding: 26rpx 40rpx;
.avatar {
- margin-top: 260rpx;
+ margin-top: 300rpx;
width: 140rpx;
height: 140rpx;
border-radius: 50%;
@@ -111,8 +113,12 @@
font-weight: 600;
font-size: 40rpx;
display: flex;
- align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
- justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
+ align-items: center;
+ .icon{
+ position: relative;
+ bottom: 4rpx;
+ margin-left: 6rpx;
+ }
}
}
diff --git a/wechat_staff/pages/store/staff.wxml b/wechat_staff/pages/store/staff.wxml
index 4fb840c..b675fe3 100644
--- a/wechat_staff/pages/store/staff.wxml
+++ b/wechat_staff/pages/store/staff.wxml
@@ -1,4 +1,4 @@
-<view>
+<view class="app">
<back />
<image src="../../static/images/design_banner@2x.png" mode="widthFix" class="bg_wrap"></image>
<view class="container">
@@ -25,7 +25,8 @@
<view class="card">
<image src="../../static/images/mingpian_bg_kehu.png" class="bg"></image>
<view>鏈嶅姟瀹㈡埛</view>
- <view class="num" wx:if="{{ userInfo.costomerNum || userInfo.costomerNum == 0 }}">{{ userInfo.costomerNum || '--' }}+
+ <view class="num" wx:if="{{ userInfo.costomerNum || userInfo.costomerNum == 0 }}">{{ userInfo.costomerNum || '--' }}
+ <text class="icon">+</text>
</view>
<view wx:else class="num">--</view>
</view>
diff --git a/wechat_staff/pages/store/staff.wxss b/wechat_staff/pages/store/staff.wxss
index 157d955..dc40b81 100644
--- a/wechat_staff/pages/store/staff.wxss
+++ b/wechat_staff/pages/store/staff.wxss
@@ -7,11 +7,14 @@
left: 0;
z-index: -1;
}
+.app {
+ overflow-y: hidden;
+}
.container {
padding: 26rpx 40rpx;
}
.container .avatar {
- margin-top: 260rpx;
+ margin-top: 300rpx;
width: 140rpx;
height: 140rpx;
border-radius: 50%;
@@ -104,6 +107,12 @@
font-weight: 600;
font-size: 40rpx;
display: flex;
+ align-items: center;
+}
+.static .card .num .icon {
+ position: relative;
+ bottom: 4rpx;
+ margin-left: 6rpx;
}
.guide .title {
font-weight: 500;
@@ -186,9 +195,6 @@
font-size: 26rpx;
color: #999999;
text-align: center;
- align-items: flex-end; /* 杩欎細浣垮瓙鍏冪礌搴曢儴瀵归綈 */
- justify-content: center; /* 杩欎細浣垮瓙鍏冪礌姘村钩灞呬腑 */
-
}
.card_wrap {
position: fixed;
diff --git a/wechat_staff/pages/work/index.less b/wechat_staff/pages/work/index.less
index 4ee6943..9e5d718 100644
--- a/wechat_staff/pages/work/index.less
+++ b/wechat_staff/pages/work/index.less
@@ -1,6 +1,9 @@
.container {
- background-color: #fff;
-
+ .topbg{
+ position: absolute;
+ width: 100%;
+ z-index: -1;
+ }
.navbar {
padding-left: 30rpx;
font-weight: 600;
@@ -53,14 +56,19 @@
background: #F7F7F7;
border-radius: 8rpx;
margin-bottom: 40rpx;
+ padding: 0 40rpx;
.line{
display: flex;
align-items: center;
justify-content: space-between;
- padding: 0 40rpx;
height: 108rpx;
+ border-bottom: 1rpx solid #E5E5E5;
+ &:nth-last-of-type(1){
+ border: none;
+ }
.icon{
width: 40rpx;
+ height: 40rpx;
}
}
}
diff --git a/wechat_staff/pages/work/index.wxml b/wechat_staff/pages/work/index.wxml
index f2e8756..4050138 100644
--- a/wechat_staff/pages/work/index.wxml
+++ b/wechat_staff/pages/work/index.wxml
@@ -1,5 +1,6 @@
<view class="container">
- <view class="topbg" style="background-image:url('{{topimg}}');background-color: aquamarine;">
+ <view >
+ <image class="topbg" mode="widthFix" src="{{topimg}}"></image>
<view class="navbar" style="padding-top: {{ clientTop }}px;height: {{clientHeight + clientTop}}px;">宸ヤ綔鍙�</view>
<view class="userinfo">
<image data-index="0" bindtap="changePath" class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
diff --git a/wechat_staff/pages/work/index.wxss b/wechat_staff/pages/work/index.wxss
index 71a87b2..3f9fb10 100644
--- a/wechat_staff/pages/work/index.wxss
+++ b/wechat_staff/pages/work/index.wxss
@@ -1,5 +1,7 @@
-.container {
- background-color: #fff;
+.container .topbg {
+ position: absolute;
+ width: 100%;
+ z-index: -1;
}
.container .navbar {
padding-left: 30rpx;
@@ -50,16 +52,21 @@
background: #F7F7F7;
border-radius: 8rpx;
margin-bottom: 40rpx;
+ padding: 0 40rpx;
}
.container .main_content .func_list .line {
display: flex;
align-items: center;
justify-content: space-between;
- padding: 0 40rpx;
height: 108rpx;
+ border-bottom: 1rpx solid #E5E5E5;
+}
+.container .main_content .func_list .line:nth-last-of-type(1) {
+ border: none;
}
.container .main_content .func_list .line .icon {
width: 40rpx;
+ height: 40rpx;
}
.container .modal {
width: 600rpx;
--
Gitblit v1.9.3