2024-2-23

pages.json

@@ -29,14 +29,14 @@
 			"style": {
 				"navigationBarTitleText": "个人中心"
 			}
-		},
-		{
-			"path": "pages/index/list",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "课程列表"
-			}
-		}
+		}
+		// {
+		// 	"path": "pages/index/list",
+		// 	"style": {
+		// 		"navigationStyle": "custom",
+		// 		"navigationBarTitleText": "课程列表"
+		// 	}
+		// }
 	],
 	"subPackages": [
 		{
@@ -354,12 +354,12 @@
 				"selectedIconPath": "static/tabBar/tab-home-current.png",
 				"text": "首页"
 			},
-			{
-					"pagePath": "pages/index/list",
-					"iconPath": "static/tabBar/kc.png",
-					"selectedIconPath": "static/tabBar/kcaction.png",
-					"text": "课程"
-				},
+			// {
+			// 		"pagePath": "pages/index/list",
+			// 		"iconPath": "static/tabBar/kc.png",
+			// 		"selectedIconPath": "static/tabBar/kcaction.png",
+			// 		"text": "课程"
+			// 	},
 			// {
 			// 	"pagePath": "pages/category/category",
 			// 	"iconPath": "static/tabBar/tab-cate.png",

pages/modelData/modeltemplate/model_1.vue

@@ -107,7 +107,7 @@
 							<image :src="baseURL + '/resource/model/model1/m2.png'" mode="" class="tit-logo"></image>自我展示
 						</view>
 						<view class="card-content">
-							{{cardInfo.service_intro_content}}
+							<rich-text :nodes="cardInfo.service_intro_content"></rich-text>
 						</view>
 						<view class="img-list flex" style="padding-top: 0;">
 							<image :src="siiitem" mode="" v-for="siiitem in cardInfo.service_intro_imgs"></image>

pages/modelData/modeltemplate/model_2.vue

@@ -110,7 +110,7 @@
 							<image :src="baseURL + '/resource/icon/model2/zwpj.png'" mode="" class=""></image>
 						</view>
 						<view class="card-content">
-							{{cardInfo.service_intro_content}}
+							<rich-text :nodes="cardInfo.service_intro_content"></rich-text>
 						</view>
 						<view class="img-list flex" style="padding-top: 0;">
 							<image :src="siiitem" mode="" v-for="siiitem in cardInfo.service_intro_imgs"></image>

pages/modelData/modeltemplate/model_3.vue

@@ -115,7 +115,7 @@
 				<image class="line" :src="baseURL + '/resource/model/model3/tap11.png'" mode="widthFix"></image>
 			</view>
 			<view class="text margin-t-20">
-				{{cardInfo.service_intro_content}}
+				<rich-text :nodes="cardInfo.service_intro_content"></rich-text>
 			</view>
 			<view class="img-list flex">
 				<image :src="siiitem" mode="scaleToFill" v-for="siiitem in cardInfo.service_intro_imgs"></image>

pages/user/model/model.vue

@@ -31,7 +31,7 @@
 			</view>
 		</view>
 		<block v-if="type==0">
-			<view class="ljrz bottom" v-if="userInfo.work_type_id <=0"
+			<view class="ljrz bottom" v-if="userInfo.work_type_id <=0&&userInfo.info_audit_status != 1"
 				@click="navto('/pages/user/model/modelrz?modelid=' + mtype + '&type=2')">
 				生成我的名片
 			</view>

pages/user/model/modelrz.vue

@@ -64,7 +64,8 @@
 						</pickerAddress>
 					</view> -->
 					<view class="right flex">
-						<picker class="input" :range='jgList' mode="selector" @change="changeAncestralPlace" range-key="name">
+						<picker class="input" :range='jgList' mode="selector" @change="changeAncestralPlace"
+							range-key="name">
 							<view>
 								{{updata.ancestral_place||'选择籍贯'}}
 							</view>
@@ -215,9 +216,8 @@
 		<view class="listBox">
 			<view class="list">
 				<view class="listItem">
-					<textarea class="textarea" auto-height :maxlength='-1' v-model="updata.mymask" type="text"
-						placeholder="自我评价\n\n本人从业***年，已经服务***名客户\n成长经历：\n从事母婴工作之前是做***行业的，于***年经过专业培训后进入母婴行业；先后学习了***\n性格特征：\n本人性格直爽，具有很强的服务意识，做事认真负责，擅长……类工作\n服务格言：\n全心全意服务好每一位客户"
-						placeholder-class="textareaplaceholder" />
+					<editor class="textarea" auto-height :maxlength='-1' @blur='changeMyask' type="text"
+						placeholder="自我评价\n\n本人从业***年，已经服务***名客户\n成长经历：\n从事母婴工作之前是做***行业的，于***年经过专业培训后进入母婴行业；先后学习了***\n性格特征：\n本人性格直爽，具有很强的服务意识，做事认真负责，擅长……类工作\n服务格言：\n全心全意服务好每一位客户" />
 				</view>
 			</view>
 			<view class="con_box">
@@ -355,7 +355,7 @@
 				this.type = 0
 			}
 			this.init()
