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

# Conflicts:
#	SunshineIns/src/fetch/_fetch.js
#	SunshineIns/src/fetch/index.js
#	SunshineIns/src/page/Active.jsx
#	SunshineIns/src/page/Login.jsx
#	SunshineIns/src/view/BulidMakingView/index.jsx
#	SunshineIns/src/view/BulidMakingView/style.scss
#	SunshineIns/src/view/HeadView/style.scss
#	SunshineIns/src/view/TableBtnView/style.scss
#	SunshineLnsMinApp/app.js
#	SunshineLnsMinApp/app.json
#	SunshineLnsMinApp/app.wxss
#	SunshineLnsMinApp/pages/index/index.js
#	SunshineLnsMinApp/pages/index/index.wxml
#	SunshineLnsMinApp/pages/index/index.wxss
#	SunshineLnsMinApp/pages/junctionStation/junctionStation.js
#	SunshineLnsMinApp/project.config.json
#	package.json