commit -m 优化项目结构和修改页面路径

common/config/wxLogin.js

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

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

@@ -16,13 +16,13 @@
 				</view>
 				<!-- 订单 -->
 				<view class="user-order">
-					<view class="tab-title" @click="navigator('/seller/pages/order/order-list?listType=0')">
+					<view class="tab-title" @click="navigator('/pages/seller/order/order-list?listType=0')">
 						<text class="cell-tit">我的订单</text>
 						<text class="cell-more">全部订单</text>
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
 					<view class="order-section">
-						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
+						<view class="order-item" @click="navigator('/pages/seller/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
 								<image src="https://static.caimei365.com/app/img/icon/order5@3x.png" mode=""></image>
 								<text 	v-if="beforeConfirmCount>0" 
@@ -33,7 +33,7 @@
 							</view>
 							<text class="order-t">待确认</text>
 						</view>
-						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=2')"  hover-class="common-hover" :hover-stay-time="50">
+						<view class="order-item" @click="navigator('/pages/seller/order/order-list?listType=2')"  hover-class="common-hover" :hover-stay-time="50">
 							<view class="order-icon">
 								<image src="https://static.caimei365.com/app/img/icon/order1@3x.png" mode=""></image>
 								<text  v-if="beforePayCount >0" 
@@ -44,7 +44,7 @@
 							</view>
 							<text class="order-t">待付款</text>
 						</view>
-						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=3')" hover-class="common-hover"  :hover-stay-time="50">
+						<view class="order-item" @click="navigator('/pages/seller/order/order-list?listType=3')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
 								<image src="https://static.caimei365.com/app/img/icon/order2@3x.png" mode=""></image>
 								<text   v-if="beforeShipCount >0" 
@@ -55,7 +55,7 @@
 							</view>
 							<text class="order-t">待发货</text>
 						</view>
-						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=4')" hover-class="common-hover"  :hover-stay-time="50">
+						<view class="order-item" @click="navigator('/pages/seller/order/order-list?listType=4')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
 								<image src="https://static.caimei365.com/app/img/icon/order3@3x.png" mode=""></image>
 								<text 	v-if="shippedCount>0" 
@@ -66,7 +66,7 @@
 							</view>
 							<text class="order-t">已发货</text>
 						</view>
-						<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=5')" hover-class="common-hover"  :hover-stay-time="50">
+						<view class="order-item" @click="navigator('/pages/seller/order/order-list?listType=5')" hover-class="common-hover"  :hover-stay-time="50">
 							<view class="order-icon">
 								<image src="https://static.caimei365.com/app/img/icon/order4@3x.png" mode=""></image>
 								<text 	v-if="refundsCount >0"
@@ -145,29 +145,29 @@
 				firstList:[
 					{
 						name:'待注册机构',
-						path:'/seller/pages/club/stayClub-list',
+						path:'/pages/seller/club/stayClub-list',
 						icon:'https://static.caimei365.com/app/img/icon/icon_seller_1@2x.png',
 					},
 					{
 						name:'机构列表',
-						path:'/seller/pages/club/list',
+						path:'/pages/seller/club/list',
 						icon:'https://static.caimei365.com/app/img/icon/icon_seller_2@2x.png',
 					},
 					{
 						name:'拉机构上线',
-						path:'/seller/pages/login/register-select',
+						path:'/pages/seller/login/register-select',
 						icon:'https://static.caimei365.com/app/img/icon/icon_seller_3@2x.png',
 					},
 					{
 						name:'邀请运营人员',
-						path:'/seller/pages/club/allClub-list',
+						path:'/pages/seller/club/allClub-list',
 						icon:'https://static.caimei365.com/app/img/icon/icon_seller_4@2x.png',
 					}
 				],
 				twoList:[
 					{
 						name:'帮机构下单',
-						path:'/seller/pages/club/club-list',
+						path:'/pages/seller/club/club-list',
 						icon:'https://static.caimei365.com/app/img/icon/icon_seller_5@2x.png',
 					},
 					{
@@ -206,7 +206,7 @@
 						this.logout()
 						uni.setStorageSync('unionId',response.data.unionId)
 						this.$store.commit('updateStatus',response.data)
-						this.$api.navigateTo('/seller/pages/login/login')
+						this.$api.navigateTo('/pages/seller/login/login')
 					}
 				})
 			},	

components/cm-module/creatOrder/sellerAddress.vue

