事项列表和活动列表拆开 无公用的key

pages-approve/activity/detail.vue

@@ -8,11 +8,11 @@
 					<view class="label">活动时间:</view>
 					<view v-if="info.RsCalendarResearcherItem.StartDate === info.RsCalendarResearcherItem.EndDate">
 						{{info.RsCalendarResearcherItem.StartDate}}({{info.RsCalendarResearcherItem.StartWeek}})
-							{{info.RsCalendarResearcherItem.StartTime}}~{{info.RsCalendarResearcherItem.EndTime}}
+							{{info.RsCalendarResearcherItem.StartTime.substr(0,5)}}~{{info.RsCalendarResearcherItem.EndTime.substr(0,5)}}
 					</view>
 					<view v-else>
 						{{info.RsCalendarResearcherItem.StartDate}}({{info.RsCalendarResearcherItem.StartWeek}})
-							{{info.RsCalendarResearcherItem.StartTime}}~{{info.RsCalendarResearcherItem.EndDate}}({{info.RsCalendarResearcherItem.EndWeek}}){{info.RsCalendarResearcherItem.EndTime}}
+							{{info.RsCalendarResearcherItem.StartTime.substr(0,5)}}~{{info.RsCalendarResearcherItem.EndDate}}({{info.RsCalendarResearcherItem.EndWeek}}){{info.RsCalendarResearcherItem.EndTime.substr(0,5)}}
 					</view>
 				</view>
 				<view class="info-item flex" v-if="Role === 'seller'">
@@ -213,6 +213,7 @@
 						return require('../static/roadshow/back-ico.png') //撤回
 					case 6:
 						return require('../static/roadshow/end-ico.png') //结束
+					default: return ''
 				}
 			},
 			

pages-approve/activity/list.vue

@@ -11,55 +11,78 @@
 		</van-sticky>
 		<van-empty description="暂无数据" :image="require('@/static/empty.png')" v-if="finished&&list.length===0" />
 		<view class="list-wrap" v-else>
