瀏覽代碼

拉取备份

zhuxinbo 5 年之前
父節點
當前提交
168fb7ebf4

+ 6 - 5
src/components/DatePicker.vue

@@ -12,7 +12,7 @@
       @change="onChange"
     />
     <div class="pickOptions" v-show="openOptions" ref="pickOptions">
-      <div v-for="item in pickOptions" :key="item.key" @click="changeDate(item)">{{item.title}}</div>
+      <div v-for="item in pickOptions" :key="item.key" @click="changeDate(item)" class="btn">{{item.title}}</div>
     </div>
   </div>
 </template>
@@ -102,9 +102,7 @@ let pickOptions = [
     key: '8',
     value: 8,
     dateValue: [
-      moment()
-        .subtract(1, 'days')
-        .subtract(1, 'years'),
+      moment().subtract(1, 'days').subtract(1, 'years'),
       moment().subtract(1, 'days')
     ]
   }
@@ -142,7 +140,7 @@ export default {
       this.$parent.dateValue = val.dateValue
     },
     handleClose() {
-      this.$parent.opendate()
+      this.$parent.opendateClose()
     },
     disabledDate(current) {
       // console.log(current)
@@ -182,6 +180,9 @@ export default {
       padding: 10px 15px;
       box-sizing: border-box;
     }
+    .btn:hover{
+        color: #1890ff;
+    }
   }
 }
 </style>

+ 14 - 7
src/views/modules/Statistics/CompareData.vue

@@ -126,6 +126,9 @@
             slot="costProportion"
             slot-scope="costProportion"
           >{{ costProportion | toPercentage }}</span>
+          <span slot="cost" slot-scope="cost">{{ cost | decimalsHandle }}</span>
+        <span slot="click" slot-scope="click">{{ click | formatCurrency }}</span>
+        <span slot="showNum" slot-scope="showNum">{{ showNum | formatCurrency }}</span>
           <!-- <span slot="statDatetime" slot-scope>{{ dateValue[0].format('YYYY-MM-DD')+'~'+dateValue[1].format('YYYY-MM-DD')}}</span> -->
         </a-table>
       </div>
@@ -619,7 +622,7 @@ export default {
     //保留两位小数并且变成货币格式
     decimalsHandle(val){
         
-        val=val.toFixed(2);
+       val=parseFloat(val).toFixed(2);
         let numberStr = val.toString()
         let str = numberStr.split('.')
         
@@ -686,25 +689,29 @@ export default {
     padding-bottom: 20px;
     div {
       border-bottom: 1px solid #e0e0e0;
-      padding: 5px 10px;
-      font-size: 16px;
-      font-weight: 600;
+      padding: 10px 10px;
+      font-size: 14px;
+      font-weight: 550;
+      // font-family: Arial, Helvetica, sans-serif;
+      // font-family: Cambria, Cochin, Georgia, Times, 'Times New Roman', serif;
+      font-family: Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif;
+
     }
     p {
       padding: 15px 15px 5px;
       margin-bottom: 0;
       span{
-          font-weight: 550;
+          font-weight: 600;
           font-size: 16px;
           margin-left: 15px;
       }
       .huanbi{
-          font-weight: 550;
+          font-weight: 600;
           font-size: 16px;
           margin-left: 0;
           position: relative;
           display: inline-block;
-          padding: 0 15px  0;
+          padding: 0 15px 0 ;
       }
       .redIcon {
       width: 0;

+ 9 - 2
src/views/modules/Statistics/newHome.vue

@@ -14,7 +14,7 @@
               </a-tooltip>
             </div>
             <div id="topChart" style="width:100%;height:100px" ref="topChart"></div>
-            <div class="footerInfo">TOP1消耗数: <span class="num">¥{{this.topOption.series[0].data[0] | decimalsHandle}}</span> </div>
+            <div class="footerInfo">TOP1: <span class="num">¥{{this.topOption.series[0].data[0] | decimalsHandle}}</span> </div>
           </div>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6" :xxl="6" class="topBox">
@@ -134,6 +134,9 @@
           style="word-break: break-all;"
         >
         <span slot="costProportion" slot-scope="costProportion">{{ costProportion | toPercentage }}</span>
+        <span slot="cost" slot-scope="cost">{{ cost | decimalsHandle }}</span>
+        <span slot="click" slot-scope="click">{{ click | formatCurrency }}</span>
+        <span slot="showNum" slot-scope="showNum">{{ showNum | formatCurrency }}</span>
         <!-- <span slot="statDatetime" slot-scope>{{ dateValue[0].format('YYYY-MM-DD')+'~'+dateValue[1].format('YYYY-MM-DD')}}</span> -->
         </a-table>
     </div>
@@ -681,6 +684,10 @@ export default {
       //  console.log(this.openOptions)
    },
 
+    opendateClose(){
+          this.openOptions=false;
+          //  console.log(this.openOptions)
+      },
     //对比按钮的事件
     comparehandle(){
       this.compareVisiable=true;
@@ -730,7 +737,7 @@ export default {
     decimalsHandle(val){
         // console.log(val)
         if(val){
-          val=val.toFixed(2);
+          val=parseFloat(val).toFixed(2);
           let numberStr = val.toString()
           let str = numberStr.split('.')
           

+ 1 - 0
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -568,6 +568,7 @@
           bestIndex = bestIndex
           this.visibleMatemal = true
           this.checkVideo = []
+          this.active = 0
           var params = {}
           params.accountId = localStorage.getItem('accountId')
           params.materialType = this.getData('creativeMaterialType')

+ 1 - 0
vue.config.js

@@ -73,6 +73,7 @@ module.exports = {
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.54:8080', //请求本地 需要jeecg-boot后台项目  孙震
         // target: 'http://192.168.1.165:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
+        target: 'http://192.168.1.251:8088', //请求本地 需要jeecg-boot后台项目 
         ws: false,
         changeOrigin: true
       },