From cb2e73a23ffaa618d0f3a04c985b6225f13536da Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Wed, 3 Jan 2024 16:36:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=88=86=E6=AC=BE=E6=8E=A8=E8=8D=90=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 10 + src/assets/images/miniProgram.png | Bin 0 -> 414 bytes src/layouts/navbar/index.vue | 13 +- src/pages/activity/list/index.vue | 22 +- src/pages/miniProgramMg/index/add/index.vue | 293 ++++++++++++++++++ src/pages/miniProgramMg/index/inlet/index.vue | 54 ++++ src/pages/miniProgramMg/index/list/index.vue | 185 +++++++++++ src/pages/preschool/list/index.vue | 2 +- src/pages/preschool/manage/basic.vue | 5 + src/pages/supplier/list/index.vue | 5 +- src/pages/supplier/manage/basic.vue | 5 + .../supplierClassification/list/index.vue | 9 + src/pages/user/detail/index.vue | 5 +- src/pages/user/list/index.vue | 8 +- src/plugins/requests/index.js | 2 +- src/router/modules/miniProgramMg.js | 30 ++ src/setting.js | 2 +- 17 files changed, 631 insertions(+), 19 deletions(-) create mode 100644 src/assets/images/miniProgram.png create mode 100644 src/pages/miniProgramMg/index/add/index.vue create mode 100644 src/pages/miniProgramMg/index/inlet/index.vue create mode 100644 src/pages/miniProgramMg/index/list/index.vue create mode 100644 src/router/modules/miniProgramMg.js diff --git a/src/api/index.js b/src/api/index.js index 1ecaf32..158648d 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -17,6 +17,7 @@ export default { backgroundActivityList: `competition/competition/management/backgroundActivityList`, + postLoginActivity: `competition/competition/management/postLoginActivity`, addCompetition: `competition/competition/management/addCompetition`, batchDeleteCompetition: `competition/competition/management/batchDeleteCompetition`, disabledEventsCompetition: `competition/competition/management/disabledEvents`, @@ -43,6 +44,8 @@ export default { transferAdmin: `nakadai/nakadai/partnerAccount/transferAdmin`, savePartnerAccount: `nakadai/nakadai/partnerAccount/savePartnerAccount`, platformTeamAccountList: `nakadai/kindergarten/platformTeamAccount/platformTeamAccountList`, + removeOrganization: `nakadai/kindergarten/platformTeamAccount/removeOrganization`, + updateAccountStatus: `nakadai/kindergarten/platformTeamAccount/updateAccountStatus`, delSupplierClass: `nakadai/supplierClassification/batchDeletion`, findSupplierClass: `nakadai/supplierClassification/findById`, @@ -54,4 +57,11 @@ export default { listComClass: `competition/competitionClassification/categoryList`, saveComClass: `competition/competitionClassification/save`, updateComClass: `competition/competitionClassification/update`, + + delExplosive: `nakadai/explosiveRecommendation/batchDeletion`, + explosiveList: `nakadai/explosiveRecommendation/explosiveList`, + findExplosive: `nakadai/explosiveRecommendation/findById`, + saveExplosive: `nakadai/explosiveRecommendation/save`, + sortExplosive: `nakadai/explosiveRecommendation/sort`, + updateExplosive: `nakadai/explosiveRecommendation/update`, } \ No newline at end of file diff --git a/src/assets/images/miniProgram.png b/src/assets/images/miniProgram.png new file mode 100644 index 0000000000000000000000000000000000000000..bd96ab6cd36600c4ffe2365b785d74765e528cc8 GIT binary patch literal 414 zcmV;P0b%}$P)Px$SV=@dR5(waQ?W_|K@fd!FW+Ec6)Y?jRIF{p=Az&s;-xaF1O+QCjej60SV+Vs z7ez0iISU&fm4yWL8*)2(XYRNho5F0dFgx?+&CHu6a;MR1mzAg`fu0691;{I* zUNrSXd9~EYhBIq4uG=*#9^?}ywrDvlua#)sA~_@E_Mzg&|sD^aC)6VyReOyEMO#(I{1 z0#GDy0pd#p`*Ez`oSq*%1DG{|qu!EPh{BxGs0y&vkL{$+bfO}=q#6fgF98emCZSva zivv<+nF*X~g*r8&YLI0%RMr{jnZ%h6rQ6r~y%4JTo~6HyDnvc!ru`-%*J;Uu>)1z4 zKR6a(+o(h|ZL`ku2(SoXV#wnB>6|!6-moOW$h(~;_{XpM0rmf(*dPFrt^fc407*qo IM6N<$g8hrIbN~PV literal 0 HcmV?d00001 diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index ae8440a..0474070 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -92,7 +92,18 @@ export default { icon: 'activity', index: '/activity/list', title: '活动管理' - } + }, + { + icon: 'miniProgram', + index: 'miniProgram', + title: '小程序管理', + subs: [ + { + index: '/miniProgramMg/index', + title: '首页设置' + }, + ] + }, ], }; }, diff --git a/src/pages/activity/list/index.vue b/src/pages/activity/list/index.vue index 054fbd1..e11bcff 100644 --- a/src/pages/activity/list/index.vue +++ b/src/pages/activity/list/index.vue @@ -43,9 +43,8 @@
  • - + { const list = data.records this.list = list @@ -284,10 +294,6 @@ export default { this.$refs.table.clearSelection(); this.initData(); }, - // 活动来源回调 - sourceChange (val) { - this.initData() - }, delData (row) { this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", { type: "warning" diff --git a/src/pages/miniProgramMg/index/add/index.vue b/src/pages/miniProgramMg/index/add/index.vue new file mode 100644 index 0000000..bf9600d --- /dev/null +++ b/src/pages/miniProgramMg/index/add/index.vue @@ -0,0 +1,293 @@ + + + + + \ No newline at end of file diff --git a/src/pages/miniProgramMg/index/inlet/index.vue b/src/pages/miniProgramMg/index/inlet/index.vue new file mode 100644 index 0000000..2845cb2 --- /dev/null +++ b/src/pages/miniProgramMg/index/inlet/index.vue @@ -0,0 +1,54 @@ + + + + + \ No newline at end of file diff --git a/src/pages/miniProgramMg/index/list/index.vue b/src/pages/miniProgramMg/index/list/index.vue new file mode 100644 index 0000000..c5cd78e --- /dev/null +++ b/src/pages/miniProgramMg/index/list/index.vue @@ -0,0 +1,185 @@ + + + + + \ No newline at end of file diff --git a/src/pages/preschool/list/index.vue b/src/pages/preschool/list/index.vue index 5da5a7d..7fc2763 100644 --- a/src/pages/preschool/list/index.vue +++ b/src/pages/preschool/list/index.vue @@ -306,7 +306,7 @@ export default { this.status1 = list.filter(e => e.auditStatus === 1).length this.status2 = list.filter(e => e.auditStatus === 2).length this.status3 = list.filter(e => e.auditStatus === 3).length - this.status4 = list.filter(e => e.auditStatus === 4).length + this.status4 = list.filter(e => e.auditStatus === 0).length this.all = list.length }, initData () { diff --git a/src/pages/preschool/manage/basic.vue b/src/pages/preschool/manage/basic.vue index 7543b35..2781327 100644 --- a/src/pages/preschool/manage/basic.vue +++ b/src/pages/preschool/manage/basic.vue @@ -66,6 +66,10 @@ rows="4" v-model="form.address" /> + + + e.auditStatus === 1).length this.status2 = list.filter(e => e.auditStatus === 2).length this.status3 = list.filter(e => e.auditStatus === 3).length - this.status4 = list.filter(e => e.auditStatus === 4).length + this.status4 = list.filter(e => e.auditStatus === 0).length this.all = list.length }, initData () { diff --git a/src/pages/supplier/manage/basic.vue b/src/pages/supplier/manage/basic.vue index 0d99ab6..ff382ee 100644 --- a/src/pages/supplier/manage/basic.vue +++ b/src/pages/supplier/manage/basic.vue @@ -72,6 +72,10 @@ rows="4" v-model="form.address" /> + + + { - this.$post(this.api.delUserAccounts, [row.openId]).then(res => { + this.$get(this.api.removeOrganization, { + manageId: row.manageId, + teamId: row.teamId, + }).then(res => { this.$message.success('移除成功') this.getData() }).catch(res => { }) diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue index 49a6532..6e30db3 100644 --- a/src/pages/user/list/index.vue +++ b/src/pages/user/list/index.vue @@ -93,7 +93,7 @@ - { + this.$post(`${this.api.updateAccountStatus}?openId=${row.appOpenId}&isEnable=${val}`).then(res => { Util.successMsg(val ? '启用成功' : '禁用成功') + this.getData() }).catch(res => { }) }, handleSelectionChange (val) { diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js index 4deca2c..bc04402 100644 --- a/src/plugins/requests/index.js +++ b/src/plugins/requests/index.js @@ -49,7 +49,7 @@ service.interceptors.response.use( const { status, data } = error.response if (status) { const { message } = data - switch (code) { + switch (status) { // 401: 未登录 case 401: Util.errorMsg("登录过期，请重新登录"); diff --git a/src/router/modules/miniProgramMg.js b/src/router/modules/miniProgramMg.js new file mode 100644 index 0000000..1a09e0a --- /dev/null +++ b/src/router/modules/miniProgramMg.js @@ -0,0 +1,30 @@ +import BasicLayout from '@/layouts/home' + +const meta = {} + +export default { + path: '/miniProgramMg', + name: 'miniProgramMg', + redirect: { + path: `/miniProgramMg/index`, + }, + meta, + component: BasicLayout, + children: [ + { + path: `index`, + component: () => import('@/pages/miniProgramMg/index/inlet'), + meta: { title: '首页管理' } + }, + { + path: `list`, + component: () => import('@/pages/miniProgramMg/index/list'), + meta: { title: '首页管理' } + }, + { + path: `add`, + component: () => import('@/pages/miniProgramMg/index/add'), + meta: { title: '爆款推荐' } + }, + ] +} diff --git a/src/setting.js b/src/setting.js index d41a4e0..7af381a 100644 --- a/src/setting.js +++ b/src/setting.js @@ -4,7 +4,7 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境 let host = `${location.origin}/` if (isDev) { - host = 'https://huorantech.com/' + host = 'http://124.71.79.122/' host = 'http://192.168.31.217:10010/' }