diff --git a/.env.development b/.env.development
index 961b9b0..7b42084 100644
--- a/.env.development
+++ b/.env.development
@@ -8,8 +8,7 @@ VUE_APP_BASE_API = '/api'
 # VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi"
 
 
-VUE_APP_URL = "http://192.168.0.105:7211"
-VUE_APP_REPORT_URL = "http://192.168.2.106:7202"
-##VUE_APP_REPORT_URL = "https://lpk.yyundong.com"
+VUE_APP_URL = "http://192.168.0.105:8114"
+VUE_APP_REPORT_URL = "http://192.168.1.105:7202"
 ##VUE_APP_REPORT_URL = "https://supervise.yxtsoft.com/lpk"
 ##VUE_APP_URL = "http://8.130.39.13:8112"
diff --git a/package.json b/package.json
index 253f062..1890a0a 100644
--- a/package.json
+++ b/package.json
@@ -1,76 +1,77 @@
 {
-  "name": "yxt-yyth-ui-admin",
-  "version": "1.1.0",
-  "description": "",
-  "author": "",
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview",
-    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
-    "lint": "eslint --ext .js,.vue src",
-    "test:unit": "jest --clearCache && vue-cli-service test:unit",
-    "test:ci": "npm run lint && npm run test:unit"
-  },
-  "dependencies": {
-    "axios": "^0.24.0",
-    "bpmn-js": "^9.2.2",
-    "core-js": "^3.8.3",
-    "echarts": "^5.4.3",
-    "ejs": "^2.7.4",
-    "element-ui": "^2.15.14",
-    "js-cookie": "2.2.0",
-    "moment": "^2.29.1",
-    "normalize.css": "7.0.0",
-    "nprogress": "0.2.0",
-    "path-to-regexp": "2.4.0",
-    "portfinder": "^1.0.21",
-    "print-template": "^1.2.8",
-    "qs": "^6.9.4",
-    "quill": "^1.3.7",
-    "sass-resources-loader": "^2.1.1",
-    "viewerjs": "^1.9.0",
-    "vue": "^2.6.14",
-    "vue-amap": "^0.5.10",
-    "vue-router": "^3.5.1",
-    "vuex": "3.6.0",
-    "vuex-persistedstate": "^4.0.0",
-    "xcrud": "^0.4.19"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.4",
-    "@vue/cli-plugin-eslint": "4.4.4",
-    "@vue/cli-plugin-unit-jest": "4.4.4",
-    "@vue/cli-service": "4.4.4",
-    "@vue/test-utils": "1.0.0-beta.29",
-    "autoprefixer": "9.5.1",
-    "babel-eslint": "10.1.0",
-    "babel-jest": "23.6.0",
-    "babel-plugin-dynamic-import-node": "2.3.3",
-    "babel-polyfill": "^6.26.0",
-    "chalk": "2.4.2",
-    "connect": "3.6.6",
-    "eslint": "6.7.2",
-    "eslint-plugin-vue": "6.2.2",
-    "html-webpack-plugin": "3.2.0",
-    "mockjs": "1.0.1-beta3",
-    "runjs": "4.3.2",
-    "sass": "1.26.8",
-    "sass-loader": "8.0.2",
-    "script-ext-html-webpack-plugin": "2.1.3",
-    "serve-static": "1.13.2",
-    "svg-sprite-loader": "4.1.3",
-    "svgo": "1.2.2",
-    "vue-template-compiler": "2.6.10"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ],
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
-  "license": "MIT"
+    "name": "yxt-yyth-ui-admin",
+    "version": "1.1.0",
+    "description": "",
+    "author": "",
+    "scripts": {
+        "dev": "vue-cli-service serve",
+        "build:prod": "vue-cli-service build",
+        "build:stage": "vue-cli-service build --mode staging",
+        "preview": "node build/index.js --preview",
+        "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
+        "lint": "eslint --ext .js,.vue src",
+        "test:unit": "jest --clearCache && vue-cli-service test:unit",
+        "test:ci": "npm run lint && npm run test:unit"
+    },
+    "dependencies": {
+        "axios": "^0.24.0",
+        "bpmn-js": "^9.2.2",
+        "core-js": "^3.8.3",
+        "echarts": "^5.4.3",
+        "ejs": "^2.7.4",
+        "element-china-area-data": "^6.1.0",
+        "element-ui": "^2.15.14",
+        "js-cookie": "2.2.0",
+        "moment": "^2.29.1",
+        "normalize.css": "7.0.0",
+        "nprogress": "0.2.0",
+        "path-to-regexp": "2.4.0",
+        "portfinder": "^1.0.21",
+        "print-template": "^1.2.8",
+        "qs": "^6.9.4",
+        "quill": "^1.3.7",
+        "sass-resources-loader": "^2.1.1",
+        "viewerjs": "^1.9.0",
+        "vue": "^2.6.14",
+        "vue-amap": "^0.5.10",
+        "vue-router": "^3.5.1",
+        "vuex": "3.6.0",
+        "vuex-persistedstate": "^4.0.0",
+        "xcrud": "^0.4.19"
+    },
+    "devDependencies": {
+        "@vue/cli-plugin-babel": "4.4.4",
+        "@vue/cli-plugin-eslint": "4.4.4",
+        "@vue/cli-plugin-unit-jest": "4.4.4",
+        "@vue/cli-service": "4.4.4",
+        "@vue/test-utils": "1.0.0-beta.29",
+        "autoprefixer": "9.5.1",
+        "babel-eslint": "10.1.0",
+        "babel-jest": "23.6.0",
+        "babel-plugin-dynamic-import-node": "2.3.3",
+        "babel-polyfill": "^6.26.0",
+        "chalk": "2.4.2",
+        "connect": "3.6.6",
+        "eslint": "6.7.2",
+        "eslint-plugin-vue": "6.2.2",
+        "html-webpack-plugin": "3.2.0",
+        "mockjs": "1.0.1-beta3",
+        "runjs": "4.3.2",
+        "sass": "1.26.8",
+        "sass-loader": "8.0.2",
+        "script-ext-html-webpack-plugin": "2.1.3",
+        "serve-static": "1.13.2",
+        "svg-sprite-loader": "4.1.3",
+        "svgo": "1.2.2",
+        "vue-template-compiler": "2.6.10"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions"
+    ],
+    "engines": {
+        "node": ">=8.9",
+        "npm": ">= 3.0.0"
+    },
+    "license": "MIT"
 }
diff --git a/src/api/User/login.js b/src/api/User/login.js
index 399fda6..0f024ed 100644
--- a/src/api/User/login.js
+++ b/src/api/User/login.js
@@ -2,34 +2,34 @@ import request from '@/utils/request'
 import qs from 'qs'
 
 class User {
-  login(data) { // 登录
-    return request({
-      url: '/system/user/login',
-      method: 'post',
-      data
-    })
-  }
-  logout(data) { // 退出
-    return request({
-      url: '/portal/v1/sysuser/signOut',
-      method: 'post',
-      data: qs.stringify(data)
-    })
-  }
-  updatePassword(data) { // 退出修改密码
-    return request({
-      url: '/portal/v1/sysuser/updatePassword',
-      method: 'post',
-      data: qs.stringify(data)
-    })
-  }
-  reGetPwd(data) {
-    return request({
-      url: `/system/user/reGetPwd/${data.userName}/${data.userPhone}`,
-      method: 'post',
-      data: qs.stringify(data)
-    })
-  }
+    login(data) { // 登录
+        return request({
+            url: '/system/user/login',
+            method: 'post',
+            data
+        })
+    }
+    logout(data) { // 退出
+        return request({
+            url: '/portal/v1/sysuser/signOut',
+            method: 'post',
+            data: qs.stringify(data)
+        })
+    }
+    updatePassword(data) { // 退出修改密码
+        return request({
+            url: '/portal/v1/sysuser/updatePassword',
+            method: 'post',
+            data: qs.stringify(data)
+        })
+    }
+    reGetPwd(data) {
+        return request({
+            url: `/system/user/reGetPwd/${data.userName}/${data.userPhone}`,
+            method: 'post',
+            data: qs.stringify(data)
+        })
+    }
 }
 
-export default new User()
+export default new User()
\ No newline at end of file
diff --git a/src/api/adminmallapi.js b/src/api/adminmallapi.js
index c909b71..3aa558d 100644
--- a/src/api/adminmallapi.js
+++ b/src/api/adminmallapi.js
@@ -1,18 +1,18 @@
 import request from '@/utils/request'
 
 export default {
-  // 品牌列表
-  listAllBrand: function(params) {
-    return request({
-      url: '/adminapi/mall/listAllBrand',
-      method: 'get'
-    })
-  },
-  // 品牌列表
-  listAllCategory: function(params) {
-    return request({
-      url: '/adminapi/mall/listAllCategory',
-      method: 'get'
-    })
-  }
-}
+    // 品牌列表
+    listAllBrand: function(params) {
+        return request({
+            url: '/mall/adminapi/mall/listAllBrand',
+            method: 'get'
+        })
+    },
+    // 品牌列表
+    listAllCategory: function(params) {
+        return request({
+            url: '/mall/adminapi/mall/listAllCategory',
+            method: 'get'
+        })
+    }
+}
\ No newline at end of file
diff --git a/src/api/appletNotice/appletNotice.js b/src/api/appletNotice/appletNotice.js
index 34d37f6..e641602 100644
--- a/src/api/appletNotice/appletNotice.js
+++ b/src/api/appletNotice/appletNotice.js
@@ -1,40 +1,40 @@
 import request from '@/utils/request'
 
 export default {
-	
-	// 查询分页列表
-	listPage: function(params) {
-	  return request({
-	    url: '/appletnotice/pageList',
-	    method: 'post',
-	    data: params,
-	  })
-	},
-	
-	// 新增、保存
-	saveNotice: function(data) {
-		return request({
-			url: '/appletnotice/saveOrUpdate',
-			method: 'post',
-			data: data
-		});
-	},
-	
-	// 初始化
-	noticeInit: function(data) {
-		return request({
-			url: '/appletnotice/noticeInit/'+data,
-			method: 'get'
-		});
-	},
-	
-	
-	// 修改是否可见
-	updateAppletUseTo: function(sid,isEnable) {
-		return request({
-			url: '/appletnotice/isDisplayed/'+sid+"/"+isEnable
-		});
-	},
-	
-	
+
+    // 查询分页列表
+    listPage: function(params) {
+        return request({
+            url: '/mall/appletnotice/pageList',
+            method: 'post',
+            data: params,
+        })
+    },
+
+    // 新增、保存
+    saveNotice: function(data) {
+        return request({
+            url: '/mall/appletnotice/saveOrUpdate',
+            method: 'post',
+            data: data
+        });
+    },
+
+    // 初始化
+    noticeInit: function(data) {
+        return request({
+            url: '/mall/appletnotice/noticeInit/' + data,
+            method: 'get'
+        });
+    },
+
+
+    // 修改是否可见
+    updateAppletUseTo: function(sid, isEnable) {
+        return request({
+            url: '/mall/appletnotice/isDisplayed/' + sid + "/" + isEnable
+        });
+    },
+
+
 }
\ No newline at end of file
diff --git a/src/api/authentication/authentication.js b/src/api/authentication/authentication.js
index d3c8366..7e54bb1 100644
--- a/src/api/authentication/authentication.js
+++ b/src/api/authentication/authentication.js
@@ -1,23 +1,23 @@
 import request from '@/utils/request'
 
 export default {
-	
-	// 查询分页列表
-	listPage: function(params) {
-	  return request({
-	    url: '/enterprisecertification/listPage',
-	    method: 'post',
-	    data: params,
-	  })
-	},
-	
-	
-	//   审核
-	toExamine: function(params) {
-	  return request({
-	    url: '/enterprisecertification/toExamine',
-	    method: 'post',
-	    data: params,
-	  })
-	},
+
+    // 查询分页列表
+    listPage: function(params) {
+        return request({
+            url: '/mall/enterprisecertification/listPage',
+            method: 'post',
+            data: params,
+        })
+    },
+
+
+    //   审核
+    toExamine: function(params) {
+        return request({
+            url: '/mall/enterprisecertification/toExamine',
+            method: 'post',
+            data: params,
+        })
+    },
 }
\ No newline at end of file
diff --git a/src/api/brand.js b/src/api/brand.js
index 6c62b7e..fe87285 100644
--- a/src/api/brand.js
+++ b/src/api/brand.js
@@ -1,53 +1,52 @@
 import request from '@/utils/request'
 export function fetchList(params) {
-  return request({
-    url:'/pms/PmsBrand/list',
-    method:'get',
-    params:params
-  })
+    return request({
+        url: '/mall/pms/PmsBrand/list',
+        method: 'get',
+        params: params
+    })
 }
 export function createBrand(data) {
-  return request({
-    url:'/pms/PmsBrand/create',
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/mall/pms/PmsBrand/create',
+        method: 'post',
+        data: data
+    })
 }
 export function updateShowStatus(data) {
-  return request({
-    url:'/pms/PmsBrand/update/showStatus',
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/mall/pms/PmsBrand/update/showStatus',
+        method: 'post',
+        data: data
+    })
 }
 
 export function updateFactoryStatus(data) {
-  return request({
-    url:'/pms/PmsBrand/update/factoryStatus',
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/mall/pms/PmsBrand/update/factoryStatus',
+        method: 'post',
+        data: data
+    })
 }
 
 export function deleteBrand(id) {
-  return request({
-    url:'/pms/PmsBrand/delete/'+id,
-    method:'get',
-  })
+    return request({
+        url: '/mall/pms/PmsBrand/delete/' + id,
+        method: 'get',
+    })
 }
 
 export function getBrand(id) {
-  return request({
-    url:'/pms/PmsBrand/'+id,
-    method:'get',
-  })
-}
-
-export function updateBrand(id,data) {
-  return request({
-    url:'/pms/PmsBrand/update/'+id,
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/mall/pms/PmsBrand/' + id,
+        method: 'get',
+    })
 }
 
+export function updateBrand(id, data) {
+    return request({
+        url: '/mall/pms/PmsBrand/update/' + id,
+        method: 'post',
+        data: data
+    })
+}
\ No newline at end of file
diff --git a/src/api/commodity/commodity.js b/src/api/commodity/commodity.js
index 69419d2..499f527 100644
--- a/src/api/commodity/commodity.js
+++ b/src/api/commodity/commodity.js
@@ -1,53 +1,52 @@
 import request from '@/utils/request'
 
 export default {
-	
-	// 获取商品列表
-	goodsListPage: function(data) {
-		return request({
-			url: '/lpkgoods/goodsListPage',
-			method: 'post',
-			data: data
-		});
-	},
-	
-	// 新增、保存商品
-	saveGoods: function(data) {
-		return request({
-			url: '/lpkgoods/saveGoods',
-			method: 'post',
-			data: data
-		});
-	},
-	
-	// 初始化商品
-	goodsInit: function(data) {
-		return request({
-			url: '/lpkgoods/goodsInit/'+data,
-			method: 'get'
-		});
-	},
-	
-	// 删除商品
-	deleteGoods: function(data) {
-		return request({
-			url: '/lpkgoods/deleteGoods/'+data,
-			method: 'delete'
-		});
-	},
-	
-	// 修改商品是否属于小程序状态
-	updateAppletUseTo: function(sid,isEnable) {
-		return request({
-			url: '/lpkgoods/appletUseTo/'+sid+"/"+isEnable
-		});
-	},
-	
-	// 修改上架/下架状态
-	updateIsEnable: function(sid,isEnable) {
-		return request({
-			url: '/lpkgoods/appletGrounding/'+sid+"/"+isEnable
-		});
-	},
-}
 
+    // 获取商品列表
+    goodsListPage: function(data) {
+        return request({
+            url: '/mall/lpkgoods/goodsListPage',
+            method: 'post',
+            data: data
+        });
+    },
+
+    // 新增、保存商品
+    saveGoods: function(data) {
+        return request({
+            url: '/mall/lpkgoods/saveGoods',
+            method: 'post',
+            data: data
+        });
+    },
+
+    // 初始化商品
+    goodsInit: function(data) {
+        return request({
+            url: '/mall/lpkgoods/goodsInit/' + data,
+            method: 'get'
+        });
+    },
+
+    // 删除商品
+    deleteGoods: function(data) {
+        return request({
+            url: '/mall/lpkgoods/deleteGoods/' + data,
+            method: 'delete'
+        });
+    },
+
+    // 修改商品是否属于小程序状态
+    updateAppletUseTo: function(sid, isEnable) {
+        return request({
+            url: '/mall/lpkgoods/appletUseTo/' + sid + "/" + isEnable
+        });
+    },
+
+    // 修改上架/下架状态
+    updateIsEnable: function(sid, isEnable) {
+        return request({
+            url: '/mall/lpkgoods/appletGrounding/' + sid + "/" + isEnable
+        });
+    },
+}
\ No newline at end of file
diff --git a/src/api/invoiceReview/invoiceReview.js b/src/api/invoiceReview/invoiceReview.js
index 30be512..2637e75 100644
--- a/src/api/invoiceReview/invoiceReview.js
+++ b/src/api/invoiceReview/invoiceReview.js
@@ -1,30 +1,30 @@
 import request from '@/utils/request'
 
 export default {
-	
-	// 查询分页列表
-	listPage: function(params) {
-	  return request({
-	    url: '/invoicerecords/listPage',
-	    method: 'post',
-	    data: params,
-	  })
-	},
-	
-	//   获取订单详情
-	getOrderDetails: function(params) {
-	  return request({
-	    url: '/empsreservoorder/OrderDetailsNew/'+params,
-	    method: 'get'
-	  })
-	},
-	
-	//   审核发票
-	toExamine: function(params) {
-	  return request({
-	    url: '/invoicerecords/toExamine',
-	    method: 'post',
-	    data: params,
-	  })
-	},
+
+    // 查询分页列表
+    listPage: function(params) {
+        return request({
+            url: '/mall/invoicerecords/listPage',
+            method: 'post',
+            data: params,
+        })
+    },
+
+    //   获取订单详情
+    getOrderDetails: function(params) {
+        return request({
+            url: '/mall/empsreservoorder/OrderDetailsNew/' + params,
+            method: 'get'
+        })
+    },
+
+    //   审核发票
+    toExamine: function(params) {
+        return request({
+            url: '/mall/invoicerecords/toExamine',
+            method: 'post',
+            data: params,
+        })
+    },
 }
