~liuwh/nsjcy.git

forked from nsjcy/frontEnd/nsjcy

$LAPTOP-RI7D261L\Mr Ke$

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

LAPTOP-RI7D261L\Mr Ke

2020-02-26 a92f3c4d10bebbdc55270e72ccd97cd1ba7d4e28

refs
author	LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
	Wednesday, February 26, 2020 16:40 +0800
committer	LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
	Wednesday, February 26, 2020 16:40 +0800
commit	a92f3c4d10bebbdc55270e72ccd97cd1ba7d4e28
tree	f74a1aa8c9c1aa6083e34d3f9b27ce479df3bcab tree \| zip \| gz
parent	8f619dde9e2382fc8a4f1e04fafde1418f06165b view \| diff b321fc6111c6483e3b2e501620d2e7ffc6a22f15 view \| diff

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

# Conflicts:
#	SunshineIns/src/fetch/index.js
#	SunshineIns/src/index.jsx

14 files added

27 files modified

	SunshineIns/src/asset/image/sign.png	diff \| view \| raw \| blame \| history
	SunshineIns/src/data/menu.js	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/_fetch.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/activeManage.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/addResult.js	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/entryQuery.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/index.js	14 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/signinfo.js	5 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialCompany.js	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialCompanyDetail.js	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialCompanySave.js	8 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialCompanydelete.js	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/fetch/socialQuery.js	2 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/index.jsx	3 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/ActiveManage.jsx	247 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/ActiveManageEdit.jsx	127 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/ApplyFor.jsx	107 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/ApplyForEdit.jsx	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/CareList.jsx	144 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/CareListEdit.jsx	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/Examine.jsx	113 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/ExamineEdit.jsx	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/PoliceSecurity.jsx	96 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/SignIn.jsx	82 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/UnderAgeList.jsx	224 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/page/policeSecurityEdit.jsx	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/view/CommonSearchForm/index.jsx	253 ●●●●● diff \| view \| raw \| blame \| history
	SunshineIns/src/view/CommonSearchForm/style.scss	13 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/app.json	1 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/activityDetail/activityDetail.js	112 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml	113 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/activityDetail/activityDetail.wxss	1 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js	132 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml	170 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxss	9 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/me/me.js	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/me/me.wxml	10 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/myTranslate/myTranslate.js	146 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/myTranslate/myTranslate.json	6 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/myTranslate/myTranslate.wxml	26 ●●●●● diff \| view \| raw \| blame \| history
	SunshineLnsMinApp/pages/myTranslate/myTranslate.wxss	111 ●●●●● diff \| view \| raw \| blame \| history