diff --git a/src/pages/activity/ActivityCode.vue b/src/pages/activity/ActivityCode.vue new file mode 100644 index 0000000..6b44388 --- /dev/null +++ b/src/pages/activity/ActivityCode.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue index fff0ccb..2eed89a 100644 --- a/src/pages/activity/ActivityPlan.vue +++ b/src/pages/activity/ActivityPlan.vue @@ -206,10 +206,13 @@ export default { { title: "活动码", key: "activityCode", - render(h) { + render(h, p) { return h( "Button", - { props: { type: "primary", size: "small" } }, + { + props: { type: "primary", size: "small" }, + on: { click: () => _this.navigateCode(p.row) }, + }, "查看详情" ); }, @@ -317,6 +320,12 @@ export default { this.showUse = true; store.commit("SET_useData", instance); }, + navigateCode(instance) { + this.$router.push({ + path: "/activity/plan/code", + query: { instanceId: instance.id }, + }); + }, searchTable(params = {}) { this.loading = true; if ( diff --git a/src/pages/activity/GuideCode.vue b/src/pages/activity/GuideCode.vue new file mode 100644 index 0000000..e03a4b0 --- /dev/null +++ b/src/pages/activity/GuideCode.vue @@ -0,0 +1,9 @@ + + + + + diff --git a/src/pages/activity/useActivityStepOne.vue b/src/pages/activity/useActivityStepOne.vue index 7b5bbd6..9198eb4 100644 --- a/src/pages/activity/useActivityStepOne.vue +++ b/src/pages/activity/useActivityStepOne.vue @@ -42,7 +42,11 @@ - + { + _this.formValidate.activityStyle = item.id; + }); + } + console.log(22, this.formValidate); }, - watch: { - ["formValidate.activityStyle"]() { + methods: { + onChange(e) { let _this = this; + this.formValidate.activityStyle = e; let type = {}; this.schedule.params.forEach((item) => { if (item.id == _this.formValidate.activityStyle) { @@ -116,8 +129,6 @@ export default { }); store.getters.useData.params = [type]; }, - }, - methods: { storeStartDate(date) { store.getters.useData.beginTime = date; }, diff --git a/src/pages/activity/useActivityStepTwo.vue b/src/pages/activity/useActivityStepTwo.vue index 39c6697..677b846 100644 --- a/src/pages/activity/useActivityStepTwo.vue +++ b/src/pages/activity/useActivityStepTwo.vue @@ -56,10 +56,17 @@ export default { mounted() { this.getCompanyInfo(); let _this = this; + console.log(111, store.getters.useData); if (store.getters.useData.company) { store.getters.useData.company.forEach((item) => { _this.checkCompanys.push(item.id); }); + } else if (store.getters.useData.stores) { + store.getters.useData.stores.forEach((item) => { + if (item.companyId) { + _this.checkCompanys.push(item.companyId); + } + }); } }, methods: { diff --git a/src/pages/shop/IncreaseStaffManager.vue b/src/pages/shop/IncreaseStaffManager.vue index 501ea38..204628a 100644 --- a/src/pages/shop/IncreaseStaffManager.vue +++ b/src/pages/shop/IncreaseStaffManager.vue @@ -1,515 +1,577 @@ + - - -
- - -
+ + +
+

+
+

{{ this.showStoreCode }}

+

{{ this.showStoreName }}

+ +
+ +
+ -
- - - - - - - - - - - - - - - - 同步开通账号 - - - - - - - - - - -
- + + +
+ + +
+ +
+ + + + + + + + + + + + + + + + 同步开通账号 + + + + + + + + + + +
+ - -

确定要删除此账户吗？删除后不可恢复

-
- - -
- + +

+ 确定要删除此账户吗？删除后不可恢复 +

+
+ + +
+ - - + + diff --git a/src/pages/user/AccountManagementModify.vue b/src/pages/user/AccountManagementModify.vue index 517c280..b837b0a 100644 --- a/src/pages/user/AccountManagementModify.vue +++ b/src/pages/user/AccountManagementModify.vue @@ -1,14 +1,14 @@ - + diff --git a/src/pages/user/AccountManager.vue b/src/pages/user/AccountManager.vue index ec86923..3266d53 100644 --- a/src/pages/user/AccountManager.vue +++ b/src/pages/user/AccountManager.vue @@ -1,404 +1,457 @@ diff --git a/src/pages/user/AccountManagerAdd.vue b/src/pages/user/AccountManagerAdd.vue index 32b2902..5826c60 100644 --- a/src/pages/user/AccountManagerAdd.vue +++ b/src/pages/user/AccountManagerAdd.vue @@ -1,327 +1,407 @@ - + diff --git a/src/router/index.js b/src/router/index.js index 8de1026..8604335 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,236 +1,247 @@ -import Vue from 'vue' -import Router from 'vue-router' -import Login from '@/pages/Login'; -import ExternalContact from '@/pages/ExternalContact'; -import Home from '@/pages/Home'; -import AccountManager from '@/pages/user/AccountManager'; -import AccountManagerAdd from '@/pages/user/AccountManagerAdd'; -import AccountManagementModify from '@/pages/user/AccountManagementModify'; -import AccountManagerUpload from '@/pages/user/AccountManagerUpload'; -import RoleManager from '@/pages/user/RoleManager'; -import IncreaseManager from '@/pages/shop/IncreaseManager'; +import Vue from "vue"; +import Router from "vue-router"; +import Login from "@/pages/Login"; +import ExternalContact from "@/pages/ExternalContact"; +import Home from "@/pages/Home"; +import AccountManager from "@/pages/user/AccountManager"; +import AccountManagerAdd from "@/pages/user/AccountManagerAdd"; +import AccountManagementModify from "@/pages/user/AccountManagementModify"; +import AccountManagerUpload from "@/pages/user/AccountManagerUpload"; +import RoleManager from "@/pages/user/RoleManager"; +import IncreaseManager from "@/pages/shop/IncreaseManager"; import CustomerView from "@/pages/home/CustomerView"; import TableAnalysis from "@/pages/TableAnalysis"; import AddCustomerTable from "@/pages/analysis/AddCustomerTable"; import ApplyCustomerTable from "@/pages/analysis/ApplyCustomerTable"; import ZeroExtendDetail from "@/pages/home/ZeroExtendDetail"; import CustomerDetail from "@/pages/home/CustomerDetail"; -import IncreaseData from '@/pages/shop/IncreaseData'; -import IncreaseDataCompany from '@/pages/shop/IncreaseDataCompany'; -import IncreaseDataStaff from '@/pages/shop/IncreaseDataStaff'; -import IncreaseDataStore from '@/pages/shop/IncreaseDataStore'; -import IncreaseStaffManager from '@/pages/shop/IncreaseStaffManager'; -import IncreaseStaffManagerBatchAdd from '@/pages/shop/IncreaseStaffManagerBatchAdd'; -import IncreaseStoreManager from '@/pages/shop/IncreaseStoreManager'; -import IncreaseConfigure from '@/pages/shop/IncreaseConfigure'; -import IncreaseGroupSendConfigure from '@/pages/shop/IncreaseGroupSendConfigure'; -import IncreaseWelcomeConfigure from '@/pages/shop/IncreaseWelcomeConfigure'; -import IncreaseGroupSendConfigureAdd from '@/pages/shop/IncreaseGroupSendConfigureAdd'; -import NoPermission from '@/pages/shop/NoPermission'; -import CustomerViewHome from '@/pages/home/CustomerViewHome'; +import IncreaseData from "@/pages/shop/IncreaseData"; +import IncreaseDataCompany from "@/pages/shop/IncreaseDataCompany"; +import IncreaseDataStaff from "@/pages/shop/IncreaseDataStaff"; +import IncreaseDataStore from "@/pages/shop/IncreaseDataStore"; +import IncreaseStaffManager from "@/pages/shop/IncreaseStaffManager"; +import IncreaseStaffManagerBatchAdd from "@/pages/shop/IncreaseStaffManagerBatchAdd"; +import IncreaseStoreManager from "@/pages/shop/IncreaseStoreManager"; +import IncreaseConfigure from "@/pages/shop/IncreaseConfigure"; +import IncreaseGroupSendConfigure from "@/pages/shop/IncreaseGroupSendConfigure"; +import IncreaseWelcomeConfigure from "@/pages/shop/IncreaseWelcomeConfigure"; +import IncreaseGroupSendConfigureAdd from "@/pages/shop/IncreaseGroupSendConfigureAdd"; +import NoPermission from "@/pages/shop/NoPermission"; +import CustomerViewHome from "@/pages/home/CustomerViewHome"; import ActivityAnalysis from "@/pages/activity/ActivityAnalysis"; import ActivityManager from "@/pages/activity/ActivityManager"; import ActivityPlan from "@/pages/activity/ActivityPlan"; - +import ActivityCode from "@/pages/activity/ActivityCode"; +import GuideCode from "@/pages/activity/GuideCode"; Vue.use(Router); const router = new Router({ - mode: 'history', - base: '/youke', + mode: "history", + base: "/youke", routes: [ { - path: '/', - redirect: '/login' + path: "/", + redirect: "/login", }, { - path: '/login', - name: 'login', - component: Login + path: "/login", + name: "login", + component: Login, }, { - path: '/external/contact', - name: 'externalContact', - component: ExternalContact + path: "/external/contact", + name: "externalContact", + component: ExternalContact, }, { - path: '/home', - name: 'Home', + path: "/home", + name: "Home", component: Home, children: [ { - path: '/activity/manager', - name: 'ActivityManager', - component: ActivityManager + path: "/activity/manager", + name: "ActivityManager", + component: ActivityManager, + }, + { + path: "/activity/plan", + name: "ActivityPlan", + component: ActivityPlan, + children: [], + }, + { + path: "/activity/plan/code", + name: "ActivityCode", + component: ActivityCode, }, { - path: '/activity/plan', - name: 'ActivityPlan', - component: ActivityPlan + path: "/activity/plan/GuideCode", + name: "GuideCode", + component: GuideCode, }, { - path: '/activity/analysis', - name: 'ActivityAnalysis', - component: ActivityAnalysis + path: "/activity/analysis", + name: "ActivityAnalysis", + component: ActivityAnalysis, }, { - path: '/account/manager', - name: 'AccountManager', - component: AccountManager + path: "/account/manager", + name: "AccountManager", + component: AccountManager, }, { - path: '/account/management/add', - name: 'AccountManagerAdd', - component: AccountManagerAdd + path: "/account/management/add", + name: "AccountManagerAdd", + component: AccountManagerAdd, }, { - path: '/account/management/modify', - name: 'AccountManagementModify', - component: AccountManagementModify + path: "/account/management/modify", + name: "AccountManagementModify", + component: AccountManagementModify, }, { - path: '/account/upload', - name: 'AccountManagerUpload', - component: AccountManagerUpload + path: "/account/upload", + name: "AccountManagerUpload", + component: AccountManagerUpload, }, { - path: '/role/manager', - name: 'RoleManager', - component: RoleManager + path: "/role/manager", + name: "RoleManager", + component: RoleManager, }, { - path: '/shop/increase/manager', - name: 'IncreaseManager', + path: "/shop/increase/manager", + name: "IncreaseManager", component: IncreaseManager, children: [ { - path: '/', - redirect: '/shop/increase/manager/store' + path: "/", + redirect: "/shop/increase/manager/store", }, { - path: '/shop/increase/manager/store', - name: 'IncreaseStoreManager', - component: IncreaseStoreManager + path: "/shop/increase/manager/store", + name: "IncreaseStoreManager", + component: IncreaseStoreManager, }, { - path: '/shop/increase/manager/staff', - name: 'IncreaseStaffManager', - component: IncreaseStaffManager + path: "/shop/increase/manager/staff", + name: "IncreaseStaffManager", + component: IncreaseStaffManager, }, { - path: '/shop/increase/manager/staff/batch/add', - name: 'IncreaseStaffManagerBatchAdd', - component: IncreaseStaffManagerBatchAdd - } - ] + path: "/shop/increase/manager/staff/batch/add", + name: "IncreaseStaffManagerBatchAdd", + component: IncreaseStaffManagerBatchAdd, + }, + ], }, { - path: '/table/analysis', - name: 'TableAnalysis', + path: "/table/analysis", + name: "TableAnalysis", component: TableAnalysis, children: [ { - path: '/', - redirect: '/table/analysis/customer/add' + path: "/", + redirect: "/table/analysis/customer/add", }, { - path: '/table/analysis/customer/add', - name: 'AddCustomerTable', - component: AddCustomerTable + path: "/table/analysis/customer/add", + name: "AddCustomerTable", + component: AddCustomerTable, }, { - path: '/table/analysis/customer/apply', - name: 'ApplyCustomerTable', - component: ApplyCustomerTable - } - ] + path: "/table/analysis/customer/apply", + name: "ApplyCustomerTable", + component: ApplyCustomerTable, + }, + ], }, { - path: '/shop/increase/configure', - name: 'IncreaseConfigure', + path: "/shop/increase/configure", + name: "IncreaseConfigure", component: IncreaseConfigure, children: [ { - path: '/', - redirect: '/shop/increase/configure/welcome' + path: "/", + redirect: "/shop/increase/configure/welcome", }, { - path: '/shop/increase/configure/group', - name: 'IncreaseGroupSendConfigure', - component: IncreaseGroupSendConfigure + path: "/shop/increase/configure/group", + name: "IncreaseGroupSendConfigure", + component: IncreaseGroupSendConfigure, }, { - path: '/shop/increase/configure/welcome', - name: 'IncreaseWelcomeConfigure', - component: IncreaseWelcomeConfigure + path: "/shop/increase/configure/welcome", + name: "IncreaseWelcomeConfigure", + component: IncreaseWelcomeConfigure, }, { - path: '/shop/increase/configure/group/add', - name: 'IncreaseGroupSendConfigureAdd', - component: IncreaseGroupSendConfigureAdd + path: "/shop/increase/configure/group/add", + name: "IncreaseGroupSendConfigureAdd", + component: IncreaseGroupSendConfigureAdd, }, - ] + ], }, { - path: '/shop/increase/data', - name: 'IncreaseData', + path: "/shop/increase/data", + name: "IncreaseData", component: IncreaseData, children: [ { - path: '/', - redirect: '/shop/increase/data/region' + path: "/", + redirect: "/shop/increase/data/region", }, { - path: '/shop/increase/data/region', - name: 'IncreaseDataCompany', - component: IncreaseDataCompany + path: "/shop/increase/data/region", + name: "IncreaseDataCompany", + component: IncreaseDataCompany, }, { - path: '/shop/increase/data/store', - name: 'IncreaseDataStore', - component: IncreaseDataStore + path: "/shop/increase/data/store", + name: "IncreaseDataStore", + component: IncreaseDataStore, }, { - path: '/shop/increase/data/staff', - name: 'IncreaseDataStaff', - component: IncreaseDataStaff + path: "/shop/increase/data/staff", + name: "IncreaseDataStaff", + component: IncreaseDataStaff, }, - ] + ], }, { - path: '/customer/view', - name: 'CustomerView', + path: "/customer/view", + name: "CustomerView", component: CustomerView, }, { - path: '/zero/extend/detail', - name: 'ZeroExtendDetail', - component: ZeroExtendDetail + path: "/zero/extend/detail", + name: "ZeroExtendDetail", + component: ZeroExtendDetail, }, { - path: '/customer/data/detail', - name: 'CustomerDetail', + path: "/customer/data/detail", + name: "CustomerDetail", component: CustomerDetail, }, { - path: '/no/permission', - name: 'NoPermission', + path: "/no/permission", + name: "NoPermission", component: NoPermission, }, - - ] + ], }, { - path: '/customer/view/home', - name: 'CustomerViewHome', + path: "/customer/view/home", + name: "CustomerViewHome", component: CustomerViewHome, }, - ] + ], }); /* -* 跳转前的处理事件 -* */ -router.beforeEach(function (to, from, next) { + * 跳转前的处理事件 + * */ +router.beforeEach(function(to, from, next) { next(); }); -export default router +export default router;