pull/1/head
袁野 4 years ago
parent b4cc54c6ff
commit 61d7d2f9b5
  1. 2
      package-lock.json
  2. 2
      src/app/admin/company/company-detail/company-detail.component.html
  3. 2
      src/app/admin/merchant/merchant-edit/merchant-edit.component.html
  4. 1
      src/app/admin/merchant/merchant-edit/merchant-edit.component.ts
  5. 58
      src/app/admin/order/order-list/order-list.component.html
  6. 2
      src/assets/node_modules/@notadd/neditor/dialogs/fonts/iconfont.svg

2
package-lock.json generated

@ -331,7 +331,7 @@
"strip-ansi": { "strip-ansi": {
"version": "5.2.0", "version": "5.2.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "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, "dev": true,
"requires": { "requires": {
"ansi-regex": "^4.1.0" "ansi-regex": "^4.1.0"

@ -21,7 +21,7 @@
<nz-descriptions nzBordered> <nz-descriptions nzBordered>
<nz-descriptions-item nzTitle="所属地区">{{data.company.regionName}}</nz-descriptions-item> <nz-descriptions-item nzTitle="所属地区">{{data.company.regionName}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="单位logo"> <nz-descriptions-item nzTitle="单位logo">
<img class="head_img" src="{{FILE_URL +data.logo}}" onerror="this.src='../../../../assets/admin/navigation/icon.png'" alt=""> <img class="head_img" src="{{FILE_URL + data.company.logo}}" onerror="this.src='../../../../assets/admin/navigation/icon.png'" alt="">
</nz-descriptions-item> </nz-descriptions-item>
<nz-descriptions-item nzTitle="公司名称">{{data.company.name}}</nz-descriptions-item> <nz-descriptions-item nzTitle="公司名称">{{data.company.name}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="联系方式">{{data.company.phone}}</nz-descriptions-item> <nz-descriptions-item nzTitle="联系方式">{{data.company.phone}}</nz-descriptions-item>

@ -22,7 +22,7 @@
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col [nzSpan]="8"> <div nz-col [nzSpan]="8">
<nz-form-item>77 <nz-form-item>
<nz-form-label [nzFor]="'password'" nzRequired>登录密码</nz-form-label> <nz-form-label [nzFor]="'password'" nzRequired>登录密码</nz-form-label>
<nz-form-control nzErrorTip="请输入登录密码!"> <nz-form-control nzErrorTip="请输入登录密码!">
<nz-input-group [nzSuffix]="suffixTemplate"> <nz-input-group [nzSuffix]="suffixTemplate">

@ -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']['telephone'] = this.validateForm.value.loginTelephone;
this.validateForm.value['secUser']['password'] = this.validateForm.value.password; this.validateForm.value['secUser']['password'] = this.validateForm.value.password;
if (this.logoFile.length !== 0) { if (this.logoFile.length !== 0) {

@ -66,6 +66,8 @@
<thead nzSingleSort> <thead nzSingleSort>
<tr> <tr>
<th nzWidth="50px">编号</th> <th nzWidth="50px">编号</th>
<th nzWidth="180px">商品名称</th>
<th nzWidth="180px">订单来源</th>
<th nzWidth="180px">订单号</th> <th nzWidth="180px">订单号</th>
<th nzWidth="180px">支付流水号</th> <th nzWidth="180px">支付流水号</th>
<th nzWidth="120px">客户名称</th> <th nzWidth="120px">客户名称</th>
@ -81,15 +83,59 @@
<tbody> <tbody>
<tr *ngFor="let data of ajaxTable.data; let i = index"> <tr *ngFor="let data of ajaxTable.data; let i = index">
<td>{{i+1}}</td> <td>{{i+1}}</td>
<td>{{data.orderNo}}</td> <td>{{data.goodsName}}</td>
<td>{{data.paySerialNo == null ? '暂无': data.paySerialNo}}</td> <td>{{data.giveawayType === true ? '赠送' : '购买'}}</td>
<td>
<span *ngIf="data.giveawayType">
赠送订单
</span>
<span *ngIf="!data.giveawayType">
{{data.orderNo}}
</span>
</td>
<td>
<span *ngIf="data.giveawayType">
赠送订单
</span>
<span *ngIf="!data.giveawayType">
{{data.paySerialNo}}
</span>
</td>
<td>{{data.memName == null ? '暂无': data.memName}}</td> <td>{{data.memName == null ? '暂无': data.memName}}</td>
<td>{{data.memPhone == null ? '暂无': data.memPhone}}</td> <td>{{data.memPhone == null ? '暂无': data.memPhone}}</td>
<td>{{data.payModel == null ? '暂无': data.payModel | paymodel}}</td> <td>
<td>{{data.payType == null ? '暂无': data.payType | paytype}}</td> <span *ngIf="data.giveawayType">
<td>{{data.payPrice == null ? '暂无': data.payPrice}}</td> 赠送
</span>
<span *ngIf="!data.giveawayType">
{{data.payModel == null ? '暂无': data.payModel | paymodel}}
</span>
</td>
<td>
<span *ngIf="data.giveawayType">
赠送
</span>
<span *ngIf="!data.giveawayType">
{{data.payType == null ? '暂无': data.payType | paytype}}
</span>
</td>
<td>
<span *ngIf="data.giveawayType">
0
</span>
<span *ngIf="!data.giveawayType">
{{data.payPrice == null ? '暂无': data.payPrice}}
</span>
</td>
<td>{{data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td> <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
<td>{{data.orderStatus | orderCouponStatus}}</td> <td>
<span *ngIf="data.giveawayType">
赠送订单
</span>
<span *ngIf="!data.giveawayType">
{{data.orderStatus | orderCouponStatus}}
</span>
</td>
<!-- <td nzRight="0px" class="table-td-operation">--> <!-- <td nzRight="0px" class="table-td-operation">-->
<!-- <a *ngIf="data.status !== 101" (click)="getDetail(data.id)">订单详情</a>--> <!-- <a *ngIf="data.status !== 101" (click)="getDetail(data.id)">订单详情</a>-->
<!-- </td>--> <!-- </td>-->

@ -23,7 +23,7 @@ Created by iconfont
<glyph glyph-name="close" unicode="&#58964;" d="M960 742.4l-89.6 89.6-358.4-358.4-358.4 358.4-89.6-89.6 358.4-358.4-358.4-358.4 89.6-89.6 358.4 358.4 358.4-358.4 89.6 89.6-358.4 358.4 358.4 358.4z" horiz-adv-x="1024" /> <glyph glyph-name="close" unicode="&#58964;" d="M960 742.4l-89.6 89.6-358.4-358.4-358.4 358.4-89.6-89.6 358.4-358.4-358.4-358.4 89.6-89.6 358.4 358.4 358.4-358.4 89.6 89.6-358.4 358.4 358.4 358.4z" horiz-adv-x="1024" />
<glyph glyph-name="searchreplace" unicode="&#59151;" d="M437.771654 317.01890000000003h82.93098L299.553354 896H219.181972L0.080371 317.01890000000003h80.883302L136.762912 476.225905h241.626065zM160.823135 541.751617l87.026337 241.114145A222.173119 222.173119 0 0 1 256.040186 823.307413a274.388921 274.388921 0 0 1 9.214553-40.441651l90.097855-241.114145h-194.529459z m825.214441-403.904587a146.920933 146.920933 0 0 1-94.705131 44.537008 145.897094 145.897094 0 0 1 74.740266 51.191963 138.730219 138.730219 0 0 1 27.13174 84.466738 117.741515 117.741515 0 0 1-45.560847 96.75281 189.922182 189.922182 0 0 1-122.348791 36.346294h-170.469237V-127.83925699999998h175.076513a204.767851 204.767851 0 0 1 137.70638 46.072766 153.575889 153.575889 0 0 1 53.751561 121.324952 136.170621 136.170621 0 0 1-35.322454 98.288569z m-255.959814 250.840618h74.740266q109.550801 0 109.5508-81.907141a91.121694 91.121694 0 0 0-30.715178-73.204506 126.956068 126.956068 0 0 0-84.978658-26.619821h-68.59723V388.687648z m180.707629-421.821774a136.682541 136.682541 0 0 0-90.609775-27.13174h-90.097854v204.767851h77.299864q135.146782 0 135.146782-99.824327a93.681292 93.681292 0 0 0-31.739017-78.323704zM460.808037 94.33386199999995a176.100352 176.100352 0 0 0-85.490578 40.95357 178.148031 178.148031 0 0 0-38.905892 219.613521L282.148087 384.080371A241.114145 241.114145 0 0 1 460.808037 29.32006899999999v-42.489329l112.110399 77.811783L460.808037 142.966226v-51.191963z" horiz-adv-x="1024" /> <glyph glyph-name="searchreplace" unicode="&#59151;" d="M437.1654 317.01890000000003h82.93098L299.553354 896H219.181972L0.080371 317.01890000000003h80.883302L136.762912 476.225905h241.626065zM160.823135 541.751617l87.026337 241.114145A222.173119 222.173119 0 0 1 256.040186 823.307413a274.388921 274.388921 0 0 1 9.214553-40.441651l90.097855-241.114145h-194.529459z m825.214441-403.904587a146.920933 146.920933 0 0 1-94.705131 44.537008 145.897094 145.897094 0 0 1 74.740266 51.191963 138.730219 138.730219 0 0 1 27.13174 84.466738 117.741515 117.741515 0 0 1-45.560847 96.75281 189.922182 189.922182 0 0 1-122.348791 36.346294h-170.469237V-127.83925699999998h175.076513a204.767851 204.767851 0 0 1 137.70638 46.072766 153.575889 153.575889 0 0 1 53.751561 121.324952 136.170621 136.170621 0 0 1-35.322454 98.288569z m-255.959814 250.840618h74.740266q109.550801 0 109.5508-81.907141a91.121694 91.121694 0 0 0-30.715178-73.204506 126.956068 126.956068 0 0 0-84.978658-26.619821h-68.59723V388.687648z m180.707629-421.821774a136.682541 136.682541 0 0 0-90.609775-27.13174h-90.097854v204.767851h77.299864q135.146782 0 135.146782-99.824327a93.681292 93.681292 0 0 0-31.739017-78.323704zM460.808037 94.33386199999995a176.100352 176.100352 0 0 0-85.490578 40.95357 178.148031 178.148031 0 0 0-38.905892 219.613521L282.148087 384.080371A241.114145 241.114145 0 0 1 460.808037 29.32006899999999v-42.489329l112.110399 77.811783L460.808037 142.966226v-51.191963z" horiz-adv-x="1024" />
<glyph glyph-name="italic" unicode="&#58925;" d="M384 832v-64h128L384 0H256v-64h384v64H512l128 768h128V832z" horiz-adv-x="1024" /> <glyph glyph-name="italic" unicode="&#58925;" d="M384 832v-64h128L384 0H256v-64h384v64H512l128 768h128V832z" horiz-adv-x="1024" />

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 78 KiB

Loading…
Cancel
Save