guhongwei hace 2 años
padre
commit
809d010cfe
Se han modificado 8 ficheros con 204 adiciones y 77 borrados
  1. 59 57
      app.json
  2. 96 0
      pages/basic/index.js
  3. 6 0
      pages/basic/index.json
  4. 4 0
      pages/basic/index.less
  5. 5 0
      pages/basic/index.wxml
  6. 4 0
      pages/basic/index.wxss
  7. 29 19
      pages/home/index.js
  8. 1 1
      project.config.json

+ 59 - 57
app.json

@@ -1,60 +1,62 @@
 {
-  "pages": [
-    "pages/index/index",
-    "pages/home/index",
-    "pages/login/index",
-    "pages/login/agreement",
-    "pages/test/index",
-    "pages/logs/logs"
-  ],
-  "usingComponents": {
-    "van-button": "/miniprogram_npm/@vant/weapp/button/index",
-    "van-row": "/miniprogram_npm/@vant/weapp/row/index",
-    "van-col": "/miniprogram_npm/@vant/weapp/col/index",
-    "van-datetime-picker": "/miniprogram_npm/@vant/weapp/datetime-picker/index",
-    "van-picker": "/miniprogram_npm/@vant/weapp/picker/index",
-    "van-popup": "/miniprogram_npm/@vant/weapp/popup/index",
-    "van-radio": "/miniprogram_npm/@vant/weapp/radio/index",
-    "van-radio-group": "/miniprogram_npm/@vant/weapp/radio-group/index",
-    "van-action-sheet": "/miniprogram_npm/@vant/weapp/action-sheet/index",
-    "van-search": "/miniprogram_npm/@vant/weapp/search/index",
-    "van-tree-select": "/miniprogram_npm/@vant/weapp/tree-select/index",
-    "van-overlay": "/miniprogram_npm/@vant/weapp/overlay/index",
-    "van-dialog": "/miniprogram_npm/@vant/weapp/dialog/index",
-    "van-tab": "/miniprogram_npm/@vant/weapp/tab/index",
-    "van-tabs": "/miniprogram_npm/@vant/weapp/tabs/index",
-    "van-stepper": "/miniprogram_npm/@vant/weapp/stepper/index",
-    "van-collapse": "/miniprogram_npm/@vant/weapp/collapse/index",
-    "van-collapse-item": "/miniprogram_npm/@vant/weapp/collapse-item/index",
-    "van-cell": "/miniprogram_npm/@vant/weapp/cell/index",
-    "van-cell-group": "/miniprogram_npm/@vant/weapp/cell-group/index",
-    "van-toast": "/miniprogram_npm/@vant/weapp/toast/index",
-    "van-field": "/miniprogram_npm/@vant/weapp/field/index",
-    "van-checkbox": "/miniprogram_npm/@vant/weapp/checkbox/index",
-    "van-checkbox-group": "/miniprogram_npm/@vant/weapp/checkbox-group/index",
-    "van-loading": "/miniprogram_npm/@vant/weapp/loading/index",
-    "van-icon": "/miniprogram_npm/@vant/weapp/icon/index",
-    "van-nav-bar": "/miniprogram_npm/@vant/weapp/nav-bar/index",
-    "van-tabbar": "/miniprogram_npm/@vant/weapp/tabbar/index",
-    "van-tabbar-item": "/miniprogram_npm/@vant/weapp/tabbar-item/index",
-    "van-rate": "/miniprogram_npm/@vant/weapp/rate/index",
-    "van-uploader": "@vant/weapp/uploader/index",
-    "van-divider": "/miniprogram_npm/@vant/weapp/divider/index"
-  },
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "耗材-小程序",
-    "navigationBarTextStyle": "black",
-    "navigationStyle": "custom"
-  },
-  "requiredBackgroundModes": [
-    "location"
-  ],
-  "sitemapLocation": "sitemap.json",
-  "permission": {
-    "scope.userLocation": {
-      "desc": "你的位置信息将用于小程序位置接口的效果展示"
+    "pages": [
+        "pages/basic/index",
+        "pages/index/index",
+        "pages/home/index",
+   
+        "pages/login/index",
+        "pages/login/agreement",
+        "pages/test/index",
+        "pages/logs/logs"
+    ],
+    "usingComponents": {
+        "van-button": "/miniprogram_npm/@vant/weapp/button/index",
+        "van-row": "/miniprogram_npm/@vant/weapp/row/index",
+        "van-col": "/miniprogram_npm/@vant/weapp/col/index",
+        "van-datetime-picker": "/miniprogram_npm/@vant/weapp/datetime-picker/index",
+        "van-picker": "/miniprogram_npm/@vant/weapp/picker/index",
+        "van-popup": "/miniprogram_npm/@vant/weapp/popup/index",
+        "van-radio": "/miniprogram_npm/@vant/weapp/radio/index",
+        "van-radio-group": "/miniprogram_npm/@vant/weapp/radio-group/index",
+        "van-action-sheet": "/miniprogram_npm/@vant/weapp/action-sheet/index",
+        "van-search": "/miniprogram_npm/@vant/weapp/search/index",
+        "van-tree-select": "/miniprogram_npm/@vant/weapp/tree-select/index",
+        "van-overlay": "/miniprogram_npm/@vant/weapp/overlay/index",
+        "van-dialog": "/miniprogram_npm/@vant/weapp/dialog/index",
+        "van-tab": "/miniprogram_npm/@vant/weapp/tab/index",
+        "van-tabs": "/miniprogram_npm/@vant/weapp/tabs/index",
+        "van-stepper": "/miniprogram_npm/@vant/weapp/stepper/index",
+        "van-collapse": "/miniprogram_npm/@vant/weapp/collapse/index",
+        "van-collapse-item": "/miniprogram_npm/@vant/weapp/collapse-item/index",
+        "van-cell": "/miniprogram_npm/@vant/weapp/cell/index",
+        "van-cell-group": "/miniprogram_npm/@vant/weapp/cell-group/index",
+        "van-toast": "/miniprogram_npm/@vant/weapp/toast/index",
+        "van-field": "/miniprogram_npm/@vant/weapp/field/index",
+        "van-checkbox": "/miniprogram_npm/@vant/weapp/checkbox/index",
+        "van-checkbox-group": "/miniprogram_npm/@vant/weapp/checkbox-group/index",
+        "van-loading": "/miniprogram_npm/@vant/weapp/loading/index",
+        "van-icon": "/miniprogram_npm/@vant/weapp/icon/index",
+        "van-nav-bar": "/miniprogram_npm/@vant/weapp/nav-bar/index",
+        "van-tabbar": "/miniprogram_npm/@vant/weapp/tabbar/index",
+        "van-tabbar-item": "/miniprogram_npm/@vant/weapp/tabbar-item/index",
+        "van-rate": "/miniprogram_npm/@vant/weapp/rate/index",
+        "van-uploader": "@vant/weapp/uploader/index",
+        "van-divider": "@vant/weapp/divider/index"
+    },
+    "window": {
+        "backgroundTextStyle": "light",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTitleText": "耗材-小程序",
+        "navigationBarTextStyle": "black",
+        "navigationStyle": "custom"
+    },
+    "requiredBackgroundModes": [
+        "location"
+    ],
+    "sitemapLocation": "sitemap.json",
+    "permission": {
+        "scope.userLocation": {
+            "desc": "你的位置信息将用于小程序位置接口的效果展示"
+        }
     }
-  }
 }

