王文政 пре 2 година
родитељ
комит
ffeaf41362
63 измењених фајлова са 1815 додато и 20 уклоњено
  1. 5 1
      app.json
  2. 8 0
      app.wxss
  3. BIN
      image/control/photo.png
  4. BIN
      image/control/success.png
  5. BIN
      image/icon/add.png
  6. BIN
      image/icon/error-red.png
  7. BIN
      image/icon/error.png
  8. BIN
      image/icon/search.png
  9. BIN
      image/icon/service.png
  10. BIN
      image/sorting/add.png
  11. BIN
      image/sorting/copy.png
  12. BIN
      image/sorting/delete.png
  13. BIN
      image/sorting/exit.png
  14. 22 0
      pages/control/choice/choice.js
  15. 4 0
      pages/control/choice/choice.json
  16. 26 0
      pages/control/choice/choice.wxml
  17. 65 0
      pages/control/choice/choice.wxss
  18. 26 0
      pages/control/order/order.js
  19. 6 0
      pages/control/order/order.json
  20. 55 0
      pages/control/order/order.wxml
  21. 157 0
      pages/control/order/order.wxss
  22. 20 0
      pages/control/result/result.js
  23. 4 0
      pages/control/result/result.json
  24. 32 0
      pages/control/result/result.wxml
  25. 93 0
      pages/control/result/result.wxss
  26. 67 0
      pages/login/login.js
  27. 4 0
      pages/login/login.json
  28. 27 0
      pages/login/login.wxml
  29. 48 0
      pages/login/login.wxss
  30. 15 0
      pages/mySet/admin/admin.js
  31. 7 0
      pages/mySet/admin/admin.json
  32. 42 0
      pages/mySet/admin/admin.wxml
  33. 46 0
      pages/mySet/admin/admin.wxss
  34. 66 0
      pages/mySet/print/print.js
  35. 8 0
      pages/mySet/print/print.json
  36. 23 0
      pages/mySet/print/print.wxml
  37. 53 0
      pages/mySet/print/print.wxss
  38. 66 0
      pages/signIn/hand/hand.js
  39. 4 0
      pages/signIn/hand/hand.json
  40. 13 0
      pages/signIn/hand/hand.wxml
  41. 36 0
      pages/signIn/hand/hand.wxss
  42. 66 0
      pages/signIn/recode/recode.js
  43. 4 0
      pages/signIn/recode/recode.json
  44. 11 0
      pages/signIn/recode/recode.wxml
  45. 23 0
      pages/signIn/recode/recode.wxss
  46. 49 0
      pages/signIn/siginIn.js
  47. 8 0
      pages/signIn/siginIn.json
  48. 32 0
      pages/signIn/siginIn.wxml
  49. 69 0
      pages/signIn/siginIn.wxss
  50. 23 0
      pages/sorting/choice/choice.js
  51. 4 0
      pages/sorting/choice/choice.json
  52. 26 0
      pages/sorting/choice/choice.wxml
  53. 65 0
      pages/sorting/choice/choice.wxss
  54. 24 0
      pages/sorting/enter/enter.js
  55. 3 0
      pages/sorting/enter/enter.json
  56. 118 0
      pages/sorting/enter/enter.wxml
  57. 209 0
      pages/sorting/enter/enter.wxss
  58. 3 1
      pages/tabber/home/index.js
  59. 5 0
      pages/tabber/set/index.js
  60. 1 1
      pages/tabber/set/index.wxml
  61. 4 4
      project.config.json
  62. 8 2
      project.private.config.json
  63. 12 11
      utils/api.js

+ 5 - 1
app.json

@@ -10,7 +10,11 @@
         "pages/signIn/recode/recode",
         "pages/mySet/admin/admin",
         "pages/mySet/print/print",
-        "pages/sorting/choice/choice"
+        "pages/sorting/choice/choice",
+        "pages/control/choice/choice",
+        "pages/control/order/order",
+        "pages/control/result/result",
+        "pages/sorting/enter/enter"
     ],
     "window": {
         "backgroundTextStyle": "light",

+ 8 - 0
app.wxss

@@ -33,6 +33,10 @@ view {
   justify-content: flex-end;
 }
 
+.m-top-10 {
+  margin-top: 10rpx;
+}
+
 .m-top-15 {
   margin-top: 15rpx;
 }
@@ -53,6 +57,10 @@ view {
   margin-top: 40rpx;
 }
 
+.m-top-50 {
+  margin-top: 50rpx;
+}
+
 .m-left-10 {
   margin-left: 10rpx;
 }

BIN
image/control/photo.png


BIN
image/control/success.png


BIN
image/icon/add.png


BIN
image/icon/error-red.png


BIN
image/icon/error.png


BIN
image/icon/search.png


BIN
image/icon/service.png


BIN
image/sorting/add.png


BIN
image/sorting/copy.png


BIN
image/sorting/delete.png


BIN
image/sorting/exit.png


+ 22 - 0
pages/control/choice/choice.js

@@ -0,0 +1,22 @@
+// pages/sorting/choice.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+    toOrder(){
+        wx.navigateTo({
+          url: '../order/order',
+        })
+    }
+})

+ 4 - 0
pages/control/choice/choice.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "质检上挂"
+}

+ 26 - 0
pages/control/choice/choice.wxml

@@ -0,0 +1,26 @@
+<!--pages/sorting/choice.wxml-->
+<view class="contioner">
+    <view class="boxs flex ju-b" bindtap="toOrder">
+        <view class="le">
+            <view class="tit">扫码分拣</view>
+            <view class="m-top-25">扫描封签二维码</view>
+        </view>
+        <image class="icon" src="/image/sorting/scan.png"></image>
+    </view>
+
+    <view class="boxs flex al-s boxs2 m-top-25">
+        <view class="le">
+            <view class="tit">人工输入</view>
+            <view class="m-top-25">二维码无法识别时人工输入封签号</view>
+        </view>
+        <view class="foot flex ju-b m-top-30">
+            <view class="input flex">
+                <input type="text" placeholder="手动输入数字" />
+            </view>
+            <view class="btn btn-sky m-left-15">签收</view>
+
+        </view>
+    </view>
+</view>
+
+<view class="tips">线下单录入>></view>

