修改

components/cm-module/listTemplate/productList.vue

@@ -1,9 +1,9 @@
 <template>
 	<view
-		class="container commodity-list-wrapper"
+		class="container commodity-list-wrapper tui-skeleton"
 		:style="{
-			overflow: showSkeleton ? 'hidden' : 'auto',
-			height: showSkeleton ? windowHeight + 'px' : 'auto'
+			overflow: !showSkeleton ? 'hidden' : 'auto',
+			height: !showSkeleton ? windowHeight + 'px' : 'auto'
 		}"
 	>
 		<list-skeleton v-if="showSkeleton" :listType="0"></list-skeleton>
@@ -33,18 +33,18 @@
 				<image
 					mode="widthFix"
 					:src="item.mainImage"
-					class="list-img"
+					class="list-img tui-skeleton-rect"
 					alt="list-img"
 					lazy-load
 				></image>
 				<view class="list-details-info">
 					<!-- 商品名称 -->
-					<text class="list-details-title">{{ item.productName }}</text>
-					<text class="list-details-specs">规格：{{ item.unit != null ? item.unit : '' }}</text>
+					<text class="list-details-title tui-skeleton-rect">{{ item.productName }}</text>
+					<text class="list-details-specs tui-skeleton-rect">规格：{{ item.unit != null ? item.unit : '' }}</text>
 					<!-- <text class="list-details-specs">商品编码：{{ item.productCode != null ? item.productCode : '' }}</text> -->
-					<text class="list-details-miniQuantity">起订量：{{ item.ladderPriceFlag == '1' ? item.maxBuyNumber : item.minBuyNumber}}</text>
+					<text class="list-details-miniQuantity tui-skeleton-rect">起订量：{{ item.ladderPriceFlag == '1' ? item.maxBuyNumber : item.minBuyNumber}}</text>
 					<!-- 价格 -->
-					<view class="list-details-price prom">
+					<view class="list-details-price prom tui-skeleton-rect">
 						<view class="floor-item-act" v-if="item.actStatus == 1">
 							<view class="floor-tags" v-if="PromotionsFormat(item.promotion)">
 								{{ item.promotion.name}}
@@ -68,7 +68,7 @@
 								</text>
 							</view>
 						</view>
-						<button class="add-cart-btn" @click.stop="operationHanld(item)">
+						<button class="add-cart-btn tui-skeleton-rect" @click.stop="operationHanld(item)">
 							购买
 						</button>
 					</view>
@@ -129,7 +129,7 @@ export default {
 			isModallayer: false,
 			windowHeight: '',
 			// 是否显示骨架
-			showSkeleton: false,
+			showSkeleton: true,
 			isShowEmpty: false,
 			scrollHeight: '',
 			productList: [],
@@ -157,6 +157,7 @@ export default {
 		this.productList = await this.getGoodsList()
 		// 购物车数量统计
 		this.getCartQuantity()
+		this.showSkeleton = false
 	},
 	filters: {
 		//处理金额
@@ -207,6 +208,9 @@ export default {
 			const { code, data: result } = await this.SellerService.GoodList(params).catch(
 				error => {
 					console.log(error)
+					uni.navigateBack({
+						delta: 1
+					})
 				}
 			)
 			// 如果获取失败 返回上一页
@@ -219,6 +223,7 @@ export default {
 			// 是否还有下一页
 			this.hasNextPage = result.hasNextPage
 			this.loadingNow = false
+			
 			// 返回列表
 			return result.list
 		},

components/cm-module/productDetails/cm-price.vue

@@ -1,326 +1,361 @@
 <template name="cm-price">
 	<!-- 商品详情价格判断 -->
 	<view class="wrap-main">
-			<!-- 协销  -->
-			<template>
-				<view class="wrap-main-item">
-					<!-- <view class="p-price tui-skeleton-fillet" :class="PromotionsFormat(product.promotions) ? 'none' : ''">
-						<text class="txt sm">￥</text>
-						<text class="txt big">{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice) | NumFormat }}</text>
-					</view> -->
-					<view class="p-price tui-skeleton-fillet">
-						<text class="txt big">￥{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice) | NumFormat }}</text>
-					</view>
-					<!-- 如果用户登录了就显示优惠价格 -->
-					<!-- <view v-if="product.actStatus==1" class="floor-item-act">
-						<view v-if="product.promotions.type == 1 && product.promotions.mode == 1"  class="floor-tags" @click.stop="clickPopupShow(1)">
-							{{product.promotions.name}}<text v-if="hasLogin">:￥{{ product.promotions == null ? '0.00' : product.promotions.touchPrice | NumFormat }}</text>
-						</view>
-						<view v-else class="floor-tags" @click.stop="clickPopupShow()">{{product.promotions.name}}</view>	
-					</view>
-					<view  v-if="product.actStatus == 0  &&  product.ladderPriceFlag == 1" class="floor-item-act">
-						<view class="floor-tags" @click.stop="clickPopupShow()">阶梯价格</view>	
-					</view> -->
-				</view>		
-			</template>	
-			
-			<!--促销活动弹窗提示-->
-			<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
-				<view class="tui-popup-box clearfix">
-					<template v-if="product.actStatus == 0  &&  product.ladderPriceFlag == 1">
-						<view class="tui-scrollview-box">
-							<view class="ladder-main clearfix">
-								<view class="ladder-item">
-									<view class="ladder-item-td">起订量</view>
-									<view class="ladder-item-td">价格</view>
-								</view>
-								<view class="ladder-item" v-for="(ladd, index) in product.ladderPriceList" :key="index">
-									<view class="ladder-item-td">{{ ladd.buyNumRangeShow }}</view>
-									<view class="ladder-item-td">{{ ladd.buyPrice | NumFormat }}</view>
-								</view>
-							</view>
-						</view>	
-					</template>	
-					<template v-else>
-						<view class="tui-scrollview-box">
-							<view class="box-text">
-								<text>促销时间：</text>
-								<text class="txt" v-if="product.promotions.status == 1">不限时</text>
-								<text class="txt" v-else>{{ product.promotions.beginTime }} ～ {{ product.promotions.endTime }}</text>
-							</view>
-							<view class="box-title" v-show="product.promotions.mode ==2">
-								<text>购买{{ product.promotions.name }}商品，满</text>
-								<text class="txt">¥{{ product.promotions == null ? '0.00' : product.promotions.touchPrice | NumFormat }}</text>减
-								<text class="txt">¥{{ product.promotions == null ? '0.00' : product.promotions.reducedPrice | NumFormat }}</text>
+		<!-- 协销  -->
+		<view class="wrap-main-item">
+			<view
+				class="p-price tui-skeleton-fillet"
+				:class="promotionFormat(product.promotion) ? 'none' : ''"
+			>
+				<text class="txt sm">￥</text>
+				<text class="txt big">{{
+					(promotionFormat(product.promotion) ? product.price1 : product.retailPrice)
+						| NumFormat
+				}}</text>
+			</view>
+			<view v-if="product.actStatus == 1" class="floor-item-act">
+				<view
+					v-if="product.promotion.type == 1 && product.promotion.mode == 1"
+					class="floor-tags"
+					@click.stop="clickPopupShow(1)"
+				>
+					{{ product.promotion.name
+					}}<text v-if="hasLogin"
+						>:￥{{
+							product.promotion == null
+								? '0.00'
+								: product.promotion.touchPrice | NumFormat
+						}}</text
+					>
+				</view>
+				<view v-else class="floor-tags" @click.stop="clickPopupShow()">{{
+					product.promotion.name
+				}}</view>
+			</view>
+			<view
+				v-if="product.actStatus == 0 && product.ladderPriceFlag == 1"
+				class="floor-item-act"
+			>
+				<view class="floor-tags" @click.stop="clickPopupShow()">阶梯价格</view>
+			</view>
+		</view>
+
+		<!--促销活动弹窗提示-->
+		<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
+			<view class="tui-popup-box clearfix">
+				<template v-if="product.actStatus == 0 && product.ladderPriceFlag == 1">
+					<view class="tui-scrollview-box">
+						<view class="ladder-main clearfix">
+							<view class="ladder-item">
+								<view class="ladder-item-td">起订量</view>
+								<view class="ladder-item-td">价格</view>
 							</view>