-			<view class="item white-wrap" v-for="item in list" :key="item.RsCalendarResearcherId" @click="goDetail(item)">
-				
-				<!-- 路演 公开会议 -->
-				<block v-if="['活动申请','活动审批'].includes(activity_type)">					
-					<view class="title flex">
-						<image src="../../static/man.png" mode="aspectFill" class="icon" v-if="item.ActivityType=='路演'">
-						</image>
-						<image style="width:16px;height:16px" src="../static/icon-1.png" mode="aspectFill" class="icon"
-							v-else></image>
-						<view>{{item.ActivityType=='路演'?item.CompanyName:item.Theme}}</view>
-					</view>
-					<view class="content">
-							<view class="info">活动类型：{{item.RoadshowType}}{{item.ActivityType}}</view>
-							<view class="info">{{activity_type === '活动申请' ? `研究员：${item.ResearcherName}` : `提交销售：${item.SysUserRealName}` }} </view>
-							<view class="info">提交时间：{{item.CreateTime|formatTime}}</view>	
-					</view>
-					<view class="status approve-list-status-wait" v-if="item.Status=='1'">待审批</view>
-					<view class="status approve-list-status-success" v-if="item.Status=='2'">已接受</view>
-					<view class="status approve-list-status-fail" v-if="item.Status=='3'">已拒绝</view>
-					<view class="status approve-list-status-cancel" v-if="item.Status=='4'">已删除</view>
-					<view class="status approve-list-status-cancel" v-if="item.Status=='5'">已撤回</view>
-					<view class="status approve-list-status-cancel" v-if="item.Status=='6'">已结束</view>
-				</block>
-				
-				<!-- 其他 -->
-				<block v-else-if="['内部会议','报告电话会','事项'].includes(activity_type)">
-					<view class="content">
-							<view class="info">{{activity_type==='内部会议' ? '会议' : '活动'}}时间：
-								<block v-if="item.StartDate === item.EndDate">
-									{{item.StartDate}}({{item.StartWeek}})
-									{{item.StartTime}}~{{item.EndTime}}
-								</block>
-								<block v-else>
-									{{item.StartDate}}({{item.StartWeek}}){{item.StartTime}}~{{item.EndDate}}({{item.EndWeek}}){{item.EndTime}}
-								</block>
-							</view>
-							<view class="info" v-if="item.ActivityCategory">活动类别：{{item.ActivityCategory}} </view>
-							<view class="info" v-if="item.MatterContent">事项内容：{{item.MatterContent}} </view>
-							<view class="info" v-if="['内部会议','报告电话会'].includes(activity_type)">参会人员：{{ item.ResearcherName }} </view>
-							
-							<view class="info">添加时间：{{item.CreateTime|formatTime}}</view>
-							
-							<view class="bot-btns" v-if="haveActiyityStart(item)">
-									<van-button type="primary" plain color="#3385FF" class="btn" size="small" block round @click.stop="handleAction(item,'del')">删除</van-button>
-									<van-button type="primary" color="#3385FF" class="btn" size="small" block round @click.stop="handleAction(item,'edit')">修改</van-button>
-							</view>
-					</view>
-				</block>
-			</view>
+			<!-- 活动 -->
+			<block v-if="activity_type !== '事项'">
+				<view class="item white-wrap" v-for="item in list" :key="item.RsCalendarResearcherId" @click="goDetail(item)">
+					
+					<!-- 路演 公开会议 -->
+					<block v-if="['活动申请','活动审批'].includes(activity_type)">					
+						<view class="title flex">
+							<image src="../../static/man.png" mode="aspectFill" class="icon" v-if="item.ActivityType=='路演'">
+							</image>
+							<image style="width:16px;height:16px" src="../static/icon-1.png" mode="aspectFill" class="icon"
+								v-else></image>
+							<view>{{item.ActivityType=='路演'?item.CompanyName:item.Theme}}</view>
+						</view>
+						<view class="content">
+								<view class="info">活动类型：{{item.RoadshowType}}{{item.ActivityType}}</view>
+								<view class="info">{{activity_type === '活动申请' ? `研究员：${item.ResearcherName}` : `提交销售：${item.SysUserRealName}` }} </view>
+								<view class="info">提交时间：{{item.CreateTime|formatTime}}</view>	
+						</view>
+						<view class="status approve-list-status-wait" v-if="item.Status=='1'">待审批</view>
+						<view class="status approve-list-status-success" v-if="item.Status=='2'">已接受</view>
+						<view class="status approve-list-status-fail" v-if="item.Status=='3'">已拒绝</view>
+						<view class="status approve-list-status-cancel" v-if="item.Status=='4'">已删除</view>
+						<view class="status approve-list-status-cancel" v-if="item.Status=='5'">已撤回</view>
+						<view class="status approve-list-status-cancel" v-if="item.Status=='6'">已结束</view>
+					</block>
+					
+					<!-- 其他 -->
+					<block v-else-if="['内部会议','报告电话会'].includes(activity_type)">
+						<view class="content">
+								<view class="info">{{activity_type==='内部会议' ? '会议' : '活动'}}时间：
+										{{item.StartDate}}({{item.StartWeek}})
+										{{item.StartTime.substr(0,5)}}~{{item.EndTime.substr(0,5)}}
+								</view>
+								<view class="info" v-if="item.ActivityCategory">活动类别：{{item.ActivityCategory}} </view>
+								<view class="info" v-if="['内部会议','报告电话会'].includes(activity_type)">参会人员：{{ item.ResearcherName }} </view>
+								
+								<view class="info">添加时间：{{item.CreateTime|formatTime}}</view>
+								
+								<view class="bot-btns" v-if="haveActiyityStart(item)">
+										<van-button type="primary" plain color="#3385FF" class="btn" size="small" block round @click.stop="handleAction(item,'del')">删除</van-button>
+										<van-button type="primary" color="#3385FF" class="btn" size="small" block round @click.stop="handleAction(item,'edit')">修改</van-button>
+								</view>
+						</view>
+					</block>
+				</view>
+			</block>
+			
+			
+			<!-- 事项 -->
+			<block v-else>
+				<view class="item white-wrap" v-for="item in list" :key="item.RsMattersId">
+						<view class="content">
+								<view class="info">{{activity_type==='内部会议' ? '会议' : '活动'}}时间：
+									<block v-if="item.StartDate === item.EndDate">
+										{{item.StartDate}}({{item.StartWeek}})
+										{{item.StartTime.substr(0,5)}}~{{item.EndTime.substr(0,5)}}
+									</block>
+									<block v-else>
+										{{item.StartDate}}({{item.StartWeek}}){{item.StartTime.substr(0,5)}}~{{item.EndDate}}({{item.EndWeek}}){{item.EndTime.substr(0,5)}}
+									</block>
+								</view>
+								<view class="info" v-if="item.MatterContent">事项内容：{{item.MatterContent}} </view>
+								
+								<view class="info">添加时间：{{item.CreateTime|formatTime}}</view>
+								
+								<view class="bot-btns" v-if="haveActiyityStart(item)">
+										<van-button type="primary" plain color="#3385FF" class="btn" size="small" block round @click.stop="handleAction(item,'del')">删除</van-button>
+										<van-button type="primary" color="#3385FF" class="btn" size="small" block round @click.stop="handleAction(item,'edit')">修改</van-button>
+								</view>
+						</view>
+				</view>
+			</block>
 		</view>
 	</view>
 </template>
@@ -185,6 +208,7 @@
 			
 			/* 操作 */
 			handleAction(item,type) {
+				console.log(item)
 				type === 'del' ? this.delActivityHandle(item) : this.editActivityHandle(item);
 			},
 			

pages/login/login.vue

@@ -2,8 +2,10 @@
 	<view class="login-page white-wrap">
 		<view class="title">您好，<br />欢迎使用弘则移动CRM！</view>
 		<view class="input-wrap">
-			<van-field :value="username" @change="inputChange('username',$event)" type="text" placeholder="请输入管理后台账号" custom-style="margin-bottom: 20px;" />
-			<van-field :value="password" @change="inputChange('password',$event)" password placeholder="请输入密码" />
+			<!-- <van-field :value="username" @input="inputChange('username',$event)" type="text" placeholder="请输入管理后台账号" custom-style="margin-bottom: 20px;" />
+			<van-field :value="password" @input="inputChange('password',$event)" password placeholder="请输入密码" /> -->
+			<input class="ipt-item" v-model="username" placeholder="请输入管理后台账号" />
+			<input class="ipt-item" v-model="password" password placeholder="请输入密码" />
 		</view>
 		<van-button custom-class="login-btn" block color="#3385FF" round @click="handleLogin">登录</van-button>
 	</view>
@@ -73,6 +75,12 @@
 			font-weight: bold;
 			margin-bottom: 150rpx;
 		}
+		
+		.ipt-item {
+			border-bottom: 1rpx solid #ebedf0;
+			margin-bottom: 20px;
+			padding: 10rpx 0;
+		}
 
 		.login-btn {
 			margin-top: 90rpx;