+ 65 - 0
pages/control/choice/choice.wxss

@@ -0,0 +1,65 @@
+/* pages/sorting/choice.wxss */
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F6F6F6;
+}
+
+.contioner {
+    padding: 24rpx;
+}
+
+.contioner .boxs {
+    width: 702rpx;
+    background: #FFFFFF;
+    border-radius: 16rpx;
+    padding: 32rpx;
+}
+
+.contioner .boxs .le {
+    font-size: 26rpx;
+    color: #999999;
+}
+
+.contioner .boxs .le .tit {
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #333333;
+}
+
+.contioner .boxs .icon {
+    width: 80rpx;
+    height: 80rpx;
+}
+
+
+.contioner .boxs2 {
+    flex-direction: column;
+}
+
+.boxs2 .input {
+    width: 450rpx;
+    height: 80rpx;
+    background: #F6F6F6;
+    border-radius: 8rpx;
+    padding: 0rpx 30rpx;
+    font-size: 28rpx;
+    color: #999999;
+}
+
+.boxs2 .btn {
+    width: 164rpx;
+    height: 80rpx;
+    background: #52A1FF;
+    border-radius: 8rpx;
+    line-height: 80rpx;
+}
+
+.tips {
+    position: absolute;
+    left: 50%;
+    bottom: 5%;
+    transform: translate(-50%, 0);
+    font-size: 28rpx;
+    color: #999999;
+}

+ 26 - 0
pages/control/order/order.js

@@ -0,0 +1,26 @@
+// pages/control/order/order.js
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+       
+    },
+
+    toResult(){
+        wx.navigateTo({
+          url: '../result/result',
+        })
+    }
+
+  
+})

+ 6 - 0
pages/control/order/order.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index"
+  },
+  "navigationBarTitleText": "质检上挂"
+}

+ 55 - 0
pages/control/order/order.wxml

@@ -0,0 +1,55 @@
+<!--pages/control/order/order.wxml-->
+<view class="contioner m-bottom-25">
+    <view class="top flex ju-b b-bottom">
+        <view class="le">
+            <view class="tit black m-bottom-25">水洗码:1234567</view>
+            <view class="tips gray m-bottom-15">订单编号:321897947903220</view>
+            <view class="tips gray">网点:中央美术学院</view>
+        </view>
+        <view class="lr flex ju-c">
+            <view class="tit tit2">#1</view>
+            <view class="tips gray m-top-10 ">挂架号</view>
+        </view>
+    </view>
+
+    <view class="foot">
+        <view class="flex m-top-25">
+            <view class="le  m-right-25">洗护标准</view>
+            <view class="lr">单烫不洗</view>
+        </view>
+        <view class="flex m-top-25">
+            <view class="le  m-right-25">增值服务</view>
+            <view class="lr"><text class="m-right-10">防水处理</text><text class="m-right-10">塑封包膜</text></view>
+        </view>
+    </view>
+</view>
+
+<view class="boxs">
+    <view class="tit m-bottom-25">洗后照片</view>
+
+    <view class="content flex">
+        <view class="item m-right-25 m-bottom-15" wx:for="{{5}}">
+            <image src="/image/build/scan.png" class="img-bgs"></image>
+            <view class="icon flex ju-c">
+                <van-icon name="cross" color="#fff" size="15rpx" />
+            </view>
+        </view>
+
+        <view class="photo flex ju-c">
+            <image src="/image/control/photo.png"></image>
+        </view>
+    </view>
+</view>
+
+<view class="tipsBox flex ju-b">
+    <view class="le">
+        <view class="tops">提交后直接进入打包</view>
+        <view class="foots m-top-15">此单仅当前一件,可直接打包</view>
+    </view>
+    <image src="/image/control/success.png" class="lr"></image>
+</view>
+
+<view class="footer flex ju-b">
+    <view class="btn btn-border">取消</view>
+    <view class="btn btn-sky" bindtap="toResult">提交</view>
+</view>

+ 157 - 0
pages/control/order/order.wxss

