Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页

build/app.json

@@ -1 +1 @@
-{"pages":["pages/index/index","pages/order/index","pages/shopping/index","pages/user/index","pages/login/index"],"window":{"backgroundTextStyle":"light","navigationBarBackgroundColor":"#fff","navigationBarTitleText":"WeChat","navigationBarTextStyle":"black","backgroundColor":"#ffffff"},"tabBar":{"custom":true,"list":[{"pagePath":"pages/index/index","text":"首页"},{"pagePath":"pages/shopping/index","text":"购物"},{"pagePath":"pages/order/index","text":"订单"},{"pagePath":"pages/user/index","text":"我的"}],"color":"#707070","selectedColor":"#2680EB","backgroundColor":"#fff","borderStyle":"white"},"usingComponents":{"custom-wrapper":"/custom-wrapper"},"subPackages":[{"root":"pages/delivery","pages":["index"]},{"root":"pages/deliveryDetail","pages":["index"]},{"root":"pages/colorRelated","pages":["sampleComparison/index","takeColor/index","findColor/index"]},{"root":"pages/addAddress","pages":["index"]},{"root":"pages/addressManager","pages":["index"]},{"root":"pages/customerPage","pages":["index"]},{"root":"pages/orderDetails","pages":["index"]},{"root":"pages/saleuserPage","pages":["index"]},{"root":"pages/searchPage","pages":["index"]},{"root":"pages/submitOrder","pages":["index"]},{"root":"pages/refundPage","pages":["index"]},{"root":"pages/refundDetail","pages":["index"]},{"root":"pages/refundMoneyDetail","pages":["index"]}]}
+{"pages":["pages/index/index","pages/order/index","pages/shopping/index","pages/user/index","pages/login/index"],"window":{"backgroundTextStyle":"light","navigationBarBackgroundColor":"#fff","navigationBarTitleText":"WeChat","navigationBarTextStyle":"black","backgroundColor":"#ffffff"},"tabBar":{"custom":true,"list":[{"pagePath":"pages/index/index","text":"首页"},{"pagePath":"pages/shopping/index","text":"购物"},{"pagePath":"pages/order/index","text":"订单"},{"pagePath":"pages/user/index","text":"我的"}],"color":"#707070","selectedColor":"#2680EB","backgroundColor":"#fff","borderStyle":"white"},"usingComponents":{"custom-wrapper":"/custom-wrapper"},"subPackages":[{"root":"pages/takeDelivery","pages":["index"]},{"root":"pages/takeDeliveryDetail","pages":["index"]},{"root":"pages/delivery","pages":["index"]},{"root":"pages/deliveryDetail","pages":["index"]},{"root":"pages/colorRelated","pages":["sampleComparison/index","takeColor/index","findColor/index"]},{"root":"pages/addAddress","pages":["index"]},{"root":"pages/addressManager","pages":["index"]},{"root":"pages/customerPage","pages":["index"]},{"root":"pages/orderDetails","pages":["index"]},{"root":"pages/saleuserPage","pages":["index"]},{"root":"pages/searchPage","pages":["index"]},{"root":"pages/submitOrder","pages":["index"]},{"root":"pages/refundPage","pages":["index"]},{"root":"pages/refundDetail","pages":["index"]},{"root":"pages/refundMoneyDetail","pages":["index"]},{"root":"pages/applyGoods","pages":["index"]},{"root":"pages/applyMoney","pages":["index"]},{"root":"pages/newCollection","pages":["index"]},{"root":"pages/addCollection","pages":["index"]},{"root":"pages/accountPage","pages":["index"]},{"root":"pages/collectionDetail","pages":["index"]}]}

build/pages/addressManager/index.js

@@ -1 +1 @@
-"use strict";require("./sub-common/dde3895fab754ea605d2697ad6817a2a.js");(wx.webpackJsonp=wx.webpackJsonp||[]).push([[5052],{4555:function(e,s,a){var r=a(9975),n=a(885),t=a(4165),d=a(5861),i=a(1515),c=a(9792),l=a(2185),o=a(2535),u=a.n(o),h=a(1251),p=a(5513),f=(0,c.memo)((function(e){var s,a,r,f,m=e.addButtonEnabled,v=void 0===m||m,x=e.focusBorderEnabled,g=void 0!==x&&x,_=(0,l.hE)(),j=_.fetchData,b=_.state,N=function(){var s=(0,d.Z)((0,t.Z)().mark((function _callee(){var s,a;return(0,t.Z)().wrap((function _callee$(r){for(;;)switch(r.prev=r.next){case 0:return r.next=2,j({purchaser_id:e.purchaser_id});case 2:s=r.sent,e.id?R(e.id):null===(a=s.data.list)||void 0===a||a.every((function(e){return!e.is_default||(R(e.id),!1)}));case 4:case"end":return r.stop()}}),_callee)})));return function getData(){return s.apply(this,arguments)}}();(0,o.useDidShow)((function(){return N(),u().eventCenter.on("addressList:refresh",N),function(){u().eventCenter.off("addressList:refresh",N)}}));var w=(0,c.useState)(!1),k=(0,n.Z)(w,2),Z=k[0],C=k[1],G=function(){var e=(0,d.Z)((0,t.Z)().mark((function _callee2(){return(0,t.Z)().wrap((function _callee2$(e){for(;;)switch(e.prev=e.next){case 0:return C(!0),e.next=3,N();case 3:C(!1);case 4:case"end":return e.stop()}}),_callee2)})));return function handleRefresh(){return e.apply(this,arguments)}}(),S=(Array.from({length:15}),(0,c.useState)()),y=(0,n.Z)(S,2),E=y[0],R=y[1],A=(0,o.useRouter)(),L=(0,c.useState)({}),T=(0,n.Z)(L,2),B=(T[0],T[1],(0,h.ER)().fetchData),D=function(){var s=(0,d.Z)((0,t.Z)().mark((function _callee3(s,a){var r;return(0,t.Z)().wrap((function _callee3$(n){for(;;)switch(n.prev=n.next){case 0:if(!A.params.orderId){n.next=6;break}return u().showLoading({title:"请稍等...",mask:!0}),n.next=4,B({address_id:s.id,id:Number(A.params.orderId),shipment_mode:2});case 4:"success"===(r=n.sent).msg?(u().hideLoading(),u().showToast({title:"成功",icon:"success"}),u().navigateBack({delta:1})):(u().hideLoading(),u().showToast({title:r.msg,icon:"error"}));case 6:e.onSelect&&e.onSelect(s,a),g&&R(null==s?void 0:s.id);case 8:case"end":return n.stop()}}),_callee3)})));return function handleSelect(e,a){return s.apply(this,arguments)}}();return(0,p.jsxs)(i.G7,{className:"address-scroll-view",children:[(0,p.jsx)(i.pf,{scrollY:!0,refresherEnabled:e.refresherEnabled,enhanced:!0,refresherTriggered:Z,onRefresherRefresh:G,children:(0,p.jsx)(i.G7,{className:"address-scroll-view-content",children:(null==b||null===(s=b.data)||void 0===s||null===(a=s.list)||void 0===a?void 0:a.length)>0?null==b||null===(r=b.data)||void 0===r||null===(f=r.list)||void 0===f?void 0:f.map((function(e,s){return(0,p.jsxs)(i.G7,{onClick:function onClick(){return D(e,s)},className:"address-list ".concat(E==e.id&&"address-active"),children:[(0,p.jsxs)(i.G7,{className:"address-user",children:[e.name,e.is_default?(0,p.jsx)(i.xv,{className:"address-list-default",children:"默认"}):(0,p.jsx)(i.xv,{className:"address-list-phone",children:e.phone.replace(e.phone.substring(3,7),"****")})]}),(0,p.jsxs)(i.G7,{className:"address-list-bottom",children:[(0,p.jsxs)(i.G7,{className:"address-list-info",children:[(0,p.jsx)(i.G7,{children:e.province_name+e.city_name+e.district_name}),e.is_default&&(0,p.jsx)(i.xv,{className:"address-list-phone",children:e.phone.replace(e.phone.substring(3,7),"****")})]}),(0,p.jsx)(i.C3,{onClick:function onClick(e){return e.stopPropagation()},url:"/pages/addAddress/index?type=edit&id=".concat(e.id,"&&purchaser_id=").concat(Number(A.params.purchaser_id)),hoverClass:"none",className:"address-edit",children:(0,p.jsx)(i.xv,{className:"iconfont icon-bianji"})})]})]})})):(0,p.jsx)(i.G7,{className:"address-no-data",children:"暂未添加地址"})})}),v&&(0,p.jsx)(i.C3,{url:"/pages/addAddress/index?type=add&purchaser_id=".concat(Number(A.params.purchaser_id)),hoverClass:"none",className:"add-address",children:"添加收货地址"})]})})),m=f,addressManager=function(){var e=(0,o.useRouter)();return(0,p.jsx)(i.G7,{className:"address-manager",children:(0,p.jsx)(m,{refresherEnabled:!0,purchaser_id:e.params.purchaser_id})})};addressManager.enableShareAppMessage=!0;Page((0,r.createPageConfig)(addressManager,"pages/addressManager/index",{root:{cn:[]}},{navigationBarTitleText:"地址管理",enableShareAppMessage:!0}||{}))}},function(e){e.O(0,[7097,2107,1216,8592],(function(){return s=4555,e(e.s=s);var s}));e.O()}]);
+"use strict";require("./sub-common/dde3895fab754ea605d2697ad6817a2a.js");(wx.webpackJsonp=wx.webpackJsonp||[]).push([[5052],{4555:function(e,s,a){var r=a(9975),n=a(885),t=a(4165),d=a(5861),i=a(1515),c=a(9792),l=a(2185),o=a(2535),u=a.n(o),h=a(6028),p=a(1251),f=a(5513),m=(0,c.memo)((function(e){var s,a,r,m,v=e.addButtonEnabled,x=void 0===v||v,g=e.focusBorderEnabled,_=void 0!==g&&g,b=(0,l.hE)(),j=b.fetchData,w=b.state,N=function(){var s=(0,d.Z)((0,t.Z)().mark((function _callee(){var s,a;return(0,t.Z)().wrap((function _callee$(r){for(;;)switch(r.prev=r.next){case 0:return r.next=2,j({purchaser_id:e.purchaser_id});case 2:s=r.sent,e.id?A(e.id):null===(a=s.data.list)||void 0===a||a.every((function(e){return!e.is_default||(A(e.id),!1)}));case 4:case"end":return r.stop()}}),_callee)})));return function getData(){return s.apply(this,arguments)}}();(0,o.useDidShow)((function(){return N(),u().eventCenter.on("addressList:refresh",N),function(){u().eventCenter.off("addressList:refresh",N)}}));var k=(0,c.useState)(!1),Z=(0,n.Z)(k,2),C=Z[0],G=Z[1],S=function(){var e=(0,d.Z)((0,t.Z)().mark((function _callee2(){return(0,t.Z)().wrap((function _callee2$(e){for(;;)switch(e.prev=e.next){case 0:return G(!0),e.next=3,N();case 3:G(!1);case 4:case"end":return e.stop()}}),_callee2)})));return function handleRefresh(){return e.apply(this,arguments)}}(),y=(Array.from({length:15}),(0,c.useState)()),E=(0,n.Z)(y,2),R=E[0],A=E[1],B=(0,o.useRouter)(),D=(0,c.useState)({}),L=(0,n.Z)(D,2),T=(L[0],L[1],(0,p.ER)().fetchData),P=function(){var s=(0,d.Z)((0,t.Z)().mark((function _callee3(s,a){var r,n;return(0,t.Z)().wrap((function _callee3$(t){for(;;)switch(t.prev=t.next){case 0:if(!B.params.orderId||"-100"==B.params.orderId){t.next=9;break}return u().showLoading({title:"请稍等...",mask:!0}),t.next=5,T({address_id:s.id,id:Number(B.params.orderId),shipment_mode:2});case 5:"success"===(r=t.sent).msg?(u().hideLoading(),u().showToast({title:"成功",icon:"success"}),u().navigateBack({delta:1})):(u().hideLoading(),u().showToast({title:r.msg,icon:"error"})),t.next=13;break;case 9:n=u().getCurrentPages(),n[n.length-2].setData({addressObj:s}),u().navigateBack({delta:1});case 13:e.onSelect&&e.onSelect(s,a),_&&A(null==s?void 0:s.id);case 15:case"end":return t.stop()}}),_callee3)})));return function handleSelect(e,a){return s.apply(this,arguments)}}();return(0,f.jsxs)(i.G7,{className:"address-scroll-view",children:[(0,f.jsx)(i.pf,{scrollY:!0,refresherEnabled:e.refresherEnabled,enhanced:!0,refresherTriggered:C,onRefresherRefresh:S,children:(0,f.jsx)(i.G7,{className:"address-scroll-view-content",children:(null==w||null===(s=w.data)||void 0===s||null===(a=s.list)||void 0===a?void 0:a.length)>0?null==w||null===(r=w.data)||void 0===r||null===(m=r.list)||void 0===m?void 0:m.map((function(e,s){return(0,f.jsxs)(i.G7,{onClick:function onClick(){return P(e,s)},className:"address-list ".concat(R==e.id&&"address-active"),children:[(0,f.jsxs)(i.G7,{className:"address-user",children:[e.name,e.is_default?(0,f.jsx)(i.xv,{className:"address-list-default",children:"默认"}):(0,f.jsx)(i.xv,{className:"address-list-phone",children:e.phone.replace(e.phone.substring(3,7),"****")})]}),(0,f.jsxs)(i.G7,{className:"address-list-bottom",children:[(0,f.jsxs)(i.G7,{className:"address-list-info",children:[(0,f.jsx)(i.G7,{children:e.province_name+e.city_name+e.district_name}),e.is_default&&(0,f.jsx)(i.xv,{className:"address-list-phone",children:e.phone.replace(e.phone.substring(3,7),"****")})]}),(0,f.jsx)(i.C3,{onClick:function onClick(e){return e.stopPropagation()},url:"/pages/addAddress/index?type=edit&id=".concat(e.id,"&&purchaser_id=").concat(Number(B.params.purchaser_id)),hoverClass:"none",className:"address-edit",children:(0,f.jsx)(h.Z,{name:"icon-bianji",size:40})})]})]})})):(0,f.jsx)(i.G7,{className:"address-no-data",children:"暂未添加地址"})})}),x&&(0,f.jsx)(i.C3,{url:"/pages/addAddress/index?type=add&purchaser_id=".concat(Number(B.params.purchaser_id)),hoverClass:"none",className:"add-address",children:"添加收货地址"})]})})),v=m,addressManager=function(){var e=(0,o.useRouter)();return(0,f.jsx)(i.G7,{className:"address-manager",children:(0,f.jsx)(v,{refresherEnabled:!0,purchaser_id:e.params.purchaser_id})})};addressManager.enableShareAppMessage=!0;Page((0,r.createPageConfig)(addressManager,"pages/addressManager/index",{root:{cn:[]}},{navigationBarTitleText:"地址管理",enableShareAppMessage:!0}||{}))}},function(e){e.O(0,[7097,2107,1216,8592],(function(){return s=4555,e(e.s=s);var s}));e.O()}]);

