增加联系人

addons/longbing_company/inc/web/manage/goodsedit.inc.php

@@ -86,6 +86,7 @@ if ($_GPC['action'] == 'edit') {
         $data['start_time']=json_encode($sta_time,true);
     }
 
+
 	if (isset($data['images'])) {
 		$data['images'] = implode(',', $data['images']);
 	} else {

addons/longbing_company/inc/wxapp/gtasks.inc.php

@@ -9,7 +9,7 @@ global $_W;
 $uniacid = $_W['uniacid'];
 $uid = $_GPC['user_id'];
 $type = $_GPC['type'];
-$time = $_GPC['search_time'];
+$time = strtotime($_GPC['time']);
 
 
 if (!$type) {
@@ -24,57 +24,68 @@ if (isset($_GPC['page'])) {
     $curr = $_GPC['page'];
 }
 
-$where = array('uniacid' => $uniacid, 'status !=' => -1, 'user_id' => $uid);
+$where = array('uniacid' => $uniacid, 'status !=' => -1);
 $collage_overtime = 172800;
 $info = pdo_get('longbing_company_config', array('uniacid' => $_W['uniacid']), array('collage_overtime'));
 $collage_overtime = $info['collage_overtime'];
 $tu = pdo_get('longbing_company_user_info',array('fans_id'=>$uid));
+$com =pdo_get('longbing_company_company',array('id'=>$tu['company_id']));
 if (!$collage_overtime) {
     $collage_overtime = 172800;
 }
 
-
-switch ($type) {
-    case 1:
-        $where['pay_status'] = 1;
-        $where['order_status'] = 0;
-        $where['company_id']=$tu['company_id'];
-        break;
-
-    case 2:
-        $where['pay_status'] = 1;
-        $where['order_status'] = 3;
-        $where['company_id']=$tu['company_id'];
-        break;
-
-    case 3:
-        $where['pay_status'] = 1;
-        $where['company_id']=$tu['company_id'];
-        break;
-
+if($time==''){
+    $time= date('Y-m-d', time());
 }
 
+    switch ($type) {
+        //未上车
+        case 1:
+            $where['pay_status'] = 1;
+            $where['order_status'] = 0;
+            $where['company_id'] = $tu['company_id'];
+            $where['trip_time'] = $time;
+            break;
+        //已上车
+        case 2:
+            $where['pay_status'] = 1;
+            $where['order_status'] = 3;
+            $where['company_id'] = $tu['company_id'];
+            $where['trip_time'] = $time;
+            break;
+        //总计
+        case 3:
+            $where['pay_status'] = 1;
+            $where['company_id'] = $tu['company_id'];
+            $where['trip_time'] = $time;
+            break;
 
+    }
 
 
-$list = pdo_getslice('longbing_company_shop_order', $where, $limit, $count, array(), '', array('id desc'));
+    $list = pdo_getslice('longbing_company_shop_order', $where, $limit, $count, array(), '', array('id desc'));
 //print_r($list);die;
 
-foreach ($list as $k => $v) {
-    $sql = 'SELECT a.id,a.order_id,a.goods_id,a.name,a.cover,a.number,a.total_price,a.price,a.content,a.qr_code,b.id,b.unit FROM ' . tablename('longbing_company_shop_order_item') . ' a LEFT JOIN ' . tablename('longbing_company_goods') . (' b ON a.goods_id = b.id WHERE a.order_id = ' . $v['id'] . ' && a.uniacid = ' . $uniacid);
-    $goods_info = pdo_fetchall($sql);
+    foreach ($list as $k => $v) {
+        $sql = 'SELECT a.id,a.order_id,a.goods_id,a.name,a.cover,a.number,a.total_price,a.price,a.content,a.qr_code,a.company_name,b.id,b.unit FROM ' . tablename('longbing_company_shop_order_item') . ' a LEFT JOIN ' . tablename('longbing_company_goods') . (' b ON a.goods_id = b.id WHERE a.order_id = ' . $v['id'] . ' && a.uniacid = ' . $uniacid);
+        $goods_info = pdo_fetchall($sql);
+        $op=array(
+            'time'=>$time
+        );
+        $cc=json_encode($op);
+        $t_time=json_decode($cc);
+        $list[$k]['trip_time']=$t_time;
+        foreach ($goods_info as $k2 => $v2) {
+            $goods_info[$k2]['cover_true'] = tomedia($v2['cover']);
+        }
+
+        $list[$k]['goods_info'] = $goods_info;
+        $list[$k]['user_company'] = $com['short_name'];
 
-    foreach ($goods_info as $k2 => $v2) {
-        $goods_info[$k2]['cover_true'] = tomedia($v2['cover']);
     }
 
-    $list[$k]['goods_info'] = $goods_info;
-
-
-}
-
-$data = array('page' => $curr, 'total_page' => ceil($count / 5), 'list' => $list);
-return $this->result(0, '', $data);
+    $data = array('page' => $curr, 'count' => $count, 'total_page' => ceil($count / 5), 'list' => $list,'company_name'=>$com['short_name']);
+    return $this->result(0, '', $data);
 
 
 

addons/longbing_company/inc/wxapp/shopgoodsdetail.inc.php

@@ -141,6 +141,9 @@ $to_uid = $_GPC['to_uid'];
 $goods_id = $_GPC['goods_id'];
 //$d = $_GPC['m_price'];
 $is_member = $_GPC['is_member'];
+
+
+
 //if (!$to_uid) {
 //	return $this->result(-1, '不存在to_uid', array());
 //}

addons/longbing_company/inc/wxapp/shopmyorder.inc.php

@@ -58,11 +58,12 @@ case 4:
 $list = pdo_getslice('longbing_company_shop_order', $where, $limit, $count, array(), '', array('id desc'));
 
 foreach ($list as $k => $v) {
-	$sql = 'SELECT a.id,a.order_id,a.goods_id,a.name,a.cover,a.number,a.total_price,a.price,a.content,a.qr_code,b.id,b.unit,b.is_free_card FROM ' . tablename('longbing_company_shop_order_item') . ' a LEFT JOIN ' . tablename('longbing_company_goods') . (' b ON a.goods_id = b.id WHERE a.order_id = ' . $v['id'] . ' && a.uniacid = ' . $uniacid);
+	$sql = 'SELECT a.id,a.order_id,a.goods_id,a.name,a.cover,a.trip_time,a.phone,a.person,a.number,a.company_name,a.total_price,a.price,a.content,a.qr_code,b.id,b.unit,b.is_free_card FROM ' . tablename('longbing_company_shop_order_item') . ' a LEFT JOIN ' . tablename('longbing_company_goods') . (' b ON a.goods_id = b.id WHERE a.order_id = ' . $v['id'] . ' && a.uniacid = ' . $uniacid);
 	$goods_info = pdo_fetchall($sql);
 
 	foreach ($goods_info as $k2 => $v2) {
 		$goods_info[$k2]['cover_true'] = tomedia($v2['cover']);
+		$goods_info[$k2]['trip_time']=date('Y-m-d ', $goods_info[$k2]['trip_time']);
 	}
 
 	$list[$k]['goods_info'] = $goods_info;

addons/longbing_company/inc/wxapp/shopmyorderdetail.inc.php

@@ -59,7 +59,7 @@ if ($info['pay_status'] == 0 && $info['order_status'] != 1) {
 
 
 
-$sql = 'SELECT a.id,a.order_id,a.goods_id,a.name,a.cover,a.number,a.price,a.trip_time,a.company_id,a.company_name,a.spe_price_id,a.qr_code,b.id FROM ' . tablename('longbing_company_shop_order_item') . ' a LEFT JOIN ' . tablename('longbing_company_goods') . (' b ON a.goods_id = b.id WHERE a.order_id = ' . $id . ' && a.uniacid = ' . $uniacid);
+$sql = 'SELECT a.id,a.order_id,a.goods_id,a.name,a.cover,a.number,a.price,a.trip_time,a.person,a.phone,a.company_id,a.company_name,a.spe_price_id,a.qr_code,b.id FROM ' . tablename('longbing_company_shop_order_item') . ' a LEFT JOIN ' . tablename('longbing_company_goods') . (' b ON a.goods_id = b.id WHERE a.order_id = ' . $id . ' && a.uniacid = ' . $uniacid);
 $goods_info = pdo_fetchall($sql);
 $fg = pdo_get('longbing_company_shop_order_item',array('order_id'=>$id));
 

addons/longbing_company/inc/wxapp/shopplaceorder2.inc.php

@@ -12,14 +12,14 @@ $to_uid = $_GPC['to_uid'];
 $record_id = $_GPC['record_id'];
 $number = $_GPC['number'];
 $goods_id = $_GPC['goods_id'];
-$trip_time = $_GPC['trip_time'];
+$trip_time = strtotime($_GPC['trip_time']);
 $company_id = $_GPC['company_id'];
 $company_name = $_GPC['company_name'];
 $spe_id = $_GPC['spe_price_id'];
 //$disprice=$_GPC['m_price'];
 $is_discount = $_GPC['is_discount'];
 $leve_id=$_GPC['leve_id'];
-$person =$_GPC['name'];
+$person =$_GPC['person'];
 $phone=$_GPC['phone'];
 /*if (!$address_id || !$number || !$goods_id) {
 	return $this->result(-1, '', array());
@@ -154,7 +154,7 @@ $leveid=$u['level_id'];
 		$time = time();
 		$total_freight = sprintf('%.2f', $goods_info['freight']);
 		$price = sprintf('%.2f', $spe_info['price'] * $number);
-		$insertOrder = array('user_id' => $uid, 'company_id' => $company_id,'to_uid'=>$to_uid,'trip_time'=>$trip_time,'phone'=>$phone,'name'=>$person, 'level_id'=>$goods_info['leve_id'], 'freight' => $total_freight, 'price' => $price, 'total_disprice'=>0,'discount_price'=>$total_freight + $price, 'total_price' => $total_freight + $price, 'uniacid' => $uniacid, 'name' => $address['name'], 'sex' => $address['sex'], 'phone' => $address['phone'], 'address' => $address['address'], 'address_detail' => $address['address_detail'], 'province' => $address['province'], 'city' => $address['city'], 'area' => $address['area'], 'to_uid' => $to_uid, 'create_time' => $time, 'update_time' => $time);
+		$insertOrder = array('user_id' => $uid, 'company_id' => $company_id,'to_uid'=>$to_uid,'trip_time'=>$trip_time,'phone'=>$phone,'person'=>$person, 'level_id'=>$goods_info['leve_id'], 'freight' => $total_freight, 'price' => $price, 'total_disprice'=>0,'discount_price'=>$total_freight + $price, 'total_price' => $total_freight + $price, 'uniacid' => $uniacid, 'name' => $address['name'], 'sex' => $address['sex'], 'phone' => $address['phone'], 'address' => $address['address'], 'address_detail' => $address['address_detail'], 'province' => $address['province'], 'city' => $address['city'], 'area' => $address['area'], 'to_uid' => $to_uid, 'create_time' => $time, 'update_time' => $time);
 
 		if ($record_id) {
 			$sign = true;
@@ -258,7 +258,7 @@ $leveid=$u['level_id'];
 				$total_disprice=sprintf('%.2f',$total_disprice);
 				$total_price= $total_freight + $price*$discount/100;//总计:运费+折扣价
 				$total_price=sprintf('%.2f',$total_price);
-				$insertOrder = array('user_id' => $uid,'company_id' => $company_id  ,'to_uid'=>$to_uid ,'phone'=>$phone,'name'=>$person,'level_id'=>$goods_info['leve_id'], 'freight' => $total_freight, 'price' => $price, 'total_disprice'=>$total_disprice,'discount_price' => $discount_price, 'total_price' =>$total_price, 'uniacid' => $uniacid, 'name' => $address['name'], 'sex' => $address['sex'], 'phone' => $address['phone'], 'address' => $address['address'], 'address_detail' => $address['address_detail'], 'province' => $address['province'], 'city' => $address['city'], 'area' => $address['area'], 'to_uid' => $to_uid, 'create_time' => $time, 'update_time' => $time);
+				$insertOrder = array('user_id' => $uid,'company_id' => $company_id ,'trip_time'=>$trip_time, 'to_uid'=>$to_uid ,'phone'=>$phone,'person'=>$person,'level_id'=>$goods_info['leve_id'], 'freight' => $total_freight, 'price' => $price, 'total_disprice'=>$total_disprice,'discount_price' => $discount_price, 'total_price' =>$total_price, 'uniacid' => $uniacid, 'name' => $address['name'], 'sex' => $address['sex'], 'phone' => $address['phone'], 'address' => $address['address'], 'address_detail' => $address['address_detail'], 'province' => $address['province'], 'city' => $address['city'], 'area' => $address['area'], 'to_uid' => $to_uid, 'create_time' => $time, 'update_time' => $time);
 
 				if ($record_id) {
 					$sign = true;
@@ -353,7 +353,7 @@ $leveid=$u['level_id'];
 			$time = time();
 			$total_freight = sprintf('%.2f', $goods_info['freight']);
 			$price = sprintf('%.2f', $spe_info['price'] * $number);
-			$insertOrder = array('user_id' => $uid, 'company_id' => $company_id ,'to_uid'=>$to_uid ,'phone'=>$phone,'name'=>$person, 'level_id'=>$goods_info['leve_id'],'freight' => $total_freight, 'price' => $price, 'total_disprice'=>0,'discount_price' =>$total_freight + $price , 'total_price' => $total_freight + $price, 'uniacid' => $uniacid, 'name' => $address['name'], 'sex' => $address['sex'], 'phone' => $address['phone'], 'address' => $address['address'], 'address_detail' => $address['address_detail'], 'province' => $address['province'], 'city' => $address['city'], 'area' => $address['area'], 'to_uid' => $to_uid, 'create_time' => $time, 'update_time' => $time);
+			$insertOrder = array('user_id' => $uid, 'company_id' => $company_id ,'trip_time'=>$trip_time,'to_uid'=>$to_uid ,'phone'=>$phone,'person'=>$person, 'level_id'=>$goods_info['leve_id'],'freight' => $total_freight, 'price' => $price, 'total_disprice'=>0,'discount_price' =>$total_freight + $price , 'total_price' => $total_freight + $price, 'uniacid' => $uniacid, 'name' => $address['name'], 'sex' => $address['sex'], 'phone' => $address['phone'], 'address' => $address['address'], 'address_detail' => $address['address_detail'], 'province' => $address['province'], 'city' => $address['city'], 'area' => $address['area'], 'to_uid' => $to_uid, 'create_time' => $time, 'update_time' => $time);
 
 			if ($record_id) {
 				$sign = true;

addons/longbing_company/template/manage/goodsEdit.html

@@ -477,7 +477,7 @@
                // $point=$(".dayHtml input[name='dayVal']").eq(i).val();
                 if($day){
                     jsonList[i]={
-                        "day":$day,
+                        "time":$day,
 
                     }
                 }
@@ -497,7 +497,7 @@
     }
     function timesFun(){
         var start_time =  "{$info['start_time']}";
-        var end_time =  "{$info['end_time']}";
+       // var end_time =  "{$info['end_time']}";
         if(start_time){
             var d = new Date(start_time*1000);
             var n = d.getFullYear();//年
@@ -505,13 +505,7 @@
             var r = d.getDate();//日
             $("#StartTime").val(nums(n)+"-"+nums(y)+"-"+nums(r));
         }
-        if(end_time){
-            var ds = new Date(end_time*1000);
-            var ns = ds.getFullYear();//年
-            var ys = ds.getMonth()+1;//月
-            var rs = ds.getDate();//日
-            $("#EndTime").val(nums(ns)+"-"+nums(ys)+"-"+nums(rs));
-        }
+
     }
     layui.use(['layer', 'form','laydate'], function () {
         var layer = layui.layer;
@@ -540,6 +534,7 @@
         });
         form.on('submit(formSub)', function(data){
             var formData = data.field;
+            var sta_time=getDatas();
             var ids = "";
             var l = $("input[name='ids']").size();
             for(var i=0;i<l;i++){
@@ -557,7 +552,6 @@
                 var start_timeD = new Date(formData.start_time);
                 formData.start_time=start_timeD.getTime()/1000;
             }
-
             var url = "{php echo $this->createWebUrl('manage/goodsedit')}";
             var id = '{$id}';
             var data = {
@@ -568,9 +562,7 @@
             if (id > 0) {
                 data.id = id;
             }
-
             postData(url, data);
-
             return false;
         });
 

addons/longbing_company/template/manage/speEdit.html

@@ -57,6 +57,7 @@
 
 
                     <button type="button" class="btn btn-info btn-lg btn-insert" style="margin-bottom: 30px">新增规格</button>
+                    <button type="button" class="btn btn-info btn-lg btn-delete" style="margin-bottom: 30px">移除规格</button>
 
                     <div class="bodySpe">
                         {loop $data $index $item}
@@ -164,7 +165,14 @@
             createPriceTable();
         });
 
+   //移除规格
     });
+    $('.btn-delete').click(function () {
+
+
+
+    });
+
 
     //  新增选项
     function insertItem (obj)