diff --git a/package-lock.json b/package-lock.json index 31aa458..9e22669 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12193,6 +12193,11 @@ "integrity": "sha1-3EJpcTMwLOMBdSQ1amxht7abShg=", "dev": true }, + "vuejs-datepicker": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/vuejs-datepicker/-/vuejs-datepicker-1.5.3.tgz", + "integrity": "sha512-vCYLx7rbYPEqLLx1EplFQHxkMA/SAFJvwj5PYzeaG98q7hynLZMXsvhE8FPr08PJUiKA+zRknq0CqRioNYLYkg==" + }, "vuex": { "version": "3.0.1", "resolved": "http://registry.npm.taobao.org/vuex/download/vuex-3.0.1.tgz", diff --git a/package.json b/package.json index a8ed49f..d000cd3 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "semantic-ui-vue": "^0.2.11", "vue": "^2.5.17", "vue-router": "^3.0.1", + "vuejs-datepicker": "^1.5.3", "vuex": "^3.0.1" }, "devDependencies": { diff --git a/src/components/ControlPanel/channel/components/page-breadcrumb.vue b/src/components/ControlPanel/channel/components/page-breadcrumb.vue new file mode 100644 index 0000000..d5e9167 --- /dev/null +++ b/src/components/ControlPanel/channel/components/page-breadcrumb.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/components/ControlPanel/channel/components/sidemenu.vue b/src/components/ControlPanel/channel/components/sidemenu.vue index 8f7a81e..f0067e0 100644 --- a/src/components/ControlPanel/channel/components/sidemenu.vue +++ b/src/components/ControlPanel/channel/components/sidemenu.vue @@ -1,7 +1,7 @@ @@ -16,6 +16,11 @@ export default { name: 'ChannelSideMenu', data () { return {} + }, + computed: { + side: function () { + return this.$route.meta.side || '' + } } } diff --git a/src/components/ControlPanel/channel/index.vue b/src/components/ControlPanel/channel/index.vue index 6d46862..ca8b1d3 100644 --- a/src/components/ControlPanel/channel/index.vue +++ b/src/components/ControlPanel/channel/index.vue @@ -19,6 +19,7 @@ + @@ -38,6 +39,7 @@ } .f-full { flex: 1; + flex-flow: row; } } diff --git a/src/components/ControlPanel/channel/opay/components/opay-setting.vue b/src/components/ControlPanel/channel/opay/components/opay-setting.vue new file mode 100644 index 0000000..1bb9e7b --- /dev/null +++ b/src/components/ControlPanel/channel/opay/components/opay-setting.vue @@ -0,0 +1,98 @@ + + + diff --git a/src/components/ControlPanel/channel/opay/index.vue b/src/components/ControlPanel/channel/opay/index.vue new file mode 100644 index 0000000..b45413d --- /dev/null +++ b/src/components/ControlPanel/channel/opay/index.vue @@ -0,0 +1,70 @@ + + + diff --git a/src/components/Login/index.vue b/src/components/Login/index.vue index dc92f14..484d644 100644 --- a/src/components/Login/index.vue +++ b/src/components/Login/index.vue @@ -1,7 +1,7 @@