Browse Source

Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

wangxiaoming 7 years ago
parent
commit
b10d9845aa

+ 61 - 39
watero-rst-web/src/main/webapp/WEB-INF/views/wap/pts/machine_delivery.ftl

@@ -12,41 +12,44 @@
     <link href="${path}/common/lib/mui/css/mui.poppicker.css" rel="stylesheet" type="text/css" />
     <link href="${path}/common/css/input_order/input_order1.css" rel="stylesheet" type="text/css" />
     <link rel="stylesheet" type="text/css" href="//css.iamberry.com/wateroPF/new/css/iconfont.css?v=2017072401" />
+    <style>
+        .mui-segmented-control{border:1px solid #58d1eb;}
+        .mui-segmented-control .mui-control-item{background-color:#fff;line-height: 48px;color:#58d1eb;border-color:#58d1eb;border-left: 1px solid #58d1eb;}
+        .mui-segmented-control .mui-control-item.mui-active{background-color:#58d1eb;}
+        .chuku-saoma{position: absolute;right: 25px;top:0;color: #fff;background-color: #58d1eb;padding: 9px 10px;}
+        .bg-select{background: url(${path}/common/images/pts/select-down.png) 96% center no-repeat;background-size:20px;}
+        .cl-blue{color:#58d1eb;}
+        .my-pull-list>li{position: relative;height: 100px;padding-left: 15px;}
+        .my-pull-list>li:after{content: '';position: absolute;left: 0px;right: 0px;height: 1px;bottom: 0; background-color:#f0f0f0;}
+        .my-pull-list>li:before{content: '';position: absolute;left: 0;top:40%;height: 20%;width:3px;background-color: #58d1eb;}
+        .my-pull-list>li>div{padding: 10px 0;height: 35px;margin:5px 0;}
+        .btn-cancel{float: right;padding: 5px 12px;background-color: #fff;color: #58d1eb;border:1px solid #58d1eb;}
+        .my-pull-right{float: right;color: #999;}
+        .sp-status{margin-top: 5px;float: left;}
+    </style>
     <title>RST - 产品出库</title>
 </head>
-<body class="mui-fullscreen">
-<!--页面主结构开始-->
-<div id="app" class="mui-views">
-    <div class="mui-view">
-        <div class="mui-navbar" style="display: none;">
-        </div>
-        <div class="mui-pages">
+<body>
+    <div class="mui-content" style="background-color: #fff;">
+        <div style="padding: 10px 10px 0 10px;">
+            <div id="segmentedControl" class="mui-segmented-control">
+                <a class="mui-control-item mui-active" href="#item1">出库</a>
+                <a class="mui-control-item" href="#item2">已出库</a>
+            </div>
         </div>
-    </div>
-</div>
-<!--页面主结构结束-->
-<!--单页面开始-->
-<div id="setting" class="mui-page">
-    <!--页面标题栏开始-->
-    <div class="mui-navbar-inner mui-bar mui-bar-nav">
-    </div>
-    <!--页面标题栏结束-->
-    <!--页面主内容区开始-->
-    <div class="mui-page-content">
-        <div class="mui-scroll-wrapper">
-            <div class="mui-scroll my-scroll1">
+
+        <div id="item1" class="mui-control-content mui-active">
                 <article class="cl pd-10">
                     <ul class="my_input_list" id="basic_input_list">
-                        <li class="title"><label>出库信息</label></li>
                         <li>销售公司&nbsp;&nbsp;
-                            <input type="text" class="input-text w-75" id="machineSalesCompanyId" placeholder="请选择销售公司" readonly="readonly">
+                            <input type="text" class="input-text w-75 bg-select" id="machineSalesCompanyId" placeholder="请选择销售公司" readonly="readonly">
                         </li>
-                        <li>条&nbsp;&nbsp;形&nbsp;&nbsp;码&nbsp;&nbsp;<span id="xy_number"></span>
-                            <input type="text" class="input-text" id="machineBarcode" style="width: 60%;margin-bottom: 0;" placeholder="请扫描条形码">
-                            <span class="iconfont icon-saoma"></span>
+                        <li>出库日期&nbsp;&nbsp;
+                            <input type="text" id="machineSalesDate" class="input-text w-75 bg-select"  placeholder="请选择日期" readonly="readonly">
                         </li>
-                        <li>销售日期&nbsp;&nbsp;
-                            <input type="text" id="machineSalesDate" class="input-text w-75"  placeholder="请选择日期" readonly="readonly">
+                        <li style="position: relative;">条&nbsp;&nbsp;形&nbsp;&nbsp;码&nbsp;&nbsp;<span id="xy_number"></span>
+                            <input type="text" class="input-text w-75" id="machineBarcode" placeholder="请输入产品条形码/扫描">
+                            <span class="iconfont icon-saoma chuku-saoma"></span>
                         </li>
                     </ul>
                 </article>
@@ -55,12 +58,36 @@
                         <a class="btn btn-block btn-water radius size-L" href="javascript:void(0);" onclick="addMachineDelivery()">提交</a>
                     </div>
                 </div>
+            <div style="padding-top: 100px;text-align: center;">
+                净水机:今日出库 <span class="cl-blue">0</span><br/>
+                上朵牙刷:今日出库 <span  class="cl-blue">0</span>
             </div>
         </div>
+        <div id="item2" class="mui-control-content">
+            <article class="cl pd-10">
+                <ul class="my_input_list">
+                    <li style="position: relative;">条&nbsp;&nbsp;形&nbsp;&nbsp;码&nbsp;&nbsp;
+                        <input type="text" class="input-text w-75" id="machineBarcode" placeholder="请输入产品条形码/扫描进行搜索">
+                        <span class="iconfont icon-saoma chuku-saoma"></span>
+                    </li>
+                </ul>
+                <ul class="my-pull-list">
+                    <li>
+                        <div>232435u6yi1i2 爱贝源<span class="my-pull-right">2017-10-20</span></div>
+                        <div><span class="sp-status">已出库</span><span class="btn-cancel">取消出库</span></div>
+                    </li>
+                    <li>
+                        <div>232435u6yi1i2 爱贝源<span class="my-pull-right">2017-10-20</span></div>
+                        <div><span class="sp-status">已出库</span><span class="btn-cancel">取消出库</span></div>
+                    </li>
+                    <li>
+                        <div>232435u6yi1i2 爱贝源<span class="my-pull-right">2017-10-20</span></div>
+                        <div><span class="sp-status">已出库</span><span class="btn-cancel">取消出库</span></div>
+                    </li>
+                </ul>
+            </article>
+        </div>
     </div>
-    <!--页面主内容区结束-->
-</div>
-<!--单页面结束-->
 <script type="text/javascript" src="${path}/common/lib/mui/js/mui.min.js"></script>
 <script type="text/javascript" src="${path}/common/lib/mui/js/mui.view.js"></script>
 <script type="text/javascript" src="${path}/common/lib/mui/js/mui.picker.min.js"></script>
@@ -69,7 +96,7 @@
 <script type="text/javascript" src="${path}/common/js/order/order_common.js"></script>
 
 <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
-<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
+<#--<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>-->
 <script>
     var check = true,alert_msg='';
     var mobile=/^(13|14|15|18|17)[0-9]{9}$/; //手机号码
@@ -83,12 +110,7 @@
     var en_num1=/^[A-Za-z0-9\-]{1,}$/;//英文数字
     var card_id=/^(\d{17}[\d|x]|\d{15})$/; //身份证(国内)
     var validate_flag=false;
-    mui.init();
-    //初始化单页view
-    var viewApi = mui('#app').view({
-        defaultPage: '#setting'
-    });
-    mui('.mui-scroll-wrapper').scroll();
+
     mui.ready(function() {
 
     });
@@ -109,8 +131,8 @@
         })
     });
 
-    /*扫码*/
-    mui('body').on('tap', '.icon-saoma', function() {
+    /*出库扫码*/
+    mui('body').on('tap', '.chuku-saoma', function() {
         wx.scanQRCode({
             needResult: 1, // 默认为0,扫描结果由微信处理,1则直接返回扫描结果,
             scanType: ["barCode"], // 可以指定扫二维码还是一维码,默认二者都有

BIN
watero-rst-web/src/main/webapp/common/images/pts/select-down.png