Merge branch 'master' of https://git.agilestar.cn/spfm-group/spfm-market-front into test

src/pages/main/terminal/advdetailed.vue

@@ -104,23 +104,7 @@
                 userInfo: {},
                 params: {},
                 infoApply: [],
-                tabList:[
-                    // {
-                    //     code:11,
-                    //     name:'cs1',
-                    //     supplies:["aaa","bbb","ccc"],
-                    //     price:["11","22","33"],
-                    //     num:["5","6","7"],
-                    //     totalPrice:["55","132","231"],
-                    // },{
-                    //     code:11,
-                    //     name:'cs1',
-                    //     supplies:["aaa","bbb","ccc"],
-                    //     price:["11","22","33"],
-                    //     num:["5","6","7"],
-                    //     totalPrice:["55","132","231"],
-                    // },
-                ],
+                tabList:[],
                 allPrice:0,
                 allNum:0,
             }
@@ -148,14 +132,9 @@
                     data: v,
                 }).then((res) => {
                     this.tabList = res.data;
-                    for(let i=0;i<this.tabList.length;i++){
-                        for(let j=0;j<this.tabList[i].sl.length;j++){
-                            this.allNum += this.tabList[i].sl[j]*1
-                        }
-                        for(let j=0;j<this.tabList[i].fy.length;j++){
-                            this.allPrice += this.tabList[i].fy[j]*1
-                        }
-                    }
+                    this.allPrice = res.data[res.data.length-1].amountPrice;
+                    this.allNum = res.data[res.data.length-1].numTotal;
+                    this.tabList.pop();
                 });
             },
             // 分页