From 66ac29de482f5c2423ae7ba10531533c756b854a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com> Date: Fri, 14 May 2021 17:48:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A5=BC=E5=B1=82=E8=A3=85?= =?UTF-8?q?=E4=BF=AE=E6=A0=B7=E5=BC=8F=E4=BB=A5=E5=8F=8A=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/assets/icon.png | Bin 0 -> 676 bytes manager/src/config/index.js | 8 +- .../views/lili-floor-renovation/wap/btn.js | 6 +- .../views/lili-floor-renovation/wap/config.js | 302 ++++++++---------- .../lili-floor-renovation/wap/style.scss | 183 ++++++----- .../wap/template/tpl_menu.vue | 6 +- seller/src/config/index.js | 16 +- 7 files changed, 237 insertions(+), 284 deletions(-) create mode 100644 manager/src/assets/icon.png diff --git a/manager/src/assets/icon.png b/manager/src/assets/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e2656e39dce92c0a9471ab931fb1d700712e8756 GIT binary patch literal 676 zcmeAS@N?(olHy`uVBq!ia0vp^CLqkg3?x4-dwml~^#=HaxB}__(~!_?-v9H2|IZct zKUe7gY;KU$EH0>m8EpUO@PfqW@c*C54kCfFK(O5(q~+`L{~vDtzqRE5vC{t=9sd9P z`2X{x|4;V(f3W5M?G^uT%=>>R`~O<=|9^k}|MTPjn+yM6o%w%f<^NOl|96G`U#{_g ziPHbY@@`K!^MMW$DGBlmW(YGjo&bxtD$3E(l~)@BGbXEd(vvGxeL>5Le8CU5P08ucTXQl-2XZc5D1rIjJP-aJT*U#Wj}qO4Xe%+?Z)%eSyQ8@x_#C zzakAsbqA#tW+9tbGITo0w8>-_$#hTPJn}7e^U{e4R)4?fSsB{CpSXdGg>$WX@{;1C zi?pLQ1T>odUo9K;zmTww_M?T;lBOaeJ@Gq)?glElXV9`teU&t0Qb% zyg%h%$aKp?Mv-p&P9#ZM9r9QiGHs&C(V!3x`P1T|Zlb#vBumCKgvv20ozi~C6u`LU z;Uw>~=T`jvdh_3+JbR%V?fu)5&wXc}T3hnF&LhXP?;q3AA4{@~64v|!#x8@WtDnm{ Hr-UW|f!s>| literal 0 HcmV?d00001 diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 61e60083..8f1ce647 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -23,10 +23,10 @@ export default { manager: 'https://admin-api.pickmall.cn' }, api_prod: { - common: 'http://127.0.0.1:8890', - buyer: 'http://127.0.0.1:8888', - seller: 'http://127.0.0.1:8889', - manager: 'http://127.0.0.1:8887' + common: 'https://common-api.pickmall.cn', + buyer: 'https://buyer-api.pickmall.cn', + seller: 'https://store-api.pickmall.cn', + manager: 'https://admin-api.pickmall.cn' }, /** * @description api请求基础路径前缀 diff --git a/manager/src/views/lili-floor-renovation/wap/btn.js b/manager/src/views/lili-floor-renovation/wap/btn.js index ed203ace..dc137544 100644 --- a/manager/src/views/lili-floor-renovation/wap/btn.js +++ b/manager/src/views/lili-floor-renovation/wap/btn.js @@ -4,17 +4,17 @@ export const btnWay = [ { - img: "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/8153f1d85f462b277d024baf812814a6.png", + img: require('@/assets/icon.png'), title: "", size:"80*80" }, { - img: "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/c72f2c4f452d72e4ad82f38c72911ce4.png", + img: require('@/assets/icon.png'), title: "", size:"80*80" }, { - img: "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/875dd6d2b1980dbccbec0895f757cdff.png", + img: require('@/assets/icon.png'), title: "", size:"80*80" }, diff --git a/manager/src/views/lili-floor-renovation/wap/config.js b/manager/src/views/lili-floor-renovation/wap/config.js index bef9cba1..1ffbfdee 100644 --- a/manager/src/views/lili-floor-renovation/wap/config.js +++ b/manager/src/views/lili-floor-renovation/wap/config.js @@ -1,18 +1,13 @@ - -import * as API_Other from '@/api/other' +import * as API_Other from "@/api/other"; // 获取楼层装修信息 -export function initData(id){ - API_Other.getHomeData(id).then(res=>{ - - homeData = res - - }) +export function initData(id) { + API_Other.getHomeData(id).then(res => { + homeData = res; + }); } - -export let homeData ={} - +export let homeData = {}; /** * drawer:true 广告右侧打开抽屉中显示 @@ -31,7 +26,6 @@ export const modelData = [ close: true, options: { list: [ - { img: "https://i.loli.net/2020/12/05/fKH4CwImpbuD5Xj.png", url: "", @@ -45,12 +39,11 @@ export const modelData = [ size: "750*350" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/343e226d0d2e2d2efcf21f31a678ba46.png", + img: "https://i.loli.net/2021/05/14/ZlzcCdnpejtN9gL.png", url: "", link: "", size: "750*350" - }, + } ] } }, @@ -64,22 +57,19 @@ export const modelData = [ options: { list: [ { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", size: "335*335" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/cddb5d90a4241f6235d16368534bc730.png", + img: "https://i.loli.net/2021/05/14/kdB3AE9ay4c1SnN.png", url: "", link: "", size: "335*177" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/e047d312fb5930de972ae288b9b3bae7.png", + img: "https://i.loli.net/2021/05/14/FmDr9ksiXeEqYLU.png", url: "", link: "", size: "335*177" @@ -113,22 +103,19 @@ export const modelData = [ options: { list: [ { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/cddb5d90a4241f6235d16368534bc730.png", + img: "https://i.loli.net/2021/05/14/kdB3AE9ay4c1SnN.png", url: "", link: "", size: "335*177" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/e047d312fb5930de972ae288b9b3bae7.png", + img: "https://i.loli.net/2021/05/14/FmDr9ksiXeEqYLU.png", url: "", link: "", size: "335*177" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", size: "335*335" @@ -146,25 +133,22 @@ export const modelData = [ options: { list: [ { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - size:"226*226 (1:1)" + size: "226*226 (1:1)" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - size:"226*226 (1:1)" + size: "226*226 (1:1)" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - size:"226*226 (1:1)" + size: "226*226 (1:1)" } ] } @@ -179,11 +163,10 @@ export const modelData = [ options: { list: [ { - img: - "https://i.loli.net/2020/12/05/8wSNWbnqujDh6HL.png", + img: "https://i.loli.net/2020/12/05/8wSNWbnqujDh6HL.png", url: "", link: "", - size:"750*280" + size: "750*280" } ] } @@ -198,15 +181,13 @@ export const modelData = [ options: { list: [ { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", size: "335*220" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", size: "335*220" @@ -224,22 +205,19 @@ export const modelData = [ options: { list: [ { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", size: "710*170" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", size: "335*170" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", size: "335*170" @@ -257,23 +235,20 @@ export const modelData = [ options: { list: [ { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", size: "335*170" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", size: "335*170" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", size: "710*170" @@ -294,35 +269,31 @@ export const modelData = [ img: "https://picsum.photos/id/127/200/200", url: "", link: "", - size:"75*75（1:1）" + size: "75*75（1:1）" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - size:"75*75（1:1）" + size: "75*75（1:1）" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - size:"75*75（1:1）" + size: "75*75（1:1）" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - size:"75*75（1:1）" + size: "75*75（1:1）" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - size:"75*75（1:1）" + size: "75*75（1:1）" } ] } @@ -337,32 +308,28 @@ export const modelData = [ options: { list: [ { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - size:"88*88（1:1）" + size: "88*88（1:1）" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - size:"88*88（1:1）" + size: "88*88（1:1）" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - size:"88*88（1:1）" + size: "88*88（1:1）" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - size:"88*88（1:1）" + size: "88*88（1:1）" } ] } @@ -377,32 +344,32 @@ export const modelData = [ options: { list: [ { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - title: "88*88（1:1）" + title: "文字", + size: "88*88（1:1）" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - title: "88*88（1:1）" + title: "文字", + size: "88*88（1:1）" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - title: "88*88（1:1）" + title: "文字", + size: "88*88（1:1）" }, { - img: - "https://shopro-1253949872.file.myqcloud.com/uploads/20200704/0669a6adec3f35d45ec66a082e03774f.png", + img: "https://i.loli.net/2021/05/14/dtNvI5UxchXn8gz.png", url: "", link: "", - title: "88*88（1:1）" + title: "文字", + size: "88*88（1:1）" } ] } @@ -430,40 +397,35 @@ export const modelData = [ options: { list: [ { - img: - "https://i.loli.net/2020/12/05/SoGAv7gYybuWzED.png", + img: "https://i.loli.net/2020/12/05/SoGAv7gYybuWzED.png", url: "", link: "", title: "标题", size: "88*88 (1:1)" }, { - img: - "https://i.loli.net/2020/12/05/JXR5K3sbIeENjqH.png", + img: "https://i.loli.net/2020/12/05/JXR5K3sbIeENjqH.png", url: "", link: "", title: "标题", size: "88*88 (1:1)" }, { - img: - "https://i.loli.net/2020/12/05/KlZfnCFIdEV231Y.png", + img: "https://i.loli.net/2020/12/05/KlZfnCFIdEV231Y.png", url: "", link: "", title: "标题", size: "88*88 (1:1)" }, { - img: - "https://i.loli.net/2020/12/05/GfmMyN2wrUVIlci.png", + img: "https://i.loli.net/2020/12/05/GfmMyN2wrUVIlci.png", url: "", link: "", title: "标题", size: "88*88 (1:1)" }, { - img: - "https://i.loli.net/2020/12/05/eznDa3iNby5FkYL.png", + img: "https://i.loli.net/2020/12/05/eznDa3iNby5FkYL.png", url: "", link: "", title: "标题", @@ -517,120 +479,114 @@ export const modelData = [ ], listWay: [ { - img: - "https://api.7wpp.com/uploads/20200930/78d480fa1025394b9be24ef5eef17489.png", + img: "https://i.loli.net/2021/05/14/KTLSrOVJmEdX12A.png", price: "120", title: " 微软 (Microsoft) Xbox 无线控制器/手柄 湛蓝色 | 3.5mm耳机接口蓝牙连接 Xbox主机电脑平板通用", type: "精选" }, { - img: - "https://i.loli.net/2020/12/05/c9mptI5Pg8qJ6ny.png", + img: "https://i.loli.net/2020/12/05/c9mptI5Pg8qJ6ny.png", title: "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米", price: "190", type: "精选" }, { - img: - "https://i.loli.net/2020/12/05/QsSYIPF743Hgf8q.png", + img: "https://i.loli.net/2020/12/05/QsSYIPF743Hgf8q.png", title: "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米", price: "10", type: "精选" }, { - img: - "https://i.loli.net/2020/12/05/VTwDYcLWnukGxat.png", + img: "https://i.loli.net/2020/12/05/VTwDYcLWnukGxat.png", title: "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米", price: "190", type: "精选" }, { - img: - "https://i.loli.net/2020/12/05/SIFwaVpE4YJAuQf.png", + img: "https://i.loli.net/2020/12/05/SIFwaVpE4YJAuQf.png", title: "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米", price: "10", type: "精选" }, { - img: - "https://api.7wpp.com/uploads/20201110/86d4dedc0d88ce4b1329b02a4b87fe7d.jpg", + img: "https://i.loli.net/2021/05/14/KTLSrOVJmEdX12A.png", title: "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米", price: "190", type: "精选" }, { - img: - "https://api.7wpp.com/uploads/20200930/0d9102613d7b7e738c83504f80194cd4.jpg", + img: "https://i.loli.net/2021/05/14/xA5FW2ubiShBdPE.jpg", title: "宏碁(acer) DP高清线1.2版 2K*4KDisplayPort公对公接线笔记本电脑显卡连接显示器视频线1.5米", price: "10", type: "精选" - }, + } ] } ] } - }, - { - notAdd: true, - notImg: true, - type: "joinGroup", - name: "拼团活动", - img: "md-image", - options: { - list: [ - { - title: "测试拼团" - } - ] - } - }, - { - notAdd: true, - notImg: true, - type: "integral", - name: "积分活动", - img: "md-image", - options: { - list: [ - { - title: "测试积分" - } - ] - } - }, - { - notAdd: true, - notImg: true, - type: "spike", - name: "秒杀活动", - img: "md-image", - options: { - list: [ - { - title: "测试秒杀" - } - ] - } - }, - { - notAdd: true, - notImg: true, - type: "group", - name: "团购活动", - img: "md-image", - options: { - list: [ - { - title: "测试团购" - } - ] - } } + // TODO 第一版本隐藏暂无此功能 + // { + // notAdd: true, + // notImg: true, + // type: "joinGroup", + // name: "拼团活动", + // img: "md-image", + // options: { + // list: [ + // { + // title: "测试拼团" + // } + // ] + // } + // }, + // { + // notAdd: true, + // notImg: true, + // type: "integral", + // name: "积分活动", + // img: "md-image", + // options: { + // list: [ + // { + // title: "测试积分" + // } + // ] + // } + // }, + // { + // notAdd: true, + // notImg: true, + // type: "spike", + // name: "秒杀活动", + // img: "md-image", + // options: { + // list: [ + // { + // title: "测试秒杀" + // } + // ] + // } + // }, + // { + // notAdd: true, + // notImg: true, + // type: "group", + // name: "团购活动", + // img: "md-image", + // options: { + // list: [ + // { + // title: "测试团购" + // } + // ] + // } + // } ]; diff --git a/manager/src/views/lili-floor-renovation/wap/style.scss b/manager/src/views/lili-floor-renovation/wap/style.scss index aa3f6cb8..3009bbad 100644 --- a/manager/src/views/lili-floor-renovation/wap/style.scss +++ b/manager/src/views/lili-floor-renovation/wap/style.scss @@ -1,101 +1,98 @@ - .model-view { - display: flex; - .model-view-menu { - flex: 1.5; - - > .model-view-menu-item { - display: flex; - align-items: center; - flex-wrap: wrap; - } - } - .model-config{ - flex: 2.5; - } - .model-view-content { - flex: 6; - } - .model-item { - line-height: 1.75; - font-size: 13px; - margin: 0 5px 10px 5px; - border: 1px solid #ededed; - background: #f6f6f9; - width: 70px; - height: 70px; - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; - } -} -.model-view-content{ - - background: #f6f6f9; - border-radius: .8em; - display: flex; - justify-content: flex-start; - align-items: center; - flex-direction: column; -} -.wap-title{ - line-height: 44px; - text-align: center; - height: 44px; - border-bottom: 1px solid #ededed; -} -.content{ - margin: 20px 0; - padding: 50px 13px; - width: 360px; - background: url('../../../assets/iPhoneX_model.png') no-repeat; - height: 780px; - background-size: 360px; - overflow: hidden; - >.component,.draggable{ - height: 590px; - overflow-y: auto; - background: #ebebeb; - } - >.draggable{ - - padding-bottom: 100px; - } -} -.list{ - position: relative; -} -.close{ - position: absolute; - right: 5px; - top: 10px; - z-index: 99; -} - - -.model-btn{ - >*{ - margin: 0 4px; - } - } - .qrCode { - width: 100px; - height: 100px; - } - .default-view-content { - text-align: center; - font-weight: bold; - line-height: 2; - /deep/ img { - margin: 0 auto; + display: flex; + .model-view-menu { + flex: 1.5; + min-width: 250px; + > .model-view-menu-item { + display: flex; + align-items: center; + flex-wrap: wrap; } } .model-config { + flex: 2.5; + } + .model-view-content { + flex: 6; + } + .model-item { + line-height: 1.75; + font-size: 13px; + margin: 0 5px 10px 5px; + border: 1px solid #ededed; + background: #f6f6f9; + width: 70px; + height: 70px; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + } +} +.model-view-content { + background: #f6f6f9; + border-radius: 0.8em; + display: flex; + justify-content: flex-start; + align-items: center; + flex-direction: column; +} +.wap-title { + line-height: 44px; + text-align: center; + height: 44px; + border-bottom: 1px solid #ededed; +} +.content { + margin: 20px 0; + padding: 50px 13px; + width: 360px; + background: url("../../../assets/iPhoneX_model.png") no-repeat; + height: 780px; + background-size: 360px; + overflow: hidden; + > .component, + .draggable { + height: 590px; overflow-y: auto; + background: #ebebeb; } + > .draggable { + padding-bottom: 100px; + } +} +.list { + position: relative; +} +.close { + position: absolute; + right: 5px; + top: 10px; + z-index: 99; +} - .active { - box-sizing: border-box; - border: 1px solid $theme_color; +.model-btn { + > * { + margin: 0 4px; } +} +.qrCode { + width: 100px; + height: 100px; +} +.default-view-content { + text-align: center; + font-weight: bold; + line-height: 2; + /deep/ img { + margin: 0 auto; + } +} +.model-config { + overflow-y: auto; +} + +.active { + box-sizing: border-box; + border: 1px solid $theme_color; +} diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue index 9b959c69..7fd1357c 100644 --- a/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue +++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue @@ -21,10 +21,10 @@ export default { display: flex; align-items: center; flex-wrap: wrap; - + >.menu-item{ text-align: center; - width: 63px; + width: 20%; margin:10px 0; } } @@ -35,4 +35,4 @@ export default { .menu-title{ font-size: 12px; } - \ No newline at end of file + diff --git a/seller/src/config/index.js b/seller/src/config/index.js index 0d51af68..0ae255f4 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -18,16 +18,16 @@ export default { * @description api请求基础路径 */ api_dev: { - common: 'http://127.0.0.1:8890', - buyer: 'http://127.0.0.1:8888', - seller: 'http://127.0.0.1:8889', - manager: 'http://127.0.0.1:8887' + common: 'https://common-api.pickmall.cn', + buyer: 'https://buyer-api.pickmall.cn', + seller: 'https://store-api.pickmall.cn', + manager: 'https://admin-api.pickmall.cn' }, api_prod: { - common: 'http://127.0.0.1:8890', - buyer: 'http://127.0.0.1:8888', - seller: 'http://127.0.0.1:8889', - manager: 'http://127.0.0.1:8887' + common: 'https://common-api.pickmall.cn', + buyer: 'https://buyer-api.pickmall.cn', + seller: 'https://store-api.pickmall.cn', + manager: 'https://admin-api.pickmall.cn' }, /** * @description api请求基础路径前缀