\ No newline at end of file
diff --git a/src/api/lpk/banner.js b/src/api/lpk/banner.js
index 91b802d..cae8882 100644
--- a/src/api/lpk/banner.js
+++ b/src/api/lpk/banner.js
@@ -2,39 +2,39 @@ import request from '@/utils/request'
 
 export default {
 
-  // 查询分页列表
-  listPage: function(params) {
-    return request({
-      url: '/adminapi/banner/pageList',
-      method: 'post',
-      data: params,
-    })
-  },
-
-  // 新增、保存
-  saveNotice: function(data) {
-    return request({
-      url: '/adminapi/banner/saveOrUpdate',
-      method: 'post',
-      data: data
-    });
-  },
-
-  // 初始化
-  noticeInit: function(data) {
-    return request({
-      url: '/adminapi/banner/noticeInit/' + data,
-      method: 'get'
-    });
-  },
-
-
-  // 修改是否可见
-  updateAppletUseTo: function(sid, isEnable) {
-    return request({
-      url: '/adminapi/banner/isDisplayed/' + sid + "/" + isEnable
-    });
-  },
-
-
-}
+    // 查询分页列表
+    listPage: function(params) {
+        return request({
+            url: '/mall/adminapi/banner/pageList',
+            method: 'post',
+            data: params,
+        })
+    },
+
+    // 新增、保存
+    saveNotice: function(data) {
+        return request({
+            url: '/mall/adminapi/banner/saveOrUpdate',
+            method: 'post',
+            data: data
+        });
+    },
+
+    // 初始化
+    noticeInit: function(data) {
+        return request({
+            url: '/mall/adminapi/banner/noticeInit/' + data,
+            method: 'get'
+        });
+    },
+
+
+    // 修改是否可见
+    updateAppletUseTo: function(sid, isEnable) {
+        return request({
+            url: '/mall/adminapi/banner/isDisplayed/' + sid + "/" + isEnable
+        });
+    },
+
+
+}
\ No newline at end of file
diff --git a/src/api/lpk/ordertools.js b/src/api/lpk/ordertools.js
index 8f59dfe..be8e7be 100644
--- a/src/api/lpk/ordertools.js
+++ b/src/api/lpk/ordertools.js
@@ -2,93 +2,93 @@ import request from '@/utils/request'
 
 export default {
 
-	// 获取客户级预约单列表
-	pageOfCustomer: function(data) {
-		return request({
-			url: '/adminapi/reserve/pageOfCustomer',
-			method: 'post',
-			data: data
-		});
-	},
-  expExcelOfCustomer: function(params) {
-    return request({
-      url: '/adminapi/reserve/expExcelOfCustomer',
-      method: 'post',
-      data: params,
-      // headers: {
-      //   "responseType": "blob" //将二进制流转换成blob对象
-      // },
-      headers: {
-        'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
-      },
-      responseType: 'blob'
-    })
-  },
-	// 获取各提货点配货列表
-	pageOfStore: function(data) {
-		return request({
-			url: '/adminapi/reserve/pageOfStore',
-			method: 'post',
-			data: data
-		});
-	},
-  expExcelOfStore: function(params) {
-    return request({
-      url: '/adminapi/reserve/expExcelOfStore',
-      method: 'post',
-      data: params,
-      // headers: {
-      //   "responseType": "blob" //将二进制流转换成blob对象
-      // },
-      headers: {
-        'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
-      },
-      responseType: 'blob'
-    })
-  },
-	// 获取各支行配货列表
-	pageOfBank: function(data) {
-		return request({
-			url: '/adminapi/reserve/pageOfBank',
-			method: 'post',
-			data: data
-		});
-	},
-  expExcelOfBank: function(params) {
-    return request({
-      url: '/adminapi/reserve/expExcelOfBank',
-      method: 'post',
-      data: params,
-      // headers: {
-      //   "responseType": "blob" //将二进制流转换成blob对象
-      // },
-      headers: {
-        'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
-      },
-      responseType: 'blob'
-    })
-  },
-	// 获取总配货列表
-	pageOfAll: function(data) {
-		return request({
-			url: '/adminapi/reserve/pageOfAll',
-			method: 'post',
-			data: data
-		});
-	},
-  expExcelOfAll: function(params) {
-    return request({
-      url: '/adminapi/reserve/expExcelOfAll',
-      method: 'post',
-      data: params,
-      // headers: {
-      //   "responseType": "blob" //将二进制流转换成blob对象
-      // },
-      headers: {
-        'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
-      },
-      responseType: 'blob'
-    })
-  }
+    // 获取客户级预约单列表
+    pageOfCustomer: function(data) {
+        return request({
+            url: '/mall/adminapi/reserve/pageOfCustomer',
+            method: 'post',
+            data: data
+        });
+    },
+    expExcelOfCustomer: function(params) {
+        return request({
+            url: '/mall/adminapi/reserve/expExcelOfCustomer',
+            method: 'post',
+            data: params,
+            // headers: {
+            //   "responseType": "blob" //将二进制流转换成blob对象
+            // },
+            headers: {
+                'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
+            },
+            responseType: 'blob'
+        })
+    },
+    // 获取各提货点配货列表
+    pageOfStore: function(data) {
+        return request({
+            url: '/mall/adminapi/reserve/pageOfStore',
+            method: 'post',
+            data: data
+        });
+    },
+    expExcelOfStore: function(params) {
+        return request({
+            url: '/mall/adminapi/reserve/expExcelOfStore',
+            method: 'post',
+            data: params,
+            // headers: {
+            //   "responseType": "blob" //将二进制流转换成blob对象
+            // },
+            headers: {
+                'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
+            },
+            responseType: 'blob'
+        })
+    },
+    // 获取各支行配货列表
+    pageOfBank: function(data) {
+        return request({
+            url: '/mall/adminapi/reserve/pageOfBank',
+            method: 'post',
+            data: data
+        });
+    },
+    expExcelOfBank: function(params) {
+        return request({
+            url: '/mall/adminapi/reserve/expExcelOfBank',
+            method: 'post',
+            data: params,
+            // headers: {
+            //   "responseType": "blob" //将二进制流转换成blob对象
+            // },
+            headers: {
+                'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
+            },
+            responseType: 'blob'
+        })
+    },
+    // 获取总配货列表
+    pageOfAll: function(data) {
+        return request({
+            url: '/mall/adminapi/reserve/pageOfAll',
+            method: 'post',
+            data: data
+        });
+    },
+    expExcelOfAll: function(params) {
+        return request({
+            url: '/mall/adminapi/reserve/expExcelOfAll',
+            method: 'post',
+            data: params,
+            // headers: {
+            //   "responseType": "blob" //将二进制流转换成blob对象
+            // },
+            headers: {
+                'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
+            },
+            responseType: 'blob'
+        })
+    }
 
-}
+}
\ No newline at end of file
diff --git a/src/api/lpk/reserveorder.js b/src/api/lpk/reserveorder.js
index 8f59dfe..be8e7be 100644
--- a/src/api/lpk/reserveorder.js
+++ b/src/api/lpk/reserveorder.js
@@ -2,93 +2,93 @@ import request from '@/utils/request'
 
 export default {
 
-	// 获取客户级预约单列表
-	pageOfCustomer: function(data) {
-		return request({
-			url: '/adminapi/reserve/pageOfCustomer',
-			method: 'post',
-			data: data
-		});
-	},
-  expExcelOfCustomer: function(params) {
-    return request({
-      url: '/adminapi/reserve/expExcelOfCustomer',
-      method: 'post',
-      data: params,
-      // headers: {
-      //   "responseType": "blob" //将二进制流转换成blob对象
-      // },
-      headers: {
-        'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
-      },
-      responseType: 'blob'
-    })
-  },
-	// 获取各提货点配货列表
-	pageOfStore: function(data) {
-		return request({
-			url: '/adminapi/reserve/pageOfStore',
-			method: 'post',
-			data: data
-		});
-	},
-  expExcelOfStore: function(params) {
-    return request({
-      url: '/adminapi/reserve/expExcelOfStore',
-      method: 'post',
-      data: params,
-      // headers: {
-      //   "responseType": "blob" //将二进制流转换成blob对象
-      // },
-      headers: {
-        'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
-      },
-      responseType: 'blob'
-    })
-  },
-	// 获取各支行配货列表
-	pageOfBank: function(data) {
-		return request({
-			url: '/adminapi/reserve/pageOfBank',
-			method: 'post',
-			data: data
-		});
-	},
-  expExcelOfBank: function(params) {
-    return request({
-      url: '/adminapi/reserve/expExcelOfBank',
-      method: 'post',
-      data: params,
-      // headers: {
-      //   "responseType": "blob" //将二进制流转换成blob对象
-      // },
-      headers: {
-        'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
-      },
-      responseType: 'blob'
-    })
-  },
-	// 获取总配货列表
-	pageOfAll: function(data) {
-		return request({
-			url: '/adminapi/reserve/pageOfAll',
-			method: 'post',
-			data: data
-		});
-	},
-  expExcelOfAll: function(params) {
-    return request({
-      url: '/adminapi/reserve/expExcelOfAll',
-      method: 'post',
-      data: params,
-      // headers: {
-      //   "responseType": "blob" //将二进制流转换成blob对象
-      // },
-      headers: {
-        'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
-      },
-      responseType: 'blob'
-    })
-  }
+    // 获取客户级预约单列表
+    pageOfCustomer: function(data) {
+        return request({
+            url: '/mall/adminapi/reserve/pageOfCustomer',
+            method: 'post',
+            data: data
+        });
+    },
+    expExcelOfCustomer: function(params) {
+        return request({
+            url: '/mall/adminapi/reserve/expExcelOfCustomer',
+            method: 'post',
+            data: params,
+            // headers: {
+            //   "responseType": "blob" //将二进制流转换成blob对象
+            // },
+            headers: {
+                'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
+            },
+            responseType: 'blob'
+        })
+    },
+    // 获取各提货点配货列表
+    pageOfStore: function(data) {
+        return request({
+            url: '/mall/adminapi/reserve/pageOfStore',
+            method: 'post',
+            data: data
+        });
+    },
+    expExcelOfStore: function(params) {
+        return request({
+            url: '/mall/adminapi/reserve/expExcelOfStore',
+            method: 'post',
+            data: params,
+            // headers: {
+            //   "responseType": "blob" //将二进制流转换成blob对象
+            // },
+            headers: {
+                'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
+            },
+            responseType: 'blob'
+        })
+    },
+    // 获取各支行配货列表
+    pageOfBank: function(data) {
+        return request({
+            url: '/mall/adminapi/reserve/pageOfBank',
+            method: 'post',
+            data: data
+        });
+    },
+    expExcelOfBank: function(params) {
+        return request({
+            url: '/mall/adminapi/reserve/expExcelOfBank',
+            method: 'post',
+            data: params,
+            // headers: {
+            //   "responseType": "blob" //将二进制流转换成blob对象
+            // },
+            headers: {
+                'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
+            },
+            responseType: 'blob'
+        })
+    },
+    // 获取总配货列表
+    pageOfAll: function(data) {
+        return request({
+            url: '/mall/adminapi/reserve/pageOfAll',
+            method: 'post',
+            data: data
+        });
+    },
+    expExcelOfAll: function(params) {
+        return request({
+            url: '/mall/adminapi/reserve/expExcelOfAll',
+            method: 'post',
+            data: params,
+            // headers: {
+            //   "responseType": "blob" //将二进制流转换成blob对象
+            // },
+            headers: {
+                'Access-Control-Allow-Headers': 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild'
+            },
+            responseType: 'blob'
+        })
+    }
 
-}
+}
\ No newline at end of file
diff --git a/src/api/pickupPoint/pickupPoint.js b/src/api/pickupPoint/pickupPoint.js
index f3243eb..73b4ca5 100644
--- a/src/api/pickupPoint/pickupPoint.js
+++ b/src/api/pickupPoint/pickupPoint.js
@@ -1,55 +1,54 @@
 import request from '@/utils/request'
 
 export default {
-	
-	// 获取支行选择列表
-	bankSelect: function(data) {
-		return request({
-			url: '/lpkbank/listAll',
-			method: 'get'
-		});
-	},
-
-	// 获取提货点列表
-	storeListPage: function(data) {
-		return request({
-			url: '/lpkstore/storeListPage',
-			method: 'post',
-			data: data
-		});
-	},
-
-	// 新增、保存提货点
-	saveStore: function(data) {
-		return request({
-			url: '/lpkstore/saveStore',
-			method: 'post',
-			data: data
-		});
-	},
-
-	// 初始化提货点
-	storeInit: function(data) {
-		return request({
-			url: '/lpkstore/storeInit/'+data,
-			method: 'get'
-		});
-	},
-
-	// 删除提货点
-	deleteStore: function(data) {
-		return request({
-			url: '/lpkstore/deleteStore/'+data,
-			method: 'delete'
-		});
-	},
-	// 修改状态
-	updateIsEnable: function(sid,isEnable) {
-		return request({
-			url: '/lpkstore/updateIsEnable/'+sid+"/"+isEnable
-		});
-	},
-
-	
-}
 
+    // 获取支行选择列表
+    bankSelect: function(data) {
+        return request({
+            url: '/mall/lpkbank/listAll',
+            method: 'get'
+        });
+    },
+
+    // 获取提货点列表
+    storeListPage: function(data) {
+        return request({
+            url: '/mall/lpkstore/storeListPage',
+            method: 'post',
+            data: data
+        });
+    },
+
+    // 新增、保存提货点
+    saveStore: function(data) {
+        return request({
+            url: '/mall/lpkstore/saveStore',
+            method: 'post',
+            data: data
+        });
+    },
+
+    // 初始化提货点
+    storeInit: function(data) {
+        return request({
+            url: '/mall/lpkstore/storeInit/' + data,
+            method: 'get'
+        });
+    },
+
+    // 删除提货点
+    deleteStore: function(data) {
+        return request({
+            url: '/mall/lpkstore/deleteStore/' + data,
+            method: 'delete'
+        });
+    },
+    // 修改状态
+    updateIsEnable: function(sid, isEnable) {
+        return request({
+            url: '/mall/lpkstore/updateIsEnable/' + sid + "/" + isEnable
+        });
+    },
+
+
+}
\ No newline at end of file
diff --git a/src/api/productAttrCate.js b/src/api/productAttrCate.js
index 126e270..ef7b0d0 100644
--- a/src/api/productAttrCate.js
+++ b/src/api/productAttrCate.js
@@ -1,37 +1,37 @@
 import request from '@/utils/request'
 export function fetchList(params) {
-  return request({
-    url:'/pms/PmsProductAttributeCategory/list',
-    method:'get',
-    params:params
-  })
+    return request({
+        url: '/mall/pms/PmsProductAttributeCategory/list',
+        method: 'get',
+        params: params
+    })
 }
 
 export function createProductAttrCate(data) {
-  return request({
-    url:'/pms/PmsProductAttributeCategory/create',
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/mall/pms/PmsProductAttributeCategory/create',
+        method: 'post',
+        data: data
+    })
 }
 
 export function deleteProductAttrCate(id) {
-  return request({
-    url:'/pms/PmsProductAttributeCategory/delete/'+id,
-    method:'get'
-  })
+    return request({
+        url: '/mall/pms/PmsProductAttributeCategory/delete/' + id,
+        method: 'get'
+    })
 }
 
-export function updateProductAttrCate(id,data) {
-  return request({
-    url:'/pms/PmsProductAttributeCategory/update/'+id,
-    method:'post',
-    data:data
-  })
+export function updateProductAttrCate(id, data) {
+    return request({
+        url: '/mall/pms/PmsProductAttributeCategory/update/' + id,
+        method: 'post',
+        data: data
+    })
 }
 export function fetchListWithAttr() {
-  return request({
-    url:'/pms/PmsProductAttributeCategory/list/withAttr',
-    method:'get'
-  })
-}
+    return request({
+        url: '/mall/pms/PmsProductAttributeCategory/list/withAttr',
+        method: 'get'
+    })
+}
\ No newline at end of file
diff --git a/src/api/productCate.js b/src/api/productCate.js
index 9b82792..29c447f 100644
--- a/src/api/productCate.js
+++ b/src/api/productCate.js
@@ -1,76 +1,76 @@
 import request from '@/utils/request'
 
 export function fetchListAll(params) {
-  return request({
-    url:'/pms/PmsProductCategory/list',
-    method:'get',
-    params:params
-  })
+    return request({
+        url: '/mall/pms/PmsProductCategory/list',
+        method: 'get',
+        params: params
+    })
 }
