抢购

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.smart19.starter.test" version="4.5.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter.test" version="4.5.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>部机关党建云</name>
     <description>组织部党建云平台App.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

ionic.config.json

@@ -7,7 +7,7 @@
   "proxies": [
     {
       "path": "/wisdomgroup",
-      "proxyUrl": "http://47.103.33.196:8080/wisdomgroup"
+      "proxyUrl": "http://218.78.19.169:8081/wisdomgroup"
     },
     {
       "path": "/logistics",

platforms/android/app/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties

-#Thu Aug 15 02:35:07 CST 2019
+#Mon Aug 19 09:00:05 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-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

platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt

-#Sun Aug 18 17:34:03 CST 2019
+#Sun Aug 18 19:47:54 CST 2019
 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0
 renamed.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

-#Thu Aug 15 02:35:17 CST 2019
+#Mon Aug 19 09:00:14 CST 2019
 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0
 renamed.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

 #Internal package file, do not edit.
-#Thu Aug 15 02:35:17 CST 2019
+#Mon Aug 19 09:00:14 CST 2019
 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/assets/release
 439.set=ASSET
@@ -80,7 +80,7 @@
 290.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png
 356.set=ANDROID_RESOURCE
 120.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/resources.arsc
-153.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
+153.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
 279.set=ASSET
 324.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/mine/barCode_prod.png
 202.set=ASSET
@@ -625,7 +625,7 @@
 410.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
 95.set=ANDROID_RESOURCE
 346.set=ASSET
-152.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
+152.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
 269.set=ANDROID_RESOURCE
 323.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/build/97.js
 36.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release

platforms/android/app/build/intermediates/manifests/full/release/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.ionic.smart19.starter"
+    package="io.ionic.smart19.starter.test"
     android:hardwareAccelerated="true"
-    android:versionCode="40500"
-    android:versionName="4.5.0" >
+    android:versionCode="40507"
+    android:versionName="4.5.7" >
 
     <uses-sdk
         android:minSdkVersion="16"
@@ -62,7 +62,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true" >
         <activity
-            android:name="io.ionic.smart19.starter.MainActivity"
+            android:name="io.ionic.smart19.starter.test.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
             android:label="@string/activity_name"
             android:launchMode="singleTop"
@@ -77,7 +77,7 @@
 
         <provider
             android:name="io.github.pwlin.cordova.plugins.fileopener2.FileProvider"
-            android:authorities="io.ionic.smart19.starter.opener.provider"
+            android:authorities="io.ionic.smart19.starter.test.opener.provider"
             android:exported="false"
             android:grantUriPermissions="true" >
             <meta-data
@@ -86,7 +86,7 @@
         </provider>
         <provider
             android:name="org.apache.cordova.camera.FileProvider"
-            android:authorities="io.ionic.smart19.starter.provider"
+            android:authorities="io.ionic.smart19.starter.test.provider"
             android:exported="false"
             android:grantUriPermissions="true" >
             <meta-data

platforms/android/app/build/intermediates/manifests/full/release/output.json

-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40507},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/manifests/instant-run/release/output.json

-[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40507},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/res/release/output.json

-[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40507},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt

-io.ionic.smart19.starter
+io.ionic.smart19.starter.test
 int attr coordinatorLayoutStyle 0x7f010000
 int attr font 0x7f010001
 int attr fontProviderAuthority 0x7f010002

platforms/android/app/build/intermediates/transforms/dex/release/__content__.json

-[{"name":"main","index":0,"scopes":["SUB_PROJECTS","EXTERNAL_LIBRARIES","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true}]
+[{"name":"main","index":0,"scopes":["EXTERNAL_LIBRARIES","PROJECT","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file

platforms/android/app/build/outputs/apk/release/output.json

-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40507},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file

platforms/android/app/build/outputs/logs/manifest-merger-release-report.txt

@@ -42,7 +42,7 @@ 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-30:12
 INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-30:12
 	package
-		ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:102-136
+		ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:102-141
 		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
@@ -52,7 +52,7 @@ INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/
 	android:hardwareAccelerated
 		ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:11-45
 	xmlns:android
-		ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:137-195
+		ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:142-200
 	android:versionCode
 		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
@@ -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
 	android:icon
 		ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:4:53-80
-activity#io.ionic.smart19.starter.MainActivity
+activity#io.ionic.smart19.starter.test.MainActivity
 ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:5:9-10:20
 	android:label
 		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

@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
       <span class="mdl-layout-title">Lint Report: 1 error</span>
       <div class="mdl-layout-spacer"></div>
       <nav class="mdl-navigation mdl-layout--large-screen-only">
-Check performed at Thu Aug 15 02:35:19 CST 2019      </nav>
+Check performed at Mon Aug 19 09:00:16 CST 2019      </nav>
     </div>
   </header>
   <div class="mdl-layout__drawer">

platforms/android/app/src/main/AndroidManifest.xml

 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="40500" android:versionName="4.5.0" package="io.ionic.smart19.starter.test" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="40507" android:versionName="4.5.7" package="io.ionic.smart19.starter.test" 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" />
     <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">

platforms/android/app/src/main/res/xml/config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.smart19.starter.test" version="4.5.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.smart19.starter.test" version="4.5.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <feature name="Keyboard">
         <param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" />
     </feature>

src/app/app.component.ts

@@ -51,7 +51,7 @@ export class MyApp {
             this.statusBar.styleLightContent();
 
 
-            timer(500).subscribe((res) => {
+            timer(4500).subscribe((res) => {
                 this.showSplash = false;
                 this.device();
                 this.loadLogin();

src/pages/serve-pages/food/food.ts

@@ -184,7 +184,7 @@ export class FoodPage {
         this.serveSer.getGoodsInfo().subscribe(
             (res) => {
                 if (res.data && res.data.length > 0) {
-                    const arr = res.data.filter(e=>e.isPurchasing == 0);
+                    const arr = res.data.filter(e=>e.isPurchasing == 1);
                     if(arr.length > 0) {
                         this.navCtrl.push(RushBuyPage);
                     }else{

src/pages/serve-pages/food/rush-buy/rush-buy.ts

@@ -15,7 +15,7 @@ export class RushBuyPage {
         foodText: '请选择',
         type: null,
         unitPrice: null,
-        version: null,
+        purchaseVersion: null,
         remark:null
     };
     foodList;
@@ -35,10 +35,10 @@ export class RushBuyPage {
             (res) => {
                 this.foodList = res.data;
                 this.obj.foodText = this.foodList[0].goodsName;
-                this.obj.version = this.foodList[0].version;
+                this.obj.purchaseVersion = this.foodList[0].version;
                 this.obj.unitPrice = this.foodList[0].unitPrice;
-                this.obj.type = this.foodList[0].id
-                this.obj.remark = this.foodList[0].remark
+                this.obj.type = this.foodList[0].id;
+                this.obj.remark = this.foodList[0].remark;
             }
         )
     }
@@ -50,7 +50,7 @@ export class RushBuyPage {
                 role: e.id,
                 handler: () => {
                     this.obj.foodText = e.goodsName;
-                    this.obj.version = e.version;
+                    this.obj.purchaseVersion = e.version;
                     this.obj.unitPrice = e.unitPrice;
                     this.obj.type = e.id
                 }
@@ -95,7 +95,7 @@ export class RushBuyPage {
             type: this.obj.type,
             peopleCount: this.obj.peopleCount,
             unitPrice: this.obj.unitPrice,
-            version: this.obj.version
+            version: this.obj.purchaseVersion
         };
         this.serveSer.saveMeals(data).subscribe(
             (res) => {

src/pages/serve-pages/meet-room/meet-room.ts

@@ -185,7 +185,6 @@ export class MeetRoomPage {
     chooseType(item, time) {
         const nowDate = new Date().getTime();
         const chooseDate = new Date(this.date +' 23:59:59').getTime();
-        console.log(nowDate,chooseDate);
         if(nowDate > chooseDate && !item.applicantName) {
             this.commonSer.toast('该时间会议室不可预定');
             return false;

src/pages/serve-pages/meet-room/room-apply/room-apply.ts

@@ -99,9 +99,9 @@ export class RoomApplyPage {
         const data = this.navParams.get('data');
         if (data) {
             console.log(data);
-            this.obj.startTimeChange = this.datePipe.transform(new Date(), 'yyyy-MM-ddTHH:mm:ss');
-            this.obj.endTimeChange = this.datePipe.transform(new Date(), 'yyyy-MM-ddTHH:mm:ss');
-            this.nowDate = this.datePipe.transform(new Date(), 'yyyy-MM-ddTHH:mm:ss');
+            this.obj.startTimeChange = this.datePipe.transform(data.startTime, 'yyyy-MM-ddTHH:mm:ss');
+            this.obj.endTimeChange = this.datePipe.transform(data.startTime, 'yyyy-MM-ddTHH:mm:ss');
+            this.nowDate = this.datePipe.transform(data.startTime, 'yyyy-MM-ddTHH:mm:ss');
             this.obj.roomId = data.roomId;
             this.obj.roomText = data.roomName;
             this.roomMax = `该会议室可容纳${data.accommodation}人`;
@@ -157,9 +157,9 @@ export class RoomApplyPage {
                     this.obj.roomText = res.roomName;
                     this.getEquipmervice(this.obj.equipmervice);
 
-                    if(new Date(res.startTime).getTime() < new Date().getTime()){
+                    if (new Date(res.startTime).getTime() < new Date().getTime()) {
                         this.overTime = true;
-                    }else{
+                    } else {
                         this.overTime = false;
                     }
                 }
@@ -341,6 +341,7 @@ export class RoomApplyPage {
         const clock12 = new Date(this.datePipe.transform(new Date(), 'yyyy-MM-dd 12:00')).getTime();
         const startTime = new Date(this.obj.startTime).getTime();
         const endTime = new Date(this.obj.endTime).getTime();
+        const nowDate = new Date(this.datePipe.transform(new Date(), 'yyyy-MM-dd HH:mm:ss')).getTime();
         console.log("clock12:" + clock12);
         console.log("startTime:" + startTime);
         console.log("startTime:" + this.datePipe.transform(startTime, 'yyyy-MM-dd HH:mm'));
@@ -349,6 +350,10 @@ export class RoomApplyPage {
             this.commonSer.toast('时间选择错误');
             return
         }
+        if (startTime == endTime || nowDate > startTime) {
+            this.commonSer.toast('时间选择错误');
+            return
+        }
         return true;
     }
 
@@ -370,7 +375,6 @@ export class RoomApplyPage {
 
     submit() {
         if (!this.checkTime()) {
-            this.commonSer.toast("时间有误");
             return;
         }
 

src/pages/tabs/discover/discover.ts

@@ -552,9 +552,8 @@ export class DiscoverPage {
                         e.resourceType = e.attachments[0].resourceType;
                     }
                 });
+                this.totalNum = res.data.total;
                 this.slideList[this.indexParent] = this.newList;
-                console.log(this.slideList);
-                console.log(this.slideList[this.indexParent]);
             }
         )
     }
@@ -616,6 +615,7 @@ export class DiscoverPage {
 
     //上拉加载更多
     doInfinite(e) {
+        console.log('total:'+this.totalNum)
         if (this.totalNum == this.slideList[this.indexParent].length || this.totalNum < this.slideList[this.indexParent].length) {
             e.complete();
             return false;