commit -m 优惠券功能、优化项目目录结构和分包模块

common/config/caimeiApi.js

@@ -211,7 +211,7 @@ const caimeiApi = {
 				})
 			}else{
 				uni.navigateTo({
-				  	url:`/second/pages/product/product-details?id=${pros.product.productId}`
+				  	url:`/pages/second/product/product-details?id=${pros.product.productId}`
 				})
 			}
 		}else{
@@ -226,25 +226,25 @@ const caimeiApi = {
 				const typeMap = {
 				 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}`,
 				 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-				 	3:`/h5/pages/article/page-image?image=${pros.adsImage}&title=专题直播`,
-					4:`/h5/pages/activity/activity?title=${pros.crmTitle}&link=${pros.crmLink}`,
+				 	3:`/pages/h5/article/page-image?image=${pros.adsImage}&title=专题直播`,
+					4:`/pages/h5/activity/activity?title=${pros.crmTitle}&link=${pros.crmLink}`,
 				 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-				 	// 7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-				 	8:'/h5/pages/activity/activity-list',
-				 	9:'/second/pages/form/introduce',
-				 	10:'/second/pages/product/product-list',
-				 	11:'/second/pages/form/form',
-				 	12:`/search/pages/search/search?keyWord=${pros.linkParam.keyword}`,
-				 	13:`/h5/pages/article/path?link=${pros.link}`,
-				 	14:`/h5/pages/article/path?link=${pros.link}`,
-				 	15:`/h5/pages/article/path?link=${pros.link}`,
-					// '-1':`/h5/pages/article/path?link=${pros.link}`,
+				 	// 7:`/pages/supplier/user/my-shop?shopId=${pros.linkParam.id}`,
+				 	8:'/pages/h5/activity/activity-list',
+				 	9:'/pages/second/form/introduce',
+				 	10:'/pages/second/product/product-list',
+				 	11:'/pages/second/form/form',
+				 	12:`/pages/search/search?keyWord=${pros.linkParam.keyword}`,
+				 	13:`/pages/h5/article/path?link=${pros.link}`,
+				 	14:`/pages/h5/article/path?link=${pros.link}`,
+				 	15:`/pages/h5/article/path?link=${pros.link}`,
+					// '-1':`/pages/h5/article/path?link=${pros.link}`,
 				 	17:'/pages/login/register-select',
-				 	18:`/h5/pages/article/path?link=${pros.link}`,
-				 	19:`/search/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`,
-					21:'/h5/pages/activity/meobohui',
+				 	18:`/pages/h5/article/path?link=${pros.link}`,
+				 	19:`/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`,
+					21:'/pages/h5/activity/meobohui',
 					24:'/pages/user/coupon/coupon',
-					23:`/h5/pages/activity/activity-topic?linkId=${pros.linkParam.id}`
+					23:`/pages/h5/activity/activity-topic?linkId=${pros.linkParam.id}`
 				}
 				const url = typeMap[pros.linkType]
 				uni.navigateTo({
@@ -258,22 +258,22 @@ const caimeiApi = {
 			const typeMap = {
 				1:`/pages/goods/goods-instrument?linkId=${linkId}`,
 				2:`/pages/goods/instrument-details?id=${linkId}`,
-				4:`/h5/pages/activity/activity?id=${linkId}`,
+				4:`/pages/h5/activity/activity?id=${linkId}`,
 				5:`/pages/goods/product?id=${linkId}`, 
-				// 7:`/supplier/pages/user/my-shop?shopId=${linkId}`,
-				8:'/h5/pages/activity/activity-list',
-				9:'/second/pages/form/introduce',
-				10:'/second/pages/product/product-list',
-				11:'/second/pages/form/form',
-				12:`/search/pages/search/search?keyWord=${keyword}`,
-				13:`/h5/pages/article/path?link=${linkHref}`,
-				14:`/h5/pages/article/path?link=${linkHref}`,
-				15:`/h5/pages/article/path?link=${linkHref}`,
+				// 7:`/pages/supplier/user/my-shop?shopId=${linkId}`,
+				8:'/pages/h5/activity/activity-list',
+				9:'/pages/second/form/introduce',
+				10:'/pages/second/product/product-list',
+				11:'/pages/second/form/form',
+				12:`/pages/search/search?keyWord=${keyword}`,
+				13:`/pages/h5/article/path?link=${linkHref}`,
+				14:`/pages/h5/article/path?link=${linkHref}`,
+				15:`/pages/h5/article/path?link=${linkHref}`,
 				17:'/pages/login/register-select',
-				18:`/h5/pages/article/path?link=${linkHref}`,
-				19:`/search/pages/search/search-supplier?keyWord=${keyword}`,
-				21:'/h5/pages/activity/meobohui',
-				// '-1':`/h5/pages/article/path?link=${pros.link}`
+				18:`/pages/h5/article/path?link=${linkHref}`,
+				19:`/pages/search/search-supplier?keyWord=${keyword}`,
+				21:'/pages/h5/activity/meobohui',
+				// '-1':`/pages/h5/article/path?link=${pros.link}`
 				24:'/pages/user/coupon/coupon'
 			}
 			const url = typeMap[linkType]

common/config/wxLogin.js

@@ -43,7 +43,7 @@ const wxLoginQuick = async function(){// 根据微信的code获取用户登录
 			if(response.data.userIdentity ==1){
 				uni.navigateTo({url:'/seller/pages/index/index'})
 			}else if(response.data.userIdentity === 3){
-				uni.navigateTo({url:'/supplier/pages/index/index'})
+				uni.navigateTo({url:'/pages/supplier/index/index'})
 			}else{
 				uni.switchTab({url:'/pages/tabBar/user/user'})
 			}

components/cm-custom/custom-floor.vue

@@ -1,17 +1,17 @@
 <template name="headerNavbar">
 	<!-- 二级楼层导航栏 -->
-	<view class='navbar-wrap' :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
-	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
+	<view class='navbar-wrap' :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
+	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
 			  :style="{top:navbarBtn.top + statusBarHeight+'px;',lineHeight:navbarBtn.height+'px;',left:navbarBtn.right+'px;',width:navbarBtn.height+'px;',height:navbarBtn.height+'px;'}">
 			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-fanhui"></text>
 			  <text v-else  @click="_goHome" class="iconfont icon-shouye"></text>
-	  	</view>
+	  	</view>
 		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
-	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+20)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
+	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+20)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
 				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/项目仪器</view>
 			</view>
-	  	</view>
+	  	</view>
 	</view>
 </template>
 
@@ -43,16 +43,16 @@
 		data() {
 			return{
 				headerType:'',
-				clickPath:'/search/pages/search/search', 
+				clickPath:'/pages/search/search', 
 				haveBack: true, // 是否有返回按钮，true 有 false 没有 若从分享页进入则为 false
-			    statusBarHeight: 0, // 状态栏高度
-			    navbarHeight: 0, // 顶部导航栏高度,
-			    navbarBtn: { // 胶囊位置信息
-			      height: 0,
-			      width: 0,
-			      top: 0,
-			      bottom: 0,
-			      right: 0
+			    statusBarHeight: 0, // 状态栏高度
+			    navbarHeight: 0, // 顶部导航栏高度,
+			    navbarBtn: { // 胶囊位置信息
+			      height: 0,
+			      width: 0,
+			      top: 0,
+			      bottom: 0,
+			      right: 0
 				},
 				platform:'',
 				fontSizeSetting:0
@@ -63,54 +63,54 @@
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息
-		    /**
-		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
-		     * 菜单按键宽度： 87
-		     * 菜单按键高度： 32
-		     * 菜单按键左边界坐标： 278
-		     * 菜单按键上边界坐标： 26
-		     * 菜单按键右边界坐标： 365
-		     * 菜单按键下边界坐标： 58
-		     */
+		    /**
+		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
+		     * 菜单按键宽度： 87
+		     * 菜单按键高度： 32
+		     * 菜单按键左边界坐标： 278
+		     * 菜单按键上边界坐标： 26
+		     * 菜单按键右边界坐标： 365
+		     * 菜单按键下边界坐标： 58
+		     */
 			let btnPosi = { // 胶囊实际位置，坐标信息不是左上角原点
-			      height: headerPosi.height,
-			      width: headerPosi.width,
-			      // 胶囊top - 状态栏高度
-			      top: headerPosi.top - statusBarHeight,
-			      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
-			      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-			      // 屏幕宽度 - 胶囊right
-			      right: this.systeminfo.screenWidth - headerPosi.right
+			      height: headerPosi.height,
+			      width: headerPosi.width,
+			      // 胶囊top - 状态栏高度
+			      top: headerPosi.top - statusBarHeight,
+			      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
+			      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+			      // 屏幕宽度 - 胶囊right
+			      right: this.systeminfo.screenWidth - headerPosi.right
 			}
 			console.log(btnPosi)
 			let haveBack;
 			if (getCurrentPages().length === 1) { // 当只有一个页面时
-			     haveBack = false;
+			     haveBack = false;
 			} else {
-			     haveBack = true;
+			     haveBack = true;
 			}
-		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
-		    this.statusBarHeight=statusBarHeight,
-		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
+		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
+		    this.statusBarHeight=statusBarHeight,
+		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
 			this.$parent.navbarHeight = this.navbarHeight
 			this.$parent.statusBarHeight = this.statusBarHeight
 			// console.log(this.navbarHeight);
-		    this.navbarBtn=btnPosi
+		    this.navbarBtn=btnPosi
 		},
 		onLoad(){
 			
 		},
 		methods:{
 			_goBack: function () {
-		      	uni.navigateBack({
-		        	delta: this.page
-		      	});
-		    },
-		    _goHome: function () {
-		      	uni.switchTab({
-		        	url: '/pages/tabBar/home/index'
-		      	})
-		    }
+		      	uni.navigateBack({
+		        	delta: this.page
+		      	});
+		    },
+		    _goHome: function () {
+		      	uni.switchTab({
+		        	url: '/pages/tabBar/home/index'
+		      	})
+		    }
 		},
 		onShow(){
 	

components/cm-custom/custom-p.vue

@@ -1,17 +1,17 @@
 <template name="headerNavbar">
 	<!-- 自定义导航栏 -->
-	<view class='navbar-wrap' :class="[headerColor? 'bg-color' : 'no-color']" :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
-	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
+	<view class='navbar-wrap' :class="[headerColor? 'bg-color' : 'no-color']" :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
+	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
 			  :style="{top:navbarBtn.top + statusBarHeight+'px;',lineHeight:navbarBtn.height+'px;',left:navbarBtn.right+'px;',width:navbarBtn.height+'px;',height:navbarBtn.height+'px;'}">
 			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-fanhui"></text>
 			  <text v-else  @click="_goHome" class="iconfont icon-shouye"></text>
-	  	</view>
+	  	</view>
 		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
-	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+20)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
+	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+20)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
 				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/项目仪器</view>
 			</view>
-	  	</view>
+	  	</view>
 	</view>
 </template>
 
@@ -45,16 +45,16 @@
 		data() {
 			return{
 				headerType:'',
-				clickPath:'/search/pages/search/search', 
+				clickPath:'/pages/search/search', 
 				haveBack: true, // 是否有返回按钮，true 有 false 没有 若从分享页进入则为 false
-			    statusBarHeight: 0, // 状态栏高度
-			    navbarHeight: 0, // 顶部导航栏高度,
-			    navbarBtn: { // 胶囊位置信息
-			      height: 0,
-			      width: 0,
-			      top: 0,
-			      bottom: 0,
-			      right: 0
+			    statusBarHeight: 0, // 状态栏高度
+			    navbarHeight: 0, // 顶部导航栏高度,
+			    navbarBtn: { // 胶囊位置信息
+			      height: 0,
+			      width: 0,
+			      top: 0,
+			      bottom: 0,
+			      right: 0
 				},
 				platform:'',
 				fontSizeSetting:0
@@ -65,54 +65,54 @@
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息
-		    /**
-		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
-		     * 菜单按键宽度： 87
-		     * 菜单按键高度： 32
-		     * 菜单按键左边界坐标： 278
-		     * 菜单按键上边界坐标： 26
-		     * 菜单按键右边界坐标： 365
-		     * 菜单按键下边界坐标： 58
-		     */
+		    /**
+		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
+		     * 菜单按键宽度： 87
+		     * 菜单按键高度： 32
+		     * 菜单按键左边界坐标： 278
+		     * 菜单按键上边界坐标： 26
+		     * 菜单按键右边界坐标： 365
+		     * 菜单按键下边界坐标： 58
+		     */
 			let btnPosi = { // 胶囊实际位置，坐标信息不是左上角原点
-			      height: headerPosi.height,
-			      width: headerPosi.width,
-			      // 胶囊top - 状态栏高度
-			      top: headerPosi.top - statusBarHeight,
-			      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
-			      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-			      // 屏幕宽度 - 胶囊right
-			      right: this.systeminfo.screenWidth - headerPosi.right
+			      height: headerPosi.height,
+			      width: headerPosi.width,
+			      // 胶囊top - 状态栏高度
+			      top: headerPosi.top - statusBarHeight,
+			      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
+			      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+			      // 屏幕宽度 - 胶囊right
+			      right: this.systeminfo.screenWidth - headerPosi.right
 			}
 			console.log(btnPosi)
 			let haveBack;
 			if (getCurrentPages().length === 1) { // 当只有一个页面时
-			     haveBack = false;
+			     haveBack = false;
 			} else {
-			     haveBack = true;
+			     haveBack = true;
 			}
-		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
-		    this.statusBarHeight=statusBarHeight,
-		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
+		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
+		    this.statusBarHeight=statusBarHeight,
+		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
 			this.$parent.navbarHeight = this.navbarHeight
 			this.$parent.statusBarHeight = this.statusBarHeight
 			// console.log(this.navbarHeight);
-		    this.navbarBtn=btnPosi
+		    this.navbarBtn=btnPosi
 		},
 		onLoad(){
 			
 		},
 		methods:{
 			_goBack: function () {
-		      	uni.navigateBack({
-		        	delta: this.page
-		      	});
-		    },
-		    _goHome: function () {
-		      	uni.switchTab({
-		        	url: '/pages/tabBar/home/index'
-		      	})
-		    }
+		      	uni.navigateBack({
+		        	delta: this.page
+		      	});
+		    },
+		    _goHome: function () {
+		      	uni.switchTab({
+		        	url: '/pages/tabBar/home/index'
+		      	})
+		    }
 		},
 		onShow(){
 	

components/cm-module/activity/pageFloor.vue

@@ -163,7 +163,7 @@ export default {
 		NavToDetailPage(page) {
 			//跳转
 			this.$api.navigateTo(
-				`/h5/pages/activity/activity-floorMore?pageType=${this.pageType}&floorId=${page.id}&title=${
+				`/pages/h5/activity/activity-floorMore?pageType=${this.pageType}&floorId=${page.id}&title=${
 					page.title
 				}`
 			)

components/cm-module/articleTemplate/templateA.vue

@@ -51,7 +51,7 @@ export default {
 				return
 			}else if(item.linkType === -1){
 				uni.navigateTo({
-					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
 				})
 			}else{
 				caimeiApi.FlooryNavigateTo(item)

components/cm-module/articleTemplate/templateB.vue

@@ -46,7 +46,7 @@ export default {
 				return
 			}else if(item.linkType === -1){
 				uni.navigateTo({
-					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
 				})
 			}else{
 				caimeiApi.FlooryNavigateTo(item)

components/cm-module/articleTemplate/templateC.vue

@@ -40,7 +40,7 @@ export default {
 				return
 			}else if(item.linkType === -1){
 				uni.navigateTo({
-					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
 				})
 			}else{
 				caimeiApi.FlooryNavigateTo(item)

components/cm-module/articleTemplate/templateD.vue

@@ -46,7 +46,7 @@ export default {
 				return
 			}else if(item.linkType === -1){
 				uni.navigateTo({
-					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
 				})
 			}else{
 				caimeiApi.FlooryNavigateTo(item)

components/cm-module/cm-seller/home.vue

@@ -134,7 +134,7 @@
 				})
 			},
 			handleClick(data){
-				this.$api.navigateTo(`/h5/pages/activity/meobohui`)
+				this.$api.navigateTo(`/pages/h5/activity/meobohui`)
 				this.$store.commit('setActivity',data)
 			},
 			handleCancelClick(data){

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

@@ -172,7 +172,7 @@
 					},
 					{
 						name:'发布二手商品',
-						path:'/second/pages/form/form-seller',
+						path:'/pages/second/form/form-seller',
 						icon:'https://static.caimei365.com/app/img/icon/icon_seller_6@2x.png',
 					}
 				]

components/cm-module/creatOrder/coupon.vue

@@ -2,6 +2,7 @@
 	<view class="coupon-template">
 		<view class="coupon-title" @tap.stop="showPopup">
 			<text class="text">优惠券:</text>
+			<text class="text-coupon">-￥20.00</text>
 			<text class="iconfont icon-xiayibu"></text>
 		</view>
 		<!-- 优惠券 -->
@@ -213,6 +214,14 @@
 				font-size: $font-size-28;
 				color: $text-color;
 			}
+			.text-coupon{
+				display: inline-block;
+				float: right;
+				padding-right: 30rpx;
+				line-height: 88rpx;
+				font-size: 28rpx;
+				color: #f94b4b;
+			}
 			.iconfont{
 				width: 50rpx;
 				height: 88rpx;

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

@@ -1,20 +1,20 @@
 <template name="headerNavbar">
 	<!-- 自定义导航栏 -->
-	<view class='navbar-wrap' :class="[headerColor? 'bg-color' : 'bg-color']" :style="{height:navbarHeight+'px',paddingTop:CustomBar/2+'px'}"> 
-	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
+	<view class='navbar-wrap' :class="[headerColor? 'bg-color' : 'bg-color']" :style="{height:navbarHeight+'px',paddingTop:CustomBar/2+'px'}"> 
+	  	<view class="navbar-icon" v-if="navbarData.showCapsule ? navbarData.showCapsule : true" 
 			  :style="{top:navbarBtn.top + statusBarHeight+'px;',lineHeight:navbarBtn.height+'px;',left:12+'px;',width:navbarBtn.height+'px;',height:navbarBtn.height+'px;'}">
 			  <text v-if='haveBack' @click="_goBack" class="iconfont icon-fanhui"></text>
 			  <text v-else  @click="_goHome" class="iconfont icon-shouye"></text>
-	  	</view>
+	  	</view>
 		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
 			<image class="logo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;'}" src="https://static.caimei365.com/app/img/icon/logo-top@2x.png" mode=""></image>
 		</view>
  		<!--<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
-	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+30)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
+	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',right:(navbarBtn.width+30)+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width*2)+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
 				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/供应商/项目仪器</view>
 			</view>
-	  	</view> -->
+	  	</view> -->
 	</view>
 </template>
 
@@ -49,16 +49,16 @@
 			return{
 				headerType:'',
 				CustomBar:this.CustomBar,// 顶部导航栏高度
-				clickPath:'/search/pages/search/search',
+				clickPath:'/pages/search/search',
 				haveBack: true, // 是否有返回按钮，true 有 false 没有 若从分享页进入则为 false
-			    statusBarHeight: 0, // 状态栏高度
-			    navbarHeight: 0, // 顶部导航栏高度,
-			    navbarBtn: { // 胶囊位置信息
-			      height: 0,
-			      width: 0,
-			      top: 0,
-			      bottom: 0,
-			      right: 0
+			    statusBarHeight: 0, // 状态栏高度
+			    navbarHeight: 0, // 顶部导航栏高度,
+			    navbarBtn: { // 胶囊位置信息
+			      height: 0,
+			      width: 0,
+			      top: 0,
+			      bottom: 0,
+			      right: 0
 				},
 				platform:'',
 				fontSizeSetting:0
@@ -69,54 +69,54 @@
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息
-		    /**
-		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
-		     * 菜单按键宽度： 87
-		     * 菜单按键高度： 32
-		     * 菜单按键左边界坐标： 278
-		     * 菜单按键上边界坐标： 26
-		     * 菜单按键右边界坐标： 365
-		     * 菜单按键下边界坐标： 58
-		     */
+		    /**
+		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
+		     * 菜单按键宽度： 87
+		     * 菜单按键高度： 32
+		     * 菜单按键左边界坐标： 278
+		     * 菜单按键上边界坐标： 26
+		     * 菜单按键右边界坐标： 365
+		     * 菜单按键下边界坐标： 58
+		     */
 			let btnPosi = { // 胶囊实际位置，坐标信息不是左上角原点
-			      height: headerPosi.height,
-			      width: headerPosi.width,
-			      // 胶囊top - 状态栏高度
-			      top: headerPosi.top - statusBarHeight,
-			      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
-			      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-			      // 屏幕宽度 - 胶囊right
-			      right: this.systeminfo.screenWidth - headerPosi.right
+			      height: headerPosi.height,
+			      width: headerPosi.width,
+			      // 胶囊top - 状态栏高度
+			      top: headerPosi.top - statusBarHeight,
+			      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
+			      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+			      // 屏幕宽度 - 胶囊right
+			      right: this.systeminfo.screenWidth - headerPosi.right
 			}
 			console.log(btnPosi)
 			let haveBack;
 			if (getCurrentPages().length === 1) { // 当只有一个页面时
-			     haveBack = false;
+			     haveBack = false;
 			} else {
-			     haveBack = true;
+			     haveBack = true;
 			}
-		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
-		    this.statusBarHeight=statusBarHeight,
-		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
+		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
+		    this.statusBarHeight=statusBarHeight,
+		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
 			this.$parent.navbarHeight = this.navbarHeight
 			this.$parent.statusBarHeight = this.statusBarHeight
 			// console.log(this.navbarHeight);
-		    this.navbarBtn=btnPosi
+		    this.navbarBtn=btnPosi
 		},
 		onLoad(){
 			
 		},
 		methods:{
 			_goBack: function () {
-		      	uni.navigateBack({
-		        	delta: this.page
-		      	});
-		    },
-		    _goHome: function () {
-		      	uni.switchTab({
-		        	url: '/pages/tabBar/home/index'
-		      	})
-		    }
+		      	uni.navigateBack({
+		        	delta: this.page
+		      	});
+		    },
+		    _goHome: function () {
+		      	uni.switchTab({
+		        	url: '/pages/tabBar/home/index'
+		      	})
+		    }
 		},
 		onShow(){
 	

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

@@ -1,230 +0,0 @@
-<template name="headerNavbar">
-	<!-- 自定义导航栏 -->
-	<view class='navbar-wrap' :style="{height:(CustomBar+55)+'px',paddingTop:StatusBar+'px'}" @touchmove.stop.prevent="discard" @tap="hideBubble"> 		
-	  	<view class="navbar-text" 
-			  :style="{color:navbarData.textColor ? navbarData.textColor:'',lineHeight:(CustomBar - StatusBar)+'px;',fontSize:fontSizeSetting+'px;',paddingLeft:navbarData.textLeft ? '' : 12+'px'}" :class="platformClass">
-	    	  {{navbarData.title ? navbarData.title : " "}}
-	  	</view>
-		<view class="search-input">
-			<view class="search-tab">
-				<view class="search-tab-btn"  @click="topBubble">
-					<text>{{ tabValue }}</text>
-					<text class="iconfont icon-xiangxiajiantou"></text>
-				</view>
-				<tui-bubble-popup :show="show" :mask="true" position="absolute" direction="top" @close="topBubble" width="140rpx"
-				 left="10rpx" bottom="0rpx" translateY="100%" triangleRight="60rpx" triangleTop="-22rpx" :maskBgColor="maskBgColor">
-					<view class="tui-menu-item" @tap="selectTabs(1)">产品</view>
-					<view class="tui-menu-item" @tap="selectTabs(2)">供应商</view>
-					<view class="tui-menu-item" @tap="selectTabs(3)">项目仪器</view>
-				</tui-bubble-popup>
-			</view>
-			<view class="gosearch-btn" @click="this.$api.navigateTo(clickPath)">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input class="input" type="text" v-model="SearchText" value="" placeholder="你想要的这里都有"/>
-			</view>
-			<view class="search-service">
-				<!-- #ifdef MP-WEIXIN -->
-				<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
-					<text class="iconfont icon-liuyan"></text>
-				</button>	
-				<!-- #endif -->
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	var self;
-	import btSearch from '@/components/uni-search/bt-search.vue'
-	export default{
-		name:'headerNavbar',
-		components:{
-			btSearch,
-		},
-		props:{
-		    navbarData: { // 由父页面传递的数据
-				type: Object
-		    },
-			maskBgColor: {//遮罩背景色
-				type: String,
-				default: 'transparent'
-			},
-		},
-		data() {
-			return{
-				show:false,
-				clickPath:'/search/pages/search/search',
-				SearchText:'',
-				tabValue:'产品',
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				StatusBar: this.StatusBar,
-				fontSizeSetting:this.fontSizeSetting,
-				screenWidth:this.screenWidth,
-				capsule:this.capsule,
-				platformClass:this.platformClass,
-			}
-		},
-		created() {
-			if (getCurrentPages().length === 1) { // 当只有一个页面时
-			      this.navbarData.haveBack = false;
-			} else {
-			      this.navbarData.haveBack = true;
-			}
-		},
-		onLoad(){
-			
-		},
-		methods:{
-			handleContact(e){
-				console.log(e.detail.path)
-				console.log(e.detail.query)
-			},
-			topBubble() {
-				this.show = !this.show;
-			},
-			selectTabs(index){
-				this.show = false
-				switch(index){
-					case 1:
-						this.tabValue='产品'
-						break;
-					case 2:
-						this.tabValue='供应商'
-						break;
-					case 3:
-						this.tabValue='项目仪器'
-						break;
-				}
-			},
-			hideBubble(){
-				this.shwo = false
-			},
-			discard(){
-				//丢弃
-			},
-		},
-		onShow(){
-	
-		}
-	}
-</script>
-
-<style lang="scss">
-	.navbar-wrap {
-		 position: fixed;
-		 width: 100%;
-		 top: 0;
-		 z-index: 100000;
-		 box-sizing: border-box;
-		 background: url(https://img.caimei365.com/group1/M00/03/B0/Cmis217Z9LCAF_anAADHlsIu3aE475.png);
-		 background-size: cover;
-		 border-bottom:none;
-	}
-	.navbar-text {
-		width: 100%;
-		font-size: 30rpx;
-		color: #000000;
-		font-weight: 500;
-	}
-	.navbar-text.center{
-		text-align: center;
-	}
-	.navbar-text.left{
-		text-align: left;
-		padding-left: 45px;
-	}
-	.navbar-icon {
-		 position: fixed;
-		 display: flex;
-		 box-sizing: border-box;
-	}
-	.navbar-icon .iconfont {
-		 display: inline-block;
-		 overflow: hidden;
-		 font-size: 44rpx;
-		 padding-right:40rpx;
-		 margin-top: 1px;
-	}
-	.navbar-icon .icon-iconfonticonfontsousuo1 {
-		color: #000000;
-	}
-	.navbar-icon view {
-		 height: 18px;
-		 border-left: 0.5px solid rgba(0,0,0, 0.3);
-		 margin-top: 6px;
-	}
-	.navbar-loading {
-		 background: #fff;
-		 text-align: center;
-	}
-	.search-input{
-		width: 100%;
-		height: 70rpx;
-		padding: 20rpx 0;
-		.search-tab{
-			width: 180rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			color: #FFFFFF;
-			font-size: $font-size-28;
-			text-align: center;
-			float: left;
-			position: relative;
-			.icon-xiangxiajiantou{
-				margin-left: 10rpx;
-			}
-		}
-		.gosearch-btn{
-			width: 470rpx;
-			height: 100%;
-			float: left;
-			border-radius: 40rpx;
-			background: #F0F0F0;
-			margin: 0 auto;
-			padding:0 20rpx;
-			font-size: 28rpx;
-			line-height: 70rpx;
-			padding-left: 70rpx;
-			color: #8A8A8A;
-			background: #FFFFFF;
-			position: relative;
-			box-sizing: border-box;
-			.icon-iconfonticonfontsousuo1{
-				width: 70rpx;
-				height: 70rpx;
-				line-height: 70rpx;
-				text-align: center;
-				display: block;
-				position: absolute;
-				left: 0;
-				top: 0;
-				font-size: 34rpx;
-				color: #8A8A8A;
-				z-index: 10;
-			}
-			.input{
-				width: 400rpx;
-				height: 100%;
-				float: left;
-			}
-		}
-		.search-service{
-			width: 100rpx;
-			height: 70rpx;
-			line-height: 70rpx;
-			float: right;
-			text-align: center;
-			color: #FFFFFF;
-			.contact-btn{
-				width: 100%;
-				height: 70rpx;
-				background-color: rgba(0,0,0,0);
-				line-height: 70rpx;
-				.icon-liuyan{
-					font-size: 64rpx;
-					color: #FFFFFF;
-				}
-			}
-		}
-	}
-</style>

components/cm-module/homeIndex/coupon.vue

@@ -26,7 +26,7 @@
 				if(this.hasLogin){
 					this.$api.navigateTo(url)
 				}else{
-					this.$api.navigateTo('/pages/login/login?type=0')
+					this.$api.navigateTo('/pages/user/coupon/coupon-collection-visitor')
 				}
 			},
 		}

components/cm-module/homeIndex/customer.vue

@@ -31,7 +31,7 @@
 		},
 		data() {
 			return{
-				clickPath:'/search/pages/search/search',
+				clickPath:'/pages/search/search',
 				hotSearchText:'搜索商品/项目仪器',
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				StatusBar: this.StatusBar,

components/cm-module/homeIndex/navbars.vue

@@ -47,16 +47,16 @@
 				if(pros.linkType){
 					 const typeMap = {
 						1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						3:`/h5/pages/article/path-live`,
-						4:`/h5/pages/other/brands`,
-						10:`/second/pages/product/product-list`,
-						14:`/h5/pages/other/brand`,
-						15:`/h5/pages/other/repair`,
-						18:`/h5/pages/article/path?link=${pros.link}`,
+						3:`/pages/h5/article/path-live`,
+						4:`/pages/h5/other/brands`,
+						10:`/pages/second/product/product-list`,
+						14:`/pages/h5/other/brand`,
+						15:`/pages/h5/other/repair`,
+						18:`/pages/h5/article/path?link=${pros.link}`,
 						20:`/pages/goods/good-floor?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						21:`/h5/pages/activity/meobohui`,
+						21:`/pages/h5/activity/meobohui`,
 						22:`/pages/goods/good-floor-temp?linkId=${pros.linkParam.id}&title=${pros.name}`,
-						23:`/h5/pages/activity/activity-topic?linkId=${pros.linkParam.id}`  //活动专题页面
+						23:`/pages/h5/activity/activity-topic?linkId=${pros.linkParam.id}`  //活动专题页面
 					 }
 					const url = typeMap[pros.linkType];
 					this.$api.navigateTo(url)

components/cm-module/homeIndex/pageSpecial.vue

@@ -103,10 +103,10 @@
 						Um_Key_SourcePage: '商城首页',
 					})
 				}
-				this.$api.navigateTo(`/h5/pages/article/path?link=${LINK}`)
+				this.$api.navigateTo(`/pages/h5/article/path?link=${LINK}`)
 			},
 			NewActivityList(){
-				this.$api.navigateTo('/h5/pages/activity/activity-list')
+				this.$api.navigateTo('/pages/h5/activity/activity-list')
 			},
 			NewActivityListPath(pros){
 				// 友盟埋点首页活动模块点击
@@ -128,20 +128,20 @@
 					const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.name}`,
 					 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-						4:`/h5/pages/activity/activity?title=${pros.title}&link=${pros.appletsLink}`,
+						4:`/pages/h5/activity/activity?title=${pros.title}&link=${pros.appletsLink}`,
 					 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-					 	// 7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-					 	8:`/h5/pages/activity/activity-list`,
-					 	9:`/second/pages/form/introduce`,
-					 	10:`/second/pages/product/product-list`,
-					 	11:`/second/pages/form/form`,
-					 	12:`/search/pages/search/search?keyWord=${pros.linkParam.keyword}`,
-					 	13:`/h5/pages/article/path?link=${pros.link}`,
-					 	14:`/h5/pages/article/path?link=${pros.link}`,
-					 	15:`/h5/pages/article/path?link=${pros.link}`,
+					 	// 7:`/pages/supplier/user/my-shop?shopId=${pros.linkParam.id}`,
+					 	8:`/pages/h5/activity/activity-list`,
+					 	9:`/pages/second/form/introduce`,
+					 	10:`/pages/second/product/product-list`,
+					 	11:`/pages/second/form/form`,
+					 	12:`/pages/search/search?keyWord=${pros.linkParam.keyword}`,
+					 	13:`/pages/h5/article/path?link=${pros.link}`,
+					 	14:`/pages/h5/article/path?link=${pros.link}`,
+					 	15:`/pages/h5/article/path?link=${pros.link}`,
 					 	17:`/pages/login/register-select`,
-					 	18:`/h5/pages/article/path?link=${pros.link}`,
-					 	19:`/search/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`
+					 	18:`/pages/h5/article/path?link=${pros.link}`,
+					 	19:`/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`
 					}
 					const url = typeMap[pros.linkType];
 					uni.navigateTo({
@@ -150,7 +150,7 @@
 				}
 			},
 			LiveGoPath(){//查看直播
-				this.$api.navigateTo('/h5/pages/article/path-live')
+				this.$api.navigateTo('/pages/h5/article/path-live')
 				
 				// uni.navigateToMiniProgram({
 				// 	appId: 'wx92d650b253f8f2e3',
@@ -174,7 +174,7 @@
 						Um_Key_SourcePage: '商城首页',
 					})
 				}
-				this.$api.navigateTo(`/h5/pages/article/page-image?title=${live.liveTitle}&image=${live.advertisingImage}`)
+				this.$api.navigateTo(`/pages/h5/article/page-image?title=${live.liveTitle}&image=${live.advertisingImage}`)
 			}
 		}
 	}

