cloud-web-corejs 1.0.18 → 1.0.20

package/src/views/user/home/distributor.vue

@@ -3,36 +3,39 @@
     <el-row>
       <el-col :span="7">
         <div class="user-info">
-          <div class="head-img"><img src="~@/resources/images/default-header.png" /></div>
+          <div class="head-img"><img src="~@/resources/images/default-header.png"/></div>
           <div class="id">ID:{{ userInfo.id }}</div>
           <div class="txt">
-            <p class="name">{{ userInfo.loginAccount }}<i class="w iconfont icon-nv"></i><i class="m iconfont icon-nan"></i></p>
+            <p class="name">{{ userInfo.loginAccount }}<i class="w iconfont icon-nv"></i><i
+              class="m iconfont icon-nan"></i></p>
             <p>电话：{{ userInfo.mobile }}</p>
-            <p>机构：{{userInfo.companyName }}</p>
+            <p>机构：{{ userInfo.companyName }}</p>
           </div>
         </div>
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix head">
             <span>待办事项</span>
-<!--            <el-button class="more" type="text">更多+</el-button>-->
+            <!--            <el-button class="more" type="text">更多+</el-button>-->
             <el-button type="text" @click="$router.push('/basic/wf/wf_manage/list')" class="more">
               <i class="el-icon-news"></i>
               <span>更多+</span>
             </el-button>
           </div>
           <div class="need-to">
-            <div class="item" v-for="(unDoWfRow,index) in unDoWfRows" :key="index"   @click="openWfDialog(unDoWfRow)">
-<!--              <a-->
-<!--                href="javascript:void(0);"-->
-<!--                class="a-link"-->
-<!--               -->
-<!--              >-->
-                  <i class="ico"></i>
-                  <div class="status"><el-tag >审核中</el-tag></div>
-                  <p class="name">{{ unDoWfRow.name }}</p>
-                  <p>当前任务：{{ unDoWfRow.taskName }}</p>
-                  <p>申请人：{{ unDoWfRow.createBy }} {{unDoWfRow.createDate }}</p>
-<!--              </a>-->
+            <div class="item" v-for="(unDoWfRow,index) in unDoWfRows" :key="index" @click="openWfDialog(unDoWfRow)">
+              <!--              <a-->
+              <!--                href="javascript:void(0);"-->
+              <!--                class="a-link"-->
+              <!--               -->
+              <!--              >-->
+              <i class="ico"></i>
+              <div class="status">
+                <el-tag>审核中</el-tag>
+              </div>
+              <p class="name">{{ unDoWfRow.name }}</p>
+              <p>当前任务：{{ unDoWfRow.taskName }}</p>
+              <p>申请人：{{ unDoWfRow.createBy }} {{ unDoWfRow.createDate }}</p>
+              <!--              </a>-->
             </div>
           </div>
         </el-card>
@@ -43,18 +46,18 @@
             <div class="banner"><img src="~@/resources/images/banner-test.png"/></div>
           </el-col>
           <el-col :span="24" class="real-time">
-<!--            <div class="item" v-for="index in 8" :key="index"><p>补差金额（元）</p><b>4800</b></div>-->
-            <div class="item" ><p>可发货余额（元）</p><b>{{ balances.balance }}</b></div>
-            <div class="item" ><p>使用金额（元）</p><b>{{ balances.usageAmount }}</b></div>
-            <div class="item" ><p>回款总额（元）</p><b>{{ balances.depositAmount }}</b></div>
-            <div class="item" ><p>退货总额（元）</p><b>{{ balances.returnAmount }}</b></div>
-            <div class="item" ><p>返利余额（元）</p><b>{{ balances.policyBalance }}</b></div>
-            <div class="item" ><p>返利上账（元）</p><b>{{ balances.policyAmount }}</b></div>
-            <div class="item" ><p>返利使用（元）</p><b>{{ balances.policyUsage }}</b></div>
-            <div class="item" ><p>授信总额（元）</p><b>{{ balances.creditAmount }}</b></div>
+            <!--            <div class="item" v-for="index in 8" :key="index"><p>补差金额（元）</p><b>4800</b></div>-->
+            <div class="item"><p>可发货余额（元）</p><b>{{ balances.balance }}</b></div>
+            <div class="item"><p>使用金额（元）</p><b>{{ balances.usageAmount }}</b></div>
+            <div class="item"><p>回款总额（元）</p><b>{{ balances.depositAmount }}</b></div>
+            <div class="item"><p>退货总额（元）</p><b>{{ balances.returnAmount }}</b></div>
+            <div class="item"><p>返利余额（元）</p><b>{{ balances.policyBalance }}</b></div>
+            <div class="item"><p>返利上账（元）</p><b>{{ balances.policyAmount }}</b></div>
+            <div class="item"><p>返利使用（元）</p><b>{{ balances.policyUsage }}</b></div>
+            <div class="item"><p>授信总额（元）</p><b>{{ balances.creditAmount }}</b></div>
           </el-col>
           <el-col :span="7">