-export function fetchList(parentId,params) {
-  return request({
-    url:'/pms/PmsProductCategory/list/'+parentId,
-    method:'get',
-    params:params
-  })
+export function fetchList(parentId, params) {
+    return request({
+        url: '/mall/pms/PmsProductCategory/list/' + parentId,
+        method: 'get',
+        params: params
+    })
 }
 export function deleteProductCate(id) {
-  return request({
-    url:'/pms/PmsProductCategory/delete/'+id,
-    method:'get'
-  })
+    return request({
+        url: '/mall/pms/PmsProductCategory/delete/' + id,
+        method: 'get'
+    })
 }
 
 export function createProductCate(data) {
-  return request({
-    url:'/pms/PmsProductCategory/create',
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/mall/pms/PmsProductCategory/create',
+        method: 'post',
+        data: data
+    })
 }
 
-export function updateProductCate(id,data) {
-  return request({
-    url:'/pms/PmsProductCategory/update/'+id,
-    method:'post',
-    data:data
-  })
+export function updateProductCate(id, data) {
+    return request({
+        url: '/mall/pms/PmsProductCategory/update/' + id,
+        method: 'post',
+        data: data
+    })
 }
 
 export function getProductCate(id) {
-  return request({
-    url:'/pms/PmsProductCategory/'+id,
-    method:'get',
-  })
+    return request({
+        url: '/mall/pms/PmsProductCategory/' + id,
+        method: 'get',
+    })
 }
 
 export function updateShowStatus(data) {
-  return request({
-    url:'/pms/PmsProductCategory/update/showStatus',
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/mall/pms/PmsProductCategory/update/showStatus',
+        method: 'post',
+        data: data
+    })
 }
 
 export function updateIndexStatus(data) {
-  return request({
-    url:'/pms/PmsProductCategory/update/indexStatus',
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/mall/pms/PmsProductCategory/update/indexStatus',
+        method: 'post',
+        data: data
+    })
 }
 
 export function updateNavStatus(data) {
-  return request({
-    url:'/pms/PmsProductCategory/update/navStatus',
-    method:'post',
-    data:data
-  })
+    return request({
+        url: '/mall/pms/PmsProductCategory/update/navStatus',
+        method: 'post',
+        data: data
+    })
 }
 
 export function fetchListWithChildren() {
-  return request({
-    url:'/pms/PmsProductCategory/list/withChildren',
-    method:'get'
-  })
-}
+    return request({
+        url: '/mall/pms/PmsProductCategory/list/withChildren',
+        method: 'get'
+    })
+}
\ No newline at end of file
diff --git a/src/api/user.js b/src/api/user.js
index 0f6bb26..c00c433 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -4,69 +4,105 @@ import qs from 'qs'
 
 // 登录
 export function doLogin(data) {
-  return request({
-    url: '/sysuser/doLogin',
-    method: 'post',
-    data: data,
-    headers: { 'Content-Type': 'application/json' }
-  })
+    return request({
+        url: '/mall/apiadmin/sysuser/login',
+        method: 'post',
+        data: data,
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
 }
-// 获取登录人员信息
- export function getUserById(sid) {
+
+// 注册发送验证码
+export function registerSendMessageCode(code) {
     return request({
-      url: '/cyf/sys/getUserById/' + sid
+        url: '/mall/apiadmin/sysuser/sendMessageCode/?mobile=' + code,
+        method: 'post',
+        headers: {
+            'Content-Type': 'application/json'
+        }
     })
-  
- } 
-// 登录
-export function login(data) {
-  return request({
-    url: '/portal/v1/sysuser/login',
-    method: 'post',
-    data: data,
-    headers: { 'Content-Type': 'application/json' }
-  })
+
 }
 
 // 用户注册
 export function registUser(data) {
-  return request({
-    url: '/system/user/save',
-    method: 'post',
-    data,
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded;' }
-  })
+    return request({
+        url: '/mall/apiadmin/sysuser/register',
+        method: 'post',
+        data: data,
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
+}
+
+
+// 绑定企业/组织
+export function bindOrganization(data) {
+    return request({
+        url: '/mall/apiadmin/sysuser/bindOrganization',
+        method: 'post',
+        data: data,
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
+}
+
+
+// 选择企业/组织sid
+export function selOrganization(data) {
+    return request({
+        url: '/mall/apiadmin/sysuser/selOrganization',
+        method: 'post',
+        data: data,
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    })
 }
 
+
+// 获取登录人员信息
+export function getUserById(sid) {
+    return request({
+        url: '/mall/cyf/sys/getUserById/' + sid
+    })
+
+}
+
+
 // 获取手机验证码
 export function getVerificationCode(data) {
-  return request({
-    url: '/system/user/getVerificationCode',
-    method: 'get',
-    params: data
-  })
+    return request({
+        url: '/mall/system/user/getVerificationCode',
+        method: 'get',
+        params: data
+    })
 }
 
 // 获取登录验证码
 export function imgCode() {
-  return request({
-    url: '/system/api/defaultBlendCode?temm=' + new Date().getTime(),
-    method: 'get'
-  })
+    return request({
+        url: '/mall/system/api/defaultBlendCode?temm=' + new Date().getTime(),
+        method: 'get'
+    })
 }
 
 // 获取用信息
 export function getInfo(token) {
-  return request({
-    url: '/system/user/loginDetails',
-    method: 'post'
-  })
+    return request({
+        url: '/mall/system/user/loginDetails',
+        method: 'post'
+    })
 }
 
 export function logout(data) { // 退出
-  return request({
-    url: '/portal/v1/sysuser/signOut',
-    method: 'post',
-    data: qs.stringify(data)
-  })
-}
+    return request({
+        url: '/mall/portal/v1/sysuser/signOut',
+        method: 'post',
+        data: qs.stringify(data)
+    })
+}
\ No newline at end of file
diff --git a/src/assets/home/bj.png b/src/assets/home/bj.png
index d8e3497..e6e6278 100644
Binary files a/src/assets/home/bj.png and b/src/assets/home/bj.png differ
diff --git a/src/assets/images/company_icon.png b/src/assets/images/company_icon.png
new file mode 100644
index 0000000..d655f49
Binary files /dev/null and b/src/assets/images/company_icon.png differ
diff --git a/src/assets/images/experience.png b/src/assets/images/experience.png
new file mode 100644
index 0000000..342fa74
Binary files /dev/null and b/src/assets/images/experience.png differ
diff --git a/src/assets/images/formal.png b/src/assets/images/formal.png
new file mode 100644
index 0000000..5e982a9
Binary files /dev/null and b/src/assets/images/formal.png differ
diff --git a/src/assets/images/overdue.png b/src/assets/images/overdue.png
new file mode 100644
index 0000000..1359a90
Binary files /dev/null and b/src/assets/images/overdue.png differ
diff --git a/src/assets/loginImg/login_left.png b/src/assets/loginImg/login_left.png
new file mode 100644
index 0000000..395d2c2
Binary files /dev/null and b/src/assets/loginImg/login_left.png differ
diff --git a/src/assets/loginImg/yxt-logo.png b/src/assets/loginImg/yxt-logo.png
new file mode 100644
index 0000000..ab4694a
Binary files /dev/null and b/src/assets/loginImg/yxt-logo.png differ
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index b5e6257..6f935c1 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,168 +1,179 @@
 <template>
-  <div>
-    <div class="navbar">
-     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>惠享管理平台</p>
-     <!-- <h3 class="breadcrumb-container">银行供应链贷后监管平台</h3> -->
-      <div class="right-menu">
-<!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
-       <!-- <p>欢迎您，{{name}}</p>
-        <p class="dy" @click="logout()"><img src="@/assets/images/dy.png"></p> -->
-      </div>
+    <div>
+        <div class="navbar">
+            <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png"
+                    style="width: 45px;height: 45px;margin-right: 10px;" />预订商城管理平台</p>
+            <!-- <h3 class="breadcrumb-container">银行供应链贷后监管平台</h3> -->
+            <div class="right-menu">
+                <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
+                <p>欢迎您：{{pNameAndDepartmentNameAndPostName}}- {{name}}</p>
+                <!-- <img src="@/assets/images/info.png"> -->
+                <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
+                <span class="backToHome" @click="logout"><i class="el-icon-back"></i>退出登录</span>
+            </div>
+        </div>
+        <el-footer class="footer" height="40px">Copyright © {{ year }} 预订商城管理平台 All Rights Reserved</el-footer>
     </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 惠享管理平台 All Rights Reserved</el-footer>
-  </div>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        name: '',
-        year:'',
-      }
-    },
-    mounted() {
-      this.name = window.sessionStorage.getItem('userName')
-      var nowDate = new Date()
-      this.year = nowDate.getFullYear()
-    },
-    methods: {
-      logout() {
-        this.$confirm('确定要退出吗, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-            // this.$store.commit('user/SET_UESRINFO', '')
-            this.$router.push({
-              path: '/login'
-            })
-          })
-      },
+    export default {
+        data() {
+            return {
+                Orgname: '',
+                departmentName: '',
+                name: '',
+                defaultRoleName: '',
+                year: '',
+                pNameAndDepartmentNameAndPostName: ''
+            }
+        },
+        mounted() {
+            this.Orgname = window.sessionStorage.getItem('orgName')
+            this.departmentName = window.sessionStorage.getItem('departmentName')
+            this.name = window.sessionStorage.getItem('name')
+            this.defaultRoleName = window.sessionStorage.getItem('defaultRoleName')
+            this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
+            var nowDate = new Date()
+            this.year = nowDate.getFullYear()
+        },
+        methods: {
+            logout() {
+                this.$confirm('确定要退出吗, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    // this.$store.commit('user/SET_UESRINFO', '')
+                    this.$router.push({
+                        path: '/login'
+                    })
+                })
+            },
+        }
     }
-  }
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/variables.scss";
-
-  .navbar {
-    height: 60px;
-    overflow: hidden;
-    position: relative;
-    background: $header-bg;
-    padding: 0 30px;
-    box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
-
-    .hamburger-container {
-      line-height: 46px;
-      height: 100%;
-      float: left;
-      cursor: pointer;
-      transition: background .3s;
-      -webkit-tap-highlight-color: transparent;
-
-      &:hover {
-        background: rgba(0, 0, 0, .025)
-      }
-    }
+    @import "~@/styles/variables.scss";
+
+    .navbar {
+        height: 60px;
+        overflow: hidden;
+        position: relative;
+        background: $header-bg;
+        padding: 0 30px;
+        box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
+
+        .hamburger-container {
+            line-height: 46px;
+            height: 100%;
+            float: left;
+            cursor: pointer;
+            transition: background .3s;
+            -webkit-tap-highlight-color: transparent;
 
-   .breadcrumb-container {
-     display: flex;
-     align-items: center;
-     color: #fff;
-     font-size: 26px;
-     line-height: 60px;
-     margin: 0;
-     float: left;
-   }
-
-    .right-menu {
-      float: right;
-      height: 100%;
-      line-height: 60px;
-      color: #fff;
-
-      &:focus {
-        outline: none;
-      }
-
-      p {
-        display: inline-block;
-        margin: 0;
-        padding: 0;
-        padding: 0 15px;
-      }
-
-      img {
-        vertical-align: middle;
-        margin: 0 10px;
-        cursor: pointer;
-      }
-
-      .backToHome {
-        display: inline-block;
-        vertical-align: middle;
-        padding: 0 15px;
-        cursor: pointer;
-      }
-
-      .backToHome:hover {
-        background: #087dba;
-      }
-
-      .right-menu-item {
-        display: inline-block;
-        padding: 0 8px;
-        height: 100%;
-        font-size: 18px;
-        color: #5a5e66;
-        vertical-align: text-bottom;
-
-        &.hover-effect {
-          cursor: pointer;
-          transition: background .3s;
-
-          &:hover {
-            background: rgba(0, 0, 0, .025)
-          }
+            &:hover {
+                background: rgba(0, 0, 0, .025)
+            }
         }
-      }
-
-      .avatar-container {
-        margin-right: 30px;
-
-        .avatar-wrapper {
-          margin-top: 5px;
-          position: relative;
 
-          .user-avatar {
-            cursor: pointer;
-            width: 40px;
-            height: 40px;
-            border-radius: 10px;
-          }
+        .breadcrumb-container {
+            display: flex;
+            align-items: center;
+            color: #fff;
+            font-size: 26px;
+            line-height: 60px;
+            margin: 0;
+            float: left;
+        }
 
-          .el-icon-caret-bottom {
-            cursor: pointer;
-            position: absolute;
-            right: -20px;
-            top: 25px;
-            font-size: 12px;
-          }
+        .right-menu {
+            float: right;
+            height: 100%;
+            line-height: 60px;
+            color: #fff;
+
+            &:focus {
+                outline: none;
+            }
+
+            p {
+                display: inline-block;
+                margin: 0;
+                padding: 0;
+                padding: 0 15px;
+            }
+
+            img {
+                vertical-align: middle;
+                margin: 0 10px;
+                cursor: pointer;
+            }
+
+            .backToHome {
+                display: inline-block;
+                vertical-align: middle;
+                padding: 0 15px;
+                cursor: pointer;
+            }
+
+            .backToHome:hover {
+                background: #087dba;
+            }
+
+            .right-menu-item {
+                display: inline-block;
+                padding: 0 8px;
+                height: 100%;
+                font-size: 18px;
+                color: #5a5e66;
+                vertical-align: text-bottom;
+
+                &.hover-effect {
+                    cursor: pointer;
+                    transition: background .3s;
+
+                    &:hover {
+                        background: rgba(0, 0, 0, .025)
+                    }
+                }
+            }
+
+            .avatar-container {
+                margin-right: 30px;
+
+                .avatar-wrapper {
+                    margin-top: 5px;
+                    position: relative;
+
+                    .user-avatar {
+                        cursor: pointer;
+                        width: 40px;
+                        height: 40px;
+                        border-radius: 10px;
+                    }
+
+                    .el-icon-caret-bottom {
+                        cursor: pointer;
+                        position: absolute;
+                        right: -20px;
+                        top: 25px;
+                        font-size: 12px;
+                    }
+                }
+            }
         }
-      }
     }
-  }
-
-  .footer {
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-    line-height: 40px;
-    background: #E9F1F7;
-    text-align: center;
-    font-size: 14px;
-    color: #666;
-  }
-</style>
+
+    .footer {
+        position: fixed;
+        bottom: 0;
+        width: 100%;
+        line-height: 40px;
+        background: #E9F1F7;
+        text-align: center;
+        font-size: 14px;
+        color: #666;
+    }
+</style>
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 82adddb..2eca12b 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,583 +1,579 @@
 <template>
-  <div :class="{ 'has-logo': showLogo }">
-    <logo v-if="showLogo" :collapse="isCollapse" />
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-menu
-        :default-active="$route.path"
-        :background-color="variables.menuBg"
-        :text-color="variables.menuText"
-        :unique-opened="false"
-        :active-text-color="variables.menuActiveText"
-        :collapse-transition="false"
-        mode="vertical"
-      >
-        <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path" />
-      </el-menu>
-    </el-scrollbar>
-  </div>
+    <div :class="{ 'has-logo': showLogo }">
+        <logo v-if="showLogo" :collapse="isCollapse" />
+        <el-scrollbar wrap-class="scrollbar-wrapper">
+            <el-menu :default-active="$route.path" :background-color="variables.menuBg" :text-color="variables.menuText"
+                :unique-opened="false" :active-text-color="variables.menuActiveText" :collapse-transition="false"
+                mode="vertical">
+                <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path" />
+            </el-menu>
+        </el-scrollbar>
+    </div>
 </template>
 
 <script>
-  import {
-    mapGetters
-  } from 'vuex'
-  import Logo from './Logo'
-  import SidebarItem from './SidebarItem'
-  import variables from '@/styles/variables.scss'
-  import {
-    getrolemenus,
-    loginDetails
-  } from '@/api/system/Role/role.js'
-  import {
-    getStorage
-  } from '@/utils/auth'
-  export default {
-    components: {
-      SidebarItem,
-      Logo
-    },
-    data() {
-      return {
-        YongHuid: [],
-        // routes: [],
-        params: {
-          sourceSid: '',
-          userSid: ''
+    import {
+        mapGetters
+    } from 'vuex'
+    import Logo from './Logo'
+    import SidebarItem from './SidebarItem'
+    import variables from '@/styles/variables.scss'
+    import {
+        getrolemenus,
+        loginDetails
+    } from '@/api/system/Role/role.js'
+    import {
+        getStorage
+    } from '@/utils/auth'
+    export default {
+        components: {
+            SidebarItem,
+            Logo
         },
-        routes: [{
-            alwaysShow: true,
-            component: 'userInfo',
-            meta: {
-              icon: 'el-icon-menu',
-              title: '用户信息'
-            },
-            name: '/userInfo/index',
-            path: '/userInfo/index'
-          }, {
-            alwaysShow: true,
-            component: 'pms',
-            meta: {
-              icon: 'el-icon-menu',
-              title: '商品管理'
-            },
-            name: '/pms',
-            path: '/pms',
-            children: [
-              //            {
-              //              alwaysShow: true,
-              //              component: 'product',
-              //              meta: {
-              //                icon: 'el-icon-help',
-              //                title: '商品列表'
-              //              },
-              //              name: '/pms/product',
-              //              path: '/pms/product'
-              //            },
-              // {
-              // 	path: '/pms/addProduct',
-              // 	name: '/pms/addProduct',
-              //              component: 'addProduct',
-              // 	meta: {
-              // 		title: '添加商品',
-              // 		icon: 'el-icon-help'
-              // 	}
-              // },
-              {
-                alwaysShow: true,
-                component: 'brand',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '品牌管理'
-                },
-                name: '/pms/brand',
-                path: '/pms/brand'
-              }, {
-                alwaysShow: true,
-                component: 'productCate',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '商品分类'
-                },
-                name: '/pms/productCate',
-                path: '/pms/productCate'
-              }
-              // , {
-              //   alwaysShow: true,
-              //   component: 'productAttr',
-              //   meta: {
-              //     icon: 'el-icon-help',
-              //     title: '商品类型'
-              //   },
-              //   name: '/pms/productAttr',
-              //   path: '/pms/productAttr'
-              // }
-            ]
-          },
-          {
-            alwaysShow: true,
-            component: 'marketingCard',
-            meta: {
-              icon: 'el-icon-menu',
-              title: '营销卡设置'
-            },
-            name: '/marketingCard',
-            path: '/marketingCard',
-            children: [{
-                alwaysShow: true,
-                component: 'index',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '小程序礼包设置'
+        data() {
+            return {
+                YongHuid: [],
+                // routes: [],
+                params: {
+                    sourceSid: '',
+                    userSid: ''
                 },
-                name: '/marketingCard/applet',
-                path: '/marketingCard/applet'
-              },
-              {
-                alwaysShow: true,
-                component: 'index',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '新人推荐礼包设置'
-                },
-                name: '/marketingCard/newUserGift',
-                path: '/marketingCard/newUserGift'
-              },
-              {
-                alwaysShow: true,
-                component: 'index',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '礼包设置'
-                },
-                name: '/marketingCard/index',
-                path: '/marketingCard/index'
-              },
+                routes: [
+                    //   {
+                    //   alwaysShow: true,
+                    //   component: 'userInfo',
+                    //   meta: {
+                    //     icon: 'el-icon-menu',
+                    //     title: '用户信息'
+                    //   },
+                    //   name: '/userInfo/index',
+                    //   path: '/userInfo/index'
+                    // },
+                    {
+                        alwaysShow: true,
+                        component: 'pms',
+                        meta: {
+                            icon: 'el-icon-menu',
+                            title: '商品管理'
+                        },
+                        name: '/pms',
+                        path: '/pms',
+                        children: [
+                            //            {
+                            //              alwaysShow: true,
+                            //              component: 'product',
+                            //              meta: {
+                            //                icon: 'el-icon-help',
+                            //                title: '商品列表'
+                            //              },
+                            //              name: '/pms/product',
+                            //              path: '/pms/product'
+                            //            },
+                            // {
+                            // 	path: '/pms/addProduct',
+                            // 	name: '/pms/addProduct',
+                            //              component: 'addProduct',
+                            // 	meta: {
+                            // 		title: '添加商品',
+                            // 		icon: 'el-icon-help'
+                            // 	}
+                            // },
+                            {
+                                alwaysShow: true,
+                                component: 'brand',
+                                meta: {
+                                    icon: 'el-icon-help',
+                                    title: '品牌管理'
+                                },
+                                name: '/pms/brand',
+                                path: '/pms/brand'
+                            }, {
+                                alwaysShow: true,
+                                component: 'productCate',
+                                meta: {
+                                    icon: 'el-icon-help',
+                                    title: '商品分类'
+                                },
+                                name: '/pms/productCate',
+                                path: '/pms/productCate'
+                            }
+                            // , {
+                            //   alwaysShow: true,
+                            //   component: 'productAttr',
+                            //   meta: {
+                            //     icon: 'el-icon-help',
+                            //     title: '商品类型'
+                            //   },
+                            //   name: '/pms/productAttr',
+                            //   path: '/pms/productAttr'
+                            // }
+                        ]
+                    },
+                    // {
+                    //     alwaysShow: true,
+                    //     component: 'marketingCard',
+                    //     meta: {
+                    //         icon: 'el-icon-menu',
+                    //         title: '营销卡设置'
+                    //     },
+                    //     name: '/marketingCard',
+                    //     path: '/marketingCard',
+                    //     children: [{
+                    //             alwaysShow: true,
+                    //             component: 'index',
+                    //             meta: {
+                    //                 icon: 'el-icon-help',
+                    //                 title: '小程序礼包设置'
+                    //             },
+                    //             name: '/marketingCard/applet',
+                    //             path: '/marketingCard/applet'
+                    //         },
+                    //         {
+                    //             alwaysShow: true,
+                    //             component: 'index',
+                    //             meta: {
+                    //                 icon: 'el-icon-help',
+                    //                 title: '新人推荐礼包设置'
+                    //             },
+                    //             name: '/marketingCard/newUserGift',
+                    //             path: '/marketingCard/newUserGift'
+                    //         },
+                    //         {
+                    //             alwaysShow: true,
+                    //             component: 'index',
+                    //             meta: {
+                    //                 icon: 'el-icon-help',
+                    //                 title: '礼包设置'
+                    //             },
+                    //             name: '/marketingCard/index',
+                    //             path: '/marketingCard/index'
+                    //         },
 
-              {
-                alwaysShow: true,
-                component: 'pickupCardSet',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '个人卡设置'
-                },
-                name: '/marketingCard/pickupCardSet',
-                path: '/marketingCard/pickupCardSet'
-              },
-              {
-                alwaysShow: true,
-                component: 'corporateCardSet',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '企业卡设置'
-                },
-                name: '/marketingCard/corporateCardSet',
-                path: '/marketingCard/corporateCardSet'
-              }
-              // {
-              // 	alwaysShow: true,
-              // 	component: "grantRecords",
-              // 	meta: {
-              // 		icon: "el-icon-help",
-              // 		title: "发放记录",
-              // 	},
-              // 	name: "/marketingCard/grantRecords",
-              // 	path: "/marketingCard/grantRecords",
-              // },
-              // {
-              // 	alwaysShow: true,
-              // 	component: "carList",
-              // 	meta: {
-              // 		icon: "el-icon-help",
-              // 		title: "提货卡列表",
-              // 	},
-              // 	name: "/marketingCard/carList",
-              // 	path: "/marketingCard/carList",
-              // },
-            ]
-          },
-          {
-            alwaysShow: true,
-            component: 'carManage',
-            meta: {
-              icon: 'el-icon-menu',
-              title: '营销卡管理'
-            },
-            name: '/cardManage',
-            path: '/cardManage',
-            children: [
+                    //         {
+                    //             alwaysShow: true,
+                    //             component: 'pickupCardSet',
+                    //             meta: {
+                    //                 icon: 'el-icon-help',
+                    //                 title: '个人卡设置'
+                    //             },
+                    //             name: '/marketingCard/pickupCardSet',
+                    //             path: '/marketingCard/pickupCardSet'
+                    //         },
+                    //         {
+                    //             alwaysShow: true,
+                    //             component: 'corporateCardSet',
+                    //             meta: {
+                    //                 icon: 'el-icon-help',
+                    //                 title: '企业卡设置'
+                    //             },
+                    //             name: '/marketingCard/corporateCardSet',
+                    //             path: '/marketingCard/corporateCardSet'
+                    //         }
+                    //         // {
+                    //         // 	alwaysShow: true,
+                    //         // 	component: "grantRecords",
+                    //         // 	meta: {
+                    //         // 		icon: "el-icon-help",
+                    //         // 		title: "发放记录",
+                    //         // 	},
+                    //         // 	name: "/marketingCard/grantRecords",
+                    //         // 	path: "/marketingCard/grantRecords",
+                    //         // },
+                    //         // {
+                    //         // 	alwaysShow: true,
+                    //         // 	component: "carList",
+                    //         // 	meta: {
+                    //         // 		icon: "el-icon-help",
+                    //         // 		title: "提货卡列表",
+                    //         // 	},
+                    //         // 	name: "/marketingCard/carList",
+                    //         // 	path: "/marketingCard/carList",
+                    //         // },
+                    //     ]
+                    // },
+                    // {
+                    //     alwaysShow: true,
+                    //     component: 'carManage',
+                    //     meta: {
+                    //         icon: 'el-icon-menu',
+                    //         title: '营销卡管理'
+                    //     },
+                    //     name: '/cardManage',
+                    //     path: '/cardManage',
+                    //     children: [
 
-              {
-                alwaysShow: true,
-                component: 'person',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '个人卡统计'
-                },
-                name: '/cardManage/person',
-                path: '/cardManage/person'
-              },
+                    //         {
+                    //             alwaysShow: true,
+                    //             component: 'person',
+                    //             meta: {
+                    //                 icon: 'el-icon-help',
+                    //                 title: '个人卡统计'
+                    //             },
+                    //             name: '/cardManage/person',
+                    //             path: '/cardManage/person'
+                    //         },
 
-              {
-                alwaysShow: true,
-                component: 'enterprise',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '企业卡统计'
-                },
-                name: '/cardManage/enterprise',
-                path: '/cardManage/enterprise'
-              }, {
-                alwaysShow: true,
-                component: 'giftCard',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '福利卡统计'
-                },
-                name: '/cardManage/giftCard',
-                path: '/cardManage/giftCard'
-              }
-            ]
-          },
-          {
-            alwaysShow: true,
-            component: 'pickupPoint',
-            meta: {
-              icon: 'el-icon-menu',
-              title: '提货地点'
-            },
-            name: '/pickupPoint/index',
-            path: '/pickupPoint/index'
-          },
-          {
-            alwaysShow: true,
-            component: 'coupon',
-            meta: {
-              icon: 'el-icon-menu',
-              title: '优惠券管理'
-            },
-            name: '/coupon/index',
-            path: '/coupon/index'
-          },
-          {
-            alwaysShow: true,
-            component: 'network',
-            meta: {
-              icon: 'el-icon-menu',
-              title: '支行管理'
-            },
-            name: '/network/index',
-            path: '/network/index'
-          },
-          {
-            alwaysShow: true,
-            component: 'commodity',
-            meta: {
-              icon: 'el-icon-menu',
-              title: '商品信息'
-            },
-            name: '/commodity/index',
-            path: '/commodity/index'
-          },
+                    //         {
+                    //             alwaysShow: true,
+                    //             component: 'enterprise',
+                    //             meta: {
+                    //                 icon: 'el-icon-help',
+                    //                 title: '企业卡统计'
+                    //             },
+                    //             name: '/cardManage/enterprise',
+                    //             path: '/cardManage/enterprise'
+                    //         }, {
+                    //             alwaysShow: true,
+                    //             component: 'giftCard',
+                    //             meta: {
+                    //                 icon: 'el-icon-help',
+                    //                 title: '福利卡统计'
+                    //             },
+                    //             name: '/cardManage/giftCard',
+                    //             path: '/cardManage/giftCard'
+                    //         }
+                    //     ]
+                    // },
+                    {
+                        alwaysShow: true,
+                        component: 'pickupPoint',
+                        meta: {
+                            icon: 'el-icon-menu',
+                            title: '提货地点'
+                        },
+                        name: '/pickupPoint/index',
+                        path: '/pickupPoint/index'
+                    },
+                    // {
+                    //     alwaysShow: true,
+                    //     component: 'coupon',
+                    //     meta: {
+                    //         icon: 'el-icon-menu',
+                    //         title: '优惠券管理'
+                    //     },
+                    //     name: '/coupon/index',
+                    //     path: '/coupon/index'
+                    // },
+                    // {
+                    //     alwaysShow: true,
+                    //     component: 'network',
+                    //     meta: {
+                    //         icon: 'el-icon-menu',
+                    //         title: '支行管理'
+                    //     },
+                    //     name: '/network/index',
+                    //     path: '/network/index'
+                    // },
+                    {
+                        alwaysShow: true,
+                        component: 'commodity',
+                        meta: {
+                            icon: 'el-icon-menu',
+                            title: '商品信息'
+                        },
+                        name: '/commodity/index',
+                        path: '/commodity/index'
+                    },
 
-          // {
-          // 	alwaysShow: true,
-          // 	component: 'order',
-          // 	meta: {
-          // 		icon: 'el-icon-menu',
-          // 		title: '订单管理'
-          // 	},
-          // 	name: '/order',
-          // 	path: '/order',
-          // 	children: [{
-          // 			alwaysShow: true,
-          // 			component: 'index',
-          // 			meta: {
-          // 				icon: 'el-icon-help',
-          // 				title: '订单统计'
-          // 			},
-          // 			name: '/order/index',
-          // 			path: '/order/index'
-          // 		},
-          // 		{
-          // 			alwaysShow: true,
-          // 			component: 'distributionCount',
-          // 			meta: {
-          // 				icon: 'el-icon-help',
-          // 				title: '网点配货统计'
-          // 			},
-          // 			name: '/order/distributionCount',
-          // 			path: '/order/distributionCount'
-          // 		},
-          // 		{
-          // 			alwaysShow: true,
-          // 			component: 'subBranch',
-          // 			meta: {
-          // 				icon: 'el-icon-help',
-          // 				title: '支行配货统计'
-          // 			},
-          // 			name: '/order/subBranch',
-          // 			path: '/order/subBranch'
-          // 		},
-          // 		{
-          // 			alwaysShow: true,
-          // 			component: 'allDistributionCount',
-          // 			meta: {
-          // 				icon: 'el-icon-help',
-          // 				title: '总配货统计'
-          // 			},
-          // 			name: '/order/allDistributionCount',
-          // 			path: '/order/allDistributionCount'
-          // 		}
+                    // {
+                    // 	alwaysShow: true,
+                    // 	component: 'order',
+                    // 	meta: {
+                    // 		icon: 'el-icon-menu',
+                    // 		title: '订单管理'
+                    // 	},
+                    // 	name: '/order',
+                    // 	path: '/order',
+                    // 	children: [{
+                    // 			alwaysShow: true,
+                    // 			component: 'index',
+                    // 			meta: {
+                    // 				icon: 'el-icon-help',
+                    // 				title: '订单统计'
+                    // 			},
+                    // 			name: '/order/index',
+                    // 			path: '/order/index'
+                    // 		},
+                    // 		{
+                    // 			alwaysShow: true,
+                    // 			component: 'distributionCount',
+                    // 			meta: {
+                    // 				icon: 'el-icon-help',
+                    // 				title: '网点配货统计'
+                    // 			},
+                    // 			name: '/order/distributionCount',
+                    // 			path: '/order/distributionCount'
+                    // 		},
+                    // 		{
+                    // 			alwaysShow: true,
+                    // 			component: 'subBranch',
+                    // 			meta: {
+                    // 				icon: 'el-icon-help',
+                    // 				title: '支行配货统计'
+                    // 			},
+                    // 			name: '/order/subBranch',
+                    // 			path: '/order/subBranch'
+                    // 		},
+                    // 		{
+                    // 			alwaysShow: true,
+                    // 			component: 'allDistributionCount',
+                    // 			meta: {
+                    // 				icon: 'el-icon-help',
+                    // 				title: '总配货统计'
+                    // 			},
+                    // 			name: '/order/allDistributionCount',
+                    // 			path: '/order/allDistributionCount'
+                    // 		}
 
-          // 	]
-          // },
+                    // 	]
+                    // },
 
-          {
-            alwaysShow: true,
-            component: 'orderreserve',
-            meta: {
-              icon: 'el-icon-menu',
-              title: '预约提货单'
-            },
-            name: '/orderreserve',
-            path: '/orderreserve',
-            children: [{
-                alwaysShow: true,
-                component: 'index',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '预约单统计'
-                },
-                name: '/orderreserve/index',
-                path: '/orderreserve/index'
-              },
-              {
-                alwaysShow: true,
-                component: 'distributionCount',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '网点配货统计'
-                },
-                name: '/orderreserve/distributionCount',
-                path: '/orderreserve/distributionCount'
-              },
-              {
-                alwaysShow: true,
-                component: 'subBranch',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '支行配货统计'
-                },
-                name: '/orderreserve/subBranch',
-                path: '/orderreserve/subBranch'
-              },
-              {
-                alwaysShow: true,
-                component: 'allDistributionCount',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '总配货统计'
-                },
-                name: '/orderreserve/allDistributionCount',
-                path: '/orderreserve/allDistributionCount'
-              }
+                    {
+                        alwaysShow: true,
+                        component: 'orderreserve',
+                        meta: {
+                            icon: 'el-icon-menu',
+                            title: '预约提货单'
+                        },
+                        name: '/orderreserve',
+                        path: '/orderreserve',
+                        children: [{
+                                alwaysShow: true,
+                                component: 'index',
+                                meta: {
+                                    icon: 'el-icon-help',
+                                    title: '预约单统计'
+                                },
+                                name: '/orderreserve/index',
+                                path: '/orderreserve/index'
+                            },
+                            {
+                                alwaysShow: true,
+                                component: 'distributionCount',
+                                meta: {
+                                    icon: 'el-icon-help',
+                                    title: '网点配货统计'
+                                },
+                                name: '/orderreserve/distributionCount',
+                                path: '/orderreserve/distributionCount'
+                            },
+                            {
+                                alwaysShow: true,
+                                component: 'subBranch',
+                                meta: {
+                                    icon: 'el-icon-help',
+                                    title: '支行配货统计'
+                                },
+                                name: '/orderreserve/subBranch',
+                                path: '/orderreserve/subBranch'
+                            },
+                            {
+                                alwaysShow: true,
+                                component: 'allDistributionCount',
+                                meta: {
+                                    icon: 'el-icon-help',
+                                    title: '总配货统计'
+                                },
+                                name: '/orderreserve/allDistributionCount',
+                                path: '/orderreserve/allDistributionCount'
+                            }
 
-            ]
-          },
+                        ]
+                    },
 
-          // {
-          // 	alwaysShow: true,
-          // 	component: "order",
-          // 	meta: {
-          // 		icon: "el-icon-menu",
-          // 		title: "订单信息",
-          // 	},
-          // 	name: "/order/index",
-          // 	path: "/order/index"
-          // },
+                    // {
+                    // 	alwaysShow: true,
+                    // 	component: "order",
+                    // 	meta: {
+                    // 		icon: "el-icon-menu",
+                    // 		title: "订单信息",
+                    // 	},
+                    // 	name: "/order/index",
+                    // 	path: "/order/index"
+                    // },
 
-          {
-            alwaysShow: true,
-            component: 'print',
-            meta: {
-              icon: 'el-icon-menu',
-              title: '电子卡管理'
-            },
-            name: '/print',
-            path: '/print',
-            children: [{
-                alwaysShow: true,
-                component: 'index',
-                meta: {
-                  icon: 'el-icon-help',
-                  title: '打印电子卡'
-                },
-                name: '/print/index',
-                path: '/print/index'
-              },
-              {
-                alwaysShow: true,
-                component: 'print',
-                meta: {
-                  icon: 'el-icon-menu',
-                  title: '打印企业卡'
-                },
-                name: '/print/enterpriseCrad',
-                path: '/print/enterpriseCrad'
-              }
+                    // {
+                    //     alwaysShow: true,
+                    //     component: 'print',
+                    //     meta: {
+                    //         icon: 'el-icon-menu',
+                    //         title: '电子卡管理'
+                    //     },
+                    //     name: '/print',
+                    //     path: '/print',
+                    //     children: [{
+                    //             alwaysShow: true,
+                    //             component: 'index',
+                    //             meta: {
+                    //                 icon: 'el-icon-help',
+                    //                 title: '打印电子卡'
+                    //             },
+                    //             name: '/print/index',
+                    //             path: '/print/index'
+                    //         },
+                    //         {
+                    //             alwaysShow: true,
+                    //             component: 'print',
+                    //             meta: {
+                    //                 icon: 'el-icon-menu',
+                    //                 title: '打印企业卡'
+                    //             },
+                    //             name: '/print/enterpriseCrad',
+                    //             path: '/print/enterpriseCrad'
+                    //         }
 
-            ]
-          },
-          {
-            alwaysShow: true,
-            component: 'applet',
-            meta: {
-              icon: 'el-icon-menu',
-              title: '小程序设置'
-            },
-            name: '/applet',
-            path: '/applet',
-            children: [{
-                alwaysShow: true,
-                component: 'appletNotice',
-                meta: {
-                  icon: 'el-icon-menu',
-                  title: '小程序通告'
-                },
-                name: '/appletNotice/index',
-                path: '/appletNotice/index'
-              }, {
-                alwaysShow: true,
-                component: 'appletBanner',
-                meta: {
-                  icon: 'el-icon-menu',
-                  title: '小程序轮播图'
-                },
-                name: '/appletBanner/index',
-                path: '/appletBanner/index'
-              }, {
-                alwaysShow: true,
-                component: 'appletBanner',
-                meta: {
-                  icon: 'el-icon-menu',
-                  title: '企业认证审核'
-                },
-                name: '/authentication/index',
-                path: '/authentication/index'
-              },
-			  {
-			    alwaysShow: true,
-			    component: 'appletBanner',
-			    meta: {
-			      icon: 'el-icon-menu',
-			      title: '发票申请审核'
-			    },
-			    name: '/invoiceReview/index',
-			    path: '/invoiceReview/index'
-			  },
-			  // {
-     //            alwaysShow: true,
-     //            component: 'OrdertoolsIndex',
-     //            meta: {
-     //              icon: 'el-icon-menu',
-     //              title: '订单发货导出工具'
-     //            },
-     //            name: '/ordertools/index',
-     //            path: '/ordertools/index'
-     //          }
+                    //     ]
+                    // },
+                    {
+                        alwaysShow: true,
+                        component: 'applet',
+                        meta: {
+                            icon: 'el-icon-menu',
+                            title: '小程序设置'
+                        },
+                        name: '/applet',
+                        path: '/applet',
+                        children: [{
+                                alwaysShow: true,
+                                component: 'appletNotice',
+                                meta: {
+                                    icon: 'el-icon-menu',
+                                    title: '小程序通告'
+                                },
+                                name: '/appletNotice/index',
+                                path: '/appletNotice/index'
+                            }, {
+                                alwaysShow: true,
+                                component: 'appletBanner',
+                                meta: {
+                                    icon: 'el-icon-menu',
+                                    title: '小程序轮播图'
+                                },
+                                name: '/appletBanner/index',
+                                path: '/appletBanner/index'
+                            },
+                            {
+                                alwaysShow: true,
+                                component: 'appletBanner',
+                                meta: {
+                                    icon: 'el-icon-menu',
+                                    title: '企业认证审核'
+                                },
+                                name: '/authentication/index',
+                                path: '/authentication/index'
+                            },
+                            {
+                                alwaysShow: true,
+                                component: 'appletBanner',
+                                meta: {
+                                    icon: 'el-icon-menu',
+                                    title: '发票申请审核'
+                                },
+                                name: '/invoiceReview/index',
+                                path: '/invoiceReview/index'
+                            },
+                            // {
+                            //            alwaysShow: true,
+                            //            component: 'OrdertoolsIndex',
+                            //            meta: {
+                            //              icon: 'el-icon-menu',
+                            //              title: '订单发货导出工具'
+                            //            },
+                            //            name: '/ordertools/index',
+                            //            path: '/ordertools/index'
+                            //          }
 
-            ]
-          }
+                        ]
+                    }
 
-        ]
-      }
-    },
-    computed: {
-      ...mapGetters(['sidebar']),
-      // routes() {
-      // f4d2e507-c4ed-451c-b364-04c08f962045
-      //   console.log('78979789', this.$router.options.routes)
-      //   return this.$router.options.routes
-      // },
-      activeMenu() {
-        // const route = this.$route
-        // const {
-        //   meta,
-        //   path
-        // } = route
-        // // if set path, the sidebar will highlight the path you set
-        // if (meta.activeMenu) {
-        //   return meta.activeMenu
-        // }
-        return '/index'
-      },
-      showLogo() {
-        return this.$store.state.settings.sidebarLogo
-      },
-      variables() {
-        return variables
-      },
-      isCollapse() {
-        return !this.sidebar.opened
-      }
-    },
-    created() {
-      this.postHuoquyonghu()
-    },
-    methods: {
-      // 获取用户信息
-      postHuoquyonghu() {
-        // var token = getStorage()
-        // loginDetails(token).then((response) => {
-        //   console.log('resss', response)
-        //   if (response.code === '200') {
-        //     this.YongHuid = response.data
-        //     this.params.userSid = this.YongHuid.sid
-        //     getrolemenus(this.params).then((res) => {
-        //       const userRoles = this.resRouter(res.data)
-        this.routes.push({
-          path: '*',
-          redirect: '/404',
-          hidden: true
-        })
-        console.log('左侧菜单', this.routes)
-        return this.routes
-        //     })
-        //   }
-        // })
-      },
-      resRouter(menus) {
-        // 递归，将后台传来数组
-        for (var i = 0; i < menus.length; i++) {
-          if (menus[i].children && menus[i].children.length != 0) {
-            this.resRouter(menus[i].children)
-          }
-          if (menus[i].children.length == 0) {
-            delete menus[i].children
-            delete menus[i].redirect
-          }
-          if (menus[i].component == '') {
-            console.log('55555', menus[i])
-            menus[i] = {
-              path: menus[i].path,
-              component: '',
-              redirect: menus[i].path,
-              children: [menus[i]]
+                ]
+            }
+        },
+        computed: {
+            ...mapGetters(['sidebar']),
+            // routes() {
+            // f4d2e507-c4ed-451c-b364-04c08f962045
+            //   console.log('78979789', this.$router.options.routes)
+            //   return this.$router.options.routes
+            // },
+            activeMenu() {
+                // const route = this.$route
+                // const {
+                //   meta,
+                //   path
+                // } = route
+                // // if set path, the sidebar will highlight the path you set
+                // if (meta.activeMenu) {
+                //   return meta.activeMenu
+                // }
+                return '/index'
+            },
+            showLogo() {
+                return this.$store.state.settings.sidebarLogo
+            },
+            variables() {
+                return variables
+            },
+            isCollapse() {
+                return !this.sidebar.opened
+            }
+        },
+        created() {
+            this.postHuoquyonghu()
+        },
+        methods: {
+            // 获取用户信息
+            postHuoquyonghu() {
+                // var token = getStorage()
+                // loginDetails(token).then((response) => {
+                //   console.log('resss', response)
+                //   if (response.code === '200') {
+                //     this.YongHuid = response.data
+                //     this.params.userSid = this.YongHuid.sid
+                //     getrolemenus(this.params).then((res) => {
+                //       const userRoles = this.resRouter(res.data)
+                this.routes.push({
+                    path: '*',
+                    redirect: '/404',
+                    hidden: true
+                })
+                console.log('左侧菜单', this.routes)
+                return this.routes
+                //     })
+                //   }
+                // })
+            },
+            resRouter(menus) {
+                // 递归，将后台传来数组
+                for (var i = 0; i < menus.length; i++) {
+                    if (menus[i].children && menus[i].children.length != 0) {
+                        this.resRouter(menus[i].children)
+                    }
+                    if (menus[i].children.length == 0) {
+                        delete menus[i].children
+                        delete menus[i].redirect
+                    }
+                    if (menus[i].component == '') {
+                        console.log('55555', menus[i])
+                        menus[i] = {
+                            path: menus[i].path,
+                            component: '',
+                            redirect: menus[i].path,
+                            children: [menus[i]]
+                        }
+                    } else {
+                        // menus[i] = {
+                        //   path: menus[i].path,
+                        //   component: '',
+                        //   redirect: menus[i].path,
+                        //   children: [menus[i]],
+                        // }
+                    }
+                }
+                this.routes = menus
+                console.log('左侧菜单', this.routes)
+                return menus
             }
-          } else {
-            // menus[i] = {
-            //   path: menus[i].path,
-            //   component: '',
-            //   redirect: menus[i].path,
-            //   children: [menus[i]],
-            // }
-          }
         }
-        this.routes = menus
-        console.log('左侧菜单', this.routes)
-        return menus
-      }
     }
