样式调整

c7aa2080 · Chao Sun · fc48b8eb · c7aa2080 · c7aa2080 · c7aa2080
Commit c7aa2080 authored Mar 12, 2020 by Chao Sun
5 changed files
--- a/src/app/my/my-business-detail/my-business-detail.component.html
+++ b/src/app/my/my-business-detail/my-business-detail.component.html
@@ -9,18 +9,18 @@
    </li>
  </ul>
  <div class="content" *ngIf="selectedId===1">
-    <i class="iconfont icon-xiugaiziliao" *ngIf="readonlyFlag" (click)="editInfo()"></i>
+    <i class="iconfont icon-bianji" *ngIf="readonlyFlag" (click)="editInfo()"></i>
    <i class="iconfont icon-save" *ngIf="!readonlyFlag" (click)="saveInfo()"></i>
    <div class="contentDetail">
      <div class="contentItem">
        <span>姓名</span>
-        <input class="form-control" type="text" placeholder="姓名" [(ngModel)]="editBusiness.name"
+        <input class="form-control" type="text" placeholder="{{readonlyFlag ?'暂无姓名':'请输入姓名'}}"
-          [disabled]="readonlyFlag" />
+          [(ngModel)]="editBusiness.name" [disabled]="readonlyFlag" />
      </div>
      <div class="contentItem">
        <span>年龄</span>
-        <input class="form-control" type="text" placeholder="年龄" [(ngModel)]="editBusiness.age"
+        <input class="form-control" type="text" placeholder="{{readonlyFlag ?'暂无年龄信息':'请输入年龄'}}"
-          [disabled]="readonlyFlag" />
+          [(ngModel)]="editBusiness.age" [disabled]="readonlyFlag" />
      </div>
      <div class="contentItem">
        <span>性别</span>
@@ -35,30 +35,27 @@
      </div>
      <div class="contentItem">
        <span>手机</span>
-        <input class="form-control" type="text" placeholder="手机" [(ngModel)]="editBusiness.mobileNo" disabled />
+        <input class="form-control" type="text" [(ngModel)]="editBusiness.mobileNo" disabled />
      </div>
      <div class="contentItem">
        <span>微信</span>
-        <input class="form-control" type="text" placeholder="微信" [(ngModel)]="editBusiness.weChat"
+        <input class="form-control" type="text" placeholder="{{readonlyFlag ?'暂无微信':'请输入微信'}}"
-          [disabled]="readonlyFlag" />
+          [(ngModel)]="editBusiness.weChat" [disabled]="readonlyFlag" />
      </div>
      <div class="contentItem">
        <span>其他联系</span>
-        <input class="form-control" type="text" placeholder="其他联系" [(ngModel)]="editBusiness.otherContacts"
+        <input class="form-control" type="text" placeholder="{{readonlyFlag ?'暂无其他联系方式':'请输入其他联系方式'}}"
-          [disabled]="readonlyFlag" />
+          [(ngModel)]="editBusiness.otherContacts" [disabled]="readonlyFlag" />
      </div>
      <div class="contentItem">
        <span>商机来源</span>
-        <input class="form-control" type="text" placeholder="商机来源" [(ngModel)]="editBusiness.sourceChannel"
+        <input class="form-control" type="text" [(ngModel)]="editBusiness.sourceChannel" disabled />
-          [disabled]="readonlyFlag" />
      </div>
      <div class="contentItem">
        <span>城市</span>
-        <input class="form-control" type="text" placeholder="城市" [(ngModel)]="editBusiness.address"
+        <input class="form-control" type="text" placeholder="{{readonlyFlag ?'暂无城市信息':'请输入城市'}}"
-          [disabled]="readonlyFlag" />
+          [(ngModel)]="editBusiness.address" [disabled]="readonlyFlag" />
      </div>
      <div class="contentItem">
@@ -68,7 +65,8 @@
      </div>
      <div class="contentItem">
        <span>商机状态</span>
-        <div>{{lifeCommonService.checkStr(editBusiness.mdDropOptionId)}}</div>
+        <div style="padding: 6px 15px;padding: 6px 15px;color: #e10d0d;font-weight: bold;">
+          {{lifeCommonService.checkStr(editBusiness.mdDropOptionId)}}</div>
      </div>
      <!-- <div class="contentItem">
        <span>标签</span>
@@ -77,10 +75,13 @@
      </div> -->
    </div>
    <div class="tagWrapper">
-      <div style="width: 100%;">标签</div>
+      <div style="width: 100%;height: 34px;line-height: 34px;">标签</div>
-      <div class="tagContent" *ngFor="let tagItem of tagList" (click)="selectTag(tagItem)"
+      <!-- <div class="tagContent" *ngFor="let tagItem of tagList" (click)="selectTag(tagItem)"
        [ngClass]="{selected:tagItem.selected}">
        {{tagItem.tagName}}
+      </div> -->
+      <div class="tagContent selected" *ngFor="let tagItem of opportunityCustomerTags">
+        {{tagItem.tagName}}
      </div>
    </div>
@@ -115,7 +116,7 @@
      </div>
      <div>
        <div>跟进时间</div>
-        <div><input type="text" id="time" class="form-control" [(ngModel)]="opportunityRecordNoticeDate"></div>
+        <div><input id="time" class="form-control" [(ngModel)]="opportunityRecordNoticeDate"></div>
      </div>
      <div class="add">
        <i class="iconfont icon-jia" (click)="ownOpportunityRecordSave()"></i>

