diff --git a/merchant.zip b/merchant.zip
new file mode 100644
index 0000000..949e13f
Binary files /dev/null and b/merchant.zip differ
diff --git a/src/api/public/index.js b/src/api/public/index.js
index 65bd7f8..dbbff2b 100644
--- a/src/api/public/index.js
+++ b/src/api/public/index.js
@@ -1,10 +1,28 @@
 import httpService from "@/request"
 
-// 注册-发送验证码
+// 账户-获取个人信息
 export function userInfo(params) {
 	return httpService({
 		url: `/user/getUserInfo`,
 		method: 'get',
 		params: params,
 	})
+}
+
+// 经营类目列表
+export function merchantList(params) {
+	return httpService({
+		url: `/user/authentication/MerchantCategoryFindAll`,
+		method: 'get',
+		params: params,
+	})
+}
+
+// 城市列表
+export function getCityList(params) {
+	return httpService({
+		url: `/city/allCity`,
+		method: 'get',
+		params: params,
+	})
 }
\ No newline at end of file
diff --git a/src/router/intShop.js b/src/router/intShop.js
index 2e6061d..d79186d 100644
--- a/src/router/intShop.js
+++ b/src/router/intShop.js
@@ -34,14 +34,6 @@ export default [
 				component: resolve => require(['@/views/IntShop/Item/_itemList'], resolve),
 				meta: {title: '商品列表'},
 			},
-			// {
-			// 	path: '/Item/BrandAuthor',
-			// 	name: "BrandAuthor",
-			// 	title: "品牌资质",
-			// 	hide: false,
-			// 	component: resolve => require(['@/views/IntShop/Item/_brandAuthor'], resolve),
-			// 	meta: {title: '品牌资质'},
-			// },
 			{
 				path: '/Item/TypeList',
 				name: "TypeList",
@@ -68,6 +60,34 @@ export default [
 			},
 		]
 	},
