Commit d29b945e authored by 赵茹林's avatar 赵茹林

update

parent 74ed0710
...@@ -4,6 +4,19 @@ ...@@ -4,6 +4,19 @@
const path = require('path'); 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 = { module.exports = {
dev: { dev: {
// Paths // Paths
...@@ -18,7 +31,7 @@ module.exports = { ...@@ -18,7 +31,7 @@ module.exports = {
} }
}, },
// Various Dev Server settings // 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 port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false, autoOpenBrowser: false,
errorOverlay: true, errorOverlay: true,
......
...@@ -14,6 +14,12 @@ ...@@ -14,6 +14,12 @@
<el-form-item label="收货地址" required> <el-form-item label="收货地址" required>
<el-input v-model="form.receive_address" type="text"></el-input> <el-input v-model="form.receive_address" type="text"></el-input>
</el-form-item> </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-form-item label="物流单号">
<el-input v-model="form.express_no" type="text"></el-input> <el-input v-model="form.express_no" type="text"></el-input>
</el-form-item> </el-form-item>
...@@ -87,9 +93,12 @@ ...@@ -87,9 +93,12 @@
receive_address: this.form.receive_address, receive_address: this.form.receive_address,
receive_name: this.form.receive_name, receive_name: this.form.receive_name,
receive_mobile: this.form.receive_mobile, 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_no ? json.express_no = this.form.express_no : '';
this.form.express_name ? json.express_name = this.form.express_name : ''; //this.form.express_name ? json.express_name = this.form.express_name : '';
putDisposableApi(this.form.id, json).then(res => { putDisposableApi(this.form.id, json).then(res => {
this.$message({ this.$message({
type: 'success', type: 'success',
......
...@@ -167,15 +167,15 @@ ...@@ -167,15 +167,15 @@
this.getList(); this.getList();
}, },
editAddress(row) { editAddress(row) {
// this.dialogObj={show:true}
console.log(row); console.log(row);
//if (row.status == 1) { //if (row.status == 1) {
this.dialogObj.express_no = row.express_no || ''; this.dialogObj.express_no = row.express_no;
this.dialogObj.express_name = row.express_name || ''; this.dialogObj.express_name = row.express_name;
this.dialogObj.status = row.status;
//} //}
this.dialogObj.receive_address = row.receive_address || ''; this.dialogObj.receive_address = row.receive_address;
this.dialogObj.receive_mobile = row.receive_mobile || ''; this.dialogObj.receive_mobile = row.receive_mobile;
this.dialogObj.receive_name = row.receive_name || ''; this.dialogObj.receive_name = row.receive_name;
this.dialogObj.id = row.id; this.dialogObj.id = row.id;
this.dialogObj.show = true; this.dialogObj.show = true;
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment