diff --git a/src/views/Shop/GoodsManage/_goodsCate/index.vue b/src/views/Shop/GoodsManage/_goodsCate/index.vue
index 6407301..ae1f4a7 100644
--- a/src/views/Shop/GoodsManage/_goodsCate/index.vue
+++ b/src/views/Shop/GoodsManage/_goodsCate/index.vue
@@ -18,7 +18,6 @@
             class="tree"
             v-model="checkedKeys"
             :expanded-keys="expandedKeys"
-			 :scroll="{ x: 2600 }"
             :auto-expand-parent="autoExpandParent"
             :selected-keys="selectedKeys"
             :tree-data="treeData"
@@ -32,7 +31,7 @@
           >
           </a-tree>
         </a-col>
-        <a-col :span="18">
+        <a-col :span="20">
           <a-table
             :columns="columns"
             :data-source="tableData"
@@ -52,6 +51,7 @@
               <a-space>
                 <a class="ant-dropdown-link" @click="show(row.id)" v-if="row.isShow===0">显示</a>
                 <a class="ant-dropdown-link" @click="show(row.id)" v-else-if="row.isShow===1">隐藏</a>
+                <a class="ant-dropdown-link" @click="edit(row)">修改分类信息</a>
               </a-space>
             </span>
             <span slot="imgpic" slot-scope="text, row">
@@ -92,13 +92,24 @@ export default {
 			tableData: [],
 			drawer: {
 				show: false,
-				title: "分类-详情",
+				title: "新增分类",
+			},
+			form:{
+				categoryId:undefined,
+				name:undefined,
+				imgList:[],
 			},
 			expandedKeys: [],
 			autoExpandParent: true,
 			checkedKeys: [],
 			selectedKeys: [],
-			treeData: [],
+			treeData: [
+				{
+					id:0,
+					name:'所有分类',
+					shopCategoryVoList:[]
+				}
+			],
 		};
 	},
 	mounted() {
@@ -107,7 +118,7 @@ export default {
 	methods: {
 		async getData() {
 			let res = await cateList();
-			this.treeData = res.data;
+			this.treeData[0].shopCategoryVoList = res.data;
 		},
 		addCate() {},
 		onClose() {},
@@ -120,6 +131,10 @@ export default {
 				this.$message.error(res.msg)
 			}
 		},
+		edit(data){
+			console.log(data);
+			this.drawer.show = true
+		},
 		selectionChoosed(data) {
 			this.selectedRowKeys = data;
 		},
diff --git a/src/views/Shop/OrderManage/depend/detail.vue b/src/views/Shop/OrderManage/depend/detail.vue
index 7000bc7..cd2fb7a 100644
--- a/src/views/Shop/OrderManage/depend/detail.vue
+++ b/src/views/Shop/OrderManage/depend/detail.vue
@@ -12,8 +12,8 @@
                   <div class="tradeStatus">
                       {{infoData.tradeStatus|tradeStatus}}
                   </div>
-                  <div style='margin-bottom:10px'>买家已付款至账户，请尽快发货，否则买家有权申请退款。</div>
-                  <a-space size='large'><a-button type="primary">确认发货</a-button><a v-if="infoData.tradeStatus!==9">取消订单</a></a-space>
+                  <div style='margin-bottom:10px'  v-if="infoData.tradeStatus===2">买家已付款至账户，请尽快发货，否则买家有权申请退款。</div>
+                  <a-space size='large'><a-button type="primary"  v-if="infoData.tradeStatus===2">确认发货</a-button><a v-if="infoData.tradeStatus===2||infoData.tradeStatus===4">取消订单</a></a-space>
               </a-col>
               <a-col :span="12" style="margin-top:20px">
                      <a-steps :current="1" style="">
@@ -24,7 +24,7 @@
                         </template>
                         <span slot="description">This is a description.</span>
                         </a-step>
-                        <a-step title="In Progress"  description="This is a description." />
+                        <a-step title="In Progress"  description="This is a 1description." />
                         <a-step title="Waiting" description="This is a description." />
                     </a-steps>
               </a-col>
diff --git a/src/views/Shop/OrderManage/index.vue b/src/views/Shop/OrderManage/index.vue
index 06d525b..3f9c798 100644
--- a/src/views/Shop/OrderManage/index.vue
+++ b/src/views/Shop/OrderManage/index.vue
@@ -74,7 +74,8 @@
       <span slot="action" slot-scope="text, record">
         <a-space>
           <a @click="detail(record)">查看详情</a>
-          <a @click="cancelOrder(record.id)">取消订单</a>
+		  <!-- 2和4才可以取消 -->
+          <a v-if="record.tradeStatus===2||record.tradeStatus===4" @click="cancelOrder(record.id)">取消订单</a>
         </a-space>
       </span>
     </a-table>