-			console.log(this.jgList); 
+			console.log(this.jgList);
 		},
 		computed: {
 			// #ifdef H5
@@ -364,6 +364,11 @@
 			...mapState(['baseURL']),
 		},
 		methods: {
+			changeMyask({
+				detail
+			}) {
+				this.updata.mymask = detail.html;
+			},
 			// 选择学历
 			changeEducation(res) {
 				this.updata.education = this.educationList[res.detail.value];
@@ -467,7 +472,7 @@
 				)
 				// console.log(that.updata);
 				let data = {
-					is_china: that.updata.is_wm == '是'?0:1,
+					is_china: that.updata.is_wm == '是' ? 0 : 1,
 					name: that.updata.name,
 					avatar: that.updata.avatar,
 					age: IdCard(that.updata.cardId, 3),
@@ -477,11 +482,11 @@
 					ancestral_place: that.updata.ancestral_place,
 					minority: that.updata.minority,
 					education: that.updata.education,
-					service_area_all: that.updata.is_wm == '否'?that.updata.onCity.map(
+					service_area_all: that.updata.is_wm == '否' ? that.updata.onCity.map(
 						(item) => {
 							return item.province + item.city + item.district
 						}
-					):['海外,海外,海外'],
+					) : ['海外,海外,海外'],
 					service_min_price: that.updata.minMoney,
 					service_max_price: that.updata.maxMoney,
 					service_time_type_title: that.updata.timetype.title,
@@ -519,13 +524,13 @@
 								minMoney: res.service_min_price, //最低价
 								maxMoney: res.service_max_price, //最高价
 								time: res.birthday, //出生日期
-								onCity:res.is_china == 1 ?  res.service_area_all.map((arr) => {
+								onCity: res.is_china == 1 ? res.service_area_all.map((arr) => {
 									return {
 										province: arr[0].name,
 										city: arr[1].name,
 										district: arr[2] ? arr[2].name : '市辖区'
 									}
-								}): [], //选中的城市
+								}) : [], //选中的城市
 								mymask: res.service_intro_content, //自评
 								imageList: res.service_intro_imgs, //自评上传图片列表
 								ancestral_place: res.ancestral_place, //籍贯
@@ -697,7 +702,7 @@
 					// #ifdef MP
 					uni.chooseMedia({
 						count: 1,
-						mediaType:['image'],
+						mediaType: ['image'],
 						sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
 						sourceType: sourceType,
 						success(res) {
@@ -706,7 +711,7 @@
 							ok(res.tempFiles[0])
 						},
 						fail(err) {
-							console.log(err,'’1111')
+							console.log(err, '’1111')
 							uni.showModal({
 								title: '文件打开错误',
 								content: '请设置授权文件存储权限',
@@ -734,7 +739,7 @@
 						}
 					});
 					// #endif
-					
+
 				})
 			},
 			// 实名认证
@@ -745,7 +750,7 @@
 				}
 				that.loding = true;
 				subInfoAudit({
-						is_china: that.updata.is_wm == '是'?0:1,
+						is_china: that.updata.is_wm == '是' ? 0 : 1,
 						avatar: that.updata.avatar,
 						name: that.updata.name,
 						mobile: that.updata.phone,
@@ -769,8 +774,17 @@
 						service_count: that.updata.service_count
 					})
 					.then((e) => {
+						if (e.msg == '提交成功,数据已通过审核') {
+							this.$api.msg(e.msg);
+							setTimeout(
+								() => {
+									uni.navigateBack()
+								}, 1000
+							)
+						} else {
+							this.$api.msg(e.msg);
+						}
 						that.loding = false;
-						this.$api.msg(e.msg);
 					})
 					.catch(err => {
 						this.loding = false;
@@ -844,15 +858,15 @@
 					});
 					return false
 				}
