Merge pull request 'zmr' (#56) from zmr into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/56

common/api/user.js

@@ -256,6 +256,34 @@ export default {
 				if(file) Object.assign(params, { file: file });
 				return vm.$u.post('Order/orderEvaluate', params);
 			},
+			// 信息模块
+			messageIndex({ }) {
+				return vm.$u.post('Message/messageIndex', { });
+			},
+			// 公告咨询列表
+			informationList({ }) {
+				return vm.$u.post('Message/informationList', { });
+			},
+			// 关注列表
+			snsfriendList({ }) {
+				return vm.$u.post('message/snsfriendList', { });
+			},
+			// 公告消息列表
+			informationInfo({ }) {
+				return vm.$u.post('message/informationInfo', { });
+			},
+			// 活动消息列表
+			messageactivityList({ }) {
+				return vm.$u.post('message/messageactivityList', { });
+			},
+			// 全部已读接口
+			delMessage({ type }) {
+				return vm.$u.post('message/delMessage', { type });
+			},
+			// 已读消息
+			delMessage({ type }) {
+				return vm.$u.post('/message/readMessage', { type });
+			},
         }
     }
 }

components/informations/titles/titles.vue

@@ -53,6 +53,7 @@
 </style>
 <script>
 	export default {
+		props:['information'],
 		name: "info_title",
 		data() {
 
@@ -110,6 +111,11 @@
 					default:
 						break;
 				}
+			},
+			// 获取消息首页的内容
+			messageIndex(){
+				console.log("333")
+				
 			}
 		}
 	}

pageA/login/login.vue

@@ -26,7 +26,7 @@
 					</view>
 					<u-checkbox-group @change="checkboxGroupChange" size="27">
 						<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
-						 shape="circle" size="14" active-color="#19BE6B"></u-checkbox>
+						 shape="circle" size="30" active-color="#19BE6B"></u-checkbox>
 					</u-checkbox-group>
 				</view>
 			</view>
@@ -159,32 +159,32 @@
 							})
 							return false
 						}else{
-							// 缓存用户的信息
+							uni.setStorageSync('token', res.data.token);//存储一个字符传值
-							uni.setStorage({
-								key: 'user_info',
-								data: res.data,
-								success: function() {
-									console.log('success');
-									// 跳转首页
 							uni.navigateTo({
 								url : '/pageA/topick/topick'
 							})
+							// 缓存用户的信息
+							// uni.setStorageSync({ 
+							// 	key: 'user_info',
+							// 	data: res.data,
+							// 	success: function() {
+							// 		console.log('success');
+							// 		// 跳转首页
+							// 		uni.navigateTo({
+							// 			url : '/pageA/topick/topick'
+							// 		})
+							// 	}
+							// });
 						}
-							});
-						}
-						
 						
 						// 存储接口请求所需token
