diff --git a/antis-ncc-admin/src/views/lqHytkHytk/detail.vue b/antis-ncc-admin/src/views/lqHytkHytk/detail.vue index c6daa98..9b6f32e 100644 --- a/antis-ncc-admin/src/views/lqHytkHytk/detail.vue +++ b/antis-ncc-admin/src/views/lqHytkHytk/detail.vue @@ -149,7 +149,7 @@ -
+
科技部老师业绩
diff --git a/antis-ncc-admin/src/views/statisticsList/form1.vue b/antis-ncc-admin/src/views/statisticsList/form1.vue index 847d8e4..60d2a45 100644 --- a/antis-ncc-admin/src/views/statisticsList/form1.vue +++ b/antis-ncc-admin/src/views/statisticsList/form1.vue @@ -914,13 +914,13 @@ export default { const projectNumber = matchedItem ? (Number(matchedItem.projectNumber) || 0) : 0 const itemAmount = price * projectNumber - // 构建行数据 + // 构建行数据(所有行都显示完整数据,补全空白部分) const rowData = [ - teacherIndex === 0 ? baseData.date : '', // 开单日期(只在第一行显示) - teacherIndex === 0 ? baseData.customerName : '', // 客户姓名(只在第一行显示) - teacherIndex === 0 ? baseData.customerPhone : '', // 客户电话(只在第一行显示) - teacherIndex === 0 ? baseData.goldTriangle : '', // 金三角(只在第一行显示) - teacherIndex === 0 ? baseData.customerType : '', // 客户类型(只在第一行显示) + baseData.date, // 开单日期 + baseData.customerName, // 客户姓名 + baseData.customerPhone, // 客户电话 + baseData.goldTriangle, // 金三角 + baseData.customerType, // 客户类型 teacher.teacherName || '无', // 健康师 teacher.performance ? `¥${this.formatMoney(teacher.performance)}` : '¥0.00', // 业绩金额 matchedItem ? (matchedItem.itemName || '无') : (teacher.itemName || '无'), // 相关品项 @@ -929,15 +929,15 @@ export default { matchedItem && matchedItem.price ? `¥${this.formatMoney(matchedItem.price)}` : '¥0.00', // 单价 matchedItem ? (matchedItem.projectNumber || 0) : 0, // 次数 `¥${this.formatMoney(itemAmount)}`, // 品项金额(单价 * 次数) - teacherIndex === 0 ? baseData.paidAmount : '', // 已付金额(只在第一行显示) - teacherIndex === 0 ? baseData.debtAmount : '', // 欠款金额(只在第一行显示) - teacherIndex === 0 ? baseData.totalAmount : '', // 总金额(只在第一行显示) - teacherIndex === 0 ? baseData.paymentMethod : '', // 支付方式(只在第一行显示) - teacherIndex === 0 ? baseData.cooperationInstitutionName : '', // 合作机构(只在第一行显示) - teacherIndex === 0 ? baseData.paymentHospitalName : '', // 结算机构(只在第一行显示) - teacherIndex === 0 ? baseData.activityName : '', // 活动名称(只在第一行显示) - teacherIndex === 0 ? baseData.remark : '', // 备注(只在第一行显示) - teacherIndex === 0 ? baseData.createTime : '' // 开单时间(只在第一行显示) + baseData.paidAmount, // 已付金额 + baseData.debtAmount, // 欠款金额 + baseData.totalAmount, // 总金额 + baseData.paymentMethod, // 支付方式 + baseData.cooperationInstitutionName, // 合作机构 + baseData.paymentHospitalName, // 结算机构 + baseData.activityName, // 活动名称 + baseData.remark, // 备注 + baseData.createTime // 开单时间 ] dataRows.push(rowData) }) diff --git a/绿纤uni-app/apis/modules/oauth.js b/绿纤uni-app/apis/modules/oauth.js index af44d7c..443506c 100644 --- a/绿纤uni-app/apis/modules/oauth.js +++ b/绿纤uni-app/apis/modules/oauth.js @@ -27,4 +27,8 @@ export default { getUserList(params) { return request.get(`${config.getApiBaseUrl()}/api/permission/Users`, params); }, + // 修改密码 + changePassword(data) { + return request.post(`${config.getApiBaseUrl()}/api/permission/Users/ChangePassword`, data); + }, } \ No newline at end of file diff --git a/绿纤uni-app/common/config.js b/绿纤uni-app/common/config.js index 6594ec3..36cb2fd 100644 --- a/绿纤uni-app/common/config.js +++ b/绿纤uni-app/common/config.js @@ -10,8 +10,8 @@ const ENV_CONFIG = { // 正式环境 production: { name: '正式环境', - // apiBaseUrl: 'http://erp_test.lvqianmeiye.com', - apiBaseUrl: 'https://erp.lvqianmeiye.com', + apiBaseUrl: 'http://erp_test.lvqianmeiye.com', + // apiBaseUrl: 'https://erp.lvqianmeiye.com', description: '生产环境服务器' } }; diff --git a/绿纤uni-app/components/custom-tab-bar/index.vue b/绿纤uni-app/components/custom-tab-bar/index.vue new file mode 100644 index 0000000..63eab47 --- /dev/null +++ b/绿纤uni-app/components/custom-tab-bar/index.vue @@ -0,0 +1,188 @@ + + + + + \ No newline at end of file diff --git a/绿纤uni-app/components/custom-tab-bar/index副本.vue b/绿纤uni-app/components/custom-tab-bar/index副本.vue new file mode 100644 index 0000000..afb3ff7 --- /dev/null +++ b/绿纤uni-app/components/custom-tab-bar/index副本.vue @@ -0,0 +1,189 @@ + + + + + + diff --git a/绿纤uni-app/pages.json b/绿纤uni-app/pages.json index fc74e88..c188cd9 100644 --- a/绿纤uni-app/pages.json +++ b/绿纤uni-app/pages.json @@ -1,6 +1,21 @@ { "pages": [ { + "path": "pages/home/home", + "style": { + "navigationBarTitleText": "绿纤工作台" + // "navigationStyle": "custom" + } + }, + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "绿纤协同平台", + "navigationStyle": "custom" + } + }, + + { "path": "pages/index/index", "style": { "navigationBarTitleText": "绿纤协同平台", @@ -118,14 +133,6 @@ } }, { - "path" : "refund/refund", - "style" : - { - "enablePullDownRefresh": false , - "navigationBarTitleText" : "退卡" - } - }, - { "path" : "pages/lx-list/lx-list", "style" : { @@ -328,6 +335,18 @@ { "navigationBarTitleText" : "旧日志" } + }, + { + "path": "pages/information/information", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/me/me", + "style": { + "navigationStyle": "custom" + } } ], "globalStyle": { @@ -336,4 +355,35 @@ "navigationBarBackgroundColor": "#fff" }, "uniIdRouter": {} + // "tabBar": { + // "custom": false, + // "color": "#8a8a8a", + // "borderStyle": "white", + // "fontSize": "12px", + // "iconWidth": "30px", + // "spacing": "1px", + // "selectedColor": "#009b4d", + // "backgroundColor": "#FFFFFF", + // "height": "65px", + // "list": [ + // { + // "iconPath": "/static/tabBar/icon2.png", + // "selectedIconPath": "/static/tabBar/icon1.png", + // "pagePath": "pages/home/home", + // "text": "首页" + // }, + // { + // "iconPath": "/static/tabBar/icon4.png", + // "selectedIconPath": "/static/tabBar/icon3.png", + // "pagePath": "pages/information/information", + // "text": "数据中心" + // }, + // { + // "iconPath": "/static/tabBar/icon6.png", + // "selectedIconPath": "/static/tabBar/icon5.png", + // "pagePath": "pages/me/me", + // "text": "我的" + // } + // ] + // } } diff --git a/绿纤uni-app/pages/home/application.vue b/绿纤uni-app/pages/home/application.vue new file mode 100644 index 0000000..c18904a --- /dev/null +++ b/绿纤uni-app/pages/home/application.vue @@ -0,0 +1,1187 @@ + + + + diff --git a/绿纤uni-app/pages/home/home.vue b/绿纤uni-app/pages/home/home.vue new file mode 100644 index 0000000..49a1803 --- /dev/null +++ b/绿纤uni-app/pages/home/home.vue @@ -0,0 +1,368 @@ + + + + + \ No newline at end of file diff --git a/绿纤uni-app/refund/refund.vue b/绿纤uni-app/pages/information/information.vue index 8183fd0..b6e3706 100644 --- a/绿纤uni-app/refund/refund.vue +++ b/绿纤uni-app/pages/information/information.vue @@ -1,22 +1,20 @@ + \ No newline at end of file diff --git a/绿纤uni-app/pages/me/me.vue b/绿纤uni-app/pages/me/me.vue new file mode 100644 index 0000000..babd26a --- /dev/null +++ b/绿纤uni-app/pages/me/me.vue @@ -0,0 +1,1037 @@ + + + + + \ No newline at end of file diff --git a/绿纤uni-app/static/head.png b/绿纤uni-app/static/head.png new file mode 100644 index 0000000..7209c90 --- /dev/null +++ b/绿纤uni-app/static/head.png diff --git a/绿纤uni-app/static/home/activity-order.png b/绿纤uni-app/static/home/activity-order.png new file mode 100644 index 0000000..8a84d47 --- /dev/null +++ b/绿纤uni-app/static/home/activity-order.png diff --git a/绿纤uni-app/static/home/ai-qa.png b/绿纤uni-app/static/home/ai-qa.png new file mode 100644 index 0000000..c2a3407 --- /dev/null +++ b/绿纤uni-app/static/home/ai-qa.png diff --git a/绿纤uni-app/static/home/consume-card.png b/绿纤uni-app/static/home/consume-card.png new file mode 100644 index 0000000..2d34efe --- /dev/null +++ b/绿纤uni-app/static/home/consume-card.png diff --git a/绿纤uni-app/static/home/create-member.png b/绿纤uni-app/static/home/create-member.png new file mode 100644 index 0000000..a2ee727 --- /dev/null +++ b/绿纤uni-app/static/home/create-member.png diff --git a/绿纤uni-app/static/home/dingxuan-order.png b/绿纤uni-app/static/home/dingxuan-order.png new file mode 100644 index 0000000..410197a --- /dev/null +++ b/绿纤uni-app/static/home/dingxuan-order.png diff --git a/绿纤uni-app/static/home/expansion.png b/绿纤uni-app/static/home/expansion.png new file mode 100644 index 0000000..26fedf0 --- /dev/null +++ b/绿纤uni-app/static/home/expansion.png diff --git a/绿纤uni-app/static/home/member.png b/绿纤uni-app/static/home/member.png new file mode 100644 index 0000000..0621b97 --- /dev/null +++ b/绿纤uni-app/static/home/member.png diff --git a/绿纤uni-app/static/home/order.png b/绿纤uni-app/static/home/order.png new file mode 100644 index 0000000..a295040 --- /dev/null +++ b/绿纤uni-app/static/home/order.png diff --git a/绿纤uni-app/static/home/purchase.png b/绿纤uni-app/static/home/purchase.png new file mode 100644 index 0000000..0a360b2 --- /dev/null +++ b/绿纤uni-app/static/home/purchase.png diff --git a/绿纤uni-app/static/home/refund-card.png b/绿纤uni-app/static/home/refund-card.png new file mode 100644 index 0000000..4b96398 --- /dev/null +++ b/绿纤uni-app/static/home/refund-card.png diff --git a/绿纤uni-app/static/home/reimbursement-apply.png b/绿纤uni-app/static/home/reimbursement-apply.png new file mode 100644 index 0000000..c7021d5 --- /dev/null +++ b/绿纤uni-app/static/home/reimbursement-apply.png diff --git a/绿纤uni-app/static/home/reimbursement-audit.png b/绿纤uni-app/static/home/reimbursement-audit.png new file mode 100644 index 0000000..33e57fb --- /dev/null +++ b/绿纤uni-app/static/home/reimbursement-audit.png diff --git a/绿纤uni-app/static/home/report.png b/绿纤uni-app/static/home/report.png new file mode 100644 index 0000000..72662a0 --- /dev/null +++ b/绿纤uni-app/static/home/report.png diff --git a/绿纤uni-app/static/home/store-management.png b/绿纤uni-app/static/home/store-management.png new file mode 100644 index 0000000..c97dcc4 --- /dev/null +++ b/绿纤uni-app/static/home/store-management.png diff --git a/绿纤uni-app/static/home/towel-record.png b/绿纤uni-app/static/home/towel-record.png new file mode 100644 index 0000000..0f9ceee --- /dev/null +++ b/绿纤uni-app/static/home/towel-record.png diff --git a/绿纤uni-app/static/home/transfer-card.png b/绿纤uni-app/static/home/transfer-card.png new file mode 100644 index 0000000..868d89f --- /dev/null +++ b/绿纤uni-app/static/home/transfer-card.png diff --git a/绿纤uni-app/static/home/usage-record.png b/绿纤uni-app/static/home/usage-record.png new file mode 100644 index 0000000..8ebd377 --- /dev/null +++ b/绿纤uni-app/static/home/usage-record.png diff --git a/绿纤uni-app/static/home/退出.png b/绿纤uni-app/static/home/退出.png new file mode 100644 index 0000000..52f8cdb --- /dev/null +++ b/绿纤uni-app/static/home/退出.png diff --git a/绿纤uni-app/static/icon1.png b/绿纤uni-app/static/icon1.png new file mode 100644 index 0000000..ad5cc8b --- /dev/null +++ b/绿纤uni-app/static/icon1.png diff --git a/绿纤uni-app/static/icon2.png b/绿纤uni-app/static/icon2.png new file mode 100644 index 0000000..e74ac3f --- /dev/null +++ b/绿纤uni-app/static/icon2.png diff --git a/绿纤uni-app/static/tabBar/icon1.png b/绿纤uni-app/static/tabBar/icon1.png new file mode 100644 index 0000000..15342d5 --- /dev/null +++ b/绿纤uni-app/static/tabBar/icon1.png diff --git a/绿纤uni-app/static/tabBar/icon2.png b/绿纤uni-app/static/tabBar/icon2.png new file mode 100644 index 0000000..7e1e09f --- /dev/null +++ b/绿纤uni-app/static/tabBar/icon2.png diff --git a/绿纤uni-app/static/tabBar/icon3.png b/绿纤uni-app/static/tabBar/icon3.png new file mode 100644 index 0000000..5f5099a --- /dev/null +++ b/绿纤uni-app/static/tabBar/icon3.png diff --git a/绿纤uni-app/static/tabBar/icon4.png b/绿纤uni-app/static/tabBar/icon4.png new file mode 100644 index 0000000..37f744c --- /dev/null +++ b/绿纤uni-app/static/tabBar/icon4.png diff --git a/绿纤uni-app/static/tabBar/icon5.png b/绿纤uni-app/static/tabBar/icon5.png new file mode 100644 index 0000000..575f247 --- /dev/null +++ b/绿纤uni-app/static/tabBar/icon5.png diff --git a/绿纤uni-app/static/tabBar/icon6.png b/绿纤uni-app/static/tabBar/icon6.png new file mode 100644 index 0000000..81c2981 --- /dev/null +++ b/绿纤uni-app/static/tabBar/icon6.png