From b45a01a8bee4a9bff5f9c248ead301b8675d1099 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 28 十月 2022 17:22:35 +0800
Subject: [PATCH] 2022.10.28
---
pages/home/home.js | 11 +++
pages/m_user/mine/mine.wxml | 2
pages/m_user/userlogin/userlogin.js | 33 ++++++++---
pages/m_user/behaviors/b_login.js | 2
pages/m_assessment/assessment/assessment.wxml | 7 -
pages/m_assessment/assessment/assessment.js | 15 +++-
pages/m_ledger/ledgerhome/ledgerhome.js | 16 +++--
pages/m_service/p_schedule/p_schedule.js | 15 ++++
pages/m_assessment/gradereport/gradereport.js | 36 ++++++-----
pages/m_ledger/ledgerupload/ledgerupload.js | 2
pages/m_ledger/ledgerhome/ledgerhome.wxml | 10 ++-
pages/m_user/mine/mine.js | 7 +
pages/m_user/userloginpw/userloginpw.js | 8 ++
pages/m_service/p_schedule/p_schedule.wxml | 4
pages/m_assessment/assessment/assessment.wxss | 6 +
pages/home/home.wxml | 2
16 files changed, 117 insertions(+), 59 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 479c736..42c3a83 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -232,8 +232,8 @@
}
});
- monthInfo.percent = Math.round(monthInfo.finishedMust / monthInfo.totalMust * 100)
- monthInfo.percent2 = Math.round(monthInfo.finishedSelf / monthInfo.totalSelf * 100)
+ monthInfo.percent = monthInfo.totalMust == 0 ? 0 : Math.round(monthInfo.finishedMust / monthInfo.totalMust * 100)
+ monthInfo.percent2 = monthInfo.totalSelf == 0 ? 0 : Math.round(monthInfo.finishedSelf / monthInfo.totalSelf * 100)
this.setData({monthInfo})
},
@@ -302,6 +302,13 @@
wx.navigateTo({
url: url
})
+ } else {
+ wx.showToast({
+ title: '鍔熻兘鏁鏈熷緟',
+ duration: 1000,
+ icon: 'none',
+ mask: true,
+ })
}
}
})
\ No newline at end of file
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 46615d3..6d0afc2 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -123,7 +123,7 @@
<view class="fyui-box__tag">
<view>{{item.time}}</view>
<view class="flex-h">
- <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
+ <image src="/res/icons/view.png" class="image-16"></image>{{item.views}}
</view>
</view>
</view>
diff --git a/pages/m_assessment/assessment/assessment.js b/pages/m_assessment/assessment/assessment.js
index 3079544..0bc27ea 100644
--- a/pages/m_assessment/assessment/assessment.js
+++ b/pages/m_assessment/assessment/assessment.js
@@ -296,16 +296,16 @@
}
break;
case "1":
- //
+ //鍘嗗彶璇勪及璁板綍璇︽儏
var period = e.currentTarget.dataset.period
url = `/pages/m_assessment/gradereport/gradereport?period=${period}`
break;
case "2":
- //
+ //纰虫帓鏀炬櫤鑳戒及绠�
url = ""
- return;
+ break;
case "3":
- //
+ //鍏朵粬涓撻」鑷祴
url = ""
break;
case "4":
@@ -317,6 +317,13 @@
wx.navigateTo({
url: url
})
+ } else {
+ wx.showToast({
+ title: '鍔熻兘鏁鏈熷緟',
+ duration: 1000,
+ icon: 'none',
+ mask: true,
+ })
}
}
})
\ No newline at end of file
diff --git a/pages/m_assessment/assessment/assessment.wxml b/pages/m_assessment/assessment/assessment.wxml
index deeb1f6..ff8b50e 100644
--- a/pages/m_assessment/assessment/assessment.wxml
+++ b/pages/m_assessment/assessment/assessment.wxml
@@ -36,7 +36,7 @@
<!-- <mp-icon icon="arrow" class="" size="15" color="white"></mp-icon> -->
</view>
<view class="flex-h">
- <view class="flex-h_block">
+ <view class="flex-h_block" bindtap="goto" data-index="2">
<view class="top-card">
<image src="/res/icons/ass_2.png" mode="aspectFit"></image>
<view>
@@ -45,7 +45,7 @@
</view>
</view>
</view>
- <view class="flex-h_block">
+ <view class="flex-h_block" bindtap="goto" data-index="3">
<view class="top-card top-card_2">
<image src="/res/icons/ass_1.png" mode="aspectFit"></image>
<view>
@@ -99,9 +99,6 @@
</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>
- </view> -->
</view>
</view>
</view>
diff --git a/pages/m_assessment/assessment/assessment.wxss b/pages/m_assessment/assessment/assessment.wxss
index 5e00253..1c152f1 100644
--- a/pages/m_assessment/assessment/assessment.wxss
+++ b/pages/m_assessment/assessment/assessment.wxss
@@ -106,7 +106,8 @@
.top-card {
position: relative;
border-radius: 4px;
- background: linear-gradient(90deg, #A3D9F5, #88E1EC);
+ /* background: linear-gradient(90deg, #A3D9F5, #88E1EC); */
+ background-color: rgb(199, 199, 199);
color: white;
padding: 8px;
margin-left: 10px;
@@ -117,7 +118,8 @@
}
.top-card_2 {
- background: linear-gradient(90deg, #87CEB2, #6CD398);
+ /* background: linear-gradient(90deg, #87CEB2, #6CD398); */
+ background-color: rgb(199, 199, 199);
margin-left: 2px;
margin-right: 10px;
}
diff --git a/pages/m_assessment/gradereport/gradereport.js b/pages/m_assessment/gradereport/gradereport.js
index e3095a0..23db2f7 100644
--- a/pages/m_assessment/gradereport/gradereport.js
+++ b/pages/m_assessment/gradereport/gradereport.js
@@ -156,7 +156,6 @@
onReady: function () {
this.ecComponent = this.selectComponent('#mychart-dom-radar');
this.initChart()
- this.getDetail()
},
/**
@@ -188,22 +187,26 @@
}],
value: [100, 100, 80, 5, 67, 82]
}
- this.ecComponent.init((canvas, width, height, dpr) => {
- // 鑾峰彇缁勪欢鐨� canvas銆亀idth銆乭eight 鍚庣殑鍥炶皟鍑芥暟
- // 鍦ㄨ繖閲屽垵濮嬪寲鍥捐〃
- const chart = echarts.init(canvas, null, {
- width: width,
- height: height,
- devicePixelRatio: dpr // new
+ setTimeout(() => {
+ this.ecComponent.init((canvas, width, height, dpr) => {
+ // 鑾峰彇缁勪欢鐨� canvas銆亀idth銆乭eight 鍚庣殑鍥炶皟鍑芥暟
+ // 鍦ㄨ繖閲屽垵濮嬪寲鍥捐〃
+ const chart = echarts.init(canvas, null, {
+ width: width,
+ height: height,
+ devicePixelRatio: dpr // new
+ });
+ // setOption(chart, data);
+
+ // 灏嗗浘琛ㄥ疄渚嬬粦瀹氬埌 this 涓婏紝鍙互鍦ㄥ叾浠栨垚鍛樺嚱鏁帮紙濡� dispose锛変腑璁块棶
+ this.chart = chart;
+
+ this.getDetail()
+
+ // 娉ㄦ剰杩欓噷涓�瀹氳杩斿洖 chart 瀹炰緥锛屽惁鍒欎細褰卞搷浜嬩欢澶勭悊绛�
+ return chart;
});
- // setOption(chart, data);
-
- // 灏嗗浘琛ㄥ疄渚嬬粦瀹氬埌 this 涓婏紝鍙互鍦ㄥ叾浠栨垚鍛樺嚱鏁帮紙濡� dispose锛変腑璁块棶
- this.chart = chart;
-
- // 娉ㄦ剰杩欓噷涓�瀹氳杩斿洖 chart 瀹炰緥锛屽惁鍒欎細褰卞搷浜嬩欢澶勭悊绛�
- return chart;
- });
+ }, 1000);
},
getDetail() {
@@ -279,6 +282,7 @@
losePoints: losePoints,
losePointsItem: losePointsItem
})
+ debugger
setOption(that.chart, classPoints)
}
})
diff --git a/pages/m_ledger/ledgerhome/ledgerhome.js b/pages/m_ledger/ledgerhome/ledgerhome.js
index f4e2abc..39935de 100644
--- a/pages/m_ledger/ledgerhome/ledgerhome.js
+++ b/pages/m_ledger/ledgerhome/ledgerhome.js
@@ -63,7 +63,7 @@
*/
onLoad(options) {
let now = moment()
- let limitTime = moment().day(this.DEADLINEDAY)
+ let limitTime = moment().date(this.DEADLINEDAY)
//濡傛灉鏄柊娉ㄥ唽鐢ㄦ埛涓嶅埌涓�涓湀锛屽垯涓嶆彁閱掓湰鏈堟儏鍐碉紝鐩存帴鎻愰啋涓嬩釜鏈堢殑鎯呭喌
if (app.globalData.newUser) {
limitTime.add(1, 'M')
@@ -86,6 +86,7 @@
pageList: r[1],
thisMonthInfo: r[2]
})
+ this.tabsHeight('.page0')
}) //鏈湀
this.getLedgerType(now.add(-1, 'M').format('YYYY-MM-DD'), r => {
this.setData({
@@ -147,13 +148,13 @@
//閫夐」鍗�
if (s.upLoad) {
s.tag = '/res/icons/round_check_fill.png'
- s.opacity = 0.2
+ s.opacity = 0.7
} else if (s.ledgerFinished) {
s.tag = '/res/icons/warning_yellow.png'
s.opacity = 1
} else if (!s.needUpdate) {
s.tag = '/res/icons/warning_selected.png'
- s.opacity = 0.5
+ s.opacity = 0.8
} else {
s.tag = '/res/icons/warning_red.png'
s.opacity = 1
@@ -168,16 +169,16 @@
if (monthInfo.finishedMust == 0) {
monthInfo.status = '鏈彁浜�'
if (lastMonth) {
- monthInfo.suggestion = '褰撴湡鍙拌处瀹屽叏鏈彁浜わ紝涓ラ噸褰卞搷璇勪及缁撴灉锛屽悗缁娉ㄦ剰'
+ monthInfo.suggestion = '寤鸿锛氬綋鏈熷彴璐﹀畬鍏ㄦ湭鎻愪氦锛屼弗閲嶅奖鍝嶈瘎浼扮粨鏋滐紝鍚庣画璇锋敞鎰�'
} else {
- monthInfo.suggestion = '璇峰敖蹇彁浜ゅ彴璐�'
+ monthInfo.suggestion = '寤鸿锛氳灏藉揩鎻愪氦鍙拌处'
}
} else if (monthInfo.finishedMust < monthInfo.totalMust) {
monthInfo.status = '閮ㄥ垎鎻愪氦'
if (lastMonth) {
- monthInfo.suggestion = '褰撴湡鍙拌处閮ㄥ垎鏈彁浜わ紝浼氬奖鍝嶈瘎浼扮粨鏋滐紝鍚庣画璇峰敖閲忔彁浜ゆ墍鏈夊彴璐�'
+ monthInfo.suggestion = '寤鸿锛氬綋鏈熷彴璐﹂儴鍒嗘湭鎻愪氦锛屼細褰卞搷璇勪及缁撴灉锛屽悗缁灏介噺鎻愪氦鎵�鏈夊彴璐�'
} else {
- monthInfo.suggestion = '褰撳墠宸叉彁浜ら儴鍒嗗彴璐︼紝璇疯ˉ鍏ㄥ墿浣欏彴璐�'
+ monthInfo.suggestion = '寤鸿锛氬綋鍓嶅凡鎻愪氦閮ㄥ垎鍙拌处锛岃琛ュ叏鍓╀綑鍙拌处'
}
} else {
monthInfo.status = '宸叉彁浜�'
@@ -230,6 +231,7 @@
let pageList = that.data.pageList
pageList[i[0]][i[1]].upLoad = true
pageList[i[0]][i[1]].tag = '/res/icons/round_check_fill.png'
+ pageList[i[0]][i[1]].opacity = 0.7
that.setData({
pageList
})
diff --git a/pages/m_ledger/ledgerhome/ledgerhome.wxml b/pages/m_ledger/ledgerhome/ledgerhome.wxml
index 72bc305..2ff9da2 100644
--- a/pages/m_ledger/ledgerhome/ledgerhome.wxml
+++ b/pages/m_ledger/ledgerhome/ledgerhome.wxml
@@ -4,7 +4,7 @@
<view class="page__hd">
<!-- <view class="fyui-panel"> -->
<view class="head_right" bindtap="changeMonth">
- <text class="head_tag" >{{showThisMonth ? thisMonth + '鏈湀' : lastMonth + '涓婃湀'}}姹囨��</text>
+ <text class="head_tag">{{showThisMonth ? thisMonth + '鏈湀' : lastMonth + '涓婃湀'}}姹囨��</text>
<mp-icon style="margin-left: 4px;" icon="transfer2" color="white" size="{{20}}"></mp-icon>
</view>
<view class="card">
@@ -25,10 +25,12 @@
</view>
<view class="head_row">
<view class="head_tag">鏈湡鍙拌处鎻愪氦鏃ワ細{{deadline}}</view>
- <view wx:if="{{leftday > 0}}" class="head_tag">鍓╀綑<text>{{leftday}}</text>澶�</view>
- <view wx:else class="head_tag">閫炬湡 <text>{{thisMonthInfo.overtime}}</text>澶�</view>
+ <block wx:if="{{thisMonthInfo.percent < 1}}">
+ <view wx:if="{{leftday > 0}}" class="head_tag">鍓╀綑<text>{{leftday}}</text>澶�</view>
+ <view wx:else class="head_tag">閫炬湡 <text>{{thisMonthInfo.overtime}}</text>澶�</view>
+ </block>
</view>
- <view class="head_tag">寤鸿锛歿{thisMonthInfo.suggestion}}</view>
+ <view class="head_tag">{{thisMonthInfo.suggestion}}</view>
</block>
<block wx:else>
diff --git a/pages/m_ledger/ledgerupload/ledgerupload.js b/pages/m_ledger/ledgerupload/ledgerupload.js
index 3ee34f4..c214ad0 100644
--- a/pages/m_ledger/ledgerupload/ledgerupload.js
+++ b/pages/m_ledger/ledgerupload/ledgerupload.js
@@ -95,7 +95,7 @@
//鍙拌处鎻愪氦鎴愬姛鍚�
_success(res) {
this.getOpenerEventChannel().emit('uploadOver', {
- indexGroup: that.data.indexGroup
+ indexGroup: this.data.indexGroup
})
wx.navigateBack({
delta: 1,
diff --git a/pages/m_service/p_schedule/p_schedule.js b/pages/m_service/p_schedule/p_schedule.js
index 4294756..5319c71 100644
--- a/pages/m_service/p_schedule/p_schedule.js
+++ b/pages/m_service/p_schedule/p_schedule.js
@@ -39,6 +39,7 @@
time: s.time.format('MM鏈圖D鏃�'),
name: e.name,
left: s.diffDays,
+ s: s
})
});
}
@@ -54,12 +55,22 @@
})
},
- goto() {
+ goto(e) {
var that = this
+ const index = e.currentTarget.dataset.index
+ const s = that.data.schedules[index[0]].details[index[1]].s
+ const _s = {
+ time: s.time.format('YYYY-MM-DD dddd'),
+ events: s.events,
+ diffDays: s.diffDays,
+ steps: s.steps,
+ category: s.category
+ }
+ console.log(that.data.schedules);
wx.navigateTo({
url: '/pages/m_service/p_scheduledetail/p_scheduledetail',
success: (res) => {
- res.eventChannel.emit('acceptDataFromOpenerPage', that.data.thisSchedule)
+ res.eventChannel.emit('acceptDataFromOpenerPage', _s)
},
})
}
diff --git a/pages/m_service/p_schedule/p_schedule.wxml b/pages/m_service/p_schedule/p_schedule.wxml
index 677d810..ecb8aa0 100644
--- a/pages/m_service/p_schedule/p_schedule.wxml
+++ b/pages/m_service/p_schedule/p_schedule.wxml
@@ -3,9 +3,9 @@
<view>鍏辨湁{{totals}}鏉℃棩绋嬭褰�</view>
</view>
<view class="page__bd">
- <block wx:for="{{schedules}}" wx:key="index">
+ <block wx:for="{{schedules}}" wx:key="i" wx:for-index="i">
<view class="sm-title">{{item.category}}</view>
- <view wx:for="{{item.details}}" wx:key="i" wx:for-item="d" class="sm-card" bindtap="goto">
+ <view wx:for="{{item.details}}" wx:key="j" wx:for-index="j" wx:for-item="d" class="sm-card" data-index="{{[i, j]}}" bindtap="goto">
<view class="sm-time">{{d.time}}</view>
<view class="history_icon">
<view class="history_icon_1">
diff --git a/pages/m_user/behaviors/b_login.js b/pages/m_user/behaviors/b_login.js
index d86c6cc..3c5e064 100644
--- a/pages/m_user/behaviors/b_login.js
+++ b/pages/m_user/behaviors/b_login.js
@@ -15,6 +15,8 @@
},
methods: {
loginPw(accessTokenPW) {
+ // accessTokenPW.nickName = '\xF0\x9F\x98\x84'
+ // debugger
wx.showLoading({
title: '鐧诲綍涓�',
mask: true,
diff --git a/pages/m_user/mine/mine.js b/pages/m_user/mine/mine.js
index 02065b2..ffdc436 100644
--- a/pages/m_user/mine/mine.js
+++ b/pages/m_user/mine/mine.js
@@ -11,7 +11,9 @@
data: {
version: app.globalData.version,
//璁よ瘉鐘舵�侊紝[浼佷笟, 鍦烘櫙, 涓汉]
- authStatus:[]
+ authStatus:[],
+ //鍦烘櫙绫诲瀷
+ sceneType: app.globalData.userInfo.extension2
},
/**
@@ -19,7 +21,8 @@
*/
onLoad: function (options) {
this.setData({
- userRealName: app.globalData.userInfo.realname
+ userRealName: app.globalData.userInfo.realname,
+ sceneType: app.globalData.userInfo.extension2
})
this.getBaseInfo()
},
diff --git a/pages/m_user/mine/mine.wxml b/pages/m_user/mine/mine.wxml
index fe07eae..d50d138 100644
--- a/pages/m_user/mine/mine.wxml
+++ b/pages/m_user/mine/mine.wxml
@@ -17,7 +17,7 @@
<!-- <view>{{authStatus[0] ? '淇敼浼佷笟淇℃伅' : '浼佷笟淇℃伅璁よ瘉'}}</view> -->
<view>浼佷笟淇℃伅璁よ瘉</view>
</view>
- <view bindtap="gotoAuthentication" data-index="1">
+ <view wx:if="{{sceneType == 1}}" bindtap="gotoAuthentication" data-index="1">
<text class="{{authStatus[1] ? 'status-1' : 'status-2'}}">{{authStatus[1] ? '宸茶璇�' : '鏈璇�'}}</text>
<image src="/res/icons/scene_info.png"></image>
<!-- <view>{{authStatus[1] ? '淇敼搴楅摵淇℃伅' : '搴楅摵淇℃伅璁よ瘉'}}</view> -->
diff --git a/pages/m_user/userlogin/userlogin.js b/pages/m_user/userlogin/userlogin.js
index 057d71d..c4509fb 100644
--- a/pages/m_user/userlogin/userlogin.js
+++ b/pages/m_user/userlogin/userlogin.js
@@ -64,7 +64,7 @@
console.log(res);
},
fail(e) {
- console.log(fail);
+ console.log(e);
},
complete() {
that.loginPw(app.globalData.userProfile)
@@ -117,15 +117,30 @@
gotoLogin(toast) {
if (!this.waitAgree()) return
- wx.navigateTo({
- url: '/pages/m_user/userloginpw/userloginpw',
- success: (result) => {
- if (typeof toast === 'function') {
- toast()
- }
+ wx.requestSubscribeMessage({
+ tmplIds: [
+ '6JQFOJ12yBvKfRg_duSdwKiH5_J3LpICmz3Li-L1Cr8',
+ 'zPNMzF5WsshniJyl83DD-lDZtNvx7JyqLbKgqDl0qvU',
+ 'dqREi7vAd03OOirTgBGcm5aCihZJKBjVpiA8Kbu4B8w'
+ ],
+ success(res) {
+ console.log(res);
},
- fail: (res) => {},
- complete: (res) => {},
+ fail(e) {
+ console.log(e);
+ },
+ complete() {
+ wx.navigateTo({
+ url: '/pages/m_user/userloginpw/userloginpw',
+ success: (result) => {
+ if (typeof toast === 'function') {
+ toast()
+ }
+ },
+ fail: (res) => {},
+ complete: (res) => {},
+ })
+ }
})
},
diff --git a/pages/m_user/userloginpw/userloginpw.js b/pages/m_user/userloginpw/userloginpw.js
index 67ac4df..47998bc 100644
--- a/pages/m_user/userloginpw/userloginpw.js
+++ b/pages/m_user/userloginpw/userloginpw.js
@@ -112,7 +112,13 @@
token.userName = this.data.userName
token.password = this.data.password
this.loginPw(token)
- }
+ },
+ fail:(e)=>{
+
+ },
+ complete:()=>{
+
+ },
})
}
--
Gitblit v1.9.3