Skip to content

Fix mood tracking page #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
garrettleung wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix mood tracking page #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
343baaa
update json
garrettleung Mar 30, 2022
0bf2010
fixed merge conflicts
garrettleung Mar 30, 2022
2638f86
fixed moodtracking button
garrettleung Mar 30, 2022
3f65d6c
fixed merge conflicts
garrettleung Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion miniprogram/pages/index/index.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</view>

<view class="uploader">
<button bindtap="to_new_mood_tracking">go to new Questionnaire</button>
<button bindtap="toMoodTracking">go to new Mood Tracking</button>
</view>


Expand Down
186 changes: 93 additions & 93 deletions project.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,95 +1,95 @@
{
"miniprogramRoot": "miniprogram/",
"cloudfunctionRoot": "cloudfunctions/",
"setting": {
"urlCheck": true,
"es6": true,
"enhance": true,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": true,
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true,
"disableUseStrict": false,
"minifyWXML": true,
"showES6CompileOption": false,
"useCompilerPlugins": false
},
"appid": "wxce2e39d26aad783a",
"projectname": "miniprogram-2",
"libVersion": "2.14.1",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"cloudfunctionTemplateRoot": "cloudfunctionTemplate",
"compileType": "miniprogram",
"condition": {
"search": {
"list": []
},
"conversation": {
"list": []
},
"plugin": {
"list": []
},
"game": {
"list": []
},
"gamePlugin": {
"list": []
},
"miniprogram": {
"list": [
{
"id": -1,
"name": "db guide",
"pathName": "pages/databaseGuide/databaseGuide",
"query": ""
},
{
"id": 1,
"name": "pages/charts/charts",
"pathName": "pages/charts/charts",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/medTracking/medTracking",
"pathName": "pages/medTracking/medTracking",
"query": "",
"scene": null
},
{
"id": 3,
"name": "pages/moodTracking/moodTracking",
"pathName": "pages/moodTracking/moodTracking",
"query": "",
"scene": null
}
]
}
}
"miniprogramRoot": "miniprogram/",
"cloudfunctionRoot": "cloudfunctions/",
"setting": {
"urlCheck": true,
"es6": true,
"enhance": true,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": true,
"useApiHook": true,
"useApiHostProcess": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": true,
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true,
"disableUseStrict": false,
"minifyWXML": true,
"showES6CompileOption": false,
"useCompilerPlugins": false
},
"appid": "wxce2e39d26aad783a",
"projectname": "miniprogram-2",
"libVersion": "2.14.1",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"cloudfunctionTemplateRoot": "cloudfunctionTemplate",
"compileType": "miniprogram",
"condition": {
"search": {
"list": []
},
"conversation": {
"list": []
},
"plugin": {
"list": []
},
"game": {
"list": []
},
"gamePlugin": {
"list": []
},
"miniprogram": {
"list": [
{
"id": -1,
"name": "db guide",
"pathName": "pages/databaseGuide/databaseGuide",
"query": ""
},
{
"id": 1,
"name": "pages/index/index",
"pathName": "pages/index/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/medTracking/medTracking",
"pathName": "pages/medTracking/medTracking",
"query": "",
"scene": null
},
{
"id": 3,
"name": "pages/moodTracking/moodTracking",
"pathName": "pages/moodTracking/moodTracking",
"query": "",
"scene": null
}
]
}
}
}
5 changes: 0 additions & 5 deletions project.private.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,8 @@
"scene": null
},
{
<<<<<<< HEAD
"name": "pages/infoPage/infoPage",
"pathName": "pages/infoPage/infoPage",
=======
"name": "pages/index/index",
"pathName": "pages/index/index",
>>>>>>> main
"query": "",
"scene": null
}
Expand Down