优化

components/CusTeamInfo/index.vue

@@ -39,7 +39,9 @@
 			</view>
 			<view class="dialog-box-intro">
 				<view class="dialog-box-intro-title">团队简介</view>
-				<view class="dialog-box-intro-content">{{teamInfo.brief||'暂无'}}</view>
+				<view style="max-height: 280rpx;overflow-y: auto;">
+					<view class="dialog-box-intro-content">{{teamInfo.brief||'暂无'}}</view>
+				</view>
 			</view>
 		</view>
 	</view>

pagesHome/components/receiveList.vue

@@ -14,8 +14,8 @@
 						<view class="name">团队名称：{{item.teamName||''}}</view>
 						<view class="bottom adfacjb">
 							<view class="bottom-left">截止时间：{{item.endTime}}</view>
-							<view class="bottom-right" v-if="item.status===0" @click.stop="showNotice(item)">立即作答</view>
-							<view class="bottom-right" v-else-if="item.status===1" @click.stop="reviewReport(item)">查看报告</view>
+							<view class="bottom-right" @click.stop="showNotice(item)">立即作答</view>
+							<!-- <view class="bottom-right" v-else-if="item.status===1" @click.stop="reviewReport(item)">查看报告</view> -->
 						</view>
 					</view>
 				</up-list-item>

pagesMy/order.vue

@@ -23,6 +23,7 @@
 				</view>
 				<view class="list-pre-btns adf">
 					<view class="list-pre-btns-pre cancel" v-if="item.orderStatus==0" @click.stop="orderCancel(item)">取消订单</view>
+					<view class="list-pre-btns-pre" @click.stop="handlePublish" v-if="item.orderStatus==1">发布问卷</view>
 					<view class="list-pre-btns-pre" @click.stop="handlePay(item)" v-if="item.orderStatus==0">立即支付</view>
 					<view class="list-pre-btns-pre" @click.stop="buyAgain" v-else>再次购买</view>
 				</view>
@@ -128,6 +129,11 @@
 					}
 				})
 			},
+			handlePublish(){
+				uni.reLaunch({
+					url:'/pages/publish'
+				})
+			},
 			handlePay(item){
 				this.orderNo = item.orderNo;
 				this.$refs.wxPay.payShow = true;

pagesMy/orderDetail.vue

@@ -40,12 +40,18 @@
 			</view>
 		</view>
 		<view class="bottom adfacjb">
-			<template v-if="orderInfo.orderStatus!=0">
-				<view class="bottom-default" @click="buyAgain">再次购买</view>
+			<template v-if="orderInfo.orderStatus==1">
+				<view class="bottom-default half qx" @click="backHome">返回首页</view>
+				<view class="bottom-default half" @click="handlePublish">发布问卷</view>
 			</template>
 			<template v-else>
-				<view class="bottom-default half qx" @click="orderCancel">取消订单</view>
-				<view class="bottom-default half" @click="orderPay">立即支付</view>
+				<template v-if="orderInfo.orderStatus!=0">
+					<view class="bottom-default" @click="buyAgain">再次购买</view>
+				</template>
+				<template v-else>
+					<view class="bottom-default half qx" @click="orderCancel">取消订单</view>
+					<view class="bottom-default half" @click="orderPay">立即支付</view>
+				</template>
 			</template>
 		</view>
 		<WechatPay ref="wxPay" @confirmPay="toPay" @cancelPay="cancelPay"></WechatPay>
@@ -103,6 +109,16 @@
 					this.getDetail();
 				})
 			},
