Merge remote-tracking branch 'remotes/origin/developerB' into developer

components/cm-module/homeIndex/banner.vue

@@ -22,7 +22,7 @@
 					<text class="iconfont icon-zhengpin"><text class="sm">正品保证</text></text>
 				</view>
 				<view class="item ce">
-					<text class="iconfont icon-jigou"><text class="sm">6000+机构</text></text>
+					<text class="iconfont icon-jigou"><text class="sm">8000+机构</text></text>
 				</view>
 				<view class="item ri">
 					<text class="iconfont icon-gongyingshang"><text class="sm">100+供应商</text></text>
@@ -33,8 +33,10 @@
 </template>
 
 <script>
+	import cmsMixins from '@/mixins/cmsMixins.js'
 	export default{
-		name:'address',
+		mixins: [cmsMixins],
+		name:'banner',
 		props:{
 			list:{
 				type:Array
@@ -57,6 +59,7 @@
 				this.current = index
 			},
 			NavToDetailPage(floor) {//跳转
+				this.cmsSysStatistics(1)
 				this.$api.FlooryNavigateTo(floor)
 			}
 		}

components/cm-module/homeIndex/pageSpecial.vue

@@ -70,7 +70,9 @@
 
 <script>
 	import { mapState,mapMutations} from 'vuex'
+	import cmsMixins from '@/mixins/cmsMixins.js'
 	export default{
+		mixins: [cmsMixins],
 		name:'pagesProduct',
 		props:{
 			templateData:{
@@ -117,6 +119,8 @@
 						Um_Key_SourcePage: '商城首页',
 					})
 				}
+				// 采美埋点首页文章模块数据统计
+				this.cmsSysStatistics(4)
 				this.$api.navigateTo(`/pages/h5/article/path?link=${LINK}`)
 			},
 			NewActivityList(){
@@ -131,6 +135,8 @@
 						Um_Key_SourcePage: '商城首页',
 					})
 				}
