~liuwh/nsjcy.git

Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

Mr Ke

2020-05-27 0ec802e93557b2b1422ddbd68aafa994fa68f455

refs
author	Mr Ke <kelq@hugeinfo.com.cn>
	Wednesday, May 27, 2020 10:04 +0800
committer	Mr Ke <kelq@hugeinfo.com.cn>
	Wednesday, May 27, 2020 10:04 +0800
commit	0ec802e93557b2b1422ddbd68aafa994fa68f455
tree	be7d0e738c9e6c407717199fb718956318350f58 tree \| zip \| gz
parent	5545fc19893ca0e23818f20eed930850c84edb72 view \| diff c9b0f3fa490afc0aeed1df11a723006aba27316b view \| diff

Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy

# Conflicts:
#	SunshineIns/src/fetch/_fetch.js

3 files deleted

45 files added

21 files modified

	SunshineIns/src/asset/fingerprint/css/box.css	11 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/css/dhtmlx.css	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/image/base_clearImage.jpg	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/image/base_fingerBg.jpg	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/image/base_fingerBg.png	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/image/base_fpRegister_clearImage.jpg	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/image/base_fpVerify.jpg	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/image/base_fpVerify_clearImage.jpg	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/image/base_fpVerify_clearImage.png	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/image/base_notFoundMapPic.jpg	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/image/base_readCard.png	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/image/base_stopReadCard.png	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/image/base_wait.gif	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/js/baseMoth.js	57 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/js/dhtmlxCommon.js	1728 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/js/fingerprint.js	1841 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/js/jquery.js	9420 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/js/main.js	870 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/middleware/zkbioonline.exe	diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/指纹比对.html	72 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/asset/fingerprint/指纹登记.html	68 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/conf/cover.scss	8 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/data/menu.js	10 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/findImage.js	3 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/index.js	4 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialDelete copy.js	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialUpdate.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/index.jsx	11 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/ApplyForEdit.jsx	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/CareList.jsx	36 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/CareListEdit.jsx	244 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/CriminalExecution.jsx	280 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/Login.jsx	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/QuestionDetail.jsx	3 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/TopImage.jsx	135 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/app.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/app.json	5 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/lib/jb_background.png	diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/lib/jb_person.png	diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/lib/jb_phone.png	diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/flyz/flyz.js	103 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/flyz/flyz.json	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/flyz/flyz.wxml	14 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/flyz/flyz.wxss	37 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/index/index.wxml	25 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/qyfwdt/qyfwdt.js	102 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/qyfwdt/qyfwdt.json	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/qyfwdt/qyfwdt.wxml	14 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/qyfwdt/qyfwdt.wxss	38 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/sbbltb/sbbltb.js	105 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/sbbltb/sbbltb.json	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/sbbltb/sbbltb.wxml	14 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/sbbltb/sbbltb.wxss	38 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/wjjb/wjjb.js	10 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zhgh/zhgh.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zhgh/zhgh.wxml	36 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js	16 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml	30 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxss	61 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zhghchildrenInfo/zhghchildrenInfo.js	212 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zhghchildrenInfo/zhghchildrenInfo.json	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zhghchildrenInfo/zhghchildrenInfo.wxml	50 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zhghchildrenInfo/zhghchildrenInfo.wxss	154 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zhwj/zhwj.js	23 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zhwj/zhwj.wxml	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zscqdt/zscqdt.js	104 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zscqdt/zscqdt.json	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zscqdt/zscqdt.wxml	14 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/zscqdt/zscqdt.wxss	38 ●●●●● diff \| view \| raw \| blame \| history