From af2abce52a040b0b9ed3f0fe89d43a785ac18099 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Tue, 7 Jun 2022 10:25:25 +0800
Subject: [PATCH] zx

---
 README.md                                     |   3 +-
 public/index.html                             |   2 +-
 src/App.vue                                   |   1 -
 src/components/alarmModal/index.vue           | 126 --------
 src/main.js                                   |   2 -
 src/permission.js                             |   8 +-
 src/router/basic.js                           |   9 -
 src/router/index.js                           |  62 +---
 src/router/intShop.js                         |  75 +++++
 src/styles/index.less                         |   5 +
 .../Item/_brandAuthor}/index.vue              |   2 +-
 .../Item/_itemList}/index.vue                 |   2 +-
 src/views/IntShop/Item/index.vue              |  13 +
 .../Setting/_certification/depend/config.js   |  47 +++
 .../IntShop/Setting/_certification/index.vue  | 276 ++++++++++++++++++
 src/views/IntShop/Setting/_shopInfo/index.vue |  51 ++++
 src/views/IntShop/Setting/index.vue           |  13 +
 src/views/IntShop/WorkBench/index.vue         |  92 ++++++
 src/views/Layout/index.vue                    |  20 +-
 src/views/Login/index.vue                     | 191 +-----------
 .../GoodsManage/_goodsList/depend/form.vue    |   2 +-
 .../Shop/GoodsManage/_goodsList/index.vue     |   3 +-
 22 files changed, 600 insertions(+), 405 deletions(-)
 delete mode 100644 src/components/alarmModal/index.vue
 create mode 100644 src/router/intShop.js
 rename src/views/{Set/basicSet => IntShop/Item/_brandAuthor}/index.vue (67%)
 rename src/views/{FromPlatform => IntShop/Item/_itemList}/index.vue (69%)
 create mode 100644 src/views/IntShop/Item/index.vue
 create mode 100644 src/views/IntShop/Setting/_certification/depend/config.js
 create mode 100644 src/views/IntShop/Setting/_certification/index.vue
 create mode 100644 src/views/IntShop/Setting/_shopInfo/index.vue
 create mode 100644 src/views/IntShop/Setting/index.vue
 create mode 100644 src/views/IntShop/WorkBench/index.vue
diff --git a/README.md b/README.md
index 01585cc..96b2b94 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1 @@
-未开发功能：缴费计划、账单管理（暂无接口,暂无图），工单管理（暂无接口）
-bug：详见3.12问题单
\ No newline at end of file
+小蜜蜂商户端
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index c5f5595..3adb55e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>智慧小区后台管理系统</title>
+    <title>智慧商城后台管理系统</title>
   </head>
   <body>
     <noscript>
diff --git a/src/App.vue b/src/App.vue
index 22b65e9..f3004a7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,7 +10,6 @@
    <a-config-provider :locale="locale">
         <div id="app">
             <router-view v-if="isRouterAlive"></router-view>
-			<alarmModal></alarmModal>
         </div>
     </a-config-provider>
 </template>
diff --git a/src/components/alarmModal/index.vue b/src/components/alarmModal/index.vue
deleted file mode 100644
index 7ce9412..0000000
--- a/src/components/alarmModal/index.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-    <a-modal :visible="visible" title="警报">
-        <div class="warning-area">
-            <a-descriptions :column="1">
-                <a-descriptions-item label="报警类型">{{alarmData.type}}</a-descriptions-item>
-                <a-descriptions-item label="报警号">{{alarmData.alarmNo}}</a-descriptions-item>
-                <a-descriptions-item label="报警人手机号">{{alarmData.deviceNo}}</a-descriptions-item>
-                <a-descriptions-item label="报警人名称">{{alarmData.deviceName}}</a-descriptions-item>
-                <a-descriptions-item label="报警时间">{{alarmData.time}}</a-descriptions-item>
-                <a-descriptions-item label="报警内容">{{alarmData.alarmContent}}</a-descriptions-item>
-            </a-descriptions>
-        </div>
-        <a-checkbox v-model="alarmCheck" @change="checkChange">我已知晓该警报</a-checkbox>
-        <template slot="footer">
-            <a-button type="danger" @click="confirm" :disabled="confirmDisabled">确定</a-button>
-        </template>
-    </a-modal>
-</template>
-
-<script>
-import store from "@/store";
-export default {
-    data() {
-        return {
-            //窗口
-            visible: false,
-            alarmCheck: false,
-            confirmDisabled: true,
-            //报警设置
-            websock: null,
-            infoText: '',
-            showInfo: false,
-            lockReconnect: false,
-            alarmBox: [],
-            alarmBG: ['', 'bgCC6966', 'bg969696', 'bgCC6966 ', 'bg969696', 'bgCC6966', 'bgCC6966', 'bgCC6966'],
-            alarmTime: 0,
-            timer: null, // 声音报警定时器
-            myAudio: null, // 报警声音控件
-            alarmType: ['', '超限报警', '超限预警', '断电报警 ', '离线报警', '设备异常', '上线通知', '来电通知'],
-            time1: null, // 连接的延时器
-            //报警信息
-            alarmData: {
-                model: '',
-                communityCode: '',
-                alarmType: undefined,
-                alarmNo: '',
-                deviceNo: '',
-                deviceName: '',
-                time: '',
-                alarmContent: ''
-            }
-        }
-    },
-    mounted() {
-        this.initWebSocket()
-    },
-    methods: {
-        //报警
-        initWebSocket: function() {
-            let communityCode = store.getters.getCommunityCode;
-            let nickName = store.getters.getUserInfo.userName;
-            let userId = store.getters.getUserInfo.id;
-            let url = 'wss://saas.kaidalai.cn/websocket/manage/'+ communityCode +'/'+ nickName + '/' + userId;
-            this.websock = new WebSocket(url)
-            this.websock.onopen = this.websocketOnopen
-            this.websock.onerror = this.websocketOnerror
-            this.websock.onmessage = this.websocketOnmessage
-            this.websock.onclose = this.websocketOnclose
-        },
-        websocketOnopen: function () {
-            console.log('页面WebSocket连接成功')
-            //心跳检测重置
-            // this.heartCheck.reset().start()
-        },
-        // 连接失败后的回调函数
-        websocketOnerror: function (e) {
-            console.log('WebSocket连接发生错误', e)
-            this.reconnect()
-        },
-        // 当从服务器接受到信息时的回调函数
-        websocketOnmessage: function (e) {
-            // console.log('-----接收消息-----');
-            // console.log(e.data)
-            let data = JSON.stringify(e.data);
-            this.alarmData = JSON.parse(data);
-            if(this.alarmData.alarmType) {
-                this.visible = true;
-            }
-        },
-        websocketOnclose: function (e) {
-            // console.log('connection closed (' + e.code + ')')
-            // this.reconnect()
-        },
-        //重新连接
-        reconnect() {
-            let context = this
-            if (context.lockReconnect) return
-            context.lockReconnect = true
-            //没连接上会一直重连，设置延迟避免请求过多
-            clearTimeout(this.time1);
-            this.time1 = setTimeout(function () {
-                // console.info('尝试重连...')
-                context.initWebSocket()
-                context.lockReconnect = false
-            }, 5000)
-        },
-
-        /////////
-        //窗口控制
-        checkChange() {
-            if(this.alarmCheck == true) {
-                this.confirmDisabled = false;
-            } else {
-                this.confirmDisabled = true;
-            }
-        },
-        confirm() {
-            this.visible = false
-        }
-    }
-}
-</script>
-
-<style lang="less">
-
-</style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index f1a8efe..da42045 100644
--- a/src/main.js
+++ b/src/main.js
@@ -24,14 +24,12 @@ import commonTable from './components/table'
 import commonUpload from './components/upload/index.vue'
 import allCity from './components/allCity/index.vue'
 import searchForm from './components/searchForm/index.vue'