-							<view class="box-title" v-show="product.promotions.mode==3">
-								<text>购买{{ product.promotions.name }}商品，满</text>
-								<text class="txt">¥{{ product.promotions == null ? '0.00' : product.promotions.touchPrice | NumFormat }}</text>赠送商品
+							<view
+								class="ladder-item"
+								v-for="(ladd, index) in product.ladderPriceList"
+								:key="index"
+							>
+								<view class="ladder-item-td">{{ ladd.buyNumRangeShow }}</view>
+								<view class="ladder-item-td">{{ ladd.buyPrice | NumFormat }}</view>
 							</view>
-							<view class="box-product" v-show="product.promotions.mode==3">
-								<view class="box-product-main"  v-for="(item, index) in product.promotions.giftList" :key="index">
-									<view class="image"><image :src="item.image" mode="widthFix"></image></view>
-									<view class="info">
-										<view class="name">{{ item.name }}</view>
-										<view class="num">X{{ item.number }}</view>
-									</view>
+						</view>
+					</view>
+				</template>
+				<template v-else>
+					<view class="tui-scrollview-box">
+						<view class="box-text">
+							<text>促销时间：</text>
+							<text class="txt" v-if="product.promotion.status == 1">不限时</text>
+							<text class="txt" v-else
+								>{{ product.promotion.beginTime }} ～
+								{{ product.promotion.endTime }}</text
+							>
+						</view>
+						<view class="box-title" v-show="product.promotion.mode == 2">
+							<text>购买{{ product.promotion.name }}商品，满</text>
+							<text class="txt"
+								>¥{{
+									product.promotion == null
+										? '0.00'
+										: product.promotion.touchPrice | NumFormat
+								}}</text
+							>减
+							<text class="txt"
+								>¥{{
+									product.promotion == null
+										? '0.00'
+										: product.promotion.reducedPrice | NumFormat
+								}}</text
+							>
+						</view>
+						<view class="box-title" v-show="product.promotion.mode == 3">
+							<text>购买{{ product.promotion.name }}商品，满</text>
+							<text class="txt"
+								>¥{{
+									product.promotion == null
+										? '0.00'
+										: product.promotion.touchPrice | NumFormat
+								}}</text
+							>赠送商品
+						</view>
+						<view class="box-product" v-show="product.promotion.mode == 3">
+							<view
+								class="box-product-main"
+								v-for="(item, index) in product.promotion.giftList"
+								:key="index"
+							>
+								<view class="image"
+									><image :src="item.image" mode="widthFix"></image
+								></view>
+								<view class="info">
+									<view class="name">{{ item.name }}</view>
+									<view class="num">X{{ item.number }}</view>
 								</view>
 							</view>
 						</view>
-					</template>
-					<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
-						<view class="tui-flex-1">
-							<view class="tui-button" v-if="product.promotions.type == 2" @click="goGoodActiveFn(product.promotions.id)">更多凑单商品</view>
-							<view class="tui-button" v-else @click="hidePopup()">了解</view>
-						</view>
 					</view>
-				</view>	
-			</tui-bottom-popup>
+				</template>
+				<view
+					class="tui-right-flex tui-popup-btn"
+					:style="{ paddingBottom: isIphoneX ? '68rpx' : '0rpx' }"
+				>
+					<view class="tui-flex-1">
+						<view
+							class="tui-button"
+							v-if="product.promotion.type == 2"
+							@click="goGoodActiveFn(product.promotion.id)"
+							>更多凑单商品</view
+						>
+						<view class="tui-button" v-else @click="hidePopup()">了解</view>
+					</view>
+				</view>
+			</view>
+		</tui-bottom-popup>
 		<!-- </template> -->
 	</view>
 </template>
 
 <script>
