From 0c25b1c6e4da80b0d2725700b7f9abcad1f82887 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Mon, 6 Nov 2023 17:55:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/chat/customer_list/index.vue | 6 +++++- pages/index/index.vue | 1 + pages/moreProject/moreProject.vue | 4 ++-- pages/nongKe/supply_chain/goods_list.vue | 14 ++++++++------ .../nongKe/supply_chain/shopping_trolley.vue | 10 +++++++++- pages/product/list/index.vue | 15 ++++++++++----- static/images/SMRK/bar.png | Bin 2897 -> 2465 bytes static/images/SMRK/img.png | Bin 2642 -> 2539 bytes static/images/SMRK/name.png | Bin 2937 -> 1887 bytes 9 files changed, 35 insertions(+), 15 deletions(-) diff --git a/pages/chat/customer_list/index.vue b/pages/chat/customer_list/index.vue index 517c85c..e9c361c 100644 --- a/pages/chat/customer_list/index.vue +++ b/pages/chat/customer_list/index.vue @@ -121,7 +121,11 @@ //获取商户信息 getindex(){ getUserInfo().then(res => { - + if (res.data.mer_info.length == 0) { + return uni.showModal({ + title: '暂无商户信息' + }) + } this.mer_id = res.data.service.mer_id; if(this.isLogin){ this.getList(this.mer_id) diff --git a/pages/index/index.vue b/pages/index/index.vue index 8a2b7af..12b5b10 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -939,6 +939,7 @@ // console.log(res); this.userid = res.data.uid this.userInfoData = res.data + this.$store.commit('SET_USERINFO', res.data); this.merchantData.phone = res.data.phone if (res.data.service == null) { // console.log('123'); diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index e27c73a..dec447f 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -34,11 +34,11 @@ 在售管理 - 财务管理 - + --> - 线下入库 + 修改库存 -

线下入库

+

修改库存

线上入库

