个人中心新增健康档案

apis/interfaces/essentialInfo.js

@@ -16,7 +16,6 @@ import { request } from '../index'
  * @Date: 2022-01-12 11:08:11
  */
 const recordsHealth = (data) => {
-	console.log(data, 'camsji///////////')
 	return request({
 		url: 'health/records',
 		method: "POST",

components/vueScale/index.vue

@@ -167,7 +167,6 @@ export default {
                 let scrollLen = (
                     Number(scrollLeft / (this.maginL + 2)) + this.scrollStart
                 ).toFixed(1);
-                console.log(typeof scrollLen);
                 this.scrollLeftInit =
                     (scrollLen - this.scrollStart) * (this.maginL + 2);
                 this.$emit("scroll", scrollLen);

pages.json

@@ -4,7 +4,7 @@
 			"name": "Index",
 			"style": {
 				"navigationBarTitleText": "发现",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -27,8 +27,8 @@
 			"path": "pages/record/index",
 			"name": "Record",
 			"style": {
-				"navigationBarTitleText": "记录"
-				// "navigationStyle": "custom"
+				"navigationBarTitleText": "记录",
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -163,7 +163,8 @@
 			"path": "pages/auth/auth",
 			"name": "Auth",
 			"style": {
-				"navigationBarTitleText": "登录"
+				"navigationBarTitleText": "登录",
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -729,6 +730,14 @@
 				"navigationBarTitleText": "搜索",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
+		},
+		{
+			"path": "pages/user/files",
+			"name": "UserFiles",
+			"style": {
+				"navigationBarTitleText": "健康档案",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
 		}
 	],
 	"tabBar": {
@@ -739,12 +748,12 @@
 				"selectedIconPath": "static/tabBar/tabBar_show_00.png",
 				"pagePath": "pages/index/index",
 				"text": "健康"
-			},
-			{
-				"iconPath": "static/tabBar/tabBar_02.png",
-				"selectedIconPath": "static/tabBar/tabBar_show_02.png",
-				"pagePath": "pages/store/index",
-				"text": "好物"
+			},
+			{
+				"iconPath": "static/tabBar/tabBar_02.png",
+				"selectedIconPath": "static/tabBar/tabBar_show_02.png",
+				"pagePath": "pages/store/index",
+				"text": "好物"
 			},
 			{
 				"iconPath": "static/tabBar/tabBar_01.png",

pages/essentialInfo/index.vue

@@ -420,7 +420,6 @@ export default {
             this.sexShow = false;
             this.birthdayShow = true;
             this.dateShow = true;
-            console.log(this.percentplan1, this.sex);
         },
 
         // 年龄-------------确认选择了出生年月日
@@ -667,7 +666,7 @@ export default {
         margin-top: $margin * 2;
         view {
             background-color: rgba($color: $main-color, $alpha: 0.5);
-            color: $text-color;
+            color: white;
             font-size: $title-size;
             font-weight: bold;
             padding: $padding * 0.6 $padding * 3;

pages/index/index.vue

@@ -4,8 +4,8 @@
 			<view class="status-main">
 				<view class="helloe">欢迎使用ZH健康</view>
 				<view class="btns">
-					<view class="btns-item" @click="$Router.push({name: 'signIndex'})"><image src="@/static/icon/sign-icon.gif" mode="widthFix"></image></view>
-					<view class="btns-item show" @click="$Router.push({name: 'noticeIndex'})"><uni-icons custom-prefix="iconfont" type="icon-pinglun" size="25"></uni-icons></view>
+					<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>
 				</view>
 			</view>
 		</view>
@@ -29,9 +29,13 @@
 				</view>
 			</view>
 		</u-scroll-list>
+		<!-- 排行榜 -->
+		<view class="img-card" @click="onBtn('Record')">
+			<image src="@/static/dev/img-02.png" mode="widthFix"></image>
+		</view>
 		<!-- 话题广场 -->
 		<view class="new-box">
-            <view class="title">话题广场</view><view class="more" @click="$Router.push({name: 'topicIndex'})">更多分类</view>
+            <view class="title">话题广场</view><view class="more" @click="$Router.push({name: 'topicIndex'})">更多</view>
             <oct-topic
                 :lists="topicArr"
                 @onTopic="$Router.push({ name: 'topicDetails', params: {id: $event.topic_id }})" 
@@ -44,6 +48,7 @@
 
 <script>
     import { index } from '@/apis/interfaces/topic'
+	import userAuth from '@/public/userAuth'
     export default {
         data() {
             return {
@@ -63,6 +68,14 @@
                     this.topicArr   = res.topics
             	})
             },
+			onBtn(name){
+				if(this.$store.state.token === ''){
+					const Auth = new userAuth()
+					Auth.Login()
+					return
+				}
+				this.$Router.push({name})
+			}
         }
     };
 </script>

pages/ranking/details.vue

@@ -125,7 +125,7 @@
                         ￥{{ item.price }}
                     </view>
                 </view>
-                <view class="item-btn">
+                <view class="item-btn" @click="$Router.push({ name: 'StoreGoods', params: {id: item.goods_id}})">
                     查看商品
                 </view>
             </view>

pages/topic/details.vue

@@ -52,7 +52,7 @@
                                 ￥{{ item.price }}
                             </view>
                         </view>
-                        <view class="item-btn">
+                        <view class="item-btn" @click="$Router.push({ name: 'StoreGoods', params: {id: item.goods_id}})">
                             查看商品
                         </view>
                     </view>

pages/user/index.vue

@@ -186,8 +186,13 @@
 			},
             // 个人档案
             onFiles(){
-            	if(this.isLogin()){
-            		this.$Router.push({name: 'indexFiles'})
+            	if(this.isLogin()){
+					if(!this.userInfo.has_record){
+						console.log('未完善资料')
+						this.$Router.push({name: 'EssentialInfo'})
+						return
+					}
+            		this.$Router.push({name: 'UserFiles'})
             	}
             },
 			// 按钮导航