$1Tem?dhwevhNsOAQ3d}2req{$SAFnpUokD&p`hv?**dS8;
zyG8{0v>r5#rg|+CM}z)M3LkM_esHj9rjehAchRElu`5i+^eRo3wk!phzsXIYVh&i%
ziz}|t8@EE|yq#AN#Z+W`sr|uUT@>`@Qd3&!j
zIZ8~0nq2>FPYSrwzF9i$_)6#t)6C?;r%1cvUQIGyrmKU{@rD%f37J%u*sNU(msXv8
zm=x757wmrX2qf=wYMw9B+y!m5&fq?93n^*EP7B98)>*-YEmMk@fT@N!YWx`5x
z>!&NERrU7W?SixfRR-YcPD8~XAMBvM7ER_hyS5iVQk6MqPet#7B#L~0!yKS6xHx6PJnE8Vk
zV#th41M|JQB4;i-R@R(P9Z?^3QLJUA36L4MHZ?I-ic+OhcY11>#_U=U;Su>M`}*g1
zYVj`Nj8?x$N(_JKm$Zn<1fUJMP?XF)JjgqTj6tQ@+-9OrozS*B+V*ICPYYumR2Of{
zDe+Lg1a77;+e_2^Qczgrcyr&;It0;w`OBa672N^(1v8B{F6uexK1?~+M~qda
zfIW)>gDm&)bZQ!`TU|toY8a~UCf@e+{;^q>mdN{Q%CNl)A%>xn2^^czJFQ*tNk-_e
paygrAYhupWBd>tOwcQrhHkh|DNUif0V$w)vo0igK%`t$1zW{P<+9v=2
literal 0
HcmV?d00001
diff --git a/multipleShop/images/scan.png b/multipleShop/images/scan.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5f48361f4e2a9650ab1fa1c51d723aeb33cb9b9
GIT binary patch
literal 2533
zcmVPx;pGibPRCr$PTzhO&=N11Q#|h7dX@x>bAQu{9hgN%NEl?(P>Pkby!%haJ?WDc6
zwc9EIo2o&jZtc+8qE!OaRx9hoR3@z*gT+pGcWg!5I$o1nZ6kIFa2+U*LboQ+Cg9|r
z?KrV>o!Iex`H{5WKen&W>-*jFefNClJKrVbsg*ZX&2ej(3C7I~nhIbl^?foRzd^t`
z0OuGS`=q|l9v4oX@wFVyhv}3vrN>Y_?Y#GHm&SDf{C(h9Rv!bA5nyNyZRIBp;&wzW
z3p2r(Rlp`~n>~KasGeG4)Df^4L=#NdW}K9{oe4WZ)bL@KYu}|6$FCY^Hb)N_po3Y~fb#uJwsht6g;ZhpCUjgGO5GtH9&Jj5bRU>|)%@_VH2%24)wgH
zaAm61KuW-rpyv^Qeqk4bWz*_VGi3p4ZoX%bsE6MC8V+4PVp+w!iF5Gk{8t9?i_Gn3
z8nEL`z_RRKM*gnq55F`}$RNOaLkP5j=q9TgON&df`Htryol4iT1z23)@%9izM@KYc
zq>#?Ui|*p?iq=J~*YpH~08@hAC;t!cPppC^d~)Z90!wJJ4VdT<&=w!8x84=j)~a;Wdy`k$EnfCW5zomel9NWhr)
zsdeG|5+2roz8Q)2`iX?Cqr^0Kr1tK)`|azec%e-L`tA)4ak+8eRBex6f%ZAU?gkFM(@|b
z_;r>rN)kKl0fY7sDNR*gXfB%(T|X}RjB0a7IB)qdy&WHV(ma!PQfF-A>?*nL$6K*?V0Rz{n{_x)3eMvb~HL9n>i8W=W
zZ8ljE=$n)##cLlVPK&2;^w)()w&>C|SyX3tn~mGm^6(@%llk#RuAyPYLDe6QMb3_w
z3g{Q%`6?A~wzeWR<0p#i5`dLARh1QKbcR3~E31dPDf;T2{pSzh;iI{)-jQ-E8Q#+D
zRuD0m(d{aWENecWGlpRIUn?t)c4_|dUOViC|uolslL`jsqX2JF_%+yuZ8SPgKbNF0wnEI
za-e`*)?VZv*yNbYw1>qQ{tUO$?veM}jOYWVvM5k}p@p^&m$QNvmwV8C=UM;BRwFhU226y>X%X($_5ze#J8nc%LDKNs
z*D2~d=R4JA)I3vwC59*Pn_ShD8SRK!ItF%9Y1jSg-D;N^Uekc}`LS#OKQkN;&r7<7
znV)R)x2(%F!CQMu4gr5f!24woUM66ynY)xPS~<@R((bqOh9_$trt7iN;8j4p0YvGG
zAM%BeUN3V1OsnIk(yW?f8?d-ySxSL;Q=z@YNM1?=rj?Pp(3@64((^e6SbT1q-so9Q
z!1{bI+~v&xOjy&lH2ixjb5%NUodqneCAMv+{Se@_0QH_W%~50Ezr@-)^}72-C*OS-
zH$OXo^+}(+Z}Pa&ofB#RT1tc^*?Th-UjoxErk0ZTGkUIDn%
zJC`*qCBR3(t#&%az`u#m#DvDklF(tRujn&tL+$_@V42dOe1hC170jf7V{c&T|CH~&
vP0m?MS$yJ?h*j>s9#QMn_sw?J3Htv5rcvb1t5bKW00000NkvXXu0mjf4jbqd
literal 0
HcmV?d00001
diff --git a/multipleShop/images/time.png b/multipleShop/images/time.png
new file mode 100644
index 0000000000000000000000000000000000000000..327d87537771c10d10bc57fa149fdc74b7fca876
GIT binary patch
literal 569
zcmV-90>=G`P)Px$^GQTOR7gv;Rl#xFFc7@ML;9+Oq=Lj1Sn0s7z)A(79|HLc{Ue}<=?Y9&5O)xD
zV7mglgnWSqE<6sP5ov%FGci8W5ajONVsC-)!3#eaA7&A3x7)8=&~CSTKDDq>f-K8c
z%jNQlh&G7Wfrmvz&xqIl%dW*@4=*n9A`MBdAfs`_9B`=LJpJK9%5qP=Yh^W+Bcb)R;
z5#)K!_S?s*pXz}3eHZ6i>$4OAo8nSy{TOq^SO>m<3q<^-lsXiC_`^dagm^;4Z&g)w
zT1Rw#B%*Uf>vgx31HD2jEv|Jylt7KU*afiI#YqSY}u6SAzM1YW~YiBi)Vo=Yjy
z5_y8rL!Kh=bFx-S9b)C3O#$HN(92W6ydP$$b>>adroqdcJt?cE$fT4_dlnbN8JZOp
zDe#k{A^?OBTDR2J+M9{6yX90pIqU``oG-+Zweh@n&UJAugjlul-NiM>IU;7W;yRG{
zgJX~l0DKup^g=|9wYK@E3n!-cf4?$MvFFq~vo8H9u-N`z|7t@h7P!J700000NkvXX
Hu0mjf!rTPE
literal 0
HcmV?d00001
diff --git a/multipleShop/images/time.webp b/multipleShop/images/time.webp
new file mode 100644
index 0000000000000000000000000000000000000000..914682aebb5c304492b99f529468dc6b577a5c33
GIT binary patch
literal 760
zcmWIYbaVT_#J~{l>J$(bU=hK^z`$St#NuG&>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93
zkx>fl4;UDM5DXHNiwhtutRzs?w`&l!mvynKz%R&|l3JV$RPq6cRf>R?1KlJ7WQ(Lj
z*cu>q5`=97VwaZ`lmOKPfY?PLLC!#S3XrXlj>JwvVkZ|AfzZ
zZ((5Ab{-*y2$O=uqC~K9EI^VeEscTU({cs|-be-p;R_55T+v`TAc4be3P33tpu6&c
zFr6WXA(cUa!IL46A(=rB$T9*(sv(0JFou1Y7#SG!#SgFwtZ!J6E3JCF@BPRBEo`^8
z
+ page {
+ background: #FAFAFA;
+ }
+
+ .multiple {
+ padding-bottom: 30rpx;
+
+ .multiple-search {
+ position: sticky;
+ top: 0;
+ z-index: 10;
+ display: flex;
+ height: 90rpx;
+ background-color: #fff;
+ padding: 0 24rpx;
+ box-sizing: border-box;
+
+ .multiple-search-txt {
+ position: absolute;
+ right: 28rpx;
+ top: 50%;
+ transform: translateY(-50%);
+ width: 110rpx;
+ height: 52rpx;
+ line-height: 52rpx;
+ text-align: center;
+ background: #FFFFFF;
+ border-radius: 30rpx 30rpx 30rpx 30rpx;
+ font-size: 28rpx;
+ color: #20B128;
+ }
+ }
+
+ .multiple-card {
+ padding-top: 24rpx;
+
+ .multiple-card-item {
+ display: flex;
+ background: #FFFFFF;
+ border-radius: 16rpx;
+ margin: 0 24rpx 20rpx;
+ padding: 30rpx 0 42rpx 30rpx;
+ overflow: hidden;
+
+ .multiple-card-item-left {
+ width: 70%;
+ border-right: 2rpx solid #F1F1F1;
+
+ .multiple-card-item-left-title {
+ margin-bottom: 14rpx;
+ font-weight: bold;
+ font-size: 28rpx;
+ color: #444444;
+ }
+
+ .multiple-card-item-left-tag {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ margin-bottom: 16rpx;
+
+ text {
+ width: 90rpx;
+ height: 42rpx;
+ line-height: 42rpx;
+ text-align: center;
+ border-radius: 8rpx;
+ font-size: 24rpx;
+ margin-right: 16rpx;
+ padding: 4rpx 10rpx;
+ }
+
+ .yellow {
+ background-color: #FFF8F1;
+ color: #FFB76D;
+ }
+
+ .green {
+ color: #20B128;
+ background-color: #F2FFF3;
+ }
+ }
+
+ .multiple-card-item-left-info {
+ display: flex;
+
+ &:nth-child(1) {
+ margin-bottom: 10rpx;
+ }
+
+ text {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #777777;
+ margin-left: 4rpx;
+ }
+ }
+ }
+
+ .multiple-card-item-right {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ width: 30%;
+
+ .multiple-card-item-right-distance {
+ margin-bottom: 20rpx;
+ font-size: 22rpx;
+ color: #777777;
+ }
+
+ .multiple-card-item-right-icon {
+ display: flex;
+ align-items: center;
+ }
+ }
+ }
+
+ .active {
+ position: relative;
+ border: 2rpx solid #20B128;
+
+ &::after {
+ content: "";
+ display: block;
+ position: absolute;
+ right: -34rpx;
+ bottom: -8rpx;
+ width: 0;
+ height: 0;
+ border-left: 50rpx solid transparent;
+ border-right: 50rpx solid transparent;
+ border-bottom: 50rpx solid #20B128;
+ transform: rotate(135deg);
+ }
+
+ &::before {
+ content: "√";
+ display: block;
+
+ position: absolute;
+ right: 10rpx;
+ bottom: 4rpx;
+ color: #fff;
+ z-index: 11;
+ font-weight: bold;
+ }
+ }
+ }
+ }
+
+
+
+
+
+ 搜索
+
+
+
+
+
+ 泸州春雨路自提中转中心
+
+ 可自提
+ 可配送
+
+
+
+ 四川省泸州市龙马潭区一环春雨路一段107号一环路117号
+
+
+
+ 09:00-20:00
+
+
+
+ 距离1km
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/multipleShop/orderVerification/index.vue b/multipleShop/orderVerification/index.vue
new file mode 100644
index 0000000..d7d69c6
--- /dev/null
+++ b/multipleShop/orderVerification/index.vue
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+ 1
+ 核销券码
+
+ 确认核销
+
+
+
+
+ 2
+ 二维码核销
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/multipleShop/verificationOrder/detail.vue b/multipleShop/verificationOrder/detail.vue
new file mode 100644
index 0000000..158293e
--- /dev/null
+++ b/multipleShop/verificationOrder/detail.vue
@@ -0,0 +1,119 @@
+
+
+
+
+ 订单编号:123123123
+
+ 收货人:
+ 核销码:
+ 核销门店:
+ 核销时间:
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/multipleShop/verificationOrder/index.vue b/multipleShop/verificationOrder/index.vue
new file mode 100644
index 0000000..e4939e3
--- /dev/null
+++ b/multipleShop/verificationOrder/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+ 搜索
+
+
+
+ 待配送(0)
+ 已配送(0)
+
+
+
+
+
+
+ 订单编号:123123123123
+
+
+ 配送订单
+ 收货人:李斯
+ 商品信息:黄牛牛腩块2kg*5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index b8a6273..084bb82 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "purchase-let",
+ "name": "purchase_let",
"lockfileVersion": 3,
"requires": true,
"packages": {
diff --git a/package-lock.json b/package-lock.json
index a22d4b0..959fbf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "purchase-let",
+ "name": "purchase_let",
"lockfileVersion": 3,
"requires": true,
"packages": {
diff --git a/pages.json b/pages.json
index 1787b7b..dcd2c8b 100644
--- a/pages.json
+++ b/pages.json
@@ -22,6 +22,18 @@
}
}
},
+ {
+ "path": "pages/index/test",
+ "style": {
+ "navigationBarTitleText": "购物",
+ "disableScroll": true,
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ // 将回弹属性关掉
+ "bounce": "none"
+ }
+ }
+ },
{
"path": "pages/login/login",
"style": {
@@ -56,6 +68,34 @@
],
"subPackages": [{
+ "root": "multipleShop",
+ "pages": [{
+ "path": "index/index",
+ "style": {
+ "navigationBarTitleText": "选择门店",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "verificationOrder/index",
+ "style": {
+ "navigationBarTitleText": "核销订单",
+ "enablePullDownRefresh": false
+ }
+ }, {
+ "path": "verificationOrder/detail",
+ "style": {
+ "navigationBarTitleText": "核销订单详情",
+ "enablePullDownRefresh": false
+ }
+ }, {
+ "path": "orderVerification/index",
+ "style": {
+ "navigationBarTitleText": "订单核销",
+ "enablePullDownRefresh": false
+ }
+ }]
+ }, {
"root": "pagesOrder",
"pages": [{
"path": "order/order",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9979a56..676697a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,894 +1,898 @@
-
-
-
- 惠农批发
-
-
-
-
-
-
-
-
- 购物车
-
-
-
- 我的订单
-
-
-
- 个人中心
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
- 全
- 部
-
-
-
-
-
- 全部分类
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
- 综合
- 价格
- 销量
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
- {{item.spec}}
-
-
-
-
-
-
- ¥{{item.sell}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 合计
- ¥{{cartInfo.total_price}}
-
-
+
+
+
+
+
+ ¥{{item.price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合计
+ ¥{{cartInfo.total_price}}
+
+
-
-
- 结算
-
-
-
- {{cartInfo.count}}
-
-
+
+
+ 结算
+
+
+
+ {{cartInfo.count}}
+
+
-
-
+
+
\ No newline at end of file
diff --git a/pages/index/test.vue b/pages/index/test.vue
new file mode 100644
index 0000000..2c4d29f
--- /dev/null
+++ b/pages/index/test.vue
@@ -0,0 +1,127 @@
+
+
+
+
+ 订单编号:123123123
+
+ 收货人:
+ 核销码:
+ 联系电话:
+ 核销门店:
+ 核销时间:
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index a8410d3..a69bb94 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -95,9 +95,9 @@
const showOfficial = ref(false);
const navToIndex = () => {
- if (userStore.userInfo && userStore.token) uni.reLaunch({
- url: '/pages/index/index'
- })
+ if (userStore.userInfo && userStore.token) uni.reLaunch({
+ url: '/pages/index/index'
+ })
// if (!userStore.userInfo.supplier) uni.reLaunch({
// url: '/pages/index/index'
// })