Ver Fonte

commit -m

zhengjinyi há 4 anos atrás
pai
commit
4e08cdedf3

+ 2086 - 1
common/json/data.json.js

@@ -2581,8 +2581,2093 @@ const productList=[
                             "beautyActFlag":null
                         }
                     ]			
+const orderDataList = [
+            {
+                "orderID":15212,
+                "orderNo":"X161613565411068",
+                "organizeID":0,
+                "userID":11063,
+                "buyUserID":11062,
+                "shopOrderIDs":"19376",
+                "orderSubmitType":3,
+                "orderType":0,
+                "hasActProduct":"1",
+                "autoCloseTimeMills":0,
+                "status":"0",
+                "receiptStatus":"1",
+                "payStatus":"1",
+                "sendOutStatus":"1",
+                "refundType":"0",
+                "paySuccessCounter":0,
+                "payFlag":"0",
+                "onlinePayFlag":"0",
+                "productTotalFee":500,
+                "orderTotalFee":500,
+                "payTotalFee":500,
+                "payableAmount":500,
+                "balancePayFee":0,
+                "preferential":0,
+                "discountFee":0,
+                "promotionFullReduction":0,
+                "spID":1401,
+                "mainSpID":1304,
+                "note":null,
+                "clubID":5638,
+                "clubScanTime":null,
+                "payWay":null,
+                "orderSource":"6",
+                "closeTime":null,
+                "confirmTime":null,
+                "payTime":null,
+                "orderTime":"2021-03-19 14:34:14",
+                "productCount":1,
+                "presentCount":0,
+                "promotionalGiftsCount":0,
+                "cooFreeFlag":"0",
+                "cooFreeRate":0,
+                "cooFreeAmount":0,
+                "invoiceFlag":"0",
+                "confirmFlag":"0",
+                "clauseID":1,
+                "clauseContent":null,
+                "clauseName":"无条款",
+                "updateDate":"2021-03-19 14:34:14",
+                "freePostFlag":"-1",
+                "freight":0,
+                "delFlag":"0",
+                "freePostageTicketID":null,
+                "splitFlag":"1",
+                "closeReason":null,
+                "postageOrderFlag":"0",
+                "thirdPartyOrderNo":null,
+                "secondHandOrderFlag":"0",
+                "affirmPaymentFlag":"0",
+                "rebateFlag":"0",
+                "zeroCostFlag":0,
+                "orderState":null,
+                "orderMark":null,
+                "receiptAmount":0,
+                "pendingPayments":500,
+                "returnedPurchaseFee":null,
+                "shopOrderList":[
+                    {
+                        "shopOrderID":19376,
+                        "shopOrderNo":"X16161356541106801",
+                        "orderNo":"X161613565411068",
+                        "orderID":15212,
+                        "organizeID":null,
+                        "userID":11063,
+                        "shopID":1186,
+                        "orderPromotionsId":null,
+                        "orderType":0,
+                        "orderSubmitType":3,
+                        "presentNum":0,
+                        "itemCount":1,
+                        "outStoreNum":0,
+                        "outStoreTimes":0,
+                        "townID":null,
+                        "note":"",
+                        "fee":-1,
+                        "accountAmount":0,
+                        "productAmount":8500,
+                        "totalAmount":500,
+                        "needPayAmount":500,
+                        "discountAmount":null,
+                        "discountFee":0,
+                        "preferential":0,
+                        "promotionFullReduction":0,
+                        "payFlag":"0",
+                        "orderTime":"2021-03-19 14:34:14",
+                        "payTime":null,
+                        "finishTime":null,
+                        "autoOverTimeMills":null,
+                        "status":1,
+                        "payStatus":"1",
+                        "sendOutStatus":"1",
+                        "refundStatus":0,
+                        "returnGoodsStatus":null,
+                        "receiveGoodsTime":null,
+                        "autoReceiveTimeMills":null,
+                        "totalAddedValueTax":null,
+                        "canRefundAmount":500,
+                        "refundAmount":null,
+                        "clubID":5638,
+                        "spID":1401,
+                        "mainSpID":1304,
+                        "orderBeanAmount":0,
+                        "useBeanAmount":0,
+                        "useBeanFlag":0,
+                        "canRefundFlag":1,
+                        "useBalanceFlag":0,
+                        "canRefundBeans":null,
+                        "freePostageFee":null,
+                        "freePostageTicketID":null,
+                        "brokerage":1090,
+                        "delFlag":"0",
+                        "refundsAmount":0,
+                        "orderStatusFlag":"1",
+                        "buyStatus":"1",
+                        "deliveryTimeMills":null,
+                        "orderDeliveryID":null,
+                        "splitFlag":"0",
+                        "receiptedFlag":null,
+                        "receiptedType":null,
+                        "paying":"0",
+                        "shopProductAmount":7410,
+                        "shopPostFee":0,
+                        "shopTaxFee":0,
+                        "shouldPayShopAmount":7410,
+                        "payedShopAmount":0,
+                        "shopOtherFee":0,
+                        "refunding":null,
+                        "costType":null,
+                        "proportional":null,
+                        "modifyShouldPayNote":null,
+                        "modifyShouldPayUserID":null,
+                        "modifyShouldPayDate":null,
+                        "zeroCostFlag":0,
+                        "shopName":"北京嘉盛壹美科技有限公司",
+                        "shopLogo":"https://www-b.caimei365.com/img/default/suppliver.jpg",
+                        "logisticsRecordList":null,
+                        "orderProductList":[
+                            {
+                                "orderProductID":29361,
+                                "orderNo":"X161613565411068",
+                                "orderID":15212,
+                                "shopOrderID":19376,
+                                "shopOrderNo":"X16161356541106801",
+                                "shopID":1186,
+                                "productID":3957,
+                                "organizeProductID":null,
+                                "organizeID":null,
+                                "num":1,
+                                "presentNum":0,
+                                "outStoreType":null,
+                                "skuID":null,
+                                "props":null,
+                                "propName":null,
+                                "productNo":null,
+                                "price":8500,
+                                "normalPrice":10000,
+                                "costPrice":7410,
+                                "price0":8500,
+                                "price1":8500,
+                                "totalAmount":8500,
+                                "totalFee":500,
+                                "shouldPayFee":500,
+                                "discount":100,
+                                "discountPrice":8500,
+                                "includedTax":"2",
+                                "invoiceType":"3",
+                                "taxRate":0,
+                                "supplierTaxRate":0,
+                                "addedValueTax":0,
+                                "totalAddedValueTax":0,
+                                "shouldPayTotalTax":0,
+                                "singleShouldPayTotalTax":0,
+                                "shopProductAmount":7410,
+                                "shopFee":7410,
+                                "otherFee":0,
+                                "cmFee":1090,
+                                "singleShopFee":7410,
+                                "singleOtherFee":0,
+                                "singleCmFee":1090,
+                                "status":null,
+                                "commentFlag":"0",
+                                "totalBeans":0,
+                                "useBalanceAmount":0,
+                                "useBeanAmount":null,
+                                "notOutStore":1,
+                                "cmbeanPrice":null,
+                                "isActProduct":"1",
+                                "isGiftProduct":"0",
+                                "productActInfo":null,
+                                "buyAgainFlag":"0",
+                                "confirmProductFlag":"0",
+                                "payStatus":"0",
+                                "shopName":"北京嘉盛壹美科技有限公司",
+                                "name":"A-ONE TAB with wifi检测仪 面部检测仪",
+                                "productUnit":"台",
+                                "productImage":"https://img.caimei365.com/group1/M00/00/8A/Cmis2FpfAGOAaCQfAACFGx9pRi496.JPEG",
+                                "actType":null,
+                                "actPreferential":0,
+                                "productType":"0",
+                                "orderPromotionsId":397,
+                                "preferential":0,
+                                "discountFee":0,
+                                "cancelNum":null,
+                                "ladderPriceFlag":0,
+                                "shipmentsNum":null,
+                                "returnedNum":null,
+                                "actualCancelNum":null,
+                                "aliasName":null,
+                                "productCategory":"1",
+                                "secondHandType":null,
+                                "productPromotion":{
+                                    "id":397,
+                                    "name":"优惠价",
+                                    "description":null,
+                                    "type":1,
+                                    "mode":1,
+                                    "touchPrice":500,
+                                    "reducedPrice":null,
+                                    "beginTime":null,
+                                    "endTime":null,
+                                    "status":1,
+                                    "supplierId":null,
+                                    "productId":null,
+                                    "orderId":15212,
+                                    "productList":null,
+                                    "giftList":null,
+                                    "products":null
+                                },
+                                "includedTaxFlag":null
+                            }
+                        ],
+                        "userInfo":null,
+                        "name":null,
+                        "receiptStatus":null,
+                        "shopPromotion":null,
+                        "shouHuoRen":null
+                    }
+                ],
+                "clubName":"正经一点机构",
+                "invoiceStatus":false,
+                "payButton":true,
+                "expensesOfTaxation":null
+            },
+            {
+                "orderID":15211,
+                "orderNo":"X161613560870120",
+                "organizeID":0,
+                "userID":11063,
+                "buyUserID":11062,
+                "shopOrderIDs":"19375",
+                "orderSubmitType":3,
+                "orderType":0,
+                "hasActProduct":"1",
+                "autoCloseTimeMills":0,
+                "status":"0",
+                "receiptStatus":"1",
+                "payStatus":"1",
+                "sendOutStatus":"1",
+                "refundType":"0",
+                "paySuccessCounter":0,
+                "payFlag":"0",
+                "onlinePayFlag":"0",
+                "productTotalFee":275008.8,
+                "orderTotalFee":275008.8,
+                "payTotalFee":275008.8,
+                "payableAmount":275008.8,
+                "balancePayFee":0,
+                "preferential":0,
+                "discountFee":0,
+                "promotionFullReduction":0,
+                "spID":1401,
+                "mainSpID":1304,
+                "note":null,
+                "clubID":5638,
+                "clubScanTime":null,
+                "payWay":null,
+                "orderSource":"6",
+                "closeTime":null,
+                "confirmTime":null,
+                "payTime":null,
+                "orderTime":"2021-03-19 14:33:28",
+                "productCount":1,
+                "presentCount":0,
+                "promotionalGiftsCount":0,
+                "cooFreeFlag":"0",
+                "cooFreeRate":0,
+                "cooFreeAmount":0,
+                "invoiceFlag":"0",
+                "confirmFlag":"0",
+                "clauseID":1,
+                "clauseContent":null,
+                "clauseName":"无条款",
+                "updateDate":"2021-03-19 14:33:28",
+                "freePostFlag":"-1",
+                "freight":0,
+                "delFlag":"0",
+                "freePostageTicketID":null,
+                "splitFlag":"1",
+                "closeReason":null,
+                "postageOrderFlag":"0",
+                "thirdPartyOrderNo":null,
+                "secondHandOrderFlag":"0",
+                "affirmPaymentFlag":"0",
+                "rebateFlag":"0",
+                "zeroCostFlag":0,
+                "orderState":null,
+                "orderMark":null,
+                "receiptAmount":0,
+                "pendingPayments":275008.8,
+                "returnedPurchaseFee":null,
+                "shopOrderList":[
+                    {
+                        "shopOrderID":19375,
+                        "shopOrderNo":"X16161356087012001",
+                        "orderNo":"X161613560870120",
+                        "orderID":15211,
+                        "organizeID":null,
+                        "userID":11063,
+                        "shopID":1001,
+                        "orderPromotionsId":null,
+                        "orderType":0,
+                        "orderSubmitType":3,
+                        "presentNum":0,
+                        "itemCount":1,
+                        "outStoreNum":0,
+                        "outStoreTimes":0,
+                        "townID":null,
+                        "note":"",
+                        "fee":-1,
+                        "accountAmount":0,
+                        "productAmount":250008,
+                        "totalAmount":275008.8,
+                        "needPayAmount":275008.8,
+                        "discountAmount":null,
+                        "discountFee":0,
+                        "preferential":0,
+                        "promotionFullReduction":0,
+                        "payFlag":"0",
+                        "orderTime":"2021-03-19 14:33:28",
+                        "payTime":null,
+                        "finishTime":null,
+                        "autoOverTimeMills":null,
+                        "status":1,
+                        "payStatus":"1",
+                        "sendOutStatus":"1",
+                        "refundStatus":0,
+                        "returnGoodsStatus":null,
+                        "receiveGoodsTime":null,
+                        "autoReceiveTimeMills":null,
+                        "totalAddedValueTax":null,
+                        "canRefundAmount":275009,
+                        "refundAmount":null,
+                        "clubID":5638,
+                        "spID":1401,
+                        "mainSpID":1304,
+                        "orderBeanAmount":0,
+                        "useBeanAmount":0,
+                        "useBeanFlag":0,
+                        "canRefundFlag":1,
+                        "useBalanceFlag":0,
+                        "canRefundBeans":null,
+                        "freePostageFee":null,
+                        "freePostageTicketID":null,
+                        "brokerage":274782.8,
+                        "delFlag":"0",
+                        "refundsAmount":0,
+                        "orderStatusFlag":"1",
+                        "buyStatus":"1",
+                        "deliveryTimeMills":null,
+                        "orderDeliveryID":null,
+                        "splitFlag":"0",
+                        "receiptedFlag":null,
+                        "receiptedType":null,
+                        "paying":"0",
+                        "shopProductAmount":200,
+                        "shopPostFee":0,
+                        "shopTaxFee":26,
+                        "shouldPayShopAmount":226,
+                        "payedShopAmount":0,
+                        "shopOtherFee":0,
+                        "refunding":null,
+                        "costType":null,
+                        "proportional":null,
+                        "modifyShouldPayNote":null,
+                        "modifyShouldPayUserID":null,
+                        "modifyShouldPayDate":null,
+                        "zeroCostFlag":0,
+                        "shopName":"香港丽润国际",
+                        "shopLogo":"https://www-b.caimei365.com/uploadFile/shopLogo/ZXV6IIFSP520140415035836.jpg",
+                        "logisticsRecordList":null,
+                        "orderProductList":[
+                            {
+                                "orderProductID":29360,
+                                "orderNo":"X161613560870120",
+                                "orderID":15211,
+                                "shopOrderID":19375,
+                                "shopOrderNo":"X16161356087012001",
+                                "shopID":1001,
+                                "productID":1010,
+                                "organizeProductID":null,
+                                "organizeID":null,
+                                "num":1,
+                                "presentNum":0,
+                                "outStoreType":null,
+                                "skuID":null,
+                                "props":null,
+                                "propName":null,
+                                "productNo":null,
+                                "price":275008.8,
+                                "normalPrice":660,
+                                "costPrice":200,
+                                "price0":250008,
+                                "price1":250008,
+                                "totalAmount":250008,
+                                "totalFee":275008.8,
+                                "shouldPayFee":275008.8,
+                                "discount":100,
+                                "discountPrice":300009.6,
+                                "includedTax":"0",
+                                "invoiceType":"1",
+                                "taxRate":10,
+                                "supplierTaxRate":13,
+                                "addedValueTax":25000.8,
+                                "totalAddedValueTax":25000.8,
+                                "shouldPayTotalTax":26,
+                                "singleShouldPayTotalTax":26,
+                                "shopProductAmount":200,
+                                "shopFee":226,
+                                "otherFee":0,
+                                "cmFee":274782.8,
+                                "singleShopFee":226,
+                                "singleOtherFee":0,
+                                "singleCmFee":274782.8,
+                                "status":null,
+                                "commentFlag":"0",
+                                "totalBeans":0,
+                                "useBalanceAmount":0,
+                                "useBeanAmount":null,
+                                "notOutStore":1,
+                                "cmbeanPrice":null,
+                                "isActProduct":"1",
+                                "isGiftProduct":"0",
+                                "productActInfo":null,
+                                "buyAgainFlag":"0",
+                                "confirmProductFlag":"0",
+                                "payStatus":"0",
+                                "shopName":"香港丽润国际",
+                                "name":"大幅度第三方团雪山之恋丝绒洁面乳团雪山之恋丝绒洁面乳团雪山之恋丝绒洁面乳团雪山之恋丝绒洁面乳",
+                                "productUnit":"100ml/瓶",
+                                "productImage":"https://img-b.caimei365.com/group1/M00/03/09/Cmgy61-Gr6qAG5rbAADFf8tivls567.jpg",
+                                "actType":null,
+                                "actPreferential":0,
+                                "productType":"0",
+                                "orderPromotionsId":null,
+                                "preferential":0,
+                                "discountFee":0,
+                                "cancelNum":null,
+                                "ladderPriceFlag":0,
+                                "shipmentsNum":null,
+                                "returnedNum":null,
+                                "actualCancelNum":null,
+                                "aliasName":null,
+                                "productCategory":"1",
+                                "secondHandType":null,
+                                "productPromotion":null,
+                                "includedTaxFlag":null
+                            }
+                        ],
+                        "userInfo":null,
+                        "name":null,
+                        "receiptStatus":null,
+                        "shopPromotion":null,
+                        "shouHuoRen":null
+                    }
+                ],
+                "clubName":"正经一点机构",
+                "invoiceStatus":false,
+                "payButton":false,
+                "expensesOfTaxation":null
+            },
+            {
+                "orderID":15210,
+                "orderNo":"X161613547788441",
+                "organizeID":0,
+                "userID":11063,
+                "buyUserID":11062,
+                "shopOrderIDs":"19374",
+                "orderSubmitType":3,
+                "orderType":0,
+                "hasActProduct":"1",
+                "autoCloseTimeMills":0,
+                "status":"0",
+                "receiptStatus":"1",
+                "payStatus":"1",
+                "sendOutStatus":"1",
+                "refundType":"0",
+                "paySuccessCounter":0,
+                "payFlag":"0",
+                "onlinePayFlag":"0",
+                "productTotalFee":275008.8,
+                "orderTotalFee":275008.8,
+                "payTotalFee":275008.8,
+                "payableAmount":275008.8,
+                "balancePayFee":0,
+                "preferential":0,
+                "discountFee":0,
+                "promotionFullReduction":0,
+                "spID":1401,
+                "mainSpID":1304,
+                "note":null,
+                "clubID":5638,
+                "clubScanTime":null,
+                "payWay":null,
+                "orderSource":"6",
+                "closeTime":null,
+                "confirmTime":null,
+                "payTime":null,
+                "orderTime":"2021-03-19 14:31:17",
+                "productCount":1,
+                "presentCount":0,
+                "promotionalGiftsCount":0,
+                "cooFreeFlag":"0",
+                "cooFreeRate":0,
+                "cooFreeAmount":0,
+                "invoiceFlag":"0",
+                "confirmFlag":"0",
+                "clauseID":1,
+                "clauseContent":null,
+                "clauseName":"无条款",
+                "updateDate":"2021-03-19 14:31:17",
+                "freePostFlag":"-1",
+                "freight":0,
+                "delFlag":"0",
+                "freePostageTicketID":null,
+                "splitFlag":"1",
+                "closeReason":null,
+                "postageOrderFlag":"0",
+                "thirdPartyOrderNo":null,
+                "secondHandOrderFlag":"0",
+                "affirmPaymentFlag":"0",
+                "rebateFlag":"0",
+                "zeroCostFlag":0,
+                "orderState":null,
+                "orderMark":null,
+                "receiptAmount":0,
+                "pendingPayments":275008.8,
+                "returnedPurchaseFee":null,
+                "shopOrderList":[
+                    {
+                        "shopOrderID":19374,
+                        "shopOrderNo":"X16161354778844101",
+                        "orderNo":"X161613547788441",
+                        "orderID":15210,
+                        "organizeID":null,
+                        "userID":11063,
+                        "shopID":1001,
+                        "orderPromotionsId":null,
+                        "orderType":0,
+                        "orderSubmitType":3,
+                        "presentNum":0,
+                        "itemCount":1,
+                        "outStoreNum":0,
+                        "outStoreTimes":0,
+                        "townID":null,
+                        "note":"",
+                        "fee":-1,
+                        "accountAmount":0,
+                        "productAmount":250008,
+                        "totalAmount":275008.8,
+                        "needPayAmount":275008.8,
+                        "discountAmount":null,
+                        "discountFee":0,
+                        "preferential":0,
+                        "promotionFullReduction":0,
+                        "payFlag":"0",
+                        "orderTime":"2021-03-19 14:31:17",
+                        "payTime":null,
+                        "finishTime":null,
+                        "autoOverTimeMills":null,
+                        "status":1,
+                        "payStatus":"1",
+                        "sendOutStatus":"1",
+                        "refundStatus":0,
+                        "returnGoodsStatus":null,
+                        "receiveGoodsTime":null,
+                        "autoReceiveTimeMills":null,
+                        "totalAddedValueTax":null,
+                        "canRefundAmount":275009,
+                        "refundAmount":null,
+                        "clubID":5638,
+                        "spID":1401,
+                        "mainSpID":1304,
+                        "orderBeanAmount":0,
+                        "useBeanAmount":0,
+                        "useBeanFlag":0,
+                        "canRefundFlag":1,
+                        "useBalanceFlag":0,
+                        "canRefundBeans":null,
+                        "freePostageFee":null,
+                        "freePostageTicketID":null,
+                        "brokerage":274782.8,
+                        "delFlag":"0",
+                        "refundsAmount":0,
+                        "orderStatusFlag":"1",
+                        "buyStatus":"1",
+                        "deliveryTimeMills":null,
+                        "orderDeliveryID":null,
+                        "splitFlag":"0",
+                        "receiptedFlag":null,
+                        "receiptedType":null,
+                        "paying":"0",
+                        "shopProductAmount":200,
+                        "shopPostFee":0,
+                        "shopTaxFee":26,
+                        "shouldPayShopAmount":226,
+                        "payedShopAmount":0,
+                        "shopOtherFee":0,
+                        "refunding":null,
+                        "costType":null,
+                        "proportional":null,
+                        "modifyShouldPayNote":null,
+                        "modifyShouldPayUserID":null,
+                        "modifyShouldPayDate":null,
+                        "zeroCostFlag":0,
+                        "shopName":"香港丽润国际",
+                        "shopLogo":"https://www-b.caimei365.com/uploadFile/shopLogo/ZXV6IIFSP520140415035836.jpg",
+                        "logisticsRecordList":null,
+                        "orderProductList":[
+                            {
+                                "orderProductID":29359,
+                                "orderNo":"X161613547788441",
+                                "orderID":15210,
+                                "shopOrderID":19374,
+                                "shopOrderNo":"X16161354778844101",
+                                "shopID":1001,
+                                "productID":1010,
+                                "organizeProductID":null,
+                                "organizeID":null,
+                                "num":1,
+                                "presentNum":0,
+                                "outStoreType":null,
+                                "skuID":null,
+                                "props":null,
+                                "propName":null,
+                                "productNo":null,
+                                "price":275008.8,
+                                "normalPrice":660,
+                                "costPrice":200,
+                                "price0":250008,
+                                "price1":250008,
+                                "totalAmount":250008,
+                                "totalFee":275008.8,
+                                "shouldPayFee":275008.8,
+                                "discount":100,
+                                "discountPrice":300009.6,
+                                "includedTax":"0",
+                                "invoiceType":"1",
+                                "taxRate":10,
+                                "supplierTaxRate":13,
+                                "addedValueTax":25000.8,
+                                "totalAddedValueTax":25000.8,
+                                "shouldPayTotalTax":26,
+                                "singleShouldPayTotalTax":26,
+                                "shopProductAmount":200,
+                                "shopFee":226,
+                                "otherFee":0,
+                                "cmFee":274782.8,
+                                "singleShopFee":226,
+                                "singleOtherFee":0,
+                                "singleCmFee":274782.8,
+                                "status":null,
+                                "commentFlag":"0",
+                                "totalBeans":0,
+                                "useBalanceAmount":0,
+                                "useBeanAmount":null,
+                                "notOutStore":1,
+                                "cmbeanPrice":null,
+                                "isActProduct":"1",
+                                "isGiftProduct":"0",
+                                "productActInfo":null,
+                                "buyAgainFlag":"0",
+                                "confirmProductFlag":"0",
+                                "payStatus":"0",
+                                "shopName":"香港丽润国际",
+                                "name":"大幅度第三方团雪山之恋丝绒洁面乳团雪山之恋丝绒洁面乳团雪山之恋丝绒洁面乳团雪山之恋丝绒洁面乳",
+                                "productUnit":"100ml/瓶",
+                                "productImage":"https://img-b.caimei365.com/group1/M00/03/09/Cmgy61-Gr6qAG5rbAADFf8tivls567.jpg",
+                                "actType":null,
+                                "actPreferential":0,
+                                "productType":"0",
+                                "orderPromotionsId":null,
+                                "preferential":0,
+                                "discountFee":0,
+                                "cancelNum":null,
+                                "ladderPriceFlag":0,
+                                "shipmentsNum":null,
+                                "returnedNum":null,
+                                "actualCancelNum":null,
+                                "aliasName":null,
+                                "productCategory":"1",
+                                "secondHandType":null,
+                                "productPromotion":null,
+                                "includedTaxFlag":null
+                            }
+                        ],
+                        "userInfo":null,
+                        "name":null,
+                        "receiptStatus":null,
+                        "shopPromotion":null,
+                        "shouHuoRen":null
+                    }
+                ],
+                "clubName":"正经一点机构",
+                "invoiceStatus":false,
+                "payButton":false,
+                "expensesOfTaxation":null
+            },
+            {
+                "orderID":15209,
+                "orderNo":"X161613544703234",
+                "organizeID":0,
+                "userID":11063,
+                "buyUserID":11062,
+                "shopOrderIDs":"19373",
+                "orderSubmitType":3,
+                "orderType":0,
+                "hasActProduct":"0",
+                "autoCloseTimeMills":0,
+                "status":"0",
+                "receiptStatus":"1",
+                "payStatus":"1",
+                "sendOutStatus":"1",
+                "refundType":"0",
+                "paySuccessCounter":0,
+                "payFlag":"0",
+                "onlinePayFlag":"0",
+                "productTotalFee":1800,
+                "orderTotalFee":1800,
+                "payTotalFee":1800,
+                "payableAmount":1800,
+                "balancePayFee":0,
+                "preferential":0,
+                "discountFee":0,
+                "promotionFullReduction":0,
+                "spID":1401,
+                "mainSpID":1304,
+                "note":null,
+                "clubID":5638,
+                "clubScanTime":null,
+                "payWay":null,
+                "orderSource":"6",
+                "closeTime":null,
+                "confirmTime":null,
+                "payTime":null,
+                "orderTime":"2021-03-19 14:30:47",
+                "productCount":3,
+                "presentCount":0,
+                "promotionalGiftsCount":0,
+                "cooFreeFlag":"0",
+                "cooFreeRate":0,
+                "cooFreeAmount":0,
+                "invoiceFlag":"0",
+                "confirmFlag":"0",
+                "clauseID":1,
+                "clauseContent":null,
+                "clauseName":"无条款",
+                "updateDate":"2021-03-19 14:30:47",
+                "freePostFlag":"-1",
+                "freight":0,
+                "delFlag":"0",
+                "freePostageTicketID":null,
+                "splitFlag":"1",
+                "closeReason":null,
+                "postageOrderFlag":"0",
+                "thirdPartyOrderNo":null,
+                "secondHandOrderFlag":"0",
+                "affirmPaymentFlag":"0",
+                "rebateFlag":"0",
+                "zeroCostFlag":0,
+                "orderState":null,
+                "orderMark":null,
+                "receiptAmount":0,
+                "pendingPayments":1800,
+                "returnedPurchaseFee":null,
+                "shopOrderList":[
+                    {
+                        "shopOrderID":19373,
+                        "shopOrderNo":"X16161354470323401",
+                        "orderNo":"X161613544703234",
+                        "orderID":15209,
+                        "organizeID":null,
+                        "userID":11063,
+                        "shopID":10109,
+                        "orderPromotionsId":null,
+                        "orderType":0,
+                        "orderSubmitType":3,
+                        "presentNum":0,
+                        "itemCount":3,
+                        "outStoreNum":0,
+                        "outStoreTimes":0,
+                        "townID":null,
+                        "note":"",
+                        "fee":-1,
+                        "accountAmount":0,
+                        "productAmount":1800,
+                        "totalAmount":1800,
+                        "needPayAmount":1800,
+                        "discountAmount":null,
+                        "discountFee":0,
+                        "preferential":0,
+                        "promotionFullReduction":0,
+                        "payFlag":"0",
+                        "orderTime":"2021-03-19 14:30:47",
+                        "payTime":null,
+                        "finishTime":null,
+                        "autoOverTimeMills":null,
+                        "status":1,
+                        "payStatus":"1",
+                        "sendOutStatus":"1",
+                        "refundStatus":0,
+                        "returnGoodsStatus":null,
+                        "receiveGoodsTime":null,
+                        "autoReceiveTimeMills":null,
+                        "totalAddedValueTax":null,
+                        "canRefundAmount":1800,
+                        "refundAmount":null,
+                        "clubID":5638,
+                        "spID":1401,
+                        "mainSpID":1304,
+                        "orderBeanAmount":0,
+                        "useBeanAmount":0,
+                        "useBeanFlag":0,
+                        "canRefundFlag":1,
+                        "useBalanceFlag":0,
+                        "canRefundBeans":null,
+                        "freePostageFee":null,
+                        "freePostageTicketID":null,
+                        "brokerage":900,
+                        "delFlag":"0",
+                        "refundsAmount":0,
+                        "orderStatusFlag":"1",
+                        "buyStatus":"1",
+                        "deliveryTimeMills":null,
+                        "orderDeliveryID":null,
+                        "splitFlag":"1",
+                        "receiptedFlag":null,
+                        "receiptedType":null,
+                        "paying":"0",
+                        "shopProductAmount":900,
+                        "shopPostFee":0,
+                        "shopTaxFee":0,
+                        "shouldPayShopAmount":900,
+                        "payedShopAmount":0,
+                        "shopOtherFee":0,
+                        "refunding":null,
+                        "costType":null,
+                        "proportional":null,
+                        "modifyShouldPayNote":null,
+                        "modifyShouldPayUserID":null,
+                        "modifyShouldPayDate":null,
+                        "zeroCostFlag":0,
+                        "shopName":"演员测试供应商AAA",
+                        "shopLogo":"https://img-b.caimei365.com/group1/M00/02/EA/Cmgy618FyDCAcnqjAABqocyxYRw91.JPEG",
+                        "logisticsRecordList":null,
+                        "orderProductList":[
+                            {
+                                "orderProductID":29358,
+                                "orderNo":"X161613544703234",
+                                "orderID":15209,
+                                "shopOrderID":19373,
+                                "shopOrderNo":"X16161354470323401",
+                                "shopID":10109,
+                                "productID":4357,
+                                "organizeProductID":null,
+                                "organizeID":null,
+                                "num":3,
+                                "presentNum":0,
+                                "outStoreType":null,
+                                "skuID":null,
+                                "props":null,
+                                "propName":null,
+                                "productNo":null,
+                                "price":600,
+                                "normalPrice":500,
+                                "costPrice":300,
+                                "price0":600,
+                                "price1":600,
+                                "totalAmount":1800,
+                                "totalFee":1800,
+                                "shouldPayFee":1800,
+                                "discount":100,
+                                "discountPrice":600,
+                                "includedTax":"2",
+                                "invoiceType":"3",
+                                "taxRate":0,
+                                "supplierTaxRate":0,
+                                "addedValueTax":0,
+                                "totalAddedValueTax":0,
+                                "shouldPayTotalTax":0,
+                                "singleShouldPayTotalTax":0,
+                                "shopProductAmount":900,
+                                "shopFee":900,
+                                "otherFee":0,
+                                "cmFee":900,
+                                "singleShopFee":300,
+                                "singleOtherFee":0,
+                                "singleCmFee":300,
+                                "status":null,
+                                "commentFlag":"0",
+                                "totalBeans":0,
+                                "useBalanceAmount":0,
+                                "useBeanAmount":null,
+                                "notOutStore":3,
+                                "cmbeanPrice":null,
+                                "isActProduct":"2",
+                                "isGiftProduct":"0",
+                                "productActInfo":null,
+                                "buyAgainFlag":"0",
+                                "confirmProductFlag":"0",
+                                "payStatus":"0",
+                                "shopName":"演员测试供应商AAA",
+                                "name":"演员测试供应商商品显示名AAA",
+                                "productUnit":"包",
+                                "productImage":"https://img-b.caimei365.com/group1/M00/02/E0/Cmgy618EE1OAN0e7AAIcZ5Hb98Q16.jfif",
+                                "actType":null,
+                                "actPreferential":0,
+                                "productType":"0",
+                                "orderPromotionsId":null,
+                                "preferential":0,
+                                "discountFee":0,
+                                "cancelNum":null,
+                                "ladderPriceFlag":1,
+                                "shipmentsNum":null,
+                                "returnedNum":null,
+                                "actualCancelNum":null,
+                                "aliasName":null,
+                                "productCategory":"1",
+                                "secondHandType":null,
+                                "productPromotion":null,
+                                "includedTaxFlag":null
+                            }
+                        ],
+                        "userInfo":null,
+                        "name":null,
+                        "receiptStatus":null,
+                        "shopPromotion":null,
+                        "shouHuoRen":null
+                    }
+                ],
+                "clubName":"正经一点机构",
+                "invoiceStatus":false,
+                "payButton":false,
+                "expensesOfTaxation":null
+            },
+            {
+                "orderID":15208,
+                "orderNo":"X161613541392914",
+                "organizeID":0,
+                "userID":11063,
+                "buyUserID":11062,
+                "shopOrderIDs":"19372",
+                "orderSubmitType":3,
+                "orderType":0,
+                "hasActProduct":"1",
+                "autoCloseTimeMills":0,
+                "status":"0",
+                "receiptStatus":"1",
+                "payStatus":"1",
+                "sendOutStatus":"1",
+                "refundType":"0",
+                "paySuccessCounter":0,
+                "payFlag":"0",
+                "onlinePayFlag":"0",
+                "productTotalFee":116.86,
+                "orderTotalFee":116.86,
+                "payTotalFee":116.86,
+                "payableAmount":116.86,
+                "balancePayFee":0,
+                "preferential":0,
+                "discountFee":0,
+                "promotionFullReduction":0,
+                "spID":1401,
+                "mainSpID":1304,
+                "note":null,
+                "clubID":5638,
+                "clubScanTime":null,
+                "payWay":null,
+                "orderSource":"6",
+                "closeTime":null,
+                "confirmTime":null,
+                "payTime":null,
+                "orderTime":"2021-03-19 14:30:13",
+                "productCount":7,
+                "presentCount":0,
+                "promotionalGiftsCount":0,
+                "cooFreeFlag":"0",
+                "cooFreeRate":0,
+                "cooFreeAmount":0,
+                "invoiceFlag":"0",
+                "confirmFlag":"0",
+                "clauseID":1,
+                "clauseContent":null,
+                "clauseName":"无条款",
+                "updateDate":"2021-03-19 14:30:13",
+                "freePostFlag":"-1",
+                "freight":0,
+                "delFlag":"0",
+                "freePostageTicketID":null,
+                "splitFlag":"1",
+                "closeReason":null,
+                "postageOrderFlag":"0",
+                "thirdPartyOrderNo":null,
+                "secondHandOrderFlag":"0",
+                "affirmPaymentFlag":"0",
+                "rebateFlag":"0",
+                "zeroCostFlag":0,
+                "orderState":null,
+                "orderMark":null,
+                "receiptAmount":0,
+                "pendingPayments":116.86,
+                "returnedPurchaseFee":null,
+                "shopOrderList":[
+                    {
+                        "shopOrderID":19372,
+                        "shopOrderNo":"X16161354139291401",
+                        "orderNo":"X161613541392914",
+                        "orderID":15208,
+                        "organizeID":null,
+                        "userID":11063,
+                        "shopID":10134,
+                        "orderPromotionsId":null,
+                        "orderType":0,
+                        "orderSubmitType":3,
+                        "presentNum":0,
+                        "itemCount":7,
+                        "outStoreNum":0,
+                        "outStoreTimes":0,
+                        "townID":null,
+                        "note":"",
+                        "fee":-1,
+                        "accountAmount":0,
+                        "productAmount":127.25,
+                        "totalAmount":116.86,
+                        "needPayAmount":116.86,
+                        "discountAmount":null,
+                        "discountFee":0,
+                        "preferential":0,
+                        "promotionFullReduction":0,
+                        "payFlag":"0",
+                        "orderTime":"2021-03-19 14:30:13",
+                        "payTime":null,
+                        "finishTime":null,
+                        "autoOverTimeMills":null,
+                        "status":1,
+                        "payStatus":"1",
+                        "sendOutStatus":"1",
+                        "refundStatus":0,
+                        "returnGoodsStatus":null,
+                        "receiveGoodsTime":null,
+                        "autoReceiveTimeMills":null,
+                        "totalAddedValueTax":null,
+                        "canRefundAmount":116.857,
+                        "refundAmount":null,
+                        "clubID":5638,
+                        "spID":1401,
+                        "mainSpID":1304,
+                        "orderBeanAmount":0,
+                        "useBeanAmount":0,
+                        "useBeanFlag":0,
+                        "canRefundFlag":1,
+                        "useBalanceFlag":0,
+                        "canRefundBeans":null,
+                        "freePostageFee":null,
+                        "freePostageTicketID":null,
+                        "brokerage":38.51,
+                        "delFlag":"0",
+                        "refundsAmount":0,
+                        "orderStatusFlag":"1",
+                        "buyStatus":"1",
+                        "deliveryTimeMills":null,
+                        "orderDeliveryID":null,
+                        "splitFlag":"1",
+                        "receiptedFlag":null,
+                        "receiptedType":null,
+                        "paying":"0",
+                        "shopProductAmount":90,
+                        "shopPostFee":0,
+                        "shopTaxFee":4.6,
+                        "shouldPayShopAmount":94.6,
+                        "payedShopAmount":0,
+                        "shopOtherFee":0,
+                        "refunding":null,
+                        "costType":null,
+                        "proportional":null,
+                        "modifyShouldPayNote":null,
+                        "modifyShouldPayUserID":null,
+                        "modifyShouldPayDate":null,
+                        "zeroCostFlag":0,
+                        "shopName":"深圳市美轮美奂服务有限公司",
+                        "shopLogo":"https://www-b.caimei365.com/img/default/suppliver.jpg",
+                        "logisticsRecordList":null,
+                        "orderProductList":[
+                            {
+                                "orderProductID":29355,
+                                "orderNo":"X161613541392914",
+                                "orderID":15208,
+                                "shopOrderID":19372,
+                                "shopOrderNo":"X16161354139291401",
+                                "shopID":10134,
+                                "productID":6420,
+                                "organizeProductID":null,
+                                "organizeID":null,
+                                "num":1,
+                                "presentNum":0,
+                                "outStoreType":null,
+                                "skuID":null,
+                                "props":null,
+                                "propName":null,
+                                "productNo":null,
+                                "price":28.325,
+                                "normalPrice":25.75,
+                                "costPrice":20,
+                                "price0":25.75,
+                                "price1":25.75,
+                                "totalAmount":25.75,
+                                "totalFee":28.33,
+                                "shouldPayFee":28.33,
+                                "discount":100,
+                                "discountPrice":30.905,
+                                "includedTax":"0",
+                                "invoiceType":"2",
+                                "taxRate":10,
+                                "supplierTaxRate":10,
+                                "addedValueTax":2.58,
+                                "totalAddedValueTax":2.58,
+                                "shouldPayTotalTax":2,
+                                "singleShouldPayTotalTax":2,
+                                "shopProductAmount":20,
+                                "shopFee":22,
+                                "otherFee":0,
+                                "cmFee":6.33,
+                                "singleShopFee":22,
+                                "singleOtherFee":0,
+                                "singleCmFee":6.33,
+                                "status":null,
+                                "commentFlag":"0",
+                                "totalBeans":0,
+                                "useBalanceAmount":0,
+                                "useBeanAmount":null,
+                                "notOutStore":1,
+                                "cmbeanPrice":null,
+                                "isActProduct":"0",
+                                "isGiftProduct":"0",
+                                "productActInfo":null,
+                                "buyAgainFlag":"0",
+                                "confirmProductFlag":"0",
+                                "payStatus":"0",
+                                "shopName":"深圳市美轮美奂服务有限公司",
+                                "name":"【测试用】润百颜注射修饰透明质酸钠凝胶1ml",
+                                "productUnit":"盒",
+                                "productImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHIIWATL05AAGHUpelz2U374.jpg",
+                                "actType":null,
+                                "actPreferential":0,
+                                "productType":"0",
+                                "orderPromotionsId":null,
+                                "preferential":0,
+                                "discountFee":0,
+                                "cancelNum":null,
+                                "ladderPriceFlag":0,
+                                "shipmentsNum":null,
+                                "returnedNum":null,
+                                "actualCancelNum":null,
+                                "aliasName":null,
+                                "productCategory":"1",
+                                "secondHandType":null,
+                                "productPromotion":null,
+                                "includedTaxFlag":null
+                            },
+                            {
+                                "orderProductID":29356,
+                                "orderNo":"X161613541392914",
+                                "orderID":15208,
+                                "shopOrderID":19372,
+                                "shopOrderNo":"X16161354139291401",
+                                "shopID":10134,
+                                "productID":6419,
+                                "organizeProductID":null,
+                                "organizeID":null,
+                                "num":1,
+                                "presentNum":0,
+                                "outStoreType":null,
+                                "skuID":null,
+                                "props":null,
+                                "propName":null,
+                                "productNo":null,
+                                "price":28.5325,
+                                "normalPrice":25.25,
+                                "costPrice":20,
+                                "price0":25.25,
+                                "price1":25.25,
+                                "totalAmount":25.25,
+                                "totalFee":28.53,
+                                "shouldPayFee":28.53,
+                                "discount":100,
+                                "discountPrice":31.8125,
+                                "includedTax":"0",
+                                "invoiceType":"1",
+                                "taxRate":13,
+                                "supplierTaxRate":13,
+                                "addedValueTax":3.28,
+                                "totalAddedValueTax":3.28,
+                                "shouldPayTotalTax":2.6,
+                                "singleShouldPayTotalTax":2.6,
+                                "shopProductAmount":20,
+                                "shopFee":22.6,
+                                "otherFee":0,
+                                "cmFee":5.93,
+                                "singleShopFee":22.6,
+                                "singleOtherFee":0,
+                                "singleCmFee":5.93,
+                                "status":null,
+                                "commentFlag":"0",
+                                "totalBeans":0,
+                                "useBalanceAmount":0,
+                                "useBeanAmount":null,
+                                "notOutStore":1,
+                                "cmbeanPrice":null,
+                                "isActProduct":"0",
+                                "isGiftProduct":"0",
+                                "productActInfo":null,
+                                "buyAgainFlag":"0",
+                                "confirmProductFlag":"0",
+                                "payStatus":"0",
+                                "shopName":"深圳市美轮美奂服务有限公司",
+                                "name":"【测试用】Dermaheal HSR 德玛莉肌活丝蕴凝颜精华液",
+                                "productUnit":"片",
+                                "productImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHH8aAFiGIAAGHr5DovGA124.jpg",
+                                "actType":null,
+                                "actPreferential":0,
+                                "productType":"0",
+                                "orderPromotionsId":null,
+                                "preferential":0,
+                                "discountFee":0,
+                                "cancelNum":null,
+                                "ladderPriceFlag":0,
+                                "shipmentsNum":null,
+                                "returnedNum":null,
+                                "actualCancelNum":null,
+                                "aliasName":null,
+                                "productCategory":"1",
+                                "secondHandType":null,
+                                "productPromotion":null,
+                                "includedTaxFlag":null
+                            },
+                            {
+                                "orderProductID":29357,
+                                "orderNo":"X161613541392914",
+                                "orderID":15208,
+                                "shopOrderID":19372,
+                                "shopOrderNo":"X16161354139291401",
+                                "shopID":10134,
+                                "productID":6421,
+                                "organizeProductID":null,
+                                "organizeID":null,
+                                "num":5,
+                                "presentNum":0,
+                                "outStoreType":null,
+                                "skuID":null,
+                                "props":null,
+                                "propName":null,
+                                "productNo":null,
+                                "price":15.25,
+                                "normalPrice":15.25,
+                                "costPrice":10,
+                                "price0":15.25,
+                                "price1":15.25,
+                                "totalAmount":76.25,
+                                "totalFee":60,
+                                "shouldPayFee":60,
+                                "discount":100,
+                                "discountPrice":15.25,
+                                "includedTax":"0",
+                                "invoiceType":"3",
+                                "taxRate":0,
+                                "supplierTaxRate":0,
+                                "addedValueTax":0,
+                                "totalAddedValueTax":0,
+                                "shouldPayTotalTax":0,
+                                "singleShouldPayTotalTax":0,
+                                "shopProductAmount":50,
+                                "shopFee":50,
+                                "otherFee":0,
+                                "cmFee":26.25,
+                                "singleShopFee":10,
+                                "singleOtherFee":0,
+                                "singleCmFee":5.25,
+                                "status":null,
+                                "commentFlag":"0",
+                                "totalBeans":0,
+                                "useBalanceAmount":0,
+                                "useBeanAmount":null,
+                                "notOutStore":5,
+                                "cmbeanPrice":null,
+                                "isActProduct":"1",
+                                "isGiftProduct":"0",
+                                "productActInfo":null,
+                                "buyAgainFlag":"0",
+                                "confirmProductFlag":"0",
+                                "payStatus":"0",
+                                "shopName":"深圳市美轮美奂服务有限公司",
+                                "name":"【测试用】肌本演绎【O4元素破茧疗法】25800 特惠方案",
+                                "productUnit":"瓶",
+                                "productImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHJGCARS7iAAVlWLR-uKU385.jpg",
+                                "actType":null,
+                                "actPreferential":0,
+                                "productType":"0",
+                                "orderPromotionsId":396,
+                                "preferential":0,
+                                "discountFee":0,
+                                "cancelNum":null,
+                                "ladderPriceFlag":0,
+                                "shipmentsNum":null,
+                                "returnedNum":null,
+                                "actualCancelNum":null,
+                                "aliasName":null,
+                                "productCategory":"1",
+                                "secondHandType":null,
+                                "productPromotion":{
+                                    "id":396,
+                                    "name":"优惠价",
+                                    "description":null,
+                                    "type":1,
+                                    "mode":1,
+                                    "touchPrice":12,
+                                    "reducedPrice":null,
+                                    "beginTime":null,
+                                    "endTime":null,
+                                    "status":1,
+                                    "supplierId":null,
+                                    "productId":null,
+                                    "orderId":15208,
+                                    "productList":null,
+                                    "giftList":null,
+                                    "products":null
+                                },
+                                "includedTaxFlag":null
+                            }
+                        ],
+                        "userInfo":null,
+                        "name":null,
+                        "receiptStatus":null,
+                        "shopPromotion":null,
+                        "shouHuoRen":null
+                    }
+                ],
+                "clubName":"正经一点机构",
+                "invoiceStatus":false,
+                "payButton":false,
+                "expensesOfTaxation":null
+            },
+            {
+                "orderID":15207,
+                "orderNo":"P161612466484974",
+                "organizeID":0,
+                "userID":11063,
+                "buyUserID":null,
+                "shopOrderIDs":"19371",
+                "orderSubmitType":4,
+                "orderType":0,
+                "hasActProduct":null,
+                "autoCloseTimeMills":0,
+                "status":"0",
+                "receiptStatus":"1",
+                "payStatus":"1",
+                "sendOutStatus":"1",
+                "refundType":"0",
+                "paySuccessCounter":0,
+                "payFlag":"0",
+                "onlinePayFlag":"0",
+                "productTotalFee":3000,
+                "orderTotalFee":3390,
+                "payTotalFee":3390,
+                "payableAmount":3390,
+                "balancePayFee":0,
+                "preferential":0,
+                "discountFee":0,
+                "promotionFullReduction":0,
+                "spID":1401,
+                "mainSpID":null,
+                "note":"",
+                "clubID":5638,
+                "clubScanTime":null,
+                "payWay":null,
+                "orderSource":"4",
+                "closeTime":null,
+                "confirmTime":null,
+                "payTime":null,
+                "orderTime":"2021-03-19 11:30:48",
+                "productCount":10,
+                "presentCount":0,
+                "promotionalGiftsCount":0,
+                "cooFreeFlag":null,
+                "cooFreeRate":null,
+                "cooFreeAmount":null,
+                "invoiceFlag":null,
+                "confirmFlag":"0",
+                "clauseID":1,
+                "clauseContent":"",
+                "clauseName":"无条款",
+                "updateDate":null,
+                "freePostFlag":"0",
+                "freight":0,
+                "delFlag":"0",
+                "freePostageTicketID":null,
+                "splitFlag":"1",
+                "closeReason":null,
+                "postageOrderFlag":"0",
+                "thirdPartyOrderNo":null,
+                "secondHandOrderFlag":"0",
+                "affirmPaymentFlag":"0",
+                "rebateFlag":"0",
+                "zeroCostFlag":0,
+                "orderState":null,
+                "orderMark":null,
+                "receiptAmount":0,
+                "pendingPayments":3390,
+                "returnedPurchaseFee":null,
+                "shopOrderList":[
+                    {
+                        "shopOrderID":19371,
+                        "shopOrderNo":"P16161246648497401",
+                        "orderNo":"P161612466484974",
+                        "orderID":15207,
+                        "organizeID":null,
+                        "userID":11063,
+                        "shopID":1001,
+                        "orderPromotionsId":null,
+                        "orderType":0,
+                        "orderSubmitType":4,
+                        "presentNum":0,
+                        "itemCount":10,
+                        "outStoreNum":0,
+                        "outStoreTimes":0,
+                        "townID":null,
+                        "note":null,
+                        "fee":null,
+                        "accountAmount":0,
+                        "productAmount":3000,
+                        "totalAmount":3390,
+                        "needPayAmount":3390,
+                        "discountAmount":0,
+                        "discountFee":0,
+                        "preferential":0,
+                        "promotionFullReduction":0,
+                        "payFlag":"0",
+                        "orderTime":"2021-03-19 11:30:48",
+                        "payTime":null,
+                        "finishTime":null,
+                        "autoOverTimeMills":0,
+                        "status":null,
+                        "payStatus":"1",
+                        "sendOutStatus":"1",
+                        "refundStatus":null,
+                        "returnGoodsStatus":null,
+                        "receiveGoodsTime":null,
+                        "autoReceiveTimeMills":0,
+                        "totalAddedValueTax":390,
+                        "canRefundAmount":0,
+                        "refundAmount":0,
+                        "clubID":5638,
+                        "spID":null,
+                        "mainSpID":null,
+                        "orderBeanAmount":null,
+                        "useBeanAmount":null,
+                        "useBeanFlag":null,
+                        "canRefundFlag":null,
+                        "useBalanceFlag":null,
+                        "canRefundBeans":null,
+                        "freePostageFee":null,
+                        "freePostageTicketID":null,
+                        "brokerage":-836.3,
+                        "delFlag":"0",
+                        "refundsAmount":null,
+                        "orderStatusFlag":null,
+                        "buyStatus":null,
+                        "deliveryTimeMills":null,
+                        "orderDeliveryID":null,
+                        "splitFlag":"1",
+                        "receiptedFlag":null,
+                        "receiptedType":null,
+                        "paying":"0",
+                        "shopProductAmount":3051,
+                        "shopPostFee":0,
+                        "shopTaxFee":396.63,
+                        "shouldPayShopAmount":3447.63,
+                        "payedShopAmount":0,
+                        "shopOtherFee":0,
+                        "refunding":null,
+                        "costType":null,
+                        "proportional":null,
+                        "modifyShouldPayNote":null,
+                        "modifyShouldPayUserID":null,
+                        "modifyShouldPayDate":null,
+                        "zeroCostFlag":0,
+                        "shopName":"香港丽润国际",
+                        "shopLogo":"https://www-b.caimei365.com/uploadFile/shopLogo/ZXV6IIFSP520140415035836.jpg",
+                        "logisticsRecordList":null,
+                        "orderProductList":[
+                            {
+                                "orderProductID":29354,
+                                "orderNo":"P161612466484974",
+                                "orderID":15207,
+                                "shopOrderID":19371,
+                                "shopOrderNo":"P16161246648497401",
+                                "shopID":1001,
+                                "productID":1011,
+                                "organizeProductID":null,
+                                "organizeID":null,
+                                "num":10,
+                                "presentNum":0,
+                                "outStoreType":null,
+                                "skuID":null,
+                                "props":null,
+                                "propName":null,
+                                "productNo":"Q1MMB1011",
+                                "price":339,
+                                "normalPrice":446.18,
+                                "costPrice":305.1,
+                                "price0":300,
+                                "price1":null,
+                                "totalAmount":3000,
+                                "totalFee":3390,
+                                "shouldPayFee":3390,
+                                "discount":100,
+                                "discountPrice":378,
+                                "includedTax":"0",
+                                "invoiceType":"2",
+                                "taxRate":13,
+                                "supplierTaxRate":13,
+                                "addedValueTax":39,
+                                "totalAddedValueTax":390,
+                                "shouldPayTotalTax":396.63,
+                                "singleShouldPayTotalTax":39.66,
+                                "shopProductAmount":3051,
+                                "shopFee":3836.3,
+                                "otherFee":0,
+                                "cmFee":-836.3,
+                                "singleShopFee":383.63,
+                                "singleOtherFee":0,
+                                "singleCmFee":-83.63,
+                                "status":"0",
+                                "commentFlag":"0",
+                                "totalBeans":null,
+                                "useBalanceAmount":0,
+                                "useBeanAmount":null,
+                                "notOutStore":10,
+                                "cmbeanPrice":null,
+                                "isActProduct":"0",
+                                "isGiftProduct":"0",
+                                "productActInfo":null,
+                                "buyAgainFlag":"1",
+                                "confirmProductFlag":"0",
+                                "payStatus":"0",
+                                "shopName":"香港丽润国际",
+                                "name":"阶雪山之恋保湿滋润面霜",
+                                "productUnit":"50ml",
+                                "productImage":"https://img-b.caimei365.com/group1/M00/03/09/Cmgy61-Gqq6AcI4pAACGvvokTl0257.jpg",
+                                "actType":null,
+                                "actPreferential":0,
+                                "productType":"0",
+                                "orderPromotionsId":null,
+                                "preferential":0,
+                                "discountFee":0,
+                                "cancelNum":null,
+                                "ladderPriceFlag":1,
+                                "shipmentsNum":null,
+                                "returnedNum":null,
+                                "actualCancelNum":null,
+                                "aliasName":null,
+                                "productCategory":"1",
+                                "secondHandType":null,
+                                "productPromotion":null,
+                                "includedTaxFlag":null
+                            }
+                        ],
+                        "userInfo":null,
+                        "name":null,
+                        "receiptStatus":null,
+                        "shopPromotion":null,
+                        "shouHuoRen":null
+                    }
+                ],
+                "clubName":"正经一点机构",
+                "invoiceStatus":false,
+                "payButton":true,
+                "expensesOfTaxation":null
+            },
+            {
+                "orderID":15189,
+                "orderNo":"X161605858703888",
+                "organizeID":0,
+                "userID":11063,
+                "buyUserID":11062,
+                "shopOrderIDs":"19353",
+                "orderSubmitType":3,
+                "orderType":0,
+                "hasActProduct":"0",
+                "autoCloseTimeMills":0,
+                "status":"0",
+                "receiptStatus":"1",
+                "payStatus":"1",
+                "sendOutStatus":"1",
+                "refundType":"0",
+                "paySuccessCounter":0,
+                "payFlag":"0",
+                "onlinePayFlag":"0",
+                "productTotalFee":49.78,
+                "orderTotalFee":49.78,
+                "payTotalFee":49.78,
+                "payableAmount":49.78,
+                "balancePayFee":0,
+                "preferential":0,
+                "discountFee":0,
+                "promotionFullReduction":0,
+                "spID":1401,
+                "mainSpID":1304,
+                "note":null,
+                "clubID":5638,
+                "clubScanTime":null,
+                "payWay":null,
+                "orderSource":"6",
+                "closeTime":null,
+                "confirmTime":null,
+                "payTime":null,
+                "orderTime":"2021-03-18 17:09:47",
+                "productCount":1,
+                "presentCount":0,
+                "promotionalGiftsCount":0,
+                "cooFreeFlag":"0",
+                "cooFreeRate":0,
+                "cooFreeAmount":0,
+                "invoiceFlag":"0",
+                "confirmFlag":"0",
+                "clauseID":1,
+                "clauseContent":null,
+                "clauseName":"无条款",
+                "updateDate":"2021-03-18 17:09:47",
+                "freePostFlag":"-1",
+                "freight":0,
+                "delFlag":"0",
+                "freePostageTicketID":null,
+                "splitFlag":"1",
+                "closeReason":null,
+                "postageOrderFlag":"0",
+                "thirdPartyOrderNo":null,
+                "secondHandOrderFlag":"0",
+                "affirmPaymentFlag":"0",
+                "rebateFlag":"0",
+                "zeroCostFlag":0,
+                "orderState":null,
+                "orderMark":null,
+                "receiptAmount":0,
+                "pendingPayments":49.78,
+                "returnedPurchaseFee":null,
+                "shopOrderList":[
+                    {
+                        "shopOrderID":19353,
+                        "shopOrderNo":"X16160585870388801",
+                        "orderNo":"X161605858703888",
+                        "orderID":15189,
+                        "organizeID":null,
+                        "userID":11063,
+                        "shopID":10133,
+                        "orderPromotionsId":null,
+                        "orderType":0,
+                        "orderSubmitType":3,
+                        "presentNum":0,
+                        "itemCount":1,
+                        "outStoreNum":0,
+                        "outStoreTimes":0,
+                        "townID":null,
+                        "note":"",
+                        "fee":-1,
+                        "accountAmount":0,
+                        "productAmount":45.25,
+                        "totalAmount":49.78,
+                        "needPayAmount":49.78,
+                        "discountAmount":null,
+                        "discountFee":0,
+                        "preferential":0,
+                        "promotionFullReduction":0,
+                        "payFlag":"0",
+                        "orderTime":"2021-03-18 17:09:47",
+                        "payTime":null,
+                        "finishTime":null,
+                        "autoOverTimeMills":null,
+                        "status":1,
+                        "payStatus":"1",
+                        "sendOutStatus":"1",
+                        "refundStatus":0,
+                        "returnGoodsStatus":null,
+                        "receiveGoodsTime":null,
+                        "autoReceiveTimeMills":null,
+                        "totalAddedValueTax":null,
+                        "canRefundAmount":49.775,
+                        "refundAmount":null,
+                        "clubID":5638,
+                        "spID":1401,
+                        "mainSpID":1304,
+                        "orderBeanAmount":0,
+                        "useBeanAmount":0,
+                        "useBeanFlag":0,
+                        "canRefundFlag":1,
+                        "useBalanceFlag":0,
+                        "canRefundBeans":null,
+                        "freePostageFee":null,
+                        "freePostageTicketID":null,
+                        "brokerage":5.78,
+                        "delFlag":"0",
+                        "refundsAmount":0,
+                        "orderStatusFlag":"1",
+                        "buyStatus":"1",
+                        "deliveryTimeMills":null,
+                        "orderDeliveryID":null,
+                        "splitFlag":"0",
+                        "receiptedFlag":null,
+                        "receiptedType":null,
+                        "paying":"0",
+                        "shopProductAmount":40,
+                        "shopPostFee":0,
+                        "shopTaxFee":4,
+                        "shouldPayShopAmount":44,
+                        "payedShopAmount":0,
+                        "shopOtherFee":0,
+                        "refunding":null,
+                        "costType":null,
+                        "proportional":null,
+                        "modifyShouldPayNote":null,
+                        "modifyShouldPayUserID":null,
+                        "modifyShouldPayDate":null,
+                        "zeroCostFlag":0,
+                        "shopName":"深圳市采美奥泰贸易有限公司",
+                        "shopLogo":"https://www-b.caimei365.com/uploadFile/shopLogo//userfiles/1/images/photo/2021/01/Cmis21__5o-ADIQEAAD1N_9T1C4174.jpg",
+                        "logisticsRecordList":null,
+                        "orderProductList":[
+                            {
+                                "orderProductID":29336,
+                                "orderNo":"X161605858703888",
+                                "orderID":15189,
+                                "shopOrderID":19353,
+                                "shopOrderNo":"X16160585870388801",
+                                "shopID":10133,
+                                "productID":6418,
+                                "organizeProductID":null,
+                                "organizeID":null,
+                                "num":1,
+                                "presentNum":0,
+                                "outStoreType":null,
+                                "skuID":null,
+                                "props":null,
+                                "propName":null,
+                                "productNo":null,
+                                "price":49.775,
+                                "normalPrice":45.25,
+                                "costPrice":40,
+                                "price0":45.25,
+                                "price1":45.25,
+                                "totalAmount":45.25,
+                                "totalFee":49.78,
+                                "shouldPayFee":49.78,
+                                "discount":100,
+                                "discountPrice":54.305,
+                                "includedTax":"0",
+                                "invoiceType":"2",
+                                "taxRate":10,
+                                "supplierTaxRate":10,
+                                "addedValueTax":4.53,
+                                "totalAddedValueTax":4.53,
+                                "shouldPayTotalTax":4,
+                                "singleShouldPayTotalTax":4,
+                                "shopProductAmount":40,
+                                "shopFee":44,
+                                "otherFee":0,
+                                "cmFee":5.78,
+                                "singleShopFee":44,
+                                "singleOtherFee":0,
+                                "singleCmFee":5.78,
+                                "status":null,
+                                "commentFlag":"0",
+                                "totalBeans":0,
+                                "useBalanceAmount":0,
+                                "useBeanAmount":null,
+                                "notOutStore":1,
+                                "cmbeanPrice":null,
+                                "isActProduct":"0",
+                                "isGiftProduct":"0",
+                                "productActInfo":null,
+                                "buyAgainFlag":"0",
+                                "confirmProductFlag":"0",
+                                "payStatus":"0",
+                                "shopName":"深圳市采美奥泰贸易有限公司",
+                                "name":"【测试用】EndyMed-3Deep-医学美容多功能相控射频",
+                                "productUnit":"台",
+                                "productImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHEMOAFVmsAAGOILQcRyE020.jpg",
+                                "actType":null,
+                                "actPreferential":0,
+                                "productType":"0",
+                                "orderPromotionsId":null,
+                                "preferential":0,
+                                "discountFee":0,
+                                "cancelNum":null,
+                                "ladderPriceFlag":0,
+                                "shipmentsNum":null,
+                                "returnedNum":null,
+                                "actualCancelNum":null,
+                                "aliasName":null,
+                                "productCategory":"1",
+                                "secondHandType":null,
+                                "productPromotion":null,
+                                "includedTaxFlag":null
+                            }
+                        ],
+                        "userInfo":null,
+                        "name":null,
+                        "receiptStatus":null,
+                        "shopPromotion":null,
+                        "shouHuoRen":null
+                    }
+                ],
+                "clubName":"正经一点机构",
+                "invoiceStatus":false,
+                "payButton":true,
+                "expensesOfTaxation":null
+            },
+            {
+                "orderID":15170,
+                "orderNo":"X161595081871691",
+                "organizeID":0,
+                "userID":11063,
+                "buyUserID":11062,
+                "shopOrderIDs":"19325",
+                "orderSubmitType":3,
+                "orderType":0,
+                "hasActProduct":"0",
+                "autoCloseTimeMills":0,
+                "status":"0",
+                "receiptStatus":"1",
+                "payStatus":"1",
+                "sendOutStatus":"1",
+                "refundType":"0",
+                "paySuccessCounter":0,
+                "payFlag":"0",
+                "onlinePayFlag":"0",
+                "productTotalFee":61,
+                "orderTotalFee":61,
+                "payTotalFee":61,
+                "payableAmount":61,
+                "balancePayFee":0,
+                "preferential":0,
+                "discountFee":0,
+                "promotionFullReduction":0,
+                "spID":1401,
+                "mainSpID":1304,
+                "note":null,
+                "clubID":5638,
+                "clubScanTime":null,
+                "payWay":null,
+                "orderSource":"6",
+                "closeTime":null,
+                "confirmTime":null,
+                "payTime":null,
+                "orderTime":"2021-03-17 11:13:38",
+                "productCount":4,
+                "presentCount":0,
+                "promotionalGiftsCount":0,
+                "cooFreeFlag":"0",
+                "cooFreeRate":0,
+                "cooFreeAmount":0,
+                "invoiceFlag":"2",
+                "confirmFlag":"0",
+                "clauseID":1,
+                "clauseContent":null,
+                "clauseName":"无条款",
+                "updateDate":"2021-03-17 11:13:38",
+                "freePostFlag":"0",
+                "freight":0,
+                "delFlag":"0",
+                "freePostageTicketID":null,
+                "splitFlag":"1",
+                "closeReason":null,
+                "postageOrderFlag":"0",
+                "thirdPartyOrderNo":null,
+                "secondHandOrderFlag":"0",
+                "affirmPaymentFlag":"0",
+                "rebateFlag":"0",
+                "zeroCostFlag":0,
+                "orderState":null,
+                "orderMark":null,
+                "receiptAmount":0,
+                "pendingPayments":61,
+                "returnedPurchaseFee":null,
+                "shopOrderList":[
+                    {
+                        "shopOrderID":19325,
+                        "shopOrderNo":"X16159508187169101",
+                        "orderNo":"X161595081871691",
+                        "orderID":15170,
+                        "organizeID":0,
+                        "userID":11063,
+                        "shopID":10134,
+                        "orderPromotionsId":null,
+                        "orderType":0,
+                        "orderSubmitType":3,
+                        "presentNum":0,
+                        "itemCount":4,
+                        "outStoreNum":0,
+                        "outStoreTimes":0,
+                        "townID":null,
+                        "note":"",
+                        "fee":0,
+                        "accountAmount":0,
+                        "productAmount":61,
+                        "totalAmount":61,
+                        "needPayAmount":61,
+                        "discountAmount":null,
+                        "discountFee":0,
+                        "preferential":0,
+                        "promotionFullReduction":0,
+                        "payFlag":"0",
+                        "orderTime":"2021-03-17 11:13:38",
+                        "payTime":null,
+                        "finishTime":null,
+                        "autoOverTimeMills":null,
+                        "status":1,
+                        "payStatus":"1",
+                        "sendOutStatus":"1",
+                        "refundStatus":0,
+                        "returnGoodsStatus":null,
+                        "receiveGoodsTime":null,
+                        "autoReceiveTimeMills":null,
+                        "totalAddedValueTax":null,
+                        "canRefundAmount":61,
+                        "refundAmount":null,
+                        "clubID":5638,
+                        "spID":1401,
+                        "mainSpID":1304,
+                        "orderBeanAmount":0,
+                        "useBeanAmount":0,
+                        "useBeanFlag":0,
+                        "canRefundFlag":1,
+                        "useBalanceFlag":0,
+                        "canRefundBeans":null,
+                        "freePostageFee":null,
+                        "freePostageTicketID":null,
+                        "brokerage":21,
+                        "delFlag":"0",
+                        "refundsAmount":0,
+                        "orderStatusFlag":"1",
+                        "buyStatus":"1",
+                        "deliveryTimeMills":null,
+                        "orderDeliveryID":null,
+                        "splitFlag":"1",
+                        "receiptedFlag":null,
+                        "receiptedType":null,
+                        "paying":"0",
+                        "shopProductAmount":40,
+                        "shopPostFee":0,
+                        "shopTaxFee":0,
+                        "shouldPayShopAmount":40,
+                        "payedShopAmount":0,
+                        "shopOtherFee":0,
+                        "refunding":null,
+                        "costType":null,
+                        "proportional":null,
+                        "modifyShouldPayNote":null,
+                        "modifyShouldPayUserID":null,
+                        "modifyShouldPayDate":null,
+                        "zeroCostFlag":0,
+                        "shopName":"深圳市美轮美奂服务有限公司",
+                        "shopLogo":"https://www-b.caimei365.com/img/default/suppliver.jpg",
+                        "logisticsRecordList":null,
+                        "orderProductList":[
+                            {
+                                "orderProductID":29294,
+                                "orderNo":"X161595081871691",
+                                "orderID":15170,
+                                "shopOrderID":19325,
+                                "shopOrderNo":"X16159508187169101",
+                                "shopID":10134,
+                                "productID":6421,
+                                "organizeProductID":null,
+                                "organizeID":0,
+                                "num":4,
+                                "presentNum":0,
+                                "outStoreType":null,
+                                "skuID":null,
+                                "props":null,
+                                "propName":null,
+                                "productNo":null,
+                                "price":15.25,
+                                "normalPrice":15.25,
+                                "costPrice":10,
+                                "price0":15.25,
+                                "price1":15.25,
+                                "totalAmount":61,
+                                "totalFee":61,
+                                "shouldPayFee":61,
+                                "discount":100,
+                                "discountPrice":15.25,
+                                "includedTax":"0",
+                                "invoiceType":"3",
+                                "taxRate":0,
+                                "supplierTaxRate":0,
+                                "addedValueTax":0,
+                                "totalAddedValueTax":0,
+                                "shouldPayTotalTax":0,
+                                "singleShouldPayTotalTax":0,
+                                "shopProductAmount":40,
+                                "shopFee":40,
+                                "otherFee":0,
+                                "cmFee":21,
+                                "singleShopFee":10,
+                                "singleOtherFee":0,
+                                "singleCmFee":5.25,
+                                "status":null,
+                                "commentFlag":"0",
+                                "totalBeans":0,
+                                "useBalanceAmount":0,
+                                "useBeanAmount":null,
+                                "notOutStore":4,
+                                "cmbeanPrice":null,
+                                "isActProduct":"0",
+                                "isGiftProduct":"0",
+                                "productActInfo":null,
+                                "buyAgainFlag":"0",
+                                "confirmProductFlag":"0",
+                                "payStatus":"0",
+                                "shopName":"深圳市美轮美奂服务有限公司",
+                                "name":"【测试用】肌本演绎【O4元素破茧疗法】25800 特惠方案",
+                                "productUnit":"瓶",
+                                "productImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHJGCARS7iAAVlWLR-uKU385.jpg",
+                                "actType":null,
+                                "actPreferential":0,
+                                "productType":"0",
+                                "orderPromotionsId":null,
+                                "preferential":0,
+                                "discountFee":0,
+                                "cancelNum":null,
+                                "ladderPriceFlag":0,
+                                "shipmentsNum":null,
+                                "returnedNum":null,
+                                "actualCancelNum":null,
+                                "aliasName":null,
+                                "productCategory":"1",
+                                "secondHandType":null,
+                                "productPromotion":null,
+                                "includedTaxFlag":null
+                            }
+                        ],
+                        "userInfo":null,
+                        "name":null,
+                        "receiptStatus":null,
+                        "shopPromotion":null,
+                        "shouHuoRen":null
+                    }
+                ],
+                "clubName":"正经一点机构",
+                "invoiceStatus":false,
+                "payButton":false,
+                "expensesOfTaxation":null
+            }
+        ]
 module.exports = {
 	addressList,
 	cartList,
-	productList
+	productList,
+	orderDataList
 }

