Merge branch 'master' of http://git.cc-lotus.info/live/web-live

src/views/admin/live/achieve/statistics/achieve.vue

@@ -49,8 +49,9 @@ export default {
   methods: {
     ...code(['query']),
     ...statistics(['dockProduct']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
-      const res = await this.dockProduct({ skip, limit, ...info, dock_id: this.user.id, type: '0', ...this.form });
+    async search({ skip = 0, limit = 10 } = {}) {
+      const query = { skip, limit, dock_id: this.user.id, type: '0', ...this.form };
+      const res = await this.dockProduct(query);
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);

src/views/admin/live/achieve/statistics/requirement.vue

@@ -49,8 +49,8 @@ export default {
   methods: {
     ...code(['query']),
     ...statistics(['dockProduct']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
-      const res = await this.dockProduct({ skip, limit, ...info, dock_id: this.user.id, type: '1', ...this.form });
+    async search({ skip = 0, limit = 10 } = {}) {
+      const res = await this.dockProduct({ skip, limit, dock_id: this.user.id, type: '1', ...this.form });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);

src/views/admin/live/achieve/trans/deal.vue

@@ -16,7 +16,7 @@ export default {
     return {
       opera: [],
       fields: [
-        { label: '商品名称', prop: 'product' },
+        { label: '商品名称', prop: 'product.name' },
         { label: '购买人名称', prop: 'd_name' },
         { label: '营销人名称', prop: 's_name' },
         {

src/views/admin/live/achieve/trans/finish.vue

@@ -15,7 +15,7 @@ export default {
   data: function() {
     return {
       fields: [
-        { label: '商品名称', prop: 'product' },
+        { label: '商品名称', prop: 'product.name' },
         { label: '购买人名称', prop: 'd_name' },
         { label: '营销人名称', prop: 's_name' },
         {

src/views/admin/live/achieve/trans/list.vue

@@ -18,7 +18,7 @@ export default {
     return {
       opera: [],
       fields: [
-        { label: '商品名称', prop: 'product' },
+        { label: '商品名称', prop: 'product.name' },
         { label: '购买人名称', prop: 'd_name' },
         { label: '营销人名称', prop: 's_name' },
         {