-						uni.setStorage({
+						uni.setStorageSync('token', res.data.token);//存储一个字符传值
-						    key: 'token',
+						// // 注册返回参数
-						    data: res.data.token,
+						// this.$refs.uToast.show({
-						});
+						// 	title: res.message,
-						// 注册返回参数
+						// 	type: 'success',
-						this.$refs.uToast.show({
+						// 	url: '/pageA/topick/topick'
-							title: res.message,
+						// })
-							type: 'success',
-							url: '/pageA/topick/topick'
-						})
 					}
 					if (res.errCode == 1) {
 						this.$refs.uToast.show({
@@ -296,7 +296,10 @@
 			width: 630rpx;
 			margin: 0 auto;
 		}
-
+		.u-checkbox__icon-wrap .u-icon{
+			width: 26rpx!important;
+			height: 26rpx;
+		}
 		.more_Login text {
 			display: inline-block;
 			width: 50%;

pageA/register/register.vue

@@ -6,7 +6,7 @@
 			<view class="backes"></view>
 			<view class="content">
 				<view class="title">手机注册</view>
-				<view class="labales">
+				<view class="labales phones">
 					<!-- <text></text> -->
 					<input type="tel" placeholder="请输入您的手机号" v-model="member_mobile" />
 				</view>
@@ -21,9 +21,7 @@
 				<view class="pact">
 					<view></view>
 					<text>我已详细阅读并同意</text>
-					<text class="pact_text">《用户协议》</text>
+					<text class="pact_text" v-for="(item,index) in pact_text" :key="index" @click="pact_click(index)"> {{item.text}} </text>
-					<text class="pact_text">《隐私协议》</text>
-					<text class="pact_text">《使用协议》</text>
 					<u-checkbox-group @change="checkboxGroupChange" size="27">
 						<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
 						 shape="circle" size="14" active-color="#19BE6B" ></u-checkbox>
@@ -72,12 +70,32 @@
 				member_mobile: '', //手机号
 				smslog_type : '1',//状态
 				sms_code : '', //验证码
+				// 协议渲染
+				pact_text: [{
+						"id": '1',
+						"text": "《用户协议》"
+					}, {
+						"id": '2',
+						"text": "《隐私协议》"
+					}, {
+						"id": '3',
+						"text": "《使用协议》"
+					},
+				
+				]
 			};
 		},
 		onLoad() {
 
 		},
 		methods: {
+			// 协议跳转
+			pact_click(index){
+				console.log(index)
+				uni.navigateTo({
+				    url: '/pageA/pactList/pactList?index=' + index
+				});
+			},
 			// 用户注册
 			loginIn(){
 				let type_phone = this.$u.test.mobile( this.member_mobile)
@@ -113,8 +131,8 @@
 					if(res.errCode == 0){
 						// 缓存用户的信息
 						uni.setStorage({
-						    key: 'user_info',
+						    key: 'token',
-						    data: res.data,
+						    data: res.data.token,
 						    success: function () {
 						        console.log('success');
 								// 跳转选择页面
@@ -421,4 +439,7 @@
 		// text-overflow: ellipsis; //溢出用省略号显示
 		// white-space: nowrap; //溢出不换行
 	}
+	.phones{
+		margin-bottom: 90rpx!important;
+	}
 </style>

pageA/topick/topick.vue

@@ -34,9 +34,14 @@
 			};
 		},
 		onLoad(){
+			// 标签的列表展示
+				console.log("11111222")
+				this.$u.api.labelList({
 					
-					// 列表的方法
+				}).then((res) => {
-				this.labelList()
+					console.log(res)
+					this.tab_lables = res.data
+				})
 		},
 		
 		mounted(){
@@ -68,16 +73,7 @@
 					url: '/pages/index/index'
 				});
 			},
-			// 标签的列表展示
-			labelList(){
-				console.log("11111222")
-				this.$u.api.labelList({
 			
-				}).then((res) => {
-					console.log(res)
-					this.tab_lables = res.data
-				})
-			},
 		}
 	};
 </script>

pageD/activity/activity.vue

@@ -4,11 +4,11 @@
 		<view class="activity" v-for="(item, index) in actives" :key="index">
 			<view class="times">{{item.type}}</view>
 			<view class="content">
-				<view class="title">{{item.name}}</view>
+				<view class="title">{{item.title}}</view>
 				<view class="images_about">
-					<image :src="item.url"></image>
+					<image :src="item.goods_image"></image>
 					<view>
-						<text>{{item.about}}</text>
+						<text>{{item.summary}}</text>
 					</view>
 				</view>
 			</view>
@@ -21,43 +21,23 @@
 		data() {
 			return {
 				actives: [
-					{
-						url: '../../pageE/static/mine/1.png',
-						name: '百元趋势新品',
-						type: '2020-05-14 20:11',
-						about: '百搭休闲格纹裙！你值得有用！'
-					},
-					{
-						url: '../../pageE/static/mine/1.png',
-						name: '百元趋势新品',
-						type: '2020-05-14 20:11',
-						about: '百搭休闲格纹裙！你值得有用！'
-					},
-					{
-						url: '../../pageE/static/mine/1.png',
-						name: '百元趋势新品',
-						type: '2020-05-14 20:11',
-						about: '百搭休闲格纹裙！你值得有用！'
-					},
-					{
-						url: '../../pageE/static/mine/1.png',
-						name: '百元趋势新品',
-						type: '2020-05-14 20:11',
-						about: '百搭休闲格纹裙！你值得有用！'
-					},
-					{
-						url: '../../pageE/static/mine/1.png',
-						name: '百元趋势新品',
-						type: '2020-05-14 20:11',
-						about: '百搭休闲格纹裙！你值得有用！'
-					},
 					
 				]
 			};
 		},
+		onLoad(){
+			this.messageactivityList()
+		},
 		methods: {
 			titletext(){
 				console.log("22345")
+			},
+			// 活动消息列表
+			messageactivityList(){
+				this.$u.api.messageactivityList({}).then((res)=>{
+					console.log(res)
+					this.actives = res.data
+				})
 			}
 		},
 		components:{
@@ -66,6 +46,9 @@
 </script>
 
 <style lang="scss" scoped>
+	uni-page-body{
+		height: 100%;
+	}
 	#actives{
 			background: #ECECEC;
 			height: 100%;
@@ -106,6 +89,10 @@
 				width: 400rpx;
 				padding-left: 15rpx;
 				line-height: 36rpx;
+				display: block;
+				overflow:hidden; //超出的文本隐藏
+				text-overflow:ellipsis; //用省略号显示
+				white-space:nowrap; //不换行
 			}
 			view{
 				display: inline-block;

pageD/attention/attention.vue

@@ -52,6 +52,9 @@
 				]
 			};
 		},