-            <el-card class="box-card"  shadow="never">
+            <el-card class="box-card" shadow="never">
               <div slot="header" class="clearfix head">
                 <span>快捷通道</span>
                 <el-button type="text" class="more f-blue" @click="showCommMenuDialog = true">
@@ -77,35 +80,35 @@
                 <span>待审核</span>
                 <span class="count">{{ quantity }}</span>
               </div>
-<!--              <div class="item">-->
-<!--                <i><img src="~@/resources/images/ico-os-2.png"/></i>-->
-<!--                <span>待发货</span>-->
-<!--                <span class="count">16</span>-->
-<!--              </div>-->
-<!--              <div class="item">-->
-<!--                <i><img src="~@/resources/images/ico-os-3.png"/></i>-->
-<!--                <span>待签收</span>-->
-<!--                <span class="count">16</span>-->
-<!--              </div>-->
-<!--              <div class="item">-->
-<!--                <i><img src="~@/resources/images/ico-os-4.png"/></i>-->
-<!--                <span>已签收</span>-->
-<!--                <span class="count">16</span>-->
-<!--              </div>-->
-<!--              <div class="item">-->
-<!--                <i><img src="~@/resources/images/ico-os-5.png"/></i>-->
-<!--                <span>已退货</span>-->
-<!--                <span class="count">16</span>-->
-<!--              </div>-->
-<!--              <div class="item">-->
-<!--                <i><img src="~@/resources/images/ico-os-6.png"/></i>-->
-<!--                <span>待入库</span>-->
-<!--                <span class="count">16</span>-->
-<!--              </div>-->
+              <!--              <div class="item">-->
+              <!--                <i><img src="~@/resources/images/ico-os-2.png"/></i>-->
+              <!--                <span>待发货</span>-->
+              <!--                <span class="count">16</span>-->
+              <!--              </div>-->
+              <!--              <div class="item">-->
+              <!--                <i><img src="~@/resources/images/ico-os-3.png"/></i>-->
+              <!--                <span>待签收</span>-->
+              <!--                <span class="count">16</span>-->
+              <!--              </div>-->
+              <!--              <div class="item">-->
+              <!--                <i><img src="~@/resources/images/ico-os-4.png"/></i>-->
+              <!--                <span>已签收</span>-->
+              <!--                <span class="count">16</span>-->
+              <!--              </div>-->
+              <!--              <div class="item">-->
+              <!--                <i><img src="~@/resources/images/ico-os-5.png"/></i>-->
+              <!--                <span>已退货</span>-->
+              <!--                <span class="count">16</span>-->
+              <!--              </div>-->
+              <!--              <div class="item">-->
+              <!--                <i><img src="~@/resources/images/ico-os-6.png"/></i>-->
+              <!--                <span>待入库</span>-->
+              <!--                <span class="count">16</span>-->
+              <!--              </div>-->
             </div>
           </el-col>
           <el-col :span="9">
-            <el-card class="box-card"  shadow="never">
+            <el-card class="box-card" shadow="never">
               <div slot="header" class="clearfix head">
                 <span>通知公告</span>
                 <el-button type="text" @click="openSystemNoticeDialog()"><span class="more">更多</span></el-button>
@@ -114,11 +117,11 @@
                 <div class="item" v-for="(systemNotice,index) in systemNotices" :key="index"
                      @click="openSystemNoticeDialog(systemNotice)">
                   <div class="date">
-                    <p class="year">{{systemNotice.createDate.substring(0, 4)}}</p>
+                    <p class="year">{{ systemNotice.createDate.substring(0, 4) }}</p>
                     <p>{{ systemNotice.createDate.substring(5, 10) }}</p>
                   </div>
                   <!--                  <div class="status">已读</div>-->
-                  <p class="name">{{systemNotice.title}}</p>
+                  <p class="name">{{ systemNotice.title }}</p>
                   <p>{{ systemNotice.content }}</p>
                 </div>
               </div>