-				if(!that.updata.is_wm) {
+				if (!that.updata.is_wm) {
 					uni.showModal({
 						title: '错误',
 						content: '请选择服务区域是否海外',
 						showCancel: false,
 					});
-					return 
+					return
 				}
-				if ( that.updata.is_wm == '否'&&that.updata.onCity.length == 0) {
+				if (that.updata.is_wm == '否' && that.updata.onCity.length == 0) {
 					uni.showModal({
 						title: '错误',
 						content: '请选择服务区域',
@@ -938,18 +952,16 @@
 			padding: 35rpx 40rpx;
 			border-bottom: 1px solid $page-color-light;
 
+			.ql-editor.ql-blank:before {
+				font-style: normal;
+			}
+
 			.textarea {
 				font-size: $font-base;
 				width: 100%;
 				word-wrap: break-word;
 				white-space: pre-line;
 				min-height: 9rem;
-
-			}
-
-			/deep/ .textareaplaceholder {
-				word-wrap: break-word;
-				white-space: pre-line;
 			}
 		}
 

pages/userhome/user.vue

@@ -1,91 +1,92 @@
-<template>
-	<view class="container">
-		<scroll-view class="content-box" scroll-y="true">
-			<view class="user-section">
-				<view class="user-info-box ">
-					<view class="detail flex">
-						<view class="portrait-box" @click="navTo('/pages/set/userinfo')">
-							<image class="portrait" :src="user.avatar || '/static/error/missing-face.png'"></image>
-						</view>
-						<view class="info-box">
-							<view class="username flex-start">
-								<text class="clamp padding-r-20">
-									{{ user.nickname || '游客' }}
-								</text>
-
-								<view class="tipLevel flex-shrink-false">
-								</view>
-							</view>
-							<view class="flex-start flex">
-								<view class="authentication">{{user.mobile}}</view>
-							</view>
-						</view>
-						<view class="righ-tbox flex">
-							<image class="right-tip" src="../../static/icon/tiptop.png" mode="scaleToFill"></image>
-							<block v-if="!user.work_type_title">
-								普通用户
-							</block>
-							<block v-else>
-								{{user.work_type_title}}
-							</block>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="nav-model flex" @click="navcard">
-				<view class="right-card">
-					<view class="title">
-						我的数字名片
-					</view>
-					<view class="tip" v-if="user.info_audit_status==-2">
-						审核成功即可获得母婴界数字名片
-					</view>
-					<view class="tip" v-else-if="user.info_audit_status==1">
-						点击查看您的母婴界数字名片
-					</view>
-					<view class="tip" v-else-if="user.info_audit_status==0&&user.work_type_id<=0">
-						数字名片资料审核中请等待审核完毕
-					</view>
-					<view class="tip" v-else-if="user.info_audit_status==0&&user.work_type_id>0">
-						修改数字名片资料审核中请等待审核完毕
-					</view>
-				</view>
-				<image class="next" src="../../static/icon/next2.png" mode="scaleToFill"></image>
-			</view>
-			<view class="nav-model-rz flex" v-if="user.work_type_id>0&&user.type_audit_status!=1" @click="user.type_audit_status==0||navTo('/pages/user/model/shoprz')">
-				<view class="tiptext" v-if="user.type_audit_status==-2">
-					您未完成平台认证，请立即认证>>
-				</view>
-				<view class="tiptext" v-else-if="user.type_audit_status==-1">
-					您平台认证失败，请重新认证>>
-				</view>
-				<view class="tiptext" v-else-if="user.type_audit_status==-3">
-					您平台认证已失效，请重新认证>>
-				</view>
-				<view class="tiptext" v-else-if="user.type_audit_status==0">
-					您已提交认证信息请等待认证结束
-				</view>
-				<view class="rztext" v-if="user.type_audit_status==-2">
-					立即认证
-				</view>
-				<view class="rztext" v-else-if='user.type_audit_status==-3||user.type_audit_status==-1'>
-					重新生成
-				</view>
-			</view>
-			<view class="cover-container">
-				<view class="listBox">
-					<view class="list">
-						<!-- <view class="flex listItem" @click="navTo('/pages/user/myCart/myCart')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/mymoney.png" mode="widthFix"></image>
-								<text class="title">我的钱包</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
-							</view>
+<template>
+	<view class="container">
+		<scroll-view class="content-box" scroll-y="true">
+			<view class="user-section">
+				<view class="user-info-box ">
+					<view class="detail flex">
+						<view class="portrait-box" @click="navTo('/pages/set/userinfo')">
+							<image class="portrait" :src="user.avatar || '/static/error/missing-face.png'"></image>
+						</view>
+						<view class="info-box">
+							<view class="username flex-start">
+								<text class="clamp padding-r-20">
+									{{ user.nickname || '游客' }}
+								</text>
+
+								<view class="tipLevel flex-shrink-false">
+								</view>
+							</view>
+							<view class="flex-start flex">
+								<view class="authentication">{{user.mobile}}</view>
+							</view>
+						</view>
+						<view class="righ-tbox flex">
+							<image class="right-tip" src="../../static/icon/tiptop.png" mode="scaleToFill"></image>
+							<block v-if="!user.work_type_title">
+								普通用户
+							</block>
+							<block v-else>
+								{{user.work_type_title}}
+							</block>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="nav-model flex" @click="navcard">
+				<view class="right-card">
+					<view class="title">
+						我的数字名片
+					</view>
+					<view class="tip" v-if="user.info_audit_status==-2">
+						审核成功即可获得母婴界数字名片
+					</view>
+					<view class="tip" v-else-if="user.info_audit_status==1">
+						点击查看您的母婴界数字名片
+					</view>
+					<view class="tip" v-else-if="user.info_audit_status==0&&user.work_type_id<=0">
+						数字名片资料审核中请等待审核完毕
+					</view>
+					<view class="tip" v-else-if="user.info_audit_status==0&&user.work_type_id>0">
+						修改数字名片资料审核中请等待审核完毕
+					</view>
+				</view>
+				<image class="next" src="../../static/icon/next2.png" mode="scaleToFill"></image>
+			</view>
+			<view class="nav-model-rz flex" v-if="user.work_type_id>0&&user.type_audit_status!=1"
+				@click="user.type_audit_status==0||navTo('/pages/user/model/shoprz')">
+				<view class="tiptext" v-if="user.type_audit_status==-2">
+					您未完成平台认证，请立即认证>>
+				</view>
+				<view class="tiptext" v-else-if="user.type_audit_status==-1">
+					您平台认证失败，请重新认证>>
+				</view>
+				<view class="tiptext" v-else-if="user.type_audit_status==-3">
+					您平台认证已失效，请重新认证>>
+				</view>
+				<view class="tiptext" v-else-if="user.type_audit_status==0">
+					您已提交认证信息请等待认证结束
+				</view>
+				<view class="rztext" v-if="user.type_audit_status==-2">
+					立即认证
+				</view>
+				<view class="rztext" v-else-if='user.type_audit_status==-3||user.type_audit_status==-1'>
+					重新生成
+				</view>
+			</view>
+			<view class="cover-container">
+				<view class="listBox">
+					<view class="list">
+						<!-- <view class="flex listItem" @click="navTo('/pages/user/myCart/myCart')">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/mymoney.png" mode="widthFix"></image>
+								<text class="title">我的钱包</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
 						</view> -->
-						
+
 						<view class="flex listItem" @click="navTo('/pages/user/myteam')">
 							<view class="flex titleBox">
 								<image class="listIconImg" src="../../static/icon/myshare.png" mode="widthFix"></image>
@@ -98,413 +99,422 @@
 						</view>
 						<view class="flex listItem" @click="navTo('/pages/user/shareQrCode')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myshareimg.png" mode="widthFix"></image>
+								<image class="listIconImg" src="../../static/icon/myshareimg.png" mode="widthFix">
+								</image>
 								<text class="title">邀请海报</text>
 							</view>
 							<view class="right flex">
 								<text></text>
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
-						</view>
-						<view class="flex listItem" @click="navTo('/pages/user/model/mymodellist')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/mymodel.png" mode="widthFix"></image>
-								<text class="title">已购模板</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
-							</view>
-						</view>
-						<!-- <view class="flex listItem" @click="navTo('/pages/user/myCart/myCart')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myaddress.png" mode="widthFix"></image>
-								<text class="title">收货地址</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
-							</view>
-						</view> -->
-						<!-- #ifdef MP -->
-						<button hover-class="none" class="flex listItem" open-type='contact'>
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myserve.png" mode="widthFix"></image>
-								<text class="title">客服中心</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
-							</view>
-						</button>
-						<!-- #endif -->
-						<!-- #ifndef APP -->
-						<!-- <view class="flex listItem" @click="navTo('/pages/user/shareQrCode')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myshare.png" mode="widthFix"></image>
-								<text class="title">邀请好友</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
-							</view>
-						</view> -->
-						<!-- #endif -->
-						<!-- #ifdef APP -->
-						<view class="flex listItem" @click="shareDomApp">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myshare.png" mode="widthFix"></image>
-								<text class="title">邀请好友</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
-							</view>
-						</view>
-						<!-- #endif -->
-						<!-- #ifndef MP -->
-						<view class="flex listItem" @click="navTo('/pages/public/workwork')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myinfo.png" mode="widthFix"></image>
-								<text class="title">关于我们</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
-							</view>
-						</view>
-						<!-- #endif -->
-						<view class="flex listItem" @click="navTo('/pages/set/set')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myset.png" mode="widthFix"></image>
-								<text class="title">系统设置</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		share
-	} from '@/api/wx';
-	import {
-		getUser
-	} from '@/api/user.js';
-	import {
-		articleList,
-		notify
-	} from '@/api/index.js';
-	import {
-		saveUrl,
-		interceptor
-	} from '@/utils/loginUtils.js';
-	export default {
-		data() {
-			return {
-				user: {
-					avatar: '', //头像
-					nickname: '', //昵称
-				},
-				shareData: {}
-			};
-		},
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
-			...mapState(['baseURL', 'urlFile']),
-			...mapState(['fx']),
-			// 总消息条数
-			notic() {
-				return this.user.question_sum + this.user.notice_sum;
-			},
-		},
-		// 创建时获取分享信息
-		onLoad() {
-			// share().then((res) => {
-			// 	this.shareData = res.data.data
-			// }).catch((res) => {
-			// 	console.log(res, '分享加载失败');
-			// })
-		},
-		onShow() {
-			this.getUser();
-		},
-		methods: {
-			...mapMutations('user', ['setUserInfo']),
-			// 跳转卡片页面
-			navcard() {
-				// 判断是否已经认证
-				if (this.user.work_type_id <=0) {
-					this.navTo('/pages/user/model/modelrz?modelid='+this.user.show_template_id)
-				} else {
-					if (this.user.show_template_id) {
-						this.navTo('/pages/user/model/model?mtype=' + this.user.show_template_id+'&type=3')
-					}else{
+						</view>
+						<view class="flex listItem" @click="navTo('/pages/user/model/mymodellist')">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/mymodel.png" mode="widthFix"></image>
+								<text class="title">已购模板</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</view>
+						<!-- <view class="flex listItem" @click="navTo('/pages/user/myCart/myCart')">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/myaddress.png" mode="widthFix"></image>
+								<text class="title">收货地址</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</view> -->
+						<!-- #ifdef MP -->
+						<button hover-class="none" class="flex listItem" open-type='contact'>
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/myserve.png" mode="widthFix"></image>
+								<text class="title">客服中心</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</button>
+						<!-- #endif -->
+						<!-- #ifndef APP -->
+						<!-- <view class="flex listItem" @click="navTo('/pages/user/shareQrCode')">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/myshare.png" mode="widthFix"></image>
+								<text class="title">邀请好友</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</view> -->
+						<!-- #endif -->
+						<!-- #ifdef APP -->
+						<view class="flex listItem" @click="shareDomApp">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/myshare.png" mode="widthFix"></image>
+								<text class="title">邀请好友</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</view>
+						<!-- #endif -->
+						<!-- #ifndef MP -->
+						<view class="flex listItem" @click="navTo('/pages/public/workwork')">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/myinfo.png" mode="widthFix"></image>
+								<text class="title">关于我们</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</view>
+						<!-- #endif -->
+						<view class="flex listItem" @click="navTo('/pages/set/set')">
+							<view class="flex titleBox">
+								<image class="listIconImg" src="../../static/icon/myset.png" mode="widthFix"></image>
+								<text class="title">系统设置</text>
+							</view>
+							<view class="right flex">
+								<text></text>
+								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		share
+	} from '@/api/wx';
+	import {
+		getUser
+	} from '@/api/user.js';
+	import {
+		articleList,
+		notify
+	} from '@/api/index.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	export default {
+		data() {
+			return {
+				user: {
+					avatar: '', //头像
+					nickname: '', //昵称
+				},
+				shareData: {}
+			};
+		},
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+			...mapState(['baseURL', 'urlFile']),
+			...mapState(['fx']),
+			// 总消息条数
+			notic() {
+				return this.user.question_sum + this.user.notice_sum;
+			},
+		},
+		// 创建时获取分享信息
+		onLoad() {
+			// share().then((res) => {
+			// 	this.shareData = res.data.data
+			// }).catch((res) => {
+			// 	console.log(res, '分享加载失败');
+			// })
+		},
+		onShow() {
+			this.getUser();
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo']),
+			// 跳转卡片页面
+			navcard() {
+				// 判断是否已经认证
+				if (this.user.work_type_id <= 0) {
+					if (this.user.info_audit_status == 1) {
+						this.navTo('/pages/user/model/model?mtype=' + this.user.show_template_id + '&type=3')
+					} else {
+						this.navTo('/pages/user/model/modelrz?modelid=' + this.user.show_template_id)
+					}
+				} else {
+					if (this.user.show_template_id) {
+						this.navTo('/pages/user/model/model?mtype=' + this.user.show_template_id + '&type=3')
+					} else {
 						uni.showModal({
 							title: '错误',
 							content: '您未购买模板请先购买',
 							showCancel: false,
-						});
-					}
-				}
-			},
-
-			//#ifdef APP
-			shareDomApp() {
-				uni.share({
-					provider: 'weixin',
-					type: 0,
-					title: '母婴界严选',
-					summary: '',
-					imageUrl: this.shareData.img,
-					href: this.baseURL + this.urlFile + '/pages/public/register?spread=' + this.userInfo.uid
-				})
-			},
-			//#endif
-			// 获取用户数据
-			getUser() {
-				console.log('data')
-				const that = this;
-				getUser({}).then((e) => {
-					this.user = e.data;
+						});
+					}
+				}
+			},
+
+			//#ifdef APP
+			shareDomApp() {
+				uni.share({
+					provider: 'weixin',
+					type: 0,
+					title: '母婴界严选',
+					summary: '',
+					imageUrl: this.shareData.img,
+					href: this.baseURL + this.urlFile + '/pages/public/register?spread=' + this.userInfo.uid
+				})
+			},
+			//#endif
+			// 获取用户数据
+			getUser() {
+				console.log('data')
+				const that = this;
+				getUser({}).then((e) => {
+					this.user = e.data;
 					this.setUserInfo(e.data)
-					
-				}).catch((e) => {
-					console.log(e, 'sj');
-				})
-				// 系统消息
-				// articleList({}, 1).then((e) => {
-				// 	that.user.question_sum = e.data.count
-				// 	console.log(that, 1);
-				// }).catch((e) => {
-				// 	console.log(e);
-				// })
-				// 报警消息
-				// notify().then((e) => {
-				// 	that.user.notice_sum = e.data.count
-				// }).catch((e) => {
-				// 	console.log(e);
-				// })
-			},
-			changeTab() {
-				this.$emit('tab', true)
-			},
-			navTo(url) {
-				console.log(this.hasLogin,'this.hasLogin');
-				if (!this.hasLogin) {
-					// 保存地址
-					saveUrl();
-					// 登录拦截
-					interceptor();
-				} else {
-					uni.navigateTo({
-						url,
-						fail(e) {
-							console.log(e);
-						}
-					});
-				}
-			},
-		}
-	};
-</script>
-<style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	.listBox {
-		margin-top: 20rpx;
-		overflow: hidden;
-	}
-
-	.list {
-		.listItem {
-			padding: 35rpx 40rpx;
-			margin-bottom: 15rpx;
-			background-color: #FFFFFF;
-			border-radius: 20rpx;
-			border: none;
-			line-height: 1;
-			&::after{
-				border: none;
-			}
-		}
-		
-		.listIconImg {
-			width: 36rpx;
-			height: 36rpx;
-		}
-
-		.right {
-			.img {
-				width: 26rpx;
-			}
-		}
-
-		.titleBox {
-			.title {
-				padding-left: 20rpx;
-				color: $font-color-base;
-				font-size: $font-base;
-			}
-		}
-	}
-
-	.container {
-		height: 100%;
-		background-color: $page-color-base;
-	}
-
-	.content-box {
-		height: 100%;
-	}
-
-	.user-section {
-		padding: 15rpx 30rpx 0;
-		position: relative;
-		background: url('https://api.myjie.cn/resource/appimage/userbg.png');
-		background-size: 100% 100%;
-		padding-top: 100rpx;
-		height: 350rpx;
-	}
-
-	.user-info-box {
-		height: 180rpx;
-		color: white;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		position: relative;
-		z-index: 1;
-
-		.detail {
-			height: 130rpx;
-			flex-grow: 1;
-			overflow: hidden;
-
-			.portrait-box {
-				height: 100%;
-
-				.portrait {
-					width: 130rpx;
-					height: 100%;
-					border: 5rpx solid #fff;
-					border-radius: 50%;
-				}
-			}
-
-			.info-box {
-				margin-left: 20rpx;
-				line-height: 1.5;
-				flex-grow: 1;
-				overflow: hidden;
-
-				.tipLevel {
-					height: 36rpx;
-					margin-right: 20rpx;
-				}
-
-				.username {
-					font-size: 34rpx;
-					color: #FFF;
-					font-weight: bold;
-					height: 100%;
-				}
-
-				.authentication {
-					font-size: 24rpx;
-					color: #FFF;
-					float: left;
-				}
-			}
-
-			.righ-tbox {
-				padding: 10rpx 20rpx;
-				border-radius: 12rpx;
-				font-size: 25rpx;
-				line-height: 1;
-				color: $base-color;
-				background-color: #FFF;
-
-				.right-tip {
-					width: 25rpx;
-					height: 33rpx;
-					margin-right: 10rpx;
-				}
-			}
-		}
-	}
-	.nav-model-rz{
-		background-color:#FFD7E3 ;
-		border-radius: 20rpx;
-		margin: 0 auto;
-		padding: 30rpx;
-		padding-bottom: 15rpx;
-		padding-top: 50rpx;
-		line-height: 1;
-		width: 690rpx;
-		margin-top: -38rpx;
-		.tiptext{
-			color:#F65486 ;
-			font-size: 26rpx;
-			font-weight: bold;
-		}
-		.rztext{
-			color: #FFF;
-			background-color: #F65486;
-			border-radius: 100rpx;
-			padding: 15rpx 20rpx;
-			font-size: 22rpx;
-		}
-	}
-
-	.nav-model {
-		background: url('https://api.myjie.cn/resource/appimage/uservip.png');
-		background-size: 100% 100%;
-		color: #FFF;
-		border-radius: 20rpx;
-		width: 690rpx;
-		height: 157rpx;
-		margin: 0 auto;
-		margin-top: -80rpx;
-		font-weight: bold;
-		z-index: 1;
-		position: relative;
-
-		.next {
-			width: 26rpx;
-			height: 28rpx;
-			margin-right: 40rpx;
-		}
-
-		.right-card {
-			padding-left: 170rpx;
-		}
-
-		.title {
-			font-size: 35rpx;
-		}
-
-		.tip {
-			font-size: 26rpx;
-		}
-
-	}
-
-	.cover-container {
-		padding: 0 30rpx;
-		position: relative;
-		padding-bottom: 20rpx;
-	}
-</style>
+
+				}).catch((e) => {
+					console.log(e, 'sj');
+				})
+				// 系统消息
+				// articleList({}, 1).then((e) => {
+				// 	that.user.question_sum = e.data.count
+				// 	console.log(that, 1);
+				// }).catch((e) => {
+				// 	console.log(e);
+				// })
+				// 报警消息
+				// notify().then((e) => {
+				// 	that.user.notice_sum = e.data.count
+				// }).catch((e) => {
+				// 	console.log(e);
+				// })
+			},
+			changeTab() {
+				this.$emit('tab', true)
+			},
+			navTo(url) {
+				console.log(this.hasLogin, 'this.hasLogin');
+				if (!this.hasLogin) {
+					// 保存地址
+					saveUrl();
+					// 登录拦截
+					interceptor();
+				} else {
+					uni.navigateTo({
+						url,
+						fail(e) {
+							console.log(e);
+						}
+					});
+				}
+			},
+		}
+	};
+</script>
+<style lang="scss">
+	page {
+		height: 100%;
+	}
+
+	.listBox {
+		margin-top: 20rpx;
+		overflow: hidden;
+	}
+
+	.list {
+		.listItem {
+			padding: 35rpx 40rpx;
+			margin-bottom: 15rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			border: none;
+			line-height: 1;
+
+			&::after {
+				border: none;
+			}
+		}
+
+		.listIconImg {
+			width: 36rpx;
+			height: 36rpx;
+		}
+
+		.right {
+			.img {
+				width: 26rpx;
+			}
+		}
+
+		.titleBox {
+			.title {
+				padding-left: 20rpx;
+				color: $font-color-base;
+				font-size: $font-base;
+			}
+		}
+	}
+
+	.container {
+		height: 100%;
+		background-color: $page-color-base;
+	}
+
+	.content-box {
+		height: 100%;
+	}
+
+	.user-section {
+		padding: 15rpx 30rpx 0;
+		position: relative;
+		background: url('https://api.myjie.cn/resource/appimage/userbg.png');
+		background-size: 100% 100%;
+		padding-top: 100rpx;
+		height: 350rpx;
+	}
+
+	.user-info-box {
+		height: 180rpx;
+		color: white;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: relative;
+		z-index: 1;
+
+		.detail {
+			height: 130rpx;
+			flex-grow: 1;
+			overflow: hidden;
+
+			.portrait-box {
+				height: 100%;
+
+				.portrait {
+					width: 130rpx;
+					height: 100%;
+					border: 5rpx solid #fff;
+					border-radius: 50%;
+				}
+			}
+
+			.info-box {
+				margin-left: 20rpx;
+				line-height: 1.5;
+				flex-grow: 1;
+				overflow: hidden;
+
+				.tipLevel {
+					height: 36rpx;
+					margin-right: 20rpx;
+				}
+
+				.username {
+					font-size: 34rpx;
+					color: #FFF;
+					font-weight: bold;
+					height: 100%;
+				}
+
+				.authentication {
+					font-size: 24rpx;
+					color: #FFF;
+					float: left;
+				}
+			}
+
+			.righ-tbox {
+				padding: 10rpx 20rpx;
+				border-radius: 12rpx;
+				font-size: 25rpx;
+				line-height: 1;
+				color: $base-color;
+				background-color: #FFF;
+
+				.right-tip {
+					width: 25rpx;
+					height: 33rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+	}
+
+	.nav-model-rz {
+		background-color: #FFD7E3;
+		border-radius: 20rpx;
+		margin: 0 auto;
+		padding: 30rpx;
+		padding-bottom: 15rpx;
+		padding-top: 50rpx;
+		line-height: 1;
+		width: 690rpx;
+		margin-top: -38rpx;
+
+		.tiptext {
+			color: #F65486;
+			font-size: 26rpx;
+			font-weight: bold;
+		}
+
+		.rztext {
+			color: #FFF;
+			background-color: #F65486;
+			border-radius: 100rpx;
+			padding: 15rpx 20rpx;
+			font-size: 22rpx;
+		}
+	}
+
+	.nav-model {
+		background: url('https://api.myjie.cn/resource/appimage/uservip.png');
+		background-size: 100% 100%;
+		color: #FFF;
+		border-radius: 20rpx;
+		width: 690rpx;
+		height: 157rpx;
+		margin: 0 auto;
+		margin-top: -80rpx;
+		font-weight: bold;
+		z-index: 1;
+		position: relative;
+
+		.next {
+			width: 26rpx;
+			height: 28rpx;
+			margin-right: 40rpx;
+		}
+
+		.right-card {
+			padding-left: 170rpx;
+		}
+
+		.title {
+			font-size: 35rpx;
+		}
+
+		.tip {
+			font-size: 26rpx;
+		}
+
+	}
+
+	.cover-container {
+		padding: 0 30rpx;
+		position: relative;
+		padding-bottom: 20rpx;
+	}
+</style>