Merge branch 'master' of http://git.cc-lotus.info/Consumables/mobiles-two

app.json

@@ -7,6 +7,7 @@
         "pages/basic/index",
         "pages/user/index",
         "pages/user/detail",
+<<<<<<< HEAD
         "pages/type/index",
         "pages/type/detail",
         "pages/stock/index",
@@ -16,6 +17,9 @@
         "pages/indepot/detail",
         "pages/outdepot/index",
         "pages/outdepot/detail",
+=======
+        "pages/password/index",
+>>>>>>> 01a57669c525c382024faefd25cfcfcec7c2746e
         "pages/test/index",
         "pages/logs/logs"
     ],

pages/basic/index.js

@@ -10,14 +10,54 @@ Page({
         frameStyle: { useTop: true, name: '基本信息', leftArrow: true, useBar: false },
         // 主体高度
         infoHeight: '',
+        form: {}
+    },
+    initValidate() {
+        const rules = { name: { required: true, }, phone: { required: true, tel: true }, email: { required: true, }, address: { required: true, }, dept: { required: true, }, zw: { required: true, }, company: { required: true, } }
+        // 验证字段的提示信息，若不传则调用默认的信息
+        const messages = { name: { required: '请输入姓名', }, phone: { required: '请输入电话', }, email: { required: '请输入电子邮箱', }, address: { required: '请输入联系地址', }, dept: { required: '请输入部门', }, zw: { required: '请输入职务', }, company: { required: '请输入工作单位', } };
+        this.WxValidate = new WxValidate(rules, messages)
     },
     back: function () {
         wx.navigateBack({ url: '/pages/home/index' })
     },
+    // 取消修改
+    onReset: function () {
+        this.back()
+    },
+    // 提交修改
+    onSubmit: function (e) {
+        const params = e.detail.value;
+        if (!this.WxValidate.checkForm(params)) {
+            const error = this.WxValidate.errorList[0];
+            wx.showToast({ title: `${error.msg}`, icon: 'error', duration: 2000 })
+            return false
+        } else {
+            console.log(params);
+            // wx.request({
+            //     url: app.globalData.publicUrl + `/api/hc/user/update/${this.data.form.id}`,
+            //     method: "post",
+            //     data: { ...params },
+            //     header: {},
+            //     success: (res) => {
+            //         if (res.data.errcode == '0') {
+            //             wx.showToast({ title: `信息修改完成`, icon: 'success', duration: 2000 })
+            //             wx.setStorage({ key: "user", data: res.data.data });
+            //             app.globalData.userInfo = res.data.data;
+            //             wx.navigateTo({ url: '/pages/home/index' })
+            //         } else {
+            //             wx.showToast({ title: `${res.data.errmsg}`, icon: 'error', duration: 2000 })
+            //         }
+            //     },
+            // })
+        }
+    },
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+        //验证规则函数
+        this.initValidate();
         // 监听用户是否登录
         this.watchLogin();
         // 计算高度

pages/basic/index.less

@@ -1,4 +1,40 @@
 .main {
     position: relative;
     width: 100%;
+
+    .one {
+        position: relative;
+        padding: 10px;
+
+        .content {
+            position: relative;
+            padding: 10px 0;
+            box-shadow: 0 0 5px #000000;
+            margin: 0 0 10px 0;
+            border-radius: 5px;
+
+            .left {
+                float: left;
+                margin: 0 10px;
+
+                .icon {
+                    color: #000000;
+                }
+            }
+
+            .right {
+                input {
+                    color: #000000;
+                }
+            }
+        }
+
+        .save {
+            text-align: center;
+
+            button {
+                margin: 10px;
+            }
+        }
+    }
 }

pages/basic/index.wxml

@@ -1,5 +1,68 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
     <view slot="info" class="main" style="height:{{infoHeight}}px;">
-        基本信息
+        <view class="one">
+            <form bindsubmit="onSubmit" catchreset="onReset">
+                <view class="content">
+                    <view class="left">
+                        <text class="icon iconfont icon-xingming1"></text>
+                    </view>
+                    <view class="right">
+                        <input name="name" value="{{form.name}}" placeholder='请输入姓名' placeholder-class="placeholder"></input>
+                    </view>
+                </view>
+                <view class="content">
+                    <view class="left">
+                        <text class="icon iconfont icon-dianhua"></text>
+                    </view>
+                    <view class="right">
+                        <input name="phone" type="number" maxlength="11" value="{{form.phone}}" placeholder='请输入电话' placeholder-class="placeholder"></input>
+                    </view>
+                </view>
+                <view class="content">
+                    <view class="left">
+                        <text class="icon iconfont icon-dianziyouxiang1"></text>
+                    </view>
+                    <view class="right">
+                        <input name="email" value="{{form.email}}" placeholder='请输入电子邮箱' placeholder-class="placeholder"></input>
+                    </view>
+                </view>
+                <view class="content">
+                    <view class="left">
+                        <text class="icon iconfont icon-dizhi"></text>
+                    </view>
+                    <view class="right">
+                        <input name="address" value="{{form.address}}" placeholder='请输入联系地址' placeholder-class="placeholder"></input>
+                    </view>
+                </view>
+                <view class="content">
+                    <view class="left">
+                        <text class="icon iconfont icon-bumen"></text>
+                    </view>
+                    <view class="right">
+                        <input name="dept" value="{{form.dept}}" placeholder='请输入部门' placeholder-class="placeholder"></input>
+                    </view>
+                </view>
+                <view class="content">
+                    <view class="left">
+                        <text class="icon iconfont icon-zhiwu"></text>
+                    </view>
+                    <view class="right">
+                        <input name="zw" value="{{form.zw}}" placeholder='请输入职务' placeholder-class="placeholder"></input>
+                    </view>
+                </view>
+                <view class="content">
+                    <view class="left">
+                        <text class="icon iconfont icon-commpany"></text>
+                    </view>
+                    <view class="right">
+                        <input name="company" value="{{form.company}}" placeholder='请输入工作单位' placeholder-class="placeholder"></input>
+                    </view>
+                </view>
+                <view class="save">
+                    <button type="warn" size="mini" formType="reset">取消修改</button>
+                    <button type="primary" size="mini" formType="submit">提交修改</button>
+                </view>
+            </form>
+        </view>
     </view>
 </mobile-main>

pages/basic/index.wxss

@@ -2,3 +2,30 @@
   position: relative;
   width: 100%;
 }