--- a/src/app/my/my-business-detail/my-business-detail.component.scss
+++ b/src/app/my/my-business-detail/my-business-detail.component.scss
 .wrapper {
+  select{
+    -webkit-appearance: none;
+  }
  .tab {
    display: flex;
    list-style: none;
@@ -27,10 +30,17 @@
    padding: 10px 5px;
    position: relative;
    > .iconfont {
+      width: 45px;
+      height: 45px;
+      line-height: 45px;
+      border-radius: 50%;
      position: absolute;
      right: 10px;
      font-size: 24px;
-      top: -5px;
+      color: #fff;
+      background: #1890ff;
+      text-align: center;
+      bottom: 30px;
    }
    .contentDetail {
      margin-top: 15px;
@@ -40,7 +50,7 @@
        justify-content: space-between;
        align-items: center;
        // border-bottom: 1px #ddd solid;
-        margin: 0 8px 8px 8px;
+        margin: 0 8px 5px 8px;
        input.form-control {
          display: inline-block;
          width: 60%;
@@ -60,11 +70,16 @@
          .form-control.sex {
            width: 20%;
            margin-left: 5px;
+            border: none;
+            box-shadow: none;
          }
          .form-control.sex.sexBtn {
-            background-color: #5cb85c;
+            border: 1px #e10d0d solid;
-            color: #fff;
          }
+          .form-control[disabled] {
+            background-color: transparent;
+            opacity: 1;
+        }
        }
      }
      .contentItem:last-child {
@@ -76,18 +91,17 @@
      flex-wrap: wrap;
      padding-left: 8px;
      div.tagContent {
-        width: 25%;
        margin: 10px 3px 0 3px;
-        height: 30px;
+        height: 28px;
-        line-height: 30px;
+        line-height: 28px;
        text-align: center;
-        background-color: #e8e8e8;
+        // background-color: #e8e8e8;
        border-radius: 12px;
-        cursor: pointer;
+        font-size: 13px;
+        padding: 0 15px;
      }
      div.selected {
-        color: #5cb85c;
+        border: 1px #e10d0d solid;
-        background: rgba(91, 184, 92, 0.1);
      }
    }

--- a/src/app/my/my-business-detail/my-business-detail.component.ts
+++ b/src/app/my/my-business-detail/my-business-detail.component.ts
@@ -73,8 +73,8 @@ export class MyBusinessDetailComponent implements OnInit {
    this.selectedId = id;
    if (id === 4) {
      if (this.isCompletedQuestionnaire == 1) {
-        // window.location.href = `https://${window.location.host}/customizedPlanList/${this.opportunityId}?orderId=${this.orderId}`
+        window.location.href = `https://${window.location.host}/customizedPlanList/3?orderId=${this.orderId}&customerId=${this.opportunityId}`
-        window.location.href = `https://${window.location.host}/customizedPlanList/2?orderId=8373`
+        // window.location.href = `https://${window.location.host}/customizedPlanList/3?orderId=8373`
      }
    }
@@ -142,6 +142,9 @@ export class MyBusinessDetailComponent implements OnInit {
  //选标签
  selectTag(tagItem) {
+    if (this.readonlyFlag) {
+      return;
+    }
    this.tagList.forEach((item, idx) => {
      if (tagItem.id == item.id) {
        this.tagList[idx].selected = !tagItem.selected
@@ -196,7 +199,7 @@ export class MyBusinessDetailComponent implements OnInit {
  ownOpportunityRecordSave() {
-    if (!this.opportunityRecordId && !this.salesNotice) {
+    if (this.opportunityRecordId == null && !this.salesNotice) {
      this.toastDialog = true;
      this.toastInfo = {
        status: 1,
@@ -216,7 +219,6 @@ export class MyBusinessDetailComponent implements OnInit {
      noticeDate: this.opportunityRecordNoticeDate
    }
    this.myService.ownOpportunityRecordSave(param).subscribe(res => {
-      console.log(res);
      if (res['success']) {
        this.toastDialog = true;
        this.toastInfo = {

--- a/src/app/my/my-business/my-business.component.ts
+++ b/src/app/my/my-business/my-business.component.ts
@@ -17,15 +17,12 @@ export class MyBusinessComponent implements OnInit {
  ownOpportunityQuery() {
    const brokerCustomerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['customerId'];
-    console.log(brokerCustomerId)
    this.myService.ownOpportunityQuery({ customerId: brokerCustomerId }).subscribe((res) => {
      if (res['data']['ownOpportunityInfos']) {
        this.businessList = res['data']['ownOpportunityInfos'];
      } else {
        this.businessList = []
      }
-      console.log(this.businessList)
    })
  }

--- a/src/app/my/my-center-home/my-center-home.component.ts
+++ b/src/app/my/my-center-home/my-center-home.component.ts
@@ -50,8 +50,8 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
          { no: 2, subtitle: 'AI保险医生', icon: 'icon-ai', path: `https://${window.location.host}/questionnaire/#/index?campaign=AIRobot&task=AItask1&customerId=${this.lifeCustomerInfo.customerId}`, routerLink: '' },
          { no: 1, subtitle: '獴哥保险诊所', icon: 'icon-btnconsult', path: `https://${window.location.host}/consulting`, routerLink: '' },
          { no: 4, subtitle: '银盾在线', icon: 'icon-zaixian', path: `https://${window.location.host}/index`, routerLink: '' },
+          { no: 13, subtitle: '我的商机', icon: 'icon-shangji', path: '', routerLink: 'business' },
          { no: 12, subtitle: '我的保单', icon: 'icon-dailishangshenqing', path: '', routerLink: '' },
-          { no: 13, subtitle: '我的商机', icon: 'icon-shangji', path: '', routerLink: 'business' }
        ]
      }, {
        title: '教育培训',