diff --git a/src/views/order/orderCancellate.vue b/src/views/order/orderCancellate.vue
index b5ff3af..c332192 100644
--- a/src/views/order/orderCancellate.vue
+++ b/src/views/order/orderCancellate.vue
@@ -1,60 +1,55 @@
 <template>
   <div>
-    <el-dialog
-      v-if="dialogVisible"
-      title="订单核销"
-      :visible.sync="dialogVisible"
-      width="900px"
-    >
+    <el-dialog v-if="dialogVisible" title="订单核销" :visible.sync="dialogVisible" width="900px">
       <div class="container">
-          <el-form label-width="80px" size="small">
-            <el-form-item v-if="!isColum" label="核销码：">
-              <el-input v-model="code" placeholder="请输入核销码" class="selWidth" size="small" @keyup.enter.native="searchOrder" /> 
-              <el-button size="small" type="primary" @click="searchOrder">搜索</el-button>         
-            </el-form-item>
-            <el-form-item label="订单号：">
-              <span>{{orderData.order_sn}}</span>
-            </el-form-item>
-          </el-form>
-          <div style="margin-top: 20px;">
-            <el-table
-              ref="multipleSelection"
-              :data="productList"
-              tooltip-effect="dark"
-              size="mini"
-              :row-key="(row) => { return row.product_id }"
-              @selection-change="handleSelectionChange"
-              
-              :header-cell-style="{background:'#F0F5FF'}"
-            >
-            <el-table-column align="center" type="selection" :selectable="judgeSelect" min-width="50"/>
+        <el-form label-width="80px" size="small">
+          <el-form-item v-if="!isColum" label="核销码：">
+            <el-input v-model="code" placeholder="请输入核销码" class="selWidth" size="small"
+              @keyup.enter.native="searchOrder" />
+            <el-button size="small" type="primary" @click="searchOrder">搜索</el-button>
+          </el-form-item>
+          <el-form-item label="订单号：">
+            <span>{{ orderData.order_sn }}</span>
+          </el-form-item>
+        </el-form>
+        <div style="margin-top: 20px;">
+          <el-table ref="multipleSelection" :data="productList" tooltip-effect="dark" size="mini"
+            :row-key="(row) => { return row.product_id }" @selection-change="handleSelectionChange"
+            :header-cell-style="{ background: '#F0F5FF' }">
+            <el-table-column align="center" type="selection" :selectable="judgeSelect" min-width="50" />
             <el-table-column align="center" label="商品信息" min-width="200">
               <template slot-scope="scope">
                 <div class="acea-row" style="align-items: center;">
                   <div class="demo-image__preview">
-                    <el-image :src="scope.row.cart_info.product.image" :preview-src-list="[scope.row.cart_info.product.image]" />
+                    <el-image :src="scope.row.cart_info.product.image"
+                      :preview-src-list="[scope.row.cart_info.product.image]" />
                   </div>
-                  <span class="priceBox" style="width: 150px;">{{scope.row.cart_info.product.store_name}}</span>
+                  <span class="priceBox" style="width: 150px;">{{ scope.row.cart_info.product.store_name }}</span>
                 </div>
               </template>
             </el-table-column>
             <el-table-column align="center" label="规格" min-width="80">
               <template slot-scope="scope">
-                <span class="priceBox">{{scope.row.cart_info.productAttr.sku}}</span>
+                <span class="priceBox">{{ scope.row.cart_info.productAttr.sku }}</span>
               </template>
             </el-table-column>
             <el-table-column align="center" label="订单金额" min-width="80">
               <template slot-scope="scope">
-                <span class="priceBox">{{scope.row.cart_info.productAttr.price}}</span>
+                <span class="priceBox">{{ scope.row.cart_info.productAttr.price }}</span>
               </template>
             </el-table-column>
             <el-table-column align="center" label="状态" min-width="80">
               <template slot-scope="scope">
                 <span class="priceBox">待核销</span>
               </template>