@@ -171,7 +171,7 @@ - 数量: + 数量: @@ -391,6 +391,7 @@ this.show = true this.data.product_id = this.checkboxList1[0].product_id this.data.unique = this.checkboxList1[0].unique + this.data.number = this.checkboxList1[0].stock this.on_line = 1 } else { this.show = false @@ -971,10 +972,13 @@ .shuru { display: flex; - justify-content: flex-start; align-items: center; padding: 5px; - margin-left: 20px; + width: 80%; + margin: 0 auto; + &>view{ + flex-shrink: 0; + } input { background: #F5F5F5; @@ -982,6 +986,7 @@ border: 1px solid #999999; padding-left: 3px; margin-left: 3px; + flex: 1; } } diff --git a/static/images/SMRK/bar.png b/static/images/SMRK/bar.png index 0baebeeb5b63d30bcf36c8dd465304d3991cecf0..43ad0d89f7bc0111eb58211a9677f53e4365d82e 100644 GIT binary patch literal 2465 zcmV;S310SzP)Px;TS-JgRCr$PU1zLyMHOAkE@)JW*t=js41$S(*bpnCps0ZS5PJejP!W-c#we%| z1sfVQMge01q$tJ+Y5*0xgopwW6|rFN-DTGM&Xvde&Y9UW_q=z%d*AHj{^A&QyC-jt0PtJ3#}W0Wf0=%vgOJ0S$l|TVTfO+X!d?%-8}mR=+AEK+-J% z+z-HA0Nf71jVjvtZvdB)ytG30|00rh0Pr9HH?1h=zW{y*;HLmCC;9h^GLj;r0U+r< z0GNjC@ZIRK9+(lkBuYe;&k%aSAm^~NmYxD00l*oUMS?l9E=;Dzmgu!eCM zy(97(@cl?}-MZx6(^wmUh+6ZUNb;~Kv-yeukn~~z?s)cauE7LLQPH2jC?Dwg+&NiZX1U ztpIFZAnWb&wj}==ktqS-SO7-`3jG^^_xVTCTfw;}Ne=|@A^w8^Bqa0>AB@5y?MC z6wfPqu^sYjXo2XQ6@r8vvDt8%wMKFqS1N%UKuzB;65!=hNQif{uG}rhC)S7 zC;5yuvu1^&c?V$E&Y?Bb^sqOv#CDxm*Q4&~0B-9w2f$lM{-mTF^UgZ}j{@+8M5BL9 za@3HLE|9=6J&#4LkD|FlH)t?oG@^aLvgJE@I~{T5|!VXqc4S*{k>Ete2qOU%WC+P^nB!vLzlpWf+4jh^| zq0;~yTpANO1pr$B_)VrwTaa{2|H>(2)G4U5iQhqd7{KyFqdSP#BZHHrFaVuGJI?k3 z;N8asB)^;0(8I7O08E-DX(s?)*X&R{hompCLR17msKfx%q5%+S@*qnC;Cj;(?SiH; z`f}L@Km(w+FZKF@ByCcQ@ED_@jes@++6Wk9Bo&p>c0t#ht4%>|3TjhO(eyC}bDM%H zryxmo=RToxMO;Mkk{Uo34FE|yI+6o`J;GQ)F*n zANfLNYm)W^hG-E0=$`F5l5Z##&v_($kCLP)09R)+j}*NRSP%em@5HVl>6AHZ0>Gn5 z`r0x?3j)BJKG4XGfCj+EU2oJEG7W$g243s1lm@_p0gwyM?F|)_bZY>A%q%pU_a(}Z zGWF>02BPym0vws_i|e8A^fO30f_Wp7YXICRNzSu&L{9^KlH8S~b5HaEu)nhw4jATHBtJeNXLo^ncwe>?hp0RE zU6>XD0B5suLZy{Yl%7lSvnfkRvW(p#lRQ3u>M|IT zHZ{XW>(c;;T56T}8UU+g*l4kv8UTBebONJwLz0{|I2C?AsyFoVE*<@lfe#`1u61Mm z4d<8_0(ftt&6knPCHD)zkU7)Y5EIJICHa(f27r?_Icd`nokcQbvn9Fch0HNsru3AJ zcO?0p^#DTm9$@f6U}uA)NoMm`M*;A`#V-+4WaIB%dO<&LfOXHL?9#AnBSoQyiy;84 zMN-ZsZ8krk+mEF0N*9hK`Sg5x7lM*%-=I@)rBDd~eu(G%p*iy9y!|w%lzw(3SMaR< zmvry$9hfsErji#nSOS2(h)&*}efzr1P#y`jAHFe=R{=PAisapXChFwf zwIA`RN#1Q6Z6Eb%g#qZMAwST|#=5LRPpwH`|5^aAUxm8liY&SxF9M(g;cWnlK2ngY zap3>b4>)*%^vnI?_66#aVmY4VD@)2Ku3(pH%n@O0olxn>=*My-MYhc)c8c(NX7I-w zitZJP0q917^Syl}5tbLJa4FAmBwrm7O5Cbva4L z0Kt(HPEX^I{8MZ4%=J}bGys+t-W}KdF;AZyeF0uGMJ=5JO0rn>HBi!nyK_KIhwwMS zeha`!{eDoIlq7=sssIpC+;}!vpaC%Bp3nej0L<6|GgjY5Km%aL7MQX6HUb&|Gq%8t f)wdBaV*vgKk$Uo-quqdo00000NkvXXu0mjfRh4sv literal 2897 zcmdT`c|25m8=skm8AS#|gmLT!SK>03$gz_&4A+`mTSC2MvW8~HjUgJ7$-a!3?8+KtMVX#lkF{xVO2d6b1>L}16HP>L%7Fc?)CFyI+$NNtOcEJ zlI0Ur5=d4#){_o`#e%qDHo|4tJM7o~UV1*|3B3Aq){K8>`xysYcL0XCj`q0+hhv=0 zVKjApBTp_k`u8;$v`N6=QV1nFKfyYL21Cxt_3;kG!;mX)%u8)C6d)Iw_45{lh9gQt zJP1rts*$FR6av#4FV4{eConXYz2O~J+&4p{=cdZ+7YQQ2=RbBIC8O!CJ!W?)o;?{veUcHkRe(#byr14qBDh7F<%9&(l9g!uP8&$KC)=% zz@(a}dzn6*s&}fXn6;x{|Dc%F{~H}OcY!tteyhL_wM^}}eT|+bO;*@$jM?JN-gZ2j z7WEV{V@A}dynbPpVtr$rfd1m$v-z6u6~{^u!NE$$VWztR309v3r@It?7j<5dmML`q zhDH!%=2B94sZmT8TgVaO6loYVOw}f|$$Vl6L z(%1Il)cag9+vNpb>GX<37pZ=~ z4*?36UlS;zmlvPjtPsI3kz^-qo@dF@RX&gkTa!m+J=dPRU4%1e&M_8bi^##R5{6jV z)M~YEw(d=!q^*Dy+lfN*D)(c-u3YJ9U;=Eu_t+~h)k2xBJN}VkB8E}_lElH&GMsqP zTIg`7#JEAF0Y0e2*+fkuKUCt_!@dn5jCNTlfO{UoaAKhi0d16W!MNMV0BwZf4`9u4 z!_oaGOT2BIxojU{iQI-I|$(l z+dT6E#y=UzGNDI|-p`(k*rpzCI^i9Y(EHK6AP$fizPKGR;K&h)PUYKBrCG-WGvq!*b)5f{t;ke$yYf&fe;fRXoA2$AYCZp^W>oIENT&In=GAHSA zw8r+)v|nSYx{y}j=r}Hb*lX9Bb!pw4p!yd*^*5|CSMo#O9CfG* z&dAw3y;fj*2vm^V3U7U$_mgcIF}GSz7jEz9Cuqa7lL6GO2I<&&yFb$RbZpT&S2dzn z{#Ns>RVImHeUA#1Rs3wPz{|))z3#g^N+ury@8ix~**OTNJtMt+Ju2wa`!GB08gRfr zAiqYbU4?QIk4D->&7@%iBPIhn9=`$q$Zw_q%!Zvh0yfM$kp`i7$VTx3nkzj#cqIY;j(#r-rI8&E>;LB`q!nf<4Uc$7oN zk=@Y#UNZy#VNZQ77y zYi*M}hTheEcMQ=#J5zQAIzvAkv#a}_2t;40hV2PbVavd-?t8cpebO7gCm1g6dJW&r zd)F64Z*4>D2~i`vUYGyQ4x-Z;Tzjd0u8)PhPW<(@z&-l^VL~MS)ic&}1|q2+r}`5 z=#rMxhzssH<@V$U4(r+#hd;A8tbDw@OMk9MukP%2nVt3H_&mK;RXim zm&f9E}N;W@twK>e45rlOe{|D1~^e}_7QnLIaadUYi^8w!Zgn0SU{PJ=pmn zv90A#7@tLg!P1RiWXya=rSDZAeV><(qp4=j5_E&tWs6)#PY!)VJ!HBj>lbY?-_Updd0J99qw)YPNV;|WF7)qz;9(=0bYF=2sR&kc4h3?K-756U&Nb0R#Wt#=USuGr` zohLf$(DZ5DGiWb|em(^EI>x38l@N}u3FX~!_nem1sq&U;Owib;B}-&%F$V*d#BZEf zKacA-_`zR+?!eY*xlk1wtXi6rx_*MJwpdSVNK$NN)g{;7?;0qrM1%w@F1S1xO1fHB zl%el&`8@knmS%1t`u4gsSu%~MDdO{55&M{YTx?Odd3ojBv#@`dUlGwjRq*SVdnL7K zZ}a2dJEpvuCSQMO*27Cy6MLx>vWZa-dbfGlSHs*0NCE05F z2$k{V-<I>~u>eV)@(gSwrooIFl=^?WPEeyg^& z@$R@}lHAk!8&j~;Sf|tWPk|xwOe#W4Mt0|0DCn~%($O{b` znZ!P(hyVrn!Tg$`7Bmx_Q@~y>GK0>M>vjdF{)>r;tEvZcpWnYBY5>j1Fe@`#(<)<6 G+CKsBHQCkx diff --git a/static/images/SMRK/img.png b/static/images/SMRK/img.png index c573534a56f090a6a34594a0a56fb6b87ed175e6..7a35d90e0487c6555ae4abf75b38cba7398083d4 100644 GIT binary patch literal 2539 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 QEF|J62Ik~^{R`+n0LSy41poj5 diff --git a/static/images/SMRK/name.png b/static/images/SMRK/name.png index ed9c1f6b16205d9424667d1942f94f4297421131..4f6104159980f4dba7cf3389ad196fa8f3b0320c 100644 GIT binary patch literal 1887 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 G?0*21PcAtC From 946ced7f59f26d7f7b9aa56b0a4ecd707c385e78 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Tue, 7 Nov 2023 16:54:23 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=AF=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=9C=89?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/wholesale/wholesale/wholesale.vue | 135 +++++++++++++++++++++++- 1 file changed, 134 insertions(+), 1 deletion(-) diff --git a/pages/wholesale/wholesale/wholesale.vue b/pages/wholesale/wholesale/wholesale.vue index 4526184..9a0eb1f 100644 --- a/pages/wholesale/wholesale/wholesale.vue +++ b/pages/wholesale/wholesale/wholesale.vue @@ -150,6 +150,25 @@ + + + + + + + + {{goodsNum}} + + + + ￥{{totalMoney}} + 支持配送 售后无忧 + + + 去结算 + @@ -200,6 +219,11 @@ import { getconfig, } from '@/api/public.js'; + import { + getCartCounts, + getCartList, + + } from '@/api/requesta.js'; const app = getApp(); export default { components: { @@ -231,6 +255,8 @@ domain: HTTP_REQUEST_URL, productList: [], is_switch: true, + goodsNum: 0, + totalMoney: 0, where: { cate_id: '', order: '', @@ -334,8 +360,11 @@ this.get_host_product(); this.getClassfication(); this.getStoreType(); - this.tabIndex = 2 + // this.tabIndex = 2 }, + onShow() { + this.cartFn() + }, onReady() {}, mounted() { uni.getStorage({ @@ -791,6 +820,55 @@ }) } }, + skuaddcart() { + this.showcartpop = false + // this.skuform = {} + let res = postCartAdd({ + cart_num: this.skuNumber, + is_new: 0, + product_attr_unique: this.skuform.sku[this.skusize].unique, + product_id: this.skuform.product_id, + product_type: this.skuform.product_type, + spread_id: "", + }).then((res, err) => { + this.cartFn() + uni.showToast({ + title: "加入成功", + duration: 1000, + + }) + }).catch(err => { + // this.act_cart = false + uni.showToast({ + title: err, + icon: "none", + duration: 1000, + }) + }) + + }, + cartFn() { + getCartList().then(res => { + // console.log(res) + this.totalMoney = 0 + this.cartList = res.data.list + this.cartList.forEach(e => { + e.list.forEach(item => { + this.totalMoney += item.cart_num * item.productAttr.price + }) + + }) + this.totalMoney = this.totalMoney.toFixed(2) + }) + getCartCounts().then(res => { + this.goodsNum = res.data[0].count + }) + }, + navgo(url){ + uni.navigateTo({ + url: url + }) + } }, onPullDownRefresh() { @@ -1661,4 +1739,59 @@ } } } + .card { + width: 720rpx; + z-index: 99; + // margin:auto; + left: 50%; + transform: translateX(-50%); + position: fixed; + // bottom: 0; + background-color: #333333; + height: 101.64rpx; + border-radius: 50.82rpx; + overflow: hidden; + color: white; + display: flex; + justify-content: space-between; + box-sizing: border-box; + + .left { + display: flex; + align-items: center; + padding: 10rpx 35rpx; + + .tot_price { + display: flex; + margin-left: 42rpx; + flex-direction: column; + justify-content: space-between; + } + .badge { + position: absolute; + top: 0; + right: 0; + background-color: #f84221; + transform: translate(50%, -50%); + // padding: 10rpx 10rpx; + border-radius: 35rpx; + text-align: center; + width: 35rpx; + line-height: 35rpx; + height: 35rpx; + } + } + + .right { + font-size: 33.29rpx; + line-height: 50px; + background: linear-gradient(to right, #f84221, #ff6d20); + width: 140.19rpx; + text-align: center; + } + } + .act_cart { + transition: 0.5s; + transform: scale(1.1); + } \ No newline at end of file From 6ed514ce0308d1c5c013e87d93516632c92fee60 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Tue, 7 Nov 2023 17:45:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E8=AE=B0=E5=BD=95=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/users/gather_list/index.vue | 240 +++++++++++++++++++++++------- static/images/qianbao.png | Bin 0 -> 1218 bytes 2 files changed, 183 insertions(+), 57 deletions(-) create mode 100644 static/images/qianbao.png diff --git a/pages/users/gather_list/index.vue b/pages/users/gather_list/index.vue index a519421..8221182 100644 --- a/pages/users/gather_list/index.vue +++ b/pages/users/gather_list/index.vue @@ -1,24 +1,23 @@ @@ -63,6 +85,7 @@ sum: 0, count:0, scrollTop: 0, + endDate: '', merId: '', UserApplylist:[] } @@ -77,13 +100,19 @@ }, onLoad(option) { this.merId = option.mer_id - console.log(this.merId); + let date = new Date(); + this.endDate = `${date.getFullYear()}-${date.getMonth()+1}-01` + console.log(this.endDate); + // console.log(this.merId); this.ApplyList() // this.UserApplylist.forEach((item)=>{ // console.log(item.extract_money); // }) }, methods: { + changeDate(e){ + console.log(e.detail.value); + }, /**数字强制转为两位小数*/ returnFloat(value){ var value=Math.round(parseFloat(value)*100)/100; @@ -110,8 +139,10 @@ this.UserApplylist=res.data.list this.count=this.UserApplylist.length this.UserApplylist.forEach(item=>{ - item.create_time=item.create_time.substr(0,10) - console.log(parseInt(item.extract_money)); + item.financial_account.bank_code=item.financial_account.bank_code.substr(-4) + console.log(item.financial_account.bank_code); + // item.create_time=item.create_time.substr(0,10) + // console.log(parseInt(item.extract_money)); }) for(let i =0; i .list { .head { - width: 100%; - height: 150px; - display: flex; - background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%); - position: relative; + // width: 100%; + // height: 150px; + // display: flex; + // background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%); + // position: relative; + // padding-top: 28rpx; + width: 694rpx; + margin: 28rpx auto; + padding: 28rpx; + background-color: #fff; + border-radius: 24rpx; .head_conent { - width: 90%; - height: 150px; - background-color: #fff; - margin: 50px auto; - border-radius: 15px; - box-shadow: 0px 0px 5px rgba(#FA6514, 0.5); + // width: 694rpx; + // margin: 28rpx auto; + // height: 150px; + // margin: 50px auto; + // border-radius: 15px; + // box-shadow: 0px 0px 5px rgba(#FA6514, 0.5); - .tatil { - display: flex; - justify-content: space-around; - align-items: center; - width: 100%; - - .sum { - text-align: center; - margin-top: 30px; - - h3 { - margin-top: 15px; - font-size: 18px; - font-weight: 700; - color: #E93323; - } - } + display: flex; + justify-content: space-around; + align-items: center; + + .line{ + width: 1rpx; + height: 70rpx; + background-color: #dfdfdf; + } + + .sum { + flex: 1; + text-align: center; + color: #737373; + font-size: 30rpx; + .num{ + font-size: 42.06rpx; + margin-bottom: 15rpx; + } + .text{ + margin-bottom: 15rpx; + } } } .tixian { - position: absolute; - background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%); - box-shadow: 0px 0px 5px rgba(#FA6514, 0.5); - width: 100px; - height: 40px; - line-height: 40px; - border-radius: 30px; - text-align: center; - font-size: 18px; - color: #fff; - font-weight: 700; - left: 37%; - top: 150px; + width: 326rpx; + height: 53rpx; + line-height: 53rpx; + text-align: center; + background: #FFFFFF; + border-radius: 25rpx 25rpx 25rpx 25rpx; + opacity: 1; + border: 2rpx solid #F84221; + margin: 0 auto; + margin-top: 20rpx; + font-size: 26rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #F84221; + // position: absolute; + // background-image: linear-gradient(90deg, #FA6514 0%, #E93323 100%); + // box-shadow: 0px 0px 5px rgba(#FA6514, 0.5); + // width: 100px; + // height: 40px; + // line-height: 40px; + // border-radius: 30px; + // text-align: center; + // font-size: 18px; + // color: #fff; + // font-weight: 700; + // left: 37%; + // top: 150px; } } @@ -245,5 +301,75 @@ } } + .recoder{ + padding: 0 28rpx 28rpx 28rpx; + .time{ + height: 42rpx; + font-size: 30rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #333333; + line-height: 45rpx; + margin-bottom: 20rpx; + display: flex; + align-items: center; + .icon{ + width: 30rpx; + height: 30rpx; + transform: rotate(90deg); + margin-left: 10rpx; + } + } + .card{ + width: 694rpx; + background: #FFFFFF; + border-radius: 21rpx 21rpx 21rpx 21rpx; + opacity: 1; + padding: 28rpx; + margin-bottom: 20rpx; + display: flex; + align-items: center; + .left{ + flex-shrink: 0; + margin-right: 20rpx; + } + .right{ + flex: 1; + .item{ + width: 100%; + display: flex; + justify-content: space-between; + &_title{ + font-size: 30rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #333333; + line-height: 45rpx; + } + &_money{ + font-size: 33rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #F84221; + line-height: 50rpx; + } + &_brank{ + font-size: 26rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #737373; + line-height: 39rpx; + } + &_time{ + font-size: 23rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #B3B3B3; + line-height: 34rpx; + } + } + } + } + } } \ No newline at end of file diff --git a/static/images/qianbao.png b/static/images/qianbao.png new file mode 100644 index 0000000000000000000000000000000000000000..8c4b3cfe2703eeabfd651904234fe6ef8ee8b1a3 GIT binary patch literal 1218 zcmV;z1U>tSP)Px(d`Uz>RA@u(no(#RMHqnpe>Tb8X^;@;gHYrI3mQwZGn;~-4_8oVL9ifV#E6P5 z_FdmhK=9st^)W)B4{e~JVg(;cdt$^wJF|P27!?Yh*n+5}6#}_jZf9glR=1bC+u6#R|M}<{mlIM9}?8aPMz=?^8(OfR~F#w$1%>cXARZ87#G#ay& zO6BJywps#exNJ6i4H2i4811%>QfggFdBXF&@8a5S3CI}x5)ogFYiy6@f8W~LI##Jv z^zt>nb^zM8{gP!_pEp@p@qK^3UawzSU0q!_ww_FIh*D}J;(LfV6E>lgIwyp9JC4~M zfR5vQ3joiBj4W+zY@F-?*bcuLV;>-5F?6E=0FQFc|1yPq0MNGWG0U>5gP0LU171`)pxlywFZLL4(Swij}a<9q}Fb0OPB&iTCQ zSj`bESeA7yq+H^hA2&6YL{4YyOeW(HLh^0&_2Y6nH0eu9skzO~O>Xko>>J?J)YQ|K zWfixx^-zMzsVSwt_I-b@TrU66PJdqj8DsAv;wJ!*1gx2*A*DRq?z!waAf@yjLdZgb zh;>wHmwb8($QXM95r1qExfPwzOrf_ctfNixx`utKIpg;l@IrX=)+Lzl`>&PD<;$jU zft+pIrwAeE!^OXpa=~@oGhtgj1I*|1+41r5KbstS#dY0Fap3}aO6d$C0}Y4(#mv=T`U9}}@}%@Tl&gvR1Sr8|+Q z_tY%W7TZKs2=RDSmW;Zenr))hMz55b5kf3RLA1Ni7<&~FFQ#In*G@3TbZIpkc1TJ& z<9Xg!aUm(CFC*f)ratWg=X`%kwQayo#kQ_Kbk8N~(nqXm4ED?ar1!tr*1q)haVePW zzCQ2>M~8=pbwlZdu05mHWsCdz#BjM@ug@t2thdmWZ#ebzMcieC4GkSm Date: Tue, 7 Nov 2023 17:46:13 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=BF=BD=E7=95=A5builderx=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.json b/manifest.json index 4d5842c..5e36366 100644 --- a/manifest.json +++ b/manifest.json @@ -12,6 +12,9 @@ "nvueCompiler" : "uni-app", "nvueStyleCompiler" : "uni-app", "compilerVersion" : 3, + "compatible":{ + "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 + }, "splashscreen" : { "alwaysShowBeforeRender" : true, "waiting" : true, From e19e2aa1e8140a19fa85a32859b8c0e06e5dfd5a Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Tue, 7 Nov 2023 17:46:36 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/moreProject/moreProject.vue | 7 ++- pages/nongKe/gather/select_warehouse.vue | 67 +++++++++++++----------- 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index dec447f..bb8dee9 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -227,7 +227,12 @@ - 代发补货 + 代发订单 + + + + + 补货订单 - + 待发货 {{orderData.noPostage || 0}} - + 待收货 {{orderData.noDeliver || 0}} - + - + @@ -263,6 +263,9 @@ + + 去发货 + 查看详情 @@ -385,7 +388,8 @@ refundList } from '@/api/order.js'; import{ - behalfAdminOrderList + behalfAdminOrderList, + behalfAdminNumber } from "@/api/behalfAdmin.js" import { getUserInfo @@ -424,7 +428,7 @@ presellProList: [], //定金预售订单 presellOrderCount: 0, orderData: {}, //订单详细统计 - orderStatus: -1, //订单状态 + orderStatus: 'all', //订单状态 page: 1, limit: 20, receivingshow: false, @@ -500,16 +504,16 @@ }, methods: { arrlist() { + + // refundList({ + // product_type: 98, + // type: 0, + // page: 1, + // limit: 1500 - refundList({ - product_type: 98, - type: 0, - page: 1, - limit: 1500 - - }).then(res => { - this.len = res.data.list.length - }) + // }).then(res => { + // this.len = res.data.list.length + // }) }, // 后退 returns() { @@ -585,10 +589,8 @@ */ getOrderData: function() { let that = this; - orderData({ - product_type: 98 - }).then(res => { - // console.log(res.data) + behalfAdminNumber().then(res => { + console.log(res.data) that.$set(that, 'orderData', res.data); }) }, @@ -744,20 +746,13 @@ * 切换类型 */ statusClick: function(status) { - - if (status == 5) { - uni.navigateTo({ - url: '/pages/users/refund/list?type=98' - }) - } else { - if (status == this.orderStatus) return; + if (status == this.orderStatus) return; this.orderStatus = status; this.loadend = false; this.loading = false; this.page = 1; this.$set(this, 'orderList', []); this.getOrderList(); - } }, /** * 获取订单列表 @@ -768,56 +763,29 @@ if (that.loading) return; that.loading = true; that.loadTitle = "加载更多"; + // console.log('点击'); + // console.log(that.isReady); if (that.isReady) { that.isReady = false - if (that.orderStatus == -1) { - behalfAdminOrderList({ - page: that.page, - limit: that.limit, - }).then(res => { - that.isReady = true; - let list = res.data.list || []; - let loadend = list.length < that.limit; - // console.log(that.orderList) - that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that - .orderList); - that.$set(that, 'orderList', that.orderList); - // console.log(that.orderList) - that.getProductCount(); - that.loadend = loadend; - that.loading = false; - that.loadTitle = loadend ? "我也是有底线的" : '加载更多'; - that.page = that.page + 1 - }) - } else { - let arr; - if (that.orderStatus > -1) { - arr = that.orderStatus - } else { - arr = '' - } - getOrderList({ - status: arr, - page: that.page, - limit: that.limit, - product_type: 98 - }).then(res => { - let list = res.data.list || []; - let loadend = list.length < that.limit; - that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that - .orderList); - that.$set(that, 'orderList', that.orderList); - that.getProductCount(); - that.loadend = loadend; - that.loading = false; - that.loadTitle = loadend ? "我也是有底线的" : '加载更多'; - that.page = that.page + 1; - that.isReady = true; - }).catch(err => { - that.loading = false; - that.loadTitle = "加载更多"; - }) - } + behalfAdminOrderList({ + page: that.page, + limit: that.limit, + status: that.orderStatus + }).then(res => { + let list = res.data.list || []; + let loadend = list.length < that.limit; + // console.log(that.orderList) + that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that + .orderList); + that.$set(that, 'orderList', that.orderList); + // console.log(that.orderList) + that.getProductCount(); + that.loadend = loadend; + that.loading = false; + that.loadTitle = loadend ? "我也是有底线的" : '加载更多'; + that.page = that.page + 1; + that.isReady = true; + }) } }, /** @@ -1327,4 +1295,10 @@ font-size: 23rpx; } } + + .all{ + display: flex; + align-items: center; + + } \ No newline at end of file diff --git a/pages/replace_replenishment/replenishment.vue b/pages/replace_replenishment/replenishment.vue new file mode 100644 index 0000000..b2acd96 --- /dev/null +++ b/pages/replace_replenishment/replenishment.vue @@ -0,0 +1,197 @@ + + + \ No newline at end of file diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue index 147faab..eb10b4b 100644 --- a/pages/users/embody/embody.vue +++ b/pages/users/embody/embody.vue @@ -51,10 +51,10 @@ 当前可提现金额: ￥{{extract_money}},冻结佣金：￥{{userInfo.lock_brokerage}} + class="price">￥{{extract_money}}, 冻结金额: ￥{{lock_money}} - 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 + 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额 @@ -92,10 +92,10 @@ 当前可提现金额: ￥{{extract_money}},冻结佣金：￥{{userInfo.lock_brokerage}} + class="price">￥{{extract_money}},冻结金额: ￥{{lock_money}} - 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 + 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额 @@ -141,11 +141,11 @@ 当前可提现金额: ￥{{extract_money}},冻结佣金：￥{{userInfo.lock_brokerage}} - - - 说明: 每笔佣金的冻结期为{{userInfo.broken_day}}天，到期后可提现 - + class="price">￥{{extract_money}}, 冻结金额: ￥{{lock_money}} + + + 说明: 用户确认收货{{lock_time}}天后, 才可提现该订单金额 + @@ -194,6 +194,8 @@ data() { return { extract_money:"", + lock_money: "", + lock_time: "", mode: { bank_address: "", bank_code: "", @@ -279,6 +281,8 @@ this.mode.bank_name = res.data.financial_bank_bank this.mode.bank_address = res.data.financial_bank_branch this.extract_money=res.data.extract_money + this.lock_money = res.data.lock_money + this.lock_time = res.data.lock_time console.log(this.extract_money) } catch (err) { //TODO handle the exception diff --git a/pages/users/user_invoice_form/index.vue b/pages/users/user_invoice_form/index.vue index d38bd44..4dccdf4 100644 --- a/pages/users/user_invoice_form/index.vue +++ b/pages/users/user_invoice_form/index.vue @@ -208,7 +208,7 @@ } if(this.receipt_type == 2){ if (!formData.bank_name) return this.$util.Tips({ - title: '请输入开户行' + title: '请输入银行卡号' }); if (!formData.bank_code) return this.$util.Tips({