-  }
-</script>
-
+</script>
\ No newline at end of file
diff --git a/src/settings.js b/src/settings.js
index 03a773e..6f2defb 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,16 +1,16 @@
 module.exports = {
 
-  title: '惠享',
+    title: '预订商城',
 
-  /**
-   * @type {boolean} true | false
-   * @description Whether fix the header
-   */
-  fixedHeader: false,
+    /**
+     * @type {boolean} true | false
+     * @description Whether fix the header
+     */
+    fixedHeader: false,
 
-  /**
-   * @type {boolean} true | false
-   * @description Whether show the logo in sidebar
-   */
-  sidebarLogo: false
-}
+    /**
+     * @type {boolean} true | false
+     * @description Whether show the logo in sidebar
+     */
+    sidebarLogo: false
+}
\ No newline at end of file
diff --git a/src/utils/functions.js.js b/src/utils/functions.js.js
new file mode 100644
index 0000000..d236494
--- /dev/null
+++ b/src/utils/functions.js.js
@@ -0,0 +1,34 @@
+// 封装Cookie
+//   封装三个函数
+//   setCookie()  -- 创建 Cookie
+//   getCookie()  -- 获取 Cookie
+//   removeCookie() -- 删除 Cookie
+export function setCookie(name, value, iDay) { //分别代表cookie名称、cookie值、存储时间
+  //首先将cookie的格式拼出来
+  //document.cookie="name=value;expires=date";
+  //然后name就换为name,vlaue就换为value，至于date就要算出这个日期对象
+  var oDate = new Date();
+  oDate.setDate(oDate.getDate() + iDay);
+  document.cookie = name + "=" + value + "; expires=" + oDate;
+}
+//a=12; b=5; c=8; d=99
+export function getCookie(name) {
+  //1、先给cookie做一下字符串分割，
+  var arr = document.cookie.split("; "); //分割后变为数组，a=12 b=5 c=8 d=99
+  //2、循环数组
+  for (var i = 0; i < arr.length; i++) {
+    var arr2 = arr[i].split("="); //根据“=”再次分割
+    //arr2[0]——》存储的名称 abcd
+    //arr2[1]——》存储的值 12 5 8 99
+    if (arr2[0] == name) { //代表找到我想要的东西了
+      return arr2[1];
+    }
+  }
+  //另一种可能，用户第一次来网站，还没有cookie，所以肯定什么也找不到。所以在循环一次后就直接return 一个字符串，告诉用户什么也没找到。
+  return "";
+}
+
+export function removeCookie(name) {
+  //name名称，再随便来个值1，后面的才是重点-1，时间过期了，所以就成为了负值
+  setCookie(name, 1, -1);
+}
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 44e6839..5422004 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -1,279 +1,861 @@
 <template>
