aiyou 4 years ago
parent
commit
80d444e1a5

+ 14 - 14
application/admin/view/label/add.html

@@ -6,20 +6,20 @@
             <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="">
         </div>
     </div>
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <div class="input-group">-->
-<!--                <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="">-->
-<!--                <div class="input-group-addon no-border no-padding">-->
-<!--                    <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>-->
-<!--                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>-->
-<!--                </div>-->
-<!--                <span class="msg-box n-right" for="c-image"></span>-->
-<!--            </div>-->
-<!--            <ul class="row list-inline plupload-preview" id="p-image"></ul>-->
-<!--        </div>-->
-<!--    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-image"></span>
+            </div>
+            <ul class="row list-inline plupload-preview" id="p-image"></ul>
+        </div>
+    </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('作用范围')}:</label>

+ 14 - 14
application/admin/view/label/edit.html

@@ -6,20 +6,20 @@
             <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
         </div>
     </div>
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            <div class="input-group">-->
-<!--                <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">-->
-<!--                <div class="input-group-addon no-border no-padding">-->
-<!--                    <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>-->
-<!--                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>-->
-<!--                </div>-->
-<!--                <span class="msg-box n-right" for="c-image"></span>-->
-<!--            </div>-->
-<!--            <ul class="row list-inline plupload-preview" id="p-image"></ul>-->
-<!--        </div>-->
-<!--    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="plupload-image" class="btn btn-danger plupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-image"></span>
+            </div>
+            <ul class="row list-inline plupload-preview" id="p-image"></ul>
+        </div>
+    </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('作用范围')}:</label>

+ 2 - 3
application/admin/view/store/store_product/add.html

@@ -118,8 +118,9 @@
             <select id="c-feight_id" class="f form-control" name="row[feight_id]" data-url="ajax/freight"></select>
 <!--            <input id="c-feight_id" data-rule="required" data-source="feight/index" class="form-control selectpage" name="row[feight_id]" type="text" value="">-->
         </div>
-
     </div>
+
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('一级佣金%')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -160,7 +161,6 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_recommend')}:</label>
         <div class="col-xs-12 col-sm-8">
             {:build_radios('row[is_recommend]', ['0'=>__('不推荐'), '1'=>__('推荐')])}
-<!--            <input id="c-is_recommend" data-rule="required" class="form-control" name="row[is_recommend]" type="number" value="0">-->
         </div>
     </div>
 <!--    <div class="form-group">-->
@@ -220,7 +220,6 @@
         </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">

+ 1 - 0
application/admin/view/store/store_product/edit.html

@@ -91,6 +91,7 @@
             <input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Deposit_price')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 1 - 4
application/api/common.php

@@ -31,10 +31,7 @@ function http_curl($url, $type = 'get', $res = 'json', $arr = '')
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); //不验证证书
     curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); //不验证证书
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    if ($type == 'post') {
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $arr);
-    }
+
     //3.采集
     $output = curl_exec($ch);
     //4.关闭

+ 23 - 27
application/api/controller/Index.php

@@ -94,53 +94,49 @@ class Index extends Api
      *
      */
     public function is_show_index(){
+
+        $array['3']['name']='二手车';
+        $array['3']['img']='/static/images/icon_buycar@2x.png';
+        $array['3']['is_show']=1;
+        $array['3']['url']='../shop/newshop';
+
         $array=[];
         $array['0']['name']='我要卖车';
         $array['0']['img']='/static/images/icon_carsale@2x.png';
         $array['0']['is_show']=1;
         $array['0']['url']='./sell';
 
+        $array['7']['name']='维保查询';//打开需要改分类数据库----
+        $array['7']['img']='/static/images/icon_insure@2x.png';
+        $array['7']['is_show']=1;
+        $array['7']['url']='../shop/shop';
 
-        $array['1']['name']='汽车分期';
-        $array['1']['img']='/static/images/icon_bystages@2x.png';
-        $array['1']['is_show']=1;
-        $array['1']['url']='../mine/jisuanqi';
-
-        $array['2']['name']='抵押贷款';
-        $array['2']['img']='/static/images/icon_mortgage@2x.png';
-        $array['2']['is_show']=1;
-        $array['2']['url']='./loan';
-
-        $array['3']['name']='二手车';
-        $array['3']['img']='/static/images/icon_buycar@2x.png';
-        $array['3']['is_show']=1;
-        $array['3']['url']='../shop/newshop';
+        $array['5']['name']='车辆检测';
+        $array['5']['img']='/static/images/icon_seektopurchase@2x.png';
+        $array['5']['is_show']=1;
+        $array['5']['url']='../circle/circle';
 
         $array['4']['name']='商家入驻';
         $array['4']['img']='/static/images/icon_businesssettlement@2x.png';
         $array['4']['is_show']=1;
         $array['4']['url']='./intoshop';
 
-        $array['5']['name']='求购';
-        $array['5']['img']='/static/images/icon_seektopurchase@2x.png';
-        $array['5']['is_show']=1;
-        $array['5']['url']='../circle/circle';
+        $array['2']['name']='车抵贷款';
+        $array['2']['img']='/static/images/icon_mortgage@2x.png';
+        $array['2']['is_show']=1;
+        $array['2']['url']='./loan';
 
         $array['6']['name']='新车';
         $array['6']['img']='/static/images/icon_newcar@2x.png';
         $array['6']['is_show']=1;
         $array['6']['url']='../shop/newshop';
 
-        $array['7']['name']='保险';//打开需要改分类数据库----
-        $array['7']['img']='/static/images/icon_insure@2x.png';
-        $array['7']['is_show']=1;
-        $array['7']['url']='../shop/shop';
-
-
-
-
+        $array['1']['name']='汽车分期';
+        $array['1']['img']='/static/images/icon_bystages@2x.png';
+        $array['1']['is_show']=1;
+        $array['1']['url']='../mine/jisuanqi';
 
-        $array['8']['name']='汽车用品';
+        $array['8']['name']='商城';
         $array['8']['img']='/static/images/icon_automobile@2x.png';
         $array['8']['is_show']=1;
         $array['8']['url']='../shop/shop';

+ 1 - 0
public/assets/js/backend.js

@@ -20,6 +20,7 @@ define(['fast', 'template', 'moment'], function (Fast, Template, Moment) {
                     //必须nums大于0才显示
                     badgeList[$url] = $nums > 0 ? '<small class="' + $class + ' pull-right bg-' + $color + '">' + $nums + '</small>' : '';
                 });
+                
                 $.each(badgeList, function (k, v) {
                     var anchor = top.window.$("li a[addtabs][url='" + k + "']");
                     if (anchor) {

+ 1 - 1
public/assets/js/backend/label.js

@@ -32,7 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'name', title: __('Name')},
-                       // {field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image},
+                      {field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'cate_top_id', title: __('作用车辆'),searchList: {"0":__('全部'),"17":__('新车'),"18":__('二手车'),"15":__('汽车用品')}, formatter: Table.api.formatter.normal,operate: false},
 
                         {