专家版类型改为0；用户类型改为用户标签

pages/login.vue

@@ -147,7 +147,8 @@
 												channelType:that.channelType||'',
 												referrerId:res.data.data.referrerId||that.referrerId||'',
 												teamQuestionnaireId:res.data.data.teamQuestionnaireId||that.teamQuestionnaireId||'',
-												isRegister:res.data.data.isRegister
+												isRegister:res.data.data.isRegister,
+												userBrief:res.data.data.userBrief||'',
 											}
 										}))
 									})
@@ -173,7 +174,8 @@
 					channelType:this.channelType||'',
 					referrerId:res.data.data.referrerId||this.referrerId||'',
 					teamQuestionnaireId:res.data.data.teamQuestionnaireId||this.teamQuestionnaireId||'',
-					isRegister:res.data.data.isRegister
+					isRegister:res.data.data.isRegister,
+					userBrief:res.data.data.userBrief||'',
 				}));
 				
 				uni.hideLoading();

pages/my.vue

@@ -11,7 +11,7 @@
 					<view class="top-left-info" @click="handleLogin">
 						<view class="top-left-info-name">{{userInfo.realName||'未登录'}}</view>
 						<view class="top-left-info-tip" v-if="!userInfo.id">点击立即登录</view>
-						<view class="top-left-info-version" v-else>{{typeCfg[headData.type]||'基础版'}}</view>
+						<view class="top-left-info-version" v-else>{{headData.userBriefText||'普通用户'}}</view>
 					</view>
 				</view>
 				<view class="top-right">
