diff --git a/src/api/orderSetting.js b/src/api/orderSetting.js
new file mode 100644
index 0000000..ce087b1
--- /dev/null
+++ b/src/api/orderSetting.js
@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+export function getOrderSetting(id) {
+  return request({
+    url:'/orderSetting/'+id,
+    method:'get',
+  })
+}
+
+export function updateOrderSetting(id,data) {
+  return request({
+    url:'/orderSetting/update/'+id,
+    method:'post',
+    data:data
+  })
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 24da4c0..6acd0ad 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -95,7 +95,7 @@ a:hover {
   position: absolute;
   left: 0;
   right: 0;
-  width: 600px;
+  width: 720px;
   padding: 35px 35px 15px 35px;
   margin: 20px auto;
 }
diff --git a/src/views/oms/order/deliverOrderList.vue b/src/views/oms/order/deliverOrderList.vue
index 0a4234a..cfd3ec0 100644
--- a/src/views/oms/order/deliverOrderList.vue
+++ b/src/views/oms/order/deliverOrderList.vue
@@ -53,9 +53,9 @@
   import {deliveryOrder} from '@/api/order'
   const defaultLogisticsCompanies=["顺丰快递","圆通快递","中通快递","韵达快递"];
   export default {
+    name: 'deliverOrderList',
     data() {
       return {
-        name: 'deliverOrderList',
         list:[],
         companyOptions:defaultLogisticsCompanies
       }
diff --git a/src/views/oms/order/setting.vue b/src/views/oms/order/setting.vue
index 6fc8e61..144edda 100644
--- a/src/views/oms/order/setting.vue
+++ b/src/views/oms/order/setting.vue
@@ -1,13 +1,127 @@
 <template> 
-  <div> {{msg}}</div>
+  <el-card class="form-container" shadow="never">
+    <el-form :model="orderSetting"
+             ref="orderSettingForm"
+             :rules="rules"
+             label-width="150px">
+      <el-form-item label="秒杀订单超过：" prop="flashOrderOvertime">
+        <el-input v-model="orderSetting.flashOrderOvertime" class="input-width">
+          <template slot="append">分</template>
+        </el-input>
+        <span class="note-margin">未付款，订单自动关闭</span>
+      </el-form-item>
+      <el-form-item label="正常订单超过：" prop="normalOrderOvertime">
+        <el-input v-model="orderSetting.normalOrderOvertime" class="input-width">
+          <template slot="append">分</template>
+        </el-input>
+        <span class="note-margin">未付款，订单自动关闭</span>
+      </el-form-item>
+      <el-form-item label="发货超过：" prop="confirmOvertime">
+        <el-input v-model="orderSetting.confirmOvertime" class="input-width">
+          <template slot="append">天</template>
+        </el-input>
+        <span class="note-margin">未收货，订单自动完成</span>
+      </el-form-item>
+      <el-form-item label="订单完成超过：" prop="finishOvertime">
+        <el-input v-model="orderSetting.finishOvertime" class="input-width">
+          <template slot="append">天</template>
+        </el-input>
+        <span class="note-margin">自动结束交易，不能申请售后</span>
+      </el-form-item>
+      <el-form-item label="订单完成超过：" prop="commentOvertime">
+        <el-input v-model="orderSetting.commentOvertime" class="input-width">
+          <template slot="append">天</template>
+        </el-input>
+        <span class="note-margin">自动五星好评</span>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          @click="confirm('orderSettingForm')"
+          type="primary">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </el-card>
 </template>
 <script>
+  import {getOrderSetting,updateOrderSetting} from '@/api/orderSetting';
+  const defaultOrderSetting = {
+    id: null,
+    flashOrderOvertime: 0,
+    normalOrderOvertime: 0,
+    confirmOvertime: 0,
+    finishOvertime: 0,
+    commentOvertime: 0
+  };
+  const checkTime = (rule, value, callback) => {
+    if (!value) {
+      return callback(new Error('时间不能为空'));
+    }
+    console.log("checkTime",value);
+    let intValue = parseInt(value);
+    if (!Number.isInteger(intValue)) {
+      return callback(new Error('请输入数字值'));
+    }
+    callback();
+  };
   export default {
+    name: 'orderSetting',
     data() {
-      return {msg: '订单设置'}
+      return {
+        orderSetting: Object.assign({}, defaultOrderSetting),
+        rules: {
+          flashOrderOvertime:{validator: checkTime, trigger: 'blur' },
+          normalOrderOvertime:{validator: checkTime, trigger: 'blur' },
+          confirmOvertime: {validator: checkTime, trigger: 'blur' },
+          finishOvertime: {validator: checkTime, trigger: 'blur' },
+          commentOvertime:{validator: checkTime, trigger: 'blur' }
+        }
+      }
+    },
+    created(){
+      this.getDetail();
+    },
+    methods:{
+      confirm(formName){
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.$confirm('是否要提交修改?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              updateOrderSetting(1,this.orderSetting).then(response=>{
+                this.$message({
+                  type: 'success',
+                  message: '提交成功!',
+                  duration:1000
+                });
+              })
+            });
+          } else {
+            this.$message({
+              message: '提交参数不合法',
+              type: 'warning'
+            });
+            return false;
+          }
+        });
+      },
+      getDetail(){
+        getOrderSetting(1).then(response=>{
+          this.orderSetting=response.data;
+        })
+      }
     }
   }
 </script>
-<style></style>
+<style scoped>
+  .input-width {
+    width: 50%;
+  }
+
+  .note-margin {
+    margin-left: 15px;
+  }
+</style>