+	{
+		path: '/Order',
+		name: "Order",
+		title: "订单",
+		icon: 'container',
+		hide: false,
+		component: resolve => require(['@/views/IntShop/Order'], resolve),
+		redirect: '/Order/OrderList',
+		meta: {title: '订单'},
+		children: [
+			{
+				path: '/Order/OrderList',
+				name: "OrderList",
+				title: "订单列表",
+				hide: false,
+				component: resolve => require(['@/views/IntShop/Order/_orderList'], resolve),
+				meta: {title: '订单列表'},
+			},
+			{
+				path: '/Order/OrderDetail',
+				name: "OrderDetail",
+				title: "订单详情",
+				hide: true,
+				component: resolve => require(['@/views/IntShop/Order/_orderDetail'], resolve),
+				meta: {title: '订单详情'},
+			},
+		]
+	},
 	{
 		path: '/Setting',
 		name: "Setting",
diff --git a/src/views/IntShop/Item/_addItem/index.vue b/src/views/IntShop/Item/_addItem/index.vue
index cbb9a0b..00636cb 100644
--- a/src/views/IntShop/Item/_addItem/index.vue
+++ b/src/views/IntShop/Item/_addItem/index.vue
@@ -7,39 +7,33 @@
                     <a-tab-pane :key="1" tab="基本信息">
                             <h3 style="padding: 15px">商品信息</h3>
                             <a-form-model style="margin-left: 12px" :labelCol="{span: 3}" :wrapperCol="{span: 6}">
-                                <a-form-model-item label="商品类型">
-                                    <a-radio-group v-model="form.type">
-                                        <a-radio :value="1">实物商品</a-radio>
-                                        <a-radio :value="2">虚拟商品</a-radio>
-                                    </a-radio-group>
-                                    <div><span style="color: #AAA">实物商品需要填写物流信息，虚拟商品则不需要填写</span></div>
-                                </a-form-model-item>
                                 <a-form-model-item label="商品照片">
-                                    
-                                </a-form-model-item>
-                                <a-form-model-item label="主图视频">
-
+                                    <commonUpload
+                                        :fileList="fileList"
+                                        @handleChange="handleChange"
+                                    ></commonUpload>
                                 </a-form-model-item>
                                 <a-form-model-item label="商品名称">
                                     <a-input></a-input>
                                 </a-form-model-item>
                                 <a-form-model-item label="商品类目">
-                                    
-                                </a-form-model-item>
-                                <a-form-model-item label="类目参数">
-                                    
+                                    <a-input></a-input>
+                                    <div style="color: #BBB">准确选择商品类目有助于完善商品信息</div>
                                 </a-form-model-item>
                             </a-form-model>
                         <h3 style="padding: 15px">价格信息</h3>
                         <a-form-model style="margin-left: 12px" :labelCol="{span: 3}" :wrapperCol="{span: 5}">
-                            <a-form-model-item label="商品规格">
-                                
-                            </a-form-model-item>
                             <a-form-model-item label="价格">
-                                
+                                <a-input-group compact>
+                                    <a-input style="width: 10%" disabled default-value="¥" />
+                                    <a-input style="width: 50%" />
+                                </a-input-group>
                             </a-form-model-item>
                             <a-form-model-item label="划线价">
-                                
+                                <a-input-group compact>
+                                    <a-input style="width: 10%" disabled default-value="¥" />
+                                    <a-input style="width: 50%" />
+                                </a-input-group>
                             </a-form-model-item>
                             <a-form-model-item label="库存扣减方式">
                                 付款减库存
@@ -47,38 +41,22 @@
                             <a-form-model-item label="库存">
                                 <a-input disabled></a-input>
                             </a-form-model-item>
-                            <a-form-model-item label="开售时间">
-                                <a-radio-group v-model="form.sellTimeStart">
-                                    <a-radio :value="1">立即上架</a-radio>
-                                    <a-radio :value="2">定时上架</a-radio>
-                                    <a-radio :value="3">暂不上架</a-radio>
-                                </a-radio-group>
-                                <a-date-picker v-if="form.sellTimeStart == 2"></a-date-picker>
-                            </a-form-model-item>
-                            <a-form-model-item label="定时下架">
-                                <a-radio-group v-model="form.unsell">
-                                    <a-radio :value="1">开启</a-radio>
-                                    <a-radio :value="2">关闭</a-radio>
-                                </a-radio-group>
-                                <a-date-picker v-if="form.unsell == 1"></a-date-picker>
-                            </a-form-model-item>
                         </a-form-model>
-                        <h3 style="padding: 15px">价格信息</h3>
+                        <h3 style="padding: 15px">物流信息</h3>
                         <a-form-model style="margin-left: 12px" :labelCol="{span: 3}" :wrapperCol="{span: 6}">
                             <a-form-model-item label="配送方式">
                                 <a-radio-group v-model="form.shipWay">
                                     <a-radio :value="1">快递发货</a-radio>
                                     <a-radio :value="2">到店自提</a-radio>
                                 </a-radio-group>
-                                <div>实物商品需要填写物流信息，虚拟商品则不需要填写</div>
                             </a-form-model-item>
-                            <a-form-model-item label="快递运费">
-                                <a-radio-group v-model="form.shipFeeType">
-                                    <a-radio :value="1">统一运费</a-radio>
-                                    <a-radio :value="2">运费模版</a-radio>
-                                </a-radio-group>
-                                <a-input v-if="form.shipFeeType == 1"></a-input>
-                                <a-select v-if="form.shipFeeType == 2"></a-select>
+                            <a-form-model-item label="选择城市">
+                                <a-cascader style="width: 55%" :options="cityList" placeholder="请选择"
+                                    :field-names="{ label: 'name', value: 'id', children: 'cityList', }" 
+                                ></a-cascader>
+                            </a-form-model-item>
+                            <a-form-model-item label="自提地址">
+                                <a-input></a-input>
                             </a-form-model-item>
                         </a-form-model>
                     </a-tab-pane>
@@ -112,6 +90,7 @@
 
 <script>
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
+import { getCityList } from "@/api/public"
 import { columns1,tableData1,tableData2,tableData3 } from "./depend/config"
 export default {
     name: 'certification',
@@ -127,6 +106,8 @@ export default {
             zOption: [{label:'食品流通许可证',value:1},{label:'食品经营许可证',value:2},
                       {label:'食品生产许可证',value:3},{label:'食品小作坊登记证',value:4},
                       {label:'国境口岸卫生许可证',value:5},{label:'预包装食品备案凭证',value:6},],
+            fileList: [],
+            cityList: [],
             form: {
                 type: 1,
                 isLongtime: 0,
@@ -144,17 +125,36 @@ export default {
             editorConfig: { placeholder: '请输入内容...' },
         }
     },
+    created() {
+        this.getApi();
+    },
     beforeDestroy() {
         const editor = this.editor
         if (editor == null) return
         editor.destroy() // 组件销毁时，及时销毁编辑器
     },
     methods: {
+        getApi() {
+            getCityList().then(res => {
+                let data = res.data;
+                this.cityList = data;
+            })
+        },
         onCreated(editor) {
             this.editor = Object.seal(editor) // 一定要用 Object.seal() ，否则会报错
         },
         submit() {
+            this.$message.success('上传成功')
             this.$router.push({name:'ItemList'});
+        },
+        handleChange(data) {
+            // this.fileList = data;
+			// this.form.imgList = [];
+			// data.forEach(ele => {
+			// 	if(ele.status == 'done') {
+			// 		this.form.imgList.push(ele.response.data)
+			// 	}
+			// })
         }
     }
 }
diff --git a/src/views/IntShop/Item/_addType/index.vue b/src/views/IntShop/Item/_addType/index.vue
index 2009236..fe865a0 100644
--- a/src/views/IntShop/Item/_addType/index.vue
+++ b/src/views/IntShop/Item/_addType/index.vue
@@ -41,7 +41,8 @@ export default {
             this.editor = Object.seal(editor) // 一定要用 Object.seal() ，否则会报错
         },
         submit() {
-            this.$router.push({name:'ItemList'});
+            this.$message.success('新建成功')
+            this.$router.push({name:'TypeList'});
         }
     }
 }
