活动编辑

pages-approve/activity/detail.vue

@@ -158,7 +158,7 @@
 		<view class="fix-bottom-wrap btns-wrap flex" v-if="haveActiyityStart">
 
 			<block v-if="info.RsCalendarResearcherItem.Status===1 && Role === 'researcher'">
-				<button class="refuse-btn" @click="handleAtions('refuse')">拒绝</button>
+				<button class="refuse-btn" @click="handleActions('refuse')">拒绝</button>
 				<button class="pass-btn" @click="handleActions('accept')">接受</button>
 			</block>
 			<block v-else-if="info.RsCalendarResearcherItem.Status===1 && Role === 'seller'">

pages-approve/activity/list.vue

@@ -47,8 +47,8 @@
 							<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="handleAction(item,'del')">删除</van-button>
-									<van-button type="primary" color="#3385FF" class="btn" size="small" block round @click="handleAction(item,'edit')">修改</van-button>
+									<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>
@@ -67,7 +67,7 @@
 		delMatter,
 		delActivity
 	} from '@/api/roadshow/index.js';
-	import { getRole } from './checkRole.js';
+	import { getRole,editInfoBack } from './checkRole.js';
 	import moment from '@/pages-roadshow/utils/_moment.js';
 	export default {
 		data() {
@@ -81,7 +81,6 @@
 		},
 		onLoad(options) {
 			this.activity_type = options.type;
-			this.initState(options.type);
 			// this.getList()
 			uni.$on('activityApproveListUpdate', (e) => {
 				console.log('activityApproveListUpdate' + e);
@@ -97,7 +96,8 @@
 		onUnload() {
 			uni.$off('activityApproveListUpdate')
 		},
-		onShow() {
+		onShow(options) {
+			this.initState(this.activity_type);
 			this.$nextTick(() => {
 				this.selectComponent('#tabs').resize(); // 解决初始渲染 vant tab 底部条
 			})
@@ -123,6 +123,9 @@
 				uni.setNavigationBarTitle({
 					title
 				})
+				this.page = 1
+				this.finished = false
+				this.list = []
 				this.getList()
 			},
 			
@@ -166,7 +169,7 @@
 			},
 
 			goDetail(e) {
-				if(!['路演','公开会议'].includes(e.ActivityType)) return
+				if(!['活动申请','活动审批'].includes(this.activity_type)) return;
 				
 				uni.navigateTo({
 					url: `/pages-approve/activity/detail?RsCalendarId=${e.RsCalendarId}&RsCalendarResearcherId=${e.RsCalendarResearcherId}`
@@ -178,7 +181,7 @@
 				type === 'del' ? this.delActivityHandle(item) : this.editActivityHandle(item);
 			},
 			
-			/* 删除活动 */
+			/* 删除活动/事项 */
 			delActivityHandle({RsCalendarId,RsCalendarResearcherId,RsMattersId}) {
 				uni.showModal({
 					content: '删除该活动后，将从日历中移除，确定继续吗？',
@@ -203,15 +206,43 @@
 							this.getList();
 							
 						} else if (cancel) {
-							console.log('用户点击取消');
 						}
 					}
 				})
 			},
 			
 			/* 修改 */
-			editActivityHandle() {
+			editActivityHandle(item) {
+				// console.log(item)
+				const { RsCalendarId,RsCalendarResearcherId,RsMattersId,MatterContent,StartDate,StartTime,EndTime,EndDate } = item;
+				//编辑活动
+				if(!RsMattersId) {
+					
+					let form = editInfoBack(item,2),
+							edit_id = RsCalendarId,
+							edit_rs_id = RsCalendarResearcherId;
+							
+					uni.navigateTo({
+						url:`/pages-roadshow/addActivity/index?form=${JSON.stringify(form)}&edit_id=${edit_id}&edit_rs_id=${edit_rs_id}`
+					});	
+				} else {
+					//编辑事项
+					this.editMatter({ RsMattersId,StartDate,StartTime,EndDate,EndTime,MatterContent });
+				}
+			},
+			
+			/* 编辑事项 */
+			editMatter({ RsMattersId,StartDate,StartTime,EndDate,EndTime,MatterContent }) {
+				let matter_form = {
+							startTime: new Date(`${StartDate} ${StartTime}`).getTime(),
+							endTime: new Date(`${EndDate} ${EndTime}`).getTime(),
+							matterContent: MatterContent,
+						},
+						edit_matter_id = RsMattersId;
 				
+				uni.navigateTo({
+					url:`/pages-roadshow/addMatter/index?form=${JSON.stringify(matter_form)}&edit_matter_id=${edit_matter_id}`
+				});	
 			},
 			
 			/* 活动是否已开始 */

pages-roadshow/addActivity/index.vue

@@ -389,7 +389,9 @@
 					icon: 'success'
 				}) : this.addActivityLink({text,content,link,query});
 				
-				this.edit_id && setTimeout(() => { this.cancelHandle(); },1500);
+				this.edit_id && setTimeout(() => { 
+					this.cancelHandle();
+				},1500);
 			},
 		},
 

pages-roadshow/addActivity/mixin.js

@@ -289,11 +289,14 @@ export default {
 			}
 		},
 
