zhengjinyi vor 4 Jahren
Ursprung
Commit
f5438e5ae7

+ 1158 - 2
common/json/data.json.js

@@ -31,8 +31,1164 @@ const addressList = [
 						townID: 17,
 						userID: 11063
 					},
-				]					
+				]	
+const cartList = [
+                {
+                    "shopID":10134,
+                    "userID":11052,
+                    "name":"深圳市美轮美奂服务有限公司",
+                    "sname":"美轮美奂",
+                    "nameEn":null,
+                    "site":null,
+                    "ledgerNo":null,
+                    "logo":"",
+                    "rebateAmount":0,
+                    "level":null,
+                    "score":null,
+                    "productCount":null,
+                    "legalPerson":"sdfa",
+                    "businessLicense":null,
+                    "businessLicenseImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHHq6AYuqFAAGOILQcRyE628.jpg",
+                    "taxCertificate":null,
+                    "taxCertificateImage":null,
+                    "authorizationCertificateImage":null,
+                    "provinceID":19,
+                    "cityID":202,
+                    "townID":1958,
+                    "address":"广东省深圳市宝安区",
+                    "registeredCapital":12,
+                    "nature":"删掉",
+                    "turnover":123,
+                    "linkMan":"非林峰",
+                    "contractPhone":"",
+                    "contractMobile":"18666666669",
+                    "fax":"",
+                    "zipCode":null,
+                    "linkMan1":"非林峰",
+                    "duty1":null,
+                    "contractPhone1":null,
+                    "contractMobile1":"18666666669",
+                    "contractQQ1":null,
+                    "wechat1":null,
+                    "contractEmail1":"18666666669@qq.com",
+                    "linkMan2":"非林峰",
+                    "duty2":null,
+                    "contractPhone2":null,
+                    "contractMobile2":"18666666669",
+                    "contractQQ2":null,
+                    "wechat2":null,
+                    "contractEmail2":"18666666669@qq.com",
+                    "scope":null,
+                    "info":"啊大噶撒打发",
+                    "productDesc":"暗杀士大夫",
+                    "lng":null,
+                    "lat":null,
+                    "addTime":"2021-03-09 15:07:32",
+                    "auditStatus":"1",
+                    "auditTime":"2021-03-09 03:08:37",
+                    "auditNote":null,
+                    "favoriteTimes":0,
+                    "validFlag":"1",
+                    "payFlag1":null,
+                    "auditFlag1":null,
+                    "payFlag2":null,
+                    "auditFlag2":null,
+                    "payFlag3":null,
+                    "auditFlag3":null,
+                    "note":null,
+                    "status":90,
+                    "sortIndex":null,
+                    "rate1":null,
+                    "rate2":null,
+                    "masterFlag":null,
+                    "erpFlag":null,
+                    "shopSecret":null,
+                    "masterLogo":null,
+                    "cooperateFlag":null,
+                    "bail":null,
+                    "businessScope":"仪器护理类/撒打发",
+                    "socialCreditCode":"123456789987654321",
+                    "mainpro":"产品",
+                    "firstShopType":"1",
+                    "secondShopType":"3",
+                    "medicalPracticeLicenseImg1":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BQeHGANhPUAABorQhpGjU343.jpg",
+                    "medicalPracticeLicenseImg2":null,
+                    "medicalPracticeLicenseImg3":null,
+                    "bankAccount":null,
+                    "bankAccountName":null,
+                    "bankName":null,
+                    "ableRebateAmount":0,
+                    "totalPrice":72.1075,
+                    "productsList":[
+                        {
+                            "productID":6421,
+                            "brandID":25,
+                            "tinyTypeID":1120,
+                            "classifyId":null,
+                            "preferredFlag":null,
+                            "selfTypeID":null,
+                            "shopID":10134,
+                            "name":"【测试用】肌本演绎【O4元素破茧疗法】25800 特惠方案",
+                            "aliasName":"【测试用】肌本演绎【O4元素破茧疗法】25800 特惠方案",
+                            "searchKey":"##########",
+                            "productRemarks":null,
+                            "normalPrice":15.25,
+                            "price":15.25,
+                            "highestUserLevelPrice":null,
+                            "lowestUserLevelPrice":null,
+                            "lowestUserLevelID":null,
+                            "price0":null,
+                            "price0Grade":null,
+                            "price0Text":null,
+                            "price0TextFlag":null,
+                            "price1":15.25,
+                            "price1Grade":null,
+                            "price1Text":null,
+                            "price1TextFlag":"2",
+                            "price8":null,
+                            "price8Grade":null,
+                            "price8Text":null,
+                            "price8TextFlag":null,
+                            "ladderPriceFlag":"0",
+                            "price2":null,
+                            "price3":null,
+                            "price4":null,
+                            "price5":null,
+                            "price6":null,
+                            "price7":null,
+                            "fee":null,
+                            "stock":100,
+                            "hasSkuFlag":"1",
+                            "mainImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHJGCARS7iAAVlWLR-uKU385.jpg",
+                            "propertiesInfo":null,
+                            "addTime":"2021-03-09 15:32:19",
+                            "updateTime":"2021-03-09 15:32:19",
+                            "classifyAddTime":null,
+                            "sellNumber":0,
+                            "weekSellNumber":null,
+                            "beforeValidFlag":null,
+                            "validFlag":"2",
+                            "favoriteTimes":0,
+                            "commentScore":0,
+                            "commentTimes":0,
+                            "selfRecommendFlag":null,
+                            "sysRecommendFlag":null,
+                            "sortIndex":0,
+                            "featuredFlag":"0",
+                            "featuredSortIndex":null,
+                            "productCode":"sdfsSGZee3336421",
+                            "rate1":null,
+                            "rate2":null,
+                            "unit":"瓶",
+                            "synToERPFlag":null,
+                            "allAreaFlag":"1",
+                            "provinceIDs":"0",
+                            "serviceNumber":"1",
+                            "maxBuyNumber":null,
+                            "virtualFlag":null,
+                            "minBuyNumber":1,
+                            "packageCount":null,
+                            "byFlag":null,
+                            "normalProductFlag":1,
+                            "wholeSaleProductFlag":null,
+                            "promotionProductFlag":null,
+                            "groupBuyProductFlag":null,
+                            "step":1,
+                            "speCommisionFlag":null,
+                            "speCommision":null,
+                            "videourl":null,
+                            "props":null,
+                            "providers":null,
+                            "serviceCommissionRatio":null,
+                            "reCommissionRatio":null,
+                            "pushToERPName":null,
+                            "prodBeans":null,
+                            "useBeansFlag":null,
+                            "privateFlag":null,
+                            "invisibleServiceProviderIDs":null,
+                            "displayOnCRMFlag":null,
+                            "needServiceFlag":null,
+                            "actFlag":0,
+                            "actStatus":null,
+                            "actSort":null,
+                            "actPrice0":null,
+                            "actPrice1":null,
+                            "actPrice2":null,
+                            "actPrice3":null,
+                            "actPrice4":null,
+                            "actPrice5":null,
+                            "actPrice6":null,
+                            "actPrice7":null,
+                            "actType":null,
+                            "actCreateTime":null,
+                            "actFullReduceAmount":null,
+                            "actReduceAmount":null,
+                            "visibility":"3",
+                            "actFullGiftAmount":null,
+                            "actBuyGiftNum":null,
+                            "beginTime":null,
+                            "endTime":null,
+                            "shopIndexModuleID":null,
+                            "onlineTime":null,
+                            "downlineTime":null,
+                            "freePostFlag":"2",
+                            "crmBigTypeId":null,
+                            "crmSmallTypeId":null,
+                            "costPrice":10,
+                            "costProportional":null,
+                            "costCheckFlag":"1",
+                            "precisehKey":null,
+                            "docBoost":null,
+                            "cmbeanFlag":null,
+                            "cmbeanPrice":null,
+                            "cmbeanSort":null,
+                            "tags":"注射",
+                            "surplusTime":null,
+                            "productType":"1",
+                            "machineType":"",
+                            "qualificationImg":"",
+                            "includedTax":"0",
+                            "taxPoint":10,
+                            "supplierTaxPoint":10,
+                            "invoiceType":"3",
+                            "recommendType":"0",
+                            "skuID":null,
+                            "priceType":null,
+                            "combinationID":null,
+                            "combinationSort":null,
+                            "productCategory":"1",
+                            "auditReason":null,
+                            "commodityType":"1",
+                            "retailPrice":15.25,
+                            "discountPrice":null,
+                            "tagsList":null,
+                            "imageList":null,
+                            "productDetail":null,
+                            "productCount":1,
+                            "ladderPriceList":null,
+                            "shop":null,
+                            "sellerCartId":3771,
+                            "productsChecked":false,
+                            "repurchasePriceState":false,
+                            "initProductNum":null,
+                            "totalPrice":null,
+                            "failureState":null,
+                            "smallTypeID":1037,
+                            "bigTypeID":1013,
+                            "typeName":null,
+                            "parametersList":null,
+                            "brandName":null,
+                            "bigTypeName":null,
+                            "smallTypeName":null,
+                            "tinyTypeName":null,
+                            "activityDiscount":null,
+                            "promotions":null,
+                            "giftType":null,
+                            "userIdentity":null,
+                            "isChecked":false,
+                            "detailTalkFlag":null,
+                            "shopName":null,
+                            "beautyActFlag":null
+                        },
+                        {
+                            "productID":6420,
+                            "brandID":25,
+                            "tinyTypeID":null,
+                            "classifyId":null,
+                            "preferredFlag":null,
+                            "selfTypeID":null,
+                            "shopID":10134,
+                            "name":"【测试用】润百颜注射修饰透明质酸钠凝胶1ml",
+                            "aliasName":"【测试用】润百颜注射修饰透明质酸钠凝胶1ml",
+                            "searchKey":"##########",
+                            "productRemarks":null,
+                            "normalPrice":25.75,
+                            "price":25.75,
+                            "highestUserLevelPrice":null,
+                            "lowestUserLevelPrice":null,
+                            "lowestUserLevelID":null,
+                            "price0":null,
+                            "price0Grade":null,
+                            "price0Text":null,
+                            "price0TextFlag":null,
+                            "price1":25.75,
+                            "price1Grade":null,
+                            "price1Text":null,
+                            "price1TextFlag":"2",
+                            "price8":null,
+                            "price8Grade":null,
+                            "price8Text":null,
+                            "price8TextFlag":null,
+                            "ladderPriceFlag":"0",
+                            "price2":null,
+                            "price3":null,
+                            "price4":null,
+                            "price5":null,
+                            "price6":null,
+                            "price7":null,
+                            "fee":null,
+                            "stock":100,
+                            "hasSkuFlag":"1",
+                            "mainImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHIIWATL05AAGHUpelz2U374.jpg",
+                            "propertiesInfo":null,
+                            "addTime":"2021-03-09 15:15:45",
+                            "updateTime":"2021-03-09 15:15:45",
+                            "classifyAddTime":null,
+                            "sellNumber":0,
+                            "weekSellNumber":null,
+                            "beforeValidFlag":null,
+                            "validFlag":"2",
+                            "favoriteTimes":0,
+                            "commentScore":0,
+                            "commentTimes":0,
+                            "selfRecommendFlag":null,
+                            "sysRecommendFlag":null,
+                            "sortIndex":0,
+                            "featuredFlag":"0",
+                            "featuredSortIndex":null,
+                            "productCode":"kscz6420",
+                            "rate1":null,
+                            "rate2":null,
+                            "unit":"盒",
+                            "synToERPFlag":null,
+                            "allAreaFlag":"1",
+                            "provinceIDs":"0",
+                            "serviceNumber":"1",
+                            "maxBuyNumber":null,
+                            "virtualFlag":null,
+                            "minBuyNumber":1,
+                            "packageCount":null,
+                            "byFlag":null,
+                            "normalProductFlag":1,
+                            "wholeSaleProductFlag":null,
+                            "promotionProductFlag":null,
+                            "groupBuyProductFlag":null,
+                            "step":1,
+                            "speCommisionFlag":null,
+                            "speCommision":null,
+                            "videourl":null,
+                            "props":null,
+                            "providers":null,
+                            "serviceCommissionRatio":null,
+                            "reCommissionRatio":null,
+                            "pushToERPName":null,
+                            "prodBeans":null,
+                            "useBeansFlag":null,
+                            "privateFlag":null,
+                            "invisibleServiceProviderIDs":null,
+                            "displayOnCRMFlag":null,
+                            "needServiceFlag":null,
+                            "actFlag":0,
+                            "actStatus":null,
+                            "actSort":null,
+                            "actPrice0":null,
+                            "actPrice1":null,
+                            "actPrice2":null,
+                            "actPrice3":null,
+                            "actPrice4":null,
+                            "actPrice5":null,
+                            "actPrice6":null,
+                            "actPrice7":null,
+                            "actType":null,
+                            "actCreateTime":null,
+                            "actFullReduceAmount":null,
+                            "actReduceAmount":null,
+                            "visibility":"3",
+                            "actFullGiftAmount":null,
+                            "actBuyGiftNum":null,
+                            "beginTime":null,
+                            "endTime":null,
+                            "shopIndexModuleID":null,
+                            "onlineTime":null,
+                            "downlineTime":null,
+                            "freePostFlag":"2",
+                            "crmBigTypeId":null,
+                            "crmSmallTypeId":null,
+                            "costPrice":20,
+                            "costProportional":null,
+                            "costCheckFlag":"1",
+                            "precisehKey":null,
+                            "docBoost":null,
+                            "cmbeanFlag":null,
+                            "cmbeanPrice":null,
+                            "cmbeanSort":null,
+                            "tags":"注射",
+                            "surplusTime":null,
+                            "productType":"1",
+                            "machineType":"",
+                            "qualificationImg":"",
+                            "includedTax":"0",
+                            "taxPoint":10,
+                            "supplierTaxPoint":10,
+                            "invoiceType":"2",
+                            "recommendType":"0",
+                            "skuID":null,
+                            "priceType":null,
+                            "combinationID":null,
+                            "combinationSort":null,
+                            "productCategory":"1",
+                            "auditReason":null,
+                            "commodityType":"1",
+                            "retailPrice":28.325,
+                            "discountPrice":null,
+                            "tagsList":null,
+                            "imageList":null,
+                            "productDetail":null,
+                            "productCount":1,
+                            "ladderPriceList":null,
+                            "shop":null,
+                            "sellerCartId":3772,
+                            "productsChecked":false,
+                            "repurchasePriceState":false,
+                            "initProductNum":null,
+                            "totalPrice":null,
+                            "failureState":null,
+                            "smallTypeID":null,
+                            "bigTypeID":1014,
+                            "typeName":null,
+                            "parametersList":null,
+                            "brandName":null,
+                            "bigTypeName":null,
+                            "smallTypeName":null,
+                            "tinyTypeName":null,
+                            "activityDiscount":null,
+                            "promotions":null,
+                            "giftType":null,
+                            "userIdentity":null,
+                            "isChecked":false,
+                            "detailTalkFlag":null,
+                            "shopName":null,
+                            "beautyActFlag":null
+                        },
+                        {
+                            "productID":6419,
+                            "brandID":1,
+                            "tinyTypeID":null,
+                            "classifyId":null,
+                            "preferredFlag":null,
+                            "selfTypeID":null,
+                            "shopID":10134,
+                            "name":"【测试用】Dermaheal HSR 德玛莉肌活丝蕴凝颜精华液",
+                            "aliasName":"【测试用】Dermaheal HSR 德玛莉肌活丝蕴凝颜精华液",
+                            "searchKey":"##########",
+                            "productRemarks":null,
+                            "normalPrice":25.25,
+                            "price":25.25,
+                            "highestUserLevelPrice":null,
+                            "lowestUserLevelPrice":null,
+                            "lowestUserLevelID":null,
+                            "price0":null,
+                            "price0Grade":null,
+                            "price0Text":null,
+                            "price0TextFlag":null,
+                            "price1":25.25,
+                            "price1Grade":null,
+                            "price1Text":null,
+                            "price1TextFlag":"2",
+                            "price8":null,
+                            "price8Grade":null,
+                            "price8Text":null,
+                            "price8TextFlag":null,
+                            "ladderPriceFlag":"0",
+                            "price2":null,
+                            "price3":null,
+                            "price4":null,
+                            "price5":null,
+                            "price6":null,
+                            "price7":null,
+                            "fee":null,
+                            "stock":200,
+                            "hasSkuFlag":"1",
+                            "mainImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHH8aAFiGIAAGHr5DovGA124.jpg",
+                            "propertiesInfo":null,
+                            "addTime":"2021-03-09 15:12:28",
+                            "updateTime":"2021-03-09 15:12:28",
+                            "classifyAddTime":null,
+                            "sellNumber":0,
+                            "weekSellNumber":null,
+                            "beforeValidFlag":null,
+                            "validFlag":"2",
+                            "favoriteTimes":0,
+                            "commentScore":0,
+                            "commentTimes":0,
+                            "selfRecommendFlag":null,
+                            "sysRecommendFlag":null,
+                            "sortIndex":0,
+                            "featuredFlag":"0",
+                            "featuredSortIndex":null,
+                            "productCode":"FWLCP6419",
+                            "rate1":null,
+                            "rate2":null,
+                            "unit":"片",
+                            "synToERPFlag":null,
+                            "allAreaFlag":"1",
+                            "provinceIDs":"0",
+                            "serviceNumber":"1",
+                            "maxBuyNumber":null,
+                            "virtualFlag":null,
+                            "minBuyNumber":1,
+                            "packageCount":null,
+                            "byFlag":null,
+                            "normalProductFlag":1,
+                            "wholeSaleProductFlag":null,
+                            "promotionProductFlag":null,
+                            "groupBuyProductFlag":null,
+                            "step":1,
+                            "speCommisionFlag":null,
+                            "speCommision":null,
+                            "videourl":null,
+                            "props":null,
+                            "providers":null,
+                            "serviceCommissionRatio":null,
+                            "reCommissionRatio":null,
+                            "pushToERPName":null,
+                            "prodBeans":null,
+                            "useBeansFlag":null,
+                            "privateFlag":null,
+                            "invisibleServiceProviderIDs":null,
+                            "displayOnCRMFlag":null,
+                            "needServiceFlag":null,
+                            "actFlag":0,
+                            "actStatus":null,
+                            "actSort":null,
+                            "actPrice0":null,
+                            "actPrice1":null,
+                            "actPrice2":null,
+                            "actPrice3":null,
+                            "actPrice4":null,
+                            "actPrice5":null,
+                            "actPrice6":null,
+                            "actPrice7":null,
+                            "actType":null,
+                            "actCreateTime":null,
+                            "actFullReduceAmount":null,
+                            "actReduceAmount":null,
+                            "visibility":"3",
+                            "actFullGiftAmount":null,
+                            "actBuyGiftNum":null,
+                            "beginTime":null,
+                            "endTime":null,
+                            "shopIndexModuleID":null,
+                            "onlineTime":null,
+                            "downlineTime":null,
+                            "freePostFlag":"2",
+                            "crmBigTypeId":null,
+                            "crmSmallTypeId":null,
+                            "costPrice":20,
+                            "costProportional":null,
+                            "costCheckFlag":"1",
+                            "precisehKey":null,
+                            "docBoost":null,
+                            "cmbeanFlag":null,
+                            "cmbeanPrice":null,
+                            "cmbeanSort":null,
+                            "tags":"面膜",
+                            "surplusTime":null,
+                            "productType":"1",
+                            "machineType":"",
+                            "qualificationImg":"",
+                            "includedTax":"0",
+                            "taxPoint":13,
+                            "supplierTaxPoint":13,
+                            "invoiceType":"1",
+                            "recommendType":"0",
+                            "skuID":null,
+                            "priceType":null,
+                            "combinationID":null,
+                            "combinationSort":null,
+                            "productCategory":"1",
+                            "auditReason":null,
+                            "commodityType":"1",
+                            "retailPrice":28.5325,
+                            "discountPrice":null,
+                            "tagsList":null,
+                            "imageList":null,
+                            "productDetail":null,
+                            "productCount":1,
+                            "ladderPriceList":null,
+                            "shop":null,
+                            "sellerCartId":3773,
+                            "productsChecked":false,
+                            "repurchasePriceState":false,
+                            "initProductNum":null,
+                            "totalPrice":null,
+                            "failureState":null,
+                            "smallTypeID":null,
+                            "bigTypeID":1018,
+                            "typeName":null,
+                            "parametersList":null,
+                            "brandName":null,
+                            "bigTypeName":null,
+                            "smallTypeName":null,
+                            "tinyTypeName":null,
+                            "activityDiscount":null,
+                            "promotions":null,
+                            "giftType":null,
+                            "userIdentity":null,
+                            "isChecked":false,
+                            "detailTalkFlag":null,
+                            "shopName":null,
+                            "beautyActFlag":null
+                        }
+                    ],
+                    "businessScopeArray":null,
+                    "mobileCode":null,
+                    "shopBannerList":null,
+                    "productionLicence":null,
+                    "hygienicLicense":null,
+                    "taxLicense":null,
+                    "certificateHonor":null,
+                    "productCertification":null,
+                    "provincialAddress":null,
+                    "promotions":null,
+                    "reducedPrice":null,
+                    "normalNum":null
+                },
+                {
+                    "shopID":10133,
+                    "userID":11051,
+                    "name":"深圳市采美奥泰贸易有限公司",
+                    "sname":"采美奥泰",
+                    "nameEn":null,
+                    "site":null,
+                    "ledgerNo":null,
+                    "logo":"/userfiles/1/images/photo/2021/01/Cmis21__5o-ADIQEAAD1N_9T1C4174.jpg",
+                    "rebateAmount":0,
+                    "level":null,
+                    "score":null,
+                    "productCount":null,
+                    "legalPerson":null,
+                    "businessLicense":null,
+                    "businessLicenseImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BG9AGARTWcAAAfYeeBGQU924.jpg",
+                    "taxCertificate":"1223132454646556",
+                    "taxCertificateImage":null,
+                    "authorizationCertificateImage":null,
+                    "provinceID":19,
+                    "cityID":202,
+                    "townID":1955,
+                    "address":"红树湾",
+                    "registeredCapital":null,
+                    "nature":null,
+                    "turnover":null,
+                    "linkMan":"郑超",
+                    "contractPhone":null,
+                    "contractMobile":"18666666668",
+                    "fax":null,
+                    "zipCode":null,
+                    "linkMan1":"郑超",
+                    "duty1":null,
+                    "contractPhone1":null,
+                    "contractMobile1":"18666666668",
+                    "contractQQ1":null,
+                    "wechat1":null,
+                    "contractEmail1":"18666666668@qq.com",
+                    "linkMan2":"郑超",
+                    "duty2":null,
+                    "contractPhone2":null,
+                    "contractMobile2":"18666666668",
+                    "contractQQ2":null,
+                    "wechat2":null,
+                    "contractEmail2":"18666666668@qq.com",
+                    "scope":null,
+                    "info":"二恶烷群",
+                    "productDesc":"额外若群",
+                    "lng":null,
+                    "lat":null,
+                    "addTime":"2021-03-09 12:05:24",
+                    "auditStatus":"1",
+                    "auditTime":"2021-03-09 02:01:28",
+                    "auditNote":null,
+                    "favoriteTimes":0,
+                    "validFlag":"1",
+                    "payFlag1":null,
+                    "auditFlag1":null,
+                    "payFlag2":null,
+                    "auditFlag2":null,
+                    "payFlag3":null,
+                    "auditFlag3":null,
+                    "note":null,
+                    "status":90,
+                    "sortIndex":null,
+                    "rate1":null,
+                    "rate2":null,
+                    "masterFlag":null,
+                    "erpFlag":null,
+                    "shopSecret":null,
+                    "masterLogo":null,
+                    "cooperateFlag":null,
+                    "bail":null,
+                    "businessScope":null,
+                    "socialCreditCode":"123456789987654321",
+                    "mainpro":"",
+                    "firstShopType":"2",
+                    "secondShopType":"",
+                    "medicalPracticeLicenseImg1":null,
+                    "medicalPracticeLicenseImg2":null,
+                    "medicalPracticeLicenseImg3":null,
+                    "bankAccount":null,
+                    "bankAccountName":null,
+                    "bankName":null,
+                    "ableRebateAmount":0,
+                    "totalPrice":49.775,
+                    "productsList":[
+                        {
+                            "productID":6418,
+                            "brandID":1,
+                            "tinyTypeID":null,
+                            "classifyId":null,
+                            "preferredFlag":null,
+                            "selfTypeID":null,
+                            "shopID":10133,
+                            "name":"【测试用】EndyMed-3Deep-医学美容多功能相控射频",
+                            "aliasName":"【测试用】EndyMed-3Deep-医学美容多功能相控射频",
+                            "searchKey":"##########",
+                            "productRemarks":null,
+                            "normalPrice":45.25,
+                            "price":45.25,
+                            "highestUserLevelPrice":null,
+                            "lowestUserLevelPrice":null,
+                            "lowestUserLevelID":null,
+                            "price0":null,
+                            "price0Grade":null,
+                            "price0Text":null,
+                            "price0TextFlag":null,
+                            "price1":45.25,
+                            "price1Grade":null,
+                            "price1Text":null,
+                            "price1TextFlag":"2",
+                            "price8":null,
+                            "price8Grade":null,
+                            "price8Text":null,
+                            "price8TextFlag":null,
+                            "ladderPriceFlag":"0",
+                            "price2":null,
+                            "price3":null,
+                            "price4":null,
+                            "price5":null,
+                            "price6":null,
+                            "price7":null,
+                            "fee":null,
+                            "stock":100,
+                            "hasSkuFlag":"1",
+                            "mainImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHEMOAFVmsAAGOILQcRyE020.jpg",
+                            "propertiesInfo":null,
+                            "addTime":"2021-03-09 14:08:52",
+                            "updateTime":"2021-03-09 14:08:52",
+                            "classifyAddTime":null,
+                            "sellNumber":0,
+                            "weekSellNumber":null,
+                            "beforeValidFlag":null,
+                            "validFlag":"2",
+                            "favoriteTimes":0,
+                            "commentScore":0,
+                            "commentTimes":0,
+                            "selfRecommendFlag":null,
+                            "sysRecommendFlag":null,
+                            "sortIndex":0,
+                            "featuredFlag":"0",
+                            "featuredSortIndex":null,
+                            "productCode":"SSSXSPRZH6418",
+                            "rate1":null,
+                            "rate2":null,
+                            "unit":"台",
+                            "synToERPFlag":null,
+                            "allAreaFlag":"1",
+                            "provinceIDs":"0",
+                            "serviceNumber":"1",
+                            "maxBuyNumber":null,
+                            "virtualFlag":null,
+                            "minBuyNumber":1,
+                            "packageCount":null,
+                            "byFlag":null,
+                            "normalProductFlag":1,
+                            "wholeSaleProductFlag":null,
+                            "promotionProductFlag":null,
+                            "groupBuyProductFlag":null,
+                            "step":1,
+                            "speCommisionFlag":null,
+                            "speCommision":null,
+                            "videourl":null,
+                            "props":null,
+                            "providers":null,
+                            "serviceCommissionRatio":null,
+                            "reCommissionRatio":null,
+                            "pushToERPName":null,
+                            "prodBeans":null,
+                            "useBeansFlag":null,
+                            "privateFlag":null,
+                            "invisibleServiceProviderIDs":null,
+                            "displayOnCRMFlag":null,
+                            "needServiceFlag":null,
+                            "actFlag":0,
+                            "actStatus":null,
+                            "actSort":null,
+                            "actPrice0":null,
+                            "actPrice1":null,
+                            "actPrice2":null,
+                            "actPrice3":null,
+                            "actPrice4":null,
+                            "actPrice5":null,
+                            "actPrice6":null,
+                            "actPrice7":null,
+                            "actType":null,
+                            "actCreateTime":null,
+                            "actFullReduceAmount":null,
+                            "actReduceAmount":null,
+                            "visibility":"3",
+                            "actFullGiftAmount":null,
+                            "actBuyGiftNum":null,
+                            "beginTime":null,
+                            "endTime":null,
+                            "shopIndexModuleID":null,
+                            "onlineTime":null,
+                            "downlineTime":null,
+                            "freePostFlag":"2",
+                            "crmBigTypeId":null,
+                            "crmSmallTypeId":null,
+                            "costPrice":40,
+                            "costProportional":null,
+                            "costCheckFlag":"1",
+                            "precisehKey":null,
+                            "docBoost":null,
+                            "cmbeanFlag":null,
+                            "cmbeanPrice":null,
+                            "cmbeanSort":null,
+                            "tags":"美容仪",
+                            "surplusTime":null,
+                            "productType":"1",
+                            "machineType":"",
+                            "qualificationImg":"",
+                            "includedTax":"0",
+                            "taxPoint":10,
+                            "supplierTaxPoint":10,
+                            "invoiceType":"2",
+                            "recommendType":"0",
+                            "skuID":null,
+                            "priceType":null,
+                            "combinationID":null,
+                            "combinationSort":null,
+                            "productCategory":"1",
+                            "auditReason":null,
+                            "commodityType":"2",
+                            "retailPrice":49.775,
+                            "discountPrice":null,
+                            "tagsList":null,
+                            "imageList":null,
+                            "productDetail":null,
+                            "productCount":1,
+                            "ladderPriceList":null,
+                            "shop":null,
+                            "sellerCartId":3774,
+                            "productsChecked":false,
+                            "repurchasePriceState":false,
+                            "initProductNum":null,
+                            "totalPrice":null,
+                            "failureState":null,
+                            "smallTypeID":1051,
+                            "bigTypeID":1022,
+                            "typeName":null,
+                            "parametersList":null,
+                            "brandName":null,
+                            "bigTypeName":null,
+                            "smallTypeName":null,
+                            "tinyTypeName":null,
+                            "activityDiscount":null,
+                            "promotions":null,
+                            "giftType":null,
+                            "userIdentity":null,
+                            "isChecked":false,
+                            "detailTalkFlag":null,
+                            "shopName":null,
+                            "beautyActFlag":null
+                        }
+                    ],
+                    "businessScopeArray":null,
+                    "mobileCode":null,
+                    "shopBannerList":null,
+                    "productionLicence":null,
+                    "hygienicLicense":null,
+                    "taxLicense":null,
+                    "certificateHonor":null,
+                    "productCertification":null,
+                    "provincialAddress":null,
+                    "promotions":null,
+                    "reducedPrice":null,
+                    "normalNum":null
+                },
+                {
+                    "shopID":10131,
+                    "userID":11049,
+                    "name":"深圳市肤白貌美服务有限公司",
+                    "sname":"肤白貌美",
+                    "nameEn":null,
+                    "site":null,
+                    "ledgerNo":null,
+                    "logo":"/userfiles/1/images/photo/2021/01/Cmis21__5o-AaNq1AAEriLZ0RzY342.jpg",
+                    "rebateAmount":0,
+                    "level":null,
+                    "score":null,
+                    "productCount":null,
+                    "legalPerson":null,
+                    "businessLicense":null,
+                    "businessLicenseImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BG8bSALKXAAAAfYeeBGQU840.jpg",
+                    "taxCertificate":"45654654645654645645645645645654",
+                    "taxCertificateImage":null,
+                    "authorizationCertificateImage":null,
+                    "provinceID":19,
+                    "cityID":202,
+                    "townID":3202,
+                    "address":"高傲新村",
+                    "registeredCapital":null,
+                    "nature":null,
+                    "turnover":null,
+                    "linkMan":"吴小研",
+                    "contractPhone":null,
+                    "contractMobile":"18666666666",
+                    "fax":null,
+                    "zipCode":null,
+                    "linkMan1":"吴小研",
+                    "duty1":null,
+                    "contractPhone1":null,
+                    "contractMobile1":"18666666666",
+                    "contractQQ1":null,
+                    "wechat1":null,
+                    "contractEmail1":"18666666666@qq.com",
+                    "linkMan2":"吴小研",
+                    "duty2":null,
+                    "contractPhone2":null,
+                    "contractMobile2":"18666666666",
+                    "contractQQ2":null,
+                    "wechat2":null,
+                    "contractEmail2":"18666666666@qq.com",
+                    "scope":null,
+                    "info":"45",
+                    "productDesc":"4564",
+                    "lng":null,
+                    "lat":null,
+                    "addTime":"2021-03-09 11:55:39",
+                    "auditStatus":"1",
+                    "auditTime":"2021-03-09 01:43:18",
+                    "auditNote":null,
+                    "favoriteTimes":0,
+                    "validFlag":"1",
+                    "payFlag1":null,
+                    "auditFlag1":null,
+                    "payFlag2":null,
+                    "auditFlag2":null,
+                    "payFlag3":null,
+                    "auditFlag3":null,
+                    "note":null,
+                    "status":90,
+                    "sortIndex":null,
+                    "rate1":null,
+                    "rate2":null,
+                    "masterFlag":null,
+                    "erpFlag":null,
+                    "shopSecret":null,
+                    "masterLogo":null,
+                    "cooperateFlag":null,
+                    "bail":null,
+                    "businessScope":null,
+                    "socialCreditCode":"987654321123456666",
+                    "mainpro":"",
+                    "firstShopType":"1",
+                    "secondShopType":"1",
+                    "medicalPracticeLicenseImg1":null,
+                    "medicalPracticeLicenseImg2":null,
+                    "medicalPracticeLicenseImg3":null,
+                    "bankAccount":null,
+                    "bankAccountName":null,
+                    "bankName":null,
+                    "ableRebateAmount":0,
+                    "totalPrice":35.75,
+                    "productsList":[
+                        {
+                            "productID":6416,
+                            "brandID":1,
+                            "tinyTypeID":1120,
+                            "classifyId":null,
+                            "preferredFlag":null,
+                            "selfTypeID":null,
+                            "shopID":10131,
+                            "name":"【测试用】HydraFacial海菲秀 真空负压 深层洁净",
+                            "aliasName":"【测试用】HydraFacial海菲秀 真空负压 深层洁净",
+                            "searchKey":"##########",
+                            "productRemarks":null,
+                            "normalPrice":35.75,
+                            "price":35.75,
+                            "highestUserLevelPrice":null,
+                            "lowestUserLevelPrice":null,
+                            "lowestUserLevelID":null,
+                            "price0":null,
+                            "price0Grade":null,
+                            "price0Text":null,
+                            "price0TextFlag":null,
+                            "price1":35.75,
+                            "price1Grade":null,
+                            "price1Text":null,
+                            "price1TextFlag":"2",
+                            "price8":null,
+                            "price8Grade":null,
+                            "price8Text":null,
+                            "price8TextFlag":null,
+                            "ladderPriceFlag":"0",
+                            "price2":null,
+                            "price3":null,
+                            "price4":null,
+                            "price5":null,
+                            "price6":null,
+                            "price7":null,
+                            "fee":null,
+                            "stock":100,
+                            "hasSkuFlag":"1",
+                            "mainImage":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHDRGAQGhIAAWEI4ChAUg291.jpg",
+                            "propertiesInfo":null,
+                            "addTime":"2021-03-09 13:52:49",
+                            "updateTime":"2021-03-09 13:52:49",
+                            "classifyAddTime":null,
+                            "sellNumber":0,
+                            "weekSellNumber":null,
+                            "beforeValidFlag":null,
+                            "validFlag":"2",
+                            "favoriteTimes":0,
+                            "commentScore":0,
+                            "commentTimes":0,
+                            "selfRecommendFlag":null,
+                            "sysRecommendFlag":null,
+                            "sortIndex":0,
+                            "featuredFlag":"0",
+                            "featuredSortIndex":null,
+                            "productCode":"sdfsSGZee3336416",
+                            "rate1":null,
+                            "rate2":null,
+                            "unit":"台",
+                            "synToERPFlag":null,
+                            "allAreaFlag":"1",
+                            "provinceIDs":"0",
+                            "serviceNumber":"1",
+                            "maxBuyNumber":null,
+                            "virtualFlag":null,
+                            "minBuyNumber":1,
+                            "packageCount":null,
+                            "byFlag":null,
+                            "normalProductFlag":1,
+                            "wholeSaleProductFlag":null,
+                            "promotionProductFlag":null,
+                            "groupBuyProductFlag":null,
+                            "step":1,
+                            "speCommisionFlag":null,
+                            "speCommision":null,
+                            "videourl":null,
+                            "props":null,
+                            "providers":null,
+                            "serviceCommissionRatio":null,
+                            "reCommissionRatio":null,
+                            "pushToERPName":null,
+                            "prodBeans":null,
+                            "useBeansFlag":null,
+                            "privateFlag":null,
+                            "invisibleServiceProviderIDs":null,
+                            "displayOnCRMFlag":null,
+                            "needServiceFlag":null,
+                            "actFlag":0,
+                            "actStatus":null,
+                            "actSort":null,
+                            "actPrice0":null,
+                            "actPrice1":null,
+                            "actPrice2":null,
+                            "actPrice3":null,
+                            "actPrice4":null,
+                            "actPrice5":null,
+                            "actPrice6":null,
+                            "actPrice7":null,
+                            "actType":null,
+                            "actCreateTime":null,
+                            "actFullReduceAmount":null,
+                            "actReduceAmount":null,
+                            "visibility":"3",
+                            "actFullGiftAmount":null,
+                            "actBuyGiftNum":null,
+                            "beginTime":null,
+                            "endTime":null,
+                            "shopIndexModuleID":null,
+                            "onlineTime":null,
+                            "downlineTime":null,
+                            "freePostFlag":"2",
+                            "crmBigTypeId":null,
+                            "crmSmallTypeId":null,
+                            "costPrice":30,
+                            "costProportional":null,
+                            "costCheckFlag":"1",
+                            "precisehKey":null,
+                            "docBoost":null,
+                            "cmbeanFlag":null,
+                            "cmbeanPrice":null,
+                            "cmbeanSort":null,
+                            "tags":"清洁",
+                            "surplusTime":null,
+                            "productType":"2",
+                            "machineType":"1",
+                            "qualificationImg":"https://img-b.caimei365.com/group1/M00/03/20/Cmgy62BHDL2ADbuIAAlLT8OmIlA825.gif",
+                            "includedTax":"1",
+                            "taxPoint":10,
+                            "supplierTaxPoint":10,
+                            "invoiceType":"2",
+                            "recommendType":"0",
+                            "skuID":null,
+                            "priceType":null,
+                            "combinationID":null,
+                            "combinationSort":null,
+                            "productCategory":"1",
+                            "auditReason":null,
+                            "commodityType":"1",
+                            "retailPrice":35.75,
+                            "discountPrice":null,
+                            "tagsList":null,
+                            "imageList":null,
+                            "productDetail":null,
+                            "productCount":1,
+                            "ladderPriceList":null,
+                            "shop":null,
+                            "sellerCartId":3775,
+                            "productsChecked":false,
+                            "repurchasePriceState":false,
+                            "initProductNum":null,
+                            "totalPrice":null,
+                            "failureState":null,
+                            "smallTypeID":1037,
+                            "bigTypeID":1013,
+                            "typeName":null,
+                            "parametersList":null,
+                            "brandName":null,
+                            "bigTypeName":null,
+                            "smallTypeName":null,
+                            "tinyTypeName":null,
+                            "activityDiscount":null,
+                            "promotions":null,
+                            "giftType":null,
+                            "userIdentity":null,
+                            "isChecked":false,
+                            "detailTalkFlag":null,
+                            "shopName":null,
+                            "beautyActFlag":null
+                        }
+                    ],
+                    "businessScopeArray":null,
+                    "mobileCode":null,
+                    "shopBannerList":null,
+                    "productionLicence":null,
+                    "hygienicLicense":null,
+                    "taxLicense":null,
+                    "certificateHonor":null,
+                    "productCertification":null,
+                    "provincialAddress":null,
+                    "promotions":null,
+                    "reducedPrice":null,
+                    "normalNum":null
+                }
+            ]				
 					
 module.exports = {
-	addressList
+	addressList,
+	cartList
 }

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

