活动

src/views/activity/activityList.vue

@@ -77,6 +77,19 @@ export default {
           align:'left',
           fixed:'left',
         },
+        {
+          label:"提交商家",
+          width: 220,
+          prop:'merchant_username',
+          align:'center',
+          formatter:(cell,data,value)=>{
+            if(cell.merchant){
+              return cell.merchant.username
+            }else{
+              return ""
+            }
+          }
+        },
         {
           label:"状态",
           width: 180,