优化协销文件

components/cm-module/creatOrder/sellerAddress.vue

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

components/cm-module/home/navigationTab.vue

@@ -32,7 +32,7 @@
 		},
 		methods:{
 			navToListPage(nav){
-				this.$api.navToListPage({type:'商品分类',value:nav.classifyName,id:nav.id});
+				this.$api.navToListPage({type:'0',value:nav.classifyName,id:nav.id});
 			}
 		},
 		onShow(){

components/cm-module/listTemplate/commodityList.vue

@@ -124,50 +124,49 @@
 				})
 			},
 			getQueryGoodslist(loadMore){
-				let self = this;
-				const thisServerurl = self.$parent.serverUrl;
-				self.showLoading = true;
-				self.loadingNow = true;
-				self.loadingText = '加载中';
+				const thisServerurl = this.$parent.serverUrl;
+				this.showLoading = true;
+				this.loadingNow = true;
+				this.loadingText = '加载中';
 				if(loadMore) {
-					self.pageNum += 1;
+					this.pageNum += 1;
 				}
-				if(self.$parent.lastPageType === '再次购买') {
-					self.fromRegularPurchasePage = true;
+				if(this.$parent.lastPageType === '再次购买') {
+					this.fromRegularPurchasePage = true;
 				}
-				queryGoodslist(thisServerurl,{userId:this.userID,pageNum:self.pageNum,pageSize:self.pageSize}).then(response=>{
-					const resData = self.fromRegularPurchasePage ?response.data.page :response.data;
+				queryGoodslist(thisServerurl,{userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize}).then(response=>{
+					const resData = this.fromRegularPurchasePage ?response.data.page :response.data;
 					const resList = resData.results,
 						  getCartNum = response.data.count;
 					this.cartNum = getCartNum > 99 ?'99+' :getCartNum;
-					if(!loadMore && self.fromRegularPurchasePage && resData.hasNextPage) {
-						self.showRegularBtn = true;
+					if(!loadMore && this.fromRegularPurchasePage && resData.hasNextPage) {
+						this.showRegularBtn = true;
 					}
 					if(resList && resList.length > 0){
-						self.hasNextPage = resData.hasNextPage;
-						self.totalPage = resData.totalPage;
+						this.hasNextPage = resData.hasNextPage;
+						this.totalPage = resData.totalPage;
 						if(loadMore) {
-							self.commodityList = [...self.commodityList,...resList];
-							self.showRegularBtn = false;
+							this.commodityList = [...this.commodityList,...resList];
+							this.showRegularBtn = false;
 						} else {
-							self.commodityList = [...resList];
-							self.showSkeleton = false;
+							this.commodityList = [...resList];
+							this.showSkeleton = false;
 						}
 						// 防上拉暴滑
-						self.pullFlag = false;
+						this.pullFlag = false;
 						setTimeout(()=>{
-							self.pullFlag = true;
+							this.pullFlag = true;
 						},500)
 						// 底部提示文案
-						if(self.hasNextPage) {
-							self.loadingText = '上拉加载更多';
+						if(this.hasNextPage) {
+							this.loadingText = '上拉加载更多';
 						} else {
-							self.showLoading = true;
-							self.loadingNow = false;
+							this.showLoading = true;
+							this.loadingNow = false;
 						}
 					} else {
 						if(!loadMore) {
-							self.showEmpty = true;
+							this.showEmpty = true;
 						}
 					}
 				}).catch(error =>{

components/cu-tabbar.vue

@@ -3,17 +3,17 @@
 		<!-- isIphoneX判断是否为刘海屏在main.js里，好像uniapp有一个css变量获取刘海屏的安全区域 -->
 		<view class="tabBar" :style="{height:isIphoneX?'140rpx':'98rpx'}">
 			<view class="tabBar_list" :style="{paddingBottom:isIphoneX?'40rpx':''}">
-				<view  @tap="cut_index('/market/pages/home/home')" class="tabBar_item">
+				<view  @tap="cut_index('/seller/pages/home/home')" class="tabBar_item">
 					<image v-if="show_index == 0" src="../static/icon-home-active@3x.png"></image>
 					<image v-else src="../static/icon-home@3x.png"></image>
 					<view :class="{'tabBar_name':true,'nav_active':show_index == 0}">首页</view>
 				</view>
-				<view @tap="cut_index('/market/pages/category/category')" class="tabBar_item">
+				<view @tap="cut_index('/seller/pages/category/category')" class="tabBar_item">
 					<image v-if="show_index == 1" src="../static/icon-sort-active@3x.png"></image>
 					<image v-else src="../static/icon-sort@3x.png"></image>
 					<view :class="{'tabBar_name':true,'nav_active':show_index == 1}">分类</view>
 				</view>
-				<view  @tap="cut_index('/market/pages/user/user')" class="tabBar_item">
+				<view  @tap="cut_index('/seller/pages/user/user')" class="tabBar_item">
 					<image v-if="show_index == 2" src="../static/icon-user-active@3x.png"></image>
 					<image v-else src="../static/icon-user@3x.png"></image>
 					<view :class="{'tabBar_name':true,'nav_active':show_index == 2}">我的</view>

components/seller/category.vue

@@ -97,7 +97,7 @@
 					key: 'commodity_id',
 					data: pro.tinyTypeID,
 					success: function () {
-						self.$api.navToListPage({type:'商品分类',value:pro.name,id:pro.tinyTypeID});
+						self.$api.navToListPage({type:'4',value:pro.name,id:pro.tinyTypeID});
 					}
 				})
 			}

components/seller/home.vue

@@ -215,6 +215,8 @@
 					this.secondModulesImage= data.secondModulesImage
 					this.thirdModulesName= data.thirdModulesName
 					this.skeletonShow = false;
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
 				})
 			},
 			getOrganizeProducts(){//获取模块三商品
@@ -222,6 +224,8 @@
 					this.userID = resolve.userID
 					queryPreferred({userId:this.userID,preferredFlag:100,pageNum:1,pageSize:5}).then(res =>{
 						this.organizeProducts = res.data.results
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
 					})
 				})
 			},
