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

src/util/axios-wrapper.js

@@ -57,7 +57,6 @@ export default class AxiosWrapper {
         }
       }
     }
-    // TODO: 合并query和options
     if (_.isObject(query) && _.isObject(options)) {
       options = { ...options, params: query, method: 'get' };
     } else if (_.isObject(query) && !query.params) {

src/views/selfShop/goods/spec.vue

@@ -21,7 +21,7 @@
     <template v-else>
       <el-row>
         <el-col :span="24">
-          <el-button icon="el-icon-back" size="mini" @click="toBack()">返回</el-button>
+          <el-button icon="el-icon-back" size="mini" @click="toBackList()">返回</el-button>
         </el-col>
         <el-col :span="24">
           <data-form :span="12" :fields="infoFields" :rules="rules" v-model="form" labelWidth="150px" @save="toSave">
@@ -69,7 +69,7 @@ export default {
           },
         },
         { label: '团购金额', model: 'group_config.money' },
-        { label: '团购金额', model: 'group_config.need_person' },
+        { label: '开团人数', model: 'group_config.need_person' },
       ],
       opera: [
         { label: '修改', method: 'edit' },
@@ -94,7 +94,7 @@ export default {
         { label: '状态', model: 'status', type: 'select' },
         { label: '是否可以团购', model: 'can_group', type: 'select' },
         { label: '团购金额', model: 'money', type: 'number' },
-        { label: '团购金额', model: 'need_person', type: 'number' },
+        { label: '开团人数', model: 'need_person', type: 'number' },
       ],
       rules: {},
       form: {},
@@ -133,12 +133,30 @@ export default {
       else res = await this.create(data);
       if (this.$checkRes(res)) {
         this.$message({ type: `success`, message: `维护信息成功` });
-        this.toBack();
+        this.search();
+        this.toBackList();
+      }
+    },
+    async toEdit({ data }) {
+      const res = await this.fetch(data._id);
+      if (this.$checkRes(res)) {
+        let data = res.data;
+        const group_config = _.get(data, 'group_config', {});
+        data = { ...data, ...group_config };
+        delete data.group_config;
+        this.$set(this, `form`, data);
+        this.view = 'info';
+      } else {
+        this.$message.error('未找到指定数据');
       }
     },
     toBack() {
       window.history.go('-1');
     },
+    toBackList() {
+      this.view = 'list';
+      this.form = {};
+    },
     async searchOthers() {
       // 状态
       let res = await this.getDict({ code: 'status' });

src/views/system/order/deliver.vue

@@ -44,7 +44,7 @@ export default {
     return {
       list: [],
       fields: [
-        { label: '订单id', model: 'order_id' },
+        // { label: '订单id', model: 'order_id' },
         { label: '订单编号', model: 'order_no' },
         { label: '商品名称', model: 'goods.name' },
         { label: '商品规格', model: 'name' },
@@ -68,7 +68,20 @@ export default {
         let goodsList = [];
         for (const p2 of p1) {
           for (const p3 of p2.goods) {
-            p3.order_id = p2.id;
+            // p3 = (({ goods, name, buy_num }) => ({ goods, name, buy_num }))(p3);
+            delete p3.flow_money;
+            delete p3.freight;
+            delete p3.id;
+            delete p3.status;
+            delete p3._id;
+            delete p3.meta;
+            delete p3.num;
+            delete p3.sell_money;
+            delete p3.__v;
+            delete p3.tags;
+            delete p3.cart_id;
+            let good = (({ name }) => ({ name }))(p3.goods);
+            p3.goods = good;
             p3.order_no = p2.no;
           }
           goodsList.push(...p2.goods);
@@ -78,9 +91,10 @@ export default {
             i++;
           }
         }
-        let address = p1[0].address;
+        let address = (({ name, phone, province, city, area, address }) => ({ name, phone, province, city, area, address }))(p1[0].address);
         list.push({ goodsList, address });
       }
+      console.log(list);
       this.$set(this, 'list', list);
     },
     handleSelect(goodsList, address) {