@@ -0,0 +1,157 @@
+/* pages/control/order/order.wxss */
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F6F6F6;
+}
+
+.contioner {
+    padding: 24rpx 32rpx;
+    background: #fff;
+}
+
+.top {
+    padding: 24rpx 0;
+}
+
+.top .tit {
+    font-size: 28rpx;
+    font-weight: 600;
+}
+
+.top .tit2 {
+    font-size: 36rpx;
+}
+
+.top .tips {
+    font-size: 24rpx;
+}
+
+.black {
+    color: #333333;
+}
+
+.gray {
+    color: #666666;
+}
+
+.top .lr {
+    width: 146rpx;
+    height: 124rpx;
+    background: #F8F8F8;
+    border-radius: 8rpx;
+    flex-direction: column;
+}
+
+.foot .le {
+    font-size: 24rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.foot .lr {
+    font-size: 24rpx;
+    color: #666666;
+}
+
+.boxs {
+    width: 690rpx;
+    background: #FFFFFF;
+    border-radius: 8rpx;
+    margin: auto;
+    padding: 24rpx;
+}
+
+.boxs .tit {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.boxs .content {
+    flex-wrap: wrap;
+}
+
+.boxs .item {
+    width: 120rpx;
+    height: 120rpx;
+    border-radius: 10rpx;
+    position: relative;
+    z-index: 10;
+}
+
+.boxs .item image {
+    width: 100%;
+    height: 100%;
+
+}
+
+.boxs .item .icon {
+    width: 24rpx;
+    height: 24rpx;
+    background: #F23131;
+    border-radius: 50%;
+    position: absolute;
+    right: 5rpx;
+    top: 5rpx;
+}
+
+.boxs .photo {
+    width: 120rpx;
+    height: 120rpx;
+    background: #F6F6F6;
+    border-radius: 4rpx;
+}
+
+.boxs .photo image {
+    width: 40rpx;
+    height: 40rpx;
+}
+
+.tipsBox {
+    padding: 42rpx 24rpx;
+    border-radius: 8rpx;
+    width: 690rpx;
+    margin: 25rpx auto;
+    background: #FFFFFF;
+}
+
+.tipsBox .lr {
+    width: 48rpx;
+    height: 48rpx;
+}
+
+.tipsBox .tops {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.tipsBox .foots {
+    font-size: 24rpx;
+    color: #0F8800;
+}
+
+.footer {
+    width: 750rpx;
+    height: 148rpx;
+    background: #FFFFFF;
+    border-radius: 24rpx 24rpx 0px 0px;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    padding: 30rpx;
+}
+
+.footer .btn {
+    width: 330rpx;
+    height: 88rpx;
+    border-radius: 8rpx;
+    line-height: 88rpx;
+    font-size: 30rpx;
+}
+
+.btn-border {
+    border: 1rpx solid #52A1FF;
+    color: #52A1FF;
+}

+ 20 - 0
pages/control/result/result.js

@@ -0,0 +1,20 @@
+// pages/control/result/result.js
+const app = getApp();
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+    
+    },
+
+
+})

+ 4 - 0
pages/control/result/result.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "质检上挂"
+}

+ 32 - 0
pages/control/result/result.wxml

@@ -0,0 +1,32 @@
+<!--pages/control/result/result.wxml-->
+<view class="topBox flex ju-c m-bottom-25">
+    <image src="/image/control/success.png" class="icon m-bottom-25"></image>
+    <view class="tips">完成</view>
+</view>
+
+<view class="contioner flex ju-c">
+    <view class="top m-top-15">
+        <view class="tit">#1</view>
+        <view class="tips  m-top-15">挂架号</view>
+    </view>
+
+    <view class="foot m-bottom-15">将衣物上挂至以上挂架</view>
+</view>
+
+<view class="contioner flex  al-s">
+    <view class="title">请注意核对服务</view>
+    <view class="content flex m-bottom-15">
+        <view class="le m-right-25">洗护标准</view>
+        <view class="lr">单烫不洗</view>
+    </view>
+    <view class="content flex">
+        <view class="le m-right-25">增值服务</view>
+        <view class="lr">防水处理  塑封包膜</view>
+    </view>
+</view>
+
+
+
+<view class="footer flex ju-c">
+    <view class="btn ">关闭</view>
+</view>

+ 93 - 0
pages/control/result/result.wxss

@@ -0,0 +1,93 @@
+/* pages/control/result/result.wxss */
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F6F6F6;
+}
+
+.topBox {
+    width: 750rpx;
+    background: #FFFFFF;
+    padding: 32rpx;
+    flex-direction: column;
+}
+
+.topBox .icon {
+    width: 68rpx;
+    height: 68rpx;
+}
+
+.topBox .tips {
+    font-size: 36rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.contioner {
+    padding: 40rpx 30rpx;
+    background: #FFFFFF;
+    width: 690rpx;
+    border-radius: 8rpx;
+    margin: 25rpx auto;
+    flex-direction: column;
+}
+
+.contioner .top {
+    text-align: center;
+    margin-bottom: 56rpx;
+}
+
+.contioner .top .tit {
+    font-size: 36rpx;
+    font-weight: 600;
+    color: #000000;
+}
+
+.contioner .top .tips {
+    font-size: 24rpx;
+    color: #999999;
+}
+
+.contioner .foot {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.contioner .title {
+    font-size: 28rpx;
+    font-weight: 600;
+    text-align: left;
+    color: #333333;
+    margin-bottom: 32rpx;
+}
+
+.contioner .le {
+    font-size: 24rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.contioner .lr {
+    font-size: 24rpx;
+    color: #666666;
+}
+
+.footer {
+    width: 750rpx;
+    height: 148rpx;
+    background: #FFFFFF;
+    border-radius: 24rpx 24rpx 0px 0px;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    padding: 30rpx;
+
+}
+
+.footer .btn {
+
+    font-size: 30rpx;
+    color: #52A1FF;
+
+}

+ 67 - 0
pages/login/login.js

@@ -0,0 +1,67 @@
+// pages/login/login.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        showEyes: false,
+        form: {
+            phone: "",
+            password: ''
+        },
+        phone: ''
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        const token = wx.getStorageSync('token')
+        console.log(token);
+        if (!token || token == '') {
+            wx.setNavigationBarTitle({
+                title: '分拣系统',
+              })
+        }else{
+            wx.switchTab({
+                url: '/pages/tabber/home/index',
+            })
+        }
+    },
+    onReady(){
+       
+    },
+    close() {
+        this.data.form.phone = ''
+        this.setData({
+            phone: ''
+        })
+        console.log(this.data.phone);
+
+    },
+    inputValue1(e) {
+        let { value } = e.detail
+        this.data.form.phone = value
+        this.setData({
+            phone: value
+        })
+        console.log(this.data.phone);
+    },
+    inputValue2(e) {
+        let { value } = e.detail
+        this.data.form.password = value
+    },
+    changeEyes() {
+        this.setData({
+            showEyes: !this.data.showEyes
+        })
+    },
+    login() {
+        console.log(this.data.form);
+        wx.setStorageSync('token', "测试值")
+        wx.switchTab({
+            url: '/pages/tabber/home/index',
+        })
+    }
+})

+ 4 - 0
pages/login/login.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": ""
+}

+ 27 - 0
pages/login/login.wxml

@@ -0,0 +1,27 @@
+<!--pages/login/login.wxml-->
+<view class="topBox">
+    <view class="tit m-bottom-25">欢迎登录海星洗护分拣系统</view>
+    <view class="tips">感谢您的辛勤劳动!</view>
+
+    <view class="inputBox">
+        <view class="boxs ">
+            <view class="laber m-bottom-25">手机号</view>
+            <view class="input  b-bottom flex ju-b">
+                <input type="text" placeholder="输入手机号" bindinput="inputValue1" value="{{phone}}" />
+                <image src="/image/icon/close.png" class="icon" wx:if="{{phone}}" bindtap="close"></image>
+            </view>
+        </view>
+
+        <view class="boxs m-top-30">
+            <view class="laber m-bottom-25">密码</view>
+            <view class="input  b-bottom flex ju-b">
+                <input type="{{showEyes?'text':'password'}}" placeholder="输入密码" bindinput="inputValue2"/>
+                <image src="/image/icon/eye.png" wx:if="{{showEyes}}" class="icon" bindtap="changeEyes"></image>
+                <image src="/image/icon/eye-no.png" wx:else class="icon" bindtap="changeEyes"></image>
+            </view>
+        </view>
+
+    </view>
+
+</view>
+<view class="btn btn-sky" bindtap="login">登录</view>

+ 48 - 0
pages/login/login.wxss

@@ -0,0 +1,48 @@
+/* pages/login/login.wxss */
+.topBox {
+    padding: 100rpx 50rpx 48rpx;
+}
+
+.topBox .tit {
+    font-size: 36rpx;
+    color: #333333;
+}
+
+.topBox .tips {
+    font-size: 24rpx;
+    font-weight: 300;
+    color: #666666;
+}
+
+.topBox .inputBox {
+    margin-top: 75rpx;
+}
+
+.topBox .inputBox .laber {
+    font-size: 24rpx;
+    color: #333333;
+}
+
+.topBox .inputBox .input {
+    padding-bottom: 25rpx;
+
+}
+
+.topBox .inputBox input {
+    font-size: 32rpx;
+    color: #BDBDBD;
+}
+
+.topBox .icon {
+    width: 32rpx;
+    height: 32rpx;
+}
+
+.btn {
+    width: 630rpx;
+    height: 88rpx;
+    background: #52A1FF;
+    border-radius: 8rpx;
+    line-height: 88rpx;
+    margin: auto;
+}

+ 15 - 0
pages/mySet/admin/admin.js

@@ -0,0 +1,15 @@
+// pages/mySet/admin/admin.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        checked: true,
+    },
+
+    onChange({ detail }) {
+        // 需要手动对 checked 状态进行更新
+        this.setData({ checked: detail });
+    },
+})

+ 7 - 0
pages/mySet/admin/admin.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "van-switch": "@vant/weapp/switch/index",
+    "van-icon": "@vant/weapp/icon/index"
+
+  }
+}

+ 42 - 0
pages/mySet/admin/admin.wxml

@@ -0,0 +1,42 @@
+<!--pages/mySet/admin/admin.wxml-->
+<view class="contioner">
+    <view class="m-bottom-30 cell flex ju-b">
+        <view class="le">设置挂架总数</view>
+        <view class="lr flex">
+            <view class="m-right-15">100</view>
+            <van-icon name="arrow" />
+        </view>
+    </view>
+
+
+    <view class=" b-bottom cell flex ju-b">
+        <view class="le">设置挂架总数</view>
+        <view class="lr flex">
+            <van-switch checked="{{ checked }}" bind:change="onChange" size="30rpx" />
+        </view>
+    </view>
+    <view class=" m-bottom-30 cell flex ju-b">
+        <view class="le">
+            <view>限制件数</view>
+            <view class="tips m-top-25">超出限制件数会占用新挂架</view>
+        </view>
+        <view class="lr flex">
+            <view class="rightBox">4</view>
+        </view>
+    </view>
+
+    <view class="m-bottom-30 cell flex ju-b">
+        <view class="le">分拣时预先占用挂架</view>
+        <view class="lr flex">
+            <van-switch checked="{{ checked }}" bind:change="onChange" size="30rpx" />
+        </view>
+    </view>
+
+    <view class="m-bottom-30  cell flex ju-b">
+        <view class="le">同订单分配至同一挂架</view>
+        <view class="lr flex">
+            <van-switch checked="{{ checked }}" bind:change="onChange" size="30rpx" />
+        </view>
+    </view>
+  
+</view>

+ 46 - 0
pages/mySet/admin/admin.wxss

@@ -0,0 +1,46 @@
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F8F8F8;
+}
+
+.contioner {
+    padding: 32rpx 30rpx;
+
+}
+
+.contioner .cell {
+    width: 690rpx;
+    background: #FFFFFF;
+    border-radius: 8rpx;
+    padding: 43rpx 24rpx;
+}
+
+.contioner .cell .le {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.contioner .cell .le .tips {
+    font-size: 24rpx;
+    color: #666666;
+    font-weight: 400;
+}
+
+.contioner .cell .lr {
+    font-size: 28rpx;
+    color: #666666;
+}
+
+.contioner .cell .lr .rightBox {
+    width: 174rpx;
+    height: 64rpx;
+    background: #F2F2F2;
+    border-radius: 8rpx;
+    line-height: 64rpx;
+    text-align: center;
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #333333;
+}

+ 66 - 0
pages/mySet/print/print.js

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

+ 8 - 0
pages/mySet/print/print.json

@@ -0,0 +1,8 @@
+{
+  "usingComponents": {
+    "van-switch": "@vant/weapp/switch/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-loading": "@vant/weapp/loading/index"
+  },
+  "navigationBarTitleText": "打印设置"
+}

+ 23 - 0
pages/mySet/print/print.wxml

@@ -0,0 +1,23 @@
+<!--pages/mySet/print/print.wxml-->
+<view class="contioner">
+    <view class="m-bottom-30  cell flex ju-b">
+        <view class="le">开启连接打印机</view>
+        <view class="lr flex">
+            <van-switch checked="{{ checked }}" bind:change="onChange" size="30rpx" />
+        </view>
+    </view>
+
+    <view class="m-bottom-30  cell flex ju-b">
+        <view class="le">打印测试页</view>
+      
+    </view>
+
+    <view class="m-bottom-30 tips flex ju-b">
+        <view>可用设备</view>
+        <van-loading type="spinner" color="#1989fa" size="30rpx"/>
+    </view>
+    <view class="  cell flex ju-b">
+        <view class="le">打印名称</view>
+      
+    </view>
+</view>

+ 53 - 0
pages/mySet/print/print.wxss

@@ -0,0 +1,53 @@
+/* pages/mySet/print/print.wxss */
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F8F8F8;
+}
+
+.contioner {
+    padding: 32rpx 30rpx;
+
+}
+
+
+.contioner .cell {
+    width: 690rpx;
+    background: #FFFFFF;
+    border-radius: 8rpx;
+    padding: 43rpx 24rpx;
+}
+
+.contioner .cell .le {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.contioner .cell .le .tips {
+    font-size: 24rpx;
+    color: #666666;
+    font-weight: 400;
+}
+
+.contioner .cell .lr {
+    font-size: 28rpx;
+    color: #666666;
+}
+
+.contioner .cell .lr .rightBox {
+    width: 174rpx;
+    height: 64rpx;
+    background: #F2F2F2;
+    border-radius: 8rpx;
+    line-height: 64rpx;
+    text-align: center;
+    font-size: 32rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.tips {
+    font-size: 24rpx;
+    color: #666666;
+}

+ 66 - 0
pages/signIn/hand/hand.js

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

+ 4 - 0
pages/signIn/hand/hand.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "手动输入"
+}

+ 13 - 0
pages/signIn/hand/hand.wxml

@@ -0,0 +1,13 @@
+<!--pages/signIn/hand/hand.wxml-->
+<view class="topBox flex ju-c">
+    <view class="input flex">
+        <input type="text" placeholder="手动输入数字"/>
+    </view>
+    <view class="btn btn-sky m-left-15">签收</view>
+</view>
+
+<view class="center flex ju-c m-top-40">
+    <image class="group" src="/image/signIn/group.png"></image>
+
+    <view class="tips m-top-40">请参照物流单上的封签码输入</view>
+</view>

+ 36 - 0
pages/signIn/hand/hand.wxss

@@ -0,0 +1,36 @@
+/* pages/signIn/hand/hand.wxss */
+.topBox {
+    padding: 25rpx 30rpx;
+}
+
+.topBox .input {
+    width: 510rpx;
+    height: 80rpx;
+    background: #F6F6F6;
+    border-radius: 8rpx;
+    padding: 0rpx 30rpx;
+    font-size: 28rpx;
+    color: #999999;
+}
+
+.topBox .btn {
+    width: 164rpx;
+    height: 80rpx;
+    background: #52A1FF;
+    border-radius: 8rpx;
+    line-height: 80rpx;
+}
+
+.center {
+    flex-direction: column;
+}
+
+.center .group {
+    width: 400rpx;
+    height: 255rpx;
+}
+
+.center .tips {
+    font-size: 28rpx;
+    color: #666666;
+}

+ 66 - 0
pages/signIn/recode/recode.js

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

+ 4 - 0
pages/signIn/recode/recode.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "签收记录"
+}

+ 11 - 0
pages/signIn/recode/recode.wxml

@@ -0,0 +1,11 @@
+<!--pages/signIn/recode/recode.wxml-->
+<view class="contioner">
+    <view class="items">
+        <view class="it ">封签号:12-345678</view>
+        <view class="it ">签收时间:2019-03-29 18:45:26</view>
+        <view class="it ">始发地:北京理工大学9号公寓</view>
+        <view class="it ">目的地:北京大兴大兴大兴工厂</view>
+        <view class="it ">签收人:大黄</view>
+        <view class="it ">承运人:大黄</view>
+    </view>
+</view>

+ 23 - 0
pages/signIn/recode/recode.wxss

@@ -0,0 +1,23 @@
+/* pages/signIn/recode/recode.wxss */
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F6F6F6;
+}
+
+.contioner {
+    padding: 20rpx;
+}
+
+.items {
+    padding: 25rpx 30rpx;
+    width: 710rpx;
+    background: #FFFFFF;
+    border-radius: 8rpx;
+    line-height: 50rpx;
+}
+
+.items .it {
+    font-size: 28rpx;
+    color: #333333;
+}

+ 49 - 0
pages/signIn/siginIn.js

@@ -0,0 +1,49 @@
+// pages/signIn/siginIn.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        checked: false,
+        result:null
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+    toHand(){
+        wx.navigateTo({
+          url: '/pages/signIn/hand/hand',
+        })
+    },
+    toRecode(){
+        wx.navigateTo({
+          url: '/pages/signIn/recode/recode',
+        })
+    },
+    onChange({ detail }) {
+        // 需要手动对 checked 状态进行更新
+        this.setData({ checked: detail });
+    },
+    getScancode: function () {
+        var _this = this;
+        // 允许从相机和相册扫码
+        wx.scanCode({
+            success: (res) => {
+                var result = res.result;
+
+                _this.setData({
+                    result: result,
+
+                })
+
+                console.log(_this.data.result);
+            }
+        })
+
+    }
+})

+ 8 - 0
pages/signIn/siginIn.json

@@ -0,0 +1,8 @@
+{
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index",
+    "van-switch": "@vant/weapp/switch/index",
+    "van-cell": "@vant/weapp/cell/index"
+  },
+  "navigationBarTitleText": "入厂签收"
+}

+ 32 - 0
pages/signIn/siginIn.wxml

@@ -0,0 +1,32 @@
+<!--pages/signIn/siginIn.wxml-->
+<view class="topBox flex m-bottom-25">
+    <view>
+        签收工厂:北京大兴工厂
+    </view>
+</view>
+
+<view class="centerBox">
+    <view class="top flex ju-c b-bottom">
+        <view class="round  flex ju-c" bindtap="getScancode">
+            <van-icon name="scan" color="#fff" size="55" />
+            <view class="tips m-top-20">扫码签收</view>
+        </view>
+    </view>
+
+    <view class="footer ju-b flex">
+        <view class="le flex ju-c" bindtap="toHand">
+            <image src="/image/icon/exit.png" class="icon"></image>
+            <view class="tips m-top-15">手动输入</view>
+        </view>
+        <view class="line"></view>
+        <view class="lr flex ju-c">
+            <van-switch checked="{{ checked }}" bind:change="onChange" size="30rpx" />
+            <view class="tips m-top-15">连续扫码</view>
+        </view>
+    </view>
+</view>
+
+<view class="m-top-25">
+    <van-cell title="签收记录" is-link bindtap="toRecode" />
+
+</view>

+ 69 - 0
pages/signIn/siginIn.wxss

@@ -0,0 +1,69 @@
+/* pages/signIn/siginIn.wxss */
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F6F6F6;
+}
+
+.topBox {
+    width: 750rpx;
+    height: 88rpx;
+    background: #FFFFFF;
+    padding: 30rpx;
+    font-size: 28rpx;
+    color: #333333;
+}
+
+.centerBox {
+    width: 750rpx;
+    height: 789rpx;
+    background: #FFFFFF;
+}
+
+.centerBox .top {
+    height: 660rpx;
+}
+
+.centerBox .round {
+    width: 400rpx;
+    height: 400rpx;
+    background: #52A1FF;
+    box-shadow: 0rpx 0rpx 20rpx 0rpx #52A1FF;
+    border-radius: 50%;
+    background: #52A1FF;
+    flex-wrap: wrap;
+    flex-direction: column;
+}
+
+.centerBox .round .tips {
+    font-size: 30rpx;
+    font-weight: 500;
+    color: #FFFFFF;
+}
+
+.centerBox .footer {
+    height: calc(789rpx - 660rpx);
+}
+
+.centerBox .footer .le,
+.lr {
+    width: 50%;
+    flex-direction: column;
+    height: 100%;
+}
+
+.centerBox .footer .line {
+    width: 1rpx;
+    height: 80rpx;
+    background: #EDEDED;
+}
+
+.centerBox .footer .icon {
+    width: 40rpx;
+    height: 40rpx;
+}
+
+.centerBox .footer .tips {
+    font-size: 24rpx;
+    color: #333333;
+}

+ 23 - 0
pages/sorting/choice/choice.js

@@ -0,0 +1,23 @@
+// pages/sorting/choice.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    toEnter(){
+        wx.navigateTo({
+          url: '../enter/enter',
+        })
+    }
+})

+ 4 - 0
pages/sorting/choice/choice.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "拆包分拣"
+}

+ 26 - 0
pages/sorting/choice/choice.wxml

@@ -0,0 +1,26 @@
+<!--pages/sorting/choice.wxml-->
+<view class="contioner">
+    <view class="boxs flex ju-b" bindtap="toEnter">
+        <view class="le">
+            <view class="tit">扫码分拣</view>
+            <view class="m-top-25">扫描封签二维码</view>
+        </view>
+        <image class="icon" src="/image/sorting/scan.png"></image>
+    </view>
+
+    <view class="boxs flex al-s boxs2 m-top-25">
+        <view class="le">
+            <view class="tit">人工输入</view>
+            <view class="m-top-25">二维码无法识别时人工输入封签号</view>
+        </view>
+        <view class="foot flex ju-b m-top-30">
+            <view class="input flex">
+                <input type="text" placeholder="手动输入数字" />
+            </view>
+            <view class="btn btn-sky m-left-15">签收</view>
+
+        </view>
+    </view>
+</view>
+
+<view class="tips">线下单录入>></view>

+ 65 - 0
pages/sorting/choice/choice.wxss

@@ -0,0 +1,65 @@
+/* pages/sorting/choice.wxss */
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F6F6F6;
+}
+
+.contioner {
+    padding: 24rpx;
+}
+
+.contioner .boxs {
+    width: 702rpx;
+    background: #FFFFFF;
+    border-radius: 16rpx;
+    padding: 32rpx;
+}
+
+.contioner .boxs .le {
+    font-size: 26rpx;
+    color: #999999;
+}
+
+.contioner .boxs .le .tit {
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #333333;
+}
+
+.contioner .boxs .icon {
+    width: 80rpx;
+    height: 80rpx;
+}
+
+
+.contioner .boxs2 {
+    flex-direction: column;
+}
+
+.boxs2 .input {
+    width: 450rpx;
+    height: 80rpx;
+    background: #F6F6F6;
+    border-radius: 8rpx;
+    padding: 0rpx 30rpx;
+    font-size: 28rpx;
+    color: #999999;
+}
+
+.boxs2 .btn {
+    width: 164rpx;
+    height: 80rpx;
+    background: #52A1FF;
+    border-radius: 8rpx;
+    line-height: 80rpx;
+}
+
+.tips {
+    position: absolute;
+    left: 50%;
+    bottom: 5%;
+    transform: translate(-50%, 0);
+    font-size: 28rpx;
+    color: #999999;
+}

