TmOct5/ZhHealth
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

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

Browse Source
This commit is contained in:
张冬雪
2022-01-20 16:06:39 +08:00
parent e7807e9709 4bd2fab87b
commit f956ce77c9
13 changed files with 169 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

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

6
apis/index.js
View File

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

5
pages.json
View File

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

8
pages/auth/auth.vue
View File

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

6
pages/im/friends/index.vue
View File

@@ -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">

97
pages/im/friends/info.vue
View File

@@ -1,8 +1,28 @@
<template>
<div>
好友资料，
<u-button @click="toPrivate">发送消息</u-button>
</div>
<view class="content">
<!-- 用户信息 -->
<view class="user-info">
<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>

2
pages/index/index.vue
View File

@@ -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>

15
pages/menu/classify.vue
View File

@@ -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>

7
pages/menu/index.vue
View File

@@ -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>

2
pages/service/index.vue
View File

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

2
pages/store/list.vue
View File

@@ -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">

21
pages/topic/index.vue
View File

@@ -1,13 +1,14 @@
<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>
<view class="box">
<view class="topic" v-if="topicArr.length > 0">
<oct-topic
:lists="topicArr"
@@ -20,10 +21,11 @@
<view class="noTopic" v-else>
<u-empty
mode="list"
text="暂无食谱"
text="暂无话题"
/>
</view>
</view>
</view>
</template>
<script>
@@ -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;