From 23fac85b42cdc8a3f989d7a7a107b7cce6c86049 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 10:08:07 +0800
Subject: [PATCH] 提交
---
wechat_staff/pages/detailDis/case.wxml | 2 +-
wechat_staff/pages/discover/discover.js | 7 +++++--
wechat_staff/pages/productVideo/index.wxml | 1 +
wechat_staff/pages/consult/consult.js | 4 ++--
wechat_staff/pages/productVideo/index.json | 5 ++++-
wechat_staff/pages/discover/discover.wxml | 2 +-
wechat_staff/pages/detailDis/realpic.wxml | 2 +-
wechat_staff/pages/consult/detail.wxml | 2 +-
wechat_staff/pages/kefu/fond.wxss | 4 +++-
wechat_staff/pages/productVideo/index.js | 4 ++--
wechat_staff/pages/consult/consult.wxml | 2 +-
11 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/wechat_staff/pages/consult/consult.js b/wechat_staff/pages/consult/consult.js
index 5e74e3b..12f04cc 100644
--- a/wechat_staff/pages/consult/consult.js
+++ b/wechat_staff/pages/consult/consult.js
@@ -1,4 +1,4 @@
-import { getZhongTaiProductNewsPage, getCatalogList,actionDo } from '../../api/index'
+import { getZhongTaiProductNewsPage, getCatalogList,actionDo,refreshEnjoy } from '../../api/index'
Page({
/**
@@ -116,7 +116,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
-
+ refreshEnjoy(this)
},
/**
diff --git a/wechat_staff/pages/consult/consult.wxml b/wechat_staff/pages/consult/consult.wxml
index a3df2f1..650f706 100644
--- a/wechat_staff/pages/consult/consult.wxml
+++ b/wechat_staff/pages/consult/consult.wxml
@@ -1,6 +1,6 @@
<view class="container">
<!-- 鎮诞 -->
- <buoyClient />
+ <buoyClient class="buoyClient"/>
<view class="home_top">
<view class="search_wrap">
diff --git a/wechat_staff/pages/consult/detail.wxml b/wechat_staff/pages/consult/detail.wxml
index b43a9a2..71a4c92 100644
--- a/wechat_staff/pages/consult/detail.wxml
+++ b/wechat_staff/pages/consult/detail.wxml
@@ -1,6 +1,6 @@
<view>
<!-- <navBar title="{{ navTitle }}"></navBar> -->
- <buoyClient showPurpose="1" />
+ <buoyClient showPurpose="1" class="buoyClient"/>
<view class="main_content">
<view class="main_title">{{ info.title }}</view>
<view class="datetime">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
diff --git a/wechat_staff/pages/detailDis/case.wxml b/wechat_staff/pages/detailDis/case.wxml
index 9a99283..a1d0271 100644
--- a/wechat_staff/pages/detailDis/case.wxml
+++ b/wechat_staff/pages/detailDis/case.wxml
@@ -1,5 +1,5 @@
<view class="container">
- <buoyClient showPurpose="1" />
+ <buoyClient showPurpose="1" class="buoyClient"/>
<detailFooter bindenjoy="handleEnjoy" path="1" info="{{info}}" />
<view class="main_title">{{ info.title }}</view>
<view class="time">鍙戝竷鏃堕棿锛歿{ info.publishDt }}</view>
diff --git a/wechat_staff/pages/detailDis/realpic.wxml b/wechat_staff/pages/detailDis/realpic.wxml
index 39539d7..f972e59 100644
--- a/wechat_staff/pages/detailDis/realpic.wxml
+++ b/wechat_staff/pages/detailDis/realpic.wxml
@@ -1,5 +1,5 @@
<view class="container">
- <buoyClient showPurpose="1" />
+ <buoyClient showPurpose="1" class="buoyClient"/>
<detailFooter bindenjoy="handleEnjoy" path="2" info="{{info}}" />
<!-- -->
<view class="main_title">{{ info.title }}</view>
diff --git a/wechat_staff/pages/discover/discover.js b/wechat_staff/pages/discover/discover.js
index 64a68ad..787305e 100644
--- a/wechat_staff/pages/discover/discover.js
+++ b/wechat_staff/pages/discover/discover.js
@@ -1,4 +1,4 @@
-import { getCataLogTagList, getCatalogList } from '../../api/index'
+import { getCataLogTagList, getCatalogList,refreshEnjoy } from '../../api/index'
const { HYEventBus } = require('hy-event-store')
const eventBus = new HYEventBus()
Page({
@@ -18,7 +18,10 @@
let menuButtonInfo = wx.getMenuButtonBoundingClientRect();
this.setData({menuButtonInfo})
},
- onShow() {
+
+ onShow(){
+ console.log('onShow')
+ refreshEnjoy(this)
let discoverKey = wx.getStorageSync('discoverKey') || ''
if(discoverKey){
this.setData({ catalogCode: discoverKey })
diff --git a/wechat_staff/pages/discover/discover.wxml b/wechat_staff/pages/discover/discover.wxml
index bab498f..df9848e 100644
--- a/wechat_staff/pages/discover/discover.wxml
+++ b/wechat_staff/pages/discover/discover.wxml
@@ -1,5 +1,5 @@
<view class="container">
- <buoyClient />
+ <buoyClient class="buoyClient"/>
<view class="home_tab">
<view style="height: {{ menuButtonInfo.top - 6 }}px;"></view>
<view class="main_tab" style="height: {{ menuButtonInfo.height + 12 }}px;">
diff --git a/wechat_staff/pages/kefu/fond.wxss b/wechat_staff/pages/kefu/fond.wxss
index b7bbad2..8e14f9c 100644
--- a/wechat_staff/pages/kefu/fond.wxss
+++ b/wechat_staff/pages/kefu/fond.wxss
@@ -41,8 +41,10 @@
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
- -webkit-line-clamp: 2;
+ -webkit-line-clamp: 2;
+ white-space: break-spaces;
-webkit-box-orient: vertical;
+ word-break: break-word;
}
.date_item .line .content .time {
font-size: 24rpx;
diff --git a/wechat_staff/pages/productVideo/index.js b/wechat_staff/pages/productVideo/index.js
index 6e9614a..49da278 100644
--- a/wechat_staff/pages/productVideo/index.js
+++ b/wechat_staff/pages/productVideo/index.js
@@ -1,4 +1,4 @@
-import { getZhongTaiVideoPage, getCataLogTagList } from '../../api/index'
+import { getZhongTaiVideoPage, getCataLogTagList ,refreshEnjoy} from '../../api/index'
Page({
/**
@@ -77,7 +77,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
-
+ refreshEnjoy(this)
},
/**
diff --git a/wechat_staff/pages/productVideo/index.json b/wechat_staff/pages/productVideo/index.json
index 5322f4c..572cc92 100644
--- a/wechat_staff/pages/productVideo/index.json
+++ b/wechat_staff/pages/productVideo/index.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "浜у搧瑙嗛"
+ "navigationBarTitleText": "浜у搧瑙嗛",
+ "usingComponents": {
+ "buoyClient": "../../components/buoyClient/index"
+ }
}
\ No newline at end of file
diff --git a/wechat_staff/pages/productVideo/index.wxml b/wechat_staff/pages/productVideo/index.wxml
index 6b07bb4..a36c0bb 100644
--- a/wechat_staff/pages/productVideo/index.wxml
+++ b/wechat_staff/pages/productVideo/index.wxml
@@ -1,4 +1,5 @@
<view class="container">
+ <buoyClient class="buoyClient"/>
<!-- 鍒嗙被 -->
<view>
<scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
--
Gitblit v1.9.3