diff --git a/admin.zip b/admin.zip
index 8921f9d..4389381 100644
Binary files a/admin.zip and b/admin.zip differ
diff --git a/src/api/basic/console/index.js b/src/api/basic/console/index.js
index 692265d..c68fbc6 100644
--- a/src/api/basic/console/index.js
+++ b/src/api/basic/console/index.js
@@ -24,6 +24,14 @@ export function communityInsert(params) {
 		data: params,
 	})
 }
+// 修改小区信息
+export function communityUpdate(params) {
+	return httpService({
+		url: `/user/community/update`,
+		method: 'post',
+		data: params,
+	})
+}
 
 //获取当前账户所有小区信息
 export function getAllCommunityInfo(params) {
@@ -68,4 +76,13 @@ export function checkCompanyName(params) {
 		method: 'get',
 		params: params,
 	})
+}
+
+// 获取后台登录token信息(用于跳转到对应小区的后台页面)
+export function getManageLoginToken(params) {
+	return httpService({
+		url: `/user/getManageLoginToken`,
+		method: 'get',
+		params: params,
+	})
 }
\ No newline at end of file
diff --git a/src/api/manage/index.js b/src/api/manage/index.js
index 7cda512..5b64053 100644
--- a/src/api/manage/index.js
+++ b/src/api/manage/index.js
@@ -340,4 +340,31 @@ export function enableSuperUser(params) {
 		method: 'get',
 		params: params,
 	})
+}
+
+// 店铺审核-所有审核店铺	
+export function getShopCertiList(params) {
+	return httpService({
+		url: `/user/storeAudit/list`,
+		method: 'get',
+		params: params,
+	})
+}
+
+// 店铺审核-根据店铺主键id查询店铺详情	
+export function findCertiDetail(params) {
+	return httpService({
+		url: `/user/storeAudit/detail`,
+		method: 'get',
+		params: params,
+	})
+}
+
+// 店铺审核-通过/驳回审核
+export function examineShop(params) {
+	return httpService({
+		url: `/user/storeAudit/examine`,
+		method: 'post',
+		data: params,
+	})
 }
\ No newline at end of file
diff --git a/src/components/allCity/index.vue b/src/components/allCity/index.vue
index 7e82e38..7a06880 100644
--- a/src/components/allCity/index.vue
+++ b/src/components/allCity/index.vue
@@ -9,6 +9,7 @@
     }"
     @change="change"
     style="width: 60%"
+	:v-model="casVal"
   ></a-cascader>
 </template>
 
