Pārlūkot izejas kodu

更新秒杀列表和后台组合数据值为空编辑报错

sugar1569 7 gadi atpakaļ
vecāks
revīzija
f3e4de8b35

+ 10 - 9
application/admin/controller/setting/SystemGroupData.php

@@ -162,37 +162,38 @@ class SystemGroupData extends AuthController
                     }
                 }
             }
+            $fvalue = isset($GroupDataValue[$value['title']]['value'])?$GroupDataValue[$value['title']]['value']:'';
             switch ($value['type']){
                 case 'input':
-                    $f[] = Form::input($value['title'],$value['name'],$GroupDataValue[$value['title']]['value']);
+                    $f[] = Form::input($value['title'],$value['name'],$fvalue);
                     break;
                 case 'textarea':
-                    $f[] = Form::input($value['title'],$value['name'],$GroupDataValue[$value['title']]['value'])->type('textarea');
+                    $f[] = Form::input($value['title'],$value['name'],$fvalue)->type('textarea');
                     break;
                 case 'radio':
 
-                    $f[] = Form::radio($value['title'],$value['name'],$GroupDataValue[$value['title']]['value'])->options($info);
+                    $f[] = Form::radio($value['title'],$value['name'],$fvalue)->options($info);
                     break;
                  case 'checkbox':
-                     $f[] = Form::checkbox($value['title'],$value['name'],$GroupDataValue[$value['title']]['value'])->options($info);
+                     $f[] = Form::checkbox($value['title'],$value['name'],$fvalue)->options($info);
                     break;
                  case 'upload':
-                     if(!empty($GroupDataValue[$value['title']]['value'])){
-                         $image = is_string($GroupDataValue[$value['title']]['value']) ? $GroupDataValue[$value['title']]['value'] : $GroupDataValue[$value['title']]['value'][0];
+                     if(!empty($fvalue)){
+                         $image = is_string($fvalue) ? $fvalue : $fvalue[0];
                      }else{
                          $image = '';
                      }
                      $f[] = Form::frameImageOne($value['title'],$value['name'],Url::build('admin/widget.images/index',array('fodder'=>$value['title'],'big'=>1)),$image)->icon('image');
                     break;
                  case 'uploads':
-                     $images = !empty($GroupDataValue[$value['title']]['value']) ? $GroupDataValue[$value['title']]['value']:[];
+                     $images = !empty($fvalue) ? $fvalue:[];
                      $f[] = Form::frameImages($value['title'],$value['name'],Url::build('admin/widget.images/index', array('fodder' => $value['title'],'big'=>1)),$images)->maxLength(5)->icon('images')->width('100%')->height('550px')->spin(0);
                     break;
                  case 'select':
-                     $f[] = Form::select($value['title'],$value['name'],$GroupDataValue[$value['title']]['value'])->setOptions($info);
+                     $f[] = Form::select($value['title'],$value['name'],$fvalue)->setOptions($info);
                     break;
                 default:
-                    $f[] = Form::input($value['title'],$value['name'],$GroupDataValue[$value['title']]['value']);
+                    $f[] = Form::input($value['title'],$value['name'],$fvalue);
                     break;
 
             }

+ 1 - 0
application/admin/model/system/SystemGroupData.php

@@ -28,6 +28,7 @@ class SystemGroupData extends ModelBasic
         $model = new self;
         if($params['gid'] !== '') $model = $model->where('gid',$params['gid']);
         if($params['status'] !== '') $model = $model->where('status',$params['status']);
+        $model = $model->order('sort desc,id ASC');
         return self::page($model,function($item,$key){
             $info = json_decode($item->value,true);
             foreach ($info as $index => $value) {

+ 9 - 4
application/routine/controller/AuthApi.php

@@ -102,7 +102,7 @@ class AuthApi extends AuthController{
         $new = StoreProduct::getNewProduct('id,image,store_name,cate_id,price,unit_name,sort',3);//今日上新
         $hot = StoreProduct::getHotProduct('id,image,store_name,cate_id,price,unit_name,sort',6);//猜你喜欢
         $data['banner'] = $banner;
-        $data['lovely'] = $lovely;
+        $data['lovely'] = $lovely[0];
         $data['menus'] = $menus;
         $data['best'] = $best;
         $data['new'] = $new;
@@ -341,7 +341,7 @@ class AuthApi extends AuthController{
         $lovely = GroupDataService::getData('routine_lovely')?:[];//banner图
         $seckill = StoreSeckill::where('is_del',0)->where('status',1)->where('start_time','<',time())->where('stop_time','>',time())->order('sort desc')->select()->toArray();
         $data['seckill'] = $seckill;
-        $data['lovely'] = $lovely;
+        $data['lovely'] = $lovely[1];
         return JsonService::successful($data);
     }
     /**
@@ -1476,7 +1476,7 @@ class AuthApi extends AuthController{
         $banner = $banner[0];
         $bargainUser = StoreBargainUser::getBargainUserStatusSuccess();
         $data['bargain'] = $bargain;
-        $data['lovely'] = $lovely;
+        $data['lovely'] = $lovely[2];
         $data['banner'] = $banner;
         $data['bargainUser'] = $bargainUser;
         return JsonService::successful($data);
@@ -1730,9 +1730,14 @@ class AuthApi extends AuthController{
         return JsonService::successful($store_combination);
     }
 
+    /**
+     * 获取拼团列表顶部图
+     * @param int $offset
+     * @param int $limit
+     */
     public function get_combination_list_banner(){
         $lovely = GroupDataService::getData('routine_lovely')?:[];//banner图
-        return JsonService::successful($lovely[2]);
+        return JsonService::successful($lovely[3]);
     }
 
     /**

+ 15 - 1
update.sql

@@ -125,4 +125,18 @@ ALTER TABLE `eb_store_combination` CHANGE COLUMN `mer_use` `mer_use`TINYINT(1) U
 ALTER TABLE `eb_store_product_reply` CHANGE COLUMN `merchant_reply_content` `merchant_reply_content` VARCHAR(300) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '管理员回复内容';
 ALTER TABLE `eb_store_product_reply` CHANGE COLUMN  `merchant_reply_time` `merchant_reply_time` INT(11) NULL COMMENT '管理员回复时间';
 ALTER TABLE `eb_store_cart` CHANGE COLUMN `combination_id` `combination_id` INT(11) UNSIGNED NULL DEFAULT '0' COMMENT '拼团id';
-ALTER TABLE `eb_store_order` CHANGE COLUMN `combination_id` `combination_id` int(11) UNSIGNED DEFAULT '0' COMMENT '拼团产品id0一般产品';
+ALTER TABLE `eb_store_order` CHANGE COLUMN `combination_id` `combination_id` int(11) UNSIGNED DEFAULT '0' COMMENT '拼团产品id0一般产品';
+
+--海报表新增
+DROP TABLE IF EXISTS `eb_routine_qrcode`;
+CREATE TABLE `eb_routine_qrcode` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '微信二维码ID',
+  `third_type` varchar(32) NOT NULL COMMENT '二维码类型 spread(用户推广) product_spread(产品推广)',
+  `third_id` int(11) unsigned NOT NULL COMMENT '用户id',
+  `status` tinyint(1) unsigned DEFAULT '1' COMMENT '状态 0不可用 1可用',
+  `add_time` varchar(255) DEFAULT NULL COMMENT '添加时间',
+  `page` varchar(255) DEFAULT NULL COMMENT '小程序页面路径带参数',
+  `qrcode_url` varchar(255) DEFAULT NULL COMMENT '小程序二维码路径',
+  `url_time` int(11) unsigned DEFAULT NULL COMMENT '二维码添加时间',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COMMENT='小程序二维码管理表';

+ 1 - 3
view/crmebN/pages/miao-list/miao-list.wxml

@@ -1,8 +1,6 @@
 <view class='miao-list'>
    <view class='header'>
-     <block wx:for="{{lovely}}">
-       <image wx:if="{{index == 1}}" src='{{url}}{{item.img}}' ></image>
-     </block>
+   <image src='{{url}}{{lovely.img}}'></image>
    </view>
    <view class='list-ul'>
       <block wx:for="{{Arraylist}}" wx:index="{{item}}">