-  <div class="login">
-    <div class="logoTitle" style="margin-left: 50px;margin-top: 50px;">
-     <!-- <img src="../../assets/loginImg/shgf.png"
-        style="width: 50px;height: 50px; margin-right: 10px;" /><span>惠享</span>
-      <p class="title" style="margin-top: 5px;">惠享管理平台</p> -->
-    </div>
-    <div class="main">
-      <div class="content">
-        <el-form ref="loginForm" :model="loginForm" class="login-form">
-          <h3 class="title1">用户登录</h3>
-          <el-form-item>
-            <el-input v-model="loginForm.userName" autocomplete="off" placeholder="请输入账号" prefix-icon="el-icon-user">
-            </el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-input v-model="loginForm.password" autocomplete="off" placeholder="请输入密码" prefix-icon="el-icon-lock"
-              show-password>
-            </el-input>
-            <!-- <span class="nopsw register" @click="forgetPwd = true">忘记密码 ？</span> -->
-          </el-form-item>
-          <el-form-item v-show="showMsg" style="margin-bottom:0;">
-            <span class="text-danger">提示：用户名或密码错误，请重试！</span>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" class="login-btn" v-loading="loading" @click="login">登 录</el-button>
-            <!--  <el-popover placement="top" width="400" trigger="click" v-model="loginCode" @show="codeShow">
-              <imgCodeRole @login="login" ref="imgCodeRole"></imgCodeRole>
-              <el-button slot="reference" type="primary" class="login-btn" v-loading="loading">登 录</el-button>
-            </el-popover> -->
-            <!--<router-link :to="{name: 'registUser'}"  target="_blank"  tag="a" class="register fl">个人注册</router-link>
-						<router-link :to="{name: 'registOrg'}"  target="_blank"  tag="a" class="register fr">单位注册</router-link>-->
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
+    <div class="login">
+        <div class="logoTitle" style="margin-left: 50px;margin-top: 50px;">
+            <img src="../../assets/loginImg/yxt-logo.png" style="width: 250px;height:50px; margin-right: 10px;" />
+        </div>
+
+        <div class="main">
+
+            <img src="../../assets/loginImg/login_left.png" style="width:50%;height:100%; " />
+
+            <div class="main-right" v-show="register==0">
+
+                <span class="main-right-title">欢迎登录商享通-预订商城</span>
+
+
+                <div class="main-right-table">
+
+                    <div style="cursor:pointer;"
+                        :class="tableIndex == 1 ? 'main-right-table-text1' : 'main-right-table-text3'"
+                        @click="tableClick(1)">
+                        密码登录</div>
+                    <div style="cursor:pointer;"
+                        :class="tableIndex == 2 ? 'main-right-table-text2' : 'main-right-table-text4'"
+                        @click="tableClick(2)">
+                        验证码登录</div>
+
+                </div>
+
+                <div class="main-right-table-password" v-show="tableIndex==1">
+
+                    <el-input class="input" placeholder="请输入手机号/邮箱" clearable v-model="loginForm.userName" />
+                    <el-input class="input" placeholder="请输入密码" type="password" show-password
+                        v-model="loginForm.password" />
+
+                </div>
+
+                <div class="main-right-table-code" v-show="tableIndex==2">
+                    <el-input class="input" placeholder="请输入手机号/邮箱" clearable v-model="loginForm.userName" />
+                    <div style="display: flex;flex-direction: row;align-items: center;width: 100%;">
+                        <el-input class="input" style="flex: 1; margin-right: 10px;" maxlength="6" placeholder="请输入验证码"
+                            v-model="loginForm.verifyCode" />
+                        <span :class="sendCodeType ? 'sendCode1' : 'sendCode2'" style="cursor:pointer;"
+                            @click="sendCode">{{sendCodeText}}</span>
+                    </div>
+
+                </div>
+
+
+                <el-button type="primary" size="small"
+                    style="width: 65%;margin-top: 30px; font-size: 25px;line-height: 40px;"
+                    @click="login">登录</el-button>
+
+                <div class="main-right-bom">
+
+                    <el-checkbox class="main-right-bom-left" v-model="checkbox">7天内免登录</el-checkbox>
+
+                    <div class="main-right-bom-right">
+
+                        <span @click="forgetClick" style="cursor:pointer;">忘记密码</span>
+                        <div style="margin-left: 8px;margin-right: 8px;width: 1px; height: 18px;background: #999;">
+                        </div>
+                        <span @click="registerClick" style="cursor:pointer;">去注册</span>
+
+                    </div>
+
+                </div>
+
+            </div>
+
+
+            <div class="main-right" v-show="register==1">
+
+                <div v-show="registerStep==1" class="registerStep1">
+                    <span class="main-right-title2">欢迎注册商享通-预订商城</span>
+
+
+                    <span style="width: 100%; margin-top: 15px;">手机号码</span>
+
+                    <el-input class="input" style="flex: 1; margin-right: 10px;margin-top: 5px;" maxlength="11"
+                        placeholder="请输入手机号码" v-model="registerInfo.mobile" />
+
+                    <span style="width: 100%;margin-top: 15px;">密码</span>
+
+                    <el-input class="input" style="flex: 1; margin-right: 10px;margin-top: 5px;"
+                        placeholder="8至16位大小写字母和数字的组合" v-model="registerInfo.password" show-password />
+
+                    <span style="width: 100%;margin-top: 15px;">验证码</span>
+                    <div
+                        style="display: flex;flex-direction: row;align-items: center;width: 100%; margin-top: 5px;margin-left: -10px;">
+                        <el-input class="input" style="flex: 1; margin-right: 10px;" maxlength="6" placeholder="请输入验证码"
+                            v-model="registerInfo.code" />
+                        <span :class="sendCodeType2 ? 'sendCode1' : 'sendCode2'" @click="sendCode2"
+                            style="cursor:pointer;">{{sendCodeText2}}</span>
+                    </div>
+
+                    <div style="display: flex;flex-direction: row;align-items: center;width: 100%; margin-top: 5px;"
+                        @click="goLogin">
+                        <span>已有账号？</span>
+                        <span style="color: #5084D2;cursor:pointer;">登录</span>
+                    </div>
+
+
+                    <el-button type="primary" size="small"
+                        style="width: 100%;margin-top: 30px; font-size: 25px;line-height: 40px;"
+                        @click="registerStep1()">注册</el-button>
+
+                    <div style="display: flex;flex-direction: row;align-items: center;width: 100%; margin-top: 10px;">
+                        <el-checkbox style="margin-right: 5px;" v-model="check"></el-checkbox>
+                        <span style="font-size: 12px;">我已阅读并同意</span>
+                        <span style="font-size: 12px;cursor:pointer;">《宇信通服务协议》</span>
+                        <span style="font-size: 12px;">与</span>
+                        <span style="font-size: 12px;cursor:pointer;">《隐私协议》</span>
+                    </div>
+                </div>
+
+                <div v-show="registerStep==2" class="registerStep2">
+
+                    <span class="main-right-title">请选择公司进入商享通-预订商城</span>
+
+                    <div style="height: 300px;width: 100%; margin-top: 15px;overflow: auto;
+          display: flex;flex-direction: column;">
+
+                        <div v-for="(item,index) in companyList" :key="index" @click="itemClick(item)"
+                            style="display: flex;flex-direction: column;width: 100%;">
+                            <div style="display: flex;flex-direction: row;align-items: center;
+              background: #EDF1F7; border-radius: 8px;width: 100%;margin-bottom: 20px;
+              height: 50px;cursor:pointer;">
+                                <img src="../../assets/images/company_icon.png" style="width: 25px; height: 25px;
+                margin-left: 10px;margin-right: 10px;" />
+                                <span style="flex: 1;margin-right: 10px;">{{item.orgName}}</span>
+                                <img v-show="item.type=='3'" src="../../assets/images/overdue.png"
+                                    style=" height: 100%;" />
+                                <img v-show="item.type=='2'" src="../../assets/images/experience.png"
+                                    style=" height: 100%;" />
+                                <img v-show="item.type=='1'" src="../../assets/images/formal.png"
+                                    style=" height: 100%;" />
+
+                            </div>
+
+                        </div>
+
+                    </div>
+
+                    <el-button type="primary" size="small"
+                        style="width: 100%;margin-top: 30px; font-size: 25px;line-height: 40px;"
+                        @click="registerStep2()">新建企业信息</el-button>
 
-    <el-dialog title="忘记密码" :visible.sync="forgetPwd">
-      <el-form :model="nopassword">
-        <el-form-item label="手机号">
-          <el-input v-model="nopassword.userPhone" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="用户名">
-          <el-input v-model="nopassword.userName" autocomplete="off"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="forgetPwd = false">取 消</el-button>
-        <el-button type="primary" @click="reGetPwd()">确 定</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
+                </div>
+
+                <div v-show="registerStep==3" class="registerStep3">
+
+                    <span class="main-right-title2">欢迎注册商享通-预订商城</span>
+
+                    <span style="width: 100%; font-size: 16px;color: #000; margin-top: 40px;">请填写您的企业信息</span>
+
+                    <div style="display: flex;flex-direction: row;align-items: center; margin-top: 15px;width: 100%; ">
+                        <span>企业名称：</span>
+                        <el-input class="input" style="flex: 1; " placeholder="请输入公司名称"
+                            v-model="registerInfo.companyName" />
+                    </div>
+
+                    <div style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;width: 100%; ">
+                        <span>联系人员：</span>
+                        <el-input class="input" style="flex: 1;" placeholder="请输入联系人" v-model="registerInfo.contacts" />
+                    </div>
+
+                    <div style="display: flex;flex-direction: row;align-items: center;margin-top: 15px;width: 100%; ">
+                        <span>所在区域：</span>
+                        <!-- <el-input class="input" style="flex: 1; margin-right: 10px;" placeholder="请输入公司名称"
+              v-model="registerInfo.company" /> -->
+
+                        <el-cascader v-model="selectedOptions" :options="options" filterable clearable class="input"
+                            style="flex: 1;" @change="handleChange" />
+
+                    </div>
+                    <el-button type="primary" size="small"
+                        style="width: 100%;margin-top: 30px; font-size: 25px;line-height: 40px;"
+                        @click="registerStep3()">创建并进入</el-button>
+
+
+                </div>
+
+            </div>
+
+        </div>
+
+
+    </div>
 </template>
 
 <script>
-  import {
-    doLogin,
-    getUserById,
-    imgCode
-  } from '@/api/user.js'
-  import user from '@/api/User/login.js'
-  import {
-    setToken,
-    getToken,
-    setSession
-  } from '@/utils/auth'
-  import imgCodeRole from '@/components/imgCodeRole/index.vue'
-  import qs from 'qs'
-  export default {
-    components: {
-      imgCodeRole
-    },
-    data() {
-      return {
-        loginForm: {
-          userName: '',
-          password: '',
+    import {
+        doLogin,
+        registerSendMessageCode,
+        bindOrganization,
+        selOrganization,
+        getUserById,
+        registUser
+    } from '@/api/user.js'
+    // 导入省市区数据组件
+    import {
+        regionData,
+        codeToText,
+        TextToCode
+    } from 'element-china-area-data'
+    import {
+        setCookie,
+        getCookie,
+        removeCookie,
+    } from '@/utils/functions.js.js'
+    export default {
+        data() {
+            return {
+                checkbox: false,
+                register: 0,
+                registerStep: 1,
+                tableIndex: 1,
+
+                sendCodeText: "发送验证码",
+                sendCodeType: false,
+                totalTime: 10, //一般是60
+                timer: '', //定时器
+
+                sendCodeText2: "发送验证码",
+                sendCodeType2: false,
+                totalTime2: 10, //一般是60
+                timer2: '', //定时器
+
+                check: false,
+                registerInfo: {
+                    mobile: '',
+                    userSid: "",
+                    password: "",
+                    sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa46', // 商享通-预订商城 资源sid
+                },
+                loginForm: {
+                    // userName: '18033761989',
+                    // password: 'Yxt123',
+                    userName: '',
+                    password: '',
+                    verifyCode: "",
+                    type: "1"
+                },
+                loading: false,
+                loginCode: false,
+                showMsg: false,
+                forgetPwd: false,
+                nopassword: {
+                    userPhone: '',
+                    userName: '',
+                },
+                // 将省市区数据赋给级联选择器
+                options: regionData,
+                // 存放用户选择后省市区的信息
+                selectedOptions: [],
+                companyList: [
+
+                ]
+            }
         },
-        imgCode: '',
-        loading: false,
-        loginCode: false,
-        showMsg: false,
-        forgetPwd: false,
-        nopassword: {
-          userPhone: '',
-          userName: '',
+        created() {
+
+            if (getCookie("pas") && getCookie("name")) { //判断页面是否有对应Cookie
+                this.loginForm.userName = getCookie("name"); //有则写入
+                this.loginForm.password = getCookie("pas");
+
+                console.log(" created", this.loginForm)
+
+                this.checkbox = true
+
+
+
+            } else {
+                this.loginForm.userName = ""; //无则写空
+                this.loginForm.password = "";
+            }
+
         },
-      }
-    },
-    methods: {
-      login() {
-        console.log(66);
-        doLogin(this.loginForm).then((response) => {
-          if (response.code == 200) {
-            this.$router.push({
-              path: '/index'
-            })
-            this.loading = true
-            // this.getUserInfo(response.data.loginId)
-            window.sessionStorage.setItem('tokenName', response.data.tokenName)
-            window.sessionStorage.setItem('tokenValue', response.data.tokenValue)
-          }
-
-        }).catch(() => {
-          this.loading = true
-        })
-
-      },
-      getUserInfo(id) {
-        getUserById(id).then((response) => {
-          if (response.code == 200) {
-            console.log(" response", response)
-              let user = response.data
-               // 结果存入缓存
-               window.sessionStorage.setItem('staffSid', user.staffSid)
-               window.sessionStorage.setItem('sid', user.sid)
-               window.sessionStorage.setItem('userName', user.userName)
-          }
-
-        }).catch(() => {
-        })
-
-      },
-      codeShow() {
-        if (this.loginForm.password == '' || this.loginForm.userName == '') {
-          this.loginCode = false
-          this.showMsg = true
-          return
-        }
-        this.$refs.imgCodeRole.getCodeImage()
-      },
-      reGetPwd() {
-        user.reGetPwd(this.nopassword).then((res) => {})
-      },
-    },
-  }
+
+        methods: {
+            // 省市区级联选择器选择后更新用户前端
+            handleChange(value) {
+                console.log(" handleChange", value)
+
+                var province = ''
+                var city = ''
+                var country = ''
+                for (let i = 0; i < this.selectedOptions.length; i++) {
+                    if (i === 0) {
+                        var province = codeToText[this.selectedOptions[i]]
+                    }
+                    if (i === 1) {
+                        var city = codeToText[this.selectedOptions[i]]
+                    }
+                    if (i === 2) {
+                        var country = codeToText[this.selectedOptions[i]]
+                    }
+                }
+
+                console.log(" handleChange", province + "/" + city + "/" + country)
+
+                this.registerInfo.region = province + "/" + city + "/" + country
+
+            },
+            tableClick(index) {
+                this.tableIndex = index
+
+                this.loginForm.type = index + ""
+
+            },
+
+            // 验证码倒计时
+            sendCode() {
+                if (this.sendCodeType) return
+                // this.getCode() // 获取验证码的接口
+                this.sendCodeType = true
+                this.sendCodeText = this.totalTime + 's'
+                this.timer = setInterval(() => {
+                    this.totalTime--
+                    this.sendCodeText = this.totalTime + 's'
+                    if (this.totalTime < 0) {
+                        clearInterval(this.timer)
+                        this.sendCodeText = '发送验证码'
+                        this.totalTime = 10
+                        this.sendCodeType = false
+                    }
+                }, 1000)
+            },
+            // 验证码倒计时
+            sendCode2() {
+
+                if (this.registerInfo.mobile == '') {
+                    this.$message({
+                        message: '请输入手机号码',
+                        type: 'warning'
+                    })
+                    return
+                }
+                var reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/
+
+                console.log(" reg", reg.test(this.registerInfo.mobile))
+
+                if (!reg.test(this.registerInfo.mobile)) {
+                    this.$message({
+                        message: '手机号码格式错误',
+                        type: 'warning'
+                    })
+                    return
+                }
+
+                if (this.sendCodeType2) return
+                // this.getCode() // 获取验证码的接口
+                this.sendCodeType2 = true
+                this.sendCodeText2 = this.totalTime2 + 's'
+                this.timer2 = setInterval(() => {
+                    this.totalTime2--
+                    this.sendCodeText2 = this.totalTime2 + 's'
+                    if (this.totalTime2 < 0) {
+                        clearInterval(this.timer2)
+                        this.sendCodeText2 = '发送验证码'
+                        this.totalTime2 = 10
+                        this.sendCodeType2 = false
+                    }
+                }, 1000)
+
+                registerSendMessageCode(this.registerInfo.mobile).then((response) => {}).catch(() => {})
+
+            },
+
+            login() {
+
+                if (this.checkbox) { //判断多选框是否选中
+                    setCookie("name", this.loginForm.userName, 7); //如选中则添加Cookie，添加内容为用户输入的密码和用户名
+                    setCookie("pas", this.loginForm.password, 7);
+                } else {
+                    removeCookie("name"); //如没选中，则删除掉对应的Cookie
+                    removeCookie("pas");
+                }
+
+                // this.register = 1
+                // this.registerStep = 2
+
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
+                doLogin(this.loginForm).then((response) => {
+                    if (response.code == 200) {
+
+                        loading.close()
+                        this.register = 1
+
+                        this.companyList = response.data.sysOrganizationVos
+                        this.registerInfo.userSid = response.data.sid
+
+                        if (this.companyList.length == 0) {
+                            // 1. 新用户 无关联企业
+                            this.registerStep = 3
+                        } else {
+                            // 2. 注册过 选择企业登录
+                            this.registerStep = 2
+                        }
+                    } else {
+                        loading.close()
+                    }
+
+                }).catch(() => {
+                    loading.close()
+                })
+
+            },
+            forgetClick() {
+
+            },
+            registerClick() {
+                this.register = 1
+                this.registerStep = 1
+            },
+            goLogin() {
+                this.register = 0
+                this.registerStep = 0
+            },
+            registerStep1() {
+
+                var passwordreg = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9]).{8,16}$/
+
+                if (!passwordreg.test(this.registerInfo.password)) {
+                    this.$message({
+                        message: '密码格式错误，必须为8至16位大小写字母和数字的组合',
+                        type: 'warning'
+                    })
+                    return
+                }
+
+                if (!this.check) {
+                    this.$message({
+                        message: '请阅读并同意《宇信通服务协议》与《隐私协议》',
+                        type: 'warning'
+                    })
+                    return
+                }
+
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
+
+                registUser(this.registerInfo).then((response) => {
+                    if (response.code == 200) {
+                        loading.close()
+
+                        this.companyList = response.data.sysOrganizationVos
+                        this.registerInfo.userSid = response.data.sid
+
+                        if (this.companyList.length == 0) {
+                            // 1. 新用户 无关联企业
+                            this.registerStep = 3
+                        } else {
+                            // 2. 注册过 选择企业登录
+                            this.registerStep = 2
+                        }
+
+                    } else {
+                        loading.close()
+                    }
+
+                }).catch(() => {
+                    loading.close()
+                })
+
+            },
+            registerStep2() {
+
+                this.registerStep = 3
+
+            },
+            registerStep3() {
+
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
+                bindOrganization(this.registerInfo).then((response) => {
+
+                    if (response.code == 200) {
+
+                        this.$router.push({
+                            path: '/index'
+                        })
+
+                        loading.close()
+
+                        window.sessionStorage.setItem('token', response.data.token)
+                        window.sessionStorage.setItem('staffSid', response.data.staffSid)
+                        window.sessionStorage.setItem('userSid', response.data.sid)
+                        window.sessionStorage.setItem('name', response.data.name)
+                        window.sessionStorage.setItem('userName', response.data.userName)
+                        window.sessionStorage.setItem('mobile', response.data.mobile)
+                        window.sessionStorage.setItem('orgName', response.data.orgName)
+                        window.sessionStorage.setItem('orgSid', response.data.orgSid)
+                        window.sessionStorage.setItem('defaultDeptName', response.data.defaultDeptName)
+                        window.sessionStorage.setItem('defaultDeptSid', response.data.defaultDeptSid)
+                        window.sessionStorage.setItem('defaultRoleName', response.data.defaultRoleName)
+                        window.sessionStorage.setItem('defaultRoleSid', response.data.defaultRoleSid)
+                        window.sessionStorage.setItem('orgSidPath', response.data.orgSidPath)
+                        window.sessionStorage.setItem('defaultOrgPath', response.data.defaultOrgPath)
+                        window.sessionStorage.setItem('defaultOrgPathName', response.data.defaultOrgPathName)
+                        window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
+                            .pNameAndDepartmentNameAndPostName)
+                    } else {
+                        loading.close()
+                    }
+
+                }).catch(() => {
+                    loading.close()
+                })
+
+            },
+            itemClick(item) {
+                console.log(" itemClick", item)
+
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
+
+                var params = {
+                    userSid: this.registerInfo.userSid,
+                    orgSid: item.orgSid,
+                    sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa46', //  预订商城 资源sid
+                }
+
+                selOrganization(params).then((response) => {
+
+                    if (response.code == 200) {
+
+                        this.$router.push({
+                            path: '/index'
+                        })
+
+                        loading.close()
+
+                        window.sessionStorage.setItem('token', response.data.token)
+                        window.sessionStorage.setItem('staffSid', response.data.staffSid)
+                        window.sessionStorage.setItem('userSid', response.data.sid)
+                        window.sessionStorage.setItem('name', response.data.name)
+                        window.sessionStorage.setItem('userName', response.data.userName)
+                        window.sessionStorage.setItem('mobile', response.data.mobile)
+                        window.sessionStorage.setItem('orgName', response.data.orgName)
+                        window.sessionStorage.setItem('orgSid', response.data.orgSid)
+                        window.sessionStorage.setItem('defaultDeptName', response.data.defaultDeptName)
+                        window.sessionStorage.setItem('defaultDeptSid', response.data.defaultDeptSid)
+                        window.sessionStorage.setItem('defaultRoleName', response.data.defaultRoleName)
+                        window.sessionStorage.setItem('defaultRoleSid', response.data.defaultRoleSid)
+                        window.sessionStorage.setItem('orgSidPath', response.data.orgSidPath)
+                        window.sessionStorage.setItem('defaultOrgPath', response.data.defaultOrgPath)
+                        window.sessionStorage.setItem('defaultOrgPathName', response.data.defaultOrgPathName)
+                        window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data
+                            .pNameAndDepartmentNameAndPostName)
+
+                    } else {
+                        loading.close()
+                    }
+
+
+                }).catch(() => {
+                    loading.close()
+                })
+
+            },
+
+            getUserInfo(id) {
+                getUserById(id).then((response) => {
+                    if (response.code == 200) {
+                        console.log(" response", response)
+                        let user = response.data
+                        // 结果存入缓存
+                        window.sessionStorage.setItem('staffSid', user.staffSid)
+                        window.sessionStorage.setItem('sid', user.sid)
+                        window.sessionStorage.setItem('userName', user.userName)
+                    }
+
+                }).catch(() => {})
+
+            },
+            codeShow() {
+                if (this.loginForm.password == '' || this.loginForm.userName == '') {
+                    this.loginCode = false
+                    this.showMsg = true
+                    return
+                }
+                this.$refs.imgCodeRole.getCodeImage()
+            },
+            reGetPwd() {
+                user.reGetPwd(this.nopassword).then((res) => {})
+            },
+        },
+    }
 </script>
 
 
 <style lang="scss">