-		/* 选择路演/会议形式 */
+		/* 选择路演/会议形式 重置城市平台 */
 		confirmRoadshowType({
 			detail
 		}) {
 			this.formData.roadshowType = detail.value;
+			
+			this.formData.roadshowPlatform = '';
+			this.formData.roadshowCity = '';
 			this.isRoadshowTypePicker = false;
 		},
 		
@@ -316,7 +319,6 @@ export default {
 		confirmArea({detail}) {
 			const { values } = detail;
 			this.formData.roadshowCity = values.map(item => item.name);
-			console.log(this.formData.roadshowCity)
 			
 			this.isAreaPicker = false;
 		},

pages-roadshow/addMatter/index.vue

@@ -119,12 +119,12 @@
 	
 				// 发送请求
 				const { code } = this.edit_matter_id ? await editMatter({
-					RsMattersId: this.edit_matter_id,
+					RsMattersId: Number(this.edit_matter_id),
 					...params
 				}) : await addMatter(params);
 	
 				if(code !== 200) return;
-				// this.$message.success(this.edit_matter_id ? '提交成功' : '添加成功');
+				
 				uni.showToast({
 					title: this.edit_matter_id ? '提交成功' : '添加成功',
 					icon: 'success',
@@ -187,7 +187,7 @@
 			},
 
 			/* 设置默认状态 */
-			initSetState() {
+			initSetState(options) {
 				const {
 					RoleTypeCode
 				} = JSON.parse(uni.getStorageSync('userInfo')) || null;
@@ -200,11 +200,23 @@
 					endTime: endTime,
 					matterContent: ''
 				};
+				
+				/* 编辑时回显表单 */
+				if(options.edit_matter_id) {
+					const { form,edit_matter_id } = options;
+					this.formData = {...this.formData,...JSON.parse(form)};
+					this.edit_matter_id = Number(edit_matter_id);
+				}
+				// console.log(this.formData)
+				
+				uni.setNavigationBarTitle({
+					title: this.edit_matter_id ? '修改事项' : '添加事项'
+				})
 			}
 		},
 
-		onLoad() {
-			this.initSetState();
+		onLoad(options) {
+			this.initSetState(options);
 		},
 
 		onShow() {

utils/config.js

@@ -7,10 +7,10 @@ let baseUrl='http://8.136.199.33:8607/h5adminapi',linkRoadshowUrl;
 
 if(env.envVersion==='develop'){//开发
     baseUrl='http://8.136.199.33:8607/h5adminapi';
-    linkRoadshowUrl='http://192.168.77.17:3000/xcx_h5/ssbg';
+    linkRoadshowUrl='http://localhost:3000/xcx_h5/ssbg';
 }else if(env.envVersion==='trial'){//体验版
     baseUrl='http://8.136.199.33:8607/h5adminapi';
-		linkRoadshowUrl='http://192.168.77.17:3000/xcx_h5/ssbg';
+		linkRoadshowUrl='http://localhost:3000/xcx_h5/ssbg';
 }else if(env.envVersion==='release'){//正式版
     baseUrl='https://ficc.hzinsights.com/h5adminapi';
 		linkRoadshowUrl='';