Skip to content

P
party-build-cloud
Commit 69bab393 authored by wangqinghua's avatar wangqinghua
Browse files
Options

6/15修改

parent 57c42a2d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 260 deletions
config.xml
View file @ 69bab393
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.2.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="io.ionic.smart19.starter" version="4.2.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>部机关党建云(试运行)</name> <name>部机关党建云(试运行)</name>
<description>An awesome Ionic/Cordova app.</description> <description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author> <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......
ionic.config.json
View file @ 69bab393
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"proxies": [ "proxies": [
{ {
"path": "/wisdomgroup", "path": "/wisdomgroup",
"proxyUrl": "http://47.103.33.196:8080/wisdomgroup" "proxyUrl": "http://47.103.35.216:8080/wisdomgroup"
} }
] ]
} }
platforms/android/app/build/generated/source/buildConfig/debug/io/ionic/partyCloud/starter/test/BuildConfig.java deleted 100644 → 0
View file @ 57c42a2d
/**
* Automatically generated file. DO NOT MODIFY
*/
package io.ionic.partyCloud.starter.test;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String APPLICATION_ID = "io.ionic.partyCloud.starter.test";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 502;
public static final String VERSION_NAME = "0.5.2";
}
platforms/android/app/build/intermediates/blame/res/debug/multi-v2/values.json
View file @ 69bab393
...@@ -6,73 +6,65 @@ ...@@ -6,73 +6,65 @@
{ {
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values/values.xml", "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values/values.xml",
"from": { "from": {
"startLines": "2,3,4,5,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,54,55,59,60,61", "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "55,124,187,245,1245,1315,1383,1455,1525,1586,1647,1708,1770,1834,1896,1957,2025,2125,2185,2251,2324,2393,2450,2502,2564,2636,2712,2747,2782,2832,2866,2901,2936,3006,3077,3194,3395,3505,3706,3835,3907", "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
"endLines": "2,3,4,5,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,53,54,58,59,60,61",
"endColumns": "68,62,57,73,69,67,71,69,60,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,33,34,34,69,70,116,12,109,12,128,71,66",
"endOffsets": "119,182,240,314,1310,1378,1450,1520,1581,1642,1703,1765,1829,1891,1952,2020,2120,2180,2246,2319,2388,2445,2497,2559,2631,2707,2742,2777,2827,2861,2896,2931,3001,3072,3189,3390,3500,3701,3830,3902,3969"
}, },
"to": { "to": {
"startLines": "3,4,7,9,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,115,119,120,121,126,129,134,136,137", "startLines": "3,4,7,9,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,115,119,120,121,126,129,134,136,137",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
"startOffsets": "116,185,408,539,3910,3980,4048,4120,4190,4251,4312,4373,4435,4499,4561,4622,4690,4790,4850,4916,4989,5058,5115,5167,5229,5301,5377,5412,5447,5497,5531,5566,5661,5902,5973,6090,6357,6650,6917,7113,7185", "startOffsets": "116,185,408,539,3910,3980,4048,4120,4190,4251,4312,4373,4435,4499,4561,4622,4690,4790,4850,4916,4989,5058,5115,5167,5229,5301,5377,5412,5447,5497,5531,5566,5661,5903,5974,6091,6358,6651,6918,7114,7186",
"endLines": "3,4,7,9,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,115,119,120,124,126,132,134,136,137", "endLines": "3,4,7,9,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,115,119,120,124,126,132,134,136,137",
"endColumns": "68,62,57,73,69,67,71,69,60,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,33,34,34,69,70,116,12,109,12,128,71,66", "endColumns": "68,62,57,73,69,67,71,69,60,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,34,34,49,33,34,34,69,70,116,12,109,12,128,71,66",
"endOffsets": "180,243,461,608,3975,4043,4115,4185,4246,4307,4368,4430,4494,4556,4617,4685,4785,4845,4911,4984,5053,5110,5162,5224,5296,5372,5407,5442,5492,5526,5561,5596,5726,5968,6085,6286,6462,6846,7041,7180,7247" "endOffsets": "180,243,461,608,3975,4043,4115,4185,4246,4307,4368,4430,4494,4556,4617,4685,4785,4845,4911,4984,5053,5110,5162,5224,5296,5372,5407,5442,5492,5526,5561,5596,5726,5969,6086,6287,6463,6847,7042,7181,7248"
} }
}, },
{ {
"source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/values/strings.xml", "source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/values/strings.xml",
"from": { "from": {
"startLines": "4,2,3", "startLines": "-1,2,-1",
"startColumns": "4,4,4", "startColumns": "-1,4,-1",
"startOffsets": "162,55,103", "startOffsets": "-1,55,-1",
"endColumns": "63,47,58", "endColumns": "-1,48,-1",
"endOffsets": "221,98,157" "endOffsets": "-1,99,-1"
}, },
"to": { "to": {
"startLines": "116,117,118", "startLines": "116,117,118",
"startColumns": "4,4,4", "startColumns": "4,4,4",
"startOffsets": "5731,5795,5843", "startOffsets": "5731,5795,5844",
"endColumns": "63,47,58", "endColumns": "63,48,58",
"endOffsets": "5790,5838,5897" "endOffsets": "5790,5839,5898"
} }
}, },
{ {
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/values/values.xml", "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/values/values.xml",
"from": { "from": {
"startLines": "2,3,4,5,6,7,8,9,10", "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "4,4,4,4,4,4,4,4,4", "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "55,144,215,288,348,414,536,597,663", "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1"
"endColumns": "88,70,72,59,65,121,60,65,66",
"endOffsets": "139,210,283,343,409,531,592,658,725"
}, },
"to": { "to": {
"startLines": "5,6,8,114,125,127,128,133,135", "startLines": "5,6,8,114,125,127,128,133,135",
"startColumns": "4,4,4,4,4,4,4,4,4", "startColumns": "4,4,4,4,4,4,4,4,4",
"startOffsets": "248,337,466,5601,6291,6467,6589,6851,7046", "startOffsets": "248,337,466,5601,6292,6468,6590,6852,7047",
"endColumns": "88,70,72,59,65,121,60,65,66", "endColumns": "88,70,72,59,65,121,60,65,66",
"endOffsets": "332,403,534,5656,6352,6584,6645,6912,7108" "endOffsets": "332,403,534,5656,6353,6585,6646,6913,7109"
} }
}, },
{ {
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-core-ui-27.1.0.aar/1f86033c8ae69177eb1c33b71b9ee0f2/res/values/values.xml", "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-core-ui-27.1.0.aar/1f86033c8ae69177eb1c33b71b9ee0f2/res/values/values.xml",
"from": { "from": {
"startLines": "2,66", "startLines": "-1,-1",
"startColumns": "4,4", "startColumns": "-1,-1",
"startOffsets": "55,2487", "startOffsets": "-1,-1"
"endLines": "2,68",
"endColumns": "60,12",
"endOffsets": "111,2627"
}, },
"to": { "to": {
"startLines": "2,138", "startLines": "2,138",
"startColumns": "4,4", "startColumns": "4,4",
"startOffsets": "55,7252", "startOffsets": "55,7253",
"endLines": "2,140", "endLines": "2,140",
"endColumns": "60,12", "endColumns": "60,12",
"endOffsets": "111,7392" "endOffsets": "111,7393"
} }
} }
] ]
......
platforms/android/app/build/intermediates/blame/res/debug/single/debug.json
View file @ 69bab393
...@@ -40,16 +40,16 @@ ...@@ -40,16 +40,16 @@
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml" "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml"
}, },
{ {
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_low_normal.9.png.flat", "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-mdpi_screen.png.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notification_bg_low_normal.9.png" "source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-mdpi/screen.png"
}, },
{ {
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_media_action.xml.flat", "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_media_action.xml.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_media_action.xml" "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_media_action.xml"
}, },
{ {
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-mdpi_screen.png.flat", "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_low_normal.9.png.flat",
"source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-mdpi/screen.png" "source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notification_bg_low_normal.9.png"
}, },
{ {
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable_notification_bg.xml.flat", "merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable_notification_bg.xml.flat",
......
platforms/android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
View file @ 69bab393
This source diff could not be displayed because it is too large. You can view the blob instead.
platforms/android/app/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties
View file @ 69bab393
#Fri Jun 14 19:00:05 CST 2019 #Sat Jun 15 14:27:09 CST 2019
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-xhdpi-v4_notification_bg_normal.9.png.flat /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-xhdpi-v4_notification_bg_normal.9.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_action_tombstone.xml.flat /Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_action_tombstone.xml.flat
......
platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt
View file @ 69bab393
#Sun Jun 09 17:12:27 CST 2019 #Fri Jun 14 23:47:22 CST 2019
base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0
renamed.0=classes.dex renamed.0=classes.dex
file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex
platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt
View file @ 69bab393
#Fri Jun 14 19:05:47 CST 2019 #Sat Jun 15 14:27:22 CST 2019
base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0
renamed.0=classes.dex renamed.0=classes.dex
file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0/classes.dex file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0/classes.dex
platforms/android/app/build/intermediates/incremental/packageRelease/release/file-input-save-data.txt
View file @ 69bab393
#Internal package file, do not edit. #Internal package file, do not edit.
#Fri Jun 14 19:05:48 CST 2019 #Sat Jun 15 14:27:23 CST 2019
20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_ 20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_
143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/mergeJavaRes/release/0.jar 143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/mergeJavaRes/release/0.jar
340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-xhdpi-v4/screen.png 340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-xhdpi-v4/screen.png
...@@ -495,7 +495,7 @@ ...@@ -495,7 +495,7 @@
284.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/home/icon-tzgg.png 284.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/home/icon-tzgg.png
296.set=ASSET 296.set=ASSET
15.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/layout/notification_template_icon_group.xml 15.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/layout/notification_template_icon_group.xml
147.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png 147.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-hdpi-v4/screen.png
318.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png 318.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png
181.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release 181.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
352.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release 352.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
...@@ -650,7 +650,7 @@ ...@@ -650,7 +650,7 @@
254.set=ASSET 254.set=ASSET
129.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release 129.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
23.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/layout/notification_action.xml 23.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/layout/notification_action.xml
146.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-hdpi-v4/screen.png 146.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
132.set=ASSET 132.set=ASSET
56.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/home/icon-mail.png 56.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/home/icon-mail.png
177.set=ASSET 177.set=ASSET
......
platforms/android/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
View file @ 69bab393
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ionic.partyCloud.starter.test" package="io.ionic.smart19.starter"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:versionCode="502" android:versionCode="40201"
android:versionName="0.5.2" > android:versionName="4.2.1" >
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" > android:supportsRtl="true" >
<activity <activity
android:name="io.ionic.partyCloud.starter.test.MainActivity" android:name="io.ionic.smart19.starter.MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
android:label="@string/activity_name" android:label="@string/activity_name"
android:launchMode="singleTop" android:launchMode="singleTop"
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<provider <provider
android:name="io.github.pwlin.cordova.plugins.fileopener2.FileProvider" android:name="io.github.pwlin.cordova.plugins.fileopener2.FileProvider"
android:authorities="io.ionic.partyCloud.starter.test.opener.provider" android:authorities="io.ionic.smart19.starter.opener.provider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true" > android:grantUriPermissions="true" >
<meta-data <meta-data
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</provider> </provider>
<provider <provider
android:name="org.apache.cordova.camera.FileProvider" android:name="org.apache.cordova.camera.FileProvider"
android:authorities="io.ionic.partyCloud.starter.test.provider" android:authorities="io.ionic.smart19.starter.provider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true" > android:grantUriPermissions="true" >
<meta-data <meta-data
......
platforms/android/app/build/intermediates/manifests/full/debug/output.json
View file @ 69bab393
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":502},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40201},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/intermediates/manifests/full/release/AndroidManifest.xml
View file @ 69bab393
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ionic.smart19.starter" package="io.ionic.smart19.starter"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:versionCode="40201" android:versionCode="40203"
android:versionName="4.2.1" > android:versionName="4.2.3" >
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"
......
platforms/android/app/build/intermediates/manifests/full/release/output.json
View file @ 69bab393
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40201},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40203},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/intermediates/manifests/instant-run/debug/output.json
View file @ 69bab393
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":502},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40201},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/intermediates/manifests/instant-run/release/output.json
View file @ 69bab393
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40201},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40203},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/intermediates/res/debug/output.json
View file @ 69bab393
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":502},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40201},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/intermediates/res/release/output.json
View file @ 69bab393
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40201},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40203},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
View file @ 69bab393
io.ionic.partyCloud.starter.test io.ionic.smart19.starter
int attr coordinatorLayoutStyle 0x7f010000 int attr coordinatorLayoutStyle 0x7f010000
int attr font 0x7f010001 int attr font 0x7f010001
int attr fontProviderAuthority 0x7f010002 int attr fontProviderAuthority 0x7f010002
......
platforms/android/app/build/intermediates/transforms/dex/release/__content__.json
View file @ 69bab393
[{"name":"main","index":0,"scopes":["SUB_PROJECTS","EXTERNAL_LIBRARIES","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true}] [{"name":"main","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/intermediates/transforms/dexMerger/debug/__content__.json
View file @ 69bab393
[{"name":"main","index":0,"scopes":["SUB_PROJECTS","EXTERNAL_LIBRARIES","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true}] [{"name":"main","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/intermediates/transforms/mergeJavaRes/debug/__content__.json
View file @ 69bab393
[{"name":"resources","index":0,"scopes":["EXTERNAL_LIBRARIES","SUB_PROJECTS","PROJECT"],"types":["RESOURCES"],"format":"JAR","present":true}] [{"name":"resources","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["RESOURCES"],"format":"JAR","present":true}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/outputs/apk/debug/output.json
View file @ 69bab393
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":502},"path":"app-debug.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40201},"path":"app-debug.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/outputs/apk/release/output.json
View file @ 69bab393
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40201},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40203},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
platforms/android/app/build/outputs/logs/manifest-merger-debug-report.txt
View file @ 69bab393
...@@ -42,19 +42,19 @@ INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/ ...@@ -42,19 +42,19 @@ INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12 INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12 INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
package package
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:100-142 ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:102-136
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
android:versionName android:versionName
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:72-99 ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:74-101
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
android:hardwareAccelerated android:hardwareAccelerated
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:11-45 ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:11-45
xmlns:android xmlns:android
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:143-201 ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:137-195
android:versionCode android:versionCode
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:46-71 ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:46-73
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
supports-screens supports-screens
...@@ -81,7 +81,7 @@ ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src ...@@ -81,7 +81,7 @@ ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:4:18-52 ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:4:18-52
android:icon android:icon
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:4:53-80 ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:4:53-80
activity#io.ionic.partyCloud.starter.test.MainActivity activity#io.ionic.smart19.starter.MainActivity
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:5:9-10:20 ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:5:9-10:20
android:label android:label
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:5:97-134 ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:5:97-134
......
platforms/android/app/build/reports/lint-results-release-fatal.html
View file @ 69bab393
...@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none'; ...@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
<span class="mdl-layout-title">Lint Report: 1 error</span> <span class="mdl-layout-title">Lint Report: 1 error</span>
<div class="mdl-layout-spacer"></div> <div class="mdl-layout-spacer"></div>
<nav class="mdl-navigation mdl-layout--large-screen-only"> <nav class="mdl-navigation mdl-layout--large-screen-only">
Check performed at Fri Jun 14 19:05:49 CST 2019 </nav> Check performed at Sat Jun 15 14:27:28 CST 2019 </nav>
</div> </div>
</header> </header>
<div class="mdl-layout__drawer"> <div class="mdl-layout__drawer">
......
platforms/android/app/src/main/AndroidManifest.xml
View file @ 69bab393
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="40201" android:versionName="4.2.1" package="io.ionic.smart19.starter" xmlns:android="http://schemas.android.com/apk/res/android"> <manifest android:hardwareAccelerated="true" android:versionCode="40203" android:versionName="4.2.3" package="io.ionic.smart19.starter" xmlns:android="http://schemas.android.com/apk/res/android">
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" /> <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
<application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true"> <application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true">
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize"> <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">
......
platforms/android/app/src/main/res/xml/config.xml
View file @ 69bab393
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.2.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="io.ionic.smart19.starter" version="4.2.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<feature name="Keyboard"> <feature name="Keyboard">
<param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" /> <param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" />
</feature> </feature>
......
src/pages/discover-pages/publish/publish.html
View file @ 69bab393
<ion-header> <ion-header>
<ion-navbar> <ion-navbar>
<ion-title>发布<span *ngIf="type == 'image'">图片</span><span *ngIf="type == 'video'">视频</span> </ion-title> <ion-title>发布<span *ngIf="type == 'image'">图文</span><span *ngIf="type == 'video'">视频</span> </ion-title>
<ion-buttons end> <ion-buttons end>
<button ion-button icon-only (click)="handle()" class="toolbar-icon"> <button ion-button icon-only (click)="handle()" class="toolbar-icon">
<ion-icon name="list"></ion-icon> <ion-icon name="list"></ion-icon>
......
src/pages/mine-pages/appraisals/appraisals.html
View file @ 69bab393
<ion-header> <ion-header>
<ion-navbar> <ion-navbar>
<ion-title>绩效考核</ion-title> <ion-title>积分排行</ion-title>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
...@@ -13,48 +13,20 @@ ...@@ -13,48 +13,20 @@
refreshingSpinner="bubbles"> refreshingSpinner="bubbles">
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="appraisals"> <div class="duty-content">
<div class="appraisalsItem" (click)="change(1)"> <ion-list *ngIf="orgList.length > 0">
<span class="{{changeType == 1?'appraisals-title':''}}">支部top 5</span> <ion-grid>
</div> <ion-row class="top-col" *ngFor="let item of orgList;let i = index;">
<div class="appraisalsItem" (click)="change(2)"> <ion-col col-2>
<span class="{{changeType == 2?'appraisals-title':''}}">个人top 10</span> <img *ngIf="i == 0" src="./assets/imgs/learn/one.png">
</div> <img *ngIf="i == 1" src="./assets/imgs/learn/two.png">
<img *ngIf="i == 2" src="./assets/imgs/learn/three.png">
<span *ngIf="i > 2" class="span-rank">{{i + 1}}</span>
</ion-col>
<ion-col col-7>{{item.orgName}}</ion-col>
<ion-col col-3>{{item.total}}</ion-col>
</ion-row>
</ion-grid>
</ion-list>
</div> </div>
<ng-container *ngIf="changeType == 1">
<div class="duty-content">
<ion-list *ngIf="orgList.length > 0">
<ion-grid>
<ion-row class="top-col" *ngFor="let item of orgList;let i = index;">
<ion-col col-2>
<img *ngIf="i == 0" src="./assets/imgs/learn/one.png">
<img *ngIf="i == 1" src="./assets/imgs/learn/two.png">
<img *ngIf="i == 2" src="./assets/imgs/learn/three.png">
<span *ngIf="i > 2" class="span-rank">{{i + 1}}</span>
</ion-col>
<ion-col col-7>{{item.orgName}}</ion-col>
<ion-col col-3>{{item.total}}</ion-col>
</ion-row>
</ion-grid>
</ion-list>
</div>
</ng-container>
<ng-container *ngIf="changeType == 2">
<div class="duty-content">
<ion-list *ngIf="personList.length > 0">
<ion-grid>
<ion-row class="top-col" *ngFor="let item of personList;let i = index;">
<ion-col col-2>
<img *ngIf="i == 0" src="./assets/imgs/learn/one.png">
<img *ngIf="i == 1" src="./assets/imgs/learn/two.png">
<img *ngIf="i == 2" src="./assets/imgs/learn/three.png">
<span *ngIf="i > 2" class="span-rank">{{i + 1}}</span>
</ion-col>
<ion-col col-7>{{item.userName}}</ion-col>
<ion-col col-3>{{item.total}}</ion-col>
</ion-row>
</ion-grid>
</ion-list>
</div>
</ng-container>
</ion-content> </ion-content>
src/pages/mine-pages/appraisals/appraisals.ts
View file @ 69bab393
...@@ -25,7 +25,6 @@ export class AppraisalsPage { ...@@ -25,7 +25,6 @@ export class AppraisalsPage {
changeType = 1; changeType = 1;
orgList = []; orgList = [];
personList = [];
constructor(public navCtrl: NavController, public navParams: NavParams, constructor(public navCtrl: NavController, public navParams: NavParams,
public mineSer: MineService, public commonSer: CommonService) { public mineSer: MineService, public commonSer: CommonService) {
...@@ -33,11 +32,6 @@ export class AppraisalsPage { ...@@ -33,11 +32,6 @@ export class AppraisalsPage {
ionViewDidEnter() { ionViewDidEnter() {
this.getOrgList(); this.getOrgList();
this.getPersonList();
}
change(type){
this.changeType = type;
} }
//组织积分top5 //组织积分top5
...@@ -53,24 +47,10 @@ export class AppraisalsPage { ...@@ -53,24 +47,10 @@ export class AppraisalsPage {
) )
} }
//个人积分top10
getPersonList(){
const data = {
pageNum: this.pageNum,
pageSize: 10
};
this.mineSer.personPointList(data).subscribe(
(res) => {
this.personList = res.data.list;
}
)
}
doRefresh(e){ doRefresh(e){
timer(1000).subscribe(()=>{ timer(1000).subscribe(()=>{
e.complete(); e.complete();
this.getOrgList(); this.getOrgList();
this.getPersonList();
}) })
} }
} }
src/pages/mine-pages/verify-handle/verify-handle.html
View file @ 69bab393
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
<ion-navbar> <ion-navbar>
<ion-title>审核</ion-title> <ion-title>审核</ion-title>
<!-- <ion-buttons end>-->
<!-- <button ion-button icon-only (click)="edit()" class="toolbar-icon">-->
<!-- <ion-icon name="list"></ion-icon>-->
<!-- &lt;!&ndash; 发布&ndash;&gt;-->
<!-- </button>-->
<!-- </ion-buttons>-->
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
...@@ -36,11 +42,14 @@ ...@@ -36,11 +42,14 @@
<div *ngIf="footerView" class="stuff-footer"> <div *ngIf="footerView" class="stuff-footer">
<ion-row> <ion-row>
<ion-col col-6 (click)="handle(1)"> <ion-col col-4 (click)="handle(1)">
<button style="background-color: #999999">退回</button> <button style="background-color: #999999">退回</button>
</ion-col> </ion-col>
<ion-col col-6 (click)="handle(3)"> <ion-col col-4 (click)="handle(3)">
<button>通过</button> <button>通过</button>
</ion-col> </ion-col>
<ion-col col-4 (click)="edit()">
<button>编辑</button>
</ion-col>
</ion-row> </ion-row>
</div> </div>
src/pages/mine-pages/verify-handle/verify-handle.scss
View file @ 69bab393
...@@ -213,4 +213,10 @@ page-verify-handle { ...@@ -213,4 +213,10 @@ page-verify-handle {
margin-top: .5rem; margin-top: .5rem;
} }
} }
.toolbar-icon{
color: #fff;
margin-right: 1rem;
font-size: 1.5rem;
}
} }
src/pages/mine-pages/verify-handle/verify-handle.ts
View file @ 69bab393
...@@ -77,4 +77,8 @@ export class VerifyHandlePage { ...@@ -77,4 +77,8 @@ export class VerifyHandlePage {
}) })
} }
edit(){
this.navCtrl.push('VerifyEditPage',{stuffId:this.stuffId});
}
} }
src/pages/tabs/discover/discover.ts
View file @ 69bab393
...@@ -72,6 +72,21 @@ export class DiscoverPage { ...@@ -72,6 +72,21 @@ export class DiscoverPage {
"type": 4, "type": 4,
"indexChildren": '15' "indexChildren": '15'
}, },
{
"name": "支部活动",
"type": 6,
"indexChildren": '16'
},
{
"name": "党建联建",
"type": 7,
"indexChildren": '17'
},
{
"name": "结对帮扶",
"type": 8,
"indexChildren": '18'
},
] ]
}, },
{ {
...@@ -610,7 +625,14 @@ export class DiscoverPage { ...@@ -610,7 +625,14 @@ export class DiscoverPage {
//绘制图片 //绘制图片
canvas.getContext('2d').drawImage(e.target, 0, 0, canvas.width, canvas.height); canvas.getContext('2d').drawImage(e.target, 0, 0, canvas.width, canvas.height);
//设置标签的poster属性 //设置标签的poster属性
e.target.setAttribute("poster", canvas.toDataURL("image/png"));
let img = new Image();
img.src = canvas.toDataURL("image/png");
img.setAttribute("crossOrigin",'Anonymous')
img.onload = ()=>{
// console.log(img);
e.target.setAttribute("poster", canvas.toDataURL("image/png"));
}
} }
......
src/pages/tabs/home/home.html
View file @ 69bab393
...@@ -13,9 +13,16 @@ ...@@ -13,9 +13,16 @@
</span> </span>
</button> </button>
</ion-buttons> </ion-buttons>
<ion-buttons start>
<button ion-button icon-only (click)="goTo('ProposalPage')" class="toolbar-signUp">
<span class="signUp-span">
<img style="margin-left: 0" class="toolbar-img" src="./assets/imgs/home/icon-proposal.jpg">
</span>
</button>
</ion-buttons>
<ion-buttons end class="score margin-right-10"> <ion-buttons end class="score margin-right-10">
<span class="score-font">积分</span> <span class="score-font">积分</span>
<button (click)="goTo('IntegralPage')" style="background-color: transparent"> <button (click)="goTo('IntegralPage')" style="background-color: transparent;position: relative;">
<span class="score-num"> <span class="score-num">
{{mineInfo?.total || 0 }} {{mineInfo?.total || 0 }}
</span> </span>
......
src/pages/tabs/home/home.scss
View file @ 69bab393
...@@ -74,16 +74,18 @@ page-home { ...@@ -74,16 +74,18 @@ page-home {
.score-num { .score-num {
font-size: 2.5rem; font-size: 2.5rem;
line-height: 2.3rem; position: absolute;
color: #ffffff; color: #ffffff;
top: -22px;
left: 0px;
} }
} }
.score::after { .score::after {
content: ''; content: '';
position: absolute; position: absolute;
right: -14px; right: -24px;
top: 6px; top: 5px;
height: 18px; height: 18px;
width: 2px; width: 2px;
background-color: rgba(255, 255, 255, 0.5); background-color: rgba(255, 255, 255, 0.5);
......
src/pages/tabs/home/home.ts
View file @ 69bab393
...@@ -37,9 +37,7 @@ export class HomePage { ...@@ -37,9 +37,7 @@ export class HomePage {
picture: string = AppGlobal.domain + '/wisdomgroup'; picture: string = AppGlobal.domain + '/wisdomgroup';
slideTitle; slideTitle;
slideIndex = 1; slideIndex = 1;
slidersItems = [ slidersItems = [];
{imgUrl: null, title: null, plateType: null, id: null}
];
//所属板块类型: //所属板块类型:
//1党章党规,2系列讲话,3中央精神,4本市部署,5通知公告,6党建动态,7工作提示,8党务参考 //1党章党规,2系列讲话,3中央精神,4本市部署,5通知公告,6党建动态,7工作提示,8党务参考
//9廉政格言,10纪检提示,11风险排查,12警示教育,13支部活动,14党建联建,15结对帮扶 //9廉政格言,10纪检提示,11风险排查,12警示教育,13支部活动,14党建联建,15结对帮扶
......
src/pages/tabs/mine/mine.html
View file @ 69bab393
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<img src="./assets/imgs/mine/wdsh.png"> <img src="./assets/imgs/mine/wdsh.png">
</ion-col> </ion-col>
<ion-col class="group-right" col-10> <ion-col class="group-right" col-10>
<span>我的审核</span> <span>我的审核 <span class="main-color" *ngIf="checkList.length > 0">({{checkList.length}})</span></span>
<ion-icon name="ios-arrow-forward"></ion-icon> <ion-icon name="ios-arrow-forward"></ion-icon>
</ion-col> </ion-col>
</ion-row> </ion-row>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<img src="./assets/imgs/mine/jxkh.png"> <img src="./assets/imgs/mine/jxkh.png">
</ion-col> </ion-col>
<ion-col class="group-right" col-10> <ion-col class="group-right" col-10>
<span>绩效考核</span> <span>积分排行</span>
<ion-icon name="ios-arrow-forward"></ion-icon> <ion-icon name="ios-arrow-forward"></ion-icon>
</ion-col> </ion-col>
</ion-row> </ion-row>
......
src/pages/tabs/mine/mine.ts
View file @ 69bab393
...@@ -16,6 +16,7 @@ import {MySurveyPage} from "../../home/mySurvey/my-survey/my-survey"; ...@@ -16,6 +16,7 @@ import {MySurveyPage} from "../../home/mySurvey/my-survey/my-survey";
import {TabsService} from "../tabs.service"; import {TabsService} from "../tabs.service";
import {EmitService} from "../../../provide/emit.service"; import {EmitService} from "../../../provide/emit.service";
import {NoticePage} from "../notice/notice"; import {NoticePage} from "../notice/notice";
import {MineService} from "../../mine-pages/mine.service";
@Component({ @Component({
...@@ -29,6 +30,7 @@ export class MinePage { ...@@ -29,6 +30,7 @@ export class MinePage {
gender: object; gender: object;
version: string = ''; version: string = '';
isLatest: boolean = true; isLatest: boolean = true;
checkList = [];
mineInfo; mineInfo;
noReadNum; noReadNum;
...@@ -38,8 +40,7 @@ export class MinePage { ...@@ -38,8 +40,7 @@ export class MinePage {
picUrl = AppGlobal.domain + '/wisdomgroup/modules/common/file/showImgByFileid/'; picUrl = AppGlobal.domain + '/wisdomgroup/modules/common/file/showImgByFileid/';
constructor(public navCtrl: NavController, constructor(public navCtrl: NavController,
private appCtrl: App, private mineSer: MineService,
private alertCtrl: AlertController,
public navParams: NavParams, public navParams: NavParams,
public tabSer: TabsService, public tabSer: TabsService,
public appService: AppService, public appService: AppService,
...@@ -56,6 +57,7 @@ export class MinePage { ...@@ -56,6 +57,7 @@ export class MinePage {
} }
ionViewWillEnter() { ionViewWillEnter() {
this.getCheckList();
this.user = this.storage.get("user").then((value) => { this.user = this.storage.get("user").then((value) => {
this.user = value; this.user = value;
this.gender = this.user.userDetail.user.gender; this.gender = this.user.userDetail.user.gender;
...@@ -69,6 +71,18 @@ export class MinePage { ...@@ -69,6 +71,18 @@ export class MinePage {
this.getRole(); this.getRole();
} }
getCheckList() {
const data = {
pageNum: 1,
pageCount: 1000
};
this.mineSer.appCheckList(data).subscribe(
(res) => {
this.checkList = res.data.list;
}
)
}
//获取权限 //获取权限
// 返回值int :3-管理员，2-处室领导，1-内勤人员，0-普通用户 // 返回值int :3-管理员，2-处室领导，1-内勤人员，0-普通用户
getRole() { getRole() {
......
src/pages/tabs/serve/serve.html
View file @ 69bab393
<ion-header> <ion-header>
<ion-navbar> <ion-navbar>
<ion-buttons start> <ion-buttons start>
<button ion-button icon-only> <button ion-button icon-only>
<img class="toolbar-img" src="./assets/imgs/logo.png"> <img class="toolbar-img" src="./assets/imgs/logo.png">
</button> </button>
</ion-buttons> </ion-buttons>
<ion-buttons end> <ion-buttons end>
<button ion-button icon-only (click)="goToNotice()" class="toolbar-icon"> <button ion-button icon-only (click)="goToNotice()" class="toolbar-icon">
<ion-icon class="icon-youjian iconfont"></ion-icon> <ion-icon class="icon-youjian iconfont"></ion-icon>
<span *ngIf="noReadNum > 0" class="num">{{noReadNum}}</span> <span *ngIf="noReadNum > 0" class="num">{{noReadNum}}</span>
</button> </button>
</ion-buttons> </ion-buttons>
</ion-navbar> </ion-navbar>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div #item3 class="item3 item-notice"> <div #item3 class="item3 item-notice">
<img src="./assets/imgs/notice_bg.png" alt=""> <img style="border-top-left-radius: 5px;border-top-right-radius: 5px" src="./assets/imgs/notice_bg.jpg" alt="">
<div class="item3-2" (click)="goToNotice()" > <div class="item3-2" (click)="goToNotice()">
<ion-col col-2 class="card3"> <ion-col col-2 class="card3">
<span *ngIf="hasNew.message == 1" class="img-tips"></span> <span *ngIf="hasNew.message == 1" class="img-tips"></span>
<img src="./assets/imgs/home/icon-tips.png" > <img src="./assets/imgs/home/icon-tips.png">
</ion-col> </ion-col>
<ion-col col-9 class="card3" id="party-bir" *ngIf="noticeList.length > 0" horizonta-lamp> <ion-col col-9 class="card3" id="party-bir" *ngIf="noticeList.length > 0" horizonta-lamp>
<div class="card3-item" *ngFor="let item of noticeList;"> <div class="card3-item" *ngFor="let item of noticeList;">
<span *ngIf="noticeTips > 0" class="tip"></span> <span *ngIf="noticeTips > 0" class="tip"></span>
<span class="color-996">{{item.title}}</span><span class="color-fff">{{item.content}}</span> <span class="color-996">{{item.title}}</span><span class="color-fff">{{item.content}}</span>
</div>
</ion-col>
<ion-col col-1 class="card3" style="color: #fff;font-size: 1.6rem">
<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
</ion-col>
</div> </div>
</ion-col>
<ion-col col-1 class="card3" style="color: #fff;font-size: 1.6rem">
<ion-icon name="ios-arrow-forward" class="icon-right"></ion-icon>
</ion-col>
</div> </div>
</div>
<p class="p-font">我的应用</p> <p class="p-font">我的应用</p>
<div class="item2" style="padding: 0px;margin-top: .5rem"> <div class="item2" style="padding: 0px;margin-top: .5rem">
<div class="item2-2"> <div class="item2-2">
<div class="card" (click)="goToContact()"> <div class="card" (click)="goToContact()">
<img src="./assets/imgs/home/icon-txl.png" > <img src="./assets/imgs/home/icon-txl.png">
<label class="label2-2">通讯录</label> <label class="label2-2">通讯录</label>
</div> </div>
<div class="card" (click)="goTo('ActivityListPage')"> <div class="card" (click)="goTo('ActivityListPage')">
<img src="./assets/imgs/home/icon-hdbm.png" > <img src="./assets/imgs/home/icon-hdbm.png">
<label class="label2-2">活动报名</label> <label class="label2-2">活动报名</label>
<img class="new-logo" *ngIf="hasNew.activity==1" src="./assets/imgs/new.png"> <img class="new-logo" *ngIf="hasNew.activity==1" src="./assets/imgs/new.png">
</div> </div>
<div class="card" (click)="goTo('AnnouncementPage')"> <div class="card" (click)="goTo('AnnouncementPage')">
<img src="./assets/imgs/home/icon-tzgg.png" > <img src="./assets/imgs/home/icon-tzgg.png">
<label class="label2-2">通知公告</label> <label class="label2-2">通知公告</label>
<img class="new-logo" *ngIf="hasNew.notice==1" src="./assets/imgs/new.png"> <img class="new-logo" *ngIf="hasNew.notice==1" src="./assets/imgs/new.png">
</div> </div>
<div class="card" (click)="goOutGoingReportAboutAll()"> <div class="card" (click)="goOutGoingReportAboutAll()">
<img src="./assets/imgs/home/icon-lhbb.png" > <img src="./assets/imgs/home/icon-lhbb.png">
<label class="label2-2">离沪报备</label> <label class="label2-2">离沪报备</label>
<img class="new-logo" *ngIf="hasNew.premanager==1" src="./assets/imgs/new.png"> <img class="new-logo" *ngIf="hasNew.premanager==1" src="./assets/imgs/new.png">
</div> </div>
<div class="card" (click)="goTo('DutyPage')"> <div class="card" (click)="goTo('DutyPage')">
<img src="./assets/imgs/home/icon-zbqk.png" > <img src="./assets/imgs/home/icon-zbqk.png">
<label class="label2-2">值班情况</label> <label class="label2-2">值班情况</label>
</div> </div>
<div class="card" (click)="goTo('SurveryPage')"> <div class="card" (click)="goTo('SurveryPage')">
<img src="./assets/imgs/home/icon-wjdc.png" > <img src="./assets/imgs/home/icon-wjdc.png">
<label class="label2-2 more2-2">问卷调查</label> <label class="label2-2 more2-2">问卷调查</label>
</div> </div>
<div class="card" (click)="goTo('LearningListPage')"> <div class="card" (click)="goTo('LearningListPage')">
<img src="./assets/imgs/home/icon-xxcs.png" > <img src="./assets/imgs/home/icon-xxcs.png">
<label class="label2-2 more2-2 main-color">学习测试</label> <label class="label2-2 more2-2 main-color">学习测试</label>
<img class="new-logo" *ngIf="hasNew.test==1" src="./assets/imgs/new.png"> <img class="new-logo" *ngIf="hasNew.test==1" src="./assets/imgs/new.png">
</div> </div>
<div class="card" (click)="goTo('MoreAppPage')"> <div class="card" (click)="goTo('MoreAppPage')">
<img src="./assets/imgs/home/icon-more.png" > <img src="./assets/imgs/home/icon-more.png">
<label class="label2-2 more2-2">更多应用</label> <label class="label2-2 more2-2">更多应用</label>
</div> </div>
</div>
</div> </div>
</div>
<p class="p-font">日程表</p> <p class="p-font">日程表</p>
<div class="calen-tab"> <div class="calen-tab">
<span class="calen1">休息日</span> <span class="calen2">参加活动</span> <span class="calen1">休息日</span> <span class="calen2">参加活动</span>
<span class="calen3">值班</span><span class="calen4">离沪</span> <span class="calen3">值班</span><span class="calen4">离沪</span>
</div> </div>
<div class="calendarEle" #calendarEle> <div class="calendarEle" #calendarEle>
<ion-calendar <ion-calendar
[(ngModel)]="date" [(ngModel)]="date"
(monthChange)="monChange($event)" (monthChange)="monChange($event)"
[options]="optionsMulti" [options]="optionsMulti"
type="'js-date'" type="'js-date'"
[format]="'YYYY-MM-DD'"> [format]="'YYYY-MM-DD'">
</ion-calendar> </ion-calendar>
<div #scrollDown class="scroll-down"> <div #scrollDown class="scroll-down">
<ion-icon *ngIf="!isShow" (click)="showCalendar()" name="arrow-down"></ion-icon> <ion-icon *ngIf="!isShow" (click)="showCalendar()" name="arrow-down"></ion-icon>
<ion-icon *ngIf="isShow" (click)="hiddenCalendar()" name="arrow-up"></ion-icon> <ion-icon *ngIf="isShow" (click)="hiddenCalendar()" name="arrow-up"></ion-icon>
</div>
</div> </div>
</div>
</ion-content> </ion-content>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment