框架调整

app.json

@@ -4,22 +4,26 @@
     "pages/scan/scan",
     "pages/data/data",
     "pages/shop/shop",
-    "pages/testSAS/testSAS"
+    "pages/mine/mine"
   ],
   "subpackages": [
     {
       "root": "subpages",
-      "name":"subpages",
+      "name": "subpages",
       "pages": [
+        "testSAS/testSAS",
         "sleepEvaluation/sleepEvaluation",
         "sleepQualityIndexAssessment/sleepQualityIndexAssessment",
         "warmReminder/warmReminder"
       ]
     }
-  ],"preloadRule": {
+  ],
+  "preloadRule": {
     "pages/index/index": {
       "network": "all",
-      "packages": ["subpages"]
+      "packages": [
+        "subpages"
+      ]
     }
   },
   "window": {
@@ -73,10 +77,10 @@
         "selectedIconPath": "static/tabs/report-active@2x.png"
       },
       {
-        "pagePath": "pages/testSAS/testSAS",
-        "text": "调查问卷",
-        "iconPath": "static/tabs/investigation@2x.png",
-        "selectedIconPath": "static/tabs/investigation-active@2x.png"
+        "pagePath": "pages/mine/mine",
+        "text": "我的",
+        "iconPath": "static/tabs/mine@2x.png",
+        "selectedIconPath": "static/tabs/mine-active@2x.png"
       }
     ]
   },

custom-tab-bar/index.js

