From 9f78f3f014a3423ea3fcab8f9f1056c57cd47fc8 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 26 八月 2022 17:16:26 +0800
Subject: [PATCH] 2022.8.26
---
pages/assessment/assessment.wxml | 18
pages/assessment/assessment.wxss | 21 +
pages/home/home.js | 8
pages/module_learn/learfile/learnfile.json | 3
pages/assessment/assessment.js | 17
pages/module_learn/learncase/learncase.js | 66 +++
res/icons/complete.png | 0
res/icons/warning_selected.png | 0
pages/module_consult/consulthome/consulthome.wxml | 68 ++-
pages/module_learn/learn/learn.wxml | 120 ++++++
pages/module_consult/consulthome/consulthome.wxss | 9
pages/module_learn/learn/learn.wxss | 128 +++++++
pages/module_learn/learn/learn.js | 179 +++++++++
pages/mine/mine.wxml | 4
component/progress/progress.js | 4
pages/module_learn/behaviors/beLearn.js | 65 +++
res/icons/learn_1.png | 0
app.js | 2
pages/gradereport/gradereport.js | 6
pages/module_learn/learncase/learncase.wxss | 1
pages/module_common/pagevideo/pagevideo.wxml | 2
pages/module_learn/learncase/learncase.wxml | 2
service/baserequest.js | 4
pages/mine/mine.js | 6
pages/home/home.wxml | 40 +
pages/module_ledger/ledgerhome/ledgerhome.wxss | 4
pages/home/home.wxss | 18
pages/module_user/userlogin/userlogin.js | 1
pages/module_ledger/ledgerhome/ledgerhome.wxml | 8
res/icons/learn_2.png | 0
pages/gradereport/gradereport.wxml | 7
res/icons/ass_3.png | 0
res/icons/btn_bg_2.png | 0
pages/module_learn/learncase/learncase.json | 3
service/consultservice.js | 12
pages/module_consult/consultresult/consultresult.wxml | 11
pages/module_consult/consultresult/consultresult.wxss | 18 +
app.json | 6
/dev/null | 0
pages/module_ledger/ledgerhome/ledgerhome.js | 6
pages/module_user/userloginpw/userloginpw.js | 1
pages/module_learn/learfile/learnfile.wxss | 1
pages/module_consult/consulthome/consulthome.js | 44 ++
pages/module_learn/learfile/learnfile.wxml | 34 +
pages/module_learn/learn/learn.json | 8
res/icons/con_qa.png | 0
project.config.json | 2
pages/module_learn/learfile/learnfile.js | 66 +++
48 files changed, 943 insertions(+), 80 deletions(-)
diff --git a/app.js b/app.js
index f562a3c..21651da 100644
--- a/app.js
+++ b/app.js
@@ -12,9 +12,11 @@
// // 鍙戦�� res.code 鍒板悗鍙版崲鍙� openId, sessionKey, unionId
// }
// })
+ console.log('onLaunch');
},
globalData: {
userInfo: null,
accessToken: null,
+ isLogin: false
}
})
diff --git a/app.json b/app.json
index 33d4b92..c32bc0e 100644
--- a/app.json
+++ b/app.json
@@ -8,7 +8,7 @@
"pages/promise/promise",
"pages/assessment/assessment",
"pages/mine/mine",
- "pages/learn/learn",
+ "pages/module_learn/learn/learn",
"pages/grade/grade",
"pages/gradedetail/gradedetail",
"pages/promisefile/promisefile",
@@ -33,7 +33,9 @@
"pages/icons/icons",
"pages/module_common/pagevideo/pagevideo",
"pages/module_consult/consultresultmore/consultresultmore",
- "pages/module_consult/consultdetailitem/consultdetailitem"
+ "pages/module_consult/consultdetailitem/consultdetailitem",
+ "pages/module_learn/learfile/learnfile",
+ "pages/module_learn/learncase/learncase"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/component/progress/progress.js b/component/progress/progress.js
index e72e1c8..a174a51 100644
--- a/component/progress/progress.js
+++ b/component/progress/progress.js
@@ -94,7 +94,7 @@
wx.createSelectorQuery().in(this)
.select("#canvasProgressbg")
.context(function (res) {
- console.log("鑺傜偣瀹炰緥锛�", res);
+ // console.log("鑺傜偣瀹炰緥锛�", res);
// 鑺傜偣瀵瑰簲鐨� Canvas 瀹炰緥銆�
ctx = res.context;
ctx.setLineWidth(8); // 璁剧疆鍦嗙幆鐨勫搴�
@@ -151,7 +151,7 @@
wx.createSelectorQuery().in(this)
.select("#canvasProgress")
.context(function (res) {
- console.log("鑺傜偣瀹炰緥锛�", res); // 鑺傜偣瀵瑰簲鐨� Canvas 瀹炰緥銆�
+ // console.log("鑺傜偣瀹炰緥锛�", res); // 鑺傜偣瀵瑰簲鐨� Canvas 瀹炰緥銆�
ctx = res.context;
// 璁剧疆娓愬彉
var gradient = ctx.createLinearGradient(0, 0, 0, 200);
diff --git a/pages/assessment/assessment.js b/pages/assessment/assessment.js
index bf6226a..00da6ea 100644
--- a/pages/assessment/assessment.js
+++ b/pages/assessment/assessment.js
@@ -121,12 +121,6 @@
this.ecComponent = this.selectComponent('#mychart-dom-line');
this.initChart()
// }, 1000);
-
- wx.startPullDownRefresh({
- success: (res) => {},
- fail: (res) => {},
- complete: (res) => {},
- })
},
/**
@@ -134,6 +128,11 @@
*/
onShow: function () {
var that = this
+ wx.startPullDownRefresh({
+ success: (res) => {},
+ fail: (res) => {},
+ complete: (res) => {},
+ })
},
onPullDownRefresh(){
@@ -206,6 +205,7 @@
text1: "",
text2: "鏈娴嬭瘎宸插畬鎴�",
text3: "鏌ョ湅璇︽儏",
+ hasScore: true
})
} else {
that.setData({
@@ -213,6 +213,7 @@
text2: "璇峰敖蹇畬鎴愭祴璇�",
text3: "鍘绘祴璇�",
score: undefined,
+ hasScore: false
})
}
@@ -226,8 +227,10 @@
color: d.color,
rank: d.rank,
level: d.level,
+ period: d.period,
time: d.period.replace('/', '骞�').replace(/\-[0-9]+/, '鏈�'),
- scoreId: d.tPGuid
+ scoreId: d.tPGuid,
+ updateTime: moment(d.updateDate).format('YYYY-MM-DD hh:mm')
})
//鎶樼嚎鍥炬暟鎹�
diff --git a/pages/assessment/assessment.wxml b/pages/assessment/assessment.wxml
index de3bd9a..3a84a68 100644
--- a/pages/assessment/assessment.wxml
+++ b/pages/assessment/assessment.wxml
@@ -14,6 +14,7 @@
<view class="title">{{text1}}</view>
<view class="title">{{text2}}</view>
<view class="tag">娴嬭瘎鎴鏃堕棿锛歿{deadline}}</view>
+ <image wx:if="{{hasScore}}" src="/res/icons/complete.png" class="t-image" mode="aspectFit"></image>
</view>
<view class="btn" bindtap="goto" data-index="0">{{text3}}</view>
</view>
@@ -24,10 +25,10 @@
<view class="page__bd">
<view style="margin-left: 10px;">鍒嗙被娴嬭瘎</view>
- <view class="top-card top-card_main">
- <image src="/res/icons/ass_1.png" mode="aspectFit"></image>
+ <view class="top-card top-card_main" bindtap="goto" data-index="0">
+ <image src="/res/icons/ass_3.png" mode="aspectFit"></image>
<view>
- <view class="top-card__name">缁煎悎鑷祴鏅鸿瘎</view>
+ <view class="top-card__name">瀹堟硶鑷祴鏅鸿瘎</view>
<view class="top-card__tag">鐐瑰嚮杩涜娴嬭瘎 ></view>
</view>
<!-- <mp-icon icon="arrow" class="" size="15" color="white"></mp-icon> -->
@@ -35,18 +36,18 @@
<view class="flex-h">
<view class="flex-h_block">
<view class="top-card">
- <image src="/res/icons/ass_1.png" mode="aspectFit"></image>
+ <image src="/res/icons/ass_2.png" mode="aspectFit"></image>
<view>
- <view class="top-card__name">鍏朵粬涓撻」鑷祴</view>
+ <view class="top-card__name">纰虫帓鏀炬櫤鑳戒及绠�</view>
<view class="top-card__tag">鐐瑰嚮杩涜娴嬭瘎 ></view>
</view>
</view>
</view>
<view class="flex-h_block">
<view class="top-card top-card_2">
- <image src="/res/icons/ass_2.png" mode="aspectFit"></image>
+ <image src="/res/icons/ass_1.png" mode="aspectFit"></image>
<view>
- <view class="top-card__name">纰虫帓鏀炬櫤鑳戒及绠�</view>
+ <view class="top-card__name">鍏朵粬涓撻」鑷祴</view>
<view class="top-card__tag">鐐瑰嚮杩涜娴嬭瘎 ></view>
</view>
</view>
@@ -80,6 +81,7 @@
<view style="flex: 1;">
<view class="history_time">{{item.time}}</view>
<view class="h-cell fyui-panel">
+ <view class="h-tag">{{item.updateTime}}</view>
<view class="h-line_1">
<view class="flex-h">
<view class="h-score" style="background-color: {{item.color}};">
@@ -90,7 +92,7 @@
<view>椋庨櫓绛夌骇锛歿{item.level}}</view>
</view>
</view>
- <view data-id="{{item.scoreId}}" class="h-btn" bindtap="goto" data-index="1" data-period="{{item.time}}">鍘荤湅鐪�</view>
+ <view data-id="{{item.scoreId}}" class="h-btn" bindtap="goto" data-index="1" data-period="{{item.period}}">鍘荤湅鐪�</view>
</view>
<!-- <view class="h-line_2">
<view data-id="{{item.scoreId}}" class="h-btn" bindtap="goto" data-index="1" data-period="{{item.time}}">鍘荤湅鐪�</view>
diff --git a/pages/assessment/assessment.wxss b/pages/assessment/assessment.wxss
index d775a13..42dc929 100644
--- a/pages/assessment/assessment.wxss
+++ b/pages/assessment/assessment.wxss
@@ -24,6 +24,11 @@
margin-top: 8px;
}
+.page__hd .t-image {
+ width: 100px;
+ height: 100px;
+}
+
.page__hd .btn {
border-radius: 20px;
line-height: 20px;
@@ -85,6 +90,15 @@
font-size: 14px;
}
+.h-tag{
+ position: absolute;
+ color: var(--fyui-text-color_3);
+ font-size: 12px;
+ text-align: end;
+ bottom: 0;
+ right: 8px;
+}
+
.flex-h_block {
flex: 1;
}
@@ -92,7 +106,7 @@
.top-card {
position: relative;
border-radius: 4px;
- background: linear-gradient(90deg, #87CEB2, #6CD398);
+ background: linear-gradient(90deg, #A3D9F5, #88E1EC);
color: white;
padding: 8px;
margin-left: 10px;
@@ -103,12 +117,13 @@
}
.top-card_2 {
- background: linear-gradient(90deg, #A3D9F5, #88E1EC);
+ background: linear-gradient(90deg, #87CEB2, #6CD398);
margin-left: 2px;
margin-right: 10px;
}
.top-card_main {
+ background: linear-gradient(90deg, #55E2C9, #b6e9dc);
margin-left: 10px;
margin-right: 10px;
margin-bottom: 4px;
@@ -126,7 +141,7 @@
}
.top-card .top-card__name {
- font-size: 12px;
+ font-size: 14px;
/* width: 100%; */
/* font-weight: 600; */
/* text-align: center; */
diff --git a/pages/gradereport/gradereport.js b/pages/gradereport/gradereport.js
index 02c2f6a..03df02c 100644
--- a/pages/gradereport/gradereport.js
+++ b/pages/gradereport/gradereport.js
@@ -243,6 +243,12 @@
itemlist: []
}
rule.forEach(r => {
+ // fixme : 姝ゅ鏆傛椂灏嗐�愰楗�戠被鍨嬬殑浼佷笟璇勪及寤鸿鐨勭涓�鍙ヨ瘽鍒犻櫎
+ if (app.globalData.userInfo.extension2 === '1') {
+ const i = r.third.indexOf('锛�')
+ r.third = r.third.slice(i+1)
+ r.third = r.third.replace('浣�', '鎮�')
+ }
p.itemlist.push({
ruleName: r.first,
score: r.second,
diff --git a/pages/gradereport/gradereport.wxml b/pages/gradereport/gradereport.wxml
index 1136b29..c4d4a8d 100644
--- a/pages/gradereport/gradereport.wxml
+++ b/pages/gradereport/gradereport.wxml
@@ -28,10 +28,11 @@
<!-- 澶卞垎鏉＄洰 -->
<view class="fyui-panel fyui-panel__max">
<view class="fyui-panel_title">鑷瘎璇婃柇</view>
- <view>
+ <view wx:if="{{losePoints.length > 0}}">
鏈娴嬭瘎涓昏澶卞垎绫诲埆涓�<text style="color: orange;font-weight: 600;font-size: 16px;" wx:for="{{losePointsItem}}" wx:key="index">{{index > 0 ? "銆�" : ""}}{{item}}</text>
- 锛屽叡璁�<text style="color: orange;font-weight: 600;font-size: 18px;">{{losePoints.length}}</text>椤癸紝鍏蜂綋鎯呭喌濡備笅锛�
+ 绛夊叡璁�<text style="color: orange;font-weight: 600;font-size: 18px;">{{losePoints.length}}</text>椤癸紝鍏蜂綋闂璇婃柇鍙婂缓璁涓嬶細
</view>
+ <view wx:else="">鎮ㄦ湰娆¤嚜璇勬弧鍒嗭紝鏆傛棤璇婃柇寤鸿銆�</view>
<block wx:for="{{losePoints}}" wx:key="index">
<view class="{{index !=0 ? 'first' : ''}}">
<view class="fyui-panel_title">{{index + 1}}. 銆�<text style="color: orange;">{{item.baseRule}}</text>銆憑{item.name}}</view>
@@ -40,7 +41,7 @@
<view>闂锛�</view>{{rule.ruleName}}
</view>
<view class="fyui-panel_desc">
- <view>澶卞垎锛�</view><text style="color: orange;">{{rule.score}}鍒�</text>
+ <view>鎵ｅ垎锛�</view><text style="color: orange;">{{rule.score}}鍒�</text>
</view>
<view class="fyui-panel_desc">
<view>寤鸿锛�</view>{{rule.remark}}
diff --git a/pages/home/home.js b/pages/home/home.js
index 84fd0bc..f7c2d96 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -73,6 +73,12 @@
this.getLedgerType()
},
+ onShow(){
+ if (app.globalData.isLogin) {
+
+ }
+ },
+
onPullDownRefresh(){
console.log('onPullDownRefresh');
wx.stopPullDownRefresh({
@@ -246,7 +252,7 @@
break;
case "3":
//鍦ㄧ嚎瀹堟硶瀛︿範
- url = `/pages/learn/learn`
+ url = `/pages/module_learn/learn/learn`
break;
case "4":
//瀹堟硶鍔ㄦ��
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 9567bf9..6fcb5fe 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -25,23 +25,43 @@
<view class="flex-h">
<view class="flex-h_block">
<view class="top-card" bindtap="goto" data-index="0">
- <view class="top-card__score"><text class="top-card__num">{{historyPoint.score}}</text>鍒�</view>
- <view class="top-card__time">鑷祴鏅鸿瘎寰楀垎 ></view>
- <image src="/res/icons/wm_assessment.png"></image>
+ <view>
+ <view class="top-card__score"><text class="top-card__num">{{historyPoint.score}}</text>鍒�</view>
+ <view class="top-card__time">鑷祴鏅鸿瘎寰楀垎 ></view>
+ </view>
+ <view class="top-card__items">
+ <view class="top-card__item">
+ <view>瀹堟硶鎺掑悕</view>
+ <text>{{historyPoint.rank}}</text>
+ </view>
+ <view class="top-card__item">
+ <view>瀹堟硶鎸囨暟</view>
+ <text>{{historyPoint.legalIndex}}</text>
+ </view>
+ <!-- <view class="top-card__item">
+ <view>杩濇硶鎸囨暟</view>
+ <text>{{historyPoint.illegalIndex}}</text>
+ </view> -->
+ </view>
+ <image src="/res/icons/wm_assessment.png" mode="aspectFit"></image>
</view>
</view>
<view class="flex-h_block">
<view class="top-card top-card_2" bindtap="goto" data-index="5">
- <view class="top-card__score"><text class="top-card__num">{{monthInfo.percent}}</text>%</view>
- <view class="top-card__time">鍙拌处瀹屾垚鐜� ></view>
- <image src="/res/icons/wm_ledger.png"></image>
+ <view>
+ <view class="top-card__score"><text class="top-card__num">{{monthInfo.percent}}</text>%</view>
+ <view class="top-card__time">鍙拌处瀹屾垚鐜� ></view>
+ </view>
+ <image src="/res/icons/wm_ledger.png" mode="aspectFit"></image>
</view>
<view class="top-card top-card_3" bindtap="goto" data-index="6">
- <view class="top-card__score">{{promsieInfo.leftDays > 0 ? '鍓╀綑' : '澶辨晥'}}
- <text class="top-card__num">{{promsieInfo.leftDays > 0 ? promsieInfo.leftDays : 0 - promsieInfo.leftDays}}</text>澶�
+ <view>
+ <view class="top-card__score">{{promsieInfo.leftDays > 0 ? '鍓╀綑' : '澶辨晥'}}
+ <text class="top-card__num">{{promsieInfo.leftDays > 0 ? promsieInfo.leftDays : 0 - promsieInfo.leftDays}}</text>澶�
+ </view>
+ <view class="top-card__time">鎵胯鍊掕鏃� ></view>
</view>
- <view class="top-card__time">鎵胯鍊掕鏃� ></view>
- <image src="/res/icons/wm_commitment.png"></image>
+ <image src="/res/icons/wm_commitment.png" mode="aspectFit"></image>
</view>
</view>
</view>
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index 4a6b587..2045d23 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -6,6 +6,9 @@
.page__title {
margin-left: 10px;
+ font-size: 18px;
+ color: var(--fyui-text-color_1);
+ /* font-weight: 600; */
}
.flex-h_block{
@@ -23,6 +26,10 @@
margin-left: 10px;
margin-right: 2px;
height: 20vh;
+ text-align: center;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
}
.top-card_2 {
@@ -32,6 +39,7 @@
height: 8.5vh;
background-color: #DDEEFF;
color: #2B7BCB;
+ text-align: start;
}
.top-card_3 {
@@ -41,24 +49,28 @@
height: 8.5vh;
background-color: #FAFCF0;
color: #859438;
+ text-align: start;
}
.top-card>image{
- width: 15vh;
- height: 18vh;
+ width: 12vh;
+ height: 12vh;
position: absolute;
bottom: 0px;
right: 0px;
+ opacity: 0.6;
}
.top-card_2>image{
width: 13vw;
height: 14vw;
+ opacity: 0.5;
}
.top-card_3>image{
width: 13vw;
height: 14vw;
+ opacity: 0.5;
}
.top-card .top-card__time {
@@ -102,7 +114,7 @@
}
.top-card__items .top-card__item view {
- color: #ffffffde;
+ /* color: #ffffffde; */
font-size: 12px;
}
diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index 88f8f4d..417262d 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -18,4 +18,10 @@
userRealName: app.globalData.userInfo.realname
})
},
+
+ logout() {
+ wx.reLaunch({
+ url: '/pages/module_user/userlogin/userlogin',
+ })
+ }
})
\ No newline at end of file
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index d6f30ac..d316170 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -2,7 +2,7 @@
<view class="page">
<view class="page__hd">
<view class="flex-h">
- <image class="user-icon" src="/res/icons/btn_bg_4.png" mode="aspectFill"></image>
+ <image class="user-icon" src="/res/icons/learn_2.png" mode="aspectFill"></image>
<view class="flex-v">
<view class="user-name">{{userRealName}}</view>
<view class="user-tag"></view>
@@ -36,6 +36,6 @@
</view>
<view class="page__ft">
- <view class="logout" bindtap="onSubmit">閫�鍑鸿处鎴�</view>
+ <view class="logout" bindtap="logout">閫�鍑鸿处鎴�</view>
</view>
</view>
diff --git a/pages/module_common/pagevideo/pagevideo.wxml b/pages/module_common/pagevideo/pagevideo.wxml
index 2b66f49..c4d6098 100644
--- a/pages/module_common/pagevideo/pagevideo.wxml
+++ b/pages/module_common/pagevideo/pagevideo.wxml
@@ -9,7 +9,7 @@
{{video.lrResourcetitle}}
</view>
<view class="fyui-box__bd">
- <view class="fyui-box__content">{{video.lrResourcetitle}}</view>
+ <view class="fyui-box__content">{{video.lrResourcedesc}}</view>
</view>
<view class="fyui-box__ft">
diff --git a/pages/module_consult/consulthome/consulthome.js b/pages/module_consult/consulthome/consulthome.js
index 36071c1..855cdbc 100644
--- a/pages/module_consult/consulthome/consulthome.js
+++ b/pages/module_consult/consulthome/consulthome.js
@@ -39,6 +39,7 @@
*/
onLoad: function (options) {
this.getHotTopic()
+ this.getTopicItem()
},
/**
@@ -110,9 +111,30 @@
})
},
- gotoDetail(e) {
- var i = e.currentTarget.dataset.index
- var fileId = this.data.pageList[0][i].mfGuid
+ getTopicItem() {
+ var that = this
+ consultservice.getTopicItem(app.globalData.accessToken.userId, {
+ success(res) {
+ res.forEach(r => {
+ r.miItemContent = r.miItemContent.replace('\\n', '<br/>')
+ // r.mfKeywordLv1 = r.mfKeywordLv1.split('銆�').slice(0, 5)
+ // r.mfReleaseDate = that.formateTime(r.mfReleaseDate)
+ // r.mfEffectiveDate = that.formateTime(r.mfEffectiveDate)
+ // r.mfClosingDate = that.formateTime(r.mfClosingDate)
+ });
+ that.setData({
+ 'pageList[2]': res
+ })
+ console.log(that.data.pageList);
+ }
+ })
+ },
+
+ gotoFile(e) {
+ const iList = e.currentTarget.dataset.index.split(',')
+ const i1 = iList[0]
+ const i2 = iList[1]
+ var fileId = this.data.pageList[i1][i2].mfGuid
wx.navigateTo({
url: '/pages/module_consult/consultdetail/consultdetail',
success: (res) => {
@@ -124,6 +146,22 @@
})
},
+ gotoItem(e) {
+ const iList = e.currentTarget.dataset.index.split(',')
+ const i1 = iList[0]
+ const i2 = iList[1]
+ var itemId = this.data.pageList[i1][i2].miGuid
+ wx.navigateTo({
+ url: '/pages/module_consult/consultdetailitem/consultdetailitem',
+ success: (res) => {
+ // 閫氳繃 eventChannel 鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('acceptDataFromOpenerPage', {
+ itemId: itemId
+ })
+ },
+ })
+ },
+
formateTime(t) {
if (t) {
return moment(t).format("YYYY骞碝M鏈圖D鏃�")
diff --git a/pages/module_consult/consulthome/consulthome.wxml b/pages/module_consult/consulthome/consulthome.wxml
index 832bf4a..a3d186c 100644
--- a/pages/module_consult/consulthome/consulthome.wxml
+++ b/pages/module_consult/consulthome/consulthome.wxml
@@ -32,37 +32,61 @@
<switch-tab tabList="{{tabList}}" pageList="{{pageList}}">
- <view slot="slot{{index}}" wx:for="{{pageList}}" wx:for-item="page" wx:key="index">
+ <view slot="slot{{i1}}" wx:for="{{pageList}}" wx:for-item="page" wx:key="i1" wx:for-index="i1">
<block wx:if="{{page.length > 0}}">
- <view wx:for="{{page}}" wx:key="cIndex" wx:for-index="cIndex" data-index="{{cIndex}}" bindtap="gotoDetail">
- <view class="fyui-box fyui-box__text">
- <view class="fyui-box__hd">
- {{item.mfName}}
- </view>
- <view class="fyui-box__bd">
- <view class="fyui-box__content tag">
- <view>鏂囦欢绫诲埆锛歿{item.mfFileType}}</view>
- <view>鐢熸晥鏃堕棿锛歿{item.mfEffectiveDate}}</view>
- <view>鏂囧彿锛歿{item.mfReferenceNumber}}</view>
- <view>鐩稿叧琛屼笟 -> {{item.mfFileIndustry}}</view>
+ <block wx:if="{{i1 == 0 || i1 == 1}}">
+ <view wx:for="{{page}}" wx:key="i2" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoFile">
+ <view class="fyui-box fyui-box__text">
+ <view class="fyui-box__hd">
+ {{item.mfName}}
</view>
- <view class="fyui-box__content des">{{item.mfSummary}}</view>
- </view>
- <view class="fyui-box__ft">
- <text class="keyword">鍏抽敭璇嶏細</text>
- <view class="keyword-item">
- <text wx:for="{{item.mfKeywordLv1}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text>
+ <view class="fyui-box__bd">
+ <view class="fyui-box__content tag">
+ <view>鏂囦欢绫诲埆锛歿{item.mfFileType}}</view>
+ <view>鐢熸晥鏃堕棿锛歿{item.mfEffectiveDate}}</view>
+ <view>鏂囧彿锛歿{item.mfReferenceNumber}}</view>
+ <view>鐩稿叧琛屼笟 -> {{item.mfFileIndustry}}</view>
+ </view>
+ <view class="fyui-box__content des">{{item.mfSummary}}</view>
+ </view>
+ <view class="fyui-box__ft">
+ <text class="keyword">鍏抽敭璇嶏細</text>
+ <view class="keyword-item">
+ <text wx:for="{{item.mfKeywordLv1}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text>
+ </view>
</view>
</view>
</view>
- </view>
+ </block>
+
+ <block wx:else="{{i1 == 2}}">
+ <view wx:for="{{page}}" wx:key="i2" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoItem">
+ <view class="fyui-box fyui-box__text">
+ <view class="fyui-box__hd">
+ <rich-text nodes="{{item.miItemContent}}" 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.miChapterName}} {{item.miItemName ? ' ' + item.miItemName : ''}}</text>
+ <text class="tag2">鎵�灞炴枃浠讹細銆妠{item.mfName}}銆�</text>
+ <text class="tag2" wx:if="{{item.miReferenceNumber}}">鎵�灞炴枃鍙凤細{{item.miReferenceNumber}}</text>
+ </view>
+ <view class="fyui-box__ft">
+ <!-- <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>
</block>
+
<view wx:else class="page__ft">
<mp-loading duration="{{900}}" type="dot-gray" show="{{true}}" animated="{{true}}"></mp-loading>
-
-</view>
-
+ </view>
</view>
</switch-tab>
diff --git a/pages/module_consult/consulthome/consulthome.wxss b/pages/module_consult/consulthome/consulthome.wxss
index dab8746..3b16beb 100644
--- a/pages/module_consult/consulthome/consulthome.wxss
+++ b/pages/module_consult/consulthome/consulthome.wxss
@@ -86,4 +86,13 @@
.fyui-box__text .fyui-box__bd .tag {
margin-bottom: 8px;
font-size: 14px;
+}
+
+.subtitle{
+ font-size: 15px;
+}
+
+.tag2{
+ font-size: 12px;
+ color: var(--fyui-text-color_3);
}
\ No newline at end of file
diff --git a/pages/module_consult/consultresult/consultresult.wxml b/pages/module_consult/consultresult/consultresult.wxml
index aa66034..29c8d0c 100644
--- a/pages/module_consult/consultresult/consultresult.wxml
+++ b/pages/module_consult/consultresult/consultresult.wxml
@@ -32,11 +32,16 @@
</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>
+ <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>
</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>
+ <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>
diff --git a/pages/module_consult/consultresult/consultresult.wxss b/pages/module_consult/consultresult/consultresult.wxss
index f3d3371..10c1245 100644
--- a/pages/module_consult/consultresult/consultresult.wxss
+++ b/pages/module_consult/consultresult/consultresult.wxss
@@ -49,4 +49,22 @@
.btn-more:active{
background-color: var(--fyui-BG-COLOR-ACTIVE);
+}
+
+.tag3{
+ font-size: 10px;
+ background-color: var(--fyui-primary-color);
+ color: white;
+ border-radius: 2px;
+ padding: 2px 4px;
+ white-space: nowrap;
+ margin-right: 10px;
+}
+
+.tag3_disable{
+ background-color: var(--fyui-text-color_3);
+}
+
+.fyui-box__text .fyui-box__ft{
+ justify-content: flex-start;
}
\ No newline at end of file
diff --git a/pages/module_learn/behaviors/beLearn.js b/pages/module_learn/behaviors/beLearn.js
new file mode 100644
index 0000000..cf71a7b
--- /dev/null
+++ b/pages/module_learn/behaviors/beLearn.js
@@ -0,0 +1,65 @@
+const app = getApp()
+
+/**
+ * 瀹堟硶瀛︿範鏉愭枡鐨勮幏鍙栧拰鎵撳紑
+ */
+module.exports = Behavior({
+ data: {
+ resources: [],
+ },
+ methods: {
+ /**
+ * 瀹堟硶瀛︿範鏉愭枡鍐呭璺宠浆
+ */
+ behaviorOpenFile: function (f) {
+ var url = ""
+ switch (f.lrResourcefiletype) {
+ //鏂囨。
+ case 1:
+ let bodyUrl = f.lrBodyurl
+ wx.showLoading({
+ title: ' 鏂囦欢涓嬭浇涓�',
+ mask: true,
+ })
+ wx.downloadFile({
+ url: bodyUrl,
+ success: function (res) {
+ wx.hideLoading()
+ const filePath = res.tempFilePath
+ wx.openDocument({
+ filePath: filePath,
+ success: function (res) {
+ console.log('鎵撳紑鏂囨。鎴愬姛')
+ },
+ fail(error) {
+ console.log(error);
+ }
+ })
+ }
+ })
+ break;
+ //閾炬帴
+ case 2:
+ url = ""
+ break;
+ //鍥剧墖
+ case 3:
+ url = ""
+ break;
+ //瑙嗛
+ case 4:
+ url = "/pages/module_common/pagevideo/pagevideo"
+ break;
+ }
+ if (url != "") {
+ wx.navigateTo({
+ url: url,
+ success: (res) => {
+ // 閫氳繃 eventChannel 鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('acceptDataFromOpenerPage', f)
+ },
+ })
+ }
+ }
+ }
+})
\ No newline at end of file
diff --git a/pages/module_learn/learfile/learnfile.js b/pages/module_learn/learfile/learnfile.js
new file mode 100644
index 0000000..c6a5e29
--- /dev/null
+++ b/pages/module_learn/learfile/learnfile.js
@@ -0,0 +1,66 @@
+// pages/module_learn/learfile/learnfile.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/module_learn/learfile/learnfile.json b/pages/module_learn/learfile/learnfile.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/module_learn/learfile/learnfile.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/module_learn/learfile/learnfile.wxml b/pages/module_learn/learfile/learnfile.wxml
new file mode 100644
index 0000000..ec2c3bb
--- /dev/null
+++ b/pages/module_learn/learfile/learnfile.wxml
@@ -0,0 +1,34 @@
+<!--pages/module_learn/learfile/learnfile.wxml-->
+<view class="page__bd ">
+ <view wx:for="{{resources}}" wx:key="index" wx:item="item" bindtap="openFile" data-index="{{index}}">
+ <view wx:if="{{item.lrResourcefiletype != 4}}" class="fyui-box fyui-panel">
+ <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 wx:else class="fyui-panel fyui-panel_video">
+ <view style="position: relative;">
+ <image src="{{item.lrPicurl}}" class="video-poster" mode="aspectFit" />
+ <mp-icon class="video-play" icon="play" color="white" size="50" type="filled"></mp-icon>
+ </view>
+ <view class="video-title">{{item.lrResourcetitle}}</view>
+ <view class="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 class="page__ft"></view>
\ No newline at end of file
diff --git a/pages/module_learn/learfile/learnfile.wxss b/pages/module_learn/learfile/learnfile.wxss
new file mode 100644
index 0000000..6cad3ae
--- /dev/null
+++ b/pages/module_learn/learfile/learnfile.wxss
@@ -0,0 +1 @@
+/* pages/module_learn/learfile/learnfile.wxss */
\ No newline at end of file
diff --git a/pages/module_learn/learn/learn.js b/pages/module_learn/learn/learn.js
new file mode 100644
index 0000000..7b9b47f
--- /dev/null
+++ b/pages/module_learn/learn/learn.js
@@ -0,0 +1,179 @@
+// pages/learn/learn.js
+const lawservice = require("../../../service/lawservice")
+const moment = require('../../../utils/moment.min')
+const beLearn = require('../behaviors/beLearn')
+const app = getApp()
+
+Page({
+ behaviors: [beLearn],
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ currentTab: 0,
+ tabList: [{
+ "name": "VOCs鎺掓斁"
+ },
+ {
+ "name": "鍙拌处"
+ },
+ {
+ "name": "娌荤悊璁炬柦璁惧"
+ },
+ {
+ "name": "鍦ㄧ嚎鐩戞祴璁惧"
+ }
+ ],
+ pageList: [
+
+ ],
+ banners: [
+ {
+ pic: '',
+ url: '',
+ fileType: ''
+ },
+ ],
+ resources: [],
+ text2: [{
+ title: "鍥犺繚绔犲缓绛戝鑷存墽娉�",
+ content: "鎵ф硶鎻忚堪锛氱幆淇濅富绠￠儴闂ㄥ彲璋冮槄骞朵綔涓烘墽娉曟函婧愪緷鎹箣涓�鐜繚涓荤閮ㄩ棬鍙皟闃呭苟浣滀负鎵ф硶婧簮渚濇嵁涔嬩竴",
+ tags: ['杩濇硶鎼缓', '渚濇硶鎷嗛櫎'],
+ views: 123,
+ time: '2021骞�3鏈�2鏃�',
+ likes: 233
+ }, {
+ title: "鍥犺繚绔犲缓绛戝鑷存墽娉�",
+ content: "鎵ф硶鎻忚堪锛氱幆淇濅富绠￠儴闂ㄥ彲璋冮槄骞朵綔涓烘墽娉曟函婧愪緷鎹箣涓�鐜繚涓荤閮ㄩ棬鍙皟闃呭苟浣滀负鎵ф硶婧簮渚濇嵁涔嬩竴",
+ tags: ['杩濇硶鎼缓', '渚濇硶鎷嗛櫎'],
+ views: 123,
+ time: '2021骞�3鏈�2鏃�',
+ likes: 233
+ }, {
+ title: "鍥犺繚绔犲缓绛戝鑷存墽娉�",
+ content: "鎵ф硶鎻忚堪锛氱幆淇濅富绠￠儴闂ㄥ彲璋冮槄骞朵綔涓烘墽娉曟函婧愪緷鎹箣涓�鐜繚涓荤閮ㄩ棬鍙皟闃呭苟浣滀负鎵ф硶婧簮渚濇嵁涔嬩竴",
+ tags: ['杩濇硶鎼缓', '渚濇硶鎷嗛櫎'],
+ views: 123,
+ time: '2021骞�3鏈�2鏃�',
+ likes: 233
+ }, {
+ title: "鍥犺繚绔犲缓绛戝鑷存墽娉�",
+ content: "鎵ф硶鎻忚堪锛氱幆淇濅富绠￠儴闂ㄥ彲璋冮槄骞朵綔涓烘墽娉曟函婧愪緷鎹箣涓�鐜繚涓荤閮ㄩ棬鍙皟闃呭苟浣滀负鎵ф硶婧簮渚濇嵁涔嬩竴",
+ tags: ['杩濇硶鎼缓', '渚濇硶鎷嗛櫎'],
+ views: 123,
+ time: '2021骞�3鏈�2鏃�',
+ likes: 233
+ }]
+ },
+ //璁＄畻swiper楂樺害鏂规硶锛堝湪鍒囨崲鐨勬椂鍊欒皟鐢級
+ tabsHeight(element) {
+ let that = this;
+ let query = wx.createSelectorQuery(); //蹇呴』瑕佸厛鍒涘缓涓�涓煡璇�
+ query.select(element).boundingClientRect(function (rect) {
+ that.setData({
+ pageheight: rect.height + 'px'
+ });
+ }).exec();
+ },
+ swichNav: function (e) {
+ var that = this;
+ if (this.data.currentTab === e.target.dataset.current) {
+ return false;
+ } else {
+ that.setData({
+ currentTab: e.target.dataset.current,
+ navScrollLeft: e.target.dataset.current >= 4 ? ((e.target.dataset.current) * 60) : 0 //鍒ゆ柇褰撳墠閫変腑鐨勪釜鏁版槸鍚︽槸绗�5涓�
+ })
+ that.tabsHeight('.page' + e.target.dataset.current); //鏌ヨ鍝竴涓厓绱�
+ }
+ },
+ bindChange: function (e) {
+ var that = this;
+ that.setData({
+ currentTab: e.detail.current,
+ navScrollLeft: e.detail.current >= 4 ? ((e.detail.current) * 60) : 0 //鍒ゆ柇褰撳墠閫変腑鐨勪釜鏁版槸鍚︽槸绗�5涓�
+ });
+ // that.tabsHeight('.page'+e.target.dataset.current); //鏌ヨ鍝竴涓厓绱�
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad: function (options) {
+ // this.tabsHeight('.page0');
+ this.getResources()
+ },
+
+ onReachBottom () {
+ console.log('onReachBottom');
+ if (this.cPage && this.tPage) {
+ if (this.cPage < this.tPage) {
+ this.getResources(this.cPage + 1)
+ }
+ }
+ },
+
+ getBanner() {
+ let banners = []
+ for (let i = 0; i < 6; i++) {
+ const d = this.data.resources[i]
+ banners.push({
+ pic: d.lrPicurl,
+ url: d.lrBodyurl,
+ fileType: d.lrResourcefiletype,
+ })
+ }
+ this.setData({
+ banners
+ })
+ },
+
+ getResources(cPage = 1) {
+ var that = this
+ let user = app.globalData.userInfo
+ lawservice.getLawRegulations(user.guid, cPage, {sceneTypeId: user.extension2}, {
+ 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
+ })
+ if (that.cPage == 1) {
+ that.getBanner()
+ }
+ }
+ }, 10)
+ },
+
+ openFile(e) {
+ var index = e.currentTarget.dataset.index
+ let f = this.data.resources[index]
+ this.behaviorOpenFile(f)
+ },
+ goto: function (e) {
+ var url = ""
+ var index = e.currentTarget.dataset.index
+ switch (index) {
+ case '0':
+ url = '/pages'
+ break;
+ case '1':
+ url = ""
+ break;
+ }
+ if (url != "") {
+ wx.navigateTo({
+ url: url,
+ })
+ }
+ }
+})
\ No newline at end of file
diff --git a/pages/module_learn/learn/learn.json b/pages/module_learn/learn/learn.json
new file mode 100644
index 0000000..c8fcfef
--- /dev/null
+++ b/pages/module_learn/learn/learn.json
@@ -0,0 +1,8 @@
+{
+ "navigationBarTitleText": "瀹堟硶瀛︿範",
+ "navigationBarBackgroundColor": "#65EAD2",
+ "navigationBarTextStyle": "white",
+ "usingComponents": {
+ "mp-icon": "/component/icon/icon"
+ }
+}
\ No newline at end of file
diff --git a/pages/module_learn/learn/learn.wxml b/pages/module_learn/learn/learn.wxml
new file mode 100644
index 0000000..2db44ee
--- /dev/null
+++ b/pages/module_learn/learn/learn.wxml
@@ -0,0 +1,120 @@
+<!--pages/learn/learn.wxml-->
+<view class="page ">
+
+ <!-- <view class="swiper-tab">
+ <scroll-view scroll-left="{{navScrollLeft}}" scroll-x="true" show-scrollbar="false" scroll-with-animation="true">
+ <block wx:for="{{tabList}}" wx:key="i">
+ <view class="swiper-tab-list {{currentTab==index ? 'on' : ''}}" data-current="{{index}}" bindtap="swichNav">{{item.name}}</view>
+ </block>
+ </scroll-view>
+ </view> -->
+ <!-- <swiper current="{{currentTab}}" class="swiper-box" duration="300" bindchange="bindChange" style="height: {{pageheight}};">
+ <block wx:for="{{pageList}}" wx:for-item="page" wx:key="n">
+
+ <swiper-item>
+
+ <view class="page{{index}}">
+
+ </view>
+ </swiper-item>
+ </block>
+ </swiper> -->
+
+ <view class="page__bd ">
+ <view class="fyui-panel">
+ <swiper indicator-dots="true" autoplay="true" circular="true" interval="2000" duration="500" previous-margin="0px" next-margin="0px">
+ <block wx:for='{{banners}}' wx:key='u'>
+ <swiper-item>
+ <image src='{{item.pic}}' mode="aspectFill" class='swiper-item-images' data-index="{{index}}" bindtap="openFile" />
+ </swiper-item>
+ </block>
+ </swiper>
+ </view>
+
+ <view class="flex-h" style="padding: 8px 10px;">
+ <view class="image-btn" bindtap="goto" data-index="0">
+ <image src="/res/icons/learn_1.png" class="image-btn__2" mode="aspectFit" />
+ <view class="image-btn_title">
+ <view class="image-btn_title_t">鐜繚瀹堟硶</view>
+ <view>瑙嗛銆佹枃妗ｆ潗鏂�</view>
+ <mp-icon class="image-btn_goto" icon="arrow" color="#7F7F7F" size="8" type="filled"></mp-icon>
+ </view>
+
+ </view>
+ <view class="flex-v">
+ <view class="image-btn" style="background-color: #F4EED3;" bindtap="goto" data-index="1">
+ <image src="/res/icons/learn_2.png" class="image-btn__2" mode="aspectFit" />
+ <view class="image-btn_title">
+ <view class="image-btn_title_t">鎵ф硶妗堜緥</view>
+ <view>鐩稿叧鎵ф硶妗堜緥</view>
+ <mp-icon class="image-btn_goto" icon="arrow" color="#7F7F7F" size="8" type="filled"></mp-icon>
+ </view>
+ </view>
+ </view>
+ </view>
+
+ <!-- <view class="fyui-cell fyui-cell_select title">
+ <view class="fyui-cell__bd">鐜繚瀹堟硶</view>
+ <view class="fyui-cell__ft">鏇村</view>
+ </view> -->
+ <view wx:for="{{resources}}" wx:key="index" wx:item="item" bindtap="openFile" data-index="{{index}}">
+ <view wx:if="{{item.lrResourcefiletype != 4}}" class="fyui-box fyui-panel">
+ <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 wx:else class="fyui-panel fyui-panel_video">
+ <view style="position: relative;">
+ <image src="{{item.lrPicurl}}" class="video-poster" mode="aspectFit" />
+ <mp-icon class="video-play" icon="play" color="white" size="50" type="filled"></mp-icon>
+ </view>
+ <view class="video-title">{{item.lrResourcetitle}}</view>
+ <view class="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 class="fyui-cell fyui-cell_select title">
+ <view class="fyui-cell__bd">鎵ф硶妗堜緥</view>
+ <view class="fyui-cell__ft">鏇村</view>
+ </view>
+ <view wx:for="{{text2}}" wx:key="index" data-index="index" wx:for-item="item">
+ <view class="fyui-box fyui-panel fyui-box__text">
+ <view class="fyui-box__hd">
+ {{item.title}}
+ </view>
+ <view class="fyui-box__bd">
+ <view class="fyui-box__content">{{item.content}}</view>
+ <view class="fyui-box__tag">
+ <view wx:for="{{item.tags}}" wx:key="i" data-index="i" wx:for-item="tag">{{tag}}</view>
+ </view>
+ </view>
+ <view class="fyui-box__ft">
+ <view class="flex-h">
+ <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
+ </view>
+ <view class="flex-h">
+ <image src="/res/icons/like.png" class="icon"></image>{{item.likes}}
+ </view>
+ <view>{{item.time}}</view>
+ </view>
+ </view>
+ </view> -->
+
+ </view>
+
+ <view class="page__ft"></view>
+</view>
\ No newline at end of file
diff --git a/pages/module_learn/learn/learn.wxss b/pages/module_learn/learn/learn.wxss
new file mode 100644
index 0000000..6ca3db0
--- /dev/null
+++ b/pages/module_learn/learn/learn.wxss
@@ -0,0 +1,128 @@
+/* pages/learn/learn.wxss */
+.swiper-tab{
+ position: fixed;
+ width: 100%;
+ text-align: center;
+ line-height: 80rpx;
+ white-space: nowrap;
+ z-index: 2;
+ background-color: #65EAD2;
+}
+
+.swiper-tab-list{
+ font-size: 30rpx;
+ display: inline-block;
+ min-width: 18%;
+ padding: 0 1%;
+ color: rgba(255, 255, 255, 0.658);
+}
+
+.on{
+ color: white;
+ font-weight: bold;
+ border-bottom: 4rpx solid white;
+}
+
+.swiper-box{
+ position: absolute;
+ display: block;
+ top: 80rpx;
+ width: 100%;
+ margin-top: 10px;
+ background-color: var(--fyui-BG_1);
+}
+
+.city-item{
+ width: 100%;
+ display: flex;
+ flex-flow: row nowrap;
+ margin-bottom: 10px;
+}
+
+.img{
+ width: 40%;
+ height: 100px;
+}
+
+.text{
+ width: 60%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 24px;
+ border: 1px solid #ddd;
+ box-sizing: border-box;
+}
+
+.swiper-item-images{
+ width: 100%;
+ height: 300rpx;
+}
+
+.image-btn{
+ position: relative;
+ width: 46vw;
+ height: 20vw;
+ background-color: #ECEEF9;
+}
+
+.image-btn_title{
+ position: relative;
+ white-space: nowrap;
+ z-index: 1;
+ color: var(--fyui-text-color_2);
+ font-size: 12px;
+ margin: 10px;
+}
+
+.image-btn_title_t{
+ color: var(--fyui-text-color_1);
+ font-weight: 600;
+ font-size: 16px;
+}
+
+.image-btn__2 {
+ position: absolute;
+ width: 30vw;
+ height: 20vw;
+ /* background-color: red; */
+ right: 0;
+ bottom: 0;
+ z-index: 0;
+}
+
+.image-btn_goto{
+ display: block;
+ background-color: white;
+ width: 20px;
+ height: 20px;
+ text-align: center;
+ border-radius: 50%;
+}
+
+.fyui-panel_video .video-poster {
+ width: 100%;
+ background-color: black;
+}
+
+.fyui-panel_video .video-title{
+ padding: 2px 16px;
+ font-size: 16px;
+}
+
+.fyui-panel_video .video-play {
+ position: absolute;
+ top: calc(50% - 25px);
+ left: calc(50% - 25px);
+ z-index: 10;
+ background-color: rgba(138, 138, 138, 0.712);
+ border-radius: 50%;
+}
+
+.fyui-panel_video .tag{
+ display: flex;
+ justify-content: space-between;
+ font-size: 12px;
+ color: var(--fyui-text-color_2);
+ padding: 4px 16px;
+}
\ No newline at end of file
diff --git a/pages/module_learn/learncase/learncase.js b/pages/module_learn/learncase/learncase.js
new file mode 100644
index 0000000..2a74f2c
--- /dev/null
+++ b/pages/module_learn/learncase/learncase.js
@@ -0,0 +1,66 @@
+// pages/module_learn/learncase/learncase.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/module_learn/learncase/learncase.json b/pages/module_learn/learncase/learncase.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/module_learn/learncase/learncase.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/module_learn/learncase/learncase.wxml b/pages/module_learn/learncase/learncase.wxml
new file mode 100644
index 0000000..e46be67
--- /dev/null
+++ b/pages/module_learn/learncase/learncase.wxml
@@ -0,0 +1,2 @@
+<!--pages/module_learn/learncase/learncase.wxml-->
+<text>pages/module_learn/learncase/learncase.wxml</text>
diff --git a/pages/module_learn/learncase/learncase.wxss b/pages/module_learn/learncase/learncase.wxss
new file mode 100644
index 0000000..e585a82
--- /dev/null
+++ b/pages/module_learn/learncase/learncase.wxss
@@ -0,0 +1 @@
+/* pages/module_learn/learncase/learncase.wxss */
\ No newline at end of file
diff --git a/pages/module_ledger/ledgerhome/ledgerhome.js b/pages/module_ledger/ledgerhome/ledgerhome.js
index b4f9d86..cbdc51f 100644
--- a/pages/module_ledger/ledgerhome/ledgerhome.js
+++ b/pages/module_ledger/ledgerhome/ledgerhome.js
@@ -142,12 +142,16 @@
//閫夐」鍗�
if (s.upLoad) {
s.tag = '/res/icons/round_check_fill.png'
+ s.opacity = 0.2
} else if (s.ledgerFinished) {
s.tag = '/res/icons/warning_yellow.png'
+ s.opacity = 1
} else if (!s.needUpdate) {
- s.tag = '/res/icons/round_check_fill.png'
+ s.tag = '/res/icons/warning_selected.png'
+ s.opacity = 0.5
} else {
s.tag = '/res/icons/warning_red.png'
+ s.opacity = 1
}
if (!map.has(s.ledgerType)) {
map.set(s.ledgerType, [])
diff --git a/pages/module_ledger/ledgerhome/ledgerhome.wxml b/pages/module_ledger/ledgerhome/ledgerhome.wxml
index 55f24c2..caef692 100644
--- a/pages/module_ledger/ledgerhome/ledgerhome.wxml
+++ b/pages/module_ledger/ledgerhome/ledgerhome.wxml
@@ -59,9 +59,9 @@
<!-- </view> -->
<view class="page__bd">
<view class="swiper-tab">
- <scroll-view class="swiper-tab_view" scroll-left="{{navScrollLeft}}" scroll-x="true" show-scrollbar="true" scroll-with-animation="true">
+ <scroll-view class="swiper-tab_view" scroll-into-view="item{{currentTab}}" scroll-x="true" show-scrollbar="true" scroll-with-animation="true">
<block wx:for="{{tabList}}" wx:key="i">
- <view class="swiper-tab-list {{currentTab==index ? 'on' : ''}}" data-current="{{index}}" bindtap="swichNav">
+ <view id="item{{index}}" class="swiper-tab-list {{currentTab==index ? 'on' : ''}}" data-current="{{index}}" bindtap="swichNav">
{{item.name}}
<text wx:if="{{item.tag > 0}}" class="swiper-tab-list__tag">{{item.tag}}</text>
</view>
@@ -72,8 +72,8 @@
<block wx:for="{{pageList}}" wx:for-item="page" wx:key="n" wx:for-index="i1">
<swiper-item>
<view class="ledger-group page{{i1}}">
- <view wx:for="{{page}}" wx:for-item="ledger" wx:key="t" class="ledger-item" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoLedgerDetail">
- <image class="ledger-tag" src="{{ledger.tag}}"></image>
+ <view wx:for="{{page}}" wx:for-item="ledger" wx:key="t" class="ledger-item" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoLedgerDetail" style="opacity: {{ledger.opacity}};">
+ <image class="ledger-tag" src="{{ledger.tag}}" mode="aspectFit"></image>
<image class="ledger-icon" src="{{ledger.iconUrl}}"></image>
<view>{{ledger.ledgerName}}</view>
</view>
diff --git a/pages/module_ledger/ledgerhome/ledgerhome.wxss b/pages/module_ledger/ledgerhome/ledgerhome.wxss
index 577b4fe..ba2eb53 100644
--- a/pages/module_ledger/ledgerhome/ledgerhome.wxss
+++ b/pages/module_ledger/ledgerhome/ledgerhome.wxss
@@ -162,9 +162,9 @@
.ledger-tag {
position: absolute;
- right: 8vw;
+ right: 6vw;
top: 6px;
- width: 16px;
+ width: 32px;
height: 16px;
color: white;
padding: 1px;
diff --git a/pages/module_user/userlogin/userlogin.js b/pages/module_user/userlogin/userlogin.js
index dd378ee..6cf3bfd 100644
--- a/pages/module_user/userlogin/userlogin.js
+++ b/pages/module_user/userlogin/userlogin.js
@@ -119,6 +119,7 @@
userservice.getUserInfo(app.globalData.accessToken.userId, {
success(data) {
app.globalData.userInfo = data
+ app.globalData.isLogin = true
wx.setStorage({
key: 'userInfo',
data: data,
diff --git a/pages/module_user/userloginpw/userloginpw.js b/pages/module_user/userloginpw/userloginpw.js
index 2399e05..5b19a1e 100644
--- a/pages/module_user/userloginpw/userloginpw.js
+++ b/pages/module_user/userloginpw/userloginpw.js
@@ -101,6 +101,7 @@
userservice.getUserInfo(app.globalData.accessToken.userId, {
success(data) {
app.globalData.userInfo = data
+ app.globalData.isLogin = true
wx.setStorage({
key: 'userInfo',
data: data,
diff --git a/project.config.json b/project.config.json
index 4086af7..3278700 100644
--- a/project.config.json
+++ b/project.config.json
@@ -43,7 +43,7 @@
"disableUseStrict": false,
"showES6CompileOption": false,
"useCompilerPlugins": false,
- "ignoreUploadUnusedFiles": true,
+ "ignoreUploadUnusedFiles": false,
"useStaticServer": true,
"minifyWXML": true
},
diff --git a/res/icons/ass_3.png b/res/icons/ass_3.png
new file mode 100644
index 0000000..24c32be
--- /dev/null
+++ b/res/icons/ass_3.png
Binary files differ
diff --git a/res/icons/btn_bg_2.png b/res/icons/btn_bg_2.png
index 6794f4f..8ea19cf 100644
--- a/res/icons/btn_bg_2.png
+++ b/res/icons/btn_bg_2.png
Binary files differ
diff --git a/res/icons/btn_bg_3.png b/res/icons/btn_bg_3.png
deleted file mode 100644
index ff09904..0000000
--- a/res/icons/btn_bg_3.png
+++ /dev/null
Binary files differ
diff --git a/res/icons/btn_bg_4.png b/res/icons/btn_bg_4.png
deleted file mode 100644
index 8095685..0000000
--- a/res/icons/btn_bg_4.png
+++ /dev/null
Binary files differ
diff --git a/res/icons/btn_bg_5.png b/res/icons/btn_bg_5.png
deleted file mode 100644
index 1b327f3..0000000
--- a/res/icons/btn_bg_5.png
+++ /dev/null
Binary files differ
diff --git a/res/icons/complete.png b/res/icons/complete.png
new file mode 100644
index 0000000..63baf7c
--- /dev/null
+++ b/res/icons/complete.png
Binary files differ
diff --git a/res/icons/con_qa.png b/res/icons/con_qa.png
index 5c1fccb..efd9de0 100644
--- a/res/icons/con_qa.png
+++ b/res/icons/con_qa.png
Binary files differ
diff --git a/res/icons/learn_1.png b/res/icons/learn_1.png
new file mode 100644
index 0000000..0df5b35
--- /dev/null
+++ b/res/icons/learn_1.png
Binary files differ
diff --git a/res/icons/learn_2.png b/res/icons/learn_2.png
new file mode 100644
index 0000000..6ab25af
--- /dev/null
+++ b/res/icons/learn_2.png
Binary files differ
diff --git a/res/icons/warning_selected.png b/res/icons/warning_selected.png
new file mode 100644
index 0000000..a465fad
--- /dev/null
+++ b/res/icons/warning_selected.png
Binary files differ
diff --git a/service/baserequest.js b/service/baserequest.js
index 20db2fc..0eec8ca 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.105:8080"
-// const baseUrl = "https://fyami.com.cn:447"
+// const baseUrl = "http://192.168.0.106: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/"
diff --git a/service/consultservice.js b/service/consultservice.js
index 3ef5c06..7f59674 100644
--- a/service/consultservice.js
+++ b/service/consultservice.js
@@ -45,6 +45,18 @@
$f.get(cb)
},
+ //鑾峰彇鐑棬鏉＄洰
+ getTopicItem: function (userId, fun) {
+ let cb = {
+ url: `/consultation/topic/item`,
+ params: {
+ userId: userId,
+ },
+ }
+ Object.assign(cb, fun)
+ $f.get(cb)
+ },
+
//鑾峰彇娉曞緥娉曡鏂囦欢
getMgtFile: function (userId, fileId, fun) {
let cb = {
--
Gitblit v1.9.3