6 years ago · 656680c709
--- a/hksystem/dist/dist/0.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/0.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/0.88ece71d8c73ef32a642.chunk.js
+++ b/hksystem/dist/dist/0.88ece71d8c73ef32a642.chunk.js
--- a/hksystem/dist/dist/1.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/1.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/10.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/10.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/11.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/11.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/12.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/12.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/13.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/13.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/14.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/14.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/2.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/2.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/3.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/3.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/3.88ece71d8c73ef32a642.chunk.js
+++ b/hksystem/dist/dist/3.88ece71d8c73ef32a642.chunk.js
--- a/hksystem/dist/dist/4.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/4.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/4.88ece71d8c73ef32a642.chunk.js
+++ b/hksystem/dist/dist/4.88ece71d8c73ef32a642.chunk.js
--- a/hksystem/dist/dist/5.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/5.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/6.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/6.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/6.88ece71d8c73ef32a642.chunk.js
+++ b/hksystem/dist/dist/6.88ece71d8c73ef32a642.chunk.js
--- a/hksystem/dist/dist/7.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/7.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/7.88ece71d8c73ef32a642.chunk.js
+++ b/hksystem/dist/dist/7.88ece71d8c73ef32a642.chunk.js
--- a/hksystem/dist/dist/8.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/8.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/9.131bc0cee547f32eb572.chunk.js
+++ b/hksystem/dist/dist/9.131bc0cee547f32eb572.chunk.js
--- a/hksystem/dist/dist/main.131bc0cee547f32eb572.css
+++ b/hksystem/dist/dist/main.131bc0cee547f32eb572.css
--- a/hksystem/dist/dist/main.131bc0cee547f32eb572.js
+++ b/hksystem/dist/dist/main.131bc0cee547f32eb572.js
--- a/hksystem/dist/dist/main.88ece71d8c73ef32a642.js
+++ b/hksystem/dist/dist/main.88ece71d8c73ef32a642.js
--- a/hksystem/dist/dist/vender-base.131bc0cee547f32eb572.js
+++ b/hksystem/dist/dist/vender-base.131bc0cee547f32eb572.js
--- a/hksystem/dist/dist/vender-exten.131bc0cee547f32eb572.js
+++ b/hksystem/dist/dist/vender-exten.131bc0cee547f32eb572.js
--- a/hksystem/dist/index.html
+++ b/hksystem/dist/index.html
@@ -5,7 +5,7 @@
 
				
				     <title>家政后台</title>
			
 
				
				     <meta charset="UTF-8">
			
 
				
				     <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
			
 
				
				-    <link rel="stylesheet" href="/dist/main.88ece71d8c73ef32a642.css">
			
 
				
				+    <link rel="stylesheet" href="/dist/main.131bc0cee547f32eb572.css">
			
 
				
				     <link rel="stylesheet" name="theme" href="">
			
 
				
				     <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
			
 
				
				 </head>
			
@@ -13,9 +13,9 @@
 
				
				 <body>
			
 
				
				     <div id="app"></div>
			
 
				
				     <div class="lock-screen-back" id="lock_screen_back"></div>
			
 
				
				-    <script type="text/javascript" src="/dist/vender-base.88ece71d8c73ef32a642.js"></script>
			
 
				
				-    <script type="text/javascript" src="/dist/vender-exten.88ece71d8c73ef32a642.js"></script>
			
 
				
				-    <script type="text/javascript" src="/dist/main.88ece71d8c73ef32a642.js"></script>
			
 
				
				+    <script type="text/javascript" src="/dist/vender-base.131bc0cee547f32eb572.js"></script>
			
 
				
				+    <script type="text/javascript" src="/dist/vender-exten.131bc0cee547f32eb572.js"></script>
			
 
				
				+    <script type="text/javascript" src="/dist/main.131bc0cee547f32eb572.js"></script>
			
 
				
				 </body>
			
 
				
				 
			
 
				
				 </html>
			
