xiaoxin il y a 1 an
Parent
commit
a14bae62c1

+ 0 - 50
components/act-set-form/act-set-form.vue

@@ -65,12 +65,6 @@
 				活动开始时间
 				活动开始时间
 			</view>
 			</view>
 			<uni-datetime-picker type="datetime" v-model="form.startTime" placeholder="请选择活动开始时间" :start="dayjs(Date.now()).format('YYYY-MM-DD')" />
 			<uni-datetime-picker type="datetime" v-model="form.startTime" placeholder="请选择活动开始时间" :start="dayjs(Date.now()).format('YYYY-MM-DD')" />
-			<!-- <picker mode="date" :start="dayjs(Date.now()).format('YYYY-MM-DD')" @change="changeStartTime">
-				<view class="box_input">
-					<view class="picker" :class="{ pick: form.startTime }">{{ form.startTime ? form.startTime : '请选择活动开始时间' }}</view>
-					<uni-icons type="down" size="24" color="#A6A6A6"></uni-icons>
-				</view>
-			</picker> -->
 		</view>
 		</view>
 
 
 		<!-- 活动结束时间区域 -->
 		<!-- 活动结束时间区域 -->
@@ -80,12 +74,6 @@
 				活动结束时间
 				活动结束时间
 			</view>
 			</view>
 			<uni-datetime-picker type="datetime" v-model="form.endTime" placeholder="请选择活动结束时间" :start="dayjs(Date.now()).format('YYYY-MM-DD')" />
 			<uni-datetime-picker type="datetime" v-model="form.endTime" placeholder="请选择活动结束时间" :start="dayjs(Date.now()).format('YYYY-MM-DD')" />
-			<!-- <picker mode="date" :start="dayjs(Date.now()).format('YYYY-MM-DD')" @change="changeEndTime">
-				<view class="box_input">
-					<view class="picker" :class="{ pick: form.endTime }">{{ form.endTime ? form.endTime : '请选择活动结束时间' }}</view>
-					<uni-icons type="down" size="24" color="#A6A6A6"></uni-icons>
-				</view>
-			</picker> -->
 		</view>
 		</view>
 
 
 		<!-- 活动地址区域 -->
 		<!-- 活动地址区域 -->
@@ -118,12 +106,6 @@
 				报名开始时间
 				报名开始时间
 			</view>
 			</view>
 			<uni-datetime-picker type="datetime" v-model="form.signsTime" placeholder="请选择报名开始时间" :start="dayjs(Date.now()).format('YYYY-MM-DD')" />
 			<uni-datetime-picker type="datetime" v-model="form.signsTime" placeholder="请选择报名开始时间" :start="dayjs(Date.now()).format('YYYY-MM-DD')" />
-			<!-- <picker mode="date" :start="dayjs(Date.now()).format('YYYY-MM-DD')" @change="changeApplyStartTime">
-				<view class="box_input">
-					<view class="picker" :class="{ pick: form.signsTime }">{{ form.signsTime ? form.signsTime : '请选择报名开始时间' }}</view>
-					<uni-icons type="down" size="24" color="#A6A6A6"></uni-icons>
-				</view>
-			</picker> -->
 		</view>
 		</view>
 
 
 		<!-- 报名结束时间区域 -->
 		<!-- 报名结束时间区域 -->
@@ -133,12 +115,6 @@
 				报名结束时间
 				报名结束时间
 			</view>
 			</view>
 			<uni-datetime-picker type="datetime" v-model="form.signeTime" placeholder="请选择报名结束时间" :start="dayjs(Date.now()).format('YYYY-MM-DD')" />
 			<uni-datetime-picker type="datetime" v-model="form.signeTime" placeholder="请选择报名结束时间" :start="dayjs(Date.now()).format('YYYY-MM-DD')" />
-			<!-- <picker mode="date" :start="dayjs(Date.now()).format('YYYY-MM-DD')" @change="changeApplyEndTime">
-				<view class="box_input">
-					<view class="picker" :class="{ pick: form.signeTime }">{{ form.signeTime ? form.signeTime : '请选择报名结束时间' }}</view>
-					<uni-icons type="down" size="24" color="#A6A6A6"></uni-icons>
-				</view>
-			</picker> -->
 		</view>
 		</view>
 
 
 		<!-- 报名总人数区域 -->
 		<!-- 报名总人数区域 -->
