From 2da083225417ef7007842b84e7276242faeb0e35 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 05 八月 2024 16:18:58 +0800
Subject: [PATCH] lll
---
wechat_jiaxuan/pages/consult/consult.wxss | 50 +-
wechat_jiaxuan/pages/userinfo/index.wxml | 4
wechat_staff/pages/login/index.wxml | 3
wechat_staff/package.json | 6
wechat_staff/pages/store/staff.less | 18 +
wechat_jiaxuan/components/disProduct/index.less | 19
wechat_jiaxuan/app.js | 26
wechat_staff/project.private.config.json | 6
wechat_jiaxuan/pages/auth/auth.less | 4
wechat_staff/pages/kefu/select.wxml | 2
wechat_staff/components/disCase/index.wxml | 5
wechat_jiaxuan/pages/auth/auth.wxss | 4
wechat_staff/pages/consult/consult.wxml | 5
wechat_staff/pages/sets/protocol.wxml | 3
wechat_staff/pages/login/index.less | 6
wechat_staff/components/disRealpic/index.less | 12
wechat_staff/pages/store/staff.wxml | 5
wechat_jiaxuan/components/disCase/index.wxss | 9
wechat_staff/components/disProduct/index.js | 41 ++
wechat_staff/components/disCase/index.less | 9
wechat_jiaxuan/pages/detailDis/case.js | 4
wechat_staff/pages/consult/consult.less | 34 +
wechat_staff/components/disProduct/index.wxss | 14
wechat_jiaxuan/components/disCase/index.less | 9
wechat_jiaxuan/components/disRealpic/index.wxml | 5
wechat_jiaxuan/pages/sets/index.js | 89 ++--
wechat_jiaxuan/components/disProduct/index.wxml | 7
wechat_staff/components/disRealpic/index.wxss | 12
wechat_staff/pages/consult/consult.js | 51 ++
wechat_staff/components/disRealpic/index.js | 41 ++
wechat_jiaxuan/pages/detailDis/realpic.js | 4
wechat_jiaxuan/pages/consult/consult.wxml | 13
wechat_jiaxuan/components/disProduct/index.js | 41 ++
wechat_staff/pages/login/index.wxss | 6
wechat_jiaxuan/pages/sets/index.wxml | 11
wechat_jiaxuan/components/disRealpic/index.less | 12
wechat_staff/pages/consult/detail.js | 2
wechat_staff/components/disCase/index.wxss | 9
wechat_jiaxuan/pages/auth/auth.wxml | 3
wechat_staff/components/disProduct/index.less | 15
wechat_jiaxuan/pages/consult/consult.js | 48 ++
wechat_staff/pages/store/staff.js | 5
wechat_staff/pages/consult/consult.wxss | 30 +
wechat_jiaxuan/pages/index/index.js | 2
wechat_jiaxuan/pages/detailDis/product.js | 1
wechat_jiaxuan/pages/consult/consult.less | 68 ++-
wechat_jiaxuan/components/disCase/index.js | 41 ++
wechat_staff/package-lock.json | 42 +
wechat_jiaxuan/components/disCase/index.wxml | 5
wechat_jiaxuan/pages/sets/protocol.wxml | 3
wechat_jiaxuan/utils/config.js | 4
wechat_staff/components/disCase/index.js | 41 ++
wechat_jiaxuan/components/disRealpic/index.js | 41 ++
wechat_staff/components/disProduct/index.wxml | 7
wechat_staff/pages/store/staff.wxss | 18 +
wechat_jiaxuan/components/disRealpic/index.wxss | 12
wechat_jiaxuan/components/disProduct/index.wxss | 15
wechat_staff/components/disRealpic/index.wxml | 5
58 files changed, 770 insertions(+), 237 deletions(-)
diff --git a/wechat_jiaxuan/app.js b/wechat_jiaxuan/app.js
index 55d4c10..9503c79 100644
--- a/wechat_jiaxuan/app.js
+++ b/wechat_jiaxuan/app.js
@@ -4,7 +4,8 @@
} from './api/index'
import CustomHook from 'spa-custom-hooks';
let globalData = {
- token: wx.getStorageSync('token'),
+ // token: wx.getStorageSync('token'),
+ token: '',
primary: '#B08771',
bottomLift: ''
}
@@ -24,6 +25,8 @@
if (WindowInfo.safeArea.top > 20) {
this.globalData.bottomLift = WindowInfo.screenHeight - WindowInfo.safeArea.bottom
}
+ },
+ onShow(op) {
// 鎺堟潈鐧诲綍
var userId = null
if (op.query.scene) {
@@ -85,6 +88,7 @@
}
})
} else {
+ this.globalData.token = token
// if (op.query.scene) {
// let temp = op.query.scene.split('_')
// wx.navigateTo({
@@ -134,17 +138,15 @@
}
})
}
- },
- onShow(options) {
- const token = wx.getStorageSync('token') || ''
- if(token){
- if (options.query.scene) {
- let temp = options.query.scene.split('_')
- wx.navigateTo({
- url: `${pathMap[temp[1]]}?id=${temp[0]}&userId=${temp[2]}`,
- })
- }
- }
+ // const token = wx.getStorageSync('token') || ''
+ // if(token){
+ // if (options.query.scene) {
+ // let temp = options.query.scene.split('_')
+ // wx.navigateTo({
+ // url: `${pathMap[temp[1]]}?id=${temp[0]}&userId=${temp[2]}`,
+ // })
+ // }
+ // }
}
})
CustomHook.install({
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
index f04978a..60a366a 100644
--- a/wechat_jiaxuan/components/disCase/index.js
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -1,5 +1,6 @@
import { getCataLogTagList, getZhongTaiWholecasePage, actionDo } from '../../api/index'
import { eventBus } from '../../utils/eventBus'
+let touchDot = 0
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -8,6 +9,10 @@
menuButtonInfo: Object
},
data: {
+ // 鍔ㄧ敾
+ showTouch: true,
+ animationData: {},
+
activeIndex: -1,
activeParam: [],
selParam: '',
@@ -49,8 +54,44 @@
attached() {
this.getCatelist()
this.getList()
+ this.animation = wx.createAnimation({
+ duration: 600,
+ timingFunction: 'ease',
+ });
},
methods: {
+ bindscrolltoupper() {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ },
+ touchstart(e){
+ touchDot = e.detail.scrollTop;
+ },
+ touchmove(e) {
+ var touchMove = e.detail.scrollTop;
+ if(touchMove - touchDot > 60){
+ this.fadeOut();
+ }
+ if(touchDot - touchMove > 60){
+ this.fadeIn();
+ this.setData({ showTouch: true })
+ }
+ },
+ fadeIn: function () {
+ this.animation.opacity(1).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ },
+ fadeOut: function () {
+ this.animation.opacity(0).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ setTimeout(() => {
+ this.setData({ showTouch: false });
+ }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ },
getCatelist() {
const { catalogCode } = this.data
getCataLogTagList({
diff --git a/wechat_jiaxuan/components/disCase/index.less b/wechat_jiaxuan/components/disCase/index.less
index ea5382d..28fa615 100644
--- a/wechat_jiaxuan/components/disCase/index.less
+++ b/wechat_jiaxuan/components/disCase/index.less
@@ -52,7 +52,7 @@
width: 100%;
display: flex;
flex-wrap: wrap;
- max-height: 520rpx;
+ max-height: 680rpx;
overflow: auto;
padding: 30rpx 40rpx;
.item {
@@ -106,6 +106,10 @@
}
.status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
+ width: 100%;
display: flex;
padding: 0rpx 40rpx;
align-items: center;
@@ -124,6 +128,9 @@
box-sizing: border-box;
padding: 12rpx 40rpx;
height: calc( 100% - 188rpx);
+ .empty{
+ height: 100rpx;
+ }
.item{
width: 100%;
margin-bottom: 32rpx;
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index 53beed2..b89f81a 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -27,7 +27,7 @@
</view>
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
- <view class="status">
+ <view wx:if="{{ showTouch }}" animation="{{animationData}}" class="status">
<view class="item {{ sortType == '' ? 'active' : '' }}" data-status="" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
<view class="item {{ sortType == 'greet' ? 'active' : '' }}" data-status="greet" bindtap="statusChange">鏈�鐑�</view>
@@ -35,7 +35,8 @@
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
- <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
+ <scroll-view bindscrolltoupper="bindscrolltoupper" binddragging="touchmove" binddragstart="touchstart" bindscrolltolower="scrolltolower" scroll-y enhanced class="goods_list">
+ <view class="empty"></view>
<view wx:for="{{ dataList }}" data-id="{{ item.id }}" class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
diff --git a/wechat_jiaxuan/components/disCase/index.wxss b/wechat_jiaxuan/components/disCase/index.wxss
index 22d6cb0..741144a 100644
--- a/wechat_jiaxuan/components/disCase/index.wxss
+++ b/wechat_jiaxuan/components/disCase/index.wxss
@@ -54,7 +54,7 @@
width: 100%;
display: flex;
flex-wrap: wrap;
- max-height: 520rpx;
+ max-height: 680rpx;
overflow: auto;
padding: 30rpx 40rpx;
}
@@ -104,6 +104,10 @@
z-index: 99;
}
.main_content .status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
+ width: 100%;
display: flex;
padding: 0rpx 40rpx;
align-items: center;
@@ -123,6 +127,9 @@
padding: 12rpx 40rpx;
height: calc(100% - 188rpx);
}
+.main_content .goods_list .empty {
+ height: 100rpx;
+}
.main_content .goods_list .item {
width: 100%;
margin-bottom: 32rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index c67db66..36c966b 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -1,5 +1,6 @@
import { getCatalogList, getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
import { eventBus } from '../../utils/eventBus'
+let touchDot = 0
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -12,6 +13,10 @@
* 缁勪欢鐨勫垵濮嬫暟鎹�
*/
data: {
+ // 鍔ㄧ敾
+ showTouch: true,
+ animationData: {},
+
activeIndex: -1,
activeParam: [],
tagCodes: [],
@@ -62,8 +67,44 @@
getApp().globalData.catalogCode = ''
}, 2000)
}
+ this.animation = wx.createAnimation({
+ duration: 600,
+ timingFunction: 'ease',
+ });
},
methods: {
+ bindscrolltoupper() {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ },
+ touchstart(e){
+ touchDot = e.detail.scrollTop;
+ },
+ touchmove(e) {
+ var touchMove = e.detail.scrollTop;
+ if(touchMove - touchDot > 60){
+ this.fadeOut();
+ }
+ if(touchDot - touchMove > 60){
+ this.fadeIn();
+ this.setData({ showTouch: true })
+ }
+ },
+ fadeIn: function () {
+ this.animation.opacity(1).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ },
+ fadeOut: function () {
+ this.animation.opacity(0).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ setTimeout(() => {
+ this.setData({ showTouch: false });
+ }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ },
getCatelist() {
getCatalogList({
catalogCode: 'product_intro'
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index 50bfd4d..eb55065 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -90,7 +90,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 520rpx;
+ max-height: 680rpx;
overflow: auto;
.item {
width: 154rpx;
@@ -144,9 +144,13 @@
background-color: rgba(0,0,0,.5);
z-index: 99;
}
-
+
.status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
display: flex;
+ width: 590rpx;
padding: 0rpx 40rpx;
align-items: center;
height: 92rpx;
@@ -161,30 +165,31 @@
background-color: #333333;
}
}
-
.goods_list {
height: calc( 100% - 182rpx);
width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
+ .empty{
+ width: 590rpx;
+ height: 92rpx;
+ }
.item {
float: left;
width: 242rpx;
flex-shrink: 0;
- margin-right: 26rpx;
margin-bottom: 32rpx;
&:nth-of-type(2n){
- margin-right: 0;
+ margin-right: 26rpx;
}
.img_wrap {
width: 242rpx;
border-radius: 8rpx;
overflow: hidden;
position: relative;
-
.img {
width: 242rpx;
- max-height: 216rpx;
+ height: 136rpx;
}
.new {
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index 0c14b19..ff5e5c9 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -31,17 +31,18 @@
</view>
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
- <view class="status">
+ <view wx:if="{{ showTouch }}" animation="{{animationData}}" class="status">
<view class="item {{ sortType == '' ? 'active' : '' }}" data-status="" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
<view class="item {{ sortType == 'greet' ? 'active' : '' }}" data-status="greet" bindtap="statusChange">鏈�鐑�</view>
<view class="separate"></view>
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
- <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
+ <scroll-view bindscrolltoupper="bindscrolltoupper" binddragging="touchmove" binddragstart="touchstart" bindscrolltolower="scrolltolower" scroll-y enhanced class="goods_list">
+ <view class="empty"></view>
<view wx:for="{{ datalist }}" data-id="{{item.id}}" class="item" bindtap="handleDetail">
<view class="img_wrap">
- <image src="{{ item.coverImage }}" class="img" mode="aspectFit"></image>
+ <image src="{{ item.coverImage }}" class="img" mode="aspectFill"></image>
<image wx:if="{{ item.isNew }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
</view>
<view class="name">{{ item.title }}</view>
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index 7a1475a..adcc16d 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -85,7 +85,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 520rpx;
+ max-height: 680rpx;
overflow: auto;
}
.main_content .main_right .query_form .list .item {
@@ -134,7 +134,11 @@
z-index: 99;
}
.main_content .main_right .status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
display: flex;
+ width: 590rpx;
padding: 0rpx 40rpx;
align-items: center;
height: 92rpx;
@@ -154,15 +158,18 @@
box-sizing: border-box;
padding: 12rpx 40rpx;
}
+.main_content .main_right .goods_list .empty {
+ width: 590rpx;
+ height: 92rpx;
+}
.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-of-type(2n) {
- margin-right: 0;
+ margin-right: 26rpx;
}
.main_content .main_right .goods_list .item .img_wrap {
width: 242rpx;
@@ -172,7 +179,7 @@
}
.main_content .main_right .goods_list .item .img_wrap .img {
width: 242rpx;
- max-height: 216rpx;
+ height: 136rpx;
}
.main_content .main_right .goods_list .item .img_wrap .new {
width: 72rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index bc18860..7f8fef7 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -1,5 +1,6 @@
import { getCataLogTagList, getZhongTaiRealcasePage, actionDo } from '../../api/index'
import { eventBus } from '../../utils/eventBus'
+let touchDot = 0
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -8,6 +9,10 @@
menuButtonInfo: Object
},
data: {
+ // 鍔ㄧ敾
+ showTouch: true,
+ animationData: {},
+
activeIndex: -1,
activeParam: [],
selParam: '',
@@ -47,8 +52,44 @@
},
attached() {
this.getCatelist()
+ this.animation = wx.createAnimation({
+ duration: 600,
+ timingFunction: 'ease',
+ });
},
methods: {
+ bindscrolltoupper() {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ },
+ touchstart(e){
+ touchDot = e.detail.scrollTop;
+ },
+ touchmove(e) {
+ var touchMove = e.detail.scrollTop;
+ if(touchMove - touchDot > 60){
+ this.fadeOut();
+ }
+ if(touchDot - touchMove > 60){
+ this.fadeIn();
+ this.setData({ showTouch: true })
+ }
+ },
+ fadeIn: function () {
+ this.animation.opacity(1).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ },
+ fadeOut: function () {
+ this.animation.opacity(0).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ setTimeout(() => {
+ this.setData({ showTouch: false });
+ }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ },
getCatelist(){
const { catalogCode } = this.data
getCataLogTagList({
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index 8e7cc8e..42a7c72 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -59,7 +59,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 520rpx;
+ max-height: 680rpx;
overflow: auto;
.item {
width: 202rpx;
@@ -115,6 +115,10 @@
}
.status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
+ width: 100%;
display: flex;
padding: 0rpx 40rpx;
height: 100rpx;
@@ -135,13 +139,15 @@
padding: 12rpx 40rpx;
height: calc( 100% - 188rpx);
box-sizing: border-box;
+ .empty{
+ height: 100rpx;
+ }
.item {
width: 324rpx;
float: left;
- margin-right: 22rpx;
margin-bottom: 32rpx;
&:nth-of-type(2n){
- margin-right: 0;
+ margin-right: 22rpx;
}
.img_wrap {
width: 100%;
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index cd3c2ee..1a9e570 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -28,7 +28,7 @@
</view>
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
- <view class="status">
+ <view wx:if="{{ showTouch }}" animation="{{animationData}}" class="status">
<view class="item {{ sortType == '' ? 'active' : '' }}" data-status="" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
<view class="item {{ sortType == 'greet' ? 'active' : '' }}" data-status="greet" bindtap="statusChange">鏈�鐑�</view>
@@ -36,7 +36,8 @@
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
- <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
+ <scroll-view bindscrolltoupper="bindscrolltoupper" bindscrolltolower="scrolltolower" binddragging="touchmove" binddragstart="touchstart" scroll-y enhanced class="goods_list">
+ <view class="empty"></view>
<view wx:for="{{ dataList }}" data-item="{{item}}" class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 3d093ee..9d02cc8 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -55,7 +55,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 520rpx;
+ max-height: 680rpx;
overflow: auto;
}
.main_content .query_param .list .item {
@@ -104,6 +104,10 @@
z-index: 99;
}
.main_content .status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
+ width: 100%;
display: flex;
padding: 0rpx 40rpx;
height: 100rpx;
@@ -123,14 +127,16 @@
height: calc(100% - 188rpx);
box-sizing: border-box;
}
+.main_content .goods_list .empty {
+ height: 100rpx;
+}
.main_content .goods_list .item {
width: 324rpx;
float: left;
- margin-right: 22rpx;
margin-bottom: 32rpx;
}
.main_content .goods_list .item:nth-of-type(2n) {
- margin-right: 0;
+ margin-right: 22rpx;
}
.main_content .goods_list .item .img_wrap {
width: 100%;
diff --git a/wechat_jiaxuan/pages/auth/auth.less b/wechat_jiaxuan/pages/auth/auth.less
index 1caee13..f52e387 100644
--- a/wechat_jiaxuan/pages/auth/auth.less
+++ b/wechat_jiaxuan/pages/auth/auth.less
@@ -36,6 +36,9 @@
font-size: 30rpx;
}
}
+page{
+ overflow: hidden;
+}
.modal{
width: 100%;
height: calc( 100vh - 200rpx );
@@ -44,6 +47,7 @@
.content{
height: calc( 100vh - 460rpx );
overflow: auto;
+ overflow-x: hidden;
margin-bottom: 20rpx;
}
.btns{
diff --git a/wechat_jiaxuan/pages/auth/auth.wxml b/wechat_jiaxuan/pages/auth/auth.wxml
index 2e7e623..592e369 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxml
+++ b/wechat_jiaxuan/pages/auth/auth.wxml
@@ -23,7 +23,8 @@
<van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
<view class="content">
- <mp-html content="{{activeHtml}}"></mp-html>
+ <!-- <mp-html content="{{activeHtml}}"></mp-html> -->
+ <rich-text nodes="{{activeHtml}}"></rich-text>
</view>
<view style="bottom: {{ bottomLift }}px" class="btns">
<view data-flag="{{true}}" bindtap="handleJudge" class="agree">鍚屾剰</view>
diff --git a/wechat_jiaxuan/pages/auth/auth.wxss b/wechat_jiaxuan/pages/auth/auth.wxss
index fca9641..4cc77d7 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxss
+++ b/wechat_jiaxuan/pages/auth/auth.wxss
@@ -36,6 +36,9 @@
font-weight: 500;
font-size: 30rpx;
}
+page {
+ overflow: hidden;
+}
.modal {
width: 100%;
height: calc(100vh - 200rpx);
@@ -45,6 +48,7 @@
.modal .content {
height: calc(100vh - 460rpx);
overflow: auto;
+ overflow-x: hidden;
margin-bottom: 20rpx;
}
.modal .btns {
diff --git a/wechat_jiaxuan/pages/consult/consult.js b/wechat_jiaxuan/pages/consult/consult.js
index 81f1f32..161b04e 100644
--- a/wechat_jiaxuan/pages/consult/consult.js
+++ b/wechat_jiaxuan/pages/consult/consult.js
@@ -1,4 +1,5 @@
import { getZhongTaiProductNewsPage, getCatalogList,actionDo } from '../../api/index'
+let touchDot = 0
Page({
/**
@@ -7,6 +8,8 @@
data: {
category: [],
secondCategory: [],
+ showCate: true,
+ animationData: {},
catalogCode: '',
tagCode: '',
@@ -21,6 +24,10 @@
},
onLoad(options) {
this.getCate()
+ this.animation = wx.createAnimation({
+ duration: 500,
+ timingFunction: 'ease',
+ });
},
onReachBottom() {
console.log('瑙﹀簳浜嬩欢');
@@ -122,7 +129,38 @@
onReady() {
},
-
+ bindscrolltoupper() {
+ this.setData({ showCate: true })
+ this.fadeIn();
+ },
+ touchstart(e){
+ touchDot = e.detail.scrollTop;
+ },
+ touchmove(e) {
+ var touchMove = e.detail.scrollTop;
+ if(touchMove - touchDot > 60){
+ this.fadeOut();
+ }
+ if(touchDot - touchMove > 60){
+ this.fadeIn();
+ this.setData({ showCate: true })
+ }
+ },
+ fadeIn: function () {
+ this.animation.opacity(1).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ },
+ fadeOut: function () {
+ this.animation.opacity(0).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ setTimeout(() => {
+ this.setData({ showCate: false });
+ }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ },
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
@@ -147,6 +185,12 @@
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
onShareAppMessage() {
-
+ let { info } = this.data
+ console.log('鐐瑰嚮浜嗗垎浜�')
+ if(info.users && info.users.userId){
+ return {
+ path: '/pages/detailDis/product?id=' + info.id + '&userId=' + info.users.id
+ }
+ }
}
})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/consult/consult.less b/wechat_jiaxuan/pages/consult/consult.less
index 8634bac..a1201f2 100644
--- a/wechat_jiaxuan/pages/consult/consult.less
+++ b/wechat_jiaxuan/pages/consult/consult.less
@@ -1,65 +1,65 @@
.container {
background-color: #fff;
}
+page{
+ overflow: hidden;
+}
.home_top{
- position: fixed;
width: 100%;
z-index: 99;
top: 0;
- height: 96rpx;
- padding-bottom: 24rpx;
background-color: #fff;
- .search_wrap{
- width: 670rpx;
- height: 72rpx;
- margin: 0rpx auto;
- border-radius: 8rpx;
- padding: 0 40rpx 0rpx;
- display: flex;
- align-items: center;
- background-color: #F7F7F7;
- image{
- width: 28rpx;
- height: 28rpx;
- margin-right: 16rpx;
- }
+}
+.search_wrap{
+ width: 670rpx;
+ height: 72rpx;
+ margin: 0rpx auto 24rpx;
+ border-radius: 8rpx;
+ padding: 0 40rpx;
+ display: flex;
+ align-items: center;
+ background-color: #F7F7F7;
+ image{
+ width: 28rpx;
+ height: 28rpx;
+ margin-right: 16rpx;
}
}
.cate_wrap{
- background-color: #fff;
.cate_one{
- position: fixed;
- top: 94rpx;
background-color: #fff;
- width: 100%;
}
.cate_two{
- position: fixed;
- top: 154rpx;
+ position: absolute;
+ line-height: 88rpx;
+ margin-left: 40rpx;
+ height: 88rpx;
+ z-index: 999;
background-color: #fff;
- padding-top: 30rpx;
- width: 100%;
}
}
.scroll_cate {
display: flex;
- align-items: center;
+ line-height: 88rpx;
margin-left: 40rpx;
- height: 60rpx;
+ height: 88rpx;
.item {
- margin-right: 48rpx;
+ margin-right: 54rpx;
color: #666666;
flex-shrink: 0;
}
.active {
color: #222222;
- font-weight: 500;
+ font-weight: 600;
font-size: 30rpx;
}
}
.second_list {
+ display: flex;
+ align-items: center;
+ margin-left: 0;
.item {
padding: 0 40rpx;
display: flex;
@@ -72,14 +72,18 @@
margin-right: 24rpx;
}
.active{
- background: rgba(176,135,113,0.08);
- color: #B08771;
+ color: var(--themeColor);
+ background: rgba(176, 135, 113, 0.08);
font-size: 24rpx;
font-weight: 400;
}
}
.content{
- padding: 260rpx 40rpx 40rpx;
+ padding: 0rpx 40rpx 40rpx;
+ height: calc( 100vh - 200rpx );
+ .empty{
+ height: 88rpx;
+ }
.item{
margin-bottom: 60rpx;
.img{
diff --git a/wechat_jiaxuan/pages/consult/consult.wxml b/wechat_jiaxuan/pages/consult/consult.wxml
index ac83c43..d428352 100644
--- a/wechat_jiaxuan/pages/consult/consult.wxml
+++ b/wechat_jiaxuan/pages/consult/consult.wxml
@@ -1,21 +1,21 @@
<view class="container">
<view class="home_top">
<view class="search_wrap">
- <image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
+ <image src="../../static/icon/ic_search@2x.png"></image>
<input bindconfirm="searchList" model:value="{{ query }}" type="text" placeholder="鎼滅储璧勮鏍囬" />
</view>
</view>
<!-- 鍒嗙被 -->
<view class="cate_wrap">
<view class="cate_one">
- <scroll-view scroll-x="true" style="width: 710rpx;margin-bottom: 30rpx;">
+ <scroll-view scroll-x="true">
<view class="scroll_cate">
<view bindtap="cateClick" data-code="{{item.code}}" wx:for="{{ category }}" class="item {{ catalogCode == item.code ? 'active': '' }}">{{ item.name }}</view>
</view>
</scroll-view>
</view>
- <view class="cate_two">
- <scroll-view scroll-x="true" style="width: 710rpx;margin-bottom: 24rpx;">
+ <view animation="{{animationData}}" wx:if="{{showCate && secondCategory && secondCategory.length > 0}}" class="cate_two">
+ <scroll-view scroll-x="true">
<view class="scroll_cate second_list">
<view bindtap="seCateClick" data-code="{{item.code}}" wx:for="{{ secondCategory }}" class="item {{ tagCode == item.code ? 'active': '' }}">{{ item.name }}</view>
</view>
@@ -23,7 +23,8 @@
</view>
</view>
<!-- content -->
- <view class="content" style="padding-top: {{ secondCategory.length > 0 ? 274 : 184 }}rpx;">
+ <scroll-view scroll-y enhanced class="content" bindscrolltolower="bindscrolltolower" bindscrolltoupper="bindscrolltoupper" binddragging="touchmove" binddragstart="touchstart">
+ <view wx:if="{{ secondCategory && secondCategory.length > 0 }}" class="empty"></view>
<view wx:for="{{ dataList }}" class="item" bindtap="itemClick" data-item="{{item}}">
<image class="img" src="{{ item.coverImage }}" mode="widthFix"></image>
<view class="title">{{ item.title }}</view>
@@ -38,6 +39,6 @@
<view wx:if="{{ dataList.length == 0 }}" class="empty_wrap">
<image class="default_empty" src="../../static/images/default_empty.png"></image>
</view>
- </view>
+ </scroll-view>
</view>
<wxs module="math" src="../../utils/math.wxs"></wxs>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/consult/consult.wxss b/wechat_jiaxuan/pages/consult/consult.wxss
index ac29f23..506f6bf 100644
--- a/wechat_jiaxuan/pages/consult/consult.wxss
+++ b/wechat_jiaxuan/pages/consult/consult.wxss
@@ -1,61 +1,61 @@
.container {
background-color: #fff;
}
+page {
+ overflow: hidden;
+}
.home_top {
- position: fixed;
width: 100%;
z-index: 99;
top: 0;
- height: 96rpx;
- padding-bottom: 24rpx;
background-color: #fff;
}
-.home_top .search_wrap {
+.search_wrap {
width: 670rpx;
height: 72rpx;
- margin: 0rpx auto;
+ margin: 0rpx auto 24rpx;
border-radius: 8rpx;
- padding: 0 40rpx 0rpx;
+ padding: 0 40rpx;
display: flex;
align-items: center;
background-color: #F7F7F7;
}
-.home_top .search_wrap image {
+.search_wrap image {
width: 28rpx;
height: 28rpx;
margin-right: 16rpx;
}
-.cate_wrap {
- background-color: #fff;
-}
.cate_wrap .cate_one {
- position: fixed;
- top: 94rpx;
background-color: #fff;
- width: 100%;
}
.cate_wrap .cate_two {
- position: fixed;
- top: 154rpx;
+ position: absolute;
+ line-height: 88rpx;
+ margin-left: 40rpx;
+ height: 88rpx;
+ z-index: 999;
background-color: #fff;
- padding-top: 30rpx;
- width: 100%;
}
.scroll_cate {
display: flex;
- align-items: center;
+ line-height: 88rpx;
margin-left: 40rpx;
- height: 60rpx;
+ height: 88rpx;
}
.scroll_cate .item {
- margin-right: 48rpx;
+ margin-right: 54rpx;
color: #666666;
flex-shrink: 0;
}
.scroll_cate .active {
color: #222222;
- font-weight: 500;
+ font-weight: 600;
font-size: 30rpx;
+}
+.second_list {
+ display: flex;
+ align-items: center;
+ margin-left: 0;
}
.second_list .item {
padding: 0 40rpx;
@@ -69,13 +69,17 @@
margin-right: 24rpx;
}
.second_list .active {
+ color: var(--themeColor);
background: rgba(176, 135, 113, 0.08);
- color: #B08771;
font-size: 24rpx;
font-weight: 400;
}
.content {
- padding: 260rpx 40rpx 40rpx;
+ padding: 0rpx 40rpx 40rpx;
+ height: calc(100vh - 200rpx);
+}
+.content .empty {
+ height: 88rpx;
}
.content .item {
margin-bottom: 60rpx;
diff --git a/wechat_jiaxuan/pages/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
index b5a3cb3..fe270e3 100644
--- a/wechat_jiaxuan/pages/detailDis/case.js
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -1,6 +1,7 @@
import {
actionDo,
- getWholecaseInfo
+ getWholecaseInfo,
+ getMemberInfo
} from '../../api/index'
import {
eventBus
@@ -139,6 +140,7 @@
this.setData({
member: res.data
})
+ wx.setStorageSync('member', res.data)
})
}
})
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
index 45c126b..ad52c22 100644
--- a/wechat_jiaxuan/pages/detailDis/product.js
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -110,6 +110,7 @@
if(userId){
getMemberInfo().then(res => {
this.setData({ member: res.data })
+ wx.setStorageSync('member', res.data)
})
}else{
this.setData({ member: wx.getStorageSync('member') })
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.js b/wechat_jiaxuan/pages/detailDis/realpic.js
index c2c1b6f..4ece354 100644
--- a/wechat_jiaxuan/pages/detailDis/realpic.js
+++ b/wechat_jiaxuan/pages/detailDis/realpic.js
@@ -1,6 +1,7 @@
import {
getRealcaseInfo,
- actionDo
+ actionDo,
+ getMemberInfo
} from '../../api/index'
import {
eventBus
@@ -85,6 +86,7 @@
this.setData({
member: res.data
})
+ wx.setStorageSync('member', res.data)
})
}
})
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 8c5d047..fa9e123 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -127,7 +127,7 @@
url: '/pages/design/design'
})
} else {
- wx.setStorageSync('tempPath', '/pages/auth/auth')
+ wx.setStorageSync('tempPath', '/pages/design/design')
wx.navigateTo({
url: '/pages/auth/auth',
})
diff --git a/wechat_jiaxuan/pages/sets/index.js b/wechat_jiaxuan/pages/sets/index.js
index 2aacd81..f0012fe 100644
--- a/wechat_jiaxuan/pages/sets/index.js
+++ b/wechat_jiaxuan/pages/sets/index.js
@@ -2,14 +2,17 @@
wxLogOff,
wxLoginCustomer
} from '../../api/index'
-import { eventBus } from '../../utils/eventBus'
+import {
+ eventBus
+} from '../../utils/eventBus'
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- show: false
+ show: false,
+ showLogout: false
},
/**
@@ -32,44 +35,52 @@
let that = this
wxLogOff().then(res => {
wx.clearStorage()
- wx.login({
- timeout: 5000,
- success(res) {
- if (res.code) {
- //鍙戣捣缃戠粶璇锋眰
- wxLoginCustomer({
- code: res.code
- }).then(res => {
- console.log(res)
- if (res && res.data.token) {
- wx.setStorageSync('sessionKey', res.data.sessionKey)
- wx.setStorageSync('token', res.data.token)
- wx.showToast({
- title: '娉ㄩ攢鎴愬姛',
- })
- setTimeout(() => {
- eventBus.emit("reloadHome")
- }, 1000)
- setTimeout(() => {
- wx.switchTab({
- url: '/pages/index/index',
- })
- }, 500)
- } else {
- console.log('鐧诲綍澶辫触锛�')
- }
- })
- } else {}
- },
- fail(err) {
- wx.showToast({
- title: '娉ㄩ攢澶辫触',
- })
- wx.switchTab({
- url: '/pages/index/index',
- })
- }
+ wx.showToast({
+ title: '娉ㄩ攢鎴愬姛',
})
+ that.setData({
+ showLogout: true
+ })
+ })
+ },
+ appClose() {
+ wx.login({
+ timeout: 5000,
+ success: (res) => {
+ if (res.code) {
+ //鍙戣捣缃戠粶璇锋眰
+ wxLoginCustomer({
+ code: res.code
+ }).then(res => {
+ console.log(res)
+ if (res && res.data.token) {
+ wx.setStorageSync('sessionKey', res.data.sessionKey)
+ wx.setStorageSync('token', res.data.token)
+ this.setData({
+ showLogout: false
+ })
+ setTimeout(() => {
+ eventBus.emit("reloadHome")
+ }, 1000)
+ setTimeout(() => {
+ wx.switchTab({
+ url: '/pages/index/index',
+ })
+ }, 500)
+ } else {
+ console.log('鐧诲綍澶辫触锛�')
+ }
+ })
+ } else {}
+ },
+ fail(err) {
+ wx.showToast({
+ title: '娉ㄩ攢澶辫触',
+ })
+ wx.switchTab({
+ url: '/pages/index/index',
+ })
+ }
})
},
changeDeal(e) {
diff --git a/wechat_jiaxuan/pages/sets/index.wxml b/wechat_jiaxuan/pages/sets/index.wxml
index 525647e..8043299 100644
--- a/wechat_jiaxuan/pages/sets/index.wxml
+++ b/wechat_jiaxuan/pages/sets/index.wxml
@@ -24,4 +24,15 @@
</view>
</view>
</van-popup>
+ <van-popup show="{{ showLogout }}" round bind:close="appClose">
+ <view class="modal">
+ <view class="title">鎻愰啋</view>
+ <view class="text">浣犳槸鍚﹁閫�鍑鸿灏忕▼搴忓悧</view>
+ <view class="btns">
+ <navigator class="btn cancel" target="miniProgram" open-type="exit">纭閫�鍑�</navigator>
+ <view class="btn" bindtap="appClose">杩斿洖棣栭〉</view>
+ </view>
+ </view>
+ </van-popup>
+
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/sets/protocol.wxml b/wechat_jiaxuan/pages/sets/protocol.wxml
index 79fbe74..39e322d 100644
--- a/wechat_jiaxuan/pages/sets/protocol.wxml
+++ b/wechat_jiaxuan/pages/sets/protocol.wxml
@@ -1,3 +1,4 @@
<view style="width: 100%;height: auto;padding: 0px 40rpx;">
-<mp-html content="{{activeHtml}}"> </mp-html>
+<!-- <mp-html content="{{activeHtml}}"> </mp-html> -->
+<rich-text nodes="{{activeHtml}}"></rich-text>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
index 951f6b7..dc9f241 100644
--- a/wechat_jiaxuan/pages/userinfo/index.wxml
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -1,5 +1,5 @@
<view class="container">
- <image class="avatar" bindtap="selMedia" src="{{ imgurlFull ? imgurlFull : '../../static/images/default_avatar.png' }}"></image>
+ <image class="avatar" src="{{ imgurlFull ? imgurlFull : '../../static/images/default_avatar.png' }}"></image>
<button open-type="chooseAvatar" bindchooseavatar="getBindchooseavatar" class="avatar_btn">鏇存崲澶村儚</button>
<view class="list">
<view class="line">
@@ -24,7 +24,7 @@
<view class="val">
<view class="picker" style="width: 100%">
<view class="picker_wrap">
- <areaSel class="city_picler" bindchange="regionChange" placeholder="璇烽�夋嫨鎵�鍦ㄥ尯鍩�" value="{{ addrValues }}" />
+ <areaSel class="city_picler" bindchange="regionChange" placeholder="璇烽�夋嫨鎵�鍦ㄥ煄甯�" value="{{ addrValues }}" />
<image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
</view>
<!-- <picker class="picker" mode="region" value="{{ addr }}" bindchange="positionChange">
diff --git a/wechat_jiaxuan/utils/config.js b/wechat_jiaxuan/utils/config.js
index ef1c60f..4bccd57 100644
--- a/wechat_jiaxuan/utils/config.js
+++ b/wechat_jiaxuan/utils/config.js
@@ -1,10 +1,10 @@
-// export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
+export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //娴嬭瘯鏈嶅姟鍣�
-export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
+// export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
// 鑵捐鍦板浘寮�鍙戣�� key
export const qqMapKey = 'HIDBZ-2QXL4-TAWUD-XET6Q-EKTJE-CCBSQ'
diff --git a/wechat_staff/components/disCase/index.js b/wechat_staff/components/disCase/index.js
index 64b1b4c..91d15ed 100644
--- a/wechat_staff/components/disCase/index.js
+++ b/wechat_staff/components/disCase/index.js
@@ -1,4 +1,5 @@
import { getCataLogTagList, getZhongTaiWholecasePage, actionDo } from '../../api/index'
+let touchDot = 0
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -7,6 +8,10 @@
menuButtonInfo: Object
},
data: {
+ // 鍔ㄧ敾
+ showTouch: true,
+ animationData: {},
+
activeIndex: -1,
activeParam: [],
selParam: '',
@@ -25,8 +30,44 @@
attached() {
this.getCatelist()
this.getList()
+ this.animation = wx.createAnimation({
+ duration: 600,
+ timingFunction: 'ease',
+ });
},
methods: {
+ bindscrolltoupper() {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ },
+ touchstart(e){
+ touchDot = e.detail.scrollTop;
+ },
+ touchmove(e) {
+ var touchMove = e.detail.scrollTop;
+ if(touchMove - touchDot > 60){
+ this.fadeOut();
+ }
+ if(touchDot - touchMove > 60){
+ this.fadeIn();
+ this.setData({ showTouch: true })
+ }
+ },
+ fadeIn: function () {
+ this.animation.opacity(1).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ },
+ fadeOut: function () {
+ this.animation.opacity(0).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ setTimeout(() => {
+ this.setData({ showTouch: false });
+ }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ },
refreshCount(){
let temData = wx.getStorageSync('conentCountTemp')
if(temData && this.data.dataList){
diff --git a/wechat_staff/components/disCase/index.less b/wechat_staff/components/disCase/index.less
index dd507b5..1cdea78 100644
--- a/wechat_staff/components/disCase/index.less
+++ b/wechat_staff/components/disCase/index.less
@@ -52,7 +52,7 @@
width: 100%;
display: flex;
flex-wrap: wrap;
- max-height: 400rpx;
+ max-height: 680rpx;
overflow: auto;
padding: 30rpx 40rpx;
.item {
@@ -106,6 +106,10 @@
}
.status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
+ width: 100%;
display: flex;
padding: 0rpx 40rpx;
align-items: center;
@@ -124,6 +128,9 @@
box-sizing: border-box;
padding: 12rpx 40rpx;
height: calc( 100% - 188rpx);
+ .empty{
+ height: 100rpx;
+ }
.item{
width: 100%;
margin-bottom: 32rpx;
diff --git a/wechat_staff/components/disCase/index.wxml b/wechat_staff/components/disCase/index.wxml
index 85dd8a4..3a14ab2 100644
--- a/wechat_staff/components/disCase/index.wxml
+++ b/wechat_staff/components/disCase/index.wxml
@@ -27,7 +27,7 @@
</view>
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
- <view class="status">
+ <view wx:if="{{ showTouch }}" animation="{{animationData}}" class="status">
<view class="item {{ sortType == '' ? 'active' : '' }}" data-status="" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
<view class="item {{ sortType == 'greet' ? 'active' : '' }}" data-status="greet" bindtap="statusChange">鏈�鐑�</view>
@@ -35,7 +35,8 @@
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
- <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
+ <scroll-view bindscrolltoupper="bindscrolltoupper" binddragging="touchmove" binddragstart="touchstart" bindscrolltolower="scrolltolower" scroll-y enhanced class="goods_list">
+ <view class="empty"></view>
<view wx:for="{{ dataList }}" data-id="{{ item.id }}" class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
diff --git a/wechat_staff/components/disCase/index.wxss b/wechat_staff/components/disCase/index.wxss
index 8e783b7..83e696e 100644
--- a/wechat_staff/components/disCase/index.wxss
+++ b/wechat_staff/components/disCase/index.wxss
@@ -54,7 +54,7 @@
width: 100%;
display: flex;
flex-wrap: wrap;
- max-height: 400rpx;
+ max-height: 680rpx;
overflow: auto;
padding: 30rpx 40rpx;
}
@@ -104,6 +104,10 @@
z-index: 99;
}
.main_content .status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
+ width: 100%;
display: flex;
padding: 0rpx 40rpx;
align-items: center;
@@ -123,6 +127,9 @@
padding: 12rpx 40rpx;
height: calc(100% - 188rpx);
}
+.main_content .goods_list .empty {
+ height: 100rpx;
+}
.main_content .goods_list .item {
width: 100%;
margin-bottom: 32rpx;
diff --git a/wechat_staff/components/disProduct/index.js b/wechat_staff/components/disProduct/index.js
index 1af2ab8..fc5464f 100644
--- a/wechat_staff/components/disProduct/index.js
+++ b/wechat_staff/components/disProduct/index.js
@@ -1,4 +1,5 @@
import { getCatalogList,getCataLogTagList, getZhongTaiProductPage } from '../../api/index'
+let touchDot = 0
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -7,6 +8,10 @@
menuButtonInfo: Object
},
data: {
+ // 鍔ㄧ敾
+ showTouch: true,
+ animationData: {},
+
activeIndex: -1,
activeParam: [],
tagCodes: [],
@@ -33,8 +38,44 @@
getApp().globalData.catalogCode = ''
}, 2000)
}
+ this.animation = wx.createAnimation({
+ duration: 600,
+ timingFunction: 'ease',
+ });
},
methods: {
+ bindscrolltoupper() {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ },
+ touchstart(e){
+ touchDot = e.detail.scrollTop;
+ },
+ touchmove(e) {
+ var touchMove = e.detail.scrollTop;
+ if(touchMove - touchDot > 60){
+ this.fadeOut();
+ }
+ if(touchDot - touchMove > 60){
+ this.fadeIn();
+ this.setData({ showTouch: true })
+ }
+ },
+ fadeIn: function () {
+ this.animation.opacity(1).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ },
+ fadeOut: function () {
+ this.animation.opacity(0).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ setTimeout(() => {
+ this.setData({ showTouch: false });
+ }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ },
refreshCount(){
let temData = wx.getStorageSync('conentCountTemp')
if(temData && this.data.datalist){
diff --git a/wechat_staff/components/disProduct/index.less b/wechat_staff/components/disProduct/index.less
index b531431..8dec614 100644
--- a/wechat_staff/components/disProduct/index.less
+++ b/wechat_staff/components/disProduct/index.less
@@ -90,7 +90,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 400rpx;
+ max-height: 680rpx;
overflow: auto;
.item {
width: 154rpx;
@@ -146,6 +146,10 @@
}
.status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
+ width: 100%;
display: flex;
padding: 0rpx 40rpx;
align-items: center;
@@ -167,13 +171,16 @@
width: 590rpx;
box-sizing: border-box;
padding: 12rpx 40rpx;
+ .empty{
+ height: 92rpx;
+ }
.item {
width: 242rpx;
float: left;
margin-bottom: 32rpx;
- margin-right: 26rpx;
+ // margin-right: 26rpx;
&:nth-of-type(2n){
- margin-right: 0;
+ margin-right: 26rpx;
}
.img_wrap {
width: 242rpx;
@@ -183,7 +190,7 @@
.img {
width: 242rpx;
- max-height: 216rpx;
+ height: 136rpx;
}
.new {
diff --git a/wechat_staff/components/disProduct/index.wxml b/wechat_staff/components/disProduct/index.wxml
index bb5bfd9..0484dc6 100644
--- a/wechat_staff/components/disProduct/index.wxml
+++ b/wechat_staff/components/disProduct/index.wxml
@@ -31,17 +31,18 @@
</view>
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
- <view class="status">
+ <view wx:if="{{ showTouch }}" animation="{{animationData}}" class="status">
<view class="item {{ sortType == '' ? 'active' : '' }}" data-status="" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
<view class="item {{ sortType == 'greet' ? 'active' : '' }}" data-status="greet" bindtap="statusChange">鏈�鐑�</view>
<view class="separate"></view>
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
- <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
+ <scroll-view bindscrolltoupper="bindscrolltoupper" binddragging="touchmove" binddragstart="touchstart" bindscrolltolower="scrolltolower" scroll-y enhanced class="goods_list">
+ <view class="empty"></view>
<view wx:for="{{ datalist }}" data-id="{{item.id}}" class="item" bindtap="handleDetail">
<view class="img_wrap">
- <image src="{{ item.coverImage }}" class="img" mode="aspectFit"></image>
+ <image src="{{ item.coverImage }}" class="img" mode="aspectFill"></image>
<image wx:if="{{ item.isNew }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
</view>
<view class="name">{{ item.title }}</view>
diff --git a/wechat_staff/components/disProduct/index.wxss b/wechat_staff/components/disProduct/index.wxss
index 79f1f9f..814043e 100644
--- a/wechat_staff/components/disProduct/index.wxss
+++ b/wechat_staff/components/disProduct/index.wxss
@@ -83,7 +83,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 400rpx;
+ max-height: 680rpx;
overflow: auto;
}
.main_content .main_right .query_form .list .item {
@@ -132,6 +132,10 @@
z-index: 99;
}
.main_content .main_right .status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
+ width: 100%;
display: flex;
padding: 0rpx 40rpx;
align-items: center;
@@ -152,14 +156,16 @@
box-sizing: border-box;
padding: 12rpx 40rpx;
}
+.main_content .main_right .goods_list .empty {
+ height: 92rpx;
+}
.main_content .main_right .goods_list .item {
width: 242rpx;
float: left;
margin-bottom: 32rpx;
- margin-right: 26rpx;
}
.main_content .main_right .goods_list .item:nth-of-type(2n) {
- margin-right: 0;
+ margin-right: 26rpx;
}
.main_content .main_right .goods_list .item .img_wrap {
width: 242rpx;
@@ -169,7 +175,7 @@
}
.main_content .main_right .goods_list .item .img_wrap .img {
width: 242rpx;
- max-height: 216rpx;
+ height: 136rpx;
}
.main_content .main_right .goods_list .item .img_wrap .new {
width: 72rpx;
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index c05e2e9..ea13ece 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -1,4 +1,5 @@
import { getCataLogTagList, getZhongTaiRealcasePage, actionDo } from '../../api/index'
+let touchDot = 0
Component({
/**
* 缁勪欢鐨勫睘鎬у垪琛�
@@ -7,6 +8,10 @@
menuButtonInfo: Object
},
data: {
+ // 鍔ㄧ敾
+ showTouch: true,
+ animationData: {},
+
activeIndex: -1,
activeParam: [],
selParam: '',
@@ -23,8 +28,44 @@
},
attached() {
this.getCatelist()
+ this.animation = wx.createAnimation({
+ duration: 600,
+ timingFunction: 'ease',
+ });
},
methods: {
+ bindscrolltoupper() {
+ this.setData({ showTouch: true })
+ this.fadeIn();
+ },
+ touchstart(e){
+ touchDot = e.detail.scrollTop;
+ },
+ touchmove(e) {
+ var touchMove = e.detail.scrollTop;
+ if(touchMove - touchDot > 60){
+ this.fadeOut();
+ }
+ if(touchDot - touchMove > 60){
+ this.fadeIn();
+ this.setData({ showTouch: true })
+ }
+ },
+ fadeIn: function () {
+ this.animation.opacity(1).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ },
+ fadeOut: function () {
+ this.animation.opacity(0).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ setTimeout(() => {
+ this.setData({ showTouch: false });
+ }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
+ },
refreshCount(){
let temData = wx.getStorageSync('conentCountTemp')
if(temData && this.data.dataList){
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index f306d69..4f5d5cc 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -60,7 +60,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 400rpx;
+ max-height: 680rpx;
overflow: auto;
.item {
width: 202rpx;
@@ -116,6 +116,10 @@
}
.status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
+ width: 100%;
display: flex;
padding: 0rpx 40rpx;
height: 100rpx;
@@ -136,13 +140,15 @@
padding: 12rpx 40rpx;
height: calc( 100% - 188rpx);
box-sizing: border-box;
+ .empty{
+ height: 100rpx;
+ }
.item {
width: 324rpx;
margin-bottom: 32rpx;
float: left;
- margin-right: 22rpx;
&:nth-of-type(2n){
- margin-right: 0;
+ margin-right: 22rpx;
}
.img_wrap {
width: 100%;
diff --git a/wechat_staff/components/disRealpic/index.wxml b/wechat_staff/components/disRealpic/index.wxml
index 60aca1f..22473aa 100644
--- a/wechat_staff/components/disRealpic/index.wxml
+++ b/wechat_staff/components/disRealpic/index.wxml
@@ -28,7 +28,7 @@
</view>
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
- <view class="status">
+ <view wx:if="{{ showTouch }}" animation="{{animationData}}" class="status">
<view class="item {{ sortType == '' ? 'active' : '' }}" data-status="" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
<view class="item {{ sortType == 'greet' ? 'active' : '' }}" data-status="greet" bindtap="statusChange">鏈�鐑�</view>
@@ -36,7 +36,8 @@
<view class="item {{ sortType == 'time' ? 'active' : '' }}" data-status="time" bindtap="statusChange">鏈�鏂�</view>
</view>
<!-- goods_list -->
- <scroll-view bindscrolltolower="scrolltolower" scroll-y enable-passive enable-flex class="goods_list">
+ <scroll-view bindscrolltoupper="bindscrolltoupper" binddragging="touchmove" binddragstart="touchstart" bindscrolltolower="scrolltolower" scroll-y enhanced class="goods_list">
+ <view class="empty"></view>
<view wx:for="{{ dataList }}" data-index="index" data-item="{{item}}" class="item {{(index%2 == 0 && index == dataList.length-1)?'lastitem':''}}" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index e811af7..f17edc3 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -55,7 +55,7 @@
display: flex;
flex-wrap: wrap;
padding: 30rpx 40rpx;
- max-height: 400rpx;
+ max-height: 680rpx;
overflow: auto;
}
.main_content .query_param .list .item {
@@ -104,6 +104,10 @@
z-index: 99;
}
.main_content .status {
+ position: absolute;
+ background-color: #fff;
+ z-index: 99;
+ width: 100%;
display: flex;
padding: 0rpx 40rpx;
height: 100rpx;
@@ -123,14 +127,16 @@
height: calc(100% - 188rpx);
box-sizing: border-box;
}
+.main_content .goods_list .empty {
+ height: 100rpx;
+}
.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;
+ margin-right: 22rpx;
}
.main_content .goods_list .item .img_wrap {
width: 100%;
diff --git a/wechat_staff/package-lock.json b/wechat_staff/package-lock.json
index 6816386..d1bea25 100644
--- a/wechat_staff/package-lock.json
+++ b/wechat_staff/package-lock.json
@@ -1,38 +1,60 @@
{
"name": "wechat_staff",
"version": "1.0.0",
- "lockfileVersion": 1,
+ "lockfileVersion": 3,
"requires": true,
- "dependencies": {
- "@vant/weapp": {
+ "packages": {
+ "": {
+ "name": "wechat_staff",
+ "version": "1.0.0",
+ "license": "ISC",
+ "dependencies": {
+ "@vant/weapp": "^1.11.6",
+ "animate.css": "^4.1.1",
+ "hy-event-store": "^1.3.1",
+ "miniprogram-sm-crypto": "^0.3.13",
+ "moment": "^2.30.1",
+ "mp-html": "^2.5.0"
+ },
+ "devDependencies": {}
+ },
+ "node_modules/@vant/weapp": {
"version": "1.11.6",
"resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.11.6.tgz",
"integrity": "sha512-a3heReWYT2gNdsyj6x1hBwsM8V8NrjcPAmle86NH2CD2V/i/h0le75piW6KntSfOPCwekVWMBKhysNrBpJeKdw=="
},
- "hy-event-store": {
+ "node_modules/animate.css": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
+ "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
+ },
+ "node_modules/hy-event-store": {
"version": "1.3.1",
"resolved": "https://registry.npmmirror.com/hy-event-store/-/hy-event-store-1.3.1.tgz",
"integrity": "sha512-uD+14mz4ONiAs9cX/csjUJ2pHTPFciE3JvIbZ+lsbaXopZWbnETEjwJ0a4l5GqNGcltcW3gJjlnUXCJPBoABfg=="
},
- "jsbn": {
+ "node_modules/jsbn": {
"version": "1.1.0",
"resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz",
"integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
},
- "miniprogram-sm-crypto": {
+ "node_modules/miniprogram-sm-crypto": {
"version": "0.3.13",
"resolved": "https://registry.npmmirror.com/miniprogram-sm-crypto/-/miniprogram-sm-crypto-0.3.13.tgz",
"integrity": "sha512-H7qwbCEmIXZzekCSgEWeHh1mb4cnz0E42YH3U5xqpOaJBB2Sj9ySq0hTGv0f+Jwo5SknABR6fw+EtjnMyJ/O/Q==",
- "requires": {
+ "dependencies": {
"jsbn": "^1.1.0"
}
},
- "moment": {
+ "node_modules/moment": {
"version": "2.30.1",
"resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
- "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
+ "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+ "engines": {
+ "node": "*"
+ }
},
- "mp-html": {
+ "node_modules/mp-html": {
"version": "2.5.0",
"resolved": "https://registry.npmmirror.com/mp-html/-/mp-html-2.5.0.tgz",
"integrity": "sha512-uvBH5tIaDIlj8qaxsvNXU3RKX0jvXOo3J6FAi/notUv/ds6j79UUTE82aDkxxUk0eLUU0CiCqMrR7WWnytk30Q=="
diff --git a/wechat_staff/package.json b/wechat_staff/package.json
index a19af05..cd6d821 100644
--- a/wechat_staff/package.json
+++ b/wechat_staff/package.json
@@ -4,12 +4,12 @@
"main": ".eslintrc.js",
"dependencies": {
"@vant/weapp": "^1.11.6",
+ "animate.css": "^4.1.1",
+ "hy-event-store": "^1.3.1",
"miniprogram-sm-crypto": "^0.3.13",
"moment": "^2.30.1",
- "mp-html": "^2.5.0",
- "hy-event-store": "^1.3.1"
+ "mp-html": "^2.5.0"
},
- "devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
diff --git a/wechat_staff/pages/consult/consult.js b/wechat_staff/pages/consult/consult.js
index b1f84a0..0d760fe 100644
--- a/wechat_staff/pages/consult/consult.js
+++ b/wechat_staff/pages/consult/consult.js
@@ -9,6 +9,7 @@
category: [],
secondCategory: [],
showCate: true,
+ animationData: {},
catalogCode: '',
tagCode: '',
@@ -24,13 +25,17 @@
},
onLoad(options) {
this.getCate()
+ this.animation = wx.createAnimation({
+ duration: 500,
+ timingFunction: 'ease',
+ });
},
bindscrolltolower() {
console.log('瑙﹀簳浜嬩欢');
const { total, dataList, pageNum } = this.data
if(total > dataList.length){
this.setData({ pageNum: pageNum + 1 })
- this.getList(false)
+ this.getList()
}else{
wx.showToast({
title: '鏆傛棤鏇村鏁版嵁',
@@ -83,7 +88,7 @@
})
}
},
- getList(showCate = true) {
+ getList() {
const { pageNum, pageSize, catalogCode, tagCode, query } = this.data
getZhongTaiProductNewsPage({
pageNum, pageSize, query, catalogCode: tagCode || catalogCode
@@ -91,8 +96,7 @@
if(res.data){
this.setData({
dataList: [ ...this.data.dataList, ...res.data.records ],
- total: res.data.total,
- showCate
+ total: res.data.total
})
}
@@ -123,19 +127,38 @@
onReady() {
},
+ bindscrolltoupper() {
+ this.setData({ showCate: true })
+ this.fadeIn();
+ },
touchstart(e){
- // touchDot = e.touches[0].pageY;
- console.log('寮�濮�', e);
+ touchDot = e.detail.scrollTop;
},
touchmove(e) {
- // var touchMove = e.touches[0].pageY;
- console.log('touchMove', e);
- // if(touchDot - touchMove > 60){
- // this.setData({ showCate: false })
- // }
- // if(touchMove - touchDot > 60){
- // this.setData({ showCate: true })
- // }
+ var touchMove = e.detail.scrollTop;
+ if(touchMove - touchDot > 60){
+ // this.setData({ showCate: false })
+ this.fadeOut();
+ }
+ if(touchDot - touchMove > 60){
+ this.fadeIn();
+ this.setData({ showCate: true })
+ }
+ },
+ fadeIn: function () {
+ this.animation.opacity(1).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ },
+ fadeOut: function () {
+ this.animation.opacity(0).step();
+ this.setData({
+ animationData: this.animation.export()
+ });
+ setTimeout(() => {
+ this.setData({ showCate: false });
+ }, 500); // 鍔ㄧ敾鎸佺画鏃堕棿
},
onShow() {
refreshEnjoy(this)
diff --git a/wechat_staff/pages/consult/consult.less b/wechat_staff/pages/consult/consult.less
index 411ce20..68ca6ad 100644
--- a/wechat_staff/pages/consult/consult.less
+++ b/wechat_staff/pages/consult/consult.less
@@ -10,18 +10,6 @@
top: 0;
background-color: #fff;
}
-.cate_wrap{
- background-color: #fff;
- .cate_one{
- background-color: #fff;
- }
- .cate_two{
- line-height: 88rpx;
- margin-left: 40rpx;
- height: 88rpx;
- background-color: #fff;
- }
-}
.search_wrap{
width: 670rpx;
height: 72rpx;
@@ -33,7 +21,21 @@
background-color: #F7F7F7;
image{
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
+ }
+}
+.cate_wrap{
+ .cate_one{
+ background-color: #fff;
+ }
+ .cate_two{
+ position: absolute;
+ line-height: 88rpx;
+ margin-left: 40rpx;
+ height: 88rpx;
+ z-index: 999;
+ background-color: #fff;
}
}
.scroll_cate {
@@ -57,6 +59,7 @@
.second_list {
display: flex;
align-items: center;
+ margin-left: 0;
.item {
padding: 0 40rpx;
display: flex;
@@ -69,8 +72,8 @@
margin-right: 24rpx;
}
.active{
- background: rgba(176,135,113,0.08);
- color: #fff;
+ color: var(--themeColor);
+ background: rgba(176, 135, 113, 0.08);
font-size: 24rpx;
font-weight: 400;
}
@@ -78,6 +81,9 @@
.content{
padding: 0rpx 40rpx 40rpx;
height: calc( 100vh - 200rpx );
+ .empty{
+ height: 88rpx;
+ }
.item{
margin-bottom: 60rpx;
.img{
diff --git a/wechat_staff/pages/consult/consult.wxml b/wechat_staff/pages/consult/consult.wxml
index 40f45e0..d024c37 100644
--- a/wechat_staff/pages/consult/consult.wxml
+++ b/wechat_staff/pages/consult/consult.wxml
@@ -17,7 +17,7 @@
</view>
</scroll-view>
</view>
- <view wx:if="{{showCate && secondCategory && secondCategory.length > 0}}" class="cate_two">
+ <view animation="{{animationData}}" wx:if="{{showCate && secondCategory && secondCategory.length > 0}}" class="cate_two">
<scroll-view scroll-x="true">
<view class="scroll_cate second_list">
<view bindtap="seCateClick" data-code="{{item.code}}" wx:for="{{ secondCategory }}" class="item {{ tagCode == item.code ? 'active': '' }}">{{ item.name }}</view>
@@ -26,7 +26,8 @@
</view>
</view>
<!-- content -->
- <scroll-view scroll-y enhanced class="content" bindscrolltolower="bindscrolltolower" binddragging="touchmove" binddragstart="touchstart">
+ <scroll-view scroll-y enhanced class="content" bindscrolltoupper="bindscrolltoupper" bindscrolltolower="bindscrolltolower" binddragging="touchmove" binddragstart="touchstart">
+ <view wx:if="{{ secondCategory && secondCategory.length > 0 }}" class="empty"></view>
<view wx:for="{{ dataList }}" class="item" bindtap="itemClick" data-item="{{item}}">
<image class="img" src="{{ item.coverImage }}" mode="widthFix"></image>
<view class="title">{{ item.title }}</view>
diff --git a/wechat_staff/pages/consult/consult.wxss b/wechat_staff/pages/consult/consult.wxss
index 0d487c1..76ce9d5 100644
--- a/wechat_staff/pages/consult/consult.wxss
+++ b/wechat_staff/pages/consult/consult.wxss
@@ -10,18 +10,6 @@
top: 0;
background-color: #fff;
}
-.cate_wrap {
- background-color: #fff;
-}
-.cate_wrap .cate_one {
- background-color: #fff;
-}
-.cate_wrap .cate_two {
- line-height: 88rpx;
- margin-left: 40rpx;
- height: 88rpx;
- background-color: #fff;
-}
.search_wrap {
width: 670rpx;
height: 72rpx;
@@ -34,7 +22,19 @@
}
.search_wrap image {
width: 28rpx;
+ height: 28rpx;
margin-right: 16rpx;
+}
+.cate_wrap .cate_one {
+ background-color: #fff;
+}
+.cate_wrap .cate_two {
+ position: absolute;
+ line-height: 88rpx;
+ margin-left: 40rpx;
+ height: 88rpx;
+ z-index: 999;
+ background-color: #fff;
}
.scroll_cate {
display: flex;
@@ -55,6 +55,7 @@
.second_list {
display: flex;
align-items: center;
+ margin-left: 0;
}
.second_list .item {
padding: 0 40rpx;
@@ -68,8 +69,8 @@
margin-right: 24rpx;
}
.second_list .active {
+ color: var(--themeColor);
background: rgba(176, 135, 113, 0.08);
- color: #fff;
font-size: 24rpx;
font-weight: 400;
}
@@ -77,6 +78,9 @@
padding: 0rpx 40rpx 40rpx;
height: calc(100vh - 200rpx);
}
+.content .empty {
+ height: 88rpx;
+}
.content .item {
margin-bottom: 60rpx;
}
diff --git a/wechat_staff/pages/consult/detail.js b/wechat_staff/pages/consult/detail.js
index 55ba4f7..ef324bb 100644
--- a/wechat_staff/pages/consult/detail.js
+++ b/wechat_staff/pages/consult/detail.js
@@ -27,6 +27,8 @@
actionType: 'share',
id: this.data.info.id
})
+ console.log(`/pages/consult/detail?id=${this.data.info.id}&origin=b&userId=${wx.getStorageSync('member').id}`);
+ return
wx.navigateToMiniProgram({
appId: 'wxcd2b89fd2ff065f8',
path: `/pages/consult/detail?id=${this.data.info.id}&origin=b&userId=${wx.getStorageSync('member').id}`,
diff --git a/wechat_staff/pages/kefu/select.wxml b/wechat_staff/pages/kefu/select.wxml
index 5914ed7..f9fcf70 100644
--- a/wechat_staff/pages/kefu/select.wxml
+++ b/wechat_staff/pages/kefu/select.wxml
@@ -61,7 +61,7 @@
<view class="name">{{ item.customerName }}</view>
<view class="line source">
<view class="label">鏉ユ簮</view>
- <view class="val">{{ item.orgName }}</view>
+ <view class="val">{{ item.channel }}</view>
</view>
</view>
</view>
diff --git a/wechat_staff/pages/login/index.less b/wechat_staff/pages/login/index.less
index bd82b41..14fd823 100644
--- a/wechat_staff/pages/login/index.less
+++ b/wechat_staff/pages/login/index.less
@@ -13,6 +13,9 @@
.placeholder9{
text-align: center;
}
+page{
+ overflow: hidden;
+}
.btns{
margin-top: 120rpx;
padding: 0 62rpx;
@@ -66,7 +69,8 @@
position: relative;
.content{
height: calc( 100% - 180rpx );
- overflow: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
margin-bottom: 20rpx;
}
.btns{
diff --git a/wechat_staff/pages/login/index.wxml b/wechat_staff/pages/login/index.wxml
index 67069e8..2187148 100644
--- a/wechat_staff/pages/login/index.wxml
+++ b/wechat_staff/pages/login/index.wxml
@@ -36,7 +36,8 @@
<van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
<view class="content">
- <mp-html content="{{activeHtml}}"></mp-html>
+ <!-- <mp-html content="{{activeHtml}}"></mp-html> -->
+ <rich-text nodes="{{activeHtml}}"></rich-text>
</view>
<view style="bottom: {{ bottomLift }}px" class="btns">
<view data-flag="{{true}}" bindtap="handleJudge" class="agree">鍚屾剰</view>
diff --git a/wechat_staff/pages/login/index.wxss b/wechat_staff/pages/login/index.wxss
index a02546a..923ef39 100644
--- a/wechat_staff/pages/login/index.wxss
+++ b/wechat_staff/pages/login/index.wxss
@@ -13,6 +13,9 @@
.placeholder9 {
text-align: center;
}
+page {
+ overflow: hidden;
+}
.btns {
margin-top: 120rpx;
padding: 0 62rpx;
@@ -67,7 +70,8 @@
}
.modal .content {
height: calc(100% - 180rpx);
- overflow: auto;
+ overflow-y: auto;
+ overflow-x: hidden;
margin-bottom: 20rpx;
}
.modal .btns {
diff --git a/wechat_staff/pages/sets/protocol.wxml b/wechat_staff/pages/sets/protocol.wxml
index e36adf3..5c1edf4 100644
--- a/wechat_staff/pages/sets/protocol.wxml
+++ b/wechat_staff/pages/sets/protocol.wxml
@@ -1,4 +1,5 @@
<!--pages/sets/protocol.wxml-->
<view style="width: 100%;height: auto;padding: 0px 40rpx;">
-<mp-html content="{{content}}"> </mp-html>
+<!-- <mp-html content="{{content}}"> </mp-html> -->
+<rich-text nodes="{{content}}"></rich-text>
</view>
diff --git a/wechat_staff/pages/store/staff.js b/wechat_staff/pages/store/staff.js
index ffd4ea7..25aef41 100644
--- a/wechat_staff/pages/store/staff.js
+++ b/wechat_staff/pages/store/staff.js
@@ -32,6 +32,11 @@
bottomLift: app.bottomLift
})
},
+ jumpUser() {
+ wx.navigateTo({
+ url: '/pages/userinfo/index',
+ })
+ },
showQrcode() {
this.setData({
isShow: true
diff --git a/wechat_staff/pages/store/staff.less b/wechat_staff/pages/store/staff.less
index e0c3bd7..a7dde90 100644
--- a/wechat_staff/pages/store/staff.less
+++ b/wechat_staff/pages/store/staff.less
@@ -6,6 +6,24 @@
top: 0;
left: 0;
z-index: -1;
+ image{
+ width: 750rpx;
+ height: 400rpx;
+ }
+}
+.editBtn{
+ position: fixed;
+ right: 40rpx;
+ top: 304rpx;
+ width: 144rpx;
+ height: 56rpx;
+ line-height: 56rpx;
+ text-align: center;
+ border-radius: 28rpx;
+ border: 1rpx solid #999999;
+ color: #999999;
+ font-size: 24rpx;
+ z-index: 999;
}
page{
overflow-y: hidden;
diff --git a/wechat_staff/pages/store/staff.wxml b/wechat_staff/pages/store/staff.wxml
index cfb0d38..59d9532 100644
--- a/wechat_staff/pages/store/staff.wxml
+++ b/wechat_staff/pages/store/staff.wxml
@@ -1,6 +1,9 @@
<view class="app">
<back />
- <image src="../../static/images/design_banner@2x.png" mode="widthFix" class="bg_wrap"></image>
+ <view class="bg_wrap">
+ <image src="../../static/images/design_banner@2x.png" mode="widthFix" ></image>
+ </view>
+ <view bindtap="jumpUser" class="editBtn">缂栬緫璧勬枡</view>
<view class="container">
<image class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
<view class="name_wrap">
diff --git a/wechat_staff/pages/store/staff.wxss b/wechat_staff/pages/store/staff.wxss
index 8a0672b..d6a31a8 100644
--- a/wechat_staff/pages/store/staff.wxss
+++ b/wechat_staff/pages/store/staff.wxss
@@ -7,6 +7,24 @@
left: 0;
z-index: -1;
}
+.bg_wrap image {
+ width: 750rpx;
+ height: 400rpx;
+}
+.editBtn {
+ position: fixed;
+ right: 40rpx;
+ top: 304rpx;
+ width: 144rpx;
+ height: 56rpx;
+ line-height: 56rpx;
+ text-align: center;
+ border-radius: 28rpx;
+ border: 1rpx solid #999999;
+ color: #999999;
+ font-size: 24rpx;
+ z-index: 999;
+}
page {
overflow-y: hidden;
}
diff --git a/wechat_staff/project.private.config.json b/wechat_staff/project.private.config.json
index ed6bbaa..bdf26d0 100644
--- a/wechat_staff/project.private.config.json
+++ b/wechat_staff/project.private.config.json
@@ -38,7 +38,7 @@
},
{
"name": "",
- "pathName": "pages/webView/index",
+ "pathName": "pages/login/index",
"query": "",
"launchMode": "default",
"scene": null
@@ -52,8 +52,8 @@
},
{
"name": "",
- "pathName": "pages/consult/detail",
- "query": "id=1813577799402684418",
+ "pathName": "pages/work/index",
+ "query": "",
"launchMode": "default",
"scene": null
}
--
Gitblit v1.9.3