+ 96 - 0
pages/basic/index.js

@@ -0,0 +1,96 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        frameStyle: { useTop: true, name: '基本信息', leftArrow: true, useBar: false },
+        // 主体高度
+        infoHeight: '',
+    },
+    back: function () {
+        wx.navigateBack({ url: '/pages/home/index' })
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        // 监听用户是否登录
+        this.watchLogin();
+        // 计算高度
+        this.searchHeight()
+    },
+    // 监听用户是否登录
+    watchLogin: function () {
+        wx.getStorage({
+            key: 'user',
+            success: res => {
+                console.log(res);
+            }
+        })
+
+    },
+    // 计算高度
+    searchHeight: function () {
+        let frameStyle = this.data.frameStyle;
+        let client = app.globalData.client;
+        let infoHeight = client.windowHeight;
+        // 是否去掉状态栏
+        if (frameStyle.useTop) infoHeight = infoHeight - (client.statusBarHeight + client.getMenu.height + (client.getMenu.top - client.statusBarHeight) * 2);
+        // 是否减去底部菜单
+        if (frameStyle.useBar) infoHeight = infoHeight - 50;
+        if (infoHeight) this.setData({ infoHeight: infoHeight })
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+ 6 - 0
pages/basic/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "mobile-main": "/commpents/mobile-frame/mobile-main"
+  }
+}