-  .login {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    background-size: 100% 100%;
-    background-image: url(../../assets/home/bj.jpg);
-    background-position: center;
-    overflow: hidden;
-
-    .logoTitle {
-      margin: 30px;
-
-      img {
-        width: 70px;
-      }
-
-      span {
-        font-size: 40px;
-        color: #191919;
-      }
-
-      .title {
-        font-size: 25px;
-        font-family: Source Han Sans CN;
-        font-weight: 500;
-        color: #191919;
-        margin: 0;
-      }
+    // .el-input__inner {
+    //   border: none;
+    //   color: #000;
+    //   font-size: 16px;
+    // }
+
+    input:-webkit-autofill {
+        -webkit-box-shadow: 0 0 0px 1000px white inset;
+        -webkit-text-fill-color: #000;
     }
 
-    .main {
-      width: 30%;
-      /*height: 640px;*/
-      background: #ffffff;
-      box-shadow: 0px 13px 12px 0px rgba(0, 0, 0, 0.15);
-      opacity: 0.8;
-      border-radius: 20px;
-      position: absolute;
-      right: 15%;
-	  top:35%;
-
-      .content {
+
+    .login {
         position: relative;
-        /*.title-h3{
-					width: 100%;
-					text-align: center;
-					color: #FFFFFF;
-					font-size: 30px;
-					margin: 0;
-					position: absolute;
-					top: -65px;
-
-				}*/
-      }
-    }
-  }
-
-  .login-form {
-    padding: 30px 50px;
-
-    .title1 {
-      margin: 0px auto 30px auto;
-      text-align: center;
-      font-size: 20px;
-      color: #191919;
-      font-size: 23px;
-      font-weight: 500;
-    }
+        width: 100%;
+        height: 100%;
+        background-size: 100% 100%;
+        background-image: url(../../assets/home/bj.png);
+        background-position: center;
+        overflow: hidden;
 
-    .el-input {
-      border: none;
-      background-color: transparent;
-    }
+        .logoTitle {
+            margin: 30px;
 
-    .code {
-      position: absolute;
-      top: 3px;
-      right: 5px;
-      width: 35%;
-      height: 35px;
-      cursor: pointer;
-      z-index: 9;
-    }
+        }
 
-    .nopsw {
-      position: absolute;
-      bottom: -30px;
-      right: 5px;
-      color: #018ad2;
-      font-size: 15px;
-      line-height: 30px;
-    }
+        .main {
+            width: 60%;
+            height: 500px;
+            background: #ffffff;
+            box-shadow: 0px 13px 12px 0px rgba(0, 0, 0, 0.15);
+            opacity: 0.8;
+            border-radius: 5px;
+            position: absolute;
+            right: 20%;
+            top: 25%;
+            display: flex;
+            flex-direction: row;
 
-    .register {
-      color: #EE640C;
-    }
+            .main-right {
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                width: 50%;
+                height: 100%;
 
-    .register:hover,
-    .nopsw:hover {
-      cursor: pointer;
-    }
+                .main-right-title {
+                    margin-top: 40px;
+                    font-size: 24px;
+                    font-weight: 600;
+                }
 
-    .btn-eye {
-      cursor: pointer;
-    }
+                .main-right-title2 {
+                    margin-top: 40px;
+                    font-size: 24px;
+                    font-weight: 600;
+                    color: #467CCF;
+                }
 
-    .text-danger {
-      color: #f56c6c;
-    }
+                .main-right-table {
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    margin-top: 30px;
+                    width: 70%;
 
-    .login-btn {
-      margin: 10px 0 10px 0;
-      width: 100%;
-      background-color: #EE640C;
-      border: 0;
-    }
+                    .main-right-table-text1 {
+                        flex: 1;
+                        font-size: 22px;
+                        text-align: center;
+                        color: #3E77CD;
+                    }
 
-    .login-btn:hover {
-      background-color: #EE640C;
-      border: 0;
-    }
+                    .main-right-table-text1:after {
+                        content: '';
+                        display: block;
+                        width: 60px;
+                        border-bottom: 2px solid #3E77CD;
+                        margin: 0 auto;
+                        padding-bottom: 8px;
+                    }
 
-    .el-input--prefix .el-input__inner {
-      border: 1px solid #EE640C;
-      background: transparent;
-      color: #333 !important;
-    }
 
-    .el-form-item {
-      margin-bottom: 40px;
-    }
+                    .main-right-table-text3 {
+                        flex: 1;
+                        font-size: 22px;
+                        text-align: center;
+                        color: #333;
+                        border-bottom: none;
+                        padding-bottom: 8px;
+                    }
+
+                    .main-right-table-text2 {
+                        flex: 1;
+                        font-size: 22px;
+                        text-align: center;
+                        color: #3E77CD;
+                    }
+
+                    .main-right-table-text2:after {
+                        content: '';
+                        display: block;
+                        width: 80px;
+                        border-bottom: 2px solid #3E77CD;
+                        margin: 0 auto;
+                        padding-bottom: 8px;
+                    }
+
+                    .main-right-table-text4 {
+                        flex: 1;
+                        font-size: 22px;
+                        text-align: center;
+                        color: #333;
+                        border-bottom: none;
+                        padding-bottom: 8px;
+                    }
+                }
+
+                .main-right-table-password {
+                    display: flex;
+                    width: 65%;
+                    margin-top: 10px;
+                    flex-direction: column;
+                    align-items: center;
+
+                    .input {
+                        margin-top: 10px;
+                        width: 100%;
+                        height: 50px;
+                    }
+                }
+
+                .main-right-table-code {
+
+                    display: flex;
+                    width: 65%;
+                    margin-top: 10px;
+                    flex-direction: column;
+                    align-items: center;
+
+                    .input {
+                        margin-top: 10px;
+                        width: 100%;
+                        height: 50px;
+                    }
+
+                    .sendCode1 {
+                        font-size: 16px;
+                        color: #c9c9c9;
+                    }
+
+                    .sendCode2 {
+                        font-size: 16px;
+                        color: #3E77CD;
+                    }
 
-    .el-loading-mask {
-      background-color: rgba(255, 255, 255, 0.6);
+                }
+
+                .main-right-bom {
+                    padding-left: 10px;
+                    padding-right: 10px;
+                    display: flex;
+                    width: 65%;
+                    margin-top: 10px;
+                    flex-direction: row;
+                    align-items: center;
+                    justify-content: space-between;
+
+                    .main-right-bom-left {
+                        color: #000;
+                        align-items: center;
+                    }
+
+                    .main-right-bom-right {
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+
+                        span {
+                            color: #666;
+
+                        }
+                    }
+                }
+
+                .registerStep1 {
+                    display: flex;
+                    flex-direction: column;
+                    align-items: center;
+                    width: 65%;
+
+                    .input {
+                        width: 100%;
+                        height: 50px;
+                    }
+
+                    .main-right-title2 {
+                        font-size: 24px;
+                        font-weight: 600;
+                        color: #467CCF;
+                    }
+
+                    .sendCode1 {
+                        font-size: 16px;
+                        color: #c9c9c9;
+                    }
+
+                    .sendCode2 {
+                        font-size: 16px;
+                        color: #3E77CD;
+                    }
+
+                }
+
+                .registerStep2 {
+                    display: flex;
+                    flex-direction: column;
+                    align-items: center;
+                    width: 70%;
+
+                    .input {
+                        width: 100%;
+                        height: 50px;
+                    }
+
+                    .main-right-title {
+                        font-size: 24px;
+                        font-weight: 600;
+                    }
+
+                }
+
+                .registerStep3 {
+                    display: flex;
+                    flex-direction: column;
+                    align-items: center;
+                    width: 70%;
+
+                    .input {
+                        width: 100%;
+                        height: 50px;
+                    }
+                }
+
+            }
+
+
+
+        }
     }
-  }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index f67d115..c6db48c 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -1,342 +1,341 @@
 <template>
-	<div class="app-container">
-		<div v-show="viewState == 1">
-			<button-bar ref="btnbar" view-title="订单列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-			<div class="main-content">
-				<div class="searchcon">
-					<el-button size="small" class="searchbtn" @click="clicksearchShow">
-						{{ searchxianshitit }}
-					</el-button>
-					<div v-show="isSearchShow" class="search">
-						<el-form :inline="true" class="tab-header">
-							<el-form-item label="预约开始日期">
-								<el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
-									placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-									style="width: 200px;">
-								</el-date-picker>
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="订单列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="预约开始日期">
+                                <el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
+                                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                    style="width: 200px;">
+                                </el-date-picker>
 
-							</el-form-item>
-							<el-form-item label="预约结束日期">
-								<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
-									placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-									style="width: 200px;">
-								</el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="预约结束日期">
+                                <el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
+                                    placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                                    style="width: 200px;">
+                                </el-date-picker>
 
-							</el-form-item>
-							<el-form-item label="所属支行">
+                            </el-form-item>
+                            <!-- <el-form-item label="所属支行">
 								<el-select v-model="page.params.bankSid" filterable class="item_input" clearable
 									placeholder="请选择" style="width:100%" @change="bankSelect">
 									<el-option v-for="item in bankList" :key="item.name" :label="item.name"
 										:value="item.sid">
 									</el-option>
 								</el-select>
-							</el-form-item>
+							</el-form-item> -->
 
-							<el-form-item label="提货门店">
-								<el-select v-model="page.params.store" filterable class="item_input" clearable
-									placeholder="请选择" style="width:100%" @change="giftPackSelect">
-									<el-option v-for="item in giftPackList" :key="item.text" :label="item.text"
-										:value="item.text">
-									</el-option>
-								</el-select>
-							</el-form-item>
-							
-							
-							<el-form-item label="卡券类型">
-								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
-									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
-									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
-										:value="item.sid">
-									</el-option>
-								</el-select>
-							</el-form-item>
-							
+                            <!--  <el-form-item label="提货门店">
+                                <el-select v-model="page.params.store" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%" @change="giftPackSelect">
+                                    <el-option v-for="item in giftPackList" :key="item.text" :label="item.text"
+                                        :value="item.text">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item> -->
+
+                            <!-- 
+                            <el-form-item label="卡券类型">
+                                <el-select v-model="page.params.cardType" filterable class="item_input" clearable
+                                    placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+                                    <el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+                                        :value="item.sid">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item> -->
 
-						</el-form>
-						<div class="btn" style="text-align: center;">
-							<el-button type="primary" size="small" icon="el-icon-search"
-								@click="dosearch">查询</el-button>
-							<el-button type="primary" size="small" icon="el-icon-refresh"
-								@click="resetQuery">重置</el-button>
-						</div>
-					</div>
-				</div>
-				<!-- Start 项目列表头部 -->
-				<div class="listtop">
-					<div class="tit">订单列表</div>
-				</div>
-				<!-- End 项目列表头部 -->
-				<!-- Start 项目列表 -->
-				<div class="">
-					<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
-						<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-						<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-						<el-table-column label="操作" align="center" width="120">
-							<template slot-scope="scope">
-								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
-							</template>
-						</el-table-column>
-						<el-table-column prop="cardType" label="卡券类型" align="center" />
-						<el-table-column prop="reserveDate" label="预约日期" align="center" />
-						<el-table-column prop="bankName" label="所属支行" align="center" />
-							<el-table-column prop="store" label="提货地点" align="center" />
-						<el-table-column prop="serialNumber" label="卡券序列号" align="center" />
-						<el-table-column prop="bagName" label="礼包类型" align="center" />
-						<el-table-column prop="userName" label="用户名称" align="center" />
-						<el-table-column prop="userPhone" label="联系电话" align="center" />
-					</el-table>
-				</div>
-				<!-- End 项目列表 -->
-				<div class="pages">
-					<div class="tit" />
-					<!--  翻页  -->
-					<pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
-						:limit.sync="page.size" class="pagination" @pagination="loadList" />
-				</div>
-			</div>
-		</div>
-		<!-- End 查询和其列表部分 -->
-		<!-- 新增修改部分组件 -->
-		<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-	</div>
+
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">订单列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <el-table-column label="操作" align="center" width="120">
+                            <template slot-scope="scope">
+                                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="cardType" label="卡券类型" align="center" />
+                        <el-table-column prop="reserveDate" label="预约日期" align="center" />
+                        <el-table-column prop="bankName" label="所属支行" align="center" />
+                        <el-table-column prop="store" label="提货地点" align="center" />
+                        <el-table-column prop="serialNumber" label="卡券序列号" align="center" />
+                        <el-table-column prop="bagName" label="礼包类型" align="center" />
+                        <el-table-column prop="userName" label="用户名称" align="center" />
+                        <el-table-column prop="userPhone" label="联系电话" align="center" />
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
+                        :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
+        </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+    </div>
 </template>
 
 <script>
-	import req from '@/api/order/order.js'
-	import req2 from '@/api/pickupPoint/pickupPoint.js'
-	import ButtonBar from '@/components/ButtonBar'
-	import Pagination from '@/components/pagination'
-	import pageye from '@/components/pagination/pageye'
-	import divAdd from './indexInfo.vue'
-	import {
-		getBeforeDate
-	} from '@/utils/index'
-	export default {
-		name: 'SupplierBankInfoIndex',
-		components: {
-			ButtonBar,
-			Pagination,
-			pageye,
-			divAdd,
-		},
-		data() {
-			return {
-				btndisabled: false,
-				viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-				isSearchShow: false,
-				searchxianshitit: '显示查询条件',
-				tableLoading: false,
-				dataList: [],
-				btnList: [{
-						type: 'success',
-						size: 'small',
-						icon: 'export',
-						btnKey: 'build',
-						btnLabel: '导出'
-					},
-					{
-						type: 'info',
-						size: 'small',
-						icon: 'cross',
-						btnKey: 'doClose',
-						btnLabel: '关闭'
-					}
-				],
-				page: {
-					total: 0, // 默认数据总数
-					current: 1, // 默认开始页面
-					size: 10, // 每页的数据条数
-					params: {
-						startDate: "",
-						endDate: "",
-						store: "",
-						bankSid:"",
-						cardType:""
-					},
-				},
-				giftPackList: [],
-				bankList: [],
-				cardTypeList:[
-					{
-						text :"全部",
-						sid:""
-					},
-					{
-						text :"家庭卡",
-						sid:"1"
-					},
-					{
-						text :"亲情卡",
-						sid:"2"
-					},
-					{
-						text :"企业卡",
-						sid:"3"
-					},
-					
-				]
-			}
-		},
-		mounted() {
-			this.$refs['btnbar'].setButtonList(this.btnList)
-		},
-		created() {
-			this.getAllStore()
-			// this.loadList()
-			this.getBankList()
-		},
-		methods: {
-			// 搜索条件效果
-			clicksearchShow() {
-				this.isSearchShow = !this.isSearchShow
-				if (this.isSearchShow) {
-					this.searchxianshitit = '隐藏查询条件'
-				} else {
-					this.searchxianshitit = '显示查询条件'
-				}
-			},
-			btnHandle(btnKey) {
-				switch (btnKey) {
-					case 'build': // 导出
-						this.doBuild()
-						break
-					case 'doClose':
-						this.doClose()
-						break
-					default:
-						break
-				}
-			},
-			selectTime1(val) {
+    import req from '@/api/order/order.js'
+    import req2 from '@/api/pickupPoint/pickupPoint.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import pageye from '@/components/pagination/pageye'
+    import divAdd from './indexInfo.vue'
+    import {
+        getBeforeDate
+    } from '@/utils/index'
+    export default {
+        name: 'SupplierBankInfoIndex',
+        components: {
+            ButtonBar,
+            Pagination,
+            pageye,
+            divAdd,
+        },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'success',
+                        size: 'small',
+                        icon: 'export',
+                        btnKey: 'build',
+                        btnLabel: '导出'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                page: {
+                    total: 0, // 默认数据总数
+                    current: 1, // 默认开始页面
+                    size: 10, // 每页的数据条数
+                    params: {
+                        startDate: "",
+                        endDate: "",
+                        store: "",
+                        bankSid: "",
+                        cardType: ""
+                    },
+                },
+                giftPackList: [],
+                bankList: [],
+                cardTypeList: [{
+                        text: "全部",
+                        sid: ""
+                    },
+                    {
+                        text: "家庭卡",
+                        sid: "1"
+                    },
+                    {
+                        text: "亲情卡",
+                        sid: "2"
+                    },
+                    {
+                        text: "企业卡",
+                        sid: "3"
+                    },
+
+                ]
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            this.getAllStore()
+            // this.loadList()
+            this.getBankList()
+        },
+        methods: {
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'build': // 导出
+                        this.doBuild()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            selectTime1(val) {
 
-				console.log('selectTime1:', val)
-				this.page.params.startDate = val
+                console.log('selectTime1:', val)
+                this.page.params.startDate = val
 
-			},
-			selectTime2(val) {
+            },
+            selectTime2(val) {
 
-				console.log('selectTime2:', val)
-				this.page.params.endDate = val
+                console.log('selectTime2:', val)
+                this.page.params.endDate = val
 
-			},
+            },
 
-			giftPackSelect(val) {
-				console.log('>>>>>>>>>giftPackSelect', val)
-				this.page.params.store = val
-			},
-			getBankList() {
-				req2.bankSelect()
-					.then(resp => {
-						console.log('>>>>>>>>>getBankList', resp.data)
-						this.bankList = resp.data
+            giftPackSelect(val) {
+                console.log('>>>>>>>>>giftPackSelect', val)
+                this.page.params.store = val
+            },
+            getBankList() {
+                req2.bankSelect()
+                    .then(resp => {
+                        console.log('>>>>>>>>>getBankList', resp.data)
+                        this.bankList = resp.data
 
-					})
-					.catch(() => {})
-			},
-			bankSelect(val) {
-				console.log('>>>>>>>>>bankSelect', val)
-				this.page.params.bankSid = val
-			},
-			cardTypeSelect(val){
-				console.log('>>>>>>>>>cardTypeSelect', val)
-				this.page.params.cardType = val
-			},
-			getAllStore() {
-				req.getAllStore().then((resp) => {
-					if (resp.success) {
-						this.giftPackList = resp.data
-					}
-				}).catch(() => {})
-			},
+                    })
+                    .catch(() => {})
+            },
+            bankSelect(val) {
+                console.log('>>>>>>>>>bankSelect', val)
+                this.page.params.bankSid = val
+            },
+            cardTypeSelect(val) {
+                console.log('>>>>>>>>>cardTypeSelect', val)
+                this.page.params.cardType = val
+            },
+            getAllStore() {
+                req.getAllStore().then((resp) => {
+                    if (resp.success) {
+                        this.giftPackList = resp.data
+                    }
+                }).catch(() => {})
+            },
 
-			loadList() {
-				this.tableLoading = true
-				req.orderList(this.page).then((resp) => {
-					this.tableLoading = false
-					if (resp.success) {
-						const data = resp.data
-						this.page.total = data.total
-						this.dataList = data.records
-					} else {
-						// 根据resp.code进行异常情况处理
-						this.dataList = []
-						this.page.total = 0
-					}
-				}).catch(() => {
-					this.tableLoading = false
-				})
-			},
+            loadList() {
+                this.tableLoading = true
+                req.orderList(this.page).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.page.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.page.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
 
-			// 序号
-			indexMethod(index) {
-				var pagestart = (this.page.current - 1) * this.page.size
-				var pageindex = index + 1 + pagestart
-				return pageindex
-			},
-			dosearch() {
-				this.page.current = 1
-				this.loadList()
-			},
-			resetQuery() {
-				this.page = {
-					current: 1,
-					size: 10,
-					total: 0,
-					params: {
-						startDate: "",
-						endDate: "",
-						store: "",
-						bankSid:"",
-						cardType:""
-					},
-				}
-				this.loadList()
-			},
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.page.current - 1) * this.page.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.page.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.page = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        startDate: "",
+                        endDate: "",
+                        store: "",
+                        bankSid: "",
+                        cardType: ""
+                    },
+                }
+                this.loadList()
+            },
 
-			toRelevancy(row) {
-				this.viewState = 3
-				this.$refs['divadd'].showEdit(row)
-			},
-			resetState() {
-				this.viewState = 1
-			},
-			doClose() {
-				this.$store.dispatch('tagsView/delView', this.$route)
-				this.$router.go(-1)
-			},
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            resetState() {
+                this.viewState = 1
+            },
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
 
-			// 导出
-			doBuild() {
-				const loading = this.$loading({
-					lock: true,
-					text: 'Loading',
-					spinner: 'el-icon-loading',
-					background: 'rgba(0, 0, 0, 0.7)'
-				})
+            // 导出
+            doBuild() {
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
 
 
-				req.exportExcel(this.page.params).then((resp) => {
-					loading.close()
-					const blob = new Blob([resp], {
-						type: 'application/vnd.ms-excel'
-					})
-					const fileName = '订单明细_' + this.page.params.startDate + '.xls'
-					const elink = document.createElement('a')
-					elink.download = fileName
-					elink.style.display = 'nonde'
-					elink.href = URL.createObjectURL(blob)
-					document.body.appendChild(elink)
-					elink.click()
-					URL.revokeObjectURL(elink.href)
-					document.body.removeChild(elink)
-				}).catch(() => {
-					loading.close()
-				})
-			},
+                req.exportExcel(this.page.params).then((resp) => {
+                    loading.close()
+                    const blob = new Blob([resp], {
+                        type: 'application/vnd.ms-excel'
+                    })
+                    const fileName = '订单明细_' + this.page.params.startDate + '.xls'
+                    const elink = document.createElement('a')
+                    elink.download = fileName
+                    elink.style.display = 'nonde'
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    URL.revokeObjectURL(elink.href)
+                    document.body.removeChild(elink)
+                }).catch(() => {
+                    loading.close()
+                })
+            },
 
 
-		}
-	}
+        }
+    }
 </script>
 <style scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/orderreserve/allDistributionCount.vue b/src/views/orderreserve/allDistributionCount.vue