build/pages/customerPage/index.js

@@ -1 +1 @@
-"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([[443],{7229:function(e,n,t){var a=t(9975),l=t(4165),r=t(5861),i=t(1413),s=t(885),c=t(1515),u=t(9792),o="index-module__cussBox___b9Eo6",d="index-module__searchBox___TRa3p",_="index-module__two___FcFcX",f="index-module__listBox___cZkpQ",m="index-module__itemBox___edZPr",h="index-module__cussName___zFlmD",p="index-module__phone___mmFz9",x="index-module__woker___TkWiR",g="index-module__acticveitemBox___Cxh_P",Z=t(6408),v=t.n(Z),k=t(5032),w=t(1251),z=t(2535),N=t.n(z),j=t(4909),C=t(7227),B=t(5513);Page((0,a.createPageConfig)((function(){var e=(0,u.useState)({name:null,page:1,size:10}),n=(0,s.Z)(e,2),t=n[0],a=n[1],Z=(0,u.useState)({list:[],total:0}),G=(0,s.Z)(Z,2),R=G[0],b=G[1],P=(0,w.dl)(),T=P.fetchData,I=P.state,S=(0,u.useMemo)((function(){return(0,C.rA)({list:R.list,total:R.total,status:I.loading})}),[R,I]),D=(0,u.useState)({clientId:null,clientName:""}),E=(0,s.Z)(D,2),F=E[0],O=E[1],y=(0,u.useCallback)((function(e){M.current.page=1,b((function(){return{list:[],total:0}})),a((function(n){return(0,i.Z)((0,i.Z)({},n),{},{name:e,size:10})}))}),[]),J=(0,z.useRouter)();(0,u.useEffect)((function(){""===t.name&&a((function(e){return(0,i.Z)((0,i.Z)({},e),{},{name:null})})),""!==t.name&&q()}),[t]);var M=(0,u.useRef)({size:t.size,page:t.page}),$=(0,u.useCallback)((function(){if(R.list.length<R.total){M.current.page++;var e=M.current.size*M.current.page;a((function(n){return(0,i.Z)((0,i.Z)({},n),{},{size:e})}))}}),[R]),A=(0,u.useState)(!1),L=(0,s.Z)(A,2),Q=L[0],W=L[1],X=function(){var e=(0,r.Z)((0,l.Z)().mark((function _callee(){return(0,l.Z)().wrap((function _callee$(e){for(;;)switch(e.prev=e.next){case 0:M.current.size=1,W(!0),a((function(e){return(0,i.Z)((0,i.Z)({},e),{},{size:10})}));case 3:case"end":return e.stop()}}),_callee)})));return function getRefresherRefresh(){return e.apply(this,arguments)}}(),q=function(){var e=(0,r.Z)((0,l.Z)().mark((function _callee2(){var e;return(0,l.Z)().wrap((function _callee2$(n){for(;;)switch(n.prev=n.next){case 0:return n.next=2,T({name:null===t.name?"":t.name,page:t.page,size:t.size});case 2:e=n.sent,null!=J&&J.params.clientId&&e.data.list.map((function(e){return e.id==(null==J?void 0:J.params.clientId)?e.checked=!0:e.checked=!1,e})),b((function(n){var t,a;return(0,i.Z)((0,i.Z)({},n),{},{list:null===(t=e.data)||void 0===t?void 0:t.list,total:null===(a=e.data)||void 0===a?void 0:a.total})})),W((function(){return!1}));case 6:case"end":return n.stop()}}),_callee2)})));return function getCuss(){return e.apply(this,arguments)}}();return(0,u.useEffect)((function(){if(null!==(null==F?void 0:F.clientId))O(F);else{var e=N().getCurrentPages();e[e.length-2].setData({clientId:"",clientName:""})}}),[F]),(0,B.jsxs)(c.G7,{className:o,children:[(0,B.jsx)(c.G7,{className:d,children:(0,B.jsx)(c.G7,{className:_,children:(0,B.jsx)(k.Z,{placeholder:"请输入客户名称或手机号码",showBtn:!1,changeOnSearch:y,debounceTime:300})})}),(0,B.jsx)(c.G7,{className:f,children:(0,B.jsx)(j.Z,{statusMore:S,selfonScrollToLower:$,refresherEnabled:!0,refresherTriggered:Q,selfOnRefresherRefresh:X,children:R.list.map((function(e,n){return(0,B.jsxs)(c.G7,{className:v()(e.checked?g:m),onClick:function onClick(){!function selectClient(e){R.list.map((function(n){return e.id===n.id?n.checked=!0:n.checked=!1,n})),O(e);var n=N().getCurrentPages();n[n.length-2].setData({clientId:e.id,clientName:e.name}),b((function(e){return(0,i.Z)((0,i.Z)({},e),{},{list:null==R?void 0:R.list,total:null==R?void 0:R.total})})),N().navigateBack({delta:1})}(e)},children:[(0,B.jsx)(c.G7,{className:h,children:e.name}),(0,B.jsx)(c.G7,{className:p,children:e.phone}),(0,B.jsx)(c.G7,{className:x,children:e.sale_user_name})]},n)}))})})]})}),"pages/customerPage/index",{root:{cn:[]}},{navigationBarTitleText:"选择客户"}||{}))}},function(e){e.O(0,[2107,1216,8592],(function(){return n=7229,e(e.s=n);var n}));e.O()}]);
+"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([[443],{7229:function(e,n,t){var a=t(9975),r=t(4165),l=t(5861),c=t(1413),i=t(885),s=t(1515),u=t(9792),o="index-module__cussBox___b9Eo6",d="index-module__searchBox___TRa3p",_="index-module__two___FcFcX",f="index-module__listBox___cZkpQ",m="index-module__itemBox___edZPr",h="index-module__cussName___zFlmD",p="index-module__phone___mmFz9",x="index-module__woker___TkWiR",Z="index-module__acticveitemBox___Cxh_P",g=t(6408),v=t.n(g),k=t(5032),w=t(1251),z=t(2535),N=t.n(z),j=t(4909),C=t(7227),B=t(5513);Page((0,a.createPageConfig)((function(){var e=(0,u.useState)({name:null,page:1,size:10}),n=(0,i.Z)(e,2),t=n[0],a=n[1],g=(0,u.useState)({list:[],total:0}),G=(0,i.Z)(g,2),R=G[0],b=G[1],T=(0,w.dl)(),P=T.fetchData,S=T.state,I=(0,u.useMemo)((function(){return(0,C.rA)({list:R.list,total:R.total,status:S.loading})}),[R,S]),E=(0,u.useState)({clientId:null,clientName:""}),F=(0,i.Z)(E,2),O=F[0],D=F[1],y=(0,u.useCallback)((function(e){M.current.page=1,b((function(){return{list:[],total:0}})),a((function(n){return(0,c.Z)((0,c.Z)({},n),{},{name:e,size:10})}))}),[]),J=(0,z.useRouter)();(0,u.useEffect)((function(){""===t.name&&a((function(e){return(0,c.Z)((0,c.Z)({},e),{},{name:null})})),""!==t.name&&q()}),[t]);var M=(0,u.useRef)({size:t.size,page:t.page}),$=(0,u.useCallback)((function(){if(R.list.length<R.total){M.current.page++;var e=M.current.size*M.current.page;a((function(n){return(0,c.Z)((0,c.Z)({},n),{},{size:e})}))}}),[R]),A=(0,u.useState)(!1),L=(0,i.Z)(A,2),Q=L[0],W=L[1],X=function(){var e=(0,l.Z)((0,r.Z)().mark((function _callee(){return(0,r.Z)().wrap((function _callee$(e){for(;;)switch(e.prev=e.next){case 0:M.current.size=1,W(!0),a((function(e){return(0,c.Z)((0,c.Z)({},e),{},{size:10})}));case 3:case"end":return e.stop()}}),_callee)})));return function getRefresherRefresh(){return e.apply(this,arguments)}}(),q=function(){var e=(0,l.Z)((0,r.Z)().mark((function _callee2(){var e;return(0,r.Z)().wrap((function _callee2$(n){for(;;)switch(n.prev=n.next){case 0:return n.next=2,P({name:null===t.name?"":t.name,page:t.page,size:t.size});case 2:e=n.sent,null!=J&&J.params.clientId&&e.data.list.map((function(e){return e.id==(null==J?void 0:J.params.clientId)?e.checked=!0:e.checked=!1,e})),b((function(n){var t,a;return(0,c.Z)((0,c.Z)({},n),{},{list:null===(t=e.data)||void 0===t?void 0:t.list,total:null===(a=e.data)||void 0===a?void 0:a.total})})),W((function(){return!1}));case 6:case"end":return n.stop()}}),_callee2)})));return function getCuss(){return e.apply(this,arguments)}}();return(0,u.useEffect)((function(){null!==(null==O?void 0:O.clientId)&&D(O)}),[O]),(0,B.jsxs)(s.G7,{className:o,children:[(0,B.jsx)(s.G7,{className:d,children:(0,B.jsx)(s.G7,{className:_,children:(0,B.jsx)(k.Z,{placeholder:"请输入客户名称或手机号码",showBtn:!1,changeOnSearch:y,debounceTime:300})})}),(0,B.jsx)(s.G7,{className:f,children:(0,B.jsx)(j.Z,{statusMore:I,selfonScrollToLower:$,refresherEnabled:!0,refresherTriggered:Q,selfOnRefresherRefresh:X,children:R.list.map((function(e,n){return(0,B.jsxs)(s.G7,{className:v()(e.checked?Z:m),onClick:function onClick(){!function selectClient(e){R.list.map((function(n){return e.id===n.id?n.checked=!0:n.checked=!1,n})),D(e);var n=N().getCurrentPages();n[n.length-2].setData({clientId:e.id,clientName:e.name}),b((function(e){return(0,c.Z)((0,c.Z)({},e),{},{list:null==R?void 0:R.list,total:null==R?void 0:R.total})})),N().navigateBack({delta:1})}(e)},children:[(0,B.jsx)(s.G7,{className:h,children:e.name}),(0,B.jsx)(s.G7,{className:p,children:e.phone}),(0,B.jsx)(s.G7,{className:x,children:e.sale_user_name})]},n)}))})})]})}),"pages/customerPage/index",{root:{cn:[]}},{navigationBarTitleText:"选择客户"}||{}))}},function(e){e.O(0,[2107,1216,8592],(function(){return n=7229,e(e.s=n);var n}));e.O()}]);

build/pages/login/index.js

