Merge branch 'yuantest' into test

src/views/index.vue

@@ -22,7 +22,7 @@
               <el-col :span="6">
                 <img src="@/assets/image/Sorder.png" alt="" class="header-img">
                 <span class="header-span">GMV</span>
-                <p class="header-p">{{operate.order_total_price}}</p>
+                <p class="header-p">{{beGmv}}</p>
               </el-col>
               <el-col :span="6">
                 <img src="@/assets/image/Sorder.png" alt="" class="header-img">
@@ -36,12 +36,12 @@
               <el-col :span="10">
                 <img src="@/assets/image/Sorder.png" alt="" class="header-img">
                 <span class="header-span">正常发货率</span>
-                <p class="header-p">{{operate.delivery_rate}}</p>
+                <p class="header-p">{{delivery}}%</p>
               </el-col>
               <el-col :span="10">
                 <img src="@/assets/image/Sorder.png" alt="" class="header-img">
                 <span class="header-span">待结算金额</span>
-                <p class="header-p">{{operate.unsettled_amount}}</p>
+                <p class="header-p">{{beSettled}}</p>
               </el-col>
             </el-row>
           </div>
@@ -145,7 +145,7 @@
                 prop="sale"
                 label="销量"
                 align="center"
-                width="180">
+                width="240">
               </el-table-column>
               <el-table-column
                 prop="total_price"
@@ -193,46 +193,46 @@
               <span class="main-right-foot-sa">更多>></span>
               <ul>
                 <li>
-                  <div class="main-right-foot-le">
+                  <!-- <div class="main-right-foot-le">
                     <div style="color:#F0444E">重要</div>
-                  </div>
-                  <span class="foot-le-text">关于618全民好物节活动通知</span>
+                  </div> -->
+                  <span class="foot-le-text">暂无消息</span>
                 </li>
                 <li>
-                  <div class="main-right-foot-le">
+                  <!-- <div class="main-right-foot-le">
                     <div style="color:#F0444E">重要</div>
-                  </div>
-                  <span class="foot-le-text">关于618全民好物节活动通知</span>
+                  </div> -->
+                  <span class="foot-le-text">暂无消息</span>
                 </li>
                 <li>
-                  <div class="main-right-foot-ri foot-color">
-                    <div>新</div>
-                  </div>
-                  <span class="foot-le-text">关于618全民好物节活动通知</span>
+                  <!-- <div class="main-right-foot-ri foot-color">
+                    <div style="color:#F09C33;">新</div>
+                  </div> -->
+                  <span class="foot-le-text">暂无消息</span>
                 </li>
                 <li>
-                  <div class="main-right-foot-ri foot-color">
+                  <!-- <div class="main-right-foot-ri foot-color">
                     <div >新</div>
-                  </div>
-                  <span class="foot-le-text">关于618全民好物节活动通知</span>
+                  </div> -->
+                  <span class="foot-le-text">暂无消息</span>
                 </li>
                 <li>
-                  <div class="main-right-foot-ri foot-color">
+                  <!-- <div class="main-right-foot-ri foot-color">
                     <div >新</div>
-                  </div>
-                  <span class="foot-le-text">关于618全民好物节活动通知</span>
+                  </div> -->
+                  <span class="foot-le-text">暂无消息</span>
                 </li>
                 <li>
-                  <div class="main-right-foot-ri foot-color">
+                  <!-- <div class="main-right-foot-ri foot-color">
                     <div>新</div>
-                  </div>
-                  <span class="foot-le-text">关于618全民好物节活动通知</span>
+                  </div> -->
+                  <span class="foot-le-text">暂无消息</span>
                 </li>
                 <li>
-                  <div class="main-right-foot-ri">
+                  <!-- <div class="main-right-foot-ri">
                     <div></div>
-                  </div>
-                  <span class="foot-le-text">关于618全民好物节活动通知</span>
+                  </div> -->
+                  <span class="foot-le-text">暂无消息</span>
                 </li>
               </ul>
           </div>
@@ -243,7 +243,7 @@
         <div class="footer-left">
           <div style="margin:30px 0 0 24px;">
               <span class="ft-sp">热销类目排行</span>
-              <div class="main-left-foot-top">
+              <!-- <div class="main-left-foot-top">
                 <el-date-picker
                   size="mini"
                   v-model="value2"
@@ -264,7 +264,7 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
-              </div>
+              </div> -->
           </div>
            <el-table
             style="margin-top:38px;padding:16px 16px 0;"
@@ -313,11 +313,11 @@
                 <span>规则中心</span>
                 <p>GO></p></p>
               </div>
-              <div class="footer-right-top-img footer-top-two" >
+              <div class="footer-right-top-img footer-top-two" @click="openDia()">
                 <span>学习中心</span>
                 <p>GO></p></p>
               </div>