index 63c0406..0747542 100644
--- a/src/views/orderreserve/allDistributionCount.vue
+++ b/src/views/orderreserve/allDistributionCount.vue
@@ -1,239 +1,245 @@
 <template>
-  <div class="app-container">
-    <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="总配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-      <div class="main-content">
-        <div class="searchcon">
-          <el-button size="small" class="searchbtn" @click="clicksearchShow">
-            {{ searchxianshitit }}
-          </el-button>
-          <div v-show="isSearchShow" class="search">
-            <el-form :inline="true" class="tab-header">
-              <el-form-item label="预约开始日期">
-                <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-              </el-form-item>
-              <el-form-item label="预约结束日期">
-                <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-              </el-form-item>
-              <el-form-item label="菜窖分类">
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="总配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="预约开始日期">
+                                <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期"
+                                    format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
+                            </el-form-item>
+                            <el-form-item label="预约结束日期">
+                                <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期"
+                                    format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
+                            </el-form-item>
+                            <!--  <el-form-item label="菜窖分类">
                 <el-select v-model="page.params.cardType" filterable class="item_input" clearable placeholder="请选择" style="width:100%">
                   <el-option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
-              </el-form-item>
-            </el-form>
-            <div class="btn" style="text-align: center;">
-              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
-              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </div>
-          </div>
-        </div>
-        <!-- Start 项目列表头部 -->
-        <div class="listtop">
-          <div class="tit">配货列表</div>
-        </div>
-        <!-- End 项目列表头部 -->
-        <!-- Start 项目列表 -->
-        <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
-            <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <!-- 	<el-table-column label="操作" align="center" width="120">
+              </el-form-item> -->
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">配货列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <!-- 	<el-table-column label="操作" align="center" width="120">
 							<template slot-scope="scope">
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-            <el-table-column prop="reserveDate" label="预约日期" align="center" />
-            <el-table-column prop="brandName" label="菜窖分类" align="center" />
-            <el-table-column prop="goodsName" label="商品名称" align="center" />
-            <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
+                        <el-table-column prop="reserveDate" label="预约日期" align="center" />
+                        <el-table-column prop="brandName" label="菜窖分类" align="center" />
+                        <el-table-column prop="goodsName" label="商品名称" align="center" />
+                        <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
 
-          </el-table>
-        </div>
-        <!-- End 项目列表 -->
-        <div class="pages">
-          <div class="tit" />
-          <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current" :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
+                        :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
         </div>
-      </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
     </div>
-    <!-- End 查询和其列表部分 -->
-    <!-- 新增修改部分组件 -->
-    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-  </div>
 </template>
 
 <script>
-  import req from '@/api/lpk/reserveorder.js'
-	import reqMall from '@/api/adminmallapi.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import divAdd from './indexInfo.vue'
-  export default {
-    name: 'OrderreserveAllDistributionCount',
-    components: {
-      ButtonBar,
-      Pagination,
-      divAdd
-    },
-    data() {
-      return {
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-            type: 'success',
-            size: 'small',
-            icon: 'export',
-            btnKey: 'build',
-            btnLabel: '导出'
-          },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        page: {
-          total: 0, // 默认数据总数
-          current: 1, // 默认开始页面
-          size: 10, // 每页的数据条数
-          params: {
-            startDate: '',
-            endDate: '',
-            store: '',
-            cardType: ''
-          }
+    import req from '@/api/lpk/reserveorder.js'
+    import reqMall from '@/api/adminmallapi.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import divAdd from './indexInfo.vue'
+    export default {
+        name: 'OrderreserveAllDistributionCount',
+        components: {
+            ButtonBar,
+            Pagination,
+            divAdd
         },
-        brandList: []
-      }
-    },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
-    },
-    created() {
-      this.initBrand()
-    },
-    methods: {
-      initBrand() {
-        reqMall.listAllBrand().then(resp => {
-          this.brandList = resp.data
-        })
-      },
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
-        }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'build': // 导出
-            this.doBuild()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
-        }
-      },
-      loadList() {
-        this.tableLoading = true
-        req.pageOfAll(this.page).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.page.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.page.total = 0
-          }
-        }).catch(() => {
-          this.tableLoading = false
-        })
-      },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'success',
+                        size: 'small',
+                        icon: 'export',
+                        btnKey: 'build',
+                        btnLabel: '导出'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                page: {
+                    total: 0, // 默认数据总数
+                    current: 1, // 默认开始页面
+                    size: 10, // 每页的数据条数
+                    params: {
+                        startDate: '',
+                        endDate: '',
+                        store: '',
+                        cardType: ''
+                    }
+                },
+                brandList: []
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            // this.initBrand()
+            this.loadList()
+        },
+        methods: {
+            initBrand() {
+                reqMall.listAllBrand().then(resp => {
+                    this.brandList = resp.data
+                })
+            },
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'build': // 导出
+                        this.doBuild()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            loadList() {
+                this.tableLoading = true
+                req.pageOfAll(this.page).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.page.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.page.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
 
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.page.current - 1) * this.page.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      dosearch() {
-        this.page.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.page = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            startDate: '',
-            endDate: '',
-            store: '',
-            cardType: ''
-          }
-        }
-        this.loadList()
-      },
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.page.current - 1) * this.page.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.page.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.page = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        startDate: '',
+                        endDate: '',
+                        store: '',
+                        cardType: ''
+                    }
+                }
+                this.loadList()
+            },
 
-      toRelevancy(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            resetState() {
+                this.viewState = 1
+            },
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
 
-      // 导出
-      doBuild() {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
+            // 导出
+            doBuild() {
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
 
-        req.expExcelOfAll(this.page.params).then((resp) => {
-          loading.close()
-          const blob = new Blob([resp], {
-            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-          })
-          const fileName = '总配货明细_' + this.page.params.startDate + '.xlsx'
-          const elink = document.createElement('a')
-          elink.download = fileName
-          elink.style.display = 'nonde'
-          elink.href = URL.createObjectURL(blob)
-          document.body.appendChild(elink)
-          elink.click()
-          URL.revokeObjectURL(elink.href)
-          document.body.removeChild(elink)
-        }).catch(() => {
-          loading.close()
-        })
-      }
+                req.expExcelOfAll(this.page.params).then((resp) => {
+                    loading.close()
+                    const blob = new Blob([resp], {
+                        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                    })
+                    const fileName = '总配货明细_' + this.page.params.startDate + '.xlsx'
+                    const elink = document.createElement('a')
+                    elink.download = fileName
+                    elink.style.display = 'nonde'
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    URL.revokeObjectURL(elink.href)
+                    document.body.removeChild(elink)
+                }).catch(() => {
+                    loading.close()
+                })
+            }
 
+        }
     }
-  }
 </script>
 <style scoped>
-  ::v-deep .el-table .cell {
-    padding: 0px;
-  }
-</style>
+    ::v-deep .el-table .cell {
+        padding: 0px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/orderreserve/distributionCount.vue b/src/views/orderreserve/distributionCount.vue
index e5d72f3..d6f2f98 100644
--- a/src/views/orderreserve/distributionCount.vue
+++ b/src/views/orderreserve/distributionCount.vue
@@ -1,21 +1,23 @@
 <template>
-  <div class="app-container">
-    <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="网点配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-      <div class="main-content">
-        <div class="searchcon">
-          <el-button size="small" class="searchbtn" @click="clicksearchShow">
-            {{ searchxianshitit }}
-          </el-button>
-          <div v-show="isSearchShow" class="search">
-            <el-form :inline="true" class="tab-header">
-              <el-form-item label="预约开始日期">
-                <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-              </el-form-item>
-              <el-form-item label="预约结束日期">
-                <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-              </el-form-item>
-              <el-form-item label="所属支行">
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="网点配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="预约开始日期">
+                                <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期"
+                                    format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
+                            </el-form-item>
+                            <el-form-item label="预约结束日期">
+                                <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期"
+                                    format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
+                            </el-form-item>
+                            <!-- <el-form-item label="所属支行">
                 <el-select v-model="page.params.bankSid" filterable class="item_input" clearable placeholder="请选择" style="width:100%" @change="bankSelect">
                   <el-option v-for="item in bankList" :key="item.sid" :label="item.name" :value="item.sid" />
                 </el-select>
@@ -29,40 +31,42 @@
                 <el-select v-model="page.params.cardType" filterable class="item_input" clearable placeholder="请选择" style="width:100%">
                   <el-option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
-              </el-form-item>
-            </el-form>
-            <div class="btn" style="text-align: center;">
-              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
-              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </div>
-          </div>
-        </div>
-        <!-- Start 项目列表头部 -->
-        <div class="listtop">
-          <div class="tit">网点配货列表</div>
-        </div>
-        <!-- End 项目列表头部 -->
-        <!-- Start 项目列表 -->
-        <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
-            <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <!-- 	<el-table-column label="操作" align="center" width="120">
+              </el-form-item> -->
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">网点配货列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <!-- 	<el-table-column label="操作" align="center" width="120">
 							<template slot-scope="scope">
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-            <el-table-column prop="reserveDate" label="预约日期" align="center" />
-            <el-table-column prop="bankName" label="所属支行" align="center" />
-            <el-table-column prop="storeName" label="提货地点" align="center" />
-            <el-table-column prop="brandName" label="菜窖分类" align="center" />
-            <el-table-column prop="goodsName" label="商品名称" align="center" />
-            <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
-            <el-table-column prop="storeAddress" label="提货点地址" align="center" />
-            <el-table-column prop="storeLinker" label="提货点联系人" align="center" />
-            <el-table-column prop="storePhone" label="提货点电话" align="center" />
+                        <el-table-column prop="reserveDate" label="预约日期" align="center" />
+                        <el-table-column prop="bankName" label="所属支行" align="center" />
+                        <el-table-column prop="storeName" label="提货地点" align="center" />
+                        <el-table-column prop="brandName" label="菜窖分类" align="center" />
+                        <el-table-column prop="goodsName" label="商品名称" align="center" />
+                        <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
+                        <el-table-column prop="storeAddress" label="提货点地址" align="center" />
+                        <el-table-column prop="storeLinker" label="提货点联系人" align="center" />
+                        <el-table-column prop="storePhone" label="提货点电话" align="center" />
 
-            <!-- <el-table-column label="商品明细" align="center">
+                        <!-- <el-table-column label="商品明细" align="center">
 							<template slot-scope="scope">
 								<div v-for="(item,index) in scope.row.goods" style="width: 100%;height: 100%;">
 									<div style="width: 100%;padding:10px"
@@ -73,218 +77,220 @@
 							</template>
 						</el-table-column> -->
 
-          </el-table>
-        </div>
-        <!-- End 项目列表 -->
-        <div class="pages">
-          <div class="tit" />
-          <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current" :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
+                        :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
         </div>
-      </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
     </div>
-    <!-- End 查询和其列表部分 -->
-    <!-- 新增修改部分组件 -->
-    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-  </div>
 </template>
 
 <script>
-  import req from '@/api/lpk/reserveorder.js'
-  import reqBank from '@/api/lpk/bank.js'
-	import reqMall from '@/api/adminmallapi.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import divAdd from './indexInfo.vue'
-  export default {
-    name: 'OrderreserveDistributionCount',
-    components: {
-      ButtonBar,
-      Pagination,
-      divAdd
-    },
-    data() {
-      return {
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-            type: 'success',
-            size: 'small',
-            icon: 'export',
-            btnKey: 'build',
-            btnLabel: '导出'
-          },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        page: {
-          total: 0, // 默认数据总数
-          current: 1, // 默认开始页面
-          size: 10, // 每页的数据条数
-          params: {
-            startDate: '',
-            endDate: '',
-            store: '',
-            bankSid: '',
-            cardType: ''
-          }
+    import req from '@/api/lpk/reserveorder.js'
+    import reqBank from '@/api/lpk/bank.js'
+    import reqMall from '@/api/adminmallapi.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import divAdd from './indexInfo.vue'
+    export default {
+        name: 'OrderreserveDistributionCount',
+        components: {
+            ButtonBar,
+            Pagination,
+            divAdd
         },
-        brandList: [],
-        bankList: [],
-        storeList: []
-      }
-    },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
-    },
-    created() {
-      this.initBank()
-      this.initStore()
-      this.initBrand()
-    },
-    methods: {
-      initBank() {
-        reqBank.listBankAll()
-          .then(resp => {
-            this.bankList = resp.data
-          })
-      },
-      initStore() {
-        reqBank.listStoreOfBank(this.page.params.bankSid)
-          .then(resp => {
-            this.storeList = resp.data
-          })
-      },
-      initBrand() {
-        reqMall.listAllBrand().then(resp => {
-          this.brandList = resp.data
-        })
-      },
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
-        }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'build': // 导出
-            this.doBuild()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
-        }
-      },
-      bankSelect(val) {
-        console.log('>>>>>>>>>bankSelect', val)
-        this.page.params.bankSid = val
-        this.page.params.store = ''
-        this.initStore()
-      },
-      loadList() {
-        this.tableLoading = true
-        req.pageOfStore(this.page).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.page.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.page.total = 0
-          }
-        }).catch(() => {
-          this.tableLoading = false
-        })
-      },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'success',
+                        size: 'small',
+                        icon: 'export',
+                        btnKey: 'build',
+                        btnLabel: '导出'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                page: {
+                    total: 0, // 默认数据总数
+                    current: 1, // 默认开始页面
+                    size: 10, // 每页的数据条数
+                    params: {
+                        startDate: '',
+                        endDate: '',
+                        store: '',
+                        bankSid: '',
+                        cardType: ''
+                    }
+                },
+                brandList: [],
+                bankList: [],
+                storeList: []
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            // this.initBank()
+            // this.initStore()
+            // this.initBrand()
+            this.loadList()
+        },
+        methods: {
+            initBank() {
+                reqBank.listBankAll()
+                    .then(resp => {
+                        this.bankList = resp.data
+                    })
+            },
+            initStore() {
+                reqBank.listStoreOfBank(this.page.params.bankSid)
+                    .then(resp => {
+                        this.storeList = resp.data
+                    })
+            },
+            initBrand() {
+                reqMall.listAllBrand().then(resp => {
+                    this.brandList = resp.data
+                })
+            },
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'build': // 导出
+                        this.doBuild()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            bankSelect(val) {
+                console.log('>>>>>>>>>bankSelect', val)
+                this.page.params.bankSid = val
+                this.page.params.store = ''
+                this.initStore()
+            },
+            loadList() {
+                this.tableLoading = true
+                req.pageOfStore(this.page).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.page.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.page.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
 
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.page.current - 1) * this.page.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      dosearch() {
-        this.page.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.page = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            startDate: '',
-            endDate: '',
-            store: '',
-            bankSid: '',
-            cardType: ''
-          }
-        }
-        this.loadList()
-      },
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.page.current - 1) * this.page.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.page.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.page = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        startDate: '',
+                        endDate: '',
+                        store: '',
+                        bankSid: '',
+                        cardType: ''
+                    }
+                }
+                this.loadList()
+            },
 
-      toRelevancy(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            resetState() {
+                this.viewState = 1
+            },
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
 
-      // 导出
-      doBuild() {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
+            // 导出
+            doBuild() {
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
 
-        req.expExcelOfStore(this.page.params).then((resp) => {
-          loading.close()
-          const blob = new Blob([resp], {
-            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-          })
-          const fileName = '网点配货明细_' + this.page.params.startDate + '.xlsx'
-          const elink = document.createElement('a')
-          elink.download = fileName
-          elink.style.display = 'nonde'
-          elink.href = URL.createObjectURL(blob)
-          document.body.appendChild(elink)
-          elink.click()
-          URL.revokeObjectURL(elink.href)
-          document.body.removeChild(elink)
-        }).catch(() => {
-          loading.close()
-        })
-      }
+                req.expExcelOfStore(this.page.params).then((resp) => {
+                    loading.close()
+                    const blob = new Blob([resp], {
+                        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                    })
+                    const fileName = '网点配货明细_' + this.page.params.startDate + '.xlsx'
+                    const elink = document.createElement('a')
+                    elink.download = fileName
+                    elink.style.display = 'nonde'
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    URL.revokeObjectURL(elink.href)
+                    document.body.removeChild(elink)
+                }).catch(() => {
+                    loading.close()
+                })
+            }
 
+        }
     }
-  }
 </script>
 <style scoped>