+ 1 - 1
components/cm-custom/au-custom.vue

@@ -92,7 +92,7 @@
 		 padding-right:40rpx;
 		 margin-top: 1px;
 	}
-	.navbar-icon .icon-iconfonticonfontsousuo1 {
+	.navbar-icon .icon-sousuo {
 		color: #000000;
 	}
 	.navbar-icon view {

+ 2 - 2
components/cm-custom/cm-custom.vue

@@ -12,7 +12,7 @@
 	  	</view>
 		<view class="navbar-icon" v-if="navbarData.showSearch == 1 ? true : false"
 			  :style="{top:capsule.top+'px;',right:(capsule.width)+'px;',height:capsule.height+'px;',lineHeight:capsule.height+'px;'}">
-			  <text @click.stop="_goSearchPath" class="iconfont icon-iconfonticonfontsousuo1"></text>
+			  <text @click.stop="_goSearchPath" class="iconfont icon-sousuo"></text>
 	  	</view>
 	</view>
 </template>
@@ -107,7 +107,7 @@
 		 padding-right:40rpx;
 		 margin-top: 1px;
 	}
-	.navbar-icon .icon-iconfonticonfontsousuo1 {
+	.navbar-icon .icon-sousuo {
 		color: #000000;
 	}
 	.navbar-icon view {

+ 1 - 1
components/cm-custom/cu-custom.vue

@@ -99,7 +99,7 @@
 		 padding-right:40rpx;
 		 margin-top: 1px;
 	}
-	.navbar-icon .icon-iconfonticonfontsousuo1 {
+	.navbar-icon .icon-sousuo {
 		color: #000000;
 	}
 	.navbar-icon view {

+ 53 - 53
components/cm-module/headerNavbar/header-back.vue

@@ -1,17 +1,17 @@
 <template name="headerNavbar">
 	<!-- 自定义导航栏 -->
-	<view class='navbar-wrap' :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
-	  	<view class="navbar-text" :style="{lineHeight:(navbarHeight - statusBarHeight)+'px;',fontSize:fontSizeSetting+'px;'}" :class="platformClass">
-	    	{{navbarData.title ? navbarData.title : " "}}
-	  	</view>
-	  	<view class="navbar-icon" v-if="navbarData.showCapsule == 1 ? true : false" 
+	<view class='navbar-wrap' :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
+	  	<view class="navbar-text" :style="{lineHeight:(navbarHeight - statusBarHeight)+'px;',fontSize:fontSizeSetting+'px;'}" :class="platformClass">
+	    	{{navbarData.title ? navbarData.title : " "}}
+	  	</view>
+	  	<view class="navbar-icon" v-if="navbarData.showCapsule == 1 ? true : false" 
 			  :style="{top:navbarBtn.top + statusBarHeight+'px;',left:(navbarBtn.right)+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}">
 			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-fanhui"></text>
-	  	</view>
+	  	</view>
 		<view class="navbar-icon" v-if="navbarData.showSearch == 1 ? true : false"
 			  :style="{top:navbarBtn.top + statusBarHeight+'px;',right:(navbarBtn.width)+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}">
-			  <text @click.stop="_goSearchPath" class="iconfont icon-iconfonticonfontsousuo1"></text>
-	  	</view>
+			  <text @click.stop="_goSearchPath" class="iconfont icon-sousuo"></text>
+	  	</view>
 	</view>
 </template>
 
@@ -42,14 +42,14 @@
 		data() {
 			return{
 				haveBack: true,     // 是否有返回按钮,true 有 false 没有 若从分享页进入则为 false
-			    statusBarHeight: 0, // 状态栏高度
-			    navbarHeight: 0,    // 顶部导航栏高度
-			    navbarBtn: {        // 胶囊位置信息
-			      height: 0,
-			      width: 0,
-			      top: 0,
-			      bottom: 0,
-			      right: 0
+			    statusBarHeight: 0, // 状态栏高度
+			    navbarHeight: 0,    // 顶部导航栏高度
+			    navbarBtn: {        // 胶囊位置信息
+			      height: 0,
+			      width: 0,
+			      top: 0,
+			      bottom: 0,
+			      right: 0
 				},
 				platformClass:'',
 				fontSizeSetting:0,
@@ -65,35 +65,35 @@
 			}else{
 				this.platformClass = 'center'
 			}
-		    /**
-		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
-		     * 菜单按键宽度: 87
-		     * 菜单按键高度: 32
-		     * 菜单按键左边界坐标: 278
-		     * 菜单按键上边界坐标: 26
-		     * 菜单按键右边界坐标: 365
-		     * 菜单按键下边界坐标: 58
-		     */
+		    /**
+		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
+		     * 菜单按键宽度: 87
+		     * 菜单按键高度: 32
+		     * 菜单按键左边界坐标: 278
+		     * 菜单按键上边界坐标: 26
+		     * 菜单按键右边界坐标: 365
+		     * 菜单按键下边界坐标: 58
+		     */
 			let btnPosi = { // 胶囊实际位置,坐标信息不是左上角原点
-			      height: headerPosi.height,
-			      width: headerPosi.width,
-			      // 胶囊top - 状态栏高度
-			      top: headerPosi.top - statusBarHeight,
-			      // 胶囊bottom - 胶囊height - 状态栏height (现胶囊bottom 为距离导航栏底部的长度)
-			      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-			      // 屏幕宽度 - 胶囊right
-			      right: this.systeminfo.screenWidth - headerPosi.right
+			      height: headerPosi.height,
+			      width: headerPosi.width,
+			      // 胶囊top - 状态栏高度
+			      top: headerPosi.top - statusBarHeight,
+			      // 胶囊bottom - 胶囊height - 状态栏height (现胶囊bottom 为距离导航栏底部的长度)
+			      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+			      // 屏幕宽度 - 胶囊right
+			      right: this.systeminfo.screenWidth - headerPosi.right
 			}
 			let haveBack;
 			if (getCurrentPages().length === 1) { // 当只有一个页面时
-			     haveBack = false;
+			     haveBack = false;
 			} else {
-			     haveBack = true;
+			     haveBack = true;
 			}
-		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
-		    this.statusBarHeight=statusBarHeight,
-		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
-		    this.navbarBtn=btnPosi
+		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
+		    this.statusBarHeight=statusBarHeight,
+		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
+		    this.navbarBtn=btnPosi
 		},
 		onLoad(){
 			
@@ -106,20 +106,20 @@
 					this._goUser()
 				}else{
 					uni.navigateBack({
-			        	delta: 1
-			      	});
+			        	delta: 1
+			      	});
 				}
-		    },
-		    _goHome: function () {
-		      	uni.switchTab({
-		        	url: '/pages/tabBar/home/index'
-		      	})
-		    },
-		    _goUser: function () {
-		      	uni.switchTab({
-		        	url: '/pages/tabBar/user/user'
-		      	})
-		    },
+		    },
+		    _goHome: function () {
+		      	uni.switchTab({
+		        	url: '/pages/tabBar/home/index'
+		      	})
+		    },
+		    _goUser: function () {
+		      	uni.switchTab({
+		        	url: '/pages/tabBar/user/user'
+		      	})
+		    },
 			_goSearchPath:function () {
 				this.$emit('goSearchPath')
 			}
@@ -163,7 +163,7 @@
 		 padding-right:40rpx;
 		 margin-top: 1px;
 	}