@@ -8,7 +8,7 @@
 	  	<view class="navbar-icon" v-if="navbarData.showCapsule == 1 ? true : false" 
 			  :style="{top:capsule.top +'px;',left:((screenWidth-capsule.right)+5)+'px;',height:capsule.height+'px;',lineHeight:capsule.height+'px;'}">
 			  <text v-if="navbarData.haveBack" @tap="BackPage" class="iconfont icon-fanhui"></text>
-			  <text v-if="navbarData.haveHome" @tap="_goHome" class="iconfont icon-shouye"></text>
+			  <text v-if="navbarData.haveHome" @tap="_goHome" class="iconfont icon-fanhuishouye"></text>
 	  	</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;'}">

+ 46 - 46
components/cm-custom/custom-d.vue

@@ -1,14 +1,14 @@
 <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;'}">
-	    	{{navbarData.title ? navbarData.title : " "}}
-	  	</view>
-	  	<view class="navbar-icon" :style="{width:headerBtnPosi.width+'px',lineHeight:(navbarBtn.height)+'px',top:navbarBtn.top + statusBarHeight+'px',left:navbarBtn.right+'px',height:(navbarBtn.height)+'px'}">
+	<view class='navbar-wrap' :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
+	  	<view class="navbar-text" :style="{lineHeight:(navbarHeight - statusBarHeight)+'px;',fontSize:fontSizeSetting+'px;'}">
+	    	{{navbarData.title ? navbarData.title : " "}}
+	  	</view>
+	  	<view class="navbar-icon" :style="{width:headerBtnPosi.width+'px',lineHeight:(navbarBtn.height)+'px',top:navbarBtn.top + statusBarHeight+'px',left:navbarBtn.right+'px',height:(navbarBtn.height)+'px'}">
 			  <text @click="_goBack" class="iconfont icon-shangyibu" :style="{width:headerBtnPosi.width/2+'px',height:navbarBtn.height+'px'}"></text>