@@ -1 +1 @@
-"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([[2003],{5195:function(e,n,i){var s=i(9975),a=i(4165),c=i(1413),l=i(5861),o=i(885),t=i(2407),r=i(6028),u=i(1515),d=i(9792),_="index-module__login___EqvJi",x="index-module__login-panel___EQuDb",m="index-module__login-title___dkk8O",p="index-module__input-bar___VMnKd",h="index-module__input-bar--account___X4zuk",j="index-module__input-bar--password___Gb5Q_",g="index-module__login-options___QEaXx",f="index-module__login-option___RbES2",Z="index-module__login-button___xuvF4",v="index-module__isForgetPwd___Mb3Qd",N="index-module__quick-login___TPdk0",k="index-module__quick-login--options___KSNBY",b="index-module__quick-login--divider___uC_UV",w="index-module__quick-login--iconCard___LFNc2",G=i(6574),C=i(7594),I=i(8560),z=i(8072),S=i(2535),y=i.n(S),P=i(1115),q=i(3929),E=i(5513),T=(0,d.memo)((function(){return(0,E.jsxs)(u.G7,{className:N,children:[(0,E.jsx)(t.Z,{direction:"horizontal",customClassName:b,children:"或通过以下方式登录"}),(0,E.jsx)(u.G7,{className:k,children:(0,E.jsx)(I.Z,{iconName:"icon-weixindenglu",title:"微信登录",customClass:w})})]})})),B=function Login(){var e=(0,d.useState)(!1),n=(0,o.Z)(e,2),i=n[0],s=n[1],N=(0,d.useState)(!0),k=(0,o.Z)(N,2),b=k[0],w=k[1],I=(0,d.useState)(""),S=(0,o.Z)(I,2),B=S[0],F=S[1],Q=(0,d.useState)(""),J=(0,o.Z)(Q,2),L=J[0],O=J[1],V=function formatInput(e){return e.trim()},D=(0,q.Z)(),K=D.setToken,M=D.setUserInfo,U=(0,z.Ig)().fetchData,X=function(){var e=(0,l.Z)((0,a.Z)().mark((function _callee(){var e;return(0,a.Z)().wrap((function _callee$(n){for(;;)switch(n.prev=n.next){case 0:if(""!==B&&""!==L){n.next=2;break}return n.abrupt("return",P.Z9.error("账号密码不能为空！"));case 2:return n.next=5,U({account:B,password:L});case 5:(e=n.sent).success?(P.Z9.success("登陆成功"),K(e.data.token),M((0,c.Z)({},e.data)),y().switchTab({url:"/pages/index/index"})):P.Z9.error("登陆失败");case 8:case"end":return n.stop()}}),_callee)})));return function handleLogin(){return e.apply(this,arguments)}}();return(0,E.jsxs)(u.G7,{className:_,children:[(0,E.jsx)(u.Ee,{className:"full-100",mode:"widthFix",src:"https://cdn.zzfzyc.com/service_center/login_head.png"}),(0,E.jsxs)(u.G7,{className:x,children:[(0,E.jsxs)(u.G7,{className:m,children:[(0,E.jsx)(u.xv,{children:"您好，"}),(0,E.jsx)(u.xv,{children:"欢迎来到蜘蛛管家"})]}),(0,E.jsxs)(u.G7,{className:p,children:[(0,E.jsx)(r.Z,{name:"icon-yonghuming",size:48,color:"#999999"}),(0,E.jsx)(t.Z,{direction:"vertical"}),(0,E.jsx)(u.II,{onInput:function handleInputAccount(e){var n=V(e.detail.value);F(n)},className:h,placeholder:"请输入用户名"})]}),(0,E.jsxs)(u.G7,{className:p,children:[(0,E.jsx)(r.Z,{name:"icon-mima",size:48,color:"#999999"}),(0,E.jsx)(t.Z,{direction:"vertical"}),(0,E.jsx)(u.II,{onInput:function handleInputPassword(e){var n=V(e.detail.value);O(n)},password:b,className:j,type:"text",placeholder:"请输入密码"}),(0,E.jsx)(u.G7,{onClick:function handlePwdVisible(){w((function(e){return!e}))},children:b?(0,E.jsx)(r.Z,{name:"icon-biyan",size:48,color:"#999999"}):(0,E.jsx)(r.Z,{name:"icon-yanjing",size:48,color:"#999999"})})]}),(0,E.jsxs)(u.G7,{className:g,children:[(0,E.jsx)(u.G7,{className:f,children:(0,E.jsx)(G.Z,{status:i,size:"small",circle:!0,onSelect:function selectCallBack(){s(!0)},onClose:function closeCallBack(){s(!1)},children:"记住密码"})}),(0,E.jsx)(u.G7,{className:f,children:(0,E.jsx)(u.xv,{className:v,children:"忘记密码？"})})]}),(0,E.jsx)(C.Z,{circle:!0,plain:!0,onClick:X,customClassName:Z,children:"登录"}),(0,E.jsx)(T,{})]})]})};Page((0,s.createPageConfig)(B,"pages/login/index",{root:{cn:[]}},{navigationBarTitleText:"登录"}||{}))}},function(e){e.O(0,[2107,1216,8592],(function(){return n=5195,e(e.s=n);var n}));e.O()}]);
+"use strict";(wx.webpackJsonp=wx.webpackJsonp||[]).push([[2003],{5195:function(e,n,i){var s=i(9975),c=i(4165),a=i(1413),o=i(5861),l=i(885),t=i(2407),r=i(6028),d=i(1515),u=i(9792),_="index-module__login___EqvJi",x="index-module__login-panel___EQuDb",m="index-module__login-title___dkk8O",h="index-module__input-bar___VMnKd",p="index-module__input-bar--account___X4zuk",j="index-module__input-bar--password___Gb5Q_",g="index-module__login-options___QEaXx",f="index-module__login-option___RbES2",Z="index-module__login-button___xuvF4",v="index-module__isForgetPwd___Mb3Qd",k="index-module__quick-login___TPdk0",N="index-module__quick-login--options___KSNBY",w="index-module__quick-login--divider___uC_UV",b="index-module__quick-login--iconCard___LFNc2",C=i(6574),G=i(7594),I=i(8560),z=i(7835),P=i(2535),S=i.n(P),y=i(1115),T=i(3929),q=i(5513),E=(0,u.memo)((function(){return(0,q.jsxs)(d.G7,{className:k,children:[(0,q.jsx)(t.Z,{direction:"horizontal",customClassName:w,children:"或通过以下方式登录"}),(0,q.jsx)(d.G7,{className:N,children:(0,q.jsx)(I.Z,{iconName:"icon-weixindenglu",title:"微信登录",customClass:b})})]})})),F=function Login(){var e=(0,u.useState)(!1),n=(0,l.Z)(e,2),i=n[0],s=n[1],k=(0,u.useState)(!0),N=(0,l.Z)(k,2),w=N[0],b=N[1],I=(0,u.useState)(""),P=(0,l.Z)(I,2),F=P[0],B=P[1],Q=(0,u.useState)(""),J=(0,l.Z)(Q,2),L=J[0],O=J[1],V=function formatInput(e){return e.trim()},D=(0,T.Z)(),K=D.setToken,M=D.setUserInfo,U=(0,z.Ig)().fetchData,X=function(){var e=(0,o.Z)((0,c.Z)().mark((function _callee(){var e;return(0,c.Z)().wrap((function _callee$(n){for(;;)switch(n.prev=n.next){case 0:if(""!==F&&""!==L){n.next=2;break}return n.abrupt("return",y.Z9.error("账号密码不能为空！"));case 2:return n.next=5,U({account:F,password:L});case 5:(e=n.sent).success?(y.Z9.success("登陆成功"),K(e.data.token),M((0,a.Z)({},e.data)),S().switchTab({url:"/pages/index/index"})):y.Z9.error("登陆失败");case 8:case"end":return n.stop()}}),_callee)})));return function handleLogin(){return e.apply(this,arguments)}}();return(0,q.jsxs)(d.G7,{className:_,children:[(0,q.jsx)(d.Ee,{className:"full-100",mode:"widthFix",src:"https://cdn.zzfzyc.com/service_center/login_head.png"}),(0,q.jsxs)(d.G7,{className:x,children:[(0,q.jsxs)(d.G7,{className:m,children:[(0,q.jsx)(d.xv,{children:"您好，"}),(0,q.jsx)(d.xv,{children:"欢迎来到蜘蛛管家"})]}),(0,q.jsxs)(d.G7,{className:h,children:[(0,q.jsx)(r.Z,{name:"icon-yonghuming",size:48,color:"#999999"}),(0,q.jsx)(t.Z,{direction:"vertical"}),(0,q.jsx)(d.II,{onInput:function handleInputAccount(e){var n=V(e.detail.value);B(n)},className:p,placeholder:"请输入用户名"})]}),(0,q.jsxs)(d.G7,{className:h,children:[(0,q.jsx)(r.Z,{name:"icon-mima",size:48,color:"#999999"}),(0,q.jsx)(t.Z,{direction:"vertical"}),(0,q.jsx)(d.II,{onInput:function handleInputPassword(e){var n=V(e.detail.value);O(n)},password:w,className:j,type:"text",placeholder:"请输入密码"}),(0,q.jsx)(d.G7,{onClick:function handlePwdVisible(){b((function(e){return!e}))},children:w?(0,q.jsx)(r.Z,{name:"icon-biyan",size:48,color:"#999999"}):(0,q.jsx)(r.Z,{name:"icon-yanjing",size:48,color:"#999999"})})]}),(0,q.jsxs)(d.G7,{className:g,children:[(0,q.jsx)(d.G7,{className:f,children:(0,q.jsx)(C.Z,{status:i,size:"small",circle:!0,onSelect:function selectCallBack(){s(!0)},onClose:function closeCallBack(){s(!1)},children:"记住密码"})}),(0,q.jsx)(d.G7,{className:f,onClick:function handleForgetPwd(){S().showToast({title:"联系客服:0757-86834274",icon:"none"})},children:(0,q.jsx)(d.xv,{className:v,children:"忘记密码？"})})]}),(0,q.jsx)(G.Z,{circle:!0,plain:!0,onClick:X,customClassName:Z,children:"登录"}),(0,q.jsx)(E,{})]})]})};Page((0,s.createPageConfig)(F,"pages/login/index",{root:{cn:[]}},{navigationBarTitleText:"登录"}||{}))}},function(e){e.O(0,[2107,1216,8592],(function(){return n=5195,e(e.s=n);var n}));e.O()}]);

build/prebundle/remoteEntry.js

@@ -1 +1 @@
-"use strict";var taro_app_library;(wx["webpackJsonp"]=wx["webpackJsonp"]||[]).push([[68],{42:function(n,r,t){var e={"./react":function(){return t.e(970).then((function(){return function(){return t(970)}}))},"./react-redux":function(){return Promise.all([t.e(31),t.e(903),t.e(154),t.e(289)]).then((function(){return function(){return t(289)}}))},"./@tarojs/taro":function(){return Promise.all([t.e(31),t.e(903),t.e(99)]).then((function(){return function(){return t(99)}}))},"./classnames":function(){return Promise.all([t.e(31),t.e(903),t.e(297)]).then((function(){return function(){return t(297)}}))},"./redux":function(){return t.e(1).then((function(){return function(){return t(1)}}))},"./redux-thunk":function(){return t.e(141).then((function(){return function(){return t(141)}}))},"./qs":function(){return t.e(61).then((function(){return function(){return t(61)}}))},"./redux-logger":function(){return Promise.all([t.e(31),t.e(903),t.e(547)]).then((function(){return function(){return t(547)}}))},"./dayjs":function(){return t.e(350).then((function(){return function(){return t(350)}}))},"./react/jsx-runtime":function(){return t.e(517).then((function(){return function(){return t(517)}}))},"./@tarojs/runtime":function(){return Promise.all([t.e(31),t.e(903),t.e(977)]).then((function(){return function(){return t(977)}}))},"./@tarojs/plugin-framework-react/dist/runtime":function(){return Promise.all([t.e(31),t.e(903),t.e(573)]).then((function(){return function(){return t(573)}}))},"./@tarojs/plugin-platform-weapp/dist/runtime":function(){return Promise.all([t.e(31),t.e(638)]).then((function(){return function(){return t(638)}}))},"./react-dom":function(){return Promise.all([t.e(31),t.e(903),t.e(154),t.e(212)]).then((function(){return function(){return t(212)}}))}},u=function(n,r){return t.R=r,r=t.o(e,n)?e[n]():Promise.resolve().then((function(){throw new Error('Module "'+n+'" does not exist in container.')})),t.R=void 0,r},i=function(n,r){if(t.S){var e="default",u=t.S[e];if(u&&u!==n)throw new Error("Container initialization failed as it has already been initialized with a different share scope");return t.S[e]=n,t.I(e,r)}};t.d(r,{get:function(){return u},init:function(){return i}});var o={"./react":function(){return function(){return t(970)}},"./react-redux":function(){return function(){return t(289)}},"./@tarojs/taro":function(){return function(){return t(99)}},"./classnames":function(){return function(){return t(297)}},"./redux":function(){return function(){return t(1)}},"./redux-thunk":function(){return function(){return t(141)}},"./qs":function(){return function(){return t(61)}},"./redux-logger":function(){return function(){return t(547)}},"./dayjs":function(){return function(){return t(350)}},"./react/jsx-runtime":function(){return function(){return t(517)}},"./@tarojs/runtime":function(){return function(){return t(977)}},"./@tarojs/plugin-framework-react/dist/runtime":function(){return function(){return t(573)}},"./@tarojs/plugin-platform-weapp/dist/runtime":function(){return function(){return t(638)}},"./react-dom":function(){return function(){return t(212)}}},c=function(n){return o[n]()};t.taro(c)}},function(n){var r=function(r){return n(n.s=r)},t=r(42);taro_app_library=t}]);
+"use strict";var taro_app_library;(wx["webpackJsonp"]=wx["webpackJsonp"]||[]).push([[68],{242:function(n,r,t){var e={"./react":function(){return t.e(970).then((function(){return function(){return t(970)}}))},"./react-redux":function(){return Promise.all([t.e(31),t.e(903),t.e(154),t.e(289)]).then((function(){return function(){return t(289)}}))},"./@tarojs/taro":function(){return Promise.all([t.e(31),t.e(903),t.e(99)]).then((function(){return function(){return t(99)}}))},"./classnames":function(){return Promise.all([t.e(31),t.e(903),t.e(297)]).then((function(){return function(){return t(297)}}))},"./redux":function(){return t.e(1).then((function(){return function(){return t(1)}}))},"./qs":function(){return t.e(61).then((function(){return function(){return t(61)}}))},"./redux-thunk":function(){return t.e(141).then((function(){return function(){return t(141)}}))},"./redux-logger":function(){return Promise.all([t.e(31),t.e(903),t.e(547)]).then((function(){return function(){return t(547)}}))},"./dayjs":function(){return t.e(350).then((function(){return function(){return t(350)}}))},"./react/jsx-runtime":function(){return t.e(517).then((function(){return function(){return t(517)}}))},"./@tarojs/runtime":function(){return Promise.all([t.e(31),t.e(903),t.e(977)]).then((function(){return function(){return t(977)}}))},"./@tarojs/plugin-platform-weapp/dist/runtime":function(){return Promise.all([t.e(31),t.e(638)]).then((function(){return function(){return t(638)}}))},"./@tarojs/plugin-framework-react/dist/runtime":function(){return Promise.all([t.e(31),t.e(903),t.e(573)]).then((function(){return function(){return t(573)}}))},"./react-dom":function(){return Promise.all([t.e(31),t.e(903),t.e(154),t.e(212)]).then((function(){return function(){return t(212)}}))}},u=function(n,r){return t.R=r,r=t.o(e,n)?e[n]():Promise.resolve().then((function(){throw new Error('Module "'+n+'" does not exist in container.')})),t.R=void 0,r},i=function(n,r){if(t.S){var e="default",u=t.S[e];if(u&&u!==n)throw new Error("Container initialization failed as it has already been initialized with a different share scope");return t.S[e]=n,t.I(e,r)}};t.d(r,{get:function(){return u},init:function(){return i}});var o={"./react":function(){return function(){return t(970)}},"./react-redux":function(){return function(){return t(289)}},"./@tarojs/taro":function(){return function(){return t(99)}},"./classnames":function(){return function(){return t(297)}},"./redux":function(){return function(){return t(1)}},"./qs":function(){return function(){return t(61)}},"./redux-thunk":function(){return function(){return t(141)}},"./redux-logger":function(){return function(){return t(547)}},"./dayjs":function(){return function(){return t(350)}},"./react/jsx-runtime":function(){return function(){return t(517)}},"./@tarojs/runtime":function(){return function(){return t(977)}},"./@tarojs/plugin-platform-weapp/dist/runtime":function(){return function(){return t(638)}},"./@tarojs/plugin-framework-react/dist/runtime":function(){return function(){return t(573)}},"./react-dom":function(){return function(){return t(212)}}},c=function(n){return o[n]()};t.taro(c)}},function(n){var r=function(r){return n(n.s=r)},t=r(242);taro_app_library=t}]);