@@ -62,11 +62,11 @@
 			initData(res) {
 				if(Object.keys(res).length == 0){
 					this.isEmpty = true
-					this.addressSrc = '/seller/pages/address/addressManage'
+					this.addressSrc = '/pages/seller/address/addressManage'
 				}else{
 					this.isEmpty = false
 					this.$parent.isFreight = false
-					this.addressSrc = '/seller/pages/address/address?type=select'
+					this.addressSrc = '/pages/seller/address/address?type=select'
 				}
 			}
 		}

components/cm-module/homeIndex/coupon.vue

@@ -1,6 +1,6 @@
 <template name="navbars">
 	<view>
-		<view class="coupon-content clearfix" @click="navigator('/pages/user/coupon/coupon')">
+		<view class="coupon-content clearfix" @click="navigator('/pages/user/coupon/coupon-collection')">
 			<image src="https://static.caimei365.com/app/img/icon/icon-coupon-banner@2x.png" mode=""></image>
 		</view>
 	</view>

components/cm-module/productDetails/secondPrice.vue

@@ -4,11 +4,11 @@
 		<template v-if="!hasLogin">
 			<view class="p-login grade tui-skeleton-fillet">
 				<view class="floor-item-btn" v-if="product.detailTalkFlag !=2">
-					<view class="btn-none" v-if="product.sold == 1">已售二手商品不公开价格</view>
+					<view class="btn-none" v-if="product.sold == 1"></view>
 					<view class="btn" @click.stop="loginClick" v-else>登录查看价格></view>
 				</view>
 				<template  v-else>
-					<text v-if="product.sold == 1">已售二手商品不公开价格</text>
+					<text v-if="product.sold == 1"></text>
 					<text v-else><text class="txt sm">￥</text>价格详聊</text>
 				</template>
 			</view>
@@ -23,11 +23,11 @@
 			<view class="wrap-main-item" v-else>
 				<view class="p-price tui-skeleton-fillet">
 					<text class="txt big" v-if="product.detailTalkFlag==2">
-						<text v-if="product.sold == 1">已售二手商品不公开价格</text>
+						<text v-if="product.sold == 1"></text>
 						<text v-else><text class="txt sm">￥</text>价格详聊</text>
 					</text>
 					<text class="txt big" v-else>
-						<text v-if="product.sold == 1">已售二手商品不公开价格</text>
+						<text v-if="product.sold == 1"></text>
 						<text v-else><text class="txt sm">￥</text>{{product.price | NumFormat}}</text>
 					</text>
 				</view>

pages.json