diff --git a/src/views/IntShop/Item/_itemList/depend/config.js b/src/views/IntShop/Item/_itemList/depend/config.js
index beff90b..a3470de 100644
--- a/src/views/IntShop/Item/_itemList/depend/config.js
+++ b/src/views/IntShop/Item/_itemList/depend/config.js
@@ -50,17 +50,17 @@ export const columns = [
 	},
 	{
 		title: "售货价",
-		width: "7%",
+		width: "8%",
 		dataIndex: "price",
 	},
 	{
 		title: "库存",
-		width: "6%",
+		width: "8%",
 		dataIndex: "discountPrice",
 	},
 	{
 		title: "销量",
-		width: "5%",
+		width: "7%",
 		dataIndex: "viewsNum",
 	},
 	{
diff --git a/src/views/IntShop/Item/_itemList/index.vue b/src/views/IntShop/Item/_itemList/index.vue
index bb102a8..565dfcf 100644
--- a/src/views/IntShop/Item/_itemList/index.vue
+++ b/src/views/IntShop/Item/_itemList/index.vue
@@ -6,7 +6,7 @@
     <!-- <searchForm :formItem="formItem" @getSearch="search($event)"></searchForm> -->
 	<div class="search-box">
         <a-row>
-            <a-col :span="20">
+            <a-col :span="24">
             <a-space size="large">
 				<a-form-model layout="inline">
 					<a-form-model-item label="商品类目">
diff --git a/src/views/IntShop/Order/_orderDetail/config.js b/src/views/IntShop/Order/_orderDetail/config.js
new file mode 100644
index 0000000..78b35bb
--- /dev/null
+++ b/src/views/IntShop/Order/_orderDetail/config.js
@@ -0,0 +1,79 @@
+/**
+ * 配置
+ * 表格列
+ */
+
+export const detailColumns =  [
+	{
+		title: "商品",
+		dataIndex: "skuName",
+		width: "18%",
+		scopedSlots: { customRender: "skuName"}
+	},
+	{
+		title: "商品来源",
+		dataIndex: "kind",
+		width: "15%",
+		customRender:function(kind){
+			switch (kind) {
+			case 0:
+				return '未知'
+			case 1:
+				return '自营'
+			case 2:
+				return '其他'
+			default:
+				break;
+			}
+		}
+	},
+	{
+		title: "商品单价",
+		dataIndex: "sellPrice",
+		width: "10%",
+		customRender:function(sellPrice){
+			return '￥'+sellPrice
+		}
+	},
+	{
+		title: "数量",
+		dataIndex: "num",
+		width: "10%",
+	},
+	{
+		title: "订单总金额",
+		width: "15%",
+		customRender:function(data){
+			return '￥'+data.sellPrice*data.num
+		}
+	},
+	{
+		title: "实收款",
+		dataIndex: "payPrice",
+		width: "15%",
+		customRender:function(payPrice){
+			return '￥'+payPrice
+		}
+	},
+	{
+		title: "售后状态",
+		dataIndex: "status",
+		width: "240",
+		fixed: 'right'
+	},
+]
+// 搜索项
+export const searchForm = {
+	code: "",
+	jcookCode: '',
+	tradeStatus:undefined
+}
+// 分页
+export const pagination = {
+	current: 1,
+	total: 0,
+	pageSize: 10,
+	showTotal: (total) => `共 ${total} 条`,
+	showSizeChanger: true,
+	showQuickJumper: true,
+}
\ No newline at end of file
diff --git a/src/views/IntShop/Order/_orderDetail/index.vue b/src/views/IntShop/Order/_orderDetail/index.vue
new file mode 100644
index 0000000..cab4fd1
--- /dev/null
+++ b/src/views/IntShop/Order/_orderDetail/index.vue
@@ -0,0 +1,257 @@
+<template>
+  <div>
+      <a-space class="top-content" size="large">
+          <span class="back-btn" @click='back'><a-icon type="left" style='margin-right:10px' />返回</span>
+          <span>订单号：dd20220613132233241</span>
+          <span>下单时间：2022/06/13 13:22:33</span>
+          <span>支付宝支付</span>
+      </a-space>
+      <a-card class="gray-content">
+          <a-row>
+              <a-col :span="8">
+                  <div class="tradeStatus">
+                      等待商家发货{{infoData.tradeStatus|tradeStatus}}
+                  </div>
+                  <!-- <div style='margin-top:10px'>29分 内如果买家未付款，订单将会自动取消。</div> -->
+                  <div style='margin-top:10px'>买家已付款至小蜜蜂待结算账户，请尽快发货，否则买家有权申请退款。</div>
+                  <a-space style='margin-top:20px' size='large'>
+                      <a>确认发货</a>
+                      <a @click="cancelShow = true">取消订单</a>
+                  </a-space>
+              </a-col>
+              <a-col :span="16" style="padding:20px">
+                    <a-steps :current="1">
+                        <a-step title="待付款">
+                            <template slot="description">
+                                2022/06/13 13:23:19
+                            </template>
+                        </a-step>
+                        <a-step title="待发货">
+                            <template slot="description">
+                                
+                            </template>
+                        </a-step>
+                        <a-step title="已完成">
+                            <template slot="description">
+                                
+                            </template>
+                        </a-step>
+                    </a-steps>
+              </a-col>
+          </a-row>
+      </a-card>
+      <a-card class="white-content">
+        <div>
+            <span class="box">
+                <a-descriptions title="买家信息" :column="1">
+                    <a-descriptions-item label="买家">
+                        {{infoData.payName}}
+                    </a-descriptions-item>
+                    <a-descriptions-item label="账号">
+                        {{infoData.account}}
+                    </a-descriptions-item>
+                    <a-descriptions-item label="留言">
+                        {{infoData.remake}}
+                    </a-descriptions-item>
+                </a-descriptions>
+            </span>
+            <span class="box">
+                <a-descriptions title="收货人信息" :column="1">
+                    <a-descriptions-item label="收货人">
+                        {{infoData.receiverName}}
+                    </a-descriptions-item>
+                    <a-descriptions-item label="联系方式">
+                        {{infoData.receiverTel}}
+                    </a-descriptions-item>
+                    <a-descriptions-item label="收货地址">
+                        {{infoData.addressDetail}}
+                    </a-descriptions-item>
+                </a-descriptions>
+            </span>
+            <span class="box">
+                <a-descriptions title="付款信息" :column="1">
+                    <a-descriptions-item label="实付金额">
+                        {{'￥'+112}}
+                    </a-descriptions-item>
+                    <a-descriptions-item label="付款方式">
+                        支付宝
+                    </a-descriptions-item>
+                    <a-descriptions-item label="付款时间">
+                        {{infoData.createDate}}
+                    </a-descriptions-item>
+                </a-descriptions>
+            </span>
+            <span class="box">
+                <a-descriptions title="配送信息" :column="1">
+                    <a-descriptions-item label="配送方式">
+                        快递
+                    </a-descriptions-item>
+                    <a-descriptions-item label="配送公司">
+                        顺丰
+                    </a-descriptions-item>
+                    <a-descriptions-item label="配送单号">
+                        76845423
+                    </a-descriptions-item>
+                    <a-descriptions-item label="物流状态">
+                        无物流状态
+                    </a-descriptions-item>
+                </a-descriptions>
+            </span>
+        </div>
+      </a-card>
+      <a-table class='white-content' :columns="detailColumns" :pagination="false" :data-source='skuList' :rowKey="(record,index)=>index">
+          <span slot="skuName" slot-scope="text, row">
+              <img :src="row.mainPhoto" class="table-img" alt="">
+              <span>{{row.skuName}}</span>
+          </span>
+      </a-table>
+      <a-card class="gray-content right">
+        <a-descriptions :column="1">
+            <a-descriptions-item label="商品总价">
+                {{'￥'+100}}
+            </a-descriptions-item>
+            <a-descriptions-item label="运费">
+                {{'￥'+12}}
+            </a-descriptions-item>
+        </a-descriptions>
+        <span style='color:#000000D9;font-size:20px;line-height:28px;font-weight:500'>实付款：</span>
+        <span style='color:#CF1322;font-size:20px;line-height:26px;font-weight:500;font-style: normal;'>{{'￥'+112}}</span>
+      </a-card>
+      <a-modal title="取消订单" :visible="cancelShow" @ok="cancelConfirm" @cancel="cancelShow = false" >
+        <div>
+            <a-select placeholder='请选择原因' v-model="cancelReason" style="width:200px">
+                <a-select-option :value="1">无法联系上卖家</a-select-option>
+                <a-select-option :value="2">买家误拍或者重拍了</a-select-option>
+                <a-select-option :value="3">买家无诚意完成交易</a-select-option>
+                <a-select-option :value="4">已通过银行线下汇款</a-select-option>
+                <a-select-option :value="5">已通过同城见面交易</a-select-option>
+                <a-select-option :value="6">已通过货到付款交易</a-select-option>
+                <a-select-option :value="7">已通过网上银行直接汇款</a-select-option>
+                <a-select-option :value="8">已经缺货无法交易</a-select-option>
+            </a-select>
+        </div>
+      </a-modal>
+  </div>
+</template>
+
+<script>
+import { detailColumns } from './config'
+export default {
+	data(){
+		return{
+			infoData:{},
+			skuList:[],
+            recordList: [],
+			detailColumns,
+            cancelShow: false,
+            cancelReason: undefined
+		}
+	},
+	created() {
+		// if(this.$route.params.id){
+		// 	this.getInfo(this.$route.params.id)
+		// }
+	},
+	filters: {
+		tradeStatus: function (value) {
+			switch (value) {
+			// 交易状态(0.交易创建并等待买家付款,1.未付款交易超时关闭或支付完成后全额退款,
+			// 2.交易支付成功（待发货）,3.交易结束并不可退款，4.出库（待收货）,5.订单完成,
+			// 6.申请取消,7.申请拒收，8.取消订单失败9.取消订单成功10.发生拆单,11.售后换新)
+			case 0:
+				return '交易创建并等待买家付款'
+			case 1:
+				return '交易关闭'
+			case 2:
+				return '待发货'
+			case 3:
+				return '交易结束'
+			case 4:
+				return '待收货'
+			case 5:
+				return '订单完成'
+			case 6:
+				return '申请取消'
+			case 7:
+				return '申请拒收'
+			case 8:
+				return '取消订单失败'
+			case 9:
+				return '取消订单成功'
+			case 10:
+				return '发生拆单'
+			case 11:
+				return '售后换新'
+			default:
+				break;
+			}
+		},
+	},
+	methods:{
+		getInfo(id){
+			orderInfo({orderId:id}).then(res=>{
+				this.infoData = res.data
+				this.skuList = res.data.skuList
+			})
+            getOrderRecord({orderId:id}).then(res => {
+                let data = res.data
+                this.recordList = data
+            })
+		},
+		back(){
+			this.$router.go(-1)
+		},
+        cancelConfirm() {
+            this.cancelShow = false
+        }
+	}
+}
+</script>
+
+<style lang="less" scoped>
+.top-content{
+    padding-left:13px ;
+    padding-bottom:20px ;
+    padding-top: 5px;
+    font-size: 14px;
+    border-bottom: 1px solid #e8e8e8;
+    width: 100%;
+}
+.gray-content{
+    width:95%;
+    background:#00000005;
+    margin:auto;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    border-radius: 8px;
+    .tradeStatus{
+        color: #000000D9;
+        font-weight: 500;
+        font-size: 20px;
+    }
+}
+.white-content{
+    width:95%;
+    margin:auto;
+    margin-bottom: 20px;
+    margin-top: 20px;
+    border-radius: 8px;
+}
+.box{
+    width: 25%;
+    display: inline-block;
+    margin: auto;
+    vertical-align:top;
+    padding-left: 20px;
+    padding-right: 20px;
+}
+.table-img{
+    width: 40px;
+    height: 40px;
+    display: inline;
+}
+.right{
+    text-align: right;
+    padding-right: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/IntShop/Order/_orderList/config.js b/src/views/IntShop/Order/_orderList/config.js
new file mode 100644
index 0000000..ef10ba1
--- /dev/null
+++ b/src/views/IntShop/Order/_orderList/config.js
@@ -0,0 +1,148 @@
+export const columns = [
+	{
+		title: "订单状态",
+		dataIndex: "status",
+		width: "8%",
+		customRender: function (status) {
+			switch (status) {
+			case 0: return '待付款'
+			case 1: return '待发货'
+			case 2: return '待收货'
+			case 3: return '交易完成'
+			default: break;
+			}
+		}
+	},
+	{
+		title: "商品编号",
+		dataIndex: "code",
+		width: "10%",
+	},
+	{
+		title: "商品",
+		dataIndex: "itemName",
+		width: "10%",
+	},
+	{
+		title: "所属分类",
+		dataIndex: "type",
+		width: "7%",
+	},
+	{
+		title: "商品单价",
+		dataIndex: "price",
+		width: "6%",
+	},
+	{
+		title: "数量",
+		dataIndex: "number",
+		width: "6%",
+	},
+	{
+		title: "商品总价",
+		dataIndex: "totalPrice",
+		width: "6%",
+	},
+	{
+		title: "实收款",
+		dataIndex: "receive",
+		width: "6%",
+	},
+	{
+		title: "配送",
+		dataIndex: "ship",
+		width: "6%",
+	},
+	{
+		title: "买家/收货人",
+		dataIndex: "custom",
+		width: "10%",
+	},
+	{
+		title: "下单时间",
+		dataIndex: "orderTime",
+		width: "10%",
+	},
+	{
+		title: "操作",
+		dataIndex: "action",
+		key: "action",
+		width: "250",
+		fixed: "right",
+		scopedSlots: { customRender: "action" },
+	},
+]
+export const detailColumns =  [
+	{
+		title: "商品",
+		dataIndex: "skuName",
+		width: "16%",
+		scopedSlots: { customRender: "skuName"}
+	},
+	{
+		title: "商品类别",
+		dataIndex: "kind",
+		width: "15%",
+		customRender:function(kind){
+			switch (kind) {
+			case 0:
+				return '未知'
+			case 1:
+				return '自营'
+			case 2:
+				return '其他'
+			default:
+				break;
+			}
+		}
+	},
+	{
+		title: "商品单价",
+		dataIndex: "sellPrice",
+		width: "10%",
+		customRender:function(sellPrice){
+			return '￥'+sellPrice
+		}
+	},
+	{
+		title: "数量",
+		dataIndex: "num",
+		width: "8%",
+	},
+	{
+		title: "单位",
+		dataIndex: "unit",
+		width: "12%",
+	},
+	{
+		title: "总金额",
+		width: "12%",
+		customRender:function(data){
+			return '￥'+data.sellPrice*data.num
+		}
+		
+	},
+	{
+		title: "实收款",
+		dataIndex: "payPrice",
+		width: "15%",
+		customRender:function(payPrice){
+			return '￥'+payPrice
+		}
+	},
+]
+// 搜索项
+export const searchForm = {
+	code: "",
+	jcookCode: '',
+	tradeStatus:undefined
+}
+// 分页
+export const pagination = {
+	current: 1,
+	total: 0,
+	pageSize: 10,
+	showTotal: (total) => `共 ${total} 条`,
+	showSizeChanger: true,
+	showQuickJumper: true,
+}
\ No newline at end of file
diff --git a/src/views/IntShop/Order/_orderList/index.vue b/src/views/IntShop/Order/_orderList/index.vue
new file mode 100644
index 0000000..a138105
--- /dev/null
+++ b/src/views/IntShop/Order/_orderList/index.vue
@@ -0,0 +1,183 @@
+<template>
+  <div>
+    <div class="cardTitle">订单列表</div>
+    <div class="search-box">
+      <a-row>
+        <a-col :span="24">
+          <a-space size="large">
+			<a-form-model layout="inline">
+				<a-form-model-item label="订单编号">
+					<a-input style="width: 200px" v-model="searchForm.code" placeholder="请输入订单号" />
+				</a-form-model-item>
+				<a-form-model-item label="付款方式">
+					<a-select style="width: 200px" v-model="searchForm.tradeStatus" placeholder="请选择付款方式">
+						<a-select-option :value="1">支付宝</a-select-option>
+					</a-select>
+				</a-form-model-item>
+				<a-form-model-item label="订单名称">
+					<a-input style="width: 200px" v-model="searchForm.name" placeholder="请输入订单名称" />
+				</a-form-model-item>
+				<a-form-model-item label="订单分类">
+					<a-select style="width: 200px" v-model="searchForm.name" placeholder="请选择分类"></a-select>
+				</a-form-model-item>
+				<a-form-model-item label="下单时间">
+					<a-range-picker></a-range-picker>
+				</a-form-model-item>
+				<a-form-model-item>
+					<a-button type="primary" @click="getData">查 询</a-button>
+					<a-button style="margin-left:24px">重 置</a-button>
+				</a-form-model-item>
+			</a-form-model>
+          </a-space>
+        </a-col>
+        <a-col :span="4">
+          <!-- <a-button class="add-btn" @click="">添加</a-button> -->
+        </a-col>
+      </a-row>
+    </div>
+    <a-table
+      :columns="columns"
+      :data-source="tableData"
+      :rowKey="(record) => record.id"
+      tableLayout="auto"
+      :pagination="pagination"
+	  @change="handlerPage"
+	  :scroll="{ x: 2200 }"
+	  :row-selection="{
+          selectedRowKeys: selectedRowKeys,
+          onChange: selectionChoosed,
+      }"
+    >
+      <span slot="action" slot-scope="text, record">
+        <a-space>
+          <a @click="detail(record)">查看详情</a>
+		  <a>确认发货</a>
+		  <a @click="cancelOrder(record)">取消订单</a>
+        </a-space>
+      </span>
+    </a-table>
+    <a-modal
+      title="取消订单"
+      :visible="modal.show"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      <div>
+        <a-select placeholder='请选择原因' v-model="cancelForm.cancelReasonCode" style="width:200px">
+            <a-select-option :value="1">无法联系上卖家</a-select-option>
+            <a-select-option :value="2">买家误拍或者重拍了</a-select-option>
+            <a-select-option :value="3">买家无诚意完成交易</a-select-option>
+            <a-select-option :value="4">已通过银行线下汇款</a-select-option>
+            <a-select-option :value="5">已通过同城见面交易</a-select-option>
+            <a-select-option :value="6">已通过货到付款交易</a-select-option>
+            <a-select-option :value="7">已通过网上银行直接汇款</a-select-option>
+            <a-select-option :value="8">已经缺货无法交易</a-select-option>
+        </a-select>
+      </div>
+    </a-modal>
+  </div>
+</template>
+<script>
+import { columns, pagination, searchForm } from "./config";
+export default {
+	data() {
+		return {
+			tableData: [],
+			modal: {
+				show: false,
+			},
+			selectedRowKeys: [],
+			columns,
+			pagination,
+			searchForm,
+			cancelForm: {
+				orderId: undefined,
+				cancelReasonCode: undefined,
+			},
+		};
+	},
+	filters: {
+		tradeStatus: function (value) {
+			switch (value) {
+			// 交易状态(0.交易创建并等待买家付款,1.未付款交易超时关闭或支付完成后全额退款,
+			// 2.交易支付成功（待发货）,3.交易结束并不可退款，4.出库（待收货）,5.订单完成,
+			// 6.申请取消,7.申请拒收，8.取消订单失败9.取消订单成功10.发生拆单,11.售后换新)
+			case 0:
+				return "交易创建并等待买家付款";
+			case 1:
+				return "交易关闭";
+			case 2:
+				return "待发货";
+			case 3:
+				return "交易结束";
+			case 4:
+				return "待收货";
+			case 5:
+				return "订单完成";
+			case 6:
+				return "申请取消";
+			case 7:
+				return "申请拒收";
+			case 8:
+				return "取消订单失败";
+			case 9:
+				return "取消订单成功";
+			case 10:
+				return "发生拆单";
+			case 11:
+				return "售后换新";
+			default:
+				break;
+			}
+		},
+	},
+	mounted() {
+		this.getData();
+	},
+	methods: {
+		getData() {
+			this.tableData = [
+				// {id: 1, status: 0},
+				{id: 2, status: 1},
+				// {id: 3, status: 2},
+			]
+		},
+		reset() {
+			this.searchForm = {
+				code: "",
+				jcookCode: "",
+				tradeStatus: undefined,
+			};
+			this.getData();
+		},
+		cancelOrder(id) {
+			this.cancelForm.orderId = id;
+			this.modal.show = true;
+		},
+		handleOk() {
+			this.handleCancel();
+		},
+		handleCancel() {
+			this.cancelForm = {
+				orderId: undefined,
+				cancelReasonCode: undefined,
+			}
+			this.modal.show = false;
+		},
+		detail(data) {
+			this.$router.push({ name: "OrderDetail", params: { id: data.id } });
+		},
+		//分页
+		handlerPage(value) {
+			this.pagination.current = value.current;
+			this.pagination.pageSize = value.pageSize;
+			this.getData()
+		},
+		//批量
+		selectionChoosed(value) {
+
+		}
+	},
+};
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/IntShop/Order/index.vue b/src/views/IntShop/Order/index.vue
new file mode 100644
index 0000000..8787f75
--- /dev/null
+++ b/src/views/IntShop/Order/index.vue
@@ -0,0 +1,13 @@
+<template>
+    <router-view></router-view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/IntShop/Setting/_certification/index.vue b/src/views/IntShop/Setting/_certification/index.vue
index 2532320..7e92bc4 100644
--- a/src/views/IntShop/Setting/_certification/index.vue
+++ b/src/views/IntShop/Setting/_certification/index.vue
@@ -7,7 +7,7 @@
                 <a-divider></a-divider>
                 <a-form-model>
                     <a-form-model-item label="主体类型">
-                        <a-radio-group v-model="form.type" size="large" buttonStyle="solid">
+                        <a-radio-group @change="changeType" v-model="form.type" size="large" buttonStyle="solid">
                             <a-radio-button :value="3">个体户</a-radio-button>
                             <a-radio-button :value="2">企业</a-radio-button>
                             <a-radio-button :value="1">个人</a-radio-button>
@@ -29,7 +29,8 @@
             <div class="step-item">
                 <span class="step-item-title">2、按照以下清单准备材料</span>
                 <a-divider></a-divider>
-                <a-table :columns="columns1" :data-source="form.type==1? tableData3 : form.type==2? tableData2 : tableData1" :pagination="false">
+                <a-table :columns="columns1" :data-source="form.type==1? tableData3 : form.type==2? tableData2 : tableData1" :pagination="false" :row-key="
+                    (record, index) => { return index }">
                     <div slot="detail" slot-scope="text,record">
                         <div v-if="record.detail == true">
                             <p>· 证件包含：身份证、护照、来往内地通行证等有效证件</p>
@@ -63,7 +64,9 @@
                                     <a-input v-model="conpanyForm.companyName"></a-input>
                                 </a-form-model-item>
                                 <a-form-model-item label="注册地址">
-                                    <a-select v-model="conpanyForm.registerAddress"></a-select>
+                                    <a-cascader :options="cityList" placeholder="请选择"
+                                        :field-names="{ label: 'name', value: 'id', children: 'cityList', }" @change="changeCity" 
+                                    ></a-cascader>
                                     <a-textarea v-model="conpanyForm.registerAddressDetail"></a-textarea>
                                 </a-form-model-item>
                                 <a-form-model-item label="经营范围">
@@ -84,10 +87,16 @@
                         <h3 style="padding: 16px">主体证件照片</h3>
                         <a-form-model style="margin-left: 12px" :labelCol="{span: 3}" :wrapperCol="{span: 5}">
                             <a-form-model-item label="统一社会信用代码证">
-                                
+                                <commonUpload
+                                    :fileList="fileList"
+                                    @handleChange="handleChange"
+                                ></commonUpload>
                             </a-form-model-item>
                             <a-form-model-item label="其他资质证明">
-                                
+                                <commonUpload
+                                    :fileList="fileList"
+                                    @handleChange="handleChange"
+                                ></commonUpload>
                             </a-form-model-item>
                         </a-form-model>
                     </a-tab-pane>
@@ -106,13 +115,22 @@
                         <h3 style="padding: 16px">法定代表人证件照</h3>
                         <a-form-model style="margin-left: 12px" :labelCol="{span: 3}" :wrapperCol="{span: 5}">
                             <a-form-model-item label="手持身份证照">
-                                
+                                <commonUpload
+                                    :fileList="fileList"
+                                    @handleChange="handleChange"
+                                ></commonUpload>
                             </a-form-model-item>
                             <a-form-model-item label="证件照正面">
-                                
+                                <commonUpload
+                                    :fileList="fileList"
+                                    @handleChange="handleChange"
+                                ></commonUpload>
                             </a-form-model-item>
                             <a-form-model-item label="证件照反面">
-                                
+                                <commonUpload
+                                    :fileList="fileList"
+                                    @handleChange="handleChange"
+                                ></commonUpload>
                             </a-form-model-item>
                         </a-form-model>
                         <h3 style="padding: 16px">法定代表人信息</h3>
@@ -182,7 +200,9 @@
                                 <a-input></a-input>
                             </a-form-model-item> -->
                             <a-form-model-item label="经营地址">
-                                <a-input v-model="form.authenticationOperateInfoDTO.operateAddress"></a-input>
+                                <a-cascader :options="cityList" placeholder="请选择"
+                                    :field-names="{ label: 'name', value: 'id', children: 'cityList', }" @change="changeBusCity" 
+                                ></a-cascader>
                                 <a-textarea v-model="form.authenticationOperateInfoDTO.operateAddressDetail"></a-textarea>
                             </a-form-model-item>
                             <a-form-model-item label="经营类型">
@@ -197,7 +217,7 @@
                             <a-form-model-item label="具体资质">
                                 <a-checkbox-group v-model="form.qualificationDTO" :options="zOption"></a-checkbox-group>
                             </a-form-model-item>
-                            <a-form-model-item label="许可证资质证明">
+                            <!-- <a-form-model-item label="许可证资质证明">
                             </a-form-model-item>
                             <a-form-model-item label="门店门头照片">
                             </a-form-model-item>
@@ -206,7 +226,7 @@
                             <a-form-model-item label="收银台照片">
                             </a-form-model-item>
                             <a-form-model-item label="补充信息">
-                            </a-form-model-item>
+                            </a-form-model-item> -->
                         </a-form-model>
                     </a-tab-pane>
                     <a-tab-pane :key="4" tab="申请上架社区">
@@ -238,6 +258,7 @@
 
 <script>
 import { columns1,tableData1,tableData2,tableData3 } from "./depend/config"
+import { merchantList, getCityList } from "@/api/public"
 export default {
     name: 'certification',
     data() {
@@ -299,13 +320,38 @@ export default {
                 usccImgUrls: [], //统一社会信用代码证
                 otherImgUrls: [], //其他资质证明
             },
+            cityList: [],
             isLongtime: 1,
             isIdCardLongtime: 1,
             selTime: [],
             selTime2: [],
+            fileList: [],
         }
     },
+    created() {
+        this.getApi();
+    },
     methods: {
+        getApi() {
+            merchantList({type: this.form.type}).then(res => {
+                let data = res.data;
+            });
+            getCityList().then(res => {
+                let data = res.data;
+                this.cityList = data;
+            })
+        },
+        changeType() {
+            merchantList({type: this.form.type}).then(res => {
+                let data = res.data;
+            });
+        },
+        changeCity(value) {
+            this.conpanyForm.registerAddress = value[2]
+        },
+        changeBusCity(value) {
+            this.form.authenticationOperateInfoDTO.operateAddress = value[2]
+        },
         goNext() {
             if(this.isChecked == true) {
                 this.stage = 2;
@@ -318,6 +364,9 @@ export default {
         },
         submit() {
             this.stage = 1;
+        },
+        handleChange(data) {
+
         }
     }
 }
diff --git a/src/views/IntShop/Setting/_shopInfo/index.vue b/src/views/IntShop/Setting/_shopInfo/index.vue
index 423c16a..f321462 100644
--- a/src/views/IntShop/Setting/_shopInfo/index.vue
+++ b/src/views/IntShop/Setting/_shopInfo/index.vue
@@ -5,8 +5,9 @@
             <a-button @click="goCerti" type="primary">前往认证</a-button>
         </div>
         <div class="realtime-info">
-            <div style="padding: 24px">
-                图片占位
+            <div style="padding: 24px 24px 24px 0px">
+                <!-- 图片占位 -->
+                <img style="width: 100px;height: 100px" src="" alt="" />
             </div>
             <div>
                 <a-descriptions :column="2">
diff --git a/src/views/IntShop/WorkBench/index.vue b/src/views/IntShop/WorkBench/index.vue
index 8d5d6a1..3341449 100644
--- a/src/views/IntShop/WorkBench/index.vue
+++ b/src/views/IntShop/WorkBench/index.vue
@@ -2,7 +2,7 @@
     <div class="content">
         <div class="top-info">
             <a-alert style="width: 93%" message="店铺主体认证信息被驳回，为了不影响正常经营，请尽快重新发起认证。" type="error" show-icon />
-            <a-button type="primary">前往认证</a-button>
+            <a-button type="primary" @click="goCerti">前往认证</a-button>
         </div>
         <div class="order-info">
             <div class="order-info-item">
@@ -52,7 +52,11 @@
 
 <script>
 export default {
-
+    methods: {
+        goCerti() {
+            this.$router.push({name:'Certification'});
+        }
+    }
 }
 </script>
 
diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue
index ce03172..1e6b5e3 100644
--- a/src/views/Login/index.vue
+++ b/src/views/Login/index.vue
@@ -273,7 +273,7 @@ export default {
 					this.setToken(res.data);
           userInfo().then(result => {
             this.setUserInfo(result.data);
-            this.$router.push("/");
+            this.$router.push("/shopChoose");
           });
         }
       });
