Merge branch 'car_dev' of 121.43.114.153:/home/git/repositories/shopnc into car_dev

admin/control/store.php

@@ -184,7 +184,15 @@ class storeControl extends SystemControl{
             }
             $param = array();
             $param['company_name'] = $_POST['company_name'];
-            $param['company_province_id'] = intval($_POST['province_id']);
+            $province_id    = intval($_POST['province_id']);
+            $city_id        = intval($_POST['city_id']);
+            if($province_id > 0) {
+                $param['company_province_id'] = $province_id;
+            }
+            if($city_id > 0) {
+                $param['company_city_id'] = $city_id;
+            }
+
             $param['company_address'] = $_POST['company_address'];
             $param['company_address_detail'] = $_POST['company_address_detail'];
             $param['company_phone'] = $_POST['company_phone'];
@@ -228,22 +236,28 @@ class storeControl extends SystemControl{
             }
             $result = Model('store_joinin')->editStoreJoinin(array('member_id' => $member_id), $param);
             if ($result) {
-		//好商城V3-B11 更新店铺信息
-	    	$store_update = array();
-		$store_update['store_company_name']=$param['company_name'];
-		$store_update['area_info']=$param['company_address'];
-		$store_update['store_address']=$param['company_address_detail'];
-		$model_store = Model('store');
-		$store_info = $model_store->getStoreInfo(array('member_id'=>$member_id));
-		if(!empty($store_info)) {						
-                $r=$model_store->editStore($store_update, array('member_id'=>$member_id));
+                //好商城V3-B11 更新店铺信息
+                $store_update = array();
+                $store_update['store_company_name']=$param['company_name'];
+                $store_update['area_info']=$param['company_address'];
+                $store_update['store_address']=$param['company_address_detail'];
+                if(isset($param['company_province_id'])) {
+                    $store_update['province_id']    = $param['company_province_id'];
+                }
+                if(isset($param['company_city_id'])) {
+                    $store_update['city_id']    = $param['company_city_id'];
+                }
+                $model_store = Model('store');
+                $store_info = $model_store->getStoreInfo(array('member_id'=>$member_id));
+                if(!empty($store_info)) {
+                    $r=$model_store->editStore($store_update, array('member_id'=>$member_id));
 
-		$this->log('编辑店铺信息' . '[ID:' . $r. ']', 1);
-		}
-                showMessage(L('nc_common_op_succ'), 'index.php?act=store&op=store');
-            } else {
-                showMessage(L('nc_common_op_fail'));
-            }
+                    $this->log('编辑店铺信息' . '[ID:' . $r. ']', 1);
+                }
+                    showMessage(L('nc_common_op_succ'), 'index.php?act=store&op=store');
+                } else {
+                    showMessage(L('nc_common_op_fail'));
+                }
         }
     }
     
@@ -1044,33 +1058,36 @@ class storeControl extends SystemControl{
                     return;
                 }
                 //批量导入数据的所在省份／城市校验
