1-17-1

App.vue

@@ -1,6 +1,7 @@
 <script>
 export default {
 	onLaunch() {
+		uni.setStorageSync('showchangename',0)
 		// #ifdef MP-WEIXIN
 		const updateManager = wx.getUpdateManager();
 

access/common.js

@@ -89,11 +89,13 @@ export function getEnToken() {
 	// return 'b8ca10e4ce35fded735c980403dfedf7' //master
 	// #ifdef MP
 	// const entoken = uni.getExtConfigSync().token || ''
-	return "931544405107da76ca2ec31cd63fae49"
+	// return "931544405107da76ca2ec31cd63fae49"
+	return "fa4c7dee4c8c37d41204a9c1e11f3e43"
 	// return entoken
 	// #endif
 	// #ifdef H5||APP-PLUS
-	return "931544405107da76ca2ec31cd63fae49"
+	return "fa4c7dee4c8c37d41204a9c1e11f3e43"
+	// return "931544405107da76ca2ec31cd63fae49"
 	// #endif
 }
 // 获取openid

common/http.api.js

@@ -390,70 +390,80 @@ const install = (Vue, vm) => {
 		// 余额明细
 		getAllMemberBalanceDetail: (params = '') => vm.$u.post(
 			`/Customer/apiCustomer/getAllMemberBalanceDetail`, params),
-		/*------积分------*/
-		// 积分商品详情
+		/*------股权------*/
+		// 股权商品详情
 		getIntegralGoodsInfo: (id, params = '') => vm.$u.get(
 			`/Integral/ApiIntegralGoods/getIntegralGoodsInfo/${id}`, params),
-		// 积分商品兑换列表
+		// 股权商品兑换列表
 		getAllIntegralGoodsExchange: (params = '') => vm.$u.post(
 			`/Integral/ApiIntegralGoods/getAllIntegralGoodsExchange`, params),
-		// 积分流水
+		// 股权流水
 		getAllCustomerIntegralDesc: (params = '') => vm.$u.post(
 			`/Customer/ApiCustomer/getAllCustomerIntegralDesc`, params),
-		// 积分商品列表
+		// 股权商品列表
 		getAllIntegralGoods: (params = '') => vm.$u.post(`/Integral/ApiIntegralGoods/getAllIntegralGoods`,
 			params),
-		// 积分兑换商品
+		// 股权兑换商品
 		addIntegralGoodsExchange: (params = '') => vm.$u.post(
 			`/Integral/ApiIntegralGoods/addIntegralGoodsExchange`, params),
-		// 积分商品兑换详情
+		// 股权商品兑换详情
 		getIntegralGoodsExchangeInfo: (id, params = '') => vm.$u.get(
 			`/Integral/ApiIntegralGoods/getIntegralGoodsExchangeInfo/${id}`, params),
 		/*------提现------*/
 		// 新增提现
 		addReflectDetail: (params = '') => vm.$u.post(`/Customer/apiCustomer/addReflectDetail`, params),
 		// 获取所有提现记录
-		getAllReflectDetail: (params = '') => vm.$u.post(`/Customer/apiCustomer/getAllReflectDetail`, params),
-		// 项目列表
-		getItemList:(params = '') => vm.$u.get(`/shop/ApiShopProject/list`, params),
-		// 项目详情
-		getItemDetail:(params = '') => vm.$u.get(`/shop/ApiShopProject/details`, params),
-		// 计算详情价格
-		calculation:(params = '') => vm.$u.post(`/shop/ApiShopProject/calculation`, params),
-		//获取门店列表
-		getStoreList: (params = '') => vm.$u.post(`/shop/ApiShop/getAll`, params),
-		//全部员工列表
-		getAllygList: (params = '') => vm.$u.get(`/Department/ApiStaff/staffAll`, params),
-		//选择时间员工 
-		getTimeYgList: (params = '') => vm.$u.post(`/shop/ApiShopProject/choice`, params),
-		//员工预约时间
-		getYgYyTimeArea: (params = '') => vm.$u.post(`/shop/ApiShopProject/choice_time`, params),
-		// 创建项目订单
-		createItemOrder: (params = '') => vm.$u.post(`/shop/ApiShopProject/create`, params),
-		//hop/ApiShopSubscribe/list 用户项目列表
-		getMyItem: (params = '') => vm.$u.post(`/shop/ApiShopSubscribe/list`, params),
-		// 取消预约项目/shop/ApiShopSubscribe/cancel
-		itemCancel: (params = '') => vm.$u.post(`/shop/ApiShopSubscribe/cancel`, params),
-		//支付待支付的项目shop/ApiShopProject/payment
-		itemPayment: (params = '') => vm.$u.post(`/shop/ApiShopProject/payment`, params),
-		// 抵用券列表shop/ApiShopCard/userCard
-		getDyquanList:(params = '') => vm.$u.post(`/shop/ApiShopCard/userCard`, params),
-		// 优惠卡列表
-		getYhkList:(params = '') => vm.$u.post(`/shop/ShopCard/list`, params),
-		//优惠卡详情
-		getYhkDetail:(params = '') => vm.$u.post(`/shop/ShopCard/details`, params),
-		//购买优惠卡
-		buyYhk:(params = '') => vm.$u.post(`/shop/ApiShopCard/buy_card`, params),
-		// 我的优惠卡
-		getMyyhkList:(params = '') => vm.$u.post(`/shop/ApiShopCard/card_order`, params),
-		// 提交员工评价
-		pjYg:(params = '') => vm.$u.post(`/shop/ApiShopSubscribe/comment`, params),
-		//员工详情/Department/staff/getStaffInfo
-		getYgdetail:(params = '') => vm.$u.post(`/Department/staff/getStaffInfo`, params),
-		// 员工评价列表
-		getYgPj:(params = '') => vm.$u.post(`/shop/ApiShopSubscribe/comment_list`, params),
-		//获取1招商2连锁3共享股东4高管
+		getAllReflectDetail: (params = '') => vm.$u.post(`/Customer/apiCustomer/getAllReflectDetail`, params),
+		// 项目列表
+		getItemList:(params = '') => vm.$u.get(`/shop/ApiShopProject/list`, params),
+		// 项目详情
+		getItemDetail:(params = '') => vm.$u.get(`/shop/ApiShopProject/details`, params),
+		// 计算详情价格
+		calculation:(params = '') => vm.$u.post(`/shop/ApiShopProject/calculation`, params),
+		//获取门店列表
+		getStoreList: (params = '') => vm.$u.post(`/shop/ApiShop/getAll`, params),
+		//全部员工列表
+		getAllygList: (params = '') => vm.$u.get(`/Department/ApiStaff/staffAll`, params),
+		//选择时间员工 
+		getTimeYgList: (params = '') => vm.$u.post(`/shop/ApiShopProject/choice`, params),
+		//员工预约时间
+		getYgYyTimeArea: (params = '') => vm.$u.post(`/shop/ApiShopProject/choice_time`, params),
+		// 创建项目订单
+		createItemOrder: (params = '') => vm.$u.post(`/shop/ApiShopProject/create`, params),
+		//hop/ApiShopSubscribe/list 用户项目列表
+		getMyItem: (params = '') => vm.$u.post(`/shop/ApiShopSubscribe/list`, params),
+		// 取消预约项目/shop/ApiShopSubscribe/cancel
+		itemCancel: (params = '') => vm.$u.post(`/shop/ApiShopSubscribe/cancel`, params),
+		//支付待支付的项目shop/ApiShopProject/payment
+		itemPayment: (params = '') => vm.$u.post(`/shop/ApiShopProject/payment`, params),
+		// 抵用券列表shop/ApiShopCard/userCard
+		getDyquanList:(params = '') => vm.$u.post(`/shop/ApiShopCard/userCard`, params),
+		// 优惠卡列表
+		getYhkList:(params = '') => vm.$u.post(`/shop/ShopCard/list`, params),
+		//优惠卡详情
+		getYhkDetail:(params = '') => vm.$u.post(`/shop/ShopCard/details`, params),
+		//购买优惠卡
+		buyYhk:(params = '') => vm.$u.post(`/shop/ApiShopCard/buy_card`, params),
+		// 我的优惠卡
+		getMyyhkList:(params = '') => vm.$u.post(`/shop/ApiShopCard/card_order`, params),
+		// 提交员工评价
+		pjYg:(params = '') => vm.$u.post(`/shop/ApiShopSubscribe/comment`, params),
+		//员工详情/Department/staff/getStaffInfo
+		getYgdetail:(params = '') => vm.$u.post(`/Department/staff/getStaffInfo`, params),
+		// 员工评价列表
+		getYgPj:(params = '') => vm.$u.post(`/shop/ApiShopSubscribe/comment_list`, params),
+		//获取1招商2连锁3共享股东4高管
 		getOtherList:(params = '') => vm.$u.post(`/Enterprise/Personnel/list`, params),
+		//用户股权
+		getGq:(params = '') => vm.$u.get(`/UserCenter/ApiUserCenter/holders`, params),
+		//用户分红股份
+		getFh:(params = '') => vm.$u.get(`/UserCenter/ApiUserCenter/holders_bonus`, params),
+		//用户基础股份
+		getBsGf:(params = '') => vm.$u.get(`/UserCenter/ApiUserCenter/holders_record`, params),
+		// 文章详情
+		getArtDetail:(params = '') => vm.$u.get(`/Enterprise/Article/details`, params),
+		// 审核状态
+		getSh:(params = '') => vm.$u.get(`/System/ApiBasicSetup/over_examination`, params),
 	};
 }
 

components/PageDesign/components/NavBar.vue

@@ -38,15 +38,13 @@
 					this.loginTip = true;
 				} else {
 					if (item.text == '企业文化') {
-						return;
+						this.goPage('/pagesT/unit/artdetail?type=2', switchTab);
 					} else if (item.text == '高管') {
 						this.goPage('/pagesT/unit/official?type=4', switchTab);
 					} else if (item.text == '员工') {
 						this.goPage('/pagesT/unit/official?type=5', switchTab);
 					} else if (item.text == '项目') {
 						this.goPage('/pagesT/unit/item', switchTab);
-					} else if (item.text == '疗程') {
-
 					} else if (item.text == '会员') {
 						this.goPage('/pagesT/user/VipList',switchTab)
 					} else if (item.text == '股权') {
@@ -56,12 +54,8 @@
 					} else if (item.text == '招商') {
 						this.goPage('/pagesT/unit/officialT?state=0', switchTab);
 					} else if (item.text == '招聘') {
-
-					} else if (item.text == '食品') {
-
-					} else if (item.text == '生活用品') {
-
-					} else {
+						this.goPage('/pagesT/unit/artdetail?type=1', switchTab);
+					}else {
 						this.goPage(url, switchTab);
 					}
 				}

components/Tabbar/index.vue