+ 24 - 0
pages/sorting/enter/enter.js

@@ -0,0 +1,24 @@
+// pages/sorting/enter/enter.js
+const app =getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        app.api.getInfo({id:2}).then(res=>{
+            console.log(res.data);
+        })
+    },
+    toResult(){
+        
+    }
+
+})

+ 3 - 0
pages/sorting/enter/enter.json

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

+ 118 - 0
pages/sorting/enter/enter.wxml

@@ -0,0 +1,118 @@
+<!--pages/sorting/enter/enter.wxml-->
+<view class="contioner flex ju-b b-bottom">
+    <view class="le">
+        <view class="title m-bottom-15 m-top-15">封签号:12-345678</view>
+        <view class="message t-text-ellipsis2">客户备注:备注信息备注信息备注信息备注信息最多两232212212</view>
+        <view class="les flex m-top-40">
+            <image src="/image/icon/search.png" class="icon"></image>
+            <text>查看订单(多包裹订单)</text>
+        </view>
+    </view>
+
+    <view class="lr ">
+        <view class="flex ju-b">
+            <view class="box flex ju-c m-right-15">
+                <view class="num"> <text>2</text>/5 </view>
+                <view class="tips">应收件数</view>
+            </view>
+            <view class="box flex ju-c">
+                <view class="num">5</view>
+                <view class="tips">拣出配件</view>
+            </view>
+
+        </view>
+
+
+        <view class="lrs flex m-top-50">
+            <image src="/image/icon/error.png" class="icon"></image>
+            <text>存在分拣差异</text>
+        </view>
+    </view>
+</view>
+
+<view class="contioner flex ju-b al-s">
+    <view class="left">
+        <view class="flex m-bottom-25">
+            <view class="tit m-right-25">洗护标准</view>
+            <view class="content">单烫不洗 普通洗涤</view>
+        </view>
+        <view class="flex">
+            <view class="tit  m-right-25">增值服务</view>
+            <view class="content">防水处理 塑封包膜</view>
+        </view>
+    </view>
+    <view class="right">(注意核实下单信息进行区分)</view>
+</view>
+
+
+<view class="list">
+    <view class="item">
+        <view class="title b-bottom flex ju-b">
+            <view class="le flex">
+                <view class="tit m-right-10">3.裤类-西裤</view>
+                <view class="color m-right-10"></view>
+                <view class="col">灰色</view>
+            </view>
+            <view class="lr">水洗码:1234567</view>
+        </view>
+
+        <view class="boxs b-bottom flex">
+            <view class="le m-right-20">瑕疵</view>
+            <view>起球;磨亮;拉链掉漆</view>
+        </view>
+
+        <view class="boxs b-bottom flex ju-b ">
+            <view>
+                <view class=" flex m-bottom-25">
+                    <view class="le m-right-20">洗护标准</view>
+                    <view>普通洗涤</view>
+                </view>
+                <view class=" flex">
+                    <view class="le m-right-20">增值服务</view>
+                    <view>塑封包膜</view>
+                </view>
+            </view>
+
+            <view class="rightTips flex ju-c">
+                <image class="icon m-right-10" src="/image/icon/error-red.png"></image>
+                <view class="error">不加工</view>
+            </view>
+        </view>
+
+        <view class="footerBox flex ju-b">
+            <view class="foots ju-c flex">
+                <image class="icon" src="/image/sorting/add.png"></image>
+                <view class="tips blue">配件</view>
+            </view>
+            <view class="line"></view>
+            <view class="foots ju-c flex">
+                <image class="icon" src="/image/sorting/copy.png"></image>
+                <view class="tips blue">复制</view>
+            </view>
+            <view class="line"></view>
+            <view class="foots ju-c flex">
+                <image class="icon" src="/image/sorting/exit.png"></image>
+                <view class="tips blue">编辑</view>
+            </view>
+            <view class="line"></view>
+            <view class="foots ju-c flex">
+                <image class="icon" src="/image/sorting/delete.png"></image>
+                <view class="tips red">删除</view>
+            </view>
+        </view>
+
+    </view>
+</view>
+
+<view class="footer flex ju-b">
+    <view class="btn btn-border flex ju-c">
+        <image src="/image/icon/add.png" class="icon m-right-10"></image>
+        <text>添加</text>
+    </view>
+
+    <view class="btn btn-border flex ju-c">
+        <image src="/image/icon/service.png" class="icon m-right-10"></image>
+        <text>联系用户</text>
+    </view>
+    <view class="btn btn-sky" bindtap="toResult">提交</view>
+</view>

+ 209 - 0
pages/sorting/enter/enter.wxss

