From a39cc58958e7c15c40bafce829612dcfa786dc22 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Thu, 9 Apr 2020 15:27:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/image/login_logo.png | Bin 15025 -> 0 bytes pages/login/index.wxml | 2 +- pages/mall/index.wxs | 203 +---------------------------- pages/mall/index/index.wxml | 2 +- pages/mall/order-detail/index.wxml | 1 - pages/mall/order-offer/index.wxml | 2 +- pages/mall/search-list/index.wxml | 1 - 7 files changed, 6 insertions(+), 205 deletions(-) delete mode 100644 assets/image/login_logo.png diff --git a/assets/image/login_logo.png b/assets/image/login_logo.png deleted file mode 100644 index 3ec1e4d3cc0567428cb2872b49ec3ad6bd8d4b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15025 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
tQSGVBC>2#+5&jkbNf zb@=X7r$$qB7HOnZ8xUts&sCC- z_tTxHcOqk6L*d`)A`jA`*L9?Tz+~c5N@q3WR7|3+OX!q@rB{;wtvwnbq?btJR zclhbAhG1FPdbM^xDx=DhEsncJ)_1tKUl>z_yR_s;Ny?b2b9)&<4=nH4#E#vcyw2414~vJdezja!YC!(# zI+RD7mv`ti1(KR8??u-NgD|ca>jSm<)Vfh{Z#MvQw87nQk*$zlMjC8+ZDxn_SvXO7Mn>?cetRQ_nwe!+dh zQ!;2{lmC_bIWv_2E!~?JVIu<*^JJu;GjRSACaZ!uCemD;x z55&a{L2G-8xLCVmL|!NA6Jpui3B#`ALwh<|B_i>IS;&nf0ThC9d@ z*4eTEQ$iqVhnd&Oemi+wB1~sCbW5$_*eTV$CsHSbC3VbX_yb$dk=1qup^6;uObYc-|kth z5N*?ln=RSTCpr)$uevoR6#=ip3&Q{zZ8)7gS>9~_x3e^S<|5`H^IH)9r*Iwrsh%1F z0S+#Gj<<)0!iE8aylQ%#Yg4>?o4c1+{LKQnV@Dn z^v8FmgHhNpq7CSQk2%6*==L^&2nu~a+tqsxzj4mDY<)X+O!J%Dg?vVI;hnT9toOrM z)uC^}`gO*&CpdURTKGeK6aOo1gOx);2&~)nE{pW0c-f|}@1mh zXUPPvoA|>d`o%8-0KsV^kVT3b*Q8sMRTqB+j`olZ1%qL_-at3fxKa{*?yb>PBsns8 zBglZKKJ@`VAVxF<-u8Mnq@#bspJ{)reYPmHQ!4YO)RL0?fUF&LeSQ6V*n3f9adFn_9tI*C2`BLP!etOql4lxY(5hs7bBO4?b{EFb`W09)yxQ^}G z2On4=qEK^3upCa>D^L_X_@{GHCT$rc>@`wFsG)UlzoDdsQ<*1LPqBef4 z6|6Bg5JHAG-0#FV@4ozeh$%rVu{%D$fq`svRi>l@nGQ^KOM*NK#@IJISxv&Ny*xDW?_?}p_jwBMHqDk_xxel4t6bfGmy;x* zFZr`)h8{_g=rZ2U-9@+C)I4a8jvne7wtVt~9cG7wYXQAWzuelqwf zn`iRZBkZ?nJ9tg-p!7F3RDTk4lHOTScW&DatuBVR{T2Dhyl34-yHT`~+cQulcaJ+%)W;qL_`{^y`l7$Y<_-y`&| z!oL@Y<=^`ceuL@Xy0C|HUH{>EaOxrV6y|76l~P=FsXul89wJp%REJi`n}_`$@tVb# diff --git a/pages/login/index.wxml b/pages/login/index.wxml index ca897bf..479b7d9 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -1,6 +1,6 @@ - + diff --git a/pages/mall/index.wxs b/pages/mall/index.wxs index 8e1587f..0eebd2c 100644 --- a/pages/mall/index.wxs +++ b/pages/mall/index.wxs @@ -1,43 +1,3 @@ -function orderStatus(status) { - if (status == 2) { - return '已完成' - } else if (status == 3) { - return '已取消' - } else if (status == 4) { - return '待调度' - } else if (status == 5) { - return '待装货' - } else if (status == 6) { - return '待验货' - } else if (status == 7) { - return '待入库' - } else if (status == 8) { - return '已入库' - } - return '' -} - -function customerType(type) { - if (type == 0) { - return 'A' - } else if (type == 1) { - return 'B' - } else if (type == 2) { - return 'C' - } - return '' -} - -function colorType(type) { - if (type == 0) { - return 'blue' - } else if (type == 1) { - return 'green' - } else if (type == 2) { - return 'tree' - } - return '' -} function formatePrice(price) { return Number(parseFloat(price) / 100).toFixed(2) @@ -46,91 +6,12 @@ function formatePrice(price) { function formateWeight(weight) { return Number(parseFloat(weight) / 1000).toFixed(3) } - -function deductMoney(money) { - if (money < 0) { - return '待定' - } else if (money === 0) { - return money - } - return (money / 100).toFixed(2) -} - -function deductStatus(deductionStatus) { - switch (deductionStatus) { - case 0: - return '【待客户确认】' - case 1: - return '【客户同意】' - case -1: - return '【客户拒绝】' - } -} - -function orderDate(order) { - if (order.orderStatus == 4) { - return '下单日期：' + order.orderDate - } else if (order.orderStatus == 5) { - return '调度日期' + order.schedulingCreateDate - } else if (order.orderStatus == 6) { - return '装货日期：' + order.shippingDate - } else if (order.orderStatus == 7 || order.orderStatus == 8 || order.orderStatus == 2) { - return '验货日期：' + order.inspectionDate - } - return '' -} - -function isInspectable(order, centerId) { - if (!order) { - return false - } - if (order.orderStatus === 6) { - if (centerId === 1) { - return true - } - return Number(order.destinationOperationCenterId) === centerId - } - return false -} - -function isStockinable(order, centerId) { - if (!order) { - return false - } - if (order.orderStatus === 7) { - if (centerId === 1) { - return true - } - return Number(order.destinationOperationCenterId) === centerId - } - return false -} - -function canHandle(order, centerId) { - if (order.inspectionId > 0 && order.deductMoney == -1) { - if (centerId === 1) { - return true - } - return Number(order.destinationOperationCenterId) === centerId - } - return false -} - -function isAbnormalable(order, centerId) { - if (order.orderStatus === 6) { - if (centerId === 1) { - return true - } - return Number(order.destinationOperationCenterId) === centerId - } - return false -} - + function isEmpty(val) { return typeof val === 'undefined' || val === '' || val === null } -function formateOrderDate(datetime) { +function formateDate(datetime) { if (isEmpty(datetime)) { return '' } @@ -156,86 +37,8 @@ function formateOrderDate(datetime) { return datetime + week } -function getCateName(item) { - if (!item.categoriesName){ - return '' - } - if (item.categoriesName.toString().length < 10) { - return item.categoriesName - } - return item.categoriesName.substring(0, 10) + '...' -} - -function handleWeight(weight) { - if (!weight) { - return '' - } - return '折算重量：' + Number(weight / 1000).toFixed(3) + '吨' -} - -/** - * 4: 'green', - 5: 'green', - 6: 'green', - 7: 'green', - 8: 'green', - 0: 'grey', - 1: 'green', - 2: 'grey', - 3: 'grey' - */ -function orderStatusColor(status) { - if (status == 4) { - return 'yellow' - } else if (status == 5) { - return 'yellow' - } else if (status == 6) { - return 'yellow' - } else if (status == 7) { - return 'yellow' - } else if (status == 8) { - return 'yellow' - } else if (status == 0) { - return 'gray' - } else if (status == 1) { - return 'gray' - } else if (status == 2) { - return 'blue' - } else if (status == 3) { - return 'gray' - } - return '' -} - -function getGuidePrice(cateId, cateList) { - for (var i = 0; i < cateList.length; i++) { - if (parseInt(cateId) == parseInt(cateList[i].value)) { - return '今日指导价：￥' + formatePrice(cateList[i].price) + '元/kg' - } - } - return '' -} - -function offesWeight(offsetWeight, totalWeight) { - return offsetWeight > 0.01 * totalWeight -} - module.exports = { - orderStatus: orderStatus, - customerType: customerType, - colorType: colorType, formatePrice: formatePrice, - deductMoney: deductMoney, - deductStatus: deductStatus, - orderDate: orderDate, - isInspectable: isInspectable, - canHandle: canHandle, formateWeight: formateWeight, - formateOrderDate: formateOrderDate, - getCateName: getCateName, - handleWeight: handleWeight, - orderStatusColor: orderStatusColor, - getGuidePrice: getGuidePrice, - isStockinable: isStockinable, - offesWeight: offesWeight + formateDate: formateDate } \ No newline at end of file diff --git a/pages/mall/index/index.wxml b/pages/mall/index/index.wxml index 3381021..68d5baf 100644 --- a/pages/mall/index/index.wxml +++ b/pages/mall/index/index.wxml @@ -1,5 +1,5 @@ - + 原纸商城 diff --git a/pages/mall/order-detail/index.wxml b/pages/mall/order-detail/index.wxml index f046c66..474d6a1 100644 --- a/pages/mall/order-detail/index.wxml +++ b/pages/mall/order-detail/index.wxml @@ -1,5 +1,4 @@ - 返回 订单详情 diff --git a/pages/mall/order-offer/index.wxml b/pages/mall/order-offer/index.wxml index ed3261f..0344f35 100644 --- a/pages/mall/order-offer/index.wxml +++ b/pages/mall/order-offer/index.wxml @@ -1,5 +1,5 @@ - + 返回 确认订单 diff --git a/pages/mall/search-list/index.wxml b/pages/mall/search-list/index.wxml index 18fbf64..3e1accc 100644 --- a/pages/mall/search-list/index.wxml +++ b/pages/mall/search-list/index.wxml @@ -1,5 +1,4 @@ - 返回 原纸商城