袁野 6 months ago
parent 2ba0fa0775
commit ca83f8da64
  1. 2
      src/app/data/common/dictionary.namespace.ts
  2. 6
      src/app/pages/audit/audit-list/audit-list.component.html
  3. 3
      src/app/pages/body/index/index.component.ts
  4. 12
      src/app/pages/goods/goods-list/goods-list.component.html
  5. 5
      src/app/pages/goods/goods-list/goods-list.component.ts
  6. 4
      src/app/pages/marketing/discount-list/discount-list.component.ts
  7. 8
      src/environments/environment.ts
  8. BIN
      src/favicon.ico

@ -9,5 +9,5 @@ export interface Dictionary {
ext3: string;
}
export const dictionaryData: Dictionary[] = [];
export let dictionaryData: Dictionary[] = [];

@ -110,17 +110,17 @@
</nz-descriptions-item>
<nz-descriptions-item [nzSpan]="3" nzTitle="列表图">
<nz-image-group>
<img nz-image width="80px" *ngFor="let item of auditDetail['goodsModel']['listImg'].split(',') " [nzFallback]="fallbackImg" nzSrc="{{item}}" alt="" />
<img nz-image width="80px" *ngFor="let item of auditDetail['goodsModel']['listImg'].split(',') " [nzFallback]="fallbackImg" nzSrc="{{imageUrl + item}}" alt="" />
</nz-image-group>
</nz-descriptions-item>
<nz-descriptions-item [nzSpan]="3" nzTitle="轮播图">
<nz-image-group>
<img nz-image width="80px" style="margin-left: 10px" *ngFor="let item of auditDetail['goodsModel']['bannerImg'].split(',') " [nzFallback]="fallbackImg" nzSrc="{{item}}" alt="" />
<img nz-image width="80px" style="margin-left: 10px" *ngFor="let item of auditDetail['goodsModel']['bannerImg'].split(',') " [nzFallback]="fallbackImg" nzSrc="{{imageUrl + item}}" alt="" />
</nz-image-group>
</nz-descriptions-item>
<nz-descriptions-item [nzSpan]="3" nzTitle="详情图">
<nz-image-group>
<img nz-image width="80px" style="margin-left: 10px" *ngFor="let item of auditDetail['goodsModel']['detailImg'].split(',') " [nzFallback]="fallbackImg" nzSrc="{{item}}" alt="" />
<img nz-image width="80px" style="margin-left: 10px" *ngFor="let item of auditDetail['goodsModel']['detailImg'].split(',') " [nzFallback]="fallbackImg" nzSrc="{{imageUrl + item}}" alt="" />
</nz-image-group>
</nz-descriptions-item>
</nz-descriptions>

@ -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(
{

@ -340,12 +340,12 @@
<input nzSize="large" nz-input formControlName="name" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
<nz-form-item >
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>限购数量</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请输入限购数量!">
<nz-input-number style="width: 100%" formControlName="purLimit" [nzSize]="'large'" [nzMin]="1" [nzMax]="99999" [nzStep]="1" ></nz-input-number>
</nz-form-control>
</nz-form-item>
<!-- <nz-form-item >-->
<!-- <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>限购数量</nz-form-label>-->
<!-- <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请输入限购数量!">-->
<!-- <nz-input-number style="width: 100%" formControlName="purLimit" [nzSize]="'large'" [nzMin]="1" [nzMax]="99999" [nzStep]="1" ></nz-input-number>-->
<!-- </nz-form-control>-->
<!-- </nz-form-item>-->
<nz-form-item >
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>售卖价格</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请输入售卖价格!">

@ -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;
}

@ -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'])

@ -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/',
};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Loading…
Cancel
Save