--- a/hksystem/src/libs/util.js
+++ b/hksystem/src/libs/util.js
@@ -40,7 +40,7 @@ util.ajax.interceptors.request.use((config) => {
 
				
				 });
			
 
				
				 
			
 
				
				 util.ajax.interceptors.response.use((response) => {
			
 
				
				-    console.log(response);
			
 
				
				+    // console.log(response);
			
 
				
				     if (response.data.error && response.data.error == 403) {
			
 
				
				         Vue.$login();
			
 
				
				     }
			
--- a/hksystem/src/views/homework/homework.vue
+++ b/hksystem/src/views/homework/homework.vue
@@ -180,7 +180,7 @@ export default {
 
				
				                     content: tinymce.activeEditor.getContent()
			
 
				
				                 }).then((res) => {
			
 
				
				                     this.publishLoading = false;
			
 
				
				-                    console.log(res);
			
 
				
				+                    // console.log(res);
			
 
				
				                 })
			
 
				
				                 
			
 
				
				                 // setTimeout(() => {
			
--- a/hksystem/src/views/product-order/detail.vue
+++ b/hksystem/src/views/product-order/detail.vue
@@ -9,13 +9,10 @@
 
				
				                 <Card>
			
 
				
				                     <Form :label-width="100">
			
 
				
				                         <FormItem label="产品id：">
			
 
				
				-                            <span>{{formContent.product_id}}</span>
			
 
				
				+                            <span>{{formContent.id}}</span>
			
 
				
				                         </FormItem>
			
 
				
				-                        <FormItem label="产品名称：">
			
 
				
				-                            <span>{{formContent.product_name}}</span>
			
 
				
				-                        </FormItem>
			
 
				
				-                        <FormItem label="购买数量：">
			
 
				
				-                            <span>{{formContent.amount}}</span>
			
 
				
				+                        <FormItem label="产品列表：">
			
 
				
				+                            <span v-html="formContent.list"></span>
			
 
				
				                         </FormItem>
			
 
				
				                         <FormItem label="买家备注：">
			
 
				
				                             <span>{{formContent.remark}}</span>
			
@@ -66,11 +63,15 @@ export default {
 
				
				     computed: {
			
 
				
				         photo() {
			
 
				
				             let src = this.formContent.photo;
			
 
				
				+            let html = "";
			
 
				
				             if (src) {
			
 
				
				-                return `<img src="${src}" />`;
			
 
				
				-            } else {
			
 
				
				-                return '';
			
 
				
				+                let imgs = src.split(";");
			
 
				
				+                imgs.forEach((img) => {
			
 
				
				+                    html += `<img src="${img}" style="margin-right:3px;" />`;
			
 
				
				+                });
			
 
				
				+
			
 
				
				             }
			
 
				
				+            return html;
			
 
				
				         }
			
 
				
				     },
			
 
				
				     data () {
			
--- a/hksystem/src/views/product-order/index.vue
+++ b/hksystem/src/views/product-order/index.vue
@@ -69,7 +69,8 @@ export default {
 
				
				             keyword: '',
			
 
				
				             formContent: {},
			
 
				
				             columns: [
			
 
				
				-                {title: "产品名称", key: 'product'},
			
 
				
				+                {title: "产品列表", key: 'list', type: 'html', width: 300},
			
 
				
				+                // {title: "产品名称", key: 'name'},
			
 
				
				                 // {title: "购买数量", key: 'amount'},
			
 
				
				                 // {title: "买家备注", key: 'remark'},
			
 
				
				                 // {title: "卖家备注", key: 'info'},
			
@@ -178,7 +179,22 @@ export default {
 
				
				                     page: num || 1
			
 
				
				                 }
			
 
				
				             }).then((res) => {
			
 
				
				-                this.products = res.data.data;
			
 
				
				+                let products = [];
			
 
				
				+                res.data.data.forEach((product, i) => {
			
 
				
				+                    let obj = JSON.parse(JSON.stringify(product));
			
 
				
				+                    let list = [];
			
 
				
				+                    let photo = [];
			
 
				
				+                    product.products.forEach((pro) => {
			
 
				
				+                        list.push(`分类：${pro.classify}，产品：${pro.name}，数量：${pro.pivot.product_amount}`);
			
 
				
				+                        if (pro.photo) {
			
 
				
				+                            photo.push(pro.photo);
			
 
				
				+                        }
			
 
				
				+                    });
			
 
				
				+                    obj.list = list.join("<br>");
			
 
				
				+                    obj.photo = photo.join(";");
			
 
				
				+                    products.push(obj);
			
 
				
				+                });
			
 
				
				+                this.products = products;
			
 
				
				                 this.pageSize = res.data.per_page;
			
 
				
				                 this.total = res.data.total;
			
 
				
				             });
			
--- a/hksystem/src/views/tables/editable-table.vue
+++ b/hksystem/src/views/tables/editable-table.vue
@@ -108,7 +108,7 @@ export default {
 
				
				                                         let id = params.row.id;
			
 
				
				                                         this.axios.delete(`/api/campaign/${id}`)
			
 
				
				                                             .then((res) => {
			
 
				
				-                                                console.log(res);
			
 
				
				+                                                // console.log(res);
			
 
				
				                                             });
			
 
				
				                                     }
			
 
				
				                                 }