商品详情

App.vue

@@ -148,7 +148,4 @@ page {
 .placeholder {
     color: #999999;
 }
-.uni-swiper__dots-box {
-    display: none !important;
-}
 </style>

common/json/data.json.js

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

common/util.js

@@ -78,9 +78,18 @@ export const isIntersect = (arr1 = [], arr2 = []) => {
     return arr1.some(v => arr2.indexOf(v.toString()) > -1)
 }
 
+// 将对象转为querystring参数
+export const makeQueryStr = (obj) => {
+    const strs = []
+    for (let key in obj) {
+        strs.push(key + '=' + obj[key])
+    }
+    return strs.join('&')
+}
+
 const install = (Vue, vm) => {
     console.log('初始化挂载($util)工具方法 util.js ')
-    Vue.prototype.$util = { msg, prePage, modal }
+    Vue.prototype.$util = { msg, prePage, modal, makeQueryStr }
 }
 
 export default install

components/cm-module/cm-activity-info/cm-activity-info.vue

@@ -0,0 +1,66 @@
+<template>
+    <view class="cm-activity-info">
+        <template v-if="productInfo.activeStatus == 1">
+            <view class="ladder-main clearfix">
+                <view class="ladder-item">
+                    <view class="ladder-item-td">购买数</view> <view class="ladder-item-td">价格</view>
+                </view>
+                <view class="ladder-item" v-for="(ladd, index) in productInfo.ladderList" :key="index">
+                    <view class="ladder-item-td">{{ ladd.buyNum }}</view>
+                    <view class="ladder-item-td">{{ ladd.buyPrice | NumFormat }}</view>
+                </view>
+            </view>
+        </template>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        productInfo: {
+            type: Object,
+            default: () => {}
+        }
+    },
+    filters: {
+        priceFormat(price) {
+            return Number(price).toFixed(2)
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.ladder-main {
+    width: 100%;
+    border: 1px solid rgba(225, 86, 22, 0.3);
+    border-radius: 10rpx;
+    box-sizing: border-box;
+    .ladder-item {
+        width: 100%;
+        height: 80rpx;
+        float: left;
+        border-bottom: 1px solid rgba(225, 86, 22, 0.3);
+        &:nth-child(1) {
+            .ladder-item-td {
+                color: #333333;
+            }
+        }
+        &:last-child {
+            border-bottom: none;
+        }
+        .ladder-item-td {
+            width: 50%;
+            text-align: center;
+            line-height: 80rpx;
+            font-size: 24rpx;
+            color: #333;
+            box-sizing: border-box;
+            float: left;
+            &:nth-child(1) {
+                border-right: 1px solid rgba(225, 86, 22, 0.3);
+            }
+        }
+    }
+}
+</style>

components/cm-module/cm-cart-product/cm-cart-product.vue

@@ -83,25 +83,29 @@
             shape="circle"
             :maskClosable="false"
         ></tui-modal>
+        <cm-loading :visible="showLoading" text="加载中..."></cm-loading>
     </view>
 </template>
 
 <script>
 import NumberBox from './number-box.vue'
 import activiPopup from '@/components/cm-module/productDetails/cm-activipopu'
+import CmLoading from '@/components/cm-module/cm-loading/cm-loading.vue'
 import { mapGetters, mapActions, mapMutations } from 'vuex'
 export default {
     name: 'cm-cart-product',
     components: {
         NumberBox,
-        activiPopup
+        activiPopup,
+        CmLoading
     },
     data() {
         return {
             modal: false,
             contentModalText: '',
             popupShow: false,
-            handlerPros: {}
+            handlerPros: {},
+            showLoading: false
         }
     },
     props: {
@@ -180,9 +184,12 @@ export default {
         },
         //商品数量加加
         countChange(product, count) {
+            this.showLoading = true
             this.updateShoppogCount({
                 cartId: product.cartId,
                 productCount: count
+            }).finally(() => {
+                this.showLoading = false
             })
         },
         // 促销活动弹窗
@@ -200,8 +207,10 @@ export default {
         // 确认清空
         confirm(e) {
             if (e.index !== 1) return (this.modal = false)
+            this.showLoading = true
             this.removeFailureFromCart().finally(() => {
                 this.modal = false
+                this.showLoading = false
             })
         }
     }

components/cm-module/cm-drawer/cm-drawer.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="cm-drawer">
-        <view class="mask" v-if="visible" :style="[offsetSize, { zIndex: zIndex - 1 }]"></view>
+        <view class="mask" v-if="visible" :style="[offsetSize, { zIndex: zIndex - 1 }]" @click="$emit('close')"></view>
         <view class="drawer-content" :class="[position]" :style="[offsetSize, { zIndex: zIndex }]">
             <uni-transition :mode-class="modeClass" :show="visible">
                 <view class="content">
@@ -134,7 +134,7 @@ $drawer-size: 100rpx;
         .content {
             position: relative;
             width: 750rpx;
-            min-height: 480rpx;
+            min-height: 180rpx;
             background: #fff;
             box-sizing: border-box;
             padding: 24rpx;

components/cm-module/cm-goods-nav/cm-goods-nav.vue

@@ -0,0 +1,247 @@
+<template>
+    <view>
+        <view class="cm-goods-nav" :class="{ hasBottom: isIphoneX }">
+            <!-- 导航按钮 -->
+            <uni-goods-nav
+                :fill="true"
+                :options="options"
+                :buttonGroup="buttonGroup"
+                @click="onClick"
+                @buttonClick="buttonClick"
+            />
+        </view>
+        <cm-drawer :visible="countVisible" @close="drawerClose" position="bottom">
+            <view class="count">
+                <view class="top">
+                    <image :src="productInfo.mainImage" mode="center" class="cover"></image>
+                    <view class="right">
+                        <view class="number">
+                            <text>数量：</text>
+                            <number-box :value="count" @change="countChange"></number-box>
+                        </view>
+                        <view class="single-price">
+                            <text>单价：￥</text> <text class="price">{{ buyRetailPrice | priceFormat }}</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="btn" @click="confirm">确认</view>
+            </view>
+        </cm-drawer>
+    </view>
+</template>
+
+<script>
+import CmDrawer from '@/components/cm-module/cm-drawer/cm-drawer.vue'
+import NumberBox from '@/components/cm-module/cm-cart-product/number-box.vue'
+import { mapGetters, mapActions, mapMutations } from 'vuex'
+export default {
+    components: {
+        NumberBox,
+        CmDrawer
+    },
+    props: {
+        productInfo: {
+            type: Object,
+            default: () => {}
+        }
+    },
+    filters: {
+        priceFormat(price) {
+            return Number(price).toFixed(2)
+        }
+    },
+    data() {
+        return {
+            count: 1,
+            countVisible: false,
+            buyRetailPrice: 0,
+            btnClickType: -1,
+            options: [
+                {
+                    icon: 'home',
+                    text: '首页'
+                },
+                {
+                    icon: 'headphones',
+                    text: '客服',
+                    type: 'contact'
+                },
+                {
+                    icon: 'cart',
+                    text: '购物车',
+                    info: 0,
+                    infoBackgroundColor: '#FC464C',
+                    infoColor: '#ffffff'
+                }
+            ],
+            buttonGroup: [
+                {
+                    text: '加入购物车',
+                    backgroundColor: '#FFEFF4',
+                    color: '#FF457B'
+                },
+                {
+                    text: '立即购买',
+                    backgroundColor: 'linear-gradient(90deg, #FC32B4 0%, #F83C6C 100%)',
+                    color: '#fff'
+                }
+            ]
+        }
+    },
+    computed: {
+        ...mapGetters(['isIphoneX', 'kindCount', 'hasLogin'])
+    },
+    watch: {
+        kindCount(newCount) {
+            this.options[2].info = newCount
+        },
+        count() {
+            if (!this.productInfo) return
+            this.processActivityPrice()
+        },
+        countVisible(newVal) {
+            if (newVal) this.processActivityPrice()
+        }
+    },
+    methods: {
+        ...mapActions('cart', ['addToCart', 'getCartNumber']),
+        ...mapMutations('user', ['setInviteUserId']),
+        countChange(value) {
+            this.count = value
+        },
+        drawerClose() {
+            this.countVisible = false
+            this.count = 1
+        },
+        // 左边按钮
+        onClick(e) {
+            const clickFns = {
+                0: this.toHome,
+                1: this.customer,
+                2: this.toCart
+            }
+            clickFns[e.index]()
+            console.log(e.index)
+        },
+        // 右边按钮
+        buttonClick(e) {
+            this.countVisible = true
+            this.btnClickType = e.index
+        },
+        // 确认
+        confirm() {
+            this.countVisible = false
+            const clickFns = {
+                0: this.joinCart,
+                1: this.buyNow
+            }
+            clickFns[this.btnClickType]()
+        },
+        // 跳转首页
+        toHome() {
+            uni.switchTab({ url: '/pages/tabBar/index/index' })
+        },
+        // 客服
+        customer() {
+            console.log(this)
+        },
+        // 去登陆
+        toLogin(){
+            uni.navigateTo({ url: '/pages/login/login' })
+        },
+        // 去购物车
+        toCart() {
+            if(!this.hasLogin) return this.toLogin()
+            uni.navigateTo({ url: '/pages/goods/cart' })
+        },
+        // 加入购物车
+        joinCart() {
+            if(!this.hasLogin) return this.toLogin()
+            this.addToCart({
+                productId: this.productInfo.productId,
+                productCount: this.count
+            }).finally(() => {
+                this.countVisible = false
+            })
+        },
+        // 立即购买
+        buyNow() {
+            if(!this.hasLogin) return this.toLogin()
+            let productStp = {
+                allPrice: this.count * this.buyRetailPrice,
+                allCount: this.count,
+                productId: this.productInfo.productId,
+                productCount: this.count,
+                heUserId: this.productInfo.heUserId
+            }
+            this.$api.navigateTo(
+                `/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({ data: productStp })}`
+            )
+            this.countVisible = false
+        },
+        //单独处理活动价格和阶梯价格
+        processActivityPrice() {
+            if (this.productInfo.activeStatus === 1 && this.productInfo.ladderList) {
+                this.productInfo.ladderList.forEach((item, index) => {
+                    if (this.count >= item.buyNum) {
+                        this.buyRetailPrice = item.buyPrice
+                    }
+                })
+            } else {
+                this.buyRetailPrice = this.productInfo.price
+            }
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.cm-goods-nav {
+    position: fixed;
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    background: #fff;
+    &.hasBottom {
+        padding-bottom: 44rpx;
+    }
+}
+.count {
+    padding: 60rpx 0;
+    .top {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        padding: 0 60rpx;
+        .cover {
+            width: 104rpx;
+            height: 104rpx;
+        }
+        .right {
+            margin-left: 24rpx;
+            font-size: 24rpx;
+            color: #333;
+            .single-price {
+                color: #ff457b;
+                margin-top: 24rpx;
+            }
+            .number {
+                display: flex;
+                justify-content: flex-start;
+                align-items: center;
+            }
+        }
+    }
+    .btn {
+        width: 100%;
+        height: 88rpx;
+        margin-top: 32px;
+        background: #ff457b;
+        line-height: 88rpx;
+        text-align: center;
+        color: #ffffff;
+        font-size: 28rpx;
+        border-radius: 44rpx;
+    }
+}
+</style>

components/cm-module/cm-product-info/cm-product-info.vue

@@ -0,0 +1,115 @@
+<template>
+    <view class="cm-product-info">
+        <view class="title tui-ellipsis-2">{{ productInfo.name }}</view>
+        <view class="row tags">
+            <template v-if="productInfo.tagsList.length > 0">
+                <view class="tag" v-for="(tag, index) in productInfo.tagsList" :key="index">{{ tag }}</view>
+            </template>
+        </view>
+        <button open-type="share" class="share-btn">
+            <text class="iconfont icon-fenxiang"></text> <view class="name">分享</view>
+        </button>
+        <view class="remark" v-if="false">
+            <text class="name">备注：</text>
+            <text class="content">这里是备注名称这里是备注名称这里是备注名称名称称名...</text>
+        </view>
+        <view class="line"></view>
+        <view class="service">
+            <view class="iconfont icon-wuyoushouhou"><text>无忧退货</text></view>
+            <view class="iconfont icon-wuyoushouhou"><text>快速退款</text></view>
+            <view class="iconfont icon-wuyoushouhou"><text>正品保证</text></view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        productInfo: {
+            type: Object,
+            default: () => {}
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.cm-product-info {
+    position: relative;
+    padding: 24rpx 0;
+    .share-btn {
+        position: absolute;
+        right: 24rpx;
+        top: 24rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        color: #999;
+        .name {
+            font-size: 22rpx;
+        }
+    }
+    .title {
+        width: 544rpx;
+        font-size: 32rpx;
+        line-height: 48rpx;
+        text-align: justify;
+        color: #333333;
+    }
+    .tags {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        flex-wrap: wrap;
+        margin-top: 16rpx;
+        min-height: 36rpx;
+        .tag {
+            margin-right: 20rpx;
+            margin-top: 4rpx;
+            padding: 0 4rpx;
+            line-height: 34rpx;
+            font-size: 20rpx;
+            color: #ff457b;
+            background: #fff3f7;
+            border-radius: 8rpx;
+        }
+    }
+    .remark {
+        width: 100%;
+        font-size: 24rpx;
+        line-height: 24rpx;
+        margin-top: 42rpx;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        .name {
+            color: #999999;
+        }
+        .content {
+            color: #3f3f3f;
+        }
+    }
+    .line {
+        width: 100%;
+        height: 1rpx;
+        margin: 24rpx 0;
+        background: #e1e1e1;
+    }
+    .service {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        color: #ff457b;
+        .iconfont {
+            margin-right: 60rpx;
+            font-size: 22rpx;
+            line-height: 24rpx;
+            text {
+                color: #999999;
+                margin-left: 4rpx;
+            }
+        }
+    }
+}
+</style>

components/cm-module/cm-product-params/cm-product-params.vue

@@ -0,0 +1,75 @@
+<template>
+    <cm-drawer title="商品参数" :visible="visible" @close="$emit('close')" position="bottom">
+        <scroll-view scroll-y="true" class="cm-product-params">
+            <view class="content-tr">
+                <view class="content-td">品牌：</view>
+                <view class="content-th">{{ productInfo.brandName == null ? '其他' : productInfo.brandName }}</view>
+            </view>
+            <view class="content-tr">
+                <view class="content-td">包装规格：</view> <view class="content-th">{{ productInfo.unit }}</view>
+            </view>
+            <view class="content-tr">
+                <view class="content-td">库存：</view> <view class="content-th">{{ productInfo.stock }}</view>
+            </view>
+            <view
+                class="content-tr"
+                v-if="productInfo.parametersList.length > 0"
+                v-for="(item, index) in productInfo.parametersList"
+                :key="index"
+            >
+                <view class="content-td">{{ item.paramsName }}：</view>
+                <view class="content-th">{{ item.paramsContent }}</view>
+            </view>
+        </scroll-view>
+    </cm-drawer>
+</template>
+
+<script>
+import CmDrawer from '../cm-drawer/cm-drawer.vue'
+export default {
+    components: {
+        CmDrawer
+    },
+    props: {
+        productInfo: {
+            type: Object,
+            default: () => {}
+        },
+        visible: {
+            type: Boolean,
+            default: false
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.cm-product-params {
+    width: 100%;
+    padding-top: 24rpx;
+    height: 320rpx;
+    .content-tr {
+        width: 100%;
+        min-height: 58rpx;
+        line-height: 58rpx;
+        display: flex;
+        .content-td {
+            display: flex;
+            flex: 3;
+            font-size: 26rpx;
+            color: #999999;
+            line-height: 58rpx;
+            text-align: right;
+        }
+        .content-th {
+            display: flex;
+            flex: 7;
+            font-size: 26rpx;
+            color: #333333;
+            line-height: 58rpx;
+            text-align: left;
+            padding-left: 10rpx;
+        }
+    }
+}
+</style>

components/cm-module/cm-product-price/cm-product-price.vue

@@ -0,0 +1,122 @@
+<template>
+    <!-- 价格区域 -->
+    <view class="cm-product-price">
+        <view class="price">
+            <text class="small">￥</text><text class="big">{{ bigPrice }}</text
+            ><text class="small">{{ smallPrice }}</text>
+        </view>
+        <view class="tags">
+            <view class="tag type1" v-if="productInfo.heUserId !== 0">促销</view>
+            <template v-if="productInfo.activeStatus === 1">
+                <view class="tag type2" v-if="productInfo.ladderList" @click="drawerVisible = true">活动价</view>
+            </template>
+        </view>
+
+        <cm-drawer :visible="drawerVisible" position="bottom" @close="drawerClose">
+            <scroll-view scroll-y="true" class="scroll-box">
+                <cm-activity-info :productInfo="productInfo"></cm-activity-info>
+                <view class="btn" @click="drawerVisible = false">了解</view>
+            </scroll-view>
+        </cm-drawer>
+    </view>
+</template>
+
+<script>
+import CmDrawer from '@/components/cm-module/cm-drawer/cm-drawer.vue'
+import CmActivityInfo from '@/components/cm-module/cm-activity-info/cm-activity-info.vue'
+export default {
+    components: {
+        CmDrawer,
+        CmActivityInfo
+    },
+    data() {
+        return {
+            drawerVisible: false
+        }
+    },
+    props: {
+        productInfo: {
+            type: Object,
+            default: () => {}
+        }
+    },
+    computed: {
+        price() {
+            return Number(this.productInfo.price).toFixed(2)
+        },
+        bigPrice() {
+            return this.price.split('.')[0]
+        },
+        smallPrice() {
+            return '.' + this.price.split('.')[1]
+        }
+    },
+    methods: {
+        drawerClose() {
+            this.drawerVisible = false
+        }
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.cm-product-price {
+    position: relative;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    padding: 12rpx 0;
+
+    .price {
+        color: #ff457b;
+        .small {
+            font-size: 36rpx;
+        }
+        .big {
+            font-size: 48rpx;
+        }
+    }
+    .tags {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        margin-left: 24rpx;
+        .tag {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 30rpx;
+            margin-right: 8rpx;
+            font-size: 22rpx;
+            &.type1 {
+                width: 56rpx;
+                background: #ff457b;
+                border-radius: 4rpx;
+                color: #ffffff;
+            }
+            &.type2 {
+                width: 80rpx;
+                background: url(https://static.caimei365.com/app/mini-hehe/icon/icon-active.png) top center no-repeat;
+                background-size: 80rpx 30rpx;
+                color: #f83c6c;
+            }
+        }
+    }
+}
+.scroll-box {
+    height: 500rpx;
+    box-sizing: border-box;
+    padding: 70rpx 0 24rpx;
+    .btn {
+        width: 100%;
+        height: 88rpx;
+        margin-top: 24rpx;
+        background: #ff457b;
+        line-height: 88rpx;
+        text-align: center;
+        color: #ffffff;
+        font-size: 28rpx;
+        border-radius: 44rpx;
+    }
+}
+</style>

components/cm-module/cm-product/cm-product.vue

@@ -41,7 +41,7 @@ export default {
         // 跳转商品详情
         detail() {
             uni.navigateTo({
-                url: `/pages/goods/product?productId=${this.data.productId}`
+                url: `/pages/goods/product-detail?productId=${this.data.productId}&jumpState=1`
             })
         },
         // 加入购物车

components/cm-module/orderDetails/goodsList.vue

@@ -95,7 +95,13 @@
 					console.log(pros)
 					this.$api.navigateTo(`/pages/goods/product?id=${pros.organizeProductId}`)
 				}
-			},	
+			},
+            clickPopupShow(pros, type){
+                if(type === 2){
+                    this.$emit('popupClick', pros)
+                }
+                
+            },
 			PromotionsFormat(promo){//促销活动类型数据处理
 				if(promo!=null){
 					if(promo.type == 1 && promo.mode == 1){

components/uni-components/uni-goods-nav/i18n/en.json

@@ -0,0 +1,6 @@
+{
+	"uni-goods-nav.options.shop": "shop",
+	"uni-goods-nav.options.cart": "cart",
+	"uni-goods-nav.buttonGroup.addToCart": "add to cart",
+	"uni-goods-nav.buttonGroup.buyNow": "buy now"
+}

components/uni-components/uni-goods-nav/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

components/uni-components/uni-goods-nav/i18n/zh-Hans.json

@@ -0,0 +1,6 @@
+{
+	"uni-goods-nav.options.shop": "店铺",
+	"uni-goods-nav.options.cart": "购物车",
+	"uni-goods-nav.buttonGroup.addToCart": "加入购物车",
+	"uni-goods-nav.buttonGroup.buyNow": "立即购买"
+}

components/uni-components/uni-goods-nav/i18n/zh-Hant.json

@@ -0,0 +1,6 @@
+{
+	"uni-goods-nav.options.shop": "店鋪",
+	"uni-goods-nav.options.cart": "購物車",
+	"uni-goods-nav.buttonGroup.addToCart": "加入購物車",
+	"uni-goods-nav.buttonGroup.buyNow": "立即購買"
+}

components/uni-components/uni-goods-nav/uni-goods-nav.vue

@@ -0,0 +1,281 @@
+<template>
+    <view class="uni-goods-nav">
+        <!-- 底部占位 -->
+        <view class="uni-tab__seat" />
+        <view class="uni-tab__cart-box flex">
+            <view class="flex uni-tab__cart-sub-left">
+                <template v-for="(item, index) in options">
+                    <button
+                        class="flex uni-tab__cart-button-left uni-tab__shop-cart"
+                        hover-class="none"
+                        :key="index"
+                        @click="onClick(index, item)"
+                        v-if="item.type === 'contact'"
+                    >
+                        <view class="uni-tab__icon">
+                            <uni-icons :type="item.icon" size="18" color="#666"></uni-icons>
+                            <!-- <image class="image" :src="item.icon" mode="widthFix" /> -->
+                        </view>
+                        <text class="uni-tab__text">{{ item.text }}</text>
+                        <view class="flex uni-tab__dot-box">
+                            <text
+                                v-if="item.info"
+                                :class="{ 'uni-tab__dots': item.info > 9 }"
+                                class="uni-tab__dot "
+                                :style="{
+                                    backgroundColor: item.infoBackgroundColor ? item.infoBackgroundColor : '#ff0000',
+                                    color: item.infoColor ? item.infoColor : '#fff'
+                                }"
+                                >{{ item.info }}</text
+                            >
+                        </view>
+                    </button>
+                    <view
+                        class="flex uni-tab__cart-button-left uni-tab__shop-cart"
+                        :key="index"
+                        @click="onClick(index, item)"
+                        v-else
+                    >
+                        <view class="uni-tab__icon">
+                            <uni-icons :type="item.icon" size="18" color="#666"></uni-icons>
+                            <!-- <image class="image" :src="item.icon" mode="widthFix" /> -->
+                        </view>
+                        <text class="uni-tab__text">{{ item.text }}</text>
+                        <view class="flex uni-tab__dot-box">
+                            <text
+                                v-if="item.info"
+                                :class="{ 'uni-tab__dots': item.info > 9 }"
+                                class="uni-tab__dot "
+                                :style="{
+                                    backgroundColor: item.infoBackgroundColor ? item.infoBackgroundColor : '#ff0000',
+                                    color: item.infoColor ? item.infoColor : '#fff'
+                                }"
+                                >{{ item.info }}</text
+                            >
+                        </view>
+                    </view>
+                </template>
+            </view>
+            <view :class="{ 'uni-tab__right': fill }" class="flex uni-tab__cart-sub-right ">
+                <view
+                    v-for="(item, index) in buttonGroup"
+                    :key="index"
+                    :style="{ background: item.backgroundColor, color: item.color }"
+                    class="flex uni-tab__cart-button-right"
+                    @click="buttonClick(index, item)"
+                    ><text :style="{ color: item.color }" class="uni-tab__cart-button-right-text">{{
+                        item.text
+                    }}</text></view
+                >
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import { initVueI18n } from '@dcloudio/uni-i18n'
+import messages from './i18n/index.js'
+const { t } = initVueI18n(messages)
+/**
+ * GoodsNav 商品导航
+ * @description 商品加入购物车、立即购买等
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=865
+ * @property {Array} options 组件参数
+ * @property {Array} buttonGroup 组件按钮组参数
+ * @property {Boolean} fill = [true | false] 组件按钮组参数
+ * @event {Function} click 左侧点击事件
+ * @event {Function} buttonClick 右侧按钮组点击事件
+ * @example <uni-goods-nav :fill="true"  options="" buttonGroup="buttonGroup"  @click="" @buttonClick="" />
+ */
+export default {
+    name: 'UniGoodsNav',
+    emits: ['click', 'buttonClick'],
+    props: {
+        options: {
+            type: Array,
+            default() {
+                return [
+                    {
+                        icon: 'shop',
+                        text: t('uni-goods-nav.options.shop')
+                    },
+                    {
+                        icon: 'cart',
+                        text: t('uni-goods-nav.options.cart')
+                    }
+                ]
+            }
+        },
+        buttonGroup: {
+            type: Array,
+            default() {
+                return [
+                    {
+                        text: t('uni-goods-nav.buttonGroup.addToCart'),
+                        backgroundColor: '#ffa200',
+                        color: '#fff'
+                    },
+                    {
+                        text: t('uni-goods-nav.buttonGroup.buyNow'),
+                        backgroundColor: '#ff0000',
+                        color: '#fff'
+                    }
+                ]
+            }
+        },
+        fill: {
+            type: Boolean,
+            default: false
+        }
+    },
+    methods: {
+        onClick(index, item) {
+            this.$emit('click', {
+                index,
+                content: item
+            })
+        },
+        buttonClick(index, item) {
+            if (uni.report) {
+                uni.report(item.text, item.text)
+            }
+            this.$emit('buttonClick', {
+                index,
+                content: item
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.flex {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+}
+
+.uni-goods-nav {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex: 1;
+    flex-direction: row;
+}
+
+.uni-tab__cart-box {
+    flex: 1;
+    height: 50px;
+    background-color: #fff;
+    z-index: 900;
+}
+
+.uni-tab__cart-sub-left {
+    padding: 0 5px;
+}
+
+.uni-tab__cart-sub-right {
+    flex: 1;
+}
+
+.uni-tab__right {
+    margin: 5px 0;
+    margin-right: 10px;
+    border-radius: 100px;
+    overflow: hidden;
+}
+
+.uni-tab__cart-button-left {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    // flex: 1;
+    position: relative;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    margin: 0 10px;
+    /* #ifdef H5 */
+    cursor: pointer;
+    /* #endif */
+}
+
+.uni-tab__icon {
+    width: 18px;
+    height: 18px;
+}
+
+.image {
+    width: 18px;
+    height: 18px;
+}
+
+.uni-tab__text {
+    margin-top: 3px;
+    font-size: $uni-font-size-sm;
+    color: #646566;
+}
+
+.uni-tab__cart-button-right {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    flex-direction: column;
+    /* #endif */
+    flex: 1;
+    justify-content: center;
+    align-items: center;
+    /* #ifdef H5 */
+    cursor: pointer;
+    /* #endif */
+}
+
+.uni-tab__cart-button-right-text {
+    font-size: $uni-font-size-base;
+    color: #fff;
+}
+
+.uni-tab__cart-button-right:active {
+    opacity: 0.7;
+}
+
+.uni-tab__dot-box {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    flex-direction: column;
+    /* #endif */
+    position: absolute;
+    right: -2px;
+    top: 2px;
+    justify-content: center;
+    align-items: center;
+    // width: 0;
+    // height: 0;
+}
+
+.uni-tab__dot {
+    // width: 30rpx;
+    // height: 30rpx;
+    padding: 0 4px;
+    line-height: 15px;
+    color: #ffffff;
+    text-align: center;
+    font-size: 12px;
+    background-color: #ff0000;
+    border-radius: 15px;
+}
+
+.uni-tab__dots {
+    padding: 0 4px;
+    // width: auto;
+    border-radius: 15px;
+}
+
+.uni-tab__color-y {
+    background-color: #ffa200;
+}
+
+.uni-tab__color-r {
+    background-color: #ff0000;
+}
+</style>

components/uni-components/uni-icons/icons.js

@@ -0,0 +1,132 @@
+export default {
+	"pulldown": "\ue588",
+	"refreshempty": "\ue461",
+	"back": "\ue471",
+	"forward": "\ue470",
+	"more": "\ue507",
+	"more-filled": "\ue537",
+	"scan": "\ue612",
+	"qq": "\ue264",
+	"weibo": "\ue260",
+	"weixin": "\ue261",
+	"pengyouquan": "\ue262",
+	"loop": "\ue565",
+	"refresh": "\ue407",
+	"refresh-filled": "\ue437",
+	"arrowthindown": "\ue585",
+	"arrowthinleft": "\ue586",
+	"arrowthinright": "\ue587",
+	"arrowthinup": "\ue584",
+	"undo-filled": "\ue7d6",
+	"undo": "\ue406",
+	"redo": "\ue405",
+	"redo-filled": "\ue7d9",
+	"bars": "\ue563",
+	"chatboxes": "\ue203",
+	"camera": "\ue301",
+	"chatboxes-filled": "\ue233",
+	"camera-filled": "\ue7ef",
+	"cart-filled": "\ue7f4",
+	"cart": "\ue7f5",
+	"checkbox-filled": "\ue442",
+	"checkbox": "\ue7fa",
+	"arrowleft": "\ue582",
+	"arrowdown": "\ue581",
+	"arrowright": "\ue583",
+	"smallcircle-filled": "\ue801",
+	"arrowup": "\ue580",
+	"circle": "\ue411",
+	"eye-filled": "\ue568",
+	"eye-slash-filled": "\ue822",
+	"eye-slash": "\ue823",
+	"eye": "\ue824",
+	"flag-filled": "\ue825",
+	"flag": "\ue508",
+	"gear-filled": "\ue532",
+	"reload": "\ue462",
+	"gear": "\ue502",
+	"hand-thumbsdown-filled": "\ue83b",
+	"hand-thumbsdown": "\ue83c",
+	"hand-thumbsup-filled": "\ue83d",
+	"heart-filled": "\ue83e",
+	"hand-thumbsup": "\ue83f",
+	"heart": "\ue840",
+	"home": "\ue500",
+	"info": "\ue504",
+	"home-filled": "\ue530",
+	"info-filled": "\ue534",
+	"circle-filled": "\ue441",
+	"chat-filled": "\ue847",
+	"chat": "\ue263",
+	"mail-open-filled": "\ue84d",
+	"email-filled": "\ue231",
+	"mail-open": "\ue84e",
+	"email": "\ue201",
+	"checkmarkempty": "\ue472",
+	"list": "\ue562",
+	"locked-filled": "\ue856",
+	"locked": "\ue506",
+	"map-filled": "\ue85c",
+	"map-pin": "\ue85e",
+	"map-pin-ellipse": "\ue864",
+	"map": "\ue364",
+	"minus-filled": "\ue440",
+	"mic-filled": "\ue332",
+	"minus": "\ue410",
+	"micoff": "\ue360",
+	"mic": "\ue302",
+	"clear": "\ue434",
+	"smallcircle": "\ue868",
+	"close": "\ue404",
+	"closeempty": "\ue460",
+	"paperclip": "\ue567",
+	"paperplane": "\ue503",
+	"paperplane-filled": "\ue86e",
+	"person-filled": "\ue131",
+	"contact-filled": "\ue130",
+	"person": "\ue101",
+	"contact": "\ue100",
+	"images-filled": "\ue87a",
+	"phone": "\ue200",
+	"images": "\ue87b",
+	"image": "\ue363",
+	"image-filled": "\ue877",
+	"location-filled": "\ue333",
+	"location": "\ue303",
+	"plus-filled": "\ue439",
+	"plus": "\ue409",
+	"plusempty": "\ue468",
+	"help-filled": "\ue535",
+	"help": "\ue505",
+	"navigate-filled": "\ue884",
+	"navigate": "\ue501",
+	"mic-slash-filled": "\ue892",
+	"search": "\ue466",
+	"settings": "\ue560",
+	"sound": "\ue590",
+	"sound-filled": "\ue8a1",
+	"spinner-cycle": "\ue465",
+	"download-filled": "\ue8a4",
+	"personadd-filled": "\ue132",
+	"videocam-filled": "\ue8af",
+	"personadd": "\ue102",
+	"upload": "\ue402",
+	"upload-filled": "\ue8b1",
+	"starhalf": "\ue463",
+	"star-filled": "\ue438",
+	"star": "\ue408",
+	"trash": "\ue401",
+	"phone-filled": "\ue230",
+	"compose": "\ue400",
+	"videocam": "\ue300",
+	"trash-filled": "\ue8dc",
+	"download": "\ue403",
+	"chatbubble-filled": "\ue232",
+	"chatbubble": "\ue202",
+	"cloud-download": "\ue8e4",
+	"cloud-upload-filled": "\ue8e5",
+	"cloud-upload": "\ue8e6",
+	"cloud-download-filled": "\ue8e9",
+	"headphones":"\ue8bf",
+	"shop":"\ue609"
+}

components/uni-components/uni-swiper-dot/uni-swiper-dot.vue

@@ -1,216 +1,290 @@
 <template>
-	<view class="uni-swiper__warp">
-		<slot />
-		<view v-if="mode === 'default'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='default'>
-			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
-        'width': (index === current? dots.width*2:dots.width ) + 'px','height':dots.width/3 +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
-			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-bar" />
-		</view>
-		<view v-if="mode === 'dot'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='dot'>
-			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
-        'width': dots.width + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item" />
-		</view>
-		<view v-if="mode === 'round'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='round'>
-			<view v-for="(item,index) in info" @click="clickItem(index)" :class="[index === current&&'uni-swiper__dots-long']" :style="{
-		    'width':(index === current? dots.width*3:dots.width ) + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item " />
-		</view>
-		<view v-if="mode === 'nav'" key='nav' :style="{'background-color':dotsStyles.backgroundColor,'bottom':'0'}" class="uni-swiper__dots-box uni-swiper__dots-nav">
-			<text :style="{'color':dotsStyles.color}" class="uni-swiper__dots-nav-item">{{ (current+1)+"/"+info.length +' ' +info[current][field] }}</text>
-		</view>
-		<view v-if="mode === 'indexes'" key='indexes' :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box">
-			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
-        'width':dots.width + 'px','height':dots.height +'px' ,'color':index === current?dots.selectedColor:dots.color,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-indexes"><text class="uni-swiper__dots-indexes-text">{{ index+1 }}</text></view>
-		</view>
-	</view>
+    <view class="uni-swiper__warp">
+        <slot />
+        <view
+            v-if="mode === 'default'"
+            :style="{ bottom: dots.bottom + 'px' }"
+            class="uni-swiper__dots-box"
+            key="default"
+        >
+            <view
+                v-for="(item, index) in info"
+                @click="clickItem(index)"
+                :style="{
+                    width: (index === current ? dots.width * 2 : dots.width) + 'px',
+                    height: dots.width / 3 + 'px',
+                    'background-color': index !== current ? dots.backgroundColor : dots.selectedBackgroundColor,
+                    'border-radius': '0px'
+                }"
+                :key="index"
+                class="uni-swiper__dots-item uni-swiper__dots-bar"
+            />
+        </view>
+        <view v-if="mode === 'dot'" :style="{ bottom: dots.bottom + 'px' }" class="uni-swiper__dots-box" key="dot">
+            <view
+                v-for="(item, index) in info"
+                @click="clickItem(index)"
+                :style="{
+                    width: dots.width + 'px',
+                    height: dots.height + 'px',
+                    'background-color': index !== current ? dots.backgroundColor : dots.selectedBackgroundColor,
+                    border: index !== current ? dots.border : dots.selectedBorder
+                }"
+                :key="index"
+                class="uni-swiper__dots-item"
+            />
+        </view>
+        <view v-if="mode === 'round'" :style="{ bottom: dots.bottom + 'px' }" class="uni-swiper__dots-box" key="round">
+            <view
+                v-for="(item, index) in info"
+                @click="clickItem(index)"
+                :class="[index === current && 'uni-swiper__dots-long']"
+                :style="{
+                    width: (index === current ? dots.width * 3 : dots.width) + 'px',
+                    height: dots.height + 'px',
+                    'background-color': index !== current ? dots.backgroundColor : dots.selectedBackgroundColor,
+                    border: index !== current ? dots.border : dots.selectedBorder
+                }"
+                :key="index"
+                class="uni-swiper__dots-item "
+            />
+        </view>
+        <view
+            v-if="mode === 'nav'"
+            key="nav"
+            :style="{ 'background-color': dotsStyles.backgroundColor, bottom: '0' }"
+            class="uni-swiper__dots-box uni-swiper__dots-nav"
+        >
+            <text :style="{ color: dotsStyles.color }" class="uni-swiper__dots-nav-item">{{
+                current + 1 + '/' + info.length + ' ' + info[current][field]
+            }}</text>
+        </view>
+        <view
+            v-if="mode === 'indexes'"
+            key="indexes"
+            :style="{ bottom: dots.bottom + 'px' }"
+            class="uni-swiper__dots-box"
+        >
+            <view
+                v-for="(item, index) in info"
+                @click="clickItem(index)"
+                :style="{
+                    width: dots.width + 'px',
+                    height: dots.height + 'px',
+                    color: index === current ? dots.selectedColor : dots.color,
+                    'background-color': index !== current ? dots.backgroundColor : dots.selectedBackgroundColor,
+                    border: index !== current ? dots.border : dots.selectedBorder
+                }"
+                :key="index"
+                class="uni-swiper__dots-item uni-swiper__dots-indexes"
+                ><text class="uni-swiper__dots-indexes-text">{{ index + 1 }}</text></view
+            >
+        </view>
+        <view v-if="mode === 'left'" key="left" class="uni-swiper__dots-box uni-swiper__dots-left">
+            <text class="uni-swiper__dots-left-text"> {{ current + 1 + '/' + info.length }} </text>
+        </view>
+    </view>
 </template>
 
 <script>
+/**
+ * SwiperDod 轮播图指示点
+ * @description 自定义轮播图指示点
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=284
+ * @property {Number} current 当前指示点索引，必须是通过 `swiper` 的 `change` 事件获取到的 `e.detail.current`
+ * @property {String} mode = [default|round|nav|indexes] 指示点的类型
+ * 	@value defualt 默认指示点
+ * 	@value round 圆形指示点
+ * 	@value nav 条形指示点
+ * 	@value indexes 索引指示点
+ * @property {String} field mode 为 nav 时，显示的内容字段（mode = nav 时必填）
+ * @property {String} info 轮播图的数据，通过数组长度决定指示点个数
+ * @property {Object} dotsStyles 指示点样式
+ * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
+ */
 
-	/**
-	 * SwiperDod 轮播图指示点
-	 * @description 自定义轮播图指示点
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=284
-	 * @property {Number} current 当前指示点索引，必须是通过 `swiper` 的 `change` 事件获取到的 `e.detail.current`
-	 * @property {String} mode = [default|round|nav|indexes] 指示点的类型
-	 * 	@value defualt 默认指示点
-	 * 	@value round 圆形指示点
-	 * 	@value nav 条形指示点
-	 * 	@value indexes 索引指示点
-	 * @property {String} field mode 为 nav 时，显示的内容字段（mode = nav 时必填）
-	 * @property {String} info 轮播图的数据，通过数组长度决定指示点个数
-	 * @property {Object} dotsStyles 指示点样式
-	 * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
-	 */
-
-	export default {
-		name: 'UniSwiperDot',
-		emits:['clickItem'],
-		props: {
-			info: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			current: {
-				type: Number,
-				default: 0
-			},
-			dotsStyles: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// 类型 ：default(默认) indexes long nav
-			mode: {
-				type: String,
-				default: 'default'
-			},
-			// 只在 nav 模式下生效，变量名称
-			field: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				dots: {
-					width: 8,
-					height: 8,
-					bottom: 10,
-					color: '#fff',
-					backgroundColor: 'rgba(0, 0, 0, .3)',
-					border: '1px rgba(0, 0, 0, .3) solid',
-					selectedBackgroundColor: '#333',
-					selectedBorder: '1px rgba(0, 0, 0, .9) solid'
-				}
-			}
-		},
-		watch: {
-			dotsStyles(newVal) {
-				this.dots = Object.assign(this.dots, this.dotsStyles)
-			},
-			mode(newVal) {
-				if (newVal === 'indexes') {
-					this.dots.width = 20
-					this.dots.height = 20
-				} else {
-					this.dots.width = 8
-					this.dots.height = 8
-				}
-			}
-
-		},
-		created() {
-			if (this.mode === 'indexes') {
-				this.dots.width = 20
-				this.dots.height = 20
-			}
-			this.dots = Object.assign(this.dots, this.dotsStyles)
-		},
-		methods: {
-			clickItem(index) {
-				this.$emit('clickItem', index)
-			}
-		}
-	}
+export default {
+    name: 'UniSwiperDot',
+    emits: ['clickItem'],
+    props: {
+        info: {
+            type: Array,
+            default() {
+                return []
+            }
+        },
+        current: {
+            type: Number,
+            default: 0
+        },
+        dotsStyles: {
+            type: Object,
+            default() {
+                return {}
+            }
+        },
+        // 类型 ：default(默认) indexes long nav
+        mode: {
+            type: String,
+            default: 'default'
+        },
+        // 只在 nav 模式下生效，变量名称
+        field: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            dots: {
+                width: 8,
+                height: 8,
+                bottom: 10,
+                color: '#fff',
+                backgroundColor: 'rgba(0, 0, 0, .3)',
+                border: '1px rgba(0, 0, 0, .3) solid',
+                selectedBackgroundColor: '#333',
+                selectedBorder: '1px rgba(0, 0, 0, .9) solid'
+            }
+        }
+    },
+    watch: {
+        dotsStyles(newVal) {
+            this.dots = Object.assign(this.dots, this.dotsStyles)
+        },
+        mode(newVal) {
+            if (newVal === 'indexes') {
+                this.dots.width = 20
+                this.dots.height = 20
+            } else {
+                this.dots.width = 8
+                this.dots.height = 8
+            }
+        }
+    },
+    created() {
+        if (this.mode === 'indexes') {
+            this.dots.width = 20
+            this.dots.height = 20
+        }
+        this.dots = Object.assign(this.dots, this.dotsStyles)
+    },
+    methods: {
+        clickItem(index) {
+            this.$emit('clickItem', index)
+        }
+    }
+}
 </script>
 
 <style lang="scss" scoped>
-	.uni-swiper__warp {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: column;
-		position: relative;
-		overflow: hidden;
-	}
+.uni-swiper__warp {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex: 1;
+    flex-direction: column;
+    position: relative;
+    overflow: hidden;
+}
 
-	.uni-swiper__dots-box {
-		position: absolute;
-		bottom: 10px;
-		left: 0;
-		right: 0;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-	}
+.uni-swiper__dots-box {
+    position: absolute;
+    bottom: 10px;
+    left: 0;
+    right: 0;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex: 1;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+}
 
-	.uni-swiper__dots-item {
-		width: 8px;
-		border-radius: 100px;
-		margin-left: 6px;
-		background-color: $uni-bg-color-mask;
-		/* #ifndef APP-NVUE */
-		cursor: pointer;
-		/* #endif */
-		/* #ifdef H5 */
-		// border-width: 5px 0;
-		// border-style: solid;
-		// border-color: transparent;
-		// background-clip: padding-box;
-		/* #endif */
-		// transition: width 0.2s linear;  不要取消注释，不然会不能变色
-	}
+.uni-swiper__dots-item {
+    width: 8px;
+    border-radius: 100px;
+    margin-left: 6px;
+    background-color: $uni-bg-color-mask;
+    /* #ifndef APP-NVUE */
+    cursor: pointer;
+    /* #endif */
+    /* #ifdef H5 */
+    // border-width: 5px 0;
+    // border-style: solid;
+    // border-color: transparent;
+    // background-clip: padding-box;
+    /* #endif */
+    // transition: width 0.2s linear;  不要取消注释，不然会不能变色
+}
 
-	.uni-swiper__dots-item:first-child {
-		margin: 0;
-	}
+.uni-swiper__dots-item:first-child {
+    margin: 0;
+}
 
-	.uni-swiper__dots-default {
-		border-radius: 100px;
-	}
+.uni-swiper__dots-default {
+    border-radius: 100px;
+}
 
-	.uni-swiper__dots-long {
-		border-radius: 50px;
-	}
+.uni-swiper__dots-long {
+    border-radius: 50px;
+}
 
-	.uni-swiper__dots-bar {
-		border-radius: 50px;
-	}
+.uni-swiper__dots-bar {
+    border-radius: 50px;
+}
 
-	.uni-swiper__dots-nav {
-		bottom: 0px;
-		height: 40px;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: flex-start;
-		align-items: center;
-		background-color: rgba(0, 0, 0, 0.2);
-	}
+.uni-swiper__dots-nav {
+    bottom: 0px;
+    height: 40px;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex: 1;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+    background-color: rgba(0, 0, 0, 0.2);
+}
 
-	.uni-swiper__dots-nav-item {
-		/* overflow: hidden;
+.uni-swiper__dots-nav-item {
+    /* overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap; */
-		font-size: $uni-font-size-base;
-		color: #fff;
-		margin: 0 15px;
-	}
+    font-size: $uni-font-size-base;
+    color: #fff;
+    margin: 0 15px;
+}
+
+.uni-swiper__dots-indexes {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    // flex: 1;
+    justify-content: center;
+    align-items: center;
+}
+
+.uni-swiper__dots-left {
+    left: unset;
+    right: 24rpx;
+}
 
-	.uni-swiper__dots-indexes {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		// flex: 1;
-		justify-content: center;
-		align-items: center;
-	}
+.uni-swiper__dots-left-text {
+    display: block;
+    height: 48rpx;
+    border-radius: 24rpx;
+    line-height: 48rpx;
+    padding: 0 24rpx;
+    font-size: 26rpx;
+    font-family: PingFangSC;
+    color: #ffffff;
+    background-color: rgba(0, 0, 0, 0.3);
+}
 
-	.uni-swiper__dots-indexes-text {
-		color: #fff;
-		font-size: $uni-font-size-sm;
-	}
+.uni-swiper__dots-indexes-text {
+    color: #fff;
+    font-size: $uni-font-size-sm;
+}
 </style>

mixins/wechatPay.js

@@ -19,6 +19,14 @@ function wxRequestPayment(payment) {
     })
 }
 
+// 支付信息提示页面重定向
+function payFaildRedirect(orderInfo) {
+    setTimeout(() => {
+        uni.setStorageSync('orderInfo', orderInfo)
+        uni.redirectTo({ url: '/pages/user/order/success' })
+    }, 2000)
+}
+
 // 微信支付
 const wechatPay = {
     data() {
@@ -58,23 +66,15 @@ const wechatPay = {
                 const payFlag = await wxRequestPayment(payment)
                 // 支付重定向
                 uni.reLaunch({ url: '/pages/tabBar/index/index' })
-
             } catch (error) {
                 // 微信支付失败
-                if (error.msg === 'error') this.payFaildRedirect()
+                if (error.msg === 'error') payFaildRedirect(this.hanldOrder.order)
                 else this.$util.msg(error.msg, 2000)
             } finally {
                 this.isSubLoading = false
             }
-        },
-        // 支付信息提示页面重定向
-        payFaildRedirect() {
-            setTimeout(() => {
-                const redirectData = JSON.stringify({ orderInfo: this.hanldOrder.order })
-                this.$api.redirectTo(`/pages/user/order/success?data=${redirectData}`)
-            }, 2000)
         }
-    },
+    }
 }
 
 export default wechatPay

pages.json

@@ -65,6 +65,12 @@
                 "navigationStyle": "custom"
             }
         },
+        {
+            "path": "pages/goods/product-detail",
+            "style": {
+                "navigationBarTitleText": "商品详情"
+            }
+        },
         {
             "path": "pages/goods/product-activi",
             "style": {

pages/goods/cart.vue

@@ -249,7 +249,8 @@ export default {
         },
         finallyPrice() {
             if (this.currentCoupon) {
-                return this.allPrice - this.discountedPrice - this.currentCoupon.couponAmount
+                const finallyPrice = this.allPrice - this.discountedPrice - this.currentCoupon.couponAmount
+                return finallyPrice < 0 ? 0 : finallyPrice
             }
             return this.allPrice - this.discountedPrice
         },

pages/goods/good-floorMore.vue

@@ -69,7 +69,8 @@ export default {
             return this.ProductService.QueryProductList({
                 pageNum: this.pageNum,
                 pageSize: this.pageSize,
-                floorId: this.floorId
+                floorId: this.floorId,
+                userId: this.userId
             })
                 .then(response => {
                     let data = response.data

pages/goods/product-activi.vue

@@ -41,13 +41,7 @@
                 </view>
             </view>
         </view>
-        <tui-skeleton
-            v-if="skeletonShow"
-            backgroundColor="#fafafa"
-            borderRadius="10rpx"
-            :isLoading="true"
-            :loadingType="2"
-        ></tui-skeleton>
+        <tui-skeleton v-if="skeletonShow" :loadingType="2"></tui-skeleton>
         <template v-else>
             <view class="container-product tui-skeleton">
                 <view class="container-product-main product-details product-details0">
@@ -204,11 +198,11 @@
                             <view class="item-bt" @click="buyProductCart()">
                                 <text class="iconfont icon-gouwuche"></text> <text>购物车</text>
                                 <text
-                                    v-if="hasLogin && goodsData.cartCount > 0"
+                                    v-if="hasLogin && kindCount > 0"
                                     class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"
-                                    :class="[goodsData.cartCount < 10 ? 'goleft' : '']"
+                                    :class="[kindCount < 10 ? 'goleft' : '']"
                                 >
-                                    {{ goodsData.cartCount >= 100 ? '99+' : goodsData.cartCount }}
+                                    {{ kindCount >= 100 ? '99+' : kindCount }}
                                 </text>
                                 <view class="animation-num" :class="isAnimation ? 'animation' : 'restion'">+1</view>
                             </view>
@@ -333,9 +327,7 @@ export default {
             isQuantity: false,
             disabled: false,
             tabCurrentIndex: 0,
-            userId: '',
             productId: 0,
-            userIdentity: 0, //用户类型
             goodsData: {}, //自定义数据
             product: {}, //采美
             productImage: [],
@@ -379,7 +371,7 @@ export default {
         this.getWinHeight()
     },
     computed: {
-        ...mapGetters(['hasLogin', 'isIphoneX', 'userId'])
+        ...mapGetters(['hasLogin', 'isIphoneX', 'userId', 'kindCount', 'userIdentity'])
     },
     filters: {
         NumFormat(value) {
@@ -393,18 +385,17 @@ export default {
         initData() {
             // 初始化商品详情查询
             this.ProductService.QueryProductDetils({
-                productId: this.productId
+                productId: this.productId,
+                userId: this.userId
             })
                 .then(response => {
                     //购物车数量
-                    this.skeletonShow = false
                     this.productImage = []
                     this.product = response.data
                     //已删除/已冻结
                     if (this.product.validFlag === 2) {
                         this.isShowButton = true
                     }
-                    this.ladderPriceFlag = this.product.ladderPriceFlag
                     this.html =
                         this.product.productDetail == null
                             ? this.html
@@ -423,27 +414,12 @@ export default {
                     setTimeout(() => {
                         this.getSectionProps()
                     }, 2000)
-                    console.log(this.userId)
-                    if (this.userId > 0) {
-                        this.GetCartNumber()
-                    }
                     this.isRequest = true
+                    this.skeletonShow =false
                 })
                 .catch(error => {
                     this.$util.msg(error.msg, 2000)
-                })
-        },
-        GetCartNumber() {
-            //查询购物车数量
-            this.ProductService.QueryShoppingQuantity({
-                userId: this.userId
-            })
-                .then(response => {
-                    this.goodsData.cartCount = response.data
-                    this.$store.commit('app/updateAllNum', response.data)
-                })
-                .catch(error => {
-                    console.log('查询购物车数量错误信息', error)
+                    this.isRequest =false
                 })
         },
         swiperChange(e) {
@@ -769,26 +745,17 @@ export default {
         }
     },
     onShow() {
-        this.$api
-            .getStorage()
-            .then(resolve => {
-                this.userId = resolve.userId ? resolve.userId : ''
-                this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 0
-                if (isPreviewImg) {
-                    isPreviewImg = false
-                    return
-                } else {
-                    this.initData()
-                }
-            })
-            .catch(error => {
-                this.initData()
-            })
+        if (isPreviewImg) {
+            isPreviewImg = false
+            return
+        } else {
+            this.initData()
+        }
     }
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 page {
     background-color: #ffffff;
 }

pages/goods/product-detail.vue

@@ -0,0 +1,385 @@
+<template>
+    <view class="product-detail" :class="{ hasBottom: isIphoneX }">
+        <tui-skeleton :loadingType="2" v-if="isRequest"></tui-skeleton>
+        <template v-else>
+            <!-- 顶部tabs -->
+            <tui-tabs
+                v-show="scrollTop > 40"
+                class="fixed"
+                :tabs="tabs"
+                :currentTab="currentTab"
+                @change="tabChange"
+                color="#666666"
+                bold
+                selectedColor="#FF457B"
+                sliderBgColor="#FF457B"
+            ></tui-tabs>
+            <view id="anchor1" class="anchor">
+                <!-- 商品图片 -->
+                <uni-swiper-dot :info="imageList" :current="swiperCurrent" mode="left" class="swiper-box">
+                    <swiper @change="swiperChange" class="swiper">
+                        <swiper-item v-for="(image, index) in imageList" :key="index">
+                            <image :src="image" class="image" mode="center" @click="previewImage(index)"></image>
+                        </swiper-item>
+                    </swiper>
+                </uni-swiper-dot>
+                <view class="row">
+                    <!-- 价格 -->
+                    <cm-product-price :productInfo="productInfo" class="cm-product-price"></cm-product-price>
+                    <!-- 商品信息 -->
+                    <cm-product-info :productInfo="productInfo" class="cm-product-info"></cm-product-info>
+                </view>
+                <!-- 商品参数 -->
+                <view class="row touch-bar params" @click="paramsVisible = true">
+                    <view class="name">
+                        <text class="p1">参数：</text><text class="p2">品牌</text><text class="p2">分类...</text>
+                    </view>
+                    <text class="iconfont icon-chakangengduo"></text>
+                </view>
+                <!-- 优惠券 -->
+                <view class="row touch-bar coupon" @click="couponVisible = true" v-if="couponList.length > 0">
+                    <view class="name">优惠券：</view>
+                    <view class="left">
+                        <view class="coupon-tags">
+                            <text class="tag" v-for="(tagName, index) in couponTags" :key="index">{{ tagName }}</text>
+                        </view>
+                        <text class="iconfont icon-chakangengduo"></text>
+                    </view>
+                </view>
+            </view>
+            <!-- 商品详情 -->
+            <view class="row product-info anchor" id="anchor2">
+                <view class="title">商品详情</view>
+                <view class="product-rich-text">
+                    <parser :html="detailHtml" :img-mode="widthFix" v-if="detailHtml"></parser>
+                    <view class="product-rich-text-none" v-else>暂无商品信息</view>
+                </view>
+            </view>
+            <!-- 服务项目 -->
+            <view class="row product-info anchor" id="anchor3">
+                <!-- 服务项目 -->
+                <view class="title">服务项目</view>
+                <template v-if="product.productDetail.orderInfo || product.productDetail.serviceInfo">
+                    <cm-service :product="product.productDetail"></cm-service>
+                </template>
+                <view class="content-none" v-else> <text>暂无服务项目</text> </view>
+            </view>
+        </template>
+        <!-- 商品导航 -->
+        <cm-goods-nav :productInfo="productInfo"></cm-goods-nav>
+        <!-- 回到顶部 -->
+        <tui-scroll-top :scrollTop="scrollTop" :bottom="0" :duration="500"></tui-scroll-top>
+        <!-- 商品参数 -->
+        <cm-product-params
+            :visible="paramsVisible"
+            :productInfo="productInfo"
+            @close="paramsVisible = false"
+        ></cm-product-params>
+        <!-- 优惠券列表 TODO-->
+        <cm-coupon-list
+            title="获取优惠券"
+            listType="receive"
+            :couponList="couponList"
+            :visible="couponVisible"
+            :showStatus="true"
+            @close="closeCouponList"
+            @couponClick="couponClick"
+        ></cm-coupon-list>
+    </view>
+</template>
+
+<script>
+import { mapGetters, mapActions, mapMutations } from 'vuex'
+import CmProductPrice from '@/components/cm-module/cm-product-price/cm-product-price.vue'
+import CmProductInfo from '@/components/cm-module/cm-product-info/cm-product-info.vue'
+import CmCouponList from '@/components/cm-module/cm-coupon-list/cm-coupon-list'
+import CmProductParams from '@/components/cm-module/cm-product-params/cm-product-params.vue'
+import CmGoodsNav from '@/components/cm-module/cm-goods-nav/cm-goods-nav.vue'
+import Parser from '@/components/jyf-Parser/index' //富文本处理
+const observers = {}
+export default {
+    components: {
+        Parser,
+        CmProductPrice,
+        CmProductInfo,
+        CmCouponList,
+        CmProductParams,
+        CmGoodsNav
+    },
+    data() {
+        return {
+            tabs: [{ name: '商品' }, { name: '详情' }, { name: '服务项目' }],
+            currentTab: 0,
+            productId: 1014,
+            imageList: [
+                'https://picsum.photos/750/750?random=1',
+                'https://picsum.photos/750/750?random=2',
+                'https://picsum.photos/750/750?random=3'
+            ],
+            swiperCurrent: 0,
+            productInfo: {},
+            isRequest: true,
+            scrollTop: 0,
+            couponList: [],
+            couponVisible: false,
+            paramsVisible: false,
+            jumpState: 1,
+            selectorTimer: null,
+            anchorList: [],
+            anchorStatus: [0, 0, 0]
+        }
+    },
+    computed: {
+        ...mapGetters(['isIphoneX', 'kindCount', 'userId']),
+        // 优惠券标签
+        couponTags() {
+            const result = []
+            for (let i = 0; i < this.couponList.length; i++) {
+                if (i >= 3) return result
+                if (this.couponList[i].noThresholdFlag === 1) {
+                    result.push(`减${this.couponList[i].couponAmount}`)
+                } else {
+                    result.push(`满${this.couponList[i].touchPrice}减${this.couponList[i].couponAmount}`)
+                }
+            }
+            return result
+        },
+        // 商品详情html
+        detailHtml() {
+            return this.productInfo.hasOwnProperty('productDetail') ? this.productInfo.productDetail.detailInfo : ''
+        }
+    },
+    onPageScroll(e) {
+        this.scrollTop = e.scrollTop
+        // this.observerAnchor()
+        this.setCurrentTab()
+    },
+    onLoad(option) {
+        // 收集分享信息
+        if (option.type == 'share') {
+            this.setInviteUserId(option.inviteUserId)
+        }
+        this.jumpState = parseInt(option.jumpState)
+        this.productId = parseInt(option.productId)
+        this.initProductDetail()
+        this.getCouponByProduct()
+    },
+    onReady() {
+        this.selectorTimer = setInterval(() => {
+            if (!this.isRequest) {
+                this.getAnchorSection()
+            }
+        }, 1000)
+    },
+    //分享转发
+    onShareAppMessage(res) {
+        const queryString = this.$util.makeQueryStr({
+            type: 'share',
+            productId: this.productInfo.productId,
+            inviteUserId: this.userId
+        })
+        return {
+            title: this.productInfo.name,
+            path: `pages/goods/product-detail?${queryString}`,
+            imageUrl: this.imageList[0]
+        }
+    },
+    methods: {
+        ...mapMutations('user', ['setInviteUserId']),
+        // tab切换
+        tabChange(e) {
+            this.currentTab = e.index
+            this.scrollToAnchor()
+        },
+        // 加入购物车 / 立即下单信息
+        initProductInfo(data) {
+            // jumpState 1: 非活动页商品详情 2: 活动页面商品详情
+            data.heUserId = this.jumpState === 1 ? 0 : this.userId
+            return data
+        },
+        // 初始化商品详情
+        initProductDetail() {
+            this.ProductService.QueryProductDetils({
+                productId: this.productId,
+                userId: this.userId
+            }).then(res => {
+                const data = res.data
+                this.imageList = data.imageList
+                this.productInfo = this.initProductInfo(data)
+                this.isRequest = false
+            })
+        },
+        // 获取当前商品可用优惠券列表
+        getCouponByProduct() {
+            this.CouponService.GetCouponByProduct({
+                productId: this.productId,
+                userId: this.userId
+            }).then(res => {
+                this.couponList = res.data
+            })
+        },
+        // 关闭优惠券列表
+        closeCouponList() {
+            this.couponVisible = false
+        },
+        // 优惠券列表按钮点击事件
+        couponClick() {
+            this.couponVisible = false
+        },
+        // 轮播图切换
+        swiperChange(e) {
+            this.swiperCurrent = e.detail.current
+        },
+        // 图片预览
+        previewImage(index) {
+            uni.previewImage({
+                current: index,
+                urls: this.imageList
+            })
+        },
+        // 获取锚点元素信息
+        getAnchorSection() {
+            const query = uni.createSelectorQuery().in(this)
+            query
+                .selectAll('.anchor')
+                .boundingClientRect(data => {
+                    console.log(data)
+                    if (data.length > 0) {
+                        console.log(data)
+                        this.anchorList = data
+                        clearInterval(this.selectorTimer)
+                        this.observerAnchor(data)
+                    }
+                })
+                .exec()
+        },
+        // 滚动到锚点
+        scrollToAnchor() {
+            // const selector = '#anchor' + (this.currentTab + 1)
+            uni.pageScrollTo({
+                scrollTop: this.anchorList[this.currentTab].top - 40
+            })
+        },
+        // 创建观测者
+        observerAnchor(selectorList = []) {
+            const height =  uni.getSystemInfoSync().windowHeight - 50
+            selectorList.forEach((selector, index) => {
+                observers[selector.id] = uni.createIntersectionObserver(this)
+                observers[selector.id].relativeToViewport({ bottom: - height }).observe(`#${selector.id}`, res => {
+                    if (res.intersectionRatio > 0) {
+                        this.anchorStatus[index] = 1
+                        console.log(index, `当前区域为${selector.id}标签选择器的区域...`)
+                    } else {
+                        this.anchorStatus[index] = 0
+                        console.log(index, `离开区域为${selector.id}标签选择器的区域...`)
+                    }
+                })
+            })
+        },
+        // 设置currentTab
+        setCurrentTab(){
+            const index = this.anchorStatus.lastIndexOf(1)
+            if(this.currentTab !== index) this.currentTab = index
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+$swiper-width: 750rpx;
+.fixed {
+    position: fixed;
+    width: 100%;
+    top: 0;
+    left: 0;
+    z-index: 99;
+}
+.product-detail {
+    min-height: 100vh;
+    background: #f7f7f7;
+    box-sizing: border-box;
+    // padding-top: 80rpx;
+    padding-bottom: 100rpx;
+    &.hasBottom {
+        padding-bottom: 144rpx;
+    }
+}
+.swiper-box {
+    position: relative;
+}
+.swiper {
+    width: $swiper-width;
+    height: $swiper-width;
+    .image {
+        width: $swiper-width;
+        height: $swiper-width;
+    }
+}
+.row {
+    padding: 0 24rpx;
+    margin-bottom: 24rpx;
+    background: #ffffff;
+    &.touch-bar {
+        line-height: 90rpx;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .name {
+            font-size: 28rpx;
+        }
+    }
+    &.params {
+        .p1,
+        .iconfont {
+            color: #999999;
+        }
+        .p2 {
+            margin: 0 32rpx;
+            color: #333333;
+        }
+    }
+    &.coupon {
+        color: #ff457b;
+        .left {
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            .tag {
+                padding: 2rpx 8rpx;
+                font-size: 20rpx;
+                background: #fff3f7;
+                border: 1rpx solid #ff457b;
+                border-radius: 8rpx;
+                margin-left: 8rpx;
+            }
+            .iconfont {
+                margin-left: 24rpx;
+            }
+        }
+    }
+    &.product-info {
+        padding-bottom: 24rpx;
+        .title {
+            padding: 40rpx 0 32rpx;
+            font-size: 28rpx;
+            font-weight: bold;
+            color: #333333;
+        }
+        .product-rich-text-none {
+            box-sizing: border-box;
+            text-align: left;
+            font-size: 24rpx;
+            color: #999999;
+            line-height: 60rpx;
+        }
+        .content-none {
+            height: 80rpx;
+            line-height: 80rpx;
+            text-align: left;
+            font-size: 26rpx;
+            color: #999999;
+            box-sizing: border-box;
+        }
+    }
+}
+</style>

pages/goods/product.vue

@@ -430,7 +430,8 @@ export default {
         // 初始化商品详情查询
         initData() {
             this.ProductService.QueryProductDetils({
-                productId: this.productId
+                productId: this.productId,
+                userId: this.userId
             })
                 .then(response => {
                     this.skeletonShow = false

pages/goods/search.vue

@@ -42,6 +42,7 @@
                 @scrolltolower="scrolltolower"
                 scroll-y
                 v-if="!showEmpty"
+                class="scroll-view"
             >
                 <view
                     v-for="(pro, index) in productList"
@@ -54,24 +55,26 @@
                         <image class="product-image" :src="pro.mainImage" mode=""></image>
                     </view>
                     <view class="product-list-msgs">
-                        <view class="product-name">{{ pro.name }}</view>
+                        <view class="product-name tui-ellipsis-2">{{ pro.name }}</view>
                         <view class="product-unit">规格：{{ pro.unit }}</view>
-                        <view class="product-tags" v-if="pro.activistatus == 1"><text class="tag">活动价</text></view>
-                        <view class="product-pric">
+                        <view class="product-tags">
+                            <text class="tag type2" v-if="pro.activeStatus === 1">活动价</text>
+                            <text class="tag type2" v-if="pro.couponsLogo">优惠券</text>
+                        </view>
+                        <view class="product-price">
                             <view class="price">￥{{ pro.price | PriceFormat }}</view>
-                            <view class="carts" @click.stop="handAddCarts(pro)">
-                                <view class="carts-add"> <text class="iconfont icon-gouwuche"></text> </view>
-                            </view>
+                            <text class="carts-add iconfont icon-gouwuche" @click.stop="handAddCarts(pro)"></text>
                         </view>
                     </view>
                 </view>
                 <view v-if="showLoading && productList.length > 5">
-                    <view class="loading-wrapper loading-wrapper-now" v-if="loadingNow"
-                        >{{ loadingText }}<text v-if="loadingText === '已至底部'">‧ ‧ ‧</text></view
-                    >
-                    <view class="loading-wrapper loading-wrapper-btm" v-else
-                        >———<text class="btm-text">已至底部</text>———</view
-                    >
+                    <view class="loading-wrapper loading-wrapper-now" v-if="loadingNow">
+                        <template>{{ loadingText }}</template>
+                        <text v-if="loadingText === '已至底部'">‧ ‧ ‧</text>
+                    </view>
+                    <view class="loading-wrapper loading-wrapper-btm" v-else>
+                        <text class="btm-text">———已至底部———</text>
+                    </view>
                 </view>
             </scroll-view>
             <view class="empty-container" v-if="showEmpty">
@@ -103,19 +106,14 @@ import wxLogin from '@/services/wxLogin.js'
 
 export default {
     components: {
-        modalLayer,
+        modalLayer
     },
     data() {
         return {
             StaticUrl: this.$Static,
-            shopId: 0,
-            userID: 0,
             themeClass: 'block',
             show: false,
-            userIdentity: '',
-            searchKeyType: 1,
             isShowClose: false, //是否显示清空输入框图标
-            isSearchHistory: false, //是都显示搜索历史
             serachRecordList: [
                 { searchWord: '奥术大师大所打' },
                 { searchWord: '奥术大师大所打' },
@@ -127,7 +125,6 @@ export default {
             isShowWrapper: true,
             isModallayer: false,
             isFocus: false,
-            priceLoading: true,
             windowHeight: '',
             showEmpty: false,
             scrollHeight: '',
@@ -153,18 +150,15 @@ export default {
             this.setInviteUserId(option.inviteUserId)
             wxLogin.wxLoginAuthorize()
         }
-        this.$api.getStorage().then(resolve => {
-            this.listQuery.userId = resolve.userId ? resolve.userId : 0
-            this.userIdentity = resolve.userIdentity
-            if (option.keyWord) {
-                this.listQuery.name = option.keyWord
-                this.getListFromServer()
-                this.isFocus = false
-            } else {
-                this.isFocus = true
-                this.InitGetSerachRecord()
-            }
-        })
+        this.listQuery.userId = this.userId
+        if (option.keyWord) {
+            this.listQuery.name = option.keyWord
+            this.getListFromServer()
+            this.isFocus = false
+        } else {
+            this.isFocus = true
+            this.InitGetSerachRecord()
+        }
     },
     filters: {
         PriceFormat: function(text) {
@@ -173,22 +167,22 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['hasLogin', 'userId'])
+        ...mapGetters(['hasLogin', 'userId', 'userIdentity'])
     },
     methods: {
-        ...mapActions('cart',['addToCart']),
-        ...mapActions('user',['setInviteUserId']),
+        ...mapActions('cart', ['addToCart']),
+        ...mapActions('user', ['setInviteUserId']),
         ...mapMutations('user', ['setInviteUserId']),
+        //查询搜索历史记录
         InitGetSerachRecord() {
-            //查询搜索历史记录
             this.ProductService.GetProductSearchHistory({ userId: this.listQuery.userId }).then(response => {
                 if (response.code == 0) {
                     this.serachRecordList = response.data
                 }
             })
         },
+        //搜索
         SubMitSearch() {
-            //搜索
             if (this.listQuery.name == '') {
                 this.$util.msg('请输入搜索关键词', 2000)
             } else {
@@ -202,8 +196,8 @@ export default {
                 this.getListFromServer(true)
             }
         },
+        //搜索商品
         getListFromServer(loadMore) {
-            //搜索商品
             this.showLoading = true
             this.loadingNow = true
             this.loadingText = '加载中'
@@ -249,36 +243,36 @@ export default {
         handAddCarts(pro) {
             this.addToCart({ productId: pro.productId })
         },
+        //输入框输入时触发
         onShowClose() {
-            //输入框输入时触发
             this.inputEmpty(this.listQuery.name)
         },
+        //输入框获取焦点时触发
         onFocus() {
-            //输入框获取焦点时触发
             this.inputEmpty(this.listQuery.name)
             this.InitGetSerachRecord()
         },
+        //清除输入框内容
         delInputText() {
-            //清除输入框内容
             this.listQuery.name = ''
             this.isShowClose = false
             this.isShowWrapper = false
             this.inputEmpty(this.listQuery.name)
             this.InitGetSerachRecord()
         },
+        //关键词搜索与历史搜索
         keywordsClick(item) {
-            //关键词搜索与历史搜索
             this.listQuery.name = item
             this.isShowClose = true
             this.isFocus = false
             this.SubMitSearch()
         },
+        //清空历史记录
         confirmDetele() {
-            //清空历史记录
             this.modal = true
         },
+        //用户操作订单
         handleClick(e) {
-            //用户操作订单
             let index = e.index
             if (index == 1) {
                 this.ProductService.GetDeleteProductSearchHistory({ userId: this.listQuery.userId })
@@ -330,8 +324,8 @@ export default {
             this.show = !this.show
         }
     },
+    //分享转发
     onShareAppMessage(res) {
-        //分享转发
         if (res.from === 'button') {
             // 来自页面内转发按钮
         }
@@ -460,12 +454,6 @@ page {
         float: left;
         padding: 0 24rpx 30rpx 24rpx;
         box-sizing: border-box;
-        .list-title {
-            width: 100%;
-            height: 40rpx;
-            font-size: $font-size-26;
-            color: #333;
-        }
         .list-main {
             width: 100%;
             float: left;
@@ -501,36 +489,23 @@ page {
     box-sizing: border-box;
     padding: 0 24rpx;
     background: #ffffff;
-    scroll-view {
+    .scroll-view {
         height: 100%;
         overflow: scroll;
     }
     .empty-container-image {
         margin-top: -300rpx;
     }
-    .toIndexPage {
-        bottom: 390rpx;
-    }
-    .show-more-btn {
-        width: 276rpx;
-        height: 52rpx;
-        line-height: 52rpx;
-        border: 2rpx solid #d8d8d8;
-        background: #f7f7f7;
-        font-size: 26rpx;
-        margin: 26rpx 0;
-        position: absolute;
-        left: 50%;
-        margin-left: -138rpx;
-    }
 }
 .product-list-type {
-    height: 246rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     padding: 32rpx 0;
-    box-sizing: border-box;
     border-bottom: 1px solid #e1e1e1;
+    overflow: hidden;
     &:last-child {
-        border-bottom: none;
+        border-bottom: 0;
     }
     .product-list-image {
         width: 182rpx;
@@ -538,7 +513,6 @@ page {
         box-sizing: border-box;
         border-radius: 8rpx;
         border: 1px solid #e1e1e1;
-        float: left;
         .product-image {
             width: 180rpx;
             height: 180rpx;
@@ -549,78 +523,68 @@ page {
     .product-list-msgs {
         width: 495rpx;
         height: 100%;
-        float: right;
-        position: relative;
         .product-name {
             width: 100%;
-            height: auto;
+            height: 72rpx;
             line-height: 36rpx;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            display: -webkit-box;
-            -webkit-line-clamp: 2;
-            line-clamp: 2;
-            -webkit-box-orient: vertical;
             font-size: $font-size-26;
             color: #333333;
             text-align: justify;
-            float: left;
+        }
+        .product-unit,
+        .product-tags,
+        .product-price {
+            margin-top: 8rpx;
         }
         .product-unit {
             width: 100%;
             height: 28rpx;
-            float: left;
-            margin-top: 4rpx;
             text-align: left;
             line-height: 28rpx;
             font-size: $font-size-20;
             color: #999999;
         }
         .product-tags {
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
             width: 100%;
             height: 30rpx;
-            margin-top: 8rpx;
-            float: left;
             .tag {
-                display: inline-block;
-                width: 80rpx;
-                height: 30rpx;
-                background: url(https://static.caimei365.com/app/mini-hehe/icon/icon-active.png) top center no-repeat;
-                background-size: contain;
+                margin-right: 8rpx;
                 font-size: 22rpx;
+                height: 30rpx;
                 line-height: 30rpx;
                 text-align: center;
-                color: #f83c6c;
-                float: left;
+                &.type2 {
+                    width: 80rpx;
+                    color: #f83c6c;
+                    background: url(https://static.caimei365.com/app/mini-hehe/icon/icon-active.png) top center
+                        no-repeat;
+                    background-size: contain;
+                }
             }
         }
-        .product-pric {
-            width: 100%;
-            height: 44rpx;
-            position: absolute;
-            bottom: -10rpx;
-            left: 0;
+        .product-price {
+            display: flex;
+            justify-content: space-between;
+            align-items: flex-end;
+            height: $font-size-26;
             .price {
-                float: left;
                 font-size: $font-size-26;
                 color: #f83c6c;
                 font-weight: bold;
-                line-height: 44rpx;
+                line-height: $font-size-26;
             }
-            .carts {
-                float: right;
-                .carts-add {
-                    width: 44rpx;
-                    height: 44rpx;
-                    text-align: center;
-                    line-height: 44rpx;
-                    background-color: #ff457b;
-                    border-radius: 50%;
-                    .iconfont {
-                        font-size: 32rpx;
-                        color: #ffffff;
-                    }
-                }
+            .carts-add {
+                width: 44rpx;
+                height: 44rpx;
+                line-height: 44rpx;
+                border-radius: 50%;
+                text-align: center;
+                font-size: 32rpx;
+                color: #ffffff;
+                background-color: #ff457b;
             }
         }
     }

pages/tabBar/cart/index.vue

@@ -201,7 +201,8 @@ export default {
         },
         finallyPrice() {
             if (this.currentCoupon) {
-                return this.allPrice - this.discountedPrice - this.currentCoupon.couponAmount
+                const finallyPrice = this.allPrice - this.discountedPrice - this.currentCoupon.couponAmount
+                return finallyPrice < 0 ? 0 : finallyPrice
             }
             return this.allPrice - this.discountedPrice
         },

pages/tabBar/index/index.vue

@@ -146,7 +146,7 @@ export default {
         },
         //初始化首页商品数据
         GetHomeProductList() {
-            return this.ProductService.QueryProductFloor().then(response => {
+            return this.ProductService.QueryProductFloor({ userId: this.userId}).then(response => {
                 this.productFloor = response.data
             })
         },

pages/tabBar/user/index.vue

@@ -384,13 +384,12 @@ export default {
 .user-support {
     width: 100%;
     float: left;
-    margin-top: 270rpx;
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
     &.top {
-        margin-top: 240rpx;
+        margin-top: 100rpx;
     }
     .user-support-image {
         width: 54rpx;

pages/user/activity/activity.vue

@@ -114,7 +114,7 @@ export default {
                 })
         },
         detail(pro) {
-            this.$api.navigateTo(`/pages/goods/product-activi?productId=${pro.productId}&heUserId=${this.userId}`)
+            this.$api.navigateTo(`/pages/goods/product-detail?productId=${pro.productId}&jumpState=2`)
         },
         handAddCarts(pro) {
             this.addToCart({ productId: pro.productId, heUserId: this.userId })

pages/user/order/create-order.vue

@@ -37,7 +37,7 @@
                     <view class="footer-price">
                         <view class="sum" :class="totalFullReduction == 0 ? 'none' : ''">
                             <view class="price">总价:￥{{ payAllPrice | NumFormat }}</view>
-                            <view class="discount">共减 ￥{{ discountedPrice | NumFormat }}</view>
+                            <view class="discount" v-if="discountedPrice > 0">共减 ￥{{ discountedPrice | NumFormat }}</view>
                         </view>
                     </view>
                 </view>
@@ -135,7 +135,8 @@ export default {
         },
         // 支付金额
         payAllPrice() {
-            return this.allPrice - this.couponAmount
+            const payAllPrice = this.allPrice - this.couponAmount
+            return  payAllPrice < 0 ? 0 : payAllPrice
         },
         hanldOrder() {
             return {

pages/user/order/success.vue

@@ -66,9 +66,8 @@ export default {
             orderInfo: {}
         }
     },
-    onLoad(option) {
-        let data = JSON.parse(option.data)
-        this.orderInfo = data.orderInfo
+    onLoad() {
+        this.initOrderInfo()
     },
     filters: {
         NumFormat(value) {
@@ -85,6 +84,10 @@ export default {
         }
     },
     methods: {
+        initOrderInfo() {
+            this.orderInfo = uni.getStorageSync('orderInfo')
+            uni.removeStorageSync('orderInfo')
+        },
         setHeaderBtnPosi() {
             // 获得胶囊按钮位置信息
             let headerBtnPosi = uni.getMenuButtonBoundingClientRect()

services/config.env.js

@@ -3,9 +3,9 @@ if (process.env.NODE_ENV === 'development') {
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:8011'	 //采美测试地址
     // URL_CONFIG = 'http://192.168.2.67:8011'	 //裴裴联调地址
-    URL_CONFIG = 'http://192.168.2.68:8011'	 //涛涛联调地址
+    // URL_CONFIG = 'http://192.168.2.68:8011'	 //涛涛联调地址
     // URL_CONFIG = 'http://127.0.0.1:8011'	 //涛涛联调地址
-    // URL_CONFIG = 'https://mall2c-b.caimei365.com'
+    URL_CONFIG = 'https://mall2c-b.caimei365.com'
     // URL_CONFIG = 'https://mall2c.caimei365.com'
 } else {
     // 生产环境

services/product.service.js

@@ -110,7 +110,7 @@ export default class ProductService {
         return this.AjaxService.post({
             url: '/shopping/update',
             data,
-            isLoading: true
+            isLoading: false
         })
     }
     /**
@@ -121,7 +121,7 @@ export default class ProductService {
         return this.AjaxService.post({
             url: '/shopping/delete',
             data,
-            isLoading: true
+            isLoading: false
         })
     }
     /* 查询搜索历史记录 */