components/cm-module/homeIndex/supplierList.vue

@@ -47,7 +47,7 @@
 				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
 			},
 			NavToDetailPage(item) {//跳转
-				this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${item.linkParam.id}`)
+				this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${item.linkParam.id}`)
 			}
 		}
 	}

components/cm-module/listTemplate/secondHand.vue

@@ -242,7 +242,7 @@
 			},
 			navToDetailPage(id) {
 				this.isModallayer = true;
-				this.$api.navigateTo(`/second/pages/product/product-details?id=${id}`);
+				this.$api.navigateTo(`/pages/second/product/product-details?id=${id}`);
 				this.isModallayer = false;
 			},
 			onShowClose () {//输入框失去焦点时触发

components/cm-module/orderDetails/goodsList.vue

@@ -123,7 +123,7 @@
 		},
 		methods:{
 			goShophome(id){
-				this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${id}`)
+				this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${id}`)
 			},
 			details(pros){
 				if(pros.validFlag == 9){

components/cm-module/pcitureTemplate/templateA.vue

@@ -90,7 +90,7 @@ export default {
 				return
 			}else if(item.linkType === -1){
 				uni.navigateTo({
-					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
 				})
 			}else{
 				caimeiApi.FlooryNavigateTo(item)

components/cm-module/pcitureTemplate/templateB.vue

@@ -93,7 +93,7 @@ export default {
 				return
 			}else if(item.linkType === -1){
 				uni.navigateTo({
-					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
 				})
 			}else{
 				caimeiApi.FlooryNavigateTo(item)

components/cm-module/pcitureTemplate/templateC.vue

@@ -34,7 +34,7 @@ export default{
 				return
 			}else if(item.linkType === -1){
 				uni.navigateTo({
-					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
 				})
 			}else{
 				caimeiApi.FlooryNavigateTo(item)

components/cm-module/pcitureTemplate/templateD.vue

@@ -53,7 +53,7 @@ export default{
 				return
 			}else if(item.linkType === -1){
 				uni.navigateTo({
-					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
 				})
 			}else{
 				caimeiApi.FlooryNavigateTo(item)

components/cm-module/pcitureTemplate/templateE.vue

@@ -89,7 +89,7 @@ export default {
 				return
 			}else if(item.linkType === -1){
 				uni.navigateTo({
-					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
 				})
 			}else{
 				caimeiApi.FlooryNavigateTo(item)

components/cm-module/pcitureTemplate/templateF.vue

@@ -53,7 +53,7 @@ export default{
 				return
 			}else if(item.linkType === -1){
 				uni.navigateTo({
-					url:`/h5/pages/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
+					url:`/pages/h5/activity/activity-detail?adsImage=${item.adsImage}&title=${item.name}`
 				})
 			}else{
 				caimeiApi.FlooryNavigateTo(item)

components/cm-module/productDetails/instrument-recommend.vue

@@ -49,18 +49,18 @@
 					 	1:`/pages/goods/goods-instrument?linkId=${value.linkParam.id}&title=${value.title}`,
 						2:`/pages/goods/instrument-details?id=${value.linkParam.id}`,
 					 	5:`/pages/goods/product?id=${value.linkParam.id}`,
-					 	// 7:`/supplier/pages/user/my-shop?shopId=${value.linkParam.id}`,
-					 	8:`/h5/pages/activity/activity-list`,
-					 	9:`/second/pages/form/introduce`,
-					 	10:`/second/pages/product/product-list`,
-					 	11:`/second/pages/form/form`,
-					 	12:`/search/pages/search/search?keyWord=${value.title}`,
-					 	13:`/h5/pages/article/path?link=${value.link}`,
-					 	14:`/h5/pages/article/path?link=${value.link}`,
-					 	15:`/h5/pages/article/path?link=${value.link}`,
+					 	// 7:`/pages/supplier/user/my-shop?shopId=${value.linkParam.id}`,
+					 	8:`/pages/h5/activity/activity-list`,
+					 	9:`/pages/second/form/introduce`,
+					 	10:`/pages/second/product/product-list`,
+					 	11:`/pages/second/form/form`,
+					 	12:`/pages/search/search?keyWord=${value.title}`,
+					 	13:`/pages/h5/article/path?link=${value.link}`,
+					 	14:`/pages/h5/article/path?link=${value.link}`,
+					 	15:`/pages/h5/article/path?link=${value.link}`,
 					 	17:`/pages/login/register-select`,
-					 	18:`/h5/pages/article/path?link=${value.link}`,
-					 	19:`/search/pages/search/search-supplier?keyWord=${value.title}`
+					 	18:`/pages/h5/article/path?link=${value.link}`,
+					 	19:`/pages/search/search-supplier?keyWord=${value.title}`
 					 }
 					 const url = typeMap[value.linkType];
 					 this.$api.navigateTo(url)

components/cm-module/supplier/home.vue

@@ -134,7 +134,7 @@
 				})
 			},
 			handleClick(data){
-				this.$api.navigateTo(`/h5/pages/activity/meobohui`)
+				this.$api.navigateTo(`/pages/h5/activity/meobohui`)
 				this.$store.commit('setActivity',data)
 			},
 			handleCancelClick(data){

components/cm-module/supplier/user.vue

@@ -10,7 +10,7 @@
 							<text class="u-h1">{{name}}</text>
 							<text class="u-tips">供应商</text>
 						</view>
-						<view class="user-item" @click="navigator('/supplier/pages/user/my-shop?shopId='+shopID)">
+						<view class="user-item" @click="navigator('/pages/supplier/user/my-shop?shopId='+shopID)">
 							<text class="u-shop">进入店铺</text><text class="iconfont icon-jinrudianpu"></text>
 						</view>
 					</view>
@@ -21,7 +21,7 @@
 						<text class="cell-tit">我的商品</text>
 					</view>
 					<view class="order-section">
-						<view class="order-item" @click="navigator('/supplier/pages/user/my-product?listType=0')" hover-class="common-hover"  :hover-stay-time="50">
+						<view class="order-item" @click="navigator('/pages/supplier/user/my-product?listType=0')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
 								<text class="iconfont icon-quanbushangpin"></text>
 								<text 	v-if="allNum>0" 
@@ -32,7 +32,7 @@
 							</view>
 							<text class="order-t">全部商品</text>
 						</view>
-						<view class="order-item" @click="navigator('/supplier/pages/user/my-product?listType=1')"  hover-class="common-hover" :hover-stay-time="50">
+						<view class="order-item" @click="navigator('/pages/supplier/user/my-product?listType=1')"  hover-class="common-hover" :hover-stay-time="50">
 							<view class="order-icon">
 								<text class="iconfont icon-yishangjia"></text>
 								<text  v-if="upNum >0" 
@@ -43,7 +43,7 @@
 							</view>
 							<text class="order-t">已上架</text>
 						</view>
-						<view class="order-item" @click="navigator('/supplier/pages/user/my-product?listType=2')" hover-class="common-hover"  :hover-stay-time="50">
+						<view class="order-item" @click="navigator('/pages/supplier/user/my-product?listType=2')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
 								<text class="iconfont icon-yixiajia"></text>
 								<text   v-if="downNum >0" 
@@ -60,7 +60,7 @@
 			<!-- 底部跳转 -->
 			<view class="foot-list">
 				<view class="list-cell-item">
-					<view class="list-cell" hover-class="cell-hover" :hover-stay-time="50" @click="navigator('/supplier/pages/order/order-list')">
+					<view class="list-cell" hover-class="cell-hover" :hover-stay-time="50" @click="navigator('/pages/supplier/order/order-list')">
 						<view class="cell-icon">
 							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_11@2x.png" mode=""></image>
 						</view>
@@ -93,7 +93,7 @@
 						<text class="cell-tit">关于我们</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
-					<view class="list-cell last" @click="this.$api.navigateTo('/h5/pages/article/page?linkType=99')" hover-class="cell-hover" :hover-stay-time="50">
+					<view class="list-cell last" @click="this.$api.navigateTo('/pages/h5/article/page?linkType=99')" hover-class="cell-hover" :hover-stay-time="50">
 						<view class="cell-icon">
 							<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_7@2x.png" mode=""></image>
 						</view>
@@ -142,17 +142,17 @@
 				firstList:[
 					{
 						name:'运营人员管理',
-						path:'/supplier/pages/user/operator/list',
+						path:'/pages/supplier/user/operator/list',
 						icon:'https://static.caimei365.com/app/img/icon/icon_club_1@2x.png',
 					},
 					{
 						name:'我的资料',
-						path:'/supplier/pages/user/information',
+						path:'/pages/supplier/user/information',
 						icon:'https://static.caimei365.com/app/img/icon/icon_club_12@2x.png',
 					},
 					{
 						name:'账户设置',
-						path:'/supplier/pages/user/setting/setting',
+						path:'/pages/supplier/user/setting/setting',
 						icon:'https://static.caimei365.com/app/img/icon/icon_club_4@2x.png',
 					},
 				]

components/thorui/tui-no-data/tui-no-data.vue

@@ -1,103 +0,0 @@
-<template>
-	<view class="tui-nodata-box" :class="[fixed?'tui-nodata-fixed':'']">
-		<image v-if="imgUrl" :src="imgUrl" class="tui-tips-icon" :style="{width:imgWidth+'rpx',height:imgHeight+'rpx'}"></image>
-		<view class="tui-tips-content">
-			<slot></slot>
-		</view>
-		<button class="tui-tips-btn" hover-class="tui-tips-btn-hover" :style="{width:btnWidth+'rpx'}" v-if="btnText"  @tap="handleClick">{{btnText}}</button>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "tuiNoData",
-		props: {
-			//是否垂直居中
-			fixed: {
-				type: Boolean,
-				default: true
-			},
-			//图片地址，没有则不显示
-			imgUrl: {
-				type: String,
-				default: ""
-			},
-			//图片宽度
-			imgWidth: {
-				type: Number,
-				default: 200
-			},
-			//图片高度
-			imgHeight:{
-				type: Number,
-				default: 200
-			},
-			//按钮宽度
-			btnWidth:{
-				type: Number,
-				default: 200
-			},
-			//按钮文字，没有则不显示
-			btnText:{
-				type:String,
-				default: ""
-			}
-		},
-		methods: {
-			handleClick(e) {
-				this.$emit('click', {});
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.tui-nodata-box {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.tui-nodata-fixed {
-		width: 90%;
-		position: fixed;
-		left: 50%;
-		top: 50%;
-		-webkit-transform: translate(-50%, -50%);
-		transform: translate(-50%, -50%);
-	}
-
-	.tui-tips-icon {
-		display: block;
-		flex-shrink: 0;
-		width: 280rpx;
-		height: 280rpx;
-		margin-bottom: 40rpx;
-	}
-
-	.tui-tips-content {
-		text-align: center;
-		color: #666666;
-		font-size: 28rpx;
-		padding: 0 50rpx 24rpx 50rpx;
-		box-sizing: border-box;
-		word-break: break-all;
-		word-wrap: break-word;
-	}
-
-	.tui-tips-btn {
-		height: 60rpx;
-		line-height: 60rpx;
-		font-size: 28rpx;
-		background-color: #EB0909;
-		color: #fff;
-		border-radius: 6rpx;
-		margin: 0;
-	}
-
-	.tui-tips-btn-hover {
-		background-color: #c80808;
-		color: #e5e5e5;
-	}
-</style>

components/thorui/tui-top-dropdown/tui-top-dropdown.vue

@@ -1,104 +0,0 @@
-<template>
-	<view>
-		<view
-			class="tui-top-dropdown tui-dropdown-box"
-			:class="[show ? 'tui-dropdown-show' : '']"
-			:style="{
-				height: height ? px(height) : 'auto',
-				backgroundColor: backgroundColor,
-				paddingBottom: px(paddingbtm),
-				transform: 'translateZ(0) translateY(' + (show ? px(translatey) : '-100%') + ')'
-			}"
-		>
-			<slot></slot>
-		</view>
-		<view @touchmove.stop.prevent class="tui-dropdown-mask" :class="[mask && show ? 'tui-mask-show' : '']" @tap="handleClose"></view>
-	</view>
-</template>
-
-<script>
-export default {
-	name: 'tuiTopDropdown',
-	props: {
-		//是否需要mask
-		mask: {
-			type: Boolean,
-			default: true
-		},
-		//控制显示
-		show: {
-			type: Boolean,
-			default: false
-		},
-		//背景颜色
-		backgroundColor: {
-			type: String,
-			default: '#f2f2f2'
-		},
-		//padding-bottom  rpx
-		paddingbtm: {
-			type: Number,
-			default: 0
-		},
-		//高度 rpx
-		height: {
-			type: Number,
-			default: 580
-		},
-		//移动距离 需要计算
-		translatey: {
-			type: Number,
-			default: 0
-		}
-	},
-	methods: {
-		handleClose() {
-			if (!this.show) {
-				return;
-			}
-			this.$emit('close', {});
-		},
-		px(num) {
-			return uni.upx2px(num) + 'px';
-		}
-	}
-};
-</script>
-
-<style scoped>
-.tui-dropdown-box {
-	width: 100%;
-	position: fixed;
-	box-sizing: border-box;
-	border-bottom-right-radius: 24rpx;
-	border-bottom-left-radius: 24rpx;
-	transform: translateZ(0);
-	overflow: hidden;
-	/* visibility: hidden; */
-	transition: all 0.3s ease-in-out;
-	z-index: 996;
-	top: 0;
-}
-
-.tui-dropdown-show {
-	/* visibility: visible; */
-}
-
-.tui-dropdown-mask {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background-color: rgba(0, 0, 0, 0.6);
-	z-index: 986;
-	transition: all 0.3s ease-in-out;
-	opacity: 0;
-	visibility: hidden;
-}
-
-.tui-mask-show {
-	opacity: 1;
-	visibility: visible;
-}
-</style>

components/uni-search/cat-search.vue

@@ -1,12 +1,12 @@
 <template name="headerNavbar">
 	<!-- 自定义导航栏 -->
-	<view class='navbar-wrap' :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
+	<view class='navbar-wrap' :style="{height:navbarHeight+'px',paddingTop:statusBarHeight+'px'}"> 
 		<view class="navbar-text" :style="{top:navbarBtn.top + statusBarHeight+'px;',height:navbarBtn.height+'px;',fontSize:fontSizeSetting+'px;'}">
-	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',left:navbarBtn.height/2+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width)-20+'px;',lineHeight:navbarBtn.height+'px;'}">
+	    	<view class="gosearch-btn" :style="{paddingLeft:navbarBtn.height+'px;',left:navbarBtn.height/2+'px;',borderRadius:(navbarBtn.height/2)+'px;',width:(375-navbarBtn.width)-20+'px;',lineHeight:navbarBtn.height+'px;'}">
 				<text class="iconfont icon-sousuo" :style="{width:navbarBtn.height+'px;',height:navbarBtn.height+'px;',lineHeight:navbarBtn.height+'px;'}"></text>
 				<view class="input" @click="this.$api.navigateTo(clickPath)">搜索商品/项目仪器</view>
 			</view>
-	  	</view>
+	  	</view>
 		<view class="category-tab">
 			<view class="category-tab-item" :class="categoryTabIndex ==1 ? 'active' : ''" @click="categoryTabClick(1)">产品</view>
 			<view class="category-tab-item" :class="categoryTabIndex ==2 ? 'active' : ''" @click="categoryTabClick(2)">仪器</view>
@@ -41,16 +41,16 @@
 		data() {
 			return{
 				headerType:'',
-				clickPath:'/search/pages/search/search',
+				clickPath:'/pages/search/search',
 				haveBack: true, // 是否有返回按钮，true 有 false 没有 若从分享页进入则为 false
-			    statusBarHeight: 0, // 状态栏高度
-			    navbarHeight: 0, // 顶部导航栏高度,
-			    navbarBtn: { // 胶囊位置信息
-			      height: 0,
-			      width: 0,
-			      top: 0,
-			      bottom: 0,
-			      right: 0
+			    statusBarHeight: 0, // 状态栏高度
+			    navbarHeight: 0, // 顶部导航栏高度,
+			    navbarBtn: { // 胶囊位置信息
+			      height: 0,
+			      width: 0,
+			      top: 0,
+			      bottom: 0,
+			      right: 0
 				},
 				platform:'',
 				fontSizeSetting:0,
@@ -62,54 +62,54 @@
 			this.fontSizeSetting = this.systeminfo.fontSizeSetting
 			let statusBarHeight = this.systeminfo.statusBarHeight // 状态栏高度
 			let headerPosi = this.headerBtnPosi // 胶囊位置信息
-		    /**
-		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
-		     * 菜单按键宽度： 87
-		     * 菜单按键高度： 32
-		     * 菜单按键左边界坐标： 278
-		     * 菜单按键上边界坐标： 26
-		     * 菜单按键右边界坐标： 365
-		     * 菜单按键下边界坐标： 58
-		     */
+		    /**
+		     * wx.getMenuButtonBoundingClientRect() 坐标信息以屏幕左上角为原点
+		     * 菜单按键宽度： 87
+		     * 菜单按键高度： 32
+		     * 菜单按键左边界坐标： 278
+		     * 菜单按键上边界坐标： 26
+		     * 菜单按键右边界坐标： 365
+		     * 菜单按键下边界坐标： 58
+		     */
 			let btnPosi = { // 胶囊实际位置，坐标信息不是左上角原点
-			      height: headerPosi.height,
-			      width: headerPosi.width,
-			      // 胶囊top - 状态栏高度
-			      top: headerPosi.top - statusBarHeight,
-			      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
-			      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
-			      // 屏幕宽度 - 胶囊right
-			      right: this.systeminfo.screenWidth - headerPosi.right
+			      height: headerPosi.height,
+			      width: headerPosi.width,
+			      // 胶囊top - 状态栏高度
+			      top: headerPosi.top - statusBarHeight,
+			      // 胶囊bottom - 胶囊height - 状态栏height （现胶囊bottom 为距离导航栏底部的长度）
+			      bottom: headerPosi.bottom - headerPosi.height - statusBarHeight,
+			      // 屏幕宽度 - 胶囊right
+			      right: this.systeminfo.screenWidth - headerPosi.right
 			}
 			console.log(btnPosi)
 			let haveBack;
 			if (getCurrentPages().length === 1) { // 当只有一个页面时
-			     haveBack = false;
+			     haveBack = false;
 			} else {
-			     haveBack = true;
+			     haveBack = true;
 			}
-		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
-		    this.statusBarHeight=statusBarHeight,
-		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
+		    this.haveBack=haveBack, // 获取是否是通过分享进入的小程序
+		    this.statusBarHeight=statusBarHeight,
+		    this.navbarHeight= headerPosi.bottom + btnPosi.bottom, // 原胶囊bottom + 现胶囊bottom
 			this.$parent.navbarHeight = this.navbarHeight
 			this.$parent.statusBarHeight = this.statusBarHeight
 			// console.log(this.navbarHeight);
-		    this.navbarBtn=btnPosi
+		    this.navbarBtn=btnPosi
 		},
 		onLoad(){
 			
 		},
 		methods:{
 			_goBack: function () {
-		      	uni.navigateBack({
-		        	delta: this.page
-		      	});
-		    },
-		    _goHome: function () {
-		      	uni.switchTab({
-		        	url: '/pages/tabBar/home/index'
-		      	})
-		    },
+		      	uni.navigateBack({
+		        	delta: this.page
+		      	});
+		    },
+		    _goHome: function () {
+		      	uni.switchTab({
+		        	url: '/pages/tabBar/home/index'
+		      	})
+		    },
 			categoryTabClick(index){
 				this.categoryTabIndex = index 
 				this.$emit('click',this.categoryTabIndex)

components/uni-search/go-search.vue

@@ -1,323 +0,0 @@
-<template name="go-search">
-	<view>
-		<view class="search">
-			<view class="search-input">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input maxlength="20" focus type="text" value="" confirm-type="search" @focus="onFocus" @input="onShowClose" @confirm="searchStart()" placeholder="请输入商品关键词" v-model.trim="searchText"/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-			</view>
-			<view class="search-btn" @click="searchStart()">搜索</view>
-		</view>
-		<view class="search-container">
-			<view :class="'s-' + theme" v-if="isSearchHistory">
-				<view class="header">
-					搜索历史
-					<text class="iconfont icon-shanchu" @click="delhistory"></text>
-				</view>
-				<view class="list">
-					<view v-for="(item,index) in serachRecordList" :key="index" @click="keywordsClick(item.searchWord)">{{item.searchWord}}</view>
-				</view>
-			</view>
-		</view>
-		<!-- 删除弹窗 -->
-		<model-alert v-if="isShowDelModal"
-					 :alertText='alertText' 
-					 @btnConfirm ='confirmDetele'>
-		</model-alert>
-	</view>
-</template>
-
-<script>
-	import modelAlert from '@/components/cm-module/modelAlert/modelAlert.vue'
-	import authorize from '@/common/config/authorize.js'
-	export default{
-		name:"go-search",
-		components:{
-			modelAlert
-		},
-		props:{
-			isFocus:{	//是否自动获取焦点
-				type: Boolean,
-				default: false
-			},
-			theme:{	//选择块级显示还是圆形显示
-				type: String,
-				default: 'block'
-			}
-		},
-		data() {
-			return {
-				searchText:'',								//搜索关键词
-				alertText:'确定删除全部历史记录?',
-				isShowDelModal:false,						//控制显示删除弹窗
-				isShowClose:false,							//是否显示清空输入框图标
-				isSearchHistory:false,						//是都显示搜索历史
-				serachRecordList:[]
-			};
-		},
-		created() {
-			// this.initGetSerachRecord()
-		},
-		methods: {
-			initGetSerachRecord(){
-				authorize.getCode('weixin').then(wechatcode =>{
-					this.$api.get('/search/record',{organizeID:this.userOrganizeID,code:wechatcode},
-						response =>{
-							if(response.code == '1'){
-								this.serachRecordList = response.data
-								if(this.serachRecordList.length>0){
-									this.isSearchHistory = true
-								}else{
-									this.isSearchHistory = false
-								}
-							}else{
-								this.$util.msg(response.msg,2000)
-							}							
-						}
-					)
-				})
-			},
-			searchStart: function() {	//触发搜索
-				let _this = this;
-				if (_this.searchText == '') {
-					this.$util.msg('请输入商品关键词',2000);
-				}else{
-					_this.isSearchHistory = false
-					_this.$emit('getSearchText', _this.searchText)
-				}
-			},
-			onShowClose () { //输入框失去焦点时触发
-				this.inputEmpty(this.searchText)
-			},
-			onFocus () { //输入框获取焦点时触发
-				this.inputEmpty(this.searchText)
-				this.initGetSerachRecord()
-			},
-			delInputText () { //清除输入框内容
-				this.searchText = ''
-				this.isShowClose = false
-				this.$parent.isShowWrapper = false
-				this.inputEmpty(this.searchText)
-				this.initGetSerachRecord()
-			},
-			keywordsClick (item) {	//关键词搜索与历史搜索
-				this.searchText = item;
-				this.isShowClose = true;
-				this.searchStart();
-			},
-			delhistory () {		//清空历史记录
-				this.isShowDelModal = true;				
-			},
-			confirmDetele() {
-				this.isShowDelModal = false;
-				authorize.getCode('weixin').then(wechatcode =>{
-					this.$api.get('/search/delete',{organizeID:this.userOrganizeID,code:wechatcode},
-						response =>{
-							if(response.code == '1'){
-								this.serachRecordList=[];
-								this.isSearchHistory = false
-							}else{
-								this.$util.msg(response.msg,2000)
-							}							
-						}
-					)
-				})
-			},
-			inputEmpty(val){
-				this.$parent.isShowWrapper = false
-				if(val != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "@/uni.scss";
-	.search{
-		width: 702rpx;
-		height: 80rpx;
-		padding: 12rpx 24rpx;
-		border-bottom: 1px solid #F0F0F0;
-		position: fixed;
-		top: 0;
-		left: 0;
-		background: #FFFFFF;
-		z-index: 999;
-		.search-input{
-			width: 448rpx;
-			height: 80rpx;
-			padding: 0 68rpx;
-			line-height: 80rpx;
-			border-radius: 40rpx;
-			position: relative;
-			background: #F0F0F0;
-			float: left;
-			.icon-iconfonticonfontsousuo1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				left: 24rpx;
-				z-index: 10;
-			}
-			.icon-shanchu1{
-				font-size: 36rpx;
-				color: #8A8A8A;
-				position: absolute;
-				right: 24rpx;
-				top: 0;
-				padding: 0 10rpx;
-				z-index: 10;
-			}
-			input{
-				width: 448rpx;
-				height: 80rpx;
-				background-color: #F0F0F0;
-				font-size: 26rpx;
-			}
-		}
-		.search-btn{
-			width: 118rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			color: $color-system;
-			font-size: 30rpx;
-			text-align: center;
-			float: left;
-		}
-		.voice-icon{
-			width: 36rpx;
-			height: 36rpx;
-			padding: 16rpx 20rpx 16rpx 0;
-			position: absolute;
-			left: 16rpx;
-			top: 4rpx;
-			z-index: 10;
-		}
-		
-	}
-	.search-container{
-		padding-top: 106rpx;
-	}
-	.s-block{
-		background: #FFFFFF;
-		.header{
-			font-size: 32rpx;
-			padding:40rpx 24rpx 22rpx 24rpx;
-			line-height: 42rpx;
-			font-size: 30rpx;
-			font-weight: bold;
-			position: relative;
-			.icon-shanchu{
-				font-size: 36rpx;
-				color: #333333;
-				float: right;
-				padding: 0 10rpx;
-				z-index: 10;
-				font-weight: normal;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding-bottom: 40rpx;
-			view{
-				color: #8A8A8A;
-				font-size: 24rpx;
-				box-sizing: border-box;
-				text-align: center;
-				height: 48rpx;
-				line-height: 48rpx;
-				border-radius: 24rpx;
-				margin:12rpx;
-				padding:.0 30rpx;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-				background-color: #F3F3F3;
-			}
-		}
-	}
-	.s-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-			border-bottom: 2rpx solid #F9F9F9;
-			position: relative;
-			image{
-				width: 36rpx;
-				height: 36rpx;
-				padding: 10rpx;
-				position: absolute;
-				right: 40rpx;
-				top: 24rpx;
-			}
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
-		}
-	}
-	.wanted-block{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			view{
-				width: 50%;
-				color: #8A8A8A;
-				font-size: 28rpx;
-				box-sizing: border-box;
-				text-align: center;
-				padding: 20rpx 0;
-				border-top: 2rpx solid #FFF;
-				border-left: 2rpx solid #FFF;
-				background-color: #F7F7F7;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-			}
-		}
-	}
-	.wanted-circle{
-		margin-top: 30rpx;
-		.header{
-			font-size: 32rpx;
-			padding: 30rpx;
-		}
-		.list{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 0 30rpx 20rpx;
-			view{
-				padding: 8rpx 30rpx;
-				margin: 20rpx 30rpx 0 0;
-				font-size: 28rpx;
-				color: #8A8A8A;
-				background-color: #F7F7F7;
-				box-sizing: border-box;
-				text-align: center;
-				border-radius: 20rpx;
-			}
-		}
-	}
-</style>

pages.json

@@ -374,6 +374,13 @@
 						"enablePullDownRefresh" : true
 					}
 				},
+				{
+					"path": "coupon/coupon-collection-visitor",
+					"style": {
+						"navigationBarTitleText": "领券中心",
+						"enablePullDownRefresh" : true
+					}
+				},
 				{
 					"path": "coupon/coupon-exchange", 
 					"style": {
@@ -558,177 +565,177 @@
 			]
 		},
 		{
-			"root": "h5",
+			"root": "pages/h5/",//活动分包模块
 			"pages": [
 				{
-					"path": "pages/activity/activity",
+					"path": "activity/activity",
 					"style": {
 						"navigationBarTitleText": ""
 					}
 				},
 				{
-					"path": "pages/activity/activity_mid",
+					"path": "activity/activity_mid",
 					"style": {
 						"navigationBarTitleText": "年中大促",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/activity/meobohui",
+					"path": "activity/meobohui",
 					"style": {
 						"navigationBarTitleText": "美博会",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/activity/activity-topic",
+					"path": "activity/activity-topic",
 					"style": {
 						"navigationBarTitleText": "活动专题",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/activity/activity-detail",
+					"path": "activity/activity-detail",
 					"style": {
 						"navigationBarTitleText": "活动专题",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/activity/activity-floorMore",
+					"path": "activity/activity-floorMore",
 					"style": {
 						"navigationBarTitleText": "更多",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/activity/meobohui-booth",
+					"path": "activity/meobohui-booth",
 					"style": {
 						"navigationBarTitleText": "展位图",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/activity/meobohui-supplier",
+					"path": "activity/meobohui-supplier",
 					"style": {
 						"navigationBarTitleText": "参展商",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/article/page",
+					"path": "article/page",
 					"style": {
 						"navigationBarTitleText": "采美采购平台",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/article/path",
+					"path": "article/path",
 					"style": {
 						"navigationBarTitleText": "采美采购平台",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/article/page-image",
+					"path": "article/page-image",
 					"style": {
 						"navigationBarTitleText": "采美采购平台"
 					}
 				},
 				{
-					"path": "pages/article/path-live",
+					"path": "article/path-live",
 					"style": {
 						"navigationBarTitleText": "采美采购平台",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/activity/activity-list",
+					"path": "activity/activity-list",
 					"style": {
 						"navigationBarTitleText": "商品专题",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/other/repair",
+					"path": "other/repair",
 					"style": {
 						"navigationBarTitleText": "维修"
 					}
 				},
 				{
-					"path": "pages/other/brand",
+					"path": "other/brand",
 					"style": {
 						"navigationBarTitleText": "品牌招商"
 					}
 				},
 				{
-					"path": "pages/other/brands",
+					"path": "other/brands",
 					"style": {
 						"navigationBarTitleText": "品牌招商"
 					}
 				}
 			]	
 		},{
-			"root": "search",
+			"root": "pages/search/",//搜索分包模块
 			"pages": [
 				{
-					"path": "pages/search/search",
+					"path": "search",
 					"style": {
 						"navigationBarTitleText": "搜索"
 					}
 				},{
-					"path": "pages/search/search-supplier",
+					"path": "search-supplier",
 					"style": {
 						"navigationBarTitleText": "搜索供应商"
 					}
 				},{ 
-					"path": "pages/search/search-instrument",
+					"path": "search-instrument",
 					"style": {
 						"navigationBarTitleText": "搜索仪器"
 					}
 				},{
-					"path": "pages/search/search-order",
+					"path": "search-order",
 					"style": {
 						"navigationBarTitleText": "订单搜索"
 					}
 				},{
-					"path": "pages/search/search-second",
+					"path": "search-second",
 					"style": {
 						"navigationBarTitleText": "二手搜索"
 					}
 				}
 			]	
 		},{
-			"root": "second",
+			"root": "pages/second/",
 			"pages": [
 				{
-					"path": "pages/form/introduce",
+					"path": "form/introduce",
 					"style": {
 						"navigationBarTitleText": "二手市场介绍",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/form/form",
+					"path": "form/form",
 					"style": {
 						"navigationBarTitleText": "发布二手"
 					}
 				},
 				{
-					"path": "pages/form/form-seller",
+					"path": "form/form-seller",
 					"style": {
 						"navigationBarTitleText": "发布二手"
 					}
 				},
 				{
-					"path": "pages/product/product-list",
+					"path": "product/product-list",
 					"style": {
 						"navigationBarTitleText": "二手商品",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/product/product-details",
+					"path": "product/product-details",
 					"style": {
 						"navigationBarTitleText": "商品详情",
 						"enablePullDownRefresh":true,
@@ -738,62 +745,62 @@
 			]	
 		},
 		{
-			"root": "supplier",
+			"root": "pages/supplier/",
 			"pages": [
 				{
-					"path": "pages/index/index",
+					"path": "index/index",
 					"style": {
 						"navigationBarTitleText": "采美采购商城",
 						"enablePullDownRefresh":true,
 						"navigationStyle":"custom"
 					}
 				},{
-					"path": "pages/login/bind-operator",
+					"path": "login/bind-operator",
 					"style": {
 						"navigationBarTitleText": "绑定微信"
 					}
 				},{
-					"path": "pages/user/my-product",
+					"path": "user/my-product",
 					"style": {
 						"navigationBarTitleText": "我的商品",
 						"enablePullDownRefresh":true
 					}
 				},{
-					"path": "pages/user/my-shop",
+					"path": "user/my-shop",
 					"style": {
 						"navigationBarTitleText": "店铺主页",
 						"enablePullDownRefresh":true
 					}
 				},{
-					"path": "pages/login/share-login",
+					"path": "login/share-login",
 					"style": {
 						"navigationBarTitleText": "查看订单"
 					}
 				},{
-					"path": "pages/login/share-info",
+					"path": "login/share-info",
 					"style": {
 						"navigationBarTitleText": "订单详情",
 						"navigationStyle":"custom"
 					}
 				},{
-					"path": "pages/order/order-details",
+					"path": "order/order-details",
 					"style": {
 						"navigationBarTitleText": "订单详情",
 						"enablePullDownRefresh":true
 					}
 				},{
-					"path": "pages/user/supplier",
+					"path": "user/supplier",
 					"style": {
 						"navigationBarTitleText": "供应商信息"
 					}
 				},{
-					"path": "pages/order/order-list",
+					"path": "order/order-list",
 					"style": {
 						"navigationBarTitleText": "我的订单",
 						"enablePullDownRefresh":true
 					}
 				},{
-					"path": "pages/order/order-service-details",
+					"path": "order/order-service-details",
 					"style": {
 						"navigationBarTitleText": "订单详情",
 						"navigationStyle":"custom",
@@ -801,32 +808,32 @@
 					}
 				},
 				{
-					"path": "pages/deliver/add-logistics",
+					"path": "deliver/add-logistics",
 					"style": {
 						"navigationBarTitleText": "录入物流信息"
 					}
 				},
 				{
-					"path": "pages/deliver/qualifications-add",
+					"path": "deliver/qualifications-add",
 					"style": {
 						"navigationBarTitleText": "上传商品资质"
 					}
 				},
 				{
-					"path": "pages/deliver/qualifications-details",
+					"path": "deliver/qualifications-details",
 					"style": {
 						"navigationBarTitleText": "商品资质"
 					}
 				},
 				{
-					"path": "pages/deliver/deliver-goods",
+					"path": "deliver/deliver-goods",
 					"style": {
 						"navigationBarTitleText": "发货",
 						"enablePullDownRefresh":true
 					}
 				},
 				{
-					"path": "pages/deliver/deliver-record",
+					"path": "deliver/deliver-record",
 					"style": {
 						"navigationBarTitleText": "发货记录",
 						"enablePullDownRefresh":true,
@@ -834,43 +841,43 @@
 					}
 				},
 				{
-					"path": "pages/deliver/logistics-list",
+					"path": "deliver/logistics-list",
 					"style": {
 						"navigationBarTitleText": "物流公司"
 					}
 				},
 				{
-					"path": "pages/user/setting/password",
+					"path": "user/setting/password",
 					"style": {
 						"navigationBarTitleText": "修改密码"
 					}
 				},
 				{
-					"path": "pages/user/setting/phone",
+					"path": "user/setting/phone",
 					"style": {
 						"navigationBarTitleText": "更换手机号"
 					}
 				},
 				{
-					"path": "pages/user/setting/setting",
+					"path": "user/setting/setting",
 					"style": {
 						"navigationBarTitleText": "账户设置"
 					}
 				},
 				{
-					"path": "pages/user/operator/list",
+					"path": "user/operator/list",
 					"style": {
 						"navigationBarTitleText": "运营人员管理"
 					}
 				},
 				{
-					"path": "pages/user/operator/addoperator",
+					"path": "user/operator/addoperator",
 					"style": {
 						"navigationBarTitleText": "添加运营人员"
 					}
 				},
 				{
-					"path": "pages/user/information",
+					"path": "user/information",
 					"style": {
 						"navigationBarTitleText": "资料信息"
 					}

pages/goods/good-floorMore.vue

@@ -52,7 +52,7 @@
 		},
 		data(){
 			return{
-				clickPath:'/search/pages/search/search',
+				clickPath:'/pages/search/search',
 				hotSearchText:'搜索商品/项目仪器',	
 				userIdentity:0,
 				skeletonShow:true,

pages/goods/goods-instrument.vue

@@ -100,20 +100,20 @@
 					const typeMap = {
 					 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.title}`,
 					 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-						4:`/h5/pages/activity/activity?title=${pros.crmTitle}&link=${pros.crmLink}`,
+						4:`/pages/h5/activity/activity?title=${pros.crmTitle}&link=${pros.crmLink}`,
 					 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-					 	// 7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-					 	8:`/h5/pages/activity/activity-list`,
-					 	9:`/second/pages/form/introduce`,
-					 	10:`/second/pages/product/product-list`,
-					 	11:`/second/pages/form/form`,
-					 	12:`/search/pages/search/search?keyWord=${pros.linkParam.keyword}`,
-					 	13:`/h5/pages/article/path?link=${pros.link}`,
-					 	14:`/h5/pages/article/path?link=${pros.link}`,
-					 	15:`/h5/pages/article/path?link=${pros.link}`,
+					 	// 7:`/pages/supplier/user/my-shop?shopId=${pros.linkParam.id}`,
+					 	8:`/pages/h5/activity/activity-list`,
+					 	9:`/pages/second/form/introduce`,
+					 	10:`/pages/second/product/product-list`,
+					 	11:`/pages/second/form/form`,
+					 	12:`/pages/search/search?keyWord=${pros.linkParam.keyword}`,
+					 	13:`/pages/h5/article/path?link=${pros.link}`,
+					 	14:`/pages/h5/article/path?link=${pros.link}`,
+					 	15:`/pages/h5/article/path?link=${pros.link}`,
 					 	17:`/pages/login/register-select`,
-					 	18:`/h5/pages/article/path?link=${pros.link}`,
-					 	19:`/search/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`
+					 	18:`/pages/h5/article/path?link=${pros.link}`,
+					 	19:`/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`
 					}
 					const url = typeMap[pros.linkType];
 					uni.navigateTo({

pages/goods/product.vue

@@ -397,7 +397,7 @@
 		},
 		data(){
 			return{			
-				clickPath:'/search/pages/search/search',
+				clickPath:'/pages/search/search',
 				html:'<div style="text-align: center;color:#333333;">暂无内容</div>',
 				productNoneImage:'https://static.caimei365.com/app/img/icon/icon-pnone.png',
 				mode:'round',
@@ -856,7 +856,7 @@
 				});
 			},
 			goSupplier(){//跳供应商资料页
-				this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+this.shopId)
+				this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+this.shopId)
 			},
 			discard(){
 				//丢弃
@@ -2120,7 +2120,7 @@
 			width: 100%;
 			float: left;
 			&.coupon{
-				padding-bottom: 24rpx;
+				padding-bottom: 40rpx;
 			}
 			.tui-popup-scroll{
 				width: 100%;
@@ -2132,6 +2132,9 @@
 					box-sizing: border-box;
 					background: url(https://static.caimei365.com/app/img/icon/icon-coupon-uesb@2x.png);
 					background-size: cover;
+					&:last-child{
+						margin-bottom: 24rpx;
+					}
 					.list-cell-le{
 						width: 224rpx;
 						height: 100%;

h5/pages/activity/activity-floorMore.vue → pages/h5/activity/activity-floorMore.vue

@@ -98,7 +98,7 @@
 		},
 		data(){
 			return{
-				clickPath:'/search/pages/search/search',
+				clickPath:'/pages/search/search',
 				hotSearchText:'搜索商品/项目仪器',	
 				userIdentity:0,
 				skeletonShow:true,

h5/pages/activity/activity-list.vue → pages/h5/activity/activity-list.vue

@@ -99,7 +99,7 @@
 			NavigateToActivity(item){//跳转活动详情
 				if(item.status!=3 ){
 					if(item.crmLink){
-						this.$api.navigateTo(`/h5/pages/activity/activity?title=${item.title}&link=${item.crmLink}`)
+						this.$api.navigateTo(`/pages/h5/activity/activity?title=${item.title}&link=${item.crmLink}`)
 					}
 				}else{
 					this.$util.msg('活动已经结束',2000)

h5/pages/activity/activity_mid.vue → pages/h5/activity/activity_mid.vue

@@ -251,7 +251,7 @@
 				}
 				return {
 				  title: '采美年中大促，折扣满满，全场低至9元~',
-				  path: '/h5/pages/activity/activity_mid',
+				  path: '/pages/h5/activity/activity_mid',
 				  imageUrl:'https://admin.caimei365.com/userfiles/1/images/photo/2020/08/share%402x.png'
 				}
 			},
@@ -279,7 +279,7 @@
 		    }
 			return {
 				title: '采美年中大促，折扣满满，全场低至9元~',
-				path: '/h5/pages/activity/activity_mid',
+				path: '/pages/h5/activity/activity_mid',
 				imageUrl:'https://admin.caimei365.com/userfiles/1/images/photo/2020/08/share%402x.png'
 			}
 		},

h5/pages/activity/meobohui-booth.vue → pages/h5/activity/meobohui-booth.vue

@@ -91,7 +91,7 @@
 		    }
 			return {
 			  title: '生美医美正品采购服务平台',
-			  path: '/h5/pages/activity/meobohui',
+			  path: '/pages/h5/activity/meobohui',
 			  imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
 			}
 		},

h5/pages/activity/meobohui-supplier.vue → pages/h5/activity/meobohui-supplier.vue

@@ -62,9 +62,9 @@
 			...mapMutations(['login','logout']),
 			goSupplierPath(type,value,keyWord){
 				if(type == 1){
-					this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
+					this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+value)
 				}else if(type == 2){
-					this.$api.navigateTo(`/search/pages/search/search?keyWord=${keyWord}`)
+					this.$api.navigateTo(`/pages/search/search?keyWord=${keyWord}`)
 				}
 			},
 		},
@@ -85,7 +85,7 @@
 		    }
 			return {
 			  title: '生美医美正品采购服务平台',
-			  path: '/h5/pages/activity/meobohui',
+			  path: '/pages/h5/activity/meobohui',
 			  imageUrl:'https://static.caimei365.com/app/img/bg/min-banner.jpg'
 			}
 		},

h5/pages/activity/meobohui.vue → pages/h5/activity/meobohui.vue

@@ -22,7 +22,7 @@
 			<view class="tui-group-name">
 				<view class="tui-group-title">
 					<view class="tui-group-l">参展商</view>
-					<view class="tui-group-r" @click="NavToDetailPage('/h5/pages/activity/meobohui-supplier')">
+					<view class="tui-group-r" @click="NavToDetailPage('/pages/h5/activity/meobohui-supplier')">
 						<text>更多</text>
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
@@ -61,7 +61,7 @@
 			<view class="tui-group-name">
 				<view class="tui-group-title">
 					<view class="tui-group-l">展位图</view>
-					<view class="tui-group-r" @click="NavToDetailPage('/h5/pages/activity/meobohui-booth')">
+					<view class="tui-group-r" @click="NavToDetailPage('/pages/h5/activity/meobohui-booth')">
 						<text>更多</text>
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
@@ -298,7 +298,7 @@
 					if(this.userIdentity == 2 || this.userIdentity == 4){
 						this.$api.navigateTo('/pages/user/coupon/coupon')
 					}else if(this.userIdentity == 3){
-						this.$api.navigateTo('/supplier/pages/index/index')
+						this.$api.navigateTo('/pages/supplier/index/index')
 					}else{
 						return;
 					}
@@ -340,13 +340,13 @@
 			},
 			goSupplierPath(type,value,keyWord){
 				if(type == 1){
-					this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
+					this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+value)
 				}else if(type == 2){
-					this.$api.navigateTo(`/search/pages/search/search?keyWord=${keyWord}`)
+					this.$api.navigateTo(`/pages/search/search?keyWord=${keyWord}`)
 				}
 			},
 			LiveGoPathPros(live){
-				this.$api.navigateTo(`/h5/pages/article/page-image?title=${live.optionTitle}&image=${live.liveImg}`)
+				this.$api.navigateTo(`/pages/h5/article/page-image?title=${live.optionTitle}&image=${live.liveImg}`)
 			},
 			PromotionsFormat(promo){//促销活动类型数据处理
 				if(promo!=null){
@@ -385,7 +385,7 @@
 		    }
 			return {
 			  title: '美博会震撼开启，重磅优惠等你来领~',
-			  path: '/h5/pages/activity/meobohui',
+			  path: '/pages/h5/activity/meobohui',
 			  imageUrl:'http://static.caimei365.com/app/meibohui/meibo_share_01.jpg'
 			}
 		},

h5/pages/other/brand.vue → pages/h5/other/brand.vue

@@ -54,7 +54,7 @@
 				switch(index){
 					case 1:
 						let path ='https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
-						this.$api.navigateTo(`/h5/pages/activity/activity?link=${path}&title=品牌OEM服务`)
+						this.$api.navigateTo(`/pages/h5/activity/activity?link=${path}&title=品牌OEM服务`)
 						break;
 					case 2:
 						this.isBannerHome = false

h5/pages/other/brands.vue → pages/h5/other/brands.vue

@@ -35,7 +35,7 @@
 				switch(index){
 					case 1:
 						let path ='https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
-						this.$api.navigateTo(`/h5/pages/activity/activity?link=${path}&title=品牌OEM服务`)
+						this.$api.navigateTo(`/pages/h5/activity/activity?link=${path}&title=品牌OEM服务`)
 						break;
 					case 2:
 						this.isBannerHome = false

h5/pages/other/repair.vue → pages/h5/other/repair.vue

@@ -24,7 +24,7 @@
 		},
 		methods:{
 			NavToH5Page() {//跳转H5超皮秒防伪查询
-				 this.$api.navigateTo(`/h5/pages/article/page?linkType=101`)
+				 this.$api.navigateTo(`/pages/h5/article/page?linkType=101`)
 			}
 		},
 		onShow() {

pages/login/bindOperator.vue

@@ -127,7 +127,7 @@
 						}else if(response.data.userIdentity === 2 || response.data.userIdentity === 4){
 							this.$api.switchTabTo('/pages/tabBar/user/user')
 						}else if(response.data.userIdentity === 3){
-							this.$api.navigateTo('/supplier/pages/index/index')
+							this.$api.navigateTo('/pages/supplier/index/index')
 						}else{
 							this.isUserInfo= true
 						}

pages/login/binding.vue

@@ -204,7 +204,7 @@
 						}else if(response.data.userIdentity === 2 || response.data.userIdentity === 4){
 							this.$api.switchTabTo('/pages/tabBar/user/user')
 						}else if(response.data.userIdentity === 3){
-							this.$api.navigateTo('/supplier/pages/index/index')
+							this.$api.navigateTo('/pages/supplier/index/index')
 						}else{
 							this.GetClubUserInfo()
 							this.isRegisterShow= true

pages/login/bindwechat.vue

@@ -155,11 +155,11 @@
 				)
 				.then(response =>{
 					if(this.userIdentity === 3){
-						this.$api.navigateTo('/supplier/pages/index/index')
+						this.$api.navigateTo('/pages/supplier/index/index')
 					}else{
 						switch(this.isLoginType){
 							case 9:
-								this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+								this.$api.navigateTo(`/pages/h5/activity/activity_mid`)
 								break;
 							case 8:
 								this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
@@ -208,21 +208,21 @@
 					.then(res =>{
 						const TIME_COUNT = 60;
 						this.$util.msg('验证短信已发送',2000)
-				     	if (!this.codeTime) {
-				       		this.count = TIME_COUNT;
+				     	if (!this.codeTime) {
+				       		this.count = TIME_COUNT;
 							this.isMobileDisabled = true;
-				       		this.codeTime = setInterval(() => {
-				       			if (this.count > 1 && this.count <= TIME_COUNT) {
-				         			this.count--
-				         			this.mobileCodeText = this.count +'s重新发送'
-				        		} else {
-					         		this.isMobileDisabled = false;
-					         		clearInterval(this.codeTime)
-					         		this.codeTime = null
+				       		this.codeTime = setInterval(() => {
+				       			if (this.count > 1 && this.count <= TIME_COUNT) {
+				         			this.count--
+				         			this.mobileCodeText = this.count +'s重新发送'
+				        		} else {
+					         		this.isMobileDisabled = false;
+					         		clearInterval(this.codeTime)
+					         		this.codeTime = null
 									this.mobileCodeText = '获取验证码'
-				        		}
-				       		},1000)
-				      	}
+				        		}
+				       		},1000)
+				      	}
 					})
 					.catch( error =>{
 						this.$util.msg(error.msg,2000)

pages/login/logincode.vue

@@ -85,13 +85,13 @@
 					wxLogin.wxLoginAuthorize()
 					if(response.data.userIdentity === 3){
 						setTimeout(()=>{
-							this.$api.navigateTo('/supplier/pages/index/index')
+							this.$api.navigateTo('/pages/supplier/index/index')
 						},1500)
 					}else{
 						setTimeout(()=>{
 							switch(this.isLoginType){
 								case 9:
-									this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+									this.$api.navigateTo(`/pages/h5/activity/activity_mid`)
 									break;
 								case 8:
 									this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)

search/pages/search/search-instrument.vue → pages/search/search-instrument.vue

@@ -172,7 +172,7 @@
 		    }
 			return {
 			  title: `做项目找仪器，上采美`,
-			  path: `search/pages/search/search-instrument?type=share&keyWord=${this.listQuery.keyword}`
+			  path: `pages/search/search-instrument?type=share&keyWord=${this.listQuery.keyword}`
 			}
 		},
 		onShow() {

search/pages/search/search-second.vue → pages/search/search-second.vue

@@ -208,7 +208,7 @@
 			},
 			navToDetailPage(id) {
 				this.isModallayer = true;
-				this.$api.navigateTo(`/second/pages/product/product-details?id=${id}`);
+				this.$api.navigateTo(`/pages/second/product/product-details?id=${id}`);
 				this.isModallayer = false;
 			},
 			setScrollHeight() {

search/pages/search/search-supplier.vue → pages/search/search-supplier.vue

@@ -202,7 +202,7 @@
 				return Array
 			},
 			goSupplier(value){//跳供应商资料页
-				this.$api.navigateTo('/supplier/pages/user/my-shop?shopId='+value)
+				this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+value)
 			},
 		},
 		onReachBottom() {
@@ -218,7 +218,7 @@
 		    }
 			return {
 			  title: `采美正品供应商，质量有保证！`,
-			  path: `search/pages/search/search-supplier?type=share&keyWord=${this.listQuery.keyword}`
+			  path: `pages/search/search-supplier?type=share&keyWord=${this.listQuery.keyword}`
 			}
 		},
 		onShow() {

search/pages/search/search.vue → pages/search/search.vue

@@ -281,11 +281,11 @@
 							break;
 						case 2:
 							this.setSearchHistoryAdd()
-							this.$api.navigateTo(`/search/pages/search/search-supplier?keyWord=${this.listQuery.keyword}`);
+							this.$api.navigateTo(`/pages/search/search-supplier?keyWord=${this.listQuery.keyword}`);
 							break;
 						case 3:
 							this.setSearchHistoryAdd()
-							this.$api.navigateTo(`/search/pages/search/search-instrument?keyWord=${this.listQuery.keyword}`);
+							this.$api.navigateTo(`/pages/search/search-instrument?keyWord=${this.listQuery.keyword}`);
 							break;
 					}
 				}
@@ -469,7 +469,7 @@
 		    }
 			return {
 			  title: `点击查看“${this.listQuery.keyword}”相关的商品`,
-			  path: `search/pages/search/search?type=share&keyWord=${this.listQuery.keyword}`
+			  path: `pages/search/search?type=share&keyWord=${this.listQuery.keyword}`
 			}
 		},
 		onShow() {

second/pages/form/form-seller.vue → pages/second/form/form-seller.vue

@@ -621,7 +621,7 @@
 					'signType': data.signType,
 					'paySign': data.paySign,
 					'success':function(res){
-						wx.reLaunch({url: 'second/pages/product/product-list'});
+						wx.reLaunch({url: '/pages/second/product/product-list'});
 					},
 					'fail':function(res){
 						self.$util.msg('用户取消支付~')

second/pages/form/form.vue → pages/second/form/form.vue

@@ -621,7 +621,7 @@
 					'signType': data.signType,
 					'paySign': data.paySign,
 					'success':function(res){
-						wx.reLaunch({url: 'second/pages/product/product-list'});
+						wx.reLaunch({url: '/pages/second/product/product-list'});
 					},
 					'fail':function(res){
 						self.$util.msg('用户取消支付~')

second/pages/form/introduce.vue → pages/second/form/introduce.vue

@@ -103,13 +103,13 @@
 		},
 		methods:{
 			gotoform:function(){
-				this.$api.navigateTo('/second/pages/form/form');
+				this.$api.navigateTo('/pages/second/form/form');
 			},
 			gotolist:function(){
-				this.$api.navigateTo('/second/pages/product/product-list');
+				this.$api.navigateTo('/pages/second/product/product-list');
 			},
 			gotorepair:function(){
-				this.$api.navigateTo('/h5/pages/article/page?linkType=7');
+				this.$api.navigateTo('/pages/h5/article/page?linkType=7');
 			},
 		},
 		

second/pages/product/product-details.vue → pages/second/product/product-details.vue

@@ -164,7 +164,7 @@
 		data(){
 			return{		
 				productNoneImage:'https://static.caimei365.com/app/img/icon/icon-pnone.png',
-				clickPath:'/search/pages/search/search-second',
+				clickPath:'/pages/search/search-second',
 				disabledTabNavList:[{name:'相关推荐'}],
 				mode:'round',
 				iconClass:'icon-aixin',
@@ -306,7 +306,7 @@
 			    }
 				return {
 				  title: `${this.product.name}`,
-				  path: `second/pages/product/product-details?type=share&id=${this.productID}`,
+				  path: `pages/second/product/product-details?type=share&id=${this.productID}`,
 				  imageUrl:`${this.product.imageList[0]}`
 				}
 			},
@@ -413,7 +413,7 @@
 		    }
 			return {
 			  title: `${this.product.name}`,
-			  path: `second/pages/product/product-details?type=share&id=${this.productID}`,
+			  path: `pages/second/product/product-details?type=share&id=${this.productID}`,
 			  imageUrl:`${this.product.imageList[0]}`
 			}
 		},

second/pages/product/product-list.vue → pages/second/product/product-list.vue

@@ -76,10 +76,10 @@
 		            </view>
 		        </view>
 				<view class="fabu" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }" v-if="identity == 1">
-					 <text  class="intro long" @click.stop="navigator('/second/pages/form/introduce')" >二手市场介绍</text>
+					 <text  class="intro long" @click.stop="navigator('/pages/second/form/introduce')" >二手市场介绍</text>
 				</view>
 				<view class="fabu" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }" v-else>
-					 <text  class="intro"  @click.stop="navigator('/second/pages/form/introduce')" >二手市场介绍</text>
+					 <text  class="intro"  @click.stop="navigator('/pages/second/form/introduce')" >二手市场介绍</text>
 					 <text  class="release" @click.stop="NavigatorRelease" >我要发布</text>
 				</view>
 				<!-- 透明模态层 -->
@@ -102,7 +102,7 @@
 			return{
 				userId:0,
 				isIphoneX:this.$store.state.isIphoneX,
-				clickPath:'/search/pages/search/search-second',
+				clickPath:'/pages/search/search-second',
 				isShowClose:false,
 				isModallayer:false,
 				currentId:1,
@@ -198,7 +198,7 @@
 			},	
 			navToDetailPage:function(id) {
 				this.isModallayer = true;
-				this.$api.navigateTo(`/second/pages/product/product-details?id=${id}`);
+				this.$api.navigateTo(`/pages/second/product/product-details?id=${id}`);
 				this.isModallayer = false;
 			},
 			gettabList:function (loadMore) {
@@ -272,7 +272,7 @@
 						Um_Key_SourcePage: '二手市场列表',
 					})
 				}
