Merge branch 'master' of http://119.23.72.7/sunlong_v5/note-library

# Conflicts:
#	.env

.env

@@ -58,4 +58,4 @@ ADMIN=liuzhiyong@teshehui.com
 LOGIN_DOMAIN='user.liexin.net'
 
 ERP_DOMAIN=http://192.168.1.235:6888
-ERP_DB_NAME=ICHUNT
\ No newline at end of file
+ERP_SUPPLY_DB_NAME=demo
\ No newline at end of file

app/Http/Controllers/WebController.php

@@ -54,8 +54,8 @@ class WebController extends Controller
     // 首页
     public function index(Request $request)
     {
-//        $JobsModel = new JobsModel();
-//
+        $JobsModel = new JobsModel();
+
         $info = $this->getPageInfo($request);
 
         return view('index', $info);
@@ -83,20 +83,7 @@ class WebController extends Controller
     }
 
     public function design($request,$info){
-//        echo DNS1D::getBarcodeSVG('4445645656', 'PHARMA2T');
-//        echo DNS1D::getBarcodeHTML('4445645656', 'PHARMA2T',"2","10");
-//        echo '<img src="data:image/png,' . DNS1D::getBarcodePNG('4', 'C39+') . '" alt="barcode"   />';
-//        echo DNS1D::getBarcodePNGPath('4445645656', 'PHARMA2T');
-//        echo '<img src="data:image/png;base64,' . DNS1D::getBarcodePNG('4', 'C39+') . '" alt="barcode"   />';
-//        exit;
-
-
-//        echo DNS1D::getBarcodeSVG("4445645656", "C39","1","20");
-//        echo DNS2D::getBarcodeHTML("4445645656", "QRCODE","3","3");
-//        echo DNS2D::getBarcodePNGPath("4445645656", "PDF417");
-//        echo DNS2D::getBarcodeSVG("4445645656", "DATAMATRIX");
-//        echo '<img src="data:image/png;base64,' . DNS2D::getBarcodePNG("4", "PDF417") . '" alt="barcode"   />';
-//exit;
+
 
         $info['title'] = '标签设计';
         return view('web', $info);

public/css/design.css

+.clr {
+    clear: both
+}
+
+.clr:after {
+    content: " ";
+    display: table;
+    clear: both
+}
+
+.fl {
+    float: left
+}
+
+.fr {
+    float: right
+}
+
+
+.tag-content {
+    width: 1100px
+}
+
+.tag-content input,
+.tag-content select {
+    width: 85px;
+    height: 26px;
+    line-height: 26px;
+    padding: 0 5px;
+    margin-right: 10px;
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    outline: none;
+    box-sizing: border-box;
+    font-family: "SimSun"
+}
+
+.tag-content .tag-tools {
+    background: #fff;
+    border: 1px solid #ccc;
+    clear: both;
+    padding: 15px;
+    height: 150px
+}
+
+.tag-content .tag-tools .tips {
+    color: #ffa200;
+    font-size: 12px;
+    margin-bottom: 20px
+}
+
+.tag-content .tag-tools .items {
+    cursor: pointer;
+    box-sizing: border-box;
+    float: left;
+    margin-left: 20px;
+    position: relative
+}
+
+.tag-content .tag-tools .items.yuan {
+    height: 45px;
+    width: 45px;
+    border-radius: 45px;
+    border: 1px solid #333
+}
+
+.tag-content .tag-tools .items.fang {
+    width: 70px;
+    height: 45px;
+    border: 1px solid #333
+}
+
+.tag-content .tag-tools .items.text {
+    font-size: 36px;
+    color: #666;
+    width: 70px;
+    text-align: center
+}
+
+.tag-content .tag-tools .items.line {
+    width: 100px;
+    height: 25px;
+    width: 70px;
+    border-top: 1px solid #333;
+    margin-top: 25px
+}
+
+.tag-content .tag-tools .items.erweima {
+    width: 45px;
+    height: 45px;
+    background-color: #ccc
+}
+
+.tag-content .tag-tools .items.yiweima {
+    width: 87px;
+    height: 35px;
+    background-color: #ccc
+}
+
+.tag-content .tag-tools .items.tupian {
+    width: 60px;
+    height: 45px;
+    background-color: #ccc
+}
+
+.tag-content .tag-tools .items.logo1 {
+    width: 91px;
+    height: 45px;
+    background-color: #ccc
+}
+
+.tag-content .tag-tools .items.logo2 {
+    width: 64px;
+    height: 25px;
+    background-color: #ccc
+}
+
+.tag-content .tag-tools .items.logo3 {
+    width: 88px;
+    height: 34px;
+    background-color: #ccc
+}
+
+.tag-content .tag-tools .items span {
+    position: absolute;
+    width: 100%;
+    color: #333;
+    text-align: center;
+    bottom: -20px;
+    font-size: 14px;
+    left: 0
+}
+.tag-edit h3{padding:20px 0}
+.tag-content .tag-edit .edit-seclect .seclect-group {
+    margin-right: 50px
+}
+
+.tag-content .tag-edit .fztip {
+    margin-top: 10px;
+    font-size: 12px;
+    color: #999
+}
+
+.edit-box {
+    background: #fff;
+    border: 1px solid #000;
+    padding: 15px 20px;
+    margin-top: 20px
+}
+
+.edit-box .edit-con {
+    clear: both;
+    position: relative;
+    border: 1px solid #ccc
+}
+
+.edit-box .edit-con div.gezi {
+    width: 20px;
+    height: 20px;
+    box-sizing: border-box;
+    border-bottom: 1px solid #ccc;
+    float: left;
+    border-right: 1px solid #ccc
+}
+
+.edit-box .edit-con div.gezi.right0 {
+    border-right: 0px
+}
+
+.edit-box .edit-con div.gezi.bottom0 {
+    border-bottom: 0px
+}
+
+.edit-box .edit-con div.gezi.border0 {
+    border: 0px
+}
+
+.tag-content .tag-edit .edit-value {
+    margin-top: 20px;
+    position: fixed;
+    width: 410px;
+    min-height: 300px;
+    right: 10px
+}
+
+.tag-content .tag-edit .edit-value .tools {
+    background: #f2f2f2;
+    padding: 20px;
+    display: none
+}
+
+.tag-content .tag-edit .edit-value .tools.act {
+    display: block
+}
+
+.tag-content .tag-edit .edit-value .tools .group-value {
+    margin-bottom: 10px
+}
+
+.tag-content .tag-edit .edit-value .tools .group-value span {
+    width: 80px
+}
+
+.zanshiUi {
+    position: absolute;
+    left: 888888888px;
+    z-index: 1;
+    box-sizing: border-box
+}
+
+.huabuitem {
+    position: absolute;
+    box-sizing: border-box;
+    cursor: pointer
+}
+
+.zctem {
+    display: none
+}
+
+.round {
+    border: 1px solid #333;
+    border-radius: 100%
+}
+
+.rectangle {
+    border: 1px solid #333
+}
+
+textarea {
+    outline: none;
+    resize: none;
+    border: 0px;
+    overflow: hidden;
+    line-height: 22px;
+    background: rgba(225, 225, 225, 0)
+}
+
+textarea:focus {
+    background: #f2f2f2
+}
+
+.lineit {
+    border-top: 1px solid #333
+}
+
+.more-data-gl {
+    margin-bottom: 10px
+}
+
+.xuanzhuan {
+    transform: rotate(90deg);
+    transform-origin: left top
+}