@@ -244,7 +248,7 @@
 					key: 'commodity_id',
 					data: nav.id,
 					success: function () {
-						self.$api.navToListPage({type:'导航分类',value:nav.classifyName,id:nav.id});
+						self.$api.navToListPage({type:'0',value:nav.classifyName,id:nav.id});
 					}
 				})
 			},

components/seller/user.vue

@@ -18,13 +18,13 @@
 			</view>
 			<!-- 订单 -->
 			<view class="user-order">
-				<view class="tab-title tui-skeleton-fillet" @click="navigator('/market/pages/order/order-list?listType=0')">
+				<view class="tab-title tui-skeleton-fillet" @click="navigator('/seller/pages/order/order-list?listType=0')">
 					<text class="cell-tit tui-skeleton-fillet">我的订单</text>
 					<text class="cell-more tui-skeleton-fillet">查看更多</text>
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
 				<view class="order-section">
-					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
+					<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon tui-skeleton-fillet">
 							<image src="../../static/temp/order1@3x.png" mode=""></image>
 							<text 	v-if="beforeConfirmCount >0" 
@@ -35,7 +35,7 @@
 						</view>
 						<text class="order-t tui-skeleton-fillet">待确认</text>
 					</view>
-					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=2')"  hover-class="common-hover" :hover-stay-time="50">
+					<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=2')"  hover-class="common-hover" :hover-stay-time="50">
 						<view class="order-icon tui-skeleton-fillet">
 							<image src="../../static/temp/order2@3x.png" mode=""></image>
 							<text  v-if="beforePayCount >0" 
@@ -46,7 +46,7 @@
 						</view>
 						<text class="order-t tui-skeleton-fillet">待付款</text>
 					</view>
-					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=3')" hover-class="common-hover"  :hover-stay-time="50">
+					<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=3')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon tui-skeleton-fillet">
 							<image src="../../static/temp/order3@3x.png" mode=""></image>
 							<text   v-if="beforeShipCount >0" 
@@ -57,7 +57,7 @@
 						</view>
 						<text class="order-t tui-skeleton-fillet">待发货</text>
 					</view>
-					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=4')" hover-class="common-hover"  :hover-stay-time="50">
+					<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=4')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon tui-skeleton-fillet">
 							<image src="../../static/temp/order4@3x.png" mode=""></image>
 							<text 	v-if="shippedCount >0" 
@@ -68,7 +68,7 @@
 						</view>
 						<text class="order-t tui-skeleton-fillet">已发货</text>
 					</view>
-					<view class="order-item" @click="navigator('/market/pages/order/order-list?listType=5')" hover-class="common-hover"  :hover-stay-time="50">
+					<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=5')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon tui-skeleton-fillet">
 							<image src="../../static/temp/order5@3x.png" mode=""></image>
 							<text 	v-if="refundsCount >0"
@@ -117,10 +117,10 @@
 				shippedCount:0,   //已发货角标
 				refundsCount:'', //退货/款角标
 				firstList:[
-					{name:'机构列表',path:'/market/pages/club/list'},
-					{name:'帮机构下单',path:'/market/pages/club/club-list'},
-					{name:'拉机构上线',path:'/market/pages/login/register'},
-					{name:'邀请运营人员',path:'/market/pages/club/allClub-list'}
+					{name:'机构列表',path:'/seller/pages/club/list'},
+					{name:'帮机构下单',path:'/seller/pages/club/club-list'},
+					{name:'拉机构上线',path:'/seller/pages/login/register'},
+					{name:'邀请运营人员',path:'/seller/pages/club/allClub-list'}
 				],
 			}
 		},
@@ -145,7 +145,7 @@
 							uni.removeStorageSync('sessionid')
 							uni.setStorageSync('sessionid','JSESSIONID='+response.data)
 							this.$store.commit('updateStatus',response.data)
-							this.$api.navigateTo('/market/pages/login/login')
+							this.$api.navigateTo('/seller/pages/login/login')
 						})
 					})
 				})

home.vue

