yuwenjun 4 роки тому
батько
коміт
c9f8cf7470

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

@@ -1185,7 +1185,549 @@ const cartList = [
                     "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
+				},
+				{
+				    "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
+				}
             ]				
 const productList=[
                         {
@@ -1358,6 +1900,346 @@ const productList=[
                             "shopName":null,
                             "beautyActFlag":null
                         },
+						{
+						    "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":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,

+ 47 - 13
components/cm-module/listTemplate/productList.vue

@@ -1,18 +1,23 @@
 <template>
 	<view class="container commodity-list-wrapper" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
 		<list-skeleton v-if="showSkeleton" :listType='0'></list-skeleton>
+		<!-- 搜索框 -->
+		<fuzzy-search placeholder="搜索商品名称" :list="searchList" @fuzzyClick="fuzzyClickHandle" :fixed="true" @input="fuzzyInputHandle"></fuzzy-search>
+		<!-- 内容区域 -->
 		<view class="product-container" v-if="!isShowEmpty">
 			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="productList.length > 0">
-				<view v-for="(item,index) in productList" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.productID)">
+				<view v-for="(item,index) in productList" :key="index" :id="item.id" class="all-type-list-content commodity-list goods-item" @click.stop="navToDetailPage(item.productID)">
 					<image mode='widthFix' :src="item.mainImage"  class="list-img" alt="list-img"></image>
 					<view class="list-details-info">
 						<text class="list-details-title">{{item.name}}</text>
-						<text class="list-details-specs">规格:{{item.unit !=null ? item.unit : ''}}</text>
-						<text class="list-details-miniQuantity">起订量:{{ item.ladderPriceFlag == '1' ? item.maxBuyNumber : item.minBuyNumber}}</text>
-						<view class="list-details-price" v-if="item.price1TextFlag == 1">
-							<view class="list-none"><view class="price-small">未公开价格</view></view>
+						<!-- 商品标签 -->
+						<view class="list-details-tags">
+							<tui-tag type="red" class="tag" padding="6rpx" size="20rpx" plain>商品标签</tui-tag>
+							<tui-tag type="red" class="tag" padding="6rpx" size="20rpx" plain>商品标签</tui-tag>
 						</view>
-						<view class="list-details-price" v-else>
+						<text class="list-details-specs">规格:{{item.unit !=null ? item.unit : ''}}</text>
+						<!-- 价格 -->
+						<view class="list-details-price">
 							<view class="list-shop">
 								<view class="list-price-none" v-if="item.repurchasePriceState">
 									<text class="price-none">¥{{item.discountPrice}}</text>
@@ -46,10 +51,10 @@
 				</view>
 			</scroll-view>
 		</view>
+		<!-- 商品列表为空时 -->
 		<view class="empty-container" v-else>
 			<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AWdWzAAGlgAP0das422.png" mode="aspectFit"></image>
-			<text class="error-text">您还没有购买过任何商品哟~</text>
-			<button class="submit-btn toIndexPage" @click="toIndexPage">去逛逛</button>
+			<text class="error-text">暂时没有商品哦,尽请期待!~</text>
 		</view>
 		<!-- 可拖动悬浮按钮 -->
 		<cm-drag v-if="!isShowEmpty"
@@ -70,6 +75,9 @@
 	import modalLayer from "@/components/modal-layer"
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import cmDrag from '@/components/cm-custom/cm-drag.vue'
+	import fuzzySearch from '@/components/cm-module/search/fuzzySearch.vue'
+	// 引入测试数据
+	import {productList} from '@/common/json/data.json.js'
 	import { mapState,mapMutations } from 'vuex';
 	export default{
 		name:'productList',
@@ -77,7 +85,8 @@
 			listSkeleton,
 			modalLayer,
 			uniStars,
-			cmDrag
+			cmDrag,
+			fuzzySearch
 		},
 		props: {
 			emptyText: {
@@ -88,7 +97,8 @@
 			return{
 				isModallayer:false,
 				windowHeight: '',
-				showSkeleton: true,
+				// 是否显示骨架
+				showSkeleton: false,
 				isShowEmpty: false,
 				userID: '',
 				scrollHeight: '',
@@ -103,14 +113,17 @@
 				fromRegularPurchasePage: false,
 				cartQuantity: 0,
 				showRegularBtn: false,
-				isPrecedence:false
+				isPrecedence:false,
+				searchList:['第一条记录','第二条记录']     //模糊搜索匹配的内容
 			}
 		},
 		created() {
+			this.productList = productList
 			this.setScrollHeight();		
 			this.$api.getStorage().then((resolve) =>{
 				this.userID = resolve.userID
-				this.getProductAgainInfo()
+				// 获取产品数据
+				// this.getProductAgainInfo()
 			})
 		},
 		filters: {
@@ -122,6 +135,14 @@
 			...mapState(['hasLogin','userInfo','identity'])
 		},
 		methods:{
+			// 模糊框单击事件
+			fuzzyClickHandle(e){
+				console.log(e);
+			},
+			// 模糊搜索框输入时
+			fuzzyInputHandle(e){
+				console.log(e);
+			},
 			scrolltolower() {
 				if(this.hasNextPage && this.pullFlag) {
 					this.getProductAgainInfo(true);
@@ -283,7 +304,7 @@
 		.list-details-specs {
 			width: 100%;
 			display: inline-block;
-			margin-top: 8rpx;
+			margin-top: 14rpx;
 			color: #999999;
 		}
 		.list-details-miniQuantity {
@@ -361,6 +382,7 @@
 				.price-larger {
 					font-size: $font-size-30;
 					display: inline-block;
+					font-weight: bold;
 					&.none{
 						text-decoration: line-through;
 						color: #999999;
@@ -395,4 +417,16 @@
 			color: $text-color;
 		}
 	}
+	.list-details-tags {
+		display: flex;
+		justify-content: flex-start;
+		margin: 14rpx 0;
+		height: 34rpx;
+		.tag{
+			margin-right: 5rpx;
+		}
+	}
+	.product-container .goods-item:first-child{
+		margin-top: 100rpx;
+	}
 </style>

+ 125 - 0
components/cm-module/search/fuzzySearch.vue

@@ -0,0 +1,125 @@
+<template>
+	<view>
+		<view class="search" :style="{ position: fixed ? 'fixed' : 'relative' }">
+			<view class="search-box">
+				<text class="iconfont icon-sousuo"></text>
+				<input type="text" :placeholder="placeholder" v-model="text" @input="onInputHandle" @focus="inputFoucsHandle" @blur="inputBlurHandle"/>
+			</view>
+			<view class="fuzzy" v-if="showMask">
+				<view
+					class="fuzzy-item"
+					v-for="(item, index) in list"
+					:key="index"
+					@click="chickHandle(item)"
+				>
+					{{ item }}
+				</view>
+			</view>
+		</view>
+		<view class="mask" v-show="showMask"></view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		placeholder: {
+			type: String,
+			default: '请输入搜索内容'
+		},
+		list: {
+			type: Array
+		},
+		fixed: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			showMask:false,
+			text:''
+		}
+	},
+	methods: {
+		chickHandle(e) {
+			this.$emit('fuzzyClick', e)
+		},
+		// 文本框获取焦点
+		inputFoucsHandle(){
+			this.showMask = true
+		},
+		// 文本框失去焦点
+		inputBlurHandle(){
+			this.showMask = false
+		},
+		// 文本框输入事件
+		onInputHandle(){
+			this.$emit('input',this.text)
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+	// 自定义动画
+	@keyframes fadeIn {
+		from{
+			opacity: 0;
+		}
+		to{
+			opacity: 1;
+		}
+	}
+.mask{
+	width: 100vh;
+	height: 100vh;
+	position: fixed;
+	background-color: rgba(0,0,0,.4);
+	top: 0;
+	left: 0;
+	z-index: 666;
+	animation: fadeIn ease-in .2s;
+}
+.search {
+	position: relative;
+	top: 0;
+	padding: 20rpx 24rpx;
+	width: 100%;
+	box-sizing: border-box;
+	background-color: #fff;
+	z-index: 999;
+	.search-box {
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		height: 60rpx;
+		padding-left: 10rpx;
+		background-color: #f1f1f1;
+		box-sizing: border-box;
+		border-radius: 30rpx;
+		position: relative;
+		z-index: 999;
+		.iconfont {
+			width: 60rpx;
+			height: 60rpx;
+			margin-right: 8rpx;
+			text-align: center;
+			line-height: 60rpx;
+		}
+		input {
+			font-size: 26rpx;
+		}
+	}
+	.fuzzy {
+		padding: 10rpx 0;
+		padding-left: 76rpx;
+		animation:  fadeIn ease-in .2s;
+		.fuzzy-item {
+			font-size: 26rpx;
+			color: #444;
+			line-height: 60rpx;
+		}
+	}
+}
+</style>

+ 1 - 1
components/thorui/tui-tag/tui-tag.vue

@@ -120,7 +120,7 @@ export default {
 }
 
 .tui-red {
-	background-color: #ff201f !important;
+	background-color: #ff2a2a !important;
 	color: #fff;
 }
 

+ 113 - 121
pages.json

@@ -1,17 +1,20 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+	"pages": [
+		//pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "维沙采购商城",
 				"enablePullDownRefresh": true
 			}
-		}, {
+		},
+		{
 			"path": "pages/authorization/authorization",
 			"style": {
 				"navigationBarTitleText": "微信授权"
 			}
-		}, {
+		},
+		{
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "登录"
@@ -23,132 +26,120 @@
 				"navigationBarTitleText": "分类",
 				"navigationStyle": "custom"
 			}
-		}, {
+		},
+		{
 			"path": "pages/tabBar/cart/cart",
 			"style": {
 				"navigationBarTitleText": "购物车",
 				"enablePullDownRefresh": true
 			}
+		},
+		{
+			"path": "pages/goods/list",
+			"style": {
+				"navigationBarTitleText":"立即下单"
+			}
 		}
-
-	],
+    ],
 	"subPackages": [{
-			"root": "pages/goods/", //商品模块
-			"pages": [{
-					"path": "product",
-					"style": {
-						"navigationBarTitleText": "商品详情",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "立即下单"
-					}
+		"root": "pages/user/", //机构个人中心模块
+		"pages": [{
+				"path": "club/club-list",
+				"style": {
+					"navigationBarTitleText": "机构列表"
 				}
-			]
-		},
-		{
-			"root": "pages/user/", //机构个人中心模块
-			"pages": [{
-					"path": "club/club-list",
-					"style": {
-						"navigationBarTitleText": "机构列表"
-					}
-				}, {
-					"path": "cart/cart",
-					"style": {
-						"navigationBarTitleText": "购物车"
-					}
-				},
-				{
-					"path": "cart/immediately",
-					"style": {
-						"navigationBarTitleText": "立即下单"
-					}
-				},
-
-				{
-					"path": "address/addressManage",
-					"style": {
-						"navigationBarTitleText": "添加新地址"
-					}
-				},
-				{
-					"path": "address/address",
-					"style": {
-						"navigationBarTitleText": "地址列表"
-					}
-				},
-				{
-					"path": "order/create-order",
-					"style": {
-						"navigationBarTitleText": "确认订单"
-					}
-				},
-				{
-					"path": "order/success",
-					"style": {
-						"navigationBarTitleText": "支付结果",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "order/order-payment",
-					"style": {
-						"navigationBarTitleText": "选择支付方式",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "order/order-pay",
-					"style": {
-						"navigationBarTitleText": "收银台",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "order/orderShareLogin",
-					"style": {
-						"navigationBarTitleText": "输入分享码"
-					}
-				},
-				{
-					"path": "order/order-list",
-					"style": {
-						"navigationBarTitleText": "我的订单",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "order/order-details",
-					"style": {
-						"navigationBarTitleText": "订单详情",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "order/order-sharedetails",
-					"style": {
-						"navigationBarTitleText": "订单详情"
-					}
-				},
-				{
-					"path": "order/order-logistics",
-					"style": {
-						"navigationBarTitleText": "物流信息"
-					}
-				},
-				{
-					"path": "service/sellconten",
-					"style": {
-						"navigationBarTitleText": "条款内容"
-					}
+			},
+			{
+				"path": "cart/cart",
+				"style": {
+					"navigationBarTitleText": "购物车"
 				}
-			]
-		}
-	],
+			},
+			{
+				"path": "cart/immediately",
+				"style": {
+					"navigationBarTitleText": "立即下单"
+				}
+			},
+			{
+				"path": "address/addressManage",
+				"style": {
+					"navigationBarTitleText": "添加新地址"
+				}
+			},
+			{
+				"path": "address/address",
+				"style": {
+					"navigationBarTitleText": "地址列表"
+				}
+			},
+			{
+				"path": "order/create-order",
+				"style": {
+					"navigationBarTitleText": "确认订单"
+				}
+			},
+			{
+				"path": "order/success",
+				"style": {
+					"navigationBarTitleText": "支付结果",
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "order/order-payment",
+				"style": {
+					"navigationBarTitleText": "选择支付方式",
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "order/order-pay",
+				"style": {
+					"navigationBarTitleText": "收银台",
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "order/orderShareLogin",
+				"style": {
+					"navigationBarTitleText": "输入分享码"
+				}
+			},
+			{
+				"path": "order/order-list",
+				"style": {
+					"navigationBarTitleText": "我的订单",
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "order/order-details",
+				"style": {
+					"navigationBarTitleText": "订单详情",
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "order/order-sharedetails",
+				"style": {
+					"navigationBarTitleText": "订单详情"
+				}
+			},
+			{
+				"path": "order/order-logistics",
+				"style": {
+					"navigationBarTitleText": "物流信息"
+				}
+			},
+			{
+				"path": "service/sellconten",
+				"style": {
+					"navigationBarTitleText": "条款内容"
+				}
+			}
+		]
+	}],
 	"tabBar": {
 		"height": "80",
 		"color": "#999999",
@@ -181,7 +172,8 @@
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	},
-	"condition": { //模式配置,仅开发期间生效
+	"condition": {
+		//模式配置,仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
 		"list": [{
 			"name": "", //模式名称

+ 28 - 22
pages/goods/list.vue

@@ -5,12 +5,18 @@
 		<view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" @tap="hideSpec">
 			<!-- 遮罩层 -->
 			<view class="mask"></view>
-			<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-332rpx' : '-294rpx'}">
+			<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-460rpx' : '-294rpx'}">
 				<view class="content">
 					<view class="layer-smimg">
 						<image :src="handleData.mainImage" mode=""></image>
 					</view>
 					<view class="layer-nunbox">
+						<view class="layer-nunbox-b">
+							<view class="text">
+								<text class="p sm">¥</text>
+								<text class="p bg">{{buyRetailPrice.toFixed(2)}}</text>
+							</view>
+						</view>
 						<view class="layer-nunbox-t">
 							<view class="layer-nunbox-text">数量:</view>
 							<view class="number-box">
@@ -19,16 +25,10 @@
 								<view  class="iconfont icon-jiahao"  :class="[isStock==true?'disabled':'']" @click="changeCountAdd()"></view>
 							</view>
 						</view>
-						<view class="layer-nunbox-b">
-							<view class="text">单价:
-								<text class="p sm">¥</text>
-								<text class="p bg">{{buyRetailPrice.toFixed(2)}}</text>
-							</view>
-						</view>
 					</view>
 				</view>
 				<view class="btn">
-					<view class="button buy" @click="toConfirmation">立即购买</view>
+					<!-- <view class="button buy" @click="toConfirmation">立即购买</view> -->
 					<view class="button add" @click="getAddProductCart">加入购物车</view>
 				</view>
 			</view>
@@ -252,7 +252,7 @@
 			bottom: -294rpx;
 			width: 702rpx;
 			padding: 24rpx 24rpx 36rpx 24rpx;
-			height: 236rpx;
+			height: 360rpx;
 			border-radius: 20rpx 20rpx 0 0;
 			background-color: #fff;
 			display: flex;
@@ -260,26 +260,27 @@
 			align-content: space-between;
 			.content {
 				width: 100%;
+				margin-top: 40rpx;
 			}
 			.btn {
 				width: 100%;
 				height: 88rpx;
 				display: flex;
+				justify-content: center;
 				.button {
-					width: 340rpx;
-					height: 88rpx;
+					width: 600rpx;
+					height: 90rpx;
 					color: #fff;
 					display: flex;
 					align-items: center;
 					justify-content: center;
 					font-size: $font-size-28;
-					border-radius: 44rpx;
+					border-radius: 45rpx;
 					&.buy{
 						background: $btn-confirm;
 					}
 					&.add{
-						background: rgba(239, 175, 0, 1);
-						margin-left: 20rpx;
+						background: rgba(0, 0, 0, 1.0);
 					}
 				}
 			}
@@ -321,14 +322,15 @@
 			}
 		}
 		.layer-smimg{
-			width: 114rpx;
-			height: 114rpx;
+			border: 1px solid #eee;
+			width: 136rpx;
+			height: 136rpx;
 			float: left;
 			border-radius: 10rpx;
 			margin-right: 24rpx;
 			image{
-				width: 114rpx;
-				height: 114rpx;	
+				width: 136rpx;
+				height: 136rpx;	
 				border-radius: 10rpx;
 			}
 		}
@@ -355,6 +357,7 @@
 					border: 2rpx solid #e1e1e1;
 					border-radius: 30rpx;
 					height: 48rpx;
+					margin-left: 20rpx;
 					.iconfont{
 						font-size: $font-size-24;
 						padding:0 18rpx;
@@ -394,7 +397,10 @@
 			.layer-nunbox-b{
 				width: 100%;
 				height:44rpx;
-				margin-top: 13rpx;
+				padding: 14rpx 0;
+				.text{
+					font-weight: bold;
+				}
 			}
 			.text{
 				line-height: 44rpx;
@@ -402,9 +408,9 @@
 				.p{
 					color: #FF2A2A;
 				}
-				.p:first-child{
-					margin-left: 30rpx;
-				}
+				// .p:first-child{
+				// 	margin-left: 30rpx;
+				// }
 				.p.sm{
 					font-size: $font-size-24;
 				}