diff --git a/src/assets/site/form_linkActive.svg b/src/assets/site/form_linkActive.svg new file mode 100644 index 0000000..a6b2d92 --- /dev/null +++ b/src/assets/site/form_linkActive.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/site/step_1.png b/src/assets/site/step_1.png new file mode 100644 index 0000000..07938c1 Binary files /dev/null and b/src/assets/site/step_1.png differ diff --git a/src/assets/site/step_2.png b/src/assets/site/step_2.png new file mode 100644 index 0000000..c77a65b Binary files /dev/null and b/src/assets/site/step_2.png differ diff --git a/src/assets/site/step_3.png b/src/assets/site/step_3.png new file mode 100644 index 0000000..fc41f64 Binary files /dev/null and b/src/assets/site/step_3.png differ diff --git a/src/assets/site/uploadIcon.svg b/src/assets/site/uploadIcon.svg new file mode 100644 index 0000000..eb1fb8e --- /dev/null +++ b/src/assets/site/uploadIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/GuipButton.vue b/src/components/GuipButton.vue index d0c7744..9ae2b34 100644 --- a/src/components/GuipButton.vue +++ b/src/components/GuipButton.vue @@ -49,4 +49,10 @@ export default { } } + diff --git a/src/components/GuipInput.vue b/src/components/GuipInput.vue index 545b9ec..f7aa4d1 100644 --- a/src/components/GuipInput.vue +++ b/src/components/GuipInput.vue @@ -9,7 +9,7 @@ :placeholder="placeholder1" :disabled="disabled" :maxlength="maxlength1" - :style="{width:width}" + :style="{width:width,height:height}" :minLength="minLength1" :show-word-limit="showWordLimit" @input="$emit('input', $event)" @@ -58,7 +58,7 @@ width:'510px', height:'38px' }, - placeholder1:'请输入内容' + placeholder1:'' } }, watch: { // 监听外部传来的 value prop 的变化,以便同步到内部状态 inputValue 上(可选) diff --git a/src/components/PageTitle.vue b/src/components/PageTitle.vue index b63d604..2db5571 100644 --- a/src/components/PageTitle.vue +++ b/src/components/PageTitle.vue @@ -1,5 +1,5 @@ @@ -9,7 +9,7 @@ import { mapState } from 'vuex'; export default { // 站点设置 name: '', - props: [''], + props: ['className'], components: { // GuipInput, diff --git a/src/router/index.js b/src/router/index.js index c1159db..38475af 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -80,6 +80,16 @@ const routes = [{ name: '个性化设置', component: () => import( /* webpackChunkName: "sitePersonalization" */ '../views/SitePersonalization.vue') }, + { + path: 'siteH5', + name: '移动端设置', + component: () => import( /* webpackChunkName: "siteH5" */ '../views/SiteH5.vue') + }, + { + path: 'siteSem', + name: '营销推广', + component: () => import( /* webpackChunkName: "siteSem" */ '../views/SiteSem.vue') + }, ] }, ] diff --git a/src/style/theme/common.scss b/src/style/theme/common.scss index ff80fa8..7378f08 100644 --- a/src/style/theme/common.scss +++ b/src/style/theme/common.scss @@ -13,6 +13,31 @@ body { padding: 0; } } +.point{ + cursor: pointer; +} +.mt32{ + margin-top: 32px; +} +.mb32{ + margin-bottom: 32px; +} +.hide{ + display: none !important; +} +.column{ + display: flex; + flex-direction: column; +} +.mb24{ + margin-bottom: 24px; +} +.mt12{ + margin-top: 12px; +} +.mt10{ + margin-top: 10px; +} .ceshi{ transition: all .5s; box-sizing: border-box; @@ -21,6 +46,28 @@ body { /* 蓝色阴影_常规 */ box-shadow: 0px 4px 16px 0px rgba(17, 55, 143, 0.12); } +::v-deep .el-radio__original { + display: none !important; +} + +::v-deep .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) + .el-radio__inner { + box-shadow: none !important; +} + +.addStore { + margin-top: 12px; + border-radius: 4px; + opacity: 1; + /* text/text_white_2 */ + border: 1px dashed #BABDC2; + padding: 15px 20px; + color: #626573; + justify-content: center; + img{ + margin-right: 12px; + } +} @keyframes fadeInOut { 0% { opacity: 0; @@ -36,19 +83,7 @@ body { .ellipsis{ } -.hide{ - display: none !important; -} -.column{ - display: flex; - flex-direction: column; -} -.mb24{ - margin-bottom: 24px; -} -.mt12{ - margin-top: 12px; -} + .el-container { height: 100%; @@ -73,6 +108,23 @@ body { width: 84.75%; margin: 0 auto; } +.min-flex-right { + min-width: 1033px; + max-width: 1556px; + width: 84.75%; + margin: 0 auto; + .flex-common{ + .flex-left, + .flex-right { + min-width: 440px; + max-width: 590px; + flex: 1; + } + .flex-line { + margin: 0 33px; + } + } +} .desc { font-size: 12px; @@ -168,6 +220,13 @@ body { align-items: center; justify-content: center; transition: all .3s; + span{ + display: flex; + align-items: center; + } + img{ + margin-right: 6px; + } } .el-button--normal { @@ -366,6 +425,7 @@ body { .el-textarea__inner { padding: 10px 12px; border-radius: 2px; + height: 100%; } .el-textarea__inner:hover { diff --git a/src/views/SiteBaseSetting.vue b/src/views/SiteBaseSetting.vue index 424f48c..03edc5f 100644 --- a/src/views/SiteBaseSetting.vue +++ b/src/views/SiteBaseSetting.vue @@ -1,5 +1,5 @@