@@ -1,644 +0,0 @@
-<template>
-	<view class="container home clearfix">	
-		<!-- 头部轮播 -->
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view :class="'container-home-'+ inputActive" class="tui-skeleton">
-			<view :class="'search-input-' + inputActive">
-				<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>
-			</view>
-			<view class="banner-section">
-				<!-- <uni-swiper-dot :info="bannerList" :current="current" field="content" :mode="mode" > -->
-				<swiper class="banner tui-banner tui-skeleton-rect" circular @change="swiperChange" :autoplay="true" :interval="5000" :duration="500" :circular="false">
-					<swiper-item v-for="(item, index) in bannerImageList" :key="index" class="banner-item"> 
-						<image :src="item" />
-					</swiper-item>
-				</swiper>
-				<view class="swiper__dots-box" v-if="bannerImageList.length > 1">
-					<view v-for="(item,idx) in bannerImageList" 
-						  :key="idx" 
-						  :class="[idx===current?'swiper__dots-long':'none']" 
-						  :data-index="current" class="swiper__dots-item" />
-				</view>
-				<!-- </uni-swiper-dot> -->
-			</view>
-			<view class="cate-section clearfix">
-				<!-- 自定义分类导航栏 -->
-				<view class="tabbar clearfix">
-					<view class="cate-item" v-for="(nav,idx) in productsClassify" :key="idx" @click.stop="navToListPage(nav)">
-						<image class="tui-skeleton-fillet" :src="nav.classifyImage"></image>
-						<text class="tui-skeleton-rect">{{nav.classifyName}}</text>
-					</view>
-				</view>
-				<!-- 优选分类 -->
-				<view class="tabbar clearfix">
-					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'1',value:mallPageModules.firstModulesName})">
-						<image class="tui-skeleton-fillet" :src="mallPageModules.firstModulesImage"></image>
-						<text class="tui-skeleton-fillet">{{mallPageModules.firstModulesName}}</text>
-					</view>
-					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'2',value:mallPageModules.secondModulesName})">
-						<image class="tui-skeleton-fillet" :src="mallPageModules.secondModulesImage"></image>
-						<text class="tui-skeleton-fillet">{{mallPageModules.secondModulesName}}</text>
-					</view>
-					<view class="cate-item-info" @click="showTost">
-						<image class="tui-skeleton-fillet" :src="navInforList[0].icon"></image>
-						<text class="tui-skeleton-fillet">{{navInforList[0].text}}</text>
-					</view>
-					<view class="cate-item-info">
-						<!-- #ifdef MP-WEIXIN -->
-						<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
-							<image class="tui-skeleton-fillet" :src="navInforList[1].icon"></image>
-						</button>	
-						<!-- #endif -->
-						<text class="tui-skeleton-fillet">{{navInforList[1].text}}</text>
-					</view>
-				</view>
-			</view>
-			<!-- 热销商品 -->
-			<view class="hotgoods-section">
-				<view class="s-header" @click="this.$api.navToListPage({type:'3',value:mallPageModules.thirdModulesName})">
-					<text class="tip tui-skeleton-fillet">{{mallPageModules.thirdModulesName}}</text>
-					<text class="tit tui-skeleton-fillet">更多</text>
-					<text class="iconfont icon-xiayibu"></text>
-				</view>
-				<view class="hotgoods-swiper">
-					<scroll-view class="floor-list" scroll-x>
-						<view class="scoll-wrapper">
-							<view 
-								v-for="(item, index) in organizeProducts" :key="index"
-								class="floor-item"
-								@click.stop="navToDetailPage(item.id)"
-							>
-								<image class="tui-skeleton-fillet" :src="item.mainImage" mode="aspectFill"></image>
-								<view class="title tui-skeleton-rect">
-									<text class="mclap">{{item.name}}</text>
-								</view>
-								<view v-if="isLogin" class="price tui-skeleton-rect">
-									<text class="p sm">￥</text>
-									<text class="p big">{{item.retailPrice.toFixed(2)}}</text>
-								</view>
-								<view v-else class="no-price">							
-									<text vi-else class="p-no tui-skeleton-rect" @click.stop="navto('/pages/login/login?type=3')">登录查看价格<text class="iconfont icon-xiayibu" style="font-size: 22rpx;margin: 0 6rpx;"></text></text>
-								</view>		
-							</view>
-						</view>
-					</scroll-view>
-				</view>	
-			</view>
-			<!-- 底部 -->
-			<view class="footer-section ">
-				<view class="s-header tui-skeleton-fillet">
-					<text class="tip">医美机构正品联盟</text>
-				</view>
-				<view class="f-content tui-skeleton-fillet" @click="navto('/pages/service/member')">
-					<image class="tui-banner" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AEwQlAAjGFdpI2LM357.png" mode=""></image>
-				</view>
-				<view class="f-tab-section">
-					<!-- 优选分类 -->
-					<view class="tabbar clearfix">
-						<view class="cate-item" @click="showTost">
-							<image class="tui-skeleton-fillet" :src="navServerList[0].icon"></image>
-							<text class="tui-skeleton-fillet">{{navServerList[0].text}}</text>
-						</view>
-						<view class="cate-item" @click="navto(navServerList[1].path)">
-							<image class="tui-skeleton-fillet" :src="navServerList[1].icon"></image>
-							<text class="tui-skeleton-fillet">{{navServerList[1].text}}</text>
-						</view>
-						<view class="cate-item" @click="navto(navServerList[2].path)">
-							<image class="tui-skeleton-fillet" :src="navServerList[2].icon"></image>
-							<text class="tui-skeleton-fillet">{{navServerList[2].text}}</text>
-						</view>
-						<view class="cate-item" @click="telPhoneTo">
-							<image class="tui-skeleton-fillet" :src="navServerList[3].icon"></image>
-							<text class="tui-skeleton-fillet">{{navServerList[3].text}}</text>
-						</view>
-					</view>
-				</view>
-				<view class="f-logo s tui-skeleton-fillet">
-					<image class="" src="../../../static/logo-s@3x.png" mode=""></image>
-				</view>
-				<view class="f-logo c tui-skeleton-fillet">
-					<image class="" src="../../../static/logo-c@2x.png" mode=""></image>
-				</view>
-				<view class="f-text tui-skeleton-fillet">
-					<text class="">技术支持：采美365网</text>
-				</view>
-			</view>	
-		</view>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='modallayer'></modal-layer>
-	</view>
-</template>
-
-<script>
-	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import authorize from '@/common/config/authorize.js'
-	import modalLayer from "@/components/modal-layer"
-	import btSearch from '@/components/uni-search/bt-search.vue'
-	import { mapMutations} from 'vuex';
-	export default {
-		components:{
-			tuiSkeleton,
-			modalLayer,
-			btSearch
-		},
-		data() {
-			return {
-				userID:'',
-				inputActive:'float',
-				hotSearchText:'你想要的这里都有',
-				clickPath:'/pages/search/search',
-				current:0,
-				mode:'round',
-				modallayer:false,
-				isLogin:false,
-				bannerImageList:[],
-				hotGoodsList:[],
-				skeletonShow: true,
-				organizeProducts:[],//常用商品
-				productsClassify:[], //导航分类
-				mallPageModules:'', //优惠模块分类
-				navInforList:[
-					{text:'会员中心',icon:'https://img.caimei365.com/group1/M00/03/83/Cmis214FbbCAN1DUAACN4QezCQg932.png'},
-					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/83/Cmis214FbbCAAtjBAACWFNlS2jU759.png'}
-				],
-				navServerList:[
-					{text:'会员优惠',icon:'../../../static/temp/server1@2x.png',path:'/pages/service/member'},
-					{text:'售后无忧',icon:'../../../static/temp/server2@2x.png',path:'/pages/service/aftersale'},
-					{text:'购物须知',icon:'../../../static/temp/server3@2x.png',path:'/pages/service/shoppingnotice'},
-					{text:'联系我们',icon:'../../../static/temp/server4@2x.png',path:''},
-				]
-			}
-		},
-		onLoad() {
-			this.initData()
-		},
-		methods: {
-			async initData(){
-				this.skeletonShow = true;
-				let hotGoodsList = await this.$util.json('hotGoodsList'); 
-				this.hotGoodsList = hotGoodsList;
-			},	
-			getCheekeyCode(){
-				authorize.getCode('weixin').then(wechatcode =>{
-					// console.log(wechatcode);
-					// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-					this.$api.get('/login/doLogin',{userOrganizeID:this.userOrganizeID,code:wechatcode},
-						response =>{
-							// console.log(response);
-							if(response.code == '1'){
-								this.isLogin = true;
-								this.userID = response.data.userID;						
-								let user_key = {code:response.code,openid:response.data.openid,userID:response.data.userID}
-								this.$store.commit('updateStatus',user_key)
-								// uni.setStorageSync('cookieKey','JSESSIONID='+response.data.sessionId)
-								// uni.setStorageSync('X-Token','JSESSIONID='+response.data.sessionId)
-								this.getHomeInformation()
-							}else{
-								this.isLogin = false;
-								this.userID ='';
-								let user_key = {code:response.code,tel:response.data,userID:this.userID,openid:''}
-								this.$store.commit('updateStatus',user_key)
-								this.getHomeInformation()
-								// this.$store.commit('updateAllNum',0)
-							}
-						}
-					)
-				})
-			},		
-			getHomeInformation(){				
-				this.$api.get('/home/information',{userID:this.userID,organizeID:this.userOrganizeID}, 
-					response => {
-						if(response.code =='1'){
-							let data = response.data;
-							this.organizeProducts = data.organizeProducts
-							this.productsClassify = data.productsClassify
-							this.bannerImageList = data.bannerImageList
-							this.mallPageModules = data.mallPageModules
-							this.$store.commit('updateAllNum',response.data.count)
-						}
-						this.skeletonShow = false
-					}
-				)
-			},
-			//轮播图切换修改背景色
-			swiperChange(e) {
-				const index = e.detail.current;
-				this.current = index;
-				// console.log('current',this.current)
-				// this.titleNViewBackground = this.carouselList[index].background;
-			},
-			formatMoney(num){
-				return num.toString().replace(/\d+/, function (n) { // 先提取整数部分
-					return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) { // 对整数部分添加分隔符
-						return $1 + ",";
-					});
-				});
-			},
-			//分类导航跳转
-			navToListPage(nav){
-				let self = this;
-				uni.setStorage({
-					key: 'commodity_id',
-					data: nav.id,
-					success: function () {
-						self.$api.navToListPage({type:'商品分类',value:nav.classifyName,id:nav.id});
-					}
-				})
-			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.modallayer = true;
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
-			},
-			handleContact(e){
-				console.log(e.detail.path)
-				console.log(e.detail.query)
-			},
-			showTost(){
-				this.$util.msg("正在开发中，敬请期待~",2000);
-			},
-			navto(url){
-				this.$api.navigateTo(url)
-			},
-			telPhoneTo(){
-				let self = this;
-				this.$api.get('/home/afterSale',{organizeID:this.userOrganizeID}, 
-					response => {
-						console.log(response.data.contactNumber)
-						uni.makePhoneCall({
-							phoneNumber:response.data.contactNumber //仅为示例
-						});
-					}
-				)	
-			},
-		},
-		onPageScroll(e){
-			// console.log(e.scrollTop);//实时获取到滚动的值
-			if(e.scrollTop>50){
-				this.inputActive = 'fixed'
-			}else{
-				this.inputActive = 'float'
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.getHomeInformation()
-			uni.stopPullDownRefresh()
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		      console.log(res.target)
-		    }
-			return {
-			  title: '星范Starstyle-全球医美领导品牌',
-			  path: 'pages/tabBar/home/home',
-			  imageUrl:'https://img.caimei365.com/group1/M00/03/88/Cmis214gJkOAAJBGABjUCizCahk919.png'
-			}
-		},
-		onShow(){
-			this.modallayer = false;
-			this.getCheekeyCode()
-		}
-	}
-</script>
-
-<style lang="scss">
-	page,.home{
-		width: 100%;
-		height: auto;
-	}	
-	.container-home-float{
-		padding-top: 0;
-	}
-	.container-home-fixed{
-		padding-top: 100rpx;
-	}
-	.search-input-float{
-		width: 100%;
-		height:auto;
-	}
-	.search-input-fixed{
-		width: 100%;
-		height:auto;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 1000;
-		background: #FFFFFF;
-	}		
-	.banner-section{
-		width: 100%;
-		height: 366rpx;
-		position: relative;
-	}	
-	.banner{
-		width: 100%;
-		height: 366rpx;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.swiper__dots-box{
-		position: absolute;
-		bottom: 10px;
-		left: 0;
-		right: 0;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		.swiper__dots-item{
-			width: 8rpx;
-			height: 8rpx;
-			border-radius: 100%;
-			margin-left: 6px;
-			background-color:rgba(255,255,255,.7);
-		}
-		.swiper__dots-long{
-			width: 32rpx;
-			height: 8rpx;
-			border-radius: 4rpx;
-			background-color: #ffff;
-			transition: all 0.4s;
-		}
-	}
-	/* 分类 */
-	.cate-section {
-		width: 702rpx;
-		height: auto;
-		padding: 48rpx 24rpx; 
-		background: #fff;
-		.tabbar{
-			margin-bottom: 26rpx;
-		}
-		.cate-item {
-			width: 118rpx;
-			margin-right:28rpx;
-			margin-bottom:28rpx;
-			display: flex;
-			float: left;
-			flex-direction: column;
-			align-items: center;
-			font-size: $font-size-26;
-			color: $text-color;
-			line-height: 36rpx;
-			&:last-child{
-				margin-right: 0;
-			}
-			&:nth-child(5n){
-				margin-right: 0;
-			}
-			image {
-				width: 90rpx;
-				height: 90rpx;
-				margin-bottom: 8rpx;
-			}	
-		}
-		.cate-item-info {
-			width: 160rpx;
-			margin-right:20.666rpx;
-			display: flex;
-			float: left;
-			flex-direction: column;
-			align-items: center;
-			font-size: $font-size-26;
-			color: $text-color;
-			line-height: 36rpx;
-			&:last-child{
-				margin-right: 0;
-			}
-			image {
-				width: 160rpx;
-				height: 90rpx;
-				margin-bottom: 16rpx;
-			}	
-			button.contact-btn{
-				width: 160rpx;
-				height: 90rpx;
-				margin: 0;
-				padding: 0;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				box-sizing: border-box;
-				text-align: center;
-				text-decoration: none;
-				border-radius: 0;
-				-webkit-tap-highlight-color: transparent;
-				overflow: hidden;
-				background-color:#FFFFFF;
-				margin-bottom: 16rpx;
-				image{
-					width: 160rpx;
-					height: 90rpx;
-					margin-bottom: 0;
-				}
-			}
-		}
-	}
-	/* 活动 */
-	.hot-section{
-		padding:0 24rpx 48rpx 24rpx; 
-		background: #FFFFFF;
-		.ht-l{
-			width: 339rpx;
-			height: 188rpx;
-			float: left;
-			image{
-				width: 339rpx;
-				height: 188rpx;
-				border-radius:10rpx;
-			}
-		}
-		.ht-r{
-			width: 339rpx;
-			height: 188rpx;
-			float: right;
-			image{
-				width: 339rpx;
-				height: 188rpx;
-				border-radius:10rpx;
-			}
-		}
-	}
-	.hotgoods-section{
-		padding: 4rpx 0 24rpx 24rpx;
-		background: #fff;
-		.s-header{
-			display:flex;
-			align-items:center;
-			height: 40rpx;
-			line-height: 40rpx;
-			.tip{
-				flex: 4;
-				font-size: 30rpx;
-				color: $text-color;
-				font-weight: bolder;
-			}
-			.tit{
-				flex: 4.4;
-				font-size: $font-size-28;
-				color: $text-color;
-				text-align: right;
-			}
-			.icon-xiayibu{
-				flex: 0.6;
-				color: $text-color;
-				text-align: left;
-				font-size: $font-size-24;
-			}
-		}
-	}	
-	.hotgoods-swiper{
-		width: 100%;
-		height: auto;				
-		overflow: hidden;
-		scroll-view{
-			padding: 26rpx 0;
-			width: 100%;
-		}
-		.scoll-wrapper{
-			display:flex;
-			align-items: flex-start;
-		}
-		.floor-item{
-			width: 210rpx;
-			padding-right: 24rpx;
-			font-size: $font-size-24;
-			color: $text-color;
-			line-height: 36rpx;
-			border-radius: 10rpx;
-			image{
-				width: 210rpx;
-				height: 217rpx;
-				border-radius: 10rpx;
-			}
-			.title{
-				width: 210rpx;
-				height: 72rpx;
-				display: flex;
-				flex-direction: column;
-				.mclap{
-					width: 100%;
-					line-height: 36rpx;
-					text-overflow:ellipsis;
-					display: -webkit-box;
-					word-break: break-all;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
-					overflow: hidden;
-					font-size: 26rpx;
-				}
-			}
-			.no-price{
-				height: 36rpx;
-				line-height: 36rpx;
-				display: flex;
-				margin-top: 8rpx;
-				.p-no{
-					font-size: $font-size-24;
-					color: #F8C499;
-					margin-left: 10rpx;
-				}
-				image{
-					width:30rpx;
-					height: 36rpx;
-				}
-			}
-			.price{
-				color:#FF2A2A;
-				line-height: 20rpx;
-				margin-top: 18rpx;
-				.sm{
-					font-size: $font-size-24;
-				}
-				.big{
-					font-size: $font-size-28;
-				}
-			}
-		}
-	}
-	.footer-section{
-		width: 702rpx;
-		padding: 0  24rpx 30rpx 24rpx;
-		.s-header{
-			display:flex;
-			align-items:center;
-			height: 40rpx;
-			line-height: 40rpx;
-			margin-bottom: 38rpx;
-			.tip{
-				flex: 1;
-				font-size: 30rpx;
-				color: $text-color;
-				font-weight: bolder;
-			}
-		}
-		.f-content{
-			width: 100%;
-			image{
-				width: 100%;
-				height: 350rpx;
-			}
-		}
-		/*底部服务导航*/
-		.f-tab-section {
-			width: 100%;
-			height: auto;
-			padding: 38rpx 0; 
-			background: #fff;
-			/*底部服务导航*/
-			.cate-item {
-				width: 99rpx;
-				margin-right: 102rpx;
-				float: left;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				font-size: $font-size-24;
-				color: $text-color;
-				&:last-child{
-					margin-right: 0;
-				}
-				image {
-					width: 75rpx;
-					height: 75rpx;
-					margin-bottom: 8rpx;
-					border-radius: 50%;
-				}
-			}
-		}	
-		.f-logo.s{
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			margin-bottom: 8rpx;
-			image{
-				width: 250rpx;
-				height: 86rpx;
-			}
-		}
-		.f-logo.c{
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			image{
-				width: 82rpx;
-				height: 84rpx;
-			}
-		}
-		.f-text{
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			font-size: $font-size-24;
-			color: $text-color;
-			line-height: 40rpx;
-		}
-	}
-</style>

pages.json

@@ -239,7 +239,7 @@
     ],
 	"subPackages": [
 		{
-			"root": "market",
+			"root": "seller",
 			"pages": [
 				{
 					"path": "pages/index/index",

pages/goods/goods.vue

@@ -34,35 +34,37 @@
 					key: 'commodity_id',
 					success: function (res) {
 					    const id = res.data;
+						const emptyTxt = '正在上架中，敬请期待~';
+						const otherTypeUrl = '/product/preferred';
+						/**
+						 *@商品分类列表传参类型
+						 *@type  首页分类：0，首页商品模块1：1,首页商品模块2：2,首页商品模块3：3，底部导航分类：4
+						 **/
 						switch(type){
-							case '商品分类':
-								self.serverUrl = `/product/listByTinyTypeID?tinyTypeID=${id}`;
+							case '0':
+								self.serverUrl = `/home/classify?classifyId=${id}`;
 								self.emptyText = '该分类暂时还没有商品哟，去逛逛别的吧~';
 								break;
-							case '导航分类':
-								self.serverUrl = `/home/classify?classifyId=${id}`;
+							case '1':	
+								self.serverUrl = `${otherTypeUrl}?preferredFlag=001`;
+								self.emptyText = `${self.lastPageVal}商品${emptyTxt}`;
+								break;
+							case '2':
+								self.serverUrl = `${otherTypeUrl}?preferredFlag=010`;
+								self.emptyText = `${self.lastPageVal}商品${emptyTxt}`;
+								break;
+							case '3':
+								self.serverUrl = `${otherTypeUrl}?preferredFlag=100`;
+								self.emptyText = `${self.lastPageVal}商品${emptyTxt}`;
+								break;
+							case '4':
+								self.serverUrl = `/product/listByTinyTypeID?tinyTypeID=${id}`;
 								self.emptyText = '该分类暂时还没有商品哟，去逛逛别的吧~';
 								break;
 						}
 						self.$refs.childList.getListFromServer();
 					}
 				})
-				if(type !== '商品分类') {
-					// 空内容文案
-					const emptyTxt = '正在上架中，敬请期待~',
-						  otherTypeUrl = '/product/preferred';
-					if(type === '1') {
-						this.serverUrl = `${otherTypeUrl}?preferredFlag=001`;
-						this.emptyText = `${this.lastPageVal}商品${emptyTxt}`;
-					} else if(type === '2') {
-						this.serverUrl = `${otherTypeUrl}?preferredFlag=010`;
-						this.emptyText = `${this.lastPageVal}商品${emptyTxt}`;
-					} else if(type === '3') {
-						this.serverUrl = `${otherTypeUrl}?preferredFlag=100`;
-						this.emptyText = `${this.lastPageVal}商品${emptyTxt}`;
-					}
-					this.$refs.childList.getListFromServer();
-				}
 			}
 		},
 		onShow() {

pages/login/bindOperator.vue

@@ -119,7 +119,7 @@
 							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
 							this.$store.commit('updateStatus',response.data)
 							if(response.data.userIdentity ==1){
-								this.$api.navigateTo('/market/pages/index/index')
+								this.$api.navigateTo('/seller/pages/index/index')
 							}else{
 								this.$api.switchTabTo('/pages/tabBar/home/home')
 							}
@@ -192,21 +192,21 @@
 				getbindOperatorCode(params).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( res =>{
 					this.$util.msg(res.msg,2000)
 					this.isMobileDisabled = false;

pages/tabBar/category/category.vue

@@ -74,7 +74,7 @@
 						}
 					}
 				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
+					this.$util.msg(error.msg,2000)
 				})
 			},
 			showCategory(e,index){//分类切换显示
@@ -92,7 +92,7 @@
 					key: 'commodity_id',
 					data: pro.tinyTypeID,
 					success: function () {
-						self.$api.navToListPage({type:'商品分类',value:pro.name,id:pro.tinyTypeID});
+						self.$api.navToListPage({type:'4',value:pro.name,id:pro.tinyTypeID});
 					}
 				})
 			}

