Merge branch 'master' of https://git.yuzhankeji.cn/TmOct5/ZhHealth

App.vue

@@ -5,9 +5,7 @@
     export default {
         onLaunch: function() {
             im.initIm('lmxuhwaglu76d')
-			
 			return
-
             //#ifdef APP-PLUS
             // 获取系统版本号
             getVersions({

apis/index.js

@@ -64,6 +64,12 @@ const request = (parameter, hideLoding = true) => {
 					return
 				}
 				errToast(res.statusCode)
+			},
+			fail(err) {
+				uni.showToast({
+					title: err.errMsg,
+					icon : 'none'
+				})
 			}
 		})
 	})

pages.json

@@ -144,7 +144,7 @@
             "path": "pages/store/index",
             "name": "Store",
             "style": {
-                "navigationBarTitleText": "健康生活",
+                "navigationBarTitleText": "好物",
                 "enablePullDownRefresh": true,
                 "app-plus": {
                     "titleNView": {
@@ -420,7 +420,7 @@
             "path": "pages/im/friends/index",
             "name": "imFriends",
             "style": {
-                "navigationBarTitleText": "我的好友"
+                "navigationBarTitleText": "我的好友"
             }
         },
         {
@@ -434,7 +434,8 @@
             "path": "pages/im/friends/info",
             "name": "imFriendsInfo",
             "style": {
-                "navigationBarTitleText": ""
+                "navigationBarTitleText": "好友资料",
+				"navigationBarBackgroundColor":"#FFFFFF"
             }
         },
         {

pages/auth/auth.vue

@@ -82,20 +82,20 @@ export default {
             smsAuth({
                 mobileNo: this.phone,
                 code: this.code,
-            })
+            }).then((res) => {
-                .then((res) => {
+				console.log(111)
-                    this.$store.commit(
+				this.$store.commit(
-                        "setToken",
+					"setToken",
-                        res.token_type + " " + res.access_token
+					res.token_type + " " + res.access_token
-                    );
+				);
-                    this.$Router.back();
+				this.$Router.back();
-                })
+			}).catch((err) => {
-                .catch((err) => {
+				console.log(2222)
-                    uni.showToast({
+				uni.showToast({
-                        title: err.message,
+					title: err.message,
-                        icon: "none",
+					icon: "none",
-                    });
+				});
-                });
+			});
         },
         // 获取验证码
         getPhoneCode() {

pages/im/friends/index.vue

@@ -13,14 +13,14 @@
             <u-line></u-line>
         </view>
 
-        <u-index-list :indexList="indexList">
+        <u-index-list :indexList="indexList" activeColor="#34CE98">
             <template v-for="(item, index) in itemArr">
                 <!-- #ifdef APP-NVUE -->
-                <u-index-anchor :text="indexList[index]" :key="index"></u-index-anchor>
+                <u-index-anchor bgColor="#F3F6FB" color="#666" :text="indexList[index]" :key="index"></u-index-anchor>
                 <!-- #endif -->
                 <u-index-item :key="index">
                     <!-- #ifndef APP-NVUE -->
-                    <u-index-anchor :text="indexList[index]"></u-index-anchor>
+                    <u-index-anchor :text="indexList[index]" bgColor="#F3F6FB" color="#666"></u-index-anchor>
                     <!-- #endif -->
                     <view class="list" v-for="(item1, index1) in item" :key="index1">
                         <view class="list__item" @click="toInfo">

pages/im/friends/info.vue

@@ -1,8 +1,28 @@
-<template>
+<template>
-    <div>
+	<view class="content">
-        好友资料，
+		<!-- 用户信息 -->
-        <u-button @click="toPrivate">发送消息</u-button>
+		<view class="user-info">
-    </div>
+			<u-avatar
+				src="https://cdn.uviewui.com/uview/album/1.jpg"
+				size="58"
+			></u-avatar>
+			<view class="nickname">唐明明</view>
+			<view class="sex">
+				<u-tag text="男" color="#fff" borderColor="#5db6ee" size="mini" icon="man" bgColor="#5db6ee"></u-tag>
+				<!-- <u-tag text="女" color="#fff" borderColor="#e4867a" size="mini" icon="woman" bgColor="#e4867a"></u-tag> -->
+			</view>
+		</view>
+		<view class="user-lists">
+			<view class="user-lists-item">
+				<label>地区</label>
+				<text>黑龙江 哈尔滨</text>
+			</view>
+		</view>
+		<!-- 发送消息 -->
+		<view class="info-footer">
+			<button class="open-btn" @click="toPrivate">发送消息</button>
+		</view>
+	</view>
 </template>
 
 <script>
@@ -17,5 +37,72 @@
     }
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.content{
+		min-height: 100vh;
+		background: $window-color;
+	}
+	// 用户信息
+	.user-info{
+		padding: $padding*3 $padding;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		background: white;
+		.nickname{
+			font-size: 42rpx;
+			padding-top: $padding;
+			color: $text-color;
+		}
+		.sex{
+			padding-top: $padding/2;
+			text{
+				font-size: $title-size-sm;
+				background: #303133;
+				padding: 0 10rpx;
+				color: white;
+				border-radius: $radius-m;
+				line-height: 30rpx;
+				display: inline-block;
+			}
+		}
+	}
+	.user-lists{
+		margin-top: $margin;
+		background: white;
+		.user-lists-item{
+			padding: 0 $padding;
+			display: flex;
+			justify-content: space-between;
+			line-height: 90rpx;
+			font-size: $title-size-lg;
+			label{
+				color: $text-color;
+			}
+			text{
+				color: $text-gray;
+			}
+		}
+	}
+	// 发送消息
+	.info-footer{
+		padding: $padding;
+		width: 100%;
+		box-sizing: border-box;
+		.open-btn{
+			width: 100%;
+			height: 90rpx;
+			line-height: 90rpx;
+			background: $main-color;
+			border-radius: $radius-lg;
+			padding: 0;
+			margin: 0;
+			color: white;
+			font-size: $title-size;
+			&::after{
+				display: none;
+			}
+		}
+	}
 </style>

pages/im/index.vue

@@ -92,7 +92,7 @@
 				}
 				this.getConversationList()
 				this.isShown = true
