pengchanglu преди 3 години
родител
ревизия
0961c9f00b

+ 3 - 1
application/admin/view/pig/order/add.html

@@ -41,7 +41,7 @@
         <label class="control-label col-xs-12 col-sm-2">检疫图片:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="">
+                <input id="c-images" data-rule="required" class="form-control" size="50" name="row[images]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -51,6 +51,7 @@
             <ul class="row list-inline faupload-preview" id="p-images"></ul>
         </div>
     </div>
+<!--
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -69,6 +70,7 @@
 
         </div>
     </div>
+-->
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 3 - 1
application/admin/view/pig/order/edit.html

@@ -50,7 +50,7 @@
         <label class="control-label col-xs-12 col-sm-2">检疫图片:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
+                <input id="c-images" data-rule="required" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -60,6 +60,7 @@
             <ul class="row list-inline faupload-preview" id="p-images"></ul>
         </div>
     </div>
+<!--
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -78,6 +79,7 @@
 
         </div>
     </div>
+-->
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 2 - 2
application/admin/view/pig/order/index.html

@@ -1,5 +1,5 @@
 <div class="panel panel-default panel-intro">
-    
+<!--    
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
@@ -9,7 +9,7 @@
             {/foreach}
         </ul>
     </div>
-
+-->
 
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">

+ 1 - 1
application/index/controller/Source.php

@@ -80,7 +80,7 @@ class Source extends Frontend
         $code_arr['orderid'] = encrypt($orderid);
         $code_arr['code'] = $code_str;
         $code_arr['time'] = date('Y-m-d H:i:s');
-        $code_arr['text'] = '亲爱的消费者,您查询的溯源码是:'.$code_str.'这一批猪肉产品是由'.$info['companyinfo']['name'].'加工屠宰,产品各项检测指标符合相关标准要求,请放心选购。肉品加工地:安徽。查询时间:'.$code_arr['time'].'具体信息参见下方资料';
+        $code_arr['text'] = '亲爱的消费者,您查询的溯源码是:'.$code_str.'这一批猪肉产品是由'.$info['companyinfo']['name'].'加工屠宰,产品各项检测指标符合相关标准要求,请放心选购。肉品加工地:安徽。查询时间:'.$code_arr['time'].'具体信息参见下方资料';
 
         $this->view->assign('code', $code_arr);
         $this->view->assign('orderinfo', $info['orderinfo']);

+ 11 - 8
application/index/view/source/code.html

@@ -21,19 +21,22 @@
                 <h3 class="sydetail-h3">溯 源 信 息</h3>
                 <!--<p><span class="color">资质荣誉:</span></p>-->
                 <p class="marginbtm"><img src="__CDN__/assets/code/zzry.jpg"></p>
-{volist name="$companyinfo.imgs" id="data"}
-<p class="marginbtm"><img src="__CDN__{$data}"></p>
-{/volist}
-                <p>
-                    <span class="color"><i class="r-w">屠宰单位</i>:</span><span class="syright2" id="spancompany">{$companyinfo.name}</span>
-                </p>
+
+<p class="marginbtm"><img src="__CDN__{$companyinfo.imgs.0}"></p>
+                
                 <p><span class="color"><i class="r-w">产品名称</i>:</span>白条猪肉</p>
-                <p><span class="color"><i class="r-w">屠宰基地</i>:</span><span class="syright" id="spanarea">{$companyinfo.address}</span></p>
-                <p><span class="color"><i class="r-w">养殖单位</i>:</span><span class="syright" id="spanmarket">{$supplier.name}</span></p>
                 <p>
                     <span class="color"><i class="r-w">溯源内容</i>:</span><span class="syright">养殖单位→生猪检疫→生猪运输→宰前检验→加工过程检验→宰后核验→市场接收单位<a color="#0061a8" href="/source/inspect.html?id={$code.orderid}">详情&gt;&gt;</a></span>
                     <!--<a id="aLink" class="click-btn" href="/source/inspect.html?id={$code.orderid}">详情&gt;&gt;</a>-->
                 </p>
+                <p><span class="color"><i class="r-w">养殖单位</i>:</span><span class="syright" id="spanmarket">{$supplier.name}</span></p>
+                <p>
+                    <span class="color"><i class="r-w">屠宰单位</i>:</span><span class="syright2" id="spancompany">{$companyinfo.name}</span>
+                </p>
+                
+                <p><span class="color"><i class="r-w">屠宰基地</i>:</span><span class="syright" id="spanarea">{$companyinfo.address}</span></p>
+                
+
                 <p><span class="color"><i class="r-w">屠宰检验</i>:</span><span class="syright">合格</span></p>
                 <p><span class="color"><i class="r-w">屠宰时间</i>:</span><span class="syright">{$orderinfo.leavetime|date="Y-m-d H:i",###}</span></p>
                 <p><span class="color"><i class="r-w">接收单位</i>:</span>{$customer.name}</p>

+ 4 - 4
application/index/view/source/company.html

@@ -14,11 +14,11 @@
             -->
         </div>
         <div class="sydetail">
-            <h3 class="sydetail-h3">公 司 简 介</h3>
-            <p>公司名称:<span id="companyname">{$companyinfo.name}</span></p>
+            <h3 class="sydetail-h3">单 位 简 介</h3>
+            <p>单位名称:<span id="companyname">{$companyinfo.name}</span></p>
             <!--<p>负责人:<span id="person">苏振明</span></p>-->
-            <p id="p_address">公司地址:<span id="address">{$companyinfo.address}</span></p>
-            <p>公司介绍:<span id="product">{$companyinfo.content}</span></p>          
+            <p id="p_address">单位地址:<span id="address">{$companyinfo.address}</span></p>
+            <p>单位介绍:<span id="product">{$companyinfo.content}</span></p>          
             <!--
             <p id="TrademarkScan"><img src="__CDN__/assets/code/86a2983b74cd1965dedfad30a33126f.jpg"></p>
             <p id="LicensePicScan"><img src="__CDN__/assets/code/7ced6bfeebf89936a78c1cda875ad81.jpg"></p>