-              <div class="footer-right-top-img footer-top-thr" style="margin-top:15px;">
+              <div class="footer-right-top-img footer-top-thr" style="margin-top:15px;"@click="openDia()">
                 <span>商家成长</span>
                 <p>GO></p></p>
               </div>
@@ -348,7 +348,10 @@
     },
     data() {
       return {
-        dialogVisible: false,
+        delivery:'',//发货率
+        beSettled:'',//待结算金额
+        beGmv:'',//gmv
+        dialogVisible: false,//控制弹框
         numberValue:'1',//控制运营数据时间筛选
         operate:{},//运营数据
         waitFor:{},//待办事项数据
@@ -395,23 +398,24 @@
       },
       //跳转到我的资产
       goMyAssets(){
-        console.log('跳转到我的资产')
+        this.$router.push('/system/asset/myAsset')
+        console.log('我的资产')
       },
       //跳转到商品发布页面
       goCommodity(){
-        console.log('跳转到商品发布页面')
+        this.$router.push('/system/goods/add')
       },
       //跳转到售后
       afterSale(){
-        console.log('去售后')
+        this.$router.push('/system/repeat/retreat')
       },
       //跳转到订单列表
       godeliver(){
-        console.log('24和48超时')
+        this.$router.push('/system/order/index')
       },
       //跳转到订单列表
       goovertime(){
-        console.log('超时')
+        this.$router.push('/system/order/index')
       },
       //获取默认数据
       async GetDefaultData(){
@@ -419,14 +423,27 @@
         this.operate=result.data.operational_data
         this.waitFor=result.data.seller_todo_data
         this.storeOrder=result.data.store_order_data
+        // let stroeGoods=result.data.store_goods_sale_data.map(item=>{
+        //         item.total_price* 1 / 100
+        // })
+        // console.log(stroeGoods,'看看改造的数据')
         this.storeGoods=result.data.store_goods_sale_data
         this.cateGory=result.data.category_sale_data
         this.numberChartData=this.storeOrder
+        this.delivery=result.data.operational_data.delivery_rate/100
+        this.beSettled=result.data.operational_data.unsettled_amount/100
+        this.beGmv=result.data.operational_data.order_total_price/100
         let storeObject={}
         storeObject.date=this.storeOrder.date.reverse()
-        storeObject.customerprice=this.storeOrder.customer_price
+        let catePrice = this.storeOrder.customer_price.map(item=>{
+          return  item / 100
+        })
+        let orderPrice= this.storeOrder.order_total.map(item=>{
+          return item / 100
+        })
+        storeObject.customerprice=catePrice
         storeObject.ordercount=this.storeOrder.order_count
-        storeObject.ordertotal=this.storeOrder.order_total
+        storeObject.ordertotal=orderPrice
         this.numberChartData=storeObject
         console.log(result.data,'默认返回的数据')
       },
@@ -438,16 +455,18 @@
           query.end_time=this.value1[1] / 1000
           query.seller_id=this.$store.state.user.sellerid
           const result=await getStoreData(query)
-          console.log(result)
           let storeObject={}
           storeObject.date=result.data.date.reverse()
-          storeObject.customerprice=result.data.customer_price
+          let catePrice = this.storeOrder.customer_price.map(item=>{
+          return  item / 100
+          })
+          storeObject.customerprice=catePrice
           storeObject.ordercount=result.data.order_count
-          storeObject.ordertotal=result.data.order_total
+          let orderPrice= this.storeOrder.order_total.map(item=>{
+          return item / 100
+          })
+          storeObject.ordertotal=orderPrice
           this.numberChartData=storeObject
-          console.log(this.numberChartData,'123456')
-          console.log(this.value1,'统计店铺选择时间')
-          console.log(query)
         }else if(this.numSelect=='13'){
           let query={}
           query.start_time=this.value1[0] / 1000
@@ -668,6 +687,7 @@
     color: #999999;
   }
   .main-right-foot .main-right-foot-le{
+    display: none;
     width: 37px;
     height: 22px;
     display: inline-block;
@@ -675,6 +695,7 @@
     border-radius: 4px;
   }
   .main-right-foot .main-right-foot-ri{
+    display: none;
     width: 23px;
     height: 22px;
     display: inline-block;
@@ -690,7 +711,7 @@
     font-style: italic;
   }
   .main-right-foot .foot-le-text{
-    margin-left: 6px;
+    margin-left: 46px;
     font: 400 14px Alibaba PuHuiTi;
     color: #000000;
   }
@@ -726,6 +747,7 @@
     margin: 24px auto;
   }
   .footer-right-top-img{
+    cursor: pointer;
     width: 177px;
     height: 81px;
     border: 1px dotted black;