+ 4 - 0
pages/basic/index.less

@@ -0,0 +1,4 @@
+.main {
+    position: relative;
+    width: 100%;
+}

+ 5 - 0
pages/basic/index.wxml

@@ -0,0 +1,5 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+    <view slot="info" class="main" style="height:{{infoHeight}}px;">
+        基本信息
+    </view>
+</mobile-main>

+ 4 - 0
pages/basic/index.wxss

@@ -0,0 +1,4 @@
+.main {
+  position: relative;
+  width: 100%;
+}

+ 29 - 19
pages/home/index.js

@@ -23,28 +23,38 @@ Page({
   // 跳转页面
   toPath: function (e) {
     const { data } = e.currentTarget.dataset;
+    // 绑定微信
     if (data.is_routine && data.is_routine == '1') {
-      wx.getStorage({
-        key: 'user',
-        success: res => {
-          if (res.data) {
-            const { openid } = app.globalData.wxInfo;
-            wx.request({
-              url: app.globalData.publicUrl + `/api/hc/user/update/${res.data.id}`,
-              method: "post",
-              data: { openid: openid },
-              header: {},
-              success: (res) => {
-                if (res.data.errcode == '0') {
-                  wx.showToast({ title: `绑定微信成功`, icon: 'success', duration: 2000 })
-                } else {
-                  wx.showToast({ title: `${res.data.errmsg}`, icon: 'error', duration: 2000 })
-                }
-              },
-            })
+      wx.showModal({
+        content: '您确定使用此微信绑定当前登录账号吗?',
+        title: '绑定微信',
+        success: (res) => {
+          if (res.confirm) {
+            wx.showToast({ title: `绑定微信成功`, icon: 'success', duration: 2000 })
           }
-        }
+        },
       })
+      // wx.getStorage({
+      //   key: 'user',
+      //   success: res => {
+      //     if (res.data) {
+      //       const { openid } = app.globalData.wxInfo;
+      //       wx.request({
+      //         url: app.globalData.publicUrl + `/api/hc/user/update/${res.data.id}`,
+      //         method: "post",
+      //         data: { openid: openid },
+      //         header: {},
+      //         success: (res) => {
+      //           if (res.data.errcode == '0') {
+      //             wx.showToast({ title: `绑定微信成功`, icon: 'success', duration: 2000 })
+      //           } else {
+      //             wx.showToast({ title: `${res.data.errmsg}`, icon: 'error', duration: 2000 })
+      //           }
+      //         },
+      //       })
+      //     }
+      //   }
+      // })
     } else if (data.is_routine && data.is_routine == '2') {
       wx.clearStorage({
         key: 'user',

+ 1 - 1
project.config.json

@@ -25,7 +25,7 @@
         "checkInvalidKey": true,
         "checkSiteMap": true,
         "uploadWithSourceMap": true,
-        "compileHotReLoad": true,
+        "compileHotReLoad": false,
         "lazyloadPlaceholderEnable": false,
         "useMultiFrameRuntime": true,
         "useApiHook": true,