-import alarmModal from './components/alarmModal/index.vue'
 
 // 注册组件
 Vue.component('commonTable', commonTable)
 Vue.component('commonUpload', commonUpload)
 Vue.component('allCity', allCity)
 Vue.component('searchForm', searchForm)
-Vue.component('alarmModal', alarmModal)
 
 new Vue({
 	render: h => h(App),
diff --git a/src/permission.js b/src/permission.js
index aa9a4d5..25d8823 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -8,12 +8,12 @@ const whitePath = [ '/login','/rule','/yszc','/fromPlatform']
 router.beforeEach((to, from, next) => {
 	NProgress.start()
 	const token = store.getters.getToken;
-	if(!token && !whitePath.includes(to.path)) {
-		next('/login');
-	} else {
+	// if(!token && !whitePath.includes(to.path)) {
+	// 	next('/login');
+	// } else {
 		next();
 		NProgress.done()
-	}
+	// }
 })
 
 router.afterEach(() => {
diff --git a/src/router/basic.js b/src/router/basic.js
index d728b6e..fecfe09 100644
--- a/src/router/basic.js
+++ b/src/router/basic.js
@@ -1,14 +1,5 @@
 
 export default [
-	// {
-	// 	path: '/Console',
-	// 	name: "Console",
-	// 	title: "控制台",
-	// 	hide: false,
-	// 	icon: 'container',
-	// 	component: resolve => require(['@/views/Basic/Console'], resolve),
-	// 	meta: {title: '控制台'}
-	// },
 	{
 		path: '/Employee',
 		name: "Employee",
diff --git a/src/router/index.js b/src/router/index.js
index ca727a5..18edf8b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -23,66 +23,18 @@ Vue.use(Router);
 // 	console.log(files(key).default,files);
 // })
 import Layout from "@/views/Layout"
-import basic from "./basic" // 基础功能
-import payment from "./payment" // 缴费管理
-import shop from "./shop" // 智慧商城
-import operation from "./operation" // 运营管理
-import setting from "./setting" // 设置
+import intShop from "./intShop" // 智慧商城
 
 const router = [
 	{
 		path: "/",
-		name: "basic",
+		name: "shop",
 		title: "基础",
 		component: Layout,
-		redirect: '/Employee',
+		redirect: '/WorkBench',
 		meta: {title: '首页'},
 		children: [
-			...basic,
-		]
-	},
-	{
-		path: "/shop",
-		name: "shop",
-		title: "智慧商城",
-		component: Layout,
-		redirect: '/GoodsManage/GoodsList',
-		meta: {title: '智慧商城'},
-		children: [
-			...shop,
-		]
-	},
-	{
-		path: "/payment",
-		name: "payment",
-		title: "缴费管理",
-		component: Layout,
-		redirect: '/ChargeStandardManage',
-		meta: {title: '缴费管理'},
-		children: [
-			...payment,
-		]
-	},
-	{
-		path: "/operation",
-		name: "operation",
-		title: "运营管理",
-		component: Layout,
-		redirect: '/clientSet',
-		meta: {title: '运营管理'},
-		children: [
-			...operation,
-		]
-	},
-	{
-		path: "/setting",
-		name: "setting",
-		title: "设置",
-		component: Layout,
-		redirect: '/basicSet',
-		meta: {title: '设置'},
-		children: [
-			...setting,
+			...intShop,
 		]
 	},
 	{
@@ -97,12 +49,6 @@ const router = [
 		title: "隐私政策",
 		component: resolve => require(['@/views/Yszc'], resolve)
 	},
-	{
-		path: "/fromPlatform",
-		name: "fromPlatform",
-		title: "跳转登录",
-		component: resolve => require(['@/views/FromPlatform'], resolve)
-	},
 	{
 		path: "/login",
 		name: "Login",
diff --git a/src/router/intShop.js b/src/router/intShop.js
new file mode 100644
index 0000000..81dd36c
--- /dev/null
+++ b/src/router/intShop.js
@@ -0,0 +1,75 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-24 14:50:31
+ * @LastEditTime: 2021-11-24 14:50:31
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /LittleBeeSaas/src/router/smartMall.js
+ */
+export default [
+	{
+		path: '/WorkBench',
+		name: "WorkBench",
+		title: "工作台",
+		hide: false,
+		icon: 'container',
+		component: resolve => require(['@/views/IntShop/WorkBench'], resolve),
+		meta: {title: '工作台'}
+	},
+	{
+		path: '/Item',
+		name: "Item",
+		title: "商品",
+		icon: 'home',
+		hide: false,
+		component: resolve => require(['@/views/IntShop/Item'], resolve),
+		redirect: '/Item/ItemList',
+		meta: {title: '商品管理'},
+		children: [
+			{
+				path: '/Item/ItemList',
+				name: "ItemList",
+				title: "商品列表",
+				hide: false,
+				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: '/Setting',
+		name: "Setting",
+		title: "设置",
+		icon: 'home',
+		hide: false,
+		component: resolve => require(['@/views/IntShop/Setting'], resolve),
+		redirect: '/Setting/ShopInfo',
+		meta: {title: '设置'},
+		children: [
+			{
+				path: '/Setting/ShopInfo',
+				name: "ShopInfo",
+				title: "店铺信息",
+				hide: false,
+				component: resolve => require(['@/views/IntShop/Setting/_shopInfo'], resolve),
+				meta: {title: '店铺信息'},
+			},
+			{
+				path: '/Setting/Certification',
+				name: "Certification",
+				title: "主体认证",
+				hide: true,
+				component: resolve => require(['@/views/IntShop/Setting/_certification'], resolve),
+				meta: {title: '主体认证'},
+			},
+		]
+	},
+]
\ No newline at end of file
diff --git a/src/styles/index.less b/src/styles/index.less
index bd31c94..9592f56 100644
--- a/src/styles/index.less
+++ b/src/styles/index.less
@@ -14,6 +14,11 @@
     background: #fff;
 }
 
+.info {
+    padding   : 13px;
+    background: #F9F9F9;
+}
+
 .cardTitle {
     border-left  : 8px solid #205FBD;
     padding-left : 10px;
diff --git a/src/views/Set/basicSet/index.vue b/src/views/IntShop/Item/_brandAuthor/index.vue
similarity index 67%
rename from src/views/Set/basicSet/index.vue
rename to src/views/IntShop/Item/_brandAuthor/index.vue
index 57bc783..6d27e8d 100644
--- a/src/views/Set/basicSet/index.vue
+++ b/src/views/IntShop/Item/_brandAuthor/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>1</div>
+    <div>brandAuthor</div>
 </template>
 
 <script>
diff --git a/src/views/FromPlatform/index.vue b/src/views/IntShop/Item/_itemList/index.vue
similarity index 69%
rename from src/views/FromPlatform/index.vue
rename to src/views/IntShop/Item/_itemList/index.vue
index 724b8e6..18ea355 100644
--- a/src/views/FromPlatform/index.vue
+++ b/src/views/IntShop/Item/_itemList/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>test</div>
+    <div>itemList</div>
 </template>
 
 <script>
diff --git a/src/views/IntShop/Item/index.vue b/src/views/IntShop/Item/index.vue
new file mode 100644
index 0000000..8787f75
--- /dev/null
+++ b/src/views/IntShop/Item/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/depend/config.js b/src/views/IntShop/Setting/_certification/depend/config.js
new file mode 100644
index 0000000..c2d464b
--- /dev/null
+++ b/src/views/IntShop/Setting/_certification/depend/config.js
@@ -0,0 +1,47 @@
+export const columns1 = [
+	{
+		title: "认证材料",
+		dataIndex: "mat",
+		width: "40%",
+	},
+	{
+		title: "详情",
+		dataIndex: "detail",
+		width: "60%",
+		scopedSlots: { customRender: "detail" },
+	},
+];
+export const tableData3 = [
+	{
+		mat: '法定代表人证件照正反面照片、法定代表人手持证件照',
+		detail: true,
+	},
+];
+export const tableData1 = [
+	{
+		mat: '统一社会信用代码证',
+		detail: '-',
+	},
+	{
+		mat: '法定证件照正反面照片、法人手持证件照',
+		detail: true,
+	},
+	{
+		mat: '门店门头照片、门店内景照片、收银台照片',
+		detail: '无实体门店的商家可提供线上店铺首页、管理后台、商品照片',
+	},
+];
+export const tableData2 = [
+	{
+		mat: '统一社会信用代码证',
+		detail: '-',
+	},
+	{
+		mat: '法定证件照正反面照片、法人手持证件照',
+		detail: true,
+	},
+	{
+		mat: '门店门头照片、门店内景照片、收银台照片',
+		detail: '无实体门店的商家可提供线上店铺首页、管理后台、商品照片',
+	},
+]
\ No newline at end of file
diff --git a/src/views/IntShop/Setting/_certification/index.vue b/src/views/IntShop/Setting/_certification/index.vue
new file mode 100644
index 0000000..cd777f4
--- /dev/null
+++ b/src/views/IntShop/Setting/_certification/index.vue
@@ -0,0 +1,276 @@
+<template>
+    <div>
+        <div class="step" v-if="stage==1">
+            <div class="cardTitle">添加商户</div>
+            <div class="step-item">
+                <span class="step-item-title">1、选择入驻商户的主体类型</span>
+                <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-button :value="1">个体户</a-radio-button>
+                            <a-radio-button :value="2">企业</a-radio-button>
+                            <a-radio-button :value="3">个人</a-radio-button>
+                        </a-radio-group>
+                        <div>
+                            <a-card class="card-item" size="small" :bordered="false">
+                                <span v-if="form.type == 1">“个体户”在营业执照上的主体类型一般为：个体户、个体工商户、个体经营。</span>
+                                <span v-if="form.type == 2">“企业”在营业执照上的主体类型一般为：有限公司、有限责任公司等。</span>
+                                <span v-if="form.type == 3">“个人”为根据法律法规和相关规定免于办理工商登记，无营业执照的商家。 </span>
+                                <div v-if="form.type == 3">(若年交易额大于10万元，则不属于个人商家范畴，需依法办理营业执照。)</div>
+                            </a-card>
+                        </div>
+                    </a-form-model-item>
+                    <a-form-model-item label="经营类目">
+                        
+                    </a-form-model-item>
+                </a-form-model>
+            </div>
+            <div class="step-item">
+                <span class="step-item-title">2、按照以下清单准备材料</span>
+                <a-divider></a-divider>
+                <a-table :columns="columns1" :data-source="form.type==3? tableData3 : form.type==2? tableData2 : tableData1" :pagination="false">
+                    <div slot="detail" slot-scope="text,record">
+                        <div v-if="record.detail == true">
+                            <p>· 证件包含：身份证、护照、来往内地通行证等有效证件</p>
+                            <p>· 其中护照需要增加翻译件，加盖公司鲜章，外籍商家姓名需为中文（英文），如微软（Microsoft）</p>
+                            <p>· 照片标准：四角完整，清晰可辨。若加水印需保证照片重要信息清晰可辨</p>
+                            <p>· 法人证件非大陆身份证（如护照等）时，需要提供法人证明函</p>
+                        </div>
+                        <div v-else>{{record.detail}}</div>
+                    </div>
+                </a-table>
+            </div>
+        </div>
+        <div class="step" v-if="stage==2">
+            <div class="cardTitle">申请流程</div>
+            <div class="step2-item">
+                <a-alert message="依据中国人民银行《关于进一步加强支付结算管理防范电信网络新型违法犯罪有关事项的通知》要求，
+                切实履行账户实名管理，商户身份核实、交易风险管理等职责，需核实相关信息，感谢你的配合。" type="info" show-icon />
+                <a-tabs v-model="activeTab" style="margin-top: 24px">
+                    <a-tab-pane :key="1" tab="填写主体信息" v-if="form.type == 1 || form.type == 2">
+                        <h3 style="padding: 16px">主体类型</h3>
+                            <a-form-model style="margin-left: 12px" :labelCol="{span: 3}" :wrapperCol="{span: 5}">
+                                <a-form-model-item label="主体类型">
+                                    <a-radio-group v-model="form.type" disabled>
+                                        <a-radio :value="1">个体户</a-radio>
+                                        <a-radio :value="2">企业</a-radio>
+                                        <a-radio :value="3">个人</a-radio>
+                                    </a-radio-group>
+                                    <div><span>如需修改主体类型请返回<a>上一步</a>进行操作</span></div>
+                                </a-form-model-item>
+                                <a-form-model-item label="企业名称">
+                                    <a-input></a-input>
+                                </a-form-model-item>
+                                <a-form-model-item label="注册地址">
+                                    <a-select></a-select>
+                                    <a-textarea></a-textarea>
+                                </a-form-model-item>
+                                <a-form-model-item label="经营范围">
+                                    <a-textarea></a-textarea>
+                                </a-form-model-item>
+                                <a-form-model-item label="统一社会信用代码">
+                                    <a-input></a-input>
+                                </a-form-model-item>
+                                <a-form-model-item label="营业期限">
+                                    <a-radio-group v-model="form.isLongtime">
+                                        <a-radio :value="0">区间有效</a-radio>
+                                        <a-radio :value="1">长期有效</a-radio>
+                                    </a-radio-group>
+                                    <a-date-picker v-if="form.isLongtime == 1"></a-date-picker>
+                                    <a-range-picker v-if="form.isLongtime == 0"></a-range-picker>
+                                </a-form-model-item>
+                            </a-form-model>
+                        <h3 style="padding: 16px">主体证件照片</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-form-model-item>
+                        </a-form-model>
+                    </a-tab-pane>
+                    <a-tab-pane :key="2" tab="填写个人信息">
+                        <h3 style="padding: 16px">法定代表人证件照</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-form-model-item>
+                            <a-form-model-item label="证件照反面">
+                                
+                            </a-form-model-item>
+                        </a-form-model>
+                        <h3 style="padding: 16px">法定代表人信息</h3>
+                        <a-form-model style="margin-left: 12px" :labelCol="{span: 3}" :wrapperCol="{span: 5}">
+                            <a-form-model-item label="证件类型">
+                                <a-select></a-select>
+                            </a-form-model-item>
+                            <a-form-model-item label="法定代表人姓名">
+                                <a-input></a-input>
+                            </a-form-model-item>
+                            <a-form-model-item label="证件号码">
+                                <a-input></a-input>
+                            </a-form-model-item>
+                            <a-form-model-item label="出生日期">
+                                <a-date-picker></a-date-picker>
+                            </a-form-model-item>
+                            <a-form-model-item label="证件有效期">
+                                <a-radio-group v-model="form.isIdCardLongtime">
+                                    <a-radio :value="0">区间有效</a-radio>
+                                    <a-radio :value="1">长期有效</a-radio>
+                                </a-radio-group>
+                                <a-date-picker v-if="form.isIdCardLongtime == 1"></a-date-picker>
+                                <a-range-picker v-if="form.isIdCardLongtime == 0"></a-range-picker>
+                            </a-form-model-item>
+                        </a-form-model>
+                    </a-tab-pane>
+                    <a-tab-pane :key="3" tab="填写经营信息">
+                        <h3 style="padding: 16px">联系人</h3>
+                        <a-form-model style="margin-left: 12px" :labelCol="{span: 3}" :wrapperCol="{span: 5}">
+                            <a-form-model-item label="联系人姓名">
+                                <a-input></a-input>
+                            </a-form-model-item>
+                            <a-form-model-item label="手机号">
+                                <a-input></a-input>
+                            </a-form-model-item>
+                            <a-form-model-item label="常用邮箱">
+                                <a-input></a-input>
+                            </a-form-model-item>
+                            <a-form-model-item label="客服电话">
+                                <a-input></a-input>
+                            </a-form-model-item>
+                        </a-form-model>
+                        <h3 style="padding: 16px">结算账户信息</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></a-input>
+                            </a-form-model-item>
+                            <a-form-model-item label="支付宝账号">
+                                <a-input></a-input>
+                            </a-form-model-item>
+                        </a-form-model>
+                        <h3 style="padding: 16px">经营信息</h3>
+                        <a-form-model style="margin-left: 12px" :labelCol="{span: 3}" :wrapperCol="{span: 6}">
+                            <a-form-model-item label="商户名称">
+                                <a-input></a-input>
+                            </a-form-model-item>
+                            <a-form-model-item label="经营地址">
+                                <a-input></a-input>
+                            </a-form-model-item>
+                            <a-form-model-item label="经营类目">
+                                <a-input></a-input>
+                            </a-form-model-item>
+                            <h4 style="padding: 12px">“食品>生鲜果蔬”特殊资质证明</h4>
+                            <a-form-model-item label="具体资质">
+                                <a-checkbox-group v-model="zList" :options="zOption"></a-checkbox-group>
+                            </a-form-model-item>
+                            <a-form-model-item label="许可证资质证明">
+                            </a-form-model-item>
+                            <a-form-model-item label="门店门头照片">
+                            </a-form-model-item>
+                            <a-form-model-item label="门店内景照片">
+                            </a-form-model-item>
+                            <a-form-model-item label="收银台照片">
+                            </a-form-model-item>
+                            <a-form-model-item label="补充信息">
+                            </a-form-model-item>
+                        </a-form-model>
+                    </a-tab-pane>
+                    <a-tab-pane :key="4" tab="申请上架社区">
+                        <h3 style="padding: 16px">城市一</h3>
+                        <a-form-model style="margin-left: 12px" :labelCol="{span: 3}" :wrapperCol="{span: 5}">
+                            <a-form-model-item label="选择位置">
+                                <a-select></a-select>
+                            </a-form-model-item>
+                            <a-form-model-item label="选择小区">
+                                <a-select></a-select>
+                            </a-form-model-item>
+                        </a-form-model>
+                    </a-tab-pane>
+                </a-tabs>
+            </div>  
+        </div>
+        <div style="height: 100px"></div>
+        <div class="footer">
+            <a-checkbox v-model="isChecked" v-if="stage==1" style="margin-left: 24px">
+                我已同意协议并开通有赞支付账户
+            </a-checkbox>
+            <a v-if="stage==1">《有赞支付开户及服务协议》</a>
+            <a v-if="stage==1">《有赞支付隐私政策》</a>
+            <a-button style="margin-left: 24px" type="primary" v-if="stage==1" @click="goNext">下一步</a-button>
+            <a-button style="margin-left: 24px" type="primary" v-if="stage==2" @click="submit">提交</a-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import { columns1,tableData1,tableData2,tableData3 } from "./depend/config"
+export default {
+    name: 'certification',
+    data() {
+        return {
+            stage: 2,
+            activeTab: 1,
+            isChecked: false,
+            columns1: columns1,
+            tableData1: tableData1,
+            tableData2: tableData2,
+            tableData3: tableData3,
+            zOption: [{label:'食品流通许可证',value:1},{label:'食品经营许可证',value:2},
+                      {label:'食品生产许可证',value:3},{label:'食品小作坊登记证',value:4},
+                      {label:'国境口岸卫生许可证',value:5},{label:'预包装食品备案凭证',value:6},],
+            form: {
+                type: 1,
+                isLongtime: 0,
+                isIdCardLongtime: 0,
+                zList: []
+            }
+        }
+    },
+    methods: {
+        goNext() {
+            if(this.isChecked == true) {
+                this.stage = 2;
+                if(this.form.type == 3) {
+                    this.activeTab = 2;
+                }
+            } else {
+                this.$message.warning('请阅读并同意《服务协议》和《隐私政策》')
+            }
+        },
+        submit() {
+            this.stage = 1;
+        }
+    }
+}
+</script>
+
+<style lang="less">
+.step {
+    .step-item {
+        padding: 32px 32px 0px 32px;
+        .step-item-title {
+            font-family: 'PingFang SC';
+            font-style: normal;
+            font-weight: 500;
+            font-size: 20px;
+            line-height: 28px;
+            text-transform: uppercase;
+            color: #333333;
+        }
+    }
+    .step2-item {
+        padding: 16px
+    }
+}
+.card-item {
+    background: #ECECEC;
+    margin-top: 16px;
+    width: 40%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/IntShop/Setting/_shopInfo/index.vue b/src/views/IntShop/Setting/_shopInfo/index.vue
new file mode 100644
index 0000000..29e4fba
--- /dev/null
+++ b/src/views/IntShop/Setting/_shopInfo/index.vue
@@ -0,0 +1,51 @@
+<template>
+    <div class="content">
+        <div class="top-info">
+            <a-alert style="width: 93%" message="店铺主体认证信息被驳回，为了不影响正常经营，请尽快重新发起认证。" type="info" show-icon />
+            <a-button @click="goCerti" type="primary">前往认证</a-button>
+        </div>
+        <div class="realtime-info">
+            <div style="padding: 24px">
+                图片占位
+            </div>
+            <div>
+                <a-descriptions :column="2">
+                    <template slot="title">
+                        <div class="top-info">
+                            <span>店铺信息</span>
+                            <a>切换店铺</a>
+                        </div>
+                    </template>
+                    <a-descriptions-item label="已支付订单">0</a-descriptions-item>
+                    <a-descriptions-item label="支付金额">0</a-descriptions-item>
+                    <a-descriptions-item label="待入账金额">0</a-descriptions-item>
+                    <a-descriptions-item label="支付人数">0</a-descriptions-item>
+                    <a-descriptions-item label="访客数">0</a-descriptions-item>
+                    <a-descriptions-item label="店铺可用余额">0</a-descriptions-item>
+                </a-descriptions>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    methods: {
+        goCerti() {
+            this.$router.push({name:'Certification'});
+        }
+    }
+}
+</script>
+
+<style lang="less">
+.top-info {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.realtime-info {
+    display: flex;
+    padding: 24px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/IntShop/Setting/index.vue b/src/views/IntShop/Setting/index.vue
new file mode 100644
index 0000000..8787f75
--- /dev/null
+++ b/src/views/IntShop/Setting/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/WorkBench/index.vue b/src/views/IntShop/WorkBench/index.vue
new file mode 100644
index 0000000..b968a8b
--- /dev/null
+++ b/src/views/IntShop/WorkBench/index.vue
@@ -0,0 +1,92 @@
+<template>
+    <div class="content">
+        <div class="top-info">
+            <a-alert style="width: 93%" message="店铺主体认证信息被驳回，为了不影响正常经营，请尽快重新发起认证。" type="info" show-icon />
+            <a-button type="primary">前往认证</a-button>
+        </div>
+        <div class="order-info">
+            <div class="order-info-item">
+                <a-descriptions title="待发货订单" :column="1">
+                    <a-descriptions-item>
+                        <span class="order-number">0</span>
+                    </a-descriptions-item>
+                    <a-descriptions-item label="买家催促发货">0</a-descriptions-item>
+                    <a-descriptions-item label="买家评价提醒">0</a-descriptions-item>
+                </a-descriptions>
+            </div>
+            <div class="order-info-item">
+                <a-descriptions title="待处理售后" :column="1">
+                    <a-descriptions-item>
+                        <span class="order-number">0</span>
+                    </a-descriptions-item>
+                    <a-descriptions-item label="买家催促发货">0</a-descriptions-item>
+                    <a-descriptions-item label="买家评价提醒">0</a-descriptions-item>
+                </a-descriptions>
+            </div>
+            <div class="order-info-item">
+                <a-descriptions title="库存紧张" :column="1">
+                    <a-descriptions-item>
+                        <span class="order-number">0</span>
+                    </a-descriptions-item>
+                    <a-descriptions-item label="买家催促发货">0</a-descriptions-item>
+                    <a-descriptions-item label="买家评价提醒">0</a-descriptions-item>
+                </a-descriptions>
+            </div>
+        </div>
+        <div class="realtime-info">
+            <a-descriptions layout="vertical">
+                <template slot="title">
+                    <span>实时概况</span>
+                    <span class="realTime-number">更新于2022/05/05 16:58:33</span>
+                </template>
+                <a-descriptions-item label="已支付订单">0</a-descriptions-item>
+                <a-descriptions-item label="支付金额">0</a-descriptions-item>
+                <a-descriptions-item label="待入账金额">0</a-descriptions-item>
+                <a-descriptions-item label="支付人数">0</a-descriptions-item>
+                <a-descriptions-item label="访客数">0</a-descriptions-item>
+                <a-descriptions-item label="店铺可用余额">0</a-descriptions-item>
+            </a-descriptions>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="less">
+.top-info {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.order-info {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 24px;
+    .order-info-item {
+        .order-number {
+            font-family: 'Roboto';
+            font-style: normal;
+            font-weight: 700;
+            font-size: 24px;
+            line-height: 28px;
+            text-transform: uppercase;
+        }
+    }
+}
+.realtime-info {
+    padding: 24px;
+    .realTime-number {
+        font-family: 'PingFang SC';
+        font-size: 12px;
+        line-height: 14px;
+        text-transform: uppercase;
+        color: rgba(0, 0, 0, 0.25);
+        margin-left: 24px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Layout/index.vue b/src/views/Layout/index.vue
index 1aba609..62cdb15 100644
--- a/src/views/Layout/index.vue
+++ b/src/views/Layout/index.vue
@@ -70,26 +70,14 @@ export default {
 			tagActive: 0,
 			tags: [],
 			menuTags: [
-				{
-					label: "基础功能",
-					value: "basic"
-				},
+				// {
+				// 	label: "基础功能",
+				// 	value: "basic"
+				// },
 				{
 					label: "智慧商城",
 					value: "shop"
 				},
-				{
-					label: "缴费管理",
-					value: "payment"
-				},
-				{
-				    label: "运营管理",
-				    value: "operation"
-				},
-				// {
-				//     label: "设置",
-				//     value: "setting"
-				// }
 			],
 		};
 	},
diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue
index 11a0852..7004b7f 100644
--- a/src/views/Login/index.vue
+++ b/src/views/Login/index.vue
@@ -2,55 +2,19 @@
   <div class="bg">
     <div class="logo-box">
       <img src="@/assets/images/logo.png" alt="" />
-      <span class="title">智慧小区后台管理系统</span>
+      <span class="title">智慧商城后台管理系统</span>
     </div>
     <div class="login-box">
       <a-row>
-        <!-- <a-col :span="12" class="box-a">
-          <img src="@/assets/images/logo.png" alt="" />
-        </a-col> -->
-        <!-- <a-col :span="1" class="box-cen"></a-col> -->
-        <!-- 登录 -->
           <a-col class="box-b" v-if="status === 1">
             <a-tabs v-model="activeName">
               <a-tab-pane key="1" tab="密码登录"></a-tab-pane>
               <a-tab-pane key="2" tab="验证码登录"> </a-tab-pane>
             </a-tabs>
-            <div class="login-input" v-if="activeName === '1'">
-              <a-cascader
-                :options="cityList"
-                placeholder="请选择城市"
-                v-model="cityvalue"
-                :show-search="{ filter }"
-                @change="onChange"
-                :field-names="{
-                  label: 'name',
-                  value: 'id',
-                  children: 'cityList',
-                }"
-              />
+            <div class="login-input" v-if="activeName === '1'">    
               <span class="form">
-                <a-select
-                  v-model="communityCode"
-                  notFoundContent="该城市无可选择小区"
-                  :disabled="cityvalue.length === 0"
-                  placeholder="请选择小区"
-                  @change="communityChange"
-                >
-                  <a-select-option
-                    v-for="(item) in communityList"
-                    :key="item.id"
-                    :value="item.code"
-                    >{{ item.name }}</a-select-option
-                  >
-                </a-select>
                 <a-input v-model="pwdLogin.username" placeholder="请输入手机号码"></a-input>
                 <a-input v-model="pwdLogin.password" type="password" placeholder="请输入密码"></a-input>
-                <!-- <a-row>
-                  <a-col :span="12" style="margin-left: 23px"
-                    ><a-checkbox></a-checkbox>&nbsp;&nbsp;三天之内免登陆</a-col
-                  >
-                </a-row> -->
               </span>
               <a-button
                 type="primary"
@@ -81,36 +45,8 @@
                 </a-col>
               </a-row>
             </div>
-
             <div class="login-input" v-else-if="activeName === '2'">
-              <a-cascader
-                :options="cityList"
-                placeholder="请选择城市"
-                v-model="cityvalue"
-                :show-search="{ filter }"
-                @change="onChange"
-                :field-names="{
-                  label: 'name',
-                  value: 'id',
-                  children: 'cityList',
-                }"
-              />
-
               <span class="form">
-                <a-select
-                  v-model="communityCode"
-                  notFoundContent="该城市无可选择小区"
-                  :disabled="cityvalue.length === 0"
-                  placeholder="请选择小区"
-                  @change="communityChange"
-                >
-                  <a-select-option
-                    v-for="item in communityList"
-                    :key="item.id"
-                    :value="item.code"
-                    >{{ item.name }}</a-select-option
-                  >
-                </a-select>
                 <a-input
                   placeholder="请输入手机号码"
                   v-model="form.tel"
@@ -124,11 +60,6 @@
               <a-button type="primary" @click="getCode" :disabled="inCodeGap">
                 {{inCodeGap == false ? '获取验证码' : codeGap+'s后再次获取'}}
               </a-button>
-              <!-- <a-row>
-                <a-col :span="12" style="margin-left: 23px"
-                  ><a-checkbox></a-checkbox>&nbsp;&nbsp;三天之内免登陆</a-col
-                >
-              </a-row> -->
               <a-button
                 type="primary"
                 @click="login"
@@ -281,8 +212,6 @@ export default {
         password: '',
       },  
       isChecked: false,
-      communityId: undefined,
-			communityCode: undefined,
 			rules: {
 				tel: [
 					{
@@ -311,73 +240,14 @@ export default {
 					},
 				],
 			},
-			cityList: [], //城市列表
-			cityvalue: [], //省市区级联绑定值
-			communityList: [], //小区列表
       inCodeGap: false,
       codeGap: 60,
 		};
 	},
 	created() {
-    if(this.$route.query.token && this.$route.query.code) {
-      this.setToken(this.$route.query.token);
-      this.setCommunityCode(this.$route.query.code);
-      userInfo().then(result => {
-        this.setUserInfo(result.data);
-        this.$router.push("/");
-      })
-    }
 		this.keyupEnter();
-		this.getAllCity();
-	},
-	watch: {
-		communityCode: {
-			handler(value) {
-				this.setCommunityCode(value);
-			},
-		},
 	},
 	methods: {
-		getAllCity() {
-			this.$axios({
-				method: "get",
-				url: process.env.VUE_APP_URL + "manage/city/allCity", //【api不需要communityCode】
-			})
-				.then((response) => {
-					this.cityList = response.data.data;
-					this.setCity(response.data.data);
-				})
-				.catch((error) => {
-					console.log(error); //请求失败返回的数据
-				});
-		},
-		getCommunity(cityId) {
-			this.$axios({
-				method: "get",
-				url: process.env.VUE_APP_URL + "manage/community/findAll", //【api不需要communityCode】
-				params: {
-					cityId: cityId,
-				},
-			})
-				.then((response) => {
-					this.communityList = response.data.data;
-				})
-				.catch((error) => {
-					console.log(error); //请求失败返回的数据
-				});
-		},
-		// 选择城市后获取该城市小区
-		onChange(data) {
-			this.getCommunity(data[2]);
-			this.communityCode = undefined;
-		},
-		// 级联筛选
-		filter(inputValue, path) {
-			return path.some(
-				(cityList) =>
-					cityList.name.toLowerCase().indexOf(inputValue.toLowerCase()) > -1
-			);
-		},
 		// 绑定enter事件
 		keyupEnter() {
 			document.onkeydown = (e) => {
@@ -388,58 +258,21 @@ export default {
 			};
 		},
 		login() {
-			if (this.communityCode === undefined) {
-				this.$message.error("先选择小区");
-				return;
-			};
       if (this.isChecked == false) {
         this.$message.error("请阅读并同意《用户协议》");
 				return;
       };
-			loginTel(this.form).then((res) => {
-				if (res.code === 200) {
-					this.$message.success(res.msg);
-					// 存储token
-					this.setToken(res.data);
-          userInfo().then(result => {
-            this.setUserInfo(result.data);
-            this.$router.push("/");
-          })
-				} else {
-					this.$message.error(res.msg);
-				}
-			});
+      this.$router.push("/");
 		},
     passwordLogin() {
-      if (this.communityCode === undefined) {
-				this.$message.error("先选择小区");
-				return;
-			};
       if (this.isChecked == false) {
         this.$message.error("请阅读并同意《用户协议》");
 				return;
       };
-      let obj = Object.assign(this.pwdLogin, {communityId: this.communityId})
-      loginPWD(obj).then((res) => {
-				if (res.code === 200) {
-					this.$message.success(res.msg);
-					// 存储token
-					this.setToken(res.data);
-          userInfo().then(result => {
-            this.setUserInfo(result.data);
-            this.$router.push("/");
-          })
-				} else {
-					this.$message.error(res.msg);
-				}
-			});
+      this.$router.push("/");
     },
 		// 获取验证码
 		getCode() {
-			if (this.communityCode === undefined) {
-				this.$message.error("先选择小区");
-				return;
-			}
       let num = setInterval(() => {
         this.inCodeGap = true;
         this.codeGap -= 1;
@@ -451,11 +284,11 @@ export default {
           }
         }
       },1000)
-			sendTelCode(this.form).then((res) => {
-				if (res) {
-					this.$message.success(res.msg);
-				}
-			});
+			// sendTelCode(this.form).then((res) => {
+			// 	if (res) {
+			// 		this.$message.success(res.msg);
+			// 	}
+			// });
 		},
 		onSubmit() {
 			this.$refs.ruleForm.validate((valid) => {
@@ -471,10 +304,6 @@ export default {
 		resetForm() {
 			this.$refs.ruleForm.resetFields();
 		},
-    //改变小区获取id
-    communityChange(value, option) {
-      this.communityId = option.key
-    }
 	},
 };
 </script>
@@ -509,7 +338,7 @@ export default {
 }
 .login-box {
   background: #ffffff;
-  height: 500px;
+  height: 400px;
   width: 489px;
   margin: auto;
 }
diff --git a/src/views/Shop/GoodsManage/_goodsList/depend/form.vue b/src/views/Shop/GoodsManage/_goodsList/depend/form.vue
index 3b0b4e9..b642cde 100644
--- a/src/views/Shop/GoodsManage/_goodsList/depend/form.vue
+++ b/src/views/Shop/GoodsManage/_goodsList/depend/form.vue
@@ -128,7 +128,7 @@ export default {
 		};
 	},
 	mounted() {
-		this.getItem();
+		
 	},
 	methods: {
 		getItem() {
diff --git a/src/views/Shop/GoodsManage/_goodsList/index.vue b/src/views/Shop/GoodsManage/_goodsList/index.vue
index 5620901..4d67a75 100644
--- a/src/views/Shop/GoodsManage/_goodsList/index.vue
+++ b/src/views/Shop/GoodsManage/_goodsList/index.vue
@@ -119,8 +119,7 @@ export default {
 		};
 	},
 	mounted() {
-		this.getApi();
-		this.getData();
+		
 	},
 	methods: {
 		getApi() {