-            </el-table-column> 
-            <el-table-column align="center" prop="product_num" label="总数" min-width="80" />                 
-            <el-table-column label="待核销数量" align="center" min-width="120">
+            </el-table-column>
+            <el-table-column align="center" prop="product_num" label="总数" min-width="80" />
+            <el-table-column label="核销码" align="center" min-width="180">
+              <template slot-scope="scope">
+                <el-input v-model="verify_code" class="priceBox" />
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="待核销数量" align="center" min-width="120">
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row['refund_num']"
@@ -65,15 +60,15 @@
                   @change="limitNum(scope.row)"
                 />  
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
-          </div>
-        </div> 
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false" size="small">取消</el-button>
-          <el-button type="primary" @click="handleCancellation" size="small">核销</el-button>
-        </span>    
-    </el-dialog> 
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="small">取消</el-button>
+        <el-button type="primary" @click="handleCancellation" size="small">核销</el-button>
+      </span>
+    </el-dialog>
 
   </div>
 </template>
@@ -88,7 +83,7 @@
 // +----------------------------------------------------------------------
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
-import { orderCancellationApi, goCancellationApi  } from '@/api/order'
+import { orderCancellationApi, goCancellationApi } from '@/api/order'
 
 export default {
   name: 'OrderCancellate',
@@ -101,50 +96,60 @@ export default {
       orderData: "",
       multipleSelection: [],
       ids: [],
+      verify_code: '', //核销码
       isColum: false,
       productList: []
     }
   },
   methods: {
     searchOrder() {
-      if(!this.code){
+      if (!this.code) {
         return this.$message.warning('输入核销码!')
       }
       this.productDetails(this.code)
     },
-    judgeSelect(row,index){
-      return row.is_refund==0
+    judgeSelect(row, index) {
+      return row.is_refund == 0
     },
     handleCancellation() {
-      if(!this.code){
+      // if (!this.code) {
+      //   return this.$message.warning('输入核销码!')
+      // }
+      if (!this.verify_code) {
         return this.$message.warning('输入核销码!')
       }
+
       if (!this.multipleSelection.length) {
         return this.$message.warning('请选择核销商品!')
       }
       const data = []
       this.multipleSelection.map((item) => {
-        if(item.refund_num>0){
-          data.push({id:item.order_product_id,num:item.refund_num})
+        if (item.refund_num > 0) {
+          data.push({ id: item.order_product_id, num: item.refund_num })
         }
-        
+
       })
-      goCancellationApi(this.order_id,{verify_code: this.code,data: data}).then(res => {
-         this.$message.success(res.message)
-         this.dialogVisible = false
-         this.$emit('getList','')
+      goCancellationApi(this.order_id, { verify_code: this.verify_code, data: data }).then(res => {
+        this.$message.success(res.message)
+        this.dialogVisible = false
+        this.$emit('getList', '')
       }).catch(({ message }) => {
         this.$message.error(message)
       })
     },
-    productDetails(code) {
-      this.code = code
+    productDetails(code, type = false) {
+      if (type) { this.code = code }
+      else {
+        this.code = "";
+        this.verify_code = "";
+      }
       this.loading = true
       orderCancellationApi(code).then(res => {
         this.orderData = res.data
         this.order_id = res.data.order_id
+        if (type) this.verify_code = res.data.verify_code
         this.productList = res.data.orderProduct
-        this.productList.forEach((item, index)=>{
+        this.productList.forEach((item, index) => {
           item.max_num = item.refund_num
         })
         this.loading = false
@@ -153,19 +158,19 @@ export default {
         this.$message.error(message)
       })
     },
-    resetData(){
+    resetData() {
       this.orderData = {},
-      this.productList = [];
+        this.productList = [];
       this.code = ""
     },
-     // 选择商品
+    // 选择商品
     handleSelectionChange(val) {
       this.multipleSelection = val
     },
-    limitNum(row){
-      if(row.refund_num > row.max_num){
+    limitNum(row) {
+      if (row.refund_num > row.max_num) {
         row.refund_num = row.max_num
-      }else if(row.refund_num < 1){
+      } else if (row.refund_num < 1) {
         row.refund_num = 1
       }
     }
@@ -174,7 +179,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.title{
+.title {
   margin-bottom: 16px;
   color: #17233d;
   font-weight: 500;