-  ::v-deep .el-table .cell {
-    padding: 0px;
-  }
-</style>
+    ::v-deep .el-table .cell {
+        padding: 0px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/orderreserve/index.vue b/src/views/orderreserve/index.vue
index 1479d75..9eb11f1 100644
--- a/src/views/orderreserve/index.vue
+++ b/src/views/orderreserve/index.vue
@@ -1,21 +1,23 @@
 <template>
-  <div class="app-container">
-    <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="预约单列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-      <div class="main-content">
-        <div class="searchcon">
-          <el-button size="small" class="searchbtn" @click="clicksearchShow">
-            {{ searchxianshitit }}
-          </el-button>
-          <div v-show="isSearchShow" class="search">
-            <el-form :inline="true" class="tab-header">
-              <el-form-item label="预约开始日期">
-                <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-              </el-form-item>
-              <el-form-item label="预约结束日期">
-                <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-              </el-form-item>
-              <el-form-item label="所属支行">
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="预约单列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="预约开始日期">
+                                <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期"
+                                    format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
+                            </el-form-item>
+                            <el-form-item label="预约结束日期">
+                                <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期"
+                                    format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
+                            </el-form-item>
+                            <!--  <el-form-item label="所属支行">
                 <el-select v-model="page.params.bankSid" filterable class="item_input" clearable placeholder="请选择" style="width:100%" @change="bankSelect">
                   <el-option v-for="item in bankList" :key="item.sid" :label="item.name" :value="item.sid" />
                 </el-select>
@@ -29,251 +31,254 @@
                 <el-select v-model="page.params.cardType" filterable class="item_input" clearable placeholder="请选择" style="width:100%">
                   <el-option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
-              </el-form-item>
-            </el-form>
-            <div class="btn" style="text-align: center;">
-              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
-              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </div>
-          </div>
-        </div>
-        <!-- Start 项目列表头部 -->
-        <div class="listtop">
-          <div class="tit">预约单列表</div>
-        </div>
-        <!-- End 项目列表头部 -->
-        <!-- Start 项目列表 -->
-        <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
-            <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <!--            <el-table-column label="操作" align="center" width="120">
+              </el-form-item> -->
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">预约单列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <!--            <el-table-column label="操作" align="center" width="120">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
               </template>
             </el-table-column> -->
-            <el-table-column prop="reserveDate" label="预约日期" align="center" />
-            <el-table-column prop="bankName" label="所属支行" align="center" />
-            <el-table-column prop="storeName" label="提货点" align="center" />
-            <el-table-column prop="brandName" label="菜窖分类" align="center" />
-            <el-table-column prop="userName" label="用户名称" align="center" />
-            <el-table-column prop="userPhone" label="联系电话" align="center" />
-            <el-table-column prop="goodsName" label="商品名称" align="center" />
-            <el-table-column prop="goodsNumber" label="商品数量" align="center" />
-            <el-table-column prop="customerBank" label="客户所属支行" align="center" />
-          </el-table>
-        </div>
-        <!-- End 项目列表 -->
-        <div class="pages">
-          <div class="tit" />
-          <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current" :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                        <el-table-column prop="reserveDate" label="预约日期" align="center" />
+                        <el-table-column prop="bankName" label="所属支行" align="center" />
+                        <el-table-column prop="storeName" label="提货点" align="center" />
+                        <el-table-column prop="brandName" label="菜窖分类" align="center" />
+                        <el-table-column prop="userName" label="用户名称" align="center" />
+                        <el-table-column prop="userPhone" label="联系电话" align="center" />
+                        <el-table-column prop="goodsName" label="商品名称" align="center" />
+                        <el-table-column prop="goodsNumber" label="商品数量" align="center" />
+                        <el-table-column prop="customerBank" label="客户所属支行" align="center" />
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
+                        :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
         </div>
-      </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
     </div>
-    <!-- End 查询和其列表部分 -->
-    <!-- 新增修改部分组件 -->
-    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-  </div>
 </template>
 
 <script>
-  import req from '@/api/lpk/reserveorder.js'
-  import reqBank from '@/api/lpk/bank.js'
-	import reqMall from '@/api/adminmallapi.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import divAdd from './indexInfo.vue'
-  export default {
-    name: 'OrderreserveIndex',
-    components: {
-      ButtonBar,
-      Pagination,
-      divAdd
-    },
-    data() {
-      return {
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-            type: 'success',
-            size: 'small',
-            icon: 'export',
-            btnKey: 'build',
-            btnLabel: '导出'
-          },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        page: {
-          total: 0, // 默认数据总数
-          current: 1, // 默认开始页面
-          size: 10, // 每页的数据条数
-          params: {
-            startDate: '',
-            endDate: '',
-            store: '',
-            bankSid: '',
-            cardType: ''
-          }
+    import req from '@/api/lpk/reserveorder.js'
+    import reqBank from '@/api/lpk/bank.js'
+    import reqMall from '@/api/adminmallapi.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import divAdd from './indexInfo.vue'
+    export default {
+        name: 'OrderreserveIndex',
+        components: {
+            ButtonBar,
+            Pagination,
+            divAdd
         },
-        brandList: [],
-        bankList: [],
-        storeList: []
-      }
-    },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
-    },
-    created() {
-      this.initBank()
-      this.initStore()
-      this.initBrand()
-      // this.getAllStore()
-      // this.loadList()
-      // this.getBankList()
-    },
-    methods: {
-      initBank() {
-        reqBank.listBankAll()
-          .then(resp => {
-            this.bankList = resp.data
-          })
-      },
-      initStore() {
-        reqBank.listStoreOfBank(this.page.params.bankSid)
-          .then(resp => {
-            this.storeList = resp.data
-          })
-      },
-      initBrand() {
-        reqMall.listAllBrand().then(resp => {
-          this.brandList = resp.data
-        })
-      },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'success',
+                        size: 'small',
+                        icon: 'export',
+                        btnKey: 'build',
+                        btnLabel: '导出'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                page: {
+                    total: 0, // 默认数据总数
+                    current: 1, // 默认开始页面
+                    size: 10, // 每页的数据条数
+                    params: {
+                        startDate: '',
+                        endDate: '',
+                        store: '',
+                        bankSid: '',
+                        cardType: ''
+                    }
+                },
+                brandList: [],
+                bankList: [],
+                storeList: []
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            // this.initBank()
+            // this.initStore()
+            // this.initBrand()
+            // this.getAllStore()
+            this.loadList()
+            // this.getBankList()
+        },
+        methods: {
+            initBank() {
+                reqBank.listBankAll()
+                    .then(resp => {
+                        this.bankList = resp.data
+                    })
+            },
+            initStore() {
+                reqBank.listStoreOfBank(this.page.params.bankSid)
+                    .then(resp => {
+                        this.storeList = resp.data
+                    })
+            },
+            initBrand() {
+                reqMall.listAllBrand().then(resp => {
+                    this.brandList = resp.data
+                })
+            },
 
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
-        }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'build': // 导出
-            this.doBuild()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
-        }
-      },
-      bankSelect(val) {
-        console.log('>>>>>>>>>bankSelect', val)
-        this.page.params.bankSid = val
-        this.page.params.store = ''
-        this.initStore()
-      },
-      loadList() {
-        this.tableLoading = true
-        req.pageOfCustomer(this.page).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.page.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.page.total = 0
-          }
-        }).catch(() => {
-          this.tableLoading = false
-        })
-      },
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'build': // 导出
+                        this.doBuild()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            bankSelect(val) {
+                console.log('>>>>>>>>>bankSelect', val)
+                this.page.params.bankSid = val
+                this.page.params.store = ''
+                this.initStore()
+            },
+            loadList() {
+                this.tableLoading = true
+                req.pageOfCustomer(this.page).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.page.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.page.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
 
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.page.current - 1) * this.page.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      dosearch() {
-        this.page.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.page = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            startDate: '',
-            endDate: '',
-            store: '',
-            bankSid: '',
-            cardType: ''
-          }
-        }
-        this.loadList()
-      },
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.page.current - 1) * this.page.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.page.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.page = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        startDate: '',
+                        endDate: '',
+                        store: '',
+                        bankSid: '',
+                        cardType: ''
+                    }
+                }
+                this.loadList()
+            },
 
-      toRelevancy(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            resetState() {
+                this.viewState = 1
+            },
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
 
-      // 导出
-      doBuild() {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
+            // 导出
+            doBuild() {
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
 
-        req.expExcelOfCustomer(this.page.params).then((resp) => {
-          loading.close()
-          const blob = new Blob([resp], {
-            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-          })
-          const fileName = '预约单明细_' + this.page.params.startDate + '.xlsx'
-          const elink = document.createElement('a')
-          elink.download = fileName
-          elink.style.display = 'nonde'
-          elink.href = URL.createObjectURL(blob)
-          document.body.appendChild(elink)
-          elink.click()
-          URL.revokeObjectURL(elink.href)
-          document.body.removeChild(elink)
-        }).catch(() => {
-          loading.close()
-        })
-      }
+                req.expExcelOfCustomer(this.page.params).then((resp) => {
+                    loading.close()
+                    const blob = new Blob([resp], {
+                        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                    })
+                    const fileName = '预约单明细_' + this.page.params.startDate + '.xlsx'
+                    const elink = document.createElement('a')
+                    elink.download = fileName
+                    elink.style.display = 'nonde'
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    URL.revokeObjectURL(elink.href)
+                    document.body.removeChild(elink)
+                }).catch(() => {
+                    loading.close()
+                })
+            }
 
+        }
     }
-  }
 </script>
 <style scoped>
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/orderreserve/subBranch.vue b/src/views/orderreserve/subBranch.vue
index e85c41e..8909714 100644
--- a/src/views/orderreserve/subBranch.vue
+++ b/src/views/orderreserve/subBranch.vue
@@ -1,21 +1,23 @@
 <template>
-  <div class="app-container">
-    <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="支行配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
-      <div class="main-content">
-        <div class="searchcon">
-          <el-button size="small" class="searchbtn" @click="clicksearchShow">
-            {{ searchxianshitit }}
-          </el-button>
-          <div v-show="isSearchShow" class="search">
-            <el-form :inline="true" class="tab-header">
-              <el-form-item label="预约开始日期">
-                <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-              </el-form-item>
-              <el-form-item label="预约结束日期">
-                <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
-              </el-form-item>
-              <el-form-item label="所属支行">
+    <div class="app-container">
+        <div v-show="viewState == 1">
+            <button-bar ref="btnbar" view-title="支行配货统计" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+            <div class="main-content">
+                <div class="searchcon">
+                    <el-button size="small" class="searchbtn" @click="clicksearchShow">
+                        {{ searchxianshitit }}
+                    </el-button>
+                    <div v-show="isSearchShow" class="search">
+                        <el-form :inline="true" class="tab-header">
+                            <el-form-item label="预约开始日期">
+                                <el-date-picker v-model="page.params.startDate" type="date" placeholder="选择日期"
+                                    format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
+                            </el-form-item>
+                            <el-form-item label="预约结束日期">
+                                <el-date-picker v-model="page.params.endDate" type="date" placeholder="选择日期"
+                                    format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" clearable />
+                            </el-form-item>
+                            <!-- <el-form-item label="所属支行">
                 <el-select v-model="page.params.bankSid" filterable class="item_input" clearable placeholder="请选择" style="width:100%">
                   <el-option v-for="item in bankList" :key="item.sid" :label="item.name" :value="item.sid" />
                 </el-select>
@@ -24,234 +26,238 @@
                 <el-select v-model="page.params.cardType" filterable class="item_input" clearable placeholder="请选择" style="width:100%">
                   <el-option v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
-              </el-form-item>
-            </el-form>
-            <div class="btn" style="text-align: center;">
-              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
-              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </div>
-          </div>
-        </div>
-        <!-- Start 项目列表头部 -->
-        <div class="listtop">
-          <div class="tit">支行配货列表</div>
-        </div>
-        <!-- End 项目列表头部 -->
-        <!-- Start 项目列表 -->
-        <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
-            <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <!-- 	<el-table-column label="操作" align="center" width="120">
+              </el-form-item> -->
+                        </el-form>
+                        <div class="btn" style="text-align: center;">
+                            <el-button type="primary" size="small" icon="el-icon-search"
+                                @click="dosearch">查询</el-button>
+                            <el-button type="primary" size="small" icon="el-icon-refresh"
+                                @click="resetQuery">重置</el-button>
+                        </div>
+                    </div>
+                </div>
+                <!-- Start 项目列表头部 -->
+                <div class="listtop">
+                    <div class="tit">支行配货列表</div>
+                </div>
+                <!-- End 项目列表头部 -->
+                <!-- Start 项目列表 -->
+                <div class="">
+                    <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
+                        <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+                        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+                        <!-- 	<el-table-column label="操作" align="center" width="120">
 							<template slot-scope="scope">
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-            <el-table-column prop="reserveDate" label="预约日期" align="center" />
-            <el-table-column prop="bankName" label="支行名称" align="center" />
-            <el-table-column prop="brandName" label="菜窖分类" align="center" />
-            <el-table-column prop="goodsName" label="商品名称" align="center" />
-            <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
-            <el-table-column prop="bankAddress" label="支行地址" align="center" />
-            <el-table-column prop="bankLinker" label="支行联系人" align="center" />
-            <el-table-column prop="bankPhone" label="支行电话" align="center" />
+                        <el-table-column prop="reserveDate" label="预约日期" align="center" />
+                        <el-table-column prop="bankName" label="支行名称" align="center" />
+                        <el-table-column prop="brandName" label="菜窖分类" align="center" />
+                        <el-table-column prop="goodsName" label="商品名称" align="center" />
+                        <el-table-column prop="goodsNumber" label="数量(份)" align="center" />
+                        <el-table-column prop="bankAddress" label="支行地址" align="center" />
+                        <el-table-column prop="bankLinker" label="支行联系人" align="center" />
+                        <el-table-column prop="bankPhone" label="支行电话" align="center" />
 
-          </el-table>
-        </div>
-        <!-- End 项目列表 -->
-        <div class="pages">
-          <div class="tit" />
-          <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current" :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                    </el-table>
+                </div>
+                <!-- End 项目列表 -->
+                <div class="pages">
+                    <div class="tit" />
+                    <!--  翻页  -->
+                    <pagination v-show="dataList.length > 0" :total="page.total" :page.sync="page.current"
+                        :limit.sync="page.size" class="pagination" @pagination="loadList" />
+                </div>
+            </div>
         </div>
-      </div>
+        <!-- End 查询和其列表部分 -->
+        <!-- 新增修改部分组件 -->
+        <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
     </div>
-    <!-- End 查询和其列表部分 -->
-    <!-- 新增修改部分组件 -->
-    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-  </div>
 </template>
 
 <script>
-  import req from '@/api/lpk/reserveorder.js'
-  import reqBank from '@/api/lpk/bank.js'
-	import reqMall from '@/api/adminmallapi.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import divAdd from './indexInfo.vue'
-  export default {
-    name: 'OrderreserveSubBranch',
-    components: {
-      ButtonBar,
-      Pagination,
-      divAdd
-    },
-    data() {
-      return {
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-            type: 'success',
-            size: 'small',
-            icon: 'export',
-            btnKey: 'build',
-            btnLabel: '导出'
-          },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        page: {
-          total: 0, // 默认数据总数
-          current: 1, // 默认开始页面
-          size: 10, // 每页的数据条数
-          params: {
-            startDate: '',
-            endDate: '',
-            bankSid: '',
-            cardType: ''
-          }
+    import req from '@/api/lpk/reserveorder.js'
+    import reqBank from '@/api/lpk/bank.js'
+    import reqMall from '@/api/adminmallapi.js'
+    import ButtonBar from '@/components/ButtonBar'
+    import Pagination from '@/components/pagination'
+    import divAdd from './indexInfo.vue'
+    export default {
+        name: 'OrderreserveSubBranch',
+        components: {
+            ButtonBar,
+            Pagination,
+            divAdd
         },
-        brandList: [],
-        bankList: []
-      }
-    },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
-    },
-    created() {
-      this.initBank()
-      this.initBrand()
-    },
-    methods: {
-      initBank() {
-        reqBank.listBankAll()
-          .then(resp => {
-            this.bankList = resp.data
-          })
-      },
-      initBrand() {
-        reqMall.listAllBrand().then(resp => {
-          this.brandList = resp.data
-        })
-      },
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
-        }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'build': // 导出
-            this.doBuild()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
-        }
-      },
-      loadList() {
-        this.tableLoading = true
-        req.pageOfBank(this.page).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.page.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.page.total = 0
-          }
-        }).catch(() => {
-          this.tableLoading = false
-        })
-      },
+        data() {
+            return {
+                btndisabled: false,
+                viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+                isSearchShow: false,
+                searchxianshitit: '显示查询条件',
+                tableLoading: false,
+                dataList: [],
+                btnList: [{
+                        type: 'success',
+                        size: 'small',
+                        icon: 'export',
+                        btnKey: 'build',
+                        btnLabel: '导出'
+                    },
+                    {
+                        type: 'info',
+                        size: 'small',
+                        icon: 'cross',
+                        btnKey: 'doClose',
+                        btnLabel: '关闭'
+                    }
+                ],
+                page: {
+                    total: 0, // 默认数据总数
+                    current: 1, // 默认开始页面
+                    size: 10, // 每页的数据条数
+                    params: {
+                        startDate: '',
+                        endDate: '',
+                        bankSid: '',
+                        cardType: ''
+                    }
+                },
+                brandList: [],
+                bankList: []
+            }
+        },
+        mounted() {
+            this.$refs['btnbar'].setButtonList(this.btnList)
+        },
+        created() {
+            // this.initBank()
+            // this.initBrand()
+            this.loadList()
+        },
+        methods: {
+            initBank() {
+                reqBank.listBankAll()
+                    .then(resp => {
+                        this.bankList = resp.data
+                    })
+            },
+            initBrand() {
+                reqMall.listAllBrand().then(resp => {
+                    this.brandList = resp.data
+                })
+            },
+            // 搜索条件效果
+            clicksearchShow() {
+                this.isSearchShow = !this.isSearchShow
+                if (this.isSearchShow) {
+                    this.searchxianshitit = '隐藏查询条件'
+                } else {
+                    this.searchxianshitit = '显示查询条件'
+                }
+            },
+            btnHandle(btnKey) {
+                switch (btnKey) {
+                    case 'build': // 导出
+                        this.doBuild()
+                        break
+                    case 'doClose':
+                        this.doClose()
+                        break
+                    default:
+                        break
+                }
+            },
+            loadList() {
+                this.tableLoading = true
+                req.pageOfBank(this.page).then((resp) => {
+                    this.tableLoading = false
+                    if (resp.success) {
+                        const data = resp.data
+                        this.page.total = data.total
+                        this.dataList = data.records
+                    } else {
+                        // 根据resp.code进行异常情况处理
+                        this.dataList = []
+                        this.page.total = 0
+                    }
+                }).catch(() => {
+                    this.tableLoading = false
+                })
+            },
 
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.page.current - 1) * this.page.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      dosearch() {
-        this.page.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.page = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            startDate: '',
-            endDate: '',
-            bankSid: '',
-            cardType: ''
-          }
-        }
-        this.loadList()
-      },
+            // 序号
+            indexMethod(index) {
+                var pagestart = (this.page.current - 1) * this.page.size
+                var pageindex = index + 1 + pagestart
+                return pageindex
+            },
+            dosearch() {
+                this.page.current = 1
+                this.loadList()
+            },
+            resetQuery() {
+                this.page = {
+                    current: 1,
+                    size: 10,
+                    total: 0,
+                    params: {
+                        startDate: '',
+                        endDate: '',
+                        bankSid: '',
+                        cardType: ''
+                    }
+                }
+                this.loadList()
+            },
 
-      toRelevancy(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
+            toRelevancy(row) {
+                this.viewState = 3
+                this.$refs['divadd'].showEdit(row)
+            },
+            resetState() {
+                this.viewState = 1
+            },
+            doClose() {
+                this.$store.dispatch('tagsView/delView', this.$route)
+                this.$router.go(-1)
+            },
 
-      // 导出
-      doBuild() {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
+            // 导出
+            doBuild() {
+                const loading = this.$loading({
+                    lock: true,
+                    text: 'Loading',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                })
 
-        req.expExcelOfBank(this.page.params).then((resp) => {
-          loading.close()
-          const blob = new Blob([resp], {
-            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-          })
-          const fileName = '支行配货明细_' + this.page.params.startDate + '.xlsx'
-          const elink = document.createElement('a')
-          elink.download = fileName
-          elink.style.display = 'nonde'
-          elink.href = URL.createObjectURL(blob)
-          document.body.appendChild(elink)
-          elink.click()
-          URL.revokeObjectURL(elink.href)
-          document.body.removeChild(elink)
-        }).catch(() => {
-          loading.close()
-        })
-      }
+                req.expExcelOfBank(this.page.params).then((resp) => {
+                    loading.close()
+                    const blob = new Blob([resp], {
+                        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                    })
+                    const fileName = '支行配货明细_' + this.page.params.startDate + '.xlsx'
+                    const elink = document.createElement('a')
+                    elink.download = fileName
+                    elink.style.display = 'nonde'
+                    elink.href = URL.createObjectURL(blob)
+                    document.body.appendChild(elink)
+                    elink.click()
+                    URL.revokeObjectURL(elink.href)
+                    document.body.removeChild(elink)
+                }).catch(() => {
+                    loading.close()
+                })
+            }
 
+        }
     }
-  }
 </script>
 <style scoped>
-  ::v-deep .el-table .cell {
-    padding: 0px;
-  }
-</style>
+    ::v-deep .el-table .cell {
+        padding: 0px;
+    }
+</style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 49e1300..af9fa42 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
     return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '惠享' // page title
+const name = defaultSettings.title || '预订商城' // page title
 
 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
@@ -24,8 +24,8 @@ module.exports = {
      *在大多数情况下，请使用“/”！！！
      *详细信息：https://cli.vuejs.org/config/#publicpath
      */
-    publicPath: process.env.NODE_ENV === 'production' ? '/lpk/' : '/',
-    outputDir: 'yythmall-ui',
+    publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
+    outputDir: 'ordermall-ui',
     assetsDir: 'static',
     lintOnSave: process.env.NODE_ENV === 'development',
     productionSourceMap: false,