修改界面

canvas-container/styles/theme/index.css

@@ -1562,7 +1562,6 @@
 
 .el-dialog__headerbtn {
     position: absolute;
-    top: 20px;
     right: 20px;
     padding: 0;
     background: 0 0;
@@ -4644,7 +4643,7 @@
 }
 
 .el-message-box__status.el-icon-success {
-    color: #67C23A
+    color: #183ECD
 }
 
 .el-message-box__status.el-icon-info {
@@ -5961,15 +5960,15 @@
 
 .el-alert--success.is-light {
     background-color: #f0f9eb;
-    color: #67C23A
+    color: #183ECD
 }
 
 .el-alert--success.is-light .el-alert__description {
-    color: #67C23A
+    color: #183ECD
 }
 
 .el-alert--success.is-dark {
-    background-color: #67C23A;
+    background-color: #183ECD;
     color: #FFF
 }
 
@@ -6140,7 +6139,7 @@
 }
 
 .el-notification .el-icon-success {
-    color: #67C23A
+    color: #183ECD
 }
 
 .el-notification .el-icon-error {
@@ -9832,7 +9831,7 @@
 }
 
 .el-upload-list__item .el-icon-upload-success {
-    color: #67C23A
+    color: #183ECD
 }
 
 .el-upload-list__item .el-icon-close {
@@ -10354,11 +10353,11 @@
 }
 
 .el-progress.is-success .el-progress-bar__inner {
-    background-color: #67C23A
+    background-color: #183ECD
 }
 
 .el-progress.is-success .el-progress__text {
-    color: #67C23A
+    color: #183ECD
 }
 
 .el-progress.is-warning .el-progress-bar__inner {
@@ -10551,7 +10550,7 @@
 }
 
 .el-message--success .el-message__content {
-    color: #67C23A
+    color: #183ECD
 }
 
 .el-message--warning {
@@ -10598,7 +10597,7 @@
 }
 
 .el-message .el-icon-success {
-    color: #67C23A
+    color: #183ECD
 }
 
 .el-message .el-icon-error {
@@ -10671,7 +10670,7 @@
 }
 
 .el-badge__content--success {
-    background-color: #67C23A
+    background-color: #183ECD
 }
 
 .el-badge__content--warning {
@@ -10821,8 +10820,8 @@
 }
 
 .el-step__head.is-success {
-    color: #67C23A;
-    border-color: #67C23A
+    color: #183ECD;
+    border-color: #183ECD
 }
 
 .el-step__head.is-error {
@@ -10925,7 +10924,7 @@
 }
 
 .el-step__title.is-success {
-    color: #67C23A
+    color: #183ECD
 }
 
 .el-step__title.is-error {
@@ -10953,7 +10952,7 @@
 }
 
 .el-step__description.is-success {
-    color: #67C23A
+    color: #183ECD
 }
 
 .el-step__description.is-error {
@@ -11701,20 +11700,20 @@
 .el-tag.el-tag--success {
     background-color: #f0f9eb;
     border-color: #e1f3d8;
-    color: #67c23a
+    color: #183ECD
 }
 
 .el-tag.el-tag--success.is-hit {
-    border-color: #67C23A
+    border-color: #183ECD
 }
 
 .el-tag.el-tag--success .el-tag__close {
-    color: #67c23a
+    color: #183ECD
 }
 
 .el-tag.el-tag--success .el-tag__close:hover {
     color: #FFF;
-    background-color: #67c23a
+    background-color: #183ECD
 }
 
 .el-tag.el-tag--warning {
@@ -11812,13 +11811,13 @@
 }
 
 .el-tag--dark.el-tag--success {
-    background-color: #67c23a;
-    border-color: #67c23a;
+    background-color: #183ECD;
+    border-color: #183ECD;
     color: #fff
 }
 
 .el-tag--dark.el-tag--success.is-hit {
-    border-color: #67C23A
+    border-color: #183ECD
 }
 
 .el-tag--dark.el-tag--success .el-tag__close {
@@ -11909,20 +11908,20 @@
 .el-tag--plain.el-tag--success {
     background-color: #fff;
     border-color: #c2e7b0;
-    color: #67c23a
+    color: #183ECD
 }
 
 .el-tag--plain.el-tag--success.is-hit {
-    border-color: #67C23A
+    border-color: #183ECD
 }
 
 .el-tag--plain.el-tag--success .el-tag__close {
-    color: #67c23a
+    color: #183ECD
 }
 
 .el-tag--plain.el-tag--success .el-tag__close:hover {
     color: #FFF;
-    background-color: #67c23a
+    background-color: #183ECD
 }
 
 .el-tag--plain.el-tag--warning {
@@ -13386,7 +13385,7 @@
 }
 
 .el-timeline-item__node--success {
-    background-color: #67C23A
+    background-color: #183ECD
 }
 
 .el-timeline-item__node--warning {
@@ -13519,11 +13518,11 @@
 
 .el-link.el-link--success.is-underline:hover:after,
 .el-link.el-link--success:after {
-    border-color: #67C23A
+    border-color: #183ECD
 }
 
 .el-link.el-link--success {
-    color: #67C23A
+    color: #183ECD
 }
 
 .el-link.el-link--success:hover {
@@ -14027,8 +14026,8 @@
 
 .el-button--success {
     color: #FFF;
-    background-color: #67C23A;
-    border-color: #67C23A
+    background-color: #183ECD;
+    border-color: #183ECD
 }
 
 .el-button--success:focus,
@@ -14059,15 +14058,15 @@
 }
 
 .el-button--success.is-plain {
-    color: #67C23A;
+    color: #183ECD;
     background: #f0f9eb;
     border-color: #c2e7b0
 }
 
 .el-button--success.is-plain:focus,
 .el-button--success.is-plain:hover {
-    background: #67C23A;
-    border-color: #67C23A;
+    background: #183ECD;
+    border-color: #183ECD;
     color: #FFF
 }
 

src/layout/components/AppMain.vue

@@ -25,7 +25,7 @@ export default {
   position: relative;
   overflow: hidden;
   background: #F2F6FA;
-  padding: 20px;
+  padding: 24px;
 }
 .fixed-header + .app-main {
   padding-top: 50px;

src/views/commodity/commoditySystem/addComponent.vue

@@ -372,33 +372,9 @@ export default {
   methods: {
     // 获取商品分组
     async getStorehouseList() {
-      const res = await storehouseGetAll({ page: 1, pageSize: 100
-      })
+      const res = await storehouseGetAll({ page: 1, pageSize: 100})
       this.storehouseList = res.data.list
     },
-    // proving1(e) {
-    //   var keynum = window.event ? e.keyCode : e.which // 获取键盘码
-    //   // var keychar = String.fromCharCode(keynum) // 获取键盘码对应的字符
-    //   console.log(
-    //     e.key
-    //       .replace(/[^\d^\.]+/g, '')
-    //       .replace('.', '$#$')
-    //       .replace(/\./g, '')
-    //       .replace('$#$', '.')
-    //   )
-    //   console.log(keynum)
-    //   if (
-    //     e.key
-    //       .replace(/[^\d^\.]+/g, '')
-    //       .replace('.', '$#$')
-    //       .replace(/\./g, '')
-    //       .replace('$#$', '.') === '' &&
-    //     keynum !== 8
-    //   ) {
-    //     this.$message.warning('禁止输入中文或空')
-    //     e.target.value = ' '
-    //   }
-    // },
     handleImageSuccess(response) {
       const url = response.data.url
       this.form.imgs.push({
@@ -425,17 +401,12 @@ export default {
     },
     del(row, index, arr) {
       console.log(row, index)
-      // this.form.skuList.splice(index, 1);
-      // console.log(this.form.skuAttrList);
-      // console.log(this.form.skuList);
       console.log(arr)
     },
     //
     changeAttrStyle(index) {
       console.log(index)
       console.log(this.form)
-      // if (index === 0) {
-      //   this.form.skuAttrList = []
       // }
     },
     addSkuAttrList() {
@@ -560,25 +531,45 @@ export default {
         doExchange(values, 0)
       }
       this.form.skuList = skuListArray.map(sku1 => {
-        const { skuAttrList, skuAttrCodeDTOList } = sku1
-        const skuAttrList1 = skuAttrCodeDTOList || skuAttrList
-        const skuMap = this.form.skuList.filter(sku2 => {
-          const skuAttrList2 = sku2.skuAttrList
-          sku2.skuAttrCodeDTOList = skuAttrList2
-          if (!skuAttrList2) return false
-          const ids = []
-          skuAttrList1.filter(item => ids.push(item.id))
-          const result = skuAttrList2.every(
-            item => ids.indexOf(item.attrValueId) !== -1
-          )
+        const findSku = this.form.skuList.find(sku2 => {
+          console.log("begin")
+          console.log(sku1)
+          console.log(sku2)
+          if(!sku2.skuAttrCodeDTOList){
+            return false
+          } 
+          if(sku2.skuAttrCodeDTOList.length != sku1.skuAttrCodeDTOList.length){
+            return false
+          }
+          const valueCodeList = sku2.skuAttrCodeDTOList.map(item => item.valueCode)
+          var result = sku1.skuAttrCodeDTOList.every(item => valueCodeList.indexOf(item.valueCode) !== -1)
+          console.log(result)
           return result
         })
-        let selectMap = sku1
-        if (skuMap && skuMap.length) {
-          selectMap = JSON.parse(JSON.stringify(skuMap[0]))
-          selectMap.skuAttrCodeDTOList = skuAttrCodeDTOList
-        }
-        return selectMap
+        if(findSku){
+          return findSku
+        }else{
+          return sku1
+        }
+        // const { skuAttrList, skuAttrCodeDTOList } = sku1
+        // const skuAttrList1 = skuAttrCodeDTOList || skuAttrList
+        // const skuMap = this.form.skuList.filter(sku2 => {
+        //   const skuAttrList2 = sku2.skuAttrList
+        //   sku2.skuAttrCodeDTOList = skuAttrList2
+        //   if (!skuAttrList2) return false
+        //   const ids = []
+        //   skuAttrList1.filter(item => ids.push(item.id))
+        //   const result = skuAttrList2.every(
+        //     item => ids.indexOf(item.attrValueId) !== -1
+        //   )
+        //   return result
+        // })
+        // let selectMap = sku1
+        // if (skuMap && skuMap.length) {
+        //   selectMap = JSON.parse(JSON.stringify(skuMap[0]))
+        //   selectMap.skuAttrCodeDTOList = skuAttrCodeDTOList
+        // }
+        // return selectMap
       })
     }
   }

src/views/commodity/commoditySystem/index.vue

@@ -298,7 +298,6 @@ export default {
     },
     closeModal() {
       this.showTinymce = false
-      this.$refs.child.last()
       this.$refs.child.reset()
     },
     btnClick(id) {

src/views/dashboard/index.vue

@@ -2,22 +2,57 @@
   <div class="home-page">
     <div class="total-data">
       <p class="p-title">今日数据</p>
-      <ul>
-        <li v-for="(item, index) in dataList" :key="index">
-          <p>{{ (index === 3 ? MoneyUnit(item.value) : item.value) || 0 }}</p>
-          <p>{{ item.name }}</p>
-        </li>
-      </ul>
+      <div class="card-parent">
+        <div class="card-info">
+          <div class="card-type-info">
+            <img class="card-type-img" src="../../assets/images/main_icon_cjje.png" />
+            <div class="card-type-name">{{ dataList[3].name }}</div>
+          </div>
+          <div class="card-content-info">
+            <div class="card-content-num">{{ MoneyUnit(dataList[3].value) }}</div>
+            <div class="card-content-unit">{{ dataList[3].unit }}</div>
+          </div>
+        </div>
+        <div class="card-empty"></div>
+        <div class="card-info">
+          <div class="card-type-info">
+            <img class="card-type-img" src="../../assets/images/main_icon_dcldd.png" />
+            <div class="card-type-name">{{ dataList[1].name }}</div>
+          </div>
+          <div class="card-content-info">
+            <div class="card-content-num">{{ dataList[1].value }}</div>
+            <div class="card-content-unit">{{ dataList[1].unit }}</div>
+          </div>
+        </div>
+        <div class="card-empty"></div>
+        <div class="card-info">
+          <div class="card-type-info">
+            <img class="card-type-img" src="../../assets/images/main_icon_shdd.png" />
+            <div class="card-type-name">{{ dataList[2].name }}</div>
+          </div>
+          <div class="card-content-info">
+            <div class="card-content-num">{{ dataList[2].value }}</div>
+            <div class="card-content-unit">{{ dataList[2].unit }}</div>
+          </div>
+        </div>
+        <div class="card-empty"></div>
+        <div class="card-info">
+          <div class="card-type-info">
+            <img class="card-type-img" src="../../assets/images/main_icon_dpfwcs.png" />
+            <div class="card-type-name">{{ dataList[0].name }}</div>
+          </div>
+          <div class="card-content-info">
+            <div class="card-content-num">{{ dataList[0].value }}</div>
+            <div class="card-content-unit">{{ dataList[0].unit }}</div>
+          </div>
+        </div>
+      </div>
     </div>
     <div class="sketch_map">
       <div class="tab_list">
         <ul>
-          <li
-            v-for="(item,index) in tabList"
-            :key="index"
-            :class="[{'active':item.show}]"
-            @click="changeTab(item)"
-          >{{ item.name }}</li>
+          <li v-for="(item, index) in tabList" :key="index" :class="[{ 'active': item.show }]" @click="changeTab(item)">{{
+            item.name }}</li>
         </ul>
       </div>
       <div class="echart_list">
@@ -66,16 +101,16 @@ export default {
         condition: 1
       },
       dataList: [
-        { name: '店铺访问次数 (次)', value: '', field: 'total' },
-        { name: '待处理订单 (件)', value: '', field: 'stayOrders' },
-        { name: '售后订单 (件)', value: '', field: 'stayAfters' },
-        { name: '成交金额 (万元)', value: '', field: 'money' }
+        { name: '店铺访问次数', value: '', field: 'total', unit: '次' },
+        { name: '待处理订单', value: '', field: 'stayOrders', unit: '件' },
+        { name: '售后订单', value: '', field: 'stayAfters', unit: '件' },
+        { name: '成交金额', value: '', field: 'money', unit: '万元' }
       ],
       tabList: [
-        { name: '最近30天', type: 4, date: '30' },
-        { name: '最近7天', type: 3, date: '7' },
+      { name: '今天', type: 1, show: true, date: '0' },
       { name: '昨天', type: 2, date: '1' },
-        { name: '今天', type: 1, show: true, date: '0' }
+      { name: '最近7天', type: 3, date: '7' },
+      { name: '最近30天', type: 4, date: '30' }
       ],
       info: {},
       date: '0',
@@ -92,7 +127,7 @@ export default {
         const d = res.data
         // 小于100元，单位为 元
         if (d.money < 10000) {
-          this.dataList[3].name = '成交金额 (元)'
+          this.dataList[3].unit = '元'
         }
         this.dataList.map(item => {
           item.value = d[item.field]
@@ -318,22 +353,104 @@ export default {
 ul {
   list-style: none;
 }
+
 .home-page {
   height: 100%;
+
   .total-data {
     .p-title {
-      padding-left: 20px;
-      font-size: 24px;
+      font-size: 20px;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #121F31;
+      margin-bottom: 24px;
+    }
+
+    .card-parent {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: nowrap;
+      align-content: center;
+      justify-content: center;
+      align-items: center;
+      margin-bottom: 10px;
+
+      .card-info {
+        flex: 1;
+        background: #FFFFFF;
+        border-radius: 10px;
+        padding: 25px;
+        display: flex;
+        flex-direction: column;
+        flex-wrap: nowrap;
+        align-content: flex-start;
+        justify-content: center;
+        align-items: flex-start;
+
+        .card-type-info {
+          margin-top: 9px;
+          display: flex;
+          flex-direction: row;
+          flex-wrap: nowrap;
+          align-content: center;
+          justify-content: center;
+          align-items: center;
+
+          .card-type-img {
+            width: 38px;
+            height: 38px;
+          }
+
+          .card-type-name {
+            margin-left: 16px;
+            font-size: 16px;
+            font-family: PingFang SC;
             font-weight: 400;
-      color: rgba(51, 51, 51, 1);
-      line-height: 50px;
-      height: 50px;
-      margin: 0;
+            color: #404F69;
+
+          }
+        }
+
+        .card-content-info {
+          margin-top: 22px;
+          margin-bottom: 9px;
+          display: flex;
+          flex-direction: row;
+          align-content: flex-end;
+          -webkit-box-pack: center;
+          -ms-flex-pack: center;
+          justify-content: space-between;
+          -webkit-box-align: center;
+          -ms-flex-align: center;
+          align-items: center;
+          width: 100%;
+
+          .card-content-num {
+            font-size: 40px;
+            font-family: San Francisco Display;
+            font-weight: bold;
+            color: #121F31;
+          }
+
+          .card-content-unit {
+            font-size: 16px;
+            font-family: PingFang SC;
+            font-weight: 400;
+            color: #404F69;
+          }
+        }
+      }
+
+      .card-empty {
+        width: 19px;
+      }
     }
+
     ul {
       overflow: hidden;
       display: flex;
       padding: 0;
+
       li {
         padding: 0;
         box-sizing: border-box;
@@ -343,82 +460,102 @@ ul {
         background: rgba(255, 255, 255, 1);
         border: 1px solid rgba(224, 229, 235, 1);
         border-radius: 4px;
-        margin: 20px;
+
+
+
         p {
           margin: 0;
           height: 70px;
           line-height: 70px;
           text-align: center;
+
           &:nth-child(1) {
             font-size: 48px;
             font-weight: 600;
           }
+
           &:nth-child(2) {
             font-size: 18px;
           }
         }
+
         &:nth-child(1) {
           p:nth-child(1) {
             color: #1acda1;
           }
         }
+
         &:nth-child(2) {
           p:nth-child(1) {
             color: #ffae11;
           }
         }
+
         &:nth-child(3) {
           p:nth-child(1) {
             color: #ff7911;
           }
         }
+
         &:nth-child(4) {
           p:nth-child(1) {
             color: #3a68f2;
           }
         }
       }
+
+      .empty {
+        width: 19px;
+      }
     }
   }
 
   .sketch_map {
     height: calc(100% - 260px);
     box-sizing: border-box;
-    background: #fff;
-    padding: 0 20px;
+    padding: 0px;
+
     .tab_list {
-      border-bottom: 1px solid #e0e5eb;
       overflow: hidden;
       margin-bottom: 20px;
+
       ul {
         overflow: hidden;
-        float: right;
-        width: 60%;
+        float: left;
+        width: 100%;
         padding: 0;
         margin: 0;
+
         li {
           padding: 0 20px;
           margin: 0;
-          float: right;
-          height: 60px;
-          line-height: 60px;
-          color: #999999;
-          font-size: 18px;
+          float: left;
+          height: 48px;
+          line-height: 48px;
+          font-size: 16px;
+font-family: PingFang SC;
+font-weight: 400;
+color: #404F64;
+
           &:hover {
             cursor: pointer;
           }
+
           &:nth-child(1) {
-            padding-right: 0;
+            padding-left: 0;
           }
         }
+
         .active {
           color: #3a68f2;
           border-bottom: 3px solid #3a68f2;
         }
       }
     }
+
     .echart_list {
       height: calc(100% - 100px);
+
       .echart_item {
         position: relative;
         padding-left: 20px;
@@ -428,34 +565,41 @@ ul {
         background: rgba(255, 255, 255, 1);
         border: 1px solid rgba(224, 229, 235, 1);
         box-shadow: 0px 5px 10px 0px rgba(51, 51, 51, 0.15);
-        border-radius: 4px;
+        border-radius: 10px;
         float: left;
+
         .echart {
           height: calc(100% - 100px);
         }
+
         &:nth-child(-n + 2) {
           margin-right: 20px;
         }
+
         .title {
           margin: 0;
           height: 50px;
           line-height: 50px;
           font-size: 18px;
           color: #333333;
+
           &:nth-child(2) {
             text-align: center;
             color: #3a68f2;
             font-size: 14px;
           }
         }
+
         ul {
           height: calc(100% - 50px);
           margin: 0;
           padding: 0;
+
           li {
             height: 10%;
             display: flex;
             margin-bottom: 20px;
+
             p {
               float: left;
               // text-align: center;
@@ -467,18 +611,22 @@ ul {
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
+
               &:nth-child(1) {
                 flex: 2;
               }
+
               &:nth-child(2) {
                 flex: 6;
               }
+
               &:nth-child(3) {
                 flex: 4;
               }
             }
           }
         }
+
         .exportBtn {
           position: absolute;
           right: 10px;
@@ -488,20 +636,23 @@ ul {
     }
   }
 }
+
 .empty {
   height: 450px;
+
   img {
     width: 80px;
     height: 80px;
     margin: 100px auto 10px;
     display: block;
   }
+
   p {
     text-align: center;
     color: #333333;
   }
 }
+
 .full-size {
   height: 500px;
-}
-</style>
+}</style>

src/views/marketing/channelManage/add.vue

@@ -6,7 +6,7 @@
         ref="ruleForm"
         class="formBox"
         :model="addForm"
-        label-width="150px"
+        label-width="115px"
         :rules="couponRules"
         :disabled="visitDetail"
       >

src/views/system/shopSys/index.vue

@@ -343,6 +343,9 @@ export default {
     padding-left: 10px;
     padding-right: 300px;
     flex-wrap: 800;
+    border-bottom: 1px solid black;
+    padding-bottom: 10px;
+    
     .title {
       flex: 1;
     }