优惠券

pages.json

@@ -330,7 +330,7 @@
 				{
 					"path": "address/address",
 					"style": {
-						"navigationBarTitleText": "地址列表"
+						"navigationBarTitleText": "收货地址"
 					}
 				},
 				{
@@ -485,6 +485,12 @@
 						"navigationBarTitleText": "兑换优惠券"
 					}
 				},
+				{
+					"path": "coupon/coupon-details",
+					"style": {
+						"navigationBarTitleText": "领取优惠券"
+					}
+				},
 				{
 					"path": "coupon/coupon-product",
 					"style": {
@@ -698,7 +704,7 @@
 				{
 					"path": "cart/coupon",
 					"style": {
-						"navigationBarTitleText": "优惠券列表",
+						"navigationBarTitleText": "优惠券",
 						"enablePullDownRefresh": true
 					}
 				},

pages/login/apply.vue

@@ -9,7 +9,7 @@
 				<view class="register-title"><text></text></view>
 			</view>
 		</view>
-		<view class="register-main clearfix" v-if="clubStatus == 92">
+		<view class="register-main clearfix" v-if="errorList.length>0">
 			<view class="register-row none clearfix">
 				<view class="error-title">审核未通过原因:</view>
 				<view class="error-main">

pages/login/bindwechat.vue

@@ -133,49 +133,55 @@
 						console.log('微信获取用户信息新API',res)	
 						self.wxLogin(res.userInfo)	
 						self.nickName = res.userInfo.nickName
-						self.avatarUrl = res.userInfo.avatarUrl
-						self.BindingWechat()
+						self.avatarUrl = res.userInfo.avatarUrl
+                        const params = {
+                            userId:self.userId,
+                            mobile:self.bindLinkPhone,
+                            linkName:self.bindLinkName,
+                            smsCode:self.smsCode,
+                            unionId:self.unionId,
+                            nickName:self.nickName,
+                            avatarUrl:self.avatarUrl,
+                        }
+						self.BindingWechat(params)
 					},
 					fail() {
 						self.$util.msg('授权失败', 2000)
 					}
 				})