-				this.$api.navigateTo('/second/pages/form/form')
+				this.$api.navigateTo('/pages/second/form/form')
 			}
 		},
 		onShareAppMessage(res){//分享转发
@@ -281,7 +281,7 @@
 		    }
 			return {
 			  title: `欢迎来到采美二手市场~`,
-			  path: `search/pages/search-instrument?keyWord=${this.listQuery.keyword}`
+			  path: `pages/search/search-instrument?keyWord=${this.listQuery.keyword}`
 			}
 		},	
 		onShow() {

supplier/pages/deliver/add-logistics.vue → pages/supplier/deliver/add-logistics.vue

@@ -155,7 +155,7 @@
 			pageNavigateTo(index){//选择物流公司
 				this.isChange = false
 				this.checkLogicsIndex = index
-				this.$api.navigateTo(`/supplier/pages/deliver/logistics-list?selectID=${this.selectID}`)
+				this.$api.navigateTo(`/pages/supplier/deliver/logistics-list?selectID=${this.selectID}`)
 			},
 			showShowRemarksFn(){//显示发货备注
 				this.isShowRemarks = !this.isShowRemarks 
@@ -238,7 +238,7 @@
 				this.ShopService.ShopAddLogisticsInfo({params:JSON.stringify(params)}).then(response =>{
 					this.$util.msg('添加物流成功',2000,true,'success')
 					setTimeout(()=>{
-						this.$api.navigateTo(`/supplier/pages/deliver/deliver-record?shopOrderId=${this.info.shopOrderId}`)
+						this.$api.navigateTo(`/pages/supplier/deliver/deliver-record?shopOrderId=${this.info.shopOrderId}`)
 					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -300,7 +300,7 @@
 					this.$util.msg('发货成功',2000,true,'success')
 					let logisticsBatchId = response.data
 					setTimeout(()=>{
-						this.$api.navigateTo(`/supplier/pages/deliver/qualifications-add?logisticsBatchId=${logisticsBatchId}&shopOrderId=${this.info.shopOrderId}`)
+						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-add?logisticsBatchId=${logisticsBatchId}&shopOrderId=${this.info.shopOrderId}`)
 					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);

supplier/pages/deliver/deliver-goods.vue → pages/supplier/deliver/deliver-goods.vue

@@ -195,7 +195,7 @@
 					this.$util.msg("请先选择商品~",2000);
 					return
 				}else{
-					this.$api.navigateTo(`/supplier/pages/deliver/add-logistics?type=add&shopOrderId=${this.shopOrderId}&data=${JSON.stringify(setProductList)}`)
+					this.$api.navigateTo(`/pages/supplier/deliver/add-logistics?type=add&shopOrderId=${this.shopOrderId}&data=${JSON.stringify(setProductList)}`)
 				}
 			},
 		},

supplier/pages/deliver/deliver-record.vue → pages/supplier/deliver/deliver-record.vue

@@ -225,10 +225,10 @@
 								logisticsBatchId:hanldData.id,
 								logisticsBatchData:setProductList
 							}
-						this.$api.navigateTo(`/supplier/pages/deliver/add-logistics?type=reple&shopOrderId=${this.shopOrderId}&data=${JSON.stringify(data)}`)
+						this.$api.navigateTo(`/pages/supplier/deliver/add-logistics?type=reple&shopOrderId=${this.shopOrderId}&data=${JSON.stringify(data)}`)
 						break
 					case 'qualifications':
-						this.$api.navigateTo(`/supplier/pages/deliver/qualifications-details?logisticsBatchId=${hanldData.id}&shopOrderId=${this.shopOrderId}`)
+						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-details?logisticsBatchId=${hanldData.id}&shopOrderId=${this.shopOrderId}`)
 						break
 						
 				}
@@ -246,10 +246,10 @@
 				})
 			},
 			pageGoLink(){
-				this.$api.navigateTo('/supplier/pages/deliver/deliver-goods?shopOrderId='+this.shopOrderId)
+				this.$api.navigateTo('/pages/supplier/deliver/deliver-goods?shopOrderId='+this.shopOrderId)
 			},
 			hanldPageDetails(){
-				this.$api.navigateTo('/supplier/pages/order/order-details?shopOrderId='+this.shopOrderId)
+				this.$api.navigateTo('/pages/supplier/order/order-details?shopOrderId='+this.shopOrderId)
 			}
 		},
 		onPullDownRefresh() {//下拉刷新

supplier/pages/deliver/qualifications-add.vue → pages/supplier/deliver/qualifications-add.vue

@@ -183,7 +183,7 @@
 				.then(response =>{
 					this.$util.msg('保存成功',2000);
 					setTimeout(()=>{
-						this.$api.navigateTo(`/supplier/pages/deliver/deliver-record?shopOrderId=${this.shopOrderId}`)
+						this.$api.navigateTo(`/pages/supplier/deliver/deliver-record?shopOrderId=${this.shopOrderId}`)
 					},2000)
 				})
 				.catch(error =>{
@@ -259,7 +259,7 @@
 				}
 			},
 			editButtonCanel(){
-				this.$api.navigateTo(`/supplier/pages/deliver/deliver-record?shopOrderId=${this.shopOrderId}`)
+				this.$api.navigateTo(`/pages/supplier/deliver/deliver-record?shopOrderId=${this.shopOrderId}`)
 			},
 		},
 		onShow() {

supplier/pages/deliver/qualifications-details.vue → pages/supplier/deliver/qualifications-details.vue

@@ -80,10 +80,10 @@
 			editSubmitFn(type){
 				switch(type){
 					case 'edit':
-						this.$api.navigateTo(`/supplier/pages/deliver/qualifications-add?type=edit&logisticsBatchId=${this.logisticsBatchId}&shopOrderId=${this.shopOrderId}`)
+						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-add?type=edit&logisticsBatchId=${this.logisticsBatchId}&shopOrderId=${this.shopOrderId}`)
 						break;
 					case 'add':
-						this.$api.navigateTo(`/supplier/pages/deliver/qualifications-add?type=add&logisticsBatchId=${this.logisticsBatchId}&shopOrderId=${this.shopOrderId}`)
+						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-add?type=add&logisticsBatchId=${this.logisticsBatchId}&shopOrderId=${this.shopOrderId}`)
 						break;
 				}
 			},

supplier/pages/login/bind-operator.vue → pages/supplier/login/bind-operator.vue

@@ -151,21 +151,21 @@
 					.then(res =>{
 					const TIME_COUNT = 60;
 					this.$util.msg('验证短信已发送',2000)
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
+			     	if (!this.codeTime) {
+			       		this.count = TIME_COUNT;
 						this.isMobileDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.mobileCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
+			       		this.codeTime = setInterval(() => {
+			       			if (this.count > 1 && this.count <= TIME_COUNT) {
+			         			this.count--
+			         			this.mobileCodeText = this.count +'s重新发送'
+			        		} else {
+				         		this.isMobileDisabled = false;
+				         		clearInterval(this.codeTime)
+				         		this.codeTime = null
 								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
+			        		}
+			       		},1000)
+			      	}
 				}).catch( error =>{
 					this.$util.msg(error.msg,2000)
 					this.isMobileDisabled = false;
@@ -188,7 +188,7 @@
 								unionId:this.bind_supplierInfo.unionId
 						}
 						this.ShopService.BindShopOperator(params).then(response =>{
-							this.$api.navigateTo(`/supplier/pages/order/order-details?shopOrderId=${this.shopOrderId}`)
+							this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${this.shopOrderId}`)
 						}).catch(error =>{
 							this.$util.msg(error.msg,2000)
 						})	

supplier/pages/login/share-info.vue → pages/supplier/login/share-info.vue

@@ -57,23 +57,23 @@
 							switch(res.data.resultCode){
 								case 1:
 									this.shopOrderId = res.data.shopOrderId;
-									this.$api.navigateTo(`/supplier/pages/order/order-service-details?shopOrderId=${this.shopOrderId}`)
+									this.$api.navigateTo(`/pages/supplier/order/order-service-details?shopOrderId=${this.shopOrderId}`)
 									break;
 								case 2:
 									console.log('供应商联系人');
-									this.$api.navigateTo(`/supplier/pages/order/order-details?shopOrderId=${this.shopOrderId}`)
+									this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${this.shopOrderId}`)
 									break;
 								case 3:
 									console.log('供应商发货人员');
-									this.$api.navigateTo(`/supplier/pages/order/order-details?shopOrderId=${this.shopOrderId}`)
+									this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${this.shopOrderId}`)
 									break;
 							}
 						}).catch(err =>{
 							if(this.source == 2){
 								this.$api.setStorage('bind_supplierInfo', err.data)
-								this.$api.navigateTo(`/supplier/pages/login/bind-operator?shopOrderId=${this.shopOrderId}`)
+								this.$api.navigateTo(`/pages/supplier/login/bind-operator?shopOrderId=${this.shopOrderId}`)
 							}else if(this.source == 3){
-								this.$api.navigateTo(`/supplier/pages/login/share-login?shopOrderId=${this.shopOrderId}`)
+								this.$api.navigateTo(`/pages/supplier/login/share-login?shopOrderId=${this.shopOrderId}`)
 							}else{
 								this.isRequest = true;
 							}

supplier/pages/login/share-login.vue → pages/supplier/login/share-login.vue

@@ -58,7 +58,7 @@
 						this.ShopService.MiniShipments(params).then(res =>{
 							if(res.data.resultCode ==3){
 								console.log('供应商发货人员');
-								this.$api.navigateTo(`/supplier/pages/order/order-details?shopOrderId=${this.shopOrderId}`)
+								this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${this.shopOrderId}`)
 							}
 						}).catch(error =>{
 							this.$util.msg(error.msg,2000);

supplier/pages/order/order-details.vue → pages/supplier/order/order-details.vue

@@ -207,10 +207,10 @@
 			handShowAlert(type){//判断点击的按钮类型并执行...
 				switch(type){
 					case 'record':
-						this.$api.navigateTo('/supplier/pages/deliver/deliver-record?shopOrderId='+this.shopOrderId)
+						this.$api.navigateTo('/pages/supplier/deliver/deliver-record?shopOrderId='+this.shopOrderId)
 						break
 					case 'deliver':
-						this.$api.navigateTo('/supplier/pages/deliver/deliver-goods?shopOrderId='+this.shopOrderId)
+						this.$api.navigateTo('/pages/supplier/deliver/deliver-goods?shopOrderId='+this.shopOrderId)
 						break
 				}
 			},
@@ -288,7 +288,7 @@
 			    }
 				return {
 					title: '您有订单待处理，请点击查看~',
-					path: `/supplier/pages/login/share-info?authority=3&shopOrderId=${this.shopOrderId}`,
+					path: `/pages/supplier/login/share-info?authority=3&shopOrderId=${this.shopOrderId}`,
 					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			}

supplier/pages/order/order-list.vue → pages/supplier/order/order-list.vue

@@ -252,7 +252,7 @@
 			},
 			detail(shopOrderId) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/supplier/pages/order/order-details?shopOrderId=${shopOrderId}`)
+				this.$api.navigateTo(`/pages/supplier/order/order-details?shopOrderId=${shopOrderId}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				console.log(data)
@@ -264,10 +264,10 @@
 			handShowAlert(data){//判断点击的按钮类型并执行...
 				switch(data.type){
 					case 'record':
-						this.$api.navigateTo('/supplier/pages/deliver/deliver-record?shopOrderId='+this.btnoRderID)
+						this.$api.navigateTo('/pages/supplier/deliver/deliver-record?shopOrderId='+this.btnoRderID)
 						break
 					case 'deliver':
-						this.$api.navigateTo('/supplier/pages/deliver/deliver-goods?shopOrderId='+this.btnoRderID)
+						this.$api.navigateTo('/pages/supplier/deliver/deliver-goods?shopOrderId='+this.btnoRderID)
 						break
 				}
 			},