@@ -16,9 +17,23 @@
 import store from "@/store";
 import { allCity } from "@/api/public"
 export default {
+	props: {
+		value: {
+			type: Array,
+		}
+	},
+	watch: {
+		value: {
+			handler(val) {
+				this.casVal = val
+			},
+			immediate: true
+		}
+	},
 	data(){
 		return{
-			cityList:[]
+			cityList:[],
+			casVal: [],
 		}
 	},
 	methods: {
diff --git a/src/router/basic.js b/src/router/basic.js
index adcc5e8..26629fa 100644
--- a/src/router/basic.js
+++ b/src/router/basic.js
@@ -64,7 +64,7 @@ export default [
 	},
 	{
 		path: '/Manage/ShopRemain',
-		name: "settled",
+		name: "shopSettled",
 		title: "第三方商城余额",
 		icon: 'dollar', 
 		hide: false,
diff --git a/src/router/manage.js b/src/router/manage.js
index f0bd01b..b942e7d 100644
--- a/src/router/manage.js
+++ b/src/router/manage.js
@@ -8,15 +8,31 @@ export default [
 		component: resolve => require(['@/views/Manage/SettleRequestManage'], resolve),
 		meta: {title: '入驻申请管理'},
 	},
+	{
+		path: '/Manage/ShopCertiManage',
+		name: "ShopCertiManage",
+		title: "店铺审核管理",
+		hide: false,
+		icon: 'bank',
+		component: resolve => require(['@/views/Manage/ShopCertiManage'], resolve),
+		meta: {title: '店铺审核管理'},
+	},
 	{
 		path: '/Manage/SettleRequestManage/settle_detail',
 		name: "settle_detail",
 		title: "查看详情",
 		hide: true,
-		icon: 'container',
 		component: resolve => require(['@/views/Manage/SettleRequestManage/_detail'], resolve),
 		meta: {title: '查看详情'},
 	},
+	{
+		path: '/Manage/ShopCertiManage/certi_detail',
+		name: "certi_detail",
+		title: "店铺审核详情",
+		hide: true,
+		component: resolve => require(['@/views/Manage/ShopCertiManage/_detail'], resolve),
+		meta: {title: '店铺审核详情'},
+	},
 	{
 		path: '/Manage/CustomerList',
 		name: "CustomerList",
diff --git a/src/views/Basic/home/index.vue b/src/views/Basic/home/index.vue
index 3190286..dd12a8e 100644
--- a/src/views/Basic/home/index.vue
+++ b/src/views/Basic/home/index.vue
@@ -91,13 +91,10 @@
                   >
                     <template slot="actions" class="ant-card-actions">
                       <span><a @click="handlerBound(item)">绑定</a></span>
+                      <span><a @click="handlerUpdate(item)">修改</a></span>
                       <span><a @click="handlerDetail(item)">详情</a></span>
                     </template>
-                    <a-card-meta
-                      :title="item.name"
-                      :description="'小区地址：' + item.addressDetails"
-                    >
-                    </a-card-meta>
+                    <a-card-meta @click="goSaas(item)" :title="item.name" :description="'小区地址：' + item.addressDetails" ></a-card-meta>
                   </a-card>
                   <a-card class="card-add">
                     <div class="card-a-content-add" @click="addVillage">
@@ -182,7 +179,7 @@
       @cancel="handleCancel"
     >
       <div class="modalContent">
-        <div class="cardTitle">小区信息</div>
+        <div class="cardTitle">{{activeMode==1?'小区信息':'修改信息'}}</div>
         <a-form-model
           ref="ruleForm"
           :model="form"
@@ -193,7 +190,14 @@
             <a-input v-model="form.name" style="60%"></a-input>
           </a-form-model-item>
           <a-form-model-item label="小区地址" prop='address'>
-            <allCity @onchange='onchange'></allCity>
+            <a-cascader
+              :options="cityList"
+              placeholder="请选择"
+              :field-names="{label: 'name', value: 'id', children: 'cityList', }"
+              @change="casChange"
+              style="width: 60%"
+              :defaultValue="casVal"
+            ></a-cascader>
           </a-form-model-item>
           <a-form-model-item label="小区详细地址" prop='addressDetails'>
             <a-input  v-model="form.addressDetails" style="60%"></a-input>
@@ -252,15 +256,19 @@
         <a-descriptions-item label="有效日期至">
           {{(orderInfoDetail.expirationDate)}}
         </a-descriptions-item>
+        <a-descriptions-item label="已绑定小区">
+          {{(orderInfoDetail.bindCommunityName)}}
+        </a-descriptions-item>
       </a-descriptions>
     </a-drawer>
   </div>
 </template>
 
 <script>
-import { consoleShow, communityInsert } from "@/api/basic/console";
-import { userUnbindingCommunity, userBindingCommunity } from "@/api/basic/console";
+import { consoleShow, communityInsert, communityUpdate } from "@/api/basic/console";
+import { userUnbindingCommunity, userBindingCommunity,getManageLoginToken } from "@/api/basic/console";
 import { findByIdAdmin } from "@/api/manage";
+import { allCity } from "@/api/public"
 import store from "@/store";
 export default {
 	name: "Console",
@@ -283,11 +291,15 @@ export default {
 				address:[{required: true,message: "请选择",trigger: "change"}],
 				addressDetails:[{required: true,message: "请输入",trigger: "blur"}],
 			},
+      casVal: [0,0,0],
+      cityList: [],
 			orderList: [],
 			estateList: [],
 			visible: false,
 			confirmLoading: false,
 			companyInfo: {},
+      activeMode: 1,
+      activeId: undefined,
       //绑定弹窗
       boundVisible: false,
       boundForm: {communityId: undefined, adminFunctionOrderId: undefined},
@@ -300,12 +312,14 @@ export default {
 		};
 	},
 	mounted() {
+    allCity().then(res=>{
+				this.cityList = res.data
+		})
 		this.getData();
 	},
 	methods: {
 		async getData() {
 			let res = await consoleShow();
-      console.log(res)
       if(res.data.consoleCompanyVo != null) {
         this.form.companyId = res.data.consoleCompanyVo.id
       }
@@ -317,12 +331,13 @@ export default {
 			this.$router.push({ name: "settled" });
 		},
 		addVillage() {
+      this.activeMode = 1;
 			this.visible = true;
 		},
 		editCompany() {},
 		handleOk() {
 			this.$refs.ruleForm.validate(async (valid) => {
-				if (valid) {
+				if (valid && this.activeMode == 1) {
 					let res = await communityInsert(this.form);
 					if (res.code === 200) {
 						this.$message.success(res.msg);
@@ -331,11 +346,30 @@ export default {
 					} else {
 						this.$message.error(res.msg);
 					}
-				}
+				} else if (valid && this.activeMode == 2) {
+          let obj = {
+            id: this.activeId,
+            name: this.form.name,
+            address: this.form.address,
+            addressDetails: this.form.addressDetails,
+            communityUrls: this.form.communityUrls
+          }
+          let res = await communityUpdate(obj);
+					if (res.code === 200) {
+						this.$message.success(res.msg);
+						this.getData();
+						this.handleCancel()
+					} else {
+						this.$message.error(res.msg);
+					}
+        }
 			});
 		},
 		handleCancel() {
 			this.$refs.ruleForm.resetFields();
+      this.casVal[0] = 0;
+      this.casVal[1] = 0;
+      this.casVal[2] = 0;
 			this.visible = false;
 		},
 		newOrder() {
@@ -344,7 +378,7 @@ export default {
 		handleChange(data){
 			this.form.communityUrls[0] = data[0].response.data
 		},
-		onchange(data){
+		casChange(data){
 			this.form.address = data[2]
 		},
     //小区后台
@@ -352,6 +386,21 @@ export default {
       this.boundForm.communityId = val.id
       this.boundVisible = true;
     },
+    handlerUpdate(val) {
+      this.activeMode = 2;
+      this.activeId = val.id;
+      findByIdAdmin({communityId: val.id}).then(res => {
+        let data = res.data;
+        this.form.name = data.name;
+        this.form.address = data.countyId;
+        this.form.addressDetails = data.addressDetails;
+        this.casVal[0] = data.provinceId;
+        this.casVal[1] = data.cityId;
+        this.casVal[2] = data.countyId;
+        this.form.communityUrls = data.imgList;
+      })
+      this.visible = true;
+    },
     boundConfirm() {
       userBindingCommunity(this.boundForm).then(res => {
         if (res.code === 200) {
@@ -401,6 +450,12 @@ export default {
               }
             },
       })
+    },
+    //前往saas
+    goSaas(val) {
+      getManageLoginToken({communityId: val.id}).then(res => {
+        window.open('https://saas.kaidalai.cn/#/login?token='+res.data+'&code='+val.code, '_blank');
+      })
     }
 	},
 };
diff --git a/src/views/Manage/ShopCertiManage/_detail.vue b/src/views/Manage/ShopCertiManage/_detail.vue
new file mode 100644
index 0000000..2e1e02b
--- /dev/null
+++ b/src/views/Manage/ShopCertiManage/_detail.vue
@@ -0,0 +1,202 @@
+<template>
+  <div>
+    <div class="main">
+      <div class="cardTitle">店铺主体信息</div>
+      <a-divider />
+      <div class="content">
+        <a-descriptions title="基本信息" :column="3" v-if="infoList.type != 3">
+          <a-descriptions-item label="企业名称">
+            {{infoList.companyName}}
+          </a-descriptions-item>
+          <a-descriptions-item label="注册地址">
+            {{infoList.registerAddress}}
+            {{infoList.registerAddressDetail}}
+          </a-descriptions-item>
+          <a-descriptions-item label="经营范围">
+            {{infoList.businessScope}}
+          </a-descriptions-item>
+          <a-descriptions-item label="统一社会信用代码"> {{infoList.uscc}} </a-descriptions-item>
+          <a-descriptions-item label="营业期限">
+            {{infoList.businessTermStart}} 至 
+            {{infoList.businessTermEnd == null ? '长期' : infoList.businessTermEnd}}
+          </a-descriptions-item>
+          <a-descriptions-item label="统一社会信用代码照片">{{infoList.usccImgList}}</a-descriptions-item>
+          <a-descriptions-item label="其他资质照片">{{infoList.otherImgList}}</a-descriptions-item>
+        </a-descriptions>
+        <a-descriptions title="个人信息" :column="3">
+          <a-descriptions-item label="头像面">
+            <a v-for="(item, index) in infoList.authenticationPersonalInfoVo.idCardFrontImgList" :key="index"
+               :href="'https://saas.kaidalai.cn/resource/merchant/'+item.url" target="_blank">
+              点击查看
+            </a>
+          </a-descriptions-item>
+          <a-descriptions-item label="国徽面">
+            <a v-for="(item, index) in infoList.authenticationPersonalInfoVo.idCardBackImgList" :key="index"
+               :href="'https://saas.kaidalai.cn/resource/merchant/'+item.url" target="_blank">
+              点击查看
+            </a>
+          </a-descriptions-item>
+          <a-descriptions-item label="证件类型">
+            大陆身份证
+          </a-descriptions-item>
+          <a-descriptions-item label="法人姓名">
+            {{infoList.authenticationPersonalInfoVo.name}}
+          </a-descriptions-item>
+          <a-descriptions-item label="法人证件号码">
+            {{infoList.authenticationPersonalInfoVo.idNumber}}
+          </a-descriptions-item>
+          <a-descriptions-item label="出生日期">
+            {{infoList.authenticationPersonalInfoVo.birthday}}
+          </a-descriptions-item>
+          <a-descriptions-item label="证件有效期">
+            {{infoList.idValidityStart}} 至 
+            {{infoList.idValidityEnd == null ? '长期' : infoList.idValidityEnd}}
+          </a-descriptions-item>
+          <a-descriptions-item label="性别">
+            {{infoList.authenticationPersonalInfoVo.sex == 1?'男':infoList.authenticationPersonalInfoVo.sex == 2?'女':'保密'}}
+          </a-descriptions-item>
+          <a-descriptions-item label="职业">
+            {{infoList.authenticationPersonalInfoVo.occupation}}
+          </a-descriptions-item>
+        </a-descriptions>
+        <a-descriptions title="经营信息" :column="3">
+          <a-descriptions-item label="联系人"> {{infoList.authenticationOperateInfoVo.name}} </a-descriptions-item>
+          <a-descriptions-item label="联系人号码">
+            {{infoList.authenticationOperateInfoVo.tel}}
+          </a-descriptions-item>
+          <a-descriptions-item label="邮箱">{{infoList.authenticationOperateInfoVo.email}}</a-descriptions-item>
+          <a-descriptions-item label="客服电话">{{infoList.authenticationOperateInfoVo.customerServiceTel}}</a-descriptions-item>
+          <a-descriptions-item label="结算类型">支付宝</a-descriptions-item>
+          <a-descriptions-item label="支付宝用户名">{{infoList.authenticationOperateInfoVo.alipayName}}</a-descriptions-item>
+          <a-descriptions-item label="支付宝账号">{{infoList.authenticationOperateInfoVo.alipayAccount}}</a-descriptions-item>
+          <a-descriptions-item label="经营地址">{{infoList.authenticationOperateInfoVo.operateAddressDetail}}</a-descriptions-item>
+          <a-descriptions-item label="经营类目">
+            <span v-for="(item,index) in infoList.authenticationOperateInfoVo.categoryList" :key="index">
+              {{item.name}}
+            </span>
+          </a-descriptions-item>
+          <a-descriptions-item label="经营资质" :span="3">
+            <span v-for="(item,index) in infoList.authenticationOperateInfoVo.qualificationVoList" :key="index">
+              <a v-for="(it,id) in item.qualificationInfoVoList" :href="'https://saas.kaidalai.cn/resource/merchant/'+it.url" :key="id">
+                {{it.name}}
+              </a>
+            </span>
+          </a-descriptions-item>
+          <a-descriptions-item label="门店门头">
+            <a v-for="(item, index) in infoList.authenticationOperateInfoVo.doorHeadImgList" :key="index"
+               :href="'https://saas.kaidalai.cn/resource/merchant/'+item.url" target="_blank">
+              点击查看
+            </a>
+          </a-descriptions-item>
+          <a-descriptions-item label="门店内景">
+            <a v-for="(item, index) in infoList.authenticationOperateInfoVo.indoorSceneImgList" :key="index"
+               :href="'https://saas.kaidalai.cn/resource/merchant/'+item.url" target="_blank">
+              点击查看
+            </a>
+          </a-descriptions-item>
+          <a-descriptions-item label="收银台">
+            <a v-for="(item, index) in infoList.authenticationOperateInfoVo.cashierImgList" :key="index"
+               :href="'https://saas.kaidalai.cn/resource/merchant/'+item.url" target="_blank">
+              点击查看
+            </a>
+          </a-descriptions-item>
+          <a-descriptions-item label="补充信息">
+            <a v-for="(item, index) in infoList.authenticationOperateInfoVo.otherImgList" :key="index"
+               :href="'https://saas.kaidalai.cn/resource/merchant/'+item.url" target="_blank">
+              点击查看
+            </a>
+          </a-descriptions-item>
+        </a-descriptions>
+      </div>
+    </div>
+    <div class="footer">
+      <a-space style="margin-left: 70%">
+        <a-button type="primary" @click="auditShow=true">审核</a-button>
+        <a-button @click="cancel">取消</a-button>
+      </a-space>
+    </div>
+    <a-modal
+      title="审核"
+      :visible="auditShow"
+      @ok="auditSubmit"
+      @cancel="auditCancel"
+    >
+      <div class="content">
+        <a-form-model>
+          <a-form-model-item label="审核类型">
+            <a-select v-model="appForm.type" style="width: 120px">
+                <a-select-option :value="1">
+                    通过
+                </a-select-option>
+                <a-select-option :value="2">
+                    驳回
+                </a-select-option>
+            </a-select>
+          </a-form-model-item>
+          <a-form-model-item label="审核留言" >
+            <a-textarea v-model="appForm.reason" style="" :auto-size="{ minRows: 5, maxRows: 8 }"></a-textarea>
+          </a-form-model-item>
+        </a-form-model>
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import {findCertiDetail,examineShop} from "@/api/manage/index.js"
+export default {
+	data() {
+		return {
+      appForm: {
+        merchantShopId: undefined,
+        type: 1,
+        reason: ''
+      },
+      infoList: {},
+			auditShow: false,
+    };
+	},
+	mounted() {
+    this.appForm.merchantShopId = this.$route.query.id;
+    this.getData()
+	},
+	methods: {
+    getData() {
+      findCertiDetail({merchantShopId: this.$route.query.id}).then(res => {
+        let data = res.data;
+        this.infoList = data;
+      })
+    },
+		cancel() {
+			this.$router.go(-1);
+		},
+		auditSubmit(){
+      examineShop(this.appForm).then((res) => {
+          if (res.code === 200) {
+						this.$message.success(res.msg);
+            this.$router.go(-1);
+					} else {
+						this.$message.error(res.msg);
+					}
+      })
+			this.auditShow = false
+		},
+		auditCancel(){
+			this.auditShow = false
+		}
+	},
+};
+</script>
+
+<style lang="less" scoped>
+.content {
+  padding-top: 0px;
+  padding-bottom: 120px;
+}
+.content img {
+  width: 142px;
+  height: 107px;
+  margin: 10px;
+  cursor: pointer;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Manage/ShopCertiManage/config.js b/src/views/Manage/ShopCertiManage/config.js
new file mode 100644
index 0000000..ab07da6
--- /dev/null
+++ b/src/views/Manage/ShopCertiManage/config.js
@@ -0,0 +1,68 @@
+export const columns = [
+    {
+        title: "店铺编号",
+        dataIndex: "code",
+        width: "200",
+    },
+    {
+        title: "店铺状态",
+        dataIndex: "status",
+        customRender: function (status) {
+			switch (status) {
+			case 1: return "未认证";
+			case 2: return "审核中";
+            case 3: return "已认证";
+			default: break;
+			}
+		},
+        width: "8%",
+    },
+    {
+        title: "店铺名称",
+        dataIndex: "name",
+        width: "200",
+    },
+    {
+        title: "店铺账号",
+        dataIndex: "account",
+        width: "200",
+    },
+    {
+        title: "主体类型",
+        dataIndex: "type",
+        customRender: function (type) {
+			switch (type) {
+			case 1: return "个体户";
+			case 2: return "企业";
+            case 3: return "个人";
+			default:
+				break;
+			}
+		},
+        width: "200",
+    },
+    {
+        title: "企业名称",
+        dataIndex: "companyName",
+        width: "200",
+    },
+    {
+        title: "经营类目",
+        dataIndex: "categoryNameList",
+        width: "200",
+        scopedSlots: { customRender: "category" },
+    },
+    {
+        title: "提交时间",
+        dataIndex: "updateDate",
+        width: "180",
+    },
+    {
+        title: "操作",
+        dataIndex: "action",
+        key: "action",
+        width: "180",
+        fixed: "right",
+        scopedSlots: { customRender: "action" },
+    },
+]
\ No newline at end of file
diff --git a/src/views/Manage/ShopCertiManage/index.vue b/src/views/Manage/ShopCertiManage/index.vue
new file mode 100644
index 0000000..928eddc
--- /dev/null
+++ b/src/views/Manage/ShopCertiManage/index.vue
@@ -0,0 +1,134 @@
+<template>
+  <div class="main">
+    <!-- 标题 -->
+    <div class="cardTitle">店铺审核管理</div>
+    <!-- 搜索 -->
+    <div class="search-box">
+      <a-space size="large">
+		<a-form-model layout="inline">
+			<a-form-model-item label="店铺编号">
+        		<a-input v-model="searchForm.code" placeholder="请输入编号" />
+			</a-form-model-item>
+			<a-form-model-item label="店铺名称">
+        		<a-input v-model="searchForm.name" placeholder="请输入名称" />
+			</a-form-model-item>
+			<a-form-model-item label="店铺账号">
+        		<a-input v-model="searchForm.account" placeholder="请输入账号" />
+			</a-form-model-item>
+			<a-form-model-item label="主体类型">
+        		<a-select v-model="searchForm.type" style="width: 200px" placeholder="请选择类型">
+					<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>
+			</a-form-model-item>
+			<a-form-model-item label="企业名称">
+        		<a-input v-model="searchForm.companyName" placeholder="请输入账号" />
+			</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="handlerSearch">查 询</a-button>
+        		<a-button @click="handlerReset">重 置</a-button>
+			</a-form-model-item>
+		</a-form-model>
+      </a-space>
+    </div>
+    <!-- 表格 -->
+    <div id="commonTable">
+      <a-table
+        :scroll="{ x: 2120 }"
+        :columns="columns"
+        :data-source="tableData"
+        :pagination="pagination"
+        @change="handleTableChange"
+        :row-key="
+          (record, index) => {
+            return index;
+          }
+        "
+      >
+        <!-- 操作 -->
+        <span slot="action" slot-scope="text,record">
+          <a v-if="record.status != 3" @click="detail(record)">详情</a>
+        </span>
+      </a-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import {getShopCertiList} from "@/api/manage/index.js"
+import {columns} from "./config"
+export default {
+	data() {
+		return {
+			// 搜索项
+			searchForm: {
+				code: "",
+				name: '',
+				account: '',
+				type: undefined,
+				companyName: '',
+				updateDateStart: '',
+				updateDateEnd: ''
+			},
+			//   列
+			columns: columns,
+			//   数据
+			tableData: [],
+			//   分页
+			pagination: {
+				current: 1,
+				total: 0,
+				pageSize: 10,
+				showTotal: (total) => `共 ${total} 条`,
+				showSizeChanger: true,
+				showQuickJumper: true,
+			},
+		};
+	},
+	mounted() {
+		this.getData();
+	},
+	methods: {
+		getData() {
+			let obj = Object.assign(this.searchForm, {size: this.pagination.pageSize,pageNum: this.pagination.current})
+			getShopCertiList(obj).then(res => {
+				let data = res.data;
+				this.tableData = data.rows;
+				this.pagination.total = data.total;
+			})
+		},
+		detail(data){
+			let id = data.id
+			this.$router.push(
+				{
+					name:'certi_detail',
+					query: {
+						id: id
+					}
+				}
+			)
+		},
+		//查询
+		handlerSearch() {
+			this.getData()
+		},
+		//重置
+		handlerReset() {
+			this.getData()
+		},
+		//分页
+		handleTableChange(pagination) {
+			this.pagination.pageSize = pagination.pageSize;
+			this.pagination.current = pagination.current;
+			this.getData();
+		},
+	},
+};
+</script>
+
+<style lang="less" scoped>
+</style>>
\ No newline at end of file
diff --git a/src/views/Manage/ShopManage/GoodCate/index.vue b/src/views/Manage/ShopManage/GoodCate/index.vue
new file mode 100644
index 0000000..5da6af3
--- /dev/null
+++ b/src/views/Manage/ShopManage/GoodCate/index.vue
@@ -0,0 +1,13 @@
+<template>
+    <div>goodCate</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/Manage/ShopManage/GoodList/index.vue b/src/views/Manage/ShopManage/GoodList/index.vue
new file mode 100644
index 0000000..943504e
--- /dev/null
+++ b/src/views/Manage/ShopManage/GoodList/index.vue
@@ -0,0 +1,13 @@
+<template>
+    <div>goodList</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/Manage/ShopManage/ShopList/index.vue b/src/views/Manage/ShopManage/ShopList/index.vue
new file mode 100644
index 0000000..9f2fee2
--- /dev/null
+++ b/src/views/Manage/ShopManage/ShopList/index.vue
@@ -0,0 +1,13 @@
+<template>
+    <div>shopVerified</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/Manage/ShopManage/ShopVerified/index.vue b/src/views/Manage/ShopManage/ShopVerified/index.vue
new file mode 100644
index 0000000..7bc21fd
--- /dev/null
+++ b/src/views/Manage/ShopManage/ShopVerified/index.vue
@@ -0,0 +1,13 @@
+<template>
+    <div>shopList</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/Manage/ShopManage/index.vue b/src/views/Manage/ShopManage/index.vue
new file mode 100644
index 0000000..d0f13e3
--- /dev/null
+++ b/src/views/Manage/ShopManage/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/Manage/ShopRemain/index.vue b/src/views/Manage/ShopRemain/index.vue
index 9135323..17ff819 100644
--- a/src/views/Manage/ShopRemain/index.vue
+++ b/src/views/Manage/ShopRemain/index.vue
@@ -4,9 +4,9 @@
         <div class="search-box">
             <a-space size="large">
                 <a-descriptions layout="vertical">
-                    <!-- <a-descriptions-item label="余额">
-                        ¥ <span class="total-amount">5112</span>
-                    </a-descriptions-item> -->
+                    <a-descriptions-item label="余额">
+                        ¥ <span class="total-amount">{{remain}}</span>
+                    </a-descriptions-item>
                 </a-descriptions>
             </a-space>
         </div>
@@ -32,7 +32,7 @@
         <a-modal title="充值" :visible="modalVisible" @cancel="modalClose" @ok="confirm">
             <a-form-model layout="inline">
                 <a-form-model-item label="充值金额">
-                 ¥ <a-input-number
+                  ¥ <a-input-number
                         :formatter="value => ` ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
                         :parser="value => value.replace(/\$\s?|(,*)/g, '')"
                         v-model="form.payAmount" :min="0" :step="0.01" style="width: 150px">
@@ -40,7 +40,7 @@
                 </a-form-model-item>
             </a-form-model>
             <div style="margin-top: 12px">
-                <span>当前余额<span>{{}}</span>元，点击继续将跳转至支付宝付款页面</span>
+                <span>当前余额<span> {{remain}} </span>元，点击继续将跳转至支付宝付款页面</span>
             </div>
         </a-modal>
         <!-- <div>
@@ -54,6 +54,7 @@
 </template>
 
 <script>
+import { userInfo } from "@/api/public/login";
 import {getBalanceList, createBalanceRechargeOrder} from "@/api/user"
 export default {
     name: 'shopRemain',
@@ -113,7 +114,7 @@ export default {
 				showQuickJumper: true,
             },
             modalVisible: false,
-
+            remain: 0,
         }
     },
     mounted() {
@@ -124,10 +125,12 @@ export default {
             let obj = {pageNum: this.pagination.current,size: this.pagination.pageSize}
             getBalanceList(obj).then(res => {
                 let data = res.data;
-                console.log(data)
                 this.tableData = data.rows;
                 this.pagination.total = data.total
-            })
+            });
+            userInfo().then(res =>{
+                this.remain = res.data.balance
+		    })
         },
         handleTableChange(val) {
             this.pagination.current = val.current;
diff --git a/src/views/Rule/rule.vue b/src/views/Rule/rule.vue
index 44692ce..d1320d5 100644
--- a/src/views/Rule/rule.vue
+++ b/src/views/Rule/rule.vue
@@ -59,14 +59,35 @@
 1.使用小蜜蜂服务时违反有关法律法规规定的；
 2.违反本协议或小蜜蜂规则（即本协议第二条）约定的；
 3.为适应小区服务、电子商务发展，为广大用户提供高效优质服务，你理解并同意，其他情节影响严重，小蜜蜂有合理理由认定你违约的，如你不能提供充分举证和合理解释，则视为你违约。
-(二)【禁止性信息】你在使用小蜜蜂服务时须遵守法律法规，不得制作、复制、发布、传播含有下列内容的商品、服务或从事相关行为，也不得为制作、复制、发布、传播含有下列内容的信息或从事相关行为提供便利：
-1.违反国家法律法规禁止性规定的；
-2.政治宣传、封建迷信、淫秽、色情、赌博、暴力、恐怖或者教唆犯罪的；
-3.欺诈、虚假、不准确或存在误导性的；
-4.侵犯他人知识产权或涉及第三方商业秘密及其他专有权利的；
-5.侮辱、诽谤、恐吓、涉及他人隐私等侵害他人合法权益的；
-6.存在可能破坏、篡改、删除、影响小蜜蜂任何系统正常运行或未经授权秘密获取小蜜蜂及其他用户的数据、个人资料的病毒、木马、爬虫等恶意软件、程序代码的；
-7.其他违背社会公共利益或公共道德或依据相关小蜜蜂协议、规则的规定不适合在小蜜蜂上发布的。
+(二)【用户行为规范】
+你同意并承诺在使用小蜜蜂服务时遵守法律法规，不得制作、复制、发布、传播含有下列内容的商品、服务或从事相关行为，也不得为制作、复制、发布、传播含有下列内容的信息或从事相关行为提供便利： 
+1、反对宪法确定的基本原则的；
+2、危害国家安全，泄露国家秘密的；
+3、颠覆国家政权，推翻社会主义制度，煽动分裂国家，破坏国家统一的；
+4、损害国家荣誉和利益的；
+5、宣扬恐怖主义、极端主义的；
+6、宣扬民族仇恨、民族歧视，破坏民族团结的；
+7、煽动地域歧视、地域仇恨的；
+8、破坏国家宗教政策，宣扬邪教和封建迷信的；
+9、编造、散布谣言、虚假信息，扰乱经济秩序和社会秩序、破坏社会稳定的；
+10、散布、传播淫秽、色情、赌博、暴力、凶杀、恐怖或者教唆犯罪的；
+11、危害网络安全、利用网络从事危害国家安全、荣誉和利益的；
+12、侮辱或者诽谤他人，侵害他人合法权益的；
+13、对他人进行暴力恐吓、威胁，实施人肉搜索的；
+14、涉及他人隐私、个人信息或资料的；
+15、散布污言秽语，损害社会公序良俗的；
+16、侵犯他人隐私权、名誉权、肖像权、知识产权等合法权益内容的；
+17、散布商业广告，或类似的商业招揽信息、过度营销信息及垃圾信息；
+18、使用本网站常用语言文字以外的其他语言文字评论的；
+19、与所评论的信息毫无关系的；
+20、所发表的信息毫无意义的，或刻意使用字符组合以逃避技术审核的；
+21、侵害未成年人合法权益或者损害未成年人身心健康的；
+22、未获他人允许，偷拍、偷录他人，侵害他人合法权利的；
+23、包含恐怖、暴力血腥、高危险性、危害表演者自身或他人身心健康内容的，包括但不限于以下情形：
+i. 任何暴力和/或自残行为内容；
+ii. 任何威胁生命健康、利用刀具等危险器械表演的危及自身或他人人身及/或财产权利的内容；
+iii.怂恿、诱导他人参与可能会造成人身伤害或导致死亡的危险或违法活动的内容；
+24、其他含有违反法律法规、政策及公序良俗、干扰“抖音”正常运营或侵犯其他用户或第三方合法权益内容的信息。
 (三)【违反约定】如你的行为使小蜜蜂及其关联公司遭受损失（包括直接经济损失、商誉损失及对外支付的赔偿金、和解款、律师费、诉讼费等间接经济损失），你应赔偿小蜜蜂及其关联公司的上述全部损失；如你的行为使小蜜蜂及其关联公司遭受第三人主张权利，小蜜蜂及其关联公司可在对第三人承担金钱给付等义务后就全部损失向你追偿。如你违反本协议或小蜜蜂规则约定的，小蜜蜂有权经综合评估后视你的行为性质，采取包括但不限于删除你发布的商品或服务、暂停使用许可、终止服务、限制使用、回收帐号、追究法律责任等措施。
 (四)【服务终止】你需要对自己在服务使用过程中的行为负责。即使你已经终止使用该服务或完成了相应的交易或删除你所拥有的店铺，你仍应对你的之前的行为负责，你承担责任的形式包括但不限于：对受到侵害者进行赔偿，以及小蜜蜂承担了因你的行为导致的行政处罚或侵权损害赔偿责任后，你应给予小蜜蜂等额的赔偿（如有）。
 (五)【关联处理】如因你严重违约导致小蜜蜂终止本协议时，出于维护小蜜蜂秩序及保护消费者权益的目的，小蜜蜂及/或其关联公司可对与你在其他协议项下的合作采取中止甚或终止协议的措施，并以本协议第十一条约定的方式通知你。如小蜜蜂与你签署的其他协议及小蜜蜂及/或其关联公司、支付公司与你签署的协议中明确约定了对你在本协议项下合作进行关联处理的情形，则小蜜蜂出于维护小蜜蜂秩序的目的，可在收到指令时中止甚至终止协议，并以本协议第十一条约定的方式通知你。