From 03ce8817be418d836a7ffa5d73bf339934e1e5f1 Mon Sep 17 00:00:00 2001 From: qijq <624811160@qq.com> Date: Thu, 14 Nov 2024 14:55:08 +0800 Subject: [PATCH] update --- admin/config.js | 4 +- .../static/shop/default/js/product_item.js | 3 +- package.json | 9 +- public/config.js | 1 - public/index.html | 6 + src/api/printer/printer.js | 200 + src/assets/time-selector.jpg | Bin 0 -> 59994 bytes src/assets/xiaofa-logo.png | Bin 0 -> 7975 bytes src/baiduMap/index.js | 4 +- src/components/baiduMap/keyword.vue | 120 +- .../baidu_Map_xiufu/overlays/Circle.vue | 166 +- src/config/net.config.js | 29 +- src/config/setting.config.js | 6 +- src/icon/xiaofa-logo.svg | 194 + src/main.js | 18 +- src/utils/routes.js | 67 +- src/vab/components/VabAppMain/index.vue | 6 +- src/vab/components/VabLogo/index.vue | 239 +- .../VabTheme/components/VabThemeSetting.vue | 338 +- src/views/login/index.vue | 544 ++- .../productList/components/addProductEdit.vue | 3703 ++++++++-------- src/views/settings/config/receiptMachine.vue | 425 ++ .../store/base/cloudPrint/addCloudPrint.vue | 746 ---- .../base/cloudPrint/addTemplateManagement.vue | 1630 ------- .../store/base/cloudPrint/editCloudPrint.vue | 1854 ++++---- .../cloudPrint/editTemplateManagement.vue | 3597 +++++++++++++++- .../store/base/cloudPrint/plotterManager.vue | 436 +- .../store/base/cloudPrint/receiptDialog.vue | 2005 ++++++--- .../base/cloudPrint/templateManagement.vue | 389 +- .../store/base/components/LocationEdit.vue | 414 +- .../distributionSetup/distributionMode.vue | 538 ++- .../distributionSetupConfig/config.js | 221 + .../distributionSetup/editSelfPickUpSite.vue | 470 ++ .../base/distributionSetup/localDelivery.vue | 3798 +++++++++++------ .../distributionSetup/logisticsInterface.vue | 165 +- .../base/distributionSetup/selfPickUpSite.vue | 200 + src/views/store/sellerconfig/index.vue | 218 +- src/views/store/setupshop/index.vue | 603 +-- vab.config.js | 4 +- 39 files changed, 14580 insertions(+), 8790 deletions(-) create mode 100644 src/api/printer/printer.js create mode 100644 src/assets/time-selector.jpg create mode 100644 src/assets/xiaofa-logo.png create mode 100644 src/icon/xiaofa-logo.svg create mode 100644 src/views/settings/config/receiptMachine.vue delete mode 100644 src/views/store/base/cloudPrint/addCloudPrint.vue delete mode 100644 src/views/store/base/cloudPrint/addTemplateManagement.vue create mode 100644 src/views/store/base/distributionSetup/distributionSetupConfig/config.js create mode 100644 src/views/store/base/distributionSetup/editSelfPickUpSite.vue create mode 100644 src/views/store/base/distributionSetup/selfPickUpSite.vue diff --git a/admin/config.js b/admin/config.js index 74dff55..095759e 100644 --- a/admin/config.js +++ b/admin/config.js @@ -470,7 +470,7 @@ function mf(number, decimals, dec_point, thousands_sep) { var StateCode = {}; var User_BindConnectModel = {}; -;(function (factory) { +(function (factory) { if (typeof define === "function" && define.amd) { // AMD模式 define(factory); @@ -484,7 +484,7 @@ var User_BindConnectModel = {}; window.SYS = {}; } - + SYS.VER = 'undefined' != typeof SYS.VER ? SYS.VER : '1.0.28'; SYS.DEBUG = 'undefined' != typeof SYS.DEBUG ? SYS.DEBUG : 0; diff --git a/admin/diy-pc/static/shop/default/js/product_item.js b/admin/diy-pc/static/shop/default/js/product_item.js index de54260..dc1b273 100644 --- a/admin/diy-pc/static/shop/default/js/product_item.js +++ b/admin/diy-pc/static/shop/default/js/product_item.js @@ -21,8 +21,7 @@ $(function() { //defaultSelectValue : '-1', //defaultSelectValue : rowData.categoryId || '', showRoot : true - } - + } var categoryTree = Public.categoryTree($('#category_id'), opts, 'product_category'); } diff --git a/package.json b/package.json index 448323c..80852a1 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "lancer-admin", + "name": "xiaofa-admin", "version": "2.0.12-dev", "private": true, "author": "Yutao", @@ -26,6 +26,7 @@ "dependencies": { "@logicflow/core": "^1.0.2", "@logicflow/extension": "^1.0.2", + "@vuemap/vue-amap": "^0.1.17", "axios": "^0.26.1", "clipboard": "^2.0.10", "core-js": "^3.21.1", @@ -95,11 +96,11 @@ "svg-sprite-loader": "^6.0.11", "vab-templates": "^0.0.5", "vue-eslint-parser": "^8.0.1", - "vue-template-compiler": "^2.6.14", "vue-plugin-utils": "1.0.3", + "vue-template-compiler": "^2.6.14", "webpack": "4.46.0", - "webpackbar": "^5.0.2", - "webpack-ld": "^1.0.2" + "webpack-ld": "^1.0.2", + "webpackbar": "^5.0.2" }, "gitHooks": { "pre-commit": "lint-staged" diff --git a/public/config.js b/public/config.js index 74dff55..615c7bb 100644 --- a/public/config.js +++ b/public/config.js @@ -524,7 +524,6 @@ var User_BindConnectModel = {}; return SYS.CONFIG; })); - // utils.js if ('undefined' == typeof window.verifyUtils) { diff --git a/public/index.html b/public/index.html index 9afd673..d6a3b7b 100644 --- a/public/index.html +++ b/public/index.html @@ -25,6 +25,12 @@ window.SYS = {CONFIG:{}, URL:{}}; + + diff --git a/src/api/printer/printer.js b/src/api/printer/printer.js new file mode 100644 index 0000000..6d2e807 --- /dev/null +++ b/src/api/printer/printer.js @@ -0,0 +1,200 @@ +import request from '@/utils/request' +import { URL } from '@/config' + + +//总后台-获取小票机品牌列表 +export function getReceiptMachineList(params){ + return request({ + url: URL.shop.store.printer.getReceiptMachineList, + method: 'get', + params, + }) +} + +//总后台-添加小票机品牌 +/** + * @param { + * model_name:飞鹅云打印机PF-V7 打票机型号 + * intro:飞鹅云打印机PF-V7 打票机型号备注名 + * brand_name:飞鹅 品牌名 + * website_url:www.feieyun.com 官网URL + * paper_with:58 纸张宽度 + * } + * @returns + */ +export function addReceiptMachine(params){ + return request({ + url: URL.shop.store.printer.addReceiptMachine, + method: 'post', + params, + }) +} + +//总后台-删除小票机品牌 +/** + * @param { model_id } + * @returns + */ +export function delectReceiptMachine(params){ + return request({ + url: URL.shop.store.printer.delectReceiptMachine, + method: 'post', + params, + }) +} + +//总后台-更新小票机品牌 +/** + * @param { +* model_name:飞鹅云打印机PF-V7 打票机型号 +* intro:飞鹅云打印机PF-V7 打票机型号备注名 +* brand_name:飞鹅 品牌名 +* website_url:www.feieyun.com 官网URL +* paper_with:58 纸张宽度 +* } +* @returns +*/ +export function updateReceiptMachine(params){ + return request({ + url: URL.shop.store.printer.updateReceiptMachine, + method: 'post', + params, + }) +} + + +// 商家端-获取打印机列表 +export function getPrinterList(params){ + return request({ + url: URL.shop.store.printer.getPrinterList, + method: 'get', + params, + }) +} +// 商家端-获取打印机详情 +/** + * @param {id} 打印机id + * @returns + */ +export function getPrinterDetail(params){ + return request({ + url: URL.shop.store.printer.getPrinterDetail, + method: 'get', + params, + }) +} +// 商家端-获取品牌列表 +/** + * @param {count} 数量 + * @returns + */ +export function getPrinterModelList(params){ + return request({ + url: URL.shop.store.printer.getPrinterModelList, + method: 'get', + params, + }) +} + +// 商家端-获取打印区域列表 +/** + * @param {count} 数量 + * @returns + */ +export function getPrinterflagList(params){ + return request({ + url: URL.shop.store.printer.getPrinterflagList, + method: 'get', + params, + }) +} + +// 商家端-添加打印机 +/** + * @param { +* model_id:1 打票机型号ID +* printer_name:核销台打印机 打票机备注名 +* printer_sn:922441475 打票机编号 +* printer_key:r6ZXPvHH 打票机密钥 +* region_id:1 打票机摆放区域ID +* paper_with:58 纸张宽度 +* printer_id:1 打票机自增ID +* website_url:https://www.feieyun.com 打印机网站地址 +* } 数量 +* @returns +*/ + +export function addPrinter(params){ + return request({ + url: URL.shop.store.printer.addPrinter, + method: 'post', + params, + }) +} + +//商家端-删除打印机 +/** + * @param { printer_id:0} 打票机自增ID + * @returns + */ +export function delectPrinter(params){ + return request({ + url: URL.shop.store.printer.delectPrinter, + method: 'post', + params, + }) + } + + +// 商家端-更新打印机信息 +/** + * @param { + * model_id:1 打票机型号ID + * printer_name:核销台打印机 打票机备注名 + * printer_sn:922441475 打票机编号 + * printer_key:r6ZXPvHH 打票机密钥 + * region_id:1 打票机摆放区域ID + * paper_with:58 纸张宽度 + * printer_id:1 打票机自增ID + * website_url:https://www.feieyun.com 打印机网站地址 + * } 数量 + * @returns + */ + +export function updatePrinterInfo(params){ + return request({ + url: URL.shop.store.printer.updatePrinterInfo, + method: 'post', + params, + }) +} + +//商家端-更新打印机状态 +/** + * @param {printer_id,status} + * @returns + */ + +export function updatePrnterStatus(params){ + return request({ + url: URL.shop.store.printer.updatePrnterStatus, + method: 'post', + params, + }) +} + + +// 商家端-测试打印 +/** + * @param {orderId} DD-20241112-1 + * @returns + */ +export function testPrinter(params){ + return request({ + url: URL.shop.store.printer.testPrinter, + method: 'post', + params, + }) +} + + diff --git a/src/assets/time-selector.jpg b/src/assets/time-selector.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b0b3cef1e07a44cdc2e33cd0d0ef01c859abb1d4 GIT binary patch literal 59994 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 D0I*8z literal 0 HcmV?d00001 diff --git a/src/assets/xiaofa-logo.png b/src/assets/xiaofa-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..1160a0fd3394804cbadfcbda289a8d98eebfa819 GIT binary patch literal 7975 zcmZ{JXE>Zs^tQIjis-$Ix>}-_XsajK#V%G4QKCohb%_!Y1ko)L8$>4|Y7o8GC=tDP zt1a^S{onHK{V>lw^UQV5oNKN#&zbwa%D z-gmfO2AW`;ieZ-R`vHN2imnO{PIVIL%?rT&n8ZU1;e~@k$Mavq)i&Th!ogu{)>c!2 z`CIN=kba=)ZnR8N85&A7ZjtV5ImYGJIEr>uBWST14JS~uJ&4msqT^&W$S&jc@%yxC zC?xbb3LIAid0X?IaTgz(&bBjkG+Rc`<5Q~Aw6k>is_tw|CeRaSlD$$;07-Hhx z_l%CoOHKesw05U=0zM}nb{s8xx8hvxcK+0;`k&Sb>LKZYbjs9lR?i{eK>JJkDOk5> zRmgV)Unuy-&!ju{(bgMj7J)_5h19K@sT;Nc);wCL(u%zLuK~r}*gRix2`8>L<1agM zR|f&)dDKp&pVB0kj?AxCmHpL>ch)HClIqLa-QUV` z!b`5NIm@9$*I0xVM;BAY9W8rbiuAlgN7ulT#}#>V)Wbc?RQo=befE>2S^5VXEwJ zeURS>nfoZyS%o~d`qsLy&lD-!3b0=<)=TzTSZG0};~=YIo{<7>qY^Wto_ojg?MfGu z(N{tWgrD5PQ$vh2k?~^+gnFU*-j`Lu`JIpa(6D0FesD{d*h5R4ilGCgh zJDKQ(>=TV|Q}(a!ASNDl7`x?&s3e{+Q6P`7GPQ399qK0>@=_F?yrP z9QW%B_N_h<)T|v%E~)*C+Q^tjw)*g1OiXdHy4tqDDaDeq;QzeDcKHDQwq2sLKOaE_&}>9n&Y6SoyGq2{bLu{ag`svECMk6( zE1oytN{7k);h7O*?z8yO_Y^pm^0OiikYas!05X!d70H}_1!kTkb)W^1&<<#3EoVYt zQ0^w-$>9>KHCSWp*U*oH_%TTe**py)+$9U7YElbc$5Z7tYR7HC zqgtr3I#Md9y@UEZ6UCL!&?nuqwelSK!ptoZk28t(g6&&!K+F_=`)AL4pE_y>4MaVq z!;8LCOX)rciMa`R4qoVd<_I7SFoPKW6SKb4MVk`0i1?&sa_Frb0W|EITs8|1U1 zhO&DA89g-AG%mNpS5WZWG3S_7!>WdTo3v_(8U;#-!yag({mWYFiht{(q;4()|3D^x zqV3fDaC!vJU<6mnas5O_p;!DOMvn><`25^ z19S$b$!$NSqtVAr-cE;RyIX+rdFXRT+WK>4>dNyZvN6H>0ww(bQ!`LLo2{Qx`*qO8 zyYE=8`sM+ZPkIpNZ|4blrbIuZT@+@Fu|O!3M}sZiu;BOmT$9d=$h(-uC5BZ#tF$ zrn1?YSv8~g&`&i_%3whUNhUo@mM>aH1a3s$$LLo#z8(`uLezSWFJ~@H~7k`OZ}x`W0IB>Y+(yQ zF;RES76^+!=9%1J4pq(TB|Degl3)Lc8`W!8Dy7rJh`ab(SMnr& z*E}!-TiC)5lI7U#Y}Rwiy)sRs9Nl=g9klKdIeYHr-cajVm1h z9Ll^NR5$1^%*x{2{8{-I$-Y8H27DLVGDho(GqXGyeH9~WNq?915XExS`x_(`VwKc|< zmXD0sJh&6un)OAxS&8{zaieU}EU1%D5AgyH-}K~l8xYp&FCMzAljruARZ*ZKO~eX` z$|3QK7ZjNzu^yg%4k@phxPY{CMJ%me_jT)vq)g6V2ocNN<*?YhFWlrJnF$#JM+0Z1 zi{uL6-&T4^f<)<-GXaEVAK%q?@mWa)cVJVsjr{WDpQ96r_f?`y*N7#XUZz3yFPki9 z{_S-JEe^ibMS%f{ivPm5GfOFpOt4mYDPEcQrVM3<+4Y;|gX6ic81}@KJDHDjt+7=$6f$ACD4iZ?|CK3x>aM|Vb`+89GlK(UMdRjQqW=rUoxe{ z>EKjFLgM0}z2D`c=8sB>BkszW#|+A;Oks~6!H~pi6h@#_W+ZWi4CRRA1W$UI!0{k?WPo;`_?_Ups~h zJ*;EI!lj)?_Q?2TJCDg%FL|YB>)K~g(}RvyC<}0RiM$mKU_Yz0|5l@R%OWf#XLG@T`Zy_Env^v;;W?wo}gN>TqcVzfj{l_XbH$!U0YbV5ccg$5CIQK8F%S&KeLd zlTXmX2yEZ`AFqJZ#5;MmASuC+Rfzj^Vt+}&X{NEKV$VlPaZm9sQtB{_?)25qm}ai% zBEK!i!&n+5-4v&wIN0^ag^E}dvswaPEzMr)q!u&1^7=$k?tlB6cn23|-Fc%zXOqk& zN3t_K!9)-aE&9gQ8(GA+otfy_k1?p+Sawu(pIeM!uzSTW+sE)nn9bcY99Jyk;+g;{MCWScxn71qi8F_1I z;4puE?TLFsxQhPj)VGwY`mRzFyT%4YK@zi^lNch;m{=Et4-%QYhcSIfu9OSiQ-Yk) zaXnPli~6%KLvM!ptiyC3glIxN=aPt{tMnP z?pXw}+-E+fb^%m_(n(!#jEnW?C;BBCVWpphm}uwItd4R#VNWXy1uH7D<%8twEA^zO z3IyP6Wk!1yr_T(2Tk7^!RaxXt6u6?te~5C9jiqWDh}bs6n6H31#9VZW$1F8_V3Uwv z(Fnp&6X4$`Y1Ke2HEG_H{mfwHX+aCkYK7aeq+i_XJ%*yEnH>IRY0jqygWDggETUuWncIUb7X2&U+#N zZ%<&2z7+H4j@aVIjEtB}OnAnV#$7KX`BSm&fc1mkH%lH5Ud5cO@P0c?Y2xWw|FA2C z(sisW#|~XQZRvBHnt`y4D;{4i*t}qaf3`r@);2*(tJc4TJzgxe8OQnBx~))HETJ`D ze{9jpJ@;TVD_*W3MhZ1n(|~2?qxO%%vi#a?{)!i(F&La|C#N%LgF)NR^S8Ir;)-xl zw>tN8nmw24bJ{hr)z|P{&+~58qag9s1HM zKEfc~c#bb9gJ{2&P{&+neNpyCVG|{7unQ8T!iXlxZj&*ya9lF$tA>bmr^;T#IP|tDl-&qEg=G&F|Z09)4 zzqvZ2Lh>fvyX^}i!)}!C>XWL~ZR6fLRi0^Mj8Tl|Z1BA0g~DZL!=J`@Y$umavRoT_ zElMDH$S`&>=?g@Z!skg7?=aCA@PCGOgz7fK%8Py)xReSd_mbUlK~PM>UUXz=K_4=p z0F5E~X_Y7?1%BJqP!=Se4|qjW+N&qf3jI2!g^qnX5xDv6D#L{XSkN00(r6gp>lXUo z6cp{rB-Hacy|l|JFc*H{zNqqpVa+X+OI{BPuGeV6P90y+i@l<-WPLGBYYhdEhb7y> zUiZ98&M0Icq0JZUr&;Ar#9N=^nLPSlt5p`sXk)F$c{S#M*k%g#CAHGWNp4WOp()Gr ze6hi>S1~8osM|`TzSbS00e1bq@{6UjVWLYGW1Ru5rircreY8oj6!|LDt#3$KdVZ1K z?YBAEr)y7l5!Y-!r-i;kE)$S`AqPA|#~!TkR&~5-&~p>3H8)+up=pICkdGm=NR&A} zwb;dfDvtuX3-)PVKdi;*qrcJvTt1^%dI+gHIw6?o(ignNNxdrLgT$&30$;q%$7bx& zM!V5>oP^@7(ArFrl$icFCZ10E9ggdB3Hw7YC*^$!f$$}C9ZmhrvXuA>zGHTM{Htp) zD?zAXhO63HP<_GmPsXiBpg^&nA5zWTKW#@qCg_%ksvPJ06fw&sWINq9kxvk@=!jG-v%mRy&!k+_S&oxPClm9_mDV-e#*Z*K)p~@lewiL*F+n#Z~Yp5R1 zu-xPnn|h_j(a4$QXr>eCj}zGb1eBC2RIErd2%LIAK}xHCbwUCc%@g`;Wg8aAT_)mY z;Fq91CbbXvN*pCtPxI`Pd+8`CII-;{=H|H+#e1@KO+BpTbj1+x@AV9~k8vI5bwX42 zdEp6{Yt%zi${6ZVU>_-Xin&Vwvm3Z-@n4>q2OVj>_Pw51BxG%;6M^x5+ajHMT2(}1 zPLPO<59KHHpqXP2(clk*IqD}0p?qC~-wdwNg`ggC4X}zPbFcpEv`YWMWf>ZEzdlo? z8Mlu^UfRDjG8bUEH<=n|9aMr9+<3si(Xk#n`HwnhP?CN=MECLW@)5F`}0tCm5z zOnEe=lRJe8)^uABV`)0s=b{Mfdnuj5f{6a3nGjmluiijUNr;io%m8U*{8C*N*W^*( z1fr?P@NSA>d&6k?`tvB81X}$aG$OrQuooP!YlV&qcZJDT@J)7M<;8-YXZ|K8^PRBo zD1XXPrx`&5GXE!d&a6!b(|Jgb;&P+ixT55aoFg++I4vG?!Mp zxSL9sy~d+{9oZm}Yk_Y;PGj}kEjn2hGqtYoosJZ&?eu3x%-RtcGF+RrXQojbX9a>V zA+%@Eu8KU;lo&`03RYyUY{~W6Y9@A4Mjwe5;K+j(a8z1y>*Vu-1-$;eYf}{cmqjYX zU!LcQ3wa|-!b=_KM`W^>v}?XtmVfb;=YPUf_Wlj38MPTJ1FH)HmR}`KYbalLVdvMw z5SqJ(cQXEWArEb z&K#KGnp)`pLKNI&8)nioLQ2V79FfTeeP^HWw&%z06q4sn~j<%uF--!#AnV2QKQyq8t<|SNqQRB))#3=>ts@9fg$X#L;VqR8hm#kU? zuB1eDKfc$u@Yh*|B=8a4hogBVx1x}KO~Qz2(Q3P%zpXbtkb&QdL<#%+?M?-H8LHaF z#6(E{8+#n0?a?uZswTv#iBfXO$46m~!2j_Guray0__Q(y|4K|d5kr#(u~0m?TAo_? z44g<@G00fn-n>T(&b>S=z&fuDAFm4Q?Q^|9o(&=hJDHM)W}<-D5q@_2I{)WR9ZfiA z=|p|F^iPM-r!rve=c6AGAL&4Bfm>a#&a_zzX;D8PYL4ywva;|jh>B3;N_S-AY%ebo z7WMf1L`dvK;GfeX!1IF}n1}$gLVkK`fb!duRZ(~DTr}<^qB3n-^8w}N_dH-!S zj^1QKw{3>DhOTMTD}0oq?j;}{89yA@xlY=bD&JuPl(ZR3GQ>@1oS~y=eiXd-d%WcP zGZ9zOzoqoD0fBng?O|*q*d~pw(4c|8gsukv;O@{8z~0AX!{Gthd}?IO;DejVDsEUo z35|T{n&6K#?zW^$&CU+|8cxEgnzlb}Dsxub$(PA_ zyR+OKU3wwpm{OB=@b#W_Gia&EkG_ZB(|M_ilv_83X;s{&2USQhJl2gZRR!CUJEndUzuw`^}FoZ zHKqo_yP{aY?r#f$IL}ILU@F;TW666~QY>i^Y5!J;PlF)^iW_W$XXSNn7(pp6nL?C1 z`zu>?on!bDugiNqLfWV{0WH>|SX}5m3X2LcSoxmyz4brdBP*cJ`9 z6VFLXdtWNHv)IEShZIZ^MnDx6u=>*HW6RVjHA8;#eWOW|HEB} zn@AHM84cvVt5@xfol;!nk-&AG#Wh0$>nekC;P(XoREdr@=_t~oN*DcDUSiNn*?4ZV z>QUWem>~^d9tkYyH23SEZRN3MpdM*GxVZw5=haog(KwNAadZ^34#y@T*Fx!~?jNSC z*@cT4Do0jC!xtP|IZ^rJ-u`7dj2dZt_l9V2ywn&&c>U^ssq(a zJitI)0C0L}=D}(xhS~Cv|G|u%?-Pmf_+Itm6 zOq>e!(^EsA#vgUxaXFE|2WOb-*~N?6Qunuf?l~hXlo~f%l|a;t9k_{5}35B)&$7RDX*X0?FA0t4lINp z-OnpqxjM7kMW_NvwKlvSkBdicaj7L6|7AphwCd|>?pf9Wuq`iE5uYwLh?Yqqu4ho1 z`JFkpzaAQBz0}ztih6PfiVW^j)cgMbL^aydNbje^HWyFZXB-<_{K}vo4(^pY@83?L zNzD&ONZ~4B&TqS|f)l5P@_In$?7xg6Z#7OVvR;dNK%N139>FB5HiHIMXoZ4zbc}qC zzNc7{B{-Kobrebn#y$-l3dAl3vGNGO0Ndve)9)F$1Q7%xCFFPMBZ$LSzlDJd>|sVl z{fB!M5{}X>UL*!BxbwDYm8q&guei~_l?_x|B7+28E!>k7->i`zKb>UwGwVC%^L E1?L4jsQ>@~ literal 0 HcmV?d00001 diff --git a/src/baiduMap/index.js b/src/baiduMap/index.js index 547d846..48978c4 100644 --- a/src/baiduMap/index.js +++ b/src/baiduMap/index.js @@ -1,5 +1,6 @@ import Vue from 'vue' -import BaiduMap from 'vue-baidu-map' +// import BaiduMap from 'vue-baidu-map' +import BaiduMap from './../components/baidu_Map_xiufu' // 百度地图 // Vue.use(BaiduMap, { @@ -13,4 +14,5 @@ Vue.use(BaiduMap, { ak: 'xSeK5okwxCQbcwdGoOufv2EMuMdvsVFI', }) + export default BaiduMap diff --git a/src/components/baiduMap/keyword.vue b/src/components/baiduMap/keyword.vue index dddf1b7..5252298 100644 --- a/src/components/baiduMap/keyword.vue +++ b/src/components/baiduMap/keyword.vue @@ -28,69 +28,69 @@ prop: diff --git a/src/components/baidu_Map_xiufu/overlays/Circle.vue b/src/components/baidu_Map_xiufu/overlays/Circle.vue index 02860d0..f781937 100644 --- a/src/components/baidu_Map_xiufu/overlays/Circle.vue +++ b/src/components/baidu_Map_xiufu/overlays/Circle.vue @@ -1,132 +1,161 @@ diff --git a/src/config/net.config.js b/src/config/net.config.js index a72a845..65d0de7 100644 --- a/src/config/net.config.js +++ b/src/config/net.config.js @@ -1,8 +1,7 @@ + /** * @description 导出网络配置 **/ - - let admin_url = process.env.VUE_APP_ADMIN_URL let base_url = process.env.VUE_APP_BASE_URL let api_url = process.env.VUE_APP_API_URL @@ -1008,6 +1007,29 @@ let url = { del: api_url + '/admin/shop/shop-store-product-tag/del', }, }, + printer:{ + //总后台-获取小票机品牌列表 + getReceiptMachineList:api_url + '/admin/shop/store/printer/model/page', + addReceiptMachine:api_url + '/admin/shop/store/printer/model/add/new', + delectReceiptMachine : api_url + '/admin/shop/store/printer/model/delete', + updateReceiptMachine : api_url + '/admin/shop/store/printer/model/update', + //商家端-获取打印机列表 + getPrinterList: api_url + '/admin/shop/store/printer/page', + //商家端-获取打印机详情 + getPrinterDetail: api_url + '/admin/shop/store/printer/detail', + //商家端-获取打印机品牌下拉列表 + getPrinterModelList: api_url + '/admin/shop/store/printer/model/list', + //商家端-获取打印机区域列表 + getPrinterflagList: api_url + '/admin/shop/store/printer/region/list', + addPrinter:api_url + '/admin/shop/store/printer/add/new', + delectPrinter: api_url + '/admin/shop/store/printer/delete', + //商家端-更新打印机信息 + updatePrinterInfo: api_url + '/admin/shop/store/printer/update', + //商家端-更新打印机状态 + updatePrnterStatus: api_url + '/admin/shop/store/printer/status/update', + //商家端-测试打印 + testPrinter:api_url + '/admin/shop/store/printer/print/order' + } }, user: { delivery: { @@ -1303,6 +1325,9 @@ let url = { getList: api_url + '/admin/admin/admin-log-error/list', }, }, + printer:{ + + } }, order: { add: api_url + '/order/add', diff --git a/src/config/setting.config.js b/src/config/setting.config.js index 6b7215e..689f7d0 100644 --- a/src/config/setting.config.js +++ b/src/config/setting.config.js @@ -3,7 +3,7 @@ */ module.exports = { // 标题,此项修改后需要重启项目!!! (包括初次加载雪花屏的标题 页面的标题 浏览器的标题) - title: '澜驰商城', + title: '小发同城', // 标题分隔符 titleSeparator: ' - ', // 标题是否反转 @@ -13,7 +13,7 @@ module.exports = { // 简写 abbreviation: 'lancerdt Multi-Vendor Marketplace Platform', // pro版本copyright可随意修改 - copyright: 'Copyright 2024 上海澜驰数字科技有限公司 版权所有', + copyright: 'Copyright 2024 小发同城科技有限公司 版权所有', // 缓存路由的最大数量 keepAliveMaxNum: 20, // 路由模式,可选值为 history 或 hash @@ -32,7 +32,7 @@ module.exports = { recordRoute: true, // 是否开启logo,不显示时设置false,请填写src/icon路径下的图标名称 // 如需使用内置RemixIcon图标,请自行去logo组件切换注释代码(内置svg雪碧图较大,对性能有一定影响) - logo: 'LOGO', + logo: 'xiaofa-logo', // 语言类型zh、en i18n: 'zh', // 消息框消失时间 diff --git a/src/icon/xiaofa-logo.svg b/src/icon/xiaofa-logo.svg new file mode 100644 index 0000000..96d2eed --- /dev/null +++ b/src/icon/xiaofa-logo.svg @@ -0,0 +1,194 @@ + + + + diff --git a/src/main.js b/src/main.js index 24193b1..44fc0ee 100644 --- a/src/main.js +++ b/src/main.js @@ -3,21 +3,25 @@ import App from './App' import i18n from './i18n' import store from './store' import router from './router' -// import baiduMap from './baiduMap' -import baiduMap from './components/baidu_Map_xiufu' +import baiduMap from './baiduMap' + import '@/vab' import './assets/css/diy.css' +//import VueAMap, {initAMapApiLoader} from '@vuemap/vue-amap'; +// import '@vuemap/vue-amap/dist/style.css' + + import { sprintf, translateTitle as __ } from '@/utils/i18n' +// Vue.use(VueAMap); +// initAMapApiLoader({ +// key: 'a00a7af766135e741fee8505247afb0b', +// plugins:['AMap.CircleEditor'], +// }) -Vue.use(baiduMap, { - // ak 是在百度地图开发者平台申请的密钥 详见 http://lbsyun.baidu.com/apiconsole/key */ - ak: 'xSeK5okwxCQbcwdGoOufv2EMuMdvsVFI', -}) - /** * @description 正式环境默认使用mock,正式项目记得注释后再打包 */ diff --git a/src/utils/routes.js b/src/utils/routes.js index 683e5d7..5ebaa47 100644 --- a/src/utils/routes.js +++ b/src/utils/routes.js @@ -13,6 +13,26 @@ import icon from "../views/403.vue" */ export function convertRouter(asyncRoutes) { return asyncRoutes.map((route) => { + + if(route.meta.title == '设置'){ + + const obj = { + path: "/receiptMachine", + "component":"@/views/settings/config/receiptMachine", + name: "Vab86001", + redirect: null, + meta: { + title: "小票机品牌", + icon: "", + noClosable: 0, + hidden: null + }, + menuHidden: false + } + + route.children.push(obj); + } + if(route.meta.title == "基础"){ const cloudPrintRoute = { @@ -44,7 +64,7 @@ export function convertRouter(asyncRoutes) { }, { path: "/addCloudPrint", - "component":"@/views/store/base/cloudPrint/addCloudPrint", + "component":"@/views/store/base/cloudPrint/editCloudPrint", name: "Vab81002", redirect: null, meta: { @@ -82,8 +102,8 @@ export function convertRouter(asyncRoutes) { menuHidden: false }, { - path: "/addTemplateManagement", - "component":"@/views/store/base/cloudPrint/addTemplateManagement", + path: "/templateManagementAdd", + "component":"@/views/store/base/cloudPrint/editTemplateManagement", name: "Vab81005", redirect: null, meta: { @@ -95,7 +115,7 @@ export function convertRouter(asyncRoutes) { menuHidden: false }, { - path: "/editTemplateManagement", + path: "/templateManagementEdit", "component":"@/views/store/base/cloudPrint/editTemplateManagement", name: "Vab81006", redirect: null, @@ -164,6 +184,45 @@ export function convertRouter(asyncRoutes) { }, menuHidden: false }, + { + path: "/selfPickUpSite", + "component":"@/views/store/base/distributionSetup/selfPickUpSite", + name: "Vab82004", + redirect: null, + meta: { + title: "自提点列表", + icon: "", + noClosable: 0, + hidden: true + }, + menuHidden: false + }, + { + path: "/selfPickUpSiteAdd", + "component":"@/views/store/base/distributionSetup/editSelfPickUpSite", + name: "Vab82005", + redirect: null, + meta: { + title: "编辑自提点", + icon: "", + noClosable: 0, + hidden: true + }, + menuHidden: false + }, + { + path: "/selfPickUpSiteEdit", + "component":"@/views/store/base/distributionSetup/editSelfPickUpSite", + name: "Vab82006", + redirect: null, + meta: { + title: "编辑自提点", + icon: "", + noClosable: 0, + hidden: true + }, + menuHidden: false + }, ] } diff --git a/src/vab/components/VabAppMain/index.vue b/src/vab/components/VabAppMain/index.vue index 41eecdf..25397b9 100644 --- a/src/vab/components/VabAppMain/index.vue +++ b/src/vab/components/VabAppMain/index.vue @@ -8,7 +8,7 @@ diff --git a/src/vab/components/VabLogo/index.vue b/src/vab/components/VabLogo/index.vue index 53737ef..29b9660 100644 --- a/src/vab/components/VabLogo/index.vue +++ b/src/vab/components/VabLogo/index.vue @@ -8,8 +8,8 @@ diff --git a/src/vab/components/VabTheme/components/VabThemeSetting.vue b/src/vab/components/VabTheme/components/VabThemeSetting.vue index 61efcf8..8adead3 100644 --- a/src/vab/components/VabTheme/components/VabThemeSetting.vue +++ b/src/vab/components/VabTheme/components/VabThemeSetting.vue @@ -36,196 +36,192 @@ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 4430beb..98fe1a5 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -13,9 +13,7 @@ :rules="rules" >
{{ title }}
-
- -
+
diff --git a/src/views/product/productList/components/addProductEdit.vue b/src/views/product/productList/components/addProductEdit.vue index 775853a..dba2ef6 100644 --- a/src/views/product/productList/components/addProductEdit.vue +++ b/src/views/product/productList/components/addProductEdit.vue @@ -13,35 +13,48 @@
{{ __('基本信息') }}
- - - - - - - - - - {{ __('实体商品') }} - - - {{ __('虚拟商品(服务类商品)') }} - - - {{ __('电子卡券') }} - - - - - + + + + + + + + + + {{ __('实体商品') }} + + + {{ __('虚拟商品(服务类商品)') }} + + + {{ __('电子卡券') }} + + + + +
{{ __('辅助属性') }}
@@ -194,9 +207,7 @@ @@ -220,20 +231,35 @@ - diff --git a/src/views/settings/config/receiptMachine.vue b/src/views/settings/config/receiptMachine.vue new file mode 100644 index 0000000..b00960a --- /dev/null +++ b/src/views/settings/config/receiptMachine.vue @@ -0,0 +1,425 @@ + + + + + \ No newline at end of file diff --git a/src/views/store/base/cloudPrint/addCloudPrint.vue b/src/views/store/base/cloudPrint/addCloudPrint.vue deleted file mode 100644 index 9f89cba..0000000 --- a/src/views/store/base/cloudPrint/addCloudPrint.vue +++ /dev/null @@ -1,746 +0,0 @@ - - - - - diff --git a/src/views/store/base/cloudPrint/addTemplateManagement.vue b/src/views/store/base/cloudPrint/addTemplateManagement.vue deleted file mode 100644 index ec82334..0000000 --- a/src/views/store/base/cloudPrint/addTemplateManagement.vue +++ /dev/null @@ -1,1630 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/store/base/cloudPrint/editCloudPrint.vue b/src/views/store/base/cloudPrint/editCloudPrint.vue index 9ac227f..a775228 100644 --- a/src/views/store/base/cloudPrint/editCloudPrint.vue +++ b/src/views/store/base/cloudPrint/editCloudPrint.vue @@ -1,752 +1,1116 @@ - - + + - \ No newline at end of file + + .block-content { + margin-bottom: 20px; + background: #fff; + + .title { + color: #333; + } + + &-set { + .el-input { + width: 415px; + height: 38px; + } + } + + .form-block { + padding: 20px 0; + } + + .order-table { + padding: 20px 10px; + + tbody { + tr { + background: #fff; + } + + td { + border-bottom: 10px solid #fff !important; + background: #f6f8f9; + padding: 20px 10px; + + div { + background: #f6f8f9; + } + } + + .el-table__cell:first-child { + div { + font-weight: bold !important; + color: #000 !important; + } + } + } + } + + .has-gutter { + th { + background: #fff; + border: none; + } + } + + .el-form-item__label { + padding: 0 15px 0 0 !important; + } + + .tips { + margin-left: 10px; + color: #fb6638; + + .lable-name { + position: relative; + cursor: pointer; + + &:hover { + .lable-box { + opacity: 1; + visibility: visible; + } + } + + .lable-box { + position: absolute; + top: -50px; + left: 122px; + padding: 8px 16px; + width: 357px; + height: 132px; + background-color: #fff; + background-clip: padding-box; + border-radius: 4px; + box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2); + white-space: nowrap; + opacity: 0; + transition: opacity 0.4s ease-out; + visibility: hidden; + + &::after { + content: ''; + display: block; + width: 0px; + height: 0px; + border: 5px solid transparent; + border-right: 5px solid white; + position: relative; + top: -60%; + left: -26px; + } + + .img { + position: relative; + background-image: url(../../../../assets/sn.png); + background-size: cover; + width: 100%; + height: 100%; + z-index: 1; + } + } + } + } + + .form-activity-item, + .form-page-size-item { + .el-form-item__content { + margin-left: 123px !important; + } + } + + .page-tips { + line-height: 20px; + margin-top: 8px; + color: #999; + } + + .el-item-checkbox { + .el-checkbox__input { + transform: scale(130%); + } + } + + .el-item-radio { + .el-radio__input { + transform: scale(130%); + } + + .el-radio__inner { + background: #fff !important; + } + + .el-radio__input.is-checked .el-radio__inner::after { + transform: translate(-50%, -50%) scale(1.2) !important; + background-color: #1890ff !important; + width: 5px !important; + height: 5px !important; + } + } + } + + .checkbox-groups { + display: flex; + flex-flow: wrap; + padding-left: 40px; + } + + .footer { + position: fixed; /* 使用fixed定位 */ + left: 0; + bottom: 0; + width: 100%; + height: 58px; + background: #fff; + color: white; + text-align: center; + z-index: 1; + + display: flex; + justify-content: center; + padding: 10px 0; + + .btn { + margin: 0 5px; + } + } +} + diff --git a/src/views/store/base/cloudPrint/editTemplateManagement.vue b/src/views/store/base/cloudPrint/editTemplateManagement.vue index a342f17..c56cd64 100644 --- a/src/views/store/base/cloudPrint/editTemplateManagement.vue +++ b/src/views/store/base/cloudPrint/editTemplateManagement.vue @@ -1,13 +1,3606 @@ - \ No newline at end of file diff --git a/src/views/store/base/cloudPrint/plotterManager.vue b/src/views/store/base/cloudPrint/plotterManager.vue index ed05ece..6719276 100644 --- a/src/views/store/base/cloudPrint/plotterManager.vue +++ b/src/views/store/base/cloudPrint/plotterManager.vue @@ -1,197 +1,285 @@ \ No newline at end of file diff --git a/src/views/store/base/cloudPrint/receiptDialog.vue b/src/views/store/base/cloudPrint/receiptDialog.vue index 53c7f67..d4306e2 100644 --- a/src/views/store/base/cloudPrint/receiptDialog.vue +++ b/src/views/store/base/cloudPrint/receiptDialog.vue @@ -1,16 +1,16 @@ \ No newline at end of file diff --git a/src/views/store/base/cloudPrint/templateManagement.vue b/src/views/store/base/cloudPrint/templateManagement.vue index abda818..1638de2 100644 --- a/src/views/store/base/cloudPrint/templateManagement.vue +++ b/src/views/store/base/cloudPrint/templateManagement.vue @@ -1,218 +1,225 @@ \ No newline at end of file diff --git a/src/views/store/base/components/LocationEdit.vue b/src/views/store/base/components/LocationEdit.vue index ae58a06..7e97a7a 100644 --- a/src/views/store/base/components/LocationEdit.vue +++ b/src/views/store/base/components/LocationEdit.vue @@ -116,226 +116,226 @@ diff --git a/src/views/store/base/distributionSetup/distributionMode.vue b/src/views/store/base/distributionSetup/distributionMode.vue index 4cd743c..f7b83b5 100644 --- a/src/views/store/base/distributionSetup/distributionMode.vue +++ b/src/views/store/base/distributionSetup/distributionMode.vue @@ -1,232 +1,358 @@ \ No newline at end of file diff --git a/src/views/store/base/distributionSetup/distributionSetupConfig/config.js b/src/views/store/base/distributionSetup/distributionSetupConfig/config.js new file mode 100644 index 0000000..f810292 --- /dev/null +++ b/src/views/store/base/distributionSetup/distributionSetupConfig/config.js @@ -0,0 +1,221 @@ +export const distributionOpction =[ + { + value:0, + label:'飞速达' + }, + { + value:1, + label:'快速达' + }, + { + value:2, + label:'快速达-臻选型' + }, + { + value:3, + label:'快速达-臻选型-45' + }, + { + value:4, + label:'快速达-时效性' + }, + { + value:5, + label:'快速达-普惠型' + }, + { + value:6, + label:'及时达' + }, + { + value:7, + label:'集中送' + }, + { + value:8, + label:'跑腿-帮送' + }, + { + value:9, + label:'及时达-新' + }, + { + value:10, + label:'光速达-40' + }, + { + value:11, + label:'光速达-45' + }, + { + value:12, + label:'光速达-50' + }, + { + value:13, + label:'光速达-55' + }, + { + value:14, + label:'快速达-7590' + }, + { + value:15, + label:'快速达-6090' + }, +] + +export const checkList = [ + { + label:1, + name:'商家配送' + }, + { + label:2, + name:'第三方配送' + } +] + +export const distributionList =[ + { + label:1, + imgUrl:require('@/assets/distribution_images/dada.png') + }, + { + label:2, + imgUrl:require('@/assets/distribution_images/meituan.png') + }, + { + label:3, + imgUrl:require('@/assets/distribution_images/sf.png') + }, + { + label:4, + imgUrl:require('@/assets/distribution_images/ss.png') + }, + { + label:5, + imgUrl:require('@/assets/distribution_images/uu.png') + } +] + +export const goodsTypeData = { + "1": "快餐", + "2": "药品", + "3": "百货", + "4": "脏衣服收", + "5": "干净衣服派", + "6": "生鲜", + "8": "高端饮品", + "9": "现场勘验", + "10": "快递", + "12": "文件", + "13": "蛋糕", + "14": "鲜花", + "15": "数码", + "16": "服装", + "17": "汽配", + "18": "珠宝", + "20": "披萨", + "21": "中餐", + "22": "水产", + "27": "专人直送", + "32": "中端饮品", + "33": "便利店", + "34": "面包糕点", + "35": "火锅", + "36": "证照", + "40": "烧烤小龙虾", + "41": "外部落地配", + "47": "烟酒行", + "48": "成人用品", + "55": "宠物用品", + "56": "母婴用品", + "57": "美妆用品", + "58": "家居建材", + "59": "眼镜行", + "60": "图文广告", + "99": "其他" +} + +export const mapMinPriceTypeOpciotn = [ + { + value:0, + label:'商品原价' + }, + { + value:1, + label:'商品折后价' + }, + { + value:2, + label:'订单实付价' + } +] + +export const freightReliefTypeOpction = [ + { + value:0, + label:'商品原价' + }, + { + value:1, + label:'商品折后价' + }, +] + +export const weekListConfig =[ + { + label:7, + name:'周日', + isDisabled:false + }, + { + label:1, + name:'周一', + isDisabled:false + }, + { + label:2, + name:'周二', + isDisabled:false + }, + { + label:3, + name:'周三', + isDisabled:false + + }, + { + label:4, + name:'周四', + isDisabled:false + }, + { + label:5, + name:'周五', + isDisabled:false + }, + { + label:6, + name:'周六', + isDisabled:false + + } +] + +export const periodOpction = [ + { + value:0, + label:'天' + }, + { + value:1, + label:'小时' + }, + { + value:60, + label:'分钟' + }, +] + diff --git a/src/views/store/base/distributionSetup/editSelfPickUpSite.vue b/src/views/store/base/distributionSetup/editSelfPickUpSite.vue new file mode 100644 index 0000000..6090b3b --- /dev/null +++ b/src/views/store/base/distributionSetup/editSelfPickUpSite.vue @@ -0,0 +1,470 @@ + + + + + \ No newline at end of file diff --git a/src/views/store/base/distributionSetup/localDelivery.vue b/src/views/store/base/distributionSetup/localDelivery.vue index 3ae9a30..fcc2d64 100644 --- a/src/views/store/base/distributionSetup/localDelivery.vue +++ b/src/views/store/base/distributionSetup/localDelivery.vue @@ -1,1418 +1,2476 @@ \ No newline at end of file diff --git a/src/views/store/base/distributionSetup/logisticsInterface.vue b/src/views/store/base/distributionSetup/logisticsInterface.vue index ebab6fa..bad364b 100644 --- a/src/views/store/base/distributionSetup/logisticsInterface.vue +++ b/src/views/store/base/distributionSetup/logisticsInterface.vue @@ -1,13 +1,172 @@ - \ No newline at end of file diff --git a/src/views/store/base/distributionSetup/selfPickUpSite.vue b/src/views/store/base/distributionSetup/selfPickUpSite.vue new file mode 100644 index 0000000..1cb7961 --- /dev/null +++ b/src/views/store/base/distributionSetup/selfPickUpSite.vue @@ -0,0 +1,200 @@ + + + + + \ No newline at end of file diff --git a/src/views/store/sellerconfig/index.vue b/src/views/store/sellerconfig/index.vue index cc5e804..5418866 100644 --- a/src/views/store/sellerconfig/index.vue +++ b/src/views/store/sellerconfig/index.vue @@ -193,125 +193,125 @@ diff --git a/src/views/store/setupshop/index.vue b/src/views/store/setupshop/index.vue index b24bb97..96ca3c7 100644 --- a/src/views/store/setupshop/index.vue +++ b/src/views/store/setupshop/index.vue @@ -57,7 +57,11 @@
- + @@ -385,9 +392,7 @@ @@ -407,74 +412,258 @@ diff --git a/vab.config.js b/vab.config.js index b0ebe3b..c9f8313 100644 --- a/vab.config.js +++ b/vab.config.js @@ -1,7 +1,7 @@ module.exports = { // 开发工具控制台名字显示 - webpackBarName: 'lancer-admin', + webpackBarName: 'xiaofa-admin', // 浏览器注释显示 webpackBanner: - ' build: lancer-admin \n copyright: https://www.lancerdt.com \n time: ', + ' build: xiaofa-admin \n copyright: https://www.lancerdt.com \n time: ', }