+		onLoad(){
+			this.snsfriendList()
+		},
 		methods: {
 			// 点击切换颜色
 			tapClick(index) {
@@ -63,6 +66,12 @@
 					this.rSelect.splice(this.rSelect.indexOf(index), 1); //取消
 					
 				}
+			},
+			snsfriendList(){
+				this.$u.api.snsfriendList({}).then((res)=>{
+					console.log(res)
+					// this.attention = res.data
+				})
 			}
 		},
 		components: {

pageD/notice/notice.vue

@@ -12,9 +12,17 @@
 			return {
 			};
 		},
+		onLoad(){
+			this.informationList()
+		},
 		methods: {
 			titletext(){
 				console.log("22345")
+			},
+			informationList(){
+				this.$u.api.informationList({}).then((res)=>{
+					console.log(res)
+				})
 			}
 		},
 		components:{

pages/information/information.vue

@@ -2,7 +2,7 @@
 	<view>
 		<u-navbar :is-back="false" :title-size="36" title="消息">
 			<view class="slot-wrap">
-				<image src="../../static/pageD/info(3).png"></image>
+				<image src="../../static/pageD/info(3).png" @click="delMessage()"></image>
 				<image src="../../static/pageD/info(2).png"></image>
 			</view>
 		</u-navbar>
@@ -11,7 +11,7 @@
 		</view>
 		<view class="sousuo"></view>
 		<view class="backes">
-			<titles></titles>
+			<titles :information="information_dles"></titles>
 		</view>
 		<!-- 消息通知 -->
 		<view class="backes">
@@ -20,12 +20,13 @@
 					<view>
 						<image :src="item.url"></image>
 					</view>
-					<view class="title">{{item.text}}</view>
+					<view class="title">{{item.title}}</view>
 					<view class="contentes">{{item.contentes}}</view>
 					<view class="times">{{item.title}}</view>
 				</view>
 			</view>
 		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -34,6 +35,29 @@
 	export default {
 		data() {
 			return {
+				information_dles : [{
+						id: 0,
+						url: '../../static/pageD/info(11).png',
+						text: '公告/资讯'
+					},
+					{
+						id: 0,
+						url: '../../static/pageD/info(6).png',
+						text: '活动消息'
+					},
+					{
+						id: 0,
+						url: '../../static/pageD/info(14).png',
+						text: '交易物流'
+
+					},
+					{
+						id: 0,
+						url: '../../static/pageD/info(15).png',
+						text: '关注消息'
+					},
+
+				],
 				// 通知消息
 				information_dl: [{
 						id: 0,
@@ -63,6 +87,10 @@
 				show: false
 			};
 		},
+		onLoad() {
+			// /消息模块的请求
+			this.messageIndex()
+		},
 		methods: {
 			// 选中某个复选框时，由checkbox时触发
 			checkboxChange(e) {
@@ -75,6 +103,46 @@
 			mask_u() {
 				this.show = !this.show
 			},
+			// 消息模块的读取
+			messageIndex(){
+				console.log("消息模块的读取消息模块的读取消息模块的读取")
+				this.$u.api.messageIndex({}).then((res)=>{
+					console.log(res)
+					let data = res.data.allMessages;
+					for(let i in data){
+						var type = data[i].type;
+						console.log(data[i].type)
+						var array = []
+						array.push(type)
+						
+					}
+					console.log( array)
+					// 获取到字段的类型 添加到数据中心
+					for(let j = 0; j < this.information_dles.length; j++ ){
+						console.log()
+						// this.information_dles[j].type = type;
+						for(let k = 0; k < array.length; k++ ){
+							this.information_dles[j].type = array[k];
+							console.log( array[k])
+						}
+					}
+					console.log(this.information_dles)
+				})
+			},
+			// 清空消息
+			delMessage(){
+				this.$u.api.delMessage({
+					type : "all"
+				}).then((res)=>{
+					console.log(res)
+					if(res.errCode == 0){
+						this.$refs.uToast.show({
+							title: '清除成功',
+							type: 'success'
+						})
+					}
+				})
+			}
 			
 		},
 		components: {