From deb7df629c3eefe628fad0baab451c79f2f58760 Mon Sep 17 00:00:00 2001
From: anyv <anyu@bronet.cn>
Date: Fri, 28 Jun 2019 16:09:27 +0800
Subject: [PATCH] a

---
 public/themes/simpleboot3/portal/salesmangoods/salesman_goods_add.html  |  1 -
 public/themes/simpleboot3/portal/salesmangoods/salesman_goods_edit.html | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_add.html b/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_add.html
index 4a84929..92a02b1 100755
--- a/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_add.html
+++ b/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_add.html
@@ -64,7 +64,6 @@
                 <div class="three_model_school_name">学龄前</div>
                 <div class="three_model_school_name">3-6年级</div>
                 <div class="three_model_school_name">1-2年级</div>
-
             </div>
         </div>
     </div>
diff --git a/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_edit.html b/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_edit.html
index 28f56f8..1c4066d 100755
--- a/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_edit.html
+++ b/public/themes/simpleboot3/portal/salesmangoods/salesman_goods_edit.html
@@ -38,6 +38,24 @@
         .log_six_select_one span,.log_two_input_title span,.log_two_picture_title span{
             color: #F20000;
         }
+        .mui-poppicker-header,
+        .mui-picker {
+            background-color: white;
+        }
+
+        .mui-btn-blue,
+        .mui-btn-primary,
+        input[type=submit] {
+            background-color: #FF7700;
+            border: 0;
+        }
+
+        .mui-pciker-list li.highlight {
+            color: #FF7700;
+        }
+        .mui-dtpicker-header,.mui-dtpicker-title h5{
+            background-color: white;
+        }
     </style>
 </head>
 
@@ -63,6 +81,7 @@
                 <div class="three_model_school_name">高中</div>
                 <div class="three_model_school_name">学龄前</div>
                 <div class="three_model_school_name">3-6年级</div>
+                <div class="three_model_school_name">1-2年级</div>
             </div>
         </div>
     </div>
@@ -323,6 +342,33 @@
 <script src="__TMPL__/public/assets/js/uploadfile.js"></script>
 <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
 <script>
+    var schoolpicker = new mui.PopPicker();
+    var classpicker = new mui.PopPicker();
+    var class_arr = '';
+    zujian();
+    function zujian(data_class_arr){
+        (function($, doc) {
+            $.init();
+            console.log(data_class_arr,'dfdfds');
+            $.ready(function() {
+                schoolpicker.setData(school_arr);
+                classpicker.setData(data_class_arr);
+            });
+        })(mui, document);
+    }
+    var school_name;
+    $(".log_six_select_nianji").click(function() {
+        schoolpicker.show(function(e) {
+            school_name = e[0].value;
+            school_names = e[0].text;
+            $(".log_six_nianji_contant").text(e[0].text);
+            $('.log_six_nianji_contant').css('color', '#333333');
+            
+        });
+
+    })
+</script>
+<script>
     $('#openCamera').click(function(){
 
         wx.config({$jssdk});
@@ -556,11 +602,11 @@
 <script>
 
     //选择年级
-    $(".log_six_select_nianji").click(function(){
-        $(".tx_mask_tongyi").css({
-            display: "block"
-        });
-    })
+//    $(".log_six_select_nianji").click(function(){
+//        $(".tx_mask_tongyi").css({
+//            display: "block"
+//        });
+//    })
     $(".tx_mask_tongyi .three_model_school_name").click(function(){
         var index = $(this).index();
         $('.log_six_nianji_contant').text($(this).text()).css("color", "#333");
--
libgit2 0.24.0