@@ -429,20 +405,6 @@ const handleFinish = () => {
 	})
 	})
 }
 }
 
 
-// 选择活动开始时间回调
-// const changeStartTime = (e) => {
-// 	console.log(e)
-// 	console.log(form.value.startTime)
-// 	// form.value.startTime = e.detail.value + ' 00:00:00'
-// 	// console.log(form.value)
-// }
-
-// 选择活动结束时间回调
-// const changeEndTime = (e) => {
-// 	form.value.endTime = e.detail.value + ' 00:00:00'
-// 	// console.log(form.value)
-// }
-
 // 点击选择地址回调
 // 点击选择地址回调
 const clickAddress = () => {
 const clickAddress = () => {
 	uni.chooseLocation({
 	uni.chooseLocation({
@@ -466,18 +428,6 @@ const inputDesc = (e) => {
 	// console.log(form.value)
 	// console.log(form.value)
 }
 }
 
 
-// 选择报名开始时间回调
-// const changeApplyStartTime = (e) => {
-// 	form.value.signsTime = e.detail.value + ' 00:00:00'
-// 	// console.log(form.value)
-// }
-
-// 选择报名结束时间回调
-// const changeApplyEndTime = (e) => {
-// 	form.value.signeTime = e.detail.value + ' 00:00:00'
-// 	// console.log(form.value)
-// }
-
 // 选择报名范围时的回调
 // 选择报名范围时的回调
 const changeRange = (e) => {
 const changeRange = (e) => {
 	let index = e.detail.value
 	let index = e.detail.value

+ 9 - 1
pages/act_album/act_album.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 	<view class="container">
 		<!-- 图片列表区域 -->
 		<!-- 图片列表区域 -->
 		<view class="list">
 		<view class="list">
-			<image v-for="(item, index) in imgList" :key="index" class="img" mode="aspectFill" :src="item" />
+			<image v-for="(item, index) in imgList" :key="index" class="img" mode="aspectFill" :src="item" @click="cilckImg(index, imgList)" />
 		</view>
 		</view>
 
 
 		<!-- 没有数据时展示的页面 -->
 		<!-- 没有数据时展示的页面 -->
@@ -40,6 +40,14 @@ const clickUpload = () => {
 		url: `/pages/school_photo_upload/school_photo_upload?type=1&currentId=${currentId.value}`
 		url: `/pages/school_photo_upload/school_photo_upload?type=1&currentId=${currentId.value}`
 	})
 	})
 }
 }
+
+// 点击图片回调
+const cilckImg = (current, urls) => {
+	uni.previewImage({
+		urls,
+		current
+	})
+}
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

+ 6 - 1
pages/act_detail/act_detail.vue

@@ -79,7 +79,7 @@
 		</view>
 		</view>
 		<view class="album" v-if="info.isImage == 1 && info.images?.length">
 		<view class="album" v-if="info.isImage == 1 && info.images?.length">
 			<!-- 每一张照片区域 -->
 			<!-- 每一张照片区域 -->
-			<image class="img" :src="item" mode="aspectFill" v-for="(item, index) in info.images.splice(0, 3)" :key="item"></image>
+			<image class="img" :src="item" mode="aspectFill" v-for="(item, index) in actImgList" :key="item"></image>
 		</view>
 		</view>
 
 
 		<!-- 按钮区域 -->
 		<!-- 按钮区域 -->
@@ -139,6 +139,9 @@ const currentId = ref()
 const lat = ref('')
 const lat = ref('')
 const lng = ref('')
 const lng = ref('')
 
 
+// 活动相册列表
+const actImgList = ref([])
+
 onLoad((options) => {
 onLoad((options) => {
 	if (options.id) {
 	if (options.id) {
 		currentId.value = options.id
 		currentId.value = options.id
@@ -157,6 +160,8 @@ const getData = async (id) => {
 	const res = await getDetailInfoById(data)
 	const res = await getDetailInfoById(data)
 	// console.log(res)
 	// console.log(res)
 	info.value = res.data
 	info.value = res.data
+	let arr = JSON.parse(JSON.stringify(info.value.images))
+	actImgList.value = arr.splice(0, 3)
 }
 }
 
 
 // 获取当前用户经纬度
 // 获取当前用户经纬度

+ 1 - 1
pages/index/index.vue

@@ -94,4 +94,4 @@ const getCardnumberURL = () => {
 }
 }
 </script>
 </script>
 
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1
unpackage/dist/build/web/assets/act_album-D2bnMLGe.css


+ 1 - 1
unpackage/dist/build/web/index.html

@@ -14,7 +14,7 @@
     <title>H5_schoolFellow</title>
     <title>H5_schoolFellow</title>
     <!--preload-links-->
     <!--preload-links-->
     <!--app-context-->
     <!--app-context-->
-    <script type="module" crossorigin src="/alumnus/alumniH5/assets/index-B7wpxaRz.js"></script>
+    <script type="module" crossorigin src="/alumnus/alumniH5/assets/index-wNOaAG3_.js"></script>
     <link rel="stylesheet" crossorigin href="/alumnus/alumniH5/assets/index-DKUHF3PI.css">
     <link rel="stylesheet" crossorigin href="/alumnus/alumniH5/assets/index-DKUHF3PI.css">
   </head>
   </head>
   <body>
   <body>

+ 14 - 0
unpackage/dist/dev/mp-weixin/app.js

@@ -9,6 +9,20 @@ if (!Math) {
   "./pages/back_school/back_school.js";
   "./pages/back_school/back_school.js";
   "./pages/activity/activity.js";
   "./pages/activity/activity.js";
   "./pages/set_act/set_act.js";
   "./pages/set_act/set_act.js";
+  "./pages/school_represent/school_represent.js";
+  "./pages/school_represent_detail/school_represent_detail.js";
+  "./pages/school_form/school_form.js";
+  "./pages/school_photo/school_photo.js";
+  "./pages/school_photo_upload/school_photo_upload.js";
+  "./pages/news/news.js";
+  "./pages/news_detail/news_detail.js";
+  "./pages/address_book/address_book.js";
+  "./pages/check/check.js";
+  "./pages/act_detail/act_detail.js";
+  "./pages/people_detail/people_detail.js";
+  "./pages/act_album/act_album.js";
+  "./pages/home/home.js";
+  "./pages/404/404.js";
 }
 }
 const _sfc_main = {
 const _sfc_main = {
   onLaunch: function() {
   onLaunch: function() {

+ 20 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -6,7 +6,21 @@
     "pages/org_detail/org_detail",
     "pages/org_detail/org_detail",
     "pages/back_school/back_school",
     "pages/back_school/back_school",
     "pages/activity/activity",
     "pages/activity/activity",
-    "pages/set_act/set_act"
+    "pages/set_act/set_act",
+    "pages/school_represent/school_represent",
+    "pages/school_represent_detail/school_represent_detail",
+    "pages/school_form/school_form",
+    "pages/school_photo/school_photo",
+    "pages/school_photo_upload/school_photo_upload",
+    "pages/news/news",
+    "pages/news_detail/news_detail",
+    "pages/address_book/address_book",
+    "pages/check/check",
+    "pages/act_detail/act_detail",
+    "pages/people_detail/people_detail",
+    "pages/act_album/act_album",
+    "pages/home/home",
+    "pages/404/404"
   ],
   ],
   "window": {
   "window": {
     "navigationBarTextStyle": "black",
     "navigationBarTextStyle": "black",
@@ -14,5 +28,10 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
     "backgroundColor": "#F8F8F8"
   },
   },
+  "permission": {
+    "scope.userLocation": {
+      "desc": ""
+    }
+  },
   "usingComponents": {}
   "usingComponents": {}
 }
 }

Fichier diff supprimé car celui-ci est trop grand
+ 34 - 3
unpackage/dist/dev/mp-weixin/app.wxss