Merge branch 'master' of http://119.23.72.7/shiyu/icsales

Application/Home/View/GoodManage/index.html

@@ -72,7 +72,7 @@
                         上传商品
                     </div>
                     <div class="xz fr boxsiz btn btn_border">
-                        下载商品模板
+                        <a href="__PUBLIC__/ic_templet.xls">下载商品模板</a>
                     </div>
                     <div class="plsc fr btn btn_green">
                         <span class="icon iconfont iconjuxing16 "></span>

Application/Home/View/GoodManage/uploadsingle.html

@@ -16,7 +16,7 @@
                     <div class="nav_title">商品管理 > 发布商品 > 上传商品</div>
                     <div class="inquiry_form">
                         <div class="top_title clr">
-                            <h3 class="bold fl">上传商品</h3>
+                            <h3 class="bold fl" id="title"></h3>
                             <div class="plsc_btn fr">
                                 <span class="icon iconfont iconjuxing16"></span>
                                 批量上传

dist/css/chat.css

@@ -288,3 +288,4 @@
 .chat_content .content .content_div .notice_right .notice_list .notice_item .notice_content .template .template_right .template_right_bottom div i {
   color: #515559;
 }
+/*# sourceMappingURL=chat.css.map */
\ No newline at end of file

dist/css/chat.css.map