+				// 采美埋点首页活动模块数据统计
+				this.cmsSysStatistics(3)
 				/**
 				 * 页面跳转类型
 				 * 1、二级页面,2、搜索项目仪器,3、直播页面,4、自由页面,5、商品详情,6、仪器项目详情,7、供应商主页
@@ -196,6 +202,8 @@
 						Um_Key_SourcePage: '商城首页',
 					})
 				}
+				// 采美埋点首页直播模块数据统计
+				this.cmsSysStatistics(2)
 				this.$api.navigateTo(`/pages/h5/article/page-image?title=${live.liveTitle}&image=${live.advertisingImage}`)
 			}
 		}

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

@@ -36,7 +36,9 @@ import uniGrader from '@/components/uni-grade/uni-grade.vue'
 import templateTags from '@/components/cm-module/pageTemplate/templateTags.vue'
 import templatePrice from '@/components/cm-module/pageTemplate/templatePrice.vue'
 import templateType from '@/components/cm-module/pageTemplate/templateType.vue'	
-export default {
+import cmsMixins from '@/mixins/cmsMixins.js'
+export default{
+	mixins: [cmsMixins],
     name: 'TemplateProduct',
 	components: {
 		uniGrader,
@@ -54,9 +56,10 @@ export default {
        ...mapState(['hasLogin', 'userInfo', 'isActivity']),
     },
     methods: {
-        // 跳转商品详情
+        // 跳转商品详情ss
 	   navToDetailPage(pros) {
-			this.$api.navigateTo(`/pages/goods/product?id=${pros.productId}`)
+			this.cmsSysStatistics(5)
+			this.$api.navigateTo(`/pages/goods/product?id=${pros.productId}&typeId=5`)
 	   }
     }
 }

components/cm-module/pageTemplate/templateL.vue

@@ -84,6 +84,7 @@ export default {
 			const userInfo = await this.$api.getStorage()
 			this.shopId = userInfo.shopId ? userInfo.shopId : 0
 			this.productList = data.floorImageList4
+			console.log('==========',this.productList)
 			// if (this.productCount > 0) {
 			// 	this.productList.splice(0, this.productList.length)
 			// 	for (var i = 0, j = data.floorImageList4.length; i < j; i += this.pageSize) {

components/cm-module/productDetails/second-attributes.vue

@@ -1,88 +0,0 @@
-<template name="cm-attributes">
-	<!-- 二手商品详情-->
-	<view class="cm-attributes">
-		<view class="wrap-info">
-			<view class="info-viewT" :class="goodsData.isNoneDisabled ? 'none' : ''">
-				<view class="info-viewL tui-skeleton-fillet">品牌：<text>{{product.brandName}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet">分类：<text>{{product.typeStr}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet">商品成色：<text>{{product.productQuality}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet" v-if="product.fixedYears!=''">出厂日期：<text>{{product.fixedYears}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet" v-if="product.showContactFlag==2">联系人：<text>{{product.contactName}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet" v-if="product.showContactFlag==2">联系方式：<text>{{product.contactMobile}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet" v-if="product.productType!=null||product.productType!=''">商品类型：<text v-if="product.productType==1">医美</text><text v-else>非医美</text></view>
-			</view>
-			<view class="info-viewT" :class="goodsData.isNoneDisabled ? 'none' : ''" v-if="product.secondHandType==2">
-				<view class="info-viewL tui-skeleton-fillet">市场价：<text>{{product.normalPriceStr}}</text></view>	
-			    <view class="info-viewL tui-skeleton-fillet">采购价/原价：<text>{{product.originalPriceStr}}</text></view>
-				<view class="info-viewL tui-skeleton-fillet">产品到期日：<text>{{product.maturityYears}}</text></view>	
-				<view class="info-viewL tui-skeleton-fillet">库存：<text>{{product.stock}}</text></view>	
-			</view>
-			<view class="info-viewT" :class="goodsData.isNoneDisabled ? 'none' : ''">
-				<view class="info-viewL tui-skeleton-fillet">所在地：<text>{{product.provinceCityDistrict}}</text></view>
-		   </view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:'cm-attributes',
-		props:{
-			product:{
-				type:Object,
-				default: {}
-			},
-			goodsData:{
-				type:Object,
-				default: {}
-			},
-		},
-		data() {
-			return{
-				
-			}
-		},
-		created() {
-			
-		},
-		methods:{
-		},
-		
-	}
-</script>
-
-<style lang="scss">	
-	.bmCode{
-	float: left;
-	width: 702rpx;
-	padding: 20rpx 24rpx 0 24rpx;
-	border-bottom: 1px solid #F8F8F8	
-	}
-	.tui-skeleton-fillet{
-	color:#999999 ;
-	}
-	.tui-skeleton-fillet text{
-	color: #333333;
-	}
-</style>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

components/cm-module/productDetails/secondBrand.vue

@@ -1,43 +0,0 @@
-<template name="secondBrand">
-	<view class="secondBrand">
-		<view class="secondBrand-empty" v-if="product.brandInfo==''||product.brandInfo==null">暂无品牌信息</view>
-		<p v-else>{{product.brandInfo}}</p>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:'secondBrand',
-		data(){
-			return{
-			 }
-			},
-			props:{
-				product:{
-					type:Object,
-				},
-			}
-		}
-</script>
-
-<style>
-	.secondBrand{
-		width: 702rpx;
-		margin: auto;
-	}
-	.secondBrand p{
-		padding: 20rpx;
-		font-size: 28rpx;
-		color: #666666;
-		line-height: 48rpx
-	}
-	.secondBrand-empty{
-		width: 702rpx;
-		height: 100rpx;
-		line-height: 100rpx;
-		padding: 0 24rpx;
-		font-size: 28rpx;
-		color: #999999;
-		text-align: center;
-	}
-</style>

components/cm-module/productDetails/secondDeatail.vue

@@ -1,73 +0,0 @@
-<template name="secondDeatail">
-	<view class="secondDeatail clearfix">
-		<view class="Disclaimer">
-			<h3>免责声明:</h3>
-			<p>
-				鉴于本网站提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！
-			</p>
-	    </view>
-		<view class="contentHtml">
-			<view class="detailsText" v-if="product.productDetails!=''||product.productDetails!=null"  >{{product.productDetails}}</view>
-			   <view class="imgList" v-for="(item, index) in product.imageList" :key="index" :data-src="item">
-				   <img :src="item"/>
-			   </view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	
-	export default{
-		name:'secondDeatail',
-		props:{
-			product:{
-				type:Object,
-			  }
-			},
-		data() {
-			return{
-			}
-		},
-		}
-</script>
-
-<style>
-	.Disclaimer{
-		width: 702rpx;
-		background: #F7F7F7;
-		color:#333333 ;
-		line-height: 48rpx;
-		margin:20rpx auto;
-		border-radius: 4rpx;
-		}
-		.Disclaimer h3{
-		color: 28rpx;
-		padding: 20rpx 15rpx 0rpx 15rpx
-		}
-		.Disclaimer ._p{
-		font-size: 24rpx;
-		color: #666666;
-		padding: 10rpx 15rpx;
-		}
-		.imgList{
-			width: 702rpx; 
-			margin: auto;
-			height: 710rpx;
-			margin-bottom: 20rpx;
-		}
-		.imgList img{
-			width: 100%;
-			height: 100%;
-			
-		}
-		.detailsText{
-			padding: 0 30rpx 30rpx 30rpx;
-			color: #333333;
-			font-size: 24rpx;
-			text-align: left;
-		}
-</style>

mixins/cmsMixins.js

@@ -0,0 +1,30 @@
+// 统计数据
+// 统计类型 1：首页banner；2：直播模块；3：最新活动；4：热门文章；5：新品橱窗；6：活动列表
+import Vue from 'vue'
+const cmsMixins = {
+    computed: {
+		
+    },
+    methods: {
+        cmsSysStatistics(cmsSysType,productId) {
+            this.ProductService.sYsStatisticsTypesSatisticsNumber({typeId:cmsSysType,productId:productId})
+                .then(response => {
+                    const map = {
+					    1: '首页轮播',
+					    2: '直播模块',
+					    3: '最新活动',
+					    4: '热门文章',
+					    5: '新品橱窗',
+					    6: '活动列表'
+                    }
+                    const sYsText = map[cmsSysType]
+                    console.log(`<-------${sYsText}统计数据成功------>`)
+                })
+                .catch(error => {
+                    console.log('<-------统计数据异常------>')
+                })
+        },
+    }
+}
+
+export default cmsMixins

pages.json

@@ -716,7 +716,7 @@
 						"navigationBarTitleText": "订单列表"
 					}
 				}, {
-					"path": "search/search-order",
+					"path": "order/search-order",
 					"style": {
 						"navigationBarTitleText": "订单搜索"
 					}

pages/goods/good-hot.vue

@@ -256,7 +256,9 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import uniGrader from '@/components/uni-grade/uni-grade.vue'
-export default {
+import cmsMixins from '@/mixins/cmsMixins.js'
+export default{
+	mixins: [cmsMixins],
 	components: {
 		uniGrader
 	},
@@ -393,7 +395,8 @@ export default {
 		},
 		navToDetailPage(productId) {
 			//跳转商品详情页
-			this.$api.navigateTo(`/pages/goods/product?id=${productId}`)
+			this.cmsSysStatistics(5)
+			this.$api.navigateTo(`/pages/goods/product?id=${pros.productId}&typeId=5`)
 		},
 		isShowVipFlag(pros) {
 			// 超级会员价格显示控制

pages/goods/goods-doc-detail.vue

@@ -21,7 +21,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import cmProductDoc from '@/components/cm-module/productDetails/cm-product-doc.vue'
+import cmProductDoc from './components/cm-product-doc.vue'
 export default {
     components: {
         cmProductDoc

pages/goods/instrument-details.vue

@@ -128,29 +128,17 @@
 
 <script>
 	import { mapState,mapMutations } from 'vuex'
-	import customP from '@/components/cm-custom/custom-p.vue' 		 //自定义导航
-	import cmPrice from "@/components/cm-module/productDetails/cm-price.vue" //价格显示
-	import cmAttributes from "@/components/cm-module/productDetails/cm-attributes.vue" //规格信息
 	import authorize from '@/common/config/authorize.js'
-	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import parser from "@/components/jyf-Parser/index" //富文本处理
-	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import recommend from "@/components/cm-module/productDetails/instrument-recommend" //相关推荐
-	import cmParameter from "@/components/cm-module/productDetails/cm-parameter" //相关参数
-	import cmService from "@/components/cm-module/productDetails/cm-service" //服务项目
+	import customP from '@/components/cm-custom/custom-p.vue' 		 //自定义导航
+	import recommend from "./components/instrument-recommend" //相关推荐
 	import wxLogin from "@/common/config/wxLogin.js"
 	var isPreviewImg;
 	export default{
 		components:{
-			uniStars,
 			customP,
 			parser,
-			tuiSkeleton,
 			recommend,
-			cmPrice,
-			cmAttributes,
-			cmParameter,
-			cmService
 		},
 		data(){
 			return{			

pages/goods/product.vue

@@ -316,11 +316,11 @@
 					<view class="product-details recommend product-details3">
 						<view class="title"> <view class="title-tab">相关推荐</view> </view>
 						<view class="content hot">
-							<recommend
+							<cm-recommend
 								:query-productid="product.productId"
 								:query-type="product.recommendType"
 								v-if="isRequest"
-							></recommend>
+							></cm-recommend>
 						</view>
 					</view>
 				</view>
@@ -674,14 +674,14 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import customP from '@/components/cm-module/headerNavbar/header-poduct' //自定义导航
-import cmPrice from '@/components/cm-module/productDetails/cm-price.vue' //价格显示
-import cmAttributes from '@/components/cm-module/productDetails/cm-attributes.vue' //规格信息
 import parser from '@/components/jyf-Parser/index' //富文本处理
 import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
-import recommend from '@/components/cm-module/productDetails/recommend' //相关推荐
-import cmParameter from '@/components/cm-module/productDetails/cm-parameter' //相关参数
-import cmService from '@/components/cm-module/productDetails/cm-service' //服务项目
-import cmProductDoc from '@/components/cm-module/productDetails/cm-product-doc.vue'
+import cmPrice from './components/cm-price.vue' //价格显示
+import cmAttributes from './components/cm-attributes.vue' //规格信息
+import cmRecommend from './components/recommend' //相关推荐
+import cmParameter from './components/cm-parameter' //相关参数
+import cmService from './components/cm-service' //服务项目
+import cmProductDoc from './components/cm-product-doc.vue'
 import couponTabs from '@/components/cm-module/coupon/tui-tabs.vue'
 import authorize from '@/common/config/authorize.js'
 import wxLogin from '@/common/config/wxLogin.js'
@@ -695,7 +695,7 @@ export default {
 		customP,
 		parser,
 		tuiSkeleton,
-		recommend,
+		cmRecommend,
 		cmPrice,
 		cmAttributes,
 		cmParameter,
@@ -735,6 +735,7 @@ export default {
 			userId: 0,
 			shopId: 0,
 			shopID: 0,
+			typeId: 0,
 			vipFlag: 0,
 			firstClubType: 0,
 			productId: 0,
@@ -865,6 +866,7 @@ export default {
 	},
 	onLoad(option) {
 		this.productId = this.couponParam.productId = option.id //获取商品ID
+		this.typeId =  option.typeId
 		this.opentype = option.open
 		this.isShareType = option.type
 		this.linkPath = option.path
@@ -914,7 +916,8 @@ export default {
 			this.ProductService.QueryProductDetils({
 				userId: this.userId,
 				productId: this.productId,
-				identity: this.identity
+				identity: this.identity,
+				typeId:this.typeId
 			})
 				.then(response => {
 					this.productImage = []

pages/h5/activity/activity-list.vue

@@ -22,7 +22,9 @@
 <script>
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	export default {
+	import cmsMixins from '@/mixins/cmsMixins.js'
+	export default{
+		mixins: [cmsMixins],
 		components:{
 			tuiLoadmore,
 			tuiNomore,
@@ -99,6 +101,7 @@
 			NavigateToActivity(item){//跳转活动详情
 				if(item.status!=3 ){
 					if(item.crmLink){
+						this.cmsSysStatistics(6)
 						this.$api.navigateTo(`/pages/h5/activity/activity?title=${item.title}&link=${item.crmLink}`)
 					}
 				}else{

pages/h5/activity/activity-topic.vue

@@ -18,10 +18,10 @@
 	import { mapState,mapMutations} from 'vuex' 
 	import customFloor from '@/components/cm-custom/custom-floor' 		 //自定义导航
 	import templateNav from '@/components/cm-module/pageTemplate/templateNav.vue'
-	import pageFloor from '@/components/cm-module/activity/pageFloor.vue'
+	import pageFloor from './components/pageFloor.vue'
 	import authorize from '@/common/config/authorize.js'
 	import wxLogin from '@/common/config/wxLogin.js'
-    import  ActivityContact from '@/components/cm-module/activityContact/index.vue'
+    import  ActivityContact from './components/index.vue'
 	
 	export default{ 
 		components:{

pages/second/product/product-details.vue

@@ -143,12 +143,12 @@
 <script>
 	import { mapState,mapMutations } from 'vuex'
 	import customP from '@/components/cm-module/headerNavbar/header-poduct' 		 //自定义导航
-	import secondPrice from '@/components/cm-module/productDetails/secondPrice.vue' //价格显示
+	import secondPrice from './components/secondPrice.vue' //价格显示
 	import authorize from '@/common/config/authorize.js'
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
-	import recommend from '@/components/cm-module/productDetails/secondRecommend' //相关推荐
-	import cmParameter from '@/components/cm-module/productDetails/secondParameters.vue' //相关参数
+	import recommend from './components/secondRecommend' //相关推荐
+	import cmParameter from './components/secondParameters.vue' //相关参数
 	import wxLogin from '@/common/config/wxLogin.js'
 	import { debounce } from '@/common/config/common.js'
 	var isPreviewImg

pages/seller/cart/buyagain.vue

@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import buyagainList from '@/components/cm-module/listTemplate/buyagainList'
+import buyagainList from './components/buyagainList'
 export default {
 	components: {
 		buyagainList

pages/seller/cart/immediately.vue

@@ -87,7 +87,7 @@
 </template>
 
 <script>
-	import immediatelyList from '@/components/cm-module/listTemplate/immediatelyList'
+	import immediatelyList from './components/immediatelyList'
 	export default{
 		components:{
 			immediatelyList

pages/seller/cart/second.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script>
-	import secondHand from '@/components/cm-module/listTemplate/secondHand'
+	import secondHand from './components/secondHand'
 	export default{
 		components:{
 			secondHand

pages/seller/order/create-order.vue

@@ -149,15 +149,15 @@
 </template>
 
 <script>
-	import choiceAddress from '@/components/cm-module/creatOrder/sellerAddress'  
-	import sellerGoodsList from '@/components/cm-module/creatOrder/sellerGoodsList'
-	import sellerInvoice from '@/components/cm-module/creatOrder/sellerInvoice'
-	import sellerFreight from '@/components/cm-module/creatOrder/sellerFreight'
 	import freightAlert from '@/components/cm-module/modelAlert/freightAlert.vue'
-	import sellerCoupon from '@/components/cm-module/creatOrder/sellerCoupon'
-	import sellerExchangeCoupon from '@/components/cm-module/creatOrder/sellerExchangeCoupon'
-	import sellerClubVisible from '@/components/cm-module/creatOrder/sellerClubVisible'
-	import sellerRegulations from '@/components/cm-module/creatOrder/sellerRegulations.vue'
+	import choiceAddress from './components/sellerAddress'  
+	import sellerGoodsList from './components/sellerGoodsList'
+	import sellerInvoice from './components/sellerInvoice'
+	import sellerFreight from './components/sellerFreight'
+	import sellerCoupon from './components/sellerCoupon'
+	import sellerExchangeCoupon from './components/sellerExchangeCoupon'
+	import sellerClubVisible from './components/sellerClubVisible'
+	import sellerRegulations from './components/sellerRegulations.vue'
 	
 	export default {
 		components:{

pages/seller/order/order-details.vue

@@ -124,7 +124,7 @@ import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent' //发
 import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
 import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord' //支付记录
 import refundRecord from '@/components/cm-module/orderDetails/refundRecord' //退款记录
-import orderButton from '@/components/cm-module/orderDetails/sellerDetaileButton' //底部按钮
+import orderButton from './components/sellerDetaileButton' //底部按钮
 import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert.vue' //分享弹窗
 import orderModel from '@/components/cm-module/modelAlert/order-alert' //付款弹窗
 import activiPopup from '@/components/cm-module/orderDetails/activipopu' //促销活动弹窗

pages/seller/order/order-historylist.vue

@@ -262,7 +262,7 @@ import btSearch from '@/components/uni-search/bt-search.vue' // 搜索
 import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
 import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
 import tuiNomore from '@/components/tui-components/nomore/nomore'
-import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' // 操作按钮
+import orderButton from './components/sellerOrderButton' // 操作按钮
 import modalLayer from '@/components/modal-layer'
 import empty from '@/components/empty'
 import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert' // 分享弹窗
@@ -619,7 +619,7 @@ export default {
 			})
 		},
 		handlSearchPath() {
-			this.$api.navigateTo('/pages/seller/search/search-order')
+			this.$api.navigateTo('/pages/seller/order/search-order')
 		},
 		onShareAppMessage(res) {
 			//分享转发

pages/seller/order/order-list.vue

@@ -276,7 +276,7 @@ import btSearch from '@/components/uni-search/bt-search.vue' //搜索
 import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton'
 import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
 import tuiNomore from '@/components/tui-components/nomore/nomore'
-import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //操作按钮
+import orderButton from './components/sellerOrderButton' //操作按钮
 import modalLayer from '@/components/modal-layer'
 import empty from '@/components/empty'
 import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert' //分享弹窗
@@ -641,7 +641,7 @@ export default {
 			})
 		},
 		handlSearchPath() {
-			this.$api.navigateTo('/pages/seller/search/search-order')
+			this.$api.navigateTo('/pages/seller/order/search-order')
 		},
 		onShareAppMessage(res) {
 			//分享转发

pages/seller/search/search-order.vue → pages/seller/order/search-order.vue

@@ -248,7 +248,7 @@
 import orSearch from '@/components/uni-search/or-search.vue'
 import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
 import tuiNomore from '@/components/tui-components/nomore/nomore'
-import orderButton from '@/components/cm-module/orderDetails/sellerOrderButton' //按钮
+import orderButton from './components/sellerOrderButton' //按钮
 import modalLayer from '@/components/modal-layer'
 import empty from '@/components/empty'
 import shareAlert from '@/components/cm-module/modelAlert/sellerShareAlert' //分享弹窗

pages/supplier/deliver/deliver-record.vue

@@ -91,7 +91,7 @@
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex'
-import orderButton from '@/components/cm-module/orderDetails/supplierRecorgButton.vue' //底部按钮
+import orderButton from './components/supplierRecorgButton.vue' //底部按钮
 import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
 import tuiNomore from '@/components/tui-components/nomore/nomore'
 import cdCustom from '@/components/cm-custom/custom-d'

pages/supplier/order/order-details.vue

@@ -122,7 +122,7 @@
 	import headerBack from '@/components/cm-module/headerNavbar/header-back' 		 	 //自定义导航
 	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
 	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
-	import orderButton from '@/components/cm-module/orderDetails/supplierDetaileButton'	//底部按钮
+	import orderButton from './components/supplierDetaileButton'	//底部按钮
 	import shareAlert from '@/components/cm-module/modelAlert/supplierShareAlert'	  //分享弹窗
 	export default {
 		components:{

pages/supplier/order/order-list.vue

@@ -110,7 +110,7 @@
 <script>
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import orderButton from '@/components/cm-module/orderDetails/supplierListButton'//底部按钮
+	import orderButton from './components/supplierListButton'//底部按钮
 	import shareAlert from '@/components/cm-module/modelAlert/supplierShareAlert'	  //分享弹窗
 	import modalLayer from "@/components/modal-layer"
 	import empty from "@/components/empty";

pages/user/order/create-order.vue

@@ -121,12 +121,12 @@
 </template>
 <script>
 	import { mapState, mapMutations } from 'vuex'
-	import choiceAddress from '@/components/cm-module/creatOrder/choiceAddress'
-	import goodsList from '@/components/cm-module/creatOrder/goodsList'
-	import invoiceTent from '@/components/cm-module/creatOrder/invoiceTent'
-	import coupon from '@/components/cm-module/creatOrder/coupon'
-	import exchangeCoupon from '@/components/cm-module/creatOrder/exchangeCoupon'
-	import freight from '@/components/cm-module/creatOrder/freight'
+	import choiceAddress from './components/choiceAddress'
+	import goodsList from './components/goodsList'
+	import invoiceTent from './components/invoiceTent'
+	import coupon from './components/coupon'
+	import exchangeCoupon from './components/exchangeCoupon'
+	import freight from './components/freight'
 	import freightAlert from '@/components/cm-module/modelAlert/freightAlert'
 	export default {
 		components:{

pages/user/regularPurchase/regularPurchase.vue

@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import productList from '@/components/cm-module/listTemplate/productList'
+import productList from './components/productList'
 export default {
 	components: {
 		productList

services/product.service.js

@@ -520,17 +520,28 @@ export default class ProductService {
     /**
 	 * @搜索筛选项查询商品品牌
 	 * @param:keyword 关键词
-	 * @param:id 分类Id
-	 * @param:idType 1 一级分类 2 二级分类 3 三级分类
+	 * @param:id 分类id
+	 * @param:idtype 1 一级分类 2 二级分类 3 三级分类
 	 * @param:identity 
 	 */
-    getCommoditySearchQUeryBrand (data = {}) {
+    getcommoditysearchquerybrand (data = {}) {
         return this.AjaxService.get({
             url:'/commodity/search/query/brand',
             data,
-            isLoading: true ,
+            isloading: true ,
               
         })
     }
-	
+    /**
+	 * @数据统计
+	 * @param:TypeId 1：首页banner；2：直播模块；3：最新活动；4：热门文章；5：新品橱窗；6：活动列表
+	 */
+    sYsStatisticsTypesSatisticsNumber (data = {}) {
+	    return this.AjaxService.get({
+	        url:'/commodity/StatisticsType/statisticsNumber',
+	        data,
+	        isLoading: false ,
+	          
+	    })
+    }
 }