@@ -290,7 +290,7 @@ export default {
 					this.setToken(res.data);
           userInfo().then(result => {
             this.setUserInfo(result.data);
-            this.$router.push("/");
+            this.$router.push("/shopChoose");
           });
         }
       });
diff --git a/src/views/ShopChoose/index.vue b/src/views/ShopChoose/index.vue
index 8c4e283..4c278e6 100644
--- a/src/views/ShopChoose/index.vue
+++ b/src/views/ShopChoose/index.vue
@@ -21,7 +21,18 @@
                         <a-button @click="createShop" type="primary">创建店铺</a-button>
                     </div>
                     <div style="padding: 32px">
-                        <a-input style="width: 308px" placeholder="店铺名称"></a-input>
+                        <a-input-search placeholder="店铺名称" style="width: 308px" @search="getData" />
+                    </div>
+                    <div>
+                        <a-row style="padding: 0px 0px 0px 32px">
+                            <a-col :span="6">
+                                <a-card title="小蜜蜂旗舰店">
+                                    <a slot="extra" @click="handlerGo">进入</a>
+                                    <p>店铺状态：营业中</p>
+                                    <p>经营地址：北京市北京市丰台区和义街道 19 单元 107 室</p>
+                                </a-card>
+                            </a-col>
+                        </a-row>
                     </div>
                 </div>
             </a-layout-content>
@@ -59,6 +70,7 @@
 </template>
 
 <script>
+import { quit } from "@/api/login";
 export default {
     data() {
         return {
@@ -70,14 +82,26 @@ export default {
         }
     },
     methods: {
-        logout() {
+        getData() {
 
         },
+        async logout(){
+			let res = await quit()
+			if(res.code === 200){
+				this.$message.success(res.msg)
+				this.$router.push({name:'Login'});
+			}else{
+				this.$message.error(res.msg)
+			}
+		},
         createShop() {
             this.visible = true
         },
         submit() {
 
+        },
+        handlerGo() {
+            this.$router.push({name:'WorkBench'});
         }
     }
 }