diff --git a/src/app/data/common/dictionary.namespace.ts b/src/app/data/common/dictionary.namespace.ts
index 280d530..eb18c1c 100644
--- a/src/app/data/common/dictionary.namespace.ts
+++ b/src/app/data/common/dictionary.namespace.ts
@@ -9,5 +9,5 @@ export interface Dictionary {
ext3: string;
}
-export const dictionaryData: Dictionary[] = [];
+export let dictionaryData: Dictionary[] = [];
diff --git a/src/app/pages/audit/audit-list/audit-list.component.html b/src/app/pages/audit/audit-list/audit-list.component.html
index 357468a..17419f4 100644
--- a/src/app/pages/audit/audit-list/audit-list.component.html
+++ b/src/app/pages/audit/audit-list/audit-list.component.html
@@ -110,17 +110,17 @@
- ![]()
+ ![]()
- ![]()
+ ![]()
- ![]()
+ ![]()
diff --git a/src/app/pages/body/index/index.component.ts b/src/app/pages/body/index/index.component.ts
index a113dd1..c5c2aa8 100644
--- a/src/app/pages/body/index/index.component.ts
+++ b/src/app/pages/body/index/index.component.ts
@@ -18,7 +18,7 @@ import {BrowserStorageService} from "../../../utils/localStorage.service";
import {DATA, INIT_FLAG, LOGIN_DATA, USER_TOKEN} from "../../../data/login/localStorage.namespace";
import {NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown";
import {NzMessageService} from "ng-zorro-antd/message";
-import {dictionaryData} from "../../../data/common/dictionary.namespace";
+import {Dictionary, dictionaryData} from "../../../data/common/dictionary.namespace";
import {CommonService} from "../../../services/common/common.service";
import {LoginService} from "../../../services/login/login.service";
import {NzConfigService} from "ng-zorro-antd/core/config";
@@ -80,6 +80,7 @@ export class IndexComponent {
this.nzConfigService.set('treeSelect', { nzSize: 'large' })
// 缓存数据字典
this.commonService.queryDictionary('','',(data: any) => {
+ dictionaryData.length = 0;
for (let item of data['return_data']) {
dictionaryData.push(
{
diff --git a/src/app/pages/goods/goods-list/goods-list.component.html b/src/app/pages/goods/goods-list/goods-list.component.html
index 2dc902b..425f920 100644
--- a/src/app/pages/goods/goods-list/goods-list.component.html
+++ b/src/app/pages/goods/goods-list/goods-list.component.html
@@ -340,12 +340,12 @@
-
- 限购数量
-
-
-
-
+
+
+
+
+
+
售卖价格
diff --git a/src/app/pages/goods/goods-list/goods-list.component.ts b/src/app/pages/goods/goods-list/goods-list.component.ts
index 2b6e325..728ac05 100644
--- a/src/app/pages/goods/goods-list/goods-list.component.ts
+++ b/src/app/pages/goods/goods-list/goods-list.component.ts
@@ -167,7 +167,7 @@ export class GoodsListComponent {
// 初始化
this.editSpecsForm = this.fb.group({
name: ['' , [Validators.required]],
- purLimit: ['' , [Validators.required]],
+ // purLimit: ['' , [Validators.required]],
salePrice: ['' , [Validators.required]],
originalPrice: ['' , [Validators.required]],
stock: ['' , [Validators.required]],
@@ -227,6 +227,9 @@ export class GoodsListComponent {
}
} else {
this.editForm.reset()
+ this.listImg = [];
+ this.bannerImg = [];
+ this.detailImg = [];
}
this.isVisibleEdit = true;
}
diff --git a/src/app/pages/marketing/discount-list/discount-list.component.ts b/src/app/pages/marketing/discount-list/discount-list.component.ts
index 1944114..1d3a404 100644
--- a/src/app/pages/marketing/discount-list/discount-list.component.ts
+++ b/src/app/pages/marketing/discount-list/discount-list.component.ts
@@ -199,6 +199,8 @@ export class DiscountListComponent {
}
} else {
this.editForm.reset();
+ this.img = [];
+
}
this.isVisibleEdit = true;
}
@@ -297,7 +299,7 @@ export class DiscountListComponent {
}
this.discountService.getListDiscountGoodsRel(params , (data: any) => {
if (data['return_code'] == '000000') {
- console.log("data" , data);
+ this.listOfSelectBind.length = 0;
this.nodesDiscountGoods = data['return_data'];
for (const dataKey of this.nodesDiscountGoods) {
this.listOfSelectBind.push(dataKey['specsId'])
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 8ff2b9b..548d026 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,11 +7,11 @@ export const environment = {
baseUrl: 'https://phgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
orderUrl: 'https://phgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
userUrl: 'https://phgcs.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
- // imageUrl: 'https://phgcs.dctpay.com/filesystem/',
- //baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址)
- //orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址)
+ imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/',
+ // baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址)
+ // orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址)
// userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址)
- imageUrl: 'https://phgcs.dctpay.com/filesystem/',
+ // imageUrl: 'https://phgcs.dctpay.com/filesystem/',
};
diff --git a/src/favicon.ico b/src/favicon.ico
index ba7c40e..353c17c 100644
Binary files a/src/favicon.ico and b/src/favicon.ico differ