+			backHome(){
+				uni.reLaunch({
+					url:'/pages/home'
+				})
+			},
+			handlePublish(){
+				uni.reLaunch({
+					url:'/pages/publish'
+				})
+			},
 			buyAgain(){
 				uni.navigateTo({
 					url:'/pagesPublish/rechargeCenter'

pagesMy/recommendHistory.vue

@@ -12,7 +12,7 @@
 						<view class="list-item-left adfac">
 							<image :src="imgCfg[item.channelType]||defaultImg"></image>
 							<view class="name adffc">
-								<p>{{item.realName}}</p>
+								<p>{{item.realName||'游客'}}</p>
 								<text>来源：{{item.channelName||''}}</text>
 							</view>
 						</view>
@@ -24,7 +24,7 @@
 		<view style="height: 100%;" v-else>
 			<page-empty text="暂无推荐记录"></page-empty>
 		</view>
-		<u-picker :itemHeight="88" :immediateChange="true" :show="show" :columns="typeData" title="渠道类型"
+		<u-picker :immediateChange="true" :show="show" :columns="typeData" title="渠道类型"
 			@cancel="show=false" @confirm="confirm" keyName="name"></u-picker>
 	</view>
 </template>
@@ -65,7 +65,6 @@
 				this.$api.get('/getListByType/channel_type').then(({data:res})=>{
 					if(res.code!==0) return this.$showToast(res.msg)
 					this.typeData = [res.data.map(d=>({name:d.dictLabel,id:d.dictValue}))];
-					resolve()
 				})
 			},
 			scrolltolower(){

pagesPublish/questionnaireFill.vue

@@ -15,25 +15,25 @@
 			<text>问卷答题说明</text>
 			<image :src="imgBase+'icon_memo.png'"></image>
 		</view>
-		<scroll-view class="list" scroll-y="true" :scroll-top="scrollTop" :style="{ height: h - 203 - mt + 'px' }">
-			<div v-if="isLoading" class="loading-container adfacjc">
-				<div class="adfac">
+		<scroll-view class="list" scroll-y="true" :scroll-top="scrollTop" :style="{ height: h - 234 - mt + 'px' }">
+			<view v-if="isLoading" class="loading-container adfacjc">
+				<view class="adfac">
 					<u-loading-icon size="42"></u-loading-icon>
 					<text style="margin-left: 10rpx; font-size: 34rpx; color: #666666">问卷加载中...</text>
-				</div>
-			</div>
+				</view>
+			</view>
 			<template v-else>
 				<view>
-					<div class="l_item" v-for="(item, index) in list" :key="item.id" :id="'question-' + index">
+					<view class="l_item" v-for="(item, index) in list" :key="item.id" :id="'question-' + index">
 						<question-item :item="item" :index="index" @change="handleAnswerChange"></question-item>
-					</div>
+					</view>
 				</view>
 			</template>
 		</scroll-view>
 		<!-- <view class="list">
-			<div class="l_item" v-for="(item, index) in list" :key="item.id" :id="'question-' + index">
+			<view class="l_item" v-for="(item, index) in list" :key="item.id" :id="'question-' + index">
 				<question-item :item="item" :index="index" @change="handleAnswerChange"></<question-item>
-			</div>
+			</view>
 		</view> -->
 		<view class="bottom adfacjb">
 			<view class="bottom-left adffcac" @click="showTeamInfo" v-if="type==1">
@@ -52,8 +52,7 @@
 			</view>
 			<view class="bottom-right" :class="{'questionnaire':turnType==='questionnaire'}" @click="confirmSubmit">提交问卷</view>
 		</view>
-		<cus-notice title="问卷答题说明" :show="noticeShow" :content="noticeContent"
-			@close="noticeShow=false" @handleKnow="noticeShow=false"></cus-notice>
+		<cus-notice :show="noticeShow" @close="noticeShow=false" @handleKnow="noticeShow=false"></cus-notice>
 		<cus-team-info :show="teamShow" :teamInfo="teamInfo" @close="teamShow=false"></cus-team-info>
 		<cus-team-user :show="userShow" :list="teamUserList" @close="userShow=false"></cus-team-user>
 	</view>
@@ -61,7 +60,7 @@
 
 <script>
 	import QuestionItem from '@/components/QuestionItem/index3.vue'
-	import CusNotice from '@/components/CusNotice/index.vue'
+	import CusNotice from '@/components/CusNotice/index2.vue'
 	import CusTeamInfo from '@/components/CusTeamInfo/index.vue'
 	import CusTeamUser from '@/components/CusTeamUser/index.vue'
 	export default {
@@ -410,7 +409,7 @@
 	
 		.list{
 			width: 100%;
-			padding: 0 24rpx;
+			padding: 0 24rpx 20rpx;
 			box-sizing: border-box;
 			// flex: 1;
 			// overflow-y: auto;

uni_modules/uview-ui/components/u-picker/u-picker.vue

@@ -16,11 +16,12 @@
 			></u-toolbar>
 			<picker-view
 				class="u-picker__view"
-				:indicatorStyle="`height: ${$u.addUnit(itemHeight)}`"
+				:indicatorStyle="`height: 50px`"
 				:value="innerIndex"
 				:immediateChange="immediateChange"
 				:style="{
-					height: `${$u.addUnit(visibleItemCount * itemHeight)}`
+					height: `${visibleItemCount * 50}px`,
+					margin:'100px 0 50px'
 				}"
 				@change="changeHandler"
 			>
@@ -35,8 +36,8 @@
 						v-for="(item1, index1) in item"
 						:key="index1"
 						:style="{
-							height: $u.addUnit(itemHeight),
-							lineHeight: $u.addUnit(itemHeight),
+							height: '50px',
+							lineHeight: '50px',
 							fontWeight: index1 === innerIndex[index] ? 'bold' : 'normal'
 						}"
 					>{{ getItemText(item1) }}</text>

uni_modules/uview-ui/libs/config/props/picker.js

@@ -15,7 +15,7 @@ export default {
         title: '',
         columns: () => [],
         loading: false,
-        itemHeight: 44,
+        itemHeight: 88,
         cancelText: '取消',
         confirmText: '确定',
         cancelColor: '#909193',