-	      	  <text class="iconfont icon-vertical_line" :style="{borderColor:navbarData.borderColor ? navbarData.borderColor : 'rgba(0,0,0,0.4)'}"></text>
-			  <text @click="_goDetails" class="iconfont icon-shouye" :style="{width:headerBtnPosi.width/2+'px',height:navbarBtn.height+'px'}"></text>
-	  	</view>
+	      	  <text class="iconfont icon-vertical_line" :style="{borderColor:navbarData.borderColor ? navbarData.borderColor : 'rgba(0,0,0,0.4)'}"></text>
+			  <text @click="_goDetails" class="iconfont icon-fanhuishouye" :style="{width:headerBtnPosi.width/2+'px',height:navbarBtn.height+'px'}"></text>
+	  	</view>
 	</view>
 </template>
 
@@ -33,14 +33,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
 				},
 				platform:'',
 				fontSizeSetting:0,
@@ -51,48 +51,48 @@
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息
-		    /**
-		     * 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(){
 			
 		},
 		methods:{
 			_goBack: function () {
-		      	uni.navigateBack({
-		        	delta: this.page
-		      	});
-		    },
-		    _goDetails: function () {
-		      this.$emit('pageDetails')
-		    }
+		      	uni.navigateBack({
+		        	delta: this.page
+		      	});
+		    },
+		    _goDetails: function () {
+		      this.$emit('pageDetails')
+		    }
 		},
 		onShow(){
 	

+ 47 - 47
components/cm-custom/custom-p.vue

@@ -1,17 +1,17 @@
 <template name="headerNavbar">
 	<!-- 自定义导航栏 -->
-	<view class='navbar-wrap' :class="[headerColor? 'bg-color' : 'no-color']" :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
-	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
+	<view class='navbar-wrap' :class="[headerColor? 'bg-color' : 'no-color']" :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
+	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
 			  :style="{top:navbarBtn.top + statusBarHeight+'px;',lineHeight:navbarBtn.height+'px;',left:navbarBtn.right+'px;',width:navbarBtn.height+'px;',height:navbarBtn.height+'px;'}">
-			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-fanhui"></text>
-			  <text v-else  @click="_goHome" class="iconfont icon-shouye"></text>
-	  	</view>
+			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-daohangfanhui"></text>
+			  <text v-else  @click="_goHome" class="iconfont icon-fanhuishouye"></text>
+	  	</view>
 		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
-	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+20)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
+	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+20)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
 				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/供应商/项目仪器</view>
 			</view>
-	  	</view>
+	  	</view>
 	</view>
 </template>
 
@@ -47,14 +47,14 @@
 				headerType:'',
 				clickPath:'/search/pages/search/search', 
 				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
 				},
 				platform:'',
 				fontSizeSetting:0
@@ -65,54 +65,54 @@
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息
-		    /**
-		     * 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
 			}
 			console.log(btnPosi)
 			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.haveBack=haveBack, // 获取是否是通过分享进入的小程序
+		    this.statusBarHeight=statusBarHeight,
+		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
 			this.$parent.navbarHeight = this.navbarHeight
 			this.$parent.statusBarHeight = this.statusBarHeight
 			// console.log(this.navbarHeight);
-		    this.navbarBtn=btnPosi
+		    this.navbarBtn=btnPosi
 		},
 		onLoad(){
 			
 		},
 		methods:{
 			_goBack: function () {
-		      	uni.navigateBack({
-		        	delta: this.page
-		      	});
-		    },
-		    _goHome: function () {
-		      	uni.switchTab({
-		        	url: '/pages/tabBar/home/index'
-		      	})
-		    }
+		      	uni.navigateBack({
+		        	delta: this.page
+		      	});
+		    },
+		    _goHome: function () {
+		      	uni.switchTab({
+		        	url: '/pages/tabBar/home/index'
+		      	})
+		    }
 		},
 		onShow(){
 	

+ 2 - 2
components/cm-module/cm-seller/user.vue

@@ -19,7 +19,7 @@
 					<view class="tab-title" @click="navigator('/seller/pages/order/order-list?listType=0')">
 						<text class="cell-tit">我的订单</text>
 						<text class="cell-more">全部订单</text>
-						<text class="iconfont icon-xiayibu"></text>
+						<text class="iconfont icon-chakangengduo"></text>
 					</view>
 					<view class="order-section">
 						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
@@ -90,7 +90,7 @@
 								class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
 								{{orderNum == 99 ? '99+' : orderNum}}
 						</text>
-						<text class="cell-more iconfont icon-xiayibu"></text>
+						<text class="cell-more iconfont icon-chakangengduo"></text>
 					</view>
 				</view>
 			</view>

+ 1 - 1
components/cm-module/creatOrder/choiceAddress.vue

@@ -184,7 +184,7 @@
 				}
 			}
 		}
-		.icon-xiayibu {
+		.icon-chakangengduo {
 			font-size: 32rpx;
 			color: $text-color;
 			margin-right: 30rpx;

+ 1 - 1
components/cm-module/creatOrder/freight.vue

@@ -7,7 +7,7 @@
 				<view class="freight-text">{{freightText}}</view>
 				<view class="select" v-if="freightData.freePostFlag == 1"  @click.stop="selectFreight">
 					<text class="select-text">{{orderPriceToFixed(freightMoney)}}</text>
-					<text class="iconfont icon-xiayibu"></text>
+					<text class="iconfont icon-chakangengduo"></text>
 				</view>
 			</view>
 		</view>

+ 1 - 1
components/cm-module/creatOrder/invoiceTent.vue

@@ -3,7 +3,7 @@
 		 <!-- 发票信息 -->
 		<view class="invoice-title" @tap.stop="hanldOperationConfim">
 			<text class="text">发票信息:</text>
-			<text class="iconfont icon-xiayibu"></text>
+			<text class="iconfont icon-chakangengduo"></text>
 		</view>
 		<view class="invoice-text">
 			<text>{{invoiceText}}</text>

+ 1 - 1
components/cm-module/creatOrder/sellerAddress.vue

@@ -185,7 +185,7 @@
 				}
 			}
 		}
-		.icon-xiayibu {
+		.icon-chakangengduo {
 			font-size: 32rpx;
 			color: $text-color;
 			margin-right: 30rpx;

+ 2 - 2
components/cm-module/creatOrder/sellerFreight.vue

@@ -6,7 +6,7 @@
 			<view class="freight-right">
 				<text class="text-l">{{freightText}}</text>
 				<text class="text" v-if="freightData.freePostFlag == 1">¥{{orderPriceToFixed(freightMoney)}}</text>
-				<text class="iconfont icon-xiayibu"></text>
+				<text class="iconfont icon-chakangengduo"></text>
 			</view>
 		</view>
 		<!--底部选择模态层弹窗组件 -->
@@ -220,7 +220,7 @@
 					margin:0 20rpx;
 					font-weight: normal;
 				}
-				.icon-xiayibu{
+				.icon-chakangengduo{
 					line-height: 88rpx;
 					color: #999999;
 					font-weight: normal;

+ 1 - 1
components/cm-module/creatOrder/sellerInvoice.vue

@@ -5,7 +5,7 @@
 			<text class="text">发票信息</text>
 			<view class="invoice-right">
 				<text class="text-l">{{invoiceText}}</text>
-				<text class="iconfont icon-xiayibu"></text>
+				<text class="iconfont icon-chakangengduo"></text>
 			</view>
 		</view>
 		<!-- <view class="invoice-text">

+ 2 - 2
components/cm-module/creatOrder/sellerRegulations.vue

@@ -4,7 +4,7 @@
 			<text class="text">售后条款</text>
 			<view class="freight-right">
 				<text class="text-l">{{regulaText}}</text>
-				<text class="iconfont icon-xiayibu"></text>
+				<text class="iconfont icon-chakangengduo"></text>
 			</view>
 		</view>
 		<!--底部选择模态层弹窗组件 -->
@@ -133,7 +133,7 @@
 					margin:0 20rpx;
 					font-weight: normal;
 				}
-				.icon-xiayibu{
+				.icon-chakangengduo{
 					line-height: 88rpx;
 					color: #999999;
 					font-weight: normal;

+ 47 - 47
components/cm-module/headerNavbar/header-poduct.vue

@@ -1,20 +1,20 @@
 <template name="headerNavbar">
 	<!-- 自定义导航栏 -->
-	<view class='navbar-wrap' :class="[headerColor? 'bg-color' : 'bg-color']" :style="{height:navbarHeight+'px',paddingTop:CustomBar/2+'px'}"> 
-	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
+	<view class='navbar-wrap' :class="[headerColor? 'bg-color' : 'bg-color']" :style="{height:navbarHeight+'px',paddingTop:CustomBar/2+'px'}"> 
+	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
 			  :style="{top:navbarBtn.top + statusBarHeight+'px;',lineHeight:navbarBtn.height+'px;',left:12+'px;',width:navbarBtn.height+'px;',height:navbarBtn.height+'px;'}">
-			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-fanhui"></text>
-			  <text v-else  @click="_goHome" class="iconfont icon-shouye"></text>
-	  	</view>
+			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-daohangfanhui"></text>
+			  <text v-else  @click="_goHome" class="iconfont icon-fanhuishouye"></text>
+	  	</view>
 		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
 			<image class="logo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;'}" src="https://static.caimei365.com/app/img/icon/logo-top@2x.png" mode=""></image>
 		</view>
  		<!--<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
-	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+30)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
+	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+30)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
 				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/供应商/项目仪器</view>
 			</view>
-	  	</view> -->
+	  	</view> -->
 	</view>
 </template>
 
@@ -51,14 +51,14 @@
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				clickPath:'/search/pages/search/search',
 				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
 				},
 				platform:'',
 				fontSizeSetting:0
@@ -69,54 +69,54 @@
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息
-		    /**
-		     * 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
 			}
 			console.log(btnPosi)
 			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.haveBack=haveBack, // 获取是否是通过分享进入的小程序
+		    this.statusBarHeight=statusBarHeight,
+		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
 			this.$parent.navbarHeight = this.navbarHeight
 			this.$parent.statusBarHeight = this.statusBarHeight
 			// console.log(this.navbarHeight);
-		    this.navbarBtn=btnPosi
+		    this.navbarBtn=btnPosi
 		},
 		onLoad(){
 			
 		},
 		methods:{
 			_goBack: function () {
-		      	uni.navigateBack({
-		        	delta: this.page
-		      	});
-		    },
-		    _goHome: function () {
-		      	uni.switchTab({
-		        	url: '/pages/tabBar/home/index'
-		      	})
-		    }
+		      	uni.navigateBack({
+		        	delta: this.page
+		      	});
+		    },
+		    _goHome: function () {
+		      	uni.switchTab({
+		        	url: '/pages/tabBar/home/index'
+		      	})
+		    }
 		},
 		onShow(){
 	

+ 48 - 48
components/cm-module/headerNavbar/headerNavbar.vue

@@ -1,15 +1,15 @@
 <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;'}">
-	    	{{navbarData.title ? navbarData.title : " "}}
-	  	</view>
-	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
+	<view class='navbar-wrap' :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
+	  	<view class="navbar-text" :style="{lineHeight:(navbarHeight - statusBarHeight)+'px;',fontSize:fontSizeSetting+'px;'}">
+	    	{{navbarData.title ? navbarData.title : " "}}
+	  	</view>
+	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
 			  :style="{width:headerBtnPosi.width+'px;',lineHeight:(navbarBtn.height)+'px',top:navbarBtn.top + statusBarHeight+'px;',left:navbarBtn.right+'px;',height:(navbarBtn.height)+'px;'}">
 			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-shangyibu" :style="{width:headerBtnPosi.width/2+'px',height:navbarBtn.height+'px'}"></text>
-	      	  <text  v-if='haveBack' class="iconfont icon-vertical_line" :style="{borderColor:navbarData.borderColor ? navbarData.borderColor : 'rgba(0,0,0,0.4)'}"></text>
-			  <text @click="_goHome" class="iconfont icon-shouye" :style="{width:headerBtnPosi.width/2+'px',height:navbarBtn.height+'px'}"></text>
-	  	</view>
+	      	  <text  v-if='haveBack' class="iconfont icon-vertical_line" :style="{borderColor:navbarData.borderColor ? navbarData.borderColor : 'rgba(0,0,0,0.4)'}"></text>
+			  <text @click="_goHome" class="iconfont icon-fanhuishouye" :style="{width:headerBtnPosi.width/2+'px',height:navbarBtn.height+'px'}"></text>
+	  	</view>
 	</view>
 </template>
 
@@ -34,14 +34,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
 				},
 				platform:'',
 				fontSizeSetting:0,
@@ -52,50 +52,50 @@
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息
-		    /**
-		     * 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(){
 			
 		},
 		methods:{
 			_goBack: function () {
-		      	uni.navigateBack({
-		        	delta: this.page
-		      	});
-		    },
-		    _goHome: function () {
-		      	uni.switchTab({
-		        	url: '/pages/tabBar/home/index'
-		      	})
-		    }
+		      	uni.navigateBack({
+		        	delta: this.page
+		      	});
+		    },
+		    _goHome: function () {
+		      	uni.switchTab({
+		        	url: '/pages/tabBar/home/index'
+		      	})
+		    }
 		},
 		onShow(){
 	

+ 1 - 1
components/cm-module/orderDetails/orderAddress.vue

@@ -150,7 +150,7 @@
 				}
 			}
 		}
-		.icon-xiayibu {
+		.icon-chakangengduo {
 			font-size: 32rpx;
 			color: $text-color;
 			margin-right: 30rpx;

+ 4 - 4
pages/goods/product.vue

@@ -96,7 +96,7 @@
 					<view class="product-parameter" @click="showPopup" v-if="!goodsData.isNoneDisabled">
 						<text class="title">参数:</text>
 						<text class="name">品牌  起订量  分类...</text>
-						<text class="iconfont icon-xiayibu"></text>
+						<text class="iconfont icon-chakangengduo"></text>
 					</view>
 					<view class="product-supplier" @click="goSupplier">
 						<view class="logo"><img :src="shop.logo ? shop.logo :'https://static.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
@@ -112,7 +112,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="right"><text class="iconfont icon-xiayibu"></text></view>
+						<view class="right"><text class="iconfont icon-chakangengduo"></text></view>
 					</view>
 				</view>
 				<view class="product-details product-details0">
@@ -1161,7 +1161,7 @@
 			white-space: nowrap;
 			text-align: right;
 		}
-		.icon-xiayibu{
+		.icon-chakangengduo{
 			line-height: 90rpx;
 			display: inline-block;
 			position: absolute;
@@ -1232,7 +1232,7 @@
 			}
 		}
 		
-		.icon-xiayibu{
+		.icon-chakangengduo{
 			line-height: 154rpx;
 			display: inline-block;
 			position: absolute;

+ 2 - 2
pages/user/address/address.vue

@@ -221,7 +221,7 @@
 	.u-box{
 		display: flex;
 		align-items: center;
-		font-size: $font-size-28;
+		font-size: $font-size-26;
 		color: $text-color;
 		line-height: 40rpx;
 		margin-bottom: 12rpx;
@@ -233,7 +233,7 @@
 			font-weight: bold;
 		}
 		.default-tags{
-			margin-left: 10rpx;
+			margin-left: 15rpx;
 			display: block;
 			width: 72rpx;
 			height: 32rpx;

+ 25 - 21
pages/user/address/addressManage.vue

@@ -2,16 +2,19 @@
 	<view class="container clearfix">
 		<view class="add-content">
 			<view class="input-row b-b">
-				<input class="input" type="text" v-model="addressData.shouHuoRen" @input="onShouHuoRen" placeholder="收货人姓名" placeholder-class="placeholder" />
+				<view class="label">收货人姓名</view>
+				<input class="input" type="text" v-model="addressData.shouHuoRen" @input="onShouHuoRen" placeholder="请输入收货人姓名" placeholder-class="placeholder" />
 			</view>
 			<view class="input-row b-b">
-				<input class="input" type="number" maxlength="11" v-model="addressData.mobile"  @input="onMobile" placeholder="手机号码" placeholder-class="placeholder" />
+				<view class="label">联系方式</view>
+				<input class="input" type="number" maxlength="11" v-model="addressData.mobile"  @input="onMobile" placeholder="请输入联系方式" placeholder-class="placeholder" />
 			</view>
 			<view class="input-row b-b" @click="showMulLinkageThreePicker">
+				<view class="label">收货地址</view>
 				<text class="input">
 					{{addressData.allAddress}}
 				</text>		
-				<text class="iconfont icon-xiayibu"></text>
+				<text class="iconfont icon-chakangengduo"></text>
 			</view>
 			<view class="text-textarea b-b"> 
 				<view class="textarea show" v-if="isShowInput">{{addressData.address ?addressData.address :'详细地址:如道路、门牌号、小区、楼房号、单元室等'}}</view>
@@ -28,7 +31,7 @@
 			</view>
 			<view class="text-input default-row">
 				<text class="tit">设为默认地址</text>
-				<switch :checked="switchDefault" color="#5FB00A" @change="switchChange" style="transform:scale(0.8)" />
+				<switch :checked="switchDefault" color="#333333" @change="switchChange" style="transform:scale(0.6)" />
 			</view>
 			<button class="add-btn" :disabled="isConfirm" :class="[isConfirm == true ? 'disabled':'']" @click="confirm">{{buttonText}}</button>
 		</view>
@@ -58,7 +61,7 @@
 				switchDefault:false,
 				addressData:{
 					addressID:'',
-					allAddress:'所在地区',
+					allAddress:'请选择所在地区',
 					userID: '',			//用户id ,只在新增收货地址时传
 					shouHuoRen: '',		//收货人
 					mobile:'',			//收货人手机
@@ -118,7 +121,7 @@
 				if(!this.addressData.shouHuoRen){
 					this.$util.msg('请填写收货人');
 				}
-				if(this.addressData.address =='所在地区'){
+				if(this.addressData.address =='请选择所在地区'){
 					this.$util.msg('请选择所在地区');
 				}
 				if(!/(^1[0-9][0-9]{9}$)/.test(this.addressData.mobile)){
@@ -198,7 +201,6 @@
 	page{
 		height: auto;
 		background: $bg-color;
-		// border-top: 1px solid #EBEBEB;
 	}
 	.add-content{
 		width: 702rpx;
@@ -207,38 +209,39 @@
 			display: flex;
 			align-items: center;
 			position: relative;
-			width: 654rpx;
+			width: 702rpx;
 			height: 88rpx;
-			padding:0 24rpx;
 			margin: 0 auto;
-			// background: #F7F7F7;
-			// border-radius: 14rpx;
+			border-bottom: 2rpx solid #e1e1e1;
+			.label{
+				font-size: $font-size-28;
+				color: #666666;
+				line-height: 88rpx;
+				flex: 2;
+			}
 			.input{
-				width: 100%;
 				height: 100%;
-				// background: #F7F7F7;
 				font-size: $font-size-28;
 				line-height: 88rpx;
 				color: #333333;
-				border-bottom: 2rpx solid #e1e1e1;
-
+				flex:7;
+				box-sizing: border-box;
+				padding-left: 20rpx;
 			}
 			&.b-b{
 				margin: 20rpx 0;
 			}
 		}
 	}
-	.icon-xiayibu{
+	.icon-chakangengduo{
 		font-size: 36rpx;
 		color: #b2b2b2;
 		position: absolute;
 		right: 0;
 	}
 	.text-textarea{
-		width: 654rpx;
+		width: 100%;
 		height: 146rpx;
-		padding: 0 24rpx;
-		// background: #F7F7F7;
 		border-bottom: 2rpx solid #e1e1e1;
 		.textarea{
 			width: 100%;
@@ -257,10 +260,11 @@
 	.default-row{
 		background: #FFFFFF;
 		margin-top: 16upx;
+		padding: 24rpx 24rpx 24rpx 0;
 		.tit{
 			font-size: $font-size-28;
 			line-height: 40rpx;
-			color: #333333;
+			color: #666666;
 			flex: 1;
 		}
 		switch{
@@ -280,7 +284,7 @@
 		margin-top: 80rpx;
 	}
 	.add-btn.disabled{
-		background: #F8F8F8;
+		background: #e1e1e1;
 		border-radius: 45rpx;
 	}
 </style>

+ 68 - 32
pages/user/cart/cart.vue

@@ -67,6 +67,9 @@
 											</view>
 										</view>	
 									</view>
+									<view class="goods-pros-line">
+										<view class="line"></view>
+									</view>
 								</view>
 							</view>	
 							<view class="goods-pros-b clearfix" :class="[isshowDelbtn ? 'none':'show']" >
@@ -149,6 +152,8 @@
 				</view>
 			</view>
 		</view>
+		<!-- 提示弹窗 -->
+		<tui-modal :show="modal" @click="handleClick" @cancel="hideMobel" :content="contentModalText" color="#333" :size="32" shape="circle" :maskClosable="false"></tui-modal>
 		<!-- 促销活动弹窗 -->
 		<activi-popup :product="handlerPros" :popupShow="popupShow"></activi-popup>
 		<!-- 透明模态层 -->
@@ -160,6 +165,7 @@
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
 	import activiPopup from "@/components/cm-module/productDetails/cm-activipopu"
+	import { cartList } from '@/common/json/data.json.js' //本地数据
 	import modalLayer from "@/components/modal-layer"
 	import { mapState,mapMutations } from 'vuex';
 	
@@ -173,6 +179,8 @@
 		},
 		data(){
 			return{
+				modal:false,
+				contentModalText:'',
 				clubId:'',	//机构ID
 				userID:'',
 				kindCount:0,
@@ -182,7 +190,7 @@
 				handlerPros:{},//监听单挑促销商品
 				promotionsList:[],//促销活动列表
 				failureList:[],	//失效商品列表
-				goodsList:[],	//购物车的商品
+				goodsList:cartList,	//购物车的商品
 				delGoodsList:'',//要删除的商品
 				setGoodData:'', //确认订单的商品
 				isCheckAll:false,//是否全选
@@ -191,7 +199,7 @@
 				allPrice:0,//所有价格
 				allCount:0,//被选中的产品数量
 				isModallayer:false,
-				skeletonShow:true,
+				skeletonShow:false,
 				isshowDelbtn:false,
 				isDisabled: false, // 供应商/店铺全选是否禁用状态
 				isEmpty:false,//显示空购物车
@@ -769,19 +777,25 @@
 				if(this.delGoodsList.length == 0){
 					this.$util.msg("请选择要删除的商品~",2000);
 					return
-				}else{				
-					this.$util.modal('','确定删除选中的商品吗?','确定','取消',true,() =>{
-						this.SellerService.DeleteSellerCart({sellerCartIds:this.delGoodsList}).then(response =>{
-							this.$util.msg('删除成功',2000);
-							setTimeout(()=>{
-								this.isshowDelbtn = false;
-								this.initGetCartGoodsList();
-							},2000)
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
-						})
+				}else{	
+					this.modal = true;
+					this.contentModalText = '确定删除选中的商品吗?';
+				}
+			},
+			handleClick(e) {//用户操作订单
+				let index = e.index;
+				if(index == 1){
+					this.SellerService.DeleteSellerCart({sellerCartIds:this.delGoodsList}).then(response =>{
+						this.$util.msg('删除成功',2000);
+						setTimeout(()=>{
+							this.isshowDelbtn = false;
+							this.initGetCartGoodsList();
+						},2000)
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
 					})
 				}
+				this.modal = false;
 			},
 			goNavto(url){
 				uni.navigateTo ({
@@ -801,7 +815,10 @@
 			navToListPage(id){
 				this.isModallayer = true;
 				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
-			}
+			},
+			hideMobel(){
+				this.modal = false;
+			},
 		},
 		watch:{//深度监听所有数据,每次改变重新计算总价和总数
 		    goodsList:{
@@ -824,12 +841,12 @@
 			uni.stopPullDownRefresh()
 		},
 		onShow(){
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				console.log(resolve)
-				this.clubId = resolve.clubID
-				this.againBuyProductIds = resolve.againBuyProductIds
-				this.initData()
-			})
+			// this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+			// 	console.log(resolve)
+			// 	this.clubId = resolve.clubID
+			// 	this.againBuyProductIds = resolve.againBuyProductIds
+			// 	this.initData()
+			// })
 		}
 	}
 </script>
@@ -897,7 +914,7 @@
 			line-height: 50rpx;
 			border-radius: 30rpx;
 			background:#FFFFFF;
-			border: 1px solid #E15616;
+			border: 1px solid #333333;
 			color: $color-system;
 			float: right;
 			text-align: center;
@@ -957,7 +974,7 @@
 			height: 80rpx;
 			line-height: 80rpx;
 			.checkbox-box{
-				padding: 10rpx;
+				// padding: 10rpx;
 			}
 			.text{
 				width: 450rpx;
@@ -996,15 +1013,39 @@
 		.goods-pros{
 			width: 100%;
 			height: auto;
+			&:last-child{
+				.goods-pros-line{
+					width: 100%;
+					height: 1px;
+					box-sizing: border-box;
+					padding-left: 65rpx;
+					.line{
+						height: 1px;
+						width: 100%;
+						background-color: #FFFFFF;
+					}
+				}
+			}
 		}	
+		.goods-pros-line{
+			width: 100%;
+			height: 1px;
+			box-sizing: border-box;
+			padding-left: 65rpx;
+			.line{
+				height: 1px;
+				width: 100%;
+				background-color: #e1e1e1;
+			}
+		}
 		.goods-pros-t{
 			display: flex;
 			align-items: center;
 			width: 100%;
 			height: auto;
-			padding:0 0 20rpx 0;
+			padding:20rpx 0 20rpx 0;
 			.checkbox-box{
-				padding: 10rpx;
+				// padding: 10rpx;
 			}
 			.pros-img{
 				width: 210rpx;
@@ -1188,7 +1229,7 @@
 						height: 48rpx;
 						.iconfont{
 							font-size: $font-size-24;
-							padding:0 18rpx;
+							padding:0 12rpx;
 							color: #333333;
 							text-align: center;
 							line-height: 48rpx;
@@ -1202,14 +1243,12 @@
 							}
 						}
 						.btn-input{
-							width: 62rpx;
+							width: 56rpx;
 							height: 44rpx;
 							line-height: 44rpx;
 							border-radius: 4rpx;
 							text-align: center;
 							font-size: $font-size-24;
-							border-bottom: 2rpx solid #e1e1e1;
-							border-top: 2rpx solid #e1e1e1;
 							color: #333333;
 							background-color: #f7f7f7;
 						}
@@ -1463,12 +1502,9 @@
 					color: #FFFFFF;
 					border-radius: 24rpx;
 					background:rgba(51,51,51,0.3);
-					// position: absolute;
-					// left: 0;
-					// top: 0;
 				}
 				.checkbox-box{
-					padding: 10rpx;
+					// padding: 10rpx;
 				}
 				.pros-img{
 					width: 180rpx;