dev

admin/control/refill_discount.php

@@ -14,73 +14,75 @@ class refill_discountControl extends SystemControl
         parent::__construct();
     }
 
-    private function condition($input)
-    {
-        $cond = [];
-        $start_time = $input['start_time'] ?? date("Y-m-d 00:00:00");
-
-
-
-
-    }
     public function indexOp()
     {
         $mod_discount = Model('refill_discount');
 
-        $cond = $this->condition($_GET);
-
-        $cond = [];
-
+        $list = $mod_discount->getList($_GET);
 
-//        $start_time = $_GET['start_time'] ?? date("Y-m-d 00:00:00");
-//
-//        $order_state_send = ORDER_STATE_SEND;
-//        $order_state_queue = ORDER_STATE_QUEUE;
-//        $order_state_handled = ORDER_STATE_HANDLED;
-//        $condition['order_state'] = ['in',"{$order_state_send},{$order_state_queue},{$order_state_handled}"];
-//
-//        if(!empty($_GET['mchid'])) {
-//            $condition['mchid'] = $_GET['mchid'];
-//        }
-//
-//        if(in_array($_GET['order_state'], [$order_state_send,$order_state_queue,$order_state_handled])) {
-//            $condition['order_state'] = $_GET['order_state'];
-//        }
-//        if (!empty($_GET['mch_orders'])) {
-//            $mch_orders = rtrim($_GET['mch_orders'],',');
-//            $condition['mch_order'] = ['in', $mch_orders];
-//        }
-//
-//        $start_unixtime = intval(strtotime($_GET['query_start_time']));
-//        $end_unixtime = intval(strtotime($_GET['query_end_time']));
-//        if ($start_unixtime > 0 && $end_unixtime > $start_unixtime) {
-//            $condition['order_time'] = [['egt', $start_unixtime], ['lt', $end_unixtime], 'and'];
-//        } elseif ($start_unixtime > 0) {
-//            $condition['order_time'] = ['egt', $start_unixtime];
-//        } elseif ($end_unixtime > 0) {
-//            $condition['order_time'] = ['lt', $end_unixtime];
-//        } else {
-//            $start = strtotime(date('Y-m-d', time()));
-//            $condition['order_time'] = ['egt', $start];
-//        }
-//
-//        $merchants = [];
-//        $merchant_list = $this->merchants();
-//        foreach ($merchant_list as  $value) {
-//            $merchants[$value['mchid']] = $value;
-//        }
-//
-//        if ($_GET['export'] == 1) {
-//            $this->RefillDetailExport($condition, $merchants);
-//            exit;
-//        } else {
-//            $list = $mod->getRefillDetailList($condition, 200, 1000);
-//            $list = $this->DataFormat($list, $merchants);
-//        }
-
-//        Tpl::output('merchant_list', $merchant_list);
-//        Tpl::output('list', $list);
+        Tpl::output('list', $list);
         Tpl::output('show_page', $mod_discount->showpage());
         Tpl::showpage('refill_discount.index');
     }
-}
+    public function addOp()
+    {
+        $lang	= Language::getLangContent();
+        $model_member = Model('member');
+        /**
+         * 保存
+         */
+        if (chksubmit()){
+            /**
+             * 验证
+             */
+            $obj_validate = new Validator();
+            $obj_validate->validateparam = array(
+                array("input"=>$_POST["member_name"], "require"=>"true", "message"=>$lang['member_add_name_null']),
+                array("input"=>$_POST["member_passwd"], "require"=>"true", "message"=>'密码不能为空'),
+                array("input"=>$_POST["member_email"], "require"=>"true", 'validator'=>'Email', "message"=>$lang['member_edit_valid_email'])
+            );
+            $error = $obj_validate->validate();
+            if ($error != ''){
+                showMessage($error);
+            }else {
+                $insert_array = array();
+                $insert_array['member_name']	= trim($_POST['member_name']);
+                $insert_array['member_passwd']	= trim($_POST['member_passwd']);
+                $insert_array['member_email']	= trim($_POST['member_email']);
+                $insert_array['member_truename']= trim($_POST['member_truename']);
+                $insert_array['member_sex'] 	= trim($_POST['member_sex']);
+                $insert_array['member_qq'] 		= trim($_POST['member_qq']);
+                $insert_array['member_ww']		= trim($_POST['member_ww']);
+                //默认允许举报商品
+                $insert_array['inform_allow'] 	= '1';
+                if (!empty($_POST['member_avatar'])){
+                    $insert_array['member_avatar'] = trim($_POST['member_avatar']);
+                }
+
+                $result = $model_member->addMember($insert_array);
+                if ($result)
+                {
+                    $url = array(
+                        array(
+                            'url'=>'index.php?act=member&op=member',
+                            'msg'=>$lang['member_add_back_to_list'],
+                        ),
+                        array(
+                            'url'=>'index.php?act=member&op=member_add',
+                            'msg'=>$lang['member_add_again'],
+                        ),
+                    );
+                    $this->log(L('nc_add,member_index_name').'[	'.$_POST['member_name'].']',1);
+                    showMessage($lang['member_add_succ'],$url);
+                }else {
+                    showMessage($lang['member_add_fail']);
+                }
+            }
+        }
+        Tpl::showpage('member.add');
+    }
+    public function editOp()
+    {
+
+    }
+}

docker/compose/homecuda/admin/docker-compose.yml

@@ -17,6 +17,8 @@ services:
       - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: "${CONTAINER_PREFIX}-adnginx"
     command: [ nginx,'-g','daemon off;' ]
+    environment:
+      - DOCKER_HOST_IP=192.168.3.104
     extra_hosts:
       - docker.hostip:172.17.0.1
     networks:
@@ -47,5 +49,7 @@ services:
       - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: '${CONTAINER_PREFIX}-adweb'
     command: [php-fpm]
+    extra_hosts:
+      - docker.hostip:172.17.0.1
     networks:
       - ${DOCKER_NET_NAME}

docker/compose/homecuda/ibaobei/docker-compose.yml

@@ -17,5 +17,7 @@ services:
       - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
       - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: "${CONTAINER_PREFIX}-ibaobei"
+    extra_hosts:
+      - docker.hostip:172.17.0.1
     networks:
       - ${DOCKER_NET_NAME}

docker/compose/homecuda/storage/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/redis/6379.conf:/etc/redis/redis.conf
       - /mnt/redisdata:/data
-    container_name: "panda-redis"
+    container_name: "${CONTAINER_PREFIX}-redis"
     command: [redis-server,"/etc/redis/redis.conf"]
     networks:
       - ${DOCKER_NET_NAME}

test/model/TestRefillDiscount.php

@@ -22,9 +22,9 @@ class TestRefillDiscount extends TestCase
         Base::run_util();
     }
 
-    public function testRefillDiscount()
+    public function testRefillDiscountFun()
     {
         $mod = Model('refill_discount');
-        $mod->getList(['act_id' => 1]);
+        $item = $mod->getList(['act_id' => 1]);
     }
 }