diff --git a/src/app/admin/company/company-edit/company-edit.component.ts b/src/app/admin/company/company-edit/company-edit.component.ts
index 5c19fdf..6eef281 100644
--- a/src/app/admin/company/company-edit/company-edit.component.ts
+++ b/src/app/admin/company/company-edit/company-edit.component.ts
@@ -54,10 +54,8 @@ export class CompanyEditComponent implements OnInit {
this.validateForm = this.fb.group({
loginName: [null, [Validators.required, ValidatorsService.maxLength(20)]],
password: [null, [Validators.required]],
- phone: [null, [Validators.required]],
regionId: [null],
name: [null, [Validators.required, ValidatorsService.maxLength(50)]],
- address: [null, [Validators.required, ValidatorsService.maxLength(80)]],
logo: [null],
regionName: [null],
company: {},
@@ -96,8 +94,6 @@ export class CompanyEditComponent implements OnInit {
}
this.validateForm.value['company']['name'] = this.validateForm.value.name;
this.validateForm.value['company']['regionId'] = this.regionId;
- this.validateForm.value['company']['address'] = this.validateForm.value.address;
- this.validateForm.value['company']['phone'] = this.validateForm.value.phone;
this.validateForm.value['company']['logo'] = this.validateForm.value.logo;
this.validateForm.value['user']['loginName'] = this.validateForm.value.loginName;
this.validateForm.value['user']['password'] = this.validateForm.value.password;
diff --git a/src/app/admin/company/company-list/company-list.component.html b/src/app/admin/company/company-list/company-list.component.html
index 499f69b..f78e537 100644
--- a/src/app/admin/company/company-list/company-list.component.html
+++ b/src/app/admin/company/company-list/company-list.component.html
@@ -52,8 +52,6 @@
所属地区 |
公司名称 |
公司LOGO |
- 联系方式 |
- 地址 |
创建时间 |
更新时间 |
操作 |
@@ -67,8 +65,6 @@
|
- {{data.phone}} |
- {{data.address}} |
{{data.createTime | date: 'yyyy-MM-dd HH:mm'}} |
{{data.updateTime | date: 'yyyy-MM-dd HH:mm'}} |
diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
index 4affdca..b64197f 100644
--- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
+++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
@@ -125,7 +125,7 @@
归库天数
-
+
diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
index a8e0f4e..5d1a64a 100644
--- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
+++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
@@ -78,7 +78,7 @@ export class CouponEditComponent implements OnInit {
salesPrice: [null, [Validators.required]],
discountPrice: [null, [Validators.required]],
merchantId: [null, [Validators.required]],
- isPresent: [false, [Validators.required]],
+ isPresent: [false],
payType: [null, [Validators.required]],
displayArea: [null],
couponSource: [null],
@@ -190,6 +190,14 @@ export class CouponEditComponent implements OnInit {
}
}
+ if (this.validateForm.value.isPresent == null) {
+ this.validateForm.value.isPresent = false;
+ }
+
+ if (this.validateForm.value.isPresent === false) {
+ this.validateForm.value.handselCouponId = [];
+ }
+
if (this.couponImg.length !== 0) {
if (this.couponImg[0]['response'] != null) {
this.validateForm.value.couponImg = this.couponImg[0]['response']['return_data'][0];
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 184a1dc..02e8aa1 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,9 +4,9 @@
export const environment = {
production: false,
- // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+ baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
// imageUrl: 'http://localhost:9302/filesystem/',
- baseUrl: 'https://hsgcs.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
+ // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址)
imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
};
From d46cdecc35ddb176af99c29b1dc39f5a33ae7c1d Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Thu, 8 Apr 2021 23:21:50 +0800
Subject: [PATCH 7/9] 1
---
.../coupon/coupon-edit/coupon-edit.component.html | 10 ++++++----
.../admin/coupon/coupon-edit/coupon-edit.component.ts | 1 +
.../coupon/coupon-list/coupon-list.component.html | 4 ++--
.../merchant-detail/merchant-detail.component.html | 2 +-
.../merchant-detail/merchant-detail.component.ts | 2 ++
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
index b64197f..9e58db4 100644
--- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
+++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
@@ -24,7 +24,7 @@
卡券类型
-
+
@@ -35,7 +35,7 @@
卡券来源
-
+
@@ -193,6 +193,7 @@
@@ -233,8 +235,8 @@
diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
index 5d1a64a..01fbc0c 100644
--- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
+++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts
@@ -150,6 +150,7 @@ export class CouponEditComponent implements OnInit {
pageNum: this.pageNumCoupon,
pageSize: this.pageSizeCoupon,
merchantName: e,
+ status: 2,
};
this.getCouponList(paramsObject);
}
diff --git a/src/app/admin/coupon/coupon-list/coupon-list.component.html b/src/app/admin/coupon/coupon-list/coupon-list.component.html
index d04cdff..8c1f9a4 100644
--- a/src/app/admin/coupon/coupon-list/coupon-list.component.html
+++ b/src/app/admin/coupon/coupon-list/coupon-list.component.html
@@ -41,7 +41,7 @@
卡券类型
-
+
@@ -52,7 +52,7 @@
卡券状态
-
+
diff --git a/src/app/admin/merchant/merchant-detail/merchant-detail.component.html b/src/app/admin/merchant/merchant-detail/merchant-detail.component.html
index 5ea9a7b..31ec073 100644
--- a/src/app/admin/merchant/merchant-detail/merchant-detail.component.html
+++ b/src/app/admin/merchant/merchant-detail/merchant-detail.component.html
@@ -1,7 +1,7 @@
-
+
{{data['secUser']['loginName']}}
{{data['merchantKey']}}
diff --git a/src/app/admin/merchant/merchant-detail/merchant-detail.component.ts b/src/app/admin/merchant/merchant-detail/merchant-detail.component.ts
index 88d34a1..dd25626 100644
--- a/src/app/admin/merchant/merchant-detail/merchant-detail.component.ts
+++ b/src/app/admin/merchant/merchant-detail/merchant-detail.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {MerchantService} from '../../../services/merchant.service';
import {NzMessageService} from 'ng-zorro-antd';
import {ActivatedRoute} from '@angular/router';
+import {environment} from '../../../../environments/environment';
@Component({
selector: 'app-merchant-detail',
@@ -12,6 +13,7 @@ export class MerchantDetailComponent implements OnInit {
data: any = {};
id: number;
+ FILE_URL = environment.imageUrl;
constructor(
private merchant: MerchantService,
private message: NzMessageService, // 信息提示
From e517287a2311cc4e7995aaf0af04db825b8a740d Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Fri, 9 Apr 2021 10:06:59 +0800
Subject: [PATCH 8/9] 1
---
src/app/admin/coupon/coupon-edit/coupon-edit.component.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
index b64197f..671f276 100644
--- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
+++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html
@@ -38,6 +38,7 @@
+
From 61d7d2f9b52e499770b2c8eb36fe379ef7da42d2 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 12 Apr 2021 23:35:15 +0800
Subject: [PATCH 9/9] 1
---
package-lock.json | 2 +-
.../company-detail.component.html | 2 +-
.../merchant-edit.component.html | 2 +-
.../merchant-edit/merchant-edit.component.ts | 1 +
.../order-list/order-list.component.html | 58 +++++++++++++++++--
.../neditor/dialogs/fonts/iconfont.svg | 2 +-
6 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index e10e242..8d88a33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -331,7 +331,7 @@
"strip-ansi": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W3MaA3J+lbiWA==",
"dev": true,
"requires": {
"ansi-regex": "^4.1.0"
diff --git a/src/app/admin/company/company-detail/company-detail.component.html b/src/app/admin/company/company-detail/company-detail.component.html
index 48e3fa0..72e22a8 100644
--- a/src/app/admin/company/company-detail/company-detail.component.html
+++ b/src/app/admin/company/company-detail/company-detail.component.html
@@ -21,7 +21,7 @@
{{data.company.regionName}}
-
+
{{data.company.name}}
{{data.company.phone}}
diff --git a/src/app/admin/merchant/merchant-edit/merchant-edit.component.html b/src/app/admin/merchant/merchant-edit/merchant-edit.component.html
index 5e6c7fa..7a4537d 100644
--- a/src/app/admin/merchant/merchant-edit/merchant-edit.component.html
+++ b/src/app/admin/merchant/merchant-edit/merchant-edit.component.html
@@ -22,7 +22,7 @@
- 77
+
登录密码
diff --git a/src/app/admin/merchant/merchant-edit/merchant-edit.component.ts b/src/app/admin/merchant/merchant-edit/merchant-edit.component.ts
index f835243..0a88cb1 100644
--- a/src/app/admin/merchant/merchant-edit/merchant-edit.component.ts
+++ b/src/app/admin/merchant/merchant-edit/merchant-edit.component.ts
@@ -86,6 +86,7 @@ export class MerchantEditComponent implements OnInit {
}
}
+ console.log(this.validateForm.value);
this.validateForm.value['secUser']['telephone'] = this.validateForm.value.loginTelephone;
this.validateForm.value['secUser']['password'] = this.validateForm.value.password;
if (this.logoFile.length !== 0) {
diff --git a/src/app/admin/order/order-list/order-list.component.html b/src/app/admin/order/order-list/order-list.component.html
index 860875a..4ebe375 100644
--- a/src/app/admin/order/order-list/order-list.component.html
+++ b/src/app/admin/order/order-list/order-list.component.html
@@ -66,6 +66,8 @@
编号 |
+ 商品名称 |
+ 订单来源 |
订单号 |
支付流水号 |
客户名称 |
@@ -81,15 +83,59 @@
{{i+1}} |
- {{data.orderNo}} |
- {{data.paySerialNo == null ? '暂无': data.paySerialNo}} |
+ {{data.goodsName}} |
+ {{data.giveawayType === true ? '赠送' : '购买'}} |
+
+
+ 赠送订单
+
+
+ {{data.orderNo}}
+
+ |
+
+
+ 赠送订单
+
+
+ {{data.paySerialNo}}
+
+ |
{{data.memName == null ? '暂无': data.memName}} |
{{data.memPhone == null ? '暂无': data.memPhone}} |
- {{data.payModel == null ? '暂无': data.payModel | paymodel}} |
- {{data.payType == null ? '暂无': data.payType | paytype}} |
- {{data.payPrice == null ? '暂无': data.payPrice}} |
+
+
+ 赠送
+
+
+ {{data.payModel == null ? '暂无': data.payModel | paymodel}}
+
+ |
+
+
+ 赠送
+
+
+ {{data.payType == null ? '暂无': data.payType | paytype}}
+
+ |
+
+
+ 0
+
+
+ {{data.payPrice == null ? '暂无': data.payPrice}}
+
+ |
{{data.createTime | date: 'yyyy-MM-dd HH:mm'}} |
- {{data.orderStatus | orderCouponStatus}} |
+
+
+ 赠送订单
+
+
+ {{data.orderStatus | orderCouponStatus}}
+
+ |
diff --git a/src/assets/node_modules/@notadd/neditor/dialogs/fonts/iconfont.svg b/src/assets/node_modules/@notadd/neditor/dialogs/fonts/iconfont.svg
index f2e73d5..d0c28bc 100644
--- a/src/assets/node_modules/@notadd/neditor/dialogs/fonts/iconfont.svg
+++ b/src/assets/node_modules/@notadd/neditor/dialogs/fonts/iconfont.svg
@@ -23,7 +23,7 @@ Created by iconfont
-
+
|