From 0f2fdf16f47bd2d1d8fee86449c3a5095ccc8c23 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 21 十月 2022 18:32:04 +0800
Subject: [PATCH] 首发版本 2022.10.21
---
pages/home/home.js | 10 +
pages/m_user/userlogin/userlogin.js | 46 +++
pages/m_service/c_schedule/c_schedule.wxml | 3
pages/m_user/behaviors/b_login.js | 10 +
res/icons/icon7.png | 0
base/behaviors/b_inputCheck.js | 65 +++--
pages/m_user/userlogin/userlogin.wxml | 2
pages/m_user/p_instructions/p_instructions.wxml | 7
pages/m_user/p_instructions/p_instructions.wxss | 5
app.js | 3
service/baserequest.js | 10
pages/home/home.wxml | 25 +-
pages/m_user/p_support/p_support.json | 4
data/promise.js | 13 +
pages/m_user/p_support/p_support.js | 19 +
pages/m_user/mine/mine.wxml | 26 +
component/inputcell/inputcell.wxml | 22 +-
pages/m_user/p_changepw/p_changepw.js | 84 +++----
res/icons/icon5.png | 0
pages/m_promise/promiseinfo/promiseinfo.wxml | 4
pages/m_promise/promisefile/promisefile.js | 6
pages/m_user/p_instructions/p_instructions.js | 26 ++
pages/m_ledger/ledgerhome/ledgerhome.js | 9
pages/m_user/p_instructions/p_instructions.json | 6
pages/m_promise/promisefile/promisefile.wxml | 5
pages/m_user/p_changepw/p_changepw.wxml | 2
pages/m_assessment/grade/grade.js | 6
app.json | 6
pages/m_user/mine/mine.js | 17 +
pages/m_user/p_support/p_support.wxss | 53 +++++
pages/m_user/p_support/p_support.wxml | 12 +
data/schedules.js | 2
pages/m_promise/promiseinfo/promiseinfo.js | 10
service/userservice.js | 25 ++
res/icons/4-1-我的_slices.zip | 0
pages/m_service/behaviors/b_scheduleManager.js | 29 ++
36 files changed, 427 insertions(+), 145 deletions(-)
diff --git a/app.js b/app.js
index db53ec6..0372651 100644
--- a/app.js
+++ b/app.js
@@ -23,7 +23,8 @@
accessToken: null,
isLogin: false,
version: '浣撻獙鐗� 1.0.0',
- agreement: $f.baseFileUrl + '/agreement/涓皬寰紒涓氱敓鎬佺幆澧冨畧娉曟櫤鑳芥湇鍔″井淇″皬绋嬪簭鏈嶅姟鍗忚.docx'
+ agreement: $f.baseFileUrl + '/agreement/涓皬寰紒涓氱敓鎬佺幆澧冨畧娉曟櫤鑳芥湇鍔″井淇″皬绋嬪簭鏈嶅姟鍗忚.docx',
+ newUser: false,//鏄惁涓烘敞鍐屼竴涓湀浠ュ唴鐨勬柊鐢ㄦ埛
},
// 鏅鸿兘鍜ㄨ缁撴灉绫诲瀷鏂囨湰杞崲
cosultTypeName: (typeId) => {
diff --git a/app.json b/app.json
index d4957c5..a313959 100644
--- a/app.json
+++ b/app.json
@@ -48,12 +48,14 @@
"pages/m_user/sceneauthentication/sceneauthentication",
"pages/m_user/personalauthentication/personalauthentication",
"pages/m_user/p_about/p_about",
- "pages/m_user/p_changepw/p_changepw"
+ "pages/m_user/p_changepw/p_changepw",
+ "pages/m_user/p_support/p_support",
+ "pages/m_user/p_instructions/p_instructions"
],
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
- "navigationBarTitleText": "涓皬寰紒涓氱敓鎬佺幆澧冩櫤鑳芥湇鍔�",
+ "navigationBarTitleText": "涓皬寰紒涓氱敓鎬佺幆澧冨畧娉曟櫤鑳芥湇鍔�",
"navigationBarTextStyle": "black",
"backgroundColor": "#57E4CB"
},
diff --git a/base/behaviors/b_inputCheck.js b/base/behaviors/b_inputCheck.js
index 2697fde..8a1a48c 100644
--- a/base/behaviors/b_inputCheck.js
+++ b/base/behaviors/b_inputCheck.js
@@ -61,6 +61,9 @@
* 淇℃伅瀹屾暣搴︽鏌�
*/
submitCheck() {
+ //娓呯┖缂撳瓨鐨勫瘑鐮�
+ this.lastPW = ''
+
let msg = this.data.msg
//纭淇℃伅瀹屾暣搴�
for (let i = 0; i < msg.length; i++) {
@@ -115,38 +118,44 @@
}
}
//杈撳叆妗�
+ //蹇呭～椤圭┖鐧芥娴�
else if (m.value === "" || m.value === null || m.value === undefined) {
this.showErrorMsg(i)
return false
+ }
+ //杈撳叆妗嗕笅鐨勫瘑鐮佺被鍨嬫娴�
+ else if (m.type == 'password') {
+ //瀵嗙爜涓�鑷存�х‘璁�
+ if (this.lastPW == '') {
+ this.lastPW = m.value
+ } else if (this.lastPW != m.value) {
+ let error = "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�"
+ this.setData({
+ errorMsg: error,
+ })
+ return false
+ }
+ //瀵嗙爜澶嶆潅搴︾‘璁�
+ var pwError
+ var pw = m.value
+ var regex1 = /[a-zA-Z]/
+ var regex2 = /[0-9]/
+ var r = regex1.test(pw) && regex2.test(pw)
+ console.log('regex:' + r);
+ if (pw.length < 6) {
+ pwError = '瀵嗙爜浣嶆暟鏈�灏�6浣�'
+ } else if (!r) {
+ pwError = '瀵嗙爜蹇呴』鍖呭惈瀛楁瘝鍜屾暟瀛�'
+ }
+ if (pwError) {
+ this.setData({
+ errorMsg: pwError,
+ })
+ return false
+ }
+
}
}
-
- // //瀵嗙爜涓�鑷存�х‘璁�
- // if (msg[1].value != msg[2].value) {
- // let error = "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�"
- // this.setData({
- // errorMsg: error,
- // })
- // return false
- // }
- // //瀵嗙爜澶嶆潅搴︾‘璁�
- // var pwError
- // var pw = msg[1].value
- // var regex1 = /[a-zA-Z]/
- // var regex2 = /[0-9]/
- // var r = regex1.test(pw) && regex2.test(pw)
- // console.log('regex:' + r);
- // if (pw.length < 6) {
- // pwError = '瀵嗙爜浣嶆暟鏈�灏�6浣�'
- // } else if (!r) {
- // pwError = '瀵嗙爜蹇呴』鍖呭惈瀛楁瘝鍜屾暟瀛�'
- // }
- // if (pwError) {
- // this.setData({
- // errorMsg: pwError,
- // })
- // return false
- // }
return true
},
@@ -184,7 +193,7 @@
});
this.setData({info})
this.triggerEvent('onSubmit', info)
- if (typeof this._submit === 'function') this._submit()
+ if (typeof this._submit === 'function') this._submit(info)
}
},
}
diff --git a/component/inputcell/inputcell.wxml b/component/inputcell/inputcell.wxml
index bd3e7fe..0058427 100644
--- a/component/inputcell/inputcell.wxml
+++ b/component/inputcell/inputcell.wxml
@@ -1,11 +1,13 @@
-<view class="hr-view"></view>
-<mp-cell ext-class="ext-cell">
- <view slot="title" class="title-cell"><text class="{{item.required != false ? 'required' : 'not-required'}}">*</text>{{item.name}}</view>
- <image wx:if="{{item.src}}" slot="icon" class="header-img" src="{{item.src}}"></image>
+<view wx:if="{{item.show != false}}">
+ <view class="hr-view"></view>
+ <mp-cell ext-class="ext-cell">
+ <view slot="title" class="title-cell"><text class="{{item.required != false ? 'required' : 'not-required'}}">*</text>{{item.name}}</view>
+ <image wx:if="{{item.src}}" slot="icon" class="header-img" src="{{item.src}}"></image>
- <view class="flexbox {{alignLeft?'':'flexbox-end'}}">
- <input wx:if="{{item.input}}" type="{{item.type?item.type:'text'}}" maxlength="{{item.maxLength?item.maxLength:'-1'}}" id="{{item.id?item.id:''}}" placeholder-style="color:{{item.noValue?'red':'#B2B2B2'}};" class="weui-up-input {{inputClass}} {{alignLeft?'':'input-right'}}" bindinput="changeV" value="{{item.value}}" placeholder="{{item.placeholder ? item.placeholder : '璇疯緭鍏�' + item.name}} " />
- <view wx:else="{{text}}" class="weui-up-input {{inputClass}} {{alignLeft?'':'input-right'}}">{{item.value}}</view>
- <view class="unit">{{item.unit}}</view>
- </view>
-</mp-cell>
\ No newline at end of file
+ <view class="flexbox {{alignLeft?'':'flexbox-end'}}">
+ <input wx:if="{{item.input}}" type="{{item.type?item.type:'text'}}" maxlength="{{item.maxLength?item.maxLength:'-1'}}" id="{{item.id?item.id:''}}" placeholder-style="color:{{item.noValue?'red':'#B2B2B2'}};" class="weui-up-input {{inputClass}} {{alignLeft?'':'input-right'}}" bindinput="changeV" value="{{item.value}}" placeholder="{{item.placeholder ? item.placeholder : '璇疯緭鍏�' + item.name}} " />
+ <view wx:else="{{text}}" class="weui-up-input {{inputClass}} {{alignLeft?'':'input-right'}}">{{item.value}}</view>
+ <view class="unit">{{item.unit}}</view>
+ </view>
+ </mp-cell>
+</view>
\ No newline at end of file
diff --git a/data/promise.js b/data/promise.js
new file mode 100644
index 0000000..d458e44
--- /dev/null
+++ b/data/promise.js
@@ -0,0 +1,13 @@
+const text = "涓鸿返琛岀豢鑹插彂灞曠悊蹇碉紝鍔姏钀ラ�犺瘹瀹炲畧淇＄殑绀句細鐜锛岃惤瀹炴柦宸ュ崟浣嶇幆淇濊矗浠伙紝闄嶄綆鍥犵幆澧冪瓑鍥犵礌閫犳垚鐨勬壃灏樻薄鏌撻殣鎮ｅ拰灞呮皯绾犵悍锛岀‘淇濆缓绛戜笟鍋ュ悍鏈夊簭鍙戝睍锛屾湰鍗曚綅锛堟垨鏈汉锛夎嚜鎰夸綔鍑哄涓嬫壙璇猴細\n\n涓�銆佷弗鏍奸伒瀹堝浗瀹躲�佸競銆佸尯鏈夊叧鐜淇濇姢娉曞緥銆佹硶瑙勩�佽绔犮�佹爣鍑嗗拰鏀跨瓥瑙勫畾锛岀Н鏋佸饱琛岀幆澧冧繚鎶ょぞ浼氳矗浠汇�俓n\n浜屻�佷互銆婁笂娴峰競鐜淇濇姢鏉′緥銆嬨�併�婁笂娴峰競澶ф皵姹℃煋闃叉不鏉′緥銆嬨�併�婁笂娴峰競寤鸿宸ョ▼鏂囨槑鏂藉伐绠＄悊瑙勫畾銆嬬瓑瑕佹眰涓轰緷鎹紝绉戝鍒跺畾寤鸿宸ュ湴鎵皹姹℃煋闃叉不鏂规骞跺叕绀猴紝寤虹珛鍋ュ叏浼佷笟鍐呴儴鎵皹闃叉不鏍告煡鏈哄埗锛屽畨鎺掍笓浜鸿礋璐ｆ壃灏橀槻娌讳簨瀹滐紝鍙婃椂璁板綍銆佷繚瀛樿溅杈嗚繘鍑恒�佸啿娲椼�佹磼姘寸瓑鐜繚鍙拌处銆俓n\n涓夈�佸缓璁炬柦宸ュ簲绗﹀悎銆婃枃鏄庢柦宸ユ爣鍑嗐�嬶紙DG/TJ 08-2102-2019 )锛岀瀛﹂厤缃壃灏橀槻娌昏鏂借澶囷紙楂樺帇鍐叉礂璁惧銆佽嚜鍔ㄥ柗娣嬭缃�侀浘鐐溅銆佹磼姘磋溅绛夛級锛屼緷鎵樻妧闃叉帾鏂藉紑灞曠豢鑹叉柦宸ワ紝骞跺姞寮哄鍣０鎺у埗銆佸厜姹℃煋鎺у埗銆佸己鑵愯殌鎬у寲瀛﹀搧绛夊叾浠栨薄鏌撴帶鍒讹紝闃叉瀵瑰懆杈瑰眳姘戦�犳垚鐢熸椿鐜姹℃煋銆俓n\n鍥涖�佷弗鏍兼墽琛屾壃灏樻不鐞嗗叚涓櫨鍒嗙櫨瑕佹眰锛�1銆佹柦宸ュ伐鍦板懆杈�100%鍥存尅锛�2銆佸嚭鍏ヨ溅杈�100%鍐叉礂锛�3銆佹媶杩佸伐鍦�100%婀挎硶浣滀笟锛�4銆佹福鍦熻溅杈�100%瀵嗛棴杩愯緭锛�5銆佹柦宸ョ幇鍦哄湴闈�100%纭寲锛�6銆佺墿鏂欏爢鏀�100%瑕嗙洊銆俓n\n浜斻�侀伒瀹堝叧浜庡嵃鍙戙�婁笂娴峰競鎴垮眿寤虹瓚宸ュ湴鎵皹姹℃煋闃叉不宸ヤ綔鏂规銆嬬殑閫氱煡 锛堟勃寤鸿川瀹夎仈銆�2019銆�208 鍙� 锛夌浉鍏宠瀹氾紝瀹夎甯備綇鎴垮煄涔″缓璁剧鐞嗗鍜屽競鐢熸�佺幆澧冨眬瀹樻柟缃戠珯鍏ず鍏憡鏍忎腑鏈�鏂板叕甯冪殑鍚堟牸渚涘簲鍟嗘彁渚涚殑鎵皹鍦ㄧ嚎鐩戞祴璁惧锛岄』绗﹀悎銆婁笂娴峰競寤虹瓚鏂藉伐棰楃矑鐗╀笌鍣０鍦ㄧ嚎鐩戞祴鎶�鏈鑼冦�嬶紝濮旀墭瑙勮寖鏈嶅姟鍗曚綅瀹氭湡杩愮淮锛屽強鏃惰褰曠浉鍏冲彴璐︼紝纭繚鍏舵甯镐娇鐢紱璁惧鎷嗛櫎銆佺Щ鍔ㄦ垨鍋滆繍椤绘彁鍓嶅悜涓荤閮ㄩ棬鐢宠鎴栧妗堛�俓n\n鍏�佹壃灏樺湪绾跨洃娴嬭澶囧畨瑁呭悗椤荤‘淇濈ǔ瀹氳繍琛岋紝骞跺強鏃朵笌鐢熸�佺幆澧冮儴闂ㄦ补鐑熺洃鎺х郴缁熻仈缃戯紝渚濇嵁銆婁笂娴峰競鎵皹鍦ㄧ嚎鐩戞祴鏁版嵁鎵ф硶搴旂敤瑙勫畾銆嬪畾鏈熷鏍哥洃娴嬫暟鎹紝涓嶈秴鏍囨帓鏀撅紱鎵皹鐩戞祴鏁版嵁鍧氬喅涓嶅紕铏氫綔鍋囷紝涓嶈Е鐘�婄幆澧冪洃娴嬫暟鎹紕铏氫綔鍋囪涓哄垽瀹氬強澶勭悊鍔炴硶銆嬨�俓n\n涓冦�佷笉浣跨敤鏈笂鐜繚鎷嶇収鐨勯潪閬撹矾鏈烘锛屼笉浣跨敤闈炴硶娓犻亾鎴栦笉杈炬爣鏌存补銆俓n\n鍏�佸悓鎰忔湰鎵胯鍚戠ぞ浼氬叕寮�锛屽苟鑷鎺ュ彈鏀垮簻銆佽涓氱粍缁囥�佷富绠￠儴闂ㄥ鎵樼涓夋柟鐩戠鍗曚綅銆佺ぞ浼氬叕浼椼�佹柊闂昏垎璁虹殑鐩戠潱銆�"
+
+const promise = {
+ '1': "涓鸿返琛岀豢鑹插彂灞曠悊蹇碉紝鍔姏钀ラ�犺瘹瀹炲畧淇＄殑绀句細鐜锛岃惤瀹為楗崟浣嶇幆淇濊矗浠�,闄嶄綆鍥犵幆澧冪瓑鍥犵礌閫犳垚鐨勯鍝佸畨鍏ㄩ殣鎮ｅ拰灞呮皯绾犵悍锛岀‘淇濋楗笟鍋ュ悍鏈夊簭鍙戝睍锛屾湰鍗曚綅(鎴栨湰浜�)鑷効浣滃嚭濡備笅鎵胯: \n\n涓�銆佷弗鏍奸伒瀹堝浗瀹躲�佸競銆佸尯鏈夊叧鐜淇濇姢娉曞緥銆佹硶瑙勩�佽绔犮�佹爣鍑嗗拰鏀跨瓥瑙勫畾,鍧氭寔瀹堟硶鐢熶骇缁忚惀, 绉瀬灞ヨ鐜淇濇姢绀句細璐ｄ换銆俓n\n浜屻�佸竷灞�鍜屽缓璁剧鍚堝煄甯傛�讳綋瑙勫垝銆佸競瀹圭殑鐩稿叧瑕佹眰锛屼笉鍦ㄤ互涓嬪尯鍩熸柊寤恒�佹敼寤恒�佹墿寤轰骇鐢熸补鐑熴�佸紓鍛炽�佸簾姘旂殑椁愰ギ鏈嶅姟椤圭洰:灞呮皯浣忓畢妤笺�佹湭閰嶅璁剧珛涓撶敤鐑熼亾鐨勫晢浣忔ゼ浠ュ強鍟嗕綇妤间笌灞呬綇灞傜浉閭荤殑妤煎眰銆俓n\n涓夈�佸畨瑁呮补鐑熷噣鍖栧拰寮傚懗澶勭悊璁炬柦锛屾补鐑熸帓鏀炬祿搴︾鍚堛�婁笂娴峰競椁愰ギ涓氭补鐑熸帓鏀炬爣鍑嗐��(DB 31/844-2014)锛屽苟濮旀墭瑙勮寖鏈嶅姟鍗曚綅鍙傜収銆婃帓娌圭儫璁炬柦娓呮礂鎶�鏈鑼冦��(T/SHXFXH 002-2021)瀹氭湡杩涜缁存姢娓呮礂锛屽強鏃惰褰曠浉鍏冲彴璐︼紝纭繚鍏舵甯镐娇鐢紝闃叉瀵瑰懆杈瑰眳姘戦�犳垚鐢熸椿鐜姹℃煋銆俓n\n鍥涖�佸畨瑁呯鍚堛�奀CAEPI-RG-Y-020-2011銆嬬殑娌圭儫鍦ㄧ嚎鐩戞祴瑁呯疆锛屾牴鎹�婇楗补鐑熷湪绾跨洃娴嬶紙鍏夋暎灏勬硶锛変笌鐩戞帶鎶�鏈鑼冦��(T/SHAEPI 003-2022)锛屽強鏃朵笌鐢熸�佺幆澧冮儴闂ㄦ补鐑熺洃鎺ф暟鎹钩鍙拌仈缃戯紝濮旀墭瑙勮寖鏈嶅姟鍗曚綅瀹氭湡杩愮淮锛屽強鏃惰褰曠浉鍏冲彴璐︼紝纭繚鍏舵甯镐娇鐢紝涓嶈秴鏍囨帓鏀俱�俓n\n浜斻�佸噣鍖栬缃鏈恒�佺┖璋冨鏈哄畨瑁呬綅缃敖閲忚繙绂讳綇鎴凤紝鍋氬ソ闅斿櫔銆侀檷鍣帾鏂斤紝鏄奸棿<60dB銆� 澶滈棿<50aB锛� 纭繚涓嶅櫔澹版壈姘戙�俓n\n鍏�佷笉鍦ㄧ姝㈢殑鍖哄煙(鍦ㄥ綋鍦颁汉姘戞斂搴滅姝㈢殑鏃舵鍜屽尯鍩�)鍐呴湶澶╃儳鐑ら鍝併�俓n\n涓冦�佸湪灞呮皯鍖哄唴浠庝簨椁愰ギ鏈嶅姟锛屼繚璇佷笉鍥犵幆澧冨洜绱犲奖鍝嶅懆鍥村眳姘戞甯哥敓娲伙紝涓�鏃﹀洜鎵版皯绛夐棶棰樺嚭鐜扮殑绾犵悍鐢辨湰鍗曚綅鑷璐熻矗鍗忓晢瑙ｈ瘈骞剁珛鍗虫暣鏀广�俓n\n鍏�佸悓鎰忔湰鎵胯鍚戠ぞ浼氬叕寮�锛屽苟鑷鎺ュ彈鏀垮簻銆佽涓氱粍缁囥�佷富绠￠儴闂ㄥ鎵樼涓夋柟鐩戠鍗曚綅銆佺ぞ浼氬叕浼椼�佹柊闂昏垎璁虹殑鐩戠潱銆�",
+ '2': text,
+ '3': text,
+ '4': text,
+ '5': text,
+ '6': text,
+ '7': "涓鸿返琛岀豢鑹插彂灞曠悊蹇碉紝鍔姏钀ラ�犺瘹瀹炲畧淇＄殑绀句細鐜锛岃惤瀹炴苯淇崟浣嶇幆淇濊矗浠伙紝闄嶄綆鍥犵幆澧冪瓑鍥犵礌閫犳垚鐨勬苯淇畨鍏ㄩ殣鎮ｅ拰灞呮皯绾犵悍锛岀‘淇濇苯淇笟鍋ュ悍鏈夊簭鍙戝睍锛屾湰鍗曚綅锛堟垨鏈汉锛夎嚜鎰夸綔鍑哄涓嬫壙璇猴細\n\n涓�銆佷弗鏍奸伒瀹堝浗瀹躲�佸競銆佸尯鏈夊叧鐜淇濇姢娉曞緥銆佹硶瑙勩�佽绔犮�佹爣鍑嗗拰鏀跨瓥瑙勫畾锛屽潥鎸佸畧娉曠敓浜х粡钀ワ紝绉瀬灞ヨ鐜淇濇姢绀句細璐ｄ换銆俓n\n浜屻�佸缓绔嬪仴鍏ㄧ鐞嗗埗搴︼紝鍔犲己鏃ュ父绠＄悊锛屽缓绔嬪嵄闄╁簾鐗╁彴璐﹀拰绠＄悊璁″垝銆佹薄鏌撻槻娌昏鏂借繍琛岀鐞嗗彴璐︼紝钀藉疄鐜鐩戞祴绛夊悇椤硅姹傦紝钀藉疄鍚勭被鐜椋庨櫓闃茶寖鎺柦銆俓n\n涓夈�佹礂杞﹀簾姘淬�佺淮淇尯鍩熷満鍦板啿娲楀簾姘村叏閮ㄦ敹闆嗭紝缁忎笁绾ф矇鐮傞殧娌规睜澶勭悊鍚庣撼绠℃帓鏀俱�傚簾娌广�佸喎鍐绘恫銆佹鼎婊戞补鍙婇浂閮ㄤ欢鐨勬竻娲楀簾娑层�佹矇娣�娌规偿绛夊崟鐙敹闆嗗洖鏀讹紝绂佹鎺掑叆涓嬫按绯荤粺銆俓n\n鍥涖�佹秹鍙婂柗娑傜瓑浜х敓搴熸皵鎺掓斁鐨勶紝椤诲畨瑁匳OCs澶勭悊璁炬柦锛屾帓鏀剧殑鍚勭被澶ф皵姹℃煋鐗╁簲杈惧埌銆婂ぇ姘旀薄鏌撶墿缁煎悎鎺掓斁鏍囧噯銆嬶紙DB31/933-2015锛夎瀹氱殑鎺掓斁闄愬�艰姹傘�傚簾姘斿噣鍖栬缃畾鏈熺淮鎶わ紝骞跺畾鏈熸洿鎹㈢浉搴旇�楁潗锛堟椿鎬х偔銆佽繃婊ゆ绛夛級锛屽強鏃惰褰曠浉鍏冲彴璐︼紝纭繚鍏舵甯镐娇鐢紝闃叉瀵瑰懆杈瑰眳姘戦�犳垚鐢熸椿鐜姹℃煋銆俓n\n鎵撶（銆佸柗婕嗐�佺儰婕嗐�佺儤骞层�佽皟婕嗐�佸柗鏋竻娲楃瓑浜х敓搴熸皵鐨勫伐搴忓湪瀵嗛棴绌洪棿鍐呰繘琛岋紝鏀堕泦浜х敓鐨勫簾姘旓紝骞剁粡娲绘�х偔鍚搁檮绛夋柟寮忓鐞嗗悗锛岄�氳繃鎺掓皵绛掗珮绌烘帓鏀俱�傛帓姘旂瓛楂樺害涓嶄綆浜�15绫筹紝鍏蜂綋楂樺害鎸夌幆澧冨奖鍝嶈瘎浠疯姹傜‘瀹氥�傚惈VOCs鍘熻緟鏉愭枡锛堝娌规紗銆佹秱鏂欙級鍏ㄨ繃绋嬩繚鎸佸瘑闂紝浣跨敤杩囩▼闅忓彇闅忓紑銆俓n\n浜斻�佹秹鍙婂柗娑傜瓑浜х敓搴熸皵鎺掓斁鐨勶紝鑷効瀹夎绗﹀悎銆婁笂娴峰競鍥哄畾姹℃煋婧愰潪鐢茬兎鎬荤儍鍦ㄧ嚎鐩戞祴绯荤粺楠屾敹鍙婅繍琛屾妧鏈姹傦紙璇曡锛夈�嬬殑VOCs鍦ㄧ嚎鐩戞祴瑁呯疆浠ュ強宸ュ喌鐩戞祴妯″潡鍜岃棰戠洃娴嬫ā鍧楋紝骞跺強鏃朵笌鐢熸�佺幆澧冮儴闂ㄧ浉鍏崇洃鎺х郴缁熻仈缃戯紝濮旀墭瑙勮寖鏈嶅姟鍗曚綅瀹氭湡杩愮淮锛屽強鏃惰褰曠浉鍏冲彴璐︼紝纭繚鍏舵甯镐娇鐢紝涓嶈秴鏍囨帓鏀俱�俓n\n鍏�佷笌鍏锋湁銆婂嵄闄╁簾鐗╃粡钀ヨ鍙瘉銆嬭祫璐ㄥ崟浣嶇璁㈠嵄搴熷缃悎鍚岋紝骞剁‘淇濆悎鍚岀殑鏈夋晥鎬с�傛寜鏃剁紪鍒跺嵄闄╁簾鐗╃鐞嗭紙杞Щ锛夎鍒掑苟鍙婃椂鍚戠幆淇濅富绠￠儴闂ㄥ妗堬紝骞朵弗鏍艰惤瀹炲嵄闄╁簾鐗╄浆绉昏仈鍗曞埗搴︺�傚叾浠栦竴鑸浐浣撳簾鐗╂寜鐓ф湰甯傛湁鍏宠瀹氬Ε鍠勫缃�俓n\n搴熺熆鐗╂补銆佸簾娌规紗娓ｃ�佸簾娌规紗妗�/搴熸満娌规《銆佸簾娲绘�х偔銆佸簾鍚搁檮妫夌瓑杩囨护鍚搁檮浠嬭川銆佸簾鍌寲鍓傚拰搴熼搮閰歌搫鐢垫睜绛変富瑕佸嵄搴熷簲绗﹀悎銆婂嵄闄╁簾鐗╄串瀛樻薄鏌撴帶鍒舵爣鍑嗐�嬶紙GB18597-2001锛夌殑鏈夊叧瑕佹眰锛屾敹闆嗐�佽串瀛樸�佽繍杈撱�佸埄鐢ㄣ�佸缃嵄闄╁簾鐗╃殑璁炬柦銆佸満鎵�锛屽繀椤昏缃嵄闄╁簾鐗╄绀烘爣蹇楀拰璇嗗埆鏍囧織锛屾寜鐓у嵄闄╁簾鐗╃壒鎬у垎绫昏繘琛屾敹闆嗐�佽串瀛橈紝涓嶅悓绫诲簾鐗╅棿鏈夋槑鏄剧殑闂撮殧锛岃串瀛樻恫鎬佹垨鍗婃恫鎬佸嵄搴熺殑搴旇缃硠闇叉恫浣撴敹闆嗚缃紝鍗遍櫓搴熺墿涓嶅緱娣峰叆闈炲嵄闄╁簾鐗╀腑璐瓨銆俓n\n涓冦�侀噰鍙栫患鍚堥殧澹般�佸噺闇囨帾鏂斤紝纭繚鍘傜晫鍣０杈惧埌銆婂伐涓氫紒涓氬巶鐣岀幆澧冨櫔澹版帓鏀炬爣鍑嗐�嬶紙GB12348-2008锛夌浉搴斿０鍔熻兘鍖烘帓鏀鹃檺鍊艰姹傦紝纭繚涓嶅櫔澹版壈姘戙�俓n\n鍏�佸悓鎰忔湰鎵胯鍚戠ぞ浼氬叕寮�锛屽苟鑷鎺ュ彈鏀垮簻銆佽涓氱粍缁囥�佷富绠￠儴闂ㄥ鎵樼涓夋柟鐩戠鍗曚綅銆佺ぞ浼氬叕浼椼�佹柊闂昏垎璁虹殑鐩戠潱銆�",
+}
+
+export default promise
\ No newline at end of file
diff --git a/data/schedules.js b/data/schedules.js
index 6199654..c4fa397 100644
--- a/data/schedules.js
+++ b/data/schedules.js
@@ -13,7 +13,7 @@
time: moment(`${year}-${mon}-10`),
events: [{
category: `${year}骞�${m}鏈堢幆淇濆伐浣滄棩绋媊,
- name: `鏈湀闇�鎻愪氦鍙拌处`,
+ name: `鏈湀闇�鎻愪氦鐜繚鍙拌处`,
type: 1, //绯荤粺鏃ョ▼
steps: [{
index: '01',
diff --git a/pages/home/home.js b/pages/home/home.js
index 09bf701..479c736 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -212,18 +212,28 @@
let monthInfo = {
totalMust: 0,
finishedMust: 0,
+ totalSelf: 0,
+ finishedSelf: 0
}
subtypes.forEach(s => {
//鏈堝害缁熻
if (s.needUpdate) {
monthInfo.totalMust++
+ //缁熻鑷贰鏌ョ被鍨嬬殑鍙拌处锛岀被鍒负-1锛堟殏瀹氾級
+ if (s.ledgerTypeId == -1) {
+ monthInfo.totalSelf++
+ }
if (s.upLoad) {
monthInfo.finishedMust++
+ if (s.ledgerTypeId == -1) {
+ monthInfo.finishedSelf++
+ }
}
}
});
monthInfo.percent = Math.round(monthInfo.finishedMust / monthInfo.totalMust * 100)
+ monthInfo.percent2 = Math.round(monthInfo.finishedSelf / monthInfo.totalSelf * 100)
this.setData({monthInfo})
},
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 100eb45..46615d3 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,6 +1,6 @@
<!--pages/home/home.wxml-->
<view class="page">
- <cp-notice msg="鎻愰珮娴嬭瘎寰楀垎灏忔妧宸ф潵浜嗭紝蹇偣瀛︿範鍝�" />
+ <!-- <cp-notice msg="鎻愰珮娴嬭瘎寰楀垎灏忔妧宸ф潵浜嗭紝蹇偣瀛︿範鍝�" /> -->
<view class="page__hd">
<view class="page__title">{{userRealName}}</view>
<!-- <view class="page__desc">涓嬫娴嬭瘎鏃堕棿{{nextEvaluationTime}}</view> -->
@@ -48,9 +48,15 @@
</view>
<view class="flex-h_block">
<view class="top-card top-card_2" bindtap="goto" data-index="5">
- <view>
- <view class="top-card__score"><text class="top-card__num">{{monthInfo.percent}}</text>%</view>
- <view class="top-card__time">鍙拌处瀹屾垚鐜� ></view>
+ <view class="flex-h">
+ <view>
+ <view class="top-card__score"><text class="top-card__num">{{monthInfo.percent}}</text>%</view>
+ <view class="top-card__time">鍙拌处瀹屾垚鐜� ></view>
+ </view>
+ <view>
+ <view class="top-card__score"><text class="top-card__num">{{monthInfo.percent2}}</text>%</view>
+ <view class="top-card__time">鑷贰鏌� ></view>
+ </view>
</view>
<image src="/res/icons/wm_ledger.png" mode="aspectFit"></image>
</view>
@@ -66,7 +72,9 @@
</view>
</view>
</view>
- <view class="page__bd">
+ <view class="page__bd" style="padding-top: 8px;">
+ <c-schedule></c-schedule>
+
<view class="fyui-panel" bindtap="goto" data-index="1">
<view class="fyui-cell fyui-cell_select title">
<view class="fyui-cell__hd">
@@ -86,7 +94,7 @@
</view>
</view>
- <view class="flex-h" style="padding: 8px 10px;">
+ <view class="flex-h" style="padding: 8px 10px 0 10px;">
<view class="image-btn" bindtap="goto" data-index="2">
<image src="/res/icons/btn_bg_2.png" class="" />
<text class="image-btn_title">鏅鸿兘鍦ㄧ嚎鍜ㄨ</text>
@@ -100,9 +108,6 @@
<view class="image-btn_goto"></view>
</view>
</view>
-
- <c-schedule></c-schedule>
-
<view class="fyui-panel">
<view class="fyui-cell fyui-cell_select title">
<view class="fyui-cell__hd">
@@ -123,7 +128,7 @@
</view>
</view>
<view class="fyui-box__hd">
- <image src="{{item.pic}}" class="fyui-box__hd_image" mode="aspectFill"/>
+ <image src="{{item.pic}}" class="fyui-box__hd_image" mode="aspectFill" />
</view>
</view>
</view>
diff --git a/pages/m_assessment/grade/grade.js b/pages/m_assessment/grade/grade.js
index 9a0b4a7..5b5d0b4 100644
--- a/pages/m_assessment/grade/grade.js
+++ b/pages/m_assessment/grade/grade.js
@@ -116,11 +116,13 @@
onSubmit: function () {
var itemList = []
+ var totalcount = 0
var evaluations = this.data.evaluations
for (let i = 0; i < evaluations.length; i++) {
const e1 = evaluations[i];
for (let y = 0; y < e1.sub1.length; y++) {
const e2 = e1.sub1[y];
+ totalcount++
for (let t = 0; t < e2.sub2.length; t++) {
const s2 = e2.sub2[t];
if (s2.select) {
@@ -133,9 +135,9 @@
}
}
- if (itemList.length == 0) {
+ if (itemList.length < totalcount) {
wx.showToast({
- title: '璇疯嚦灏戦�夋嫨涓�椤硅繘琛岃瘎浼�',
+ title: '璇峰畬鎴愭墍鏈夎瘎浼伴」',
icon: 'none',
})
} else {
diff --git a/pages/m_ledger/ledgerhome/ledgerhome.js b/pages/m_ledger/ledgerhome/ledgerhome.js
index cd0e5dd..f4e2abc 100644
--- a/pages/m_ledger/ledgerhome/ledgerhome.js
+++ b/pages/m_ledger/ledgerhome/ledgerhome.js
@@ -63,8 +63,13 @@
*/
onLoad(options) {
let now = moment()
- let deadline = now.format(`MM-${this.DEADLINEDAY}`)
- let leftday = this.DEADLINEDAY + 1 - now.date()
+ let limitTime = moment().day(this.DEADLINEDAY)
+ //濡傛灉鏄柊娉ㄥ唽鐢ㄦ埛涓嶅埌涓�涓湀锛屽垯涓嶆彁閱掓湰鏈堟儏鍐碉紝鐩存帴鎻愰啋涓嬩釜鏈堢殑鎯呭喌
+ if (app.globalData.newUser) {
+ limitTime.add(1, 'M')
+ }
+ let deadline = limitTime.format(`MM-${this.DEADLINEDAY}`)
+ let leftday = limitTime.diff(now, 'days')
let thisMonth = now.format('YYYY-MM')
let lastMonth = now.add(-1, 'M').format('YYYY-MM')
this.setData({
diff --git a/pages/m_promise/promisefile/promisefile.js b/pages/m_promise/promisefile/promisefile.js
index 4b85580..69c1b43 100644
--- a/pages/m_promise/promisefile/promisefile.js
+++ b/pages/m_promise/promisefile/promisefile.js
@@ -1,4 +1,5 @@
// pages/promisefile/promisefile.js
+import promise from '../../../data/promise'
const promiseservice = require("../../../service/promiseservice")
const app = getApp()
@@ -44,6 +45,11 @@
this.getOpenerEventChannel().on('acceptDataFromOpenerPage', function (data) {
that.commitmentVo = data
})
+
+ let st = app.globalData.userInfo.extension2
+ this.setData({
+ promiseText: promise[st]
+ })
},
/**
diff --git a/pages/m_promise/promisefile/promisefile.wxml b/pages/m_promise/promisefile/promisefile.wxml
index 4fa31c9..84707b7 100644
--- a/pages/m_promise/promisefile/promisefile.wxml
+++ b/pages/m_promise/promisefile/promisefile.wxml
@@ -5,13 +5,14 @@
<view class="fyui-panel">
<view class="p-title">瀹堟硶鎵胯涔�</view>
<text class="p-content">
- 涓烘帹鍔ㄧ粡娴庣ぞ浼氬彲鎸佺画鍙戝睍锛屼笉鏂敼鍠勫尯鍩熺幆澧冭川閲忥紝鍔姏鍔犲揩鐢熸�佸煄甯傚缓璁炬浼愶紝鏈紒涓氶儜閲嶆壙璇猴細\n
+ <!-- 涓烘帹鍔ㄧ粡娴庣ぞ浼氬彲鎸佺画鍙戝睍锛屼笉鏂敼鍠勫尯鍩熺幆澧冭川閲忥紝鍔姏鍔犲揩鐢熸�佸煄甯傚缓璁炬浼愶紝鏈紒涓氶儜閲嶆壙璇猴細\n
涓�銆佺墷鍥烘爲绔嬬幆淇濇剰璇嗐�傛繁鍏ュ紑灞曠幆澧冨浼犳暀鑲诧紝鍊″绉戝鍙戝睍鐞嗗康锛屽姞寮轰紒涓氭枃鍖栧缓璁撅紝鏍戠珛鈥滀繚鎶ょ幆澧冨厜鑽ｏ紝姹℃煋鐜鍙�烩�濇剰璇嗭紝鍧氭寔鍦ㄤ紒涓氬彂灞曚腑鍔犲己鐜淇濇姢锛屽湪淇濇姢鐜涓績杩涗紒涓氬彂灞曘��
寮哄寲淇濇姢鐜灏辨槸淇濇姢缇や紬鍋ュ悍鐨勭ぞ浼氳矗浠绘劅锛屽潥鎸佲�滈闃蹭负涓汇�侀槻娌荤粨鍚堚�濇柟閽堬紝鍒囧疄鑲╄礋璧风幆澧冧繚鎶ょ殑绀句細璐ｄ换锛屼績杩涚ぞ浼氥�佺粡娴庡拰鐜鐨勫彲鎸佺画鍙戝睍銆俓n
浜屻�佷弗鏍奸伒瀹堢幆淇濇硶瑙勩�傚潥鍐宠疮褰昏惤瀹炵幆澧冧繚鎶ゆ斂绛栨硶瑙勫拰鏍囧噯锛屼弗鏍兼墽琛屾帓姹＄敵鎶ュ拰鎺掓薄鏀惰垂绛夊埗搴︼紝鑷閬靛畧寤鸿椤圭洰鐜褰卞搷璇勪环鍜屸�滀笁鍚屾椂鈥濊瀹氾紝涓诲姩鎺ュ彈鐜鐜板満鎵ф硶妫�鏌ュ拰鐩戠潱绠＄悊锛�
鍋氬埌鏃犵幆澧冩薄鏌撲簨鏁呭彂鐢燂紝纭繚鐜璐ㄩ噺鏀瑰杽銆俓n
涓夈�佸垏瀹炲姞寮烘薄鏌撻槻娌汇�傚潥鎸佽蛋绉戞妧鍚噺楂樸�佽祫婧愭秷鑰楀皯銆佺幆澧冩薄鏌撳皯銆佺粡娴庢晥鐩婂ソ鐨勬柊鍨嬪伐涓氬寲閬撹矾銆傚姞寮轰紒涓氳妭鑳藉噺鎺掓姇鍏ュ拰鎶�鏈敼閫犲姏搴︼紝纭繚鑺傝兘鍑忔帓鐩爣鍏ㄩ潰瀹炵幇銆傚姞寮烘薄鏌撴不鐞嗚鏂界殑杩愯绠＄悊锛岀‘淇濆簾姘淬�佸簾姘斻�佸櫔澹板拰鍥哄簾杈炬爣鎺掓斁銆備富鍔ㄦ窐姹拌惤鍚庣殑鐢熶骇璁惧鍜屽伐鑹猴紝绉瀬瀹炴柦娓呮磥鐢熶骇锛屽彂灞曞惊鐜粡娴庯紝鎻愰珮璧勬簮鐨勫悎鐞嗗埄鐢ㄧ巼锛屽噺灏戞薄鏌撶墿鐨勬帓鏀俱�傚埗璁㈢瀛﹀彲琛岀殑绐佸彂鐜浜嬩欢搴旀�ラ妗堬紝骞剁粍缁囧簲鎬ユ紨缁冿紝纭繚鐜瀹夊叏銆俓n
- 鍥涖�佽嚜瑙夋帴鍙楃ぞ浼氱洃鐫ｃ�傚姞寮轰紒涓氱幆澧冪鐞嗭紝寮哄寲璇氫俊鎰忚瘑锛屾仾瀹堢幆淇濅俊鐢紝灏嗚瘹淇＄悊蹇佃疮绌夸簬浼佷笟鐢熶骇缁忚惀鍏ㄨ繃绋嬶紝鍏ㄥ姏鎵撻�犫�滆祫婧愯妭绾﹀瀷鍜岀幆澧冨弸濂藉瀷鈥濅紒涓氬搧鐗屻�傛墡瀹炴帹杩涗紒涓氱幆澧冧俊鎭叕寮�宸ヤ綔锛屼富鍔ㄥ鐞嗗ソ鍘傜兢鍏崇郴锛岃嚜瑙夌淮鎶ゅソ缇や紬鐨勭幆澧冩潈鐩婏紝鑷鎺ュ彈绀句細鍏紬鍜屾柊闂诲獟浣撶洃鐫ｃ�傝繖鏄垜浠悜绀句細浣滃嚭鐨勫簞涓ユ壙璇猴紝鏁绀句細鍚勭晫浜堜互鐩戠潱銆傛垜浠皢杩涗竴姝ュ姞寮鸿嚜寰嬫剰璇嗭紝瑙嗙幆淇濅负浼佷笟鐢熷懡锛屽仛璇氫俊瀹堟硶浼佷笟銆俓n
+ 鍥涖�佽嚜瑙夋帴鍙楃ぞ浼氱洃鐫ｃ�傚姞寮轰紒涓氱幆澧冪鐞嗭紝寮哄寲璇氫俊鎰忚瘑锛屾仾瀹堢幆淇濅俊鐢紝灏嗚瘹淇＄悊蹇佃疮绌夸簬浼佷笟鐢熶骇缁忚惀鍏ㄨ繃绋嬶紝鍏ㄥ姏鎵撻�犫�滆祫婧愯妭绾﹀瀷鍜岀幆澧冨弸濂藉瀷鈥濅紒涓氬搧鐗屻�傛墡瀹炴帹杩涗紒涓氱幆澧冧俊鎭叕寮�宸ヤ綔锛屼富鍔ㄥ鐞嗗ソ鍘傜兢鍏崇郴锛岃嚜瑙夌淮鎶ゅソ缇や紬鐨勭幆澧冩潈鐩婏紝鑷鎺ュ彈绀句細鍏紬鍜屾柊闂诲獟浣撶洃鐫ｃ�傝繖鏄垜浠悜绀句細浣滃嚭鐨勫簞涓ユ壙璇猴紝鏁绀句細鍚勭晫浜堜互鐩戠潱銆傛垜浠皢杩涗竴姝ュ姞寮鸿嚜寰嬫剰璇嗭紝瑙嗙幆淇濅负浼佷笟鐢熷懡锛屽仛璇氫俊瀹堟硶浼佷笟銆俓n -->
+ {{promiseText}}
</text>
<view style="text-align: end;">{{date}}</view>
<view class="flex-h" style="margin-top: 16px;">
diff --git a/pages/m_promise/promiseinfo/promiseinfo.js b/pages/m_promise/promiseinfo/promiseinfo.js
index 1b72d34..0c1c274 100644
--- a/pages/m_promise/promiseinfo/promiseinfo.js
+++ b/pages/m_promise/promiseinfo/promiseinfo.js
@@ -86,7 +86,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad: function (options) {
- let st = this.data.sceneTypeMap[app.globalData.userInfo.extension2]
+ let st = app.globalData.userInfo.extension2
switch (st) {
case '2':
case '3':
@@ -97,8 +97,12 @@
'msg[2].name': '鎶ュ缓鍙�'
})
break;
-
case '1':
+ this.setData({
+ 'msg[2].name': '鐜瘎瀹℃壒鏂囧彿',
+ 'msg[2].show': false,
+ })
+ break;
case '7':
this.setData({
'msg[2].name': '鐜瘎瀹℃壒鏂囧彿'
@@ -111,7 +115,7 @@
break;
}
this.setData({
- sceneType: st
+ sceneType: this.data.sceneTypeMap[st]
})
this.getUserBaseInfo()
},
diff --git a/pages/m_promise/promiseinfo/promiseinfo.wxml b/pages/m_promise/promiseinfo/promiseinfo.wxml
index 65543c5..f5391ea 100644
--- a/pages/m_promise/promiseinfo/promiseinfo.wxml
+++ b/pages/m_promise/promiseinfo/promiseinfo.wxml
@@ -13,7 +13,7 @@
<input-cell wx:for="{{msg}}" wx:key="id" item="{{item}}" bindpassValue="changeMsg"></input-cell>
</mp-cells>
- <view class="flex-h">
+ <!-- <view class="flex-h">
<view>浼佷笟鎵胯绫诲瀷</view>
</view>
<view class="last">
@@ -25,7 +25,7 @@
<view class="weui-cell__bd">{{item.name}}</view>
</label>
</checkbox-group>
- </view>
+ </view> -->
</view>
</view>
<view class="page__ft">
diff --git a/pages/m_service/behaviors/b_scheduleManager.js b/pages/m_service/behaviors/b_scheduleManager.js
index 891862d..a814b9f 100644
--- a/pages/m_service/behaviors/b_scheduleManager.js
+++ b/pages/m_service/behaviors/b_scheduleManager.js
@@ -18,6 +18,23 @@
lifetimes: {
attached: function () {
this.getRecentSchedule()
+ if (app.globalData.newUser) {
+ let today = moment().hour(0).minute(0).second(0).millisecond(0)
+ let s = this.data.allSchedules[this.data.index + 1];
+ let d = s.time.diff(today, 'days')
+ s.diffDays = d
+
+ this.setData({
+ thisSchedule: {
+ time: s.time.format('YYYY-MM-DD dddd'),
+ events: s.events,
+ diffDays: s.diffDays,
+ steps: s.steps,
+ category: s.category
+ },
+ index: this.data.index + 1
+ })
+ }
// this.getAllSchedules()
}
},
@@ -28,19 +45,21 @@
//2. 鎸夌収鏈湴閫昏緫锛屽緱鍑烘渶閭昏繎鏃ョ▼
const schedules = sysSchedules()
//2.1 灏嗗彴璐︺�佽瘎浼般�佹壙璇轰笁椤笰PP鍔熻兘瀹氫箟涓烘棩绋�
- //2.2 閫夋嫨鏈�閭昏繎鐨勪簨椤逛綔涓哄綋鏃ョ殑鎻愰啋浜嬮」
- const today = moment().hour(0).minute(0).second(0).millisecond(0)
+ //2.2 閫夋嫨鏈�閭昏繎鐨勪簨椤逛綔涓哄綋鏃ョ殑鎻愰啋浜嬮」,
+ let today = moment().hour(0).minute(0).second(0).millisecond(0)
let diffDays = 999
let schedule
let index = 0
for (let i = 0; i < schedules.length; i++) {
- const s = schedules[i];
- const d = s.time.diff(today, 'days')
+ let s = schedules[i];
+ let d = s.time.diff(today, 'days')
s.diffDays = d
if (Math.abs(d) < Math.abs(diffDays)) {
+ let _index = i
+
schedule = s
diffDays = d
- index = i
+ index = _index
}
}
//2.3 鏃ョ▼鍦ㄦ椂闂寸淮搴︿笂鍒嗕负涓夌被鎻愰啋锛岄鍛娿�佸綋鏃ャ�佹湭瀹屾垚鐨勯�炬湡鎻愰啋
diff --git a/pages/m_service/c_schedule/c_schedule.wxml b/pages/m_service/c_schedule/c_schedule.wxml
index 45a8f99..5ee04ae 100644
--- a/pages/m_service/c_schedule/c_schedule.wxml
+++ b/pages/m_service/c_schedule/c_schedule.wxml
@@ -3,7 +3,8 @@
<view class="schedule-tag">{{thisSchedule.diffDays > 0 ? 'FUTURE' : (thisSchedule.diffDays == 0 ? 'TODAY' : 'PAST')}}</view>
<view class="schedule-category">
<image class="image-16" src="/res/icons/schedule_1.png"></image>
- <text>{{thisSchedule.events[0].type == 1 ? '绯荤粺鏃ョ▼' : '鐜繚鏃ョ▼'}}</text>
+ <!-- <text>{{thisSchedule.events[0].type == 1 ? '绯荤粺鏃ョ▼' : '鐜繚鏃ョ▼'}}</text> -->
+ <text>鐜繚宸ヤ綔鏃ョ▼</text>
</view>
<view class="schedule-title">{{thisSchedule.events[0].name}}</view>
<view class="schedule-time">
diff --git a/pages/m_user/behaviors/b_login.js b/pages/m_user/behaviors/b_login.js
index 6bd86ca..d86c6cc 100644
--- a/pages/m_user/behaviors/b_login.js
+++ b/pages/m_user/behaviors/b_login.js
@@ -1,4 +1,5 @@
import userservice from '../../../service/userservice'
+import moment from '../../../utils/moment.min'
const app = getApp()
@@ -83,6 +84,15 @@
gotoHomePage() {
userservice.getUserInfo(app.globalData.accessToken.userId, {
success(data) {
+ if (data.uiCreateTime) {
+ const registerTime = moment(data.uiCreateTime)
+ const now = moment()
+ const m1 = now.month()
+ const m2 = registerTime.month()
+ app.globalData.newUser = m1 <= m2
+ }
+ console.log(app.globalData.newUser);
+
app.globalData.userInfo = data
app.globalData.isLogin = true
wx.setStorage({
diff --git a/pages/m_user/mine/mine.js b/pages/m_user/mine/mine.js
index 372e5c7..02065b2 100644
--- a/pages/m_user/mine/mine.js
+++ b/pages/m_user/mine/mine.js
@@ -71,27 +71,34 @@
var url = ""
var index = e.currentTarget.dataset.index
switch (index) {
- case "0":
- url = "/pages/m_user/companyauthentication/companyauthentication"
- break;
case "1":
- url = ""
+ //宸ヤ綔鎻愰啋
+ url = "/pages/m_notice/notice/notice"
break;
case "2":
- url = ""
+ //鎶�鏈敮鎸�
+ url = "/pages/m_user/p_support/p_support"
break;
case "3":
+ //鎴戠殑鏀惰棌
url = ""
break;
case "4":
+ //鎴戣鍜ㄨ
url = "/pages/m_consult/consultonline/consultonline"
break;
case "5":
+ //鐜繚鏃ョ▼
url = "/pages/m_service/p_schedule/p_schedule"
break;
case "6":
+ //鍏充簬
url = "/pages/m_user/p_about/p_about"
break;
+ case "7":
+ //鎿嶄綔鎸囧紩
+ url = "/pages/m_user/p_instructions/p_instructions"
+ break;
}
if (url != "") {
wx.navigateTo({
diff --git a/pages/m_user/mine/mine.wxml b/pages/m_user/mine/mine.wxml
index fe965cd..fe07eae 100644
--- a/pages/m_user/mine/mine.wxml
+++ b/pages/m_user/mine/mine.wxml
@@ -45,20 +45,14 @@
<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="2">
- <view class="fyui-cell__hd">
- <image src="/res/icons/icon5.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="3">
+
+ <!-- <view class="fyui-cell fyui-cell_select title" bindtap="goto" data-index="3">
<view class="fyui-cell__hd">
<image src="/res/icons/my_favor.png" class="icon" />
</view>
<view class="fyui-cell__bd">鎴戠殑鏀惰棌</view>
<view class="fyui-cell__ft"></view>
- </view>
+ </view> -->
<view class="fyui-cell fyui-cell_select title" bindtap="goto" data-index="4">
<view class="fyui-cell__hd">
<image src="/res/icons/my_consult.png" class="icon" />
@@ -73,6 +67,20 @@
<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="7">
+ <view class="fyui-cell__hd">
+ <image src="/res/icons/icon7.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="2">
+ <view class="fyui-cell__hd">
+ <image src="/res/icons/icon5.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="6">
<view class="fyui-cell__hd">
<image src="/res/icons/icon6.png" class="icon" />
diff --git a/pages/m_user/p_changepw/p_changepw.js b/pages/m_user/p_changepw/p_changepw.js
index 9043dbc..6080e17 100644
--- a/pages/m_user/p_changepw/p_changepw.js
+++ b/pages/m_user/p_changepw/p_changepw.js
@@ -1,6 +1,9 @@
// pages/m_user/p_changepw/p_changepw.js
import b_inputCheck from '../../../base/behaviors/b_inputCheck'
import b_loadingToast from '../../../base/behaviors/b_loadingToast'
+import userservice from '../../../service/userservice'
+
+const app = getApp()
Page({
behaviors: [b_inputCheck, b_loadingToast],
@@ -12,7 +15,7 @@
name: "鍘熷瘑鐮�",
id: "oldPassword",
input: true,
- type: 'password',
+ // type: 'password',
value: '',
noValue: false,
},
@@ -42,52 +45,37 @@
},
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
- */
- onHide() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
- */
- onUnload() {
-
- },
-
- /**
- * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- */
- onReachBottom() {
-
- },
-
- /**
- * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
- */
- onShareAppMessage() {
-
+ _submit(e) {
+ if (e.oldPassword == e.newPassword) {
+ this.setData({
+ errorMsg: '鏂板瘑鐮佷笉鑳藉拰鍘熷瘑鐮佺浉鍚�',
+ })
+ return
+ }
+ userservice.changePW(app.globalData.accessToken.userId, e.oldPassword, e.newPassword, {
+ success(res) {
+ if (res.success) {
+ wx.navigateBack({
+ delta: 1,
+ success: () => {
+ wx.showToast({
+ title: res.message,
+ duration: 2000,
+ icon: 'success',
+ mask: true,
+ })
+ }
+ })
+ } else {
+ wx.showToast({
+ title: res.message,
+ duration: 2000,
+ icon: 'error',
+ mask: true,
+ })
+ }
+
+ }
+ })
}
})
\ No newline at end of file
diff --git a/pages/m_user/p_changepw/p_changepw.wxml b/pages/m_user/p_changepw/p_changepw.wxml
index 6ef54d1..ade5ef7 100644
--- a/pages/m_user/p_changepw/p_changepw.wxml
+++ b/pages/m_user/p_changepw/p_changepw.wxml
@@ -1,6 +1,6 @@
<!--pages/m_user/p_changepw/p_changepw.wxml-->
<view class="page">
- <!-- <mp-toptips type="error" msg="{{errorMsg}}" show="{{errorMsg}}" delay="2000"></mp-toptips> -->
+ <mp-toptips type="error" msg="{{errorMsg}}" show="{{errorMsg}}" delay="2000"></mp-toptips>
<view class="page__bd">
<view class="items">
diff --git a/pages/m_user/p_instructions/p_instructions.js b/pages/m_user/p_instructions/p_instructions.js
new file mode 100644
index 0000000..3476c26
--- /dev/null
+++ b/pages/m_user/p_instructions/p_instructions.js
@@ -0,0 +1,26 @@
+// pages/m_user/p_instructions/p_instructions.js
+import $f from "../../../service/baserequest"
+
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ instruction: {
+ picPath: [
+ $f.baseIconUrl + 'instructions-1.png',
+ $f.baseIconUrl + 'instructions-2.png',
+ $f.baseIconUrl + 'instructions-3.png',
+ $f.baseIconUrl + 'instructions-4.png',
+ ],
+ }
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+
+ },
+})
\ No newline at end of file
diff --git a/pages/m_user/p_instructions/p_instructions.json b/pages/m_user/p_instructions/p_instructions.json
new file mode 100644
index 0000000..182a05a
--- /dev/null
+++ b/pages/m_user/p_instructions/p_instructions.json
@@ -0,0 +1,6 @@
+{
+ "navigationBarTitleText": "鎶�鏈寚寮�",
+ "navigationBarBackgroundColor": "#57E4CB",
+ "navigationBarTextStyle": "white",
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/m_user/p_instructions/p_instructions.wxml b/pages/m_user/p_instructions/p_instructions.wxml
new file mode 100644
index 0000000..7aea204
--- /dev/null
+++ b/pages/m_user/p_instructions/p_instructions.wxml
@@ -0,0 +1,7 @@
+<!--pages/m_user/p_instructions/p_instructions.wxml-->
+<view class="page">
+ <view class="page__bd">
+ <image wx:for="{{instruction.picPath}}" wx:key="index" src="{{item}}" class="image" show-menu-by-longpress="true" mode="widthFix"></image>
+ </view>
+ <view class="page__ft"></view>
+</view>
\ No newline at end of file
diff --git a/pages/m_user/p_instructions/p_instructions.wxss b/pages/m_user/p_instructions/p_instructions.wxss
new file mode 100644
index 0000000..b95e486
--- /dev/null
+++ b/pages/m_user/p_instructions/p_instructions.wxss
@@ -0,0 +1,5 @@
+/* pages/m_user/p_instructions/p_instructions.wxss */
+image {
+ display: block;
+ width: 100%;
+}
\ No newline at end of file
diff --git a/pages/m_user/p_support/p_support.js b/pages/m_user/p_support/p_support.js
new file mode 100644
index 0000000..9f04ab1
--- /dev/null
+++ b/pages/m_user/p_support/p_support.js
@@ -0,0 +1,19 @@
+// pages/m_user/p_support/p_support.js
+import $f from "../../../service/baserequest"
+
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ qrcode: $f.baseIconUrl + 'support_qrcode-1.png'
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+
+ },
+})
\ No newline at end of file
diff --git a/pages/m_user/p_support/p_support.json b/pages/m_user/p_support/p_support.json
new file mode 100644
index 0000000..6551e73
--- /dev/null
+++ b/pages/m_user/p_support/p_support.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "鎶�鏈敮鎸�",
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/m_user/p_support/p_support.wxml b/pages/m_user/p_support/p_support.wxml
new file mode 100644
index 0000000..d82e9d4
--- /dev/null
+++ b/pages/m_user/p_support/p_support.wxml
@@ -0,0 +1,12 @@
+<!--pages/m_user/p_support/p_support.wxml-->
+<view class="page">
+ <view class="page__hd">
+ 鎵弿涓嬫柟寰俊浜岀淮鐮佹坊鍔犳妧鏈挩璇�
+ </view>
+ <view class="page__bd">
+ <image show-menu-by-longpress="true" src="{{qrcode}}"></image>
+ <view>涓婃捣椋炵窘鐜繚绉戞妧鏈夐檺鍏徃</view>
+ </view>
+ <view class="page__ft">
+ </view>
+</view>
\ No newline at end of file
diff --git a/pages/m_user/p_support/p_support.wxss b/pages/m_user/p_support/p_support.wxss
new file mode 100644
index 0000000..f6515a7
--- /dev/null
+++ b/pages/m_user/p_support/p_support.wxss
@@ -0,0 +1,53 @@
+/* pages/m_user/p_support/p_support.wxss */
+.title:active {
+ background-color: var(--fyui-BG-COLOR-ACTIVE);
+}
+
+.fyui-cell_select {
+ font-size: 16px;
+ padding-top: 12px;
+ padding-bottom: 12px;
+ border-bottom: 1px solid rgb(238, 238, 238);
+}
+
+.page {
+ justify-content: space-between;
+ background-color: transparent;
+}
+
+.page__hd {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ height: 20vh;
+}
+
+.page__bd {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: flex-start;
+ height: 30vh;
+}
+
+.page__bd>image{
+ width: 56vw;
+ height: 56vw;
+}
+
+.page__bd>view{
+ font-size: 14px;
+ color: var(--fyui-text-color_2);
+ margin-top: 16px;
+}
+
+.page__bd{
+ flex: 1;
+ color: var(--fyui-text-color_1);
+}
+
+.page__ft{
+ font-size: 12px;
+ color: var(--fyui-text-color_3);
+}
\ No newline at end of file
diff --git a/pages/m_user/userlogin/userlogin.js b/pages/m_user/userlogin/userlogin.js
index ddd88f8..057d71d 100644
--- a/pages/m_user/userlogin/userlogin.js
+++ b/pages/m_user/userlogin/userlogin.js
@@ -40,7 +40,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
onReady: function () {
-
+
},
/**
@@ -51,26 +51,58 @@
},
loginWx() {
+ var that = this
if (!this.waitAgree()) return
-
if (app.globalData.userProfile) {
- this.loginPw(app.globalData.userProfile)
- }else {
+ wx.requestSubscribeMessage({
+ tmplIds: [
+ '6JQFOJ12yBvKfRg_duSdwKiH5_J3LpICmz3Li-L1Cr8',
+ 'zPNMzF5WsshniJyl83DD-lDZtNvx7JyqLbKgqDl0qvU',
+ 'dqREi7vAd03OOirTgBGcm5aCihZJKBjVpiA8Kbu4B8w'
+ ],
+ success(res) {
+ console.log(res);
+ },
+ fail(e) {
+ console.log(fail);
+ },
+ complete() {
+ that.loginPw(app.globalData.userProfile)
+ }
+ })
+ } else {
wx.getUserProfile({
lang: 'zh_CN',
desc: '鐢ㄤ簬鏄剧ず锛屾彁绀虹敤鎴峰綋鍓嶅凡鐧诲綍',
- success:(res)=> {
+ success: (res) => {
console.log(res);
wx.setStorage({
data: res.userInfo,
key: 'userProfile',
})
this.loginPw(res.userInfo)
+ },
+ complete() {
+ wx.requestSubscribeMessage({
+ tmplIds: [
+ '6JQFOJ12yBvKfRg_duSdwKiH5_J3LpICmz3Li-L1Cr8',
+ 'zPNMzF5WsshniJyl83DD-lDZtNvx7JyqLbKgqDl0qvU',
+ 'dqREi7vAd03OOirTgBGcm5aCihZJKBjVpiA8Kbu4B8w'
+ ],
+ success(res) {
+ console.log(res);
+ },
+ fail(e) {
+ console.log(e);
+ },
+ complete() {
+ }
+ })
}
})
}
-
+
},
_onLoginFail(e) {
@@ -113,7 +145,7 @@
return true
} else {
wx.showToast({
- title: '璇峰厛鍚屾剰璇存槑',
+ title: '闃呰骞跺悓鎰忔潯娆�',
icon: 'none'
})
return false
diff --git a/pages/m_user/userlogin/userlogin.wxml b/pages/m_user/userlogin/userlogin.wxml
index 0bc52d8..00b1fcc 100644
--- a/pages/m_user/userlogin/userlogin.wxml
+++ b/pages/m_user/userlogin/userlogin.wxml
@@ -12,7 +12,7 @@
<span class="weui-agree__checkbox"></span>
<span class="weui-agree__text">闃呰骞跺悓鎰�</span>
</label>
- <span class="weui-agree__text"><text bindtap="gotoAgreement">銆婁腑灏忎紒涓氬畧娉曟湇鍔″钩鍙扮敤鎴锋潯娆俱��</text>
+ <span class="weui-agree__text"><text bindtap="gotoAgreement">銆婁腑灏忓井浼佷笟鐢熸�佺幆澧冨畧娉曟櫤鑳芥湇鍔＄敤鎴锋潯娆俱��</text>
<!-- 鍙�<text>銆婇殣绉佹潯娆俱��</text> -->
</span>
</view>
diff --git "a/res/icons/4-1-\346\210\221\347\232\204_slices.zip" "b/res/icons/4-1-\346\210\221\347\232\204_slices.zip"
new file mode 100644
index 0000000..79e2fdf
--- /dev/null
+++ "b/res/icons/4-1-\346\210\221\347\232\204_slices.zip"
Binary files differ
diff --git a/res/icons/icon5.png b/res/icons/icon5.png
index 7de6039..28aef17 100644
--- a/res/icons/icon5.png
+++ b/res/icons/icon5.png
Binary files differ
diff --git a/res/icons/icon7.png b/res/icons/icon7.png
new file mode 100644
index 0000000..343ae35
--- /dev/null
+++ b/res/icons/icon7.png
Binary files differ
diff --git a/service/baserequest.js b/service/baserequest.js
index 60611b2..3a5e333 100644
--- a/service/baserequest.js
+++ b/service/baserequest.js
@@ -11,12 +11,12 @@
const util = require("../utils/util.js")
const originProperties = ['url', 'data', 'header', 'method', 'success', 'fail', 'complete'];
-const baseUrl = "http://192.168.0.137:8080"
+// const baseUrl = "http://192.168.0.137:8080"
// const baseUrl = "https://fyami.com.cn:447"
-// const baseUrl = "https://fyami.com.cn"
+const baseUrl = "https://fyami.com.cn"
-// const bu = "https://fyami.com.cn"
-const bu = "https://fyami.com.cn:447"
+const bu = "https://fyami.com.cn"
+// const bu = "https://fyami.com.cn:447"
const basePicUrl = `${bu}/images/`
const baseIconUrl = `${bu}/images/weixin/eplaw/`
const baseFileUrl = `${bu}/meeting/file/`
@@ -62,7 +62,7 @@
console.log("--------------璇锋眰閿欒----------------" + fun.url);
console.log(error);
wx.showToast({
- title: error.errMsg,
+ title: '璇锋眰澶辫触',
icon: 'none',
duration: 2000
})
diff --git a/service/userservice.js b/service/userservice.js
index 1b3a8f3..056d9ca 100644
--- a/service/userservice.js
+++ b/service/userservice.js
@@ -88,4 +88,29 @@
$f.get(cb)
},
+
+ //淇敼瀵嗙爜
+ changePW(userId, oldP, newP, fun) {
+ let cb = {
+ url: `/userInfo/password/change`,
+ params: {
+ userId: userId,
+ oldPassword: oldP,
+ newPassword: newP
+ }
+ }
+ Object.assign(cb, fun)
+
+ $f.post(cb)
+ },
+
+ subscribeResult(event, fun) {
+ let cb = {
+ url: `/wxuser/message/subscribe/result`,
+ data: event
+ }
+ Object.assign(cb, fun)
+
+ $f.post(cb)
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3