Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

后端研发-苏泰源
2 parents 9bfdb099 8806a441
Showing 4 changed files with 23 additions and 10 deletions
packageB/pages/AI-test-skin/success_result/success_result.js
packageB/pages/AI-test-skin/success_result/success_result.json
packageB/pages/AI-test-skin/success_result/success_result.wxml
packageB/pages/AI-test-skin/success_result/success_result.wxss
 /*
  * @Author: abson
  * @Date: 2022-02-16 15:36:47
- * @LastEditTime: 2022-02-18 17:40:05
+ * @LastEditTime: 2022-02-18 18:02:00
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \MShopWeApp\packageB\pages\AI-test-skin\success_result\success_result.js
@@ -33,6 +33,16 @@ Page({
     onLoad: function (options) {
     },
+    lo(){
+        this.setData({
+            oo:"hei_tou"
+        })
+    },
+    lo1(){
+        this.setData({
+            oo:"zong_he"
+        }) 
+    },
     /**
      * 生命周期函数--监听页面初次渲染完成
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "测肤报告"
 }
 \ No newline at end of file
-<scroll-view enable-flex scroll-x style="height: 100rpx;">
-    <view class="tab_scroll">
+<view style="height: 100rpx;">
+    <scroll-view enable-flex scroll-into-view="{{tab_id}}" scroll-x class="tab_scroll">
+    <view class="flex" style="height: 100%;">
         <view wx:for="{{tab}}" wx:key="id" id="{{item.id}}" bindtap="clickTab" data-tab_id="{{item.id}}" data-index="{{index}}" class="tab_scroll_item {{currentIndex==index?'active':''}}">
             {{item.name}}
         </view>
     </view>
 </scroll-view>
+</view>
-<scroll-view enable-flex scroll-into-view="{{tab_id}}">
-    <view class="analyse_by_people" id="zong_he">
+<scroll-view enable-flex scroll-into-view="{{oo}}" style="height: 1000px;">
+    <view bindtap="lo" class="analyse_by_people" id="zong_he" >
         <view class="analyse">
             <view class="analyse_left">
                 <view class="mark">毛孔 较粗大</view>
@@ -60,8 +62,7 @@
             </view>
         </view>
     </view>
-
-    <view class="content">
+    <view bindtap="lo1" class="content" id="hei_tou">
         <view class="mb_b5">
             <view class="analyse_classify bg_white">
                 <view class="analyse_classify_header">
@@ -250,7 +251,7 @@
                                 <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
                                 <text class="fs26">皮脂腺分泌旺盛</text>
                             </view>
-                            <view class="mr20"> 
+                            <view class="mr20">
                                 <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
                                 <text class="fs26">皮脂腺分泌旺盛</text>
                             </view>
@@ -386,7 +387,7 @@
                                 <text class="iconfont icon-checked" style="font-size: 26rpx;margin-right: 10rpx;"></text>
                                 <text class="fs26">皮脂腺分泌旺盛</text>
                             </view>
-                           
+
                         </view>
                     </view>
@@ -7,6 +7,7 @@ page {
 .tab_scroll {
     position: fixed;
+    top: 0;
     z-index: 99;
     display: flex;
     height: 100rpx;