update

src/views/selfShop/order/detail_orderDetail.vue

@@ -201,10 +201,12 @@ export default {
           this.$set(this, `transport`, res.data.transport);
           res = await this.sotFetch(this.id);
           if (this.$checkRes(res)) {
-            let activities = res.data.list;
-            activities[0].color = '#0bbd87';
-            this.$set(this, `activities`, activities);
-            this.$set(this, `activit`, res.data);
+            if (res.errcode == '0') {
+              let activities = res.data.list;
+              activities[0].color = '#0bbd87';
+              this.$set(this, `activities`, activities);
+              this.$set(this, `activit`, res.data);
+            }
           }
         }
       }

src/views/selfShop/order/parts/parts/detail-2.vue

@@ -67,8 +67,9 @@ export default {
         for (const p1 of test) {
           let goodsList = [];
           for (const p2 of p1) {
-            for (const p3 of p2.goods) {
-              // p3 = (({ goods, name, buy_num }) => ({ goods, name, buy_num }))(p3);
+            for (let p3 of p2.goods) {
+              let p3_1 = _.pick(p3, ['goods', 'name', 'buy_num']);
+              let p3_2 = (({ goods, name, buy_num }) => ({ goods, name, buy_num }))(p3);
               delete p3.flow_money;
               delete p3.freight;
               delete p3.id;
@@ -80,6 +81,8 @@ export default {
               delete p3.__v;
               delete p3.tags;
               delete p3.cart_id;
+              delete p3.can_group;
+              delete p3.group_config;
               let good = (({ name }) => ({ name }))(p3.goods);
               p3.goods = good;
               p3.order_no = p2.no;
@@ -91,9 +94,11 @@ export default {
               i++;
             }
           }
-          let address = (({ name, phone, province, city, area, address, _id }) => ({ name, phone, province, city, area, address, _id }))(p1[0].address);
+          let address = _.pick(p1[0].address, ['name', 'phone', 'province', 'city', 'area', 'address', '_id']);
+          // let address = (({ name, phone, province, city, area, address, _id }) => ({ name, phone, province, city, area, address, _id }))(p1[0].address);
           list.push({ goodsList, address });
         }
+        console.log(list);
         this.$set(this, 'list', list);
       }
     },

src/views/system/banner/detail.vue

@@ -13,6 +13,9 @@
             <template #status>
               <el-option v-for="i in statusList" :key="i.model" :label="i.label" :value="i.value"></el-option>
             </template>
+            <template #content>
+              <editor v-model="form.content" />
+            </template>
           </data-form>
         </el-col>
       </el-col>
@@ -30,7 +33,9 @@ const { mapActions: dictData } = createNamespacedHelpers('dictData');
 export default {
   name: 'form-1',
   props: {},
-  components: {},
+  components: {
+    editor: () => import('@/components/editor.vue'),
+  },
   data: function () {
     return {
       form: {},
@@ -52,6 +57,7 @@ export default {
           type: 'upload',
           url: '/files/point/banner/upload',
         },
+        { label: '内容', model: 'content', type: '' },
       ],
       // 类型
       typeList: [],

src/views/system/order/detail_orderDetail.vue

@@ -201,10 +201,13 @@ export default {
           this.$set(this, `transport`, res.data.transport);
           res = await this.sotFetch(this.id);
           if (this.$checkRes(res)) {
-            let activities = res.data.list;
-            activities[0].color = '#0bbd87';
-            this.$set(this, `activities`, activities);
-            this.$set(this, `activit`, res.data);
+            if (res.errcode == '0') {
+              console.log(res);
+              let activities = res.data.list;
+              activities[0].color = '#0bbd87';
+              this.$set(this, `activities`, activities);
+              this.$set(this, `activit`, res.data);
+            }
           }
         }
       }