build/project.config.json

@@ -1,5 +1,5 @@
 {
-  "miniprogramRoot": "./",
+  "miniprogramRoot": "",
   "projectname": "Mall-lymarket",
   "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "appid": "wx64fe67f111d52457",

build/runtime.js

@@ -1 +1 @@
-!function(){"use strict";var e,r,_,t,n={},u={};function __webpack_require__(e){var r=u[e];if(void 0!==r)return r.exports;var _=u[e]={id:e,loaded:!1,exports:{}};return n[e](_,_.exports,__webpack_require__),_.loaded=!0,_.exports}__webpack_require__.m=n,e=[],__webpack_require__.O=function(r,_,t,n){if(!_){var u=1/0;for(c=0;c<e.length;c++){_=e[c][0],t=e[c][1],n=e[c][2];for(var i=!0,a=0;a<_.length;a++)(!1&n||u>=n)&&Object.keys(__webpack_require__.O).every((function(e){return __webpack_require__.O[e](_[a])}))?_.splice(a--,1):(i=!1,n<u&&(u=n));if(i){e.splice(c--,1);var o=t();void 0!==o&&(r=o)}}return r}n=n||0;for(var c=e.length;c>0&&e[c-1][2]>n;c--)e[c]=e[c-1];e[c]=[_,t,n]},__webpack_require__.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return __webpack_require__.d(r,{a:r}),r},__webpack_require__.d=function(e,r){for(var _ in r)__webpack_require__.o(r,_)&&!__webpack_require__.o(e,_)&&Object.defineProperty(e,_,{enumerable:!0,get:r[_]})},__webpack_require__.f={},__webpack_require__.e=function(e){return Promise.all(Object.keys(__webpack_require__.f).reduce((function(r,_){return __webpack_require__.f[_](e,r),r}),[]))},__webpack_require__.u=function(e){},__webpack_require__.miniCssF=function(e){},__webpack_require__.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),__webpack_require__.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},r={},_="EShop:",__webpack_require__.l=function(e,t,n,u){if(r[e])r[e].push(t);else{var i,a;if(void 0!==n)for(var o=document.getElementsByTagName("script"),c=0;c<o.length;c++){var l=o[c];if(l.getAttribute("src")==e||l.getAttribute("data-webpack")==_+n){i=l;break}}i||(a=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,__webpack_require__.nc&&i.setAttribute("nonce",__webpack_require__.nc),i.setAttribute("data-webpack",_+n),i.src=e),r[e]=[t];var onScriptComplete=function(_,t){i.onerror=i.onload=null,clearTimeout(p);var n=r[e];if(delete r[e],i.parentNode&&i.parentNode.removeChild(i),n&&n.forEach((function(e){return e(t)})),_)return _(t)},p=setTimeout(onScriptComplete.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=onScriptComplete.bind(null,i.onerror),i.onload=onScriptComplete.bind(null,i.onload),a&&document.head.appendChild(i)}},__webpack_require__.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},__webpack_require__.nmd=function(e){return e.paths=[],e.children||(e.children=[]),e},t={2020:["default","./@tarojs/plugin-framework-react/dist/runtime",null],2535:["default","./@tarojs/taro",null],2934:["default","./react-redux",null],3831:["default","./dayjs",null],5513:["default","./react/jsx-runtime",null],5571:["default","./redux",null],6408:["default","./classnames",null],7461:["default","./react-dom",null],8475:["default","./redux-thunk",null],8748:["default","./qs",null],9792:["default","./react",null],9798:["default","./@tarojs/plugin-platform-weapp/dist/runtime",null],9975:["default","./@tarojs/runtime",null]},__webpack_require__.taro=function(e){for(var r in t){var _=e(t[r][1]);n[r]=function(e){return function(r){r.exports=e()}}(_)}},__webpack_require__.p="/",function(){var e={3666:0,7591:0,8215:0,7241:0,3215:0,541:0};__webpack_require__.f.j=function(r,_){var t=__webpack_require__.o(e,r)?e[r]:void 0;if(0!==t)if(t)_.push(t[2]);else if(/^([38]215|(54|724|759)1|3666)$/.test(r))e[r]=0;else{var n=new Promise((function(_,n){t=e[r]=[_,n]}));_.push(t[2]=n);var u=__webpack_require__.p+__webpack_require__.u(r),i=new Error;__webpack_require__.l(u,(function(_){if(__webpack_require__.o(e,r)&&(0!==(t=e[r])&&(e[r]=void 0),t)){var n=_&&("load"===_.type?"missing":_.type),u=_&&_.target&&_.target.src;i.message="Loading chunk "+r+" failed.\n("+n+": "+u+")",i.name="ChunkLoadError",i.type=n,i.request=u,t[1](i)}}),"chunk-"+r,r)}},__webpack_require__.O.j=function(r){return 0===e[r]};var webpackJsonpCallback=function(r,_){var t,n,u=_[0],i=_[1],a=_[2],o=0;if(u.some((function(r){return 0!==e[r]}))){for(t in i)__webpack_require__.o(i,t)&&(__webpack_require__.m[t]=i[t]);if(a)var c=a(__webpack_require__)}for(r&&r(_);o<u.length;o++)n=u[o],__webpack_require__.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return __webpack_require__.O(c)},r=wx.webpackJsonp=wx.webpackJsonp||[];r.forEach(webpackJsonpCallback.bind(null,0)),r.push=webpackJsonpCallback.bind(null,r.push.bind(r))}()}();
+!function(){"use strict";var e,r,_,t,n={},u={};function __webpack_require__(e){var r=u[e];if(void 0!==r)return r.exports;var _=u[e]={id:e,loaded:!1,exports:{}};return n[e](_,_.exports,__webpack_require__),_.loaded=!0,_.exports}__webpack_require__.m=n,e=[],__webpack_require__.O=function(r,_,t,n){if(!_){var u=1/0;for(c=0;c<e.length;c++){_=e[c][0],t=e[c][1],n=e[c][2];for(var i=!0,a=0;a<_.length;a++)(!1&n||u>=n)&&Object.keys(__webpack_require__.O).every((function(e){return __webpack_require__.O[e](_[a])}))?_.splice(a--,1):(i=!1,n<u&&(u=n));if(i){e.splice(c--,1);var o=t();void 0!==o&&(r=o)}}return r}n=n||0;for(var c=e.length;c>0&&e[c-1][2]>n;c--)e[c]=e[c-1];e[c]=[_,t,n]},__webpack_require__.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return __webpack_require__.d(r,{a:r}),r},__webpack_require__.d=function(e,r){for(var _ in r)__webpack_require__.o(r,_)&&!__webpack_require__.o(e,_)&&Object.defineProperty(e,_,{enumerable:!0,get:r[_]})},__webpack_require__.f={},__webpack_require__.e=function(e){return Promise.all(Object.keys(__webpack_require__.f).reduce((function(r,_){return __webpack_require__.f[_](e,r),r}),[]))},__webpack_require__.u=function(e){},__webpack_require__.miniCssF=function(e){},__webpack_require__.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),__webpack_require__.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},r={},_="EShop:",__webpack_require__.l=function(e,t,n,u){if(r[e])r[e].push(t);else{var i,a;if(void 0!==n)for(var o=document.getElementsByTagName("script"),c=0;c<o.length;c++){var l=o[c];if(l.getAttribute("src")==e||l.getAttribute("data-webpack")==_+n){i=l;break}}i||(a=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,__webpack_require__.nc&&i.setAttribute("nonce",__webpack_require__.nc),i.setAttribute("data-webpack",_+n),i.src=e),r[e]=[t];var onScriptComplete=function(_,t){i.onerror=i.onload=null,clearTimeout(p);var n=r[e];if(delete r[e],i.parentNode&&i.parentNode.removeChild(i),n&&n.forEach((function(e){return e(t)})),_)return _(t)},p=setTimeout(onScriptComplete.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=onScriptComplete.bind(null,i.onerror),i.onload=onScriptComplete.bind(null,i.onload),a&&document.head.appendChild(i)}},__webpack_require__.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},__webpack_require__.nmd=function(e){return e.paths=[],e.children||(e.children=[]),e},t={2020:["default","./@tarojs/plugin-framework-react/dist/runtime",null],2535:["default","./@tarojs/taro",null],2934:["default","./react-redux",null],3831:["default","./dayjs",null],5513:["default","./react/jsx-runtime",null],5571:["default","./redux",null],6408:["default","./classnames",null],7461:["default","./react-dom",null],8475:["default","./redux-thunk",null],8748:["default","./qs",null],9792:["default","./react",null],9798:["default","./@tarojs/plugin-platform-weapp/dist/runtime",null],9975:["default","./@tarojs/runtime",null]},__webpack_require__.taro=function(e){for(var r in t){var _=e(t[r][1]);n[r]=function(e){return function(r){r.exports=e()}}(_)}},__webpack_require__.p="/",function(){var e={3666:0,7591:0,8215:0,4536:0,541:0,5637:0,7241:0,3215:0};__webpack_require__.f.j=function(r,_){var t=__webpack_require__.o(e,r)?e[r]:void 0;if(0!==t)if(t)_.push(t[2]);else if(/^([38]215|(54|724|759)1|3666|4536|5637)$/.test(r))e[r]=0;else{var n=new Promise((function(_,n){t=e[r]=[_,n]}));_.push(t[2]=n);var u=__webpack_require__.p+__webpack_require__.u(r),i=new Error;__webpack_require__.l(u,(function(_){if(__webpack_require__.o(e,r)&&(0!==(t=e[r])&&(e[r]=void 0),t)){var n=_&&("load"===_.type?"missing":_.type),u=_&&_.target&&_.target.src;i.message="Loading chunk "+r+" failed.\n("+n+": "+u+")",i.name="ChunkLoadError",i.type=n,i.request=u,t[1](i)}}),"chunk-"+r,r)}},__webpack_require__.O.j=function(r){return 0===e[r]};var webpackJsonpCallback=function(r,_){var t,n,u=_[0],i=_[1],a=_[2],o=0;if(u.some((function(r){return 0!==e[r]}))){for(t in i)__webpack_require__.o(i,t)&&(__webpack_require__.m[t]=i[t]);if(a)var c=a(__webpack_require__)}for(r&&r(_);o<u.length;o++)n=u[o],__webpack_require__.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return __webpack_require__.O(c)},r=wx.webpackJsonp=wx.webpackJsonp||[];r.forEach(webpackJsonpCallback.bind(null,0)),r.push=webpackJsonpCallback.bind(null,r.push.bind(r))}()}();

