From da5cc8335fdca2a3ad3b2827e99dec91d9708a7b Mon Sep 17 00:00:00 2001 From: mabo Date: Mon, 17 May 2021 17:38:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E7=AB=AFbu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/styles/common.scss | 4 +- .../main-components/tags-page-opened.vue | 14 +---- seller/src/assets/logo-min.png | Bin 4637 -> 0 bytes seller/src/styles/common.scss | 4 +- .../goods/goods-seller/goodsOperation.vue | 55 +++++++++++++++++- seller/src/views/main.scss | 2 +- .../views/promotion/pintuan/pintuanGoods.vue | 31 +++------- .../src/views/promotion/seckill/seckill.vue | 11 +++- .../views/promotion/seckill/seckillGoods.vue | 7 +-- 9 files changed, 79 insertions(+), 49 deletions(-) delete mode 100644 seller/src/assets/logo-min.png diff --git a/manager/src/styles/common.scss b/manager/src/styles/common.scss index 29d84517..0aa5cad0 100644 --- a/manager/src/styles/common.scss +++ b/manager/src/styles/common.scss @@ -14,7 +14,9 @@ $theme_color: #804ed1; border-radius: 1em; background-color: rgba(50,50,50,.1); } - +.ivu-table table{ + width: 100%!important; +} .flex{ display: flex !important; diff --git a/manager/src/views/main-components/tags-page-opened.vue b/manager/src/views/main-components/tags-page-opened.vue index 0df6ed37..9e2f432b 100644 --- a/manager/src/views/main-components/tags-page-opened.vue +++ b/manager/src/views/main-components/tags-page-opened.vue @@ -8,20 +8,8 @@ @mousewheel="handlescroll" class="tags-outer-scroll-con" > - -
diff --git a/seller/src/assets/logo-min.png b/seller/src/assets/logo-min.png deleted file mode 100644 index 6de196a82fcf67d5753222b8aa3840384722e166..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4637 zcmV+&65{QNP)7S9qIW}B%1xp~i4u`0QKCd7N|Y!Oi4rAB zM508A5|Joz?3#sd8&S5#|Eni@;`f%sD_RsRinYvC#z2{wQU}V+ff|MlLuSSq(~Q~O z{p=e@uIrRGRV>w4N6~m<82|hoytDDERIgQ<%`wE!Um4Tf%TiY*uG(yjA%5msjz#}r ze|=nFgmiig@iW&=pSp{7T$aS!K5wht9z*<`XgJNYQygPaM zO!^-V>oF%c?^TXCIj^pbA%5CQl*>m14!(TW<-Fll4+$KXN{%6Z?5Z}K&m%!3We_~f zF*C9_r^>q-$H(TDF~oSObkZekp=|qE`WR2mNUm8`z9_nP(R9`{#}Gff3bpD1p4~}1 zCRql)Y*EDPiUf%JIeK1I$0g23WfH%xZ>KZmA2D1A)O*> z9YY+xAhDHL>;TVgr|kO~>VoLD0AHU?Fx0Ffm+JN59LEr=&H6Q2{F~j5w&a4xg=z-U z1Gs*>B8sSWkZ1DM>JW}&i1S_K=un7~1^^>+KKhKRUkPsG9EUk=+5p1&lD7Da*jVCe0xNS+0+ zg5eDr$M!ol@pQQVQ769?i+sHhjYi|J!2io(Kkjl~m8E$_om16WwF439<-F(uLCm|> zvWGjHxg>SUodLhbGZW>~*Q-QNHiPjhSfCxg&@%||uHVO}Q)Z(vQ2pS^2$B69ag67` zjD!IC>y3%^Rtrg1)ipYq060aMaq+UDyA_*>&58`pH+AXTvXI><|33EL~ z7I)e7Ex(N`$Bv)Xl8#4nGF-ow%_!lBkW zKe!Y%CLhEIM7`Wt6bnGP=U$9JY&6@i#C$@3>wDs9c$G6$P8aGIU!|T3TBY8qHagik zoUM8yh7vc+)m9)?5u=7HTrLq(uLSDy>Q2m0<9Cy zEtt-;)D=m}n3bVQoO%$0Q{y3fAAX#`bF50?`s>V<<#aSx zyXnaOaV~u7MUoGc=4_cQw<0_4L~($yfP<+A@juUpZA$Uzlf>@3QJlHFn86kmHmWSj zAjH#d=N+GKgdm2CWmWG$RPzOYq4YcwM$qY9u5^fF_b?2VObrAq00KC22HN<#3h7L5&*&b&+DmsHXBdC!A(y+)=AcdB zfSY%e+g>dR@n1aul}Cr@9NwZoS%KF-;x$0zgC)G`g-cK9wUf`1fcS{d`4X5}#J16P z5)%hJdWvO`qelW_%BTP$Q6e!_FW&Zh;V=ChVRM-Gx#@kh^|afSEE`{_HbjN=*M$fi zpFBi~bBO1LLOjH?$l99^5dsMpN@^cL;?c{o7;+0Pv{#xzj4&B<7fhi~x}5tt#;5CR zjmHM=oub%8Sb$V-WH**O@T)N<@a(StT&lOZ-*ZGSHy_M5Edky1`Ng`)z0 zNZ_!Oi8khxOE~9oU6#c;uYA_y+D1FrFL{d$N-IopCRnN$od+OF$2bn-HEd&TGDP&t zYA+!6xpN^{EMpS2jdJW~>Aeg^Y!5^2V<^n@r#Tul&v`mK>zK1{JiczP!=_SO9QI4Y zWJnUrQI5yup^4sPi1-;vg*X5)P$;d$6T28{l4Ee81GbOt0L3QUS+{$VW0^0YM_d@> zf5t@`zM)E#j|%KwmPVVu$q);*x}pz4BqnJE6tpOGCjjmp!%1+QV(D{k=QPhPN241% zt$@H!xtt5CGSrue5)bn%u0*d^MnH)K;!rWh;ydYnh;ZjsBOE&i3eL)F?Gj)UkN~qvmITeq zlKYbAMxaDL`(F~QHk)_-{(+5w0mHvABH2wljyw5Ev$?qt$r!Put|LZ3WYZa)YnA9rU<`?tTHb_#&lFGiHU*W}gh zV|-6l%R%O!bTQFV@p^YwINPi6L2#&3BXpb+gumOZ*r*wSj-}m-=^Ap#dJy64Vy!3Veb9@u6%!>V_DE;C za$bWqzfM@h)20|^f@2D`+DNp0F)j0$bNLEIGEaoPlVQp$@#GH5e!waG@%GK1ojAV7 z`WjyVd1fGG11kpimcBs?9s&fFjAKp?SVQq)KOWD&B)KhbJMT@eik4|+m@i*KiE6h$ z4hBYL6qYm1TPqGFr~8U!DWiGP*&!T@YHzypAQ(bI+($cx5`^tT@?mN4vb+<*NU-bf){}8>hb)dQ>!ptOre<8m z6C%SAfmm<1?f&2+nh%>*PdfLQcKY8|A`vFAhKk0EXmnSva-1NgBJ6E3o^!h`!$d@c zNg^h!hwsyD7W7fvFcfOi5rT-o6wDVFUaly)e6VahVFWRqaV1l9FcK)0fltb6ik9~m z%X~QY(ifQEnf`o&Elq4B?dyYh!X*$d{xFnJqoz$U!XD8*Dg!V{rx1P|oRhRvb8Z?i9OXG~mcjSf`ZJ!zJUs-@lz&ZD0Tnu1!$( z&nBihhRATkZQd(G_%9-%QM@ax(rAQA#+_w56O2YHwdb76;SH*}{Cz78FZP$pTqO2f za7T^GLw{fg?Eu6sEP77$?(3)z9M^mt+N4R-_9bL^)X5{Wk0L~@gkcJ?GQuO(yB9%_r7@MbB#F=| zx<*Gbh1uVZo@-BW^xFQ6W#eRcr90O_D>=Fl8?6@FWF@Q3JbbR^I$g^Avn45=bH~$g zY82Z@GAPJrtoA+K3FBVmWtO2MaiGTwJvsfR&yP|5cFKw-nv^&jXy~TTx}A|?anx^o z&lqN)XxJ1VoH|}@u)*luvqgl+6;XM{Izxtu`jP7lb=Hb)YQgSU_NZuePz+%j#HOTe_pKI7$AC@q*nVDj9}nnF}r_Q8BP5;DlKWv^UDOU1c_qv>;e!|vIaG-b_YKR z!pApd1Ju;BHJ7rSAT3DE4m8lrV24M=R@-+|afJguGSq)f6Zr78>6mvlB~kWn%|umi zJVnU`^}l=jVWHBfP0qIBxr|~o&MqJ%6QWWbPggbV{hJ}4_ZVu&5Ub;{P;UiEHYur) z<JL%&dlWoi-Ad#1++Sc4oJh<%jAnZK<03o9k$l;!jHl(3 z32Ax0EE(rzzSgjZ$K~;)JenYV%e?{BY{tu_-5F5G6j-Q&pTM+c8NjsRSm3qkTKM~$?p_e>vnZ(E_eU6~1bdA0 z(q=06lfYraz!%VlEVG^^!ep^ns#Qi4pyW!m2qWxesTd~_mIv9SwtJAAXx&qLeZJkH z8m&yF8g`vcO?|*~^F-mhWb%t(=(9cFSG)W3q3DBH>c{oHm)`&4KhM1W-giq{xppfz zG$AN+xd>7 z-XsecjH*pfE8|nO)dh5aj>gF+OcfKHl$N!Oq$5Wqco`ZqM6&)o6(E=(S&YzpTGaEZ zoskWo4-hmSd~w@9x4t{KwtvqTfk>EKUETVHYiPMcvUX3#I6*IM2UxGtJiCn2{C$5E z>ZdlIAYvXk-kd0eIEgRUAaSabGiW2AhyTir4p*+@UW{AD7ygFJ({{O_TWLw3VP(V! zEg+0Skgi8l+wsiSL3TBgg3Y@9AqYMuTkCKRBO_}`UcrT7k~=8M2~LR@WoV`d#Rm(; zFv%mN?xhNkLh(R>b~^o&%d3m4>&I>NA3D05W4Q1*%1TRH{&-RHjz&tee9^c;$?vqNhX^cLc{U#Q`7OImQ4VyPYhoL{edzGuqwL z>+8pSeD8}SPskF=>#Hj``0>T1GZ;oW`9V0o5=tPG zfKFaDDbt-9pauiHu|7#p@^YM$qDajJ2GllU>CHrLJDrcRLeZ^4ke)xun>>-bQ2_0p zo>`p%VS2Hmw3{K<;~9vOoiwqP$Zsd}JLv+xe0eIuifP4wkL>{kL}R+Kd4hhJx_^ zQ-+z*Y)PTYse^Z)I(7d5Z-3mz7eWtzue+ICXw-Ja-RAyZ-SsI=hMU z_HwnFT9Idg*j8#urNmrP&be4E9fY# diff --git a/seller/src/styles/common.scss b/seller/src/styles/common.scss index 41d2dd26..63488166 100644 --- a/seller/src/styles/common.scss +++ b/seller/src/styles/common.scss @@ -14,7 +14,9 @@ $theme_color: #804ed1; border-radius: 1em; background-color: rgba(50,50,50,.1); } - +.ivu-table table { + width: 100%!important; +} .flex{ display: flex !important; diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index 4ae186a7..5a3362d7 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -28,7 +28,7 @@ :key="index" > {{ item.name }} - 》 + >
    @@ -39,7 +39,7 @@ :key="index" > {{ item.name }} - 》 + >
    @@ -701,6 +701,34 @@ export default { this.activestep = 1; this.isOperationGoods = false; this.GET_GoodData(); + } else if (to.query.id) { + this.activestep = 1; + this.goodsId = this.$route.query.id; + this.GET_GoodData(); + } else { + this.baseInfoForm = { + salesModel: "RETAIL", + goodsParamsList: [], + freightPayer: "BUYER", + weight: "", + goodsGalleryFiles: [], + release: "true", + recommend: "true", + storeCategoryPath: "", + brandId: 0, + goodsUnit: "", + categoryPath: "", + sellingPoint: "", + intro: "", + mobileIntro: "", + updateSku: true, + regeneratorSkuFlag: false, + templateId: 0, + }; + this.activestep = 0; + this.isPublish = true; + this.GET_GoodsTemplate(); + this.GET_NextLevelCategory(); } } }, @@ -985,7 +1013,25 @@ export default { } //新增商品 else { - this.baseInfoForm = {}; + this.baseInfoForm = { + salesModel: "RETAIL", + goodsParamsList: [], + freightPayer: "BUYER", + weight: "", + goodsGalleryFiles: [], + release: "true", + recommend: "true", + storeCategoryPath: "", + brandId: 0, + goodsUnit: "", + categoryPath: "", + sellingPoint: "", + intro: "", + mobileIntro: "", + updateSku: true, + regeneratorSkuFlag: false, + templateId: 0, + }; this.activestep = 0; this.isPublish = true; this.GET_GoodsTemplate(); @@ -1088,6 +1134,7 @@ export default { }); }, handleBeforeUploadGoodsPicture() { + console.log(this.baseInfoForm); const check = this.baseInfoForm.goodsGalleryFiles.length < 5; if (!check) { this.$Notice.warning({ @@ -1198,6 +1245,7 @@ export default { ...this.baseInfoForm, ...response.result, }; + console.warn(this.baseInfoForm); if (this.baseInfoForm.freightPayer != "BUYER") { API_Shop.getShipTemplate().then((res) => { if (res.success) { @@ -1702,6 +1750,7 @@ export default { this.GET_GoodData(); return; } + console.log(this.baseInfoForm); this.GET_GoodsParams(); /** 1级校验 */ this.loading = true; diff --git a/seller/src/views/main.scss b/seller/src/views/main.scss index d4d2ea6d..15864933 100644 --- a/seller/src/views/main.scss +++ b/seller/src/views/main.scss @@ -258,7 +258,7 @@ top: 100px; right: 0; bottom: 0; - height: calc(100% + 52px); + height: calc(100% + 200px); width: calc(100% - 240px); background-color: #f0f0f0; diff --git a/seller/src/views/promotion/pintuan/pintuanGoods.vue b/seller/src/views/promotion/pintuan/pintuanGoods.vue index b1d56c37..73aedb0f 100644 --- a/seller/src/views/promotion/pintuan/pintuanGoods.vue +++ b/seller/src/views/promotion/pintuan/pintuanGoods.vue @@ -19,11 +19,14 @@ +
    @@ -138,27 +141,9 @@ export default { { title: "操作", - key: "action", + slot: "action", minWidth: 50, align: "center", - render: (h, params) => { - return h( - "Button", - { - props: { - size: "small", - type: "error", - ghost: true, - }, - on: { - click: () => { - this.delGoods(params.index); - }, - }, - }, - "删除" - ); - }, }, ], goodsData: [], // 商品列表 @@ -327,9 +312,9 @@ export default { margin: 20px 0; font-size: 15px; &::before{ - content: ''; - border: 1px solid $theme_color; - height: 10px; + content: '|'; + color: $theme_color; + display: inline-block; font-weight: bold; font-size: 16px; margin-right: 5px; diff --git a/seller/src/views/promotion/seckill/seckill.vue b/seller/src/views/promotion/seckill/seckill.vue index 9367daa3..49d4ced7 100644 --- a/seller/src/views/promotion/seckill/seckill.vue +++ b/seller/src/views/promotion/seckill/seckill.vue @@ -64,14 +64,19 @@ diff --git a/seller/src/views/promotion/seckill/seckillGoods.vue b/seller/src/views/promotion/seckill/seckillGoods.vue index 3b6fb1fd..7dfa3450 100644 --- a/seller/src/views/promotion/seckill/seckillGoods.vue +++ b/seller/src/views/promotion/seckill/seckillGoods.vue @@ -16,7 +16,7 @@ - + 已选择 {{ selectCount }} 项 @@ -101,8 +101,7 @@