pages/tabBar/home/home.vue

@@ -16,7 +16,8 @@
 					<view v-for="(item,idx) in bannerImageList" 
 						  :key="idx" 
 						  :class="[idx===current?'swiper__dots-long':'none']" 
-						  :data-index="current" class="swiper__dots-item" />
+						  :data-index="current" class="swiper__dots-item">
+					</view>	  
 				</view>
 			</view>
 			<view class="cate-section clearfix">
@@ -213,7 +214,7 @@
 							uni.removeStorageSync('sessionid')
 							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
 							if(response.data.userIdentity ==1){
-								this.$api.navigateTo('/market/pages/index/index')
+								this.$api.navigateTo('/seller/pages/index/index')
 							}
 						}).catch(error =>{
 							this.isLogin = false;
@@ -242,11 +243,15 @@
 					}else{
 						this.$store.commit('updateAllNum',0)
 					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
 				})
 			},
 			getOrganizeProducts(){//获取模块三商品
 				queryPreferred({userId:this.userID,preferredFlag:100,pageNum:1,pageSize:5}).then(res =>{
 					this.organizeProducts = res.data.results
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
 				})
 			},
 			//轮播图切换修改背景色
@@ -268,7 +273,7 @@
 					key: 'commodity_id',
 					data: nav.id,
 					success: function () {
-						self.$api.navToListPage({type:'导航分类',value:nav.classifyName,id:nav.id});
+						self.$api.navToListPage({type:'0',value:nav.classifyName,id:nav.id});
 					}
 				})
 			},