iconfont.json

@@ -1,7 +1,7 @@
 {
-    "symbol_url": "//at.alicdn.com/t/c/font_3619513_1msan9t0ewxk.js",
+    "symbol_url": "//at.alicdn.com/t/c/font_3619513_j3kxbij3zac.js",
     "save_dir": "./src/components/iconfont",
     "trim_icon_prefix": "",
-    "default_icon_size": 18,
+    "default_icon_size": 36,
     "design_width": 750
 }

project.private.config.json

@@ -9,6 +9,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "销售统计",
+          "pathName": "pages/saleStatistic/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "提货详情",
           "pathName": "pages/takeDeliveryDetail/index",

src/app.config.ts

@@ -36,6 +36,10 @@ export default defineAppConfig({
     'custom-wrapper': '/custom-wrapper',
   },
   subPackages: [
+    {
+      root: 'pages/saleStatistic',
+      pages: ['index'],
+    },
     {
       root: 'pages/takeDelivery',
       pages: ['index'],
@@ -101,34 +105,24 @@ export default defineAppConfig({
       pages: ['index'],
     },
     {
-      root: "pages/applyMoney",
+      root: 'pages/applyMoney',
-      pages: [
+      pages: ['index'],
-        "index"
-      ]
     },
     {
-      root: "pages/newCollection",
+      root: 'pages/newCollection',
-      pages: [
+      pages: ['index'],
-        "index"
-      ]
     },
     {
-      root: "pages/addCollection",
+      root: 'pages/addCollection',
-      pages: [
+      pages: ['index'],
-        "index"
-      ]
     },
     {
-      root: "pages/accountPage",
+      root: 'pages/accountPage',
-      pages: [
+      pages: ['index'],
-        "index"
-      ]
     },
     {
-      root: "pages/collectionDetail",
+      root: 'pages/collectionDetail',
-      pages: [
+      pages: ['index'],
-        "index"
-      ]
     },
   ],
 })

src/components/dropDown-item/index.module.scss

@@ -0,0 +1,18 @@
+.dropDownItem{
+  width: 100%;
+
+  &--title{
+    position: relative;
+    z-index: 2000;
+    background-color: white;
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: center;
+    align-items: center;
+    padding: 24px 0;
+    &--text{
+      display: block;
+      margin-right: 12px;
+    }
+  }
+}

src/components/dropDown-item/index.tsx

@@ -0,0 +1,87 @@
+import { View, Text } from '@tarojs/components'
+import { useCallback, useEffect, useMemo, useRef, useState, memo } from 'react'
+import styles from './index.module.scss'
+import classnames from 'classnames'
+import Iconfont, { IconNames } from '../iconfont/iconfont'
+import Popup from '../popup'
+import FilterButton from '../filterButton'
+// 弹窗选择向上弹窗还是向下弹窗
+type Direction = 'up' | 'down'
+// 配置 菜单可选项
+export type DropDownOptions = {
+  text: string
+  value: number
+}
+
+interface DropDownEvent {
+  change?: (value: DropDownOptions['value']) => void   // value 变化时触发
+}
+
+interface PropsType extends DropDownEvent{
+  direction?: Direction
+  title: string             // 已选中的菜单标题
+  options?: DropDownOptions[]
+  value?: number | string     // 当前选中的值
+  children?: React.ReactNode
+  activeColor?: string
+}
+
+export default (props: PropsType) => {
+  const { children, direction = 'down', title, value, options, change, activeColor } = props
+
+  const [showPopup, setShowPopup] = useState(false)
+
+  const handleClickOption = (value: DropDownOptions['value']) => {
+    
+    change?.(value)
+  }
+
+  const defaultOptions = useMemo(() => {
+    const currentValue = value
+    return options?.map(({text, value})=>{
+      return (
+        <FilterButton isActive={currentValue === value} onClick={() => handleClickOption(value)}>
+          {text}
+        </FilterButton>
+      )
+
+    })
+  }, [value])
+
+  const getIconName = () => {
+    if(direction === 'up'){
+      return showPopup ? 'icon-zhankai1' : 'icon-shouqi1'
+    }
+    // down
+    return showPopup ? 'icon-shouqi1' : 'icon-zhankai1'
+  }
+
+  const handleClickTitle = () => {
+    setShowPopup(true)
+  }
+
+  const handleClosePopup = () => {
+    setShowPopup(false)
+  }
+
+  return (
+    <View className={styles.dropDownItem}>
+      <View className={styles['dropDownItem--title']} onClick={handleClickTitle}>
+        <Text className={styles['dropDownItem--title--text']} style={{ color: activeColor }}>
+          {title}
+        </Text>
+        <Iconfont name={getIconName()} size={20} color={value !== options![0].value ? activeColor : '#333'}></Iconfont>
+      </View>
+      <Popup
+        onClose={handleClosePopup}
+        show={showPopup}
+        showTitle={false}
+        safeAreaInsetBottom={false}
+        customStyle={{ position: 'absolute', top: 'unset' }}
+        overlayStyle={{ position: 'absolute', top: 'unset' }}
+        position={direction === 'down' ? 'top' : 'bottom'}>
+        {children ? children : defaultOptions}
+      </Popup>
+    </View>
+  )
+}

src/components/filterButton/index.module.scss

@@ -0,0 +1,31 @@
+
+.filterButton {
+  display: flex;
+  flex-flow: row nowrap;
+  align-items: center;
+  justify-content: center;
+  padding: 0 20px;
+  box-sizing: border-box;
+  border: 0 solid transparent;
+  background-color: #f6f6f6;
+  border-radius: 8px;
+  font-size: 28px;
+  height: 72px;
+  &--text {
+    color: #909090;
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: center;
+    align-items: center;
+  }
+  &:hover {
+    opacity: 0.7;
+  }
+  &--active {
+    border: 1px solid $color_main;
+    background-color: #eaf2ff;
+    .filterButton--text {
+      color: $color_main;
+    }
+  }
+}

src/components/filterButton/index.tsx

@@ -0,0 +1,27 @@
+import classnames from "classnames"
+import { FC } from "react"
+import NormalButton from "../normalButton"
+import styles from './index.module.scss'
+
+interface ButtonPropsType {
+  isActive: boolean
+  onClick?: Function
+  children?: React.ReactNode
+  customClassName?: string
+}
+
+const FilterButton: FC<ButtonPropsType> = props => {
+  const { onClick, children, isActive = false, customClassName } = props
+  const handleClick = () => {
+    onClick?.()
+  }
+  return (
+    <NormalButton
+      customTextClassName={styles['filterButton--text']}
+      customClassName={classnames(styles.filterButton, isActive && styles['filterButton--active'], customClassName)}
+      onClick={handleClick}>
+      {children}
+    </NormalButton>
+  )
+}
+export default FilterButton

src/components/iconfont/iconfont.tsx

@@ -24,7 +24,7 @@ function hex2rgb(hex) {
   return "rgb(" + rgb.join(",") + ")";
 }
 
-export type IconNames = 'icon-zhankai' | 'icon-shouqi' | 'icon-lujing' | 'icon-jizhumima' | 'icon-a-jizhumima' | 'icon-weixindenglu' | 'icon-kehuxinxi' | 'icon-yewuyuanqizi' | 'icon-chakanquanbukehu' | 'icon-biyan' | 'icon-bianji' | 'icon-daikuan' | 'icon-cangku' | 'icon-guanlidingdan' | 'icon-mima' | 'icon-guanbi' | 'icon-jianshao' | 'icon-dingwei' | 'icon-saomiao' | 'icon-peihuo' | 'icon-shaixuan' | 'icon-paiming' | 'icon-shanchusousuoxinxi' | 'icon-shijian' | 'icon-sousuo' | 'icon-shouhou' | 'icon-sousuofanhui' | 'icon-sousuoshanchu' | 'icon-tuikuan' | 'icon-tishi' | 'icon-xianxiahuizong' | 'icon-xinzeng' | 'icon-yonghuming' | 'icon-yanjing' | 'icon-yufukuan' | 'icon-wodekefu' | 'icon-dizhi' | 'icon-shouhouzhongxin' | 'icon-wodeshoucang' | 'icon-shoukuanliebiao' | 'icon-madanguanli' | 'icon-qusechazhao' | 'icon-pandiansaoma' | 'icon-yaoqingma' | 'icon-duizhang' | 'icon-tihuoliebiao' | 'icon-yangpinduibi' | 'icon-yansequyang' | 'icon-fahuoliebiao' | 'icon-yuncangkucun' | 'icon-xiaoshou' | 'icon-qianzhicangkucun' | 'icon-lingquseka' | 'icon-gouwu1' | 'icon-dingdan1' | 'icon-gerenzhongxin1' | 'icon-shouye1' | 'icon-gerenzhongxin' | 'icon-dingdan' | 'icon-shouye' | 'icon-gouwu';
+export type IconNames = 'icon-zhankai1' | 'icon-shouqi1' | 'icon-shouhou1' | 'icon-cangku1' | 'icon-saoma' | 'icon-dizhi1' | 'icon-huodaofukuan' | 'icon-yufukuan1' | 'icon-yue' | 'icon-zidingyi' | 'icon-jinetiaozheng' | 'icon-tuikuan1' | 'icon-zhankai' | 'icon-shouqi' | 'icon-lujing' | 'icon-jizhumima' | 'icon-a-jizhumima' | 'icon-weixindenglu' | 'icon-kehuxinxi' | 'icon-yewuyuanqizi' | 'icon-chakanquanbukehu' | 'icon-biyan' | 'icon-bianji' | 'icon-daikuan' | 'icon-cangku' | 'icon-guanlidingdan' | 'icon-mima' | 'icon-guanbi' | 'icon-jianshao' | 'icon-dingwei' | 'icon-saomiao' | 'icon-peihuo' | 'icon-shaixuan' | 'icon-paiming' | 'icon-shanchusousuoxinxi' | 'icon-shijian' | 'icon-sousuo' | 'icon-shouhou' | 'icon-sousuofanhui' | 'icon-sousuoshanchu' | 'icon-tuikuan' | 'icon-tishi' | 'icon-xianxiahuizong' | 'icon-xinzeng' | 'icon-yonghuming' | 'icon-yanjing' | 'icon-yufukuan' | 'icon-wodekefu' | 'icon-dizhi' | 'icon-shouhouzhongxin' | 'icon-wodeshoucang' | 'icon-shoukuanliebiao' | 'icon-madanguanli' | 'icon-qusechazhao' | 'icon-pandiansaoma' | 'icon-yaoqingma' | 'icon-duizhang' | 'icon-tihuoliebiao' | 'icon-yangpinduibi' | 'icon-yansequyang' | 'icon-fahuoliebiao' | 'icon-yuncangkucun' | 'icon-xiaoshou' | 'icon-qianzhicangkucun' | 'icon-lingquseka' | 'icon-gouwu1' | 'icon-dingdan1' | 'icon-gerenzhongxin1' | 'icon-shouye1' | 'icon-gerenzhongxin' | 'icon-dingdan' | 'icon-shouye' | 'icon-gouwu';
 
 type PropsType = {
   name: IconNames;
@@ -36,7 +36,7 @@ type PropsType = {
 
 const IconFont:FC<PropsType> = ({
   name,
-  size = 18,
+  size = 36,
   color,
   customStyle = {},
   customClassName = ""
@@ -82,7 +82,43 @@ const IconFont:FC<PropsType> = ({
           className={classnames(icon, customClassName)}
         />
       )} */}
-      {/* icon-zhankai */}
+      {/* icon-zhankai1 */}
+
+      { name === 'icon-zhankai1' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1489 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M744.727273 954.181818L1442.909091 46.545455H46.545455z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(51,51,51)'}' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-shouqi1 */}
+
+      { name === 'icon-shouqi1' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1489 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M744.727273 69.818182l698.181818 907.636363H46.545455z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(51,51,51)'}' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-shouhou1 */}
+
+      { name === 'icon-shouhou1' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(74,127,255)'}' /%3E%3Cpath d='M563.584 256C694.144 256 800 361.84 800 492.416v23.168C800 646.144 694.16 752 563.584 752H256l72.64-65.92A235.728 235.728 0 0 1 256 515.6v-23.168C256 361.856 361.84 256 492.416 256h71.168z m-109.76 198.4a49.52 49.52 0 0 0-49.456 49.6c0 27.392 22.144 49.6 49.44 49.6a49.52 49.52 0 0 0 49.472-49.6c0-27.392-22.144-49.6-49.456-49.6z m148.352 0a49.52 49.52 0 0 0-49.44 49.6c0 27.392 22.128 49.6 49.44 49.6a49.52 49.52 0 0 0 49.456-49.6c0-27.392-22.144-49.6-49.44-49.6z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(255,255,255)'}' opacity='.95' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-cangku1 */}
+
+      { name === 'icon-cangku1' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(74,127,255)'}' /%3E%3Cpath d='M565.6 251.968l2.96 2.64 2.432 2.352 231.664 233.248c11.632 11.712 11.68 27.536 3.952 43.904a20 20 0 0 1-16 11.344l-2.08 0.112H754.4V738.56a43.424 43.424 0 0 1-38.56 43.152l-2.72 0.224-2.096 0.048H313.2a43.408 43.408 0 0 1-43.312-40.784l-0.08-2.64-0.016-193.024h-34.032a20 20 0 0 1-16.208-8.256l-1.152-1.792-0.752-1.456c-7.024-14.992-8.176-28.96 0.24-41.056l1.824-2.4 1.792-1.936 230.368-231.952a83.824 83.824 0 0 1 113.712-4.736zM576.976 592h-129.984a25.008 25.008 0 0 0 0 50h130a25.008 25.008 0 0 0 0-50z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(255,255,255)'}' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-saoma */}
+
+      { name === 'icon-saoma' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(89,102,247)'}' /%3E%3Cpath d='M302 592v130h129.984l0.016 40h-150c-11.04 0-20-8.96-20-20V592h40z m460 0v150c0 11.04-8.96 20-20 20H592v-40h130V592h40z m0-100v40h-500v-40h500z m-20-230c11.04 0 20 8.96 20 20V432h-40v-130H592v-40h150z m-310 0v40h-130V432h-40v-150c0-11.04 8.96-20 20-20H432z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(255,255,255)'}' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-dizhi1 */}
+
+      { name === 'icon-dizhi1' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(74,127,255)'}' /%3E%3Cpath d='M512 222c127.04 0 230 102.976 230 230 0 51.2-25.28 110.896-75.328 180.928l-3.536 4.896-3.648 4.976-6.512 8.704-6.816 8.912-7.04 8.96-7.28 9.056-7.52 9.152-7.728 9.216-4.016 4.736-10.176 11.744-2.128 2.432-8.512 9.584-8.736 9.696-9.008 9.792-9.232 9.92-9.488 10.016-9.28 9.648-19.232 21.12a20 20 0 0 1-28.4 1.168l-1.168-1.184-18.88-20.72-9.728-10.144-9.488-10.016-9.248-9.92-8.992-9.808-8.72-9.648-4.32-4.864-8.4-9.536-10.08-11.712-9.808-11.68-7.52-9.168-7.296-9.056-6.992-8.928-3.44-4.448-3.392-4.464-6.48-8.656c-54.768-74.24-82.432-137.12-82.432-190.704 0-127.04 102.976-230 230-230z m0 140a90 90 0 1 0 0 180 90 90 0 0 0 0-180z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(255,255,255)'}' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-huodaofukuan */}
+
+      { name === 'icon-huodaofukuan' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(74,127,255)'}' /%3E%3Cpath d='M224 400m32 0l512 0q32 0 32 32l0 304q0 32-32 32l-512 0q-32 0-32-32l0-304q0-32 32-32Z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(255,255,255)'}' /%3E%3Cpath d='M320.48 240h383.04a32 32 0 0 1 26.048 13.408l52.368 73.28A16 16 0 0 1 768.912 352H255.088a16 16 0 0 1-13.024-25.296l52.368-73.296A32 32 0 0 1 320.464 240z' fill='${(isStr ? colors : colors?.[2]) || 'rgb(255,255,255)'}' /%3E%3Cpath d='M461.728 485.008l1.36 1.248L512 535.168l48.912-48.912a21.328 21.328 0 0 1 31.424 28.8l-1.248 1.36L563.488 544h23.184a21.328 21.328 0 0 1 0 42.672l-53.344-0.016v32h53.344a21.328 21.328 0 1 1 0 42.672h-53.344v21.344a21.328 21.328 0 1 1-42.656 0l-0.016-21.344h-53.328a21.328 21.328 0 1 1 0-42.656l53.328-0.016v-32h-53.328a21.328 21.328 0 0 1 0-42.656h23.168l-27.584-27.584a21.328 21.328 0 0 1 28.816-31.408z' fill='${(isStr ? colors : colors?.[3]) || 'rgb(74,127,255)'}' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-yufukuan1 */}
+
+      { name === 'icon-yufukuan1' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(74,127,255)'}' /%3E%3Cpath d='M762 422c11.04 0 20 8.96 20 20v300c0 11.04-8.96 20-20 20h-500c-11.04 0-20-8.96-20-20v-300c0-11.04 8.96-20 20-20h500zM512 622H352a10 10 0 0 0-10 10v20c0 5.52 4.48 10 10 10h160c5.52 0 10-4.48 10-10V632a10 10 0 0 0-10-10z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(255,255,255)'}' /%3E%3Cpath d='M404.96 223.872l322.384 119.36a20 20 0 0 1-6.944 38.768H325.392a20 20 0 0 1-17.632-29.44l63.04-117.792c5.808-10.848 21.12-15.728 34.16-10.896z' fill='${(isStr ? colors : colors?.[2]) || 'rgb(255,255,255)'}' opacity='.7' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-yue */}
+
+      { name === 'icon-yue' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(252,168,70)'}' /%3E%3Cpath d='M772 402c5.52 0 10 4.48 10 10V752c0 5.52-4.48 10-10 10H252A10 10 0 0 1 242 752V412c0-5.52 4.48-10 10-10h520z m-185.856 85.856a20 20 0 0 0-28.288 0L512 533.728l-45.856-45.872-1.28-1.168a20 20 0 0 0-27.008 29.44l25.872 25.872h-21.728a20 20 0 0 0 0 40h50v30h-50a20 20 0 0 0 0 40h50V672a20 20 0 0 0 40 0v-20h50a20 20 0 0 0 0-40H532v-30h50a20 20 0 0 0 0-40h-21.744l25.888-25.856 1.168-1.28a20 20 0 0 0-1.168-27.008z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(255,255,255)'}' /%3E%3Cpath d='M262 292m10 0l480 0q10 0 10 10l0 40q0 10-10 10l-480 0q-10 0-10-10l0-40q0-10 10-10Z' fill='${(isStr ? colors : colors?.[2]) || 'rgb(255,255,255)'}' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-zidingyi */}
+
+      { name === 'icon-zidingyi' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(74,127,255)'}' /%3E%3Cpath d='M497.12 695.84l-115.824 60.88a32 32 0 0 1-46.432-33.744l22.128-128.96a32 32 0 0 0-9.216-28.32l-93.68-91.328a32 32 0 0 1 17.728-54.576l129.488-18.816a32 32 0 0 0 24.08-17.504l57.92-117.328a32 32 0 0 1 57.376 0l57.92 117.328a32 32 0 0 0 24.08 17.504l129.488 18.816a32 32 0 0 1 17.728 54.576l-93.68 91.328a32 32 0 0 0-9.216 28.32l22.128 128.96a32 32 0 0 1-46.432 33.744l-115.808-60.896a32 32 0 0 0-29.792 0z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(255,255,255)'}' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-jinetiaozheng */}
+
+      { name === 'icon-jinetiaozheng' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(74,127,255)'}' /%3E%3Cpath d='M768 304a32 32 0 0 1 32 32v352a32 32 0 0 1-32 32H256a32 32 0 0 1-32-32V336a32 32 0 0 1 32-32h512z m-309.856 119.856a20 20 0 0 0-28.288 0L384 469.728l-45.856-45.872-1.28-1.168a20 20 0 0 0-27.008 29.44l25.872 25.872h-21.728a20 20 0 0 0 0 40h50v30h-50a20 20 0 0 0 0 40h50V608a20 20 0 0 0 40 0v-20h50a20 20 0 0 0 0-40H404v-30h50a20 20 0 0 0 0-40h-21.744l25.888-25.856 1.168-1.28a20 20 0 0 0-1.168-27.008zM560 448h160a16 16 0 0 1 16 16v16a16 16 0 0 1-16 16H560a16 16 0 0 1-16-16v-16a16 16 0 0 1 16-16z m0 112h160a16 16 0 0 1 16 16v16a16 16 0 0 1-16 16H560a16 16 0 0 1-16-16v-16a16 16 0 0 1 16-16z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(255,255,255)'}' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-tuikuan1 */}
+
+      { name === 'icon-tuikuan1' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(74,127,255)'}' /%3E%3Cpath d='M752 416a32 32 0 0 1 32 32v288a32 32 0 0 1-32 32H272a32 32 0 0 1-32-32V448a32 32 0 0 1 32-32h480z m-165.856 87.856a20 20 0 0 0-28.288 0L512 549.728l-45.856-45.872-1.28-1.168a20 20 0 0 0-27.008 29.44l25.872 25.872h-21.728a20 20 0 0 0 0 40h50v30h-50a20 20 0 0 0 0 40h50V688a20 20 0 1 0 40 0v-20h50a20 20 0 1 0 0-40H532v-30h50a20 20 0 1 0 0-40h-21.744l25.888-25.856 1.168-1.28a20 20 0 0 0-1.168-27.008z' fill='${(isStr ? colors : colors?.[1]) || 'rgb(255,255,255)'}' /%3E%3Cpath d='M354.128 253.168a24 24 0 0 1 31.6 36.048l-1.856 1.616-26.816 21.168H720a24 24 0 0 1 23.888 21.696L744 336a24 24 0 0 1-21.696 23.888L720 360H288c-22.032 0-32.08-26.896-16.528-41.424l1.648-1.408 81.008-64z' fill='${(isStr ? colors : colors?.[2]) || 'rgb(255,255,255)'}' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
+{/* icon-zhankai */}
 
       { name === 'icon-zhankai' && (<View style={{backgroundImage: `url(${quot}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='${svgSize}px' height='${svgSize}px'%3E%3Cpath d='M492.586667 668.138667c9.962667 9.941333 25.642667 10.666667 36.416 2.133333l2.389333-2.133333 232.746667-232.746667a27.434667 27.434667 0 0 0-36.394667-40.917333l-2.389333 2.133333-213.397334 213.333333-213.312-213.333333a27.434667 27.434667 0 0 0-36.394666-2.133333l-2.389334 2.133333a27.434667 27.434667 0 0 0-2.133333 36.394667l2.133333 2.389333 232.746667 232.746667z' fill='${(isStr ? colors : colors?.[0]) || 'rgb(0,0,0)'}' opacity='.8' /%3E%3C/svg%3E${quot}); width: ${svgSize}px; height: ${svgSize}px; `, ...customStyle}} className={classnames("icon", customClassName)} />) }
 {/* icon-shouqi */}

src/components/normalButton/index.module.scss

@@ -1,5 +1,4 @@
 .button {
-  $current_color: #fff;
   display: flex;
   flex-flow: row nowrap;
   justify-content: center;
@@ -10,6 +9,7 @@
   background-color: #fff;
   text-align: center;
   color: #fff;
+  box-sizing: border-box;
   &--normal {
     height: 72px;
     font-size: $font_size_medium;
@@ -24,24 +24,23 @@
   // 按钮类型
   &--primary {
     border: 1px solid $color_main;
-    color: $color_main;
+    background-color: $color_main;
-    $current_color: $color_main;
+    color: white;
   }
   &--danger {
     border: 1px solid $color_danger;
-    color: $color_danger;
+    background-color: $color_danger;
-    $current_color: $color_danger;
+    color: white;
   }
   &--warning {
     border: 1px solid $color_warning;
-    color: $color_warning;
+    background-color: $color_warning;
-    $current_color: $color_warning;
+    color: white;
   }
   &--info {
     border: 1px solid $color_info;
-    color: $color_info;
+    background-color: $color_info;
-    $current_color: $color_info;
+    color: white;
-    
   }
   &--round {
     border-radius: 50px;
@@ -49,11 +48,24 @@
   &--circle {
     border-radius: 16px;
   }
+  // 朴素按钮
   &--plain {
-    background-color: currentColor;
+    background-color: white;
-    border-color: currentColor;
+    &.button--primary {
-    .button--text {
+      border: 1px solid $color_main;
-      color: #fff;
+      color: $color_main;
+    }
+    &.button--danger {
+      border: 1px solid $color_danger;
+      color: $color_danger;
+    }
+    &.button--warning {
+      border: 1px solid $color_warning;
+      color: $color_warning;
+    }
+    &.button--info {
+      border: 1px solid $color_info;
+      color: $color_info;
     }
   }
   &--text {

src/components/normalButton/index.tsx

@@ -11,7 +11,7 @@ interface PropsType {
   type?: ButtonType
   round?: boolean // 大圆角
   disabled?: boolean
-  plain?: boolean // 填满背景颜色
+  plain?: boolean // plain
   circle?: boolean // 小圆角
   children?: ReactNode
   onClick?: Function

src/components/popup/index.module.scss

@@ -1,58 +1,62 @@
 $am-ms: 200ms;
+
+.drawer_mask {
+  flex: 1 1 auto;
+  display: flex;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: 1011;
+  opacity: 0;
+  transition: opacity $am-ms ease-in;
+  &_active {
+    opacity: 1;
+  }
+}
+
 .drawer_main {
   .drawer {
     position: fixed;
-  left: 0;
+    left: 0;
-  top: 0;
+    top: 0;
     display: flex;
     align-items: center;
     justify-content: center;
     flex-direction: column;
     width: 100%;
-    height: 100vh;
+    height: 100%;
     margin: 0 auto;
     z-index: 1000;
     visibility: hidden;
     transition: visibility $am-ms ease-in-out;
-    .drawer_mask {
+
+    .drawer_container {
       display: flex;
+      flex-direction: column;
       position: absolute;
-      top: 0;
+      background-color: #fff;
-      left: 0;
+      z-index: 1012;
-      width: 100vw;
+      transition: transform $am-ms ease-in-out;
-      height: 100vh;
+      .drawer_container_title {
-      background: rgba(0, 0, 0, 0.6);
-      z-index: 1011;
-      opacity: 0;
-      transition: opacity $am-ms ease-in;
-      .drawer_container {
         display: flex;
-        flex-direction: column;
+        align-items: center;
-        position: absolute;
+        justify-content: center;
-        background-color: #fff;
+        height: 80px;
-        z-index: 1012;
+        font-size: 29px;
-        transition: transform $am-ms ease-in-out;
+        color: #000000;
-        .drawer_container_title {
+        padding-top: 10px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          height: 80px;
-          font-size: 29px;
-          color: #000000;
-          padding-top: 10px;
-        }
-        .common_close_btn_icon {
-          position: absolute;
-          top: 10px;
-          left: 10px;
-        }
       }
-      .drawer_container_active {
+      .common_close_btn_icon {
-        transform: translate3d(0, 0, 0);
+        position: absolute;
+        top: 10px;
+        left: 10px;
       }
     }
-    .drawer_mask_active {
+    .drawer_container_active {
-      opacity: 1;
+      transform: translate3d(0, 0, 0);
     }
   }
   .drawer_active {
@@ -80,7 +84,7 @@ $am-ms: 200ms;
   .drawer_container_right {
     bottom: 0;
     right: 0;
-    height: 100vh;
+    height: 100%;
     min-width: 300px;
     border-radius: 20px 0 0 20px;
     transform: translate3d(100%, 0, 0);

src/components/popup/index.tsx

@@ -3,21 +3,41 @@ import style from './index.module.scss'
 import classnames from 'classnames'
 import { memo, ReactNode, useEffect, useMemo, useRef, useState } from 'react'
 import CloseBtnIcon from '@/components/closeBtn'
+import Taro from '@tarojs/taro'
 
-export interface Params {
+export interface PopupEvent {
-  title?: string //标题
-  show?: false | true //显示显示弹窗
-  showTitle?: false | true //是否显示标题
   onClose?: () => void //关闭事件
+  animationEnd?: () => void //弹出动画结束
+}
+
+export interface Params extends PopupEvent {
+  title?: string //标题
+  show?: boolean //显示显示弹窗
+  showTitle?: boolean //是否显示标题
+  isFixed?: boolean //二次弹窗触发
   children?: ReactNode //插槽内容
   // IconButton?: ReactNode, //
-  showIconButton?: false | true //是否显示关闭按钮
+  showIconButton?: boolean //是否显示关闭按钮
   position?: 'bottom' | 'top' | 'right' //弹出位置
-  animationEnd?: () => void, //弹出动画结束
+  customStyle?: React.CSSProperties
-  isFixed?: boolean //二次弹窗触发
+  overlayStyle?: React.CSSProperties
+  safeAreaInsetBottom?: boolean   // 是否为iphoneX提供小黑条适配
 }
 export default memo(
-  ({ title = '标题', show = false, showTitle = true, isFixed = false, onClose, showIconButton = false, children, position = 'bottom', animationEnd }: Params) => {
+  ({
+    title = '标题',
+    show = false,
+    showTitle = true,
+    onClose,
+    isFixed = false,
+    showIconButton = false,
+    children,
+    position = 'bottom',
+    animationEnd,
+    customStyle,
+    safeAreaInsetBottom = true,
+    overlayStyle,
+  }: Params) => {
     const animationTime = useRef<any>(null)
     useEffect(() => {
       if (show) {
@@ -36,25 +56,26 @@ export default memo(
       }
     }, [])
 
-    const [ShowContext, setShowContext] = useState(false)
     return (
       <>
         <View className={style.drawer_main}>
-          <View catchMove={true} className={`${style.drawer} ${show ? style.drawer_active : ''}`}>
+          <View catchMove={true} className={classnames(style.drawer, show ? style.drawer_active : '')} style={customStyle}>
-            <View className={classnames(style.drawer_mask, { [style.drawer_mask_active]: show })} onClick={() => onClose?.()}>
+            <View className={classnames(style.drawer_mask, { [style.drawer_mask_active]: show })} onClick={onClose} style={overlayStyle}></View>
-              <View
+            <View
-                style={{ position: `${isFixed == true ? 'fixed' : 'absolute'}`, }}
+              style={{ position: `${isFixed == true ? 'fixed' : 'absolute'}`, }}
-                className={classnames(style.drawer_container, style['drawer_container_' + position], { [style.drawer_container_active]: show })}
+              className={classnames(style.drawer_container, style['drawer_container_' + position], { [style.drawer_container_active]: show })}
-                onClick={(e) => e.stopPropagation()}>
+              onClick={e => e.stopPropagation()}>
-                {showTitle && <View className={style.drawer_container_title}>{title}</View>}
+              {showTitle && <View className={style.drawer_container_title}>{title}</View>}
-                {showIconButton && (
+              {showIconButton && (
-                  <View className={style.common_close_btn_icon}>
+                <View className={style.common_close_btn_icon}>
-                    <CloseBtnIcon onClose={() => onClose?.()} />
+                  <CloseBtnIcon onClose={onClose} />
-                  </View>
+                </View>
-                )}
+              )}
-                <View className={style.drawer_container_context}>{children}</View>
+
-                <View className='common_safe_area_y'></View>
+              <View id='drawerContainerContext' className={style.drawer_container_context}>
+                {children}
               </View>
+              {safeAreaInsetBottom && <View className='common_safe_area_y'></View>}
             </View>
           </View>
         </View>

src/components/saleModeTag/index.tsx

@@ -14,17 +14,17 @@ const SaleModeTag: FC<SaleModeProps> = (props) => {
   return (
     <>
       {saleMode === EnumSaleMode.Bulk && (
-        <Tag circle type='primary' plain size={size} customClassName={customClassName}>
+        <Tag circle type='primary' size={size} customClassName={customClassName}>
           大货
         </Tag>
       )}
       {saleMode === EnumSaleMode.Plate && (
-        <Tag circle type='danger' plain size={size} customClassName={customClassName}>
+        <Tag circle type='danger' size={size} customClassName={customClassName}>
           剪板
         </Tag>
       )}
       {saleMode === EnumSaleMode.BulkCut && (
-        <Tag circle type='warning' plain size={size} customClassName={customClassName}>
+        <Tag circle type='warning' size={size} customClassName={customClassName}>
           散剪
         </Tag>
       )}

src/components/search/index.module.scss

@@ -73,3 +73,6 @@
     padding-left: 20px !important;
   }
 }
+.customRightSlot{
+  margin-right: 20px;
+}

src/components/search/index.tsx

@@ -104,22 +104,21 @@ export default memo(
                   disabled={disabled}
                   value={inputCon}
                   placeholder={placeholder}
-                  onInput={(e) => onInputEven(e)}
+                  onInput={e => onInputEven(e)}
                 />
                 <View className={styles.search_closeBtn}>
                   {!!inputCon && <CloseBtn onClose={() => clearInput()} styleObj={{ width: '20rpx', height: '20rpx', backgroundColor: '#fff', border: '0' }} />}
                 </View>
-                {
+                {showScan && (
-                  showScan && <View onClick={() => {
+                  <View
-                    handScan?.()
+                    onClick={() => {
-                  }}>
+                      handScan?.()
-                    <IconFont
+                    }}>
-                      name={'icon-saomiao'} size={40} color={'#337FFF'}
+                    <IconFont name={'icon-saomiao'} size={40} color={'#337FFF'}></IconFont>
-                    ></IconFont>
                   </View>
-                }
+                )}
 
-                <View>{customRightSlot}</View>
+                <View className={styles.customRightSlot}>{customRightSlot}</View>
               </View>
             </View>
             {showBtn && (

src/components/tag/index.module.scss

@@ -12,39 +12,54 @@
     font-size: $font_size_medium;
     height: 40px;
   }
-  &--small{
+  &--small {
     font-size: $font_size_min;
     height: 30px;
   }
-  &--circle{
+  &--circle {
     border-radius: 10px;
   }
 
   &--danger {
     border: 1px solid $color_danger;
-    color: $color_danger;
+    background-color: $color_danger;
+    color: white;
   }
-  &--primary{
+  &--primary {
     border: 1px solid $color_main;
-    color: $color_main;
+    background-color: $color_main;
+    color: white;
   }
-  &--warning{
+  &--warning {
     border: 1px solid $color_warning;
-    color: $color_warning;
+    background-color: $color_warning;
+    color: white;
   }
-  &--info{
+  &--info {
     border: 1px solid $color_info;
-    color: $color_info;
+    background-color: $color_info;
-    .tag--text {
+    color: white;
-      color: rgba($color: #333333, $alpha: 0.8) !important;
-    }
   }
   &--plain {
-    background-color: currentColor;
+    background-color: white;
-    border-color: currentColor;
+    &.tag--danger {
-    border: unset;
+      border: 1px solid $color_danger;
-    .tag--text {
+      color: $color_danger;
-      color: #ffffff;
+    }
+    &.tag--primary {
+      border: 1px solid $color_main;
+      color: $color_main;
+    }
+    &.tag--warning {
+      border: 1px solid $color_warning;
+      color: $color_warning;
+    }
+    &.tag--info {
+      border: 1px solid $color_info;
+      color: $color_info;
+      .tag--text {
+        color: rgba($color: #333333, $alpha: 0.8) !important;
+      }
     }
   }
   &--disabled {

src/components/tag/index.tsx

@@ -27,7 +27,7 @@ const Tag: FC<PropsType> = (props) => {
     onClick,
     circle = false,
     customStyle = {},
-    plain = false,
+    plain = false,         // 朴素
     customClassName = '',
   } = props
   const handleClick = (event) => {

src/pages/delivery/components/Filter/index.tsx

@@ -145,7 +145,7 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
             不限
           </FilterButton>
           {!!typeList?.length &&
-            typeList?.map((item) => {
+            typeList?.map(item => {
               return (
                 <FilterButton isActive={searchFilter.type === item?.id} onClick={() => handleSelectedType(item?.id)}>
                   {item.name}
@@ -171,10 +171,10 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
         </View>
       </View>
       <View className={styles.filterController}>
-        <NormalButton type='primary' round customClassName={classnames(styles.btn, styles.rest_btn)} onClick={handleReset}>
+        <NormalButton plain type='primary' round customClassName={classnames(styles.btn, styles.rest_btn)} onClick={handleReset}>
           重置
         </NormalButton>
-        <NormalButton type='primary' plain round customClassName={classnames(styles.btn, styles.verify_btn)} onClick={handleConfirm}>
+        <NormalButton type='primary' round customClassName={classnames(styles.btn, styles.verify_btn)} onClick={handleConfirm}>
           确认
         </NormalButton>
       </View>

src/pages/delivery/components/ItemList/index.tsx

@@ -81,6 +81,7 @@ const ItemList:FC<PropsType> = (props) => {
       <View className={styles.bottomBar}>
         <NormalButton
           customClassName={styles.bottomBar__button}
+          plain
           type='info'
           customStyles={{ color: '#8e8e8e', borderColor: '#8e8e8e' }}
           round
@@ -88,7 +89,7 @@ const ItemList:FC<PropsType> = (props) => {
           查看详情
         </NormalButton>
         {itemData?.status === 0 && (
-          <NormalButton customClassName={styles.bottomBar__button} type='primary' round onClick={() => handleAudit(itemData?.id)}>
+          <NormalButton customClassName={styles.bottomBar__button} type='primary' plain round onClick={() => handleAudit(itemData?.id)}>
             确认审核
           </NormalButton>
         )}

src/pages/deliveryDetail/index.tsx

@@ -120,10 +120,10 @@ const DeliveryDetail: FC = () => {
   const BottomBar = useMemo(() => {
     return (
       <View className={styles.bottomBar}>
-        <NormalButton type='primary' round onClick={handleUploadPic}>
+        <NormalButton plain type='primary' round onClick={handleUploadPic}>
           上传附件
         </NormalButton>
-        <NormalButton type='primary' plain round onClick={handleAudit}>
+        <NormalButton type='primary' round onClick={handleAudit}>
           确认审核
         </NormalButton>
       </View>

src/pages/login/index.tsx

@@ -115,7 +115,7 @@ const Login: FC = () => {
             <Text className={styles.isForgetPwd}>忘记密码？</Text>
           </View>
         </View>
-        <NormalButton circle plain onClick={handleLogin} customClassName={styles['login-button']}>
+        <NormalButton circle onClick={handleLogin} customClassName={styles['login-button']}>
           登录
         </NormalButton>
         <QuickLogin />

src/pages/saleStatistic/index.config.ts

@@ -0,0 +1,4 @@
+export default {
+  navigationBarTitleText: '销售统计',
+  enablePullDownRefresh: true,
+}

src/pages/saleStatistic/index.module.scss

@@ -0,0 +1,10 @@
+.saleStatistic {
+  &--filterBar {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-evenly;
+    align-items: center;
+    width: 100%;
+    background-color: white;
+  }
+}

src/pages/saleStatistic/index.tsx

@@ -0,0 +1,31 @@
+import DropDownItem, { DropDownOptions } from '@/components/dropDown-item'
+import { View } from '@tarojs/components'
+import { useState } from 'react'
+import styles from './index.module.scss'
+
+const saleStatistic = () => {
+  const [options, setOptions] = useState<DropDownOptions[]>([
+    {
+      text: 'name',
+      value: 0,
+    },
+    {
+      text: 'name1',
+      value: 1,
+    },
+    {
+      text: 'name2',
+      value: 2,
+    },
+  ])
+
+  return (
+    <View className={styles.saleStatistic}>
+      <View className={styles['saleStatistic--filterBar']}>
+        <View>sdflkajsfdlk</View>
+        <DropDownItem title='name' activeColor='#337fff' options={options}></DropDownItem>
+      </View>
+    </View>
+  )
+}
+export default saleStatistic

src/pages/shopping/components/bottomEditBar/index.tsx

@@ -43,7 +43,7 @@ export default memo<PropsType>((props) => {
         </MCheckbox>
       </View>
       <View className={styles.bottomRight}>
-        <NormalButton plain round type='danger' size='normal' onClick={handleSettle} customStyles={{ backgroundColor: '#F44761' }}>
+        <NormalButton round type='danger' size='normal' onClick={handleSettle} customStyles={{ backgroundColor: '#F44761' }}>
           <Text style={{ fontSize: '32rpx' }}>删除</Text>
         </NormalButton>
       </View>

src/pages/shopping/components/bottomSettleBar/index.tsx

@@ -26,7 +26,7 @@ export default memo<PropsType>((props) => {
         </Text>
       </View>
       <View className={styles.bottomRight}>
-        <NormalButton plain type='primary' round size='normal' onClick={handleSettle}>
+        <NormalButton type='primary' round size='normal' onClick={handleSettle}>
           <Text style={{fontSize: '32rpx'}}>结算</Text>
         </NormalButton>
       </View>

src/pages/shopping/components/shoppingCartItem/index.tsx

@@ -185,7 +185,7 @@ export default memo<PropsType>(props => {
           <View className={styles.topItem}>
             <View className='flex-row items-center'>
               <View className={styles.topTitle}>{itemData?.purchaser_name}</View>
-              <Tag type='info' size='normal' circle plain>
+              <Tag type='info' size='normal' circle customStyle={{ backgroundColor: '#f0f0f0',borderColor: 'transparent' }} plain>
                 {itemData?.sale_user_name}
               </Tag>
             </View>
@@ -194,10 +194,6 @@ export default memo<PropsType>(props => {
                 已选 {materialChecked} 种面料，{colorChecked} 个颜色，共{' '}
                 {selected === EnumSaleMode.Bulk ? `${lengthOrRollChecked} 条` : `${lengthOrRollChecked} 米`}
               </Text>
-              {/* <Text>
-                已选 {0} 种面料，{0} 个颜色，共{' '}
-                {selected === EnumSaleMode.Bulk ? `${0} 条` : `${0} 米`}
-              </Text> */}
             </View>
           </View>
           <DrawerButton isOpen={openDetail} />
@@ -234,7 +230,7 @@ export default memo<PropsType>(props => {
             <Divider customClassName={styles.line}></Divider>
             <View className={classnames(styles.orderTitle, 'justify-between')}>
               <Text>布料颜色</Text>
-              <Tag type='danger' size='normal' circle plain={false}>
+              <Tag type='danger' size='normal' circle plain>
                 {selectList[selected].title}单位：{selectList[selected].unit}
               </Tag>
             </View>

src/pages/takeDelivery/components/Filter/index.module.scss

@@ -21,13 +21,7 @@
     grid-template-columns: 1fr 1fr;
   }
 }
-.filterTypeButton {
+
-  padding: 0 24px;
-  font-size: 28px;
-}
-.filterTypeText {
-  color: #6e6e6e !important;
-}
 .filterTimeButton {
   grid-column-start: span 2;
 }
@@ -35,36 +29,6 @@
   background-color: #eaf2ff;
 }
 
-.filterButton {
-  display: flex;
-  flex-flow: row nowrap;
-  align-items: center;
-  justify-content: center;
-  padding: 0 20px;
-  box-sizing: border-box;
-  border: 0 solid transparent;
-  background-color: #f6f6f6;
-  border-radius: 8px;
-  font-size: 28px;
-  height: 72px;
-  &--text {
-    color: #909090;
-    display: flex;
-    flex-flow: row nowrap;
-    justify-content: center;
-    align-items: center;
-  }
-  &:hover {
-    opacity: 0.7;
-  }
-  &--active {
-    border: 1px solid $color_main;
-    background-color: #eaf2ff;
-    .filterButton--text {
-      color: $color_main;
-    }
-  }
-}
 .filterController {
   margin-top: 60px;
   width: 100%;

src/pages/takeDelivery/components/Filter/index.tsx

@@ -1,5 +1,4 @@
 import NormalButton from '@/components/normalButton'
-import Popup from '@/components/popup'
 import { View } from '@tarojs/components'
 import classnames from 'classnames'
 import styles from './index.module.scss'
@@ -9,7 +8,7 @@ import IconFont from '@/components/iconfont/iconfont'
 import { EnumTakeGoodsOrderTypeList } from '@/api/index'
 import dayjs from 'dayjs'
 import { getFilterData } from '@/common/util'
-import Taro from '@tarojs/taro'
+import FilterButton from '@/components/filterButton'
 
 interface SearchFilter {
   take_goods_order_type?: number
@@ -28,13 +27,6 @@ interface DeliveryPropsType {
   onReset?: () => void
 }
 
-interface ButtonPropsType {
-  isActive: boolean
-  onClick?: Function
-  children?: React.ReactNode
-  customClassName?: string
-}
-
 export const filterTimeOptions = {
   0: {
     name: '不限',
@@ -147,11 +139,14 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
             不限
           </FilterButton>
           {!!typeList?.length &&
-            typeList?.map((item) => {
+            typeList?.map(item => {
               return (
                 <FilterButton isActive={searchFilter.take_goods_order_type === item?.id} onClick={() => handleSelectedType(item?.id)}>
                   {item.name}
                 </FilterButton>
+                // <NormalButton type='info' circle onClick={() => handleSelectedType(item?.id)}>
+                //   {item.name}
+                // </NormalButton>
               )
             })}
         </View>
@@ -173,10 +168,10 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
         </View>
       </View>
       <View className={styles.filterController}>
-        <NormalButton type='primary' round customClassName={classnames(styles.btn, styles.rest_btn)} onClick={handleReset}>
+        <NormalButton type='primary' plain round customClassName={classnames(styles.btn, styles.rest_btn)} onClick={handleReset}>
           重置
         </NormalButton>
-        <NormalButton type='primary' plain round customClassName={classnames(styles.btn, styles.verify_btn)} onClick={handleConfirm}>
+        <NormalButton type='primary' round customClassName={classnames(styles.btn, styles.verify_btn)} onClick={handleConfirm}>
           确认
         </NormalButton>
       </View>
@@ -184,16 +179,5 @@ const DeliveryFilter = memo<DeliveryPropsType>((props) => {
   )
 })
 
-const FilterButton: FC<ButtonPropsType> = (props) => {
-  const { onClick, children, isActive = false, customClassName } = props
-  const handleClick = () => {
-    onClick?.()
-  }
-  return (
-    <View className={classnames(styles.filterButton, isActive && styles['filterButton--active'], customClassName)} onClick={handleClick}>
-      <View className={classnames(styles['filterButton--text'])}>{children}</View>
-    </View>
-  )
-}
 
 export default DeliveryFilter

src/pages/takeDelivery/components/ItemList/index.tsx

@@ -84,13 +84,14 @@ const ItemList:FC<PropsType> = (props) => {
         <NormalButton
           customClassName={styles.bottomBar__button}
           type='info'
+          plain
           customStyles={{ color: '#8e8e8e', borderColor: '#8e8e8e' }}
           round
           onClick={() => handleDetail(itemData)}>
           查看详情
         </NormalButton>
         {itemData?.status === 0 && (
-          <NormalButton customClassName={styles.bottomBar__button} type='primary' round onClick={() => handleAudit(itemData?.id)}>
+          <NormalButton plain customClassName={styles.bottomBar__button} type='primary' round onClick={() => handleAudit(itemData?.id)}>
             确认审核
           </NormalButton>
         )}

src/pages/takeDeliveryDetail/index.tsx

@@ -138,7 +138,7 @@ const TakeDeliveryDetail: FC = () => {
       // 采购提货
       return (
         <View className={styles.bottomBar}>
-          <NormalButton type='primary' plain round onClick={handleAudit} customStyles={{ width: '100%' }}>
+          <NormalButton type='primary' round onClick={handleAudit} customStyles={{ width: '100%' }}>
             确认提货
           </NormalButton>
         </View>
@@ -147,10 +147,10 @@ const TakeDeliveryDetail: FC = () => {
       // 退货提货
       return (
         <View className={styles.bottomBar} style={{ justifyContent: 'space-between' }}>
-          <NormalButton type='primary' round onClick={handleRefuse} customStyles={{ width: '25%' }}>
+          <NormalButton type='primary' plain round onClick={handleRefuse} customStyles={{ width: '25%' }}>
             拒收
           </NormalButton>
-          <NormalButton type='primary' plain round onClick={handleAudit} customStyles={{ width: '25%' }}>
+          <NormalButton type='primary' round onClick={handleAudit} customStyles={{ width: '25%' }}>
             确认提货
           </NormalButton>
         </View>

src/pages/user/index.tsx

@@ -82,7 +82,7 @@ const statisticAnalysis: IconCardType[] = [
   {
     iconName: 'icon-xiaoshou',
     name: '销售',
-    path: '',
+    path: '/pages/saleStatistic/index',
   },
   {
     iconName: 'icon-duizhang',
@@ -135,13 +135,13 @@ const UserInfo: FC = () => {
             <Text className={styles.userno}>{userInfo.userInfo.user_code}</Text>
           </View>
           <View className={styles.right}>
-            <NormalButton type='primary' round size='normal' onClick={handleLogout}>
+            <NormalButton plain type='primary' round size='normal' onClick={handleLogout}>
               退出登录
             </NormalButton>
           </View>
         </View>
         <View className={styles.bottomBar}>
-          <Tag type='primary' size='normal' circle customStyle={{ marginRight: '10px' }}>
+          <Tag type='primary' size='normal' circle plain customStyle={{ marginRight: '10px' }}>
             {userInfo.userInfo.department_name}
           </Tag>
           <Divider direction='vertical'></Divider>
@@ -151,7 +151,7 @@ const UserInfo: FC = () => {
       <LayoutBlock circle>
         <View className={styles.layoutTitle}>功能特色</View>
         <View className={styles['grid-container']}>
-          {feature.map((item) => {
+          {feature.map(item => {
             return <IconCard iconName={item.iconName} title={item.name} onClick={() => handleClickIconCard(item)}></IconCard>
           })}
         </View>
@@ -159,7 +159,7 @@ const UserInfo: FC = () => {
       <LayoutBlock circle>
         <View className={styles.layoutTitle}>布料取色</View>
         <View className={styles['grid-container']}>
-          {fabric.map((item) => {
+          {fabric.map(item => {
             return <IconCard iconName={item.iconName} title={item.name} onClick={() => handleClickIconCard(item)}></IconCard>
           })}
         </View>
@@ -167,7 +167,7 @@ const UserInfo: FC = () => {
       <LayoutBlock circle>
         <View className={styles.layoutTitle}>统计分析</View>
         <View className={styles['grid-container']}>
-          {statisticAnalysis.map((item) => {
+          {statisticAnalysis.map(item => {
             return <IconCard iconName={item.iconName} title={item.name} onClick={() => handleClickIconCard(item)}></IconCard>
           })}
         </View>

src/styles/common.scss

@@ -2,12 +2,12 @@ $color_bg_one: #f8f8f8;
 $color_font_one: rgba($color: #000000, $alpha: 0.8);
 $color_font_two: #ababab;
 $color_font_three: #707070;
-$color_main: #4581ff;
 
+$color_main: #4581ff;
 $color_danger: #e64340;
 $color_warning: #e6a23c;
 $color_money: #F64861;
-$color_info: rgba($color: #B3B3B3, $alpha: 0.2);
+$color_info: #909090;
 
 $opacity-disabled: 0.3;
 $borderStyle: solid;

src/styles/iconfont.scss

@@ -3,7 +3,7 @@
   /* Project id 3619513 */
   // url('/src/styles/iconfont.ttf') format('truetype');
   src:
-    url('iconfont.ttf?t=1663556335905') format('truetype');
+    url('/src/styles/iconfont.ttf?t=1663556335905') format('truetype');
 }
 
 .iconfont {
@@ -296,4 +296,4 @@
 
 .icon-gouwu:before {
   content: "\e607";
-}
+}