Skip to content

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

购物车优化

parent d46d29b8
Show whitespace changes
Inline Side-by-side
Showing with 273 additions and 122 deletions
config.xml
View file @ ae41a8bb
<?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.1" 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>
......
platforms/android/app/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties
View file @ ae41a8bb
#Tue Jul 30 20:41:49 CST 2019
#Wed Jul 31 11:42:37 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
......@@ -35,17 +35,17 @@
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/xml/opener_paths.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/xml_opener_paths.xml.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-ldpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/mipmap-ldpi_icon.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_template_part_time.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_part_time.xml.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_action_tombstone.xml.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xxhdpi_screen.png.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-port-xhdpi_screen.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_action_tombstone.xml.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_narrow.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_big_media_narrow.xml.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_action.xml.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-port-xhdpi_screen.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_template_icon_group.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_template_icon_group.xml.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_custom.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_big_media_custom.xml.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xhdpi_screen.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v21_notification_action.xml.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_template_part_chronometer.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_part_chronometer.xml.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-v21/notification_action_background.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-v21_notification_action_background.xml.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xhdpi_screen.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_custom.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_big_media_custom.xml.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_media.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_template_media.xml.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-v21/notification_action_background.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-v21_notification_action_background.xml.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-xhdpi-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-mdpi-v4/notify_panel_notification_icon_bg.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-mdpi-v4_notify_panel_notification_icon_bg.png.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-hdpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/mipmap-hdpi_icon.png.flat
......@@ -53,10 +53,10 @@
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-xxhdpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/mipmap-xxhdpi_icon.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_action.xml.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-xhdpi-v4/notification_bg_low_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-xhdpi-v4_notification_bg_low_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_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notification_bg_normal.9.png.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xxxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xxxhdpi_screen.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_normal.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notification_bg_normal.9.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_media_cancel_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout_notification_media_cancel_action.xml.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-port-hdpi_screen.png.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-hdpi_screen.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v16/notification_template_custom_big.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/layout-v16_notification_template_custom_big.xml.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-hdpi_screen.png.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-hdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-port-hdpi_screen.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat
platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt
View file @ ae41a8bb
#Tue Jul 30 20:41:55 CST 2019
#Wed Jul 31 11:42:51 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
View file @ ae41a8bb
#Internal package file, do not edit.
#Tue Jul 30 20:41:55 CST 2019
#Wed Jul 31 11:42:52 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
340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/loading.gif
......
platforms/android/app/build/intermediates/manifests/full/release/AndroidManifest.xml
View file @ ae41a8bb
......@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ionic.smart19.starter.test"
android:hardwareAccelerated="true"
android:versionCode="40500"
android:versionName="4.5.0" >
android:versionCode="40501"
android:versionName="4.5.1" >
<uses-sdk
android:minSdkVersion="16"
......
platforms/android/app/build/intermediates/manifests/full/release/output.json
View file @ ae41a8bb
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40501},"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
View file @ ae41a8bb
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40501},"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
View file @ ae41a8bb
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40501},"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/transforms/dex/release/__content__.json
View file @ ae41a8bb
[{"name":"main","index":0,"scopes":["EXTERNAL_LIBRARIES","PROJECT","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
[{"name":"main","index":0,"scopes":["PROJECT","EXTERNAL_LIBRARIES","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
platforms/android/app/build/outputs/apk/release/output.json
View file @ ae41a8bb
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40500},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40501},"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/reports/lint-results-release-fatal.html
View file @ ae41a8bb
......@@ -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 Tue Jul 30 20:41:57 CST 2019 </nav>
Check performed at Wed Jul 31 11:42:58 CST 2019 </nav>
</div>
</header>
<div class="mdl-layout__drawer">
......
platforms/android/app/src/main/AndroidManifest.xml
View file @ ae41a8bb
<?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="40501" android:versionName="4.5.1" 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
View file @ ae41a8bb
<?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.1" 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/components/spces/spces.ts
View file @ ae41a8bb
......@@ -15,7 +15,7 @@ export class SpcesComponent {
amount: <any>'1',
brand: '',
officeId: '',
id:'',
id: '',
model: '',
specs1: '',
specs2: '',
......@@ -24,17 +24,19 @@ export class SpcesComponent {
specs5: '',
};
goodsDetail;
constructor(private viewCtrl: ViewController, private params: NavParams,
private serveSer: ServeService,private commonSer:CommonService) {
private serveSer: ServeService, private commonSer: CommonService) {
this.goodsId = this.params.get('goodsId');
const data = this.params.get('data');
if(data){
this.choose.amount = data.amount;
this.choose.specs1 = data.specs1;
this.choose.specs2 = data.specs2;
this.choose.specs3 = data.specs3;
this.choose.specs4 = data.specs4;
this.choose.specs5 = data.specs5;
this.goodsDetail = this.params.get('data');
if (this.goodsDetail) {
this.choose.amount = this.goodsDetail.amount;
this.choose.specs1 = this.goodsDetail.specs1;
this.choose.specs2 = this.goodsDetail.specs2;
this.choose.specs3 = this.goodsDetail.specs3;
this.choose.specs4 = this.goodsDetail.specs4;
this.choose.specs5 = this.goodsDetail.specs5;
}
this.serveSer.supplyDetail(this.goodsId).subscribe(
(res) => {
......@@ -67,26 +69,26 @@ export class SpcesComponent {
submit() {
this.choose.brand = this.goods.brand;
this.choose.officeId = this.goods.id;
this.choose.id = this.goods.id;
if (this.goodsDetail) this.choose.id = this.goods.id; //购物车编辑
this.choose.model = this.goods.model;
console.log(this.choose);
if(this.goods.specs1List && this.goods.specs1List.length > 0 && !this.choose.specs1){
if (this.goods.specs1List && this.goods.specs1List.length > 0 && !this.choose.specs1) {
this.commonSer.toast('请选择规格！');
return false;
}
if(this.goods.specs2List && this.goods.specs2List.length > 0 && !this.choose.specs2){
if (this.goods.specs2List && this.goods.specs2List.length > 0 && !this.choose.specs2) {
this.commonSer.toast('请选择规格！');
return false;
}
if(this.goods.specs3List && this.goods.specs3List.length > 0 && !this.choose.specs3){
if (this.goods.specs3List && this.goods.specs3List.length > 0 && !this.choose.specs3) {
this.commonSer.toast('请选择规格！');
return false;
}
if(this.goods.specs4List && this.goods.specs4List.length > 0 && !this.choose.specs4){
if (this.goods.specs4List && this.goods.specs4List.length > 0 && !this.choose.specs4) {
this.commonSer.toast('请选择规格！');
return false;
}
if(this.goods.specs5List && this.goods.specs5List.length > 0 && !this.choose.specs5){
if (this.goods.specs5List && this.goods.specs5List.length > 0 && !this.choose.specs5) {
this.commonSer.toast('请选择规格！');
return false;
}
......
src/pages/serve-pages/goods-collect/goods-order/goods-order.html
View file @ ae41a8bb
......@@ -14,12 +14,16 @@
</ion-refresher-content>
</ion-refresher>
<div class="order" *ngFor="let item of orderList">
<p class="orderTips">
<span *ngIf="item.status == 2">已申请</span>
<span *ngIf="item.status == 3">已领取</span>
<span *ngIf="item.status == 4">已驳回</span>
<span float-right >时间：{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>
</p>
<div class="goodsList">
<div class="goodsItem" *ngFor="let goods of item.suppies">
<p class="model">
{{goods.model}}
</p>
<p>
<span class="amount">数量:{{goods.amount}}</span>
<span>{{goods.model}}</span>
<span class="specs">规格:
<span>{{goods.specs1}}</span>
<span>{{goods.specs2}}</span>
......@@ -27,9 +31,12 @@
<span>{{goods.specs4}}</span>
<span>{{goods.specs5}}</span>
</span>
<span class="amount">数量:{{goods.amount}}</span>
</p>
</div>
</div>
</div>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content
loadingSpinner="bubbles"
......
src/pages/serve-pages/goods-collect/goods-order/goods-order.scss
View file @ ae41a8bb
page-goods-order {
.order {
padding: 5px;
font-size: 1.6rem;
color: #333333;
background-color: #fff;
margin: 10px;
border-radius: 10px;
border-radius: 8px;
box-shadow: 5px 5px 5px #e5e5e5;
.goodsItem {
padding: 5px;
.orderTips{
padding: 10px;
background-color: #fff1f0;
color: #e42417;
border-top-right-radius: 8px;
border-top-left-radius: 8px;
font-size: 1.4rem;
}
.goodsList{
padding: 10px;
border-bottom-right-radius: 8px;
border-bottom-left-radius: 8px;
}
.model{
padding: 5px 0;
font-size: 1.4rem;
......@@ -19,6 +30,7 @@ page-goods-order {
margin-left: 5px;
color: #666666;
font-size: 1.3rem;
margin-left: 10px;
}
.amount {
......
src/pages/serve-pages/meet-room/meet-room.html
View file @ ae41a8bb
......@@ -21,61 +21,65 @@
<ion-content>
<ion-content direction="y" scrollbar-y="true" class="bgc-e7e8ed">
<ion-content direction="y" scrollbar-y="true">
<ng-container *ngIf="changeType == 1">
<ion-calendar [(ngModel)]="date"
(onChange)="onChange($event)"
(onChange)="getApply($event)"
[options]="options"
type="string"
format="YYYY-MM-DD">
</ion-calendar>
<!-- <div class="margin-top-10 duty-Obj">-->
<!-- <ion-item class="">-->
<!-- <div>-->
<!-- <p><span class="daySpan">白班</span></p>-->
<!-- <p class="padding-left-15">-->
<!-- <span *ngIf="dayObj.name">{{dayObj.name}}</span>-->
<!-- <span *ngIf="!dayObj.name">暂无</span>-->
<!-- <span>{{dayObj?.phone}}</span>-->
<!-- </p>-->
<!-- <p class="padding-left-15">{{dayObj?.orgName}}</p>-->
<!-- </div>-->
<!-- </ion-item>-->
<!-- <ion-item class=" margin-top-10">-->
<!-- <div>-->
<!-- <p><span class="nightSpan">夜班</span></p>-->
<!-- <p class="padding-left-15">-->
<!-- <span *ngIf="nightObj.name">{{nightObj.name}}</span>-->
<!-- <span *ngIf="!nightObj.name">暂无</span>-->
<!-- <span>{{nightObj?.phone}}</span>-->
<!-- </p>-->
<!-- <p class="padding-left-15">{{nightObj?.orgName}}</p>-->
<!-- </div>-->
<!-- </ion-item>-->
<!-- </div>-->
<div class="room">
<div class="already">
<p>已预定会议室</p>
<div class="morning">
<div class="morning-text">
上午
</div>
<div class="morning-room">
<span (click)="goApplyEdit(item1)" *ngFor="let item1 of room?.morningUse">
{{item1.name}}(已预定)
</span>
</div>
</div>
<div class="afternoon">
<div class="afternoon-text">
下午
</div>
<div class="morning-room">
<span (click)="goApplyEdit(item2)" *ngFor="let item2 of room?.afternoonUse">
{{item2.name}}(已预定)
</span>
</div>
</div>
</div>
<div class="notYet">
<p>可预定会议室</p>
<div class="morning">
<div class="morning-text">
上午
</div>
<div class="morning-room">
<span (click)="goApply()" *ngFor="let item3 of room?.morningNotUse">
{{item3.name}}(可预定)
</span>
</div>
</div>
<div class="afternoon">
<div class="afternoon-text">
上午
</div>
<div class="morning-room">
<span (click)="goApply()" *ngFor="let item4 of room?.afternoonNotUse">
{{item4.name}}(可预定)
</span>
</div>
</div>
</div>
</div>
</ng-container>
<ng-container *ngIf="changeType == 2">
<div class="duty-content">
<!-- <ion-list *ngIf="nowDuty.length > 0">-->
<!-- <ion-item class="dutyItem" class="margin-top-10" *ngFor="let item of nowDuty">-->
<!-- <div class="margin-bottom-15">-->
<!-- <span>{{item.dutyDate | date:'yyyy-MM-dd'}}</span>-->
<!-- <span *ngIf="item.type == 0">白班</span>-->
<!-- <span *ngIf="item.type == 1">夜班</span>-->
<!-- <span float-right class="duty-state">待值班</span>-->
<!-- </div>-->
<!-- <div>-->
<!-- <span class="color-666" style="font-size: 1.5rem">-->
<!-- <span *ngIf="item.dayType == 1">工作日</span>-->
<!-- <span *ngIf="item.dayType == 2">节假日</span>-->
<!-- <span *ngIf="item.dayType == 3">调休</span>-->
<!-- <span *ngIf="item.dayType == 4">调班</span>-->
<!-- <span *ngIf="item.dayType == 5">周末</span>-->
<!-- </span>-->
<!-- </div>-->
<!-- </ion-item>-->
<!-- </ion-list>-->
</div>
</ng-container>
</ion-content>
......
src/pages/serve-pages/meet-room/meet-room.scss
View file @ ae41a8bb
page-meet-room {
.list-ios .item-block .item-inner{
.list-ios .item-block .item-inner {
border: none;
}
.duty{
.duty {
display: flex;
flex-direction: row;
align-items: center;
......@@ -10,23 +11,27 @@ page-meet-room {
height: 36px;
background-color: #fff;
}
.duty-state{
.duty-state {
border: 1px solid #f8ac56;
font-size: 1.3rem;
border-radius: 4px;
padding: 1px 4px;
color: #f8ac56;
}
.duty div{
.duty div {
width: 50%;
text-align: center;
position: relative;
}
.duty-title{
.duty-title {
position: relative;
color: #e42417;
}
.duty-title::after{
.duty-title::after {
content: '';
position: absolute;
width: 100%;
......@@ -35,37 +40,119 @@ page-meet-room {
bottom: -10px;
left: 0px;
}
.span-btn{
.span-btn {
background-color: #e42417;
font-size: 1.4rem;
padding: 4px 6px;
color: #fff;
border-radius: 3px;
}
.dutyItem > div{
.dutyItem > div {
margin-bottom: 10px;
}
.daySpan{
.daySpan {
padding: 2px 20px;
background-color: #e42417;
color: #fff;
border-bottom-right-radius: 5px;
}
.nightSpan{
.nightSpan {
padding: 4px 20px;
background-color: #4e5e6f;
color: #fff;
border-bottom-right-radius: 5px;
}
.duty-Obj .item-ios p {
margin-bottom: 15px;
}
.duty-Obj .label-ios{
.duty-Obj .label-ios {
margin: 0;
}
.duty-Obj{
.item-ios.item-block .item-inner{
.duty-Obj {
.item-ios.item-block .item-inner {
background-color: #f5f6f7;
}
}
.room {
padding: 15px;
}
.morning, .afternoon {
display: flex;
.morning-text, .afternoon-text {
width: 20%;
display: flex;
align-items: center;
font-weight: bold;
padding-left: 15px;
}
.morning-room, .morning-room {
width: 80%;
padding: 10px 5px;
min-height: 53px;
span {
display: inline-block;
font-size: 1.2rem;
background-color: #e42417;
border: 1px solid #e42417;
border-radius: 4px;
color: #ffffff;
padding: 3px 6px;
margin-bottom: 8px;
margin-right: 5px;
}
}
}
.morning + .afternoon {
border-top: 1px solid #cccccc;
}
.already, .notYet {
border: 1px solid #dddddd;
border-radius: 3px;
p {
background-color: #fff1f0;
color: #e42417;
padding: 6px 15px;
}
}
.already {
.morning {
border-top-right-radius: 8px;
border-top-left-radius: 8px;
}
.afternoon {
border-bottom-right-radius: 8px;
border-bottom-left-radius: 8px;
}
}
.notYet {
margin-top: 15px;
.morning,.afternoon{
.morning-room{
span{
background-color: #f2f2f2;
border: 1px solid #f2f2f2;
color: #666666;
}
}
}
}
}
src/pages/serve-pages/meet-room/meet-room.ts
View file @ ae41a8bb
......@@ -3,6 +3,8 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
import {CalendarComponentOptions} from "ion2-calendar";
import {monthCh, weekDay} from "../../../app/main";
import {RoomApplyPage} from "./room-apply/room-apply";
import {ServeService} from "../serve.service";
import {DatePipe} from "@angular/common";
@IonicPage()
@Component({
......@@ -21,15 +23,25 @@ export class MeetRoomPage {
pickMode: 'single',
color: 'danger'
};
dayObj;
nightObj;
nowDuty;
constructor(public navCtrl: NavController, public navParams: NavParams) {
room;
constructor(public navCtrl: NavController, public navParams: NavParams,
private serveSer: ServeService, public datePipe: DatePipe) {
}
ionViewDidEnter() {
const date = this.datePipe.transform(new Date(), 'yyyy-MM-dd');
this.getApply(date);
}
ionViewDidLoad() {
console.log('ionViewDidLoad MeetRoomPage');
getApply(date) {
const data = {'dateStr': date}
this.serveSer.queryMeetingRoomByDate(data).subscribe(
(res) => {
this.room = res.data;
}
)
}
addMeet() {
......@@ -40,9 +52,12 @@ export class MeetRoomPage {
this.changeType = type;
}
onChange(e) {
const date = new Date(e).toLocaleDateString();
// this.getDuty(date);
goApplyEdit(item) {
this.navCtrl.push(RoomApplyPage, {id: item.id});
}
goApply() {
this.navCtrl.push(RoomApplyPage);
}
}
src/pages/serve-pages/meet-room/room-apply/room-apply.ts
View file @ ae41a8bb
......@@ -48,6 +48,8 @@ export class RoomApplyPage {
personList = [];
roomMax = '请输入参会人数'; //会议室最大人数
applyId; //是否编辑
constructor(public navCtrl: NavController, public navParams: NavParams,
private serveSer: ServeService, public modalCtrl: ModalController,
private commonSer: CommonService) {
......@@ -55,6 +57,28 @@ export class RoomApplyPage {
ionViewDidLoad() {
this.getList();
this.applyId = this.navParams.get('id');
if (this.applyId) {
this.meetDetail();
}
}
//会议详情
meetDetail() {
this.serveSer.meetDetail(this.applyId).subscribe(
(res) => {
if (res) {
this.personList = res.participants;
this.leaderList = res.leaders;
this.obj.meetingType = res.meetingType;
this.obj.remark = res.remark;
this.obj.equipmervice = res.equipmervice;
this.obj.participantAmount = res.participantAmount;
this.obj.org = {orgId: res.orgId, orgName: res.orgName};
this.obj.room = {roomId: res.roomId, roomName: res.roomName};
}
}
)
}
//会议室列表，部领导列表，处室列表
......
src/pages/serve-pages/serve.service.ts
View file @ ae41a8bb
import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service"; @Injectable()export class ServeService { constructor( private http: HttpClient, //该请求 将结果转为json private commonSer: CommonService, private https: Http, //该请求不转json ) { } getAllOrganization(data): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getAllOrganization?' + this.commonSer.toQuery(data)); } /** 物品领用 **/ //办公用品列表 searchSupplies(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/searchSupplies', this.commonSer.toFormData(data)); } //物品详情 supplyDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/detail/' + params); } //保存订单 saveOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrder', data); } //查询订单 myOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/myOrder', this.commonSer.toFormData(data)); } //类型列表 getTypeList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/getTypeList', null); } //购物车 shoppingCar(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/shoppingCar', this.commonSer.toFormData(data)); } //更新购物车 saveOrderSuppy(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrderSuppy', data); } //删除购物车物品 deleteOrderSuppy(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/deleteOrderSuppy/' + params); } /** 会议室预定 **/ //会议室列表 getRoomList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getRoomList', null); } //部领导列表 getLeaders(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getLeaders', null); } //保存会议申请 saveApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/saveApply', data); } }
\ No newline at end of file
import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service"; @Injectable()export class ServeService { constructor( private http: HttpClient, //该请求 将结果转为json private commonSer: CommonService, private https: Http, //该请求不转json ) { } getAllOrganization(data): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/sysmanagement/org/getAllOrganization?' + this.commonSer.toQuery(data)); } /** 物品领用 **/ //办公用品列表 searchSupplies(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/searchSupplies', this.commonSer.toFormData(data)); } //物品详情 supplyDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/detail/' + params); } //保存订单 saveOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrder', data); } //查询订单 myOrder(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/myOrder', this.commonSer.toFormData(data)); } //类型列表 getTypeList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/officesupplies/getTypeList', null); } //购物车 shoppingCar(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/shoppingCar', this.commonSer.toFormData(data)); } //更新购物车 saveOrderSuppy(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/saveOrderSuppy', data); } //删除购物车物品 deleteOrderSuppy(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/ordermanage/deleteOrderSuppy/' + params); } /** 会议室预定 **/ queryMeetingRoomByDate(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/queryMeetingRoomByDate', this.commonSer.toFormData(data)); } //预定详情 meetDetail(params): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/detail/' + params); } //会议室列表 getRoomList(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getRoomList', null); } //部领导列表 getLeaders(): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/getLeaders', null); } //保存会议申请 saveApply(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/meetingapply/saveApply', data); } }
\ No newline at end of file
......
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