@@ -0,0 +1,209 @@
+/* pages/sorting/enter/enter.wxss */
+page {
+    width: 750rpx;
+    min-height: 100vh;
+    background: #F6F6F6;
+}
+
+.contioner {
+    padding: 24rpx;
+    background: #ffffff;
+}
+
+.contioner .title {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.contioner .message {
+    width: 316rpx;
+    height: 65rpx;
+    font-size: 24rpx;
+    color: #999999;
+}
+
+.contioner .box {
+    width: 146rpx;
+    height: 112rpx;
+    background: #F8F8F8;
+    border-radius: 8rpx;
+    flex-direction: column;
+}
+
+.contioner .box .num text {
+    color: #F23131;
+}
+
+.contioner .box .num {
+    font-size: 36rpx;
+    font-weight: 600;
+    color: #333;
+}
+
+.contioner .box .tips {
+    font-size: 24rpx;
+    color: #999999;
+}
+
+.contioner .icon {
+    width: 28rpx;
+    height: 28rpx;
+    margin-right: 8rpx;
+}
+
+.contioner .les {
+    font-size: 24rpx;
+    color: #52A1FF;
+}
+
+.contioner .lrs {
+    font-size: 24rpx;
+    color: #F23131;
+}
+
+.contioner .left .tit {
+    font-size: 24rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.contioner .left .content {
+    font-size: 24rpx;
+    color: #666666;
+}
+
+.contioner .right {
+    font-size: 24rpx;
+    color: #F23131;
+}
+
+.list {
+    padding: 24rpx;
+}
+
+.list .item {
+    width: 702rpx;
+    background: #FFFFFF;
+    border-radius: 16rpx;
+}
+
+.list .item .title {
+    padding: 32rpx 24rpx;
+}
+
+.list .item .title .tit {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #0F8800;
+}
+
+.list .item .title .color {
+    width: 26rpx;
+    height: 26rpx;
+    background: #E4E4E4;
+}
+
+.list .item .title .col {
+    font-size: 26rpx;
+    color: #999999;
+}
+
+.list .item .title .lr {
+    font-size: 24rpx;
+    color: #666666;
+}
+
+.list .item .boxs {
+    padding: 24rpx;
+    font-size: 24rpx;
+    color: #666666;
+    position: relative;
+}
+
+
+.list .item .boxs .le {
+    font-size: 24rpx;
+    font-weight: 600;
+    color: #333333;
+}
+
+.list .item .boxs .rightTips {
+    width: 136rpx;
+    height: 48rpx;
+    background: #FFE1E1;
+    border-radius: 24rpx 0px 0px 24rpx;
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translate(0%, -50%);
+}
+
+.list .item .boxs .rightTips .icon {
+    width: 24rpx;
+    height: 24rpx;
+}
+
+.list .item .footerBox {
+    padding: 24rpx 0rpx;
+}
+
+.list .item .footerBox .foots {
+    width: 175rpx;
+}
+
+.blue {
+    font-size: 24rpx;
+    color: #52A1FF;
+}
+
+.red {
+    font-size: 24rpx;
+    color: #F23131;
+}
+
+.list .item .footerBox .icon {
+    width: 32rpx;
+    height: 32rpx;
+    margin-right: 5rpx;
+}
+
+.list .item .footerBox .line {
+    width: 1rpx;
+    height: 32rpx;
+    background: #EDEDED;
+}
+
+.error {
+    font-size: 24rpx;
+    color: #F23131;
+}
+
+.footer {
+    width: 750rpx;
+    height: 148rpx;
+    background: #FFFFFF;
+    border-radius: 24rpx 24rpx 0px 0px;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    padding: 30rpx;
+}
+
+.footer .btn {
+    padding: 0rpx 52rpx;
+    border-radius: 8rpx;
+    line-height: 88rpx;
+    font-size: 30rpx;
+    height: 88rpx;
+}
+
+.footer .icon {
+    width: 32rpx;
+    height: 32rpx;
+}
+
+.btn-border {
+    border: 1rpx solid #52A1FF;
+    color: #52A1FF;
+}

+ 3 - 1
pages/tabber/home/index.js

@@ -20,7 +20,9 @@ Page({
             },
             {
                 icon:'/image/home/icon_zhijian.png',
-                tit:'质检上挂'
+                tit:'质检上挂',
+                url:"/pages/control/choice/choice"
+
             },
             {
                 icon:'/image/home//icon_yichang.png',

+ 5 - 0
pages/tabber/set/index.js

@@ -12,5 +12,10 @@ Page({
         wx.navigateTo({
           url: '/pages/mySet/admin/admin',
         })
+    },
+    toSet(){
+      wx.navigateTo({
+        url: '/pages/mySet/print/print',
+      })
     }
 })

+ 1 - 1
pages/tabber/set/index.wxml

@@ -10,7 +10,7 @@
             <view class="tit" >挂架管理</view>
         </view>
 
-        <view class="box flex ju-c">
+        <view class="box flex ju-c" bindtap="toSet">
             <image src="/image/set/set.png" class="icon m-right-30"></image>
             <view class="tit">打印设置</view>
         </view>

+ 4 - 4
project.config.json

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

+ 8 - 2
project.private.config.json

@@ -14,13 +14,19 @@
             "list": [
                 {
                     "name": "",
-                    "pathName": "pages/sorting/choice/choice",
+                    "pathName": "pages/tabber/order/index",
                     "query": "",
                     "scene": null
                 },
                 {
                     "name": "",
-                    "pathName": "pages/tabber/order/index",
+                    "pathName": "pages/control/result/result",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/sorting/enter/enter",
                     "query": "",
                     "scene": null
                 }

+ 12 - 11
utils/api.js

@@ -1,17 +1,17 @@
 // api接口请求封装
-console.log(wx.getStorageSync('token'),'token');
+console.log(wx.getStorageSync('token'), 'token');
 
 var useApi = (url, data = {}, method = "get") => {
 
     return new Promise((resolve, reject) => {
         wx.request({
-            url: `${url}`, // 云端正式服
+            url: `http://192.168.4.12:8080${url}`,
             data,
             method,
-            header: {
-                token: wx.getStorageSync('token') || '',
-                'content-type': 'application/json',
-            },
+            // header: {
+            //     token: wx.getStorageSync('token') || '',
+            //     'content-type': 'application/json',
+            // },
             dataType: 'json', // 添加这个配置
             success(res) {
                 // wx.hideLoading()
@@ -36,11 +36,12 @@ var useApi = (url, data = {}, method = "get") => {
 }
 
 
-module.exports = {
-    useApi,
-    getBanner(data) {
-        return useApi('', data)
+function getInfo(data) {
+    return useApi('/getInfo', data)
+}
 
-    }
 
+module.exports = {
+    useApi,
+    getInfo,
 }