lyqu %!s(int64=4) %!d(string=hai) anos
pai
achega
2bb6aa2d69

+ 1 - 1
pages/activityList/activity/boost.vue

@@ -105,7 +105,7 @@
 			}
 			}
 		},
 		},
 		onLoad(options) {
 		onLoad(options) {
-			this.activityId = optionss.activityId;
+			this.activityId = options.activityId;
 			this.senderId = uni.getStorageSync("userId");
 			this.senderId = uni.getStorageSync("userId");
 			this.getBoostDetail(options.activityId, options.receiverId);
 			this.getBoostDetail(options.activityId, options.receiverId);
 			this.currentPresentSum = this.present[this.current].price;
 			this.currentPresentSum = this.present[this.current].price;

+ 15 - 6
pages/activityList/activity/signUp.vue

@@ -1,9 +1,10 @@
 <template>
 <template>
 	<view>
 	<view>
-		<view class="image-container" @click="upload">
+		<view class="image-container" @click="selectShow = true">
 			<view class="cuIcon-roundaddfill theme-color" style="font-size: 80upx;padding: 100upx 0 30upx 0;"></view>
 			<view class="cuIcon-roundaddfill theme-color" style="font-size: 80upx;padding: 100upx 0 30upx 0;"></view>
 			<view class="text-black text-bold text-sm">添加图片或视频</view>
 			<view class="text-black text-bold text-sm">添加图片或视频</view>
 		</view>
 		</view>
+		<u-action-sheet :list="list" @click="upload" v-model="selectShow"></u-action-sheet>
 		<view class="basic-container">
 		<view class="basic-container">
 			<view class="padding-sm">
 			<view class="padding-sm">
 				<text class="cuIcon-titles theme-color" style="font-size: 36upx;"></text>
 				<text class="cuIcon-titles theme-color" style="font-size: 36upx;"></text>
@@ -50,6 +51,12 @@
 		data() {
 		data() {
 			return {
 			return {
 				detail:{},
 				detail:{},
+				selectShow: false,
+				list: [{
+					text: '上传图片'
+				}, {
+					text: '上传视频'
+				}],
 				current: 0,
 				current: 0,
 				classification: [],
 				classification: [],
 				name: '',
 				name: '',
@@ -61,14 +68,16 @@
 			this.getActivityDetail(options.activityId);
 			this.getActivityDetail(options.activityId);
 		},
 		},
 		methods: {
 		methods: {
-			upload(){
-				this.$mpi.uploadFile().then(res=>{
-					console.log(res.data);
-				})
+			upload(index) {
+				console.log(index);
+				// this.$mpi.uploadFile().then(res => {
+				// 	let obj = JSON.parse(res);
+				// 	console.log(res.data);
+				// })
 			},
 			},
 			getActivityDetail(id) {
 			getActivityDetail(id) {
 				this.$u.api.activity.detail({id: id}).then(res => {
 				this.$u.api.activity.detail({id: id}).then(res => {
-					this.detail=res
+					this.detail = res
 					this.classification = res.classification.split(',');
 					this.classification = res.classification.split(',');
 				})
 				})
 			},
 			},

+ 1 - 0
pages/activityList/mine/edit.vue

@@ -98,6 +98,7 @@
 						id: this.userData.id,
 						id: this.userData.id,
 						name: this.userData.nickName,
 						name: this.userData.nickName,
 						gender: this.sex == '男' ? 1 : this.sex == '女' ? 2 : 0,
 						gender: this.sex == '男' ? 1 : this.sex == '女' ? 2 : 0,
+						birthday: this.birthday,
 						introduce: this.introduction,
 						introduce: this.introduction,
 					}
 					}
 					this.$u.api.user.submit(data).then(res => {
 					this.$u.api.user.submit(data).then(res => {

+ 1 - 2
pages/activityList/mine/myGift.vue

@@ -58,7 +58,7 @@
 						</view>
 						</view>
 					</view>
 					</view>
 					<view class="flex justify-end padding" style="margin-top: -110upx;">
 					<view class="flex justify-end padding" style="margin-top: -110upx;">
-						<view class="count">x{{item.count}}</view>
+						<view class="count" style="border: #d9d9d9 1upx solid;">x{{item.count}}</view>
 					</view>
 					</view>
 				</view>
 				</view>
 			</block>
 			</block>
@@ -216,7 +216,6 @@
 		.count {
 		.count {
 			width: 60upx;
 			width: 60upx;
 			height: 60upx;
 			height: 60upx;
-			border: #d9d9d9 1upx solid;
 			border-radius: 16upx;
 			border-radius: 16upx;
 			display: flex;
 			display: flex;
 			align-items: center;
 			align-items: center;