forked from nsjcy/frontEnd/nsjcy
parent: a2789abb | patch | commit | ignore whitespace
LAPTOP-RI7D261L\Mr Ke
2020-02-13 57a2d36b6bf715b4e838f1cd306002022ca47790 
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
1 files added
17 ■■■■■ changed files
project.config.json 17 ●●●●● patch | view | raw | blame | history 
 project.config.json


New file


@@ -0,0 +1,17 @@


{


    "client": "wxlite/",


    "svr": "server/",


    "miniprogramRoot": "wxlite/",


    "qcloudRoot": "server/",


    "appid": "wx50bea0a98be5935d",


    "projectname": "miniapp",


    "setting": {


        "urlCheck": false,


        "es6": true,


        "postcss": true,


        "minified": true,


        "newFeature": true


    },


    "libVersion": "1.9.91",


    "condition": {}


}