@@ -282,7 +287,7 @@
 			},
 			showTost(){
 				// this.$util.msg("正在开发中，敬请期待~",2000)
-				this.$api.navigateTo(`/market/pages/login/login`)
+				this.$api.navigateTo(`/seller/pages/login/login`)
 				// uni.navigateToMiniProgram({
 				// 	appId: 'wx5a5cda32926f55ac',
 				// 	path: '/pages/tabBar/home/home',

pages/user/order/orderShareLogin.vue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -167,15 +167,15 @@
 			},
 			_goImmediately(item){
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/market/pages/cart/immediately')
+				this.$api.navigateTo('/seller/pages/cart/immediately')
 			},
 			_goBuyagain(item ){
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/market/pages/cart/buyagain')
+				this.$api.navigateTo('/seller/pages/cart/buyagain')
 			},
 			_goHistory(item){
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/market/pages/order/order-history')
+				this.$api.navigateTo('/seller/pages/order/order-history')
 			}
 		},
 		onReachBottom() {

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

@@ -201,19 +201,19 @@
 			checkData(item){
 				switch(this.tabCurrentIndex){
 					case 0:
-						this.$api.navigateTo(`/market/pages/login/information?userID=${item.userID}&status=${item.status}`)
+						this.$api.navigateTo(`/seller/pages/login/information?userID=${item.userID}&status=${item.status}`)
 						break;
 					case 1:
-						this.$api.navigateTo(`/market/pages/login/apply?userID=${item.userID}&status=${item.status}`)
+						this.$api.navigateTo(`/seller/pages/login/apply?userID=${item.userID}&status=${item.status}`)
 						break;
 					case 2:
-						this.$api.navigateTo(`/market/pages/login/information?userID=${item.userID}&status=${item.status}`)
+						this.$api.navigateTo(`/seller/pages/login/information?userID=${item.userID}&status=${item.status}`)
 						break;
 				}
 			},
 			orderHistory(item){
 				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo(`/market/pages/order/order-history?clubID=${item.clubID}`)
+				this.$api.navigateTo(`/seller/pages/order/order-history?clubID=${item.clubID}`)
 			},
 			onShowClose () {//输入框失去焦点时触发
 				if(this.searchInputVal != ''){

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

@@ -88,7 +88,7 @@
 									uni.setStorageSync('token',response.data.token)
 									uni.removeStorageSync('sessionid')
 									uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-									this.$api.navigateTo('/market/pages/index/index')
+									this.$api.navigateTo('/seller/pages/index/index')
 								}
 							}else{
 								this.isSeller= true
@@ -128,7 +128,7 @@
 						uni.setStorageSync('token',response.data.token)
 						uni.removeStorageSync('sessionid')
 						uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-						this.$api.navigateTo('/market/pages/index/index')
+						this.$api.navigateTo('/seller/pages/index/index')
 					}else{
 						this.$util.msg(response.msg,2000);
 					}

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

@@ -284,10 +284,10 @@
 					if(response.code == 1){
 						this.$util.msg('支付成功',2000,true,'success')
 						setTimeout(() =>{
-							this.$api.redirectTo(`/market/pages/order/order-details?type=cash&orderID=${response.data.orderID}`)
+							this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${response.data.orderID}`)
 						},2000)
 					}else if(response.code == 2){
-						this.$api.redirectTo(`/market/pages/order/order-details?type=cash&orderID=${response.data.orderID}`)
+						this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${response.data.orderID}`)
 					}else{
 						this.$util.msg(response.msg,2000);
 					}

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

@@ -124,7 +124,7 @@
 					this.returnedPurchaseFee = resData.order.returnedPurchaseFee
 				}).catch(error =>{
 					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
-						this.$api.switchTabTo('/market/pages/index/index')
+						this.$api.switchTabTo('/seller/pages/index/index')
 					})
 				})
 			},