@@ -174,6 +177,7 @@ import systemNoticeInfoDialog from '../../../views/user/system_notice/infoDialog
 import commMenuDialog from '../../../views/user/commMenu/index.vue';
 import notifyMessageDialog from '../../../views/user/notify_message/dialog.vue';
 import notifyMessageInfoDialog from '../../../views/user/notify_message/infoDialog';
+
 export default {
   name: 'test1',
   props: {
@@ -243,10 +247,10 @@ export default {
         }
       });
     },
-    initBalance(){
+    initBalance() {
       this.$http({
         url: YX_PREFIX + '/balance/listPage',
-        data: {"size":"200","current":"1"},
+        data: {"size": "200", "current": "1"},
         method: 'post',
         success: res => {
           var balancesArr = res.objx && res.objx.records ? res.objx.records : [];
@@ -254,10 +258,10 @@ export default {
         }
       });
     },
-    initQuantity(){
+    initQuantity() {
       this.$http({
         url: YX_PREFIX + '/orderAgreement/listPage',
-        data: {"orderType":"orderAgreement","statuses":[1],"size":"200","current":"1"},
+        data: {"orderType": "orderAgreement", "statuses": [1], "size": "200", "current": "1"},
         method: 'post',
         success: res => {
           var balancesArr = res.objx && res.objx.records ? res.objx.records : [];
@@ -355,7 +359,7 @@ export default {
                       this.openWfDialog(row);
                     }}
                   >
-                    <el-tooltip enterable={false} effect="dark" content="查看" placement="top"
+                    <el-tooltip enterable={false} effect="dark" content={ this.$t1('查看') } placement="top"
                                 popper-class="tooltip-skin">
                       <i class="el-icon-edit"/>
                     </el-tooltip>
@@ -502,89 +506,341 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-.el-card{margin:0 8px;border:none;border-radius: 8px;
-  .head{padding:4px;
-    > span{color:#000;font-weight: 600;}
-    .more i{font-size: 12px;vertical-align: middle;margin-right: 3px;}
+.el-card {
+  margin: 0 8px;
+  border: none;
+  border-radius: 8px;
+
+  .head {
+    padding: 4px;
+
+    > span {
+      color: #000;
+      font-weight: 600;
+    }
+
+    .more i {
+      font-size: 12px;
+      vertical-align: middle;
+      margin-right: 3px;
+    }
   }
 }
-.dealer-home{
-  padding:10px 2px 0;
-  .user-info{
-    background-color: #FFF;position: relative;border-radius: 8px;margin:0 8px 12px;overflow: hidden;padding:16px 12px 16px 146px;color:#B3B3B3;height: 140px;font-size: 13px;
-    .head-img{width: 100px;height: 100px;border-radius: 50%;position: absolute;left:24px;top:50%;margin-top:-50px;
-      img{width: 100%;height: 100%;}
+
+.dealer-home {
+  padding: 10px 2px 0;
+
+  .user-info {
+    background-color: #FFF;
+    position: relative;
+    border-radius: 8px;
+    margin: 0 8px 12px;
+    overflow: hidden;
+    padding: 16px 12px 16px 146px;
+    color: #B3B3B3;
+    height: 140px;
+    font-size: 13px;
+
+    .head-img {
+      width: 100px;
+      height: 100px;
+      border-radius: 50%;
+      position: absolute;
+      left: 24px;
+      top: 50%;
+      margin-top: -50px;
+
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .id {
+      position: absolute;
+      background-color: #608DEB;
+      color: #FFF;
+      height: 24px;
+      position: absolute;
+      right: 12px;
+      top: 12px;
+      border-radius: 26px;
+      line-height: 24px;
+      padding: 0 12px;
     }
-    .id{position:absolute ;background-color: #608DEB;color:#FFF;height: 24px;position: absolute;right:12px;top:12px;border-radius: 26px;line-height: 24px;padding:0 12px;}
-    .name{color:#212121;font-weight: 600;font-size: 24px;margin-top:10px;
-      i{width: 22px;height: 22px;color:#FFF;border-radius: 12px;margin-left:6px;display: inline-block;text-align: center;font-size:12px;line-height: 22px;vertical-align: middle;margin-bottom: 4px;font-weight: 400;
-        &.w{background-color: #FF9CC7;}
-        &.m{background-color: #80c4ff;}
+
+    .name {
+      color: #212121;
+      font-weight: 600;
+      font-size: 24px;
+      margin-top: 10px;
+
+      i {
+        width: 22px;
+        height: 22px;
+        color: #FFF;
+        border-radius: 12px;
+        margin-left: 6px;
+        display: inline-block;
+        text-align: center;
+        font-size: 12px;
+        line-height: 22px;
+        vertical-align: middle;
+        margin-bottom: 4px;
+        font-weight: 400;
+
+        &.w {
+          background-color: #FF9CC7;
+        }
+
+        &.m {
+          background-color: #80c4ff;
+        }
       }
     }
-    p{margin-bottom: 8px;}
+
+    p {
+      margin-bottom: 8px;
+    }
   }
-  .need-to{height: calc(100vh - 262px);overflow:auto;
-    .item{
-      position: relative;padding:0 24px 0 64px;font-size: 12px;color:#999999;margin:12.5px 0;cursor: pointer;
-      p{margin-bottom:3px;}
-      &:hover{color:#225076;
-        .name{color:#225076}
+
+  .need-to {
+    height: calc(100vh - 262px);
+    overflow: auto;
+
+    .item {
+      position: relative;
+      padding: 0 24px 0 64px;
+      font-size: 12px;
+      color: #999999;
+      margin: 12.5px 0;
+      cursor: pointer;
+
+      p {
+        margin-bottom: 3px;
+      }
+
+      &:hover {
+        color: #225076;
+
+        .name {
+          color: #225076
+        }
+      }
+
+      .ico {
+        width: 52px;
+        height: 52px;
+        display: inline-block;
+        background: url(~@/resources/images/ico-1.png) no-repeat center;
+        background-size: cover;
+        left: 0;
+        top: 50%;
+        margin-top: -30px;
+        position: absolute;
+      }
+
+      .name {
+        font-size: 14px;
+        color: #212121;
+        margin-bottom: 5px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      .status {
+        position: absolute;
+        right: 12px;
+        bottom: 0;
+        zoom: 0.9;
       }
-      .ico{width: 52px;height: 52px;display:inline-block;background: url(~@/resources/images/ico-1.png) no-repeat center;background-size: cover;left:0;top:50%;margin-top:-30px;position: absolute;}
-      .name{font-size: 14px;color:#212121;margin-bottom: 5px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
-      .status{position: absolute;right:12px;bottom:0;zoom: 0.9;}
     }
 
   }
-  .banner{border-radius: 8px;overflow: hidden;height:140px;margin:0 8px 12px;
-    img{width: 100%;height: 100%;}
+
+  .banner {
+    border-radius: 8px;
+    overflow: hidden;
+    height: 140px;
+    margin: 0 8px 12px;
+
+    img {
+      width: 100%;
+      height: 100%;
+    }
   }
-  .real-time{
-    .item{
-      margin:0 8px 12px;background-color: #FFF;border-radius:8px;padding:16px 16px 12px;width: calc(25% - 16px);float: left;line-height: 1.2;
-      b{font-size: 24px;color:#1472FF}
+
+  .real-time {
+    .item {
+      margin: 0 8px 12px;
+      background-color: #FFF;
+      border-radius: 8px;
+      padding: 16px 16px 12px;
+      width: calc(25% - 16px);
+      float: left;
+      line-height: 1.2;
+
+      b {
+        font-size: 24px;
+        color: #1472FF
+      }
     }
   }
-  .order-status_box{margin:0 8px;background-color: #FFF;border-radius: 8px;padding:18px 8px 0;overflow: hidden;height: calc(100vh - 395px);
-    .item{
-      background-color: #F6F9FF;border-radius: 8px;float: left;width: calc(50% - 16px);margin: 8px;display: inline-block;height: 78px;line-height: 78px;padding: 0 14px;cursor: pointer;overflow: hidden;
-      .count{float: right;font-size: 18px;font-weight: 600;}
-      i{width: 17px;height:auto;display: inline-block;background-size: cover;vertical-align: middle;margin-right: 4px;line-height: 1;
-        img{width:100%;height: 100%;}
+
+  .order-status_box {
+    margin: 0 8px;
+    background-color: #FFF;
+    border-radius: 8px;
+    padding: 18px 8px 0;
+    overflow: hidden;
+    height: calc(100vh - 395px);
+
+    .item {
+      background-color: #F6F9FF;
+      border-radius: 8px;
+      float: left;
+      width: calc(50% - 16px);
+      margin: 8px;
+      display: inline-block;
+      height: 78px;
+      line-height: 78px;
+      padding: 0 14px;
+      cursor: pointer;
+      overflow: hidden;
+
+      .count {
+        float: right;
+        font-size: 18px;
+        font-weight: 600;
+      }
+
+      i {
+        width: 17px;
+        height: auto;
+        display: inline-block;
+        background-size: cover;
+        vertical-align: middle;
+        margin-right: 4px;
+        line-height: 1;
+
+        img {
+          width: 100%;
+          height: 100%;
+        }
       }
     }
   }
-  .news-box,.fast-box{
-    height: calc(100vh - 455px);overflow: auto;
+
+  .news-box, .fast-box {
+    height: calc(100vh - 455px);
+    overflow: auto;
   }
-  .fast-box{
-    .item{width: 33.3%;text-align: center;float: left;margin:15px 0;cursor: pointer;
-      p{margin-bottom: 0;}
-      i{width:62px;height: 62px;background-size: cover;background-repeat: no-repeat;margin:0 auto 12px;display: block;line-height: 1;
-        img{width:100%;height: 100%;}
+
+  .fast-box {
+    .item {
+      width: 33.3%;
+      text-align: center;
+      float: left;
+      margin: 15px 0;
+      cursor: pointer;
+
+      p {
+        margin-bottom: 0;
+      }
+
+      i {
+        width: 62px;
+        height: 62px;
+        background-size: cover;
+        background-repeat: no-repeat;
+        margin: 0 auto 12px;
+        display: block;
+        line-height: 1;
+
+        img {
+          width: 100%;
+          height: 100%;
+        }
       }
     }
   }
-  .news-box{
-    .item{
-      padding:0 60px;position: relative;font-size: 12px;color:#808080;margin:3px 0 11px;cursor: pointer;
-      p{margin-bottom: 0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
-      &:hover{color:#225076;
-        .name{color:#225076}
+
+  .news-box {
+    .item {
+      padding: 0 60px;
+      position: relative;
+      font-size: 12px;
+      color: #808080;
+      margin: 3px 0 11px;
+      cursor: pointer;
+
+      p {
+        margin-bottom: 0;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      &:hover {
+        color: #225076;
+
+        .name {
+          color: #225076
+        }
+      }
+
+      &:after {
+        content: "\e612";
+        position: absolute;
+        right: 0;
+        top: 2px;
+        font-family: "iconfont";
       }
-      &:after{content: "\e612";position: absolute;right:0;top:2px;font-family: "iconfont";}
-      .date{background-color: #F6F9FF;color:#7BB2F2;display: inline-block;border-radius: 8px;padding:4px 6px;position: absolute;left:0;top:0;line-height: 1.2;text-align: center;
-        .year{color:#3088EB;font-size: 16px;}
-        p{color:#7BB2F2}
+
+      .date {
+        background-color: #F6F9FF;
+        color: #7BB2F2;
+        display: inline-block;
+        border-radius: 8px;
+        padding: 4px 6px;
+        position: absolute;
+        left: 0;
+        top: 0;
+        line-height: 1.2;
+        text-align: center;
+
+        .year {
+          color: #3088EB;
+          font-size: 16px;
+        }
+
+        p {
+          color: #7BB2F2
+        }
       }
-      .status{
-        position: absolute;right:0;bottom:-2px;background-color: #E8F3FF;color:#4FA8FF;border-radius: 4px;padding:2px 8px;
+
+      .status {
+        position: absolute;
+        right: 0;
+        bottom: -2px;
+        background-color: #E8F3FF;
+        color: #4FA8FF;
+        border-radius: 4px;
+        padding: 2px 8px;
+      }
+
+      .name {
+        color: #424242;
+        font-size: 13px;
+        margin-bottom: 6px;
+        display: block;
       }
-      .name{color:#424242;font-size: 13px;margin-bottom: 6px;display: block;}
-      &.no-read{
-        .status{
-          background-color: #fef0f0;color: #f56c6c;
+
+      &.no-read {
+        .status {
+          background-color: #fef0f0;
+          color: #f56c6c;
         }
       }
     }

package/src/views/user/home/index.vue

@@ -33,7 +33,7 @@ export default {
         method: 'post',
         success: res => {
           let userInfo = res.objx;
-          if(userInfo.flag!==8){
+          if (userInfo.flag !== 8) {
             this.initHome();
           }
         }