dever 3 年之前
父节点
当前提交
055c2d4925
共有 2 个文件被更改,包括 72 次插入40 次删除
  1. 23 18
      app/mshop/src/Main.php
  2. 49 22
      app/shop/database/apply.php

+ 23 - 18
app/mshop/src/Main.php

@@ -61,27 +61,32 @@ class Main
             Dever::alert('请选择城市');
         }
 
-        $info = Dever::db('shop/info')->find($data);
+        $info = Dever::db('shop/apply')->find($data);
 
-        if (!$info) {
-            $data['truename'] = $data['name'];
-            # 根据城市查找省份
-            $county = Dever::db('area/county')->find($data['city']);
-            if ($county) {
-                $data['city'] = $county['city_id'];
-            }
-            $city = Dever::db('area/city')->find($data['city']);
-            $data['province'] = $city['province_id'];
-            $data['area'] = $data['province'] . ',' . $data['city'];
-            if ($county) {
-                $data['area'] .= ',' . $county['id'];
-            }
+        $data['truename'] = $data['name'];
+        # 根据城市查找省份
+        $county = Dever::db('area/county')->find($data['city']);
+        if ($county) {
+            $data['city'] = $county['city_id'];
+        }
+        $city = Dever::db('area/city')->find($data['city']);
+        $data['province'] = $city['province_id'];
+        $data['area'] = $data['province'] . ',' . $data['city'];
+        if ($county) {
+            $data['area'] .= ',' . $county['id'];
+        }
+
+        # 获取经纬度
+        list($data['lng'], $data['lat'], $data['map']) = Dever::load('shop/lib/info')->geo($data['city'], $city['name']);
 
-            # 获取经纬度
-            list($data['lng'], $data['lat'], $data['map']) = Dever::load('shop/lib/info')->geo($data['city'], $city['name']);
+        $data['status'] = 1;
 
-            $data['status'] = 3;
-            Dever::db('shop/info')->insert($data);
+        if (!$info) {
+            
+            Dever::db('shop/apply')->insert($data);
+        } else {
+            $data['where_id'] = $info['id'];
+            Dever::db('shop/apply')->insert($data);
         }
 
         $this->data['msg'] = '提交成功,我们会在3个工作日内与您联系,感谢您的信任。';

+ 49 - 22
app/shop/database/apply.php

@@ -2,7 +2,7 @@
 # 获取分类权限
 $status = array
 (
-    1 => '申请合作中',
+    1 => '申请中',
     2 => '已开通门店',
 );
 
@@ -11,10 +11,10 @@ return array
     # 表名
     'name' => 'apply',
     # 显示给用户看的名称
-    'lang' => '申请合作记录',
+    'lang' => '门店合作申请',
     # 后台菜单排序
-    'order' => 200,
-    'menu' => false,
+    'order' => 1,
+    //'menu' => false,
     # 数据结构
     'struct' => array
     (
@@ -29,24 +29,6 @@ return array
             'list'      => true,
             'order'     => 'desc',
         ),
-
-        'uid'       => array
-        (
-            'type'      => 'int-11',
-            'name'      => '用户名',
-            'default'   => '0',
-            'desc'      => '请选择用户',
-            'match'     => 'is_numeric',
-            'update'    => 'text',
-            //'search'  => 'select',
-            'search'    => array
-            (
-                'api' => 'passport/user-select',
-                'col' => 'username',
-                'result' => 'id',
-            ),
-            'list'      => '{uid} > 0 ? Dever::load("passport/user-find#username", {uid}) : "匿名用户"',
-        ),
         
         'name'      => array
         (
@@ -72,6 +54,29 @@ return array
             'list'      => true,
         ),
 
+        'area'       => array
+        (
+            'type'      => 'varchar-500',
+            'name'      => '所在街道',
+            'default'   => '',
+            'desc'      => '所在街道',
+            'match'     => 'option',
+            'search'    => 'linkage',
+            'update'    => 'linkage',
+            'option'    => Dever::url('api.get?level_total=4', 'area'),
+            'list'      => 'Dever::load("area/api.string", "{area}")',
+        ),
+
+        'province'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '省份',
+            'default'   => '',
+            'desc'      => '省份',
+            'match'     => 'option',
+            //'update'  => 'text',
+        ),
+
         'city'      => array
         (
             'type'      => 'int-11',
@@ -82,6 +87,28 @@ return array
             //'update'  => 'text',
         ),
 
+        'lng'       => array
+        (
+            'type'      => 'varchar-100',
+            'name'      => '经度',
+            'default'   => '',
+            'desc'      => '经度',
+            'match'     => 'option',
+            //'update'    => 'text',
+            //'list'        => true,
+        ),
+
+        'lat'       => array
+        (
+            'type'      => 'varchar-100',
+            'name'      => '纬度',
+            'default'   => '',
+            'desc'      => '纬度',
+            'match'     => 'option',
+            //'update'    => 'text',
+            //'list'        => true,
+        ),
+
         'status'        => array
         (
             'type'      => 'int-11',