diff --git a/api/demo.js b/api/demo.js
deleted file mode 100644
index 025c496..0000000
--- a/api/demo.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import http from '@/http/api.js'
-
-// 获取验证码
-const captcha = (data) => {
- return http.request({
- url: '/api/blade-auth/oauth/captcha',
- method: 'GET',
- data
- })
-}
-
-export default {
- captcha,
-}
\ No newline at end of file
diff --git a/api/notice.js b/api/notice.js
deleted file mode 100644
index d2373b7..0000000
--- a/api/notice.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import http from '@/http/api.js'
-
-// 获取通知公告列表
-export const getList = (params) => {
- return http.request({
- url: '/api/blade-desk/notice/list',
- method: 'GET',
- params
- })
-}
-
-export const remove = (ids) => {
- return http.request({
- url: '/api/blade-desk/notice/remove',
- method: 'post',
- params: {
- ids,
- }
- })
-}
-
-export const add = (row) => {
- return http.request({
- url: '/api/blade-desk/notice/submit',
- method: 'post',
- data: row
- })
-}
-
-export const update = (row) => {
- return http.request({
- url: '/api/blade-desk/notice/submit',
- method: 'post',
- data: row
- })
-}
\ No newline at end of file
diff --git a/api/reserve.js b/api/reserve.js
deleted file mode 100644
index 477c804..0000000
--- a/api/reserve.js
+++ /dev/null
@@ -1,151 +0,0 @@
-import http from '@/http/api.js'
-
-/**
- * 获取部门列表
- * @param {*} params
- * @returns
- */
-export const deptList = params => {
- return http.request({
- url: '/api/blade-system/dept/list-page',
- method: 'GET',
- params: {
- ...params
- },
- });
-};
-
-/**
- * 获取事项列表
- * @param {*} params
- * @returns
- */
-export const itemList = params => {
- return http.request({
- url: '/api/blade-biz/item/list',
- method: 'GET',
- params: {
- ...params
- },
- });
-};
-
-/**
- * 预约须知
- * @param {*} params
- * @returns
- */
-export const noticeData = params => {
- return http.request({
- url: '/api/blade-noticeinfo/noticeInfo/list',
- method: 'GET',
- params: {
- ...params
- },
- });
-};
-
-/**
- * 获取可用日历
- * @param {*} params
- * @returns
- */
-export const availableDate = params => {
- return http.request({
- url: '/api/blade-bookingdate/bookingDate/available-week-dates',
- method: 'GET',
- params: {
- ...params
- },
- });
-};
-
-/**
- * 查询用户信息
- * @param {*} params
- * @returns
- */
-export const getUserInfo = params => {
- return http.request({
- url: '/api/blade-system/user/info',
- method: 'GET',
- params: {
- ...params
- },
- });
-};
-
-/**
- * 提交预约
- * @param {*} params
- * @returns
- */
-export const submit = params => {
- return http.request({
- url: '/api/blade-biz/booking/submit-booking',
- method: 'POST',
- data: {
- ...params
- },
- });
-};
-
-/**
- * 查询我的预约
- * @param {*} params
- * @returns
- */
-export const myReserve = params => {
- return http.request({
- url: '/api/blade-biz/booking/list',
- method: 'GET',
- params: {
- ...params
- },
- });
-};
-
-/**
- * 取消预约
- * @param {*} params
- * @returns
- */
-export const cancel = params => {
- return http.request({
- url: '/api/blade-biz/booking/cancel',
- method: 'POST',
- params: {
- ...params
- },
- });
-};
-
-/**
- * 获取详情
- * @param {*} params
- * @returns
- */
-export const getDetail = params => {
- return http.request({
- url: '/api/blade-biz/booking/detail',
- method: 'GET',
- params: {
- ...params
- },
- });
-};
-
-/**
- * 获取是否无感取号成功
- * @param {*} params
- * @returns
- */
-export const getIsSuccessTicket = params => {
- return http.request({
- url: '/api/blade-onlineticket/onlineTicket/getByYyNo',
- method: 'GET',
- params: {
- ...params
- },
- });
-};
\ No newline at end of file
diff --git a/api/ticket.js b/api/ticket.js
new file mode 100644
index 0000000..d80e324
--- /dev/null
+++ b/api/ticket.js
@@ -0,0 +1,59 @@
+import http from '@/http/api.js'
+
+/**
+ * 主题取号列表
+ * @param {*} params
+ * @returns
+ */
+export const getThemeList = params => {
+ return http.request({
+ url: 'api/blade-subject/subject/list',
+ method: 'GET',
+ params: {
+ ...params
+ },
+ });
+};
+
+/**
+ * 事项列表
+ * @param {*} params
+ * @returns
+ */
+export const getBusinessList = params => {
+ return http.request({
+ url: 'api/blade-item/list',
+ method: 'GET',
+ params: {
+ ...params
+ },
+ });
+};
+
+/**
+ * 历史取号列表
+ * @param {*} params
+ * @returns
+ */
+export const getHistoryList = params => {
+ return http.request({
+ url: 'api/blade-queuerecord/queueRecord/history',
+ method: 'GET',
+ params: {
+ ...params
+ },
+ });
+};
+
+/**
+ * 取号
+ * @param {*} data { applicantName, applicantIdCard, itemId, windowId }
+ * @returns
+ */
+export const takeNumber = data => {
+ return http.request({
+ url: 'api/blade-queuerecord/queueRecord/take-number',
+ method: 'POST',
+ data
+ });
+};
\ No newline at end of file
diff --git a/http/api.js b/http/api.js
index 5a6d9fc..8dd9009 100644
--- a/http/api.js
+++ b/http/api.js
@@ -20,7 +20,7 @@ http.interceptors.request.use((config) => { // 可使用async await 做异步操
config.header['Blade-Requested-With'] = 'BladeHttpRequest';
// 客户端认证参数
config.header['Authorization'] = 'Basic ' + Base64.encode(clientId + ':' + clientSecret);
-
+
// #ifndef H5
let url = config.url
if (process.env.NODE_ENV == 'development' && !url.startsWith("http")) {
@@ -44,8 +44,8 @@ http.interceptors.request.use((config) => { // 可使用async await 做异步操
/**
/* 演示
if (!token) { // 如果token不存在,return Promise.reject(config) 会取消本次请求
- return Promise.reject(config)
- }
+ return Promise.reject(config)
+ }
**/
return config
}, config => { // 可使用async await 做异步操作
diff --git a/manifest.json b/manifest.json
index 72add51..1facbc1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name": "住房保障预约",
+ "name": "环江取号机",
"appid": "__UNI__8FD82FF",
"description": "",
"versionName": "2.0.0",
@@ -104,11 +104,6 @@
},
"h5": {
"template": "template.h5.html",
- "publicPath": "/housingAssuranceBookingMobile/",
- "router": {
- "mode": "hash",
- "base": "/housingAssuranceBookingMobile"
- },
"optimization": {
"treeShaking": {
"enable": true
@@ -117,18 +112,12 @@
"devServer": {
"proxy": {
"/api": {
- "target": "http://192.168.3.111:8181",
+ "target": "http://192.168.3.130:8079",
// "target" : "http://192.168.3.100:2891",
//"target" : "https://rider.bladex.vip/api",
"pathRewrite": {
"^/api": "/"
}
- },
- "/epoint-web-cs": {
- "target": "https://gxqzzfbzzx.cn",
- "pathRewrite": {
- "^/epoint-web-cs": "/"
- }
}
},
"port": ""
diff --git a/pages/home/businessList.vue b/pages/home/businessList.vue
index 879746c..dd0263c 100644
--- a/pages/home/businessList.vue
+++ b/pages/home/businessList.vue
@@ -4,16 +4,20 @@
-
+ {{ titleName }}
+
◆
- {{ item.name }}
+ {{ item.itemName }}
办事指南
取号
+
+ 暂无事项
+
@@ -22,50 +26,118 @@
\ No newline at end of file
+.text {
+ font-size: 30px;
+ color: rgba(51, 51, 51, 1);
+}
+