From 47e86f543415585ab1e1b2b1ed1d98830817a1be Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 19 九月 2022 09:41:07 +0800
Subject: [PATCH] 2022.9.16
---
pages/m_user/userlogin/userlogin.js | 10
pages/m_consult/consultresult/consultresult.json | 4
app.wxss | 6
pages/m_consult/c_result-item-search/c_result-item-search.js | 6
pages/m_consult/c_reult-item-tab/c_reult-item-tab.json | 7
service/lawservice.js | 23 +
app.js | 23 +
pages/m_learn/p_learnvideo/p_learnvideo.json | 10
pages/m_consult/c_reult-item-tab/c_reult-item-tab.wxml | 7
pages/m_consult/consultresultmore/consultresultmore.wxml | 42 --
service/baserequest.js | 7
pages/m_consult/consulthome/consulthome.json | 1
pages/m_consult/consultresultmore/consultresultmore.wxss | 52 ---
pages/home/home.wxml | 2
res/icons/my_favor.png | 0
pages/m_consult/consulthome/consulthome.js | 2
res/icons/qa.png | 0
pages/m_consult/consultresult/consultresult.js | 125 ++------
pages/m_user/mine/mine.wxss | 7
res/icons/my_schedule.png | 0
pages/m_user/mine/mine.wxml | 6
pages/m_consult/c_reult-item-tab/c_reult-item-tab.js | 43 +++
res/icons/my_consult.png | 0
base/behaviors/b_loadingStatus.js | 2
pages/m_consult/base_c/c_result-item/c_result-item.wxml | 42 ++
pages/m_consult/base_c/c_result-item/c_result-item.wxss | 24 +
pages/m_consult/c_reult-item-tab/c_reult-item-tab.wxss | 1
pages/m_consult/consultonline/consultonline.wxml | 2
component/mygallery/mygallery.js | 4
pages/m_consult/consultresultmore/consultresultmore.js | 66 ---
component/loadingstatus/loadingstatus.wxml | 6
app.json | 10
component/switchtab/switchtab.js | 4
/dev/null | 18 -
pages/m_learn/p_learnvideo/p_learnvideo.js | 85 ++++++
pages/m_learn/p_learnvideo/p_learnvideo.wxss | 73 +++++
pages/m_learn/p_learnvideo/p_learnvideo.wxml | 65 ++++
pages/m_consult/consultresultmore/consultresultmore.json | 4
pages/m_learn/behaviors/b_openFile.js | 2
pages/m_consult/consultresult/consultresult.wxml | 26 +
40 files changed, 507 insertions(+), 310 deletions(-)
diff --git a/app.js b/app.js
index ac97cb9..583cc38 100644
--- a/app.js
+++ b/app.js
@@ -19,5 +19,26 @@
userInfo: null,
accessToken: null,
isLogin: false
+ },
+ // 鏅鸿兘鍜ㄨ缁撴灉绫诲瀷鏂囨湰杞崲
+ cosultTypeName: (typeId) => {
+ let name = ''
+ switch (typeId) {
+ case 1:
+ name = '鐩稿叧鏂囦欢'
+ break;
+ case 2:
+ name = '鐩稿叧鏉＄洰'
+ break;
+ case 3:
+ name = '鎵ф硶妗堜緥'
+ break;
+ case 4:
+ name = '鐜繚闂'
+ break;
+ default:
+ break;
+ }
+ return name
}
-})
+})
\ No newline at end of file
diff --git a/app.json b/app.json
index 3adfbe4..e187985 100644
--- a/app.json
+++ b/app.json
@@ -1,12 +1,12 @@
{
"entryPagePath": "pages/m_user/userlogin/userlogin",
"pages": [
+ "pages/m_user/userlogin/userlogin",
"pages/home/home",
"pages/m_assessment/assessment/assessment",
"pages/m_assessment/grade/grade",
"pages/m_assessment/gradedetail/gradedetail",
"pages/m_assessment/gradereport/gradereport",
- "pages/m_common/pagevideo/pagevideo",
"pages/m_consult/consulthome/consulthome",
"pages/m_consult/consultsearch/consultsearch",
"pages/m_consult/consultresult/consultresult",
@@ -17,6 +17,7 @@
"pages/m_consult/consultdetailitem/consultdetailitem",
"pages/m_consult/consultdetailqa/consultdetailqa",
"pages/m_consult/consultdetailcase/consultdetailcase",
+ "pages/m_learn/p_learnvideo/p_learnvideo",
"pages/m_learn/learn/learn",
"pages/m_learn/learfile/learnfile",
"pages/m_learn/learncase/learncase",
@@ -30,18 +31,17 @@
"pages/m_promise/promiseresult/promiseresult",
"pages/m_promise/promisesign/promisesign",
"pages/m_service/p_servicehome/servicehome",
+ "pages/m_service/p_scheduledetail/p_scheduledetail",
+ "pages/m_service/p_schedule/p_schedule",
"pages/m_user/userloginpw/userloginpw",
"pages/m_user/userregistertype/userregistertype",
"pages/m_user/userregistergov/userregistergov",
"pages/m_user/userregistercompany/userregistercompany",
"pages/m_user/mine/mine",
- "pages/m_user/userlogin/userlogin",
"pages/icons/icons",
"pages/text/text",
"pages/test/test",
- "pages/test2/test2",
- "pages/m_service/p_schedule/p_schedule",
- "pages/m_service/p_scheduledetail/p_scheduledetail"
+ "pages/test2/test2"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/app.wxss b/app.wxss
index 031ca21..35c58a8 100644
--- a/app.wxss
+++ b/app.wxss
@@ -39,8 +39,8 @@
}
.icon {
- width: 16px;
- height: 16px;
+ width: 20px;
+ height: 20px;
}
.fyui-selector {
@@ -249,7 +249,7 @@
/* background-color: greenyellow; */
}
-.fyui-box .fyui-box__hd>image {
+.fyui-box .fyui-box__hd .fyui-box__hd_image {
width: 120px;
height: 80px;
}
diff --git a/base/behaviors/b_loadingStatus.js b/base/behaviors/b_loadingStatus.js
index d96ae21..086f1da 100644
--- a/base/behaviors/b_loadingStatus.js
+++ b/base/behaviors/b_loadingStatus.js
@@ -32,7 +32,7 @@
},
methods: {
_onReachBottom() {
- console.log('_onReachBottom');
+ // console.log('_onReachBottom');
let {cPage, tPage, loading} = this.data
if (!loading && cPage < tPage) {
if (typeof this.loadmore === 'function') {
diff --git a/component/loadingstatus/loadingstatus.wxml b/component/loadingstatus/loadingstatus.wxml
index b0a8e38..bfc45a3 100644
--- a/component/loadingstatus/loadingstatus.wxml
+++ b/component/loadingstatus/loadingstatus.wxml
@@ -4,10 +4,12 @@
<template wx:if="{{!loading && nodata}}" is="nodataPage"></template>
<block wx:else>
<view wx:if="{{!loading}}" class="load-more">
- <view wx:if="{{!scrollable}}" class="btn-more" bindtap="gotoMore">鏌ョ湅鏇村</view>
+ <block wx:if="{{!scrollable}}">
+ <view wx:if="{{needLoadMore}}" class="btn-more" bindtap="gotoMore">鏌ョ湅鏇村</view>
+ </block>
<block wx:else>
<text wx:if="{{needLoadMore}}">涓婃粦鍔犺浇</text>
- <text wx:else="">鈥斺�斿埌搴曚簡鈥斺��</text>
+ <text wx:else>鈥斺�斿埌搴曚簡鈥斺��</text>
</block>
</view>
diff --git a/component/mygallery/mygallery.js b/component/mygallery/mygallery.js
index 481f0ad..08bf58c 100644
--- a/component/mygallery/mygallery.js
+++ b/component/mygallery/mygallery.js
@@ -30,7 +30,7 @@
observer(newVal) {
if (newVal) {
let that = this;
- let query = this.createSelectorQuery(); //蹇呴』瑕佸厛鍒涘缓涓�涓煡璇�
+ let query = this.createSelectorQuery().in(this); //蹇呴』瑕佸厛鍒涘缓涓�涓煡璇�
setTimeout(() => {
query.select('.fyui-gallery__img').boundingClientRect(function (rect) {
console.log('observer');
@@ -298,7 +298,7 @@
console.log(yLimit);
let that = this;
- let query = this.createSelectorQuery(); //蹇呴』瑕佸厛鍒涘缓涓�涓煡璇�
+ let query = this.createSelectorQuery().in(this); //蹇呴』瑕佸厛鍒涘缓涓�涓煡璇�
query.select('.fyui-gallery__img').boundingClientRect(function (rect) {
console.log('imgHeight:' + that.data.imgHeight);
console.log('imgWidth:' + that.data.imgWidth);
diff --git a/component/switchtab/switchtab.js b/component/switchtab/switchtab.js
index fb33732..a3b3469 100644
--- a/component/switchtab/switchtab.js
+++ b/component/switchtab/switchtab.js
@@ -57,7 +57,7 @@
if (e) {
setTimeout(() => {
const p = `.page${this.data.currentTab}`
- console.log(p);
+ // console.log(p);
this.tabsHeight(p);
}, 50);
}
@@ -65,7 +65,7 @@
//璁＄畻swiper楂樺害鏂规硶锛堝湪鍒囨崲鐨勬椂鍊欒皟鐢級
tabsHeight(element) {
let that = this;
- let query = this.createSelectorQuery(); //蹇呴』瑕佸厛鍒涘缓涓�涓煡璇�
+ let query = this.createSelectorQuery().in(this); //蹇呴』瑕佸厛鍒涘缓涓�涓煡璇�
query.select(element).boundingClientRect(function (rect) {
that.setData({
pageheight: rect.height + 'px'
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index aab14e5..100eb45 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -123,7 +123,7 @@
</view>
</view>
<view class="fyui-box__hd">
- <image src="{{item.pic}}" class="" />
+ <image src="{{item.pic}}" class="fyui-box__hd_image" mode="aspectFill"/>
</view>
</view>
</view>
diff --git a/pages/m_common/pagevideo/pagevideo.js b/pages/m_common/pagevideo/pagevideo.js
deleted file mode 100644
index 6359bb8..0000000
--- a/pages/m_common/pagevideo/pagevideo.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// pages/module_common/pagevideo/pagevideo.js
-const lawservice = require("../../../service/lawservice")
-const moment = require('../../../utils/moment.min')
-const app = getApp()
-
-Page({
-
- /**
- * 椤甸潰鐨勫垵濮嬫暟鎹�
- */
- data: {
- video: {},
- resources: []
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- */
- onLoad(options) {
- var that = this
- this.getOpenerEventChannel().on('acceptDataFromOpenerPage', function (data) {
- setTimeout(() => {
- that.setData({
- video: data
- })
- }, 500);
-
- if (data.lrResourcetitle) {
- wx.setNavigationBarTitle({
- title: data.lrResourcetitle,
- })
- }
- })
-
- this.getResources()
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
- },
-
- onReachBottom () {
- console.log('onReachBottom');
- if (this.cPage && this.tPage) {
- if (this.cPage < this.tPage) {
- this.getResources(this.cPage + 1)
- }
- }
- },
-
- getResources(cPage = 1) {
- var that = this
- let user = app.globalData.userInfo
- lawservice.getLawRegulations(user.guid, cPage, {
- sceneTypeId: user.extension2,
- fileType: 4
- }, {
- onHead(header) {
- that.cPage = parseInt(header.currentPage)
- that.tPage = parseInt(header.totalPage)
- console.log(`cPage:${that.cPage}, tPage:${that.tPage}`);
- },
- success(data) {
- let resources = that.data.resources
- data.forEach(d => {
- d.views = parseInt(Math.random() * 1000 + 10)
- d.lrPublishdate = moment(d.lrPublishdate).format('YYYY骞碝M鏈圖D鏃�')
- });
- resources = resources.concat(data)
- that.setData({
- resources
- })
- }
- }, 4)
- },
-})
\ No newline at end of file
diff --git a/pages/m_common/pagevideo/pagevideo.json b/pages/m_common/pagevideo/pagevideo.json
deleted file mode 100644
index d4ecc0c..0000000
--- a/pages/m_common/pagevideo/pagevideo.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "navigationBarTitleText": "瑙嗛鎾斁",
- "navigationBarBackgroundColor": "#65EAD2",
- "navigationBarTextStyle": "white",
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/m_common/pagevideo/pagevideo.wxml b/pages/m_common/pagevideo/pagevideo.wxml
deleted file mode 100644
index 3a2a255..0000000
--- a/pages/m_common/pagevideo/pagevideo.wxml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--pages/module_common/pagevideo/pagevideo.wxml-->
-<view class="page">
- <view class="page__hd">
- <video class="video" id="myVideo" src="{{video.lrBodyurl}}" binderror="videoErrorCallback" show-center-play-btn='{{false}}' show-play-btn="{{true}}" controls autoplay custom-cache="{{false}}" poster="{{video.lrPicurl}}" picture-in-picture-mode="{{['push', 'pop']}}" bindenterpictureinpicture='bindVideoEnterPictureInPicture' bindleavepictureinpicture='bindVideoLeavePictureInPicture'></video>
- </view>
- <view class="page__bd">
- <view class="fyui-box fyui-box__text">
- <view class="fyui-box__hd">
- {{video.lrResourcetitle}}
- </view>
- <view class="fyui-box__bd">
- <view class="fyui-box__content">{{video.lrResourcedesc}}</view>
-
- </view>
- <view class="fyui-box__ft">
- <view>{{video.lrPublishdate}}</view>
- <view>
- <image src="/res/icons/view.png" class="icon"></image>{{video.views}}
- </view>
- </view>
- </view>
- </view>
- <view class="page__ft">
- <view class="title">鐩稿叧瑙嗛</view>
- <view wx:for="{{resources}}" wx:key="index" wx:item="item">
- <view class="fyui-box" bindtap="gotoResource" data-index="{{index}}">
- <view class="fyui-box__hd">
- <image src="{{item.lrPicurl}}" class="" mode="aspectFill"/>
- </view>
- <view class="fyui-box__bd">
- <view class="fyui-box__content">{{item.lrResourcetitle}}</view>
- <view class="fyui-box__tag">
- <view>{{item.lrPublishdate}}</view>
- <view class="flex-h">
- <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
-</view>
\ No newline at end of file
diff --git a/pages/m_common/pagevideo/pagevideo.wxss b/pages/m_common/pagevideo/pagevideo.wxss
deleted file mode 100644
index a7649b9..0000000
--- a/pages/m_common/pagevideo/pagevideo.wxss
+++ /dev/null
@@ -1,18 +0,0 @@
-/* pages/module_common/pagevideo/pagevideo.wxss */
-.page__hd{
- padding: 0;
-}
-.video{
- width: 100%;
-}
-
-.title{
- text-align: start;
- padding: 0 16px;
- font-weight: 600;
- font-size: 16px;
-}
-
-.fyui-box__content {
- text-align: start;
-}
\ No newline at end of file
diff --git a/pages/m_consult/base_c/c_result-item/c_result-item.wxml b/pages/m_consult/base_c/c_result-item/c_result-item.wxml
index 3bc43c4..4db128b 100644
--- a/pages/m_consult/base_c/c_result-item/c_result-item.wxml
+++ b/pages/m_consult/base_c/c_result-item/c_result-item.wxml
@@ -60,7 +60,7 @@
<text>妗堝彂鍦板潃锛歿{item.provinceName + item.cityName}}</text>
<text>妗堝彂鏃堕棿锛歿{item.occurDate}}</text>
</view>
- <view class="fyui-box__ft_2">
+ <view class="fyui-box__ft_2" wx:if="{{item.punish || item.illegal || item.shotSpot || item.supervise || item.detained || item.minor}}">
<view style="white-space: nowrap;">娑夊強锛�</view>
<view class="case-tag-group">
<view class="case-tag" wx:if="{{item.punish}}">
@@ -95,15 +95,45 @@
<block wx:elif="{{item.typeId == 4}}">
<view class="fyui-box fyui-box__text">
<view class="fyui-box__hd">
- <text class="fyui-box__content des subtitle">{{item.name}}</text>
+ <view class="qa-title">
+ <image class="icon" src="/res/icons/qa.png"></image>
+ <text class="fyui-box__content des subtitle">{{item.name}}锛�</text>
+ </view>
</view>
- <view class="fyui-box__bd answer">
- <view class="tag2">绛旓細</view>
- <rich-text class="tag2 des" nodes="{{item.des}}"></rich-text>
+ <view class="fyui-box__bd">
+ <!-- <view class="answer">
+ <image class="user-avator" src="/res/icons/con_qa.png"></image>
+ <view class="user-name">鐜繚鏅鸿兘鍔╂墜</view>
+ </view> -->
+ <view>
+ <!-- <view class="tag2">绛旓細</view> -->
+ <rich-text class="tag2 des" nodes="{{item.des}}"></rich-text>
+ </view>
</view>
- <view class="fyui-box__ft">
+ <!-- <view class="fyui-box__ft">
<text>鎻愰棶鏃堕棿锛歿{item.time}}</text>
<text>鍥炲鏃堕棿锛歿{item.time}}</text>
+ </view> -->
+ <view class="fyui-box__ft_2" wx:if="{{item.punish || item.illegal || item.shotSpot || item.supervise}}">
+ <view style="white-space: nowrap;">娑夊強锛�</view>
+ <view class="case-tag-group">
+ <view class="case-tag" wx:if="{{item.punish}}">
+ <image src="/res/icons/cq_punish.png"></image>
+ <text>琛屾斂澶勭綒</text>
+ </view>
+ <view class="case-tag" wx:if="{{item.illegal}}">
+ <image src="/res/icons/cq_illegal.png"></image>
+ <text>鍒戜簨璐ｄ换</text>
+ </view>
+ <view class="case-tag" wx:if="{{item.shotSpot}}">
+ <image src="/res/icons/cq_shotspot.png"></image>
+ <text>鐜繚鐑偣</text>
+ </view>
+ <view class="case-tag" wx:if="{{item.supervise}}">
+ <image src="/res/icons/cq_supervise.png"></image>
+ <text>鐫ｅ療瑕佺偣</text>
+ </view>
+ </view>
</view>
</view>
</block>
diff --git a/pages/m_consult/base_c/c_result-item/c_result-item.wxss b/pages/m_consult/base_c/c_result-item/c_result-item.wxss
index e8f6ab4..7d5d02a 100644
--- a/pages/m_consult/base_c/c_result-item/c_result-item.wxss
+++ b/pages/m_consult/base_c/c_result-item/c_result-item.wxss
@@ -31,7 +31,8 @@
.fyui-box .answer {
display: flex;
- flex-direction: row;
+ align-items: center;
+ /* flex-direction: row; */
/* justify-content: space-between; */
/* background-color: red; */
}
@@ -102,3 +103,24 @@
background-color: var(--fyui-text-color_3);
}
+.qa-title {
+ display: flex;
+ align-items: flex-start;
+}
+
+.qa-title>image {
+ margin-right: 4px;
+ margin-top: 2px;
+}
+
+.user-avator {
+ width: 16px;
+ height: 16px;
+ border-radius: 50%;
+}
+
+.user-name {
+ color: var(--fyui-text-color_2);
+ font-size: 12px;
+ margin-left: 4px;
+}
\ No newline at end of file
diff --git a/pages/m_consult/c_result-item-search/c_result-item-search.js b/pages/m_consult/c_result-item-search/c_result-item-search.js
index fabb3ed..d970f83 100644
--- a/pages/m_consult/c_result-item-search/c_result-item-search.js
+++ b/pages/m_consult/c_result-item-search/c_result-item-search.js
@@ -14,7 +14,7 @@
keyobj: {
type: Object,
value: {
- keyword: '',
+ keyword: null,
type: undefined
},
},
@@ -34,7 +34,9 @@
observers: {
'keyobj': function (keyobj) {
- this.search(keyobj, 1, this.data.sPerPage)
+ if (keyobj != null && keyobj.keyword != null) {
+ this.search(keyobj, 1, this.data.sPerPage)
+ }
},
},
diff --git a/pages/m_consult/c_reult-item-tab/c_reult-item-tab.js b/pages/m_consult/c_reult-item-tab/c_reult-item-tab.js
new file mode 100644
index 0000000..39aca47
--- /dev/null
+++ b/pages/m_consult/c_reult-item-tab/c_reult-item-tab.js
@@ -0,0 +1,43 @@
+// pages/m_consult/c_reult-item-tab/c_reult-item-tab.js
+Component({
+ /**
+ * 缁勪欢鐨勫睘鎬у垪琛�
+ */
+ properties: {
+ tabList: [
+ {name: '鐑棬',tag: 0},
+ {name: '闂瓟',tag: 0},
+ {name: '妗堜緥',tag: 0},
+ {name: '鏉＄洰',tag: 0},
+ {name: '鏂囦欢',tag: 0},
+ ],
+ refresh: false,
+ keywords: [
+ {keyword: '', type: undefined},
+ {keyword: '', type: 1},
+ {keyword: '', type: 2},
+ {keyword: '', type: 3},
+ {keyword: '', type: 4},
+ ],
+ reachBottom: [false, false, false, false, false],
+ tabIndex: 0
+ },
+
+ /**
+ * 缁勪欢鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+
+ },
+
+ /**
+ * 缁勪欢鐨勬柟娉曞垪琛�
+ */
+ methods: {
+ onTabChange(e) {
+ this.setData({
+ tabIndex: e.detail
+ })
+ }
+ }
+})
diff --git a/pages/m_consult/c_reult-item-tab/c_reult-item-tab.json b/pages/m_consult/c_reult-item-tab/c_reult-item-tab.json
new file mode 100644
index 0000000..fbf5c5d
--- /dev/null
+++ b/pages/m_consult/c_reult-item-tab/c_reult-item-tab.json
@@ -0,0 +1,7 @@
+{
+ "component": true,
+ "usingComponents": {
+ "switch-tab": "/component/switchtab/switchtab",
+ "c-result-item-search": "../c_result-item-search/c_result-item-search"
+ }
+}
\ No newline at end of file
diff --git a/pages/m_consult/c_reult-item-tab/c_reult-item-tab.wxml b/pages/m_consult/c_reult-item-tab/c_reult-item-tab.wxml
new file mode 100644
index 0000000..836785e
--- /dev/null
+++ b/pages/m_consult/c_reult-item-tab/c_reult-item-tab.wxml
@@ -0,0 +1,7 @@
+<switch-tab tabList="{{tabList}}" refresh="{{refresh}}" bindtabchange="onTabChange">
+ <c-result-item-search slot="slot0" reachBottom="{{reachBottom[0]}}" keyobj="{{keyAll}}" data-index="0" bindloadComplete="loadingDone"></c-result-item-search>
+ <c-result-item-search slot="slot1" reachBottom="{{reachBottom[1]}}" keyobj="{{key4}}" data-index="1" bindloadComplete="loadingDone"></c-result-item-search>
+ <c-result-item-search slot="slot2" reachBottom="{{reachBottom[2]}}" keyobj="{{key3}}" data-index="2" bindloadComplete="loadingDone"></c-result-item-search>
+ <c-result-item-search slot="slot3" reachBottom="{{reachBottom[3]}}" keyobj="{{key2}}" data-index="3" bindloadComplete="loadingDone"></c-result-item-search>
+ <c-result-item-search slot="slot4" reachBottom="{{reachBottom[4]}}" keyobj="{{key1}}" data-index="4" bindloadComplete="loadingDone"></c-result-item-search>
+</switch-tab>
\ No newline at end of file
diff --git a/pages/m_consult/c_reult-item-tab/c_reult-item-tab.wxss b/pages/m_consult/c_reult-item-tab/c_reult-item-tab.wxss
new file mode 100644
index 0000000..6861c57
--- /dev/null
+++ b/pages/m_consult/c_reult-item-tab/c_reult-item-tab.wxss
@@ -0,0 +1 @@
+/* pages/m_consult/c_reult-item-tab/c_reult-item-tab.wxss */
\ No newline at end of file
diff --git a/pages/m_consult/consulthome/consulthome.js b/pages/m_consult/consulthome/consulthome.js
index 19523e2..2bdaf5e 100644
--- a/pages/m_consult/consulthome/consulthome.js
+++ b/pages/m_consult/consulthome/consulthome.js
@@ -93,7 +93,7 @@
},
onTabChange(e) {
- console.log(e.detail);
+ // console.log(e.detail);
this.setData({
tabIndex: e.detail
})
diff --git a/pages/m_consult/consulthome/consulthome.json b/pages/m_consult/consulthome/consulthome.json
index 00ede65..cc3497e 100644
--- a/pages/m_consult/consulthome/consulthome.json
+++ b/pages/m_consult/consulthome/consulthome.json
@@ -5,7 +5,6 @@
"usingComponents": {
"mp-icon": "/component/icon/icon",
"switch-tab": "/component/switchtab/switchtab",
- "mp-loading": "/component/loading/loading",
"c-result-item-search": "../c_result-item-search/c_result-item-search"
}
}
\ No newline at end of file
diff --git a/pages/m_consult/consultonline/consultonline.wxml b/pages/m_consult/consultonline/consultonline.wxml
index 6fd14a2..2057e9a 100644
--- a/pages/m_consult/consultonline/consultonline.wxml
+++ b/pages/m_consult/consultonline/consultonline.wxml
@@ -11,7 +11,7 @@
<view wx:elif="{{item.type == 1}}" class="consult-text consult-qa">
<switch-tab tabList="{{item.text.tabList}}" refresh="{{item.refresh}}">
<block wx:for="{{item.text.pageList}}" wx:key="i" wx:for-item="p" wx:for-index="i">
- <c-result-item results="{{p}}" loading="{{false}}" needLoadMore="{{false}}" scrollable="{{false}}" slot="slot{{i}}" data-index="{{[index, i]}}" bindgotoMore="gotoMore"></c-result-item>
+ <c-result-item results="{{p}}" loading="{{false}}" needLoadMore="{{true}}" scrollable="{{false}}" slot="slot{{i}}" data-index="{{[index, i]}}" bindgotoMore="gotoMore"></c-result-item>
</block>
<!-- <c-result-item-search scrollable="{{false}}" slot="slot0" keyobj="{{item.text.key4}}" sPerPage="{{1}}" bindloadComplete="loadComplete"></c-result-item-search>
<c-result-item-search scrollable="{{false}}" slot="slot1" keyobj="{{item.text.key3}}" sPerPage="{{1}}"></c-result-item-search>
diff --git a/pages/m_consult/consultresult/consultresult.js b/pages/m_consult/consultresult/consultresult.js
index 7365b04..9c6aa11 100644
--- a/pages/m_consult/consultresult/consultresult.js
+++ b/pages/m_consult/consultresult/consultresult.js
@@ -10,7 +10,21 @@
*/
data: {
keyword: '',
- result: []
+ tabList: [
+ {name: '鍏ㄩ儴',tag: 0},
+ {name: '闂瓟',tag: 0},
+ {name: '妗堜緥',tag: 0},
+ {name: '鏉＄洰',tag: 0},
+ {name: '鏂囦欢',tag: 0},
+ ],
+ refresh: false,
+ // keyAll: {keyword: '', type: undefined},
+ // key1: {keyword: '', type: 1},
+ // key2: {keyword: '', type: 2},
+ // key3: {keyword: '', type: 3},
+ // key4: {keyword: '', type: 4},
+ reachBottom: [false, false, false, false, false],
+ tabIndex: 0
},
/**
@@ -21,103 +35,36 @@
this.getOpenerEventChannel().on('acceptDataFromOpenerPage', function (data) {
console.log(data);
that.setData({
- keyword: data.keyword
+ keyAll: {keyword: data.keyword, type: undefined},
+ key1: {keyword: data.keyword, type: 1},
+ key2: {keyword: data.keyword, type: 2},
+ key3: {keyword: data.keyword, type: 3},
+ key4: {keyword: data.keyword, type: 4},
})
- that.search()
+ // that.search()
})
},
- search () {
- var that = this
- wx.showLoading({
- title: '鎼滅储涓�',
- mask: true,
- success: (res) => {},
- fail: (res) => {},
- complete: (res) => {},
+ onReachBottom() {
+ let reachBottom = [false, false, false, false, false]
+ reachBottom[this.data.tabIndex] = true
+ this.setData({reachBottom})
+ },
+
+ loadingDone(e){
+ this.setData({
+ refresh: false
})
- setTimeout(() => {
- wx.hideLoading()
- }, 20000);
- consultservice.searchLaw(app.globalData.accessToken.userId, this.data.keyword, 1, 5, {
- success (res) {
- let result = []
- let thisTypeId = ''
- let thisIndex = -1
- res.forEach(r => {
- r.des = r.des.replaceAll('\\n', '<br/>')
- if (thisTypeId === '' || thisTypeId != r.typeId) {
- thisTypeId = r.typeId
- thisIndex++
- result.push({
- typeId: r.typeId,
- typeName: r.typeName,
- contents: [r]
- })
- } else {
- result[thisIndex].contents.push(r)
- }
- });
- that.setData({
- result
- })
- console.log(result);
- },
- complete (res) {
- wx.hideLoading()
- }
+ this.setData({
+ refresh: true
})
},
- // gotoDetail (e) {
- // const iList = e.currentTarget.dataset.index.split(',')
- // const i1 = iList[0]
- // const i2 = iList[1]
- // const r = this.data.result[i1]
- // switch (r.typeId) {
- // //娉曞緥娉曡鏂囦欢
- // case 1:
- // const fileId = r.contents[i2].id
- // wx.navigateTo({
- // url: '/pages/m_consult/consultdetail/consultdetail',
- // success: (res) => {
- // // 閫氳繃 eventChannel 鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- // res.eventChannel.emit('acceptDataFromOpenerPage', {
- // fileId: fileId
- // })
- // },
- // })
- // break;
- // //娉曞緥娉曡鏉＄洰
- // case 2:
-
- // break;
- // //鎵ф硶妗堜緥
- // case 3:
-
- // break;
- // //鐜繚闂
- // case 4:
-
- // break;
- // default:
- // break;
- // }
- // },
-
- gotoMore(e){
- const typeId = e.currentTarget.dataset.typeid
- const keyword = this.data.keyword
- wx.navigateTo({
- url: '/pages/m_consult/consultresultmore/consultresultmore',
- success: (res) => {
- // 閫氳繃 eventChannel 鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', {
- typeId: typeId,
- keyword: keyword
- })
- },
+ onTabChange(e) {
+ console.log(e.detail);
+ this.setData({
+ tabIndex: e.detail
})
}
})
\ No newline at end of file
diff --git a/pages/m_consult/consultresult/consultresult.json b/pages/m_consult/consultresult/consultresult.json
index 3970db1..fe28343 100644
--- a/pages/m_consult/consultresult/consultresult.json
+++ b/pages/m_consult/consultresult/consultresult.json
@@ -3,6 +3,8 @@
"navigationBarBackgroundColor": "#57E4CB",
"navigationBarTextStyle": "white",
"usingComponents": {
- "mp-icon": "/component/icon/icon"
+ "mp-icon": "/component/icon/icon",
+ "switch-tab": "/component/switchtab/switchtab",
+ "c-result-item-search": "../c_result-item-search/c_result-item-search"
}
}
\ No newline at end of file
diff --git a/pages/m_consult/consultresult/consultresult.wxml b/pages/m_consult/consultresult/consultresult.wxml
index 7bc7616..18b0016 100644
--- a/pages/m_consult/consultresult/consultresult.wxml
+++ b/pages/m_consult/consultresult/consultresult.wxml
@@ -2,12 +2,10 @@
<import src="/template/nodata.wxml"></import>
<view class="page">
- <block wx:if="{{result.length > 0}}">
- <block wx:for="{{result}}" wx:key="i1" wx:for-item="catagory" wx:for-index="i1">
- <view class="page__hd">
+ <view class="page__hd">
+ <!-- <block wx:if="{{result.length > 0}}">
+ <block wx:for="{{result}}" wx:key="i1" wx:for-item="catagory" wx:for-index="i1">
<view><text style="color: #57E4CB;">{{keyword}}</text>鐨剓{catagory.typeName}} ></view>
- </view>
- <view class="page__bd">
<view class="fyui-panel">
<block wx:if="{{catagory.typeId === 1}}">
<view wx:for="{{catagory.contents}}" wx:key="i2" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoDetail">
@@ -34,7 +32,6 @@
<rich-text nodes="{{item.des}}" class="fyui-box__content des subtitle"></rich-text>
</view>
<view class="fyui-box__bd">
- <!-- <view class="fyui-box__content tag">鐩稿叧琛屼笟 -> {{item.fileIndustry}}</view> -->
<text class="tag2">鎵�灞炵珷鑺傦細{{item.chapterName}} {{item.name ? ' ' + item.name : ''}}</text>
<text class="tag2">鎵�灞炴枃浠讹細銆妠{item.fileName}}銆�</text>
<text class="tag2" wx:if="{{item.referenceNumber}}">鎵�灞炴枃鍙凤細{{item.referenceNumber}}</text>
@@ -43,17 +40,24 @@
<text class="tag3 {{item.effective? '' : 'tag3_disable'}}">{{item.effective ? '鐢熸晥涓�':'宸插け鏁�' }}</text>
<text class="tag3 {{item.relatedItems? '' : 'tag3_disable'}}">{{item.relatedItems ? '鍏宠仈鏉＄洰' + item.relatedItems + '涓� >':'鏃犲叧鑱旀潯鐩�' }}</text>
<text class="tag3 {{item.relatedCases? '' : 'tag3_disable'}}">{{item.relatedCases ? '鍏宠仈妗堜緥' + item.relatedCases + '涓� >':'鏃犲叧鑱旀渚�' }}</text>
- <!-- <text class="keyword">鍏抽敭璇嶏細</text>
- <view class="keyword-item"><text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text></view> -->
</view>
</view>
</view>
</block>
</view>
<view class="btn-more" data-typeid="{{catagory.typeId}}" bindtap="gotoMore">鏌ョ湅鏇村</view>
- </view>
+ </block>
</block>
- </block>
- <template wx:else is="nodataPage"></template>
+ <template wx:else is="nodataPage"></template> -->
+
+ <switch-tab tabList="{{tabList}}" refresh="{{refresh}}" bindtabchange="onTabChange">
+ <c-result-item-search slot="slot0" reachBottom="{{reachBottom[0]}}" keyobj="{{keyAll}}" data-index="0" bindloadComplete="loadingDone"></c-result-item-search>
+ <c-result-item-search slot="slot1" reachBottom="{{reachBottom[1]}}" keyobj="{{key4}}" data-index="1" bindloadComplete="loadingDone"></c-result-item-search>
+ <c-result-item-search slot="slot2" reachBottom="{{reachBottom[2]}}" keyobj="{{key3}}" data-index="2" bindloadComplete="loadingDone"></c-result-item-search>
+ <c-result-item-search slot="slot3" reachBottom="{{reachBottom[3]}}" keyobj="{{key2}}" data-index="3" bindloadComplete="loadingDone"></c-result-item-search>
+ <c-result-item-search slot="slot4" reachBottom="{{reachBottom[4]}}" keyobj="{{key1}}" data-index="4" bindloadComplete="loadingDone"></c-result-item-search>
+ </switch-tab>
+ </view>
+
<view class="page__ft"></view>
</view>
\ No newline at end of file
diff --git a/pages/m_consult/consultresultmore/consultresultmore.js b/pages/m_consult/consultresultmore/consultresultmore.js
index f6fa2a1..8b172c9 100644
--- a/pages/m_consult/consultresultmore/consultresultmore.js
+++ b/pages/m_consult/consultresultmore/consultresultmore.js
@@ -1,15 +1,15 @@
// pages/m_consult/consultresultmore/consultresultmore.js
-const consultservice = require("../../../service/consultservice")
const app = getApp()
-const behavior = require('../behaviors/behConsultItem')
Page({
- behaviors: [behavior],
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- // result: []
+ keyobj: {keyword: null, type: undefined},
+ typeName: '',
+ //涓婃粦瑙﹀簳鍔犺浇
+ reachBottom: false
},
/**
@@ -18,65 +18,21 @@
onLoad(options) {
var that = this
this.getOpenerEventChannel().on('acceptDataFromOpenerPage', function (data) {
- console.log('getOpenerEventChannel:');
console.log(data);
that.setData({
- keyword: data.keyword,
- typeId: data.typeId,
+ keyobj: {
+ keyword: data.keyword,
+ type: data.typeId,
+ },
+ typeName: app.cosultTypeName(data.typeId)
})
- that.search(1)
})
},
onReachBottom () {
- console.log('onReachBottom');
- if (this.cPage && this.tPage) {
- if (this.cPage < this.tPage) {
- this.search(this.cPage + 1)
- }
- }
- },
-
- search (cPage = 1) {
- var that = this
- wx.showLoading({
- title: '鎼滅储涓�',
- mask: true,
- success: (res) => {},
- fail: (res) => {},
- complete: (res) => {},
+ this.setData({
+ reachBottom: true
})
- setTimeout(() => {
- wx.hideLoading()
- }, 20000);
- consultservice.searchLaw(app.globalData.accessToken.userId, this.data.keyword, cPage, 5, {
- onPage(head){
- that.cPage = head.page
- that.tPage = head.totalPage
- },
- success (res) {
- let result = that.data.result
- res.forEach(r => {
- r.des = r.des.replaceAll('\\n', '<br/>')
- if (result.length === 0) {
- result.push({
- typeId: r.typeId,
- typeName: r.typeName,
- contents: [r]
- })
- } else {
- result[0].contents.push(r)
- }
- });
- that.setData({
- result
- })
- console.log(result);
- },
- complete (res) {
- wx.hideLoading()
- }
- }, this.data.typeId)
},
})
\ No newline at end of file
diff --git a/pages/m_consult/consultresultmore/consultresultmore.json b/pages/m_consult/consultresultmore/consultresultmore.json
index a4ab906..b515c77 100644
--- a/pages/m_consult/consultresultmore/consultresultmore.json
+++ b/pages/m_consult/consultresultmore/consultresultmore.json
@@ -2,5 +2,7 @@
"navigationBarTitleText": "鏇村缁撴灉",
"navigationBarBackgroundColor": "#57E4CB",
"navigationBarTextStyle": "white",
- "usingComponents": {}
+ "usingComponents": {
+ "c-result-item-search": "../c_result-item-search/c_result-item-search"
+ }
}
\ No newline at end of file
diff --git a/pages/m_consult/consultresultmore/consultresultmore.wxml b/pages/m_consult/consultresultmore/consultresultmore.wxml
index d01b4b7..9f30fbb 100644
--- a/pages/m_consult/consultresultmore/consultresultmore.wxml
+++ b/pages/m_consult/consultresultmore/consultresultmore.wxml
@@ -1,48 +1,10 @@
<!--pages/m_consult/consultresultmore/consultresultmore.wxml-->
<view class="page">
- <block wx:for="{{result}}" wx:key="i1" wx:for-item="catagory" wx:for-index="i1">
<view class="page__hd">
- <view><text style="color: #57E4CB;">{{keyword}}</text>鐨剓{catagory.typeName}} ></view>
+ <view><text style="color: #57E4CB;">{{keyobj.keyword}}</text>鐨剓{typeName}} ></view>
</view>
<view class="page__bd">
- <view class="fyui-panel">
- <block wx:if="{{catagory.typeId === 1}}">
- <view wx:for="{{catagory.contents}}" wx:key="i2" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoDetail">
- <view class="fyui-box fyui-box__text">
- <view class="fyui-box__hd">
- {{item.name}}
- </view>
- <view class="fyui-box__bd">
- <view class="fyui-box__content tag">鐩稿叧琛屼笟 -> {{item.fileIndustry}}</view>
- <view class="fyui-box__content des">{{item.des}}</view>
- </view>
- <view class="fyui-box__ft">
- <text class="keyword">鍏抽敭璇嶏細</text>
- <view class="keyword-item"><text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text></view>
- </view>
- </view>
- </view>
-
- </block>
- <block wx:else="{{catagory.typeId === 2}}">
- <view wx:for="{{catagory.contents}}" wx:key="i2" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoDetail">
- <view class="fyui-box fyui-box__text">
- <view class="fyui-box__hd">
- <rich-text nodes="{{item.des}}" class="fyui-box__content des subtitle"></rich-text>
- </view>
- <view class="fyui-box__bd">
- <!-- <view class="fyui-box__content tag">鐩稿叧琛屼笟 -> {{item.fileIndustry}}</view> -->
- <text class="tag2">鏉ユ簮锛氥�妠{item.fileName}}銆� {{item.chapterName}}{{item.name ? ' ' + item.name : ''}}</text>
- </view>
- <view class="fyui-box__ft">
- <text class="keyword">鍏抽敭璇嶏細</text>
- <view class="keyword-item"><text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text></view>
- </view>
- </view>
- </view>
- </block>
- </view>
+ <c-result-item-search reachBottom="{{reachBottom}}" keyobj="{{keyobj}}"></c-result-item-search>
</view>
- </block>
<view class="page__ft"></view>
</view>
diff --git a/pages/m_consult/consultresultmore/consultresultmore.wxss b/pages/m_consult/consultresultmore/consultresultmore.wxss
index 360fb80..6bfc2d9 100644
--- a/pages/m_consult/consultresultmore/consultresultmore.wxss
+++ b/pages/m_consult/consultresultmore/consultresultmore.wxss
@@ -1,52 +1,4 @@
/* pages/m_consult/consultresult/consultresult.wxss */
-.keyword {
- white-space: nowrap;
-}
-.keyword-item {
- display: flex;
- justify-content: flex-start;
- flex-wrap: wrap;
-}
-
-.keyword-item>text {
- white-space: nowrap;
- margin-right: 8px;
- padding: 0px 6px;
- color: #2c7064;
-}
-
-.des {
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 4;
- width: 100%;
- overflow: hidden;
- /* text-overflow: ellipsis; */
-}
-
-.tag {
- margin-bottom: 8px;
-}
-
-.subtitle{
- font-size: 15px;
-}
-
-.tag2{
- font-size: 12px;
- color: var(--fyui-text-color_3);
-}
-
-.btn-more{
- text-align: center;
- background-color: white;
- margin: 0 10px;
- border-top: 1px solid var(--fyui-BG_1);
- color: var(--fyui-text-color_2);
- padding: 8px;
- font-size: 12px;
-}
-
-.btn-more:active{
- background-color: var(--fyui-BG-COLOR-ACTIVE);
+.page__hd {
+ padding-bottom: 8px;
}
\ No newline at end of file
diff --git a/pages/m_learn/behaviors/b_openFile.js b/pages/m_learn/behaviors/b_openFile.js
index 1020833..d2ce189 100644
--- a/pages/m_learn/behaviors/b_openFile.js
+++ b/pages/m_learn/behaviors/b_openFile.js
@@ -47,7 +47,7 @@
break;
//瑙嗛
case 4:
- url = "/pages/m_common/pagevideo/pagevideo"
+ url = "/pages/m_learn/p_learnvideo/p_learnvideo"
break;
}
if (url != "") {
diff --git a/pages/m_learn/p_learnvideo/p_learnvideo.js b/pages/m_learn/p_learnvideo/p_learnvideo.js
new file mode 100644
index 0000000..3a0eda4
--- /dev/null
+++ b/pages/m_learn/p_learnvideo/p_learnvideo.js
@@ -0,0 +1,85 @@
+// pages/module_common/pagevideo/pagevideo.js
+import ListPage from '../../../base/ListPage'
+import b_fetch from '../behaviors/b_fetch'
+
+const lawservice = require("../../../service/lawservice")
+const moment = require('../../../utils/moment.min')
+const app = getApp()
+
+ListPage({
+ behaviors: [b_fetch],
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ video: {},
+ series: [],
+
+ thisVideo: 1,
+ showDialog: false,
+ groups: [
+ 'actionSlot1',
+ ]
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+ var that = this
+ this.getOpenerEventChannel().on('acceptDataFromOpenerPage', function (data) {
+ setTimeout(() => {
+ that.setData({
+ video: data
+ })
+ }, 500);
+
+ // 椤甸潰鏍囬
+ if (data.lrResourcetitle) {
+ wx.setNavigationBarTitle({
+ title: data.lrResourcetitle,
+ })
+ }
+
+ // 瑙嗛鎵�鍦ㄥ悎闆�
+ if (data.lrExtension2 && data.lrExtension2 != '') {
+ if (data.lrExtension3) {
+ that.setData({
+ thisVideo: parseInt(data.lrExtension3)
+ })
+ }
+ that.getSerise(data.lrExtension2)
+ }
+ })
+
+ this.getResources({fileType: 4})
+ },
+
+ getSerise(seriesId) {
+ var that = this
+ lawservice.getSerise(app.globalData.userInfo.guid, seriesId, {
+ success(data) {
+ that.setData({
+ series: data
+ })
+ },
+ })
+ },
+
+ showSeries() {
+ this.setData({
+ showDialog: true
+ })
+ },
+
+ selectVideo(e) {
+ let thisVideo = e.currentTarget.dataset.index
+ const video = this.data.series[thisVideo]
+ thisVideo++
+ this.setData({
+ video,
+ thisVideo,
+ showDialog: false
+ })
+ }
+})
\ No newline at end of file
diff --git a/pages/m_learn/p_learnvideo/p_learnvideo.json b/pages/m_learn/p_learnvideo/p_learnvideo.json
new file mode 100644
index 0000000..c2fa9d2
--- /dev/null
+++ b/pages/m_learn/p_learnvideo/p_learnvideo.json
@@ -0,0 +1,10 @@
+{
+ "navigationBarTitleText": "瑙嗛鎾斁",
+ "navigationBarBackgroundColor": "#65EAD2",
+ "navigationBarTextStyle": "white",
+ "usingComponents": {
+ "mp-icon": "/component/icon/icon",
+ "c-learn-item": "../base_c/c_learn-item/c_learn-item",
+ "mp-actionSheet": "/component/actionsheet/actionsheet"
+ }
+}
\ No newline at end of file
diff --git a/pages/m_learn/p_learnvideo/p_learnvideo.wxml b/pages/m_learn/p_learnvideo/p_learnvideo.wxml
new file mode 100644
index 0000000..8c37969
--- /dev/null
+++ b/pages/m_learn/p_learnvideo/p_learnvideo.wxml
@@ -0,0 +1,65 @@
+<!--pages/module_common/pagevideo/pagevideo.wxml-->
+<view class="page">
+ <view class="page__hd">
+ <video class="video" id="myVideo" src="{{video.lrBodyurl}}" binderror="videoErrorCallback" show-center-play-btn='{{false}}' show-play-btn="{{true}}" controls autoplay custom-cache="{{false}}" poster="{{video.lrPicurl}}" picture-in-picture-mode="{{['push', 'pop']}}" bindenterpictureinpicture='bindVideoEnterPictureInPicture' bindleavepictureinpicture='bindVideoLeavePictureInPicture'></video>
+ </view>
+ <view class="page__bd">
+ <view class="fyui-box fyui-box__text">
+ <view class="fyui-box__hd">
+ {{video.lrResourcetitle}}
+ </view>
+ <view class="fyui-box__bd">
+ <view class="fyui-box__content">{{video.lrResourcedesc}}</view>
+
+ </view>
+ <view class="fyui-box__ft">
+ <view>{{video.lrPublishdate}}</view>
+ <view class="flex-h">
+ <image src="/res/icons/view.png" class="icon" style="margin-right: 4px;"></image>{{video.views}}
+ </view>
+ </view>
+ </view>
+
+ <view>
+ <view wx:if="{{series.length > 0}}" class="fyui-box fyui-box__text">
+ <view class="video-series" bindtap="showSeries">
+ <view>瑙嗛鍚堥泦({{thisVideo}}/{{series.length}})</view>
+ <mp-icon icon="arrow" class="icon-down" size="14" color="#7F7F7F"></mp-icon>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="page__ft">
+ <view class="title">鐩稿叧瑙嗛</view>
+ <!-- <c-learn-item results="{{results}}" loading="{{loading}}" needLoadMore="{{needLoadMore}}"></c-learn-item> -->
+
+ <view wx:for="{{results}}" wx:key="index" wx:item="item">
+ <view class="fyui-box" bindtap="gotoResource" data-index="{{index}}">
+ <view class="fyui-box__hd">
+ <image src="{{item.lrPicurl}}" class="" mode="aspectFill" />
+ </view>
+ <view class="fyui-box__bd">
+ <view class="fyui-box__content">{{item.lrResourcetitle}}</view>
+ <view class="fyui-box__tag">
+ <view>{{item.lrPublishdate}}</view>
+ <view class="flex-h">
+ <image src="/res/icons/view.png" class="icon" style="margin-right: 4px;"></image>{{item.views}}
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <mp-actionSheet show="{{showDialog}}" actions="{{groups}}" showCancel="{{false}}">
+ <view slot="actionSlot1" class="custom-action">
+ <view class="custom-action__series">
+ <view wx:for="{{series}}" wx:key="index" data-index="{{index}}" bindtap="selectVideo">
+ <view class="custom-action__video {{thisVideo == index + 1 ? 'selected' : ''}}">
+ {{index+1}}. {{item.lrResourcetitle}}
+ </view>
+ </view>
+ </view>
+ </view>
+ </mp-actionSheet>
+</view>
\ No newline at end of file
diff --git a/pages/m_learn/p_learnvideo/p_learnvideo.wxss b/pages/m_learn/p_learnvideo/p_learnvideo.wxss
new file mode 100644
index 0000000..598f2cb
--- /dev/null
+++ b/pages/m_learn/p_learnvideo/p_learnvideo.wxss
@@ -0,0 +1,73 @@
+/* pages/module_common/pagevideo/pagevideo.wxss */
+.page__hd{
+ padding: 0;
+}
+
+.page__ft{
+ text-align: left;
+}
+
+.video{
+ width: 100%;
+}
+
+.video-series {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ border: 1px solid var(--fyui-BG_1);
+ border-radius: 4px;
+ padding: 2px 16px;
+ font-size: 14px;
+ color: var(--fyui-text-color_2);
+}
+
+.title{
+ text-align: start;
+ padding: 0 16px;
+ font-weight: 600;
+ font-size: 16px;
+}
+
+.fyui-box__content {
+ text-align: start;
+}
+
+.custom-action {
+ position: relative;
+ min-height: 40vh;
+}
+
+.custom-action__series {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ align-items: center;
+ /* background-color: blueviolet; */
+}
+
+.custom-action__series>view {
+ width: 50%;
+ /* background-color: rosybrown; */
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 4px 0;
+}
+
+.custom-action__video {
+ width: 86%;
+ color: var(--fyui-text-color_2);
+ border: 1px solid var(--fyui-text-color_2);
+ border-radius: 4px;
+ padding: 2px 4px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+.selected{
+ color: white;
+ border: 1px solid var(--fyui-primary-color);
+ background-color: var(--fyui-primary-color);
+}
\ No newline at end of file
diff --git a/pages/m_user/mine/mine.wxml b/pages/m_user/mine/mine.wxml
index 1f38c59..ebadc99 100644
--- a/pages/m_user/mine/mine.wxml
+++ b/pages/m_user/mine/mine.wxml
@@ -34,21 +34,21 @@
</view>
<view class="fyui-cell fyui-cell_select title" bindtap="goto" data-index="3">
<view class="fyui-cell__hd">
- <image src="/res/icons/icon5.png" class="icon" />
+ <image src="/res/icons/my_favor.png" class="icon" />
</view>
<view class="fyui-cell__bd">鎴戠殑鏀惰棌</view>
<view class="fyui-cell__ft"></view>
</view>
<view class="fyui-cell fyui-cell_select title" bindtap="goto" data-index="4">
<view class="fyui-cell__hd">
- <image src="/res/icons/icon5.png" class="icon" />
+ <image src="/res/icons/my_consult.png" class="icon" />
</view>
<view class="fyui-cell__bd">鎴戣鍜ㄨ</view>
<view class="fyui-cell__ft"></view>
</view>
<view class="fyui-cell fyui-cell_select title" bindtap="goto" data-index="5">
<view class="fyui-cell__hd">
- <image src="/res/icons/icon5.png" class="icon" />
+ <image src="/res/icons/my_schedule.png" class="icon" />
</view>
<view class="fyui-cell__bd">鐜繚鏃ョ▼</view>
<view class="fyui-cell__ft"></view>
diff --git a/pages/m_user/mine/mine.wxss b/pages/m_user/mine/mine.wxss
index 623d764..6b3e5cd 100644
--- a/pages/m_user/mine/mine.wxss
+++ b/pages/m_user/mine/mine.wxss
@@ -5,6 +5,13 @@
padding-bottom: 30px;
}
+.fyui-cell_select {
+ font-size: 16px;
+ padding-top: 12px;
+ padding-bottom: 12px;
+ border-bottom: 1px solid var(--fyui-BG_1);
+}
+
.flex-h {
justify-content: flex-start;
align-items: center;
diff --git a/pages/m_user/userlogin/userlogin.js b/pages/m_user/userlogin/userlogin.js
index 5c60b43..285496f 100644
--- a/pages/m_user/userlogin/userlogin.js
+++ b/pages/m_user/userlogin/userlogin.js
@@ -40,15 +40,7 @@
desc: '鐢ㄤ簬鏄剧ず锛屾彁绀虹敤鎴峰綋鍓嶅凡鐧诲綍',
success(res) {
console.log(res);
- // wx.login({
- // timeout: 10000,
- // success: (result) => {
- // console.log(result);
- // },
- // fail: (res) => {},
- // complete: (res) => {},
- // })
-
+
that.login()
}
})
diff --git a/res/icons/my_consult.png b/res/icons/my_consult.png
new file mode 100644
index 0000000..2dd0266
--- /dev/null
+++ b/res/icons/my_consult.png
Binary files differ
diff --git a/res/icons/my_favor.png b/res/icons/my_favor.png
new file mode 100644
index 0000000..c76e562
--- /dev/null
+++ b/res/icons/my_favor.png
Binary files differ
diff --git a/res/icons/my_schedule.png b/res/icons/my_schedule.png
new file mode 100644
index 0000000..ed5ca10
--- /dev/null
+++ b/res/icons/my_schedule.png
Binary files differ
diff --git a/res/icons/qa.png b/res/icons/qa.png
new file mode 100644
index 0000000..e0b7645
--- /dev/null
+++ b/res/icons/qa.png
Binary files differ
diff --git a/service/baserequest.js b/service/baserequest.js
index 0eec8ca..e2fb27b 100644
--- a/service/baserequest.js
+++ b/service/baserequest.js
@@ -11,8 +11,8 @@
const originProperties = ['url', 'data', 'header', 'method', 'success', 'fail', 'complete'];
// const baseUrl = "http://127.0.0.1:8080"
-// const baseUrl = "http://192.168.0.106:8080"
-const baseUrl = "https://fyami.com.cn:447"
+const baseUrl = "http://192.168.0.111:8080"
+// const baseUrl = "https://fyami.com.cn:447"
// const basePicUrl = baseUrl + "/images/"
const basePicUrl = "https://fyami.com.cn:447/images/"
const baseIconUrl = "https://fyami.com.cn:447/images/weixin/eplaw/"
@@ -37,7 +37,8 @@
}
var fun1 = util.deepCopy(fun)
fun1.success = function (res) {
- console.log("--------------璇锋眰缁撴灉----------------" + fun.url);
+ // console.log("--------------璇锋眰缁撴灉----------------");
+ console.log("|--璁块棶: " + fun.url);
console.log(res);
if (fun.onHead) {
diff --git a/service/lawservice.js b/service/lawservice.js
index 6740779..2ad9461 100644
--- a/service/lawservice.js
+++ b/service/lawservice.js
@@ -25,4 +25,27 @@
$f.post(fun1)
},
+
+ //鑾峰彇璧勬簮鎵�鍦ㄧ郴鍒�
+ getSerise: function (userId, seriesId, fun) {
+ let cb = {
+ url: `/laws/series`,
+ params: {
+ userId: userId,
+ seriesId: seriesId
+ },
+ }
+ Object.assign(cb, fun)
+
+ let fun1 = util.deepCopy(cb)
+ fun1.success = function (res) {
+ res.forEach(r => {
+ r.lrPicurl = $f.basePicUrl + r.lrPicurl
+ r.lrBodyurl = $f.baseFileUrl + r.lrBodyurl
+ });
+ cb.success(res)
+ }
+
+ $f.post(fun1)
+ },
}
\ No newline at end of file
--
Gitblit v1.9.3