+.main .one {
+  position: relative;
+  padding: 10px;
+}
+.main .one .content {
+  position: relative;
+  padding: 10px 0;
+  box-shadow: 0 0 5px #000000;
+  margin: 0 0 10px 0;
+  border-radius: 5px;
+}
+.main .one .content .left {
+  float: left;
+  margin: 0 10px;
+}
+.main .one .content .left .icon {
+  color: #000000;
+}
+.main .one .content .right input {
+  color: #000000;
+}
+.main .one .save {
+  text-align: center;
+}
+.main .one .save button {
+  margin: 10px;
+}

pages/home/index.js

@@ -18,6 +18,7 @@ Page({
   // 获取头像
   onChooseAvatar(e) {
     const { avatarUrl } = e.detail;
+    console.log(avatarUrl);
     this.setData({ avatarUrl })
   },
   // 跳转页面

pages/password/index.js

@@ -0,0 +1,152 @@
+// pages/login/login.js
+import WxValidate from '../../utils/wxValidate'
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        frameStyle: { useTop: true, name: '修改密码', leftArrow: true, useBar: false },
+        // 主体高度
+        infoHeight: '',
+        form: {}
+    },
+    initValidate() {
+        const rules = { password: { required: true, } }
+        // 验证字段的提示信息，若不传则调用默认的信息
+        const messages = { password: { required: '请输入新密码', } };
+        this.WxValidate = new WxValidate(rules, messages)
+    },
+    back: function () {
+        wx.navigateBack({ url: '/pages/home/index' })
+    },
+    // 取消修改
+    onReset: function () {
+        this.back()
+    },
+    // 提交修改
+    onSubmit: function (e) {
+        const params = e.detail.value;
+        if (!this.WxValidate.checkForm(params)) {
+            const error = this.WxValidate.errorList[0];
+            wx.showToast({ title: `${error.msg}`, icon: 'error', duration: 2000 })
+            return false
+        } else {
+            console.log(params);
+            // wx.getStorage({
+            //     key: 'user',
+            //     success: res => {
+            //         if (res.data) {
+            //             wx.request({
+            //                 url: app.globalData.publicUrl + `/api/hc/user/password`,
+            //                 method: "post",
+            //                 data: { ...params, id: res.data.id },
+            //                 header: {},
+            //                 success: (res) => {
+            //                     if (res.data.errcode == '0') {
+            //                         wx.showToast({ title: `修改密码成功`, icon: 'success', duration: 2000 });
+            //                         wx.clearStorage({
+            //                             key: 'toekn',
+            //                             success: res => { wx.redirectTo({ url: '/pages/login/index', }) }
+            //                         })
+            //                     } else {
+            //                         wx.showToast({ title: `${res.data.errmsg}`, icon: 'error', duration: 2000 })
+            //                     }
+            //                 },
+            //             })
+            //         }
+            //     }
+            // })
+
+        }
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        //验证规则函数
+        this.initValidate();
+        // 监听用户是否登录
+        this.watchLogin();
+        // 计算高度
+        this.searchHeight()
+    },
+    // 监听用户是否登录
+    watchLogin: function () {
+        // wx.getStorage({
+        // key: 'user',
+        // success: res => {
+        //   if (res.data) {
+        //     // 查询菜单
+        //     if (res.data) this.searchRouter(res.data);
+        //     res.data.type = type.find((i) => i.value == res.data.type).label;
+        //     if (res.data) this.setData({ userInfo: res.data });
+        //     if (res.data && res.data.avatarUrl) this.setData({ avatarUrl: res.data.avatarUrl });
+        //   } else {
+        //     wx.redirectTo({ url: '/pages/login/index', })
+        //   }
+        // }
+        // })
+    },
+    // 计算高度
+    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 () {
+
+    }
+})

