From 2eb92c14f91f018bdef2a6cdbfe85327f3fe2b5e Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Wed, 21 Feb 2024 11:44:09 +0800
Subject: [PATCH] 1111111
---
common/config.js | 6 +-
pages/home/cloudCard2.vue | 4 +-
pages/home/myCellar.vue | 110 +++++++++++++++++++++++++++++-------
pages/home/myHome.vue | 115 +++++++++++++++++++-------------------
static/notices.png | Bin 0 -> 2655 bytes
5 files changed, 152 insertions(+), 83 deletions(-)
create mode 100644 static/notices.png
diff --git a/common/config.js b/common/config.js
index 625f57d..bd2d42c 100644
--- a/common/config.js
+++ b/common/config.js
@@ -6,10 +6,10 @@
* loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
*/
module.exports = {
- // baseUrl: 'http://9jb9ws.natappfree.cc', // 本地
+ // baseUrl: 'http://192.168.2.117:7211', // 本地
// baseUrl: 'https://lpk.yyundong.com/lpkapi', // 测试服务器
- baseUrl: 'https://lpk.yyundong.com/mallapi', // 测试服务器
- // baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器
+ // baseUrl: 'https://lpk.yyundong.com/mallapi', // 测试服务器
+ baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器
tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面
diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue
index d98ea9e..4757800 100644
--- a/pages/home/cloudCard2.vue
+++ b/pages/home/cloudCard2.vue
@@ -316,12 +316,12 @@
style="display: flex;flex-direction: column;align-items: center;justify-content: center;width: 100%;margin-top: 20px;">
- (云菜窖)
+ 云菜窖
- 小程序需要获取您的手机号，方便与您联系。
+ 为确保您能正常体验小程序功能，云菜窖需要获取您的手机号。
diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue
index d43249c..15bed17 100644
--- a/pages/home/myCellar.vue
+++ b/pages/home/myCellar.vue
@@ -56,10 +56,20 @@
-
+
+
+
+
+ 已失效
+
+
+
-
-
+ {{item.weight}}{{item.specificationUnit}}/{{item.unitName}}
企业菜!
-
+ 提货截止日：{{item.periodValidity}}
+ 抱歉，商品已超过提货截止日
+
+
存量：
+
{{item.goodsNumber}}{{item.unitName}}
+
+ :class="item.state=='0'?'oragin':'gray'">
@@ -322,12 +340,13 @@
style="display: flex;flex-direction: column;align-items: center;justify-content: center;width: 100%;margin-top: 20px;">
- (云菜窖)
+ 云菜窖
- 小程序需要获取您的手机号，方便与您联系。
+ 为确保您能正常体验小程序功能，云菜窖需要获取您的手机号。
@@ -344,6 +363,28 @@
+
+
+
+
+
+
+
+
+ 温馨提示
+ 您好，云菜窖预约提货服务现已恢复正常，您可在“我的菜窖”页面进行预约提菜。
+
+ {{confirmText}}
+
+
+
+
+
+
+
+
@@ -359,6 +400,9 @@
transferNotData: true,
notData: false,
showModal1: false,
+ showModal2: true,
+ confirmText: "我知道了（5s）",
+ countdown: 5,
showModal3: false,
showModal4: false,
scrollHeight: "",
@@ -446,7 +490,8 @@
this.page.endHeight = info.windowWidth * 0.8
this.shareGift()
-
+ this.showPop()
+
},
filters: {
/**
@@ -482,6 +527,25 @@
},
},
methods: {
+
+ showPop() {
+
+ let timeOut = setInterval(() => {
+
+ if (this.countdown == 1) {
+ this.showModal2 = false
+ this.confirmText = "确定"
+ this.countdown = 5
+ clearInterval(timeOut)
+
+ } else {
+ this.countdown = this.countdown - 1;
+ this.confirmText = "我知道了" + "（" + this.countdown + "s）"
+ }
+ }, 1000)
+ },
+
+
getNotice() {
let _this = this
this.$api.getNotices().then((resp) => {
@@ -678,6 +742,10 @@
colseDialog1() {
this.showModal1 = false
},
+ colseDialog2() {
+ this.showModal2 = false
+ clearInterval()
+ },
colseDialog3() {
this.showModal3 = false
},
@@ -773,18 +841,17 @@
\ No newline at end of file
diff --git a/static/notices.png b/static/notices.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a8aee3d2925152391470bef3d8f8a46c2fb7290
GIT binary patch
literal 2655
zcmZWrc{J4P8=pdqipr9G3l)vB4O!z_vW=7&OPNA$_Pw#Y#&FA$6s8n6%Y=qYWSeBh
zAUnx27|gY0OGCD#_j~ob=XXx`-1nUK`Fx(w=Xu`qp6C7Ny?Y5|dYD^;8wP_NHoIta
zc@MEaHW%Ao?h9LDMBrr~b3`4+m5$&|m=G=z`8)p^X`6=yx#o
z7}}ZxjTb@NP0)e{WF64y1?ta(W;-yF4y_J>c305i07f4|GZoMx4fIEXE?>|e1$|-s
z_xyh;-*>=p@(*RM8v6ES4?&~JUVwI1!NhYwy8_n6z#DyNfdV>ifu2BUzTrnr8|FvL
z9+}JsbG2Xq2Uhx^sh5DB3YI$nSqpsl4J^F_eONGC1u+Yu#U_ZJ2HuB*nR3t@0zUVH
zkM&@>4BB1-A7VkP6ZCZ@i8~a(H{X!p%cv{Rk1_8p_nm(bf|^RT>TRX}m#r4+gW0$L
zH~x!rBH%*enN`?Mw7!(LSTNW!xl
zR75k9I1-H0CO$zOH4{i-w@O6Q4#WWJ;?xcNkmQS-Ri;c>k+fx=GH-
z)QuaItup=9=%QYI&H2xw;kolMA4RvB>xw+oPh;-|FrISt;}cS>Cuc`Zk2vMd-L&|v
z{f%Kpt|g*nPS58-b=fEJ=%U?K`YaD9K#Ct3pHJA=~`t5`o=O
zUeRyPXBHM^vq;TI3REx8vJktVudY8=l5OqVK%;K-pQnFJbT)}Ke!bS-v8A>hg`)bw
zkQ;18@@sT4il`~G3`u{MPUUXvXi=(Cj!Hf(ArwbDo6aE0BRnew^y8oJbMXHt)n)P6
z;bBVR^Sb*t(vG&FnK7_AF^ml|pF0H3x_^ky$r=={x!o^FGJ>7y@!@cd@WCCpLff1n
zyzUnC_dqa+#1qmZ1HHFcls{axufUU2h9uN>s^JXvnSnn$UTt^}$Q=@Ht%NfUe0d#^
zeQR4aqr~;sY1|~`)x%YVL%peCW2=rgTNSBhzppBOo)vZu>+ZVXH>zMW+0Az|kR)c(!L(0P
zjXEzjLk`&-`@FWcz7<^EB-q7od;Zd}kUL8Yy%wre!=T?I(iSC+R-c?=TMG9-S%8>~
z!Cd}DkaSN^F{c2mEYEz=)*e4$+74f#o4@2MIDiu3Jm7L;Ga6PVPwVbJeIG^p`aoH*
zf&H#Rt@!3lt=n?ox?gRWGcVCoyh4j1k+xCEeI4H!URUIiBzW$2Sk2uA-k0vIApNJW
zG*3_Wrs*CJG7=qNW)HgBdX4+XU$^Oxi{No9Y+hK(zAG5-vUzl
z{r5xcV(PLIVrD{)7;hQ%YP_^LHA>2H%R&R)=jN>@>{QxkO8Hd2?1;l#ZDKE4pZ!HU
zuI4YBLz%PtySORMjO%n0e}3~72N7{6_RXqIr3?I2#f0`ZD2x1fOfO58gw2VJEj5!y
zi&d2z3sI5w`|V>pEYdTiB1uk5c!Q0qM-UCFNSdW&b47D1&r+<)>13T8uDEYE%oYS=
zD^V0{If^j*NvXp19y+df{6LHWD}v$^{|2G4(dEO^j7x;wne)ze_6`+~OknCs@wM{g
zMuaZv)pAm!x$U+M+$!pnnFa!p&C@w*8iFMMCi~s0qZsSK0Yaz>b-K;x5IRI@fW5QQ
z6kelDB+|^f0X=7s>zpu3Ew)Ic!awQJk{*FQjh$VgxEfDF(xX^7q#3KtlUD;~DGygc
z*k!0;2}77Is+(i8(S^p$?D^urUbV7sm~<}8qN{VGokxi+jUu~2b?fD_OP{@D7-#27
zksYC}54p-Hj#s^ST@k-C&(4sUBVG(of`5+_CaupMwaPCHDmRMGeh&YR#3C^Li@1A*
zg_*5a;X^(}F2QhI5>gQT)%lbst=$19_k^T0>i+~I@p~#$^x^8%cHW8Mbm`-R?h2uS
z1P^<<`qP8|K9sG<>OWEtGF`CsX<9yhY_(FyRwybByiW2J*N8hy_OG%EB+XR
zmSa}JkznhCl?T}0%sM$!z;1`wX=o!;8UpRslVsd`@ZlAB
zs~7G)r_L;+CI{X%v<+UOmu9|-sgj@R7ikesb~GQcDZuJGEu9f4uER{=s
zs^5R_dLJQBr1|E?^**UQ`^#?yXN!wHe4Wjt^RoPXEiU7{h`}jm$${|1i{#K?bx&)=
zMDMiM$~A2n1(z!B1k;hXnH{^H6l2Ab#lcr(@7nWyY7AWV0bP%27nKLyl84ET#D$nT
gOZ!aiVNQsxi6o*X6182i_l<#>8KaEK3^8$k1My(7(*OVf
literal 0
HcmV?d00001