-	.navbar-icon .icon-iconfonticonfontsousuo1 {
+	.navbar-icon .icon-sousuo {
 		color: #000000;
 	}
 	.navbar-icon view {

+ 3 - 3
components/cm-module/home/cm-custom.vue

@@ -19,7 +19,7 @@
 				</tui-bubble-popup>
 			</view>
 			<view class="gosearch-btn" @click="this.$api.navigateTo(clickPath)">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+				<text class="iconfont icon-sousuo"></text>
 				<input class="input" type="text" v-model="SearchText" value="" placeholder="你想要的这里都有"/>
 			</view>
 			<view class="search-service">
@@ -145,7 +145,7 @@
 		 padding-right:40rpx;
 		 margin-top: 1px;
 	}
-	.navbar-icon .icon-iconfonticonfontsousuo1 {
+	.navbar-icon .icon-sousuo {
 		color: #000000;
 	}
 	.navbar-icon view {
@@ -189,7 +189,7 @@
 			background: #FFFFFF;
 			position: relative;
 			box-sizing: border-box;
-			.icon-iconfonticonfontsousuo1{
+			.icon-sousuo{
 				width: 70rpx;
 				height: 70rpx;
 				line-height: 70rpx;

+ 0 - 150
components/cm-module/modelAlert/sellerShareAlert.vue

@@ -1,150 +0,0 @@
-<template name="sharealert">
-	<view class="alert spec" :class="specClass">
-		<view class="model-warp">
-			<view class="content">
-				<view class="text-content">
-					<view class="title">分享订单</view>
-					<view class="share">您的分享码:<text class="txt">{{shareCode}}</text></view>
-					<view class="text">
-						<text>有效期为24小时。订单分享后若对方无法直接登录小程序查看订单,请提供该分享码给对方,通过输入分享码查看</text>
-					</view>
-				</view>				
-				<view class="alert-btn">
-					<view class="btn btn-cancel" @click="hideConfirm">取消</view>
-					<!-- #ifdef MP-WEIXIN -->
-					<button class="btn btn-confirm" open-type="share" @click="btnConfirm(shareCode)">去分享</button>
-					<!-- #endif -->
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:'sharealert',
-		props:{
-			orderID:{
-				type:Number
-			}
-		},
-		data() {
-			return{
-				shareCode:'',
-			}
-		},
-		created() {
-			this.getShareCode(this.orderID)
-		},
-		methods:{
-			getShareCode(res){
-				this.OrderService.QueryOrderShareCode({orderID:res}).then(response =>{
-					this.shareCode = response.data
-					this.$parent.shareCode = this.shareCode;
-				}).catch(error =>{
-					this.$parent.isShareModal = false;
-					this.$util.modal('提示',error.msg,'确定','',false,() =>{})
-				})
-			},
-			hideConfirm(){
-				this.$parent.isShareModal = false
-			},
-			btnConfirm(code){//点击事件
-				this.$emit('btnConfirm')
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	/*弹窗*/
-	 .model-warp.none{
-		 display: none;
-	 }
-	 .model-warp.show{
-		 display: block;
-	 }
-	 .model-warp{
-		width: 100%;
-		height: 100%;
-		background: rgba(0,0,0,0.3);
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 10000;
-		transition: all 0.4s;
-		&.none{
-			display: none;			
-		}
-		&.show{
-			display: block;
-		}
-		.content{
-			width: 518rpx;
-			height: 418rpx;
-			position: absolute;
-			background: $bg-color;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			top: 0;
-			margin: auto;
-			border-radius: 14rpx;
-			.text-content{
-				width: 448rpx;
-				height: 264rpx;
-				padding: 20rpx 35rpx;
-				float: left;
-				.title{
-					line-height: 40rpx;
-					font-size: $font-size-28;
-					color: $text-color;
-					text-align: center;
-					font-weight: bold;
-					margin-bottom: 36rpx;
-				}
-				.share{
-					line-height: 36rpx;
-					font-size: $font-size-26;
-					color: $text-color;
-					text-align: justify;
-					margin-top: 22rpx;
-					font-weight: normal;
-					.txt{
-						margin-left: 10rpx;
-						color: #FF2A2A;
-					}
-				}
-				.text{
-					line-height: 36rpx;
-					font-size: $font-size-26;
-					color: $text-color;
-					text-align: justify;
-					margin-top: 22rpx;
-				}
-			}
-			.alert-btn{
-				width: 80%;
-				height: 70rpx;
-				display: flex;
-				margin: 0 auto;
-				.btn{
-					flex: 1;
-					line-height: 70rpx;
-					font-size: $font-size-28;
-					text-align: center;
-					color: #FFFFFF;
-					border-radius: 35rpx;
-					padding: 0;
-					margin: 0 15rpx;
-					&.btn-cancel{
-						background: $btn-cancel;
-					}
-					&.btn-confirm{
-						background: $btn-confirm;
-					}
-				}
-			}
-		}	
-	}
-</style>

+ 95 - 66
components/cm-module/modelAlert/shareAlert.vue

@@ -1,19 +1,18 @@
-<template name="sharealert">
+<template name="alert">
 	<view class="alert spec" :class="specClass">
-		<view class="model-warp">
-			<view class="content">
+		<!-- 运费弹窗说明 -->
+		<view class="freight-alert"  @click.stop="hideConfirm">
+			<view class="content clearfix">
 				<view class="text-content">
-					<view class="title">分享订单</view>
-					<view class="share">您的分享码:<text class="txt">{{shareCode}}</text></view>
-					<view class="text">
-						<text>有效期为24小时。如果对方不是您机构的运营人员,需要输入该分享码才能查看本订单</text>
-					</view>
-				</view>				
-				<view class="alert-btn">
-					<view class="btn btn-cancel" @click="hideConfirm">取消</view>
+					<view class="text-t">分享码</view>
+					<view class="text-c">{{shareCode}} <text class="clipboard" @click.stop="clipboard(shareCode)">复制</text></view>
+					<view class="text-h1">有效期为72小时,分享后对方需要输入分享码才能查看订单。</view>
+				</view>
+				<view class="text-btn">
 					<!-- #ifdef MP-WEIXIN -->
-					<button class="btn btn-confirm" open-type="share" @click="btnConfirm(shareCode)">去分享</button>
+					<button class="btn" open-type="share" @click="btnConfirm(shareCode)">去分享</button>
 					<!-- #endif -->
+					<view class="btn-none" @click.stop="hideConfirm(shareCode)">取消</view>
 				</view>
 			</view>
 		</view>
@@ -21,10 +20,11 @@
 </template>
 
 <script>
+	const thorui = require("@/components/clipboard/clipboard.thorui.js")
 	export default{
-		name:'sharealert',
+		name:'alert',
 		props:{
-			orderID:{
+			shopOrderID:{
 				type:Number
 			}
 		},
@@ -34,11 +34,14 @@
 			}
 		},
 		created() {
-			this.getShareCode(this.orderID)
+			this.getShareCode(this.shopOrderID)
+		},
+		onLoad(){
+			
 		},
 		methods:{
-			getShareCode(res){
-				this.OrderService.QueryOrderShareCode({orderID:res}).then(response =>{
+			getShareCode(data){
+				this.ShopService.ShopOrderShareCode({shopOrderId:data}).then(response =>{
 					this.shareCode = response.data
 					this.$parent.shareCode = this.shareCode;
 				}).catch(error =>{
@@ -46,32 +49,44 @@
 					this.$util.modal('提示',error.msg,'确定','',false,() =>{})
 				})
 			},
+			clipboard(data) {
+				thorui.getClipboardData(data, (res) => {
+					if (res) {
+						this.$util.msg("复制成功",2000,true,'success');
+					} else {
+						this.$util.msg("复制失败",2000,true,'none');
+					}
+				})
+			},
 			hideConfirm(){
 				this.$parent.isShareModal = false
 			},
 			btnConfirm(code){//点击事件
 				this.$emit('btnConfirm')
 			}
+		},
+		onShow(){
+	
 		}
 	}
 </script>
 
 <style lang="scss">
 	/*弹窗*/
-	 .model-warp.none{
-		 display: none;
-	 }
-	 .model-warp.show{
-		 display: block;
-	 }
-	 .model-warp{
+	.model-warp.none{
+		display: none;
+	}
+	.model-warp.show{
+		display: block;
+	}
+	.freight-alert{
 		width: 100%;
 		height: 100%;
-		background: rgba(0,0,0,0.3);
+		background: rgba(0,0,0,.5);
 		position: fixed;
 		top: 0;
 		left: 0;
-		z-index: 10000;
+		z-index: 8888;
 		transition: all 0.4s;
 		&.none{
 			display: none;			
@@ -80,71 +95,85 @@
 			display: block;
 		}
 		.content{
-			width: 518rpx;
-			height: 418rpx;
+			width: 580rpx;
+			height: 630rpx;
 			position: absolute;
-			background: $bg-color;
+			background: url(https://static-b.caimei365.com/app/wisa/img/icon/dd_pop.png) no-repeat;
+			background-size: cover;
 			left: 0;
 			right: 0;
 			bottom: 0;
 			top: 0;
 			margin: auto;
-			border-radius: 24rpx;
+			padding:0 24rpx 20rpx 24rpx;
+			box-sizing: border-box;
+			border-radius: 12rpx;
 			.text-content{
-				width: 448rpx;
-				height: 264rpx;
-				padding: 20rpx 35rpx;
-				float: left;
-				.title{
-					line-height: 40rpx;
+				width: 100%;
+				height: auto;
+				margin-top: 210rpx;
+				.text-t{
 					font-size: $font-size-28;
 					color: $text-color;
 					text-align: center;
-					font-weight: bold;
-					margin-bottom: 36rpx;
+					line-height: 44rpx;
 				}
-				.share{
-					line-height: 36rpx;
-					font-size: $font-size-26;
-					color: $text-color;
-					text-align: justify;
-					margin-top: 22rpx;
-					font-weight: normal;
-					.txt{
-						margin-left: 10rpx;
-						color: #FF2A2A;
+				.text-c{
+					font-size: $font-size-44;
+					color: #16E17C;
+					text-align: center;
+					line-height: 80rpx;
+					position: relative;
+					.clipboard{
+						width: 84rpx;
+						height: 36rpx;
+						background: #EFEFEF;
+						text-align: center;
+						font-size: $font-size-24;
+						color: #999999;
+						border-radius: 4rpx;
+						line-height: 36rpx;
+						display: inline-block;
+						position: absolute;
+						top: 29%;
+						right: 18%;
 					}
 				}
-				.text{
-					line-height: 36rpx;
-					font-size: $font-size-26;
+				.text-h1{
+					line-height: 40rpx;
+					font-size: $font-size-28;
 					color: $text-color;
 					text-align: justify;
-					margin-top: 22rpx;
 				}
 			}
-			.alert-btn{
-				width: 80%;
-				height: 70rpx;
-				display: flex;
-				margin: 0 auto;
+			.text-btn{
+				width: 100%;
+				height: auto;
+				margin-top: 40rpx;
 				.btn{
-					flex: 1;
+					width: 80%;
+					height: 70rpx;
+					margin: 0 auto;
+					background: $btn-confirm;
 					line-height: 70rpx;
 					font-size: $font-size-28;
 					text-align: center;
 					color: #FFFFFF;
 					border-radius: 35rpx;
 					padding: 0;
-					margin: 0 15rpx;
-					&.btn-cancel{
-						background: $btn-cancel;
-					}
-					&.btn-confirm{
-						background: $btn-confirm;
-					}
+				}
+				.btn-none{
+					width: 100%;
+					height: 70rpx;
+					float: left;
+					line-height: 70rpx;
+					font-size: $font-size-28;
+					text-align: center;
+					color: #666666;
+					padding: 0;
 				}
 			}
-		}	
+		}
 	}
+	
 </style>

+ 0 - 158
components/cm-module/modelAlert/supplierRegisreAlert.vue

@@ -1,158 +0,0 @@
-<template name="alert">
-	<view class="alert spec" :class="specClass">
-		<!-- 运费弹窗说明 -->
-		<view class="freight-alert">
-			<view class="content clearfix">
-				<view class="title">供应商注册需知</view>
-				<view class="text">采美采购商城(隶属于采美365网)是美容行业一站式B2B采购交易服务平台,供应商入驻需平台审核。注册说明如下,请您仔细阅读:</view>
-				<view class="text">1、本商城商品需绝对保证正品,谢绝非自营/自有品牌(以登记备案为准),代理商应出具授权书等说明文件,杜绝山寨、假冒伪劣等侵权、侵害他人利益的行为。</view>
-				<view class="text">2、注册需要提供公司名称、营业执照、公司地址、联系人等基本信息。</view>
-				<view class="text">3、供应商注册审核通过后需缴纳平台信息服务管理费用。</view>
-				<view class="register-agree">
-					<view class="agree-text"  @tap.stop="agreeCheck()">
-						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button>
-						<text class="text">我已阅读供应商注册需知</text>
-					</view>	
-				</view>
-				<view class="text-btn">
-					<view class="btn" :class="isCheck?'':'none'" @click.stop="hideAlert">确定</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { cancelPrompt } from "@/services/use.js"
-	export default{
-		name:'alert',
-		props:{
-			clubStatus:{
-				type:Number
-			}
-		},
-		data() {
-			return{
-				isCheck:false
-			}
-		},
-		created() {
-			this.status = this.clubStatus
-		},
-		onLoad(){
-			
-		},
-		methods:{
-			hideAlert(){
-				if(!this.isCheck){
-					return
-				}
-				this.$parent.isSupplierAlert = false
-			},
-			agreeCheck() {
-				this.isCheck = !this.isCheck
-			}
-		},
-		onShow(){
-	
-		}
-	}
-</script>
-
-<style lang="scss">
-	/*弹窗*/
-	.model-warp.none{
-		display: none;
-	}
-	.model-warp.show{
-		display: block;
-	}
-	.freight-alert{
-		width: 100%;
-		height: 100%;
-		background: rgba(0,0,0,.5);
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 8888;
-		transition: all 0.4s;
-		&.none{
-			display: none;			
-		}
-		&.show{
-			display: block;
-		}
-		.content{
-			width: 580rpx;
-			height: 770rpx;
-			position: absolute;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			top: 0;
-			margin: auto;
-			border-radius: 16rpx;
-			padding: 0 30rpx 30rpx 30rpx;
-			box-sizing: border-box;
-			background-color: #FFFFFF;
-			.title{
-				line-height: 80rpx;
-				font-size: $font-size-30;
-				color: #333333;
-				text-align: center;
-				font-weight: bold;
-			}
-			.text{
-				line-height: 44rpx;
-				font-size: $font-size-26;
-				color: #666666;
-				text-align: justify;
-			}
-			.register-agree{
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				margin: 20rpx 0;
-				.agree-text{
-					.checkbox{
-						float: left;
-						margin: 4rpx 6rpx 0 0;
-						color: #999999;
-						font-size: $font-size-34;
-						&.icon-gouxuan{
-							color: $color-system;
-						}
-					}
-					font-size: $font-size-22;
-					line-height: 44rpx;
-					color: #999999;
-					.text{
-						color:#1890f9;
-					}
-				}
-			}
-			.text-btn{
-				width: 100%;
-				height: auto;
-				margin-top: 20rpx;
-				.btn{
-					width: 420rpx;
-					height: 84rpx;
-					margin: 0 auto;
-					background: $btn-confirm;
-					line-height: 84rpx;
-					font-size: $font-size-28;
-					text-align: center;
-					color: #FFFFFF;
-					border-radius: 42rpx;
-					padding: 0;
-					&.none{
-						background: #e1e1e1;
-						color: #FFFFFF;
-					}
-				}
-			}
-		}
-	}
-	
-</style>

+ 0 - 178
components/cm-module/modelAlert/supplierShareAlert.vue

@@ -1,178 +0,0 @@
-<template name="alert">
-	<view class="alert spec" :class="specClass">
-		<!-- 运费弹窗说明 -->
-		<view class="freight-alert"  @click.stop="hideConfirm">
-			<view class="content clearfix">
-				<view class="text-content">
-					<view class="text-t">分享码</view>
-					<view class="text-c">{{shareCode}} <text class="clipboard" @click.stop="clipboard(shareCode)">复制</text></view>
-					<view class="text-h1">有效期为72小时。如果对方还没有绑定采美账号,需要输入该分享码才能查看本订单</view>
-				</view>
-				<view class="text-btn">
-					<!-- #ifdef MP-WEIXIN -->
-					<button class="btn" open-type="share" @click="btnConfirm(shareCode)">去分享</button>
-					<!-- #endif -->
-					<view class="btn-none" @click.stop="hideConfirm(shareCode)">取消</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	const thorui = require("@/components/clipboard/clipboard.thorui.js")
-	export default{
-		name:'alert',
-		props:{
-			shopOrderID:{
-				type:Number
-			}
-		},
-		data() {
-			return{
-				shareCode:'',
-			}
-		},
-		created() {
-			this.getShareCode(this.shopOrderID)
-		},
-		onLoad(){
-			
-		},
-		methods:{
-			getShareCode(data){
-				this.ShopService.ShopOrderShareCode({shopOrderId:data}).then(response =>{
-					this.shareCode = response.data
-					this.$parent.shareCode = this.shareCode;
-				}).catch(error =>{
-					this.$parent.isShareModal = false;
-					this.$util.modal('提示',error.msg,'确定','',false,() =>{})
-				})
-			},
-			clipboard(data) {
-				thorui.getClipboardData(data, (res) => {
-					if (res) {
-						this.$util.msg("复制成功",2000,true,'success');
-					} else {
-						this.$util.msg("复制失败",2000,true,'none');
-					}
-				})
-			},
-			hideConfirm(){
-				this.$parent.isShareModal = false
-			},
-			btnConfirm(code){//点击事件
-				this.$emit('btnConfirm')
-			}
-		},
-		onShow(){
-	
-		}
-	}
-</script>
-
-<style lang="scss">
-	/*弹窗*/
-	.model-warp.none{
-		display: none;
-	}
-	.model-warp.show{
-		display: block;
-	}
-	.freight-alert{
-		width: 100%;
-		height: 100%;
-		background: rgba(0,0,0,.5);
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 8888;
-		transition: all 0.4s;
-		&.none{
-			display: none;			
-		}
-		&.show{
-			display: block;
-		}
-		.content{
-			width: 492rpx;
-			height: 666rpx;
-			position: absolute;
-			background: url(https://img.caimei365.com/group1/M00/03/95/Cmis2F76nVaAPs9JAAHGoKa8KvY492.png) no-repeat;
-			background-size: cover;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			top: 0;
-			margin: auto;
-			padding:0 24rpx 20rpx 24rpx;
-			border-radius: 12rpx;
-			.text-content{
-				width: 100%;
-				height: auto;
-				margin-top: 210rpx;
-				.text-t{
-					font-size: $font-size-28;
-					color: $text-color;
-					text-align: center;
-					line-height: 44rpx;
-				}
-				.text-c{
-					font-size: $font-size-44;
-					color: #16E17C;
-					text-align: center;
-					line-height: 80rpx;
-					position: relative;
-					.clipboard{
-						width: 84rpx;
-						height: 36rpx;
-						background: #EFEFEF;
-						text-align: center;
-						font-size: $font-size-24;
-						color: #999999;
-						border-radius: 4rpx;
-						line-height: 36rpx;
-						display: inline-block;
-						position: absolute;
-						top: 29%;
-						right: 18%;
-					}
-				}
-				.text-h1{
-					line-height: 40rpx;
-					font-size: $font-size-28;
-					color: $text-color;
-					text-align: justify;
-				}
-			}
-			.text-btn{
-				width: 100%;
-				height: auto;
-				margin-top: 40rpx;
-				.btn{
-					width: 80%;
-					height: 70rpx;
-					margin: 0 auto;
-					background: $btn-confirm;
-					line-height: 70rpx;
-					font-size: $font-size-28;
-					text-align: center;
-					color: #FFFFFF;
-					border-radius: 35rpx;
-					padding: 0;
-				}
-				.btn-none{
-					width: 100%;
-					height: 70rpx;
-					float: left;
-					line-height: 70rpx;
-					font-size: $font-size-28;
-					text-align: center;
-					color: #666666;
-					padding: 0;
-				}
-			}
-		}
-	}
-	
-</style>

+ 2 - 2
components/empty.vue

@@ -24,10 +24,10 @@
 		data() {
 			return {
 				typeSrcall: {
-					empty: 'https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AcewRAAEtqt4jZmU397.png',				
+					empty: 'https://static-b.caimei365.com/app/wisa/img/icon/dd_empty.png',				
 				},
 				typeSrc: {
-					empty: 'https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AJZvwAAGWWe4DnXk371.png',				
+					empty: 'https://static-b.caimei365.com/app/wisa/img/icon/dd_empty.png',				
 				},
 				EmptyText:'',
 			}

+ 2 - 2
components/uni-search/bt-search.vue

@@ -2,7 +2,7 @@
 	<view class="search-input">
 		<template>
 			<view class="gosearch-btn" @click="this.$api.navigateTo(clickPath)">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+				<text class="iconfont icon-sousuo"></text>
 				<text>{{toestText}}</text>
 			</view>
 		</template>
@@ -56,7 +56,7 @@
 			font-size: 28rpx;
 			line-height: 70rpx;
 			color: #8A8A8A;
-			.icon-iconfonticonfontsousuo1{
+			.icon-sousuo{
 				margin:0 6rpx;
 				font-size: 34rpx;
 				color: #8A8A8A;

+ 2 - 2
components/uni-search/go-search.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="search">
 			<view class="search-input">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+				<text class="iconfont icon-sousuo"></text>
 				<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="searchStart()" placeholder="请输入商品关键词" v-model.trim="searchText"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
@@ -156,7 +156,7 @@
 			position: relative;
 			background: #F0F0F0;
 			float: left;
-			.icon-iconfonticonfontsousuo1{
+			.icon-sousuo{
 				font-size: 36rpx;
 				color: #8A8A8A;
 				position: absolute;

+ 2 - 2
components/uni-search/or-search.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="search">
 			<view class="search-input">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+				<text class="iconfont icon-sousuo"></text>
 				<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="searchStart()" placeholder="请输入商品关键词" v-model.trim="searchText"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
@@ -156,7 +156,7 @@
 			position: relative;
 			background: #F0F0F0;
 			float: left;
-			.icon-iconfonticonfontsousuo1{
+			.icon-sousuo{
 				font-size: 36rpx;
 				color: #8A8A8A;
 				position: absolute;

+ 6 - 0
pages.json

@@ -126,6 +126,12 @@
 					"navigationBarTitleText": "订单详情"
 				}
 			},
+			{
+				"path": "order/search-order",
+				"style": {
+					"navigationBarTitleText": "订单搜索"
+				}
+			},
 			{
 				"path": "order/order-logistics",
 				"style": {

+ 2 - 2
pages/goods/product.vue

@@ -12,7 +12,7 @@
 			<view class="search-input">
 				<view class="gosearch-btn" :class="navbarFiexd" @click="this.$api.navigateTo(clickPath)">
 					<view class="search-icon">
-						<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+						<text class="iconfont icon-sousuo"></text>
 					</view>
 					<view class="search-text">搜索商品/供应商/项目仪器</view>
 				</view>
@@ -1541,7 +1541,7 @@
 					top: 2rpx;
 					text-align: center;
 					line-height: 66rpx;
-					.icon-iconfonticonfontsousuo1{
+					.icon-sousuo{
 						margin:0 6rpx;
 						font-size: $font-size-34;
 						color: #B2B2B2;

+ 0 - 108
pages/user/order/create-order.vue

@@ -20,44 +20,6 @@
 						@showFreightAlert="handFreightAlertShow">
 		</seller-freight>
 		<freight-alert v-if="isfreightTip" ref="csPhone"></freight-alert>
-		<!-- 余额抵扣 -->
-		<view class="invoice-balance" v-if="!rechargeGoods">
-			<view class="balabce-t">
-				<view class="balabce-t-le">余额抵扣</view>
-				<view class="balabce-t-ri">
-					<view class="money">
-						<text>可用余额:</text>
-						<text>¥{{ userMoney | NumFormat }}</text>
-					</view>
-					<view class="checkbox-box">
-						<button class="checkbox iconfont" 
-								hover-class="btn-hover"
-								v-if="userMoney!=0"
-								@click.stop="checkedBalabce"
-								:class="[ischecked ?'icon-gouxuanl':'icon-weigouxuan']"
-						>
-						</button>
-					</view>
-				</view>
-			</view>
-			<view class="balabce-b" :class="{'balabce-b--hide':!ischecked}">	
-				<view class="balabce-b-text animation" :style="{'transform':ischecked?'translateY(0)':'translateY(-50%)','-webkit-transform':ischecked?'translateY(0)':'translateY(-50%)'}">
-					<text>当前使用:¥{{deductMoney | NumFormat}},剩余:¥{{ surplusMoney | NumFormat }}</text>
-				</view>
-			</view>
-		</view>
-		<!-- 售后条例 -->
-		<seller-regulations  ref="regulations"
-							 v-if="isRequest && isDepositFlg&&seconDepositFlg" 
-							:regulaDatas="regulationsData" 
-							@handleData="claData">
-		</seller-regulations>
-		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
-		<!-- 返佣订单 -->
-		<view class="Rebate" @click="RebateChang" v-if="goodsData.length==1 && secondflag && isDepositFlg">
-			<text class="rebate-title">返佣订单</text>
-			<text class="iconfont" :class="rebatecheck?'icon-yixuanze':'icon-weixuanze'" ></text>
-		</view>
 		<!-- 底部 -->
 		<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 			<view class="footer-le">
@@ -86,7 +48,6 @@
 	import sellerInvoice from '@/components/cm-module/creatOrder/sellerInvoice'
 	import sellerFreight from '@/components/cm-module/creatOrder/sellerFreight'
 	import freightAlert from '@/components/cm-module/modelAlert/freightAlert.vue'
-	import sellerRegulations from '@/components/cm-module/creatOrder/sellerRegulations.vue'
 	import modalLayer from "@/components/modal-layer"
 	export default {
 		components:{
@@ -96,7 +57,6 @@
 			sellerFreight,
 			freightAlert,
 			modalLayer,
-			sellerRegulations
 		},
 		data() {
 			return {
@@ -109,15 +69,11 @@
 				serviceProviderId:'',	  //协销ID
 				cartType:3,			  	  //购买类型(1购物车提交,2直接购买提交,3协销下单)
 				submitState:'',  		  //提交状态
-				balanceDeductionFlag:2,   //勾选余额的状态(1使用,2不使用)
 				allCount:1,				  //订单提交总数量
 				totalOriginalPrice:0,	  //订单总原价(划线部分)
 				reducedPrice:0,			  //满减金额
 				payAllPrice:0.00,		  //订单提交总金额
 				allPrice:0.00,			  //订单总金额
-				surplusMoney:0.00,		  //显示勾选后的剩余抵扣
-				userMoney:0.00,			  //显示可使用余额
-				deductMoney:0.00,		  //显示已使用的余额
 				addressID:'',			  //地址ID
 				townID:'',				  //区ID
 				isRequest:false,		  //是否加载完成渲染子组件
@@ -131,17 +87,9 @@
 				freightData:{},			  //邮费数据
 				orderInfo:[],			  //提交的商品信息
 				payInfo:{},				  //订单信息
-				rechargeGoods:false,
-				isDepositFlg:true,
-				depositIds : [6060,6061,6062,6063,6064,6065,6066,6067,6068,6069],//定金&充值余额商品ID
 				isIphoneX:this.$store.state.isIphoneX,
-				regulationsData:[],
 				clauseId:0,
-				seconDepositFlg:true,
-				rebateFlag:0,
-				rebatecheck:false,
 				productsList:[],
-				secondflag:true
 			}
 		},
 		onLoad(option){//商品数据
@@ -168,26 +116,14 @@
 			},
 		},
 		methods: {
-			RebateChang(){
-				this.rebatecheck = !this.rebatecheck;
-				if(this.rebatecheck){
-					this.rebateFlag=1;
-				}else{
-					this.rebateFlag=0;
-				}
-				console.log(this.rebateFlag)
-			},
 			getInitProdcutCrearOrder(option){//二手下单初始化查询
 				this.$api.getStorage().then((resolve) =>{
-					this.seconDepositFlg = false;
 					this.serviceProviderId = resolve.serviceProviderID
 					let params ={clubId:this.clubId,serviceProviderId:this.serviceProviderId,productCount:this.productCount,productId:this.productIds}
 					this.SellerService.GetSettlementBySencondProduct(params).then(response =>{
 						let resData = response.data
 						this.isRequest = true
 						this.goodsData = resData.shopList
-						this.userMoney = resData.userMoney
-						this.secondflag = false
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
 					})
@@ -205,18 +141,7 @@
 						this.userMoney = data.userMoney
 						this.reducedPrice = data.reducedPrice
 						this.totalOriginalPrice = data.reducedPrice + data.totalAmount
-						this.rechargeGoods = data.rechargeGoods
 						this.allPrice = this.payAllPrice = data.totalAmount
-						this.regulationsData = data.clauseList
-						this.goodsData.forEach(item =>{
-							this.productsList = item.productsList
-							item.productsList.forEach(pros =>{
-								if(this.depositIds.indexOf(pros.productID)>=0){
-									this.isDepositFlg = false
-								}
-							})
-						})
-						console.log(this.isDepositFlg)
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
 					})
@@ -274,27 +199,6 @@
 					this.attributePallPrice()
 				}
 			},
-			claData(id){
-				this.clauseId = id;
-			},
-			checkedBalabce(){//勾选使用余额
-				if(this.userMoney > 0){
-					this.ischecked = !this.ischecked
-					if(this.ischecked){
-						this.balanceDeductionFlag =1
-						this.attributePallPrice()
-					}else{
-						this.balanceDeductionFlag = 2
-						if(this.freightData.freePostFlag == 1 || this.freightData.freePostFlag == '1'){
-							this.payAllPrice = this.allPrice+parseInt(this.freightData.freight)
-						}else{
-							this.payAllPrice = this.allPrice
-						}
-					}
-				}else{
-					return
-				}
-			},	
 			attributePallPrice(){//计算价格
 				if(this.freightData.freePostFlag == 1 || this.freightData.freePostFlag == '1'){
 					this.attributeHashfreight(this.freightData.freight)
@@ -306,17 +210,11 @@
 				if(this.ischecked){
 					if(this.userMoney>this.payAllPrice){
 						this.payAllPrice = 0.00
-						this.deductMoney = this.allPrice							//勾选后使用抵余额
-						this.surplusMoney = this.userMoney - this.deductMoney	    //勾选后的剩余抵扣
 					}else{
 						this.payAllPrice = this.allPrice - this.userMoney       	//勾选后的总价
-						this.deductMoney = this.userMoney				            //勾选后使用抵余额
-						this.surplusMoney = this.userMoney - this.deductMoney	    //勾选后的剩余抵扣
 					}
 				}else{
 					this.payAllPrice = this.allPrice;
-					this.deductMoney = 0.00;
-					this.surplusMoney = this.userMoney;
 				}
 			},
 			attributeHashfreight(freight){//计算需要邮费的支付价格
@@ -324,17 +222,11 @@
 				if(this.ischecked){
 					if(this.userMoney>this.payAllPrice){							//余额大于支付金额
 						this.payAllPrice =0.00
-						this.deductMoney = this.allPrice+parseInt(freight)			//勾选后使用抵余额
-						this.surplusMoney = this.userMoney - this.deductMoney	    //勾选后的剩余抵扣
 					}else{
 						this.payAllPrice = this.allPrice+parseInt(freight) - this.userMoney       	//勾选后的总价
-						this.deductMoney = this.userMoney				            //勾选后使用抵余额
-						this.surplusMoney = this.userMoney - this.deductMoney	    //勾选后的剩余抵扣
 					}
 				}else{
 					this.payAllPrice = this.allPrice+parseInt(freight)
-					this.deductMoney = 0.00
-					this.surplusMoney = this.userMoney
 				}
 			},
 			orderSubmitMit(){//提交订单

+ 25 - 23
pages/user/order/order-list.vue

@@ -118,6 +118,8 @@
 	import empty from "@/components/empty";
 	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
 	import orderModel from '@/components/cm-module/modelAlert/order-alert'			 //付款弹窗
+	import { orderDataList } from '@/common/json/data.json.js' //本地数据
+	
 	
 	export default {
 		components: {
@@ -135,12 +137,11 @@
 		data() {
 			return {
 				CustomBar:this.CustomBar,// 顶部导航栏高度
-				orderTabBar: [{state: 0,text: '全部订单',orderList: []},
-							  {state: 1,text: '待确认',orderList: []},
-							  {state: 2,text: '待付款',orderList: []},
-							  {state: 3,text: '待发货',orderList: []},
-							  {state: 4,text: '已发货',orderList: []},
-							  {state: 5,text: '退货/款',orderList: []}
+				orderTabBar: [{state: 0,text: '全部',orderList: []},
+							  {state: 1,text: '待付款',orderList: []},
+							  {state: 2,text: '待发货',orderList: []},
+							  {state: 3,text: '已发货',orderList: []},
+							  {state: 4,text: '退货/款',orderList: []}
 							 ],
 				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
 				systeminfo:  this.setSysteminfo(),		 //获取设备信息
@@ -251,12 +252,23 @@
 				 * @param:pageSize(每页条数)
 				 * @param:organizeID(全局变量组织ID)
 				 */ 
+				let orderItem = this.orderTabBar[0];
+				let state = 1;
+				let orderList = orderDataList.filter(item=>{
+					//添加不同状态下订单的表现形式
+					item = Object.assign(item, this.StateExpFormat(item.state));
+					return item;
+				});
+				orderItem.orderList =[];
+				orderList.forEach(item=>{
+					orderItem.orderList.push(item);
+				})
 				setTimeout(()=>{
 					this.skeletonShow = false
 					this.isOnloadFlag = false
 				},1500)
-				let orderItem = this.orderTabBar[index];
-				let state = orderItem.state;
+				
+				
 				if(source === 'tabChange' && orderItem.loaded === true){
 					//tab切换只有第一次需要加载数据
 					return;
@@ -266,15 +278,7 @@
 						this.userID = resolve.userID
 						let params = {orderState:index,userId:this.userID,pageNum:1,pageSize:this.pageSize};
 						this.OrderService.QueryOrderList(params).then(response =>{
-							let orderList = response.data.results.filter(item=>{
-								//添加不同状态下订单的表现形式
-								item = Object.assign(item, this.StateExpFormat(item.state));
-								return item;
-							});
-							orderItem.orderList =[];
-							orderList.forEach(item=>{
-								orderItem.orderList.push(item);
-							})
+							
 							//loaded新字段用于表示数据加载完毕,如果为空可以显示空白页
 							this.$set(orderItem, 'loaded', true);
 							this.hasNextPage = response.data.hasNextPage;
@@ -472,7 +476,7 @@
 				})
 			},
 			handlSearchPath(){
-				this.$api.navigateTo('/search/pages/search/search-order')
+				this.$api.navigateTo('/pages/user/order/search-order')
 			},
 			onShareAppMessage (res){//分享转发
 				this.isShareModal = false
@@ -603,7 +607,7 @@
 	.tab-bar-item {
 		padding: 0;
 		height: 80rpx;
-		min-width: 80rpx;
+		min-width: 90rpx;
 		line-height: 80rpx;
 		margin: 0 28rpx;
 		display: inline-block;
@@ -616,13 +620,11 @@
 		font-size:$font-size-28;
 		color: $text-color;
 	}
-
 	.active {
-		border-bottom: 6rpx solid $color-system;
+		border-bottom: 6rpx solid #c4761f;
 	}
-
 	.active .tab-bar-title {
-		color: $color-system !important;
+		color:#c4761f !important;
 	}
 
 	/*tabbar end*/

+ 905 - 0
pages/user/order/search-order.vue

@@ -0,0 +1,905 @@
+<template>
+	<view class="search-container">
+		<!-- <or-search :theme="themeClass" @getSearchText="getSearchText"></or-search> -->
+		<view class="search-main">
+			<view class="search">
+				<view class="search-input">
+					<text class="iconfont icon-sousuo"></text>
+					<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="subMitSearch()" placeholder="请输入商品关键词" v-model.trim="searchInputVal"/>
+					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+				</view>
+				<view class="search-btn" @click="subMitSearch()">搜索</view>
+			</view>
+		</view>
+		<view class="search-container-history" v-if="!isShowWrapper">
+			<view :class="'s-' + themeClass" v-if="serachRecordList.length>0">
+				<view class="header">
+					搜索历史
+					<text class="iconfont icon-shanchu" @click="confirmDetele"></text>
+				</view>
+				<view class="list">
+					<view v-for="(item,index) in serachRecordList" :key="index" @click="keywordsClick(item.searchWord)">{{item.searchWord}}</view>
+				</view>
+			</view>
+		</view>
+		<view class=" order-container" v-if="isShowWrapper" :style="{'overflow' : 'auto','height': (showSkeleton? windowHeight + 'px' : 'auto')}">
+			<scroll-view  class="tui-skeleton" :style="{'height':scrollHeight+'px'}"  @scrolltolower="scrolltolower" scroll-y >
+				<view  :class="{'tui-order-list':scrollTop >= 0}" class="tui-skeleton clearfix">
+					<!-- 空白页 -->
+					<empty v-if="isShowEmpty" :navbarHeight="navbarHeight"></empty>
+					<!-- 列表 -->
+					<view v-else class="tui-order-content">
+						<view  class="tui-order-item" v-for="(order,orderIndex) in orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
+							<view class="order-title">
+								<view class="order-title-t">
+									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
+									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
+									<text class="bage-text tui-skeleton-fillet">订单编号:{{order.orderNo}}</text>
+									<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+								</view>
+								<view class="order-title-b">
+									<view class="order-title-btxt tui-skeleton-fillet">下单时间:{{order.orderTime}}</view>
+									<view class="order-title-tip tui-skeleton-fillet">{{ StateExpFormat(order.status) }}</view>
+								</view>
+							</view>
+							<block v-for="(shop,index) in order.shopOrderList" :key="index">
+								<view class="goods-title">
+										<view v-if="shop.shopPromotion" class="floor-item-act">
+											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
+										</view>
+										<view class="title-text tui-skeleton-fillet">{{shop.shopName}}</view>	
+								</view>
+								<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex">
+									<view class="goods-pros-t">
+										<view class="pros-img tui-skeleton-fillet">
+											<image :src="pros.productImage" alt="" />
+											<text class="tips" v-if="pros.productType ==2 || pros.productType ==1">赠品</text>
+										</view>
+										<view class="pros-product">
+											<view class="producttitle tui-skeleton-fillet">{{pros.name}}</view>
+											<view class="productspec tui-skeleton-fillet" v-if="pros.productCategory!=2">规格:{{pros.productUnit}}</view>
+											<view class="productprice">
+												<view class="price tui-skeleton-fillet">
+													<text>¥{{pros.price | NumFormat}}</text>
+												</view>
+												<view class="count tui-skeleton-fillet">
+													<text class="small">x</text>{{pros.num}}
+												</view>
+											</view>
+											<view class="floor-item-act" v-if="pros.productPromotion!=null">
+												<view v-if="PromotionsFormat(pros.productPromotion)"  class="floor-tags">
+													{{pros.productPromotion.name}}
+													<text v-if ="pros.productPromotion!=null && pros.productPromotion.type !=3">
+														:¥{{ pros.productPromotion == null ? '0.00' : pros.productPromotion.touchPrice | NumFormat}}
+													</text>
+												</view>
+												<view v-else-if="pros.productPromotion.type !=3" class="floor-tags">{{pros.productPromotion.name}}</view>	
+											</view>
+										</view>	
+									</view>
+								</view>	
+							</block>
+							<view class="order-footer">
+								<view class="order-footer-top" v-if="order.discountFee!=0">经理折扣:¥{{ order.discountFee | NumFormat }}</view>
+								<view class="order-footer-bot">
+									<view class="count tui-skeleton-fillet">共{{order.productCount}}件商品</view>
+									<view class="money tui-skeleton-fillet">待付总额:¥{{ order.pendingPayments | NumFormat}}</view>
+								</view>
+							</view>
+							<!-- 底部button -->
+							<order-button ref="orderButton" 
+										  :status="order.status" 
+										  :orderID="order.orderID" 
+										  :onlinePayFlag = "order.onlinePayFlag"
+										  @buttonConfirm="handButtonConfirm">
+							</order-button>
+						</view>
+						<!--加载loadding-->
+						<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+						<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+						<!--加载loadding-->
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<!-- 分享弹窗 -->
+		<share-alert   v-if="isShareModal"
+					   :orderID="btnoRderID" 
+					   @shareConfirm ='onShareAppMessage'>
+		</share-alert>
+		<!-- 透明模态层 -->
+		<modal-layer v-if='isModalLayer'></modal-layer>
+	</view>
+</template>
+
+<script>
+	import orSearch from '@/components/uni-search/or-search.vue'
+	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
+	import tuiNomore from "@/components/tui-components/nomore/nomore"
+	import orderButton from '@/components/cm-module/orderDetails/orderListButton'	 //按钮
+	import modalLayer from "@/components/modal-layer"
+	import empty from "@/components/empty";
+	import shareAlert from '@/components/cm-module/modelAlert/shareAlert'			 //分享弹窗
+	import authorize from '@/common/config/authorize.js'
+	export default {
+		components: {
+			orSearch,
+			tuiLoadmore,
+			tuiNomore,
+			orderButton,
+			empty,
+			shareAlert,
+		},
+		data() {
+			return {
+				themeClass: 'block',
+				searchInputVal:'',
+				isShowClose:false,							//是否显示清空输入框图标
+				isSearchHistory:false,						//是都显示搜索历史
+				serachRecordList:[],
+				isShowWrapper:false,
+				isModallayer:false,
+				isShowEmpty:false,
+				windowHeight: '',
+				showSkeleton: true,
+				userID:0,
+				orderList: [],
+				btnoRderID: 0, //点击按钮传入的的订单ID
+				pageNum: 1,	  //页数
+				pageSize: 10,  //条数
+				scrollTop: 0,
+				deteleType:'',
+				skeletonShow: true,
+				isShareModal: false,//控制分享弹窗
+				isCenceModal: false,//控制取消订单弹窗
+				isShowDelModal: false,//控制删除订单弹窗
+				isModalLayer: false,
+				loadding: false,
+				pullUpOn: true,
+				hasNextPage: false,
+				pullFlag: true,
+				navbarHeight:'',
+				nomoreText: '上拉显示更多',
+				scrollHeight:''
+			}
+		},
+		onLoad() {
+		  this.initGetSerachRecord()
+		},
+		filters:{
+			NumFormat(value) {//处理金额
+				return Number(value).toFixed(2);
+			}
+		},
+		methods:{
+			subMitSearch() {
+				if (this.searchInputVal == '') {
+					this.$util.msg('请输入商品关键词',2000);
+				}else{
+					this.commodityList =[]
+					this.getOrderDatainit()
+				}
+			},
+			initGetSerachRecord(){
+				this.$api.getStorage().then((resolve) =>{
+					this.userID = resolve.userID
+					this.OrderService.SearchOrderHistory({userId:this.userID}).then(response =>{
+						this.serachRecordList = response.data
+						if(this.serachRecordList.length>0){
+							this.isSearchHistory = true
+						}else{
+							this.isSearchHistory = false
+						}
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})	
+			},
+			onShowClose () { //输入框失去焦点时触发
+				this.inputEmpty(this.searchInputVal)
+			},
+			onFocus () { //输入框获取焦点时触发
+				this.inputEmpty(this.searchInputVal)
+				this.initGetSerachRecord()
+			},
+			delInputText () { //清除输入框内容
+				this.searchInputVal = ''
+				this.isShowClose = false
+				this.isShowWrapper = false
+				this.inputEmpty(this.searchInputVal)
+				this.initGetSerachRecord()
+			},
+			keywordsClick (item) {	//关键词搜索与历史搜索
+				this.searchInputVal = item;
+				this.isShowClose = true;
+				this.subMitSearch();
+			},
+			confirmDetele () {//清空历史记录
+				this.$util.modal('提示','确定删除历史记录?','确定','取消',true,() =>{
+					this.OrderService.ClearOrderHistory({userId:this.userID}).then(response =>{
+						this.$util.msg('删除记录成功',2000,true,'success')
+						this.serachRecordList=[]
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})
+			},
+			inputEmpty(val){
+				this.isShowWrapper = false
+				if(val != ''){
+					this.isShowClose = true
+				}else{					
+					this.isShowClose = false
+				}
+			},
+			getOrderDatainit(index,source){
+				/**
+				 * @订单初始化加载  仅加载第一页码
+				 * @param:searchWord(搜索关键词)
+				 * @param:userId(用户ID)
+				 * @param:pageNum(页码数)
+				 * @param:pageSize(每页条数)
+				 * @param:organizeID(全局变量组织ID)
+				 */ 
+				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:1,pageSize:this.pageSize};
+				this.OrderService.SearchOrderInfo(params).then(response =>{
+					this.isShowWrapper = true
+					this.showSkeleton = true
+					const _responseData = response.data.results;
+					if(_responseData && _responseData.length > 0){
+						let filrerData = _responseData.filter(item=>{
+							//添加不同状态下订单的表现形式
+							item = Object.assign(item, this.StateExpFormat(item.state));
+							return item;
+						});
+						this.orderList =[];
+						filrerData.forEach(item=>{
+							this.orderList.push(item);
+						})
+						this.hasNextPage = response.data.hasNextPage;
+						if(this.hasNextPage){
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						}else{
+							if(this.orderList.length < 2){
+								this.pullUpOn = true
+							}else{
+								this.pullUpOn = false
+								this.nomoreText = '已至底部'
+							}
+						}
+						this.isShowEmpty = false
+					}else{
+						this.isShowEmpty = true
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			}, 
+			getOnReachBottomData(index){//上拉加载
+				this.pageNum+=1
+				let params = {searchWord:this.searchInputVal,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize}
+				this.OrderService.SearchOrderInfo(params).then(response =>{
+					let resData = response.data.results
+					this.hasNextPage = response.data.hasNextPage;
+					this.orderList = this.orderList.concat(resData)
+					this.pullFlag = false;// 防上拉暴滑
+					setTimeout(()=>{this.pullFlag = true;},500)
+					if(this.hasNextPage){
+						this.pullUpOn = false
+						this.nomoreText = '上拉显示更多'
+					}else{
+						this.loadding = false
+						this.pullUpOn = false
+						this.nomoreText = '已至底部'
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			scrolltolower() {
+				if(this.hasNextPage){
+					this.loadding = true
+					this.pullUpOn = true
+					this.showSkeleton = false
+					this.getOnReachBottomData();
+				}	
+			},
+			detail(id) {//订单详情跳转
+				this.isModalLayer = true;	
+				this.$api.navigateTo(`/pages/user/order/order-details?type=search&orderID=${id}`)
+			},
+			handButtonConfirm(data) {//获取点击
+				this.handShowAlert(data)
+				this.btnoRderID = data.orderId
+			},
+			handShowAlert(data) {//执行
+				switch(data.type){
+					case 'delete':
+						this.handOrderDetele(data.orderId);
+						break
+					case 'cancel':
+						this.handCenceConfirm(data.orderId)
+						break
+					case 'query':
+						this.isModalLayer = true;
+						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
+						break
+					case 'confirm':
+						this.handOrderConfirm(data.orderId);
+						break
+					case 'confirmation':
+						this.handOrderConfirmation(data.orderId);
+						break	
+				}
+			},
+			handOrderConfirm (id){//确认收货
+				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
+					this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
+						this.$util.msg(response.msg,2000,true,'success');
+						this.getOrderDatainit()
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})
+			},
+			handOrderConfirmation (id){//确认订单
+				this.$util.modal('提示','确认此订单?','确定','取消',true,() =>{
+					this.OrderService.AffirmOrder({orderID:id}).then(response =>{
+						this.$util.msg(response.msg,2000,true,'success');
+						setTimeout(() => {
+							this.getOrderDatainit()
+						},2000)
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})
+			},
+			handOrderDetele(id){//删除订单
+				this.$util.modal('提示','确认删除该订单吗?','确定','取消',true,() =>{
+					this.OrderService.DeleteOrder({orderID:id}).then(response =>{
+						this.$util.msg(response.msg,2000,true,'success');
+						setTimeout(() => {
+							this.getOrderDatainit()
+						},2000)
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})
+			},
+			handCenceConfirm(id){//取消订单
+				this.$util.modal('提示','确认取消该订单吗?','确定','取消',true,() =>{
+					this.OrderService.CancelOrder({orderID:id}).then(response =>{
+						this.$util.msg(response.msg,2000,true,'success');
+						setTimeout(() => {
+							this.getOrderDatainit()
+						},2000)
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})
+			},
+			onShareAppMessage (res){//分享转发
+				this.isShareModal = false
+				if (res.from === 'button') {// 来自页面内转发按钮
+			    }
+				return {
+					title: '您有新的分享订单,快来查看吧~',
+					path: `/pages/user/order/order-sharelogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
+					imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
+				}
+			},
+			setScrollHeight() {
+				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
+				this.windowHeight = windowHeight - 1;
+				this.scrollHeight = windowHeight - 1;
+			},
+			PromotionsFormat(promo){//促销活动类型数据处理
+				if(promo!=null){
+					if(promo.type == 1 && promo.mode == 1){
+						return true
+					}else{
+						return false
+					}
+				}
+				return false
+			},
+			StateExpFormat(state){ //订单状态文字和颜色
+				var HtmlStateText = '',
+					stateTextObject={
+						0:'待确认',
+						4:'交易完成',
+						5:'订单完成',
+						6:'已关闭',
+						7:'交易全退',
+						77:'交易全退',
+						11:'待付款待发货',
+						12:'待付款部分发货',
+						13:'待付款已发货',
+						21:'部分付款待发货',
+						22:'部分付款部分发货',
+						23:'部分付款已发货',
+						31:'已付款待发货',
+						32:'已付款部分发货',
+						33:'已付款已发货',
+						111:'待付款待发货'
+					};
+				Object.keys(stateTextObject).forEach(function(key){
+					if(key == state){
+						HtmlStateText = stateTextObject[key]
+					}
+				});
+				return HtmlStateText;
+			}
+		},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+			
+		},
+		onShow() {
+			this.setScrollHeight();
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni.scss";
+	page{
+		background-color: #F7F7F7 !important;
+	}
+	.search{
+		width: 702rpx;
+		height: 70rpx;
+		padding: 12rpx 24rpx;
+		border-bottom: 1px solid #F0F0F0;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: #FFFFFF;
+		z-index: 1001;
+		.search-input{
+			width: 448rpx;
+			height: 70rpx;
+			padding: 0 68rpx;
+			line-height: 70rpx;
+			border-radius: 40rpx;
+			position: relative;
+			background: #F0F0F0;
+			float: left;
+			.icon-sousuo{
+				font-size: 36rpx;
+				color: #8A8A8A;
+				position: absolute;
+				left: 24rpx;
+				z-index: 10;
+			}
+			.icon-shanchu1{
+				font-size: 36rpx;
+				color: #8A8A8A;
+				position: absolute;
+				right: 24rpx;
+				top: 0;
+				padding: 0 10rpx;
+				z-index: 10;
+			}
+			input{
+				width: 448rpx;
+				height: 70rpx;
+				background-color: #F0F0F0; 
+				font-size: 26rpx;
+			}
+		}
+		.search-btn{
+			width: 118rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			color: $color-system;
+			font-size: 30rpx;
+			text-align: center;
+			float: left;
+		}
+		.voice-icon{
+			width: 36rpx;
+			height: 36rpx;
+			padding: 16rpx 20rpx 16rpx 0;
+			position: absolute;
+			left: 16rpx;
+			top: 4rpx;
+			z-index: 10;
+		}
+		
+	}
+	.search-container{
+		padding-top: 106rpx;
+	}
+	.s-block{
+		background: #FFFFFF;
+		.header{
+			font-size: 32rpx;
+			padding:40rpx 24rpx 22rpx 24rpx;
+			line-height: 42rpx;
+			font-size: 30rpx;
+			font-weight: bold;
+			position: relative;
+			.icon-shanchu{
+				font-size: 36rpx;
+				color: #333333;
+				float: right;
+				padding: 0 10rpx;
+				z-index: 10;
+				font-weight: normal;
+			}
+		}
+		.list{
+			display: flex;
+			flex-wrap: wrap;
+			padding-bottom: 40rpx;
+			view{
+				color: #8A8A8A;
+				font-size: 24rpx;
+				box-sizing: border-box;
+				text-align: center;
+				height: 48rpx;
+				line-height: 48rpx;
+				border-radius: 24rpx;
+				margin:12rpx;
+				padding:.0 30rpx;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				background-color: #F3F3F3;
+			}
+		}
+	}
+	.s-circle{
+		margin-top: 30rpx;
+		.header{
+			font-size: 32rpx;
+			padding: 30rpx;
+			border-bottom: 2rpx solid #F9F9F9;
+			position: relative;
+			image{
+				width: 36rpx;
+				height: 36rpx;
+				padding: 10rpx;
+				position: absolute;
+				right: 40rpx;
+				top: 24rpx;
+			}
+		}
+		.list{
+			display: flex;
+			flex-wrap: wrap;
+			padding: 0 30rpx 20rpx;
+			view{
+				padding: 8rpx 30rpx;
+				margin: 20rpx 30rpx 0 0;
+				font-size: 28rpx;
+				color: #8A8A8A;
+				background-color: #F7F7F7;
+				box-sizing: border-box;
+				text-align: center;
+				border-radius: 20rpx;
+			}
+		}
+	}
+	.wanted-block{
+		margin-top: 30rpx;
+		.header{
+			font-size: 32rpx;
+			padding: 30rpx;
+		}
+		.list{
+			display: flex;
+			flex-wrap: wrap;
+			view{
+				width: 50%;
+				color: #8A8A8A;
+				font-size: 28rpx;
+				box-sizing: border-box;
+				text-align: center;
+				padding: 20rpx 0;
+				border-top: 2rpx solid #FFF;
+				border-left: 2rpx solid #FFF;
+				background-color: #F7F7F7;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+			}
+		}
+	}
+	.wanted-circle{
+		margin-top: 30rpx;
+		.header{
+			font-size: 32rpx;
+			padding: 30rpx;
+		}
+		.list{
+			display: flex;
+			flex-wrap: wrap;
+			padding: 0 30rpx 20rpx;
+			view{
+				padding: 8rpx 30rpx;
+				margin: 20rpx 30rpx 0 0;
+				font-size: 28rpx;
+				color: #8A8A8A;
+				background-color: #F7F7F7;
+				box-sizing: border-box;
+				text-align: center;
+				border-radius: 20rpx;
+			}
+		}
+	}
+	.order-container {
+		scroll-view {
+			height: 100%;
+			overflow: scroll;
+		}	
+	}	
+	.container {
+		padding-bottom: env(safe-area-inset-bottom);
+		height: auto;
+		position: relative;
+	}
+	.tui-order-content{
+		width: 100%;
+		height: auto;
+	}
+	.tui-order-list {
+		width: 100%;
+		position: relative;
+	}
+	.tui-order-item {
+		display: flex;
+		flex-direction: column;
+		width: 702rpx;
+		padding:20rpx 24rpx 0 24rpx;
+		background: #fff;
+		border-bottom: 20rpx solid #F7F7F7;
+	}
+	.order-title{
+		width: 100%;
+		height: auto;
+		.order-title-t{
+			width: 100%;
+			height: 68rpx;
+			float: left;
+			line-height: 68rpx;
+			position: relative;
+			.bage-icon{
+				width: 50rpx;
+				height: 50rpx;
+				display: block;
+				position: absolute;
+				right: 0;
+				top: 9rpx;
+			}
+			.bage-buss{
+				display: inline-block;
+				width: 72rpx;
+				height: 30rpx;
+				background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
+				border-radius: 4rpx;
+				line-height: 30rpx;
+				font-size: $font-size-22;
+				text-align: center;
+				color: #FFFFFF;
+			}
+			.bage-auto{
+				display: inline-block;
+				width: 72rpx;
+				height: 30rpx;
+				background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
+				border-radius: 4rpx;
+				line-height: 30rpx;
+				font-size: $font-size-22;
+				text-align: center;
+				color: #FFFFFF;
+			}
+			.bage-text{
+				display: inline-block;
+				font-size: $font-size-28;
+				line-height: 68rpx;
+				text-align: left;
+				color: $color-system;
+				margin-left: 10rpx;
+			}
+		}
+		.order-title-b{
+			width: 100%;
+			height: 40rpx;
+			float: left;
+			margin-top: 8rpx;
+			.order-title-btxt{
+				float: left;
+				font-size: $font-size-28;
+				line-height: 40rpx;
+				color: #999999;
+				text-align: lef
+			}
+			.order-title-tip{
+				float: right;
+				font-size: $font-size-28;
+				line-height: 40rpx;
+				text-align: right;
+				color: #FF2A2A;
+			}
+		}
+	}
+	.goods-title{
+		width: 100%;
+		height: 56rpx;
+		float: left;
+		margin-top:10rpx;
+		.floor-item-act{
+			height: 56rpx;
+			text-align: center;
+			box-sizing: border-box;
+			float: left;
+			padding: 10rpx 0;
+			margin-right: 12rpx;
+			.floor-tags{
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
+				color: $color-system;
+				text-align: center;
+				display: inline-block;
+				padding:0 16rpx;
+				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
+			}
+		}
+		.title-text{
+			width: 400rpx;
+			overflow: hidden;
+			text-overflow:ellipsis;
+			white-space: nowrap;
+			float: left;
+			font-size: $font-size-28;
+			color: $text-color;
+			text-align: left;
+			line-height: 56rpx;
+			font-weight: bold;
+		}
+	}
+	.goods-item{
+		width: 100%;
+		height: auto;
+	}	
+	.goods-pros-t{
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 217rpx;
+		padding:24rpx 0;
+		.pros-img{
+			float: left;
+			width: 210rpx;
+			height: 100%;
+			border-radius: 10rpx;
+			margin:0 26rpx 0 0;
+			position: relative;
+			.tips{
+				display: inline-block;
+				width: 80rpx;
+				height: 40rpx;
+				background-image: linear-gradient(214deg, #ff4500 0%, #ff5800 53%, #ff4367 100%);
+				line-height: 40rpx;
+				text-align: center;
+				font-size: $font-size-24;
+				color: #FFFFFF;
+				border-radius:10rpx 0 10rpx 0 ;
+				position: absolute;
+				top:0;
+				left: 0;
+			}
+			image{
+				width: 210rpx;
+				height: 210rpx;
+				border-radius: 10rpx;
+				border:1px solid #f3f3f3;
+			}
+		}
+	}
+	.pros-product{
+		width: 468rpx;
+		height: 100%;
+		line-height: 36rpx;
+		font-size: $font-size-26;	
+		position: relative;
+		.producttitle{
+			width: 100%;
+			display: inline-block;
+			height: auto;							
+			text-overflow:ellipsis;
+			display: -webkit-box;
+			word-break: break-all;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 2;
+			overflow: hidden;
+			margin-bottom: 8rpx;
+		}
+		.productspec{
+			height: 36rpx;
+			color: #999999;
+		}
+		.productprice{
+			height: 48rpx;
+			position: absolute;
+			width: 100%;
+			bottom: 0;
+			.price{
+				line-height: 48rpx;
+				font-size: $font-size-28;
+				width: 48%;
+				color: #FF2A2A;
+				float: left;
+				font-weight: bold;
+			}
+			.count{
+				height: 100%;
+				float: right;
+				position: relative;
+				.small{
+					color: #666666;
+				}
+			}
+		}
+		.floor-item-act{
+			width: 100%;
+			height: 56rpx;
+			text-align: center;
+			box-sizing: border-box;
+			float: left;
+			padding:0 0 10rpx 0;
+			.floor-tags{
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
+				color: $color-system;
+				text-align: center;
+				display: inline-block;
+				padding:0 16rpx;
+				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
+			}
+		}
+	}
+	.order-footer{
+		width: 100%;
+		height: 78rpx;
+		float: left;
+		.order-footer-top{
+			width: 100%;
+			height: 34rpx;
+			line-height: 34rpx;
+			font-size: $font-size-24;
+			color: #999999;
+			text-align: right;
+		}
+		.order-footer-bot{
+			width: 100%;
+			float: left;
+			height: 48rpx;
+			line-height: 48rpx;
+			font-size: $font-size-28;
+			font-weight: bold;
+			color: $text-color;
+			.count{
+				width: 50%;
+				float: left;
+				text-align: left;
+			}
+			.money{
+				width: 50%;
+				float: right;
+				text-align: right;
+			}
+		}
+	}
+</style>