From d29b945e1a1c36611370031bc6718dc0dceb14c6 Mon Sep 17 00:00:00 2001
From: zhaorulin <zhaorulin@singsingenglish.com>
Date: Tue, 20 Aug 2019 15:19:55 +0800
Subject: [PATCH] update

---
 config/index.js                      | 15 ++++++++++++++-
 src/components/disposable/dialog.vue | 13 +++++++++++--
 src/components/disposable/index.vue  | 12 ++++++------
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/config/index.js b/config/index.js
index 94042245..3987674b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -4,6 +4,19 @@
 
 const path = require('path');
 
+function getIP() {
+  var interfaces = require('os').networkInterfaces();
+  for (var devName in interfaces) {
+    var iface = interfaces[devName];
+    for (var i = 0; i < iface.length; i++) {
+      var alias = iface[i];
+      if (alias.family === 'IPv4' && alias.address !== '127.0.0.1' && !alias.internal) {
+        return alias.address;
+      }
+    }
+  }
+}
+
 module.exports = {
   dev: {
     // Paths
@@ -18,7 +31,7 @@ module.exports = {
       }
     },
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
+    host: getIP(), // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
diff --git a/src/components/disposable/dialog.vue b/src/components/disposable/dialog.vue
index fe614590..5e32f0cd 100644
--- a/src/components/disposable/dialog.vue
+++ b/src/components/disposable/dialog.vue
@@ -14,6 +14,12 @@
       <el-form-item label="收货地址" required>
         <el-input v-model="form.receive_address" type="text"></el-input>
       </el-form-item>
+      <el-form-item label="物流状态">
+        <el-radio-group v-model="form.status">
+          <el-radio :label="0">待发货</el-radio>
+          <el-radio :label="1">已发货</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="物流单号">
         <el-input v-model="form.express_no" type="text"></el-input>
       </el-form-item>
@@ -87,9 +93,12 @@
             receive_address: this.form.receive_address,
             receive_name: this.form.receive_name,
             receive_mobile: this.form.receive_mobile,
+            express_no: this.form.express_no,
+            express_name: this.form.express_name,
+            status: this.form.status
           };
-          this.form.express_no ? json.express_no = this.form.express_no : '';
-          this.form.express_name ? json.express_name = this.form.express_name : '';
+          //this.form.express_no ? json.express_no = this.form.express_no : '';
+          //this.form.express_name ? json.express_name = this.form.express_name : '';
           putDisposableApi(this.form.id, json).then(res => {
             this.$message({
               type: 'success',
diff --git a/src/components/disposable/index.vue b/src/components/disposable/index.vue
index a05e7521..267978fb 100644
--- a/src/components/disposable/index.vue
+++ b/src/components/disposable/index.vue
@@ -167,15 +167,15 @@
         this.getList();
       },
       editAddress(row) {
-        // this.dialogObj={show:true}
         console.log(row);
         //if (row.status == 1) {
-          this.dialogObj.express_no = row.express_no || '';
-          this.dialogObj.express_name = row.express_name || '';
+          this.dialogObj.express_no = row.express_no;
+          this.dialogObj.express_name = row.express_name;
+          this.dialogObj.status = row.status;
         //}
-        this.dialogObj.receive_address = row.receive_address || '';
-        this.dialogObj.receive_mobile = row.receive_mobile || '';
-        this.dialogObj.receive_name = row.receive_name || '';
+        this.dialogObj.receive_address = row.receive_address;
+        this.dialogObj.receive_mobile = row.receive_mobile;
+        this.dialogObj.receive_name = row.receive_name;
         this.dialogObj.id = row.id;
         this.dialogObj.show = true;
       },
-- 
2.21.0