Merge branch 'test' into 'master'

Test

See merge request quanshu/mp-ui-pc!160

src/api/common.js

@@ -4,9 +4,9 @@ import request from '@/utils/request'
  * 附件
  * @param {*} data
  */
-export const privateFileSaveUrl = '/api/v1/mp/image/remote/upload/1'
+export const privateFileSaveUrl = '/api/v1/mp/image/remote/upload/commpress/1'
 
-export const publicFileSaveUrl = '/api/v1/mp/image/remote/upload/0'
+export const publicFileSaveUrl = '/api/v1/mp/image/remote/upload/commpress/0'
 
 // 云端非公开可访问的BaseUrl
 export const privateFileGetUrl = '/api/v1/mp/file/remote/download?name='
@@ -23,7 +23,7 @@ export function publicFileSaveAPI(data, config = {}) {
     formData.append(key, data[key])
   })
   return request({
-    url: '/api/v1/mp/image/remote/upload/0',
+    url: '/api/v1/mp/image/remote/upload/commpress/0',
     method: 'put',
     data: formData ,
     ...config,
@@ -42,7 +42,7 @@ export function privateFileSaveAPI(data, config = {}) {
     formData.append(key, data[key])
   })
   return request({
-    url: '/api/v1/mp/image/remote/upload/1',
+    url: '/api/v1/mp/image/remote/upload/commpress/1',
     method: 'put',
     data: formData ,
     ...config,

src/views/business/banner/components/BannerCreate.vue

@@ -43,6 +43,7 @@
             v-model="bannerPicUrl"
             :limit="1"
           />
+          <div class="tip">图片尺寸 700 * 300</div>
         </el-form-item>
         <el-form-item label="类型" prop="type">
           <el-radio-group v-model="form.type" size="small" @change="changeType">
@@ -247,4 +248,8 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
+.tip {
+    font-size: 12px;
+    color: #999;
+  }
 </style>

src/views/business/channel/childs.vue

@@ -89,13 +89,15 @@
           <el-table-column label="渠道编号" prop="channelId" width="100px" />
           <el-table-column label="渠道名称" prop="name" show-overflow-tooltip  width="180px">
             <template slot-scope="scope">
-              <el-link
-                  :underline="false"
-                   type="primary"
+              <el-button
+                  v-if="scope.row.childCnt > 0"
+                  size="mini"
+                  type="text"
                   @click="handleView(scope.row)"
                 >
                   {{scope.row.name}}
-              </el-link>
+              </el-button>
+              <span v-else>{{scope.row.name}}</span>
             </template>
           </el-table-column>
           <el-table-column label="手机号码" prop="mobile" show-overflow-tooltip  width="120px"/>
@@ -269,10 +271,16 @@ export default {
     console.log("parentId == "+parentId+  "title == "+title)
    // this.$route.meta.title = title + " - 子渠道管理"
     if(parentId){
-        this.getList();
+        this.initList();
     }
   },
   methods: {
+
+    initList(){
+      this.pageParams.pageNum = 1
+      this.getList();
+    },
+
     /** 查询用户列表 */
     getList() {
       this.loading = true;
@@ -377,7 +385,6 @@ export default {
     // 保存后的操作
     submitSuccess(){
       this.getList();
-      this.refreshChannelTree();
     },
     /**关闭弹窗*/
     hideDialog(){
@@ -401,11 +408,9 @@ export default {
       // this.createShow = true
       let parentId = row.channelId
       let title = row.name
-
-      // this.parentId = parentId
-      // this.title = title;
       this.queryParams.parentId = parentId
       this.queryParams.parentName = title
+      this.pageParams.pageNum = 1
       this.getList();
     },
   }

src/views/business/channel/index.vue

@@ -118,12 +118,14 @@
           <el-table-column label="渠道名称" prop="name" show-overflow-tooltip  width="180px">
             <template slot-scope="scope">
               <el-button
+                  v-if="scope.row.childCnt > 0"
                   size="mini"
                   type="text"
                   @click="handleView(scope.row)"
                 >
                   {{scope.row.name}}
               </el-button>
+              <span v-else>{{scope.row.name}}</span>
             </template>
           </el-table-column>
           <el-table-column label="手机号码" prop="mobile" show-overflow-tooltip  width="120px"/>

src/views/business/goods/add.vue

@@ -47,7 +47,7 @@
             <el-select
               v-model="addData.tagIds"
               placeholder="请选择商品标签"
-              multiple 
+              multiple
               clearable
             >
               <el-option :label="item.name" :value="item.tagId" v-for="(item, index) in goodsTagItemsList" :key="index" />
@@ -74,7 +74,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      
+
       <el-row v-if="addData.multiSku === 0" :gutter="40" style="width: 600px">
         <el-col :span="23">
           <el-form-item label="价格:" prop="value">
@@ -84,8 +84,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="23">
-          <el-form-item label="兑换盲豆数量:" prop="value">
-            <el-input :value="(addData.value * 10).toFixed(0)" type="number" readonly disabled>
+          <el-form-item label="兑换盲豆数量:" prop="exchangePrice">
+            <el-input v-model="addData.exchangePrice" type="number" placeholder="请输入盲豆数量">
               <template slot="append">盲豆</template>
             </el-input>
           </el-form-item>
@@ -155,12 +155,12 @@ export default {
         exchangeShow: [{ required: true, message: '请选择是否支持盲豆兑换', trigger: 'change' }],
         multiSku: [{ required: true, message: '请选择SKU类型', trigger: 'change' }],
         value: [
-          { required: true, message: '请输入商品价格', trigger: 'blur' },
+          { required: true, message: '请输商品入价格', trigger: 'blur' },
           { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }
         ],
         exchangePrice: [
-          { required: true },
-          // { pattern: /^([1-9]\d*)$/, message: "请输入正确的数字", trigger: ["blur", "change"] }
+          { required: true,message:'请输入盲豆数量', trigger: 'blur' },
+          { pattern: /^([1-9]\d*)$/, message: "请输入正确盲豆数量", trigger: ["blur", "change"] }
         ],
         cost: [
           { required: false, message: '请输入采购价格', trigger: 'blur' },
@@ -229,11 +229,11 @@ export default {
       this.$refs.addItem.validate((valid, items) => {
         if (valid) {
           this.addData.skuList = skuList
-          const { value, cost, description, ...rest } = this.addData
+          const { value, cost,exchangePrice, description, ...rest } = this.addData
           addGoods({...rest, ...{
             value: accMul(value, 100),
             cost: cost == '' || cost == null ? '' : accMul(cost, 100),
-            exchangePrice: accMul(value, 10),
+            exchangePrice: accMul(exchangePrice, 1),
             description: encodeURI(description)
           }}).then(res => {
             if (res.code === 0) {

src/views/business/goods/components/spec.vue

@@ -68,8 +68,9 @@
             </el-form-item>
           </td>
           <td>
-            <el-form-item :prop="`skuList.${index}.valueY`" :rules="exchangeRules">
-              <p>{{ (sku.valueY * 10).toFixed(0) }}</p>
+            <el-form-item :prop="`skuList.${index}.exchange`" :rules="exchangeRules">
+<!--              <p>{{ (sku.valueY * 10).toFixed(0) }}</p>-->
+              <el-input v-model="sku.exchange" />
             </el-form-item>
           </td>
           <td class="pd">
@@ -117,9 +118,16 @@ export default {
       skuList: [],
       specValTmp: '',
       specifications: [],
-      valueYRules: [{ required: true, message: '请输入价格', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"]}],
-      costYRules: [{ required: false, message: '请输入采购价格', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }],
-      exchangeRules: [{ required: true, trigger: 'blur' }]
+      valueYRules: [
+        { required: true, message: '请输入价格', trigger: 'blur' },
+        { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"]}],
+      costYRules: [
+        { required: false, message: '请输入采购价格', trigger: 'blur' },
+        { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }],
+      exchangeRules: [
+        { required: true,message:'请输入盲豆数量', trigger: 'blur' },
+        { pattern: /^([1-9]\d*)$/, message: "请输入正确的盲豆数量", trigger: ["blur", "change"] }
+      ]
     }
   },
   directives: {
@@ -154,6 +162,7 @@ export default {
       this.specListTmp = JSON.parse(JSON.stringify(this.specList))
       this.skuList = sku.map(item => {
         this.$set(item, 'valueY', accDiv(item.value, 100))
+        this.$set(item, 'exchange', accDiv(item.exchangePrice,1))
         this.$set(item, 'costY', item.cost == null ? '' : accDiv(item.cost, 100) )
         this.$set(item, 'picUrlArr', item.picUrl.split(',').map(item => { return { fileName: item }}))
         this.$set(item, 'status', !!item.quantity)
@@ -177,7 +186,7 @@ export default {
       }
       if (spec.vals.find(item => item === this.specValTmp)) {
         this.$message.warning('规格值已存在')
-        return 
+        return
       }
       spec.vals.push(this.specValTmp)
       this.specValTmp = ''
@@ -284,9 +293,9 @@ export default {
       this.$refs.sku.validate((valid, items) => {
         if (valid) {
           this.skuList.forEach(item => {
-            const { valueY, costY } = item
+            const { valueY,exchange, costY } = item
             item.value = accMul(valueY, 100)
-            item.exchangePrice = accDiv(item.value, 10)
+            item.exchangePrice = accMul(exchange, 1)
             item.cost = costY == '' ? '' : accMul(costY, 100)
             item.picUrl = item.picUrlArr.map(item => { return item.fileName }).toString()
           })
@@ -330,6 +339,6 @@ export default {
       color: red;
     }
   }
-  
+
 }
 </style>

src/views/index.vue

@@ -7,158 +7,149 @@
           <span class="text">数据驾驶舱(今日实时数据)</span>
         </div>
         <div class="brief">
-          <flexbox
-            :span="2"
-            class="brief-item">
-            <flexbox class="brief-item__body">
-              <div class="info">
-                <div class="title">
-                 实时交易金额
-                </div>
-                <div
-                  class="number">
-                  ￥ {{ accDiv((daily.payAmt && daily.payAmt.today || 0), 100)}}
-                </div>
-               <div class="brief-item__others">
-                 <div class="text">
-                   较昨天
-                 </div>
-                 <div class="rate text-one-line">
-                   <span class="rate__num">
-                      <span v-if="(daily.payAmt && daily.payAmt.yesterday || 0) > 0 ">
-                          <span v-if="((daily.payAmt && daily.payAmt.today || 0) - daily.payAmt.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
-                          <span v-if="((daily.payAmt && daily.payAmt.today || 0) - daily.payAmt.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
-                           <span v-if="(daily.payAmt && daily.payAmt.today || 0) >0">
-                              {{ getRate((daily.payAmt && daily.payAmt.today || 0) , daily.payAmt.yesterday) }}
-                           </span>
-                           <span v-else>100</span>
-                      </span>
-                      <span v-if="(daily.payAmt && daily.payAmt.yesterday || 0) == 0">
-                          <span v-if="(daily.payAmt && daily.payAmt.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
-                           {{(daily.payAmt && daily.payAmt.today || 0) > 0 ? 100 : 0 }}
-                      </span>
-                      %
-                    </span>
+          <el-row >
+             <el-col :span="6">
+               <div class="brief-item">
+                 <div class="info">
+                   <div class="title">
+                    实时交易金额
+                   </div>
+                   <div
+                     class="number">
+                     ￥ {{ accDiv((daily.payAmt && daily.payAmt.today || 0), 100)}}
+                   </div>
+                  <div class="brief-item__others">
+                    <div class="text">
+                      较昨天
+                    </div>
+                    <div class="rate text-one-line">
+                      <span class="rate__num">
+                         <span v-if="(daily.payAmt && daily.payAmt.yesterday || 0) > 0 ">
+                             <span v-if="((daily.payAmt && daily.payAmt.today || 0) - daily.payAmt.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                             <span v-if="((daily.payAmt && daily.payAmt.today || 0) - daily.payAmt.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
+                              <span v-if="(daily.payAmt && daily.payAmt.today || 0) >0">
+                                 {{ getRate((daily.payAmt && daily.payAmt.today || 0) , daily.payAmt.yesterday) }}
+                              </span>
+                              <span v-else>100</span>
+                         </span>
+                         <span v-if="(daily.payAmt && daily.payAmt.yesterday || 0) == 0">
+                             <span v-if="(daily.payAmt && daily.payAmt.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                              {{(daily.payAmt && daily.payAmt.today || 0) > 0 ? 100 : 0 }}
+                         </span>
+                         %
+                       </span>
+                    </div>
+                  </div>
                  </div>
                </div>
-              </div>
-            </flexbox>
-          </flexbox>
-
-          <flexbox
-            :span="2"
-            class="brief-item">
-            <flexbox class="brief-item__body">
-              <div class="info">
-                <div class="title">
-                 交易用户
-                </div>
-                <div
-                  class="number">
-                  {{daily.payUser && daily.payUser.today || 0}}
-                </div>
-               <div class="brief-item__others">
-                 <div class="text">
-                   较昨天
-                 </div>
-                 <div class="rate text-one-line">
-                   <span class="rate__num">
-                     <span v-if="(daily.payUser && daily.payUser.yesterday || 0) > 0 ">
-                          <span v-if="((daily.payUser && daily.payUser.today || 0) - daily.payUser.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
-                          <span v-if="((daily.payUser && daily.payUser.today || 0) - daily.payUser.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
-                          <span v-if="(daily.payUser && daily.payUser.today || 0) >0">
-                             {{ getRate((daily.payUser && daily.payUser.today || 0) , daily.payUser.yesterday) }}
-                          </span>
-                          <span v-else>100</span>
-                     </span>
-                     <span v-if="(daily.payUser && daily.payUser.yesterday || 0) == 0">
-                          <span v-if="(daily.payUser && daily.payUser.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
-                          {{(daily.payUser && daily.payUser.today || 0) > 0 ? 100 : 0 }}
-                     </span>
-                     %
-                   </span>
+             </el-col>
+             <el-col :span="6">
+               <div class="brief-item">
+                 <div class="info">
+                   <div class="title">
+                    交易用户
+                   </div>
+                   <div
+                     class="number">
+                     {{daily.payUser && daily.payUser.today || 0}}
+                   </div>
+                  <div class="brief-item__others">
+                    <div class="text">
+                      较昨天
+                    </div>
+                    <div class="rate text-one-line">
+                      <span class="rate__num">
+                        <span v-if="(daily.payUser && daily.payUser.yesterday || 0) > 0 ">
+                             <span v-if="((daily.payUser && daily.payUser.today || 0) - daily.payUser.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                             <span v-if="((daily.payUser && daily.payUser.today || 0) - daily.payUser.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
+                             <span v-if="(daily.payUser && daily.payUser.today || 0) >0">
+                                {{ getRate((daily.payUser && daily.payUser.today || 0) , daily.payUser.yesterday) }}
+                             </span>
+                             <span v-else>100</span>
+                        </span>
+                        <span v-if="(daily.payUser && daily.payUser.yesterday || 0) == 0">
+                             <span v-if="(daily.payUser && daily.payUser.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                             {{(daily.payUser && daily.payUser.today || 0) > 0 ? 100 : 0 }}
+                        </span>
+                        %
+                      </span>
+                    </div>
+                  </div>
                  </div>
-               </div>
-              </div>
-            </flexbox>
-          </flexbox>
-
-         <flexbox
-            :span="2"
-            class="brief-item">
-            <flexbox class="brief-item__body">
-              <div class="info">
-                <div class="title">
-                 盲票销售张数
                 </div>
-                <div
-                  class="number">
-                  {{daily.ticketNum && daily.ticketNum.today || 0}}
+             </el-col>
+             <el-col :span="6">
+               <div class="brief-item">
+                  <div class="info">
+                    <div class="title">
+                     盲票销售张数
+                    </div>
+                    <div
+                      class="number">
+                      {{daily.ticketNum && daily.ticketNum.today || 0}}
+                    </div>
+                   <div class="brief-item__others">
+                     <div class="text">
+                       较昨天
+                     </div>
+                     <div class="rate text-one-line">
+                       <span class="rate__num">
+                         <span v-if="(daily.ticketNum && daily.ticketNum.yesterday || 0) > 0 ">
+                              <span v-if="((daily.ticketNum && daily.ticketNum.today || 0) - daily.ticketNum.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                              <span v-if="((daily.ticketNum && daily.ticketNum.today || 0) - daily.ticketNum.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
+                              <span v-if="(daily.ticketNum && daily.ticketNum.today || 0) >0">
+                                {{ getRate((daily.ticketNum && daily.ticketNum.today || 0) , daily.ticketNum.yesterday) }}
+                              </span>
+                              <span v-else>100</span>
+                         </span>
+                         <span v-if="(daily.ticketNum && daily.ticketNum.yesterday || 0) == 0">
+                             <span v-if="(daily.ticketNum && daily.ticketNum.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                              {{(daily.ticketNum && daily.ticketNum.today || 0) > 0 ? 100 : 0 }}
+                         </span>
+                         %
+                       </span>
+
+                     </div>
+                   </div>
+                  </div>
                 </div>
-               <div class="brief-item__others">
-                 <div class="text">
-                   较昨天
-                 </div>
-                 <div class="rate text-one-line">
-                   <span class="rate__num">
-                     <span v-if="(daily.ticketNum && daily.ticketNum.yesterday || 0) > 0 ">
-                          <span v-if="((daily.ticketNum && daily.ticketNum.today || 0) - daily.ticketNum.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
-                          <span v-if="((daily.ticketNum && daily.ticketNum.today || 0) - daily.ticketNum.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
-                          <span v-if="(daily.ticketNum && daily.ticketNum.today || 0) >0">
-                            {{ getRate((daily.ticketNum && daily.ticketNum.today || 0) , daily.ticketNum.yesterday) }}
-                          </span>
-                          <span v-else>100</span>
-                     </span>
-                     <span v-if="(daily.ticketNum && daily.ticketNum.yesterday || 0) == 0">
-                         <span v-if="(daily.ticketNum && daily.ticketNum.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
-                          {{(daily.ticketNum && daily.ticketNum.today || 0) > 0 ? 100 : 0 }}
-                     </span>
-                     %
-                   </span>
-
+             </el-col>
+             <el-col :span="6">
+               <div class="brief-item">
+                 <div class="info">
+                   <div class="title">
+                    新增经销商
+                   </div>
+                   <div
+                     class="number">
+                     {{daily.newSite && daily.newSite.today || 0}}
+                   </div>
+                  <div class="brief-item__others">
+                    <div class="text">
+                      较昨天
+                    </div>
+                    <div class="rate text-one-line">
+                      <span class="rate__num">
+                        <span v-if="(daily.newSite && daily.newSite.yesterday || 0) > 0 ">
+                             <span v-if="((daily.newSite && daily.newSite.today || 0) - daily.newSite.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                             <span v-if="((daily.newSite && daily.newSite.today || 0) - daily.newSite.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
+                             <span v-if="(daily.newSite && daily.newSite.today || 0) >0">
+                               {{ getRate((daily.newSite && daily.newSite.today || 0) , daily.newSite.yesterday) }}
+                             </span>
+                             <span v-else>100</span>
+                        </span>
+                        <span v-if="(daily.newSite && daily.newSite.yesterday || 0) == 0">
+                             <span v-if="(daily.newSite && daily.newSite.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
+                             {{(daily.newSite && daily.newSite.today || 0) > 0 ? 100 : 0 }}
+                        </span>
+                        %
+                      </span>
+                    </div>
+                  </div>
                  </div>
-               </div>
-              </div>
-            </flexbox>
-          </flexbox>
-
-          <flexbox
-            :span="2"
-            class="brief-item">
-            <flexbox class="brief-item__body">
-              <div class="info">
-                <div class="title">
-                 新增经销商
-                </div>
-                <div
-                  class="number">
-                  {{daily.newSite && daily.newSite.today || 0}}
                 </div>
-               <div class="brief-item__others">
-                 <div class="text">
-                   较昨天
-                 </div>
-                 <div class="rate text-one-line">
-                   <span class="rate__num">
-                     <span v-if="(daily.newSite && daily.newSite.yesterday || 0) > 0 ">
-                          <span v-if="((daily.newSite && daily.newSite.today || 0) - daily.newSite.yesterday) > 0" class="el-icon-top rate__icon" style="color: green;" />
-                          <span v-if="((daily.newSite && daily.newSite.today || 0) - daily.newSite.yesterday) < 0" class="el-icon-bottom rate__icon" style="color: red;" />
-                          <span v-if="(daily.newSite && daily.newSite.today || 0) >0">
-                            {{ getRate((daily.newSite && daily.newSite.today || 0) , daily.newSite.yesterday) }}
-                          </span>
-                          <span v-else>100</span>
-                     </span>
-                     <span v-if="(daily.newSite && daily.newSite.yesterday || 0) == 0">
-                          <span v-if="(daily.newSite && daily.newSite.today || 0) > 0" class="el-icon-top rate__icon" style="color: green;" />
-                          {{(daily.newSite && daily.newSite.today || 0) > 0 ? 100 : 0 }}
-                     </span>
-                     %
-                   </span>
-                 </div>
-               </div>
-              </div>
-            </flexbox>
-          </flexbox>
+             </el-col>
+          </el-row>
         </div>
         <!-- 交易金额 -->
         <div class="brief-box">
@@ -179,7 +170,6 @@
               >
               </el-date-picker>
             </span>
-
             <el-select
               v-model="queryParams1.level"
               placeholder="请选择统计粒度"
@@ -278,21 +268,10 @@
              <div ref="echart4" style="width: 100%;height: 250px;"></div>
           </div>
         </div>
-
-
       </div>
     </div>
   </div>
 </template>
-
-
-<!--
-<template>
-  <div class="coontent">
-      <div ref="echart1" style="width: 100%;height: 250px;"></div>
-  </div>
-</template> -->
-
 <script>
 import { getDailyData,getPayAmtList, getPayUserCntList, getTicketBoxTop, getTicketSiteTop} from "@/api/admin/index";
 import echarts from "echarts"
@@ -487,8 +466,8 @@ export default {
               interval: 0,
               rotate: 0,
               formatter:function(value){
-                  if(value.length > 7){
-                    return value.substring(0,6) +"..."
+                  if(value.length > 6){
+                    return value.substring(0,4) +"..."
                   }else{
                     return value
                   }
@@ -540,8 +519,8 @@ export default {
               interval: 0,
               rotate: 0,
               formatter:function(value){
-                  if(value.length > 7){
-                    return value.substring(0,6) +"..."
+                  if(value.length > 6){
+                    return value.substring(0,4) +"..."
                   }else{
                     return value
                   }
@@ -763,47 +742,7 @@ export default {
       padding-top: 55px;
     }
 
-    .head {
-      position: absolute;
-      padding: 15px 20px;
-      top: 0;
-      right: 0;
-      left: 0;
-      background: #f5f6f9;
-      z-index: 1;
-
-      &__body {
-        position: relative;
-        .user-box {
-          width: unset;
-          height: 36px;
-          padding: 4px 7px;
-          border: 1px solid #E1E1E1;
-          border-radius: 3px;
-          background-color: white;
-          margin-right: 20px;
-          display: flex;
-          cursor: pointer;
-          .user-icon {
-            background: #ddd;
-            color: white;
-            padding: 5px 6px;
-            border-radius: 50%;
-          }
-          .username {
-            font-size: 12px;
-            margin: 0 8px;
-          }
-        }
-
 
-      .sort-btn {
-          position: absolute;
-          right: 0;
-          top: 0;
-        }
-      }
-    }
     .brief-box-top {
       width: 100%;
       border-radius: 3px;
@@ -836,56 +775,53 @@ export default {
       width: 100%;
       padding: 20px 10px;
       background-color: #fff;
-      display: flex;
+      // display: flex;
       align-items: center;
-      justify-content: flex-start;
+      //justify-content: flex-start;
       flex-wrap: wrap;
       margin-bottom: 24px;
       border-radius: 0 0 3px 3px;
       .brief-item {
         cursor: pointer;
-        width: calc(25% - 20px);
+        // width: calc(25% - 20px);
         height: 125px;
         box-shadow: 0 0 16px 0 rgba(0,0,0,0.08);
         border-radius: 3px;
         padding: 15px 0px;
         margin: 10px;
-        .brief-item__body {
-          flex: 1;
+        .icon-box {
+          width: 36px;
+          height: 36px;
+          line-height: 36px;
+          text-align: center;
+          border-radius: 50%;
+          margin-right: 10px;
+          margin-left: 15px;
+          flex-shrink: 0;
+          .icon {
+            color: white;
+            font-size: 19px;
+          }
+        }
+        .info {
           overflow: hidden;
-          .icon-box {
-            width: 36px;
-            height: 36px;
-            line-height: 36px;
-            text-align: center;
-            border-radius: 50%;
-            margin-right: 10px;
-            margin-left: 15px;
-            flex-shrink: 0;
-
-            .icon {
-              color: white;
-              font-size: 19px;
-            }
+          padding-left: 10px;
+          .title {
+            font-size: 13px;
+            text-align: left;
           }
-          .info {
+          .number {
+            font-size: 23px;
+            font-weight: bold;
+            line-height: 1;
+            margin-top: 8px;
+            margin-right: 5px;
+            // white-space: nowrap;
+            // text-overflow: ellipsis;
             overflow: hidden;
-            padding-left: 10px;
-            .title {
-              font-size: 13px;
-            }
-            .number {
-              font-size: 23px;
-              font-weight: bold;
-              line-height: 1;
-              margin-top: 8px;
-              margin-right: 5px;
-              // white-space: nowrap;
-              // text-overflow: ellipsis;
-              overflow: hidden;
-            }
           }
         }
+
         .brief-item__others {
           // position: relative;
           margin-top: 15px;