-	import { mapState,mapMutations } from 'vuex'
-	import uniGrader from '@/components/uni-grade/uni-grade.vue'
-	export default{
-		name:'cm-price',
-		components:{
-			uniGrader
+import { mapState, mapMutations } from 'vuex'
+import uniGrader from '@/components/uni-grade/uni-grade.vue'
+export default {
+	name: 'cm-price',
+	components: {
+		uniGrader
+	},
+	props: {
+		product: {
+			type: Object
 		},
-		props:{
-			product:{
-				type:Object,
-			},
-			userIdentity: {
-				type: Number,
-				default: 2
-			},
-			shopID: {
-				type: Number,
-				default: 2
-			},
-			ladderPriceList:{
-				type: Array,
-			},
-			promotions:{
-				type:Object,
-			}
+		userIdentity: {
+			type: Number,
+			default: 2
 		},
-		data() {
-			return{
-				popupShow:false,
-				promotionsType:0,
-				isIphoneX:this.$store.state.isIphoneX,
-			}
+		shopID: {
+			type: Number,
+			default: 2
 		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			},
+		ladderPriceList: {
+			type: Array
 		},
-		created() {
-			
+		promotion: {
+			type: Object
+		}
+	},
+	data() {
+		return {
+			popupShow: false,
+			promotionType: 0,
+			isIphoneX: this.$store.state.isIphoneX
+		}
+	},
+	filters: {
+		NumFormat: function(text) {
+			//处理金额
+			return Number(text).toFixed(2)
+		}
+	},
+	created() {
+		// console.log(this.promotion)
+	},
+	computed: {
+		...mapState(['hasLogin', 'isWxAuthorize'])
+	},
+	methods: {
+		clickPopupShow(type) {
+			this.popupShow = true
+			this.promotionType = type
 		},
-		computed: {
-			...mapState(['hasLogin','isWxAuthorize'])
+		hidePopup() {
+			this.popupShow = false
 		},
-		methods:{
-			clickPopupShow(type){
-				this.popupShow = true
-				this.promotionsType = type
-			},
-			hidePopup(){
-				this.popupShow = false
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
+		promotionFormat(promo) {
+			//促销活动类型数据处理
+			if (promo != null) {
+				if (promo.type == 1 && promo.mode == 1) {
+					return true
+				} else {
+					return false
 				}
-				return false
-			},
-			goUpgradeApply(){
-				this.$api.navigateTo('/pages/login/apply')
-			},
-			loginClick(){
-				this.$api.navigateTo('/pages/login/login')
-			},
-			goGoodActiveFn(id){
-				this.$parent.popupShow = false
-				this.$api.navigateTo('/pages/goods/goods-active?id='+id)
 			}
+			return false
 		},
-		
+		goUpgradeApply() {
+			this.$api.navigateTo('/pages/login/apply')
+		},
+		loginClick() {
+			this.$api.navigateTo('/pages/login/login')
+		},
+		goGoodActiveFn(id) {
+			this.$parent.popupShow = false
+			this.$api.navigateTo('/pages/goods/goods-active?id=' + id)
+		}
 	}
+}
 </script>
 
-<style lang="scss">	
-	.tui-flex-1 {
-		flex: 1;
-	}
-	.tui-popup-box {
-		position: relative;
-		box-sizing: border-box;
-		min-height: 220rpx;
-		padding:24rpx 24rpx 0 24rpx;
-	}
-	.tui-scrollview-box{
+<style lang="scss">
+.tui-flex-1 {
+	flex: 1;
+}
+.tui-popup-box {
+	position: relative;
+	box-sizing: border-box;
+	min-height: 220rpx;
+	padding: 24rpx 24rpx 0 24rpx;
+}
+.tui-scrollview-box {
+	width: 100%;
+	height: auto;
+	float: left;
+	box-sizing: border-box;
+	.ladder-main {
 		width: 100%;
-		height: auto;
-		float: left;
-		box-sizing: border-box;
-		.ladder-main{
+		min-height: 240rpx;
+		border: 1px solid rgba(225, 86, 22, 0.3);
+		border-radius: 10rpx;
+		.ladder-item {
 			width: 100%;
-			min-height: 240rpx;
-			border: 1px solid rgba(225,86,22,0.3);
-			border-radius: 10rpx;
-			.ladder-item{
-				width: 100%;
-				height: 80rpx;
-				float: left;
-				border-bottom: 1px solid rgba(225,86,22,0.3);
-				&:nth-child(1){
-					.ladder-item-td{
-						color: #333333;
-					}
-				}
-				&:last-child{
-					border-bottom: none;
-				}
-				.ladder-item-td{
-					width:50%;
-					text-align: center;
-					line-height: 80rpx;
-					font-size: $font-size-24;
-					color: $color-system;
-					box-sizing: border-box;
-					float: left;
-					&:nth-child(1){
-						border-right: 1px solid rgba(225,86,22,0.3);
-					}
+			height: 80rpx;
+			float: left;
+			border-bottom: 1px solid rgba(225, 86, 22, 0.3);
+			&:nth-child(1) {
+				.ladder-item-td {
+					color: #333333;
 				}
 			}
-		}
-		.box-title{
-			font-size: $font-size-26;
-			color: $text-color;
-			text-align: left;
-			line-height: 56rpx;
-			.txt{
+			&:last-child {
+				border-bottom: none;
+			}
+			.ladder-item-td {
+				width: 50%;
+				text-align: center;
+				line-height: 80rpx;
+				font-size: $font-size-24;
 				color: $color-system;
-				margin: 0 8rpx;
+				box-sizing: border-box;
+				float: left;
+				&:nth-child(1) {
+					border-right: 1px solid rgba(225, 86, 22, 0.3);
+				}
 			}
 		}
-		.box-text{
-			font-size: $font-size-26;
+	}
+	.box-title {
+		font-size: $font-size-26;
+		color: $text-color;
+		text-align: left;
+		line-height: 56rpx;
+		.txt {
+			color: $color-system;
+			margin: 0 8rpx;
+		}
+	}
+	.box-text {
+		font-size: $font-size-26;
+		color: $text-color;
+		text-align: left;
+		line-height: 56rpx;
+		.txt {
+			color: $color-system;
+		}
+	}
+	.box-product {
+		width: 100%;
+		height: auto;
+		margin-top: 20rpx;
+		.title {
+			font-size: $font-size-24;
 			color: $text-color;
 			text-align: left;
-			line-height: 56rpx;
-			.txt{
-				color: $color-system;
-			}
+			line-height: 54rpx;
 		}
-		.box-product{
+		.box-product-main {
 			width: 100%;
-			height: auto;
-			margin-top: 20rpx;
-			.title{
-				font-size: $font-size-24;
-				color: $text-color;
-				text-align: left;
-				line-height: 54rpx;
+			height: 136rpx;
+			float: left;
+			margin: 10rpx 0;
+			.image {
+				width: 134rpx;
+				height: 134rpx;
+				border: 1px solid #ebebeb;
+				float: left;
+				image {
+					width: 100%;
+					height: 100%;
+					display: block;
+				}
 			}
-			.box-product-main{
-				width: 100%;
-				height: 136rpx;
+			.info {
+				width: 540rpx;
+				height: 134rpx;
 				float: left;
-				margin: 10rpx 0;
-				.image{
-					width: 134rpx;
-					height: 134rpx;
-					border: 1px solid #EBEBEB;
+				margin-left: 16rpx;
+				position: relative;
+				.name {
+					width: 100%;
 					float: left;
-					image{
-						width: 100%;
-						height: 100%;
-						display: block;
-					}
+					line-height: 40rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+					-o-text-overflow: ellipsis;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					word-break: break-all;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
 				}
-				.info{
-					width: 540rpx;
-					height: 134rpx;
-					float: left;
-					margin-left: 16rpx;
-					position: relative;
-					.name{
-						width: 100%;
-						float: left;
-						line-height: 40rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						-o-text-overflow: ellipsis;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						word-break: break-all;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						overflow: hidden;
-					}
-					.num{
-						width: 100%;
-						height: 44rpx;
-						font-size: $font-size-24;
-						color: $text-color;
-						text-align: left;
-						line-height: 44rpx;
-						position: absolute;
-						bottom: 0;
-						left: 0;
-					}
+				.num {
+					width: 100%;
+					height: 44rpx;
+					font-size: $font-size-24;
+					color: $text-color;
+					text-align: left;
+					line-height: 44rpx;
+					position: absolute;
+					bottom: 0;
+					left: 0;
 				}
 			}
 		}
 	}
-	
-	.tui-popup-btn {
+}
+
+.tui-popup-btn {
+	width: 100%;
+	height: auto;
+	float: left;
+	margin-top: 24rpx;
+	.tui-button {
 		width: 100%;
-		height: auto;
-		float: left;
-		margin-top: 24rpx;
-		.tui-button{
-			width: 100%;
-			height: 88rpx;
-			background: $btn-confirm;
-			line-height: 88rpx;
-			text-align: center;
-			color: #FFFFFF;
-			font-size: $font-size-28;
-			border-radius: 44rpx;
-		}
+		height: 88rpx;
+		background: $btn-confirm;
+		line-height: 88rpx;
+		text-align: center;
+		color: #ffffff;
+		font-size: $font-size-28;
+		border-radius: 44rpx;
 	}
+}
 </style>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

pages/goods/list.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="container all-type-list-wrapper">
+	<view class="container all-type-list-wrapper tui-skeleton">
+		<tui-skeleton v-if="showSkeleton" :isLoading="false"></tui-skeleton>
 		<product-list ref="productList" @operationConfim="hanldOperationConfim"></product-list>
 		<!--底部选择模态层弹窗组件 -->
 		<view class="popup spec" :class="specClass" @tap="hideSpec">

pages/goods/product.vue

@@ -100,7 +100,7 @@
 										:product="product"
 										:userIdentity="userIdentity"
 										:shopID="shopID"
-										:promotions="product.promotions"
+										:promotion="product.promotion"
 										:ladderPriceList="ladderPriceList"
 									/>
 								</view>
@@ -385,6 +385,7 @@ export default {
 				productId: this.productID
 			})
 				.then(response => {
+					console.log(response);
 					this.skeletonShow = false
 					this.productImage = []
 					this.shop = response.data.shop
@@ -1029,6 +1030,7 @@ page {
 			float: left;
 			padding: 10rpx 0;
 			margin-left: 10rpx;
+			margin-top: 5rpx;
 			.floor-tags {
 				float: right;
 				height: 28rpx;
@@ -1041,7 +1043,8 @@ page {
 				padding: 0 16rpx;
 				font-size: $font-size-20;
 				margin-left: 15rpx;
-				border: 1px solid #e15616;
+				color: #ff2a2a;
+				border: 1px solid #ff2a2a;
 			}
 		}
 		.floor-item-btn {

pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<!-- 机构信息区域 -->
-		<template v-show="!isRequest">
+		<template v-if="isRequest">
 			<view class="ws-header">
 				<!-- 用户信息 -->
 				<view class="user-info">
@@ -9,7 +9,7 @@
 					<view
 						class="ws-login"
 						@click="navigator('/pages/login/login')"
-						v-if="!hasLogin && !isRequest"
+						v-if="!hasLogin && isRequest"
 					>
 						请登录
 					</view>
@@ -94,14 +94,14 @@ export default {
 	},
 	data() {
 		return {
-			organizeName: '',  //采购员组织名称
+			organizeName: '', //采购员组织名称
 			isRequest: false,
 			paymentCount: 0, //待付款角标
 			waitShipmentsCount: 0, //待收货角标
 			shipmentsCount: 0, //已发货角标
 			salesReturnCount: '', //退货/款角标
 			organizeId: '',
-			refresh:false
+			refresh: false
 		}
 	},
 	onLoad() {
@@ -111,6 +111,8 @@ export default {
 			if (res == 1) {
 				console.log('用户已授权')
 				this.GetWxAuthorize()
+			}else{
+				this.isRequest = true
 			}
 		})
 	},
@@ -123,29 +125,33 @@ export default {
 		async GetWxAuthorize() {
 			// 获取微信code
 			const wechatCode = await authorize.getCode('weixin')
-			this.UserService.userInfoLogin({code:wechatCode}).then(res=>{
-				// 登录成功  将信息保存在userInfo中 保存在本地和store
-				this.login(res.data)
-				this.organizeId = res.data.organizeId
-				this.getUserInfoPersonal(this.organizeId)
-				this.refresh = true
-			}).catch(err=>{
-				// 缓存游客openid
-				uni.setStorageSync('openid',err.data.openid)
-				this.logout()
-				this.refresh = true
-			})
+			this.UserService.userInfoLogin({ code: wechatCode })
+				.then(res => {
+					// 登录成功  将信息保存在userInfo中 保存在本地和store
+					this.login(res.data)
+					this.organizeId = res.data.organizeId
+					// 初始化个人中心
+					this.getUserInfoPersonal(this.organizeId)
+					this.refresh = true
+					this.isRequest = true //个人中心初始化成功后才显示页面
+				})
+				.catch(err => {
+					// 缓存游客openid
+					uni.setStorageSync('openid', err.data.openid)
+					this.logout()
+					this.refresh = true
+					this.isRequest = true
+				})
 		},
 		//初始化个人中心数据
 		getUserInfoPersonal(organizeId) {
 			this.UserService.userInfoPersonal({ organizeId: organizeId })
 				.then(response => {
-					this.organizeName = response.data.organizeName  //采购员组织名称
+					this.organizeName = response.data.organizeName //采购员组织名称
 					this.paymentCount = this.showBadge(response.data.paymentCount) //待付款
 					this.waitShipmentsCount = this.showBadge(response.data.waitShipmentsCount) //待收货
 					this.shipmentsCount = this.showBadge(response.data.shipmentsCount) //已发货
 					this.salesReturnCount = this.showBadge(response.data.salesReturnCount) //退货/款
-					this.isRequest = true //个人中心初始化成功后才显示页面
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
@@ -178,7 +184,7 @@ export default {
 		onPullDownRefresh() {
 			if (this.hasLogin) {
 				this.GetWxAuthorize()
-				if(this.refresh){
+				if (this.refresh) {
 					uni.stopPullDownRefresh()
 				}
 			} else {

pages/user/address/address.vue

@@ -38,7 +38,7 @@
 								>
 							</view>
 							<view v-else class="tag-left">
-								<view class="tag"
+								<view class="tag" @click="setDefaultAddress(item.addressId)"
 									><text class="iconfont icon-weixuanze"></text
 									><text>设为默认地址</text></view
 								>
@@ -105,9 +105,13 @@ export default {
 		if (option.type == 'select') {
 			this.isSelect = true
 		}
-		console.log(option && option)
 		this.setScrollHeight()
 		// console.log(this.addressList)
+		// this.initAddressList()
+	},
+	onShow() {
+		this.pageNum = 1
+		this.addressList = []
 		this.initAddressList()
 	},
 	onReachBottom() {
@@ -216,9 +220,26 @@ export default {
 			this.modal = true
 			this.contentModalText = '确认删除该地址吗？'
 			this.deleteaddressId = id
+		},
+		// 设置默认地址
+		setDefaultAddress(id) {
+			this.UserService.DefaultAddress({ addressId: id, userId: this.userId })
+				.then(res => {
+					console.log(res)
+					if(res.code === 0){
+						this.$util.msg('操作成功', 1000, true, 'success')
+						setTimeout(()=>{
+							this.pageNum = 1
+							this.addressList = []
+							this.initAddressList()
+						},1000)
+					}
+				})
+				.catch(err => {
+					console.log(err)
+				})
 		}
-	},
-	onShow() {}
+	}
 }
 </script>
 

pages/user/address/addressManage.vue

@@ -3,295 +3,335 @@
 		<view class="add-content">
 			<view class="input-row b-b">
 				<view class="label">收货人姓名</view>
-				<input class="input" type="text" v-model="addressData.shouHuoRen" @input="onShouHuoRen" placeholder="请输入收货人姓名" placeholder-class="placeholder" />
+				<input
+					class="input"
+					type="text"
+					v-model="addressData.shouHuoRen"
+					@input="onShouHuoRen"
+					placeholder="请输入收货人姓名"
+					placeholder-class="placeholder"
+				/>
 			</view>
 			<view class="input-row b-b">
 				<view class="label">联系方式</view>
-				<input class="input" type="number" maxlength="11" v-model="addressData.mobile"  @input="onMobile" placeholder="请输入联系方式" placeholder-class="placeholder" />
+				<input
+					class="input"
+					type="number"
+					maxlength="11"
+					v-model="addressData.mobile"
+					@input="onMobile"
+					placeholder="请输入联系方式"
+					placeholder-class="placeholder"
+				/>
 			</view>
 			<view class="input-row b-b" @click="showMulLinkageThreePicker">
 				<view class="label">收货地址</view>
-				<text class="input">
-					{{addressData.allAddress}}
-				</text>		
+				<text class="input"> {{ addressData.allAddress }} </text>
 				<text class="iconfont icon-chakangengduo"></text>
 			</view>
-			<view class="text-textarea b-b"> 
-				<view class="textarea show" v-if="isShowInput">{{addressData.address ?addressData.address :'详细地址：如道路、门牌号、小区、楼房号、单元室等'}}</view>
-				<textarea 	v-else
-							class="textarea" 
-							type="text" 
-							v-model="addressData.address" 
-							placeholder="详细地址：如道路、门牌号、小区、楼房号、单元室等" 
-							placeholder-class="placeholder"
-							maxlength="50"
-							@input="onTextareaInput"
-							:class="isShowInput ? '':''"
+			<view class="text-textarea b-b">
+				<view class="textarea show" v-if="isShowInput">{{
+					addressData.address
+						? addressData.address
+						: '详细地址：如道路、门牌号、小区、楼房号、单元室等'
+				}}</view>
+				<textarea
+					v-else
+					class="textarea"
+					type="text"
+					v-model="addressData.address"
+					placeholder="详细地址：如道路、门牌号、小区、楼房号、单元室等"
+					placeholder-class="placeholder"
+					maxlength="50"
+					@input="onTextareaInput"
+					:class="isShowInput ? '' : ''"
 				/>
 			</view>
 			<view class="text-input default-row">
 				<text class="tit">设为默认地址</text>
-				<switch :checked="switchDefault" color="#333333" @change="switchChange" style="transform:scale(0.6)" />
+				<switch
+					:checked="switchDefault"
+					color="#333333"
+					@change="switchChange"
+					style="transform:scale(0.6)"
+				/>
 			</view>
-			<button class="add-btn" :disabled="isConfirm" :class="[isConfirm == true ? 'disabled':'']" @click="confirm">{{buttonText}}</button>
+			<button
+				class="add-btn"
+				:disabled="isConfirm"
+				:class="[isConfirm == true ? 'disabled' : '']"
+				@click="confirm"
+			>
+				{{ buttonText }}
+			</button>
 		</view>
-		<mpvue-city-picker :themeColor="themeColor" 
-							ref="mpvueCityPicker" 
-						    :pickerValueDefault="cityPickerValueDefault"
-							@onCancel="onCancel" 
-							@onConfirm="onConfirm">
+		<mpvue-city-picker
+			:themeColor="themeColor"
+			ref="mpvueCityPicker"
+			:pickerValueDefault="cityPickerValueDefault"
+			@onCancel="onCancel"
+			@onConfirm="onConfirm"
+		>
 		</mpvue-city-picker>
-
 	</view>
 </template>
 
-<script>	
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import authorize from '@/common/config/authorize.js'	
-	export default {
-		components:{
-			mpvueCityPicker
-		},
-		data() {
-			return {
-				buttonText:'保存',
-				addType:1,				//记录添加地址的类型
-				isConfirm:true,
-				isShowInput:false,
-				switchDefault:false,
-				addressData:{
-					addressId:'',
-					allAddress:'请选择所在地区',
-					userId: '',			//用户id ,只在新增收货地址时传
-					shouHuoRen: '',		//收货人
-					mobile:'',			//收货人手机
-					townId:'',			//区ID
-					address: '',		//地址
-					defaultFlag:0,		//是否默认收货地址(0 不是默认,1 默认)
-				},
-				params:{}				//参数
+<script>
+import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+import authorize from '@/common/config/authorize.js'
+export default {
+	components: {
+		mpvueCityPicker
+	},
+	data() {
+		return {
+			buttonText: '保存',
+			addType: 1, //记录添加地址的类型
+			isConfirm: true,
+			isShowInput: false,
+			switchDefault: false,
+			addressData: {
+				addressId: '',
+				allAddress: '请选择所在地区',
+				userId: '', //用户id ,只在新增收货地址时传
+				shouHuoRen: '', //收货人
+				mobile: '', //收货人手机
+				townId: '', //区ID
+				address: '', //地址
+				defaultFlag: 0 //是否默认收货地址(0 不是默认,1 默认)
+			},
+			params: {} //参数
+		}
+	},
+	onLoad(option) {
+		let title = '添加新地址'
+		if (option.type === 'edit') {
+			title = '编辑收货地址'
+			this.isConfirm = false
+			this.addType = 2
+			let optionData = JSON.parse(option.data)
+			console.log(optionData)
+			// 设置默认值
+			this.addressData.allAddress = `${optionData.provinceName}-${optionData.cityName}-${
+				optionData.townName
+			}`
+			this.addressData.address = optionData.address
+			this.addressData.defaultFlag = optionData.defaultFlag
+			this.addressData.userId = optionData.userId
+			this.addressData.mobile = optionData.mobile
+			this.addressData.townId = optionData.townId
+			this.addressData.addressId = optionData.addressId
+			this.addressData.shouHuoRen = optionData.shouHuoRen
+			this.addressData.addressId = optionData.addressId
+			if (optionData.defaultFlag == 1) {
+				this.switchDefault = true
+			} else {
+				this.switchDefault = false
 			}
+		}
+		uni.setNavigationBarTitle({
+			title
+		})
+	},
+	methods: {
+		switchChange(e) {
+			if (e.detail.value == true) {
+				this.addressData.defaultFlag = 1
+			} else {
+				this.addressData.defaultFlag = 0
+			}
+		},
+		// 三级联动选择
+		showMulLinkageThreePicker() {
+			this.isShowInput = true
+			this.$refs.mpvueCityPicker.show()
 		},
-		onLoad(option){
-			let title = '添加新地址'
-			if(option.type==='edit'){
-				title = '编辑收货地址'
-				this.isConfirm = false;
-				this.addType = 2;	
-				let optionData = JSON.parse(option.data)
-				console.log(optionData);
-				// 设置默认值
-				this.addressData.allAddress = `${optionData.provinceName}-${optionData.cityName}-${optionData.townName}`
-				this.addressData.address = optionData.address
-				this.addressData.defaultFlag = optionData.defaultFlag;
-				this.addressData.userId = optionData.userId;
-				this.addressData.mobile = optionData.mobile;
-				this.addressData.townId = optionData.townId;
-				this.addressData.addressId = optionData.addressId;
-				this.addressData.shouHuoRen = optionData.shouHuoRen;
-				this.addressData.addressId = optionData.addressId;
-				if(optionData.defaultFlag == 1){
-					this.switchDefault = true
-				}else{
-					this.switchDefault = false
+		onConfirm(e) {
+			this.addressData.allAddress = e.name
+			this.addressData.townId = e.townCode
+			console.log(e)
+			this.initInput()
+		},
+		//提交
+		confirm() {
+			if (!this.addressData.shouHuoRen) {
+				this.$util.msg('请填写收货人')
+			}
+			if (this.addressData.address == '请选择所在地区') {
+				this.$util.msg('请选择所在地区')
+			}
+			if (!/(^1[0-9][0-9]{9}$)/.test(this.addressData.mobile)) {
+				this.$util.msg('请输入正确的手机号码')
+				return
+			}
+			if (this.addType == 1) {
+				this.params = {
+					// 测试id
+					// userId:'13914',
+					userId: this.addressData.userId, //用户id ,只在新增收货地址时传
+					shouHuoRen: this.addressData.shouHuoRen, //收货人
+					townId: this.addressData.townId, //区ID
+					address: this.addressData.address, //地址
+					mobile: this.addressData.mobile, //手机
+					defaultFlag: this.addressData.defaultFlag //是否默认收货地址(0 不是默认,1 默认)
 				}
+				this.postAddressData(this.params)
+			} else {
+				this.params = this.addressData
+				this.postAddressData(this.params)
 			}
-			uni.setNavigationBarTitle({
-				title
-			})
 		},
-		methods: {			
-			switchChange(e){
-				if(e.detail.value== true){
-					this.addressData.defaultFlag = 1;
-				}else{
-					this.addressData.defaultFlag = 0;
-				}
-			},
-			// 三级联动选择
-			showMulLinkageThreePicker() {
-				this.isShowInput = true
-				this.$refs.mpvueCityPicker.show()
-			},
-			onConfirm(e) {
-				this.addressData.allAddress = e.name;
-				this.addressData.townId = e.townCode;
-				console.log(e);
-				this.initInput();
-			},			
-			//提交
-			confirm(){
-				if(!this.addressData.shouHuoRen){
-					this.$util.msg('请填写收货人');
-				}
-				if(this.addressData.address =='请选择所在地区'){
-					this.$util.msg('请选择所在地区');
-				}
-				if(!/(^1[0-9][0-9]{9}$)/.test(this.addressData.mobile)){
-					this.$util.msg('请输入正确的手机号码');
-					return;
-				}
-				if(this.addType ==1){
-					this.params ={
-							// 测试id
-							// userId:'13914',
-							userId:this.addressData.userId,			//用户id ,只在新增收货地址时传
-							shouHuoRen:this.addressData.shouHuoRen ,//收货人
-							townId:this.addressData.townId,			//区ID
-							address:this.addressData.address,		//地址
-							mobile:this.addressData.mobile,			//手机
-							defaultFlag:this.addressData.defaultFlag//是否默认收货地址(0 不是默认,1 默认)
-						}
-					this.postAddressData(this.params)	
-				}else{
-					this.params = this.addressData;
-					this.postAddressData(this.params)
-				}
-			},
-			postAddressData(res){
-				this.btnText(true)
-				// 保存地址
-				this.UserService.AddNewAddress(res).then( response=>{
-					this.$util.msg('保存成功',2000,true,'success')
+		postAddressData(res) {
+			this.btnText(true)
+			// 保存地址
+			console.log(res)
+			this.UserService.AddNewAddress(res)
+				.then(response => {
+					this.$util.msg('保存成功', 2000, true, 'success')
 					this.btnText(false)
-					setTimeout(()=>{
-						uni.navigateBack();
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-					setTimeout(function(){
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 2000)
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+					setTimeout(function() {
 						uni.switchTab({
-							url:'/seller/pages/index/index'
+							url: '/seller/pages/index/index'
 						})
-					},1000)
+					}, 1000)
 				})
-			},
-			btnText(flg){
-				if(flg){
-					this.isConfirm = true;
-					this.buttonText = '保存中...'
-				}else{
-					this.isConfirm = false;
-					this.buttonText = '保存'
-				}
-			},
-			onShouHuoRen(e){
-			   this.addressData.shouHuoRen = e.detail.value;
-			   this.initInput();
-			},
-			onMobile(e){
-			   this.addressData.mobile = e.detail.value;
-			   this.initInput();
-			},
-			onTextareaInput(e){
-			   this.addressData.address = e.detail.value;
-			   this.initInput();
-			},
-			initInput(){
-				if(this.addressData.shouHuoRen !== "" && this.addressData.mobile !=="" && this.addressData.address !=="" && this.addressData.townId!==""){
-					this.isConfirm =false;
-				}else{
-					this.isConfirm =true;
-				}
+		},
+		btnText(flg) {
+			if (flg) {
+				this.isConfirm = true
+				this.buttonText = '保存中...'
+			} else {
+				this.isConfirm = false
+				this.buttonText = '保存'
 			}
 		},
-		onShow() {
-			this.$api.getComStorage('clubInfo').then((resolve) =>{
-				this.addressData.userId = resolve.userId
-			})
+		onShouHuoRen(e) {
+			this.addressData.shouHuoRen = e.detail.value
+			this.initInput()
+		},
+		onMobile(e) {
+			this.addressData.mobile = e.detail.value
+			this.initInput()
+		},
+		onTextareaInput(e) {
+			this.addressData.address = e.detail.value
+			this.initInput()
+		},
+		initInput() {
+			if (
+				this.addressData.shouHuoRen !== '' &&
+				this.addressData.mobile !== '' &&
+				this.addressData.address !== '' &&
+				this.addressData.townId !== ''
+			) {
+				this.isConfirm = false
+			} else {
+				this.isConfirm = true
+			}
 		}
+	},
+	onShow() {
+		this.$api.getComStorage('clubInfo').then(resolve => {
+			this.addressData.userId = resolve.userId
+		})
 	}
+}
 </script>
 
 <style lang="scss">
-	page{
-		height: auto;
-		background: $bg-color;
-	}
-	.add-content{
+page {
+	height: auto;
+	background: $bg-color;
+}
+.add-content {
+	width: 702rpx;
+	padding: 0 24rpx;
+	.input-row {
+		display: flex;
+		align-items: center;
+		position: relative;
 		width: 702rpx;
-		padding:0 24rpx;
-		.input-row{
-			display: flex;
-			align-items: center;
-			position: relative;
-			width: 702rpx;
-			height: 88rpx;
-			margin: 0 auto;
-			border-bottom: 2rpx solid #e1e1e1;
-			.label{
-				font-size: $font-size-28;
-				color: #666666;
-				line-height: 88rpx;
-				flex: 2;
-			}
-			.input{
-				height: 100%;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #333333;
-				flex:7;
-				box-sizing: border-box;
-				padding-left: 20rpx;
-			}
-			&.b-b{
-				margin: 20rpx 0;
-			}
-		}
-	}
-	.icon-chakangengduo{
-		font-size: 36rpx;
-		color: #b2b2b2;
-		position: absolute;
-		right: 0;
-	}
-	.text-textarea{
-		width: 100%;
-		height: 146rpx;
+		height: 88rpx;
+		margin: 0 auto;
 		border-bottom: 2rpx solid #e1e1e1;
-		.textarea{
-			width: 100%;
-			height: 100%;
+		.label {
 			font-size: $font-size-28;
-			color: $text-color;
-			z-index: 1;
-		}
-		.textarea.hide{
-			opacity: 0;
-		}
-		.textarea.show{
-			color: #999999;
+			color: #666666;
+			line-height: 88rpx;
+			flex: 2;
 		}
-	}
-	.default-row{
-		background: #FFFFFF;
-		margin-top: 16upx;
-		padding: 24rpx 24rpx 24rpx 0;
-		.tit{
+		.input {
+			height: 100%;
 			font-size: $font-size-28;
-			line-height: 40rpx;
-			color: #666666;
-			flex: 1;
+			line-height: 88rpx;
+			color: #333333;
+			flex: 7;
+			box-sizing: border-box;
+			padding-left: 20rpx;
 		}
-		switch{
-			transform: translateX(16upx) scale(.9);
+		&.b-b {
+			margin: 20rpx 0;
 		}
 	}
-	.add-btn{
-		width: 600rpx;
-		height: 90rpx;
+}
+.icon-chakangengduo {
+	font-size: 36rpx;
+	color: #b2b2b2;
+	position: absolute;
+	right: 0;
+}
+.text-textarea {
+	width: 100%;
+	height: 146rpx;
+	border-bottom: 2rpx solid #e1e1e1;
+	.textarea {
+		width: 100%;
+		height: 100%;
 		font-size: $font-size-28;
-		line-height: 90rpx;
-		color: #FFFFFF;
-		margin: 0 auto;
-		text-align: center;
-		background: $btn-confirm;
-		border-radius: 45rpx;
-		margin-top: 80rpx;
+		color: $text-color;
+		z-index: 1;
 	}
-	.add-btn.disabled{
-		background: #e1e1e1;
-		border-radius: 45rpx;
+	.textarea.hide {
+		opacity: 0;
 	}
+	.textarea.show {
+		color: #999999;
+	}
+}
+.default-row {
+	background: #ffffff;
+	margin-top: 16upx;
+	padding: 24rpx 24rpx 24rpx 0;
+	.tit {
+		font-size: $font-size-28;
+		line-height: 40rpx;
+		color: #666666;
+		flex: 1;
+	}
+	switch {
+		transform: translateX(16upx) scale(0.9);
+	}
+}
+.add-btn {
+	width: 600rpx;
+	height: 90rpx;
+	font-size: $font-size-28;
+	line-height: 90rpx;
+	color: #ffffff;
+	margin: 0 auto;
+	text-align: center;
+	background: $btn-confirm;
+	border-radius: 45rpx;
+	margin-top: 80rpx;
+}
+.add-btn.disabled {
+	background: #e1e1e1;
+	border-radius: 45rpx;
+}
 </style>
-

pages/user/club/club-list.vue

@@ -1,7 +1,8 @@
 <template>
-	<view class="container club clearfix">
+	<view class="container club clearfix tui-skeleton">
+		<tui-skeleton v-if="showSkeleton" :isLoading="false"></tui-skeleton>
 		<view class="club-search clearfix">
-			<view class="search-from name">
+			<view class="search-from name  tui-skeleton-rect">
 				<text class="iconfont icon-sousuo"></text>
 				<input
 					class="input"
@@ -21,7 +22,7 @@
 					@click="delInputText()"
 				></text>
 			</view>
-			<view class="search-btn">
+			<view class="search-btn  tui-skeleton-rect">
 				<button class="search-btn" type="default" @click.stop="searchClubList">搜索</button>
 			</view>
 		</view>
@@ -44,7 +45,7 @@
 					<!-- 机构数据 -->
 					<view class="list" v-for="item in clubList" :key="item.userId">
 						<view class="list-left">
-							<view class="list-head"
+							<view class="list-head tui-skeleton-rect"
 								><image
 									src="https://static.caimei365.com/app/img/icon/icon-club@3x.png"
 									mode=""
@@ -52,24 +53,24 @@
 							></view>
 						</view>
 						<view class="list-item">
-							<view class="list-title">
+							<view class="list-title tui-skeleton-rect">
 								<text class="list-name">{{ item.clubName }}</text>
 							</view>
 							<view class="list-contact">
-								<view class="list-row">
+								<view class="list-row tui-skeleton-rect">
 									<text class="iconfont icon-lianxiren"></text>
 									<text>{{ item.userName }}</text>
 								</view>
-								<view class="list-row">
+								<view class="list-row tui-skeleton-rect">
 									<text class="iconfont icon-dianhua"></text>
 									<text>{{ item.bindMobile }}</text>
 								</view>
 							</view>
 							<view class="list-opea">
-								<view class="btn border-btn" @click.stop="goOrderList(item)">
+								<view class="btn border-btn tui-skeleton-rect" @click.stop="goOrderList(item)">
 									<text>订单列表</text>
 								</view>
-								<view class="btn border-btn" @click.stop="goGoodsList(item)">
+								<view class="btn border-btn tui-skeleton-rect" @click.stop="goGoodsList(item)">
 									<text>立即下单</text>
 								</view>
 							</view>
@@ -94,6 +95,7 @@
 import authorize from '@/common/config/authorize.js'
 import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
 import tuiNomore from '@/components/tui-components/nomore/nomore'
+import tuiSkeleton from '@/components/tui-skeleton/tui-skeleton.vue'
 export default {
 	components: {
 		tuiLoadmore,
@@ -114,7 +116,8 @@ export default {
 			scrollHeight: '', //scoll-view高度
 			clubList: [],
 			showSearchModal: false, //模糊搜索框是否显示
-			organizeId: ''
+			organizeId: '',
+			showSkeleton:true  //显示骨架
 		}
 	},
 	onLoad(data) {
@@ -127,9 +130,12 @@ export default {
 	methods: {
 		// 初始化机构列表
 		async init() {
+			this.showSkeleton = true
 			this.pageNum = 1
 			this.clubList = await this.getClubList()
 			console.log(this.clubList)
+			this.showSkeleton = false
+			console.log(this.showSkeleton)
 		},
 		// 设置scroll高度
 		setScrollHeight() {

services/sellse.service.js

@@ -21,7 +21,7 @@ export default class SellerService {
 		return this.AjaxService.get({
 			url: '/product/list',
 			data,
-			isLoading: true
+			isLoading: false
 		})
 	}
 	
@@ -33,7 +33,7 @@ export default class SellerService {
 		return this.AjaxService.get({
 			url: '/shopping/quantity',
 			data,
-			isLoading: true
+			isLoading: false
 		})
 	}
 	
@@ -94,7 +94,7 @@ export default class SellerService {
 		return this.AjaxService.get({
 			url: '/product/clubList',
 			data,
-			isLoading: true
+			isLoading: false
 		})
 	}
 	/**