@@ -73,7 +73,7 @@
 				typeCfg:{
 					1:'基础版',
 					2:'专业版',
-					3:'专家版',
+					0:'专家版',
 				},
 				menuList:[
 					{
@@ -111,10 +111,20 @@
 			} 
 		},
 		methods:{
-			getMyInfo(userId){
+			getTeamScaleData(){
+				return new Promise(resolve=>{
+					this.$api.get('/getListByType/user_brief').then(({data:res})=>{
+						if(res.code!==0) return this.$showToast(res.msg)
+						resolve(res.data.map(d=>({name:d.dictLabel,id:d.dictValue})))
+					})
+				})
+			},
+			async getMyInfo(userId){
+				const userBrief = await this.getTeamScaleData()
 				this.$api.get(`/wx/myCount/${userId}`,this.params).then(({data:res})=>{
 					if(res.code!==0) return this.$showToast(res.msg)
 					this.headData = res.data;
+					this.$set(this.headData,'userBriefText',userBrief.find(u=>u.id==this.headData.userBrief).name||'普通用户')
 				})
 			},
 			handleLogin(){
@@ -188,11 +198,11 @@
 							margin-top: 31rpx;
 						}
 						&-version{
-							width: 129rpx;
+							width: 164rpx;
 							height: 40rpx;
-							background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/my_version_bg.png') no-repeat;
+							background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/my_version_bg2.png') no-repeat;
 							background-size: 100% 100%;
-							padding-left: 48rpx;
+							padding-left: 45rpx;
 							box-sizing: border-box;
 							font-family: PingFang-SC, PingFang-SC;
 							font-weight: bold;

pages/publish.vue

@@ -42,7 +42,7 @@
 				typeDict:{
 					1:'基础版',
 					2:'专业版',
-					3:'专家版，敬请期待'
+					0:'专家版，敬请期待'
 				},
 				buyShow:false,
 				buyImgList:[
@@ -59,7 +59,7 @@
 		},
 		methods:{
 			getList(){
-				this.$api.get('/core/questionnaire/list').then(({data:res})=>{
+				this.$api.get('/core/questionnaire/list?mode=1').then(({data:res})=>{
 					if(res.code!==0) return this.$showToast(res.msg)
 					this.list = res.data
 				})
@@ -67,7 +67,7 @@
 			handleTurnPage(item){
 				this.type = item.type;
 				this.questionnaireName = item.title;
-				if(item.type==3) return this.$showToast('敬请期待专家版~')
+				if(item.type==0) return this.$showToast('敬请期待专家版~')
 				this.$api.get(`/que/order/getUseFrequency/${JSON.parse(uni.getStorageSync('userInfo')).id}/${item.type}`).then(({data:res})=>{
 					if(res.code!==0) return this.$showToast(res.msg)
 					if(res.data>0){

pages/registerInfo.vue

@@ -83,7 +83,8 @@
 						channelType:this.user.channelType,
 						referrerId:this.user.referrerId,
 						teamQuestionnaireId:this.user.teamQuestionnaireId,
-						isRegister:1
+						isRegister:1,
+						userBrief:this.user.userBrief,
 					}));
 					
 					uni.hideLoading();

pagesHome/components/report/generateList.vue

@@ -54,7 +54,7 @@
 				typeCfg:{
 					1:'基础版',
 					2:'专业版',
-					3:'专家版'
+					0:'专家版'
 				},
 				stateDict:{
 					'0':'生成中',

pagesHome/components/report/receiveList.vue

@@ -40,7 +40,7 @@
 				typeCfg:{
 					1:'基础版',
 					2:'专业版',
-					3:'专家版'
+					0:'专家版'
 				},
 			}
 		},

pagesHome/components/report/sendList.vue

@@ -46,7 +46,7 @@
 				typeDict:{
 					'1':'基础版',
 					'2':'专业版',
-					'3':'专家版'
+					'0':'专家版'
 				}
 			}
 		},

pagesPublish/rechargeCenter.vue

@@ -8,7 +8,7 @@
 			<view class="info-right">
 				<view class="info-right-name adfac">
 					<view class="text">{{userInfo.realName||'游客'}}</view>
-					<view class="version">{{typeCfg[headData.type]||'基础版'}}</view>
+					<view class="version">{{headData.userBriefText||'普通用户'}}</view>
 				</view>
 				<view class="info-right-tip">可用次数：基础版{{headData.basicCount||0}}次，专业版{{headData.proCount||0}}次</view>
 			</view>
@@ -118,7 +118,7 @@
 				typeCfg:{
 					1:'基础版',
 					2:'专业版',
-					3:'专家版',
+					0:'专家版',
 				},
 				tindex:0,
 				pindex:'',
@@ -144,10 +144,20 @@
 			}
 		},
 		methods:{
-			getMyInfo(userId){
+			getTeamScaleData(){
+				return new Promise(resolve=>{
+					this.$api.get('/getListByType/user_brief').then(({data:res})=>{
+						if(res.code!==0) return this.$showToast(res.msg)
+						resolve(res.data.map(d=>({name:d.dictLabel,id:d.dictValue})))
+					})
+				})
+			},
+			async getMyInfo(userId){
+				const userBrief = await this.getTeamScaleData()
 				this.$api.get(`/wx/myCount/${userId}`,this.params).then(({data:res})=>{
 					if(res.code!==0) return this.$showToast(res.msg)
 					this.headData = res.data;
+					this.$set(this.headData,'userBriefText',userBrief.find(u=>u.id==this.headData.userBrief).name||'普通用户')
 				})
 			},
 			changeTab(index){
@@ -228,6 +238,7 @@
 				image{
 					width: 100%;
 					height: 100%;
+					border-radius: 50%;
 				}
 			}
 			&-right{
@@ -243,11 +254,11 @@
 						line-height: 32rpx;
 					}
 					.version{
-						width: 129rpx;
+						width: 160rpx;
 						height: 40rpx;
-						background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/my_version_bg.png') no-repeat;
+						background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/my_version_bg2.png') no-repeat;
 						background-size: 100% 100%;
-						padding-left: 48rpx;
+						padding-left: 45rpx;
 						box-sizing: border-box;
 						font-family: PingFang-SC, PingFang-SC;
 						font-weight: bold;