-{"version":3,"sources":["chat.less"],"names":[],"mappings":"AAAA,aACI;EACI,kBAAA;;AAFR,aACI,SAGI;EACI,kBAAA;EACA,SAAA;EACA,UAAA;EACA,WAAA;EACA,YAAA;EACA,gBAAA;;AAVZ,aACI,SAGI,aAQI;EACI,YAAA;EACA,+BAAA;EACA,YAAA;EACA,gBAAA;EACA,gBAAA;EACA,sBAAA;;AAEA,aAnBZ,SAGI,aAQI,aAQK;EACG,UAAA;;AArBpB,aACI,SAGI,aAQI,aAYI;EACI,gBAAA;EACA,0BAAA;;AA1BpB,aACI,SAGI,aAQI,aAkBI;EACI,uBAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;;AAEA,aAnChB,SAGI,aAQI,aAkBI,iBAMK;AACD,aApChB,SAGI,aAQI,aAkBI,iBAOK;EACG,yCAAA;;AAtCxB,aACI,SAGI,aAQI,aAkBI,iBAWI;EACI,YAAA;EACA,WAAA;EACA,sBAAA;;AA5CxB,aACI,SAGI,aAQI,aAkBI,iBAiBI;EACI,kBAAA;EACA,MAAA;EACA,WAAA;EACA,UAAA;EACA,SAAA;;AAGI,aAtDxB,SAGI,aAQI,aAkBI,iBAiBI,YAOI,IACK;EACG,gBAAA;;AADJ,aAtDxB,SAGI,aAQI,aAkBI,iBAiBI,YAOI,IACK,IAGG;EACI,eAAA;EACA,cAAA;EACA,kBAAA;EACA,kBAAA;;AAIR,aAjExB,SAGI,aAQI,aAkBI,iBAiBI,YAOI,IAYK;EACG,eAAA;EACA,cAAA;EACA,eAAA;;AAHJ,aAjExB,SAGI,aAQI,aAkBI,iBAiBI,YAOI,IAYK,QAKG;EACI,uBAAA;EACA,0BAAA;EACA,6BAAA;EACA,8BAAA;EACA,4BAAA;EACA,+BAAA;EACA,mBAAA;EACA,gBAAA;;AA/EpC,aACI,SAGI,aAQI,aAkBI,iBA2DI;EACI,eAAA;EACA,WAAA;EACA,kBAAA;EACA,mBAAA;EACA,YAAA;EACA,iBAAA;EACA,cAAA;;AAhGxB,aACI,SAGI,aAiGI;EACI,kBAAA;EACA,MAAA;EACA,WAAA;EACA,QAAA;EACA,SAAA;;AA1GhB,aACI,SAGI,aAiGI,cAOI;EACI,eAAA;;AA7GpB,aACI,SAGI,aAiGI,cAWI;EACI,aAAA;;AAEA,aAlHhB,SAGI,aAiGI,cAWI,WAGK;EACG,cAAA;;AApHxB,aACI,SAGI,aAiGI,cAmBI;EACI,kBAAA;EACA,SAAA;EACA,OAAA;EACA,QAAA;;AA5HpB,aACI,SAGI,aAiGI,cAmBI,cAMI;EACI,YAAA;EACA,aAAA;EACA,sDAAA;EACA,8CAAA;EACA,aAAA;EACA,kBAAA;EACA,OAAA;EACA,WAAA;EACA,WAAA;EACA,sBAAA;;AAxIxB,aACI,SAGI,aAiGI,cAmBI,cAMI,SAYI;EACI,YAAA;EACA,WAAA;EACA,YAAA;EACA,eAAA;EACA,0BAAA;;AAEA,aAhJxB,SAGI,aAiGI,cAmBI,cAMI,SAYI,GAOK;EACG,yBAAA;;AAlJhC,aACI,SAGI,aAiGI,cAmBI,cAMI,SAYI,GAWI;EACI,YAAA;EACA,WAAA;;AAvJhC,aACI,SAGI,aAiGI,cAmBI,cAoCI;EACI,gBAAA;EACA,6BAAA;EACA,gCAAA;;AA/JxB,aACI,SAGI,aAiGI,cAmBI,cAoCI,YAKI;EACI,eAAA;EACA,eAAA;;AAEA,aApKxB,SAGI,aAiGI,cAmBI,cAoCI,YAKI,IAIK;EACG,YAAA;EACA,WAAA;;AAGJ,aAzKxB,SAGI,aAiGI,cAmBI,cAoCI,YAKI,IASK;EACG,YAAA;EACA,WAAA;;AA5KhC,aACI,SAGI,aAiGI,cAmBI,cA0DI;EACI,aAAA;EACA,aAAA;;AApLxB,aACI,SAGI,aAiGI,cAmBI,cA0DI,YAII;EACI,YAAA;EACA,WAAA;EACA,iBAAA;EACA,YAAA;;AA1L5B,aACI,SAGI,aAiGI,cA2FI;EACI,gCAAA;;AAjMpB,aACI,SAGI,aAiGI,cA2FI,OAGI;EACI,eAAA;EACA,mBAAA;EACA,4BAAA;;AAtMxB,aACI,SAGI,aAiGI,cAqGI;EACI,YAAA;EACA,cAAA;EACA,qBAAA;;AA7MpB,aACI,SAGI,aAiGI,cA2GI;EACI,kBAAA;EACA,YAAA;EACA,WAAA;;AAnNpB,aACI,SAGI,aAiGI,cAiHI;EACI,kBAAA;EACA,SAAA;EACA,OAAA;EACA,QAAA;EACA,aAAA;EACA,cAAA;EACA,kBAAA;;AAEA,aA9NhB,SAGI,aAiGI,cAiHI,aASK;EACG,UAAA;;AAhOxB,aACI,SAGI,aAiGI,cAiHI,aAaI;EACI,gBAAA;;AAEA,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK;EACG,gBAAA;;AADJ,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG;EACI,iBAAA;;AAJR,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAGI;EACI,yBAAA;;AAPZ,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI;EACI,yBAAA;EACA,yBAAA;EACA,kBAAA;EACA,aAAA;EACA,kBAAA;EACA,gBAAA;;AAjBZ,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAQI;EACI,YAAA;EACA,WAAA;EACA,kBAAA;EACA,SAAA;EACA,UAAA;;AAxBhB,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI;EACI,UAAA;EACA,kBAAA;;AA7BhB,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAII;EACI,UAAA;;AAhCpB,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAII,oBAEI;EACI,cAAA;EACA,eAAA;EACA,mBAAA;;AApCxB,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAII,oBAOI;EACI,cAAA;EACA,UAAA;EACA,eAAA;EACA,iBAAA;;AA1CxB,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAmBI;EACI,UAAA;EACA,eAAA;;AAhDpB,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAmBI,uBAII;EACI,UAAA;EACA,gBAAA;;AApDxB,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAmBI,uBAII,OAGI;EACI,UAAA;;AACA,aA5RhD,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAmBI,uBAII,OAGI,IAEK;EACG,UAAA;;AAxDhC,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAmBI,uBAeI;EACI,UAAA;EACA,gBAAA;;AA/DxB,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAmBI,uBAeI,OAGI;EACI,UAAA;;AACA,aAvShD,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAmBI,uBAeI,OAGI,IAEK;EACG,UAAA;;AAnEhC,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAmBI,uBA0BI;EACI,cAAA;EACA,UAAA;;AA1ExB,aArOpB,SAGI,aAiGI,cAiHI,aAaI,aAGK,KAGG,gBAQI,UAgBI,gBAmBI,uBA0BI,IAGI;EACI,cAAA;;AAW5B,aA5TpB,SAGI,aAiGI,cAiHI,aAaI,aA0FK;EACG,iBAAA;;AADJ,aA5TpB,SAGI,aAiGI,cAiHI,aAaI,aA0FK,MAGG;EACI,kBAAA;;AAJR,aA5TpB,SAGI,aAiGI,cAiHI,aAaI,aA0FK,MAGG,gBAGI;EACI,yBAAA;;AApUpC,aACI,SAGI,aAiGI,cAiHI,aAaI,aAsGI;EACI,YAAA;EACA,WAAA;EACA,sBAAA;;AA5U5B,aACI,SAGI,aAiGI,cAiHI,aAaI,aA6GI,gBACI;EACI,qBAAA;EACA,eAAA;EACA,cAAA;EACA,kBAAA;EACA,kBAAA;;AAtVhC,aACI,SAGI,aAiGI,cAiHI,aAaI,aA6GI,gBAUI;EACI,eAAA;EACA,cAAA;EACA,kBAAA","file":"chat.css"}
\ No newline at end of file
+{"version":3,"sources":["chat.less"],"names":[],"mappings":"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","file":"chat.css"}
\ No newline at end of file

dist/js/global/global.min.js

@@ -365,7 +365,7 @@
       
       var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
       
-      today.setTime(targetday_milliseconds); //注意，这行是关键代码
+      today.setTime(targetday_milliseconds);
       
       var tYear = today.getFullYear();
       

dist/js/goodmanage/uploadsingle.js

@@ -7,6 +7,14 @@
     },
     created: function (opt) {
       
+      //判断编辑 新增状态
+      var id = Util.getRequest('id'), text = '';
+      
+      id ? text = '编辑商品' : text = '上传商品';
+      
+      $("#title").text(text);
+      
+      
       return this;
     },
     mounted: function (opt) {
@@ -33,7 +41,6 @@
         
       });
       
-      
       //天数同步期货
       $(document).on('input propertychange', 'input[name="day"]', function () {