@@ -398,10 +398,10 @@
 			]	
 		},
 		{
-			"root": "seller",
+			"root": "pages/seller/",
 			"pages": [
 				{
-					"path": "pages/index/index",
+					"path": "index/index",
 					"style": {
 						"navigationBarTitleText": "采美采购商城",
 						"enablePullDownRefresh":true,
@@ -409,156 +409,156 @@
 					}
 				},
 				{
-					"path": "pages/login/login",
+					"path": "login/login",
 					"style": {
 						"navigationBarTitleText": "登录",
 						"navigationStyle":"custom"
 					}
 				},
 				{
-					"path": "pages/cart/cart",
+					"path": "cart/cart",
 					"style": {
 						"navigationBarTitleText": "购物车"
 					}
 				},
 				{
-					"path": "pages/cart/buyagain",
+					"path": "cart/buyagain",
 					"style": {
 						"navigationBarTitleText": "再次购买"
 					}
 				},
 				{
-					"path": "pages/cart/immediately",
+					"path": "cart/immediately",
 					"style": {
 						"navigationBarTitleText": "立即下单"
 					}
 				},{
-					"path": "pages/cart/second",
+					"path": "cart/second",
 					"style": {
 						"navigationBarTitleText": "二手下单"
 					}
 				},
 				{
-					"path": "pages/order/create-order",
+					"path": "order/create-order",
 					"style": {
 						"navigationBarTitleText": "确认订单"
 					}
 				},
 				{
-					"path": "pages/order/create-recharge-order",
+					"path": "order/create-recharge-order",
 					"style": {
 						"navigationBarTitleText": "确认订单"
 					}
 				},
 				{
-					"path": "pages/order/order-details",
+					"path": "order/order-details",
 					"style": {
 						"navigationBarTitleText": "订单详情",
 						"navigationStyle":"custom"
 					}
 				},
 				{
-					"path": "pages/order/order-list",
+					"path": "order/order-list",
 					"style": {
 						"navigationBarTitleText": "订单列表",
 						"navigationStyle":"custom"
 					}
 				},
 				{
-					"path": "pages/order/order-sharedetails",
+					"path": "order/order-sharedetails",
 					"style": {
 						"navigationBarTitleText": "订单详情",
 						"navigationStyle":"custom"
 					}
 				},
 				{
-					"path": "pages/club/list",
+					"path": "club/list",
 					"style": {
 						"navigationBarTitleText": "机构列表"
 					}
 				},
 				{
-					"path": "pages/club/stayClub-list",
+					"path": "club/stayClub-list",
 					"style": {
 						"navigationBarTitleText": "待注册机构"
 					}
 				},
 				{
-					"path": "pages/club/club-list",
+					"path": "club/club-list",
 					"style": {
 						"navigationBarTitleText": "我的机构"
 					}
 				},
 				{
-					"path": "pages/club/allClub-list",
+					"path": "club/allClub-list",
 					"style": {
 						"navigationBarTitleText": "所有机构"
 					}
 				},
 				{
-					"path": "pages/club/addoperator",
+					"path": "club/addoperator",
 					"style": {
 						"navigationBarTitleText": "邀请运营人员"
 					}
 				},
 				{
-					"path": "pages/login/register",
+					"path": "login/register",
 					"style": {
 						"navigationBarTitleText": "拉机构上线",
 						"navigationStyle":"custom"
 					}
 				},
 				{
-					"path": "pages/login/register-select",
+					"path": "login/register-select",
 					"style": {
 						"navigationBarTitleText": "拉机构上线"
 					}
 				},
 				{
-					"path": "pages/login/register-general",
+					"path": "login/register-general",
 					"style": {
 						"navigationBarTitleText": "普通机构"
 					}
 				},
 				{
-					"path": "pages/login/register-member",
+					"path": "login/register-member",
 					"style": {
 						"navigationBarTitleText": "会员机构"
 					}
 				},
 				{
-					"path": "pages/login/information",
+					"path": "login/information",
 					"style": {
 						"navigationBarTitleText": "修改资料",
 						"navigationStyle":"custom"
 					}
 				},
 				{
-					"path": "pages/login/apply",
+					"path": "login/apply",
 					"style": {
 						"navigationBarTitleText": "修改申请信息",
 						"navigationStyle":"custom"
 					}
 				},
 				{
-					"path": "pages/order/order-historylist",
+					"path": "order/order-historylist",
 					"style": {
 						"navigationBarTitleText": "订单列表"
 					}
 				},{
-					"path": "pages/search/search-order",
+					"path": "search/search-order",
 					"style": {
 						"navigationBarTitleText": "订单搜索"
 					}
 				},
 				{
-					"path": "pages/address/address",
+					"path": "address/address",
 					"style": {
 						"navigationBarTitleText": "选择地址"
 					}
 				},
 				{
-					"path": "pages/address/addressManage",
+					"path": "address/addressManage",
 					"style": {
 						"navigationBarTitleText": "添加地址"
 					}

pages/login/bindOperator.vue

@@ -123,7 +123,7 @@
 					uni.setStorageSync('unionId',response.data.unionId)
 					setTimeout(()=>{
 						if(response.data.userIdentity === 1){
-							this.$api.navigateTo('/seller/pages/index/index')
+							this.$api.navigateTo('/pages/seller/index/index')
 						}else if(response.data.userIdentity === 2 || response.data.userIdentity === 4){
 							this.$api.switchTabTo('/pages/tabBar/user/user')
 						}else if(response.data.userIdentity === 3){

pages/login/binding.vue

@@ -200,7 +200,7 @@
 					uni.setStorageSync('unionId',response.data.unionId)
 					setTimeout(()=>{
 						if(response.data.userIdentity === 1){
-							this.$api.navigateTo('/seller/pages/index/index')
+							this.$api.navigateTo('/pages/seller/index/index')
 						}else if(response.data.userIdentity === 2 || response.data.userIdentity === 4){
 							this.$api.switchTabTo('/pages/tabBar/user/user')
 						}else if(response.data.userIdentity === 3){

pages/second/product/product-list.vue

@@ -51,15 +51,15 @@
 		                    <view class="targetprice">
 								<text v-if="item.detailTalkFlag ==2 && !hasLogin">￥价格详聊</text>
 								<text v-else-if="!hasLogin" class="priceparam" @click.stop="NavigatorLogin(item)">
-									<text v-if="item.sold==1">已售二手商品不公开价格</text>								
+									<text v-if="item.sold==1"></text>								
 									<text v-else>登录查看价格></text>								
 								</text>
 								<text v-else-if="hasLogin && item.detailTalkFlag==2">
-									<text v-if="item.sold == 1">已售二手商品不公开价格</text>
+									<text v-if="item.sold == 1"></text>
 									<text v-else>￥价格详聊</text>
 								</text>
 								<text v-else>
-									<text v-if="item.sold == 1">已售二手商品不公开价格</text>
+									<text v-if="item.sold == 1"></text>
 									<text v-else>￥{{ item.price | NumFormat}}</text>
 								</text>
 							</view>

seller/pages/address/address.vue → pages/seller/address/address.vue

@@ -131,7 +131,7 @@
 			},
 			addAddress(type,item){
 				uni.navigateTo({
-					url: `/seller/pages/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
+					url: `/pages/seller/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
 				})
 			},
 			//删除收货地址
@@ -148,7 +148,7 @@
 						this.$util.msg(error.msg,2000);
 						setTimeout(function(){
 							uni.switchTab({
-								url:'/seller/pages/home/home'
+								url:'/pages/seller/home/home'
 							})
 						},1000)
 					})

seller/pages/address/addressManage.vue → pages/seller/address/addressManage.vue

@@ -152,7 +152,7 @@
 					this.$util.msg(error.msg,2000);
 					setTimeout(function(){
 						uni.switchTab({
-							url:'/seller/pages/index/index'
+							url:'/pages/seller/index/index'
 						})
 					},1000)
 				})

seller/pages/cart/buyagain.vue → pages/seller/cart/buyagain.vue

@@ -158,7 +158,7 @@
 				})
 			},
 			hanldToCartPage(){
-				this.$api.navigateTo('/seller/pages/cart/cart')
+				this.$api.navigateTo('/pages/seller/cart/cart')
 			},
 			discard(){
 				//丢弃

seller/pages/cart/cart.vue → pages/seller/cart/cart.vue

@@ -732,7 +732,7 @@
 							productID:productID.substring(0,productID.lastIndexOf(',')),
 							productCount:''
 						}
-					this.$api.navigateTo(`/seller/pages/order/create-order?data=${JSON.stringify({data:cartPramsData})}`)
+					this.$api.navigateTo(`/pages/seller/order/create-order?data=${JSON.stringify({data:cartPramsData})}`)
 				}
 			},
 			showDelManager(){//显示删除商品管理

seller/pages/cart/immediately.vue → pages/seller/cart/immediately.vue

@@ -296,7 +296,7 @@
 				})
 			},
 			hanldToCartPage(){
-				this.$api.navigateTo('/seller/pages/cart/cart')
+				this.$api.navigateTo('/pages/seller/cart/cart')
 			},
 			discard(){
 				//丢弃

seller/pages/cart/second.vue → pages/seller/cart/second.vue

@@ -172,13 +172,13 @@
 						productID:this.handleData.productId,
 						productCount:this.number
 				}