@@ -305,7 +305,7 @@
 		    }
 			return {
 				title: '您有订单待处理，请点击查看~',
-				path: `/supplier/pages/login/share-info?authority=3&shopOrderId=${this.btnoRderID}`,
+				path: `/pages/supplier/login/share-info?authority=3&shopOrderId=${this.btnoRderID}`,
 				imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 			}
 		},

supplier/pages/order/order-service-details.vue → pages/supplier/order/order-service-details.vue

@@ -224,7 +224,7 @@
 			    }
 				return {
 					title: '您有订单待处理，请点击查看~',
-					path: `/supplier/pages/login/share-info?authority=2&shopOrderId=${this.shopOrderId}`,
+					path: `/pages/supplier/login/share-info?authority=2&shopOrderId=${this.shopOrderId}`,
 					imageUrl:'https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SABnOFABZCgCzFV_g063.png'
 				}
 			},

supplier/pages/user/my-shop.vue → pages/supplier/user/my-shop.vue

@@ -441,7 +441,7 @@
 				return name
 			},
 			goSupplier(){//跳供应商资料页
-				this.$api.navigateTo('/supplier/pages/user/supplier?shopId='+this.supplierId)
+				this.$api.navigateTo('/pages/supplier/user/supplier?shopId='+this.supplierId)
 			},
 			navToDetailPage(id) {//跳转商品详情页
 				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
@@ -473,7 +473,7 @@
 		    }
 			return {
 			  title: `进入店铺，发现惊喜`,
-			  path: `supplier/pages/user/my-shop?type=share&shopId=${this.listQuery.id}`
+			  path: `pages/supplier/user/my-shop?type=share&shopId=${this.listQuery.id}`
 			}
 		},
 		onShow(){

supplier/pages/user/operator/list.vue → pages/supplier/user/operator/list.vue

@@ -59,7 +59,7 @@
 			</view>
 		</view>
 		<div class="operator-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
-			<view class="add-btn" @click="this.$api.navigateTo('/supplier/pages/user/operator/addoperator')">添加运营人员</view>
+			<view class="add-btn" @click="this.$api.navigateTo('/pages/supplier/user/operator/addoperator')">添加运营人员</view>
 		</div>
 		<view class="operator-model" v-if="isOperatorModel" @click.stop="closeModel">
 			<view class="operator-alert">

supplier/pages/user/setting/setting.vue → pages/supplier/user/setting/setting.vue

@@ -2,14 +2,14 @@
 	<view class="container clearfix">
 		<view class="foot-list">
 			<view class="list-cell-item">
-				<view class="list-cell" @click="navigator(`/supplier/pages/user/setting/phone?phone=${bindMobile}`)" hover-class="cell-hover" :hover-stay-time="50">
+				<view class="list-cell" @click="navigator(`/pages/supplier/user/setting/phone?phone=${bindMobile}`)" hover-class="cell-hover" :hover-stay-time="50">
 					<text class="cell-tit">更换手机号</text>
 					<text class="cell-more">
 						<text class="txt">{{hidePhone(bindMobile)}}</text>
 						<text class="iconfont icon-xiayibu"></text>
 					</text>
 				</view>
-				<view class="list-cell" @click="navigator('/supplier/pages/user/setting/password')" hover-class="cell-hover" :hover-stay-time="50">
+				<view class="list-cell" @click="navigator('/pages/supplier/user/setting/password')" hover-class="cell-hover" :hover-stay-time="50">
 					<text class="cell-tit">修改密码</text>
 					<text class="cell-more iconfont icon-xiayibu"></text>
 				</view>

pages/tabBar/cart/cart.vue

@@ -1670,6 +1670,9 @@
 					box-sizing: border-box;
 					background: url(https://static.caimei365.com/app/img/icon/icon-coupon-uesb@2x.png);
 					background-size: cover;
+					&:last-child{
+						margin-bottom: 24rpx;
+					}
 					.list-cell-le{
 						width: 224rpx;
 						height: 100%;

pages/tabBar/home/index.vue

@@ -115,7 +115,7 @@
 					if(response.data.userIdentity ==1){
 						this.$api.redirectTo('/seller/pages/index/index')
 					}else if(response.data.userIdentity === 3){
-						this.$api.redirectTo('/supplier/pages/index/index')
+						this.$api.redirectTo('/pages/supplier/index/index')
 					}
 					this.GetInitBeansInfo()
 					this.getHomeInformation()

pages/tabBar/user/user.vue

@@ -179,7 +179,7 @@
 							<text class="cell-tit">关于我们</text>
 							<text class="cell-more iconfont icon-xiayibu"></text>
 						</view>
-						<view class="list-cell last" @click="this.$api.navigateTo('/h5/pages/article/page?linkType=99')" hover-class="cell-hover" :hover-stay-time="50">
+						<view class="list-cell last" @click="this.$api.navigateTo('/pages/h5/article/page?linkType=99')" hover-class="cell-hover" :hover-stay-time="50">
 							<view class="cell-icon">
 								<image class="cell-icon-image" src="https://static.caimei365.com/app/img/icon/icon_club_7@2x.png" mode=""></image>
 							</view>

pages/user/coupon/coupon-collection-visitor.vue

@@ -0,0 +1,397 @@
+<template>
+	<view class="container clearfix">
+		<view class="container-list">
+			<template v-if="!showEmpty">
+				<view v-for="(coupon,index) in dataList" :key="index" :id="coupon.id" class="coupon-list">
+					<view class="list-cell-le">
+						<view class="coupon-maxMoney">
+							<text class="small">￥</text>
+							{{ coupon.maxMoney }}
+						</view>
+						<view class="coupon-minMoney">
+							满{{ coupon.minMoney }}可用
+						</view>
+					</view>
+					<view class="list-cell-ri">
+						<view class="list-cell-top">
+							<view class="list-cell-type">
+								<view class="list-cell-tags">
+									<text class="tags">{{ coupon.couponType | TypeFormat }}</text>
+								</view>
+								<view class="list-cell-texts" :class="currentTab == 1 || currentTab == 2 ? 'none' : ''">
+									<text v-if="coupon.useType == 1">{{ coupon.useType | TypeFormatText }}</text>
+									<text v-if="coupon.useType == 2">{{ coupon.useType | TypeFormatText }}</text>
+									<text v-if="coupon.useType == 3">{{ coupon.useType | TypeFormatText }}{{ coupon.couponText }}的商品</text>
+								</view>
+							</view>
+							<view class="list-cell-btn">
+								<view class="icon-used">
+									<view class="icon-used-btn receive" v-if="coupon.couponBtnType == 0" @click="receiveCoupon(coupon)">领取</view>
+									<view class="icon-used-btn make" v-if="coupon.couponBtnType == 1">去使用</view>
+								</view>
+							</view>
+						</view>
+						<view class="list-cell-time">{{ coupon.couponTime }}</view>
+					</view>
+				</view>
+				<view v-if="showLoading && dataList.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>
+			</template>
+			<view class="empty-container" v-else>
+				<image class="empty-container-image" :src="StaticUrl+'/icon/icon-coupon-empty@2x.png'"></image>
+				<text class="error-text">暂无可领的优惠券~</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations} from 'vuex';
+	import couponTabs from '@/components/cm-module/coupon/tui-tabs.vue'
+	export default {
+		components:{
+			couponTabs
+		},
+		data() {
+			return {
+				StaticUrl:this.$Static,
+				isIphoneX:this.$store.state.isIphoneX,
+				currentTab: 0,
+				navbar: [
+					{ name: "未使用",num:3 }, 
+					{ name: "已使用",num:4 }, 
+					{ name: "已失效",num:5 },
+				],
+				dataList:[
+					{
+						maxMoney:5000,
+						minMoney:1000,
+						couponType:1,
+						couponTime:'2021.06.28~2021.07.28',
+						couponText:'华熙生物技术有限公司',
+						useType:1,
+						couponBtnType:0
+					},
+					{
+						maxMoney:2000,
+						minMoney:200,
+						couponType:2,
+						couponTime:'2021.06.28~2021.07.28',
+						couponText:'华熙生物技术有限公司',
+						useType:2,
+						couponBtnType:0
+					},
+					{
+						maxMoney:4000,
+						minMoney:800,
+						couponType:3,
+						couponTime:'2021.06.28~2021.07.28',
+						couponText:'华熙生物技术有限公司',
+						useType:3,
+						couponBtnType:0
+					},
+					{
+						maxMoney:6000,
+						minMoney:1000,
+						couponType:4,
+						couponTime:'2021.06.28~2021.07.28',
+						couponText:'华熙生物技术有限公司',
+						useType:1,
+						couponBtnType:0
+					},
+					{
+						maxMoney:6000,
+						minMoney:1000,
+						couponType:4,
+						couponTime:'2021.06.28~2021.07.28',
+						couponText:'华熙生物技术有限公司',
+						useType:1,
+						couponBtnType:0
+					},
+					{
+						maxMoney:6000,
+						minMoney:1000,
+						couponType:4,
+						couponTime:'2021.06.28~2021.07.28',
+						couponText:'华熙生物技术有限公司',
+						useType:1,
+						couponBtnType:0
+					},
+					{
+						maxMoney:6000,
+						minMoney:1000,
+						couponType:4,
+						couponTime:'2021.06.28~2021.07.28',
+						couponText:'华熙生物技术有限公司',
+						useType:1,
+						couponBtnType:0
+					},
+					{
+						maxMoney:6000,
+						minMoney:1000,
+						couponType:5,
+						couponTime:'2021.06.28~2021.07.28',
+						couponText:'华熙生物技术有限公司',
+						useType:2,
+						couponBtnType:0
+					}
+				],
+				windowHeight:'',
+				scrollHeight:'',
+				showEmpty: false,
+				showLoading: false,
+				loadingNow: true,
+				loadingText: '上拉加载更多',
+				hasNextPage:false,
+				pullFlag: true,
+			}
+		},
+		onLoad() {
+			
+		},
+		filters: {
+			TypeFormat:function(value) {
+				switch (value) {
+					case 1:
+						return  '活动券';
+						break;
+					case 2:
+						return  '品类券';
+						break;
+					case 3:
+						return  '店铺券';
+						break;
+					case 4:
+						return  '专享券';
+						break;
+					case 5:
+						return  '新用户券';
+						break;
+				}
+			},
+			TypeFormatText:function(value) {
+				switch (value) {
+					case 1:
+						return  '全商城商品通用';
+						break;
+					case 2:
+						return  '仅限购买仪器类商品';
+						break;
+					case 3:
+						return  '仅可购买店铺';
+						break;
+				}
+			}
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo','identity','isActivity'])
+		},
+		methods: {
+			setScrollHeight() {
+				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
+				this.windowHeight = windowHeight - 1;
+				this.scrollHeight = windowHeight - 1;
+			},
+			scrolltolower() {
+				if(this.total>this.productList.length && this.pullFlag) {
+					this.getListFromServer(true);
+				}
+			},
+			receiveCoupon(coupon){
+				coupon.couponBtnType = 1;
+			},
+			getListFromServer(loadMore) {//搜索商品
+				this.showLoading = true;
+				this.loadingNow = true;
+				this.loadingText = '加载中';
+				this.showEmpty = false;				
+				if(loadMore) {
+					this.listQuery.pageNum += 1;
+				}
+				this.ProductService.GetProductList(this.listQuery).then(response =>{
+					this.isShowWrapper = true
+					const data = response.data;
+					const dataList = data.list;
+					if(dataList && dataList.length > 0){
+						this.hasNextPage = data.hasNextPage;
+						this.showEmpty = false;
+						if(loadMore) {
+							this.productList = [...this.productList,...dataList];
+						} else {
+							this.productList = [...dataList];
+						}
+						// 防上拉暴滑
+						this.pullFlag = false;
+						setTimeout(()=>{ this.pullFlag = true; },500)
+						// 底部提示文案
+						if(this.hasNextPage) {
+							this.loadingText = '上拉加载更多';
+						} else {
+							this.showLoading = true;
+							this.loadingNow = false;
+						}
+					} else {
+						if(!loadMore) {
+							this.showEmpty = true;
+						}
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			navigator(url){
+				this.$api.navigateTo(url)
+			},	
+		},
+		onShow(){
+			this.setScrollHeight();
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.userName = resolve.name;
+				this.userIdentity = resolve.userIdentity
+			}).catch(error =>{
+				
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #F7F7F7;
+	}
+	.container{
+		width: 100%;
+		height: auto;
+	}
+	.container-list {
+		box-sizing: border-box;
+		padding:24rpx;
+		.empty-container-image {
+			width: 260rpx;
+			height: 260rpx;
+			margin-top: -300rpx;
+		}
+		.toIndexPage {
+			bottom: 390rpx;
+		}
+		.coupon-list{
+			width: 100%;
+			height: 200rpx;
+			margin-bottom: 24rpx;
+			box-sizing: border-box;
+			background: url(https://static.caimei365.com/app/img/icon/icon-coupon-uesb@2x.png);
+			background-size: cover;
+			.list-cell-le{
+				width: 224rpx;
+				height: 100%;
+				box-sizing: border-box;
+				padding: 37rpx 0;
+				float: left;
+				.coupon-maxMoney{
+					width: 100%;
+					height: 78rpx;
+					line-height: 78rpx;
+					font-size: 56rpx;
+					color: #FFFFFF;
+					text-align: center;
+					.small{
+						font-size: $font-size-24;
+					}
+				}
+				.coupon-minMoney{
+					width: 100%;
+					height: 33rpx;
+					line-height: 33rpx;
+					font-size: $font-size-24;
+					color: #FFFFFF;
+					text-align: center;
+				}
+			}
+			.list-cell-ri{
+				width: 478rpx;
+				height: 100%;
+				box-sizing: border-box;
+				padding: 20rpx 24rpx 0 24rpx;
+				float: right;
+				.list-cell-top{
+					width: 100%;
+					height: 121rpx;
+					float: left;
+					border-bottom: 1px solid #e1e1e1;
+					.list-cell-type{
+						width: 286rpx;
+						height: 100%;
+						float: left;
+						.list-cell-tags{
+							width: 100%;
+							height: 32rpx;
+							margin-bottom: 7rpx;
+							.tags{
+								display: inline-block;
+								padding: 0 10rpx;
+								height: 32rpx;
+								line-height: 32rpx;
+								background-color: #ffdcce;
+								color: #f94b4b;
+								font-size: $font-size-20;
+								border-radius: 8rpx;
+								text-align: center;
+								float: left;
+							}
+						}
+						.list-cell-texts{
+							width: 100%;
+							height: auto;
+							line-height:35rpx;
+							text-overflow:ellipsis;
+							display: -webkit-box;
+							word-break: break-all;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+							overflow: hidden;
+							font-size: 26rpx;
+							color: #333333;
+						}
+					}
+					.list-cell-btn{
+						width: 128rpx;
+						height: 100%;
+						float: right;
+						.icon-used{
+							width: 100%;
+							height: 100%;
+							box-sizing: border-box;
+							padding-top: 57rpx;
+							.icon-used-btn{
+								width: 128rpx;
+								height: 48rpx;
+								border-radius: 28rpx;
+								line-height: 48rpx;
+								font-size: $font-size-26;
+								text-align: center;
+								&.receive{
+									background-image: linear-gradient(270deg, #f94b4b 0%, #feb673 100%);;
+									color: #FFFFFF;
+								}
+								&.make{
+									border: solid 1px #f94b4b;
+									color: #f94b4b;
+								}
+							}
+						}
+					}
+				}
+				.list-cell-time{
+					width: 100%;
+					height: 58rpx;
+					line-height: 58rpx;
+					text-align: left;
+					font-size: $font-size-20;
+					color: #999999;
+				}
+			}
+		}
+	}
+</style>

pages/user/coupon/coupon-product.vue

@@ -1,48 +1,384 @@
 <template>
-	<view class="container clearfix">
-	
+	<view class="container floor clearfix">
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
+		<!-- 楼层 -->
+		<view class="container-section tui-skeleton">
+			<view class="floor-item-banner ad_01">
+				<image class="item-img-gg" src="https://img.caimei365.com/group1/M00/00/1E/rB-lF2DDKw6Aege4AAHRUhuWVn4676.jpg"></image>
+			</view>
+			<view class="section_page_main clearfix">
+				<view class="floor-item clearfix" v-for="(pros, idx) in productList" :key="idx" @click.stop="navToDetailPage(pros)">
+					<image class="item-img tui-skeleton-fillet" :src="pros.image" mode="aspectFill"></image>
+					<view class="floor-item-content">
+						<view class="title tui-skeleton-rect">
+							<text class="mclap-tag" v-if="pros.beautyActFlag == '1'">美博会</text>
+							<text class="mclap" :class="pros.beautyActFlag == '1' ? 'indent' : ''">{{pros.name}} </text>
+						</view>
+						<view class="floor-item-price">
+							<view class="floor-item-act">
+								<view class="coupon-tags">优惠券</view>
+								<template v-if="pros.actStatus===1">
+									<view class="floor-tags" v-if="PromotionsFormat(pros.promotions)">
+										{{pros.promotions.name}}
+										<text v-if="pros.priceFlag != 1">:￥{{pros.price | NumFormat}}</text>
+									</view>
+									<view class="floor-tags" v-else>{{pros.promotions.name}}</view>	
+								</template>
+								<template v-if="pros.actStatus ===0  &&  pros.ladderPriceFlag===1">
+									<view class="floor-tags">阶梯价格</view>	
+								</template>
+							</view>	
+							<view>
+								<template v-if="userIdentity ===4">
+									<view class="title-none" v-if="pros.priceFlag === 1">
+										<text class="p big">￥未公开价格</text>
+									</view>
+									<view class="title-none"  v-if="pros.priceFlag === 2">
+										<text class="p big">￥价格仅会员可见</text>
+									</view>
+									<view class="price tui-skeleton-rect" v-if="pros.priceFlag === 0" 
+										  :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
+										<text class="p sm">￥</text>
+										<text class="p big">
+											{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat}}
+										</text>
+									</view>
+								</template>
+								<template v-else>
+									<view class="title-none" v-if="pros.priceFlag === 1">
+										<text class="p big">￥未公开价格</text>
+									</view>
+									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
+										<text class="p sm">￥</text>
+										<text class="p big">
+											{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat}}
+										</text>
+									</view>
+								</template>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
 	import { mapState,mapMutations} from 'vuex';
-	export default {
-		components:{
-			
-		},
-		data() {
-			return {
-				userName:'',
-				userIdentity:0
+	export default{
+		data(){
+			return{
+				userId:0,
+				userIdentity:0,
+				productList:[
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						beautyActFlag:1,
+						name:'ET-SPACE全身热疗系统（生物热能太空舱）',
+						actStatus:1,
+						promotions:{
+							type:1,
+							mode:1,
+							name:'优惠价'
+						},
+						priceFlag:0,
+						price:2000,
+						originalPrice:1000,
+						ladderPriceFlag:null
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						beautyActFlag:1,
+						name:'ET-SPACE全身热疗系统（生物热能太空舱）',
+						actStatus:0,
+						promotions:{
+							type:1,
+							mode:1,
+							name:'优惠价'
+						},
+						priceFlag:0,
+						price:2000,
+						originalPrice:1000,
+						ladderPriceFlag:1
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						beautyActFlag:1,
+						name:'ET-SPACE全身热疗系统（生物热能太空舱）',
+						actStatus:1,
+						promotions:{
+							type:1,
+							mode:1,
+							name:'优惠价'
+						},
+						priceFlag:0,
+						price:2000,
+						originalPrice:1000,
+						ladderPriceFlag:null
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						beautyActFlag:1,
+						name:'ET-SPACE全身热疗系统（生物热能太空舱）',
+						actStatus:0,
+						promotions:{
+							type:1,
+							mode:1,
+							name:'优惠价'
+						},
+						priceFlag:0,
+						price:2000,
+						originalPrice:1000,
+						ladderPriceFlag:1
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						beautyActFlag:1,
+						name:'ET-SPACE全身热疗系统（生物热能太空舱）',
+						actStatus:1,
+						promotions:{
+							type:1,
+							mode:1,
+							name:'优惠价'
+						},
+						priceFlag:0,
+						price:2000,
+						originalPrice:1000,
+						ladderPriceFlag:null
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						beautyActFlag:1,
+						name:'ET-SPACE全身热疗系统（生物热能太空舱）',
+						actStatus:0,
+						promotions:{
+							type:1,
+							mode:1,
+							name:'优惠价'
+						},
+						priceFlag:0,
+						price:2000,
+						originalPrice:1000,
+						ladderPriceFlag:1
+					},
+				]
 			}
 		},
-		onLoad() {
-			if(!this.hasLogin){
-				uni.redirectTo({
-					url:'../../login/login'
-				})
-			}
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity','isActivity'])
-		},
-		methods: {
-
-		},
-		onShow(){
+		onLoad(option) {
+			uni.setNavigationBarTitle({title:option.title});
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.userName = resolve.name;
+				this.clubStatus = resolve.clubStatus
+				this.userId = resolve.userId ? resolve.userId : 0;
 				this.userIdentity = resolve.userIdentity
+				// this.GetHomeFloorContentDetails(this.pageType);
 			}).catch(error =>{
-				
+				// this.GetHomeFloorContentDetails(this.pageType);
 			})
+		},
+		filters: {
+			NumFormat:function(text) {//处理金额				
+				return Number(text).toFixed(2);			
+			},		
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo','identity'])
+		},
+		methods:{
+			GetHomeFloorContentDetails(pageType){//楼层查看更多
+				if(pageType == '1'){
+					this.CommonService.GetHomeFloorContentDetails({userId:this.userID,floorId:this.floorId,source:2}).then(response =>{
+						this.pageData = response.data
+						this.skeletonShow = false
+						this.isRequest = true
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				}else{
+					this.CommonService.GePageFloorContentDetails({userId:this.userID,centreId:this.floorId,source:2}).then(response =>{
+						this.pageData = response.data
+						this.skeletonShow = false
+						this.isRequest = true
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				}
+			},
+			PromotionsFormat(promo){//促销活动类型数据处理
+				if(promo!=null){
+					if(promo.type == 1 && promo.mode == 1){
+						return true
+					}else{
+						return false
+					}
+				}
+				return false
+			},
+		},
+		onPullDownRefresh() {
+			setTimeout(() => {
+				this.GetHomeFloorContentDetails(this.pageType);
+				uni.stopPullDownRefresh()
+			}, 200)
+		},
+		onShow() {
+			
 		}
 	}
 </script>
 
 <style lang="scss">
-	.container{
+	page{
+		background-color: #F7F7F7;
+	}
+	.container-home{
 		width: 100%;
 		height: auto;
 	}
+	.container-section{
+		width: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+		box-sizing: border-box;
+		padding:24rpx;
+	}
+	.floor-item-banner{
+		width: 100%;
+		height: 240rpx;
+		margin-bottom: 20rpx;
+		.item-img-gg{
+			width: 100%;
+			height: 240rpx;
+			display: block;
+			border-radius: 16rpx;
+		}
+	}
+	.section_page_main{
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		.floor-item{
+			width: 339rpx;
+			height: 516rpx;
+			margin-right: 20rpx;
+			font-size: $font-size-24;
+			color: $text-color;
+			background: #FFFFFF;
+			line-height: 36rpx;
+			border-radius: 16rpx;
+			margin-bottom: 20rpx;
+			float: left;
+			box-sizing: border-box;
+			position: relative;
+			&:nth-child(2n){
+				margin-right: 0;
+			}
+			.item-img{
+				width: 339rpx;
+				height: 339rpx;
+				border-radius: 16rpx 16rpx 0 0;
+				display: block;
+				margin-bottom: 8rpx;
+			}
+			.floor-item-content{
+				width: 100%;
+				padding: 0 20rpx;
+				box-sizing: border-box;
+			}
+			.floor-item-act{
+				display: block;
+				width: 100%;
+				height: 32rpx;
+				text-align: center;
+				box-sizing: border-box;
+				.coupon-tags{
+					height: 32rpx;
+					box-sizing: border-box;
+					border-radius: 8rpx;
+					background-color: #fff1eb;
+					line-height: 28rpx;
+					color: #f94b4b;
+					text-align: center;
+					display: inline-block;
+					padding:0 10rpx;
+					font-size: $font-size-20;
+					border: 1px solid #f94b4b;
+					float: left;
+					margin-right: 12rpx;
+				}
+				.floor-tags{
+					height: 32rpx;
+					box-sizing: border-box;
+					border-radius: 8rpx;
+					background-color: #FFFFFF;
+					line-height: 28rpx;
+					color: $color-system;
+					text-align: center;
+					display: inline-block;
+					padding:0 16rpx;
+					font-size: $font-size-20;
+					border: 1px solid #E15616;
+					float: left;
+				}
+			}
+			.title-none{
+				font-size: $font-size-26;
+				color: #FF2A2A;
+				line-height: 54rpx;
+			}
+			.title{
+				width: 100%;
+				height: 70rpx;
+				display: flex;
+				line-height: 35rpx;
+				flex-direction: column;
+				margin: 8rpx 0;
+				padding: 0;
+				position: relative;
+				.mclap{
+					width: 100%;
+					line-height:35rpx;
+					text-overflow:ellipsis;
+					display: -webkit-box;
+					word-break: break-all;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
+				}
+			}
+			.price{
+				color: #FF2A2A;
+				line-height:54rpx;
+				&.none{
+					text-decoration: line-through;
+					color: #999999;
+				}
+				.sm{
+					font-size: $font-size-24;
+				}
+				.big{
+					font-size: $font-size-28;
+				}
+			}
+		}
+	}
 </style>
+                               

pages/user/order/order-list.vue

@@ -206,7 +206,7 @@
 		},	
 		methods: {
 			goShophome(id){
-				this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${id}`)
+				this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${id}`)
 			},
 			// 滚动切换标签样式
 			onChange: function(e) {
@@ -479,7 +479,7 @@
 				})
 			},
 			handlSearchPath(){
-				this.$api.navigateTo('/search/pages/search/search-order')
+				this.$api.navigateTo('/pages/search/search-order')
 			},
 			onShareAppMessage (res){//分享转发
 				this.isShareModal = false