1

app.js

@@ -14,10 +14,10 @@ App({
       }
     })
 
-    wx.setTabBarBadge({
-      index: 2,
-      text: '2'
-    })
+    // wx.setTabBarBadge({
+    //   index: 2,
+    //   text: '2'
+    // })
 
   },
   globalData: {

app.json

@@ -1,14 +1,21 @@
 {
     "pages": [
+        "pages/login/login",
         "pages/tabber/home/index",
         "pages/tabber/order/index",
         "pages/tabber/set/index",
-        "pages/tabber/builds/index"
+        "pages/tabber/builds/index",
+        "pages/signIn/siginIn",
+        "pages/signIn/hand/hand",
+        "pages/signIn/recode/recode",
+        "pages/mySet/admin/admin",
+        "pages/mySet/print/print",
+        "pages/sorting/choice/choice"
     ],
     "window": {
         "backgroundTextStyle": "light",
         "navigationBarBackgroundColor": "#fff",
-        "navigationBarTitleText": "Weixin",
+        "navigationBarTitleText": "洗护管家",
         "navigationBarTextStyle": "black"
     },
     "tabBar": {

app.wxss

@@ -53,27 +53,37 @@ view {
   margin-top: 40rpx;
 }
 
-
 .m-left-10 {
   margin-left: 10rpx;
 }
 
+.m-left-15 {
+  margin-left: 15rpx;
+
+}
+
 .m-left-25 {
   margin-left: 25rpx;
 }
 
+.m-bottom-15 {
+  margin-bottom: 15rpx;
+}
+
 .m-bottom-20 {
   margin-bottom: 20rpx;
 }
 
 .m-bottom-25 {
   margin-bottom: 25rpx;
-
 }
 
 .m-bottom-30 {
   margin-bottom: 30rpx;
+}
 
+.m-bottom-50 {
+  margin-bottom: 50rpx;
 }
 
 .m-right-10 {
@@ -92,6 +102,10 @@ view {
   margin-right: 20rpx;
 }
 
+.m-right-30 {
+  margin-right: 30rpx;
+}
+
 
 .img-bgs {
   left: 0;
@@ -104,6 +118,7 @@ view {
 
 .b-bottom {
   border-bottom: 1rpx solid #EDEDED;
+  transform: border scaleY(0.5);
 }
 
 .t-text-ellipsis2 {

pages/tabber/builds/index.js

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

pages/tabber/builds/index.json

@@ -1,3 +1,4 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "打包"
 }

pages/tabber/builds/index.wxml

@@ -1,2 +1,40 @@
 <!--pages/tabber/builds/index.wxml-->
-<text>pages/tabber/builds/index.wxml</text>
+<view class="contioner">
+    <view class="input flex ju-b">
+        <input type="text" placeholder="输入订单号或水洗码"/>
+        <image class="icon" src="/image/build/scan.png"></image>
+    </view>
+</view>
+
+<view class="contioner m-bottom-25">
+    <view class="menu flex ju-b">
+        <view class="box flex ju-c">
+            <view class="tit">2</view>
+            <view class="tips">可打包挂架</view>
+        </view>
+
+        <view class="box flex ju-c">
+            <view class="tit">11</view>
+            <view class="tips">上挂件数</view>
+        </view>
+
+        <view class="box flex ju-c">
+            <view class="tit">11</view>
+            <view class="tips">待上挂件数</view>
+        </view>
+    </view>
+</view>
+
+<view class="contioner  flex ju-b b-bottom">
+   <view class="le">挂架列表</view>
+   <view class="lr">挂架数 {{list.length}}</view>
+</view>
+
+<view class="contioner  flex ju-b">
+    <view class="list flex ">
+        <view class="item flex ju-c" wx:for="{{list}}" wx:key="*this">
+            <view class="top">{{index+1}}</view>
+            <view class="foot m-top-20 {{item.val == 0 ? '': (item.val == item.total ? 'green' : 'blue')}}">{{item.val}}/{{item.total}}</view>
+        </view>
+    </view>
+</view>

pages/tabber/builds/index.wxss

@@ -1 +1,92 @@
-/* pages/tabber/builds/index.wxss */
+/* pages/tabber/builds/index.wxss */
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F8F8F8;
+}
+
+.contioner {
+    background: #FFFFFF;
+    padding: 30rpx;
+}
+
+.contioner .input {
+    width: 690rpx;
+    height: 80rpx;
+    background: #F6F6F6;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+    padding: 0 30rpx;
+    color: #666666;
+}
+
+.contioner .input .icon {
+    width: 36rpx;
+    height: 36rpx;
+}
+
+.contioner .box {
+    width: 210rpx;
+    height: 112rpx;
+    background: #F8F8F8;
+    border-radius: 8rpx;
+    flex-direction: column;
+}
+
+.contioner .box .tit {
+    font-size: 40rpx;
+    color: #333333;
+}
+
+.contioner .box .tips {
+    font-size: 24rpx;
+    color: #999999;
+}
+
+.contioner .le {
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #333333;
+}
+
+.contioner .lr {
+    font-size: 26rpx;
+    color: #999999;
+}
+
+.contioner .list {
+    padding: 10rpx 0;
+    flex-wrap: wrap;
+}
+
+.contioner .list .item {
+    flex-direction: column;
+    width: 20%;
+    margin-bottom: 40rpx;
+
+}
+
+.contioner .list .item .top {
+    width: 80rpx;
+    height: 80rpx;
+    border: 1rpx solid #CCCCCC;
+    border-radius: 50%;
+    line-height: 80rpx;
+    font-size: 50rpx;
+    font-weight: 600;
+    color: #333333;
+    text-align: center;
+}
+
+.contioner .list .item .foot {
+    font-size: 26rpx;
+    color: #333333;
+}
+
+.contioner .list .item .foot.blue{
+    color: #4699FF;
+}
+
+.contioner .list .item .foot.green{
+    color: #0F8800;
+}

pages/tabber/home/index.js

@@ -10,11 +10,13 @@ Page({
         menuList:[
             {
                 icon:'/image/home/icon_ruchangqianshou.png',
-                tit:'入厂签收'
+                tit:'入厂签收',
+                url:"/pages/signIn/siginIn"
             },
             {
                 icon:'/image/home/icon_fenjianluru.png',
-                tit:'分拣录入'
+                tit:'分拣录入',
+                url:"/pages/sorting/choice/choice"
             },
             {
                 icon:'/image/home/icon_zhijian.png',
@@ -38,8 +40,20 @@ Page({
         // api.getBanner().then(res=>{
         //     console.log(res);
         // })
-
+      
     },
+    toUrl(e){
+        let {url} = e.currentTarget.dataset
 
+        wx.navigateTo({
+          url,
+        })
+    },
+    loginOut(){
+        wx.removeStorageSync('token')
+        wx.reLaunch({
+          url: '/pages/login/login',
+        })
+    }
 
 })

pages/tabber/home/index.wxml

@@ -8,7 +8,7 @@
             </view>
         </view>
         <view class="lr flex ">
-            <text class="m-right-10">退出</text>
+            <text class="m-right-10" bindtap="loginOut">退出</text>
             <image src="/image/icon/back.png" class="icon"></image>
 
         </view>
@@ -31,8 +31,8 @@
     </view>
 </view>
 
-<view class="contioner flex">
-    <view class="items flex ju-c" wx:for="{{menuList}}" wx:key="*this">
+<view class="contioner ">
+    <view class="items flex ju-c" wx:for="{{menuList}}" wx:key="*this" bindtap="toUrl" data-url="{{item.url}}">
         <image class="icon" src="{{item.icon}}"></image>
         <text class="tit">{{item.tit}}</text>
     </view>

pages/tabber/home/index.wxss

@@ -60,8 +60,8 @@ page {
 .contioner {
     width: 100%;
     padding: 0 40rpx;
-    flex-direction: column;
-    align-items: flex-start;
+    display: flex;
+    flex-wrap: wrap;
     justify-content: space-between;
 }
 

pages/tabber/order/index.js

@@ -5,62 +5,38 @@ Page({
      * 页面的初始数据
      */
     data: {
-
+        selectInfo: {}
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+        class Select {
+            in = 1
+            getSelet(){
+                console.log(2);
+                return 10
+            }
+        }
 
+        var b = new Select();
+        console.log(b.getSelet());
     },
 
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
     onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
+        const query = wx.createSelectorQuery()
+        query.select('#nav').boundingClientRect((res) => {
+            console.log(res);
+            this.setData({
+                selectInfo: res
+            })
+        })
+        query.exec()
     },
 
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
 
-    }
 })

pages/tabber/order/index.json

@@ -1,3 +1,6 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index"
+  },
+  "navigationBarTitleText": "分拣单"
 }

pages/tabber/order/index.wxml

@@ -1,2 +1,53 @@
 <!--pages/tabber/news/index.wxml-->
-<text>pages/tabber/news/index.wxml</text>
+
+<view class="nav" id="nav">
+    <view class="topBox flex ju-b">
+        <view class="input flex">
+            <view class="icon m-right-15">水洗码</view>
+            <input type="text" />
+        </view>
+        <view class="btn btn-sky">搜索</view>
+    </view>
+    <view class="menu flex ju-b">
+        <view class="box flex ju-c">
+            <view class="m-right-10">状态</view>
+            <van-icon name="arrow-down" size="20rpx" />
+        </view>
+        <view class="box flex ju-c">
+            <view class="m-right-10">网点</view>
+            <van-icon name="arrow-down" size="20rpx" />
+        </view>
+        <view class="box flex ju-c">
+            <view class="m-right-10">时间</view>
+            <van-icon name="arrow-down" size="20rpx" />
+        </view>
+    </view>
+
+</view>
+<view class="seat" style="height:{{selectInfo.height}}px"></view>
+<view class="list">
+    <view class="item m-bottom-25" wx:for="{{3}}">
+        <view class="top flex ju-b m-bottom-15">
+            <view class="le">分拣单号：1234567</view>
+            <view class="lr">分拣员：大黄</view>
+        </view>
+        <view class="time m-bottom-30">分拣时间：2021-12-01 13:12:25</view>
+
+        <view class="contioner flex ju-b">
+            <view class="box flex ju-c">
+                <view class="num">4</view>
+                <view class="tips">拣出衣物</view>
+            </view>
+
+            <view class="box flex ju-c">
+                <view class="num">4</view>
+                <view class="tips">含有配件</view>
+            </view>
+
+            <view class="box flex ju-c">
+                <view class="num">正常分拣</view>
+                <view class="tips">状态</view>
+            </view>
+        </view>
+    </view>
+</view>

pages/tabber/order/index.wxss

@@ -1 +1,116 @@
-/* pages/tabber/news/index.wxss */
+/* pages/tabber/news/index.wxss */
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F4F4F4;
+}
+
+.nav {
+    position: fixed;
+    left: 0;
+    top: 0;
+}
+
+.topBox {
+    padding: 24rpx 30rpx;
+    background: #FFFFFF;
+}
+
+.topBox .input {
+    width: 524rpx;
+    height: 80rpx;
+    background: #F6F6F6;
+    border-radius: 8rpx;
+    padding: 0 30rpx;
+}
+
+.topBox .input .icon {
+    font-size: 24rpx;
+    color: #666666;
+    width: 110rpx;
+    position: relative;
+}
+
+.topBox .input .icon::after {
+    content: '';
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translate(-50%, 0%);
+    width: 0;
+    height: 0;
+    display: block;
+    border-top: 10rpx solid #9B9B9B;
+    border-bottom: 10rpx solid transparent;
+    border-left: 10rpx solid transparent;
+    border-right: 10rpx solid transparent;
+}
+
+.topBox .btn {
+    width: 136rpx;
+    height: 68rpx;
+    line-height: 68rpx;
+    background: #52A1FF;
+    border-radius: 8rpx;
+}
+
+.menu {
+    background-color: #FFFFFF;
+}
+
+.menu .box {
+    width: 250rpx;
+    height: 88rpx;
+    background: #FFFFFF;
+    font-size: 28rpx;
+    color: #333333;
+}
+
+.list {
+    padding: 24rpx 32rpx;
+
+}
+
+.list .item {
+    width: 686rpx;
+    height: 274rpx;
+    background: #FFFFFF;
+    border-radius: 8rpx;
+    padding: 32rpx 24rpx;
+
+}
+
+.list .item .top .le {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #333333;
+}
+
+.list .item .top .lr {
+    font-size: 24rpx;
+    color: #999999;
+}
+
+.list .item .time {
+    font-size: 26rpx;
+    color: #666666;
+}
+
+.list .item .contioner .box {
+    width: 196rpx;
+    height: 116rpx;
+    background: #F8F8F8;
+    border-radius: 8rpx;
+    flex-direction: column;
+}
+
+.list .item .contioner .box .num {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #333333;
+}
+
+.list .item .contioner .box .tips {
+    font-size: 24rpx;
+    color: #999999;
+}

pages/tabber/set/index.js

@@ -8,59 +8,9 @@ Page({
 
     },
 
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide: function () {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload: function () {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {
-
+    toAdmin(){
+        wx.navigateTo({
+          url: '/pages/mySet/admin/admin',
+        })
     }
 })

pages/tabber/set/index.json

@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "van-cell": "@vant/weapp/cell/index"
+  }
 }

pages/tabber/set/index.wxml

@@ -1,2 +1,18 @@
 <!--pages/tabber/my/index.wxml-->
-<text>pages/tabber/my/index.wxml</text>
+<view class="top">
+    <view class="m-bottom-50">
+        <van-cell title="切换工厂" is-link value="北京大兴大兴大兴工厂" />
+    </view>
+
+    <view class="boxs flex ju-b">
+        <view class="box flex ju-c" bindtap="toAdmin">
+            <image src="/image/set/guajian.png" class="icon m-right-30"></image>
+            <view class="tit" >挂架管理</view>
+        </view>
+
+        <view class="box flex ju-c">
+            <image src="/image/set/set.png" class="icon m-right-30"></image>
+            <view class="tit">打印设置</view>
+        </view>
+    </view>
+</view>

pages/tabber/set/index.wxss

@@ -1 +1,28 @@
-/* pages/tabber/my/index.wxss */
+/* pages/tabber/my/index.wxss */
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F8F8F8;
+}
+
+.top {
+    padding: 32rpx 30rpx;
+}
+
+.boxs .box {
+    width: 330rpx;
+    height: 134rpx;
+    background: #FFFFFF;
+    border-radius: 8rpx;
+}
+
+.boxs .box .icon {
+    width: 72rpx;
+    height: 74rpx;
+}
+
+.boxs .box .tit {
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #333333;
+}

project.config.json

@@ -27,16 +27,16 @@
         "uploadWithSourceMap": true,
         "compileHotReLoad": false,
         "lazyloadPlaceholderEnable": false,
-        "useMultiFrameRuntime": true,
-        "useApiHook": true,
-        "useApiHostProcess": true,
+        "useMultiFrameRuntime": false,
+        "useApiHook": false,
+        "useApiHostProcess": false,
         "babelSetting": {
             "ignore": [],
             "disablePlugins": [],
             "outputPath": ""
         },
         "enableEngineNative": false,
-        "useIsolateContext": true,
+        "useIsolateContext": false,
         "userConfirmedBundleSwitch": false,
         "packNpmManually": false,
         "packNpmRelationList": [

project.private.config.json

@@ -0,0 +1,30 @@
+{
+    "setting": {},
+    "condition": {
+        "plugin": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "",
+                    "pathName": "pages/sorting/choice/choice",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/tabber/order/index",
+                    "query": "",
+                    "scene": null
+                }
+            ]
+        }
+    }
+}

utils/api.js

@@ -1,7 +1,8 @@
 // api接口请求封装
+console.log(wx.getStorageSync('token'),'token');
 
 var useApi = (url, data = {}, method = "get") => {
-  
+
     return new Promise((resolve, reject) => {
         wx.request({
             url: `${url}`, // 云端正式服
@@ -27,7 +28,7 @@ var useApi = (url, data = {}, method = "get") => {
             },
             complete() {
                 wx.hideLoading({ //因为showToast、hideLoading不能同时使用
-                    fail() {}
+                    fail() { }
                 })
             }
         })
@@ -37,10 +38,9 @@ var useApi = (url, data = {}, method = "get") => {
 
 module.exports = {
     useApi,
-    getBanner(data){
-        console.log(1);
+    getBanner(data) {
         return useApi('', data)
- 
+
     }
 
 }

utils/util.js

@@ -15,5 +15,7 @@ const formatNumber = n => {
 }
 
 module.exports = {
-  formatTime
+  formatTime,
+  
 }
+