diff --git a/src/api/order/delivery.js b/src/api/order/delivery.js
index 3d36493..e5459a0 100644
--- a/src/api/order/delivery.js
+++ b/src/api/order/delivery.js
@@ -7,8 +7,19 @@ const api = {
   delivery: '/order.delivery/delivery',
   batch: '/order.delivery/batch',
   eorder: '/order.delivery/eorder',
+  updateDelivery: '/order/updateDelivery',
+}
+/**
+ * 确认发货 修改物流
+ * @param {*} data
+ */
+ export function updateDelivery (data) {
+  return axios({
+    url: api.updateDelivery,
+    method: 'post',
+    data
+  })
 }
-
 // 列表记录
 export function list (params) {
   return axios({
diff --git a/src/views/order/Detail.vue b/src/views/order/Detail.vue
index f314fae..28a03d5 100644
--- a/src/views/order/Detail.vue
+++ b/src/views/order/Detail.vue
@@ -275,13 +275,18 @@
                     <a-tag color="green">已发货</a-tag>
                   </a-descriptions-item>
                 </a-descriptions>
-                <div class="deliver-goods-list clearfix">
-                  <div class="goods-item" v-for="(goods, idx) in item.goods" :key="idx">
-                    <a-tooltip>
-                      <template slot="title">{{ goods.goods_name?goods.goods_name:'' }}</template>
-                      <img class="goods-img" :src="goods.goods_image?goods.goods_image:''" alt="商品图片" />
-                      <div class="title">共{{ goods.delivery_num }}件</div>
-                    </a-tooltip>
+                <div style="display: flex; justify-content: space-between">
+                  <div class="deliver-goods-list clearfix" style="width: 66.66%">
+                    <div class="goods-item" v-for="(goods, idx) in item.goods" :key="idx">
+                      <a-tooltip>
+                        <template slot="title">{{ goods.goods_name ? goods.goods_name : '' }}</template>
+                        <img class="goods-img" :src="goods.goods_image ? goods.goods_image : ''" alt="商品图片" />
+                        <div class="title">共{{ goods.delivery_num }}件</div>
+                      </a-tooltip>
+                    </div>
+                  </div>
+                  <div class="action-item" style="width: 33.33%" v-if="record.delivery_status==DeliveryStatusEnum.DELIVERED.value &&item.delivery_method==10">
+                    <a-button type="primary" @click="onClickEditDelivery(item)">修改物流信息</a-button>
                   </div>
                 </div>
               </a-tab-pane>
@@ -372,6 +377,7 @@
     <PriceForm ref="PriceForm" @handleSubmit="handleRefresh" />
     <RemarkForm ref="RemarkForm" @handleSubmit="handleRefresh" />
     <JingDong ref="JingDong" @handleSubmit="handleRefresh" />
+    <DeliveryFormEdit ref="DeliveryFormEdit" @handleSubmit="handleRefresh" />
   </div>
 </template>
 
@@ -379,7 +385,16 @@
 import { inArray } from '@/utils/util'
 import * as Api from '@/api/order'
 import { GoodsItem, UserItem } from '@/components/Table'
-import { DeliveryForm, ExtractForm, CancelForm, PrinterForm, PriceForm, RemarkForm, JingDong } from './modules'
+import {
+  DeliveryForm,
+  ExtractForm,
+  CancelForm,
+  PrinterForm,
+  PriceForm,
+  RemarkForm,
+  JingDong,
+  DeliveryFormEdit,
+} from './modules'
 import { Ueditor } from '@/components'
 import {
   OrderTypeEnum,
@@ -438,6 +453,7 @@ export default {
     RemarkForm,
     Ueditor,
     JingDong,
+    DeliveryFormEdit,
   },
   data() {
     return {
@@ -556,7 +572,10 @@ export default {
       const { record } = this
       this.$refs.DeliveryForm.show(record)
     },
-
+    // 修改物流
+    onClickEditDelivery(record) {
+      this.$refs.DeliveryFormEdit.show(record)
+    },
     // 自提核销
     handleExtract() {
       const { record } = this
diff --git a/src/views/order/modules/DeliveryFormEdit.vue b/src/views/order/modules/DeliveryFormEdit.vue
new file mode 100644
index 0000000..7b90256
--- /dev/null
+++ b/src/views/order/modules/DeliveryFormEdit.vue
@@ -0,0 +1,162 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="680"
+    :visible="visible"
+    :isLoading="isLoading"
+    :confirmLoading="isLoading"
+    :maskClosable="false"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="isLoading">
+      <a-form-model ref="ruleForm" :model="record" :rules="rules" :label-col="labelCol" :wrapperCol="wrapperCol">
+        <div>
+          <a-form-model-item label="物流公司" prop="express_id">
+            <a-select v-model="record.express_id" placeholder="请选择物流公司">
+              <a-select-option v-for="(item, index) in expressList" :key="index" :value="item.express_id">{{
+                item.express_name
+              }}</a-select-option>
+            </a-select>
+            <div class="form-item-help">
+              <router-link target="_blank" :to="{ path: '/setting/delivery/express/index' }">物流公司管理</router-link>
+            </div>
+          </a-form-model-item>
+          <a-form-model-item label="物流单号" prop="express_no" extra="请手动录入物流单号或快递单号">
+            <a-input v-model="record.express_no" />
+          </a-form-model-item>
+        </div>
+      </a-form-model>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { assignment } from '@/utils/util'
+import * as Api from '@/api/order/delivery'
+import * as ExpressApi from '@/api/setting/express'
+import ClientEnum from '@/common/enum/Client'
+import { PaymentMethodEnum } from '@/common/enum/payment'
+import { DeliveryStatusEnum } from '@/common/enum/order'
+import { GoodsItem } from '@/components/Table'
+
+const rules = {
+  expressId: [{ required: true, message: '请选择物流公司', trigger: 'blur' }],
+  expressNo: [{ required: true, message: '请填写物流单号', trigger: 'blur' }],
+}
+
+export default {
+  components: {
+    GoodsItem,
+  },
+  data() {
+    return {
+      // 对话框标题
+      title: '订单发货',
+      // 标签布局属性
+      labelCol: { span: 7 },
+      // 输入框布局属性
+      wrapperCol: { span: 13 },
+      // modal(对话框)是否可见
+      visible: false,
+      // modal(对话框)确定按钮 loading
+      isLoading: false,
+      // 验证规则
+      rules,
+      // 当前tab索引
+      // 物流公司列表
+      expressList: [],
+      // 当前记录
+      record: {},
+    }
+  },
+  computed: {},
+  beforeCreate() {
+    // 批量给当前实例赋值
+    assignment(this, {
+      ClientEnum,
+      PaymentMethodEnum,
+    })
+  },
+  created() {
+    // 获取物流公司列表
+    this.getExpressList()
+  },
+  methods: {
+    // 显示对话框
+    show(record) {
+      console.log(record, 'AAAAAAAAAAAAAAAAAA')
+      // 当前记录
+      this.record = record
+      this.visible = true
+    },
+
+    // 获取物流公司列表
+    getExpressList() {
+      this.isLoading = true
+      ExpressApi.all()
+        .then((result) => (this.expressList = result.data.list))
+        .finally(() => (this.isLoading = false))
+    },
+
+    // 确认按钮
+    handleSubmit(e) {
+      e.preventDefault()
+      // 表单验证
+      this.$refs.ruleForm.validate((valid) => {
+        // 提交到后端api
+        valid && this.onFormSubmit()
+      })
+    },
+
+    // 关闭对话框事件
+    handleCancel() {
+      this.visible = false
+      if (this.$refs.ruleForm) {
+        this.$refs.ruleForm.resetFields()
+      }
+    },
+
+    // 提交到后端api
+    onFormSubmit() {
+      this.isLoading = true
+      Api.updateDelivery({
+        delivery_id: this.record.delivery_id,
+        form: { express_no: this.record.express_no, express_id: this.record.express_id },
+      })
+        .then((result) => {
+          // 显示成功
+          this.$message.success(result.message, 1.5)
+          // 关闭对话框事件
+          this.handleCancel()
+          // 通知父端组件提交完成了
+          this.$emit('handleSubmit', true)
+        })
+        .finally(() => (this.isLoading = false))
+    },
+  },
+}
+</script>
+<style lang="less" scoped>
+/deep/.ant-modal-header {
+  border-bottom: none;
+}
+/deep/.ant-modal-footer {
+  border-top: none;
+}
+/deep/.ant-modal-body {
+  padding: 0px 24px;
+}
+/deep/.ant-tabs-bar {
+  margin-bottom: 22px;
+}
+.ant-table-wrapper {
+  margin-bottom: 30px;
+}
+.ant-form-item {
+  margin-bottom: 15px;
+  &:last-child {
+    margin-bottom: 5px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/order/modules/DocumentRecord.vue b/src/views/order/modules/DocumentRecord.vue
index 6c7524c..501f887 100644
--- a/src/views/order/modules/DocumentRecord.vue
+++ b/src/views/order/modules/DocumentRecord.vue
@@ -11,18 +11,21 @@
   >
     <a-spin :spinning="isLoading">
       <a-form :form="form">
-        <a-form-item
-          label="审核状态"
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-        >
-          <a-radio-group v-decorator="['standard_status', { initialValue: 1, rules: [{ required: true }] }]" @change="handleStatus">
+        <a-form-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group
+            v-decorator="['standard_status', { initialValue: 1, rules: [{ required: true }] }]"
+            @change="handleStatus"
+          >
             <a-radio :value="10">同意</a-radio>
             <a-radio :value="20">拒绝</a-radio>
           </a-radio-group>
         </a-form-item>
         <a-form-item label="拒绝原因" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="refuse_show">
-          <a-textarea placeholder="拒绝原因" :rows="2" v-decorator="['cause', { initialValue: '', rules: [{ required: true,message: '拒绝原因不能为空' }] }]"/>
+          <a-textarea
+            placeholder="拒绝原因"
+            :rows="2"
+            v-decorator="['cause', { initialValue: '', rules: [{ required: true, message: '拒绝原因不能为空' }] }]"
+          />
         </a-form-item>
       </a-form>
     </a-spin>
@@ -33,7 +36,7 @@
 import * as Api from '@/api/order'
 
 export default {
-  data () {
+  data() {
     return {
       refuse_show: false,
       // 对话框标题
@@ -49,21 +52,19 @@ export default {
       // 当前表单元素
       form: this.$form.createForm(this),
       // 当前记录
-      record: {}
+      record: {},
     }
   },
-  created () {
-  },
+  created() {},
   methods: {
-
     // 显示对话框
-    show (record) {
+    show(record) {
       // 显示窗口
       this.visible = true
       // 当前记录
       this.record = record
     },
-    handleStatus (e) {
+    handleStatus(e) {
       if (e.target.value === 20) {
         this.form.setFieldsValue({ cause: '' })
         this.refuse_show = true
@@ -72,10 +73,12 @@ export default {
       }
     },
     // 确认按钮
-    handleSubmit (e) {
+    handleSubmit(e) {
       e.preventDefault()
       // 表单验证
-      const { form: { validateFields } } = this
+      const {
+        form: { validateFields },
+      } = this
       validateFields((errors, values) => {
         // 提交到后端api
         !errors && this.onFormSubmit(values)
@@ -83,26 +86,25 @@ export default {
     },
 
     // 关闭对话框事件
-    handleCancel () {
+    handleCancel() {
       this.visible = false
       this.form.resetFields()
     },
 
     // 提交到后端api
-    onFormSubmit (values) {
+    onFormSubmit(values) {
       this.isLoading = true
       Api.updateStandard({ standardId: this.record.id, form: values })
-        .then(result => {
+        .then((result) => {
           // 显示成功
           this.$message.success(result.message, 1.5)
           // 关闭对话框事件
           this.handleCancel()
           // 通知父端组件提交完成了
-          this.$emit('handleSubmit', values)
+          this.$emit('handleSubmit')
         })
-        .finally(() => this.isLoading = false)
-    }
-
-  }
+        .finally(() => (this.isLoading = false))
+    },
+  },
 }
 </script>
diff --git a/src/views/order/modules/DocumentRecordList.vue b/src/views/order/modules/DocumentRecordList.vue
index 2361906..0a46631 100644
--- a/src/views/order/modules/DocumentRecordList.vue
+++ b/src/views/order/modules/DocumentRecordList.vue
@@ -47,11 +47,11 @@
         </span>
         <span slot="action" slot-scope="text, item">
           <a style="margin-right: 8px" @click="handleEdit(item)">详情</a>
-          <a @click="onClickRecord(item)" v-if="item.standard_status==30">审单</a>
+          <a @click="onClickRecord(item)" v-if="item.standard_status == 30">审单</a>
         </span>
       </a-table>
     </a-spin>
-    <DocumentRecord ref="DocumentRecord" />
+    <DocumentRecord ref="DocumentRecord" @handleSubmit="handleRefresh" />
     <DocumentRecordDetails ref="DocumentRecordDetails" />
   </a-modal>
 </template>
@@ -111,7 +111,7 @@ export default {
           dataIndex: 'transfer_image_url',
           scopedSlots: { customRender: 'transfer_image_url' },
         },
-         {
+        {
           title: '状态',
           dataIndex: 'standard_status',
           scopedSlots: { customRender: 'standard_status' },
@@ -131,6 +131,14 @@ export default {
   },
   created() {},
   methods: {
+    /**
+     * 刷新列表
+     * @param Boolean bool 强制刷新到第一页
+     */
+    handleRefresh(bool = false) {
+      bool && (this.page = 1)
+      this.getDocumentList()
+    },
     // 显示对话框
     show(record) {
       // 显示窗口
diff --git a/src/views/order/modules/index.js b/src/views/order/modules/index.js
index d4d6543..aeb6eaf 100644
--- a/src/views/order/modules/index.js
+++ b/src/views/order/modules/index.js
@@ -8,4 +8,5 @@ import JingDong from './JingDong'
 import DocumentRecord from './DocumentRecord'
 import DocumentRecordList from './DocumentRecordList'
 import DocumentRecordDetails from './DocumentRecordDetails'
-export { DeliveryForm, ExtractForm, CancelForm, PrinterForm, PriceForm, RemarkForm,JingDong,DocumentRecord,DocumentRecordList,DocumentRecordDetails }
+import DeliveryFormEdit from './DeliveryFormEdit'
+export { DeliveryForm, ExtractForm, CancelForm, PrinterForm, PriceForm, RemarkForm,JingDong,DocumentRecord,DocumentRecordList,DocumentRecordDetails,DeliveryFormEdit }
diff --git a/src/views/store/Setting.vue b/src/views/store/Setting.vue
index 7c214be..8be17a2 100644
--- a/src/views/store/Setting.vue
+++ b/src/views/store/Setting.vue
@@ -21,7 +21,7 @@
 					<SelectImage :defaultList="record.loginImg ? [record.loginImg]: []" v-decorator="['login_img_id']" />
 				</a-form-item>
 				<a-form-item label="审单" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="建议尺寸: 300*300,请上传正方形图片">
-					<SelectImage :defaultList="record.loginImg ? [record.loginImg]: []" v-decorator="['standard_image_id']" />
+					<SelectImage :defaultList="record.standard_image ? [record.standard_image]: []" v-decorator="['standard_image_id']" />
 				</a-form-item>
 				<a-form-item label="新品首发" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="建议尺寸: 375*326">
 					<SelectImage multiple :defaultList="record.newProductImg ? record.newProductImg : []" v-decorator="['new_product_img_id']" />