Charlie před 9 roky
rodič
revize
3b42f2d370

+ 1 - 0
www/protected/config/WoZhua_Const.php

@@ -53,6 +53,7 @@ $wz['baiduSK'] = 'IxIdcblYNPXNV5jaGbhcc0c6WSYXQVfP';
 $wz['o2o_service'] = array(
     1=>array("name"=>"日常清洁"),
     2=>array("name"=>"深度清洁"),
+
     3=>array("name"=>"除螨杀菌"),
     4=>array("name"=>"家电清洗"),
     5=>array("name"=>"民宿保洁"),

+ 8 - 64
www/protected/controllers/ProductController.php

@@ -7,12 +7,11 @@ class ProductController extends AdminController{
         $status = CommonFn::getComboboxData($status_option, 100, true, 100);
 
         $type = CommonFn::getComboboxData(Yii::app()->params['o2o_service'], 100, true, 100);
-        $service_type = CommonFn::getComboboxData(Yii::app()->params['service_type_option'], 100, true, 100);
+
 
         $this->render('index', array(
             'status' => $status,
-            'type'=>$type,
-            'service_type' => $service_type,
+            'type'=>$type
         ));
     }
 
@@ -50,39 +49,22 @@ class ProductController extends AdminController{
 
         $pics =  Yii::app()->request->getParam('pics',array());
 
+        $extra =  Yii::app()->request->getParam('extra',array());
+
         $name = Yii::app()->request->getParam('name','');
         $desc = Yii::app()->request->getParam('desc','');
-        $introduction = Yii::app()->request->getParam('introduction','');
 
-        $is_extra = intval(Yii::app()->request->getParam('is_extra',0));
 
         $price = Yii::app()->request->getParam('price',0);
 
-        $dianping_price = Yii::app()->request->getParam('dianping_price',0);
-
-        $min_weight = intval(Yii::app()->request->getParam('min_weight', 0));
-        $max_weight = intval(Yii::app()->request->getParam('max_weight', 0));
 
-        $pet_types = Yii::app()->request->getParam('relate_pet_types', array());
 
         $type = Yii::app()->request->getParam('type', 0);
 
-        $cost_time = Yii::app()->request->getParam('cost_time', 0);
 
-        $service_type = intval(Yii::app()->request->getParam('service_type', 100));
-
-        $typeArray = array();
-        $zType = new ZPetType();
-        if(!$zType->checkTypes($pet_types,$typeArray)){
-            CommonFn::requestAjax(false, '请检查宠物类型列表是否正确!');
-        }
 
-        if($min_weight > $max_weight){
-            CommonFn::requestAjax(false, '体重范围选择有误');
-        }
-
-        if(!$price || !$type || !$name || !$introduction){
-            CommonFn::requestAjax(false, '价格/服务/名称/简介类型不能为空');
+        if( !$type || !$name ||!desc){
+            CommonFn::requestAjax(false, '服务/名称/简介类型不能为空');
         }
 
         if($status == 100|| $type == 100){
@@ -93,10 +75,6 @@ class ProductController extends AdminController{
             CommonFn::requestAjax(false, '请输入4000字以内的Json格式的图文介绍');
         }
 
-        if($service_type == 100 || $service_type == 0) {
-            CommonFn::requestAjax(false, '请选择服务类型');
-        }
-
 
         $new_pics = array();
         foreach($pics as $picStr){
@@ -119,7 +97,6 @@ class ProductController extends AdminController{
         }
 
         $status=$status>1?1:$status;
-        $is_extra=$is_extra>1?1:$is_extra;
 
         if(!$id){
             $product = new Product();
@@ -133,23 +110,16 @@ class ProductController extends AdminController{
         }
 
 
-        $product->is_extra = $is_extra;
         $product->name = $name;
-        $product->introduction = $introduction;
         $product->desc = $desc;
         $product->status = $status;
         $product->order = $order;
         $product->price = $price;
-        $product->cost_time = $cost_time;
-        $product->dianping_price = $dianping_price;
-        $product->min_weight = $min_weight;
-        $product->max_weight = $max_weight;
-        $product->pet_types = $typeArray;
         $product->type = $type;
         $product->pics = $pics;
-        $product->service_type = $service_type;
+        $product->extra = $extra;
 
-        $arr_addProduct = array('status','cost_time','order','price','dianping_price','is_extra','name','introduction','desc','pics','min_weight','max_weight','pet_types','type', 'service_type');
+        $arr_addProduct = array('status','order','price','name','desc','pics','type','extra');
 
         $success = $product->save(true,$arr_addProduct);
 
@@ -157,32 +127,6 @@ class ProductController extends AdminController{
         CommonFn::requestAjax($success, '', array());
     }
 
-    //根据选择的主服务ID  获取相关的附加服务列表
-    public function actionGetExtra(){
-        $main_id = Yii::app()->request->getParam('product_id', '');
-
-        $main_product = Product::model()->get(new MongoId($main_id));
-        $pet_types = $main_product->pet_types;
-        $type = $main_product->type;
-
-
-        $criteria_extra = new EMongoCriteria();
-        $criteria_extra->status('==', 1);
-        $criteria_extra->is_extra('==', 1);
-        $criteria_extra->pet_types('==', $pet_types);
-        $criteria_extra->type('==', $type);
-        $cursor_extra = Product::model()->findAll($criteria_extra);
-        $rows_extra = CommonFn::getRowsFromCursor($cursor_extra);
-
-        $extra_row = array();
-        foreach($rows_extra as $row){
-            $ids = (string)$row['_id'];
-            $extra_row[] = array('id'=>$ids,'name'=>$row['name']);
-
-        }
-
-        CommonFn::requestAjax(true,'',$extra_row,200,array('type'=>$type));
-    }
 
 
 

+ 0 - 45
www/protected/modules/o2o/models/Mobile.php

@@ -1,45 +0,0 @@
-<?php
-class Mobile extends MongoAr
-{
-    public $_id;    //评价的object id
-
-    public $mobile;//手机号
-
-    public function __construct($scenario='insert'){
-        $this->setMongoDBComponent(Yii::app()->getComponent('mongodb_o2o'));
-        parent::__construct($scenario);
-    }
-
-
-    public static function model($className=__CLASS__)
-    {
-        return parent::model($className);
-    }
-
-    public function getCollectionName()
-    {
-        return 'oto_mobile';
-    }
-
-    public static function get($_id) {
-        if(CommonFn::isMongoId($_id)){
-            $criteria = new EMongoCriteria();
-            $criteria->_id('==', $_id);
-            $model = self::model()->find($criteria);
-            return $model;
-        }else{
-            return false;
-        }
-    }
-
-    public function parseRow($row,$output=array()){
-        $newRow = array();
-        $newRow['id'] = (string)$row['_id'];
-
-        $newRow['mobile'] = CommonFn::get_val_if_isset($row,'mobile','');
-
-
-        return $this->output($newRow,$output);
-    }
-
-}

+ 9 - 131
www/protected/modules/o2o/models/Product.php

@@ -6,39 +6,16 @@
 class Product extends MongoAr
 {
     public $_id;
-
     public $name;//服务的名字
-
-    public $pet_types=array();//产品关联的宠物类型数组
-
-    public $min_weight=0;//产品关联的最少体重   kg为单位
-    public $max_weight;//产品关联的最大体重   kg为单位   0为不限制最大体重
-
-    public $price;//商品的价格  单位:元
-
-    public $dianping_price;//点评优惠价格
-
     public $status=0;//产品状态 0=>暂停使用  1=>正常使用   -1=>已删除
-
-    public $order=0;//产品权重 
-
-    public $sale_count = 0;
-
-    public $cost_time = 0; //完成单项服务所需花费的时间
-
-    public $is_extra = 0;//是否是附加服务   1=>附加服务  0=>非附加服务
-
-    public $type;//服务的适用类型     array(1=>array("name"=>"宠物洗澡"),2=>array("name"=>"宠物剪毛"),3=>array("name"=>"宠物美容"))
-
+    public $order=0;//产品权重
+    public $type;//服务的适用类型
     public $desc;//图文介绍   json格式  [{  // 图文详情"type": 1,  //  1: 图片url, 2: 纯文本 "content": "http://a.big.jpg"}, {"type": 1,"content": "http://b.big.jpg"}, {"type": 2,"content": "描述文案..."},  // ... ]
+    public $pics=array();//七牛的地址  array('url'=>'http://xxx.qiniudn.com/1414476356856.jpg','height'=>1180,'width'=>2340)
 
-    public $introduction;//产品的简要介绍
-
-    public $orderAmount;//产品的销量
+    public $price;//商品的单价  单位:元
 
-    public $pics=array();//帖子中的图片  七牛的地址  array('url'=>'http://wozhua-avatars.qiniudn.com/1414476356856.jpg','height'=>1180,'width'=>2340)
-
-    public $service_type;//服务类型    狗洗澡、猫洗澡、狗体外驱虫、狗体内驱虫等
+    public $extra;//array('types'=>array(array('type'=>'一室一卫','price'=>180),array('type'=>'二室一卫','price'=>280)))
 
     public static $status_option = array(
         0 => array('name' => '暂停使用'),
@@ -76,37 +53,21 @@ class Product extends MongoAr
     public function parseRow($row,$output=array()){
         $newRow = array();
         $newRow['id'] = (string)$row['_id'];
-
-        $pet_types = array();
-        $t_type = new ZPetType();
-        if(isset($row['pet_types'])&&is_array($row['pet_types'])){
-            $types = $t_type->getTypeInfo($row['pet_types']);
-
-            $pet_types = PetTypes::model()->parse($types,true,array('name', 'id'));
-        }
-        $newRow['pet_types'] = $pet_types;
-        if(!isset($newRow['pet_types'])||empty($newRow['pet_types'])){
-            $newRow['pet_types']=CommonFn::$empty;
-        }
-
-        $newRow['min_weight'] = CommonFn::get_val_if_isset($row,'min_weight',0);
-        $newRow['max_weight'] = CommonFn::get_val_if_isset($row,'max_weight',0);
-
         $newRow['price'] = CommonFn::get_val_if_isset($row,'price',100);
-        $newRow['dianping_price'] = CommonFn::get_val_if_isset($row,'dianping_price',$newRow['price']);
+
         $newRow['name'] = CommonFn::get_val_if_isset($row,'name','');
         $newRow['desc'] = CommonFn::get_val_if_isset($row,'desc','');
-        $newRow['introduction'] = CommonFn::get_val_if_isset($row,'introduction','');
 
         $newRow['status'] = CommonFn::get_val_if_isset($row,'status',1);
 
-        $newRow['cost_time'] = CommonFn::get_val_if_isset($row,'cost_time',0);
-        $newRow['is_extra'] = CommonFn::get_val_if_isset($row,'is_extra',0);
+
         $newRow['order'] = CommonFn::get_val_if_isset($row,'order',1);
 
         $newRow['type'] = CommonFn::get_val_if_isset($row,'type',1);
         $newRow['type_str'] = Yii::app()->params['o2o_service'][$newRow['type']]['name'];
 
+        $newRow['extra'] = CommonFn::get_val_if_isset($row,'extra',array());
+
         $newRow['action_user'] = CommonFn::get_val_if_isset($row,'action_user',"");
         $newRow['action_time'] = CommonFn::get_val_if_isset($row,'action_time',"");
         $newRow['action_log'] = CommonFn::get_val_if_isset($row,'action_log',"");
@@ -116,7 +77,6 @@ class Product extends MongoAr
             $newRow['pics'] = CommonFn::$empty;
         }
 
-        $newRow['service_type'] = CommonFn::get_val_if_isset($row, 'service_type', 100);
 
         if(APPLICATION=='api'){
             //unset($newRow['status']);
@@ -128,86 +88,4 @@ class Product extends MongoAr
         return $this->output($newRow,$output);
     }
 
-    public function parseRowForDianping($row){
-        $newRow = array();
-
-        $newRow['min_weight'] = CommonFn::get_val_if_isset($row,'min_weight',0);
-        $newRow['max_weight'] = CommonFn::get_val_if_isset($row,'max_weight',0);
-        $newRow['price'] = CommonFn::get_val_if_isset($row,'price',100);
-        $newRow['orderAmount'] = CommonFn::get_val_if_isset($row,'orderAmount',100);
-        $newRow['status'] = CommonFn::get_val_if_isset($row,'status',1);
-        $newRow['type'] = CommonFn::get_val_if_isset($row,'type',1);
-        $newRow['productId'] = (string)$row['_id'];//第三方产品id
-        $newRow['productName'] =CommonFn::get_val_if_isset($row,'name','握爪上门服务'); //产品名称
-        $newRow['orderAmount'] = 500; //产品近期销量
-        $newRow['duration'] = 120; //产品服务耗时,以分钟为单位
-        $newRow['abstract'] = '上门宠物服务'; //用于展现在产品列表页的一行内容
-
-        $newRow['description'] = CommonFn::get_val_if_isset($row,'introduction',''); //产品描述
-
-        $newRow['details'] = json_decode(CommonFn::get_val_if_isset($row,'desc','[]')); //jsonArray   图文详情,目前支持两种类型: 1图片url,2纯文本。content总长度不能超过4000字节 json总长度不超过4000
-
-        $newRow['originalPrice'] = ceil(CommonFn::get_val_if_isset($row,'price',100)); //float   原始价格,以元为单位  
-        $newRow['dianping_price'] = ceil(CommonFn::get_val_if_isset($row,'dianping_price',0)); //真实价格    
-        $newRow['settlePrice'] = $newRow['originalPrice']; //真实价格    
-        $newRow['minOrders'] = 1; //最小下单份数
-        $newRow['maxOrders'] = 1; //最大下单份数   
-        $newRow['imageUrls'] = CommonFn::get_val_if_isset($row,'pics',array()); // jsonArray 多张产品图片。图片大小640×360  单一url小于256
-        $temp_image = array();
-        foreach ($newRow['imageUrls'] as $value) {
-            $temp_image[] = $value['url'];
-        }
-        $newRow['imageUrls'] = $temp_image;
-        $newRow['thumbUrl'] = ''; //string  预览图,图片大小 140×140    256
-        if($newRow['imageUrls'] && $newRow['imageUrls'][0]){
-            $newRow['thumbUrl'] = $newRow['imageUrls'][0];
-            unset($newRow['imageUrls'][0]);
-        }
-
-        $criteria = new EMongoCriteria();
-        $criteria->status('==',1);
-        if($newRow['type']){
-            $criteria->type('==',$newRow['type']);
-        }
-        if(isset($row['pet_types'])){
-            $criteria->pet_types('==',$row['pet_types']);
-        }
-        $criteria->max_weight('>=',$newRow['max_weight']);
-        $model = new Product();
-        $criteria->is_extra('==',1);
-        $extra_products = $model->findAll($criteria);
-        $extra_products = CommonFn::getRows($extra_products);
-        $extra_products = $model->parse($extra_products);
-        $packageList = array();
-        $i = 1;
-        $package = array();
-        $package['packageId'] = "1"; 
-        $package['packageName'] = $newRow['productName']; 
-        $package['originalPrice'] = $newRow['originalPrice']; 
-        $package['settlePrice'] = $newRow['settlePrice']; 
-        $package['duration'] = 0; 
-        $packageList[] = $package;
-        foreach ($extra_products as $e_product) {
-                $package['packageId'] = $e_product['id']; 
-                if(mb_substr($e_product['name'],-2,2,'utf-8') == '染色'){
-                    $e_product['name'] = '染色';
-                }
-                if(mb_substr($newRow['productName'],-3,3,'utf-8') == 'SPA'){
-                    $package['packageName'] = mb_substr($newRow['productName'],-3,3,'utf-8').'+'.$e_product['name'];
-                }else{
-                    $package['packageName'] = mb_substr($newRow['productName'],-2,2,'utf-8').'+'.$e_product['name'];
-                }
-                $package['originalPrice'] = $e_product['price'] + $newRow['originalPrice']; 
-                // $package['settlePrice'] = $e_product['dianping_price'] + $newRow['dianping_price'];
-                $package['settlePrice'] = $package['originalPrice'];
-                $package['duration'] = 0; 
-                $packageList[] = $package;
-        }
-        $newRow['packageList'] = $packageList;
-
-        $newRow['imageUrls'] = array_values($newRow['imageUrls']);
-        $newRow['rank'] = 10000 - CommonFn::get_val_if_isset($row,'order',1); //int 控制排序,越小越靠前
-        return $newRow;
-    }
-
 }

+ 1 - 1
www/protected/modules/o2o/models/Question.php

@@ -7,7 +7,7 @@ class Question extends MongoAr
 
     public $user;//作者object id
     public $quote;//引用的问题object id
-    public $type;// 1=>"宠物洗澡" 2=>"宠物剪毛",3=>"宠物美容"
+    public $type;//
     public $status=1;//状态   1正常   0删除   -1垃圾
     public $weight=0;//问题的权重
 

+ 4 - 1
www/protected/modules/o2o/models/ROrder.php

@@ -48,12 +48,15 @@ class ROrder extends MongoAr
 
     public $type = 0;//订单类型
 
+    public $counts=1;//预订的数量
+
+
 
     public $have_comment = 0; //是否已评价
 
     public $station = '';//服务网点,station的mongoid
 
-    public $technician = ''; // 接单技师,user的id
+    public $technicians = array(); // 接单保洁师
     public $technician_name = ''; // 接单技师姓名
 
     public $address = array(); //收货地址信息   包含   province  city  area position detail   name  mobile position

+ 10 - 132
www/protected/views/product/index.php

@@ -44,23 +44,14 @@
     <li class="f_item">
         <div class="box">
             <div class="f_label">
-                <span>市场价: </span>
+                <span>价: </span>
             </div>
             <div class="box_flex f_content">
                 <input type="text" name="price" style="width: 250px;"/>
             </div>
         </div>
     </li>
-    <li class="f_item">
-        <div class="box">
-            <div class="f_label">
-                <span>完成单项服务花费时间: </span>
-            </div>
-            <div class="box_flex f_content">
-                <input type="text" name="cost_time" style="width: 250px;"/>
-            </div>
-        </div>
-    </li>
+
     <li class="f_item">
         <div class="box">
             <div class="f_label">
@@ -71,39 +62,7 @@
             </div>
         </div>
     </li>
-    <li class="f_item">
-        <div class="box">
-            <div class="f_label">
-                <span>服务类型:</span>
-            </div>
-            <div class="box_flex f_content">
-                <input id="service_type_edit" name="service_type" />
-            </div>
-        </div>
-    </li>
-    <li class="f_item">
-        <div class="box">
-            <div class="f_label">
-                <span>是否附加服务:</span>
-            </div>
-            <div class="box_flex f_content">
-                <input id="is_extra_a" type="radio" name="is_extra" value="0" />
-                <label for="is_extra_a">否</label>
-                <input id="is_extra_b" type="radio" name="is_extra" value="1" />
-                <label for="is_extra_b">是</label>
-            </div>
-        </div>
-    </li>
-    <li class="f_item">
-        <div class="box">
-            <div class="f_label">
-                <span>产品简介: </span>
-            </div>
-            <div class="box_flex f_content">
-                <textarea name="introduction" style="width: 250px;min-height: 150px" placeholder="100字以内"></textarea>
-            </div>
-        </div>
-    </li>
+
     <li class="f_item">
         <div class="box">
             <div class="f_label">
@@ -195,20 +154,11 @@
                     </div>
                 </li>
             
+
             <li class="f_item">
                 <div class="box">
                     <div class="f_label">
-                        <span>完成单项服务花费时间: </span>
-                    </div>
-                    <div class="box_flex f_content">
-                        <input type="text" name="cost_time" style="width: 250px;"/>
-                    </div>
-                </div>
-            </li>
-            <li class="f_item">
-                <div class="box">
-                    <div class="f_label">
-                        <span>市场价: </span>
+                        <span>价格: </span>
                     </div>
                     <div class="box_flex f_content">
                         <input type="text" name="price" style="width: 250px;"/>
@@ -227,26 +177,7 @@
                         </div>
                     </div>
                 </li>
-                <li class="f_item">
-                    <div class="box">
-                        <div class="f_label">
-                            <span>服务类型:</span>
-                        </div>
-                        <div class="box_flex f_content">
-                            <input id="service_type_add" name="service_type" />
-                        </div>
-                    </div>
-                </li>
-                <li class="f_item">
-                    <div class="box">
-                        <div class="f_label">
-                            <span>产品简介: </span>
-                        </div>
-                        <div class="box_flex f_content">
-                            <textarea name="introduction" style="width: 250px;min-height: 150px" placeholder="100字以内"></textarea>
-                        </div>
-                    </div>
-                </li>
+
                 <li class="f_item">
                     <div class="box">
                         <div class="f_label">
@@ -279,19 +210,7 @@
                         </div>
                     </div>
                 </li>
-                <li class="f_item">
-                    <div class="box">
-                        <div class="f_label">
-                            <span>是否附加服务:</span>
-                        </div>
-                        <div class="box_flex f_content">
-                            <input id="is_extra_a" type="radio" name="is_extra" value="0" />
-                            <label for="is_extra_a">否</label>
-                            <input id="is_extra_b" type="radio" name="is_extra" value="1" />
-                            <label for="is_extra_b">是</label>
-                        </div>
-                    </div>
-                </li>
+
             <li class="f_item">
                 <div class="box">
                     <div class="f_label">
@@ -349,7 +268,6 @@ var jq_ss = $('#ss');
 var jq_aa = $('#aa');
 var status_data = <?php echo json_encode($status); ?>;
 var type_data = <?php echo json_encode($type); ?>;
-var service_type_data = <?php echo json_encode($service_type); ?>;
 
 var jq_setStatus = $('#setStatus');
 var jq_setStatus_add = $('#setStatus_add');
@@ -362,8 +280,6 @@ var jq_image_list = $('#image_list');
 
 var jq_upload_image_list = $('#upload_image_list');
 
-var jq_service_type_edit = $('#service_type_edit');
-var jq_service_type_add = $('#service_type_add');
 $(function(){
 
     var p_width = parseInt(w_width / 2);
@@ -411,16 +327,6 @@ $(function(){
         data: status_data
     });
 
-    jq_service_type_edit.combobox({
-        editable: false,
-        data: service_type_data
-    });
-
-    jq_service_type_add.combobox({
-        editable: false,
-        data: service_type_data
-    })
-
     jq_add_dialog.dialog({
         title: '新建',
         width: 500,
@@ -431,12 +337,6 @@ $(function(){
             text: '确认',
             iconCls: 'icon-ok',
             handler: function(){
-                if (jq_service_type_add.combobox('getValue') == '100'||
-                    jq_service_type_add.combobox('getValue') == 100||
-                    jq_service_type_add.combobox('getValue') == '') {
-                    $.messager.alert('注意', '必须为产品选择一种服务类型');
-                    return false;
-                }
 
                 $.messager.progress();
                 jq_add_form.submit();
@@ -452,12 +352,6 @@ $(function(){
             jq_add_form.form('clear');
             jq_add_form.form('load', {});
             pics_count = 0;
-            $.fn.pet_types_editor('clear',{
-                container:"pet_type_add"
-            });
-            $.fn.pet_types_editor('init',{
-                container:"pet_type_add"
-            });
 
             $('#pics_list_add').html('');
             $.fn.qiniu_upload_single('init',{
@@ -518,8 +412,7 @@ $(function(){
             {field:'id', title:'id', hidden:true},
             {field:'name', title:'名字',width:120},
             {field:'price', title:'价格', width:30, sortable: true},
-            {field:'cost_time', title:'花费时间', width:30, sortable: true},
-            {field:'dianping_price', title:'点评价格', width:40, sortable: true},
+
             {field:'type_str', title:'服务项目', width:50},
             {field:'status', title:'状态', width:60, sortable: true,
                 formatter: function(value, row){
@@ -534,11 +427,6 @@ $(function(){
             var data = $.extend({}, row);
             jq_content_form.form('load', data);
 
-            $.fn.pet_types_editor('init',{
-                container:"pet_type_edit",
-                pet_types:data.pet_types
-            });
-
             $('#admins_edit_info').html('');
 
             jq_image_list.empty();
@@ -604,14 +492,13 @@ $(function(){
 
             jq_content_form.form('clear');
             $('#id_str').html('');
-            $('.pet_type_list').remove();
+
             jq_action_info.html('');
 
             jq_dg_content.datagrid('clearSelections');
             pics_count = 0;
             jq_image_list.empty();
 
-            jq_setStatus.combobox('setValue', 100);
             $('#editType').combobox('setValue', 100);
         }
     });
@@ -675,9 +562,7 @@ $(function(){
                     timeout: 3500,
                     showType: 'slide'
                 });
-                $.fn.pet_types_editor('clear',{
-                    container:"pet_type_add"
-                });
+
                 jq_add_dialog.dialog('close');
                 jq_dg_content.datagrid('reload');
             }else{
@@ -698,13 +583,6 @@ function save_content(){
         return false;
     }
 
-    if (jq_service_type_edit.combobox('getValue') == '100' ||
-        jq_service_type_edit.combobox('getValue') == 100 ||
-        jq_service_type_edit.combobox('getValue') == '') {
-        $.messager.alert('注意', '必须为产品选择一种服务类型');
-        return false;
-    }
-
     if (jq_setStatus.combobox('getValue') != 1){
         $.messager.confirm('注意', '确认删除吗?', function(r){
             $.messager.progress();