优化部分功能

api/product.js

@@ -12,7 +12,7 @@ import $reg from '@/common/config/common.js'
  */
 export function queryGoodscategory() {
 	return new Promise(function(resolve,reject) {
-		request.lodingGet("/product/classify",{}, res => {
+		request.get("/product/classify",{}, res => {
 			if(res.code == 0){
 				resolve(res);
 			}else{

api/seller.js

@@ -49,7 +49,7 @@ export function sellerLogin(params) {
  */
 export function getSellerHome(params) {
 	return new Promise(function(resolve,reject) {
-		request.lodingGet('/seller/home',params,res => {
+		request.get('/seller/home',params,res => {
 			if(res.code == 0){
 				resolve(res)
 			}else{

components/seller/category.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="category-container clearfix">
-		<view class="category-list">
+		<!-- 头部轮播 -->
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
+		<view class="category-list tui-skeleton">
 			<!--顶部搜索导航栏-->
 <!-- 		<view class="'search-input-fixed">
 				<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>
@@ -8,7 +10,7 @@
 			<!-- 左侧分类导航 -->
 			<scroll-view class="left-aside" scroll-y="true" scroll-with-animation :scroll-top="verticalNavTop" style="height:calc(100vh - 202rpx)" :style="{top:CustomBar+'px'}">
 				<view class="row" v-if="m.smalltypeList.length > 0" v-for="(m, index) in categoryList" :key="index" :class="[index==showCategoryIndex?'on':'']" @tap="showCategory($event,index)" :data-id="index">
-					<view class="text">
+					<view class="text tui-skeleton-fillet">
 						{{m.name}}
 					</view>
 					<view class="block"></view>
@@ -18,11 +20,11 @@
 			<scroll-view  scroll-y="true" class="right-aside" style="height:calc(100vh - 202rpx)" :style="{top:CustomBar+'px'}">
 				<view class="category" v-if="n.smalltypeList.length > 0" v-for="(n,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
 					<view class="category-box" v-for="(o,oIndex) in n.smalltypeList" :key="oIndex">
-						<view class="title">{{o.name}}</view>
+						<view class="title tui-skeleton-fillet">{{o.name}}</view>
 						<view class="list" v-if="o.tinytypeList.length > 0">
 							<view class="box" v-for="(pro,proIndex) in o.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,proIndex)">
-								<image :src="pro.icon"></image>
-								<view class="text">{{pro.name}}</view>
+								<image :src="pro.icon" class="tui-skeleton-fillet"></image>
+								<view class="text tui-skeleton-fillet">{{pro.name}}</view>
 							</view>
 						</view>
 						<view v-else class="no-data">
@@ -44,6 +46,7 @@
 		},
 		data() {
 			return {
+				skeletonShow: true,
 				headerShow:true,
 				hotSearchText: '你想要的这里都有',
 				clickPath:'/pages/search/search',
@@ -74,6 +77,7 @@
 							break;
 						}
 					}
+					this.skeletonShow = false;
 				}).catch(res =>{
 					this.$util.msg(res.msg,2000);
 				})

components/seller/home.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container home clearfix" :style="{paddingTop:100+'rpx'}">	
 		<!-- 头部轮播 -->
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="9"></tui-skeleton>
+		<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-fixed" :style="{top:CustomBar+'px'} ">
 				<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>

components/seller/user.vue

@@ -105,7 +105,7 @@
 		},
 		data() {
 			return{	
-				name:'采美协销',
+				name:'',
 				headpic:'',
 				userMoney:0.00,
 				userId:'',

home.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container home clearfix">	
 		<!-- 头部轮播 -->
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="9"></tui-skeleton>
+		<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>

market/pages/cart/cart.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container cart clearfix">	
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="9"></tui-skeleton>
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="container-cart-main tui-skeleton">
 			<view v-if="!isEmpty" class="container-cart">
 				<scroll-view class="cart-content"  scroll-y  @scrolltolower="toLower">

market/pages/category/category.vue

@@ -1,248 +0,0 @@
-<template>
-	<view id="category" :style="{paddingBottom:isIphoneX?'140rpx':'98rpx'}">
-		<!--顶部搜索导航栏-->
-		<view class="'search-input-fixed">
-			<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>
-		</view>
-		<view class="category-list">
-			<!-- 左侧分类导航 -->
-			<scroll-view class="left-aside" scroll-y="true" scroll-with-animation :scroll-top="verticalNavTop" style="height:calc(100vh - 102rpx)">
-				<view class="row" v-if="m.smalltypeList.length > 0" v-for="(m, index) in categoryList" :key="index" :class="[index==showCategoryIndex?'on':'']" @tap="showCategory($event,index)" :data-id="index">
-					<view class="text">
-						{{m.name}}
-					</view>
-					<view class="block"></view>
-				</view>
-			</scroll-view>
-			<!--右侧子导航-->
-			<scroll-view  scroll-y="true" class="right-aside">
-				<view class="category" v-if="n.smalltypeList.length > 0" v-for="(n,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
-					<view class="category-box" v-for="(o,oIndex) in n.smalltypeList" :key="oIndex">
-						<view class="title">{{o.name}}</view>
-						<view class="list" v-if="o.tinytypeList.length > 0">
-							<view class="box" v-for="(pro,proIndex) in o.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,proIndex)">
-								<image :src="pro.icon"></image>
-								<view class="text">{{pro.name}}</view>
-							</view>
-						</view>
-						<view v-else class="no-data">
-							该栏目暂无分类~
-						</view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-		<!-- 底部tabbar -->
-		<cu-tabbar :active-index ="1"></cu-tabbar>
-	</view>
-</template>
-<script>
-	import cuTabbar from '@/components/cu-tabbar.vue'
-	import btSearch from '@/components/uni-search/bt-search.vue'
-	import { queryGoodscategory } from "@/api/product.js"
-
-	export default {
-		components: {
-			btSearch,
-			cuTabbar
-		},
-		data() {
-			return {
-				headerShow:true,
-				hotSearchText: '你想要的这里都有',
-				clickPath:'/pages/search/search',
-				showCategoryIndex: 0,
-				//分类列表
-				categoryList: [],
-				search: '',
-				cateTop: {},
-				verticalNavTop: 0,
-				isIphoneX:this.$store.state.isIphoneX,
-			}
-		},
-		onLoad() {
-			this.initData();
-		},
-		methods: {
-			// 跳转至商品列表
-			navToList(id){
-				uni.navigateTo({
-					url: `/pages/product/list?cate_id=${id}`
-				})
-			},
-			// 数据初始化
-			initData() {
-				this.getProductCate();
-			},
-			// 获取商品分类列表
-			getProductCate () {
-				queryGoodscategory().then(res =>{
-					this.categoryList = res.data
-					// 查询第一个拥有二级菜单的子菜单
-					for (let i = 0; i < this.categoryList.length; i++) {
-						if (this.categoryList[i].smalltypeList.length > 0) {
-							this.showCategoryIndex = i;
-							break;
-						}
-					}
-				}).catch(res =>{
-					this.$util.msg(res.msg,2000);
-				})
-			},
-			showCategory(e,index){//分类切换显示
-				this.showCategoryIndex = index;
-				this.verticalNavTop = (e.currentTarget.dataset.id - 1) * 50
-			},
-			toSearch () {// 跳转至搜索详情页
-				uni.navigateTo({
-					url: `/pages/search/search?search=${JSON.stringify(this.search)}`
-				})
-			},
-			navToListPage(pro,index){//分类导航跳转
-				let self = this;
-				uni.setStorage({
-					key: 'commodity_id',
-					data: pro.tinyTypeID,
-					success: function () {
-						self.$api.navToListPage({type:'商品分类',value:pro.name,id:pro.tinyTypeID});
-					}
-				})
-			}
-		}
-	}
-</script>
-<style scoped lang="scss">
-	page {
-		background-color: #fff;
-	}
-	.search-input-fixed{
-		width: 100%;
-		height:auto;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 1000;
-		background: #FFFFFF;
-		border-bottom: 1px solid #F7F7F7;
-	}		
-	#category {
-		/*模块分类*/
-		.category-list{
-			width: 100%;
-			background-color: #fff;
-			display: flex;
-			
-			.left-aside,.right-aside{
-				position: absolute;
-				top: 100rpx;
-				/*  #ifdef  APP-PLUS  */
-				top: calc(100rpx + var(--status-bar-height));
-				/*  #endif  */
-				bottom: 0rpx;
-			}
-			.left-aside{
-				width: 200rpx;
-				left: 0rpx;
-				background-color: #f2f2f2;
-				.row{
-					width: 100%;
-					height: 100rpx;
-					display: flex;
-					align-items: center;
-					position: relative;
-					.text{
-						width: 100%;
-						position: relative;
-						font-size: $font-size-28;
-						display: flex;
-						justify-content: center;
-						color: $text-color;
-						/* transition: transform 0.3s ease;*/
-						transition-property: transform;
-						transition-duration: 0.2s;
-						transition-timing-function: ease;
-					}
-					.block{
-						position: absolute;
-						width: 0rpx;
-						left: 0;
-						/* transition: transform 0.3s ease;*/
-						transition-property: transform;
-						transition-duration: 0.2s;
-						transition-timing-function: ease;
-					}
-					&.on{
-						height: 100rpx;
-						background-color: #fff;
-						.text{
-							font-size: $font-size-28;
-							color: $color-system;
-						}
-						.block{
-							width: 10rpx;
-							height: 60rpx;
-							top: 20rpx;
-							background-color: $color-system;
-							border-radius: 0 15rpx 15rpx 0;
-						}
-					}
-				}
-			}
-			.right-aside{
-				width: 550rpx;
-				left: 200rpx;
-				.category{
-					width: calc(100%);
-					padding: 0 15rpx 20rpx 0;
-					background: #F7F7F7;
-					.category-box{
-						background: #FFFFFF;
-						margin-bottom: 20rpx;
-						.title{
-							padding: 0 24rpx;
-							line-height: 80rpx;
-							height: 80rpx;
-							text-align: left;
-							color: $text-color;
-							font-size: $font-size-26;
-							border-bottom: 1px solid #F7F7F7;
-							font-weight: 600;
-						}
-						.list{
-							margin-top: 24rpx;
-							width: 100%;
-							display: flex;
-							flex-wrap: wrap;
-							.box{
-								width: calc(71.44vw / 3);
-								margin-bottom: 40rpx;
-								display: flex;
-								justify-content: center;
-								align-items: center;
-								flex-wrap: wrap;
-								image{
-									width: 140rpx;
-									height: 140rpx;
-								}
-								.text{
-									margin-top: 8rpx;
-									width: 100%;
-									display: flex;
-									justify-content: center;
-									font-size: $font-size-24;
-								}
-							}
-						}
-						.no-data {
-							text-align: center;
-							margin: 30rpx 0;
-							color: #999999;
-							font-size: 24rpx;
-							line-height: 80rpx;
-						}
-					}
-				}
-			}
-		}
-	}
-</style>

market/pages/club/addoperator.vue

@@ -65,7 +65,7 @@
 			</view>
 		</view>
 		<view class="login-form clearfix">
-			<view class="login-btn"  @click="bindWechatInfo">确定</view>
+			<view class="login-btn">确定</view>
 		</view>
 	</view>
 </template>
@@ -130,10 +130,11 @@
 			padding: 20rpx 24rpx;
 			margin: 24rpx 0 118rpx 0;
 			.logo-titl{
-				font-size: 24rpx;
+				font-size: 26rpx;
 				line-height: 34rpx;
 				color:$text-color;
 				margin-bottom: 40rpx;
+				font-weight: bold;
 			}
 			.logo-text{
 				font-size: 24rpx;

market/pages/home/home.vue

@@ -1,641 +0,0 @@
-<template>
-	<view class="container home clearfix" :style="{paddingBottom:isIphoneX?'140rpx':'98rpx',paddingTop:CustomBar+'px'}">	
-		<cu-custom :navbar-data='nvabarData'></cu-custom>
-		<!-- 头部轮播 -->
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="9"></tui-skeleton>
-		<view :class="'container-home-'+ inputActive" class="tui-skeleton">
-			<view :class="'search-input-' + inputActive" :style="{paddingTop:inputActive == 'fixed'?(CustomBar+2)+'px':''} ">
-				<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-info" @click.stop="this.$api.navToListPage({type:'1',value:firstModulesName})">
-						<image class="tui-skeleton-fillet" :src="firstModulesImage"></image>
-						<text class="tui-skeleton-fillet">{{firstModulesName}}</text>
-					</view>
-					<view class="cate-item-info" @click.stop="this.$api.navToListPage({type:'2',value:secondModulesName})">
-						<image class="tui-skeleton-fillet" :src="secondModulesImage"></image>
-						<text class="tui-skeleton-fillet">{{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 tui-skeleton-fillet" @click="this.$api.navToListPage({type:'3',value:thirdModulesName})">
-					<text class="tip">{{thirdModulesName}}</text>
-					<text class="tit">更多</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.productID)"
-							>
-								<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 class="" v-if="hasLogin">
-									<view class="title-none" v-if="item.price1TextFlag == '1'">
-										<text class="p big">尚未公开价格</text>
-									</view>
-									<view class="price tui-skeleton-rect" v-else>
-										<text class="p sm">￥</text>
-										<text class="p big">{{item.retailPrice.toFixed(2)}}</text>
-									</view>
-								</view>
-								<view v-else class="no-price">
-									<text class="p-no">价格:</text>
-									<uni-stars :stars="parseInt(item.price1Grade)"></uni-stars>
-								</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-text tui-skeleton-fillet">
-					<view class="">
-						<image class="logo" src="../../../static/logo-c@2x.png" mode=""></image>
-						<text class="">采美365网</text>
-					</view>
-				</view>
-			</view>	
-		</view>
-		<!-- 透明模态层 -->
-		<modal-layer v-if='modallayer'></modal-layer>
-		<!-- 底部tabbar -->
-		<cu-tabbar :active-index ="0"></cu-tabbar>
-	</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 cuTabbar from '@/components/cu-tabbar.vue'
-	import btSearch from '@/components/uni-search/bt-search.vue'
-	import uniStars from '@/components/uni-stars/uni-stars.vue'
-	import { queryHomeInfo } from "@/api/use.js"
-	import { queryPreferred } from "@/api/product.js"
-	import { mapState,mapMutations } from 'vuex'
-	export default {
-		components:{
-			tuiSkeleton,
-			modalLayer,
-			btSearch,
-			uniStars,
-			cuTabbar
-		},
-		data() {
-			return {
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '采美采购商城',  // 导航栏 中间的标题
-				},
-				userID:'',
-				inputActive:'float',
-				hotSearchText:'你想要的这里都有',
-				clickPath:'/pages/search/search',
-				current:0,
-				mode:'round',
-				isLogin:false,
-				modallayer:false,
-				bannerImageList:[],
-				skeletonShow: true,
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				organizeProducts:[],//常用商品
-				firstModulesName:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png', //优惠模块1
-				secondModulesName:'', //优惠模块2
-				firstModulesImage:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png',//优惠模块icon1
-				secondModulesImage:'',//优惠模块icon2
-				thirdModulesName:'', //优惠模块3
-				navInforList:[
-					{text:'会员中心',icon:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAAZU0AACaPrfbB8I435.png'},
-					{text:'在线客服',icon:'https://img.caimei365.com/group1/M00/03/8D/Cmis215XHXWABv0rAACt9b8scec656.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() {
-			
-		},
-		computed: {
-			...mapState(['hasLogin']),
-		},
-		methods: {
-			getCheekeyCode(){
-				this.getHomeInformation()
-				this.getOrganizeProducts()
-			},		
-			getHomeInformation(){		
-				queryHomeInfo({}).then(res =>{
-					let data = res.data;
-					this.bannerImageList = data.bannerImageList
-					this.mallPageModules = data.mallPageModules
-					this.$store.commit('updateAllNum',data.shoppingCartCount)
-					this.firstModulesName= data.firstModulesName
-					this.secondModulesName= data.secondModulesName
-					this.firstModulesImage= data.firstModulesImage
-					this.secondModulesImage= data.secondModulesImage
-					this.thirdModulesName= data.thirdModulesName
-					this.skeletonShow = false;
-				})
-			},
-			getOrganizeProducts(){//获取模块三商品
-				this.$api.getStorage().then((resolve) =>{
-					this.userID = resolve.userID
-					queryPreferred({userId:this.userID,preferredFlag:100,pageNum:1,pageSize:5}).then(res =>{
-						this.organizeProducts = res.data.results
-					})
-				})
-			},
-			//轮播图切换修改背景色
-			swiperChange(e) {
-				const index = e.detail.current;
-				this.current = index;
-			},
-			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);
-				// uni.navigateToMiniProgram({
-				// 	appId: 'wx5a5cda32926f55ac',
-				// 	path: '/pages/tabBar/home/home',
-				// 	extraData: {
-				// 		'data1': 'test'
-				// 	},
-				// 	envVersion: 'develop',
-				// 	success(res) {
-				// 		console.log(res)
-				// 		// 打开成功
-						
-				// 	}
-				// })
-			},
-			navto(url){
-				this.$api.navigateTo(url)
-			},
-			telPhoneTo(){
-				let self = this;
-				this.$api.get('/home/afterSale',{}, 
-					response => {
-						console.log(response.data.contactNumber)
-						uni.makePhoneCall({
-							phoneNumber:response.data.contactNumber //仅为示例
-						});
-					}
-				)	
-			}
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			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: '采美采购商城-生美/医美采购服务平台',
-			  path: 'pages/tabBar/home/home',
-			  imageUrl:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAWWkhAAXDP4-6m_c397.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:34rpx 24rpx 14rpx 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-none{
-				font-size: $font-size-26;
-				color: #FF2A2A;
-				line-height: 60rpx;
-			}
-			.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: $color-system;
-					margin-right: 5rpx;
-				}
-				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-text{
-			.logo{
-				width: 80rpx;
-				height: 80rpx;
-				float: left;
-				margin: 0 6rpx;
-			}
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			font-size: $font-size-24;
-			color: $text-color;
-			line-height: 80rpx;
-			padding-top: 20rpx;
-		}
-	}
-</style>

market/pages/index/index.vue

@@ -69,23 +69,20 @@
 			cut_index(type){
 				this.show_index = type
 				if(this.show_index == 0){
+					this.nvabarData.title = '采美采购商城'
 					this.isHomeData = true
 					this.isUserData = false
 					this.isCategory = false
-					// this.$refs.home.getCheekeyCode()
-					this.nvabarData.title = '采美采购商城'
 				}else if(this.show_index == 1){
+					this.nvabarData.title = '商品分类'
 					this.isHomeData = false
 					this.isUserData = false
 					this.isCategory = true
-					// this.$refs.category.getProductCate()
-					this.nvabarData.title = '商品分类'
 				}else if(this.show_index == 2){
+					this.nvabarData.title = '账户中心'
 					this.isHomeData = false
 					this.isUserData = true
 					this.isCategory = false
-					// this.$refs.user.initData()
-					this.nvabarData.title = '账户中心'
 				}
 			},
 			onPullDownRefresh(){

market/pages/order/order-list.vue

@@ -18,7 +18,7 @@
 		</view>
 		<swiper class="tab-content" :current="currentTab" duration="80" @animationfinish="onChange" :style="{height:winHeight+'px'}" >
 			<swiper-item v-for="(tabItem,index) in orderTabBar" :key="index">
-				<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="false" :loadingType="9"></tui-skeleton>
+				<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="false" :loadingType="5"></tui-skeleton>
 				<scroll-view scroll-y class="scoll-y tui-skeleton" @scrolltolower="scrolltolower">
 					<view  :class="{'tui-order-list':scrollTop >= 0}" class="tui-skeleton clearfix">
 						<!-- 空白页 -->

market/pages/user/user.vue

@@ -1,409 +0,0 @@
-<template>
-	<view class="container user clearfix" :style="{paddingBottom:isIphoneX?'140rpx':'98rpx'}">
-		<view class="user-section">
-			<view class="u-header">
-				<image src="https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_SAPDwvAAcTspdl8h0610.png" mode=""></image>
-				<view class="u-header-main">
-					<view class="user-item">
-						<view class="logo-m">
-							<image :src="headpic ? headpic:'https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_OAZaxVAAANf4oruy4674.png'" mode=""></image>
-							<text class="txt">协销员工</text>
-						</view>
-					</view>
-					<view class="user-item">
-						<text class="u-h1">{{name}}</text>
-					</view>
-				</view>
-			</view>
-			<!-- 订单 -->
-			<view class="user-order">
-				<view class="tab-title" @click="navigator('/market/pages/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('/market/pages/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
-						<view class="order-icon">
-							<image src="../../../static/temp/order1@3x.png" mode=""></image>
-							<text 	v-if="beforeConfirmCount >0" 
-									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-									:class="[beforeConfirmCount < 10 ? 'goleft':'']">
-									{{beforeConfirmCount == 99? '99+' : beforeConfirmCount}}
-							</text>
-						</view>
-						<text class="order-t">待确认</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-icon">
-							<image src="../../../static/temp/order2@3x.png" mode=""></image>
-							<text  v-if="beforePayCount >0" 
-								   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
-								   :class="[beforePayCount < 10 ? 'goleft':'']">
-								   {{beforePayCount == 99? '99+' : beforePayCount}}
-							</text>
-						</view>
-						<text class="order-t">待付款</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-icon">
-							<image src="../../../static/temp/order3@3x.png" mode=""></image>
-							<text   v-if="beforeShipCount >0" 
-									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-									:class="[beforeShipCount < 10 ? 'goleft':'']">
-									{{beforeShipCount == 99? '99+' : beforeShipCount}}
-							</text>
-						</view>
-						<text class="order-t">待发货</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-icon">
-							<image src="../../../static/temp/order4@3x.png" mode=""></image>
-							<text 	v-if="shippedCount >0" 
-									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-									:class="[shippedCount < 10 ? 'goleft':'']">
-									{{shippedCount == 99? '99+' : shippedCount}}
-							</text>
-						</view>
-						<text class="order-t">已发货</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-icon">
-							<image src="../../../static/temp/order5@3x.png" mode=""></image>
-							<text 	v-if="refundsCount >0"
-									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-									:class="[refundsCount < 10 ? 'goleft':'']">
-									{{refundsCount == 99? '99+' : refundsCount}}
-							</text>
-						</view>
-						<text class="order-t">退货/款</text>
-					</view>
-				</view>
-			</view>
-			<!-- 底部跳转 -->
-			<view class="foot-list">
-				<view class="list-cell-item">
-					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-tit">{{item.name}}</text>
-						<text class="cell-more iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-			</view>
-		</view>	
-		<!-- 底部tabbar -->
-		<cu-tabbar :active-index ="2"></cu-tabbar>
-	</view>
-</template>
-<script>
-	import cuTabbar from '@/components/cu-tabbar.vue'
-	import uniBadge from '@/components/uni-badge/uni-badge.vue'
-	import { mapState,mapMutations } from 'vuex'
-	import { getSellerHome } from "@/api/seller.js"
-	
-	export default{
-		components: {
-			uniBadge,
-			cuTabbar
-		},
-		data() {
-			return{	
-				name:'采美协销',
-				headpic:'',
-				userMoney:0.00,
-				userId:'',
-				aboutHtml:'',
-				telPhone:'',
-				beforeConfirmCount:0,//待确认角标
-				beforePayCount:0, 	//待付款角标
-				beforeShipCount:0, //待发货角标
-				shippedCount:0,   //已发货角标
-				refundsCount:'', //退货/款角标
-				isIphoneX:this.$store.state.isIphoneX,
-				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'}
-				],
-			}
-		},
-		onLoad(){
-			
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			initData(){
-				getSellerHome({userId:this.userId}).then(response =>{
-					let sellerData = response.data
-					this.name = sellerData.seller.linkMan1?sellerData.seller.linkMan1:'' 	//协销名称
-					this.headpic = sellerData.seller.logo //会所头像
-					this.beforeConfirmCount = this.showBadge(sellerData.beforeConfirmCount)//待付款
-					this.beforePayCount = this.showBadge(sellerData.beforePayCount)//待付款
-					this.beforeShipCount = this.showBadge(sellerData.beforeShipCount)//待发货		
-					this.shippedCount = this.showBadge(sellerData.shippedCount)//已发货	
-					this.refundsCount = this.showBadge(sellerData.refundsCount)//退货/款	
-				}).catch(response =>{
-					this.$util.msg(response.msg,2000)
-				})
-			},
-			navigator(url){
-				this.$api.navigateTo(url)
-			},			
-			showBadge(n){
-				let num ='';
-				if(n>100){num = 99}else{num = n;}
-				return num;
-			},
-			onPullDownRefresh() {//下拉刷新
-				this.initData()
-				uni.stopPullDownRefresh()
-			},
-			onShow(){
-				this.$api.getStorage().then((resolve) =>{
-					this.userId = resolve.userID
-					this.initData()
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "@/uni.scss";
-	page{
-		background-color: #F7F7F7;
-	}
-	.user{
-		width: 100%;
-		height: auto;
-		position:relative;
-		background: rgba(247, 247, 247, 1);
-	}	
-	.user-section.none{
-		display: none;
-	}
-	.user-section.show{
-		display: block;
-	}
-	.u-header{
-		width: 100%;
-		height: 400rpx;
-		position: relative;
-		image{
-			width: 100%;
-			height: 400rpx;
-		}
-	}	
-	.u-header-main{
-		width: 100%;
-		height: 284rpx;
-		padding: 58rpx 0;
-		position: absolute;
-		top: 0;
-		left: 0;
-		.user-item{
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			margin-bottom: 16rpx;
-			.u-h1{
-				width: 410rpx;
-				font-size: $font-size-28;
-				line-height: 40rpx;
-				color: #FFFFFF;
-				margin-bottom: 8rpx;
-				-o-text-overflow: ellipsis;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				word-break: break-all;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-				overflow: hidden;
-				align-items: center;
-			}
-			.u-p{
-				font-size: $font-size-24;
-				line-height: 40rpx;
-				color: #FFFFFF;
-			}
-		}
-		.logo-m{
-			width: 144rpx;
-			height: 144rpx;
-			border: 2rpx solid #FFFFFF;
-			border-radius: 100%;
-			background: $bg-color;
-			position: relative;
-			.txt{
-				width: 144rpx;
-				height: 42rpx;
-				display: inline-block;
-				background: linear-gradient(45deg,rgba(225,86,22,1) 0%,rgba(255,177,0,1) 100%);
-				border-radius: 21rpx;
-				line-height: 42rpx;
-				text-align: center;
-				color: #FFFFFF;
-				font-size: $font-size-22;
-				position: absolute;
-				bottom: -10rpx;
-				left: 0;
-			}
-			image{
-				width: 144rpx;
-				height: 144rpx;
-				border-radius: 100%;
-			}
-		}
-	}
-
-	.user-order{
-		width: 702rpx;
-		height: auto;
-		padding: 0 24rpx;
-		background-color: $bg-color;
-		margin-bottom: 24rpx;
-	}	
-	.tab-title{
-		font-size: $font-size-28;
-		line-height: 80rpx;
-		color: #333333;
-		text-align:left;
-		border-bottom: 1px solid #F8F8F8;
-		position: relative;
-		.cell-tit{
-			font-size: $font-size-28;
-			color: $text-color;
-		}
-		.cell-more{
-			float: right;
-			line-height: 80rpx;
-			font-size: $font-size-24;
-			color: $text-color;
-			padding-right: 30rpx;
-		}
-		.iconfont{
-			width: 30rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			font-size: $font-size-28;
-			text-align: center;
-			position: absolute;
-			right: 0;
-			top: 0;
-			display: block;
-		}
-	}
-	.order-section{
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		flex-wrap:wrap;
-		height: 99rpx;
-		padding: 24rpx 0;
-	}
-	.order-item{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		width: 98rpx;
-		position: relative;
-		margin-right: 53rpx;
-		&:last-child{
-			margin-right: 0;
-		}
-		.order-icon{
-			width: 52rpx;
-			height: 52rpx;
-			position: relative;
-			image{
-				width: 52rpx;
-				height: 52rpx;
-			}
-			.icon-num{
-				position: absolute;
-				right:-24rpx;
-				top: -9rpx;
-			}
-			.icon-num.goleft{
-				right: -12rpx;
-			}
-		}
-		.order-t{
-			line-height: 50rpx;
-			font-size: $font-size-24;
-			color: $text-color;
-		}
-	}
-
-
-	.foot-list{
-		width: 100%;
-		// margin-bottom: 150rpx;
-	}	
-	.list-cell-item{
-		width: 702rpx;
-		height: auto;
-		margin-bottom: 24rpx;
-		padding:0 24rpx;
-		background: $bg-color;
-	}
-	.list-cell{
-		display:flex;
-		width: 100%;
-		align-items:baseline;
-		line-height:100rpx;
-		position:relative;
-		background: $bg-color;
-		justify-content: center;
-		// border-bottom: 1px solid #EBEBEB;
-		&.cell-hover{
-			background:#fafafa;
-		}
-		.cell-more{
-			align-self: baseline;
-			font-size:$font-size-28;
-			color:$text-color;
-			margin-left:10rpx;
-		}
-		.cell-tit{
-			flex: 1;
-			font-size: $font-size-28;
-			color: $text-color;
-			margin-right:10rpx;
-		}
-		.cell-tip{
-			font-size: $font-size-28;
-			color: $text-color;
-		}
-	}	
-	.list-cell.last{
-		border-bottom: none;
-	}
-	.uni-badge--small {
-		-webkit-transform: scale(.8);
-		-ms-transform: scale(.8);
-		transform: scale(.8);
-		-webkit-transform-origin: center center;
-		-ms-transform-origin: center center;
-		transform-origin: center center;
-	}
-	.uni-badge {
-		font-family: 'Helvetica Neue', Helvetica, sans-serif;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		font-size: 12px;
-		line-height: 1;
-		display: inline-block;
-		padding: 3px 6px;
-		color: #333;
-		border-radius: 100px;
-		background-color: #f1f1f1;
-	}
-	.uni-badge-error {
-		color: #fff;
-		background-color: #dd524d;
-	}
-</style>

pages.json

@@ -255,25 +255,6 @@
 						"navigationStyle":"custom"
 					}
 				},
-				{
-					"path": "pages/home/home",
-					"style": {
-						"navigationBarTitleText": "首页",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "pages/category/category",
-					"style": {
-						"navigationBarTitleText": "分类"
-					}
-				},
-				{
-					"path": "pages/user/user",
-					"style": {
-						"navigationBarTitleText": "账户中心"
-					}
-				},
 				{
 					"path": "pages/cart/cart",
 					"style": {

pages/goods/product.vue

@@ -8,7 +8,7 @@
 						:type="isShareType"
 						:page='backPage'>
 		</header-poduct>
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="9"></tui-skeleton>
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="container-product tui-skeleton">
 			<view class="product-top">
 				<view class="banner-section">

pages/tabBar/cart/cart.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container cart clearfix">	
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="9"></tui-skeleton>
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="container-cart-main tui-skeleton">
 			<view v-if="!isEmpty" class="container-cart">
 				<scroll-view class="cart-content"  scroll-y  @scrolltolower="toLower">

pages/tabBar/home/home.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container home clearfix">	
 		<!-- 头部轮播 -->
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="9"></tui-skeleton>
+		<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>
@@ -194,7 +194,7 @@
 							uni.removeStorageSync('sessionid')
 							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
 							if(response.data.userIdentity ==1){
-								this.$api.navigateTo('/market/pages/login/login')
+								this.$api.navigateTo('/market/pages/index/index')
 							}
 							this.getHomeInformation()
 							this.getOrganizeProducts()

pages/user/order/order-list.vue

@@ -12,7 +12,7 @@
 		</view>
 		<swiper class="tab-content" :current="currentTab" duration="80" @animationfinish="onChange" :style="{height:winHeight+'px'}" >
 			<swiper-item v-for="(tabItem,index) in orderTabBar" :key="index">
-				<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="false" :loadingType="9"></tui-skeleton>
+				<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="false" :loadingType="5"></tui-skeleton>
 				<scroll-view scroll-y class="scoll-y tui-skeleton" @scrolltolower="scrolltolower">
 					<view  :class="{'tui-order-list':scrollTop >= 0}" class="tui-skeleton clearfix">
 						<!-- 空白页 -->