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

pages/apply/index.less

@@ -1,147 +1,147 @@
 .main {
- position: relative;
- width: 100%;
-
- .one {
-  position: relative;
-  width: 100%;
-  text-align: center;
-  border-bottom: 1px dashed #000000;
-
-  button {
-   margin: 10px;
-  }
- }
-
- .two {
-  position: relative;
-  padding: 10px;
-
-  .list {
-   float: left;
-   width: 100%;
-   margin: 0 0 8px 0;
-   background-color: #f9f9f9;
-   border-radius: 5px;
-   padding: 8px 0;
-
-   .name {
-    font-size: 16px;
-    margin: 0 0 5px 0;
-    padding: 0 10px;
-   }
-
-   .other {
-    .otherInfo {
-     margin: 0 0 5px 0;
-     font-size: 14px;
-     color: #666666;
-     padding: 0 10px;
-
-     text {
-      color: #000000;
-     }
-    }
-   }
+    position: relative;
+    width: 100%;
 
-   .btn {
-    text-align: center;
+    .one {
+        position: relative;
+        width: 100%;
+        text-align: center;
+        border-bottom: 1px dashed #000000;
 
-    button {
-     margin: 0 5px;
+        button {
+            margin: 10px;
+        }
     }
-   }
 
-
-  }
- }
+    .two {
+        position: relative;
+        padding: 10px;
+
+        .list {
+            float: left;
+            width: 100%;
+            margin: 0 0 8px 0;
+            background-color: #f9f9f9;
+            border-radius: 5px;
+            padding: 8px 0;
+
+            .name {
+                font-size: 16px;
+                margin: 0 0 5px 0;
+                padding: 0 10px;
+            }
+
+            .other {
+                .otherInfo {
+                    margin: 0 0 5px 0;
+                    font-size: 14px;
+                    color: #666666;
+                    padding: 0 10px;
+
+                    text {
+                        color: #000000;
+                    }
+                }
+            }
+
+            .btn {
+                text-align: center;
+
+                button {
+                    margin: 0 5px;
+                }
+            }
+
+
+        }
+    }
 }
 
 .dialog {
- min-height: 30px;
- max-height: 320px;
- overflow-y: auto;
- padding: 0 8px;
-
- .dialog_1 {
-  .content {
-   position: relative;
-   padding: 8px 0;
-   border-radius: 6px;
-   margin: 0 0 5px 0;
-   background-color: #f1f1f1;
-
-   .left {
-    float: left;
-    margin: 0 10px;
-
-    text {
-     font-size: 14px;
-     color: #666666;
-    }
-   }
-
-   .right {
-    input {
-     font-size: 12px;
-    }
-   }
-  }
-
-  .order {
-   position: relative;
-   padding: 8px 0;
-   border-radius: 6px;
-   margin: 0 0 5px 0;
-   background-color: #f1f1f1;
-
-   .order_1 {
-    position: relative;
-    margin: 0 10px;
-
-    text {
-     font-size: 14px;
-     color: #666666;
-    }
-   }
-
-   .order_2 {
-    position: relative;
-    padding: 0 5px;
-    margin: 5px 0 0 0;
-
-    .list {
-     margin: 0 0 8px 0;
-     background-color: #f9f9f9;
-     border-radius: 5px;
-     padding: 8px 0;
-
-     .name {
-      font-size: 16px;
-      margin: 0 0 5px 0;
-      padding: 0 10px;
-     }
-
-     .other {
-      .otherInfo {
-       margin: 0 0 5px 0;
-       font-size: 14px;
-       color: #666666;
-       padding: 0 10px;
-
-       text {
-        color: #000000;
-       }
-      }
-     }
+    min-height: 30px;
+    max-height: 320px;
+    overflow-y: auto;
+    padding: 0 8px;
+
+    .dialog_1 {
+        .content {
+            position: relative;
+            padding: 8px 0;
+            border-radius: 6px;
+            margin: 0 0 5px 0;
+            background-color: #f1f1f1;
+
+            .left {
+                float: left;
+                margin: 0 10px;
+
+                text {
+                    font-size: 14px;
+                    color: #666666;
+                }
+            }
+
+            .right {
+                input {
+                    font-size: 12px;
+                }
+            }
+        }
+
+        .order {
+            position: relative;
+            padding: 8px 0;
+            border-radius: 6px;
+            margin: 0 0 5px 0;
+            background-color: #f1f1f1;
+
+            .order_1 {
+                position: relative;
+                margin: 0 10px;
+
+                text {
+                    font-size: 14px;
+                    color: #666666;
+                }
+            }
+
+            .order_2 {
+                position: relative;
+                padding: 0 5px;
+                margin: 5px 0 0 0;
+
+                .list {
+                    margin: 0 0 8px 0;
+                    background-color: #f9f9f9;
+                    border-radius: 5px;
+                    padding: 8px 0;
+
+                    .name {
+                        font-size: 16px;
+                        margin: 0 0 5px 0;
+                        padding: 0 10px;
+                    }
+
+                    .other {
+                        .otherInfo {
+                            margin: 0 0 5px 0;
+                            font-size: 14px;
+                            color: #666666;
+                            padding: 0 10px;
+
+                            text {
+                                color: #000000;
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
-   }
-  }
- }
 
 }
 
 .van-dialog__header {
- padding-top: 0 !important;
- padding: 10px 0 !important;
+    padding-top: 0 !important;
+    padding: 10px 0 !important;
 }

pages/market/detail.js

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

pages/market/detail.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/market/detail.wxml

@@ -0,0 +1,2 @@
+<!--pages/market/detail.wxml-->
+<text>pages/market/detail.wxml</text>

pages/market/detail.wxss

@@ -0,0 +1 @@
+/* pages/market/detail.wxss */

pages/stock/index.js

@@ -28,8 +28,6 @@ Page({
     },
     // 详细信息
     toView: function (e) {
-        let data = { id: '1234567', name: '11', type_name: '办公室生活用品', num: '11', money: '111', brief: '无' }
-        this.setData({ info: data })
         this.setData({ dialog: { title: '详细信息', show: true, type: '1' } })
     },
     // 信息变更

pages/stock_order/index.js

@@ -48,6 +48,8 @@ Page({
     },
     // 监听用户是否登录
     watchLogin: function () {
+        let data = [{ id: '1234567', code: '8', name: '其他' }]
+        this.setData({ list: data })
         // wx.getStorage({
         // key: 'user',
         // success: res => {
@@ -85,7 +87,6 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
-        
     },
 
     /**
@@ -122,4 +123,4 @@ Page({
     onShareAppMessage: function () {
 
     }
-})
+})

pages/type/index.js

@@ -25,8 +25,6 @@ Page({
     },
     // 详细信息
     toView: function (e) {
-        let data = { id: '1234567', code: '8', name: '其他' }
-        this.setData({ info: data })
         this.setData({ dialog: { title: '详细信息', show: true, type: '1' } })
     },
     // 信息变更

pages/user/index.js

@@ -26,8 +26,6 @@ Page({
   },
   // 详细信息
   toView: function (e) {
-    let data = {id: '1234567', name: '测试人员', phone: '12345678901', email: '123456@qq.com', address: '1', dept: '1', zw: '1', company: '1', type: '超级管理员' }
-    this.setData({ info: data })
     this.setData({ dialog: { title: '详细信息', show: true, type: '1' } })
   },
   // 信息变更