@@ -22,10 +22,10 @@ Component({
       "selectedIconPath": "/static/tabs/report-active@2x.png"
     },
     {
-      "pagePath": "/pages/testSAS/testSAS",
-      "text": "调查问卷",
-      "iconPath": "/static/tabs/investigation@2x.png",
-      "selectedIconPath": "/static/tabs/investigation-active@2x.png"
+      "pagePath": "/pages/mine/mine",
+      "text": "我的",
+      "iconPath": "/static/tabs/mine@2x.png",
+      "selectedIconPath": "/static/tabs/mine-active@2x.png"
     }]
   },
   attached() {

pages/mine/mine.js

@@ -0,0 +1,70 @@
+// pages/mine/mine.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    const app = getApp();
+    app.globalData.selectedTabIndex = 3;
+    this.getTabBar().setData({
+      selected: 3
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/mine/mine.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {},
+  "navigationBarRightButton": {"hide": true},
+  "navigationStyle": "custom"
+}

pages/mine/mine.wxml

@@ -0,0 +1 @@
+<!--pages/mine/mine.wxml-->

pages/mine/mine.wxss

@@ -0,0 +1,4 @@
+/* pages/mine/mine.wxss */
+page {
+    background-color: #F8F9FA;
+}

pages/scan/scan.js

@@ -3,87 +3,112 @@ const util = require('../../utils/util.js')
 
 Page({
   data: {
+    activeIcon: "/subpages/icons/ic_selected_radio.svg",
+    normalIcon: "/subpages/icons/ic_radio.svg",
     logs: [],
-	canGetPhoneNumber: false,
+    checkedPrivacy: false,
+    canGetPhoneNumber: false,
+  },
+  onSaveExitState: function () {
+    wx.clearStorage();
+    console.log("onSaveExitState=");
+    // 返回保存的数据和超时时间（可选）  
+    return {
+      expireTimeStamp: Date.now() + 24 * 60 * 60 * 1000 // 超时时间戳，例如设置为1天后过期  
+    };
+  },
+  onChangePrivacy(event) {
+    const check = event.detail;
+
+    this.setData({
+      checkedPrivacy: check
+    });
   },
-  onSaveExitState: function() {  
-	  wx.clearStorage();
-	  console.log("onSaveExitState=");
-      // 返回保存的数据和超时时间（可选）  
-      return {
-        expireTimeStamp: Date.now() + 24 * 60 * 60 * 1000 // 超时时间戳，例如设置为1天后过期  
-      };  
-    },
   //扫码
-  tapScan(){
-          wx.scanCode({
-              success: function(res) {
-                  console.log('扫码获取的参数',res);
-				  wx.clearStorage();
-				  wx.setStorageSync('res',res);
-				  wx.setStorageSync('scanResultExpiresAt', Date.now() + 2 * 60 * 60 * 1000); // 超时时间戳，例如设置为2小时后过期
-				  wx.reLaunch({
-					url: '/pages/index/index?res='+res,//传res
-				  })
+  tapScan() {
+    if (!this.data.checkedPrivacy) {
+      wx.showToast({
+        title: '请先阅读并同意《舒眠大健康用户服务协议》和《舒眠大健康隐私保护政策》',
+        icon: 'none',
+        duration: 2000
+      })
+      return;
+    }
+    wx.scanCode({
+      success: function (res) {
+        console.log('扫码获取的参数', res);
+        wx.clearStorage();
+        wx.setStorageSync('res', res);
+        wx.setStorageSync('scanResultExpiresAt', Date.now() + 2 * 60 * 60 * 1000); // 超时时间戳，例如设置为2小时后过期
+        wx.reLaunch({
+          url: '/pages/index/index?res=' + res,//传res
+        })
+      }
+    })
+  },
+  onLoad() {
+    console.log("scan页面");
+  }, onShow() {
+    const app = getApp();
+    app.globalData.selectedTabIndex = 4;
+    this.getTabBar().setData({
+      selected: 4
+    })
+  },
+
+  login: function () {
+    var that = this;
+    wx.login({
+      success: res => {
+        if (res.code) {
+          // 发送 code 到服务器换取 session_key, openid  
+          wx.request({
+            url: 'https://yourserver.com/api/login',
+            data: {
+              code: res.code
+            },
+            success: function (loginRes) {
+              if (loginRes.data.success) {
+                wx.setStorageSync('session_key', loginRes.data.session_key);
+                wx.setStorageSync('openid', loginRes.data.openid);
+                // 可以在这里提示用户进行手机号授权  
+                this.setData({
+                  canGetPhoneNumber: true
+                });
               }
-          })
+            }
+          });
+        }
+      }
+    });
+  },
+  getPhoneNumber: function (e) {
+    if (e.detail.errMsg !== "getPhoneNumber:ok") {
+      return;
+    }
+    const { encryptedData, iv } = e.detail;
+    wx.request({
+      url: 'https://yourserver.com/api/decrypt_phone',
+      data: {
+        encryptedData,
+        iv,
+        session_key: wx.getStorageSync('session_key')
       },
-  onLoad() {
-	console.log("scan页面");
+      success: function (decryptRes) {
+        if (decryptRes.data.success) {
+          console.log('解密后的手机号:', decryptRes.data.phoneNumber);
+          // 处理解密后的手机号  
+        }
+      }
+    });
   },
-  login: function() {  
-	  var that = this;
-      wx.login({  
-        success: res => {  
-          if (res.code) {  
-            // 发送 code 到服务器换取 session_key, openid  
-            wx.request({  
-              url: 'https://yourserver.com/api/login',  
-              data: {  
-                code: res.code  
-              },  
-              success: function(loginRes) {  
-                if (loginRes.data.success) {  
-                  wx.setStorageSync('session_key', loginRes.data.session_key);  
-                  wx.setStorageSync('openid', loginRes.data.openid);  
-                  // 可以在这里提示用户进行手机号授权  
-                  this.setData({  
-                    canGetPhoneNumber: true  
-                  });  
-                }  
-              }  
-            });  
-          }  
-        }  
-      });  
-    },  
-    getPhoneNumber: function(e) {  
-      if (e.detail.errMsg !== "getPhoneNumber:ok") {  
-        return;  
-      }  
-      const { encryptedData, iv } = e.detail;  
-      wx.request({  
-        url: 'https://yourserver.com/api/decrypt_phone',  
-        data: {  
-          encryptedData,  
-          iv,  
-          session_key: wx.getStorageSync('session_key')  
-        },  
-        success: function(decryptRes) {  
-          if (decryptRes.data.success) {  
-            console.log('解密后的手机号:', decryptRes.data.phoneNumber);  
-            // 处理解密后的手机号  
-          }  
-        }  
-      });  
-    },  
-    
-    // 绑定按钮点击事件  
-    bindGetPhoneNumber: function() {  
-      if (this.data.canGetPhoneNumber) {  
-        wx.getPhoneNumber({  
-          success: this.getPhoneNumber  
-        });  
-      }  
+
+  // 绑定按钮点击事件  
+  bindGetPhoneNumber: function () {
+    if (this.data.canGetPhoneNumber) {
+      wx.getPhoneNumber({
+        success: this.getPhoneNumber
+      });
     }
+  }
 })

pages/scan/scan.wxml

@@ -5,6 +5,19 @@
     <view class="scan-content">
       <image class="bg-phone-image" src="/static/images/ic_phone_bg.png" mode="widthFix"></image>
       <text class="scan-tips">扫描成功后将跳转至睡眠控制主页</text>
+
+      <view class="bottom-view-privacy">
+        <van-checkbox use-icon-slot value="{{ checkedPrivacy }}" bind:change="onChangePrivacy">
+          <view class="privacy-checkbox">
+            <image class="privacy-checkbox-icon" slot="icon" src="{{ checkedPrivacy ? activeIcon : normalIcon }}" />
+            <text class="privacy-detail-btn">我已阅读并同意</text>
+          </view>
+        </van-checkbox>
+        <text class="privacy-detail-btn_tk" bindtap="showUserDetail">《舒眠大健康用户服务协议》</text>
+        <text class="privacy-detail-btn" style="margin-left: 10rpx;">和</text>
+        <text class="privacy-detail-btn_tk" bindtap="showPrivacyDetail">《舒眠大健康隐私保护政策》</text>
+      </view>
+
       <view class="scan-btn-box" bindtap="tapScan">
         <image src="/static/icons/ic_scan.svg"></image>
         <text>点击扫码</text>

pages/scan/scan.wxss

@@ -94,4 +94,39 @@
 
 .scan-btn-box:active {
   opacity: 0.7;
+}
+
+.bottom-view-privacy {
+  position: absolute;
+  left: 0;
+  bottom: 400rpx;
+  width: 100vw;
+  display: flex;
+  margin-top: 42rpx;
+  justify-content: center;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.privacy-checkbox {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.privacy-checkbox-icon {
+  width: 36rpx;
+  height: 36rpx;
+}
+
+.privacy-detail-btn {
+  font-size: 24rpx;
+  margin-left: 16rpx;
+  color: #888888;
+}
+
+.privacy-detail-btn_tk {
+  font-size: 24rpx;
+  color: #0BC3AA;
 }

project.private.config.json

@@ -10,6 +10,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "subpages/testSAS/testSAS",
+          "pathName": "subpages/testSAS/testSAS",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "subpages/sleepEvaluation/sleepEvaluation",
           "pathName": "subpages/sleepEvaluation/sleepEvaluation",
@@ -45,13 +52,6 @@
           "launchMode": "default",
           "scene": null
         },
-        {
-          "name": "pages/testSAS/testSAS",
-          "pathName": "pages/testSAS/testSAS",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "pages/scan/scan",
           "pathName": "pages/scan/scan",

subpages/sleepEvaluation/sleepEvaluation.js

@@ -3,7 +3,6 @@ const authorization = "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6Ijk5
 const api = "system/sleepEvaluation";
 Page({
 	data: {
-
 		activeIcon: "/subpages/icons/ic_selected_radio.svg",
 		normalIcon: "/subpages/icons/ic_radio.svg",
 		activeColor: "color:#0BC3AA;",

subpages/sleepQualityIndexAssessment/sleepQualityIndexAssessment.js

@@ -1,4 +1,3 @@
-// miniprogram/pages/testSAS/testSAS.js
 // const db = wx.cloud.database()
 const baseUrl = "https://fare.somnisix.top/";
 const authorization = "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6Ijk5YzI3MjI2LTdkOWQtNDhiOC1hYjlhLWM4YjVjYWZiZGNkNyIsInVzZXJuYW1lIjoiYWRtaW4ifQ.zITQOINFkHs19_1RAgHS4I9YMaVxVq0Dsn3t6r_K7rv3rXvJy0sMtodejIMi_PNa_m4uQYxnU-6k3wC2LZht_Q";

subpages/sleepQualityIndexAssessment/sleepQualityIndexAssessment.wxml

@@ -1,5 +1,3 @@
-<!--miniprogram/pages/testSAS/testSAS.wxml-->
-
 <view style="width: 100vw;height: 100vh; background: #ECFAF7;">
 	<scroll-view scroll-y="true"
 		style="height: 100vh;background: #ECFAF7;min-height: 100vh;overflow-x: hidden;overflow-y: auto;"

subpages/sleepQualityIndexAssessment/sleepQualityIndexAssessment.wxss

@@ -1,4 +1,3 @@
-/* miniprogram/pages/testSAS/testSAS.wxss */
 page {
   display: flex;
   flex-direction: column;

pages/testSAS/testSAS.js → subpages/testSAS/testSAS.js

@@ -1,4 +1,4 @@
-// miniprogram/pages/testSAS/testSAS.js
+
 // const db = wx.cloud.database()
 Page({
 
@@ -27,11 +27,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    const app = getApp();
-    app.globalData.selectedTabIndex = 3;
-    this.getTabBar().setData({
-      selected: 3
-    })
   },
 
   /**

pages/testSAS/testSAS.wxml → subpages/testSAS/testSAS.wxml

@@ -1,16 +1,15 @@
-<!--miniprogram/pages/testSAS/testSAS.wxml-->
 <view class='container'>
     <navigator url="/subpages/sleepQualityIndexAssessment/sleepQualityIndexAssessment" class="card-item">
-        <image class="card-bg" src="/static/images/ic_test_abg.png"></image>
+        <image class="card-bg" src="/subpages/images/ic_test_abg.png"></image>
         <view class="card-content">
-            <image class="card-icon" src="/static/images/ic_test_a.png"></image>
+            <image class="card-icon" src="/subpages/images/ic_test_a.png"></image>
             <text>睡眠质量指数测评</text>
         </view>
     </navigator>
     <navigator url="/subpages/sleepEvaluation/sleepEvaluation" class="card-item">
-        <image class="card-bg" src="/static/images/ic_test_bbg.png"></image>
+        <image class="card-bg" src="/subpages/images/ic_test_bbg.png"></image>
         <view class="card-content">
-            <image class="card-icon" src="/static/images/ic_test_b.png"></image>
+            <image class="card-icon" src="/subpages/images/ic_test_b.png"></image>
             <text>六感熟眠客房\n满意度调查</text>
         </view>
     </navigator>

pages/testSAS/testSAS.wxss → subpages/testSAS/testSAS.wxss

@@ -1,4 +1,3 @@
-/* miniprogram/pages/testSAS/testSAS.wxss */
 page {
   width: 100vw;
   display: flex;