From 67691fedbabb03a2c5997da4951763ba5a8f4a9f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 23 七月 2024 16:26:09 +0800
Subject: [PATCH] ‘’
---
wechat_staff/pages/kefu/index.less | 3
wechat_staff/pages/kefu/service.json | 6
wechat_staff/pages/productVideo/index.wxml | 24
wechat_staff/pages/productVideo/index.wxss | 18 +
wechat_jiaxuan/pages/kefu/index.wxml | 10
wechat_staff/pages/webView/index.json | 3
wechat_staff/pages/index/index.wxml | 44 +-
wechat_staff/pages/homeId/index.less | 12
wechat_staff/pages/index/index.wxss | 39 ++
wechat_jiaxuan/components/disProduct/index.less | 9
wechat_jiaxuan/components/disRealpic/index.less | 9
wechat_staff/project.config.json | 2
wechat_staff/pages/homeId/index.js | 73 +++-
wechat_staff/pages/kefu/index.json | 4
wechat_staff/project.private.config.json | 2
wechat_staff/pages/kefu/service.js | 74 ++++
wechat_staff/pages/userinfo/index.js | 20
wechat_jiaxuan/pages/kefu/index.js | 19 +
wechat_staff/app.wxss | 37 ++
wechat_staff/static/icon/ic_play.png | 0
wechat_jiaxuan/pages/index/index.js | 1
wechat_staff/pages/index/index.less | 42 ++
wechat_staff/pages/kefu/index.wxml | 14
wechat_staff/pages/productVideo/index.less | 16 +
wechat_staff/pages/webView/index.js | 77 +++++
wechat_jiaxuan/pages/kefu/index.less | 5
wechat_jiaxuan/components/disCase/index.wxml | 1
wechat_staff/pages/homeId/index.wxss | 14
wechat_jiaxuan/components/disCase/index.wxss | 9
wechat_staff/pages/homeId/index.wxml | 8
wechat_jiaxuan/api/index.js | 2
wechat_staff/pages/productVideo/index.js | 71 +++-
wechat_staff/pages/webView/index.wxml | 5
wechat_staff/pages/webView/index.wxss | 1
wechat_staff/pages/index/index.js | 105 +++++-
wechat_staff/pages/kefu/service.wxml | 3
wechat_staff/pages/kefu/service.wxss | 1
wechat_jiaxuan/components/disCase/index.less | 9
wechat_jiaxuan/components/disRealpic/index.wxml | 1
wechat_staff/app.json | 2
wechat_jiaxuan/components/disRealpic/index.wxss | 9
wechat_staff/api/index.js | 32 ++
wechat_jiaxuan/components/disProduct/index.wxss | 9
wechat_staff/pages/kefu/index.js | 38 ++
wechat_staff/pages/kefu/index.wxss | 3
wechat_jiaxuan/components/disProduct/index.wxml | 1
46 files changed, 730 insertions(+), 157 deletions(-)
diff --git a/wechat_jiaxuan/api/index.js b/wechat_jiaxuan/api/index.js
index d21ecc7..8c58fb5 100644
--- a/wechat_jiaxuan/api/index.js
+++ b/wechat_jiaxuan/api/index.js
@@ -166,7 +166,7 @@
url: '/web/customer/getWholecaseInfo',
data
})
-}
+}
// 鍒嗙被瀹炴櫙 鍒嗛〉鍒楄〃 涓彴
export const getZhongTaiRealcasePage = (data) => {
return request({
diff --git a/wechat_jiaxuan/components/disCase/index.less b/wechat_jiaxuan/components/disCase/index.less
index 0ae4378..52e9388 100644
--- a/wechat_jiaxuan/components/disCase/index.less
+++ b/wechat_jiaxuan/components/disCase/index.less
@@ -51,7 +51,7 @@
}
.query_param {
position: absolute;
- z-index: 99;
+ z-index: 999;
background-color: #fff;
width: 100%;
.list {
@@ -103,6 +103,13 @@
}
}
}
+ .shade{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,.5);
+ z-index: 99;
+ }
.status {
display: flex;
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
index e7166d1..1d0bda2 100644
--- a/wechat_jiaxuan/components/disCase/index.wxml
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -26,6 +26,7 @@
<view bindtap="subParam" class="btn sub">纭</view>
</view>
</view>
+ <view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
<view class="status">
<view class="item {{ sortType == 'NORMAL' ? 'active' : '' }}" data-status="NORMAL" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
diff --git a/wechat_jiaxuan/components/disCase/index.wxss b/wechat_jiaxuan/components/disCase/index.wxss
index 0f3f5ed..ef73ac8 100644
--- a/wechat_jiaxuan/components/disCase/index.wxss
+++ b/wechat_jiaxuan/components/disCase/index.wxss
@@ -51,7 +51,7 @@
}
.main_content .query_param {
position: absolute;
- z-index: 99;
+ z-index: 999;
background-color: #fff;
width: 100%;
}
@@ -101,6 +101,13 @@
background: var(--themeColor);
color: #fff;
}
+.main_content .shade {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+ z-index: 99;
+}
.main_content .status {
display: flex;
padding: 0rpx 40rpx;
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index 5243721..e4a18e4 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -83,7 +83,7 @@
.query_form {
position: absolute;
- z-index: 99;
+ z-index: 999;
background-color: #fff;
.list {
@@ -138,6 +138,13 @@
}
}
}
+ .shade{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,.5);
+ z-index: 99;
+ }
.status {
display: flex;
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index d0248d6..b9bd8b2 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -28,6 +28,7 @@
<view class="btn sub" bindtap="subParam">纭</view>
</view>
</view>
+ <view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
<view class="status">
<view class="item {{ sortType == 'NORMAL' ? 'active' : '' }}" data-status="NORMAL" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index 498d832..e0c4bfe 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -75,7 +75,7 @@
}
.main_content .main_right .query_form {
position: absolute;
- z-index: 99;
+ z-index: 999;
background-color: #fff;
}
.main_content .main_right .query_form .list {
@@ -124,6 +124,13 @@
background: var(--themeColor);
color: #fff;
}
+.main_content .main_right .shade {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+ z-index: 99;
+}
.main_content .main_right .status {
display: flex;
padding: 0rpx 40rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index 30a32f5..6ed5ae6 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -57,7 +57,7 @@
.query_param {
position: absolute;
- z-index: 99;
+ z-index: 999;
background-color: #fff;
width: 100%;
@@ -113,6 +113,13 @@
}
}
}
+ .shade{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0,0,0,.5);
+ z-index: 99;
+ }
.status {
display: flex;
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index a943534..7d967f4 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -27,6 +27,7 @@
<view bindtap="subParam" class="btn sub">纭</view>
</view>
</view>
+ <view wx:if="{{ activeParam.length > 0 }}" class="shade"></view>
<view class="status">
<view class="item {{ sortType == 'NORMAL' ? 'active' : '' }}" data-status="NORMAL" bindtap="statusChange">榛樿</view>
<view class="separate"></view>
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index e0425c2..44f0e3c 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -51,7 +51,7 @@
}
.main_content .query_param {
position: absolute;
- z-index: 99;
+ z-index: 999;
background-color: #fff;
width: 100%;
}
@@ -101,6 +101,13 @@
background: var(--themeColor);
color: #fff;
}
+.main_content .shade {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+ z-index: 99;
+}
.main_content .status {
display: flex;
padding: 0rpx 40rpx;
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index a4274e7..68b0262 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -294,7 +294,6 @@
url: `/pages/kefu/service?title=${title}&id=${id}`,
})
}
-
},
jumpProConsult() {
wx.switchTab({
diff --git a/wechat_jiaxuan/pages/kefu/index.js b/wechat_jiaxuan/pages/kefu/index.js
index 026490f..7035858 100644
--- a/wechat_jiaxuan/pages/kefu/index.js
+++ b/wechat_jiaxuan/pages/kefu/index.js
@@ -21,6 +21,25 @@
this.getDetail(options.id)
}
},
+ toSever () {
+ console.log('瀹㈡湇');
+ try {
+ wx.openCustomerServiceChat({
+ extInfo: {
+ url: "https://work.weixin.qq.com/kfid/kfcfbccadc81cd01c0b?enc_scene=ENC5EhZgjepB9zsutZUQ5AiRnyN7GamomkuWsUA4bwigukSK6w5pVyRzcNDKurjFDNDC7" //瀹㈡湇ID
+ },
+ corpId: 'ww3686d2bb864ce3e2', //浼佷笟寰俊ID
+ success(res) {
+ console.log('杩炴帴瀹㈡湇鎴愬姛');
+ }
+ })
+ } catch (error) {
+ wx.showToast({
+ title: '璇锋洿鏂拌嚦寰俊鏈�鏂扮増鏈�',
+ icon: 'none'
+ })
+ }
+ },
getDetail(id) {
getCustomizedNewsDetail({id}).then(res => {
this.setData({
diff --git a/wechat_jiaxuan/pages/kefu/index.less b/wechat_jiaxuan/pages/kefu/index.less
index efd9488..fd5875a 100644
--- a/wechat_jiaxuan/pages/kefu/index.less
+++ b/wechat_jiaxuan/pages/kefu/index.less
@@ -10,6 +10,9 @@
align-items: center;
height: 100rpx;
padding: 12rpx 40rpx;
+ .btn{
+ padding-top: 20rpx;
+ }
}
.sub_btn {
flex: 1;
@@ -42,4 +45,4 @@
width: 44rpx;
}
}
-}
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/kefu/index.wxml b/wechat_jiaxuan/pages/kefu/index.wxml
index f2bfe6d..39c2f6d 100644
--- a/wechat_jiaxuan/pages/kefu/index.wxml
+++ b/wechat_jiaxuan/pages/kefu/index.wxml
@@ -6,11 +6,11 @@
<!-- footer -->
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
- <view class="item">
- <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
- <view class="name">鍒嗕韩</view>
- </view>
- <view class="sub_btn">
+ <button open-type="share" class="item btn" bindtap="handleShare">
+ <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
+ <view class="name">鍒嗕韩</view>
+ </button>
+ <view class="sub_btn" bindtap="toSever">
<image class="icon" src="../../static/icon/home_ic_kefu.png" mode="widthFix"></image>
<view>绔嬪嵆鍜ㄨ瀹㈡湇</view>
</view>
diff --git a/wechat_staff/api/index.js b/wechat_staff/api/index.js
index 78224b6..df10226 100644
--- a/wechat_staff/api/index.js
+++ b/wechat_staff/api/index.js
@@ -67,6 +67,28 @@
data
})
}
+// 浜у搧瑙嗛
+export const getZhongTaiVideoPage = (data) => {
+ return request({
+ url: '/web/customer/getZhongTaiVideoPage',
+ method: 'POST',
+ data
+ })
+}
+// 棣栭〉 瀹氬埗鏈嶅姟 鍒楄〃
+export const getCustomizedNewsList = (data) => {
+ return request({
+ url: '/web/customer/getCustomizedNewsList',
+ data
+ })
+}
+// 瀹氬埗鏈嶅姟 璇︽儏
+export const getCustomizedNewsDetail = (data) => {
+ return request({
+ url: '/web/customer/getCustomizedNewsDetail',
+ data
+ })
+}
// 棣栭〉 鎺ㄥ箍鍜ㄨ鍒嗛〉
export const newsPage = (data) => {
return request({
@@ -98,7 +120,13 @@
data
})
}
-
+// 鎿嶄綔 琛屼负鍐呭
+export const actionDo = (data) => {
+ return request({
+ url: '/web/customer/actionDo',
+ data
+ })
+}
export const getUserCard = (data) => {
return request({
url: '/web/personnel/getUserCard',
@@ -116,7 +144,7 @@
// 蹇楄瑁呬慨 鍐呭
export const pageZSZXContentList = (data) => {
return request({
- url: '/web/customer/pageContentList',
+ url: '/web/customer/getZhongTaiZbDecoPage',
method: "POST",
data
})
diff --git a/wechat_staff/app.json b/wechat_staff/app.json
index 6adfe2c..ba74612 100644
--- a/wechat_staff/app.json
+++ b/wechat_staff/app.json
@@ -12,12 +12,14 @@
"pages/kefu/index",
"pages/kefu/fond",
"pages/kefu/select",
+ "pages/kefu/service",
"pages/userinfo/index",
"pages/userinfo/collect",
"pages/store/index",
"pages/store/info",
"pages/store/staff",
"pages/sets/index",
+ "pages/webView/index",
"pages/sets/protocol",
"pages/consult/detail",
"pages/detailDis/product",
diff --git a/wechat_staff/app.wxss b/wechat_staff/app.wxss
index 3c6fb3d..550bb1f 100644
--- a/wechat_staff/app.wxss
+++ b/wechat_staff/app.wxss
@@ -1,15 +1,22 @@
-page {
- color: #333333;
- height: 100%;
- font-size: 28rpx;
- --themeColor:#B08771;
-}
-view,text{
+
+view,text,scroll-view,image{
box-sizing: border-box;
+}
+page{
+ background-color: #fff;
+ --themeColor:#B08771;
+ color: #111111;
}
image{
display: flex;
+ border-radius: 8rpx;
}
+.container {
+ min-height: 100vh;
+ padding: 0;
+ box-sizing: border-box;
+ font-size: 28rpx;
+}
::-webkit-scrollbar {
display:none;
width:0;
@@ -27,6 +34,22 @@
.placeholder9{
color: #999999;
}
+button {
+ margin: 0;
+ padding: 0;
+ background-color: inherit;
+ position: static;
+}
+
+button:after {
+ content: none;
+}
+::-webkit-scrollbar {
+ display: none;
+}
+button::after {
+ border: none;
+}
.ar_new{
width: 14rpx;
margin-left: 8rpx;
diff --git a/wechat_staff/pages/homeId/index.js b/wechat_staff/pages/homeId/index.js
index 4b5c569..95ecff5 100644
--- a/wechat_staff/pages/homeId/index.js
+++ b/wechat_staff/pages/homeId/index.js
@@ -1,4 +1,4 @@
-import { getCataLogTagList, pageZSZXContentList } from '../../api/index'
+import { getCataLogTagList, pageZSZXContentList, actionDo } from '../../api/index'
Page({
/**
@@ -8,6 +8,7 @@
tagList: [],
activeCate: '',
dataList: [],
+ total: 0,
pageNum: 1,
pageSize: 10,
@@ -22,12 +23,53 @@
this.getTabList()
this.getList()
},
- itemClick(e) {
- const { id } = e.target.dataset
- console.log(e.target.dataset);
- wx.navigateTo({
- url: '/pages/consult/detail',
+ onReachBottom() {
+ console.log('瑙﹀簳浜嬩欢');
+ const { total, dataList, pageNum } = this.data
+ if(total > dataList.length){
+ this.setData({ pageNum: pageNum + 1 })
+ this.getList()
+ }else{
+ wx.showToast({
+ title: '鏆傛棤鏇村鏁版嵁',
+ icon: 'none'
+ })
+ }
+ },
+ getList(){
+ const { code, tagCodes, pageSize, pageNum } = this.data
+ pageZSZXContentList({
+ catalogCode: code,
+ tagCodes: tagCodes ? [tagCodes] : [],
+ pageSize,
+ pageNum
+ }).then(res => {
+ this.setData({
+ total: res.data.total,
+ dataList: [ ...this.data.dataList, ...res.data.records ]
+ })
})
+ },
+ itemClick(e) {
+ const item = e.currentTarget.dataset.item
+ console.log('item', item);
+ actionDo({actionType: 'view',id: item.id})
+ if(item.contentType == 'video'){
+ wx.previewMedia({
+ sources: [{ url: item.content, type: 'video' }]
+ })
+ }
+ if(item.contentType == 'link'){
+ wx.navigateTo({
+ url: '/pages/webView/index?link=' + item.content,
+ })
+ }
+ if(item.contentType == 'page'){
+ getApp().globalData.catalogCode=item.content
+ wx.switchTab({
+ url: '/pages/discover/discover'
+ })
+ }
},
cateClick(e) {
const { code } = e.target.dataset
@@ -49,22 +91,6 @@
}
})
- },
- getList(){
- const { code, tagCodes, pageSize, pageNum } = this.data
- pageZSZXContentList({
- catalogCode: code,
- tagCodes,
- pageSize,
- pageNum
- }).then(res => {
- this.setData({
- dataList: [ ...this.data.dataList, ...res.data.records ]
- })
- })
- },
- onReachBottom() {
-
},
onReady() {
@@ -101,9 +127,6 @@
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
- onReachBottom() {
-
- },
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
diff --git a/wechat_staff/pages/homeId/index.less b/wechat_staff/pages/homeId/index.less
index aff0800..c84a6df 100644
--- a/wechat_staff/pages/homeId/index.less
+++ b/wechat_staff/pages/homeId/index.less
@@ -1,6 +1,11 @@
.container {
background-color: #fff;
}
+.home_tabs{
+ height: 80rpx;
+ position: fixed;
+ background-color: #fff;
+}
.search_wrap{
width: 670rpx;
height: 72rpx;
@@ -54,12 +59,17 @@
}
}
.content{
- padding: 0 40rpx 40rpx;
+ padding: 80rpx 40rpx 40rpx;
.item{
+ margin-bottom: 60rpx;
.img{
width: 100%;
}
.title{
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
font-size: 30rpx;
color: #111111;
margin: 24rpx 0 12rpx;
diff --git a/wechat_staff/pages/homeId/index.wxml b/wechat_staff/pages/homeId/index.wxml
index cbab1ae..4f1849e 100644
--- a/wechat_staff/pages/homeId/index.wxml
+++ b/wechat_staff/pages/homeId/index.wxml
@@ -1,7 +1,7 @@
<view class="container">
<!-- 鍒嗙被 -->
-<view>
+<view class="home_tabs">
<scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
<view class="scroll_cate">
<view bindtap="cateClick" data-code="{{item.labelValueCode}}" wx:for="{{ tagList }}" class="item {{ tagCodes == item.labelValueCode ? 'active': '' }}">{{ item.labelValueName }}</view>
@@ -10,14 +10,14 @@
</view>
<!-- content -->
<view class="content">
- <view wx:for="{{ dataList }}" class="item" bindtap="itemClick" data-abg="qwe">
+ <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>
<view class="df_sb static">
- <view>{{ item.publishDate }}</view>
+ <view>{{ item.publishDt }}</view>
<view class="df_sb">
<image class="liulan" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>{{ item.readCount }}</text>
+ <text>{{ item.viewCount || 0 }}</text>
</view>
</view>
</view>
diff --git a/wechat_staff/pages/homeId/index.wxss b/wechat_staff/pages/homeId/index.wxss
index 5d130e2..14329e9 100644
--- a/wechat_staff/pages/homeId/index.wxss
+++ b/wechat_staff/pages/homeId/index.wxss
@@ -1,6 +1,11 @@
.container {
background-color: #fff;
}
+.home_tabs {
+ height: 80rpx;
+ position: fixed;
+ background-color: #fff;
+}
.search_wrap {
width: 670rpx;
height: 72rpx;
@@ -50,12 +55,19 @@
font-weight: 400;
}
.content {
- padding: 0 40rpx 40rpx;
+ padding: 80rpx 40rpx 40rpx;
+}
+.content .item {
+ margin-bottom: 60rpx;
}
.content .item .img {
width: 100%;
}
.content .item .title {
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
font-size: 30rpx;
color: #111111;
margin: 24rpx 0 12rpx;
diff --git a/wechat_staff/pages/index/index.js b/wechat_staff/pages/index/index.js
index 3af582f..7e2e74e 100644
--- a/wechat_staff/pages/index/index.js
+++ b/wechat_staff/pages/index/index.js
@@ -1,4 +1,10 @@
-import { getDictData, getDailyUpdates, getZSZXCatalogs } from '../../api/index'
+import {
+ getDictData,
+ getDailyUpdates,
+ getZSZXCatalogs,
+ getZhongTaiVideoPage,
+ getCustomizedNewsList
+} from '../../api/index'
Page({
data: {
searchValue: '',
@@ -7,12 +13,8 @@
DailyUpdates: {}, //姣忔棩涓婃柊
everydayTop: ['../../static/ic_top1@2x.png', '../../static/ic_top2@2x.png', '../../static/ic_top3@2x.png'],
- bannerList: [
- {imgurl: ''},
- {imgurl: 'adsa.png'},
- {imgurl: 'adsa.png'},
- {imgurl: 'adsa.png'},
- ],
+ serviceHeight: 0,
+ serviceList: [],
bannerSwiperOption: {
indicatorDots: true,
@@ -24,8 +26,12 @@
},
onLoad() {
const res = wx.getMenuButtonBoundingClientRect()
- this.setData({clientHeight: res.height})
- this.setData({clientTop: res.top})
+ this.setData({
+ clientHeight: res.height
+ })
+ this.setData({
+ clientTop: res.top
+ })
this.initData()
},
@@ -34,36 +40,64 @@
getDailyUpdates({
fileType: '0'
}).then(res => {
- this.setData({ DailyUpdates: res.data })
+ this.setData({
+ DailyUpdates: res.data
+ })
})
- getZSZXCatalogs().then(res => { //蹇楄瑁呬慨
+ // 浜у搧瑙嗛
+ getZhongTaiVideoPage({
+ pageSize: 1,
+ pageNum: 1
+ }).then(res => {
+ if (res.data.records && res.data.records.length > 0) {
+ this.setData({
+ productVideo: res.data.records
+ })
+ }
+ })
+ //蹇楄瑁呬慨
+ getZSZXCatalogs().then(res => {
this.setData({
ZSZXCata: res.data || {}
+ })
+ })
+ // 瀹氬埗鏈嶅姟
+ getCustomizedNewsList().then(res => {
+ this.setData({
+ serviceList: res.data || []
})
})
getDictData({
code: 'WEIXIN_DEFAULT_IMGS',
label: 'HOME_CLASS_A'
}).then(res => {
- this.setData({ HOME_CLASS_A: res.data.code })
+ this.setData({
+ HOME_CLASS_A: res.data.code
+ })
})
getDictData({
code: 'WEIXIN_DEFAULT_IMGS',
label: 'HOME_CLASS_B'
}).then(res => {
- this.setData({ HOME_CLASS_B: res.data.code })
+ this.setData({
+ HOME_CLASS_B: res.data.code
+ })
})
getDictData({
code: 'WEIXIN_DEFAULT_IMGS',
label: 'HOME_CLASS_B2'
}).then(res => {
- this.setData({ HOME_CLASS_B2: res.data.code })
+ this.setData({
+ HOME_CLASS_B2: res.data.code
+ })
})
getDictData({
code: 'WEIXIN_DEFAULT_IMGS',
label: 'HOME_CLASS_C'
}).then(res => {
- this.setData({ HOME_CLASS_C: res.data.code })
+ this.setData({
+ HOME_CLASS_C: res.data.code
+ })
})
},
promotionClick() {
@@ -71,10 +105,47 @@
url: '/pages/promotion/index',
})
},
+ jumpProVideo() {
+ wx.navigateTo({
+ url: '/pages/productVideo/index',
+ })
+ },
+ videoClick(e) {
+ const {
+ videourl
+ } = e.currentTarget.dataset
+ wx.previewMedia({
+ sources: [{
+ url: videourl,
+ type: 'video'
+ }]
+ })
+ },
+ seriveClick(e) {
+ const {
+ id,
+ title
+ } = e.currentTarget.dataset
+ if (title === '涓撳睘瀹㈡湇') {
+ wx.navigateTo({
+ url: `/pages/kefu/index?title=${title}&id=${id}`,
+ })
+ } else {
+ wx.navigateTo({
+ url: `/pages/kefu/service?title=${title}&id=${id}`,
+ })
+ }
+ },
+ goserHeight: function (e) {
+ const serviceHeight = e.detail.height
+ this.setData({
+ serviceHeight: serviceHeight
+ })
+ },
changeStrategy(e) {
let item = e.currentTarget.dataset.item
wx.navigateTo({
- url: `/pages/homeId/index?code=${item.code}&name=${item.name}` ,
+ url: `/pages/homeId/index?code=${item.code}&name=${item.name}`,
})
},
-})
+})
\ No newline at end of file
diff --git a/wechat_staff/pages/index/index.less b/wechat_staff/pages/index/index.less
index 9ba6c5e..f9391be 100644
--- a/wechat_staff/pages/index/index.less
+++ b/wechat_staff/pages/index/index.less
@@ -110,14 +110,46 @@
}
// 浜у搧瑙嗛
.product_video {
- padding: 72rpx 40rpx;
+ padding: 40rpx 40rpx;
background-color: #fff;
- video {
+ .video_wrap {
width: 670rpx;
- height: 300rpx;
- border: 1px solid;
+ position: relative;
+
+ .play {
+ width: 60rpx;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 1;
+ }
+
+ .img {
+ width: 100%;
+ }
}
+
+}
+.consult_swiper {
+ width: 100%;
+ image {
+ width: 100%;
+ }
+ .scroll_text{
+ height: 100rpx;
+ width: 670rpx;
+ white-space: nowrap;
+ overflow: hidden;//鏂囨湰瓒呭嚭闅愯棌
+ text-overflow: ellipsis;
+ padding-top: 20rpx;
+ font-size: 32rpx;
+ }
+}
+.consult {
+ padding: 40rpx 40rpx 60rpx;
+ background: #fff;
}
.strategy {
@@ -183,7 +215,7 @@
display: flex;
justify-content: center;
align-items: center;
- padding: 60rpx 0;
+ padding: 0rpx 0 60rpx;
background-color: #fff;
.logo {
width: 246rpx;
diff --git a/wechat_staff/pages/index/index.wxml b/wechat_staff/pages/index/index.wxml
index 4014420..64ac253 100644
--- a/wechat_staff/pages/index/index.wxml
+++ b/wechat_staff/pages/index/index.wxml
@@ -2,7 +2,7 @@
<view style="height: {{clientTop - 2}}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"/>
+ <input model:value="{{ searchValue }}" placeholder="鎼滅储" type="text" />
</view>
<view class="everyday">
<view class="header" bindtap="promotionClick">
@@ -40,7 +40,8 @@
<view class="item">
<image src="../../static/icon/home_ic_shijing@2x 2.png"></image>
<view class="text">瀹炴櫙</view>
- </view><view class="item">
+ </view>
+ <view class="item">
<image src="../../static/icon/home_ic_zixun.png"></image>
<view class="text">璧勮</view>
</view>
@@ -49,17 +50,20 @@
<!-- -->
<!-- 浜у搧瑙嗛 -->
<view class="product_video">
- <view class="com_header">
+ <view bindtap="jumpProVideo" class="com_header">
<view class="left">
<view class="name">
- <image class="icon" src="../../static/home_ic_chanpinshiping@2x.png"></image>
+ <image class="icon" src="../../static/icon/home_ic_zhutihuodong.png"></image>
<text>浜у搧瑙嗛</text>
</view>
<view class="desc">浼橀�夋椿鍔紝鎶㈠厛涓�姝�</view>
</view>
- <image class="home_ar" src="../../static/home_ar@2x.png" mode="widthFix"></image>
+ <image class="ar_right" src="../../static/icon/home_ar@2x.png"></image>
</view>
- <video controls class="main_video" src="https://vdept3.bdstatic.com/mda-njed6187hpegim0d/cae_h264/1665826435448713448/mda-njed6187hpegim0d.mp4?v_from_s=hkapp-haokan-hbe&auth_key=1720440602-0-0-f249e56273037ad05b8f7066fd0973ca&bcevod_channel=searchbox_feed&pd=1&cr=0&cd=0&pt=3&logid=0601949156&vid=646246476325419292&klogid=0601949156&abtest=101830_1-17451_2"></video>
+ <view class="video_wrap">
+ <image class="img" src="{{ productVideo[0].coverImage }}" mode="widthFix"></image>
+ <image bindtap="videoClick" data-videourl="{{ productVideo[0].videoUrl }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
+ </view>
</view>
<!-- 鏀荤暐 -->
<view class="strategy">
@@ -73,24 +77,24 @@
</view>
</view>
<view class="line">
- <view class="line_left item" data-item="{{ ZSZXCata.jdId }}" bindtap="changeStrategy">
+ <view class="line_left item" data-item="{{ ZSZXCata.qwsj }}" bindtap="changeStrategy">
<image src="{{HOME_CLASS_A}}"></image>
- <text>{{ ZSZXCata.jdId.name }}</text>
+ <!-- <text>{{ ZSZXCata.qwsj.name }}</text> -->
</view>
<view class="line_right">
<view class="item" data-item="{{ ZSZXCata.cfsj }}" bindtap="changeStrategy">
<image src="{{ HOME_CLASS_B }}"></image>
- <text>{{ ZSZXCata.cfsj.name }}</text>
+ <!-- <text>{{ ZSZXCata.cfsj.name }}</text> -->
</view>
<view class="item" data-item="{{ ZSZXCata.snsj }}" bindtap="changeStrategy">
<image src="{{ HOME_CLASS_B2 }}"></image>
- <text>{{ ZSZXCata.snsj.name }}</text>
+ <!-- <text>{{ ZSZXCata.snsj.name }}</text> -->
</view>
</view>
</view>
- <view data-item="{{ ZSZXCata.qwsj.code }}" bindtap="changeStrategy" class="home_id item">
+ <view data-item="{{ ZSZXCata.jdId }}" bindtap="changeStrategy" class="home_id item">
<image src="{{HOME_CLASS_C}}"></image>
- <text>{{ ZSZXCata.qwsj.name }}</text>
+ <!-- <text>{{ ZSZXCata.jdId.name }}</text> -->
</view>
</view>
<!-- service -->
@@ -98,19 +102,19 @@
<view class="com_header">
<view class="left">
<view class="name">
- <image class="icon" src="../../static/home_ic_fuwu@2x.png"></image>
+ <image class="icon" src="../../static/icon/home_ic_fuwu@2x.png"></image>
<view>瀹氬埗鏈嶅姟</view>
</view>
<view class="desc">璁捐韩澶勫湴涓轰綘鎬濊檻鏇村锛岄櫔浼翠綘鐨勭編濂界敓娲�</view>
</view>
</view>
- <swiper class="consult_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" duration="{{ bannerSwiperOption.duration }}">
- <block wx:for="{{ bannerList }}" wx:key="index">
- <swiper-item>
- <image mode="aspectFill" src="../../static/test.png"></image>
- </swiper-item>
- </block>
- </swiper>
+ <swiper class="consult_swiper" circular indicator-dots="{{ bannerSwiperOption.indicatorDots }}" autoplay="{{ bannerSwiperOption.autoplay }}" interval="{{ bannerSwiperOption.interval }}" style="height:{{serviceHeight}}rpx" duration="{{ bannerSwiperOption.duration }}">
+ <block wx:for="{{ serviceList }}" wx:key="index">
+ <swiper-item>
+ <image bindload='goserHeight' data-id="{{ item.id }}" data-title="{{item.title}}" bindtap="seriveClick" mode="widthFix" src="{{ item.fileList[0].fileurlFull }}"></image>
+ </swiper-item>
+ </block>
+ </swiper>
</view>
<!-- logo -->
<view class="logo_wrap">
diff --git a/wechat_staff/pages/index/index.wxss b/wechat_staff/pages/index/index.wxss
index 8ffab5f..d064e7b 100644
--- a/wechat_staff/pages/index/index.wxss
+++ b/wechat_staff/pages/index/index.wxss
@@ -99,13 +99,42 @@
margin-top: 20rpx;
}
.product_video {
- padding: 72rpx 40rpx;
+ padding: 40rpx 40rpx;
background-color: #fff;
}
-.product_video video {
+.product_video .video_wrap {
width: 670rpx;
- height: 300rpx;
- border: 1px solid;
+ position: relative;
+}
+.product_video .video_wrap .play {
+ width: 60rpx;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 1;
+}
+.product_video .video_wrap .img {
+ width: 100%;
+}
+.consult_swiper {
+ width: 100%;
+}
+.consult_swiper image {
+ width: 100%;
+}
+.consult_swiper .scroll_text {
+ height: 100rpx;
+ width: 670rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ padding-top: 20rpx;
+ font-size: 32rpx;
+}
+.consult {
+ padding: 40rpx 40rpx 60rpx;
+ background: #fff;
}
.strategy {
padding: 80rpx 40rpx;
@@ -160,7 +189,7 @@
display: flex;
justify-content: center;
align-items: center;
- padding: 60rpx 0;
+ padding: 0rpx 0 60rpx;
background-color: #fff;
}
.logo_wrap .logo {
diff --git a/wechat_staff/pages/kefu/index.js b/wechat_staff/pages/kefu/index.js
index f5f894b..8034eec 100644
--- a/wechat_staff/pages/kefu/index.js
+++ b/wechat_staff/pages/kefu/index.js
@@ -1,11 +1,12 @@
-// pages/kefu/index.js
+import { getCustomizedNewsDetail } from '../../api/index'
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- bottomLift: 0
+ bottomLift: 0,
+ info: {}
},
/**
@@ -16,11 +17,36 @@
this.setData({
bottomLift: app.bottomLift
})
+ if(options && options.id){
+ this.getDetail(options.id)
+ }
},
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
+ getDetail(id) {
+ getCustomizedNewsDetail({id}).then(res => {
+ this.setData({
+ info: { ...res.data }
+ })
+ })
+ },
+ toSever () {
+ console.log('瀹㈡湇');
+ try {
+ wx.openCustomerServiceChat({
+ extInfo: {
+ url: "https://work.weixin.qq.com/kfid/kfcfbccadc81cd01c0b?enc_scene=ENC5EhZgjepB9zsutZUQ5AiRnyN7GamomkuWsUA4bwigukSK6w5pVyRzcNDKurjFDNDC7" //瀹㈡湇ID
+ },
+ corpId: 'ww3686d2bb864ce3e2', //浼佷笟寰俊ID
+ success(res) {
+ console.log('杩炴帴瀹㈡湇鎴愬姛');
+ }
+ })
+ } catch (error) {
+ wx.showToast({
+ title: '璇锋洿鏂拌嚦寰俊鏈�鏂扮増鏈�',
+ icon: 'none'
+ })
+ }
+ },
onReady() {
},
diff --git a/wechat_staff/pages/kefu/index.json b/wechat_staff/pages/kefu/index.json
index a6c246b..3254174 100644
--- a/wechat_staff/pages/kefu/index.json
+++ b/wechat_staff/pages/kefu/index.json
@@ -1,4 +1,6 @@
{
- "usingComponents": {},
+ "usingComponents": {
+ "mp-html": "mp-html"
+ },
"navigationBarTitleText": "涓撳睘瀹㈡湇"
}
\ No newline at end of file
diff --git a/wechat_staff/pages/kefu/index.less b/wechat_staff/pages/kefu/index.less
index 0ad7523..fd5875a 100644
--- a/wechat_staff/pages/kefu/index.less
+++ b/wechat_staff/pages/kefu/index.less
@@ -10,6 +10,9 @@
align-items: center;
height: 100rpx;
padding: 12rpx 40rpx;
+ .btn{
+ padding-top: 20rpx;
+ }
}
.sub_btn {
flex: 1;
diff --git a/wechat_staff/pages/kefu/index.wxml b/wechat_staff/pages/kefu/index.wxml
index bdcdd46..39c2f6d 100644
--- a/wechat_staff/pages/kefu/index.wxml
+++ b/wechat_staff/pages/kefu/index.wxml
@@ -1,12 +1,16 @@
<view class="container">
+ <view>
+ <!-- <rich-text nodes="{{ info.content }}"></rich-text> -->
+ <mp-html content="{{info.content}}"></mp-html>
+ </view>
<!-- footer -->
<view class="footer" style="padding-bottom: {{bottomLift}}px;">
<view class="btns">
- <view class="item">
- <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
- <view class="name">鍒嗕韩</view>
- </view>
- <view class="sub_btn">
+ <button open-type="share" class="item btn" bindtap="handleShare">
+ <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
+ <view class="name">鍒嗕韩</view>
+ </button>
+ <view class="sub_btn" bindtap="toSever">
<image class="icon" src="../../static/icon/home_ic_kefu.png" mode="widthFix"></image>
<view>绔嬪嵆鍜ㄨ瀹㈡湇</view>
</view>
diff --git a/wechat_staff/pages/kefu/index.wxss b/wechat_staff/pages/kefu/index.wxss
index f88cc07..2003098 100644
--- a/wechat_staff/pages/kefu/index.wxss
+++ b/wechat_staff/pages/kefu/index.wxss
@@ -12,6 +12,9 @@
height: 100rpx;
padding: 12rpx 40rpx;
}
+.footer .btns .btn {
+ padding-top: 20rpx;
+}
.footer .sub_btn {
flex: 1;
display: flex;
diff --git a/wechat_staff/pages/kefu/service.js b/wechat_staff/pages/kefu/service.js
new file mode 100644
index 0000000..dcc7549
--- /dev/null
+++ b/wechat_staff/pages/kefu/service.js
@@ -0,0 +1,74 @@
+import { getCustomizedNewsDetail } from '../../api/index'
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ info: {}
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+ if(options && options.id){
+ this.getDetail(options.id)
+ }
+ wx.setNavigationBarTitle({
+ title: options.title
+ })
+ },
+ getDetail(id) {
+ getCustomizedNewsDetail({id}).then(res => {
+ this.setData({
+ info: { ...res.data }
+ })
+ })
+ },
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/wechat_staff/pages/kefu/service.json b/wechat_staff/pages/kefu/service.json
new file mode 100644
index 0000000..0ec25df
--- /dev/null
+++ b/wechat_staff/pages/kefu/service.json
@@ -0,0 +1,6 @@
+{
+ "usingComponents": {
+ "mp-html": "mp-html"
+ },
+ "navigationBarTitleText": ""
+}
\ No newline at end of file
diff --git a/wechat_staff/pages/kefu/service.wxml b/wechat_staff/pages/kefu/service.wxml
new file mode 100644
index 0000000..446eeb9
--- /dev/null
+++ b/wechat_staff/pages/kefu/service.wxml
@@ -0,0 +1,3 @@
+<view class="container">
+ <mp-html content="{{info.content}}"></mp-html>
+</view>
\ No newline at end of file
diff --git a/wechat_staff/pages/kefu/service.wxss b/wechat_staff/pages/kefu/service.wxss
new file mode 100644
index 0000000..ba512c3
--- /dev/null
+++ b/wechat_staff/pages/kefu/service.wxss
@@ -0,0 +1 @@
+/* pages/kefu/service.wxss */
\ No newline at end of file
diff --git a/wechat_staff/pages/productVideo/index.js b/wechat_staff/pages/productVideo/index.js
index 22a8ed7..6e9614a 100644
--- a/wechat_staff/pages/productVideo/index.js
+++ b/wechat_staff/pages/productVideo/index.js
@@ -1,34 +1,69 @@
-// pages/consult/consult.js
+import { getZhongTaiVideoPage, getCataLogTagList } from '../../api/index'
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- category: ['鏂板搧涓婂競', '涓撳埄璇佷功', '澶х墝鎺堟潈','鏂板搧涓婂競', '涓撳埄璇佷功', '澶х墝鎺堟潈'],
- secondCategory: ['绾у垎绫�','绾у垎绫�','绾у垎绫�','绾у垎绫�','绾у垎绫�','绾у垎绫�'],
- activeCate: '',
- seActiveCate: '',
- dataList: []
- },
+ category: [],
+ tagCodes: '',
+ dataList: [],
+ total: 0,
+ pageSize: 10,
+ pageNum: 1,
+
+ },
+ onReachBottom() {
+ console.log('瑙﹀簳浜嬩欢');
+ const { total, dataList, pageNum } = this.data
+ if(total > dataList.length){
+ this.setData({ pageNum: pageNum + 1 })
+ this.getList()
+ }else{
+ wx.showToast({
+ title: '鏆傛棤鏇村鏁版嵁',
+ icon: 'none'
+ })
+ }
+ },
+ getList() {
+ const { pageSize, pageNum, tagCodes } = this.data
+ getZhongTaiVideoPage({
+ pageSize,pageNum, tagCodes: tagCodes ? [tagCodes] : []
+ }).then(res => {
+ this.setData({
+ dataList: [...this.data.dataList, ...res.data.records],
+ total: res.data.total
+ })
+ })
+ },
+ getTagList() {
+ getCataLogTagList({
+ catalogCode: 'video_rec'
+ }).then(res => {
+ this.setData({ category: res.data })
+ })
+ },
itemClick(e) {
- const { id } = e.target.dataset
- console.log(e.target.dataset);
- wx.navigateTo({
- url: '/pages/consult/detail',
+ const { videourl } = e.currentTarget.dataset
+ wx.previewMedia({
+ sources: [{ url: videourl, type: 'video' }]
})
},
cateClick(e) {
- const { index } = e.target.dataset
- console.log(index);
+ const { code } = e.target.dataset
+ this.setData({ tagCodes: code })
+ this.setData({ total: 0, dataList: [], pageNum: 1 })
+ this.getList()
},
seCateClick(e) {
const { index } = e.target.dataset
console.log(index);
},
onLoad(options) {
-
+ this.getTagList()
+ this.getList()
},
/**
@@ -65,14 +100,6 @@
onPullDownRefresh() {
},
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
diff --git a/wechat_staff/pages/productVideo/index.less b/wechat_staff/pages/productVideo/index.less
index aff0800..9075a5d 100644
--- a/wechat_staff/pages/productVideo/index.less
+++ b/wechat_staff/pages/productVideo/index.less
@@ -56,8 +56,22 @@
.content{
padding: 0 40rpx 40rpx;
.item{
- .img{
+ margin-bottom: 60rpx;
+ position: relative;
+ .play{
+ width: 60rpx;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 1;
+ }
+ .img_wrap{
width: 100%;
+ position: relative;
+ .img{
+ width: 100%;
+ }
}
.title{
font-size: 30rpx;
diff --git a/wechat_staff/pages/productVideo/index.wxml b/wechat_staff/pages/productVideo/index.wxml
index 48cffa5..6b07bb4 100644
--- a/wechat_staff/pages/productVideo/index.wxml
+++ b/wechat_staff/pages/productVideo/index.wxml
@@ -1,31 +1,31 @@
<view class="container">
- <view class="search_wrap">
- <image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
- <input type="text" placeholder="鎼滅储鍜ㄨ鏍囬" />
- </view>
<!-- 鍒嗙被 -->
<view>
<scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 30rpx;">
<view class="scroll_cate">
- <view bindtap="cateClick" data-index="{{index}}" wx:for="{{ category }}" class="item {{ index == 0 ? 'active': '' }}">{{ item }}</view>
+ <view bindtap="cateClick" data-code="{{item.labelCode}}" wx:for="{{ category }}" class="item {{ tagCodes == item.labelCode ? 'active': '' }}">{{ item.labelName }}</view>
</view>
</scroll-view>
- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 28rpx;">
+ <!-- <scroll-view scroll-x="true" style="weight: 710rpx;margin-bottom: 28rpx;">
<view class="scroll_cate second_list">
<view bindtap="seCateClick" data-index="{{index}}" wx:for="{{ secondCategory }}" class="item {{ index == 0 ? 'active': '' }}">{{ index }}{{ item }}</view>
</view>
- </scroll-view>
+ </scroll-view> -->
</view>
<!-- content -->
<view class="content">
- <view class="item" bindtap="itemClick" data-abg="qwe">
- <image class="img" src="../../static/icon/test.png" mode="widthFix"></image>
- <view class="title">鍚婄伅瀹炵敤鐗硅緫 | 涓�姝ュ浼氱悊鎯冲厜褰卞竷灞�</view>
+ <view wx:for="{{ dataList }}" class="item">
+ <view class="img_wrap">
+ <image class="img" src="{{ item.coverImage }}" mode="widthFix"></image>
+ <image bindtap="itemClick" data-videourl="{{ item.videoUrl }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
+ </view>
+
+ <view class="title">{{ item.title }}</view>
<view class="df_sb static">
- <view>{{ '2021-08-21 12:00:00' }}</view>
+ <view>{{ item.publishDt }}</view>
<view class="df_sb">
<image class="liulan" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
- <text>1000</text>
+ <text>{{ item.viewCount }}</text>
</view>
</view>
</view>
diff --git a/wechat_staff/pages/productVideo/index.wxss b/wechat_staff/pages/productVideo/index.wxss
index 5d130e2..bf63316 100644
--- a/wechat_staff/pages/productVideo/index.wxss
+++ b/wechat_staff/pages/productVideo/index.wxss
@@ -52,7 +52,23 @@
.content {
padding: 0 40rpx 40rpx;
}
-.content .item .img {
+.content .item {
+ margin-bottom: 60rpx;
+ position: relative;
+}
+.content .item .play {
+ width: 60rpx;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ z-index: 1;
+}
+.content .item .img_wrap {
+ width: 100%;
+ position: relative;
+}
+.content .item .img_wrap .img {
width: 100%;
}
.content .item .title {
diff --git a/wechat_staff/pages/userinfo/index.js b/wechat_staff/pages/userinfo/index.js
index fd0231b..c67194e 100644
--- a/wechat_staff/pages/userinfo/index.js
+++ b/wechat_staff/pages/userinfo/index.js
@@ -45,12 +45,16 @@
const {
slogans,
costomerNum,
- userInfo
+ userInfo,
+ qrcodeImg,
+ companyQrcodeImg
} = this.data
editMember({
...userInfo,
slogans,
- costomerNum
+ costomerNum,
+ qrcodeImg: qrcodeImg || userInfo.qrcodeImg ,
+ companyQrcodeImg: companyQrcodeImg || userInfo.companyQrcodeImg
}).then(res => {
this.setData({
editFalg: false
@@ -96,13 +100,17 @@
wx.uploadFile({
url: uploadUrl,
filePath: e.detail.avatarUrl,
+ formData: {
+ folder: "users"
+ },
name: 'file',
success (res) {
console.log(JSON.parse(res.data))
- let data = JSON.parse(ress.data)
+ let data = JSON.parse(res.data)
userInfo.imgurl = data.data.imgaddr
userInfo.imgurlFull = data.data.url
- this.setData({userInfo})
+ that.setData({userInfo})
+ console.log('userInfo', userInfo);
}
})
}
@@ -127,7 +135,7 @@
filePath: res.tempFiles[0].tempFilePath,
name: 'file',
formData: {
- folder: 'member'
+ folder: "member"
},
header: {
token: wx.getStorageSync('token')
@@ -169,7 +177,7 @@
filePath: res.tempFiles[0].tempFilePath,
name: 'file',
formData: {
- folder: 'member'
+ folder: "member"
},
header: {
token: wx.getStorageSync('token')
diff --git a/wechat_staff/pages/webView/index.js b/wechat_staff/pages/webView/index.js
new file mode 100644
index 0000000..530c487
--- /dev/null
+++ b/wechat_staff/pages/webView/index.js
@@ -0,0 +1,77 @@
+// pages/webView/index.js
+
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ hasUserInfo: true,
+ userInfo: {},
+ id: '',
+ link: ''
+ },
+ onLoad: function (options) {
+ let that = this
+ const eventChannel = this.getOpenerEventChannel()
+
+ if (options.link) {
+ that.setData({ link: options.link, id: options.id })
+ } else {
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('acceptDataFromOpenerPage', function(data) {
+ console.log('鍙傛暟', data)
+ if (data.title) wx.setNavigationBarTitle({ title: data.title })
+ that.setData({ link: data.link, id: data.id })
+ // saveBannerLookNum({ id: data.id })
+ })
+ }
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady: function () {
+
+ },
+
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage: function () {
+ let { link, id } = this.data
+ return {
+ title: '',
+ path: '/pages/index/index?id=' + id + '&link=' + link + '&type=2'
+ }
+ }
+})
\ No newline at end of file
diff --git a/wechat_staff/pages/webView/index.json b/wechat_staff/pages/webView/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/wechat_staff/pages/webView/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/wechat_staff/pages/webView/index.wxml b/wechat_staff/pages/webView/index.wxml
new file mode 100644
index 0000000..dbf6f9a
--- /dev/null
+++ b/wechat_staff/pages/webView/index.wxml
@@ -0,0 +1,5 @@
+
+<web-view src="{{ link }}">
+</web-view>
+
+
diff --git a/wechat_staff/pages/webView/index.wxss b/wechat_staff/pages/webView/index.wxss
new file mode 100644
index 0000000..f255362
--- /dev/null
+++ b/wechat_staff/pages/webView/index.wxss
@@ -0,0 +1 @@
+/* pages/webView/index.wxss */
\ No newline at end of file
diff --git a/wechat_staff/project.config.json b/wechat_staff/project.config.json
index 0a28905..1d8d6ec 100644
--- a/wechat_staff/project.config.json
+++ b/wechat_staff/project.config.json
@@ -15,7 +15,7 @@
"preloadBackgroundData": false,
"minified": true,
"autoAudits": false,
- "uglifyFileName": false,
+ "uglifyFileName": true,
"uploadWithSourceMap": true,
"enhance": true,
"showShadowRootInWxmlPanel": true,
diff --git a/wechat_staff/project.private.config.json b/wechat_staff/project.private.config.json
index a0755f8..e8a8518 100644
--- a/wechat_staff/project.private.config.json
+++ b/wechat_staff/project.private.config.json
@@ -46,5 +46,5 @@
]
}
},
- "libVersion": "3.4.10"
+ "libVersion": "3.3.5"
}
\ No newline at end of file
diff --git a/wechat_staff/static/icon/ic_play.png b/wechat_staff/static/icon/ic_play.png
new file mode 100644
index 0000000..3e58dfa
--- /dev/null
+++ b/wechat_staff/static/icon/ic_play.png
Binary files differ
--
Gitblit v1.9.3