-				this.$api.navigateTo(`/seller/pages/order/create-order?type=prodcut&data=${JSON.stringify({data:cartPramsData})}`)
+				this.$api.navigateTo(`/pages/seller/order/create-order?type=prodcut&data=${JSON.stringify({data:cartPramsData})}`)
 				setTimeout(() => {
 					this.specClass = 'none';
 				}, 200);
 			},
 			hanldToCartPage(){
-				this.$api.navigateTo('/seller/pages/cart/cart')
+				this.$api.navigateTo('/pages/seller/cart/cart')
 			},
 			discard(){
 				//丢弃

seller/pages/club/allClub-list.vue → pages/seller/club/allClub-list.vue

@@ -158,7 +158,7 @@
 			},
 			goOperator(item){
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/seller/pages/club/addoperator')
+				this.$api.navigateTo('/pages/seller/club/addoperator')
 			},
 			onShowClose () {//输入框失去焦点时触发
 				if(this.searchInputVal != ''){

seller/pages/club/club-list.vue → pages/seller/club/club-list.vue

@@ -178,23 +178,23 @@
 			},
 			_goImmediately(item){
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/seller/pages/cart/immediately')
+				this.$api.navigateTo('/pages/seller/cart/immediately')
 			},
 			_goBuyagain(item ){
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/seller/pages/cart/buyagain')
+				this.$api.navigateTo('/pages/seller/cart/buyagain')
 			},
 			_goRechargeOrder(item){
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/seller/pages/order/create-recharge-order')
+				this.$api.navigateTo('/pages/seller/order/create-recharge-order')
 			},
 			_goSecond(item ){
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/seller/pages/cart/second')
+				this.$api.navigateTo('/pages/seller/cart/second')
 			},
 			_goHistory(item){
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo(`/seller/pages/order/order-historylist?clubID=${item.clubID}&listType=0`)
+				this.$api.navigateTo(`/pages/seller/order/order-historylist?clubID=${item.clubID}&listType=0`)
 			}
 		},
 		onReachBottom() {

seller/pages/club/list.vue → pages/seller/club/list.vue

@@ -245,16 +245,16 @@
 			checkData(item){//修改机构资料
 				switch(this.tabCurrentNum){
 					case 0:
-						this.$api.navigateTo(`/seller/pages/login/apply?userID=${item.userID}`)
+						this.$api.navigateTo(`/pages/seller/login/apply?userID=${item.userID}`)
 						break;
 					case 1:
-						this.$api.navigateTo(`/seller/pages/login/information?userID=${item.userID}`)
+						this.$api.navigateTo(`/pages/seller/login/information?userID=${item.userID}`)
 						break;
 				}
 			},
 			orderHistory(item){//跳转机构历史订单
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo(`/seller/pages/order/order-historylist?clubID=${item.clubID}&listType=0`)
+				this.$api.navigateTo(`/pages/seller/order/order-historylist?clubID=${item.clubID}&listType=0`)
 			},
 			onShowClose () {//输入框失去焦点时触发
 				if(this.searchInputVal != ''){

seller/pages/login/login.vue → pages/seller/login/login.vue

@@ -76,7 +76,7 @@
 					uni.setStorageSync('unionId',response.data.unionId)
 					if(response.data.userIdentity === 1){
 						setTimeout(()=>{
-							this.$api.navigateTo('/seller/pages/index/index')
+							this.$api.navigateTo('/pages/seller/index/index')
 						},1500)
 					}
 				}).catch(error =>{
@@ -104,7 +104,7 @@
 						this.$store.commit('updateStatus',response.data)
 						uni.setStorageSync('token',response.data.token)
 						uni.setStorageSync('unionId',response.data.unionId)
-						this.$api.navigateTo('/seller/pages/index/index')
+						this.$api.navigateTo('/pages/seller/index/index')
 						this.isSeller= false
 						setTimeout(()=>{
 							this.isSeller= true

seller/pages/login/register-select.vue → pages/seller/login/register-select.vue

@@ -3,13 +3,13 @@
 	<view class="container register">
 		<view class="main">
 			<view class="main-item">
-				<view class="item" @click.stop="this.$api.navigateTo('/seller/pages/login/register-general')">
+				<view class="item" @click.stop="this.$api.navigateTo('/pages/seller/login/register-general')">
 					<view class="icon">
 						<image src="https://static.caimei365.com/app/img/icon/icon-general.png" mode=""></image>
 					</view>
 					<view class="text">普通机构</view>
 				</view>
-				<view class="item" @click.stop="this.$api.navigateTo('/seller/pages/login/register-member')">
+				<view class="item" @click.stop="this.$api.navigateTo('/pages/seller/login/register-member')">
 					<view class="icon">
 						<image src="https://static.caimei365.com/app/img/icon/icon-member.png" mode=""></image>
 					</view>

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

@@ -390,12 +390,12 @@
 						if(data.code === '1'){
 							this.$util.msg('支付成功',2000,true,'success')
 							setTimeout(() =>{
-								this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.clubUserId}`)
+								this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.clubUserId}`)
 							},2000)
 						}else{
 							this.$util.msg('订单提交成功',2000,true,'success')
 							setTimeout(()=>{
-								this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.clubUserId}`)
+								this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.clubUserId}`)
 							},2000)
 						}
 					}).catch(error =>{

seller/pages/order/create-recharge-order.vue → pages/seller/order/create-recharge-order.vue

@@ -99,12 +99,12 @@
 					if(data.code === '1'){
 						this.$util.msg('支付成功',2000,true,'success')
 						setTimeout(() =>{
-							this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.params.userId}`)
+							this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.params.userId}`)
 						},2000)
 					}else{
 						this.$util.msg('订单提交成功',2000,true,'success')
 						setTimeout(()=>{
-							this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.params.userId}`)
+							this.$api.redirectTo(`/pages/seller/order/order-details?type=cash&orderID=${data.orderID}&userId=${this.params.userId}`)
 						},2000)
 					}
 				}).catch(error =>{

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

@@ -207,7 +207,7 @@
 					}
 				}).catch(error =>{
 					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
-						this.$api.switchTabTo('/seller/pages/index/index')
+						this.$api.switchTabTo('/pages/seller/index/index')
 					})
 				})
 			},
@@ -242,7 +242,7 @@
 				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,userId:this.againUserId,confirmFlag:0}).then(res =>{
 					if(res.code==0){
 						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
-						this.$api.navigateTo('/seller/pages/cart/cart');
+						this.$api.navigateTo('/pages/seller/cart/cart');
 					}
 				}).catch(error =>{
 					if(error.code== -3){
@@ -299,9 +299,9 @@
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							if(this.shareType ==='share'){
-								this.$api.navigateTo('/seller/pages/index/index')
+								this.$api.navigateTo('/pages/seller/index/index')
 							}else{
-								this.$api.navigateTo(`/seller/pages/order/order-list?type=detele&listType=${this.listType}`)
+								this.$api.navigateTo(`/pages/seller/order/order-list?type=detele&listType=${this.listType}`)
 							}
 						},500)
 					}).catch(error =>{

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

@@ -316,7 +316,7 @@
 			},
 			detail(order) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/seller/pages/order/order-details?listType=${this.currentTab}&orderID=${order.orderID}&userId=${order.userID}`)
+				this.$api.navigateTo(`/pages/seller/order/order-details?listType=${this.currentTab}&orderID=${order.orderID}&userId=${order.userID}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				this.handShowAlert(data)
@@ -347,7 +347,7 @@
 				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,userId:this.userID,confirmFlag:0}).then(res =>{
 					if(res.code==0){
 						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
-						this.$api.navigateTo('/seller/pages/cart/cart');
+						this.$api.navigateTo('/pages/seller/cart/cart');
 					}
 				}).catch(error =>{
 					if(error.code== -3){
@@ -398,7 +398,7 @@
 				})
 			},
 			handlSearchPath(){
-				this.$api.navigateTo('/seller/pages/search/search-order')
+				this.$api.navigateTo('/pages/seller/search/search-order')
 			},
 			onShareAppMessage (res){//分享转发
 				this.isShareModal = false

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

@@ -238,7 +238,7 @@
 			cancelBtn(){
 				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:1}).then(res =>{
 					if(res.code==0){
-						this.$api.navigateTo('/seller/pages/cart/cart');
+						this.$api.navigateTo('/pages/seller/cart/cart');
 						this.showAgan = false;
 					}
 				})
@@ -374,7 +374,7 @@
 			},
 			detail(order) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/seller/pages/order/order-details?listType=${this.currentTab}&orderID=${order.orderID}&userId=${order.userID}`)
+				this.$api.navigateTo(`/pages/seller/order/order-details?listType=${this.currentTab}&orderID=${order.orderID}&userId=${order.userID}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				this.handShowAlert(data)
@@ -405,7 +405,7 @@
 				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,userId:this.userID,confirmFlag:0}).then(res =>{
 					if(res.code==0){
 						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
-						this.$api.navigateTo('/seller/pages/cart/cart');
+						this.$api.navigateTo('/pages/seller/cart/cart');
 					}
 				}).catch(error =>{
 					if(error.code== -3){
@@ -456,7 +456,7 @@
 				})
 			},
 			handlSearchPath(){
-				this.$api.navigateTo('/seller/pages/search/search-order')
+				this.$api.navigateTo('/pages/seller/search/search-order')
 			},
 			onShareAppMessage (res){//分享转发
 				this.isShareModal = false

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

@@ -311,7 +311,7 @@
 			},
 			detail(order) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/seller/pages/order/order-details?type=seacrch&orderID=${order.orderID}&userId=${order.userID}`)
+				this.$api.navigateTo(`/pages/seller/order/order-details?type=seacrch&orderID=${order.orderID}&userId=${order.userID}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				this.handShowAlert(data)
@@ -342,7 +342,7 @@
 				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,userId:this.userID,confirmFlag:0}).then(res =>{
 					if(res.code==0){
 						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
-						this.$api.navigateTo('/seller/pages/cart/cart');
+						this.$api.navigateTo('/pages/seller/cart/cart');
 					}
 				}).catch(error =>{
 					if(error.code== -3){

pages/tabBar/home/index.vue

@@ -113,7 +113,7 @@
 					uni.setStorageSync('token',response.data.token)
 					uni.setStorageSync('unionId',response.data.unionId)
 					if(response.data.userIdentity ==1){
-						this.$api.redirectTo('/seller/pages/index/index')
+						this.$api.redirectTo('/pages/seller/index/index')
 					}else if(response.data.userIdentity === 3){
 						this.$api.redirectTo('/pages/supplier/index/index')
 					}

pages/user/coupon/coupon-collection.vue

@@ -27,7 +27,7 @@
 							<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 class="icon-used-btn make" v-if="coupon.couponBtnType == 1" @click="toUseCoupon(coupon)">去使用</view>
 								</view>
 							</view>
 						</view>
@@ -245,6 +245,26 @@
 					this.$util.msg(error.msg,2000);
 				})
 			},
+			toUseCoupon(coupon){
+				console.log('coupon',coupon)
+				switch (coupon.couponType) {
+					case 1:// 活动券跳转到商城首页 / 或者活动页（看是否指定了商品）
+						this.$api.switchTabTo('/pages/tabBar/home/index')
+						break;
+					case 2:// 品类券：跳转到产品 / 仪器页
+						this.$api.navigateTo('/pages/tabBar/home/index')
+						break;
+					case 3:// 店铺券：跳转到店铺首页
+						this.$api.navigateTo('/pages/tabBar/home/index')
+						break;
+					case 4:// 专享券：跳转到商城首页
+						this.$api.switchTabTo('/pages/tabBar/home/index')
+						break;
+					case 5:// 新用户券：跳转到商城首页
+						this.$api.switchTabTo('/pages/tabBar/home/index')
+						break;
+				}
+			},
 			navigator(url){
 				this.$api.navigateTo(url)
 			},	

pages/user/coupon/coupon.vue

@@ -35,7 +35,7 @@
 							</view>
 							<view class="list-cell-btn">
 								<view class="icon-used" v-if="currentTab == 0">
-									<view class="icon-used-btn">去使用</view>
+									<view class="icon-used-btn" @click="toUseCoupon(coupon)">去使用</view>
 								</view>
 								<view class="icon-use" v-if="currentTab == 1"></view>
 								<view class="icon-invalid" v-if="currentTab == 2"></view>
@@ -221,6 +221,26 @@
 					this.$util.msg(error.msg,2000);
 				})
 			},
+			toUseCoupon(coupon){
+				console.log('coupon',coupon)
+				switch (coupon.couponType) {
+					case 1:// 活动券跳转到商城首页 / 或者活动页（看是否指定了商品）
+						this.$api.switchTabTo('/pages/tabBar/home/index')
+						break;
+					case 2:// 品类券：跳转到产品 / 仪器页
+						this.$api.navigateTo('/pages/tabBar/home/index')
+						break;
+					case 3:// 店铺券：跳转到店铺首页
+						this.$api.navigateTo('/pages/tabBar/home/index')
+						break;
+					case 4:// 专享券：跳转到商城首页
+						this.$api.switchTabTo('/pages/tabBar/home/index')
+						break;
+					case 5:// 新用户券：跳转到商城首页
+						this.$api.switchTabTo('/pages/tabBar/home/index')
+						break;
+				}
+			},
 			change(e) {
 				this.currentTab = e.index
 				console.log('currentTab',this.currentTab)

pages/user/order/order-sharelogin.vue

@@ -68,7 +68,7 @@
 					this.OrderService.OrderShareCode(params).then(response =>{
 						console.log(response.code)
 						if(response.code === 2){
-							this.$api.navigateTo(`/seller/pages/order/order-details?type=share&orderID=${this.orderID}`)
+							this.$api.navigateTo(`/pages/seller/order/order-details?type=share&orderID=${this.orderID}`)
 						}else if(response.code === 0) {
 							console.log(response.data)
 							if(response.data == true){//同为会所运营人员查看订单详情