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

src/pages/main/terminal/advcheck.vue

@@ -28,7 +28,7 @@
                             <el-button size="mini" type="primary" @click="dialogCheck(scope.row,1)">查看</el-button>
                             <el-button size="mini" type="danger" v-if="userInfo.loginName != scope.row.opName"
                                 @click="dialogCheck(scope.row,2)">审核</el-button>
-                            <el-button v-if="scope.row.advType == '01'&&scope.row.sts!='2'" size="mini" type="primary" @click="advSure(scope.row)">归档
+                            <el-button v-if="userInfo.loginName == scope.row.opName&&scope.row.sts=='1'" size="mini" type="primary" @click="advSure(scope.row)">归档
                             </el-button>
                         </template>
                     </el-table-column>

src/pages/main/terminal/advdetailed.vue

@@ -32,16 +32,16 @@
                             <div style="text-align: left;">{{item.name}}</div>
                         </td>
                         <td>
-                            <div class="tab-f" style="text-align: left;" v-for="items in item.supplies">{{items}}</div>
+                            <div class="tab-f" style="text-align: left;" v-for="items in item.wl">{{items}}</div>
                         </td>
                         <td>
-                            <div class="tab-f" style="text-align: left;" v-for="items in item.price">{{items}}</div>
+                            <div class="tab-f" style="text-align: left;" v-for="items in item.dj">{{items}}</div>
                         </td>
                         <td>
-                            <div class="tab-f" style="text-align: left;" v-for="items in item.num">{{items}}</div>
+                            <div class="tab-f" style="text-align: left;" v-for="items in item.sl">{{items}}</div>
                         </td>
                         <td>
-                            <div class="tab-f" style="text-align: left;" v-for="items in item.totalPrice">{{items}}</div>
+                            <div class="tab-f" style="text-align: left;" v-for="items in item.fy">{{items}}</div>
                         </td>
                         <!-- <td rowspan="11" v-if="index == 0">
                             <el-input v-model="factoryName" :disabled="disableStatus"
@@ -149,11 +149,11 @@
                 }).then((res) => {
                     this.tabList = res.data;
                     for(let i=0;i<this.tabList.length;i++){
-                        for(let j=0;j<this.tabList[i].num.length;j++){
-                            this.allNum += this.tabList[i].num[j]*1
+                        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].totalPrice.length;j++){
-                            this.allPrice += this.tabList[i].totalPrice[j]*1
+                        for(let j=0;j<this.tabList[i].fy.length;j++){
+                            this.allPrice += this.tabList[i].fy[j]*1
                         }
                     }
                 });

src/pages/main/terminal/advertincrease.vue

@@ -435,7 +435,7 @@
                                         type:0
                                     }
                                 });
-                                _this.setabList("广告管理列表", "/advcheck?type="+0);
+                                // _this.setabList("广告管理列表", "/advcheck?type="+0);
                             }
 
                         });