-			}
+			}
         },
         onHide() {
             this.isShown = false

pages/index/index.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="status">
 			<view class="status-main">
-				<view class="helloe">欢迎使用ZH健康</view>
+				<view class="helloe">欢迎使用ZH-HEALTH健康</view>
 				<view class="btns">
 					<view class="btns-item" @click="onBtn('signIndex')"><image src="@/static/icon/sign-icon.gif" mode="widthFix"></image></view>
 					<view class="btns-item show" @click="onBtn('noticeIndex')"><uni-icons custom-prefix="iconfont" type="icon-pinglun" size="25"></uni-icons></view>

pages/menu/classify.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="content">
-        <u-sticky bgColor="#fff" zIndex="99">
+        <view class="tab-sticky">
             <u-tabs
                 :current="tabsIndex"
                 :list="tabArr"
@@ -8,7 +8,7 @@
                 lineColor="#34CE98"
                 :activeStyle="{fontWeight: 'bold', fontSize: '30rpx'}"
             />
-        </u-sticky>
+        </view>
         <view class="box">
             <oct-menu
                 :lists="menuData"
@@ -88,6 +88,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.tab-sticky{
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		background: white;
+		z-index: 99;
+	}
     .content {
         background-color: $window-color;
 		min-height: 100vh;
@@ -100,9 +108,8 @@
     }
     
     .box {
-        padding: 0 $padding;
+        padding: 40px $padding 0;
         box-sizing: border-box;
         margin-top: $margin;
     }
-    // 34CE98
 </style>

pages/menu/index.vue

@@ -16,11 +16,11 @@
                     :btnStyle="{'padding': '30rpx'}"
                     @onMenu="$Router.push({ name: 'menuDetails', params: {id: $event.recipe_id, title: $event.name }})" 
                 />
-                <u-empty
+                <!-- <u-empty
                     v-else
                     mode="list"
                     text="暂无食谱"
-                />
+                /> -->
             </view>
         </view>
     </view>
@@ -75,8 +75,7 @@
             }
         }
         .box {
-            padding: 0 $padding;
+
-            box-sizing: border-box;
         }
     }
 </style>

pages/service/index.vue

@@ -4,7 +4,7 @@
 			<view class="status">
 				<view class="top">
 					<view class="top-name">
-						ZH大家庭
+						ZH-HEALTH生活
 					</view>
 					<view class="top-card">
 						会员卡

pages/store/list.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<!-- 分类 -->
 		<u-sticky bgColor="#fff" zIndex="99">
-			<u-tabs :list="classify" lineColor="#34CE98" @click="onTabs"></u-tabs>
+			<u-tabs :list="classify" lineColor="#34CE98" @click="onTabs" style="background-color: #FFFFFF;"></u-tabs>
 		</u-sticky>
 		<!-- 分类商品 -->
 		<block v-if="goodsArr.length >= 1">

pages/topic/index.vue

@@ -1,28 +1,30 @@
 <template>
     <view class="content">
-        <u-sticky bgColor="#fff" zIndex="99">
+        <view class="tab-sticky">
             <u-tabs
                 :list="listArr"
                 @click="changeTopic"
                 lineColor="#34CE98"
                 :activeStyle="{fontWeight: 'bold', fontSize: '30rpx'}"
             />
-        </u-sticky>
-        <view class="topic" v-if="topicArr.length > 0">
-            <oct-topic
-                :lists="topicArr"
-                @onTopic="$Router.push({ name: 'topicDetails', params: {id: $event.topic_id, title: $event.name }})" 
-            />
-            <block v-if="page.total_page > 1">
-                <u-loadmore :status="status" />
-            </block>
-        </view>
-        <view class="noTopic" v-else>
-            <u-empty
-                mode="list"
-                text="暂无食谱"
-            />
         </view>
+		<view class="box">
+			<view class="topic" v-if="topicArr.length > 0">
+				<oct-topic
+					:lists="topicArr"
+					@onTopic="$Router.push({ name: 'topicDetails', params: {id: $event.topic_id, title: $event.name }})" 
+				/>
+				<block v-if="page.total_page > 1">
+					<u-loadmore :status="status" />
+				</block>
+			</view>
+			<view class="noTopic" v-else>
+				<u-empty
+					mode="list"
+					text="暂无话题"
+				/>
+			</view>
+		</view>
     </view>
 </template>
 
@@ -90,6 +92,19 @@
 </script>
 
 <style lang="scss" scoped>
+	.tab-sticky{
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		background: white;
+		z-index: 99;
+	}
+	
+	.box {
+	    padding-top: 40px;
+	}
+	
     .new-item {
     	position: relative;
     	margin-top: $margin - 10;