-			},
-			BindingWechat(){//绑定微信并登陆
-				this.UserService.BindingWechat(
-					{
-						userId:this.userId,
-						mobile:this.bindLinkPhone,
-						linkName:this.bindLinkName,
-						smsCode:this.smsCode,
-						unionId:this.unionId,
-						nickName:this.nickName,
-						avatarUrl:this.avatarUrl,
-					}
-				)
-				.then(response =>{
-					if(this.userIdentity === 3){
-						this.$api.navigateTo('/pages/supplier/index/index')
-					}else{
-						switch(this.isLoginType){
-							case 9:
-								this.$api.navigateTo('/pages/h5/activity/activity_mid')
-								break
-							case 8:
-								this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
-								break
-							case 7:
-								this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderId=${this.isLoginOrderId}`)
-								break
-							default:
-								this.$api.switchTabTo('/pages/tabBar/user/user')
-						}
-					}
-				})
-				.catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})	
-			},
+			},
+            async BindingWechat(params) {
+            	//绑定微信并登陆
+            	try{
+            		await this.UserService.BindingWechat(params)
+            		const url = uni.getStorageSync('LOGIN_REDIRECT_URL')
+            		if (url) {
+            		    if (url.indexOf('tabBar') > -1) {
+            		        uni.switchTabTo(url)
+            		    } else {
+            				this.$api.reLaunch(url)
+            		    }
+            		} else {
+                      if(this.userIdentity === 3){
+                      	this.$api.navigateTo('/pages/supplier/index/index')
+                      }else{
+                          const map = {
+                              7:`/pages/user/order/order-details?type=share&orderId=${this.isLoginOrderId}`,
+                              8:`/pages/goods/product?id=${this.isLoginProductId}`,
+                              9:'/pages/h5/activity/activity_mid'
+                          }
+                          if(this.isLoginType){
+                              this.$api.navigateTo(map[this.isLoginType])
+                          }else{
+                              this.$api.switchTabTo('/pages/tabBar/user/user')
+                          }
+                      }
+            		}
+            		uni.removeStorageSync('LOGIN_REDIRECT_URL')
+            	}catch(error){
+            		this.$util.msg(error.msg, 2000)
+            	}
+            },
 			getVerificationCode(){//图形验证
 				this.PublicService.GetImgVerifyCode().then(res => {
 					this.imageCodeUrl = res.data.baseImage
@@ -234,15 +240,13 @@
 				this.isUserInfo = false
 			}
 		},
-		onShow() {
-			this.$api.getStorage().then((resolve) => {
-				console.log(resolve)
-				this.unionId = resolve.unionId
-				console.log(this.unionId)
-				this.userId = resolve.userId
-				this.bindMobile = resolve.bindMobile
-				this.userIdentity = resolve.userIdentity
-			})
+		async onShow() {
+            const res = await this.$api.getStorage()
+            this.unionId = res.unionId
+            this.userId = res.userId
+            this.bindMobile = res.bindMobile
+            this.userIdentity = res.userIdentity
+            console.log(this.unionId)
 		}
 	}
 </script>

pages/login/login.vue

@@ -108,9 +108,8 @@ export default {
 			isDisabled: true
 		}
 	},
-	onLoad(option) {
-		this.getOption = JSON.stringify(option)
-        console.log(JSON.parse(this.getOption))
+	onLoad(option) {
+        this.getOption = JSON.stringify(option)
 	},
 	computed: {
 		...mapState(['hasLogin', 'isWxAuthorize', 'isLoginType'])

pages/login/logincode.vue

@@ -24,8 +24,8 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
-	import {mapState,mapMutations } from 'vuex';
+	import wxLogin from '@/common/config/wxLogin.js'
+	import {mapState,mapMutations } from 'vuex'
 	import keyInput from '@/components/uni-keyinput/uni-keyinput'
 	
 	export default{
@@ -94,38 +94,41 @@
 						self.$util.msg('授权失败', 2000)
 					}
 				})
-			},
-			BindingWechat(params){//邀请码登录并绑定微信
-				this.UserService.InvitationCodeLogin(params)
-				.then(response =>{
-					wxLogin.wxLoginAuthorize()
-					if(response.data.userIdentity === 3){
-						setTimeout(()=>{
-							this.$api.navigateTo('/pages/supplier/index/index')
-						},1500)
-					}else{
-						setTimeout(()=>{
-							switch(this.isLoginType){
-								case 9:
-									this.$api.navigateTo(`/pages/h5/activity/activity_mid`)
-									break;
-								case 8:
-									this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
-									break;
-								case 7:
-									this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
-									break;
-								default:
-									this.$api.switchTabTo('/pages/tabBar/user/user')
-							}
-						},1500)
-					}
-				})
-				.catch(error =>{
-					this.$util.msg(error.msg,2000)
-					this.isUserInfo = false
-				})
-			},
+			},
+            async BindingWechat(params) {
+            	//绑定微信并登陆
+            	try{
+            		await this.UserService.InvitationCodeLogin(params)
+                    wxLogin.wxLoginAuthorize()
+            		const url = uni.getStorageSync('LOGIN_REDIRECT_URL')
+            		if (url) {
+            		    if (url.indexOf('tabBar') > -1) {
+            		        uni.switchTabTo(url)
+            		    } else {
+            				this.$api.reLaunch(url)
+            		    }
+            		} else {
+                      if(this.userIdentity === 3){
+                      	this.$api.navigateTo('/pages/supplier/index/index')
+                      }else{
+                          const map = {
+                              7:`/pages/user/order/order-details?type=share&orderId=${this.isLoginOrderId}`,
+                              8:`/pages/goods/product?id=${this.isLoginProductId}`,
+                              9:'/pages/h5/activity/activity_mid'
+                          }
+                          if(this.isLoginType){
+                              this.$api.navigateTo(map[this.isLoginType])
+                          }else{
+                              this.$api.switchTabTo('/pages/tabBar/user/user')
+                          }
+                      }
+            		}
+            		uni.removeStorageSync('LOGIN_REDIRECT_URL')
+            	}catch(error){
+            		this.$util.msg(error.msg, 2000)
+                    this.isUserInfo = false
+            	}
+            },
 			keyInput(val) {// 输入框输入介绍
 				// this.params.invitationCode = val
 				console.log(val)

pages/login/register.vue

@@ -270,17 +270,25 @@ export default {
                 }
             })
         },
-        UserRegisterClub(params) {
-            this.UserService.UserRegisterClub(params)
-                .then(response => {
-                    wxLogin.wxLoginAuthorize()
-                    setTimeout(() => {
-                        this.$api.switchTabTo('/pages/tabBar/user/user')
-                    }, 2000)
-                })
-                .catch(error => {
-                    this.$util.msg(error.msg, 2000)
-                })
+        async UserRegisterClub(params) {
+            try{
+                await this.UserService.UserRegisterClub(params)
+                wxLogin.wxLoginAuthorize()
+                const url = uni.getStorageSync('LOGIN_REDIRECT_URL')
+                if (url) {
+                    if (url.indexOf('tabBar') > -1) {
+                        uni.switchTabTo(url)
+                    } else {
+                		this.$api.reLaunch(url)
+                    }
+                } else {
+                    setTimeout(() => {
+                        this.$api.switchTabTo('/pages/tabBar/user/user')
+                    }, 1000)
+                }
+            }catch(e){
+                this.$util.msg(error.msg, 2000)
+            }
         },
         storeUpdataeStatus(data) {
             uni.setStorageSync('token', data.token)

pages/seller/cart/coupon-share.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container clearfix" >
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5" />
 		<view class="container-content tui-skeleton" v-else>
 			<view class="container-list">
 				<view class="coupon-list">

pages/seller/cart/coupon.vue

@@ -1,14 +1,10 @@
 <template>
-	<view class="container clearfix">
-		<view class="container-list" v-show="isRequest">
-			<view class="empty-container" v-if="showEmpty">
-				<image class="empty-container-image" :src="StaticUrl + '/icon/icon-coupon-empty@2x.png'"></image>
-				<text class="error-text">暂无优惠券~</text>
-			</view>
-			<template v-else>
+	<view class="container clearfix">
+        <tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading="true"
+            :loadingType="5" />
+		<view class="container-list" v-else>
+			<template v-if="coupinList.length > 0">
 				<view v-for="(coupon, index) in coupinList" :key="index" :id="coupon.id" class="coupon-list">
-					<view class="list-cell-tag" v-if="coupon.couponPayWay == 1">售价￥{{ coupon.moneyCouponPrice }}</view>
-					<view class="list-cell-tag" v-else>售价{{ coupon.moneyCouponPrice }}采美豆</view>
 					<view class="list-cell-le">
 						<view class="coupon-maxMoney"> <text class="small">￥</text> {{ coupon.couponAmount }} </view>
 						<view class="coupon-minMoney"> 满{{ coupon.touchPrice }}可用 </view>
@@ -47,7 +43,7 @@
 							<view class="list-cell-btn">
 								<view class="icon-used">
 									<button open-type="share" class="icon-used-btn receive" :data-coupon="coupon">
-										分享购买
+										分享
 									</button>
 								</view>
 							</view>
@@ -56,11 +52,15 @@
 					</view>
 				</view>
 				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText"></tui-nomore>
+				<tui-loadmore :visible="loadding" :index="3" type="black" />
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#F7F7F7'" :text="nomoreText" />
 				<!--加载loadding-->
 			</template>
-		</view>
+            <view class="empty-container" v-else>
+            	<image class="empty-container-image" :src="StaticUrl + '/icon/icon-coupon-empty@2x.png'"></image>
+            	<text class="error-text">暂无优惠券~</text>
+            </view>
+        </view>
 	</view>
 </template>
 
@@ -81,8 +81,7 @@ export default {
 				pageSize: 10
 			},
 			coupinList: [],
-			isRequest: false,
-			showEmpty: false,
+			skeletonShow: true,
 			nomoreText: '上拉显示更多',
 			hasNextPage: false,
 			loadding: false,
@@ -119,75 +118,71 @@ export default {
 	computed: {
 		...mapState(['hasLogin', 'userInfo', 'identity', 'isActivity'])
 	},
-	methods: {
-		async initGetStotage() {
-			const userInfo = await this.$api.getStorage()
-			const clubInfo = await this.$api.getComStorage('orderUserInfo')
-			this.listQuery.userId = clubInfo.userId ? clubInfo.userId : 0
-			this.QueryCouponList()
-		},
-		QueryCouponList() {
-			// 初始化查询优惠券列表
-			this.coupinList = []
-			this.listQuery.pageNum = 1
-			this.ProductService.QueryMoneyCouponList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.showEmpty = false
-						this.hasNextPage = response.data.hasNextPage
-						this.coupinList = data.list
-						this.pullFlag = false
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							if (this.coupinList.length < 8) {
-								this.pullUpOn = true
-							} else {
-								this.pullUpOn = false
-								this.loadding = false
-								this.nomoreText = '已至底部'
-							}
-						}
-					} else {
-						this.showEmpty = true
-					}
-					this.isRequest = true
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+	methods: {
+        async initGetStotage() {
+            const userInfo = await this.$api.getStorage()
+            this.spId = userInfo.serviceProviderId 
+            this.QueryCouponList()
+            setTimeout(()=>{
+              this.skeletonShow = false
+            },500)
+        },
+		async QueryCouponList() {
+			// 初始化查询优惠券列表
+            try{
+                this.coupinList = []
+                this.listQuery.pageNum = 1
+                const res = await this.ProductService.QueryCouponCollarList(this.listQuery)
+                const data = res.data
+                if (data.list && data.list.length > 0) {
+                	this.hasNextPage = data.hasNextPage
+                	this.coupinList = data.list
+                	this.pullFlag = false
+                	setTimeout(() => {
+                		this.pullFlag = true
+                	}, 500)
+                	if (this.hasNextPage) {
+                		this.pullUpOn = false
+                		this.nomoreText = '上拉显示更多'
+                	} else {
+                		if (this.coupinList.length < 8) {
+                			this.pullUpOn = true
+                		} else {
+                			this.pullUpOn = false
+                			this.loadding = false
+                			this.nomoreText = '已至底部'
+                		}
+                	}
+                }
+            }catch(error){
+                this.$util.msg(error.msg, 2000)
+            }
 		},
-		getOnReachBottomData() {
-			// 上滑加载分页
-			this.listQuery.pageNum += 1
-			this.ProductService.QueryCouponCollarList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.hasNextPage = data.hasNextPage
-						this.coupinList = this.coupinList.concat(data.list)
-						this.pullFlag = false // 防上拉暴滑
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+		async getOnReachBottomData() {
+			// 上滑加载分页
+            try{
+                this.listQuery.pageNum += 1
+                const res = await this.ProductService.QueryCouponCollarList(this.listQuery)
+                const data = res.data
+                if (data.list && data.list.length > 0) {
+                	this.hasNextPage = data.hasNextPage
+                	this.coupinList = this.coupinList.concat(data.list)
+                	this.pullFlag = false // 防上拉暴滑
+                	setTimeout(() => {
+                		this.pullFlag = true
+                	}, 500)
+                	if (this.hasNextPage) {
+                		this.pullUpOn = false
+                		this.nomoreText = '上拉显示更多'
+                	} else {
+                		this.pullUpOn = false
+                		this.loadding = false
+                		this.nomoreText = '已至底部'
+                	}
+                }
+            }catch(error){
+                this.$util.msg(error.msg, 2000)
+            }
 		},
 		navigator(url) {
 			this.$api.navigateTo(url)
@@ -196,13 +191,11 @@ export default {
 	onShareAppMessage(res) {
 		//分享购买优惠券
 		const coupon = res.target.dataset.coupon
-		console.log('优惠券', coupon)
-		console.log('机构Id', this.listQuery.userId)
 		if (res.from === 'button') {
 			// console.log('来自页面内转发按钮')
 			return {
-				title: `只售${coupon.moneyCouponPrice}元，${coupon.couponAmount}元优惠券等您抢购~`,
-				path: `pages/seller/cart/coupon-share?couponId=${coupon.couponId}&userId=${this.listQuery.userId}`,
+				title: '送您一张优惠券~',
+				path: `pages/user/coupon/coupon-details?couponId=${coupon.couponId}&spId=${this.spId}`,
 				imageUrl: 'https://static.caimei365.com/app/img/icon/icon-shareCoupon@2x.png'
 			}
 		}
@@ -251,18 +244,6 @@ page {
 		background: url(https://static.caimei365.com/app/img/icon/icon-coupon-uesb@2x.png);
 		background-size: cover;
 		position: relative;
-		.list-cell-tag {
-			height: 32rpx;
-			line-height: 32rpx;
-			text-align: center;
-			padding: 0 10rpx;
-			background-color: #fee756;
-			color: #f94b4b;
-			font-size: $font-size-20;
-			position: absolute;
-			top: 0;
-			border-radius: 8rpx 0 8rpx 0;
-		}
 		.list-cell-le {
 			width: 224rpx;
 			height: 100%;
@@ -349,7 +330,7 @@ page {
 							height: 48rpx;
 							border-radius: 28rpx;
 							line-height: 48rpx;
-							font-size: $font-size-26;
+							font-size: $font-size-24;
 							text-align: center;
 							&.receive {
 								background-image: linear-gradient(270deg, #f94b4b 0%, #feb673 100%);

pages/seller/club/club-list.vue

@@ -1,556 +1,589 @@
 <template>
-	<view class="container club clearfix">
-		<view class="club-search clearfix">
-			<view class="search-from name">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input
-					class="input"
-					type="text"
-					confirm-type="search"
-					v-model="listQuery.name"
-					@input="onShowClose"
-					@confirm="GetSellerClubList()"
-					placeholder="机构名称/联系人"
-					maxlength="12"
-				/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-			</view>
-			<view class="search-btn">
-				<button class="search-btn" type="default" @click.stop="searchClubList">搜索</button>
-			</view>
-		</view>
-		<view class="club-main">
-			<view v-if="isEmpty" class="empty-container">
-				<image
-					class="club-empty-image"
-					src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"
-					mode="aspectFit"
-				></image>
-				<view class="txt">暂无机构数据</view>
-			</view>
-			<view v-else class="club-list">
-				<scroll-view scroll-y="true">
-					<view class="list" v-for="(club, index) in clubList" :key="index">
-						<view class="club-list-top">
-							<view class="list-left">
-								<view class="list-head"
-									><image
-										:src="
-											club.headpic
-												? club.headpic
-												: 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'
-										"
-										mode=""
-									></image
-								></view>
-							</view>
-							<view class="list-item">
-								<view class="list-title">
-									<text class="list-name">
-										{{ club.name }}
-									</text>
-									<text class="tags" v-if="club.vipFlag == 0 && club.userIdentity === 2">VIP</text>
-									<text class="tags sv" v-if="club.vipFlag == 1">SVIP</text>
-									<text class="list-hist" @click.stop="handleClickOper(5, club)"
-										><text class="iconfont icon-dingdanliebiao"></text>订单列表</text
-									>
-								</view>
-								<view class="list-opea">
-									<text
-										class="tags sm"
-										@click.stop="
-											this.$api.navigateTo('/pages/service/service?id=1041&title=标签说明')
-										"
-										>{{ club.activeState }} <text class="iconfont icon-xiayibu"></text
-									></text>
-									<text
-										class="tags sm"
-										@click.stop="
-											this.$api.navigateTo('/pages/service/service?id=1041&title=标签说明')
-										"
-										>{{ club.customerValue }} <text class="iconfont icon-xiayibu"></text
-									></text>
-								</view>
-							</view>
-						</view>
-						<view class="club-list-bot">
-							<view class="btn" @click.stop="handleClickOper(1, club)"> <text class="iconfont icon-lijixiadan"></text> 立即下单</view>
-<!-- 							<view class="btn" @click.stop="handleClickOper(3, club)"> <text class="iconfont icon-zaicigoumai1"></text> 再次购买</view>
-							<view class="btn" @click.stop="handleClickOper(6, club)"> <text class="iconfont icon-youhuiquan"></text> 购买优惠券</view>
-							<view class="btn" @click.stop="handleShowBubble(club,index)"> 
-								<text class="iconfont icon-gengduo2"></text> 
-								<view class="btn-bubble" v-if="currentIndex === index && club.bubble">
-									<view class="btn-view border" @click.stop="handleClickOper(2, club)">
-										<text class="iconfont icon-ershouxiadan"></text> 二手下单
-									</view>
-									<view class="btn-view" @click.stop="handleClickOper(4, club)">
-										<text class="iconfont icon-chongzhixiadingjin"></text> 充值/下订金
-									</view>
-								</view>
-							</view> -->
-						</view>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
-					<!--加载loadding-->
-				</scroll-view>
-			</view>
-		</view>
-	</view>
+    <view class="container club clearfix">
+        <tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading="true"
+            :loadingType="5" />
+        <template v-else>
+            <view class="club-search clearfix">
+                <view class="search-from name">
+                    <text class="iconfont icon-iconfonticonfontsousuo1"></text>
+                    <input class="input" type="text" confirm-type="search" v-model="listQuery.name" @input="onShowClose"
+                        @confirm="GetSellerClubList()" placeholder="机构名称/联系人" maxlength="12" />
+                    <text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+                </view>
+                <view class="search-btn">
+                    <button class="search-btn" type="default" @click.stop="searchClubList">搜索</button>
+                </view>
+            </view>
+            <view class="club-main">
+                <view v-if="isEmpty" class="empty-container">
+                    <image class="club-empty-image"
+                        src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"
+                        mode="aspectFit"></image>
+                    <view class="txt">暂无机构数据</view>
+                </view>
+                <view v-else class="club-list">
+                    <scroll-view scroll-y="true">
+                        <view class="list" v-for="(club, index) in clubList" :key="index">
+                            <view class="club-list-top">
+                                <view class="list-left">
+                                    <view class="list-head">
+                                        <image :src="
+            											club.headpic
+            												? club.headpic
+            												: 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'
+            										" mode=""></image>
+                                    </view>
+                                </view>
+                                <view class="list-item">
+                                    <view class="list-title">
+                                        <text class="list-name">
+                                            {{ club.name }}
+                                        </text>
+                                        <text class="tags"
+                                            v-if="club.vipFlag == 0 && club.userIdentity === 2">VIP</text>
+                                        <text class="tags sv" v-if="club.vipFlag == 1">SVIP</text>
+                                        <text class="list-hist" @click.stop="handleClickOper(5, club)"><text
+                                                class="iconfont icon-dingdanliebiao"></text>订单列表</text>
+                                    </view>
+                                    <view class="list-opea">
+                                        <text class="tags sm" @click.stop="
+            											this.$api.navigateTo('/pages/service/service?id=1041&title=标签说明')
+            										">{{ club.activeState }} <text class="iconfont icon-xiayibu"></text></text>
+                                        <text class="tags sm" @click.stop="
+            											this.$api.navigateTo('/pages/service/service?id=1041&title=标签说明')
+            										">{{ club.customerValue }} <text class="iconfont icon-xiayibu"></text></text>
+                                    </view>
+                                </view>
+                            </view>
+                            <view class="club-list-bot">
+                                <view class="btn" @click.stop="handleClickOper(1, club)"> <text
+                                        class="iconfont icon-lijixiadan"></text> 立即下单</view>
+                                <!-- 							<view class="btn" @click.stop="handleClickOper(3, club)"> <text class="iconfont icon-zaicigoumai1"></text> 再次购买</view>
+            							<view class="btn" @click.stop="handleClickOper(6, club)"> <text class="iconfont icon-youhuiquan"></text> 购买优惠券</view>
+            							<view class="btn" @click.stop="handleShowBubble(club,index)"> 
+            								<text class="iconfont icon-gengduo2"></text> 
+            								<view class="btn-bubble" v-if="currentIndex === index && club.bubble">
+            									<view class="btn-view border" @click.stop="handleClickOper(2, club)">
+            										<text class="iconfont icon-ershouxiadan"></text> 二手下单
+            									</view>
+            									<view class="btn-view" @click.stop="handleClickOper(4, club)">
+            										<text class="iconfont icon-chongzhixiadingjin"></text> 充值/下订金
+            									</view>
+            								</view>
+            							</view> -->
+                            </view>
+                        </view>
+                        <!--加载loadding-->
+                        <tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+                        <tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
+                        <!--加载loadding-->
+                    </scroll-view>
+                </view>
+            </view>
+        </template>
+    </view>
 </template>
 
 <script>
-import authorize from '@/common/config/authorize.js'
-import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
-import tuiNomore from '@/components/tui-components/nomore/nomore'
-const defaultListQuery = {
-	userIdentity: '',
-	name: '',
-	pageNum: 1,
-	pageSize: 10,
-	spId: 0,
-	status: 66,
-	type: 1,
-	groupServiceId: 0
-}
-export default {
-	components: {
-		tuiLoadmore,
-		tuiNomore
-	},
-	data() {
-		return {
-			isShowClose: false,
-			isEmpty: false,
-			nomoreText: '上拉显示更多',
-			hasNextPage: false,
-			loadding: false,
-			pullUpOn: true,
-			pullFlag: true,
-			scrollHeight: '',
-			currPage: '', //当前页面
-			prevPage: '', //上一个页面
-			clubList: [],
-			listQuery: Object.assign({}, defaultListQuery),
-			currentIndex:0
-		}
-	},
-	onLoad() {},
-	methods: {
-		async initGetStotage() {
-			// 初始化
-			const userInfo = await this.$api.getStorage()
-			this.listQuery.spId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
-			this.GetSellerClubList()
-		},
-		searchClubList() {
-			// 搜索
-			this.GetSellerClubList()
-		},
-		GetSellerClubList() {
-			this.listQuery.pageNum = 1
-			this.SellerService.GetSellerClubList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.isEmpty = false
-						this.hasNextPage = response.data.hasNextPage
-						this.clubList = data.list.map((el,index)=>{
-							el.bubble = false
-							return el
-						})
-						this.pullFlag = false
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							this.pullUpOn = true
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					} else {
-						this.isEmpty = true
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		getOnReachBottomData() {
-			this.listQuery.pageNum += 1
-			this.SellerService.GetSellerClubList(this.listQuery)
-				.then(response => {
-					let data = response.data
-					if (data.list && data.list.length > 0) {
-						this.hasNextPage = response.data.hasNextPage
-						this.clubList = this.clubList.concat(data.list)
-						this.clubList = this.clubList.map((el,index)=>{
-							el.bubble = false
-							return el
-						})
-						this.pullFlag = false // 防上拉暴滑
-						setTimeout(() => {
-							this.pullFlag = true
-						}, 500)
-						if (this.hasNextPage) {
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						} else {
-							this.pullUpOn = false
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
-		},
-		onShowClose() {
-			//输入框失去焦点时触发
-			if (this.listQuery.name != '') {
-				this.isShowClose = true
-			} else {
-				this.isShowClose = false
-			}
-		},
-		delInputText() {
-			//清除输入框内容
-			this.listQuery.name = ''
-			this.isShowClose = false
-		},
-		handleClickOper(type, club) {
-			const pathMap = {
-				1: '/pages/seller/cart/immediately',
-				2: '/pages/seller/cart/second',
-				3: '/pages/seller/cart/buyagain',
-				4: '/pages/seller/order/create-recharge-order',
-				5: '/pages/seller/order/order-historylist?listType=0',
-				6: '/pages/seller/cart/coupon',
-			}
-			this.$api.setStorage('orderUserInfo', club)
-			this.$api.navigateTo(pathMap[type])
-		},
-		handleShowBubble(club,index){
-			this.currentIndex = index
-			club.bubble = !club.bubble
-		}
-	},
-	onReachBottom() {
-		if (this.hasNextPage) {
-			this.loadding = true 
-			this.pullUpOn = true
-			this.getOnReachBottomData()
-		}
-	},
-	onShow() {
-		this.initGetStotage()
-	}
-}
+    import authorize from '@/common/config/authorize.js'
+    import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
+    import tuiNomore from '@/components/tui-components/nomore/nomore'
+    const defaultListQuery = {
+        userIdentity: '',
+        name: '',
+        pageNum: 1,
+        pageSize: 10,
+        spId: 0,
+        status: 66,
+        type: 1,
+        groupServiceId: 0
+    }
+    export default {
+        components: {
+            tuiLoadmore,
+            tuiNomore
+        },
+        data() {
+            return {
+                skeletonShow:true,
+                isShowClose: false,
+                isEmpty: false,
+                nomoreText: '上拉显示更多',
+                hasNextPage: false,
+                loadding: false,
+                pullUpOn: true,
+                pullFlag: true,
+                scrollHeight: '',
+                currPage: '', //当前页面
+                prevPage: '', //上一个页面
+                clubList: [],
+                listQuery: Object.assign({}, defaultListQuery),
+                currentIndex: 0
+            }
+        },
+        onLoad() {},
+        methods: {
+            async initGetStotage() {
+                // 初始化
+                const userInfo = await this.$api.getStorage()
+                this.listQuery.spId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+                this.GetSellerClubList()
+                setTimeout(()=>{
+                    this.skeletonShow = false
+                },1000)
+            },
+            searchClubList() {
+                // 搜索
+                this.GetSellerClubList()
+            },
+            GetSellerClubList() {
+                this.listQuery.pageNum = 1
+                this.SellerService.GetSellerClubList(this.listQuery)
+                    .then(response => {
+                        let data = response.data
+                        if (data.list && data.list.length > 0) {
+                            this.isEmpty = false
+                            this.hasNextPage = response.data.hasNextPage
+                            this.clubList = data.list.map((el, index) => {
+                                el.bubble = false
+                                return el
+                            })
+                            this.pullFlag = false
+                            setTimeout(() => {
+                                this.pullFlag = true
+                            }, 500)
+                            if (this.hasNextPage) {
+                                this.pullUpOn = false
+                                this.nomoreText = '上拉显示更多'
+                            } else {
+                                this.pullUpOn = true
+                                this.loadding = false
+                                this.nomoreText = '已至底部'
+                            }
+                        } else {
+                            this.isEmpty = true
+                        }
+                    })
+                    .catch(error => {
+                        this.$util.msg(error.msg, 2000)
+                    })
+            },
+            getOnReachBottomData() {
+                this.listQuery.pageNum += 1
+                this.SellerService.GetSellerClubList(this.listQuery)
+                    .then(response => {
+                        let data = response.data
+                        if (data.list && data.list.length > 0) {
+                            this.hasNextPage = response.data.hasNextPage
+                            this.clubList = this.clubList.concat(data.list)
+                            this.clubList = this.clubList.map((el, index) => {
+                                el.bubble = false
+                                return el
+                            })
+                            this.pullFlag = false // 防上拉暴滑
+                            setTimeout(() => {
+                                this.pullFlag = true
+                            }, 500)
+                            if (this.hasNextPage) {
+                                this.pullUpOn = false
+                                this.nomoreText = '上拉显示更多'
+                            } else {
+                                this.pullUpOn = false
+                                this.loadding = false
+                                this.nomoreText = '已至底部'
+                            }
+                        }
+                    })
+                    .catch(error => {
+                        this.$util.msg(error.msg, 2000)
+                    })
+            },
+            onShowClose() {
+                //输入框失去焦点时触发
+                if (this.listQuery.name != '') {
+                    this.isShowClose = true
+                } else {
+                    this.isShowClose = false
+                }
+            },
+            delInputText() {
+                //清除输入框内容
+                this.listQuery.name = ''
+                this.isShowClose = false
+            },
+            handleClickOper(type, club) {
+                const pathMap = {
+                    1: '/pages/seller/cart/immediately',
+                    2: '/pages/seller/cart/second',
+                    3: '/pages/seller/cart/buyagain',
+                    4: '/pages/seller/order/create-recharge-order',
+                    5: '/pages/seller/order/order-historylist?listType=0',
+                    6: '/pages/seller/cart/coupon',
+                }
+                this.$api.setStorage('orderUserInfo', club)
+                this.$api.navigateTo(pathMap[type])
+            },
+            handleShowBubble(club, index) {
+                this.currentIndex = index
+                club.bubble = !club.bubble
+            }
+        },
+        onReachBottom() {
+            if (this.hasNextPage) {
+                this.loadding = true
+                this.pullUpOn = true
+                this.getOnReachBottomData()
+            }
+        },
+        onShow() {
+            this.initGetStotage()
+        }
+    }
 </script>
 
 <style lang="scss">
-page {
-	height: auto;
-}
-page,
-.container {
-	/* padding-bottom: 120upx; */
-	background: #f7f7f7;
-}
-.container {
-	position: relative;
-}
-.club-search {
-	height: 64rpx;
-	width: 702rpx;
-	padding: 24rpx;
-	background: #ffffff;
-	display: flex;
-	align-items: center;
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: 999;
-	.search-from {
-		width: 582rpx;
-		height: 64rpx;
-		background: #f7f7f7;
-		border-radius: 32rpx;
-		float: left;
-		position: relative;
-		.icon-iconfonticonfontsousuo1 {
-			width: 64rpx;
-			height: 64rpx;
-			line-height: 64rpx;
-			text-align: center;
-			display: block;
-			font-size: $font-size-38;
-			float: left;
-			color: #999999;
-		}
-		.icon-shanchu1 {
-			font-size: $font-size-32;
-			color: #999999;
-			position: absolute;
-			width: 64rpx;
-			height: 64rpx;
-			line-height: 64rpx;
-			text-align: center;
-			top: 0;
-			right: 0;
-			z-index: 10;
-		}
-		.input {
-			width: 500rpx;
-			height: 64rpx;
-			float: left;
-			line-height: 64rpx;
-			color: $text-color;
-			font-size: $font-size-24;
-		}
-	}
-	.search-btn {
-		width: 120rpx;
-		line-height: 64rpx;
-		text-align: center;
-		font-size: $font-size-28;
-		color: $color-system;
-		float: left;
-		background: #ffffff;
-	}
-}
-.club-main {
-	padding-top: 122rpx;
-	.list {
-		align-items: center;
-		width: 702rpx;
-		height: auto;
-		padding: 24rpx;
-		background: #ffffff;
-		position: relative;
-		border-bottom: 1px solid #ebebeb;
-		float: left;
-		.club-list-top {
-			width: 100%;
-			height: 140rpx;
-			float: left;
-			display: flex;
-			align-items: center;
-			.list-left {
-				height: 140rpx;
-				flex: 2;
-				margin-right: 10rpx;
-				.list-head {
-					width: 140rpx;
-					height: 140rpx;
-					border-radius: 14rpx;
-					image {
-						width: 140rpx;
-						height: 140rpx;
-						border-radius: 14rpx;
-					}
-				}
-			}
-			.list-item {
-				height: 140rpx;
-				flex: 8;
-				display: flex;
-				flex-direction: column;
-				.list-title {
-					flex: 2;
-					line-height: 80rpx;
-					width: 100%;
-					font-size: $font-size-28;
-					color: $text-color;
-					padding-left: 11rpx;
-					flex-direction: row;
-					justify-content: flex-start;
-					.list-name {
-						min-width: 100rpx;
-						display: block;
-						float: left;
-						text-align: left;
-						-o-text-overflow: ellipsis;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						word-break: break-all;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 1;
-						overflow: hidden;
-					}
-					.tags {
-						display: inline-block;
-						height: 36rpx;
-						padding: 0 15rpx;
-						border-radius: 8rpx;
-						background: #f0cb72;
-						font-size: $font-size-22;
-						color: #4e4539;
-						text-align: center;
-						line-height: 36rpx;
-						margin-left: 10rpx;
-						margin-right: 10rpx;
-						&.sv {
-							background: #333333;
-							color: #f0cb72;
-						}
-					}	
-					.list-hist {
-						display: block;
-						float: right;
-						color: #1890F9;
-						font-size: $font-size-24;
-						text-align: right;
-						padding-right: 30rpx;
-						.icon-dingdanxuanzhong {
-							font-size: $font-size-34;
-							color: #1890F9;
-						}
-					}
-				}
-				.list-opea {
-					width: 100%;
-					display: flex;
-					flex: 4;
-					color: #166ce1;
-					flex-direction: row;
-					align-items: center;
-					.tags {
-						display: inline-block;
-						height: 36rpx;
-						padding: 0 15rpx;
-						border-radius: 8rpx;
-						background: #f0cb72;
-						font-size: $font-size-22;
-						color: #4e4539;
-						text-align: center;
-						line-height: 36rpx;
-						margin-left: 10rpx;
-						margin-right: 10rpx;
-						&.sv {
-							background: #333333;
-							color: #f0cb72;
-						}
-						&.sm {
-							display: inline-block;
-							height: 36rpx;
-							box-sizing: border-box;
-							padding: 0 8rpx 0 15rpx;
-							border-radius: 8rpx;
-							background: #faede5;
-							font-size: $font-size-22;
-							color: $color-system;
-							text-align: center;
-							line-height: 36rpx;
-							margin-right: 10rpx;
-							.icon-xiayibu {
-								font-size: 20rpx;
-								margin-left: 10rpx;
-							}
-						}
-					}
-				}
-			}
-		}
-		.club-list-bot {
-			width: 100%;
-			height: 80rpx;
-			float: left;
-			background-color: #F7F7F7;
-			border-radius: 8rpx;
-			margin-top: 20rpx;
-			.btn {
-				height: 80rpx;
-				box-sizing: border-box;
-				line-height: 80rpx;
-				padding: 0 28rpx;
-				font-size: $font-size-24;
-				color: #333333;
-				text-align: center;
-				float: left;
-				position: relative;
-				// &:nth-child(1){
-				// 	&:before{
-				// 		content: '';
-				// 		width: 1px;
-				// 		height: 20rpx;
-				// 		background-color: #B2B2B2;
-				// 		position: absolute;
-				// 		right: 0;
-				// 		top: 30rpx;
-				// 	}
-				// }
-				&:nth-child(2){
-					&:before{
-						content: '';
-						width: 1px;
-						height: 20rpx;
-						background-color: #B2B2B2;
-						position: absolute;
-						right: 0;
-						top: 30rpx;
-					}
-				}
-				&:nth-child(3){
-					&:before{
-						content: '';
-						width: 1px;
-						height: 20rpx; 
-						background-color: #B2B2B2;
-						position: absolute;
-						right: 0;
-						top: 30rpx;
-					}
-				}
-				&:last-child{
-					padding: 0 36rpx;
-					.iconfont{
-						font-weight: bold;
-					}
-					.btn-bubble{
-						width: 200rpx;
-						height: 160rpx;
-						background: rgba(51, 51, 51, 0.8);
-						position: absolute;
-						top: -154rpx;
-						right: 0;
-						border-radius: 8rpx;
-						&:before{
-							content: '';
-							width: 0;
-							height: 0;
-							border: 15rpx solid transparent;
-							border-top: 15rpx solid rgba(51, 51, 51, 0.8);
-							position: absolute;
-							bottom: -28rpx;
-							right: 42rpx;
-						}
-						.btn-view{
-							width: 100%;
-							height: 80rpx;
							box-sizing: border-box;
							line-height: 80rpx;
							font-size: $font-size-24;
							color: #FFFFFF;
							text-align: center;
							float: left;
-							.iconfont{
-								font-size: 28rpx;
-								color: #FFFFFF;
-								margin-right: 5rpx;
-								font-weight: normal;
-							}
-							&.border{
-								border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-							}
						}
-					}
-				}
-				.iconfont{
-					font-size: 30rpx;
-					color: #333333;
-					margin-right: 5rpx;
-				}
-			}
-		}
-	}
-}
-</style>
+    page {
+        height: auto;
+    }
+
+    page,
+    .container {
+        /* padding-bottom: 120upx; */
+        background: #f7f7f7;
+    }
+
+    .container {
+        position: relative;
+    }
+
+    .club-search {
+        height: 64rpx;
+        width: 702rpx;
+        padding: 24rpx;
+        background: #ffffff;
+        display: flex;
+        align-items: center;
+        position: fixed;
+        top: 0;
+        left: 0;
+        z-index: 999;
+
+        .search-from {
+            width: 582rpx;
+            height: 64rpx;
+            background: #f7f7f7;
+            border-radius: 32rpx;
+            float: left;
+            position: relative;
+
+            .icon-iconfonticonfontsousuo1 {
+                width: 64rpx;
+                height: 64rpx;
+                line-height: 64rpx;
+                text-align: center;
+                display: block;
+                font-size: $font-size-38;
+                float: left;
+                color: #999999;
+            }
+
+            .icon-shanchu1 {
+                font-size: $font-size-32;
+                color: #999999;
+                position: absolute;
+                width: 64rpx;
+                height: 64rpx;
+                line-height: 64rpx;
+                text-align: center;
+                top: 0;
+                right: 0;
+                z-index: 10;
+            }
+
+            .input {
+                width: 500rpx;
+                height: 64rpx;
+                float: left;
+                line-height: 64rpx;
+                color: $text-color;
+                font-size: $font-size-24;
+            }
+        }
+
+        .search-btn {
+            width: 120rpx;
+            line-height: 64rpx;
+            text-align: center;
+            font-size: $font-size-28;
+            color: $color-system;
+            float: left;
+            background: #ffffff;
+        }
+    }
+
+    .club-main {
+        padding-top: 122rpx;
+
+        .list {
+            align-items: center;
+            width: 702rpx;
+            height: auto;
+            padding: 24rpx;
+            background: #ffffff;
+            position: relative;
+            border-bottom: 1px solid #ebebeb;
+            float: left;
+
+            .club-list-top {
+                width: 100%;
+                height: 140rpx;
+                float: left;
+                display: flex;
+                align-items: center;
+
+                .list-left {
+                    height: 140rpx;
+                    flex: 2;
+                    margin-right: 10rpx;
+
+                    .list-head {
+                        width: 140rpx;
+                        height: 140rpx;
+                        border-radius: 14rpx;
+
+                        image {
+                            width: 140rpx;
+                            height: 140rpx;
+                            border-radius: 14rpx;
+                        }
+                    }
+                }
+
+                .list-item {
+                    height: 140rpx;
+                    flex: 8;
+                    display: flex;
+                    flex-direction: column;
+
+                    .list-title {
+                        flex: 2;
+                        line-height: 80rpx;
+                        width: 100%;
+                        font-size: $font-size-28;
+                        color: $text-color;
+                        padding-left: 11rpx;
+                        flex-direction: row;
+                        justify-content: flex-start;
+
+                        .list-name {
+                            min-width: 100rpx;
+                            display: block;
+                            float: left;
+                            text-align: left;
+                            -o-text-overflow: ellipsis;
+                            text-overflow: ellipsis;
+                            display: -webkit-box;
+                            word-break: break-all;
+                            -webkit-box-orient: vertical;
+                            -webkit-line-clamp: 1;
+                            overflow: hidden;
+                        }
+
+                        .tags {
+                            display: inline-block;
+                            height: 36rpx;
+                            padding: 0 15rpx;
+                            border-radius: 8rpx;
+                            background: #f0cb72;
+                            font-size: $font-size-22;
+                            color: #4e4539;
+                            text-align: center;
+                            line-height: 36rpx;
+                            margin-left: 10rpx;
+                            margin-right: 10rpx;
+
+                            &.sv {
+                                background: #333333;
+                                color: #f0cb72;
+                            }
+                        }
+
+                        .list-hist {
+                            display: block;
+                            float: right;
+                            color: #1890F9;
+                            font-size: $font-size-24;
+                            text-align: right;
+                            padding-right: 30rpx;
+
+                            .icon-dingdanxuanzhong {
+                                font-size: $font-size-34;
+                                color: #1890F9;
+                            }
+                        }
+                    }
+
+                    .list-opea {
+                        width: 100%;
+                        display: flex;
+                        flex: 4;
+                        color: #166ce1;
+                        flex-direction: row;
+                        align-items: center;
+
+                        .tags {
+                            display: inline-block;
+                            height: 36rpx;
+                            padding: 0 15rpx;
+                            border-radius: 8rpx;
+                            background: #f0cb72;
+                            font-size: $font-size-22;
+                            color: #4e4539;
+                            text-align: center;
+                            line-height: 36rpx;
+                            margin-left: 10rpx;
+                            margin-right: 10rpx;
+
+                            &.sv {
+                                background: #333333;
+                                color: #f0cb72;
+                            }
+
+                            &.sm {
+                                display: inline-block;
+                                height: 36rpx;
+                                box-sizing: border-box;
+                                padding: 0 8rpx 0 15rpx;
+                                border-radius: 8rpx;
+                                background: #faede5;
+                                font-size: $font-size-22;
+                                color: $color-system;
+                                text-align: center;
+                                line-height: 36rpx;
+                                margin-right: 10rpx;
+
+                                .icon-xiayibu {
+                                    font-size: 20rpx;
+                                    margin-left: 10rpx;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            .club-list-bot {
+                width: 100%;
+                height: 80rpx;
+                float: left;
+                background-color: #F7F7F7;
+                border-radius: 8rpx;
+                margin-top: 20rpx;
+
+                .btn {
+                    height: 80rpx;
+                    box-sizing: border-box;
+                    line-height: 80rpx;
+                    padding: 0 28rpx;
+                    font-size: $font-size-24;
+                    color: #333333;
+                    text-align: center;
+                    float: left;
+                    position: relative;
+
+                    // &:nth-child(1){
+                    // 	&:before{
+                    // 		content: '';
+                    // 		width: 1px;
+                    // 		height: 20rpx;
+                    // 		background-color: #B2B2B2;
+                    // 		position: absolute;
+                    // 		right: 0;
+                    // 		top: 30rpx;
+                    // 	}
+                    // }
+                    &:nth-child(2) {
+                        &:before {
+                            content: '';
+                            width: 1px;
+                            height: 20rpx;
+                            background-color: #B2B2B2;
+                            position: absolute;
+                            right: 0;
+                            top: 30rpx;
+                        }
+                    }
+
+                    &:nth-child(3) {
+                        &:before {
+                            content: '';
+                            width: 1px;
+                            height: 20rpx;
+                            background-color: #B2B2B2;
+                            position: absolute;
+                            right: 0;
+                            top: 30rpx;
+                        }
+                    }
+
+                    &:last-child {
+                        padding: 0 36rpx;
+
+                        .iconfont {
+                            font-weight: bold;
+                        }
+
+                        .btn-bubble {
+                            width: 200rpx;
+                            height: 160rpx;
+                            background: rgba(51, 51, 51, 0.8);
+                            position: absolute;
+                            top: -154rpx;
+                            right: 0;
+                            border-radius: 8rpx;
+
+                            &:before {
+                                content: '';
+                                width: 0;
+                                height: 0;
+                                border: 15rpx solid transparent;
+                                border-top: 15rpx solid rgba(51, 51, 51, 0.8);
+                                position: absolute;
+                                bottom: -28rpx;
+                                right: 42rpx;
+                            }
+
+                            .btn-view {
+                                width: 100%;
+                                height: 80rpx;
+                                box-sizing: border-box;
+                                line-height: 80rpx;
+                                font-size: $font-size-24;
+                                color: #FFFFFF;
+                                text-align: center;
+                                float: left;
+
+                                .iconfont {
+                                    font-size: 28rpx;
+                                    color: #FFFFFF;
+                                    margin-right: 5rpx;
+                                    font-weight: normal;
+                                }
+
+                                &.border {
+                                    border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+                                }
+                            }
+                        }
+                    }
+
+                    .iconfont {
+                        font-size: 30rpx;
+                        color: #333333;
+                        margin-right: 5rpx;
+                    }
+                }
+            }
+        }
+    }
+</style>

pages/seller/club/list.vue

@@ -1,214 +1,205 @@
 <template>
-	<view class="container club clearfix">
-		<view class="club-search clearfix" :style="{ paddingTop: StatusBar + 'px' }">
-			<view class="search-top" :style="{ height: CustomBar - StatusBar + 'px' }">
-				<view
-					class="search-icon"
-					:style="{
-						width: CustomBar - StatusBar + 'px',
-						height: CustomBar - StatusBar + 'px',
-						lineHeight: CustomBar - StatusBar + 'px;'
-					}"
-				>
-					<text v-if="isShowIndex" @click="handleNavigateIndex" class="iconfont icon-shouye"></text>
-					<text v-else @click="handleNavigateBack" class="iconfont icon-fanhui"></text>
-				</view>
-				<view class="title">机构列表</view>
-			</view>
-			<view class="search-main">
-				<view class="search-from name">
-					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-					<input
-						class="input"
-						type="text"
-						confirm-type="search"
-						v-model="listQuery.name"
-						@input="onShowClose"
-						@confirm="getList"
-						placeholder="机构名称/联系人/手机号"
-						maxlength="16"
-						:style="{ lineHeight: capsule.height + 'px' }"
-					/>
-					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-				</view>
-				<view class="search-btn" @click="showRightDrawer"> <text class="iconfont icon-shaixuan"></text> </view>
-			</view>
-			<!-- <view class="search-tab">
-				<view
-					class="tab-item"
-					v-for="(item, index) in listTab"
-					:key="index"
-					:class="{ current: tabCurrentNum === index }"
-					@click="tabCurrentClick(index)"
-				>
-					<text class="item-text"> {{ item.name }} <text class="line"></text> </text>
-				</view>
-			</view> -->
-			<view class="search-smalltab">
-				<view
-					class="tab-item"
-					v-for="(item, index) in listItemTab"
-					:key="index"
-					:class="{ current: tabSmallCurrentIndex === index }"
-					@click="tabSmallCurrentClick(index)"
-				>
-					<text class="item-text">{{ item.name }}</text>
-				</view>
-			</view>
-		</view>
-		<view class="club-main">
-			<view v-if="isEmpty" class="empty-container">
-				<image
-					class="club-empty-image"
-					src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"
-					mode="aspectFit"
-				></image>
-				<view class="txt">暂无机构数据</view>
-			</view>
-			<view v-else class="club-list">
-				<scroll-view scroll-y="true">
-					<view class="list" v-for="(club, index) in clubList" :key="index">
-						<view class="list-cell-top">
-							<view class="list-logo">
-								<image
-									:src="
-										club.headpic
-											? club.headpicx
-											: 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'
-									"
-									mode=""
-								></image>
-								<text class="list-id">编号:{{ club.newClubId }}</text>
-								<text class="list-tips">{{ club.userIdentity === 2 ? '资质机构' : '个人机构' }}</text>
-							</view>
-							<view class="list-content">
-								<view class="list-name">
-									{{ club.userIdentity === 2 ? club.name : club.linkMan }}
-									<text class="tags" v-if="club.vipFlag == 0 && club.userIdentity === 2">VIP</text>
-									<text class="tags sv" v-if="club.vipFlag == 1">SVIP</text>
-									<text class="tags xf" v-if="club.newDeal === 1">新分配</text>
-								</view>
-								<view class="list-tags">
-									<text
-										class="tags"
-										@click.stop="
-											this.$api.navigateTo('/pages/service/service?id=1041&title=标签说明')
-										"
-									>
-										{{ club.activeState }} <text class="iconfont icon-xiayibu"></text>
-									</text>
-									<text
-										class="tags"
-										@click.stop="
-											this.$api.navigateTo('/pages/service/service?id=1041&title=标签说明')
-										"
-									>
-										{{ club.customerValue }} <text class="iconfont icon-xiayibu"></text>
-									</text>
-									<text class="tags-or" @click.stop="handleOrderHistory(club)">
-										<text class="iconfont icon-dingdan"></text> 订单列表
-										<text
-											v-if="club.orderNum > 0"
-											class="opea-badge uni-badge uni-badge-error uni-small uni-badge--small icon-num"
-										>
-											{{ showBadge(club.orderNum) }}
-										</text>
-									</text>
-								</view>
-								<view class="list-ntel" v-if="tabSmallCurrentIndex === 1">
-									<text class="list-link">销售：{{ club.serviceName ? club.serviceName : '' }}</text>
-								</view>
-								<view class="list-ntel" v-if="tabSmallCurrentIndex !== 1">
-									<text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
-									<text class="list-texl" @click="handlePhone(club.contractMobile)">
-										{{ club.contractMobile ? club.contractMobile : '' }}
-									</text>
-								</view>
-								<view class="list-ntel" v-if="listQuery.type === 6">
-									<text class="list-link">分配时间：{{ club.providerTime | dateConversion }}</text>
-								</view>
-							</view>
-						</view>
-						<view class="club-list-bot">
-							<template v-if="tabSmallCurrentIndex === 0 || tabSmallCurrentIndex === 2">
-								<view class="btn" @click.stop="handleClickOper(1, club)">
-									<text class="iconfont icon-jigouhuaxiang"></text> 机构画像
-								</view>
-								<view class="btn" @click.stop="handleClickOper(2, club)">
-									<text class="iconfont icon-tianxie"></text> 填写咨询记录
-								</view>
-								<view class="btn" @click.stop="handleClickOper(3, club)">
-									<text class="iconfont icon-shangcheng"></text> 商城访问记录
-								</view>
-								<view
-									class="btn"
-									v-if="tabSmallCurrentIndex === 0 || tabSmallCurrentIndex === 2"
-									@click.stop="handleShowBubble(club, index)"
-								>
-									<text class="iconfont icon-gengduo2"></text>
-									<view
-										class="btn-bubble"
-										:style="{
-											height: isManage ? '180rpx' : '120rpx',
-											top: isManage ? '-180rpx' : '-120rpx'
-										}"
-										v-if="currentIndex === index && club.bubble"
-									>
-										<view class="btn-view border" @click.stop="handleClickOper(4, club)">
-											<text class="iconfont icon-xiugaiziliao"></text> 修改资料
-										</view>
-										<view class="btn-view border" @click.stop="handleClickOper(6, club)">
-											<text class="iconfont icon-tianxie"></text> 全部咨询记录
-										</view>
-										<view
-											class="btn-view"
-											v-if="isManage && club.serviceProviderId != 1342"
-											@click.stop="handleClickOper(5, club)"
-										>
-											<text class="iconfont icon-xiaoshou"></text> 更换协销
-										</view>
-									</view>
-								</view>
-							</template>
-							<template v-if="tabSmallCurrentIndex === 1">
-								<view class="btn" @click.stop="handleClickOper(1, club)">
-									<text class="iconfont icon-jigouhuaxiang"></text> 机构画像
-								</view>
-                                <view v-if="!isManage" class="btn" @click.stop="handleClickOper(2, club)">
-                                	<text class="iconfont icon-tianxie"></text> 填写咨询记录
-                                </view>
-								<view class="btn" @click.stop="handleClickOper(3, club)">
-									<text class="iconfont icon-tianxie"></text> 商城访问记录
-								</view>
-								<view
-									class="btn none"
-									v-if="isManage && club.serviceProviderId != 1342"
-									@click.stop="handleClickOper(5, club)"
-								>
-									<text class="iconfont icon-xiaoshou"></text> 更换协销
-								</view>
-							</template>
-						</view>
-					</view>
-					<!--加载loadding-->
-					<tui-loadmore :visible="loadding" :index="3" type="black" />
-					<tui-nomore :visible="!pullUpOn" bgcolor="#f7f7f7" :text="nomoreText" />
-				</scroll-view>
-			</view>
-		</view>
-		<!-- <view class="tabBar" :style="{ height: isIphoneX ? '140rpx' : '98rpx' }" v-if="tabCurrentNum === 0">
-			<view class="tabBar_list" :style="{ paddingBottom: isIphoneX ? '40rpx' : '' }">
-				<view class="tabBar_item" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
-					<text class="iconfont icon-shenhetongguo"></text> <view class="tabBar_name">待升级</view>
-				</view>
-				<view class="tabBar_item" :class="{ current1: tabCurrentIndex === 1 }" @click="tabClick(1)">
-					<text class="iconfont icon-lishidingdan"></text> <view class="tabBar_name">升级中</view>
-				</view>
-				<view class="tabBar_item" :class="{ current2: tabCurrentIndex === 2 }" @click="tabClick(2)">
-					<text class="iconfont icon-shenhebutongguo"></text> <view class="tabBar_name">升级失败</view>
-				</view>
-			</view>
-		</view> -->
+	<view class="container club clearfix">
+        <tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading="true"
+            :loadingType="5" />
+        <template v-else>
+            <view class="club-search clearfix" :style="{ paddingTop: StatusBar + 'px' }">
+            	<view class="search-top" :style="{ height: CustomBar - StatusBar + 'px' }">
+            		<view
+            			class="search-icon"
+            			:style="{
+            				width: CustomBar - StatusBar + 'px',
+            				height: CustomBar - StatusBar + 'px',
+            				lineHeight: CustomBar - StatusBar + 'px;'
+            			}"
+            		>
+            			<text v-if="isShowIndex" @click="handleNavigateIndex" class="iconfont icon-shouye"></text>
+            			<text v-else @click="handleNavigateBack" class="iconfont icon-fanhui"></text>
+            		</view>
+            		<view class="title">机构列表</view>
+            	</view>
+            	<view class="search-main">
+            		<view class="search-from name">
+            			<text class="iconfont icon-iconfonticonfontsousuo1"></text>
+            			<input
+            				class="input"
+            				type="text"
+            				confirm-type="search"
+            				v-model="listQuery.name"
+            				@input="onShowClose"
+            				@confirm="getList"
+            				placeholder="机构名称/联系人/手机号"
+            				maxlength="16"
+            				:style="{ lineHeight: capsule.height + 'px' }"
+            			/>
+            			<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
+            		</view>
+            		<view class="search-btn" @click="showRightDrawer"> <text class="iconfont icon-shaixuan"></text> </view>
+            	</view>
+            	<!-- <view class="search-tab">
+            		<view
+            			class="tab-item"
+            			v-for="(item, index) in listTab"
+            			:key="index"
+            			:class="{ current: tabCurrentNum === index }"
+            			@click="tabCurrentClick(index)"
+            		>
+            			<text class="item-text"> {{ item.name }} <text class="line"></text> </text>
+            		</view>
+            	</view> -->
+            	<view class="search-smalltab">
+            		<view
+            			class="tab-item"
+            			v-for="(item, index) in listItemTab"
+            			:key="index"
+            			:class="{ current: tabSmallCurrentIndex === index }"
+            			@click="tabSmallCurrentClick(index)"
+            		>
+            			<text class="item-text">{{ item.name }}</text>
+            		</view>
+            	</view>
+            </view>
+            <view class="club-main">
+            	<view v-if="isEmpty" class="empty-container">
+            		<image
+            			class="club-empty-image"
+            			src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"
+            			mode="aspectFit"
+            		></image>
+            		<view class="txt">暂无机构数据</view>
+            	</view>
+            	<view v-else class="club-list">
+            		<scroll-view scroll-y="true">
+            			<view class="list" v-for="(club, index) in clubList" :key="index">
+            				<view class="list-cell-top">
+            					<view class="list-logo">
+            						<image
+            							:src="
+            								club.headpic
+            									? club.headpicx
+            									: 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'
+            							"
+            							mode=""
+            						></image>
+            						<text class="list-id">编号:{{ club.newClubId }}</text>
+            						<text class="list-tips">{{ club.userIdentity === 2 ? '资质机构' : '个人机构' }}</text>
+            					</view>
+            					<view class="list-content">
+            						<view class="list-name">
+            							{{ club.userIdentity === 2 ? club.name : club.linkMan }}
+            							<text class="tags" v-if="club.vipFlag == 0 && club.userIdentity === 2">VIP</text>
+            							<text class="tags sv" v-if="club.vipFlag == 1">SVIP</text>
+            							<text class="tags xf" v-if="club.newDeal === 1">新分配</text>
+            						</view>
+            						<view class="list-tags">
+            							<text
+            								class="tags"
+            								@click.stop="
+            									this.$api.navigateTo('/pages/service/service?id=1041&title=标签说明')
+            								"
+            							>
+            								{{ club.activeState }} <text class="iconfont icon-xiayibu"></text>
+            							</text>
+            							<text
+            								class="tags"
+            								@click.stop="
+            									this.$api.navigateTo('/pages/service/service?id=1041&title=标签说明')
+            								"
+            							>
+            								{{ club.customerValue }} <text class="iconfont icon-xiayibu"></text>
+            							</text>
+            							<text class="tags-or" @click.stop="handleOrderHistory(club)">
+            								<text class="iconfont icon-dingdan"></text> 订单列表
+            								<text
+            									v-if="club.orderNum > 0"
+            									class="opea-badge uni-badge uni-badge-error uni-small uni-badge--small icon-num"
+            								>
+            									{{ showBadge(club.orderNum) }}
+            								</text>
+            							</text>
+            						</view>
+            						<view class="list-ntel" v-if="tabSmallCurrentIndex === 1">
+            							<text class="list-link">销售：{{ club.serviceName ? club.serviceName : '' }}</text>
+            						</view>
+            						<view class="list-ntel" v-if="tabSmallCurrentIndex !== 1">
+            							<text class="list-link">{{ club.linkMan ? club.linkMan : '' }}</text>
+            							<text class="list-texl" @click="handlePhone(club.contractMobile)">
+            								{{ club.contractMobile ? club.contractMobile : '' }}
+            							</text>
+            						</view>
+            						<view class="list-ntel" v-if="listQuery.type === 6">
+            							<text class="list-link">分配时间：{{ club.providerTime | dateConversion }}</text>
+            						</view>
+            					</view>
+            				</view>
+            				<view class="club-list-bot">
+            					<template v-if="tabSmallCurrentIndex === 0 || tabSmallCurrentIndex === 2">
+            						<view class="btn" @click.stop="handleClickOper(1, club)">
+            							<text class="iconfont icon-jigouhuaxiang"></text> 机构画像
+            						</view>
+            						<view class="btn" @click.stop="handleClickOper(2, club)">
+            							<text class="iconfont icon-tianxie"></text> 填写咨询记录
+            						</view>
+            						<view class="btn" @click.stop="handleClickOper(3, club)">
+            							<text class="iconfont icon-shangcheng"></text> 商城访问记录
+            						</view>
+            						<view
+            							class="btn"
+            							v-if="tabSmallCurrentIndex === 0 || tabSmallCurrentIndex === 2"
+            							@click.stop="handleShowBubble(club, index)"
+            						>
+            							<text class="iconfont icon-gengduo2"></text>
+            							<view
+            								class="btn-bubble"
+            								:style="{
+            									height: isManage ? '180rpx' : '120rpx',
+            									top: isManage ? '-180rpx' : '-120rpx'
+            								}"
+            								v-if="currentIndex === index && club.bubble"
+            							>
+            								<view class="btn-view border" @click.stop="handleClickOper(4, club)">
+            									<text class="iconfont icon-xiugaiziliao"></text> 修改资料
+            								</view>
+            								<view class="btn-view border" @click.stop="handleClickOper(6, club)">
+            									<text class="iconfont icon-tianxie"></text> 全部咨询记录
+            								</view>
+            								<view
+            									class="btn-view"
+            									v-if="isManage && club.serviceProviderId != 1342"
+            									@click.stop="handleClickOper(5, club)"
+            								>
+            									<text class="iconfont icon-xiaoshou"></text> 更换协销
+            								</view>
+            							</view>
+            						</view>
+            					</template>
+            					<template v-if="tabSmallCurrentIndex === 1">
+            						<view class="btn" @click.stop="handleClickOper(1, club)">
+            							<text class="iconfont icon-jigouhuaxiang"></text> 机构画像
+            						</view>
+                                    <view v-if="!isManage" class="btn" @click.stop="handleClickOper(2, club)">
+                                    	<text class="iconfont icon-tianxie"></text> 填写咨询记录
+                                    </view>
+            						<view class="btn" @click.stop="handleClickOper(3, club)">
+            							<text class="iconfont icon-tianxie"></text> 商城访问记录
+            						</view>
+            						<view
+            							class="btn none"
+            							v-if="isManage && club.serviceProviderId != 1342"
+            							@click.stop="handleClickOper(5, club)"
+            						>
+            							<text class="iconfont icon-xiaoshou"></text> 更换协销
+            						</view>
+            					</template>
+            				</view>
+            			</view>
+            			<!--加载loadding-->
+            			<tui-loadmore :visible="loadding" :index="3" type="black" />
+            			<tui-nomore :visible="!pullUpOn" bgcolor="#f7f7f7" :text="nomoreText" />
+            		</scroll-view>
+            	</view>
+            </view>
+        </template>
 		<!-- 筛选抽屉 -->
 		<cm-clubDrawer
 			ref="screendrawer"
@@ -280,7 +271,8 @@ export default {
 				spId: 0
 			},
 			isShowIndex: false,
-			currentIndex: 0
+			currentIndex: 0,
+            skeletonShow: true
 		}
 	},
 	filters: {
@@ -309,7 +301,10 @@ export default {
 			const userInfo = await this.$api.getStorage()
 			this.listQuery.spId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
 			this.salesParams.choseServiceId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
-			this.getList()
+			this.getList()
+            setTimeout(()=>{
+                this.skeletonShow = false
+            },1000)
 		},
 		async getList() {
 			try{

pages/seller/components/user.vue

@@ -1,725 +1,667 @@
-<template>
-	<view class="container user clearfix">
-		<cm-custom :navbar-data="nvabarData" />
-		<view class="user-section">
-			<view
-				class="header"
-				:style="{
-					height: CustomBar + 90 - StatusBar + 'px',
-					paddingTop: CustomBar + 'px',
-					background: 'url(' + bgImgUrl + ')',
-					backgroundSize: 'cover'
-				}"
-			>
-				<view class="header-main" v-if="hasLogin">
-					<view class="header-text">
-						<view class="user-item">
-							<text class="u-h1">{{ name }}</text>
-						</view>
-						<view class="user-item"> <text class="u-tips">协销人员</text> </view>
-					</view>
-					<view class="header-icon" @click="TestZHIboFn()"
-						><image src="https://static.caimei365.com/app/img/icon/icon-seller@3x.png" mode=""></image
-					></view>
-				</view>
-				<!-- 订单 -->
-				<view class="user-order">
-					<view class="tab-title" @click="navigator('/pages/seller/order/order-list?listType=0')">
-						<text class="cell-tit">我的订单</text> <text class="cell-more">全部订单</text>
-						<text class="iconfont icon-xiayibu"></text>
-					</view>
-					<view class="order-section">
-						<view
-							class="order-item"
-							@click="navigator('/pages/seller/order/order-list?listType=1')"
-							hover-class="common-hover"
-							:hover-stay-time="50"
-						>
-							<view class="order-icon">
-								<image src="https://static.caimei365.com/app/img/icon/order5@3x.png" mode=""></image>
-								<text
-									v-if="beforeConfirmCount > 0"
-									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('/pages/seller/order/order-list?listType=2')"
-							hover-class="common-hover"
-							:hover-stay-time="50"
-						>
-							<view class="order-icon">
-								<image src="https://static.caimei365.com/app/img/icon/order1@3x.png" mode=""></image>
-								<text
-									v-if="beforePayCount > 0"
-									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('/pages/seller/order/order-list?listType=3')"
-							hover-class="common-hover"
-							:hover-stay-time="50"
-						>
-							<view class="order-icon">
-								<image src="https://static.caimei365.com/app/img/icon/order2@3x.png" mode=""></image>
-								<text
-									v-if="beforeShipCount > 0"
-									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('/pages/seller/order/order-list?listType=4')"
-							hover-class="common-hover"
-							:hover-stay-time="50"
-						>
-							<view class="order-icon">
-								<image src="https://static.caimei365.com/app/img/icon/order3@3x.png" mode=""></image>
-								<text
-									v-if="shippedCount > 0"
-									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('/pages/seller/order/order-list?listType=5')"
-							hover-class="common-hover"
-							:hover-stay-time="50"
-						>
-							<view class="order-icon">
-								<image src="https://static.caimei365.com/app/img/icon/order4@3x.png" mode=""></image>
-								<text
-									v-if="refundsCount > 0"
-									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>
-			<!-- 底部跳转 -->
-			<view class="foot-list">
-				<view class="list-cell-item">
-					<view
-						class="list-cell"
-						v-for="(item, index) in threeList"
-						:key="index"
-						@click="navigator(item.path)"
-						hover-class="cell-hover"
-						:hover-stay-time="50"
-					>
-						<view class="cell-icon">
-							<image class="cell-icon-image" :src="item.icon" mode=""></image>
-						</view>
-						<text class="cell-tit">{{ item.name }}</text>
-						<text class="cell-more iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-				<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"
-					>
-						<view class="cell-icon">
-							<image class="cell-icon-image" :src="item.icon" mode=""></image>
-						</view>
-						<text class="cell-tit">{{ item.name }}</text>
-						<text
-							v-if="index == 1 && orderNum > 0"
-							class="uni-badge uni-badge-error uni-small uni-badge--small icon-num"
-						>
-							{{ orderNum == 99 ? '99+' : orderNum }}
-						</text>
-						<text class="cell-more iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-				<view class="list-cell-item">
-					<view
-						class="list-cell"
-						v-for="(item, index) in twoList"
-						:key="index"
-						@click="navigator(item.path)"
-						hover-class="cell-hover"
-						:hover-stay-time="50"
-					>
-						<view class="cell-icon">
-							<image class="cell-icon-image" :src="item.icon" mode=""></image>
-						</view>
-						<text class="cell-tit">{{ item.name }}</text>
-						<text class="cell-more iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-import authorize from '@/common/config/authorize.js'
-import { mapState, mapMutations } from 'vuex'
-
-export default {
-	data() {
-		return {
-			nvabarData: {
-				//顶部自定义导航
-				showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-				showSearch: 0,
-				title: '账户中心', // 导航栏 中间的标题
-				haveBack: false,
-				textLeft: this.$store.state.isIphone,
-				textColor: '#FFFFFF',
-				bgColor: ''
-			},
-			CustomBar: this.CustomBar, // 顶部导航栏高度
-			StatusBar: this.StatusBar,
-			bgImgUrl: 'https://static.caimei365.com/app/img/bg/home_cumres@2x.png',
-			name: '',
-			headpic: '',
-			userId: '',
-			serviceProviderId: '',
-			skeletonShow: true,
-			orderNum: 0, //未查看订单数量
-			beforeConfirmCount: 0, //待确认角标
-			beforePayCount: 0, //待付款角标
-			beforeShipCount: 0, //待发货角标
-			shippedCount: 0, //已发货角标
-			refundsCount: '', //退货/款角标
-			institutionsCont: 120,
-			firstList: [
-				{
-					name: '待注册机构',
-					path: '/pages/seller/club/stayClub-list',
-					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_1@2x.png'
-				},
-				{
-					name: '机构列表',
-					path: '/pages/seller/club/list',
-					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_2@2x.png'
-				},
-				{
-					name: '拉机构上线',
-					path: '/pages/seller/login/register-select',
-					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_3@2x.png'
-				},
-				{
-					name: '邀请运营人员',
-					path: '/pages/seller/club/allClub-list',
-					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_4@2x.png'
-				}
-			],
-			twoList: [
-				{
-					name: '帮机构下单',
-					path: '/pages/seller/club/club-list',
-					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_5@2x.png'
-				},
-				// {
-				// 	name: '发布二手商品',
-				// 	path: '/pages/second/form/form-select',
-				// 	icon: 'https://static.caimei365.com/app/img/icon/icon_seller_6@2x.png'
-				// },
-				{
-					name: '客户咨询记录',
-					path: '/pages/seller/remarks/list',
-					icon: 'https://static.caimei365.com/app/img/icon/icon_seller_7@2x.png'
-				},
-
-                {
-                	name: '我的名片',
-                	path: '/pages/seller/remarks/business-card',
-                	icon: 'https://static.caimei365.com/app/img/icon/my-card.png'
-                }
-			],
-			threeList: [
-                {
-                	name: '机构看板',
-                	path: '/pages/seller/club/club-board',
-                	icon: 'https://static.caimei365.com/app/img/icon/visits.png'
-                }
-			]
-		}
-	},
-	created() {
-		this.initData()
-	},
-	computed: {
-		...mapState(['hasLogin', 'userInfo'])
-	},
-	methods: {
-		...mapMutations(['login', 'logout']),
-		async initData() {
-			const wechatCode = await authorize.getCode('weixin') // 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-			const getUserInfo = await authorize.getUserInfo('weixin')
-			const params = { code: wechatCode, encryptedData: getUserInfo.encryptedData, iv: getUserInfo.iv }
-			this.UserService.UserLoginAuthApplets(params).then(response => {
-				if (response.code == 0 || response.code == 4) {
-					this.isLogin = true
-					this.userID = response.data.userId
-					this.userIdentity = response.data.userIdentity
-					this.clubStatus = response.data.clubStatus
-					this.serviceProviderId = response.data.serviceProviderId
-					this.$store.commit('updateStatus', response.data)
-					this.login(response.data)
-					uni.setStorageSync('token', response.data.token)
-					uni.setStorageSync('unionId', response.data.unionId)
-                    uni.setStorageSync('spUserId', response.data.spUserId)
-					this.getUserSellerHome()
-					this.getOrderCount()
-				} else {
-					this.isLogin = false
-					this.logout()
-					uni.setStorageSync('unionId', response.data.unionId)
-					this.$store.commit('updateStatus', response.data)
-					this.$api.navigateTo('/pages/seller/login/login')
-				}
-			})
-		},
-		getUserSellerHome() {
-			this.$api.getStorage().then(resolve => {
-				this.userId = resolve.userId ? resolve.userId : 0
-				this.SellerService.GetSellerHome({ userId: this.userId })
-					.then(response => {
-						let sellerData = response.data
-						this.name = sellerData.linkMan ? sellerData.linkMan : '' //协销名称
-						this.headpic = sellerData.logo //会所头像
-						this.skeletonShow = false
-					})
-					.catch(error => {
-						this.$util.msg(error.msg, 2000)
-					})
-			})
-		},
-		getOrderCount() {
-			this.SellerService.GetOrderCount({ serviceProviderId: this.serviceProviderId }).then(response => {
-				let data = response.data
-				this.beforeConfirmCount = this.showBadge(data.confirmedCount) //待确认
-				this.beforePayCount = this.showBadge(data.paymentCount) //待付款
-				this.beforeShipCount = this.showBadge(data.waitShipmentsCount) //待发货
-				this.shippedCount = this.showBadge(data.shipmentsCount) //已发货
-				this.refundsCount = this.showBadge(data.salesReturnCount) //退货/款
-				this.orderNum = this.showBadge(data.uncheckedOrderCount) //未查看订单数量
-			})
-		},
-		TestZHIboFn() {
-			//测试跳转直播小程序
-			// uni.navigateToMiniProgram({
-			// 	appId: 'wx92d650b253f8f2e3',
-			// 	path: '/pages/index/index',
-			// 	extraData: {
-			// 		'data1': 'test'
-			// 	},
-			// 	envVersion: 'develop',
-			// 	success(res) {
-			// 		// 打开成功
-			// 		console.log(res)
-			// 	}
-			// })
-		},
-		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()
-		}
-	}
-}
-</script>
-
-<style lang="scss">
-@import '@/uni.scss';
-.user {
-	width: 100%;
-	height: 100%;
-	position: relative;
-	background-color: #f7f7f7;
-	padding-bottom: 120rpx;
-}
-.header {
-	width: 100%;
-	position: relative; 
-	background-size: cover;
-}
-.header-main {
-	width: 702rpx;
-	height: 130rpx;
-	padding: 12rpx 24rpx;
-	display: flex;
-	.header-text {
-		flex: 8;
-		display: flex;
-		flex-direction: column;
-		.user-item {
-			flex: 1;
-			height: 64rpx;
-			line-height: 64rpx;
-			.u-tips {
-				display: inline-block;
-				float: left;
-				width: 98rpx;
-				height: 30rpx;
-				border: 1px solid #ffffff;
-				background: linear-gradient(128deg, rgba(242, 143, 49, 1) 0%, rgba(225, 86, 22, 1) 100%);
-				border-radius: 16rpx;
-				line-height: 30rpx;
-				font-size: $font-size-20;
-				text-align: center;
-				color: #ffffff;
-				margin-left: 10rpx;
-			}
-			.u-viptips {
-				display: inline-block;
-				float: left;
-				width: 98rpx;
-				height: 30rpx;
-				border: 1px solid #ffe600;
-				background: linear-gradient(128deg, rgba(242, 143, 49, 1) 0%, rgba(225, 86, 22, 1) 100%);
-				border-radius: 16rpx;
-				line-height: 30rpx;
-				font-size: $font-size-20;
-				text-align: center;
-				color: #ffe600;
-				margin-left: 10rpx;
-				margin-top: 17rpx;
-			}
-			.u-h1 {
-				float: left;
-				font-size: $font-size-36;
-				color: #ffffff;
-				text-align: left;
-				-o-text-overflow: ellipsis;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				word-break: break-all;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-				overflow: hidden;
-			}
-			.u-p {
-				font-size: $font-size-24;
-				line-height: 64rpx;
-				color: #ffffff;
-				text-align: left;
-			}
-		}
-	}
-	.header-icon {
-		flex: 2;
-		margin-right: 20rpx;
-		image {
-			float: right;
-			width: 128rpx;
-			height: 128rpx;
-			border-radius: 100%;
-			border: 2rpx solid #ffffff;
-		}
-	}
-}
-.header-main-none {
-	width: 702rpx;
-	height: 152rpx;
-	padding: 0 24rpx;
-	display: flex;
-	.header-text {
-		flex: 8;
-		display: flex;
-		flex-direction: column;
-		.user-item {
-			flex: 1;
-			height: 50rpx;
-			line-height: 50rpx;
-			.line {
-				margin: 0 10rpx;
-			}
-			.u-h1 {
-				float: left;
-				font-size: $font-size-36;
-				color: #ffffff;
-				text-align: left;
-				-o-text-overflow: ellipsis;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				word-break: break-all;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-				overflow: hidden;
-			}
-			.u-p {
-				font-size: $font-size-24;
-				line-height: 50rpx;
-				color: #efefef;
-				text-align: left;
-			}
-			.u-btn {
-				width: 160rpx;
-				height: 40rpx;
-				background: rgba(255, 255, 255, 0.5);
-				border-radius: 5rpx;
-				line-height: 40rpx;
-				text-align: center;
-				font-size: $font-size-24;
-				color: #ffffff;
-				display: block;
-				margin-top: 5rpx;
-				padding-left: 6rpx;
-				.icon-xiangyouhuabeifen {
-					font-size: $font-size-24;
-				}
-			}
-		}
-	}
-	.header-icon {
-		flex: 2;
-		display: flex;
-		margin-right: 20rpx;
-		align-items: center;
-		justify-content: center;
-		image {
-			float: right;
-			width: 128rpx;
-			height: 128rpx;
-			border-radius: 100%;
-			border: 2rpx solid #ffffff;
-		}
-	}
-}
-.user-order {
-	width: 654rpx;
-	height: auto;
-	padding: 0 24rpx;
-	background-color: $bg-color;
-	margin-bottom: 24rpx;
-	position: absolute;
-	bottom: -170rpx;
-	left: 24rpx;
-	border-radius: 20rpx;
-}
-.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: #666666;
-		padding-right: 30rpx;
-	}
-	.iconfont {
-		width: 30rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		text-align: center;
-		position: absolute;
-		right: 0;
-		top: 0;
-		display: block;
-		font-size: $font-size-28;
-	}
-}
-.order-section {
-	display: flex;
-	justify-content: space-around;
-	align-items: center;
-	flex-wrap: wrap;
-	height: 99rpx;
-	padding: 24rpx 0;
-}
-.order-item {
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	position: relative;
-	&: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: 702rpx;
-	padding: 0 24rpx;
-	padding-top: 168rpx;
-	padding-bottom: 120rpx;
-}
-.list-cell-image {
-	width: 100%;
-	height: 168rpx;
-	background: url(https://static.caimei365.com/app/meibohui/app/activity-small-banner@2x.png);
-	background-size: cover;
-	box-sizing: border-box;
-	margin-bottom: 24rpx;
-	.text {
-		width: 100%;
-		height: 100%;
-		box-sizing: border-box;
-		padding: 38rpx 56rpx;
-		.h1 {
-			line-height: 50rpx;
-			font-size: $font-size-36;
-			color: #ffffff;
-		}
-		.p {
-			line-height: 34rpx;
-			font-size: $font-size-30;
-			color: #ffffff;
-		}
-	}
-}
-.list-cell-item {
-	width: 654rpx;
-	height: auto;
-	margin-bottom: 24rpx;
-	padding: 0 24rpx;
-	background: $bg-color;
-	border-radius: 20rpx;
-}
-.list-cell {
-	width: 100%;
-	line-height: 100rpx;
-	position: relative;
-	background: $bg-color;
-	border-bottom: 1px solid #ebebeb;
-	height: 100rpx;
-	&:last-child {
-		border-bottom: none;
-	}
-	&.cell-hover {
-		background: #fafafa;
-	}
-	.cell-icon {
-		width: 60rpx;
-		height: 100rpx;
-		text-align: center;
-		box-sizing: border-box;
-		padding: 32rpx 12rpx;
-		float: left;
-		.cell-icon-image {
-			width: 36rpx;
-			height: 36rpx;
-			display: block;
-		}
-	}
-	.cell-more {
-		width: 60rpx;
-		height: 100rpx;
-		line-height: 100rpx;
-		text-align: right;
-		position: absolute;
-		right: 0;
-		top: 0;
-		font-size: $font-size-28;
-		color: #666666;
-		.txt {
-			color: #fb4343;
-			padding-right: 10rpx;
-		}
-	}
-	.cell-tit {
-		width: 465rpx;
-		display: block;
-		float: left;
-		font-size: $font-size-28;
-		color: #666666;
-		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(0.8);
-	-ms-transform: scale(0.8);
-	transform: scale(0.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>
+<template>
+    <view class="container user clearfix">
+        <cm-custom :navbar-data="nvabarData" />
+        <view class="user-section">
+            <view class="header" :style="{
+					height: CustomBar + 90 - StatusBar + 'px',
+					paddingTop: CustomBar + 'px',
+					background: 'url(' + bgImgUrl + ')',
+					backgroundSize: 'cover'
+				}">
+                <view class="header-main" v-if="hasLogin">
+                    <view class="header-icon" @click="TestZHIboFn()">
+                        <image src="https://static.caimei365.com/app/img/icon/default-head-new.png" mode=""></image>
+                    </view>
+                    <view class="header-text">
+                        <view class="user-item">
+                            <text class="u-h1">{{ name }}</text>
+                        </view>
+                        <view class="user-item"> <text class="u-tips">协销人员</text> </view>
+                    </view>
+                </view>
+                <!-- 订单 -->
+                <view class="user-order">
+                    <view class="tab-title" @click="navigator('/pages/seller/order/order-list?listType=0')">
+                        <text class="cell-tit">我的订单</text> <text class="cell-more">全部订单</text>
+                        <text class="iconfont icon-xiayibu"></text>
+                    </view>
+                    <view class="order-section">
+                        <view class="order-item" @click="navigator('/pages/seller/order/order-list?listType=1')"
+                            hover-class="common-hover" :hover-stay-time="50">
+                            <view class="order-icon">
+                                <image src="https://static.caimei365.com/app/img/icon/order5@3x.png" mode=""></image>
+                                <text v-if="beforeConfirmCount > 0"
+                                    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('/pages/seller/order/order-list?listType=2')"
+                            hover-class="common-hover" :hover-stay-time="50">
+                            <view class="order-icon">
+                                <image src="https://static.caimei365.com/app/img/icon/order1@3x.png" mode=""></image>
+                                <text v-if="beforePayCount > 0"
+                                    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('/pages/seller/order/order-list?listType=3')"
+                            hover-class="common-hover" :hover-stay-time="50">
+                            <view class="order-icon">
+                                <image src="https://static.caimei365.com/app/img/icon/order2@3x.png" mode=""></image>
+                                <text v-if="beforeShipCount > 0"
+                                    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('/pages/seller/order/order-list?listType=4')"
+                            hover-class="common-hover" :hover-stay-time="50">
+                            <view class="order-icon">
+                                <image src="https://static.caimei365.com/app/img/icon/order3@3x.png" mode=""></image>
+                                <text v-if="shippedCount > 0"
+                                    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('/pages/seller/order/order-list?listType=5')"
+                            hover-class="common-hover" :hover-stay-time="50">
+                            <view class="order-icon">
+                                <image src="https://static.caimei365.com/app/img/icon/order4@3x.png" mode=""></image>
+                                <text v-if="refundsCount > 0"
+                                    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>
+            <!-- 底部跳转 -->
+            <view class="foot-list">
+                <view class="list-cell-main clearfix">
+                    <view class="list-cell-navs" v-for="(item,index) in tabsList" :key="index"
+                        @click="navigator(item.path)">
+                        <view class="icon">
+                            <image class="icon-image" :src="item.icon" mode="widthFix"></image>
+                        </view>
+                        <view class="name">{{ item.name }}</view>
+                    </view>
+                </view>
+                <view class="list-cell-main clearfix">
+                    <view class="list-cell-navs" v-for="(item,index) in firstList" :key="index"
+                        @click="navigator(item.path)">
+                        <view class="icon">
+                            <image class="icon-image" :src="item.icon" mode="widthFix"></image>
+                        </view>
+                        <view class="name">{{ item.name }}</view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    import authorize from '@/common/config/authorize.js'
+    import { mapState, mapMutations } from 'vuex'
+
+    export default {
+        data() {
+            return {
+                nvabarData: {
+                    //顶部自定义导航
+                    showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+                    showSearch: 0,
+                    title: '账户中心', // 导航栏 中间的标题
+                    haveBack: false,
+                    textLeft: this.$store.state.isIphone,
+                    textColor: '#FFFFFF',
+                    bgColor: ''
+                },
+                CustomBar: this.CustomBar, // 顶部导航栏高度
+                StatusBar: this.StatusBar,
+                bgImgUrl: 'https://static.caimei365.com/app/img/bg/new_home_cumres@2x.png',
+                name: '',
+                headpic: '',
+                userId: '',
+                serviceProviderId: '',
+                skeletonShow: true,
+                orderNum: 0, //未查看订单数量
+                beforeConfirmCount: 0, //待确认角标
+                beforePayCount: 0, //待付款角标
+                beforeShipCount: 0, //待发货角标
+                shippedCount: 0, //已发货角标
+                refundsCount: '', //退货/款角标
+                institutionsCont: 120,
+                tabsList: [{
+                        name: '机构列表',
+                        path: '/pages/seller/club/list',
+                        icon: 'https://static.caimei365.com/app/img/icon/icon_seller_2@2x.png'
+                    },
+                    {
+                        name: '帮机构下单',
+                        path: '/pages/seller/club/club-list',
+                        icon: 'https://static.caimei365.com/app/img/icon/icon_seller_5@2x.png'
+                    },
+                    {
+                        name: '拉机构上线',
+                        path: '/pages/seller/login/register-select',
+                        icon: 'https://static.caimei365.com/app/img/icon/icon_seller_3@2x.png'
+                    },
+                    {
+                        name: '待注册机构',
+                        path: '/pages/seller/club/stayClub-list',
+                        icon: 'https://static.caimei365.com/app/img/icon/icon_seller_1@2x.png'
+                    },
+                    {
+                        name: '我的名片',
+                        path: '/pages/seller/remarks/business-card',
+                        icon: 'https://static.caimei365.com/app/img/icon/my-card.png'
+                    },
+                    {
+                        name: '机构看板',
+                        path: '/pages/seller/club/club-board',
+                        icon: 'https://static.caimei365.com/app/img/icon/visits.png'
+                    },
+                    {
+                        name: '客户咨询记录',
+                        path: '/pages/seller/remarks/list',
+                        icon: 'https://static.caimei365.com/app/img/icon/icon_seller_7@2x.png'
+                    },
+                    {
+                        name: '邀请运营人员',
+                        path: '/pages/seller/club/allClub-list',
+                        icon: 'https://static.caimei365.com/app/img/icon/icon_seller_4@2x.png'
+                    }
+                ],
+                firstList: [{
+                    name: '优惠券',
+                    path: '/pages/seller/cart/coupon',
+                    icon: 'https://static.caimei365.com/app/img/icon/icon_club_13@2x.png'
+                }],
+            }
+        },
+        created() {
+            this.initData()
+        },
+        computed: {
+            ...mapState(['hasLogin', 'userInfo'])
+        },
+        methods: {
+            ...mapMutations(['login', 'logout']),
+            async initData() {
+                const wechatCode = await authorize.getCode('weixin') // 根据微信的code获取用户登录状态:1已登录过 -1未登录过
+                const getUserInfo = await authorize.getUserInfo('weixin')
+                const params = { code: wechatCode, encryptedData: getUserInfo.encryptedData, iv: getUserInfo.iv }
+                this.UserService.UserLoginAuthApplets(params).then(response => {
+                    if (response.code == 0 || response.code == 4) {
+                        this.isLogin = true
+                        this.userID = response.data.userId
+                        this.userIdentity = response.data.userIdentity
+                        this.clubStatus = response.data.clubStatus
+                        this.serviceProviderId = response.data.serviceProviderId
+                        this.$store.commit('updateStatus', response.data)
+                        this.login(response.data)
+                        uni.setStorageSync('token', response.data.token)
+                        uni.setStorageSync('unionId', response.data.unionId)
+                        uni.setStorageSync('spUserId', response.data.spUserId)
+                        this.getUserSellerHome()
+                        this.getOrderCount()
+                    } else {
+                        this.isLogin = false
+                        this.logout()
+                        uni.setStorageSync('unionId', response.data.unionId)
+                        this.$store.commit('updateStatus', response.data)
+                        this.$api.navigateTo('/pages/seller/login/login')
+                    }
+                })
+            },
+            getUserSellerHome() {
+                this.$api.getStorage().then(resolve => {
+                    this.userId = resolve.userId ? resolve.userId : 0
+                    this.SellerService.GetSellerHome({ userId: this.userId })
+                        .then(response => {
+                            let sellerData = response.data
+                            this.name = sellerData.linkMan ? sellerData.linkMan : '' //协销名称
+                            this.headpic = sellerData.logo //会所头像
+                            this.skeletonShow = false
+                        })
+                        .catch(error => {
+                            this.$util.msg(error.msg, 2000)
+                        })
+                })
+            },
+            getOrderCount() {
+                this.SellerService.GetOrderCount({ serviceProviderId: this.serviceProviderId }).then(response => {
+                    let data = response.data
+                    this.beforeConfirmCount = this.showBadge(data.confirmedCount) //待确认
+                    this.beforePayCount = this.showBadge(data.paymentCount) //待付款
+                    this.beforeShipCount = this.showBadge(data.waitShipmentsCount) //待发货
+                    this.shippedCount = this.showBadge(data.shipmentsCount) //已发货
+                    this.refundsCount = this.showBadge(data.salesReturnCount) //退货/款
+                    this.orderNum = this.showBadge(data.uncheckedOrderCount) //未查看订单数量
+                })
+            },
+            TestZHIboFn() {
+                //测试跳转直播小程序
+                // uni.navigateToMiniProgram({
+                // 	appId: 'wx92d650b253f8f2e3',
+                // 	path: '/pages/index/index',
+                // 	extraData: {
+                // 		'data1': 'test'
+                // 	},
+                // 	envVersion: 'develop',
+                // 	success(res) {
+                // 		// 打开成功
+                // 		console.log(res)
+                // 	}
+                // })
+            },
+            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()
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    @import '@/uni.scss';
+
+    .user {
+        width: 100%;
+        height: 100%;
+        position: relative;
+        background-color: #f7f7f7;
+        padding-bottom: 120rpx;
+    }
+
+    .header {
+        width: 100%;
+        position: relative;
+        background-size: cover;
+    }
+
+    .header-main {
+        width: 702rpx;
+        height: 130rpx;
+        padding: 12rpx 24rpx;
+        display: flex;
+
+        .header-text {
+            flex: 8;
+            display: flex;
+            flex-direction: column;
+
+            .user-item {
+                flex: 1;
+                height: 64rpx;
+                line-height: 64rpx;
+
+                .u-tips {
+                    display: inline-block;
+                    float: left;
+                    width: 98rpx;
+                    height: 30rpx;
+                    border: 1px solid #ffffff;
+                    background: #ffffff;
+                    border-radius: 16rpx;
+                    line-height: 30rpx;
+                    font-size: $font-size-20;
+                    text-align: center;
+                    color: #999;
+                }
+
+                .u-viptips {
+                    display: inline-block;
+                    float: left;
+                    width: 98rpx;
+                    height: 30rpx;
+                    border: 1px solid #ffe600;
+                    background: linear-gradient(128deg, rgba(242, 143, 49, 1) 0%, rgba(225, 86, 22, 1) 100%);
+                    border-radius: 16rpx;
+                    line-height: 30rpx;
+                    font-size: $font-size-20;
+                    text-align: center;
+                    color: #ffe600;
+                    margin-left: 10rpx;
+                    margin-top: 17rpx;
+                }
+
+                .u-h1 {
+                    float: left;
+                    font-size: $font-size-30;
+                    color: #ffffff;
+                    text-align: left;
+                    -o-text-overflow: ellipsis;
+                    text-overflow: ellipsis;
+                    display: -webkit-box;
+                    word-break: break-all;
+                    -webkit-box-orient: vertical;
+                    -webkit-line-clamp: 1;
+                    overflow: hidden;
+                }
+
+                .u-p {
+                    font-size: $font-size-24;
+                    line-height: 64rpx;
+                    color: #ffffff;
+                    text-align: left;
+                }
+            }
+        }
+
+        .header-icon {
+            flex: 2;
+            margin-right: 20rpx;
+
+            image {
+                float: right;
+                width: 128rpx;
+                height: 128rpx;
+                border-radius: 100%;
+                border: 2rpx solid #ffffff;
+            }
+        }
+    }
+
+    .header-main-none {
+        width: 702rpx;
+        height: 152rpx;
+        padding: 0 24rpx;
+        display: flex;
+
+        .header-text {
+            flex: 8;
+            display: flex;
+            flex-direction: column;
+
+            .user-item {
+                flex: 1;
+                height: 50rpx;
+                line-height: 50rpx;
+
+                .line {
+                    margin: 0 10rpx;
+                }
+
+                .u-h1 {
+                    float: left;
+                    font-size: $font-size-36;
+                    color: #ffffff;
+                    text-align: left;
+                    -o-text-overflow: ellipsis;
+                    text-overflow: ellipsis;
+                    display: -webkit-box;
+                    word-break: break-all;
+                    -webkit-box-orient: vertical;
+                    -webkit-line-clamp: 1;
+                    overflow: hidden;
+                }
+
+                .u-p {
+                    font-size: $font-size-24;
+                    line-height: 50rpx;
+                    color: #efefef;
+                    text-align: left;
+                }
+
+                .u-btn {
+                    width: 160rpx;
+                    height: 40rpx;
+                    background: rgba(255, 255, 255, 0.5);
+                    border-radius: 5rpx;
+                    line-height: 40rpx;
+                    text-align: center;
+                    font-size: $font-size-24;
+                    color: #ffffff;
+                    display: block;
+                    margin-top: 5rpx;
+                    padding-left: 6rpx;
+
+                    .icon-xiangyouhuabeifen {
+                        font-size: $font-size-24;
+                    }
+                }
+            }
+        }
+
+        .header-icon {
+            flex: 2;
+            display: flex;
+            margin-right: 20rpx;
+            align-items: center;
+            justify-content: center;
+
+            image {
+                float: right;
+                width: 128rpx;
+                height: 128rpx;
+                border-radius: 100%;
+                border: 2rpx solid #ffffff;
+            }
+        }
+    }
+
+    .user-order {
+        width: 654rpx;
+        height: auto;
+        padding: 0 24rpx;
+        background-color: $bg-color;
+        margin-bottom: 24rpx;
+        position: absolute;
+        bottom: -170rpx;
+        left: 24rpx;
+        border-radius: 20rpx;
+    }
+
+    .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: #666666;
+            padding-right: 30rpx;
+        }
+
+        .iconfont {
+            width: 30rpx;
+            height: 80rpx;
+            line-height: 80rpx;
+            text-align: center;
+            position: absolute;
+            right: 0;
+            top: 0;
+            display: block;
+            font-size: $font-size-28;
+        }
+    }
+
+    .order-section {
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        flex-wrap: wrap;
+        height: 99rpx;
+        padding: 24rpx 0;
+    }
+
+    .order-item {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        position: relative;
+
+        &: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%;
+        box-sizing: border-box;
+        padding: 0 24rpx;
+        padding-top: 168rpx;
+        padding-bottom: 120rpx;
+    }
+
+    .list-cell-image {
+        width: 100%;
+        height: 168rpx;
+        background: url(https://static.caimei365.com/app/meibohui/app/activity-small-banner@2x.png);
+        background-size: cover;
+        box-sizing: border-box;
+        margin-bottom: 24rpx;
+
+        .text {
+            width: 100%;
+            height: 100%;
+            box-sizing: border-box;
+            padding: 38rpx 56rpx;
+
+            .h1 {
+                line-height: 50rpx;
+                font-size: $font-size-36;
+                color: #ffffff;
+            }
+
+            .p {
+                line-height: 34rpx;
+                font-size: $font-size-30;
+                color: #ffffff;
+            }
+        }
+    }
+
+    .list-cell-main {
+        width: 100%;
+        height: auto;
+        margin-bottom: 24rpx;
+        padding: 40rpx 10rpx 0 10rpx;
+        background: $bg-color;
+        border-radius: 20rpx;
+        box-sizing: border-box;
+
+        .list-cell-navs {
+            width: 25%;
+            height: auto;
+            float: left;
+            margin-bottom: 40rpx;
+
+            .icon {
+                width: 40rpx;
+                height: 40rpx;
+                margin: 0 auto;
+                position: relative;
+                margin-bottom: 10rpx;
+
+                .icon-image {
+                    width: 40rpx;
+                    height: 40rpx;
+                    display: block;
+                }
+            }
+
+            .name {
+                width: 100%;
+                height: 40rpx;
+                line-height: 40rpx;
+                text-align: center;
+                font-size: $font-size-24;
+                color: #999999;
+            }
+        }
+    }
+
+    .uni-badge--small {
+        -webkit-transform: scale(0.8);
+        -ms-transform: scale(0.8);
+        transform: scale(0.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/seller/login/apply.vue

@@ -625,12 +625,14 @@ export default {
 			if (this.businessLicense == '') {
 				this.$util.msg('请上传您的营业执照', 2000)
 				return
-			}
+			}
+            if (this.isOrganizationType == 1) {
+            	if (this.medicalPracticeLicense == '') {
+            		this.$util.msg('请上传医疗许可证', 2000)
+            		return
+            	}
+            }
 			if (this.isOrganizationType == 1 || this.isOrganizationType == 2) {
-				if (this.medicalPracticeLicense == '') {
-					this.$util.msg('请上传医疗许可证', 2000)
-					return
-				}
 				if (this.mainProduct == '') {
 					this.$util.msg('请选择住机构主营内容', 2000)
 					return

pages/tabBar/user/user.vue

@@ -127,23 +127,6 @@
                         </view>
                     </view>
                 </view>
-                <!-- <view class="header-main-order" style="margin-bottom: 20rpx;border-radius: 20rpx;" v-if="!hasLogin || userInfo.userIdentity === 3">
-                    <view
-                        class="list-cell"
-                       	@click="this.$api.navigateTo('/pages/login/supplier_login')"
-                        hover-class="cell-hover"
-                        :hover-stay-time="50"
-                        style="border-radius: 25rpx;
-    padding: 0 19rpx;
-    box-sizing: border-box;"
-                    >
-                        <view class="cell-icon">
-                            <image class="cell-icon-image" src="https://static.caimei365.com/app/img/supplier-login/supplier.png" mode=""></image>
-                        </view>
-                        <text class="cell-tit">供应商服务</text>
-                        <text style="right: 20rpx;" class="cell-more iconfont icon-xiayibu"></text>
-                    </view>
-                </view> -->
                 <!-- 订单 -->
                 <view class="header-main-order" :style="{ marginTop: hasLogin ? '0rpx' : '0rpx' }">
                     <view class="user-order">
@@ -263,131 +246,36 @@
                 </view>
                 <!-- 底部跳转 -->
                 <view class="header-main-listcell">
-                    <view class="list-cell-item" v-show="hasLogin">
-                        <view
-                            class="list-cell"
-                            v-show="userIdentity == 4"
-                            @click="navigatorClubUpgrade(`/pages/login/apply?clubStatus=${clubStatus}`)"
-                            hover-class="cell-hover"
-                            :hover-stay-time="50"
-                        >
-                            <view class="cell-icon">
-                                <image
-                                    class="cell-icon-image"
-                                    src="https://static.caimei365.com/app/img/icon/icon_club_8@2x.png"
-                                    mode=""
-                                ></image>
-                            </view>
-                            <text class="cell-tit">
-                                升级资质机构
-                                <text class="cell-tips">采美豆</text>
-                            </text>
-                            <text class="cell-more">
-                                <text class="txt">{{ clubStatusText(clubStatus) }}</text>
-                                <text class="iconfont icon-xiayibu"></text>
-                            </text>
-                        </view>
-<!--                        <view
-                            class="list-cell"
-                            @click="navigator('/pages/user/regularPurchase/regularPurchase')"
-                            hover-class="cell-hover"
-                            :hover-stay-time="50"
-                        >
-                            <view class="cell-icon">
-                                <image
-                                    class="cell-icon-image"
-                                    src="https://static.caimei365.com/app/img/icon/icon_club_9@2x.png"
-                                    mode=""
-                                ></image>
-                            </view>
-                            <text class="cell-tit">再次购买</text>
-                            <text class="cell-more iconfont icon-xiayibu"></text>
-                        </view>--> 
-                        <view
-                            class="list-cell"
-                            @click="navigator('/pages/user/collection/collection')"
-                            hover-class="cell-hover"
-                            :hover-stay-time="50"
-                        >
-                            <view class="cell-icon">
-                                <image
-                                    class="cell-icon-image"
-                                    src="https://static.caimei365.com/app/img/icon/icon_club_13@2x.png"
-                                    mode=""
-                                ></image>
-                            </view>
-                            <text class="cell-tit">收藏商品</text>
-                            <text class="cell-more iconfont icon-xiayibu"></text>
-                        </view>
-                    </view>
-                    <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"
-                        >
-                            <view class="cell-icon">
-                                <image class="cell-icon-image" :src="item.icon" mode=""></image>
-                            </view>
-                            <text class="cell-tit">
-                                {{ item.name }}
-                                <text class="cell-tips" v-if="index == 2 && isModify">采美豆</text>
-                            </text>
-                            <text class="cell-more iconfont icon-xiayibu"></text>
-                        </view>
-                    </view>
-                    <view class="list-cell-item">
-						<!-- #ifdef MP-WEIXIN -->
-						<button class="list-cell" open-type="contact" @bindcontact="handleContact">
-							<view class="cell-icon">
-							    <image
-							        class="cell-icon-image"
-							        src="https://static.caimei365.com/app/img/icon/icon_club_5@2x.png"
-							        mode=""
-							    ></image>
-							</view>
-							<text class="cell-tit"> 官方客服 </text>
-							<text class="cell-more iconfont icon-xiangyou"></text>
-						</button>
-						<!-- #endif -->
-                        <view
-                            class="list-cell"
-                            @click="this.$api.navigateTo('/pages/user/about/about')"
-                            hover-class="cell-hover"
-                            :hover-stay-time="50"
-                        >
-                            <view class="cell-icon">
-                                <image
-                                    class="cell-icon-image"
-                                    src="https://static.caimei365.com/app/img/icon/icon_club_6@2x.png"
-                                    mode=""
-                                ></image>
-                            </view>
-                            <text class="cell-tit">关于我们</text>
-                            <text class="cell-more iconfont icon-xiayibu"></text>
-                        </view>
-                        <view
-                            class="list-cell last"
-                            @click="this.$api.navigateTo('/pages/h5/article/page?linkType=99')"
-                            hover-class="cell-hover"
-                            :hover-stay-time="50"
-                        >
-                            <view class="cell-icon">
-                                <image
-                                    class="cell-icon-image"
-                                    src="https://static.caimei365.com/app/img/icon/icon_club_7@2x.png"
-                                    mode=""
-                                ></image>
-                            </view>
-                            <text class="cell-tit">帮助中心</text>
-                            <text class="cell-more iconfont icon-xiayibu"></text>
-                        </view>
+                    <view class="list-cell-main clearfix">
+                        <view class="list-cell-navs" v-for="(item,index) in firstList" :key="index" @click="navigator(item.path)" v-show=" index === 0 ? userIdentity === 4 : item.show">
+                        	<view class="icon">
+                        		<image class="icon-image" :src="item.icon" mode="widthFix"></image>
+                                <text class="cell-tips" v-if="(index === 1 && isModify) || index === 0">采美豆</text>
+                        	</view>
+                        	<view class="name">{{ item.name }}</view>
+                        </view>
                     </view>
+                    <view class="list-cell-main clearfix">
+                        <view class="list-cell-navs" v-for="(item,index) in lastList" :key="index" @click="lastNavigator(index,item.path)">
+                        	<view class="icon">
+                        		<image class="icon-image" :src="item.icon" mode="widthFix"></image>
+                        	</view>
+                        	<view class="name">{{ item.name }}</view>
+                        </view>
+                        <!-- #ifdef MP-WEIXIN -->
+                        <button class="list-cell-navs" open-type="contact" @bindcontact="handleContact">
+                        	<view class="icon">
+                        	    <image
+                        	        class="icon-image"
+                        	        src="https://static.caimei365.com/app/img/icon/icon_club_5@2x.png"
+                        	        mode=""
+                        	    ></image>
+                        	</view>
+                        	<text class="name"> 官方客服 </text>
+                        </button>
+                        <!-- #endif -->
+                    </view>
                 </view>
-                <view class="header-main-last"></view>
             </view>
         </view>
         <!-- 采美豆提示弹窗 -->
@@ -397,7 +285,7 @@
             :beansType="beansType"
             :beanNumber="beanNumber"
             @cancel="handleBeanlClick"
-        ></activityBean>
+        />
     </view>
 </template>
 <script>
@@ -420,7 +308,7 @@ export default {
                 textLeft: this.$store.state.isIphone,
                 textColor: '#333333',
                 bgColor: ''
-            },
+            },
             CustomBar: this.CustomBar, // 顶部导航栏高度
             StatusBar: this.StatusBar,
             StaticUrl: this.$Static,
@@ -452,32 +340,30 @@ export default {
             paymentCount: 0, // 待付款角标
             waitShipmentsCount: 0, // 待收货角标
             shipmentsCount: 0, // 已发货角标
-            salesReturnCount: '', // 退货/款角标
-            firstList: [
-                {
-                    name: '运营人员管理',
-                    path: '/pages/user/operator/list',
-                    icon: 'https://static.caimei365.com/app/img/icon/icon_club_1@2x.png'
-                },
-                {
-                    name: '收货地址管理',
-                    path: '/pages/user/address/address',
-                    icon: 'https://static.caimei365.com/app/img/icon/icon_club_2@2x.png'
-                },
-                {
-                    name: '机构资料',
-                    path: '/pages/login/information',
-                    icon: 'https://static.caimei365.com/app/img/icon/icon_club_3@2x.png'
-                },
-                {
-                    name: '账户设置',
-                    path: '/pages/user/setting/setting',
-                    icon: 'https://static.caimei365.com/app/img/icon/icon_club_4@2x.png'
-                }
+            salesReturnCount: '', // 退货/款角标
+            firstList: [],
+            lastList:[
+                {
+                    name: '账户设置',
+                    path: '/pages/user/setting/setting',
+                    icon: 'https://static.caimei365.com/app/img/icon/icon_club_4@2x.png'
+                },
+                {
+                	name: '关于我们',
+                	path: '/pages/user/about/about',
+                	icon: 'https://static.caimei365.com/app/img/icon/icon_club_6@2x.png'
+                },
+                {
+                	name: '帮助中心',
+                	path: '/pages/h5/article/page?linkType=99',
+                	icon: 'https://static.caimei365.com/app/img/icon/icon_club_7@2x.png'
+                }
             ]
         }
     },
-    onLoad(option) {},
+    onLoad(option) {
+       this.initTbasUser()
+    },
     computed: {
         ...mapState(['hasLogin', 'userInfo', 'isWxAuthorize'])
     },
@@ -512,11 +398,48 @@ export default {
                     this.isModify = data.isModify // 是否显示采美豆
                     this.contactNumber = data.contactNumber // 联系电话
                     let clubInfo = { name: this.name, image: this.headpic, userId: data.user.userId }
-                    uni.setStorage({ key: 'clubInfo', data: clubInfo })
+                    uni.setStorage({ key: 'clubInfo', data: clubInfo })
                 })
                 .catch(error => {
                     this.$util.msg(error.msg, 2000)
                 })
+        },
+        initTbasUser(){
+            const isLogin =  this.hasLogin ? true : false
+            console.log('isLogin',isLogin)
+            this.firstList = [
+                {
+                    name: '升级资质',
+                    path: `/pages/login/apply?clubStatus=${this.clubStatus}`,
+                    icon: 'https://static.caimei365.com/app/img/icon/icon_club_8@2x.png',
+                    show: isLogin
+                },
+                {
+                    name: '机构资料',
+                    path: '/pages/login/information',
+                    icon: 'https://static.caimei365.com/app/img/icon/icon_club_3@2x.png',
+                    show: true
+                },
+                {
+                    name: '运营人员管理',
+                    path: '/pages/user/operator/list',
+                    icon: 'https://static.caimei365.com/app/img/icon/icon_club_1@2x.png',
+                    show: true
+                },
+                {
+                    name: '地址管理',
+                    path: '/pages/user/address/address',
+                    icon: 'https://static.caimei365.com/app/img/icon/icon_club_2@2x.png',
+                    show: true 
+                },
+                {
+                    name: '收藏商品',
+                    path: '/pages/user/collection/collection',
+                    icon: 'https://static.caimei365.com/app/img/icon/icon_club_13@2x.png',
+                    show: true
+                }
+                
+            ]
         },
         UserClubOrderCount() {
             //获取订单状态数量
@@ -589,6 +512,17 @@ export default {
             } else {
                 this.$api.navigateTo('/pages/login/login?type=0&state=0')
             }
+        },
+        lastNavigator(index,url) {
+            if(index === 0){
+                if (this.hasLogin) {
+                    this.$api.navigateTo(url)
+                } else {
+                    this.$api.navigateTo('/pages/login/login')
+                }
+            }else{
+                this.$api.navigateTo(url)
+            }
         },
         navigatorRegirst(url) {
             if (!this.hasLogin) {
@@ -602,17 +536,6 @@ export default {
                 this.$api.navigateTo(url)
             }
         },
-        navigatorClubUpgrade(url) {
-            // 友盟埋点个人机构升级点击事件
-            if (process.env.NODE_ENV != 'development') {
-                this.$uma.trackEvent('Um_Event_ClubUpgrade', {
-                    Um_Key_ClubName: `${this.name}`,
-                    Um_Key_PageName: '个人机构升级入口',
-                    Um_Key_SourcePage: '个人中心'
-                })
-            }
-            this.$api.navigateTo(url)
-        },
         navigatorLoginCode(url) {
             // 友盟埋点个人机构升级点击事件
             if (process.env.NODE_ENV != 'development') {
@@ -672,24 +595,9 @@ export default {
             }
             return num
         },
-        clubStatusText(state) {
-            let stateText
-            switch (state) {
-                case 90:
-                    stateText = ''
-                    break
-                case 1:
-                    stateText = '正在审核中'
-                    break
-                case 92:
-                    stateText = '审核不通过'
-                    break
-            }
-            return stateText
-        },
         async initUserData() {
             const userInfo = await this.$api.getComStorage('userInfo')
-            this.userId = userInfo.userId ? userInfo.userId : 0
+            this.userId = userInfo.userId ? userInfo.userId : 0
             this.getClubObtainCenter()
             this.UserClubOrderCount()
             this.GetInitBeansInfo()
@@ -1099,101 +1007,77 @@ page {
         color: $text-color;
     }
 }
-.header-main-last {
-    width: 100%;
-    height: 20rpx;
-    float: left;
-    box-sizing: border-box;
-}
+
 .header-main-listcell {
     width: 100%;
     height: auto;
     box-sizing: border-box;
     padding: 0 24rpx;
-    margin-bottom: 60rpx;
-}
-.list-cell-item {
-    width: 654rpx;
-    height: auto;
-    margin-bottom: 24rpx;
-    padding: 0 24rpx;
-    background: $bg-color;
-    border-radius: 20rpx;
-}
-.list-cell {
-    width: 100%;
-    line-height: 100rpx;
-    position: relative;
-    background: $bg-color;
-    border-bottom: 1px solid #ebebeb;
-    height: 100rpx;
-    &:last-child {
-        border-bottom: none;
-    }
-    &.cell-hover {
-        background: #fafafa;
-    }
-    .cell-icon {
-        width: 60rpx;
-        height: 100rpx;
-        text-align: center;
-        box-sizing: border-box;
-        padding: 32rpx 12rpx;
-        float: left;
-        .cell-icon-image {
-            width: 36rpx;
-            height: 36rpx;
-            display: block;
-        }
+    margin-bottom: 60rpx;
+    .list-cell-main{
+        width: 100%;
+        height: auto;
+        margin-bottom: 24rpx;
+        padding: 40rpx 10rpx 0 10rpx;
+        background: $bg-color;
+        border-radius: 20rpx;
+        box-sizing: border-box;
+        .list-cell-navs{
+        	width: 25%;
+        	height: auto;
+        	float: left;
+        	margin-bottom: 40rpx;
+        	.icon{
+        		width: 40rpx;
+        		height: 40rpx;
+        		margin: 0 auto;
+        		position: relative;
+                margin-bottom: 8rpx;
+                position: relative;
+        		.icon-image{
+        			width: 40rpx;
+        			height: 40rpx;
+        			display: block;
+        		}
+                .cell-tips {
+                    width: 70rpx;
+                    height: 30rpx;
+                    line-height: 30rpx;
+                    padding: 0 6rpx;
+                    border-radius: 15rpx;
+                    background-color: #ffe6dc;
+                    color: $color-system;
+                    text-align: center;
+                    font-size: $font-size-20;
+                    position: absolute;
+                    top: 28rpx;
+                    right: -66rpx;
+                }
+                .cell-tips-dg{
+                    width: 70rpx;
+                    height: 30rpx;
+                    line-height: 30rpx;
+                    padding: 0 6rpx;
+                    border-radius: 15rpx;
+                    background-color: #C1C1C1;
+                    color: #fb4343;
+                    text-align: center;
+                    font-size: $font-size-20;
+                    position: absolute;
+                    top: 0;
+                    right: -66rpx;
+                }
+        	}
+        	.name{
+        		width: 100%;
+        		height: 40rpx;
+        		line-height: 40rpx;
+        		text-align: center;
+        		font-size: $font-size-24;
+        		color: #999999;
+        	}
+        }
     }
-    .cell-more {
-        height: 100rpx;
-        line-height: 100rpx;
-        text-align: right;
-        position: absolute;
-        right: 0;
-        top: 0;
-        font-size: $font-size-28;
-        color: #666666;
-        &.cont {
-            width: 250rpx;
-        }
-        .txt {
-            color: #fb4343;
-            padding-right: 10rpx;
-        }
-    }
-    .cell-tit {
-        width: 465rpx;
-        display: block;
-        float: left;
-        font-size: $font-size-28;
-        color: #666666;
-        margin-right: 10rpx;
-		text-align: left;
-        &.cont {
-            width: 300rpx;
-        }
-        .cell-tips {
-            width: 74rpx;
-            height: 32rpx;
-            line-height: 32rpx;
-            padding: 0 7rpx;
-            border-radius: 16rpx;
-            background-color: #ffe6dc;
-            color: $color-system;
-            text-align: center;
-            font-size: $font-size-20;
-            margin-left: 8rpx;
-        }
-    }
-    .cell-tip {
-        font-size: $font-size-28;
-        color: $text-color;
-    }
-}
-.list-cell.last {
-    border-bottom: none;
 }
 .uni-badge--small {
     -webkit-transform: scale(0.8);

pages/user/coupon/coupon-details.vue

@@ -0,0 +1,312 @@
+<template>
+	<view class="container clearfix" >
+		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5" />
+		<view class="container-content tui-skeleton" v-else>
+			<view class="container-list">
+				<view class="coupon-list">
+					<view class="list-cell-le">
+						<view class="coupon-maxMoney"> <text class="small">￥</text> {{ coupon.couponAmount }} </view>
+						<view class="coupon-minMoney"> 满{{ coupon.touchPrice }}可用 </view>
+					</view>
+					<view class="list-cell-ri">
+						<view class="list-cell-top">
+							<view class="list-cell-type">
+								<view class="list-cell-tags">
+									<template v-if="coupon.moneyCouponFlag == 1">
+										<text class="tags" v-if="coupon.moneyCouponType == 1"
+											>意向{{ coupon.couponType | TypeFormat }}</text
+										>
+										<text class="tags" v-else>定向{{ coupon.couponType | TypeFormat }}</text>
+									</template>
+									<template v-else>
+										<text class="tags">{{ coupon.couponType | TypeFormat }}</text>
+									</template>
+								</view>
+								<view class="list-cell-texts">
+									<text v-if="coupon.couponType == 0">
+										{{
+											coupon.productType && coupon.productType == 1
+												? '全商城商品通用'
+												: '仅可购买指定商品'
+										}}
+									</text>
+									<text v-if="coupon.couponType == 1">
+										{{ coupon.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
+									</text>
+									<text v-if="coupon.couponType == 3"
+										>仅限购买店铺【{{ coupon.shopName }}】的商品</text
+									>
+									<text v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</text>
+								</view>
+							</view>
+						</view>
+						<view class="list-cell-time">{{ coupon.startDate }} - {{ coupon.endDate }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="container-button">
+				<view class="button" @click="handeleReceiveCoupon(coupon)">领取优惠券</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'
+import wxLogin from '@/common/config/wxLogin.js'
+import authorize from '@/common/config/authorize.js'
+export default {
+	data() {
+		return {
+			StaticUrl: this.$Static,
+			isIphoneX: this.$store.state.isIphoneX,
+			coupon: {},
+			coupinList: [],
+			payAmount: 100 ,//支付金额
+			skeletonShow:true,
+            isReceiveLoading: false ,//领券操作状态
+            param:{
+                spId:0,
+                userId:0,
+                couponId:0,
+                source: 1
+            }
+		}
+	},
+	onLoad(option) {
+        wxLogin.wxLoginAuthorize()
+		this.param.spId = option.spId
+		this.param.couponId = option.couponId
+		this.initCouponDetail(this.param.couponId)
+	},
+	filters: {
+		TypeFormat(value) {
+			switch (value) {
+				case 0:
+					return '活动券'
+					break
+				case 1:
+					return '品类券'
+					break
+				case 2:
+					return '用户专享券'
+					break
+				case 3:
+					return '店铺券'
+					break
+				case 4:
+					return '新用户券'
+					break
+			}
+		}
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo',])
+	},
+	methods: {
+		async initCouponDetail(couponId) {
+			// 初始化优惠券信息
+            try{
+                const res = await this.ProductService.QueryCouponDetail({ couponId: couponId })
+                this.coupon = res.data
+                setTimeout(()=>{
+                     this.skeletonShow = false
+                },500)
+               
+            }catch(e){
+               console.log('初始化优惠券信息异常~')
+            }
+		},
+        async handeleReceiveCoupon(coupon){
+            // 点击优惠券领取按钮,
+            if (this.hasLogin) {
+            	if (this.isReceiveLoading) {
+            		return
+            	}
+                const userInfo = await this.$api.getStorage()
+                this.param.userId = userInfo.userId
+                this.getRceiveCoupon(this.param)
+            } else {
+                const pages = getCurrentPages()
+                const page = pages[pages.length - 1]
+                uni.setStorageSync('LOGIN_REDIRECT_URL', page.$page.fullPath)
+                this.$api.redirectTo('/pages/login/login')
+            }
+        },
+        // 执行领取优惠券
+        async getRceiveCoupon(params){
+            try{
+                await this.ProductService.ReceiveCoupon(params)
+                this.isReceiveLoading = true
+                this.$util.msg('领取成功', 1500, true, 'success')
+                setTimeout(() => {
+                	this.isReceiveLoading = false
+                    this.$api.reLaunch('/pages/user/coupon/coupon')
+                }, 1500)
+            }catch(error){
+               this.$util.msg(error.msg, 2000)
+               this.isReceiveLoading = false
+            }
+        }
+	},
+	onShow() {
+       
+    }
+}
+</script>
+
+<style lang="scss">
+page {
+	background-color: #FFFFFF;
+}
+.container {
+	width: 100%;
+	height: auto;
+}
+.container-list {
+	box-sizing: border-box;
+	padding: 24rpx;
+	.empty-container-image {
+		width: 260rpx;
+		height: 260rpx;
+		margin-top: -300rpx;
+	}
+	.toIndexPage {
+		bottom: 390rpx;
+	}
+	.coupon-list {
+		width: 100%;
+		height: 200rpx;
+		margin-bottom: 24rpx;
+		box-sizing: border-box;
+		background: url(https://static.caimei365.com/app/img/icon/icon-coupon-uesb@2x.png);
+		background-size: cover;
+		position: relative;
+		.list-cell-le {
+			width: 224rpx;
+			height: 100%;
+			box-sizing: border-box;
+			padding: 37rpx 0;
+			float: left;
+			.coupon-maxMoney {
+				width: 100%;
+				height: 78rpx;
+				line-height: 78rpx;
+				font-size: 56rpx;
+				color: #ffffff;
+				text-align: center;
+				.small {
+					font-size: $font-size-24;
+				}
+			}
+			.coupon-minMoney {
+				width: 100%;
+				height: 33rpx;
+				line-height: 33rpx;
+				font-size: $font-size-24;
+				color: #ffffff;
+				text-align: center;
+			}
+		}
+		.list-cell-ri {
+			width: 478rpx;
+			height: 100%;
+			box-sizing: border-box;
+			padding: 20rpx 24rpx 0 24rpx;
+			float: right;
+			.list-cell-top {
+				width: 100%;
+				height: 121rpx;
+				float: left;
+				border-bottom: 1px solid #e1e1e1;
+				.list-cell-type {
+					width: 286rpx;
+					height: 100%;
+					float: left;
+					.list-cell-tags {
+						width: 100%;
+						height: 32rpx;
+						margin-bottom: 7rpx;
+						.tags {
+							display: inline-block;
+							padding: 0 10rpx;
+							height: 32rpx;
+							line-height: 32rpx;
+							background-color: #ffdcce;
+							color: #f94b4b;
+							font-size: $font-size-20;
+							border-radius: 8rpx;
+							text-align: center;
+							float: left;
+						}
+					}
+					.list-cell-texts {
+						width: 100%;
+						height: auto;
+						line-height: 35rpx;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						word-break: break-all;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+						font-size: 26rpx;
+						color: #333333;
+					}
+				}
+				.list-cell-btn {
+					width: 128rpx;
+					height: 100%;
+					float: right;
+					.icon-used {
+						width: 100%;
+						height: 100%;
+						box-sizing: border-box;
+						padding-top: 57rpx;
+						.icon-used-btn {
+							width: 128rpx;
+							height: 48rpx;
+							border-radius: 28rpx;
+							line-height: 48rpx;
+							font-size: $font-size-24;
+							text-align: center;
+							&.receive {
+								background-image: linear-gradient(270deg, #f94b4b 0%, #feb673 100%);
+								color: #ffffff;
+							}
+							&.make {
+								border: solid 1px #f94b4b;
+								color: #f94b4b;
+							}
+						}
+					}
+				}
+			}
+			.list-cell-time {
+				width: 100%;
+				height: 58rpx;
+				line-height: 58rpx;
+				text-align: left;
+				font-size: $font-size-20;
+				color: #999999;
+			}
+		}
+	}
+}
+.container-button {
+	width: 100%;
+	height: 90rpx;
+	margin-top: 190rpx;
+	.button {
+		width: 600rpx;
+		height: 90rpx;
+		text-align: center;
+		background: $btn-confirm;
+		line-height: 90rpx;
+		font-size: $font-size-30;
+		color: #ffffff;
+		margin: 0 auto;
+		border-radius: 45rpx;
+	}
+}
+</style>

services/config.env.js

@@ -2,11 +2,8 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
-    // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
-    // URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
-    // URL_CONFIG = 'http://192.168.2.103:18002'    //陈凯联调地址
-    // URL_CONFIG = 'https://core-b.caimei365.com' 
-    URL_CONFIG = 'https://core.caimei365.com'    
+    URL_CONFIG = 'https://core-b.caimei365.com' 
+    // URL_CONFIG = 'https://core.caimei365.com'    
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'