@@ -160,9 +160,9 @@
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							if(this.shareType ==='share'){
-								this.$api.navigateTo('/market/pages/index/index')
+								this.$api.navigateTo('/seller/pages/index/index')
 							}else{
-								this.$api.navigateTo(`/market/pages/order/order-list?type=detele&listType=${this.listType}`)
+								this.$api.navigateTo(`/seller/pages/order/order-list?type=detele&listType=${this.listType}`)
 							}
 						},500)
 					}).catch(error =>{

market/pages/order/order-history.vue → seller/pages/order/order-history.vue

@@ -152,7 +152,7 @@
 				return stateText;
 			},
 			orderDetiles(id){
-				this.$api.navigateTo(`/market/pages/order/order-details?type=confim&orderID=${id}`)
+				this.$api.navigateTo(`/seller/pages/order/order-details?type=confim&orderID=${id}`)
 			}
 		},
 		onReachBottom() {

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

@@ -283,7 +283,7 @@
 			},
 			detail(id) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/market/pages/order/order-details?listType=${this.currentTab}&orderID=${id}`)
+				this.$api.navigateTo(`/seller/pages/order/order-details?listType=${this.currentTab}&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				this.handShowAlert(data)
@@ -339,7 +339,7 @@
 				})
 			},
 			handlSearchPath(){
-				this.$api.navigateTo('/market/pages/search/search-order')
+				this.$api.navigateTo('/seller/pages/search/search-order')
 			},
 			onShareAppMessage (res){//分享转发
 				this.isShareModal = false

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

@@ -287,7 +287,7 @@
 			},
 			detail(id) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/market/pages/order/order-details?type=seacrch&orderID=${id}`)
+				this.$api.navigateTo(`/seller/pages/order/order-details?type=seacrch&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				this.handShowAlert(data)