-                $city_id = 0;
-                $split_area_info = explode(" ", $store_area);
-                if(isset($split_area_info[0]))
-                {
-                    $province_name = $split_area_info[0];
-                    if(isset($split_area_info[1])) {
-                        $city_name = $split_area_info[1];
-                    } else {
-                        $city_name = $province_name;
-                    }
-
-                    if($city_name == '北京' || $city_name == '上海' || $city_name == '天津' || $city_name == '重庆') {
-                        $city_name = $city_name. "市";
-                    }
-
-                    $mod_area = Model('area');
-                    $area_info = $mod_area->table('area_origion')->where(array('area_name'=>array('like',$city_name)))->find();
-                    if(!empty($area_info)) {
-                        $city_id = intval($area_info['area_id']);
-                    } else {
-                        showMessage("{$store_company_name}所在省份／城市找不到!",'','html','error');
-                        exit;
-                    }
-                } else {
+                $pattern = '/(\S+)[\s]*(\S+)*/u';
+                $result = preg_match_all($pattern, $store_area, $matches);
+                if(!$result) {
+                    showMessage("{$store_company_name}所在省份／城市无法识别!",'','html','error');
+                    exit;
+                }
+                if(count($matches) !== 3) {
+                    showMessage("{$store_company_name}所在省份／城市识别错误!",'','html','error');
+                    exit;
+                }
+
+                if(empty($match[2][0])) {
+                    $city_name = $matches[1][0];
+                }
+                else {
+                    $city_name = $matches[2][0];
+                }
+
+                if($city_name == '北京' || $city_name == '上海' || $city_name == '天津' || $city_name == '重庆') {
+                    $city_name = $city_name. "市";
+                }
+
+                $mod_area = Model('area');
+                $info = $mod_area->getAreaInfo(['area_name' => $city_name]);
+                if(empty($info)) {
                     showMessage("{$store_company_name}所在省份／城市无法识别!",'','html','error');
                     exit;
                 }
+                $city_id        = intval($info['area_id']);
+                $province_id    = intval($info['area_parent_id']);
 
                 try
                 {
@@ -1097,7 +1114,8 @@ class storeControl extends SystemControl{
                 $saveArray['store_state'] = 1;
                 $saveArray['store_time']    = time();
                 $saveArray['store_company_name'] = $store_company_name;
-                $saveArray['city_id']   = $city_id;
+                $saveArray['province_id']   = $province_id;
+                $saveArray['city_id']       = $city_id;
                 $saveArray['area_info']     = $store_area;
                 $saveArray['store_address'] = $store_address;
                 $saveArray['store_type']    = $store_type;
@@ -1127,7 +1145,8 @@ class storeControl extends SystemControl{
 
                 $save_joinArray['joinin_state'] = 40;
                 $save_joinArray['company_name'] = $store_company_name;
-                $save_joinArray['company_city_id']  = $city_id;
+                $save_joinArray['company_province_id']  = $province_id;
+                $save_joinArray['company_city_id']      = $city_id;
 
                 $store_joinModel->save($save_joinArray);
 

admin/templates/default/css/skin_0.css

@@ -1521,8 +1521,8 @@ td.trigger i:hover { color: #27A9E3;}
 .mb-special-layout .module-list { font-size: 12px; vertical-align: top; letter-spacing: normal; display: inline-block; *display: inline/*IE7*/; *zoom:1/*IE7*/;}
 .mb-special-layout .mb-item-box { background: url(../images/mobile/mpat.png) no-repeat 0 0; width: 400px; height: 670px; margin: 0 50px 0 30px; }
 .mb-special-layout .item-list { width: 350px; height: 540px; margin: 51px 26px 79px 24px; overflow-x: hidden; overflow-y: scroll;}
-.mb-item-box .special-item { width: 320px; min-height: 60px; padding: 4px; border: dashed 1px #CCC; margin: 2px 2px 0 2px; position: relative; z-index: 1;}
-.mb-item-box .special-item:hover { background-color: #F3FBFE; border: solid 1px #19AEDE;}
+.mb-item-box .special-item { width: 320px; padding: 4px; border: dashed 1px #CCC; margin: 2px 2px 0 2px; position: relative; z-index: 1;padding-top: 32px;}
+.mb-item-box .special-item:hover { background-color: #F3FBFE; border: solid 1px #19AEDE;padding-bottom:32px;-webkit-transition: padding-bottom .5s ease;}
 .mb-item-box .unusable { filter:alpha(opacity=50); /*IE滤镜，透明度50%*/ -moz-opacity:0.5; /*Firefox私有，透明度50%*/ opacity:0.5;/*其他，透明度50%*/}
 .mb-item-box .usable { filter:alpha(opacity=100); /*IE滤镜，透明度100%*/ -moz-opacity:1; /*Firefox私有，透明度100%*/ opacity:1;/*其他，透明度100%*/}
 .mb-item-box .special-item .item_type,
@@ -1535,13 +1535,15 @@ td.trigger i:hover { color: #27A9E3;}
 .mb-item-box .special-item:hover .item_type,
 .mb-item-box .special-item:hover .handle { color: #FFF; filter:progid:DXImageTransform.Microsoft.gradient(enabled='true',startColorstr='#D854C1EB', endColorstr='#D854C1EB');background:rgba(84,193,235,0.85); display: block;}
 .mb-item-box .item { line-height: 0; background-color: #FFF; text-align: center; vertical-align: middle; display: table-cell; *display: block; overflow: hidden;}
+#item_edit_content {overflow: hidden;}
 /* 广告条版块、模型版块布局A、E-显示 */
 .mb-item-box .adv_list .item,
 .mb-item-box .home5 .item,
-.mb-item-box .home1 .item { width: 320px; height: 133px;}
+.mb-item-box .home1 .item { width: 320px; height: auto;}
 .mb-item-box .home1 img,
 .mb-item-box .home5 img,
 .mb-item-box .adv_list img { max-width: 320px; max-height: 133px;}
+.mb-item-box .home5 .item { display: block;}
 /* 模型版块布局B、D-显示 */
 .mb-item-box .home2 .content { font-size: 0; *word-spacing:-1px/*IE6、7*/; width: 320px;}
 .mb-item-box .home2 .content .home2_1,

admin/templates/default/mb_special_item.module_home5.php

@@ -89,7 +89,6 @@
                         <a nctype="btn_edit_item_image" href="javascript:;" class="a2"><i class="icon-edit"></i>编辑</a>
                     <?php } ?>
                 </div>
-                <br>
             <?php } ?>
         <?php } ?>
     </div>

admin/templates/default/store.edit.php

@@ -449,6 +449,10 @@ $(function(){
     });
 
     $("#btn_fail").click(function(){
+        if($("input[name='company_address']").siblings('select').length > 0) {
+            $("input[name='company_address']").siblings('select').eq(0)&&$("input[name='company_address']").siblings('select').eq(0).attr('name','province_id');
+            $("input[name='company_address']").siblings('select').eq(1)&&$("input[name='company_address']").siblings('select').eq(1).attr('name','city_id');
+        }
         $("#joinin_form").submit();
     });
 

shop/templates/default/seller/store_liveinfo.php

@@ -127,7 +127,7 @@
     });
 
     areaInit($('#area_select'), 0);
-    
+
     $("#area_select").change(function () {
         // 删除后面的select
         $(this).nextAll("select").remove();