diff --git a/common/config.js b/common/config.js
index 2f4b11b..8281903 100644
--- a/common/config.js
+++ b/common/config.js
@@ -24,11 +24,14 @@ const config = {
}
// 设置后台接口服务的基础地址
-config.baseUrl = 'http://tc.cqsznc.com:7080/api';
+ //测试
+// config.baseUrl = 'http://tc.cqsznc.com:7080/api';
+
+//本地
+config.baseUrl = '/js';
//正式
-// config.baseUrl = '/js';
-
+// config.baseUrl = 'http://183.230.235.66:11010/api';
// config.baseUrl = 'http://378a061a.r28.cpolar.top'
export default config;
diff --git a/common/http.api.js b/common/http.api.js
index 91f46f4..fd94c75 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -115,7 +115,7 @@ const install = (Vue, vm) => {
},
// 单位管理
unit:{
- addEmployee:(params = {}) => vm.$u.post(config.adminPath+'/property/xcx/person', params),
+ addEmployee:(params = {}) => vm.$u.post(config.adminPath+'/property/xcx/person/add', params),
queryEmployeeById:(params = {}) => vm.$u.get(config.adminPath+'/property/xcx/person/'+ params.id),
queryEmployee:(params = {}) => vm.$u.get(config.adminPath+'/property/xcx/person/list', params),
updateEmployee:(params = {}) => vm.$u.put(config.adminPath+'/property/xcx/person', params),
diff --git a/pages/sys/workbench/meet/createMeet.vue b/pages/sys/workbench/meet/createMeet.vue
index 9fa920f..a4f81b8 100644
--- a/pages/sys/workbench/meet/createMeet.vue
+++ b/pages/sys/workbench/meet/createMeet.vue
@@ -1,496 +1,599 @@
-
-
-
-
- 今天 07-07 周六
-
-
- 07-07 周一
-
- 07-08 周二
- 07-09 周三
- 07-10 周四
- 07-11 周五
-
-
+
+
+
+
+
+ {{item.weekDay}}
+ {{item.date}}
+ 今天
+
+
+
+
+ 选择时段
+
+
+
+ 上午
+
+
+
+ 下午
+
+
-
- 选择时段
-
-
- 上午
-
-
- 下午
-
-
+
+ 会议人数
+
+
+ 会议主题
+
-
- 会议人数
-
+
+ 会议时间
+
+
+
+
+ 选择会议室
+
+
+ {{ formData.meetingRoom || '请选择会议室' }}
+
+
+
-
- 选择会议室
-
-
- {{formData.meetingRoom || '请选择会议室'}}
- {{meetingRooms[meetingRoomIndex]}}
-
-
+
+ 增值服务
+
+ 会议物品
+
+
+
+
+
+ {{category.name}}
+
+
+
+ {{item.name}}
+ ¥{{item.price}}/{{item.unit}}
+
+
+ -
+
+ +
+
+
+
+
-
- 会议主题
-
+
+
+
-
-
-
- 会议时间
-
- {{ meetingTime || '请选择会议时间' }}
-
-
-
-
-
-
-
- 是否需要签到
-
-
- 是
-
-
-
- 否
-
-
-
- 增值服务
-
- 会议物品
-
-
-
-
-
- {{data.type}}
-
-
- {{item.name}}
- ¥{{item.price}}/{{item.unit}}
-
-
- -
-
- +
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/pages/sys/workbench/meet/meetDetail.vue b/pages/sys/workbench/meet/meetDetail.vue
new file mode 100644
index 0000000..e69de29
diff --git a/pages/sys/workbench/unitManagement/unitManagement.vue b/pages/sys/workbench/unitManagement/unitManagement.vue
index dc09929..29016ac 100644
--- a/pages/sys/workbench/unitManagement/unitManagement.vue
+++ b/pages/sys/workbench/unitManagement/unitManagement.vue
@@ -104,8 +104,8 @@ export default {
},
showInviteDialog() {
this.showDialog = true;
- this.$nextTick( () => {
- this.makeQRCode();
+ this.$nextTick(() => {
+ this.makeQRCode();
});
},
hideInviteDialog() {
@@ -116,7 +116,9 @@ export default {
// 获取uQRCode实例
var qr = new uQRCode();
// 设置二维码内容
- qr.data = `http://183.230.235.66:11010/sys/workbench/unitManagement/employeeAdd?unitId=${uni.getStorageSync('lifeData').vuex_user.unitId}`;
+ qr.data = `http://183.230.235.66:11010/parkH5/pages/sys/workbench/unitManagement/employeeAdd?unitId=${uni.getStorageSync('lifeData').vuex_user.unitId}
+ & unitName=${uni.getStorageSync('lifeData').vuex_user.unitName}
+ & tenantId=${uni.getStorageSync('lifeData').vuex_user.tenantId}`;
// 设置二维码大小,必须与canvas设置的宽高一致
qr.size = 200;
// 调用制作二维码方法
@@ -307,7 +309,7 @@ export default {
/* 修复:统一用动态尺寸,移除固定宽高,优化居中 */
.qr-code-container {
/* 容器尺寸略大于二维码,留出白边 */
- width:380rpx;
+ width: 380rpx;
height: 380rpx;
background-color: white;
border-radius: 10rpx;
@@ -322,7 +324,6 @@ export default {
}
-
/* 新增圆形关闭按钮样式 */
.close-circle-btn {
width: 80rpx;
diff --git a/pages/sys/workbench/workbench.vue b/pages/sys/workbench/workbench.vue
index d9fbac8..442e0bc 100644
--- a/pages/sys/workbench/workbench.vue
+++ b/pages/sys/workbench/workbench.vue
@@ -80,12 +80,12 @@
// url:'/pages/sys/workbench/monitor/monitors'
// },
// {
- // icon: '/static/aaaa_bsbx.png',
- // text: '报事报修',
- // url:'/pages/sys/user/myRepair/myRepair'
+ // icon: '/static/aaa_hy.png',
+ // text: '会议管理',
+ // url:'/pages/sys/workbench/meet/meet'
// },
{
- icon: '/static/ic_unit.png',
+ icon: '/static/aaa_dw.png',
text: '单位管理',
url:'/pages/sys/workbench/unitManagement/unitManagement'
},
diff --git a/static/ic_unit.png b/static/aaa_dw.png
similarity index 100%
rename from static/ic_unit.png
rename to static/aaa_dw.png
diff --git a/static/aaa_hy.png b/static/aaa_hy.png
new file mode 100644
index 0000000..af203b3
Binary files /dev/null and b/static/aaa_hy.png differ