pages/password/index.json

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

pages/password/index.less

@@ -0,0 +1,38 @@
+.main {
+    position: relative;
+    width: 100%;
+
+    .one {
+        position: relative;
+        padding: 10px;
+
+        .content {
+            position: relative;
+            padding: 10px 0;
+            box-shadow: 0 0 5px #000000;
+            margin: 0 0 10px 0;
+            border-radius: 5px;
+
+            .left {
+                float: left;
+                margin: 0 10px;
+
+                .icon {
+                    color: #000000;
+                }
+            }
+
+            .right input {
+                color: #000000;
+            }
+        }
+
+        .save {
+            text-align: center;
+
+            button {
+                margin: 10px;
+            }
+        }
+    }
+}

pages/password/index.wxml

@@ -0,0 +1,20 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+  <view slot="info" class="main" style="height:{{infoHeight}}px;">
+    <view class="one">
+      <form bindsubmit="onSubmit" catchreset="onReset">
+        <view class="content">
+          <view class="left">
+            <text class="icon iconfont icon-mima"></text>
+          </view>
+          <view class="right">
+            <input type='text' name="password" value="{{form.password}}" password placeholder='请输入新密码' placeholder-class="placeholder"></input>
+          </view>
+        </view>
+        <view class="save">
+          <button type="warn" size="mini" formType="reset">取消修改</button>
+          <button type="primary" size="mini" formType="submit">提交修改</button>
+        </view>
+      </form>
+    </view>
+  </view>
+</mobile-main>

pages/password/index.wxss

@@ -0,0 +1,31 @@
+.main {
+  position: relative;
+  width: 100%;
+}
+.main .one {
+  position: relative;
+  padding: 10px;
+}
+.main .one .content {
+  position: relative;
+  padding: 10px 0;
+  box-shadow: 0 0 5px #000000;
+  margin: 0 0 10px 0;
+  border-radius: 5px;
+}
+.main .one .content .left {
+  float: left;
+  margin: 0 10px;
+}
+.main .one .content .left .icon {
+  color: #000000;
+}
+.main .one .content .right input {
+  color: #000000;
+}
+.main .one .save {
+  text-align: center;
+}
+.main .one .save button {
+  margin: 10px;
+}