@@ -17,22 +17,23 @@ export default {
 		tabbar_list() {
 			return [
 				{
-					iconPath: 'https://onlineimg.qianniao.vip/tar-home-unsel.png',
-					selectedIconPath: 'https://onlineimg.qianniao.vip/tar-home-' + this.theme + '.png',
+					iconPath: this.$store.state.baseurl + '/img/user/' + 'home.png',
+					// selectedIconPath: 'https://onlineimg.qianniao.vip/tar-home-' + this.theme + '.png',
+					selectedIconPath: this.$store.state.baseurl + '/img/user/' + 'home-action.png',
 					text: '首页',
 					customIcon: false,
 					pagePath: '/pages/index/index'
 				},
 				{
-					iconPath: 'https://onlineimg.qianniao.vip/tar-cate-unsel.png',
-					selectedIconPath: 'https://onlineimg.qianniao.vip/tar-cate-' + this.theme + '.png',
+					iconPath: this.$store.state.baseurl + '/img/user/' + 'cate.png',
+					selectedIconPath: this.$store.state.baseurl + '/img/user/' + 'cate-action.png',
 					text: '分类',
 					customIcon: false,
 					pagePath: '/pages/classification/cate'
 				},
 				{
-					iconPath: 'https://onlineimg.qianniao.vip/tar-car-unsel.png',
-					selectedIconPath: 'https://onlineimg.qianniao.vip/tar-car-' + this.theme + '.png',
+					iconPath: this.$store.state.baseurl + '/img/user/' + 'cart.png',
+					selectedIconPath: this.$store.state.baseurl + '/img/user/' + 'cart-action.png',
 					text: '购物车',
 					customIcon: false,
 					// 红色角标显示的数字，如果需要移除角标，配置此参数为0即可
@@ -40,8 +41,8 @@ export default {
 					pagePath: '/pages/cart/cart'
 				},
 				{
-					iconPath: 'https://onlineimg.qianniao.vip/tar-my-unsel.png',
-					selectedIconPath: 'https://onlineimg.qianniao.vip/tar-my-' + this.theme + '.png',
+					iconPath: this.$store.state.baseurl + '/img/user/' + 'user.png',
+					selectedIconPath: this.$store.state.baseurl + '/img/user/' + 'user-action.png',
 					text: '我的',
 					customIcon: false,
 					pagePath: '/pages/user/user'

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "六牛云商",
+    "name" : "君海蓝",
     "appid" : "__UNI__C6CD808",
     "description" : "六牛云商 - 为传统商户量身打造的全渠道线上线下一体化新零售营销系统! 以客户为中心，将线上和线下、进销存、CRM、财务一体化，完美融合！支持连锁、代理、经销多种运营模式，小程序一键发布，自定义APP界面，多套模板选择。7X24小时为您服务",
     "versionName" : "1.1.3",

pages.json

@@ -91,60 +91,66 @@
 				"style": {
 					"navigationBarTitleText": "个人设置"
 				}
-			},
-			{
-				"path": "unit/official",
-				"style": {
-					"navigationBarTitleText": ""
-				}
-			},
-			{
-				"path": "unit/officialT",
-				"style": {
-					"navigationBarTitleText": ""
-				}
-			},
-			{
-				"path": "unit/ygdetail",
-				"style": {
-					"navigationBarTitleText": "员工详情"
-				}
-			},
-			{
-				"path": "unit/hyc",
-				"style": {
-					"navigationBarTitleText": "会员卡"
-				}
-			},
-			{
-				"path": "unit/lc",
-				"style": {
-					"navigationBarTitleText": "疗程"
-				}
-			},
-			{
-				"path": "unit/item",
-				"style": {
-					"navigationBarTitleText": "项目"
-				}
-			},
-			{
-				"path": "unit/evaluate",
-				"style": {
-					"navigationBarTitleText": "评价"
-				}
-			},
-			{
-				"path": "unit/itemdetail",
-				"style": {
-					"navigationBarTitleText": "详情展示",
-					"navigationStyle": "custom",
-					"app-plus": {
-						"titleNView": {
-							"type": "transparent"
-						}
-					}
-				}
+			},
+			{
+				"path": "unit/official",
+				"style": {
+					"navigationBarTitleText": ""
+				}
+			},
+			{
+				"path": "unit/yhk",
+				"style": {
+					"navigationBarTitleText": "优惠卡"
+				}
+			},
+			{
+				"path": "unit/officialT",
+				"style": {
+					"navigationBarTitleText": ""
+				}
+			},
+			{
+				"path": "unit/ygdetail",
+				"style": {
+					"navigationBarTitleText": "员工详情"
+				}
+			},
+			{
+				"path": "unit/artdetail",
+				"style": {
+					"navigationBarTitleText": ""
+				}
+			},
+			{
+				"path": "unit/lc",
+				"style": {
+					"navigationBarTitleText": "疗程"
+				}
+			},
+			{
+				"path": "unit/item",
+				"style": {
+					"navigationBarTitleText": "项目"
+				}
+			},
+			{
+				"path": "unit/evaluate",
+				"style": {
+					"navigationBarTitleText": "评价"
+				}
+			},
+			{
+				"path": "unit/itemdetail",
+				"style": {
+					"navigationBarTitleText": "详情展示",
+					"navigationStyle": "custom",
+					"app-plus": {
+						"titleNView": {
+							"type": "transparent"
+						}
+					}
+				}
 			},
 			{
 				"path": "user/editUserInfo",
@@ -181,30 +187,30 @@
 				"style": {
 					"navigationBarTitleText": "常购清单"
 				}
-			},
-			{
-				"path": "user/guquan",
-				"style": {
-					"navigationBarTitleText": "股权"
-				}
-			},
-			{
-				"path": "user/dyquan",
-				"style": {
-					"navigationBarTitleText": "我的抵用券"
-				}
-			},
-			{
-				"path": "user/myyhk",
-				"style": {
-					"navigationBarTitleText": "我的优惠卡"
-				}
-			},
-			{
-				"path": "user/gqDetail",
-				"style": {
-					"navigationBarTitleText": "股权明细"
-				}
+			},
+			{
+				"path": "user/guquan",
+				"style": {
+					"navigationBarTitleText": "股权"
+				}
+			},
+			{
+				"path": "user/dyquan",
+				"style": {
+					"navigationBarTitleText": "我的抵用券"
+				}
+			},
+			{
+				"path": "user/myyhk",
+				"style": {
+					"navigationBarTitleText": "我的优惠卡"
+				}
+			},
+			{
+				"path": "user/gqDetail",
+				"style": {
+					"navigationBarTitleText": "股权明细"
+				}
 			},
 			{
 				"path": "search/index",
@@ -333,23 +339,23 @@
 				"style": {
 					"navigationBarTitleText": "我的订单"
 				}
-			},
-			{
-				"path": "order/orderT",
-				"style": {
-					"navigationBarTitleText": "项目订单"
-				}
+			},
+			{
+				"path": "order/orderT",
+				"style": {
+					"navigationBarTitleText": "项目订单"
+				}
 			},{
 				"path": "order/createOrder",
 				"style": {
 					"navigationBarTitleText": "确认订单"
 				}
 			},
-			{
-				"path": "order/createOrderT",
-				"style": {
-					"navigationBarTitleText": "确认订单"
-				}
+			{
+				"path": "order/createOrderT",
+				"style": {
+					"navigationBarTitleText": "确认订单"
+				}
 			},
 			{
 				"path": "order/orderDetail",
@@ -561,14 +567,14 @@
 			{
 				"path": "pointsMall/index",
 				"style": {
-					"navigationBarTitleText": "积分商城",
+					"navigationBarTitleText": "股权商城",
 					"enablePullDownRefresh": true //开启下拉刷新
 				}
 			},
 			{
 				"path": "pointsMall/PointsDetail",
 				"style": {
-					"navigationBarTitleText": "积分明细",
+					"navigationBarTitleText": "股权明细",
 					"enablePullDownRefresh": true //开启下拉刷新
 				}
 			},
@@ -597,7 +603,7 @@
 				"path": "pointsMall/IntegralGoodsDetail",
 				"style": {
 					"enablePullDownRefresh": true,
-					"navigationBarTitleText": "积分商品详情",
+					"navigationBarTitleText": "股权商品详情",
 					"navigationStyle": "custom",
 					"app-plus": {
 						"titleNView": {
@@ -621,26 +627,26 @@
 		"selectedColor": "#ff2d2d",
 		"list": [{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/img/tabbar-icon/tar-home-unsel.png",
-				"selectedIconPath": "static/img/tabbar-icon/tar-home-red.png",
+				"iconPath": "static/img/tabbar-icon/home.png",
+				"selectedIconPath": "static/img/tabbar-icon/home-action.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/classification/cate",
-				"iconPath": "static/img/tabbar-icon/tar-cate-unsel.png",
-				"selectedIconPath": "static/img/tabbar-icon/tar-cate-unsel.png",
+				"iconPath": "static/img/tabbar-icon/cate.png",
+				"selectedIconPath": "static/img/tabbar-icon/cate-action.png",
 				"text": "分类"
 			},
 			{
 				"pagePath": "pages/cart/cart",
-				"iconPath": "static/img/tabbar-icon/tar-car-unsel.png",
-				"selectedIconPath": "static/img/tabbar-icon/tar-car-unsel.png",
+				"iconPath": "static/img/tabbar-icon/cart.png",
+				"selectedIconPath": "static/img/tabbar-icon/cart-action.png",
 				"text": "购物车"
 			},
 			{
 				"pagePath": "pages/user/user",
-				"iconPath": "static/img/tabbar-icon/tar-my-unsel.png",
-				"selectedIconPath": "static/img/tabbar-icon/tar-my-unsel.png",
+				"iconPath": "static/img/tabbar-icon/user.png",
+				"selectedIconPath": "static/img/tabbar-icon/user-action.png",
 				"text": "我的"
 			}
 		]

pages/user/user.vue

@@ -1,1097 +1,1157 @@
-<template>
-	<view class="user-index" :class="['qn-page-' + theme]">
-		<view class="user-top" :style="{ height: vip_data.name ? '418rpx' : '348rpx' }">
-			<!-- 装饰 -->
-			<view class="circle-big" :style="{ height: vip_data.name ? '418rpx' : '348rpx' }">
-				<view class="circle-one"></view>
-				<view class="circle-two"></view>
-				<view class="vip-view clearfix" v-if="vip_data.name">
-					<view class="float_left">
-						<view class="vip-name">
-							<text class="ibonfont ibonhuiyuan" style="margin-right: 16rpx;"></text>
-							{{ vip_data.name }}
-						</view>
-						<view class="desc" v-if="vip_data.vipDiscount === 5">享受全场{{ vip_data.discount - 0 }}折</view>
-						<view class="desc" v-else>专享会员权益</view>
-					</view>
-					<view class="float_right vip-btn" @click="navTo(`/pagesT/user/VipDetail?id=${vip_data.id}`)">
-						<block v-if="vip_data.isSelf">立即查看</block>
-						<block v-else>立即开通</block>
-					</view>
-				</view>
-			</view>
-			<uniStatusBar />
-			<!-- 未登录 -->
-			<view class="user-info clearfix" v-if="!isLogin">
-				<view class="ui-img float_left">
-					<u-image shape="circle" width="120rpx" height="120rpx" error-icon="photo" src="https://onlineimg.qianniao.vip/user-re.png"></u-image>
-				</view>
-				<view class="user-name float_left" style="padding-top: 20rpx;">
-					<Login @loginSuccess="loginSuccess"><view class="login-btn" slot="lBtn">登录/注册</view></Login>
-				</view>
-				<view class="float_right right-icon" @click="setUserInfo">
-					<view><text class="ibonfont ibonshezhi21"></text></view>
-					<view class="text">设置</view>
-				</view>
-			</view>
-			<!-- 已登录 -->
-			<view class="user-info clearfix" v-else>
-				<view class="ui-img float_left" @click="setUserInfo">
-					<u-image error-icon="photo" shape="circle" width="120rpx" height="120rpx" :src="userInfo.avatar"></u-image>
-					<view class="edit-bth">{{ userStatus === 0 ? '去完善' : '编辑' }}</view>
-				</view>
-				<view class="user-name float_left">
-					<view class="un-text ellipsis" v-if="userInfo.name">{{ userInfo.name || '匿名用户' }}</view>
-					<view class="un-text-desc" v-if="(personnelReview === 5 || finishData === 5) && (userStatus !== 2 || enableStatus === 4)">
-						<text v-if="enableStatus === 4">已禁用</text>
-						<text v-else-if="userStatus === 0">待完善资料</text>
-						<text v-else-if="userStatus === 1">审核中</text>
-						<text v-else-if="userStatus === 3">已驳回,请重新完善资料</text>
-					</view>
-					<view class="un-text-desc" v-else>
-						<text class="customer-type-name">{{ userInfo.customerSourceTypeName || '默认类型' }}</text>
-					</view>
-					<view class="un-text-desc" style="margin-left: 20rpx;" v-if="vip_data.isSelf"><text class="customer-type-name">VIP会员</text></view>
-				</view>
-				<view class="float_right right-icon" @click="setUserInfo">
-					<view><text class="ibonfont ibonshezhi21"></text></view>
-					<view class="text">设置</view>
-				</view>
-			</view>
-			<block v-if="personnelReview === 5 && userStatus === 3">
-				<u-notice-bar mode="horizontal" :list="['审核失败，原因：' + userInfo.auditFailReason]" :speed="100" :volume-icon="false" :more-icon="true"></u-notice-bar>
-			</block>
-		</view>
-
-		<view class="num-view" v-if="isLogin">
-			<view class="num-li" v-if="en_token !== aier_en_token" @click="navTo('/pagesT/money/Balance')">
-				<view class="num-text">{{ Number(userInfo.memberBalance) || 0 }}</view>
-				<view class="num-tit">余额</view>
-			</view>
-			<view class="num-li" @click="navTo('/pagesT/pointsMall/index')">
-				<view class="num-text">{{ userInfo.integral || 0 }}</view>
-				<view class="num-tit">积分</view>
-			</view>
-			<view class="num-li" @click="navTo('/pagesT/user/DiscountCoupon')">
-				<view class="num-text">{{ userInfo.couponNum || 0 }}</view>
-				<view class="num-tit">优惠券</view>
-			</view>
-			<view class="num-li" @click="navTo('/pagesT/user/Collection')">
-				<view class="num-text">{{ userInfo.collNum || 0 }}</view>
-				<view class="num-tit">收藏</view>
-			</view>
-		</view>
-		<view class="model-view">
-			<view class="model-tit clearfix">
-				<view class="float_left">我的订单</view>
-				<view class="float_right" @click="navTo('/pagesT/order/orderT?state=1')">
-					<text>查看全部</text>
-					<text class="ibonfont ibonjinru"></text>
-				</view>
-			</view>
-			<view class="model-main fn-ul order-ul">
-				<view class="fn-li" @click="navTo('/pagesT/order/order?state=' + 1)">
-					<u-badge v-if="order_num['2'] > 0 && isLogin" type="error" :offset="[-16, 18]" :count="order_num['2']"></u-badge>
-					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-dfk-' + theme + '.png'"></image></view>
-					<view class="fn-label">待付款</view>
-				</view>
-				<view class="fn-li" @click="navTo('/pagesT/order/order?state=' + 2)">
-					<u-badge v-if="order_num['3'] > 0 && isLogin" type="error" :offset="[-16, 18]" :count="order_num['3']"></u-badge>
-					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-dfh-' + theme + '.png'"></image></view>
-					<view class="fn-label">待发货</view>
-				</view>
-				<view class="fn-li" @click="navTo('/pagesT/order/order?state=' + 3)">
-					<u-badge v-if="order_num['4'] > 0 && isLogin" type="error" :offset="[-16, 18]" :count="order_num['4']"></u-badge>
-					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-dsh-' + theme + '.png'"></image></view>
-					<view class="fn-label">待收货</view>
-				</view>
-				<view class="fn-li" @click="navTo('/pagesT/order/order?state=' + 4)">
-					<u-badge v-if="order_num['5'] > 0 && isLogin" type="error" :offset="[-16, 18]" :count="order_num['5']"></u-badge>
-					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-finish-' + theme + '.png'"></image></view>
-					<view class="fn-label">已完成</view>
-				</view>
-				<!-- <view class="fn-li" v-if="en_token !== aier_en_token" @click="navTo('/pagesT/order/ReturnOrder')">
-					<u-badge v-if="order_num['10'] > 0 && isLogin" type="error" :offset="[-16, 18]" :count="order_num['10']"></u-badge>
-					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-service-' + theme + '.png'"></image></view>
-					<view class="fn-label">售后服务</view>
-				</view> -->
-			</view>
-		</view>
-		<!-- 负责代表信息 -->
-		<!-- <view class="model-view" v-if="isLogin">
-			<view class="information-top">
-				<image src="https://onlineimg.qianniao.vip/ic-db.png" class="img"></image>
-				<view class="text">负责代表信息</view>
-			</view>
-			<view class="information-bottom">
-				<ul class="ul-list">
-					<li class="ul-item ellipsis">
-						<text class="left">出货门店：</text>
-						<text class="right">{{ userInfo.shopDate.name }}</text>
-					</li>
-					<li class="ul-item">
-						<text class="left">业代姓名：</text>
-						<text class="right">{{ userInfo.salesManName || '客服' }}</text>
-					</li>
-					<li class="ul-item">
-						<text class="left">服务时间：</text>
-						<text class="right">全天</text>
-					</li>
-					<li class="ul-item">
-						<text class="left">门店电话：</text>
-						<text class="right right-last" @click="lianxi(userInfo.salesManMobile || userInfo.shopDate.mobile)">
-							{{ userInfo.salesManMobile || userInfo.shopDate.mobile }}
-						</text>
-					</li>
-				</ul>
-			</view>
-		</view> -->
-		<view class="model-view" v-if="en_token !== aier_en_token">
-			<view class="model-tit">我的服务</view>
-			<view class="model-main fn-ul">
-				<view class="fn-li" @click="navTo('/pagesT/user/VipList')">
-					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-vip-' + theme + '.png'"></image></view>
-					<view class="fn-label">会员卡</view>
+<template>
+	<view class="user-index" :class="['qn-page-' + theme]">
+		<view class="user-top" :style="{ height: vip_data.name ? '418rpx' : '348rpx' }">
+			<!-- 装饰 -->
+			<view class="circle-big" :style="{ height: vip_data.name ? '418rpx' : '348rpx' }">
+				<view class="circle-one"></view>
+				<view class="circle-two"></view>
+				<view class="vip-view clearfix" v-if="vip_data.name">
+					<view class="float_left">
+						<view class="vip-name">
+							<text class="ibonfont ibonhuiyuan" style="margin-right: 16rpx;"></text>
+							{{ vip_data.name }}
+						</view>
+						<view class="desc" v-if="vip_data.vipDiscount === 5">享受全场{{ vip_data.discount - 0 }}折</view>
+						<view class="desc" v-else>专享会员权益</view>
+					</view>
+					<view class="float_right vip-btn" @click="navTo(`/pagesT/user/VipDetail?id=${vip_data.id}`)">
+						<block v-if="vip_data.isSelf">立即查看</block>
+						<block v-else>立即开通</block>
+					</view>
 				</view>
-				<view class="fn-li" @click="navTo('/pagesT/user/dyquan')">
+			</view>
+			<uniStatusBar />
+			<!-- 未登录 -->
+			<view class="user-info clearfix" v-if="!isLogin">
+				<view class="ui-img float_left">
+					<u-image shape="circle" width="120rpx" height="120rpx" error-icon="photo"
+						src="https://onlineimg.qianniao.vip/user-re.png"></u-image>
+				</view>
+				<view class="user-name float_left" style="padding-top: 20rpx;">
+					<Login @loginSuccess="loginSuccess">
+						<view class="login-btn" slot="lBtn">登录/注册</view>
+					</Login>
+				</view>
+				<view class="float_right right-icon" @click="setUserInfo">
+					<view><text class="ibonfont ibonshezhi21"></text></view>
+					<view class="text">设置</view>
+				</view>
+			</view>
+			<!-- 已登录 -->
+			<view class="user-info clearfix" v-else>
+				<view class="ui-img float_left" @click="setUserInfo">
+					<u-image error-icon="photo" shape="circle" width="120rpx" height="120rpx" :src="userInfo.avatar">
+					</u-image>
+					<view class="edit-bth">{{ userStatus === 0 ? '去完善' : '编辑' }}</view>
+				</view>
+				<view class="user-name float_left">
+					<view class="un-text ellipsis" v-if="userInfo.name">{{ userInfo.name || '匿名用户' }}</view>
+					<view class="un-text-desc"
+						v-if="(personnelReview === 5 || finishData === 5) && (userStatus !== 2 || enableStatus === 4)">
+						<text v-if="enableStatus === 4">已禁用</text>
+						<text v-else-if="userStatus === 0">待完善资料</text>
+						<text v-else-if="userStatus === 1">审核中</text>
+						<text v-else-if="userStatus === 3">已驳回,请重新完善资料</text>
+					</view>
+					<view class="un-text-desc" v-else>
+						<text class="customer-type-name">{{ userInfo.customerSourceTypeName || '默认类型' }}</text>
+					</view>
+					<view class="un-text-desc" style="margin-left: 20rpx;" v-if="vip_data.isSelf"><text
+							class="customer-type-name">VIP会员</text></view>
+				</view>
+				<view class="float_right right-icon" @click="setUserInfo">
+					<view><text class="ibonfont ibonshezhi21"></text></view>
+					<view class="text">设置</view>
+				</view>
+			</view>
+			<block v-if="personnelReview === 5 && userStatus === 3">
+				<u-notice-bar mode="horizontal" :list="['审核失败，原因：' + userInfo.auditFailReason]" :speed="100"
+					:volume-icon="false" :more-icon="true"></u-notice-bar>
+			</block>
+		</view>
+
+		<view class="num-view" v-if="isLogin">
+			<view class="num-li" v-if="en_token !== aier_en_token" @click="navTo('/pagesT/money/Balance')">
+				<view class="num-text">{{ Number(userInfo.memberBalance) || 0 }}</view>
+				<view class="num-tit">余额</view>
+			</view>
+			<view class="num-li" @click="navTo('/pagesT/pointsMall/index')">
+				<view class="num-text">{{ userInfo.integral || 0 }}</view>
+				<view class="num-tit">股权</view>
+			</view>
+			<view class="num-li" @click="navTo('/pagesT/user/DiscountCoupon')">
+				<view class="num-text">{{ userInfo.couponNum || 0 }}</view>
+				<view class="num-tit">优惠券</view>
+			</view>
+			<view class="num-li" @click="navTo('/pagesT/user/Collection')">
+				<view class="num-text">{{ userInfo.collNum || 0 }}</view>
+				<view class="num-tit">收藏</view>
+			</view>
+		</view>
+		<view class="model-view">
+			<view class="model-tit clearfix">
+				<view class="float_left">我的订单</view>
+				<view class="float_right" @click="navTo('/pagesT/order/order?state=0')">
+					<text>查看全部</text>
+					<text class="ibonfont ibonjinru"></text>
+				</view>
+			</view>
+			<view class="model-main fn-ul order-ul">
+				<view class="fn-li" @click="navTo('/pagesT/order/order?state=' + 1)">
+					<u-badge v-if="order_num['2'] > 0 && isLogin" type="error" :offset="[-16, 18]"
+						:count="order_num['2']"></u-badge>
+					<view class="fn-icon">
+						<image :src="'https://onlineimg.qianniao.vip/ic-dfk-' + theme + '.png'"></image>
+					</view>
+					<view class="fn-label">待付款</view>
+				</view>
+				<view class="fn-li" @click="navTo('/pagesT/order/order?state=' + 2)">
+					<u-badge v-if="order_num['3'] > 0 && isLogin" type="error" :offset="[-16, 18]"
+						:count="order_num['3']"></u-badge>
+					<view class="fn-icon">
+						<image :src="'https://onlineimg.qianniao.vip/ic-dfh-' + theme + '.png'"></image>
+					</view>
+					<view class="fn-label">待发货</view>
+				</view>
+				<view class="fn-li" @click="navTo('/pagesT/order/order?state=' + 3)">
+					<u-badge v-if="order_num['4'] > 0 && isLogin" type="error" :offset="[-16, 18]"
+						:count="order_num['4']"></u-badge>
+					<view class="fn-icon">
+						<image :src="'https://onlineimg.qianniao.vip/ic-dsh-' + theme + '.png'"></image>
+					</view>
+					<view class="fn-label">待收货</view>
+				</view>
+				<view class="fn-li" @click="navTo('/pagesT/order/order?state=' + 4)">
+					<u-badge v-if="order_num['5'] > 0 && isLogin" type="error" :offset="[-16, 18]"
+						:count="order_num['5']"></u-badge>
+					<view class="fn-icon">
+						<image :src="'https://onlineimg.qianniao.vip/ic-finish-' + theme + '.png'"></image>
+					</view>
+					<view class="fn-label">已完成</view>
+				</view>
+				<!-- <view class="fn-li" v-if="en_token !== aier_en_token" @click="navTo('/pagesT/order/ReturnOrder')">
+					<u-badge v-if="order_num['10'] > 0 && isLogin" type="error" :offset="[-16, 18]" :count="order_num['10']"></u-badge>
+					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-service-' + theme + '.png'"></image></view>
+					<view class="fn-label">售后服务</view>
+				</view> -->
+			</view>
+		</view>
+		<!-- 负责代表信息 -->
+		<!-- <view class="model-view" v-if="isLogin">
+			<view class="information-top">
+				<image src="https://onlineimg.qianniao.vip/ic-db.png" class="img"></image>
+				<view class="text">负责代表信息</view>
+			</view>
+			<view class="information-bottom">
+				<ul class="ul-list">
+					<li class="ul-item ellipsis">
+						<text class="left">出货门店：</text>
+						<text class="right">{{ userInfo.shopDate.name }}</text>
+					</li>
+					<li class="ul-item">
+						<text class="left">业代姓名：</text>
+						<text class="right">{{ userInfo.salesManName || '客服' }}</text>
+					</li>
+					<li class="ul-item">
+						<text class="left">服务时间：</text>
+						<text class="right">全天</text>
+					</li>
+					<li class="ul-item">
+						<text class="left">门店电话：</text>
+						<text class="right right-last" @click="lianxi(userInfo.salesManMobile || userInfo.shopDate.mobile)">
+							{{ userInfo.salesManMobile || userInfo.shopDate.mobile }}
+						</text>
+					</li>
+				</ul>
+			</view>
+		</view> -->
+		<view class="model-view" v-if="en_token !== aier_en_token">
+			<view class="model-tit">我的服务</view>
+			<view class="model-main fn-ul">
+				<!-- <view class="fn-li" @click="navTo('/pagesT/user/VipList')">
 					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-vip-' + theme + '.png'"></image></view>
+					<view class="fn-label">会员卡</view>
+				</view> -->
+				<view class="fn-li" @click="navTo('/pagesT/user/dyquan')">
+					<view class="fn-icon">
+						<image src="https://api.liuniukj.com/img/user/dyq.png"></image>
+					</view>
 					<view class="fn-label">我的抵用券</view>
-				</view>
-				<view class="fn-li" @click="navTo('/pagesT/address/address')">
-					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-address-' + theme + '.png'"></image></view>
-					<view class="fn-label">我的地址</view>
-				</view>
-				<view class="fn-li" @click="navTo('/pagesT/user/DiscountCoupon')">
-					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-coupon-' + theme + '.png'"></image></view>
-					<view class="fn-label">我的优惠券</view>
-				</view>
-			<!-- 	<view class="fn-li" @click="goDistribution">
-					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-fen-' + theme + '.png'"></image></view>
-					<view class="fn-label">分销中心</view>
+				</view>
+				<view class="fn-li" @click="navTo('/pagesT/address/address')">
+					<view class="fn-icon">
+						<image src="https://api.liuniukj.com/img/user/wddz.png"></image>
+					</view>
+					<view class="fn-label">我的地址</view>
+				</view>
+				<view class="fn-li" @click="navTo('/pagesT/user/myyhk')">
+					<view class="fn-icon">
+						<image src="https://api.liuniukj.com/img/user/yhk.png"></image>
+					</view>
+					<view class="fn-label">我的优惠卡</view>
+				</view>
+				<!-- 	<view class="fn-li" @click="goDistribution">
+					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-fen-' + theme + '.png'"></image></view>
+					<view class="fn-label">分销中心</view>
 				</view> -->
 				<view class="fn-li" @click="navTo('/pagesT/user/Collection')">
-					<view class="fn-icon"><image :src="'https://onlineimg.qianniao.vip/ic-fen-' + theme + '.png'"></image></view>
+					<view class="fn-icon">
+						<image src="https://api.liuniukj.com/img/user/wdsc.png"></image>
+					</view>
 					<view class="fn-label">我的收藏</view>
-				</view>
-			</view>
-		</view>
-		<view class="model-view list-model-view">
-			<view class="model-tit">工具与服务</view>
-			<view class="model-main list-ul new-class">
-				<!-- <view class="list-li clearfix" @click="openpop">
-					<view class="fn-icon">
-						<image src="https://onlineimg.qianniao.vip/ic-kf.png" mode="aspectFill"></image>
-						<view>{{ userInfo.salesManName ? '专属客服' : '客服中心' }}</view>
-					</view>
-				</view> -->
-				<view class="list-li clearfix" v-if="en_token === aier_en_token" @click="navTo('/pagesT/address/address')">
-					<view class="fn-icon">
-						<image src="https://onlineimg.qianniao.vip/ic-dz.png" mode="aspectFill"></image>
-						<view>我的地址</view>
-					</view>
-				</view>
-				<view class="list-li clearfix" v-if="en_token === aier_en_token" @click="navTo('/pagesT/money/CustomerBalanceDetail')">
-					<view class="fn-icon">
-						<image src="https://onlineimg.qianniao.vip/ic-3.png" mode="aspectFill"></image>
-						<view>往来查询</view>
-					</view>
 				</view>
-				<view class="list-li clearfix" v-if="en_token !== aier_en_token" @click="navTo('/pagesT/user/myyhk')">
+			</view>
+		</view>
+		<view class="model-view list-model-view">
+			<view class="model-tit">工具与服务</view>
+			<view class="model-main list-ul new-class">
+				<view class="list-li clearfix" @click="openpop">
+					<view class="fn-icon">
+						<image src="https://api.liuniukj.com/img/user/ic-kf.png" mode="aspectFill"></image>
+						<view>{{ userInfo.salesManName ? '专属客服' : '客服中心' }}</view>
+					</view>
+				</view>
+				<!-- <view class="list-li clearfix" v-if="en_token === aier_en_token" @click="navTo('/pagesT/address/address')">
+					<view class="fn-icon">
+						<image src="https://onlineimg.qianniao.vip/ic-dz.png" mode="aspectFill"></image>
+						<view>我的地址</view>
+					</view>
+				</view> -->
+				<!-- <view class="list-li clearfix" v-if="en_token === aier_en_token" @click="navTo('/pagesT/money/CustomerBalanceDetail')">
 					<view class="fn-icon">
-						<image src="https://onlineimg.qianniao.vip/ix-lj.png" mode="aspectFill"></image>
+						<image src="https://onlineimg.qianniao.vip/ic-3.png" mode="aspectFill"></image>
+						<view>往来查询</view>
+					</view>
+				</view> -->
+				<view class="list-li clearfix" @click="navTo('/pagesT/unit/yhk')">
+					<view class="fn-icon">
+						<image src="https://api.liuniukj.com/img/user/hyk.png" mode="aspectFill"></image>
 						<view>优惠卡</view>
 					</view>
-				</view>
-				<view class="list-li clearfix" v-if="en_token !== aier_en_token" @click="navTo('/pagesT/user/GetCoupon')">
-					<view class="fn-icon">
-						<image src="https://onlineimg.qianniao.vip/ix-lj.png" mode="aspectFill"></image>
-						<view>领券中心</view>
-					</view>
-				</view>
-				<view class="list-li clearfix" v-if="en_token !== aier_en_token" @click="navTo('/pagesT/user/Collection')">
-					<view class="fn-icon">
-						<image src="https://onlineimg.qianniao.vip/ix-order.png" mode="aspectFill"></image>
-						<view>常购清单</view>
-					</view>
-				</view>
-				<view class="list-li clearfix" @click="navTo('/pagesT/user/needSubmit')">
-					<view class="fn-icon">
-						<image src="https://onlineimg.qianniao.vip/ic-xq.png" mode="aspectFill"></image>
-						<view>需求提报</view>
-					</view>
+				</view>
+				<view class="list-li clearfix" @click="navTo('/pagesT/user/GetCoupon')">
+					<view class="fn-icon">
+						<image src="https://api.liuniukj.com/img/user/lqzx.png" mode="aspectFill"></image>
+						<view>领券中心</view>
+					</view>
+				</view>
+				<view class="list-li clearfix" @click="navTo('/pagesT/order/orderT?state=1')">
+					<view class="fn-icon">
+						<image src="https://api.liuniukj.com/img/user/cgqd.png" mode="aspectFill"></image>
+						<view>我的预约</view>
+					</view>
+				</view>
+				<view class="list-li clearfix" @click="navTo('/pagesT/user/needSubmit')">
+					<view class="fn-icon">
+						<image src="https://api.liuniukj.com/img/user/xqtb.png" mode="aspectFill"></image>
+						<view>需求提报</view>
+					</view>
 				</view>
 				<view class="list-li clearfix" @click="navTo('/pagesT/user/guquan')">
 					<view class="fn-icon">
-						<image src="https://onlineimg.qianniao.vip/ic-xq.png" mode="aspectFill"></image>
+						<image src="https://api.liuniukj.com/img/user/gq.png" mode="aspectFill"></image>
 						<view>股权</view>
 					</view>
-				</view>
-				<!-- #ifdef MP -->
-				<view class="list-li">
-					<button class="clearfix share-btn" open-type="share">
-						<view class="fn-icon">
-							<image src="https://onlineimg.qianniao.vip/ix-tj.png" mode="aspectFill"></image>
-							<view class="share">推荐分享</view>
-						</view>
-					</button>
-				</view>
-				<!-- #endif -->
+				</view>
+				<!-- #ifdef MP -->
+				<view class="list-li">
+					<button class="clearfix share-btn" open-type="share">
+						<view class="fn-icon">
+							<image src="https://api.liuniukj.com/img/user/tjfx.png" mode="aspectFill"></image>
+							<view class="share">推荐分享</view>
+						</view>
+					</button>
+				</view>
+				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->
 				<!-- <view class="list-li clearfix"  @click="share">
 					<view class="fn-icon">
 						<image src="https://onlineimg.qianniao.vip/ic-5.png" mode="aspectFill"></image>
 						<view>推荐分享</view>
 					</view>
-				</view> -->
-				<!-- <view class="list-li clearfix" @click="share">
-					<view class="float_left">
-						<view class="fn-icon"><image src="https://onlineimg.qianniao.vip/ic-5.png" mode="aspectFill"></image></view>
-						<text>推荐分享</text>
-					</view>
-					<view class="float_right"><text class="ibonfont ibonjinru"></text></view>
-				</view> -->
-				<!-- #endif -->
-
-				<view class="list-li clearfix" v-if="en_token !== aier_en_token" @click="setUserInfo">
-					<view class="fn-icon">
-						<image src="https://onlineimg.qianniao.vip/ic-sz.png" mode="aspectFill"></image>
-						<view>设置</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<u-modal
-			v-model="tip_model"
-			@confirm="finishCofirm"
-			@cancel="tipCancel"
-			:show-cancel-button="true"
-			content="请先完善资料,再进行购物"
-			confirm-text="去完善"
-			cancel-text="逛逛商城"
-		></u-modal>
-		<Tabbar v-model="current"></Tabbar>
-
-		<u-popup v-model="call_show" width="600rpx" mode="center" border-radius="20">
-			<view class="call-pop">
-				<view class="title">
-					<text>专属客户经理</text>
-					<view class="close-icon" @click="cancalCall"><u-icon name="close" size="28" color="#6c6c6c"></u-icon></view>
-				</view>
-				<view class="call-ul">
-					<view class="call-li">
-						<text class="label">客户经理：</text>
-						<text class="value">{{ userInfo.salesManName }}</text>
-					</view>
-					<view class="call-li">
-						<text class="label">联系方式：</text>
-						<text class="value">{{ userInfo.salesManMobile }}</text>
-					</view>
-				</view>
-				<view class="call-btn primary-btn" @click="lianxi(userInfo.salesManMobile)">一键通话</view>
-			</view>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-import Login from '@/components/Login.vue';
-import uniStatusBar from '@/components/uni-status-bar/uni-status-bar.vue';
-import { getEnToken ,getToken} from '@/access/common.js';
-
-export default {
-	components: {
-		Login,
-		uniStatusBar
-	},
-	// 下拉刷新
-	onPullDownRefresh() {
-		if (this.$store.state.hasLogin) {
-			this.getCustomerInfo();
-			this.getMyVipCards();
-			// 获取分销文字设置
-			this.getTxtSetting();
-			this.getDistributionSetting();
-		} else {
-			uni.stopPullDownRefresh();
-		}
-	},
-	data() {
-		return {
-			tip_model: false,
-			call_show: false,
-			current: 3,
-			distributionSet: {},
-			userInfo: {},
-			avatar: '',
-			vip_data: {},
-			vip_num: 0,
-			// 爱尔
-			aier_en_token: '8ecdecee648713391dc144f29bea5ca7',
-			en_token: getEnToken(),
-			order_num: {}
-		};
-	},
-	watch: {
-		'$store.state.locationObj'(val) {
-			if (JSON.stringify(val) === '{}') {
-				this.getAuthorizeInfo();
-				return;
-			}
-			if (this.$store.state.hasLogin) {
-				this.getCustomerInfo();
-			}
-		},
-		isLogin(val) {
-			if (val) {
-				// 获取用户详情
-				this.getCustomerInfo();
-				// 获取分销文字设置
-				this.getTxtSetting();
-				// 获取分销基础设置
-				this.getDistributionSetting();
-				this.getOrderStatusNum();
-			} else {
-				this.vip_data = {};
-			}
-		}
-	},
-	computed: {
-		// 业代姓名
-		salesManName() {
-			if (this.$store.state.userStatus.salesManName) {
-				return this.$store.state.userStatus.salesManName;
-			} else {
-				return '客服';
-			}
-		},
-		// 门店电话
-		salesManMobile() {
-			if (this.$store.state.userStatus.salesManMobile) {
-				return this.$store.state.userStatus.salesManMobile;
-			} else {
-				return this.$store.state.userStatus.enterpriseMobile;
-			}
-		},
-		// 门店
-		enterpriseName() {
-			return this.$store.state.enterpriseInfo.enterpriseName;
-		},
-		baseSet() {
-			return this.$store.state.baseSet;
-		},
-		enterprisemobile() {
-			return this.$store.state.enterpriseInfo.mobile;
-		},
-		isLogin() {
-			return this.$store.state.hasLogin;
-		},
-		// 客户审核
-		personnelReview() {
-			return this.baseSet.personnelReview;
-		},
-		userStatus() {
-			return this.$store.state.userStatus.status;
-		},
-		enableStatus() {
-			return this.$store.state.userStatus.enableStatus;
-		},
-		// 完善资料 4禁用 5启用
-		finishData() {
-			return this.baseSet.finishData;
-		}
-	},
-	onLoad() {
-		if (JSON.stringify(this.$store.state.locationObj) === '{}') {
-			this.getAuthorizeInfo();
-			return;
-		}
-		if (this.$store.state.hasLogin) {
-			// 获取分销文字设置
-			this.getTxtSetting();
-			// 获取分销基础设置
-			this.getDistributionSetting();
-			// this.avatar = this.$common.getAvator();
-		}
-		// #ifdef MP-WEIXIN
-		// 小程序的原生菜单中显示分享按钮
-		uni.showShareMenu({
-			withShareTicket: false,
-			menus: ['shareAppMessage', 'shareTimeline']
-		});
-		// #endif
-	},
-	onShow() {
-		if (this.$store.state.hasLogin) {
-			// 获取用户详情
-			this.getCustomerInfo();
-			this.getOrderStatusNum();
-		}
-	},
-	methods: {
-		// #ifdef APP-PLUS
-		share() {
-			uni.share({
-				provider: 'weixin',
-				scene: 'WXSceneSession',
-				type: 5,
-				title: this.baseSet.shop,
-				imageUrl: this.baseSet.images,
-				success: function(res) {
-					console.log('success:' + JSON.stringify(res));
-				},
-				fail: function(err) {
-					console.log('fail:' + JSON.stringify(err));
-				}
-			});
-		},
-		// #endif
-		// 设置用户信息
-		setUserInfo() {
-			if (!(this.finishData === 5 && this.userInfo.status !== 2)) {
-				this.navTo('/pagesT/selfconfig/selfconfig');
-			} else {
-				this.navTo('/pagesT/user/editUserInfo');
-			}
-		},
-		loginSuccess() {
-			// this.isLogin = this.$store.state.hasLogin;
-			// this.getCustomerInfo();
-			// this.getMyVipCards();
-		},
-		/**
-		 * 统一跳转接口,拦截未登录路由
-		 * navigator标签现在默认没有转场动画，所以用view
-		 */
-		navTo(url) {
-			// console.log(this.hasLogin)
-			// return
-			if (!this.$store.state.hasLogin) {
-				// #ifdef APP-PLUS
-				uni.reLaunch({
-					url: '/pagesT/public/wxLogin'
-				});
-				// #endif
-				// #ifdef MP-WEIXIN
-				uni.reLaunch({
-					url: '/pagesT/binding/bindInfo'
-				});
-				//#endif
-				// #ifdef H5
-				uni.navigateTo({
-					url: '/pagesT/public/wxLogin?loginType=2'
-				});
-				// #endif
-			} else {
-				uni.navigateTo({
-					url
-				});
-			}
-		},
-		async goDistribution() {
-			if (!this.$store.state.hasLogin) {
-				// #ifdef APP-PLUS || H5
-				uni.reLaunch({
-					url: '/pagesT/public/wxLogin'
-				});
-				// #endif
-				// #ifdef MP-WEIXIN
-				uni.reLaunch({
-					url: '/pagesT/binding/bindInfo'
-				});
-				//#endif
-			} else {
-				if (this.distributionSet.level && this.distributionSet.level > 0) {
-					this.getInfoBusinessman();
-				} else {
-					this.$api.msg('抱歉，当前商家暂未开启分销功能');
-				}
-			}
-		},
-		// 获取文字设置
-		async getTxtSetting() {
-			this.$u.api.getTxtSetting().then(({ data }) => {
-				this.$store.commit('commit_distributionTextSet', data.base_form || {});
-			});
-		},
-		// 获取分销商详情
-		async getInfoBusinessman() {
-			if (this.userInfo.status !== 2) {
-				this.$api.msg('抱歉，您的账号未通过审核');
-				return;
-			}
-			this.$u.api.getInfoBusinessman().then(({ data }) => {
-				if (JSON.stringify(data) === '{}') {
-					// 不是分销商进入申请分销商页面
-					this.goPage('/pagesT/Distribution/ApplyTerm');
-				} else {
-					if (data.auditStatus === 2) {
-						// 进入分销中心页面
-						this.goPage('/pagesT/Distribution/Distribution');
-					} else {
-						this.goPage('/pagesT/Distribution/ApplyAudit?auditStatus=1&applicationCondition=' + data.applicationCondition);
-					}
-				}
-			});
-		},
-		getDistributionSetting() {
-			this.$u.api.getDistributionSetting().then(({ data }) => {
-				this.$store.commit('commit_distributionSet', data);
-				this.distributionSet = data;
-			});
-		},
-		// 获取我的会员卡
-		getMyVipCards() {
-			this.$u.api
-				.getMyVipCards({
-					page: 1,
-					pageSize: 1
-				})
-				.then(({ data, pageTotal }) => {
-					if (data.length) {
-						this.vip_num = pageTotal;
-						this.vip_data = {
-							...data[0],
-							isSelf: true
-						};
-					} else {
-						this.getAllVipCard();
-					}
-				});
-		},
-		// 获取会员列表
-		getAllVipCard() {
-			this.$u.api
-				.getAllVipCard({
-					page: 1,
-					pageSize: 1
-				})
-				.then(({ data }) => {
-					if (data.length) {
-						this.vip_data = data[0];
-					}
-				});
-		},
-		//用户订单状态数量统计
-		getOrderStatusNum() {
-			this.$u.api.getOrderStatusNum().then(res => {
-				this.order_num = res.data;
-			});
-		},
-		// 获取用户信息
-		getCustomerInfo() {
-			this.$u.api.getCustomerInfo().then(({ data }) => {
-				uni.stopPullDownRefresh();
-				this.userInfo = data;
-				if (this.userInfo.status === 2) {
-					this.getMyVipCards();
-				}
-				this.$store.commit('commit_userStatus', data);
-				if (this.baseSet.finishDataGo && data.status === 0) {
-					this.tip_model = true;
-				}
-			});
-		},
-		// 联系客服
-		async lianxi(phone) {
-			this.cancalCall();
-			uni.makePhoneCall({
-				phoneNumber: phone || this.enterprisemobile
-			});
-		},
-		cancalCall() {
-			this.call_show = false;
-		},
-		openpop() {
-			if (this.userInfo.salesManName) {
-				this.call_show = true;
-			} else {
-				this.lianxi(this.enterprisemobile);
-			}
-		},
-		// 完善资料提示取消
-		tipCancel() {
-			this.tip_model = false;
-		},
-		// 跳转完善资料页面
-		finishCofirm() {
-			this.goPage('/pagesT/user/editUserInfo');
-		}
-	},
-	onShareAppMessage(options) {
-		return {
-			title: this.$store.state.baseSet.shop,
-			path: '/pages/index/index?businessmanId=' + (this.$store.state.userStatus.id || ''),
-			success: res => {
-				console.log(res);
-			}
-		};
-	},
-	// #ifdef MP-WEIXIN
-	// 分享到朋友圈
-	onShareTimeline(obj) {},
-	// 收藏小程序
-	onAddToFavorites() {}
-	// #endif
-};
-</script>
-
-<style lang="scss">
-page {
-	background-color: #ffffff;
-}
-
-.user-index {
-	overflow-x: hidden;
-	width: 750upx;
-}
-
-.user-top {
-	color: #ffffff;
-	position: relative;
-	width: 100%;
-	height: 418rpx;
-	overflow: hidden;
-
-	.circle-big {
-		content: '';
-		display: block;
-		width: 180%;
-		height: 418rpx;
-		position: absolute;
-		left: 50%;
-		transform: translateX(-50%);
-		top: 0;
-		overflow: hidden;
-		border-radius: 0 0 50% 50%;
-		background: linear-gradient(156deg, #ff6b2c 0%, #ec2723 100%);
-
-		.circle-one {
-			position: absolute;
-			top: 0;
-			left: 20%;
-			border-bottom-right-radius: 100%;
-			width: 557rpx;
-			height: 60rpx;
-			background: linear-gradient(180deg, rgba(255, 60, 58, 0.62) 10%, #ff6d2f 100%);
-		}
-
-		.circle-two {
-			width: 155rpx;
-			height: 155rpx;
-			background: linear-gradient(211deg, #ff8d33 0%, #ff633b 62%);
-			border-radius: 100%;
-			position: absolute;
-			bottom: -12rpx;
-			left: 19%;
-		}
-
-		.vip-view {
-			width: 670upx;
-			padding: 26rpx 40rpx;
-			height: 98rpx;
-			border-radius: 15rpx;
-			background: linear-gradient(90deg, #8e0e15 0%, #550609 100%);
-			border-top: 4rpx solid rgba(255, 219, 153, 1);
-			color: #ffe285;
-			z-index: 1;
-			position: absolute;
-			bottom: 0;
-			left: 50%;
-			transform: translateX(-50%);
-			overflow: hidden;
-
-			.vip-name {
-				display: inline-block;
-				font-size: 32rpx;
-				font-weight: 500;
-			}
-
-			.desc {
-				font-size: 28rpx;
-				font-weight: 400;
-				margin-left: 16rpx;
-				display: inline-block;
-			}
-
-			.vip-btn {
-				width: 140rpx;
-				font-size: 24rpx;
-				font-weight: 400;
-				height: 42rpx;
-				background: linear-gradient(90deg, #ffbf59 0%, #ff3b2d 100%);
-				border-radius: 21rpx;
-				color: #ffefc5;
-				text-align: center;
-				line-height: 42rpx;
-			}
-		}
-	}
-
-	.user-info {
-		padding: 0 40rpx;
-		padding-top: 80rpx;
-		position: relative;
-		z-index: 9;
-
-		.ui-img {
-			border-radius: 100%;
-			border: 4upx solid #ffffff;
-			position: relative;
-
-			.edit-bth {
-				position: absolute;
-				width: 86rpx;
-				height: 32rpx;
-				background: #b620e0;
-				border-radius: 16rpx;
-				text-align: center;
-				font-size: 20rpx;
-				line-height: 32rpx;
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: -8rpx;
-			}
-		}
-
-		.right-icon {
-			text-align: center;
-			padding-top: 22rpx;
-
-			.ibonfont {
-				font-size: 40rpx;
-			}
-
-			.text {
-				font-size: 20rpx;
-				font-weight: 400;
-				color: #ffffff;
-				line-height: 28rpx;
-				margin-top: 9rpx;
-			}
-		}
-
-		.user-name {
-			font-size: 32upx;
-			padding-left: 10upx;
-			margin-top: 14rpx;
-			width: 450rpx;
-
-			.login-btn {
-				color: #fff;
-				font-size: 32rpx;
-				width: 100%;
-				text-align: left;
-			}
-
-			.un-text {
-				-webkit-line-clamp: 1;
-			}
-
-			.un-text-desc {
-				float: left;
-				font-size: 20upx;
-				margin-top: 12rpx;
-				width: 120rpx;
-				height: 36rpx;
-				line-height: 36rpx;
-				text-align: center;
-				background: rgba(255, 139, 130, 0.38);
-				border-radius: 18rpx;
-			}
-
-			.ulogin-bth {
-				text-align: left;
-				height: 46upx;
-				line-height: 46upx;
-				border-radius: 46upx;
-				padding: 0;
-				color: #ffffff;
-				float: left;
-				background-color: transparent;
-				margin-top: 20upx;
-
-				&::after {
-					border: 0 none;
-				}
-			}
-		}
-	}
-}
-
-.num-view {
-	display: flex;
-	padding-bottom: 10upx;
-	border-bottom: 16rpx solid #f9f9f9;
-	padding: 30rpx 0;
-
-	.num-li {
-		flex: 4;
-		text-align: center;
-		position: relative;
-
-		.num-text {
-			font-size: 32upx;
-			font-weight: 600;
-			padding-bottom: 10upx;
-			font-family: DIN-Medium;
-		}
-
-		.num-tit {
-			font-size: 24upx;
-			font-weight: 400;
-		}
-
-		&::after {
-			content: '';
-			display: block;
-			position: absolute;
-			width: 1px;
-			height: 40upx;
-			background-color: #ffffff;
-			right: 0;
-			top: 50%;
-			transform: translateY(-50%);
-		}
-	}
-
-	.num-li:last-child {
-		&::after {
-			background-color: transparent;
-		}
-	}
-}
-
-.model-view {
-	border-bottom: 16rpx solid #f9f9f9;
-	border-radius: 12upx;
-	padding-bottom: 40upx;
-	background-color: #ffffff;
-	position: relative;
-	z-index: 1;
-
-	.information-bottom {
-		// width: 750rpx;
-		height: 100rpx;
-		text-align: center;
-		padding-left: 48rpx;
-
-		.ul-list {
-			display: flex;
-			flex-wrap: wrap;
-			margin-top: 32rpx;
-
-			.ul-item {
-				text-align: left;
-				width: 50%;
-				-webkit-line-clamp: 1;
-
-				&:nth-child(3),
-				&:nth-child(4) {
-					margin-top: 24rpx;
-				}
-
-				.left {
-					font-size: 24rpx;
-					line-height: 33rpx;
-					color: #9d9d9d;
-					font-weight: 500;
-				}
-
-				.right {
-					font-size: 24rpx;
-					line-height: 33rpx;
-					color: #000000;
-					font-weight: 600;
-				}
-
-				.right-last {
-					color: #fa6400;
-					font-weight: 600;
-				}
-			}
-		}
-	}
-
-	// 负责信息
-	.information-top {
-		// width:750rpx ;
-		height: 72rpx;
-		background: url(https://onlineimg.qianniao.vip/bck.png) no-repeat;
-		background-position: -24rpx 0, 0 0;
-		background-size: 800rpx 99rpx;
-		padding-top: 17rpx;
-
-		.img {
-			display: inline-block;
-			width: 33rpx;
-			height: 33rpx;
-			vertical-align: middle;
-			margin-left: 56rpx;
-		}
-
-		.text {
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #2a2a2a;
-			line-height: 45rpx;
-			vertical-align: middle;
-			display: inline-block;
-			margin-left: 6rpx;
-		}
-	}
-
-	.model-tit {
-		padding: 32upx;
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #000000;
-
-		.float_right {
-			font-size: 28upx;
-			color: #9d9d9d;
-			font-weight: 400;
-
-			.ibonjinru {
-				margin-left: 10upx;
-				font-size: 24upx;
-			}
-		}
-	}
-
-	.list-ul {
-		padding: 0 30upx;
-		display: flex;
-		flex-wrap: wrap;
-
-		.list-li {
-			line-height: 90upx;
-			font-size: 28upx;
-			color: #2a2a2a;
-			width: 25%;
-			text-align: center;
-			.fn-icon {
-				// margin-right: 24upx;
-				// display: inline-block;
-				text-align: center;
-
-				.share {
-					line-height: 95rpx;
-					padding-left: 8rpx;
-				}
-
-				image {
-					width: 89rpx;
-					height: 89rpx;
-					vertical-align: middle;
-					transform: translateY(3rpx); // width: 50upx;
-					// height: 50upx;
-					// vertical-align: middle;
-					// transform: translateY(-2upx);
-				}
-			}
-
-			.ibonjinru {
-				font-size: 28upx;
-				color: #9d9d9d;
-			}
-
-			.share-btn {
-				background-color: #ffffff;
-				font-size: 28rpx;
-				padding-left: 0;
-				padding-right: 0;
-				padding-top: 2rpx;
-				text-align: left;
-				color: #2a2a2a;
-			}
-		}
-	}
-
-	.fn-ul {
-		display: flex;
-		flex-wrap: wrap;
-
-		.fn-li {
-			width: 25%;
-			flex-grow: 1;
-			text-align: center;
-			font-size: 26upx;
-			margin-top: 16upx;
-
-			.fn-label {
-				color: #6a6a6a;
-				font-size: 26rpx;
-			}
-
-			.fn-icon {
-				image {
-					width: 70upx;
-					height: 70upx;
-				}
-
-				.ibonfont {
-					color: #000000;
-					font-size: 50upx;
-					padding-bottom: 10upx;
-					display: inline-block;
-				}
-			}
-		}
-	}
-
-	.order-ul {
-		.fn-li {
-			width: 20%;
-			position: relative;
-			.fn-icon {
-				image {
-					width: 64upx;
-					height: 64upx;
-					margin-bottom: 10rpx;
-				}
-			}
-		}
-	}
-}
-
-.list-model-view {
-	margin-bottom: 0;
-	border-bottom: 0;
-	padding-bottom: 0;
-}
-
-.call-pop {
-	.title {
-		text-align: center;
-		padding: 0 30rpx;
-		line-height: 90rpx;
-		height: 90rpx;
-		font-weight: bold;
-		position: relative;
-
-		.close-icon {
-			position: absolute;
-			font-weight: normal;
-			right: 30rpx;
-			top: 50%;
-			transform: translateY(-50%);
-		}
-	}
-
-	.call-ul {
-		padding: 0 30rpx 30rpx;
-
-		.call-li {
-			line-height: 80rpx;
-			height: 80rpx;
-		}
-	}
-
-	.call-btn {
-		width: 100%;
-		line-height: 80rpx;
-		height: 80rpx;
-		text-align: center;
-	}
-}
+				</view> -->
+				<!-- <view class="list-li clearfix" @click="share">
+					<view class="float_left">
+						<view class="fn-icon"><image src="https://onlineimg.qianniao.vip/ic-5.png" mode="aspectFill"></image></view>
+						<text>推荐分享</text>
+					</view>
+					<view class="float_right"><text class="ibonfont ibonjinru"></text></view>
+				</view> -->
+				<!-- #endif -->
+
+				<view class="list-li clearfix" v-if="en_token !== aier_en_token" @click="setUserInfo">
+					<view class="fn-icon">
+						<image src="https://api.liuniukj.com/img/user/sz.png" mode="aspectFill"></image>
+						<view>设置</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-modal v-model="show_change_name" @confirm="nameCofirm" @cancel="nameCancel" :show-cancel-button="true"
+			content="您的昵称为小程序默认昵称,是否立即修改" confirm-text="去修改" cancel-text="下次再说"></u-modal>
+		<u-modal v-model="tip_model" @confirm="finishCofirm" @cancel="tipCancel" :show-cancel-button="true"
+			content="请先完善资料,再进行购物" confirm-text="去完善" cancel-text="逛逛商城"></u-modal>
+		<Tabbar v-model="current"></Tabbar>
+
+		<u-popup v-model="call_show" width="600rpx" mode="center" border-radius="20">
+			<view class="call-pop">
+				<view class="title">
+					<text>专属客户经理</text>
+					<view class="close-icon" @click="cancalCall">
+						<u-icon name="close" size="28" color="#6c6c6c"></u-icon>
+					</view>
+				</view>
+				<view class="call-ul">
+					<view class="call-li">
+						<text class="label">客户经理：</text>
+						<text class="value">{{ userInfo.salesManName }}</text>
+					</view>
+					<view class="call-li">
+						<text class="label">联系方式：</text>
+						<text class="value">{{ userInfo.salesManMobile }}</text>
+					</view>
+				</view>
+				<view class="call-btn primary-btn" @click="lianxi(userInfo.salesManMobile)">一键通话</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import Login from '@/components/Login.vue';
+	import uniStatusBar from '@/components/uni-status-bar/uni-status-bar.vue';
+	import {
+		getEnToken,
+		getToken
+	} from '@/access/common.js';
+
+	export default {
+		components: {
+			Login,
+			uniStatusBar
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			if (this.$store.state.hasLogin) {
+				this.getCustomerInfo();
+				this.getMyVipCards();
+				// 获取分销文字设置
+				this.getTxtSetting();
+				this.getDistributionSetting();
+			} else {
+				uni.stopPullDownRefresh();
+			}
+		},
+		data() {
+			return {
+				tip_model: false,
+				show_change_name: false,
+				call_show: false,
+				current: 3,
+				distributionSet: {},
+				userInfo: {},
+				avatar: '',
+				vip_data: {},
+				vip_num: 0,
+				// 爱尔
+				aier_en_token: '8ecdecee648713391dc144f29bea5ca7',
+				en_token: getEnToken(),
+				order_num: {}
+			};
+		},
+		watch: {
+			'$store.state.locationObj'(val) {
+				if (JSON.stringify(val) === '{}') {
+					this.getAuthorizeInfo();
+					return;
+				}
+				if (this.$store.state.hasLogin) {
+					this.getCustomerInfo();
+				}
+			},
+			isLogin(val) {
+				if (val) {
+					// 获取用户详情
+					this.getCustomerInfo();
+					// 获取分销文字设置
+					this.getTxtSetting();
+					// 获取分销基础设置
+					this.getDistributionSetting();
+					this.getOrderStatusNum();
+				} else {
+					this.vip_data = {};
+				}
+			}
+		},
+		computed: {
+			// 业代姓名
+			salesManName() {
+				if (this.$store.state.userStatus.salesManName) {
+					return this.$store.state.userStatus.salesManName;
+				} else {
+					return '客服';
+				}
+			},
+			// 门店电话
+			salesManMobile() {
+				if (this.$store.state.userStatus.salesManMobile) {
+					return this.$store.state.userStatus.salesManMobile;
+				} else {
+					return this.$store.state.userStatus.enterpriseMobile;
+				}
+			},
+			// 门店
+			enterpriseName() {
+				return this.$store.state.enterpriseInfo.enterpriseName;
+			},
+			baseSet() {
+				return this.$store.state.baseSet;
+			},
+			enterprisemobile() {
+				return this.$store.state.enterpriseInfo.mobile;
+			},
+			isLogin() {
+				return this.$store.state.hasLogin;
+			},
+			// 客户审核
+			personnelReview() {
+				return this.baseSet.personnelReview;
+			},
+			userStatus() {
+				return this.$store.state.userStatus.status;
+			},
+			enableStatus() {
+				return this.$store.state.userStatus.enableStatus;
+			},
+			// 完善资料 4禁用 5启用
+			finishData() {
+				return this.baseSet.finishData;
+			}
+		},
+		onLoad() {
+			if (JSON.stringify(this.$store.state.locationObj) === '{}') {
+				this.getAuthorizeInfo();
+				return;
+			}
+			if (this.$store.state.hasLogin) {
+				// 获取分销文字设置
+				this.getTxtSetting();
+				// 获取分销基础设置
+				this.getDistributionSetting();
+				// this.avatar = this.$common.getAvator();
+			}
+			// #ifdef MP-WEIXIN
+			// 小程序的原生菜单中显示分享按钮
+			uni.showShareMenu({
+				withShareTicket: false,
+				menus: ['shareAppMessage', 'shareTimeline']
+			});
+			// #endif
+		},
+		onShow() {
+			if (this.$store.state.hasLogin) {
+				// 获取用户详情
+				this.getCustomerInfo();
+				this.getOrderStatusNum();
+			}
+		},
+		methods: {
+			// #ifdef APP-PLUS
+			share() {
+				uni.share({
+					provider: 'weixin',
+					scene: 'WXSceneSession',
+					type: 5,
+					title: this.baseSet.shop,
+					imageUrl: this.baseSet.images,
+					success: function(res) {
+						console.log('success:' + JSON.stringify(res));
+					},
+					fail: function(err) {
+						console.log('fail:' + JSON.stringify(err));
+					}
+				});
+			},
+			// #endif
+			// 设置用户信息
+			setUserInfo() {
+				if (!(this.finishData === 5 && this.userInfo.status !== 2)) {
+					this.navTo('/pagesT/selfconfig/selfconfig');
+				} else {
+					this.navTo('/pagesT/user/editUserInfo');
+				}
+			},
+			loginSuccess() {
+				// this.isLogin = this.$store.state.hasLogin;
+				// this.getCustomerInfo();
+				// this.getMyVipCards();
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				// console.log(this.hasLogin)
+				// return
+				if (!this.$store.state.hasLogin) {
+					// #ifdef APP-PLUS
+					uni.reLaunch({
+						url: '/pagesT/public/wxLogin'
+					});
+					// #endif
+					// #ifdef MP-WEIXIN
+					uni.reLaunch({
+						url: '/pagesT/binding/bindInfo'
+					});
+					//#endif
+					// #ifdef H5
+					uni.navigateTo({
+						url: '/pagesT/public/wxLogin?loginType=2'
+					});
+					// #endif
+				} else {
+					uni.navigateTo({
+						url
+					});
+				}
+			},
+			async goDistribution() {
+				if (!this.$store.state.hasLogin) {
+					// #ifdef APP-PLUS || H5
+					uni.reLaunch({
+						url: '/pagesT/public/wxLogin'
+					});
+					// #endif
+					// #ifdef MP-WEIXIN
+					uni.reLaunch({
+						url: '/pagesT/binding/bindInfo'
+					});
+					//#endif
+				} else {
+					if (this.distributionSet.level && this.distributionSet.level > 0) {
+						this.getInfoBusinessman();
+					} else {
+						this.$api.msg('抱歉，当前商家暂未开启分销功能');
+					}
+				}
+			},
+			// 获取文字设置
+			async getTxtSetting() {
+				this.$u.api.getTxtSetting().then(({
+					data
+				}) => {
+					this.$store.commit('commit_distributionTextSet', data.base_form || {});
+				});
+			},
+			// 获取分销商详情
+			async getInfoBusinessman() {
+				if (this.userInfo.status !== 2) {
+					this.$api.msg('抱歉，您的账号未通过审核');
+					return;
+				}
+				this.$u.api.getInfoBusinessman().then(({
+					data
+				}) => {
+					if (JSON.stringify(data) === '{}') {
+						// 不是分销商进入申请分销商页面
+						this.goPage('/pagesT/Distribution/ApplyTerm');
+					} else {
+						if (data.auditStatus === 2) {
+							// 进入分销中心页面
+							this.goPage('/pagesT/Distribution/Distribution');
+						} else {
+							this.goPage('/pagesT/Distribution/ApplyAudit?auditStatus=1&applicationCondition=' +
+								data.applicationCondition);
+						}
+					}
+				});
+			},
+			getDistributionSetting() {
+				this.$u.api.getDistributionSetting().then(({
+					data
+				}) => {
+					this.$store.commit('commit_distributionSet', data);
+					this.distributionSet = data;
+				});
+			},
+			// 获取我的会员卡
+			getMyVipCards() {
+				this.$u.api
+					.getMyVipCards({
+						page: 1,
+						pageSize: 1
+					})
+					.then(({
+						data,
+						pageTotal
+					}) => {
+						if (data.length) {
+							this.vip_num = pageTotal;
+							this.vip_data = {
+								...data[0],
+								isSelf: true
+							};
+						} else {
+							this.getAllVipCard();
+						}
+					});
+			},
+			// 获取会员列表
+			getAllVipCard() {
+				this.$u.api
+					.getAllVipCard({
+						page: 1,
+						pageSize: 1
+					})
+					.then(({
+						data
+					}) => {
+						if (data.length) {
+							this.vip_data = data[0];
+						}
+					});
+			},
+			//用户订单状态数量统计
+			getOrderStatusNum() {
+				this.$u.api.getOrderStatusNum().then(res => {
+					this.order_num = res.data;
+				});
+			},
+			// 获取用户信息
+			getCustomerInfo() {
+				this.$u.api.getCustomerInfo().then(({
+					data
+				}) => {
+					uni.stopPullDownRefresh();
+					this.userInfo = data;
+					if (this.userInfo.status === 2) {
+						this.getMyVipCards();
+					}
+					this.$store.commit('commit_userStatus', data);
+					if (this.baseSet.finishDataGo && data.status === 0) {
+						this.tip_model = true;
+					}
+					if (this.userInfo.name == '微信用户') {
+						let show = uni.getStorageSync('showchangename')
+						if(show != 1) {
+							this.show_change_name = true
+						}
+					}
+				});
+			},
+			// 联系客服
+			async lianxi(phone) {
+				this.cancalCall();
+				uni.makePhoneCall({
+					phoneNumber: phone || this.enterprisemobile
+				});
+			},
+			cancalCall() {
+				this.call_show = false;
+			},
+			openpop() {
+				if (this.userInfo.salesManName) {
+					this.call_show = true;
+				} else {
+					this.lianxi(this.enterprisemobile);
+				}
+			},
+			// 完善资料提示取消
+			tipCancel() {
+				this.tip_model = false;
+			},
+			nameCancel() {
+				uni.setStorageSync('showchangename',1)
+				this.show_change_name = false;
+				
+			},
+			// 跳转完善资料页面
+			finishCofirm() {
+				this.goPage('/pagesT/user/editUserInfo');
+			},
+			nameCofirm() {
+				uni.setStorageSync('showchangename',1)
+				this.goPage('/pagesT/selfconfig/selfconfig');
+			},
+			
+		},
+		onShareAppMessage(options) {
+			return {
+				title: this.$store.state.baseSet.shop,
+				path: '/pages/index/index?businessmanId=' + (this.$store.state.userStatus.id || ''),
+				success: res => {
+					console.log(res);
+				}
+			};
+		},
+		// #ifdef MP-WEIXIN
+		// 分享到朋友圈
+		onShareTimeline(obj) {},
+		// 收藏小程序
+		onAddToFavorites() {}
+		// #endif
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #ffffff;
+	}
+
+	.user-index {
+		overflow-x: hidden;
+		width: 750upx;
+	}
+
+	.user-top {
+		color: #ffffff;
+		position: relative;
+		width: 100%;
+		height: 418rpx;
+		overflow: hidden;
+
+		.circle-big {
+			content: '';
+			display: block;
+			width: 180%;
+			height: 418rpx;
+			position: absolute;
+			left: 50%;
+			transform: translateX(-50%);
+			top: 0;
+			overflow: hidden;
+			border-radius: 0 0 50% 50%;
+			background: linear-gradient(156deg, #ff6b2c 0%, #ec2723 100%);
+
+			.circle-one {
+				position: absolute;
+				top: 0;
+				left: 20%;
+				border-bottom-right-radius: 100%;
+				width: 557rpx;
+				height: 60rpx;
+				background: linear-gradient(180deg, rgba(255, 60, 58, 0.62) 10%, #ff6d2f 100%);
+			}
+
+			.circle-two {
+				width: 155rpx;
+				height: 155rpx;
+				background: linear-gradient(211deg, #ff8d33 0%, #ff633b 62%);
+				border-radius: 100%;
+				position: absolute;
+				bottom: -12rpx;
+				left: 19%;
+			}
+
+			.vip-view {
+				width: 670upx;
+				padding: 26rpx 40rpx;
+				height: 98rpx;
+				border-radius: 15rpx;
+				background: linear-gradient(90deg, #8e0e15 0%, #550609 100%);
+				border-top: 4rpx solid rgba(255, 219, 153, 1);
+				color: #ffe285;
+				z-index: 1;
+				position: absolute;
+				bottom: 0;
+				left: 50%;
+				transform: translateX(-50%);
+				overflow: hidden;
+
+				.vip-name {
+					display: inline-block;
+					font-size: 32rpx;
+					font-weight: 500;
+				}
+
+				.desc {
+					font-size: 28rpx;
+					font-weight: 400;
+					margin-left: 16rpx;
+					display: inline-block;
+				}
+
+				.vip-btn {
+					width: 140rpx;
+					font-size: 24rpx;
+					font-weight: 400;
+					height: 42rpx;
+					background: linear-gradient(90deg, #ffbf59 0%, #ff3b2d 100%);
+					border-radius: 21rpx;
+					color: #ffefc5;
+					text-align: center;
+					line-height: 42rpx;
+				}
+			}
+		}
+
+		.user-info {
+			padding: 0 40rpx;
+			padding-top: 80rpx;
+			position: relative;
+			z-index: 9;
+
+			.ui-img {
+				border-radius: 100%;
+				border: 4upx solid #ffffff;
+				position: relative;
+
+				.edit-bth {
+					position: absolute;
+					width: 86rpx;
+					height: 32rpx;
+					background: #b620e0;
+					border-radius: 16rpx;
+					text-align: center;
+					font-size: 20rpx;
+					line-height: 32rpx;
+					left: 50%;
+					transform: translateX(-50%);
+					bottom: -8rpx;
+				}
+			}
+
+			.right-icon {
+				text-align: center;
+				padding-top: 22rpx;
+
+				.ibonfont {
+					font-size: 40rpx;
+				}
+
+				.text {
+					font-size: 20rpx;
+					font-weight: 400;
+					color: #ffffff;
+					line-height: 28rpx;
+					margin-top: 9rpx;
+				}
+			}
+
+			.user-name {
+				font-size: 32upx;
+				padding-left: 10upx;
+				margin-top: 14rpx;
+				width: 450rpx;
+
+				.login-btn {
+					color: #fff;
+					font-size: 32rpx;
+					width: 100%;
+					text-align: left;
+				}
+
+				.un-text {
+					-webkit-line-clamp: 1;
+				}
+
+				.un-text-desc {
+					float: left;
+					font-size: 20upx;
+					margin-top: 12rpx;
+					width: 120rpx;
+					height: 36rpx;
+					line-height: 36rpx;
+					text-align: center;
+					background: rgba(255, 139, 130, 0.38);
+					border-radius: 18rpx;
+				}
+
+				.ulogin-bth {
+					text-align: left;
+					height: 46upx;
+					line-height: 46upx;
+					border-radius: 46upx;
+					padding: 0;
+					color: #ffffff;
+					float: left;
+					background-color: transparent;
+					margin-top: 20upx;
+
+					&::after {
+						border: 0 none;
+					}
+				}
+			}
+		}
+	}
+
+	.num-view {
+		display: flex;
+		padding-bottom: 10upx;
+		border-bottom: 16rpx solid #f9f9f9;
+		padding: 30rpx 0;
+
+		.num-li {
+			flex: 4;
+			text-align: center;
+			position: relative;
+
+			.num-text {
+				font-size: 32upx;
+				font-weight: 600;
+				padding-bottom: 10upx;
+				font-family: DIN-Medium;
+			}
+
+			.num-tit {
+				font-size: 24upx;
+				font-weight: 400;
+			}
+
+			&::after {
+				content: '';
+				display: block;
+				position: absolute;
+				width: 1px;
+				height: 40upx;
+				background-color: #ffffff;
+				right: 0;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+
+		.num-li:last-child {
+			&::after {
+				background-color: transparent;
+			}
+		}
+	}
+
+	.model-view {
+		border-bottom: 16rpx solid #f9f9f9;
+		border-radius: 12upx;
+		padding-bottom: 40upx;
+		background-color: #ffffff;
+		position: relative;
+		z-index: 1;
+
+		.information-bottom {
+			// width: 750rpx;
+			height: 100rpx;
+			text-align: center;
+			padding-left: 48rpx;
+
+			.ul-list {
+				display: flex;
+				flex-wrap: wrap;
+				margin-top: 32rpx;
+
+				.ul-item {
+					text-align: left;
+					width: 50%;
+					-webkit-line-clamp: 1;
+
+					&:nth-child(3),
+					&:nth-child(4) {
+						margin-top: 24rpx;
+					}
+
+					.left {
+						font-size: 24rpx;
+						line-height: 33rpx;
+						color: #9d9d9d;
+						font-weight: 500;
+					}
+
+					.right {
+						font-size: 24rpx;
+						line-height: 33rpx;
+						color: #000000;
+						font-weight: 600;
+					}
+
+					.right-last {
+						color: #fa6400;
+						font-weight: 600;
+					}
+				}
+			}
+		}
+
+		// 负责信息
+		.information-top {
+			// width:750rpx ;
+			height: 72rpx;
+			background: url(https://onlineimg.qianniao.vip/bck.png) no-repeat;
+			background-position: -24rpx 0, 0 0;
+			background-size: 800rpx 99rpx;
+			padding-top: 17rpx;
+
+			.img {
+				display: inline-block;
+				width: 33rpx;
+				height: 33rpx;
+				vertical-align: middle;
+				margin-left: 56rpx;
+			}
+
+			.text {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #2a2a2a;
+				line-height: 45rpx;
+				vertical-align: middle;
+				display: inline-block;
+				margin-left: 6rpx;
+			}
+		}
+
+		.model-tit {
+			padding: 32upx;
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #000000;
+
+			.float_right {
+				font-size: 28upx;
+				color: #9d9d9d;
+				font-weight: 400;
+
+				.ibonjinru {
+					margin-left: 10upx;
+					font-size: 24upx;
+				}
+			}
+		}
+
+		.list-ul {
+			padding: 0 30upx;
+			display: flex;
+			flex-wrap: wrap;
+
+			.list-li {
+				line-height: 90upx;
+				font-size: 28upx;
+				color: #2a2a2a;
+				width: 25%;
+				text-align: center;
+
+				.fn-icon {
+					// margin-right: 24upx;
+					// display: inline-block;
+					text-align: center;
+
+					.share {
+						line-height: 95rpx;
+						padding-left: 8rpx;
+					}
+
+					image {
+						width: 89rpx;
+						height: 89rpx;
+						vertical-align: middle;
+						transform: translateY(3rpx); // width: 50upx;
+						// height: 50upx;
+						// vertical-align: middle;
+						// transform: translateY(-2upx);
+					}
+				}
+
+				.ibonjinru {
+					font-size: 28upx;
+					color: #9d9d9d;
+				}
+
+				.share-btn {
+					background-color: #ffffff;
+					font-size: 28rpx;
+					padding-left: 0;
+					padding-right: 0;
+					padding-top: 2rpx;
+					text-align: left;
+					color: #2a2a2a;
+				}
+			}
+		}
+
+		.fn-ul {
+			display: flex;
+			flex-wrap: wrap;
+
+			.fn-li {
+				width: 25%;
+				flex-grow: 1;
+				text-align: center;
+				font-size: 26upx;
+				margin-top: 16upx;
+
+				.fn-label {
+					color: #6a6a6a;
+					font-size: 26rpx;
+				}
+
+				.fn-icon {
+					image {
+						width: 70upx;
+						height: 70upx;
+					}
+
+					.ibonfont {
+						color: #000000;
+						font-size: 50upx;
+						padding-bottom: 10upx;
+						display: inline-block;
+					}
+				}
+			}
+		}
+
+		.order-ul {
+			.fn-li {
+				width: 20%;
+				position: relative;
+
+				.fn-icon {
+					image {
+						width: 64upx;
+						height: 64upx;
+						margin-bottom: 10rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.list-model-view {
+		margin-bottom: 0;
+		border-bottom: 0;
+		padding-bottom: 0;
+	}
+
+	.call-pop {
+		.title {
+			text-align: center;
+			padding: 0 30rpx;
+			line-height: 90rpx;
+			height: 90rpx;
+			font-weight: bold;
+			position: relative;
+
+			.close-icon {
+				position: absolute;
+				font-weight: normal;
+				right: 30rpx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+
+		.call-ul {
+			padding: 0 30rpx 30rpx;
+
+			.call-li {
+				line-height: 80rpx;
+				height: 80rpx;
+			}
+		}
+
+		.call-btn {
+			width: 100%;
+			line-height: 80rpx;
+			height: 80rpx;
+			text-align: center;
+		}
+	}
 </style>

pagesT/binding/bindPhone.vue

@@ -11,15 +11,15 @@
 			<block v-if="login_type === 1">
 				<image src="https://onlineimg.qianniao.vip/login-img.jpg" mode="aspectFill"></image>
 				<view class="login-btn-view"><button class="wx-Btn primary-bg" open-type="getPhoneNumber" @getphonenumber="getphonenumber">一键授权登录</button></view>
-				<view class="wx-change-btn" @click="login_type = 2">
+				<!-- <view class="wx-change-btn" @click="login_type = 2">
 					<text class="ibonfont ibonshouji1 wxicon" style="transform: translateY(-4rpx);display: inline-block;"></text>
 					短信验证登录
-				</view>
+				</view> -->
 			</block>
 			<block v-if="login_type === 2">
 				<view class="tab-ul">
 					<view class="tab-li" @click="login_type = 1">微信快捷登录</view>
-					<view class="tab-on">手机验证登录</view>
+					<!-- <view class="tab-on">手机验证登录</view> -->
 				</view>
 				<view class="input-ul">
 					<view class="input-li">

pagesT/money/addWithdrawal.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 申请提现 -->
 	<view class="Withdrawal" :class="['qn-page-' + theme]">
-		<view class="w-view w-channel clearfix" @click="openPay">
+		<view class="w-view w-channel clearfix" @click="openPay" v-if="shenhe == 1">
 			<view class="float_left">转出方式</view>
 			<view class="float_right">
 				<text v-if="cash_out_form.reflectType">{{ cash_out_form.reflectType }}</text>
@@ -124,14 +124,21 @@ export default {
 				remark: ''
 			},
 			agin_card_num: '', //确认卡号
-			userInfo: {}
+			userInfo: {},
+			shenhe: 0,//1->审核中 0->已过审
 		};
 	},
 
 	onShow() {
 		this.getCustomerInfo();
+		this.getSh()
 	},
 	methods: {
+		getSh() {
+			this.$u.api.getSh().then(({data})=> {
+				this.shenhe = data
+			})
+		},
 		// 获取用户信息
 		getCustomerInfo() {
 			this.$u.api.getCustomerInfo().then(({ data }) => {

pagesT/money/paySuccess.vue

@@ -5,8 +5,8 @@
 
 		<view class="btn-group">
 			<navigator url="/pagesT/order/order?state=0" open-type="redirect" class="mix-btn primary-btn" v-if="isyy == 0 && isyhk == 0">查看订单</navigator>
-			<navigator url="/pagesT/order/order?state=0" open-type="redirect" class="mix-btn primary-btn" v-if="isyhk == 1">查看优惠卡</navigator>
-			<navigator url="/pagesT/order/order?state=0" open-type="redirect" class="mix-btn primary-btn" v-if="isyy == 1">查看预约订单</navigator>
+			<navigator url="/pagesT/user/myyhk" open-type="redirect" class="mix-btn primary-btn" v-if="isyhk == 1">查看优惠卡</navigator>
+			<navigator url="/pagesT/order/orderT?state=1" open-type="redirect" class="mix-btn primary-btn" v-if="isyy == 1">查看预约订单</navigator>
 			<navigator url="/pages/index/index" open-type="switchTab" class="mix-btn hollow">返回首页</navigator>
 		</view>
 		<view class="coupon-view" v-if="get_coupon">

pagesT/order/createOrderT.vue

@@ -120,7 +120,7 @@
 					<text class="float_right ibonfont ibonguanbi" @click="closePayPop"></text>
 				</view>
 				<view class="pay-ul">
-					<view class="pay-li"  @click="pay_type = 1">
+					<view class="pay-li" @click="pay_type = 1">
 						<text class="ibonfont ibonhuodaofukuan"></text>
 						<view class="pay-name clearfix"
 							:class="[order_detail.pay_price*1 > Number(order_detail.memberBalance) ? 'balance-pay-name' : '']">
@@ -128,8 +128,8 @@
 								<text>余额</text>
 								<text class="balace-num">（余额:¥{{ Number(order_detail.memberBalance) }}）</text>
 							</view>
-							<text  class="float_right ibonfont  ibonxuanze1" v-if="pay_type == 1"></text>
-							<text  class="float_right ibonfont  ibonxuanze1" style="color: #CCCCCC;" v-else></text>
+							<text class="float_right ibonfont  ibonxuanze1" v-if="pay_type == 1"></text>
+							<text class="float_right ibonfont  ibonxuanze1" style="color: #CCCCCC;" v-else></text>
 						</view>
 					</view>
 					<view class="pay-li" @click="pay_type = 2" v-if="order_detail.pay_price*1 > 0">
@@ -180,7 +180,7 @@
 					loaded: false,
 				},
 				choose_yg: {
-					
+
 				},
 				choose_store: {},
 				choose_time: '',
@@ -231,8 +231,8 @@
 			choose_yg(newval, oldval) {
 				if (newval.staffName && newval.uid != 0) {
 					this.getYgYyTimeArea()
-				}else {
-					if(newval.staffName == '随机指派' && this.choose_time) {
+				} else {
+					if (newval.staffName == '随机指派' && this.choose_time) {
 						this.canpay = true
 					}
 				}
@@ -240,6 +240,7 @@
 			},
 			choose_time_detail(newval, oldval) {
 				if (this.choose_store && this.choose_yg.uid != 0) {
+					
 					this.getYgYyTimeArea()
 				}
 			}
@@ -370,10 +371,6 @@
 					title: title,
 					icon: 'none'
 				})
-				// this.choose_yg = {
-				// 	uid: 0,
-				// 	staffName: '随机指派'
-				// }
 				this.canpay = false
 			},
 			//判断是否能预约员工
@@ -394,18 +391,19 @@
 					if (choose_time * 1 >= worktime[0] * 1 && choose_time * 1 <= worktime[1] * 1) {
 						this.canpay = true
 					} else {
+						console.log('该员工不在工作时间')
 						that.cannot()
 					}
-					if(data.reserved.length > 0 ) {
-						for(let i = 0;i< data.reserved.length; i++) {
+					if (data.reserved.length > 0) {
+						for (let i = 0; i < data.reserved.length; i++) {
 							console.log(i)
-							if( that.choose_time_detail == data.reserved[i]) {
+							if (that.choose_time_detail == data.reserved[i]) {
 								that.cannot('该员工已有预约')
 								break
 							}
 						}
 					}
-					
+
 				})
 			},
 			choosYg(item) {
@@ -441,8 +439,8 @@
 			submit() {
 				let that = this
 				// 判断余额是否足够
-				
-				if(that.pay_type == 1 && (that.order_detail.pay_price*1 > that.order_detail.memberBalance*1)) {
+
+				if (that.pay_type == 1 && (that.order_detail.pay_price * 1 > that.order_detail.memberBalance * 1)) {
 					return this.$u.toast('抱歉，您的可用余额不足');
 				}
 				that.$u.api.createItemOrder({
@@ -450,26 +448,27 @@
 					"time": that.choose_time + ' ' + that.choose_time_detail, //预约时间
 					"staff_id": that.choose_yg.uid, //0随机排员工 指定员工传入员工id
 					"pay_type": that.pay_type, //1余额2微信3支付宝
-					"source": that.pay_type == 2 ? 3: '',
+					"source": that.pay_type == 2 ? 3 : '',
 					"remarks": that.mjly, //备注
 					"SHOP-TOKEN": that.choose_store.token
 				}).then(({
 					data
 				}) => {
 					// 余额支付
-					if(that.pay_type == 1) {
+					if (that.pay_type == 1) {
 						console.log(data)
-						if(data == '支付成功' || data.data == '支付成功') {
+						if (data == '支付成功' || data.data == '支付成功') {
 							that.payPop = false
 							setTimeout(() => {
 								uni.navigateTo({
-									url: '/pagesT/money/paySuccess?price=' + that.order_detail.pay_price + '&isyy=1'
+									url: '/pagesT/money/paySuccess?price=' + that.order_detail
+										.pay_price + '&isyy=1'
 								})
 							}, 200);
 						}
 					}
 					// 微信支付
-					if(that.pay_type == 2) {
+					if (that.pay_type == 2) {
 						// data.data
 						let payInfo = data.data
 						// #ifdef MP-WEIXIN
@@ -485,9 +484,10 @@
 								that.payPop = false
 								setTimeout(() => {
 									uni.navigateTo({
-										url: '/pagesT/money/paySuccess?price=' + that.order_detail.pay_price + '&isyy=1'
+										url: '/pagesT/money/paySuccess?price=' + that
+											.order_detail.pay_price + '&isyy=1'
 									})
-									
+
 								}, 200);
 							},
 							fail: async err => {

pagesT/order/orderT.vue

@@ -183,7 +183,7 @@
 			// #endif
 		},
 		onShow() {
-			this.getOrderSelect();
+			// this.getOrderSelect();
 			this.getCustomerInfo()
 		},
 		methods: {
@@ -304,13 +304,14 @@
 			},
 			//swiper 切换
 			changeTab(e) {
+				console.log('swiper拿去数据')
 				this.tabCurrentIndex = e.target.current;
-				// this.getOrderSelect('tab');
+				this.getOrderSelect('tab');
 			},
 			//顶部tab点击
 			tabClick(item, index) {
 				this.tabCurrentIndex = index;
-				this.getOrderSelect('tab');
+				// this.getOrderSelect('tab');
 				// this.getOrderSelect()
 			},
 			// 获取用户信息

pagesT/pointsMall/ExchangeLog.vue

@@ -23,7 +23,7 @@
 					<view class="float_left goods-img"><image :src="item.images[0]" mode="aspectFill"></image></view>
 					<view class="float_left">
 						<view class="ellipsis goods-name">{{ item.integralGoodsName }}</view>
-						<view class="points-num primary-color">{{ item.amount }}积分</view>
+						<view class="points-num primary-color">{{ item.amount }}股权</view>
 					</view>
 				</view>
 			</view>

pagesT/pointsMall/ExchangeOrder.vue

@@ -32,7 +32,7 @@
 					<view class="goods-name ellipsis">{{ goods_detail.name }}</view>
 					<view class="price-num clearfix">
 						<view class="float_left now-price">
-							<text class="pn-text">{{ goods_detail.integral||'0' }}积分</text>
+							<text class="pn-text">{{ goods_detail.integral||'0' }}股权</text>
 						</view>
 						<view class="float_right goods-num">
 							<u-number-box :min="1" v-model="buyNum" :input-height="44" @plus="valChange" @minus="valChange" @blur="valBlur"></u-number-box>
@@ -49,7 +49,7 @@
 			<view class="float_left">
 				实付
 				<text class="price-num total-price">{{ goods_detail.integral || 0 }}</text>
-				<text class="rmb-icon">积分</text>
+				<text class="rmb-icon">股权</text>
 			</view>
 			<view class="sub-btn float_right primary-btn" @click="subOrder">提交</view>
 		</view>

pagesT/pointsMall/ExchangeOrderDetail.vue

@@ -67,7 +67,7 @@
 							<view class="goods-price clearfix">
 								<view class="float_left">
 									<text class="price primary-color">
-										<text>{{ order_detail.integral }}积分</text>
+										<text>{{ order_detail.integral }}股权</text>
 									</text>
 								</view>
 								<view class="float_right">
@@ -97,7 +97,7 @@
 			<view class="view-main order-info-view">
 				<view class="order-price-view">
 					<span>合计：</span>
-					<span class="price primary-color">{{ order_detail.amount }}积分</span>
+					<span class="price primary-color">{{ order_detail.amount }}股权</span>
 				</view>
 			</view>
 			<view class="view-main order-info-view" v-if="order_detail.remark">

pagesT/pointsMall/IntegralGoodsDetail.vue

@@ -31,7 +31,7 @@
 				<view class="price-view primary-bg clearfix">
 					<view class="float_left">
 						<view style="display: inline-block;"><rich-text :nodes="$_utils.splitPrice(goods_detail.integral, 12)"></rich-text></view>
-						<text style="font-size: 24rpx;margin-left: 6rpx;">积分</text>
+						<text style="font-size: 24rpx;margin-left: 6rpx;">股权</text>
 					</view>
 					<view class="right-view">
 						<view class="goods-num">

pagesT/pointsMall/PointsDetail.vue

@@ -7,7 +7,7 @@
 
 				<!-- 创建时间 -->
 				<view class="time">{{ $u.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
-				<!-- 剩余积分 -->
+				<!-- 剩余股权 -->
 				<view class="money"><span>{{ parseInt(item.type) === 4 ? "-" : "+" }}</span>{{ item.amount }}</view>
 			</view>
 			<!-- 空白页 -->
@@ -47,7 +47,7 @@
 			}
 		},
 		methods: {
-			// 积分流水
+			// 股权流水
 			getAllCustomerIntegralDesc() {
 				this.loading_status = 'loading';
 				this.$u.api.getAllCustomerIntegralDesc({

pagesT/pointsMall/index.vue

@@ -4,7 +4,7 @@
 			<view class="float_left user-avatar"><image :src="userInfo.avatar || 'https://onlineimg.qianniao.vip/user-re.png'" mode="aspectFill"></image></view>
 			<view class="float_left info-view">
 				<view class="points-num">{{ userInfo.integral || 0 }}</view>
-				<view class="label">我的积分</view>
+				<view class="label">我的股权</view>
 			</view>
 		</view>
 		<view class="btn-view">
@@ -14,7 +14,7 @@
 				<view class="icon-view"><text class="custom-icon custom-icon-jifen"></text></view>
 			</view>
 			<view class="btn-li" @click="goPage('/pagesT/pointsMall/PointsDetail')">
-				<view class="btn-tit">积分收支</view>
+				<view class="btn-tit">股权收支</view>
 				<view class="btn-val">立即查看</view>
 				<view class="icon-view"><text class="custom-icon custom-icon-qiandao"></text></view>
 			</view>
@@ -24,7 +24,7 @@
 				<!-- 警告：微信小程序中需要hx2.8.11版本才支持在template中结合其他组件，比如下方的lazy-load组件 -->
 				<image class="goods-img" :src="item.images[0]" mode="aspectFill"></image>
 				<view class="demo-title ellipsis">{{ item.name }}</view>
-				<view class="demo-price">{{ item.integral }}积分</view>
+				<view class="demo-price">{{ item.integral }}股权</view>
 				<view class="demo-shop">{{ item.changeNum }}件已兑换</view>
 				<view class="dh-btn primary-btn" @click.stop="goPage('/pagesT/pointsMall/ExchangeOrder?id=' + item.id)">立即兑换</view>
 			</view>

pagesT/selfconfig/selfconfig.vue

@@ -22,6 +22,37 @@
 				<text class="ibonfont ibonjinru"></text>
 			</view>
 		</view>
+		<view class="box clearfix">
+			<span class="auator float_left">UID</span>
+			<view class="float_right">
+				<input type="text" class="inputSty" v-model="userInfo.id" disabled />
+				<text class="ibonfont ibonjinru"></text>
+			</view>
+		</view>
+		<view class="box clearfix" v-if="bind">
+			<span class="auator float_left">推荐人UID</span>
+			<view class="float_right">
+				<input type="text" class="inputSty" v-model="userInfo.recommenderId" disabled />
+				<text class="ibonfont ibonjinru"></text>
+			</view>
+		</view>
+		<view class="box clearfix" v-if="!bind">
+			<span class="auator float_left">推荐人UID</span>
+			<view class="float_right">
+				<input type="text" class="inputSty" v-model="userInfo.recommenderId" placeholder="请输入推荐人UID"/>
+				<text class="ibonfont ibonjinru"></text>
+			</view>
+		</view>
+		<view class="box clearfix" v-if="!bind">
+			<span class="auator float_left">推荐人类型</span>
+			<view class="float_right">
+				<picker @change="bindPickerChange" :value="index" :range="array" range-key="title">
+					<!-- <input type="text" class="inputSty" v-model="userInfo.recommenderId" /> -->
+					<text class="inputSty" :style="{color: typename == ''?'#999': '#333'}">{{typename || '请选择推荐人类型'}}</text>
+					<text class="ibonfont ibonjinru"></text>
+				</picker>
+			</view>
+		</view>
 		<view class="box clearfix">
 			<text class="auator float_left">联系电话</text>
 			<view class="float_right">
@@ -60,6 +91,19 @@
 	export default {
 		data() {
 			return {
+				sjid: '',
+				type: '',
+				typename: '',
+				array: [{
+					val: 2,
+					title: '员工',
+
+				}, {
+					val: 3,
+					title: '用户',
+
+				}],
+				bind: false,
 				region_name: '',
 				content: '请确认是否要提交修改您的用户信息',
 				modal_show: false,
@@ -97,6 +141,12 @@
 			this.getCustomerInfo();
 		},
 		methods: {
+			bindPickerChange(e) {
+				console.log(e.detail);
+				this.typename = this.array[e.detail.value].title
+				this.type = this.array[e.detail.value].val
+				this.userInfo.recommenderType =  this.array[e.detail.value].val 
+			},
 			logOut() {
 				uni.removeStorageSync('token');
 				uni.removeStorageSync('userStatus');
@@ -160,7 +210,7 @@
 			},
 			// 获取省市区
 			pickerRegionChange(row) {
-				console.log(row,'row+++++++++')
+				console.log(row, 'row+++++++++')
 				this.userInfo.provinceCode = row[0].value;
 				this.userInfo.cityCode = row[1].value;
 				this.userInfo.districtCode = row[2].value;
@@ -206,12 +256,25 @@
 							mobile: data.data.mobile
 						};
 					}
+					if (data.data.recommenderId != 0) {
+						this.bind = true
+					}else {
+						data.data.recommenderId = ''
+					}
+					if(data.data.recommenderType) {
+						if(data.data.recommenderType == 2) {
+							this.typename = '员工'
+						}
+						if(data.data.recommenderType == 3) {
+							this.typename = '用户'
+						}
+					}
 					this.userInfo = {
 						...data.data,
 						avatar: [data.data.avatar],
 						contact: contact
 					};
-					console.log(data.data.contact,'this.userInfo++++++++++++');
+					console.log(data.data.contact, 'this.userInfo++++++++++++');
 					if (data.data.contact.length) {
 						this.region_name = data.data.contact[0].area.provinceName + '-' + data.data.contact[0]
 							.area.cityName + '-' + data.data.contact[0].area.districtName;

pagesT/unit/hyc.vue → pagesT/unit/artdetail.vue

@@ -1,133 +1,110 @@
-<template>
-	<view class="content">
-		<view class="gq-list">
-			<view class="gq-item" v-for="item in 11" >
-				<view class="gq-logo">
-					<image src="" mode="" class=""></image>
-				</view>
-				
-				<view class="info">
-					<view class="info-tit">
-						名称：
-					</view>
-					<view class="info-val">
-						创始人
-					</view>
-				</view>
-				<view class="info">
-					<view class="info-tit">
-						价格：
-					</view>
-					<view class="info-val">
-						创始人
-					</view>
-				</view>
-				<view class="info">
-					<view class="info-tit">
-						赠送：
-					</view>
-					<view class="info-val">
-						创始人
-					</view>
-				</view>
-
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				type: ''
-			}
-		},
-		onLoad(opt) {
-
-		},
-		onShow() {
-
-		},
-		onReachBottom() {
-
-		},
-		onReady() {
-
-		},
-		methods: {
-			navto(url) {
-				uni.navigateTo({
-					url
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.gq-list {
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: flex-start;
-		// justify-content: space-between;
-		padding: 20rpx 0 20rpx 20rpx;
-	}
-
-	.gq-item {
-		margin: 0 0 20rpx 14rpx;
-		width: 227rpx;
-		height: 351rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 5rpx 5rpx 0px rgba(35, 24, 21, 0.06);
-		border-radius: 10rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: space-between;
-		padding: 30rpx 14rpx 20rpx;
-
-		.gq-logo {
-			width: 182rpx;
-			height: 192rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-
-			image {
-				width: 182rpx;
-				height: 192rpx;
-				background-color: #eee;
-			}
-		}
-
-		.store-name {
-			padding-top: 10rpx;
-			text-align: center;
-			width: 100%;
-			font-size: 26rpx;
-			font-weight: 500;
-			color: #262261;
-			overflow: hidden;
-		}
-
-		.info {
-			width: 100%;
-			display: flex;
-			padding: 5rpx 0;
-
-			.info-tit {
-				font-size: 18rpx;
-				flex-shrink: 0;
-			}
-
-			.info-val {
-				text-align: center;
-				font-size: 20rpx;
-				width: 140rpx;
-				border-bottom: 1px #C7C7C7 solid;
-			}
-		}
-
-	}
+<template>
+	<view class="content" :class="['qn-page-' + theme]">
+		<u-parse :html="content"></u-parse>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type: 2,
+				content: ''
+			}
+		},
+		onLoad(opt) {
+			if(opt.type) {
+				this.type = opt.type
+			}
+			this.getArtDetail()
+		},
+		onShow() {
+
+		},
+		onReachBottom() {
+
+		},
+		onReady() {
+
+		},
+		methods: {
+			getArtDetail() {
+				this.$u.api.getArtDetail({
+					type: this.type
+				}).then(({data})=> {
+					this.content = data.content
+					uni.setNavigationBarTitle({
+						title: data.title
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.gq-list {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: flex-start;
+		// justify-content: space-between;
+		padding: 20rpx 0 20rpx 20rpx;
+	}
+
+	.gq-item {
+		margin: 0 0 20rpx 14rpx;
+		width: 227rpx;
+		height: 351rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 5rpx 5rpx 0px rgba(35, 24, 21, 0.06);
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx 14rpx 20rpx;
+
+		.gq-logo {
+			width: 182rpx;
+			height: 192rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			image {
+				width: 182rpx;
+				height: 192rpx;
+				background-color: #eee;
+			}
+		}
+
+		.store-name {
+			padding-top: 10rpx;
+			text-align: center;
+			width: 100%;
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #262261;
+			overflow: hidden;
+		}
+
+		.info {
+			width: 100%;
+			display: flex;
+			padding: 5rpx 0;
+
+			.info-tit {
+				font-size: 18rpx;
+				flex-shrink: 0;
+			}
+
+			.info-val {
+				text-align: center;
+				font-size: 20rpx;
+				width: 140rpx;
+				border-bottom: 1px #C7C7C7 solid;
+			}
+		}
+
+	}
 </style>

pagesT/unit/itemdetail.vue

@@ -24,12 +24,12 @@
 					</view>
 					<!-- #endif -->
 				</view>
-				<block v-if="goods_detail.isDistribution === 4 && goods_detail.inventorTotal <= 0">
+<!-- 				<block v-if="goods_detail.isDistribution === 4 && goods_detail.inventorTotal <= 0">
 					<view v-if="!(goods_detail.inventorTotal - 0) || goods_detail.inventorTotal - 0 <= 0" class="btn">
 						<view class="buy primary-bg" style="background-color: #666666 !important;">补货中</view>
 					</view>
-				</block>
-				<view v-else class="btn">
+				</block> -->
+				<view class="btn">
 					<view class="buy primary-fu-bg" @click="openaddcartPop('btn')">立即购买</view>
 					<!-- <view class="buy primary-bg" @click="openaddcartPop('btn')">加入购物车</view> -->
 				</view>
@@ -96,7 +96,7 @@
 				</view>
 			</view>
 		</block>
-		<u-popup mode="bottom" v-model="sharePop" v-if="sharePop">
+		<u-popup mode="bottom" v-model="sharePop" >
 			<view class="share-tit">分享</view>
 			<view class="share-ul">
 				<!-- #ifdef MP -->
@@ -109,14 +109,14 @@
 					</button>
 				</view>
 				<!-- #endif -->
-				<view class="share-li" @click="generatePoster">
+				<!-- <view class="share-li" @click="generatePoster">
 					<button class="share-btn">
 						<view class="icon-view">
 							<u-icon name="photo-fill" top="12" color="#ffffff" size="60"></u-icon>
 						</view>
 						<view class="share-btn-label">生成分享海报</view>
 					</button>
-				</view>
+				</view> -->
 			</view>
 			<view class="share-cancel" @click="cancelPop">取消分享</view>
 		</u-popup>
@@ -304,8 +304,8 @@
 		},
 		onShareAppMessage() {
 			return {
-				title: this.goods_detail.title,
-				path: `/pagesT/product/product?id=${this.goods_id}&businessmanId=${this.$store.state.userStatus.id || ''}`,
+				title: this.goods_detail.name,
+				path: `/pagesT/unit/itemdetail?id=${this.goods_id}&businessmanId=${this.$store.state.userStatus.id || ''}&isyhk=${this.isyhk}`,
 				imageUrl: this.imgList[0],
 				success: res => {
 					console.log(res);

pagesT/unit/ygdetail.vue

@@ -14,7 +14,7 @@
 		<view class="yg-info">
 			<view class="info-line">
 				<view class="left-name">
-					<image src="" mode=""></image>
+					<image src="https://api.liuniukj.com/img/user/ljfw.png" mode=""></image>
 					<view class="">
 						累计服务
 					</view>
@@ -38,7 +38,7 @@
 			</view> -->
 			<view class="info-line" style="height: auto;border-bottom: none;">
 				<view class="left-name">
-					<image src="" mode=""></image>
+					<image src="https://api.liuniukj.com/img/user/ygjj.png" mode=""></image>
 					<view class="">
 						员工简介
 					</view>
@@ -65,7 +65,7 @@
 						</view>
 					</view>
 					<view class="pj-time">
-						2022-07-06
+						{{item.createTime}}
 					</view>
 				</view>
 				<view class="pj-info">

pagesT/unit/yhk.vue

@@ -5,7 +5,7 @@
 				<image :src="item.image" mode="" class="good-image"></image>
 				<view class="good-name ">
 					<view class="clamp2">
-						{{item.name}}哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈
+						{{item.name}}
 					</view>
 				</view>
 				<view class="good-price">

pagesT/user/guquan.vue

@@ -1,19 +1,86 @@
 <template>
-	<view class="content">
-		<view class="gq-list">
-			<view class="gq-item" v-for="item in 11" @click="navto('/pagesT/user/gqDetail')">
-				<image src="" mode="" class="gq-logo"></image>
-				<view class="store-name ellipsis">
-					君海蓝(黄岩店）君海蓝(黄岩店）君海蓝(黄岩店）君海蓝(黄岩店）
+	<view class="content" :class="['qn-page-' + theme]">
+		<!-- <view class="user-top">
+			<view class="select-time">
+				<picker mode="date" @change="bindDateChange" fields="month">
+					<view class="uni-input">{{showdate}}</view>
+				</picker>
+				<image src="../../static/img/downjian.png" mode="widthFix"></image>
+			</view>
+			<view class="top-val">
+				当前股权
+			</view>
+			<view class="top-tit">
+				当前股权
+			</view>
+			<view class="top-btn">
+				<view class="left">
+					
 				</view>
-				<view class="gq-num ellipsis">
-					20股
+				<view class="center">
+					
 				</view>
-				<view class="gq-num ellipsis">
-					浙江省台州市椒江区市府大道400号1楼
+				<view class="right" @click="goPage('/pagesS/yg/gqtx')">
+					股权提现
 				</view>
 			</view>
 		</view>
+		<view class="sz-wrap">
+			<view class="sz-item">
+				<view class="sz-tit">
+					累计总股权
+				</view>
+				<view class="sz-val">
+					200
+				</view>
+			</view>
+			<view class="jg"></view>
+			<view class="sz-item">
+				<view class="sz-tit">
+					业绩股权
+				</view>
+				<view class="sz-val">
+					200
+				</view>
+			</view>
+		</view> -->
+		<view class="navbar">
+			<view v-for="(item, index) in navlist" :key="index" class="nav-item" :class="[tabCurrentIndex === index ? 'current' : '']" @click="tabClick(index)">
+				{{item.title}}({{  tabCurrentIndex == 0? (dends*1).toFixed(2):(shares*1).toFixed(2)}})
+				<view class="current-line primary-btn"></view>
+			</view>
+		</view>
+		<!-- <view class="navbar">
+			<view v-for="(item, index) in navlist" :key="index" class="nav-item"
+				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{item.title}}({{  tabCurrentIndex == 0? (dends*1).toFixed(2):(shares*1).toFixed(2)}})</view>
+		</view> -->
+		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navlist" :key="tabIndex">
+				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<u-empty text="暂无数据" mode="list" v-if="tabItem.loaded && tabItem.list.length == 0"></u-empty>
+
+					<!-- 订单列表 -->
+					<view class="order-item" v-for="(item, index) in tabItem.list" :key="index">
+						<view class="title-box">
+							<view class="title">
+								<!-- <text>{{ item.mark }}</text> -->
+								{{tabCurrentIndex == 0? item.mark : item.remarks}}
+							</view>
+							<view class="time">
+								<!-- <text>{{ item.create_time }}</text> -->
+								{{$_utils.formatDate(item.createTime)}}
+							</view>
+						</view>
+						<view class="money">
+							<!-- <view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view> -->
+							+{{item.number}}
+						</view>
+					</view>
+					<u-loadmore :status="tabItem.loadingType" />
+				</scroll-view>
+			</swiper-item>
+		</swiper>
 	</view>
 </template>
 
@@ -21,25 +88,116 @@
 	export default {
 		data() {
 			return {
-
+				// showdate: '',
+				tabCurrentIndex: 0,
+				height: '',
+				id: '',
+				navlist: [{
+						status: 'getFh',
+						title: '分红股份',
+						list: [],
+						page: 1,
+						pageSize: 10,
+						loaded: false,
+						loadingType: 'loadmore',
+					},
+					{
+						status: 'getBsGf',
+						title: '原始股份',
+						list: [],
+						page: 1,
+						pageSize: 10,
+						loaded: false,
+						loadingType: 'loadmore'
+					}
+				],
+				dends: 0,
+				shares: 0,
 			}
 		},
-		onLoad() {
-
+		onLoad(opt) {
+			// this.getTime()
 		},
 		onShow() {
-
+			this.getGq()
+			this.loadData()
 		},
 		onReachBottom() {
 
 		},
 		onReady() {
-
+			var _this = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.swiper-box').boundingClientRect();
+					query.exec(function(res) {
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
+				},
+				fail: res => {}
+			});
 		},
 		methods: {
-			navto(url) {
-				uni.navigateTo({
-					url
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+				// this.loadData('tab')
+			},
+			// 选择年月
+			bindDateChange(e) {
+				let time = e.detail.value.split('-')
+				this.showdate = time[0] + '年' + time[1] + '月'
+
+				this.loadData('reload')
+			},
+			changeTab(e) {
+				console.log(e)
+				this.tabCurrentIndex = e.detail.current;
+				this.loadData('tab')
+			},
+			// 获取当前年月
+			// getTime() {
+			// 	let date = new Date()
+			// 	this.showdate = date.getFullYear() + '年' + (date.getMonth() + 1) + '月'
+			// 	this.loadData()
+			// },
+			// 获取数据
+			loadData(type) {
+				let that = this
+				let index = that.tabCurrentIndex
+				let item = that.navlist[index]
+				if (type == 'reload') {
+					item.loaded = false
+					item.loadingType = 'more'
+					item.page = 1
+					item.list = []
+				}
+				if (type == 'tab' && item.loaded) {
+					return
+				}
+				if (item.loadingType == 'loading' || item.loadingType == 'noMore') {
+					return
+				}
+
+				item.loadingType = 'loading'
+				that.$u.api[item.status]().then(({data})=> {
+					item.list = item.list.concat(data)
+					item.page++
+					if(data.length == item.pageSize) {
+						item.loadingType = 'loadmore'
+					}else {
+						item.loadingType = 'nomore'
+					}
+					item.loaded = true
+				})
+
+			},
+			getGq() {
+				this.$u.api.getGq({}).then(res=> {
+					this.dends = data.dends
+					this.shares = data.shares
 				})
 			}
 		}
@@ -47,59 +205,187 @@
 </script>
 
 <style lang="scss">
-	.gq-list {
+	.user-top {
+		width: 100%;
+		height: 400rpx;
+		background-color: #4075d6;
 		display: flex;
-		flex-wrap: wrap;
-		justify-content: flex-start;
-		// justify-content: space-between;
-		padding: 20rpx 0 20rpx 20rpx;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		padding-bottom: 60rpx;
+
+		// position: relative;
+		.top-tit {
+			font-size: 30rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+		}
+
+		.top-val {
+			font-size: 72rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
+
+		.select-time {
+			position: absolute;
+			top: 30rpx;
+			right: 30rpx;
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #fff;
+			display: flex;
+			align-items: center;
+
+			image {
+				width: 17rpx;
+				margin-left: 10rpx;
+			}
+		}
+		.top-btn {
+			margin-top: 20rpx;
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			padding: 0 50rpx;
+			font-size: 30rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+			.right {
+				text-align: right;
+			}
+			.left {
+				text-align: left;
+			}
+			.center {
+				text-align: center;
+			}
+			view {
+				width: 33.3%;
+			}
+		}
 	}
 
-	.gq-item {
-		margin: 0 0 20rpx 14rpx;
-		width: 227rpx;
-		height: 351rpx;
+	.sz-wrap {
+		width: 670rpx;
+		height: 186rpx;
 		background: #FFFFFF;
-		box-shadow: 0px 5rpx 5rpx 0px rgba(35, 24, 21, 0.06);
-		border-radius: 10rpx;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		margin: -90rpx auto 20rpx;
 		display: flex;
-		flex-direction: column;
+		justify-content: center;
 		align-items: center;
-		justify-content: space-between;
-		padding: 30rpx 14rpx;
 
-		.gq-logo {
-			width: 140rpx;
-			height: 140rpx;
-			background-color: #eee;
+		.jg {
+			width: 2rpx;
+			height: 74rpx;
+			background: #DCDFE6;
 		}
 
-		.store-name {
-			padding-top: 10rpx;
-			text-align: center;
-			width: 100%;
-			font-size: 26rpx;
-			font-weight: 500;
-			color: #262261;
-			overflow: hidden;
+		.sz-item {
+			width: 330rpx;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			font-size: 30rpx;
+			font-weight: bold;
+
+			.sz-tit {
+				color: #999999;
+
+			}
+
+			.sz-val {
+				margin-top: 30rpx;
+				color: #181818;
+			}
+		}
+	}
+
+	
+
+	//列表
+	.swiper-box {
+		.order-item:last-child {
+			margin-bottom: 60rpx;
 		}
 
-		.gq-num {
-			text-decoration: underline;
+		.order-item {
 			width: 100%;
-			font-size: 18rpx;
-			font-weight: 500;
+			// background-color: red;
+			padding: 20rpx 30rpx;
+			line-height: 1.5;
+			display: flex;
+			align-items: center;
+
+			.title-box {
+				flex-grow: 1;
+				padding-right: 50rpx;
+
+				.title {
+					font-size: 30rpx;
+					color: #333333;
+				}
+
+				.time {
+					font-size: 26rpx;
+					color: #AEAEAE;
+				}
+			}
+
+			.money {
+				color: #fd5b23;
+				font-size: 26rpx;
+				text-align: right;
+
+				.status {
+					color: #AEAEAE;
+				}
+			}
+		}
+	}
+
+	.list-scroll-content {
+		background: #ffffff;
+		height: 100%;
+	}
+	.navbar {
+		display: flex;
+		height: 88upx;
+		background: #fff;
+		position: relative;
+		z-index: 10;
+		border-bottom: 1upx solid #eee;
+	
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 28upx;
 			color: #666666;
-			text-align: center;
 			position: relative;
-			padding-left: 50rpx;
-
-			&::before {
-				content: '股权:';
-				text-align: left;
-				position: absolute;
-				top: 0;
-				left: 0;
+			font-weight: 300;
+	
+			&.current {
+				font-weight: 500;
+				.current-line {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 10upx;
+					transform: translateX(-50%);
+					width: 40upx;
+					height: 6upx;
+					background: $base-btn-bg;
+					border-radius: 6upx;
+					/*border-bottom: 2px solid #F53C28;*/
+				}
 			}
 		}
 	}