Merge pull request 'dengjie commit : 删除二次确认' (#24) from den into dev

Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/24

package-lock.json

@@ -0,0 +1,11 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "uview-ui": {
+      "version": "2.0.35",
+      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.35.tgz",
+      "integrity": "sha512-OfMttN3XkHvQosXfd8bjz8ASTvypPoGzBWmQZBJ871bYMCA7t2bDFPlzjbxUj/5ykAjKnZ8zMUapSwSisVt99g=="
+    }
+  }
+}

packageMy/browseHistory/browseHistory.vue

@@ -12,7 +12,7 @@
 							</u-image>
 							<view class="img_tag">{{item.img_tag}}</view>
 						</view>
-						<view style="padding: 16rpx;">
+						<view style="padding: 14rpx 22rpx;">
 							<view class="title_box">
 								<text class="title">{{item.title}}</text>
 								<u-tag :text="item.tag" type="warning" shape="circle"></u-tag>
@@ -30,10 +30,13 @@
 							</view>
 						</view>
 					</view>
-					<u-button v-if="type==1" type="success" text="移除" color="#0EBB5B"></u-button>
+					<u-button v-if="type==1" type="success" text="移除" color="#0EBB5B" @click="showModal()"></u-button>
 					<u-button v-if="type==2" type="success" text="取消收藏" color="#0EBB5B"></u-button>
 				</u-grid-item>
 			</u-grid>
+			<u-modal :show="showM" :content="content" showCancelButton closeOnClickOverlay @confirm="confirm"
+				@cancel="cancel" @close="close">
+			</u-modal>
 		</view>
 	</view>
 </template>
@@ -42,6 +45,8 @@
 	export default {
 		data() {
 			return {
+				showM: false,
+				content: '您确定移除吗?',
 				type: '',
 				productList: [{
 						src: '/static/products/zhanwei_dg.png',
@@ -82,12 +87,57 @@
 			this.type = options.id
 		},
 		methods: {
+			//移除按钮
+			showModal() {
+				this.showM = true
+			},
+			confirm() {
 
+			},
+			cancel() {
+				this.showM = false
+			},
+			close() {
+				this.showM = false
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
+	.u-modal {
+		width: 472rpx !important;
+
+	}
+
+	.u-modal__button-group__wrapper--cancel {
+
+		background: #D8D8D8;
+
+		.u-modal__button-group__wrapper__text {
+			color: #fff !important;
+		}
+	}
+
+	.u-modal__content {
+		padding: 43rpx 104rpx !important;
+		text-indent: 25rpx;
+	}
+
+	.u-modal__content__text {
+		font-size: 32rpx !important;
+		font-weight: 400;
+		color: #252421 !important;
+	}
+
+	.u-modal__button-group__wrapper--confirm {
+		background: #0EBB5B;
+
+		.u-modal__button-group__wrapper__text {
+			color: #fff !important;
+		}
+	}
+
 	.u-button {
 		width: 150rpx !important;
 		height: 50rpx !important;

packageMy/myRelease/myRelease.vue

@@ -12,17 +12,22 @@
 					<view class="release_time">
 						<text>{{item.time}}</text>
 					</view>
-					<view class="btn">
+					<view style="display: flex;">
-						<u-icon name="edit-pen" color="#15CA65" size="20"></u-icon>
+						<view class="btn" @click="editNeeds()">
-						<text class="btn_text">修改</text>
+							<u-icon name="edit-pen" color="#15CA65" size="20"></u-icon>
-					</view>
+							<text class="btn_text">修改</text>
-					<view class="btn">
+						</view>
-						<u-icon name="trash" color="#15CA65" size="20"></u-icon>
+						<view class="btn" @click="showModal()">
-						<text class="btn_text">删除</text>
+							<u-icon name="trash" color="#15CA65" size="20"></u-icon>
+							<text class="btn_text">删除</text>
+						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		<u-modal :show="showM" :content="content" showCancelButton closeOnClickOverlay @confirm="confirm"
+			@cancel="cancel" @close="close">
+		</u-modal>
 		<view v-if="tabCurrent == 1" style="background-color: #fff;">
 			<view v-for="(item,index) in ideasList" :key="index" class="my_line"
 				style="padding: 24rpx 19rpx; border-bottom: 1px solid #EEEEEE;">
@@ -31,13 +36,15 @@
 					<view class="release_time">
 						<text>{{item.time}}</text>
 					</view>
-					<view class="btn">
+					<view style="display: flex;">
-						<u-icon name="edit-pen" color="#15CA65" size="20"></u-icon>
+						<view class="btn" @click="editIdeas()">
-						<text class="btn_text">修改</text>
+							<u-icon name="edit-pen" color="#15CA65" size="20"></u-icon>
-					</view>
+							<text class="btn_text">修改</text>
-					<view class="btn">
+						</view>
-						<u-icon name="trash" color="#15CA65" size="20"></u-icon>
+						<view class="btn" @click="showModal()">
-						<text class="btn_text">删除</text>
+							<u-icon name="trash" color="#15CA65" size="20"></u-icon>
+							<text class="btn_text">删除</text>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -49,6 +56,8 @@
 	export default {
 		data() {
 			return {
+				showM: false,
+				content: '您确定删除吗?',
 				tabCurrent: 0,
 				tabsList: [{
 					name: '需求发布'
@@ -80,11 +89,73 @@
 				this.tabCurrent = data.index
 				this.needsPublishForm = {}
 			},
+			//删除按钮
+			showModal() {
+				this.showM = true
+			},
+			confirm() {
+
+			},
+			cancel() {
+				this.showM = false
+			},
+			close() {
+				this.showM = false
+			},
+			//修改我的需求
+			editNeeds() {
+				console.log('修改需求');
+				uni.redirectTo({
+					url: '/pages/ideasAndNeeds/ideasAndNeeds?index=' + 0
+				})
+			},
+			//修改我的创意
+			editIdeas() {
+				console.log('修改创意');
+				uni.redirectTo({
+					// id=' + ideaId + '&
+					url: '/pages/ideasAndNeeds/ideasAndNeeds?index=' + 1
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
+	.u-modal {
+		width: 472rpx !important;
+
+	}
+
+	.u-modal__button-group__wrapper--cancel {
+
+		background: #D8D8D8;
+
+		.u-modal__button-group__wrapper__text {
+			color: #fff !important;
+		}
+	}
+
+	.u-modal__content {
+		padding: 43rpx 104rpx !important;
+		text-indent: 25rpx;
+	}
+
+	.u-modal__content__text {
+		font-size: 32rpx !important;
+		font-weight: 400;
+		color: #252421 !important;
+	}
+
+	.u-modal__button-group__wrapper--confirm {
+		background: #0EBB5B;
+
+		.u-modal__button-group__wrapper__text {
+			color: #fff !important;
+		}
+	}
+
+
 	.u-tabs {
 		margin-bottom: 10rpx;
 
@@ -132,6 +203,7 @@
 			display: flex;
 			align-items: center;
 			justify-content: center;
+			margin-left: 40rpx;
 
 			.u-icon__icon {
 				top: 1px !important;

pages/my/my.vue

@@ -95,7 +95,7 @@
 			},
 			close() {
 				this.showM = false
-			},
+			}
 		}
 	}
 </script>