Browse Source

no commit message

齐博 6 years ago
parent
commit
c6f667c411
33 changed files with 254 additions and 110 deletions
  1. 50 0
      LICENSE.txt
  2. 1 14
      README.md
  3. 1 1
      application/admin/controller/Webmenu.php
  4. 23 1
      application/cms/install/install.sql
  5. 13 10
      application/common/model/User.php
  6. 1 0
      application/index/controller/Alonepage.php
  7. 8 1
      application/index/controller/Getpassword.php
  8. 125 33
      application/install/sql/install.sql
  9. 30 48
      application/shop/install/install.sql
  10. BIN
      public/uploads/images/20180302/09eb406c7b68b32f4f1a08d91e0405a4.jpg
  11. BIN
      public/uploads/images/20180302/1271aa70880157872ecd4c1cac3f6eca.jpg
  12. BIN
      public/uploads/images/20180302/1cb8ca8badefa49403b56d02365b5246.JPG
  13. BIN
      public/uploads/images/20180302/2334683a87b83f94f7106d31fc6ce0be.jpg
  14. BIN
      public/uploads/images/20180302/2ba8be29121f32954e1f7feb5d34e897.JPG
  15. BIN
      public/uploads/images/20180302/2fca054b5a1adda5a4867a3dab39339c.jpg
  16. BIN
      public/uploads/images/20180302/47ec268298550dbaf723f63f9c8068f8.JPG
  17. BIN
      public/uploads/images/20180302/4e130207d16de8e9325372e10f24b1c6.jpg
  18. BIN
      public/uploads/images/20180302/Cgbj0FnCGy2AQhMOAA5ZxbK1GIo722.jpg
  19. BIN
      public/uploads/images/20180302/CnQOjVikE4qAYN55AAMAoDa-ghQ407.jpg
  20. BIN
      public/uploads/images/20180302/acc5222477f61f1791a5f1c3e1029a33.jpg
  21. BIN
      public/uploads/images/20180302/b30dd5deccce4e1bab04274c4c7695d9.jpg
  22. BIN
      public/uploads/images/20180302/bbdad5bba94b25b1eb45004c3a946b06.jpg
  23. BIN
      public/uploads/images/20180302/d27a7a45c3fcd543a5a5dc4b1cb22d16.jpg
  24. BIN
      public/uploads/images/20180302/e04c0b963510abd7a6a75770ac73cfe5.jpg
  25. BIN
      public/uploads/images/20180302/ed46f4c7a30f7036bdb4182c2e91ce85.jpg
  26. BIN
      public/uploads/images/20180302/f4cb941062607e7ece08699e2955eaf3.jpg
  27. BIN
      public/uploads/images/20180312/1d988146be839a28964429913a06e336.jpeg
  28. BIN
      public/uploads/images/20180312/5518ce3a2f1c8eb669146b67bffc7a56.jpeg
  29. BIN
      public/uploads/images/20180312/895ef8c2ff3060b9a8c9c175d5b366bd.jpeg
  30. BIN
      public/uploads/images/20180312/ec67f52bfa1046b48dfb0887fa62b314.png
  31. BIN
      public/uploads/images/20180312/efebd1b5ec8979134a8da76c539b8f05.jpeg
  32. 1 1
      template/index_style/default/cms/content/pc_list2.htm
  33. 1 1
      template/index_style/default/cms/index/pc_index.htm

+ 50 - 0
LICENSE.txt

@@ -0,0 +1,50 @@
+齐博X1.0
+===========================
+
+齐博X1.0是集众家之所长再结合自身特色而开发出来的一套开源PHP系统。
+
+
+在此非常感谢ThinkPHP提供那么优秀的免费开源底层,同时也要感谢DolphinPHP提供那么好用的ZBuilder编辑器,除此以外还要特别鸣谢layer、mui、bootstrap、jquery、ueditor等等开源底层JS脚本。
+
+同时也要感谢一下YZNCMS、YFCMF、hisiphp、fastadmin、ThinkCMF、cltphp、EacooPHP、
+lyadmin、sentcms、spfcms等等为PHP开源所做的贡献.
+
+最后还要感谢一下 中电云集 http://www.chinaccnet.com/ 一直以来提供免费服务器赞助支持!
+
+齐博X1.0是参阅众家之所长而开发出来的系统,秉承PHP开源精神,齐博X1.0框架永久开源免费使用(也可免费用于商业),不区分商业版与免费版。
+
+但为了能持续发展,引入更多的开发者,后续的插件与模块会有免费与收费的区别。
+
+===========================
+
+ThinkPHP遵循Apache2开源协议发布,并提供免费使用。
+版权所有Copyright © 2006-2016 by ThinkPHP (http://thinkphp.cn)
+All rights reserved。
+ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。
+
+Apache Licence是著名的非盈利开源组织Apache采用的协议。
+该协议和BSD类似,鼓励代码共享和尊重原作者的著作权,
+允许代码修改,再作为开源或商业软件发布。需要满足
+的条件: 
+1. 需要给代码的用户一份Apache Licence ;
+2. 如果你修改了代码,需要在被修改的文件中说明;
+3. 在延伸的代码中(修改和有源代码衍生的代码中)需要
+带有原来代码中的协议,商标,专利声明和其他原来作者规
+定需要包含的说明;
+4. 如果再发布的产品中包含一个Notice文件,则在Notice文
+件中需要带有本协议内容。你可以在Notice中增加自己的
+许可,但不可以表现为对Apache Licence构成更改。 
+具体的协议参考:http://www.apache.org/licenses/LICENSE-2.0
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

+ 1 - 14
README.md

@@ -1,17 +1,4 @@
-齐博X1.0
-===========================
-
-齐博X1.0是集众家之所长再结合自身特色而开发出来的一套开源PHP系统。
-
-
-在此非常感谢ThinkPHP提供那么优秀的免费开源底层,同时也要感谢DolphinPHP提供那么好用的ZBuilder编辑器,除此以外还要特别鸣谢layer、mui、bootstrap、jquery、ueditor等等开源底层JS脚本。
-
-同时也要感谢一下YZNCMS、YFCMF、hisiphp、fastadmin、ThinkCMF、cltphp、EacooPHP、
-lyadmin、sentcms、spfcms等等为PHP开源所做的贡献.
-
-最后还要感谢一下 中电云集 http://www.chinaccnet.com/ 一直以来提供免费服务器赞助支持!
-
-===========================
+
 
 齐博X1.0是参阅众家之所长而开发出来的系统,秉承PHP开源精神,齐博X1.0框架永久开源免费使用(也可免费用于商业),不区分商业版与免费版。
 

+ 1 - 1
application/admin/controller/Webmenu.php

@@ -126,7 +126,7 @@ class Webmenu extends AdminBase
 	    ->addRadio('ifshow','是否隐藏','',['隐藏','显示(不隐藏)'])
 	    ->addNumber('list','排序值')
 	    ->addIcon('style','图标')
-	    ->addText('activate','选中属性[:频道链接填上频道的目录名时,呆在该频道的话,菜单就是选中状态,一般留空]')
+	    ->addText('activate','选中属性[:频道链接填上频道的目录名时,呆在该频道的话,菜单就是选中状态,一般留空]','主页就输入index,商城就输入shop以此类推,不过最好是后面加个-横框线因为栏目的话,可以定义为shop-18')
 	    ->addHidden('id',$id);
 
 	    return $form->fetch();

File diff suppressed because it is too large
+ 23 - 1
application/cms/install/install.sql


+ 13 - 10
application/common/model/User.php

@@ -93,17 +93,17 @@ class User extends Model
 		if(!$rs){
 			return 0;
 		}
-		if(defined("UC_CONNECT")){
-			if(md5(md5($password).$rs['salt'])==$rs['password']){
-				return $rs;
-			}
-		}else{
+// 		if(defined("UC_CONNECT")){
+// 			if(md5(md5($password).$rs['salt'])==$rs['password']){
+// 				return $rs;
+// 			}
+// 		}else{
 			if($ckmd5 && strlen($password)==32 && $password==$rs['password'] ){
 				return $rs;
-			}elseif(md5($password)==$rs['password']){
+			}elseif(md5($password.$rs['password_rand'])==$rs['password']){
 				return $rs;
 			}
-		}
+// 		}
 		return -1;
 	}
 	
@@ -266,7 +266,8 @@ class User extends Model
         
 		//用户昵称
 		$array['nickname'] = $array['username'];
-		$array['password'] = md5 ($array['password']);
+		$array['password_rand'] = rands(rand(5,10));
+		$array['password'] = md5 ($array['password'].$array['password_rand']);
 
 		if($result = self::create($array)){		
 		    return $result->uid;
@@ -290,7 +291,8 @@ class User extends Model
 	        }
 	    }
 	    if($array['password']){
-	        $array['password'] = md5($array['password']);
+	        $array['password_rand'] = rands(rand(5,10));
+	        $array['password'] = md5($array['password'].$array['password_rand']);
 	    }
 		
 		if(self::update($array)){
@@ -312,7 +314,8 @@ class User extends Model
 			}
 		}
 		if($array['password']){
-		    $array['password'] = md5($array['password']);
+		    $array['password_rand'] = rands(rand(5,10));
+		    $array['password'] = md5($array['password'].$array['password_rand']);
 		}
 
 // 		if(preg_match("/^pwbbs/",config('webdb.passport_type'))){

+ 1 - 0
application/index/controller/Alonepage.php

@@ -15,6 +15,7 @@ class Alonepage extends IndexBase
         }
         AlonepageModel::where('id',$id)->setInc('view',1);
         $this->assign('info', $info);
+		$this->assign('fid','alonepage'.$id);	//这里纯属是给PC头部菜单做选中样式调用
         return $this->fetch($template);
     }
 }

+ 8 - 1
application/index/controller/Getpassword.php

@@ -16,6 +16,7 @@ class Getpassword extends IndexBase
         if( time()-get_cookie('send_num') <120 ){
             return $this->err_js('2分钟后,才能再次获取验证码!');
         }
+        $to = mymd5($to,'DE');
         $num = cache(get_cookie('user_sid').'_reg') ?: rand(1000,9999);
         $send_num = get_md5_num($to.$num,6);
         $title = '来自《'.config('webdb.webname').'》的验证码,请注册查收';
@@ -47,6 +48,7 @@ class Getpassword extends IndexBase
      */
     public function check_num($num='',$field=''){
         //邮箱注册码与手机注册码,不建议同时启用,所以这里没分开处理
+        $field = mymd5($field,'DE');
         $_num = cache(get_cookie('user_sid').'_reg');
         $send_num = get_md5_num($field.$_num,6);
         if( $num ==  $send_num){
@@ -62,7 +64,12 @@ class Getpassword extends IndexBase
         if($username!=''){
             $info = UserModel::get_info($username,'username');
             if($info){
-                return $this->ok_js($info);
+                $array = [
+                        'uid'=>$info['uid'],
+                        'email'=>mymd5($info['email']),
+                        'mobphone'=>$info['mobphone']?mymd5($info['mobphone']):'',
+                ];
+                return $this->ok_js($array);
             }else{
                 return $this->err_js('用户不存在!');
             }

File diff suppressed because it is too large
+ 125 - 33
application/install/sql/install.sql


+ 30 - 48
application/shop/install/install.sql

@@ -8,6 +8,10 @@ INSERT INTO `qb_config` (`id`, `type`, `title`, `c_key`, `c_value`, `form_type`,
 
 
 
+--
+-- 表的结构 `qb_shop_car`
+--
+
 DROP TABLE IF EXISTS `qb_shop_car`;
 CREATE TABLE IF NOT EXISTS `qb_shop_car` (
   `id` int(10) NOT NULL AUTO_INCREMENT COMMENT '自增值',
@@ -23,13 +27,7 @@ CREATE TABLE IF NOT EXISTS `qb_shop_car` (
   PRIMARY KEY (`id`),
   KEY `shopid` (`shopid`,`uid`),
   KEY `uid` (`uid`,`update_time`,`ifchoose`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='购物车' AUTO_INCREMENT=2 ;
-
---
--- 转存表中的数据 `qb_shop_car`
---
-
-INSERT INTO `qb_shop_car` (`id`, `shopid`, `type1`, `type2`, `type3`, `num`, `create_time`, `update_time`, `ifchoose`, `uid`) VALUES(1, 3, 3, 1, 0, 8, 1521779315, 1521780887, 1, 5);
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='购物车' AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
@@ -51,11 +49,9 @@ CREATE TABLE IF NOT EXISTS `qb_shop_content` (
 -- 转存表中的数据 `qb_shop_content`
 --
 
-INSERT INTO `qb_shop_content` (`id`, `mid`, `uid`) VALUES(3, 1, 1);
-INSERT INTO `qb_shop_content` (`id`, `mid`, `uid`) VALUES(2, 1, 1);
-INSERT INTO `qb_shop_content` (`id`, `mid`, `uid`) VALUES(4, 1, 1);
-INSERT INTO `qb_shop_content` (`id`, `mid`, `uid`) VALUES(5, 1, 1);
-INSERT INTO `qb_shop_content` (`id`, `mid`, `uid`) VALUES(6, 1, 1);
+INSERT INTO `qb_shop_content` (`id`, `mid`, `uid`) VALUES
+(3, 1, 1),
+(2, 1, 1);
 
 -- --------------------------------------------------------
 
@@ -107,11 +103,9 @@ CREATE TABLE IF NOT EXISTS `qb_shop_content1` (
 -- 转存表中的数据 `qb_shop_content1`
 --
 
-INSERT INTO `qb_shop_content1` (`id`, `mid`, `fid`, `title`, `ispic`, `uid`, `view`, `status`, `replynum`, `create_time`, `update_time`, `list`, `picurl`, `content`, `price`, `province_id`, `city_id`, `zone_id`, `street_id`, `ext_sys`, `type1`, `type2`, `type3`, `ext_id`) VALUES(3, 1, 1, '魅族手机M9最新款', 1, 1, 25, 1, 0, 1517981293, 1523952575, 0, 'uploads/images/20180208/c30043460273133c77ddb0ccc93d7f9d.jpg', '<p>这是手机哦</p>', '10.22', 0, 0, 0, 0, 0, '["16G|32","32G","64G|45"]', '["红色","白色"]', '[]', 30);
-INSERT INTO `qb_shop_content1` (`id`, `mid`, `fid`, `title`, `ispic`, `uid`, `view`, `status`, `replynum`, `create_time`, `update_time`, `list`, `picurl`, `content`, `price`, `province_id`, `city_id`, `zone_id`, `street_id`, `ext_sys`, `type1`, `type2`, `type3`, `ext_id`) VALUES(2, 1, 1, '女人裤子最新款', 1, 1, 234, 1, 0, 1516259334, 1521098081, 0, 'uploads/images/20180315/bde984aaef393d496a50d3847282f7b5.jpg', '<p>王猛不避讳自己性格的“弱点”:“内向,敏感,不善交际”。他认为,这正与父母有关,“我母亲一直倾向于把我关在家里,按自己的喜好包办事情。”</p><p>王猛至今记忆深刻的一件事发生在小学一二年级——班里文艺演出要求穿齐膝短裤。“母亲却不由分说让我穿长裤,我提出带上短裤备用也没被准许。”王猛说,从小到大几乎所有的衣服都是按照父母的意愿和审美来置办的,几乎没有一次是按照自己的意愿来进行选择的。</p><p>王猛五六年级时,对奥数很有感觉,一开始母亲并不乐意让他去。有次参加奥数考试,携带的文件夹不见了,找回后发现被划坏并涂抹,“回到家后,母亲不但没有安慰我,反而说‘这下你知道外面的世界很精彩了吧’!”</p><p>高中毕业前,所有的社交圈子几乎都在生活的大院里,“朋友,都是父母认识、了解或者听过的”。高中时,王猛曾强烈要求到外面的学校上学,但遭到父母的拒绝。尽管后来考上北大,也因社交障碍很难与人交往。</p><p><br/></p>', '20.02', 0, 0, 0, 0, 0, '["大份|10","中份|20","小份|40"]', '["XX","XL","XXXL"]', '["红","黄","蓝"]', 30);
-INSERT INTO `qb_shop_content1` (`id`, `mid`, `fid`, `title`, `ispic`, `uid`, `view`, `status`, `replynum`, `create_time`, `update_time`, `list`, `picurl`, `content`, `price`, `province_id`, `city_id`, `zone_id`, `street_id`, `ext_sys`, `type1`, `type2`, `type3`, `ext_id`) VALUES(4, 1, 1, 'test', 0, 1, 0, 1, 0, 1523498601, 1523952604, 0, '', '<p>testsssssssss<br/></p>', '0.00', 0, 0, 0, 0, 0, '', '', '', 0);
-INSERT INTO `qb_shop_content1` (`id`, `mid`, `fid`, `title`, `ispic`, `uid`, `view`, `status`, `replynum`, `create_time`, `update_time`, `list`, `picurl`, `content`, `price`, `province_id`, `city_id`, `zone_id`, `street_id`, `ext_sys`, `type1`, `type2`, `type3`, `ext_id`) VALUES(5, 1, 1, 'fdasfd', 0, 1, 2, 1, 0, 1523498648, 0, 0, '', '<p>afdsafds</p>', '0.00', 0, 0, 0, 0, 0, '', '', '', 0);
-INSERT INTO `qb_shop_content1` (`id`, `mid`, `fid`, `title`, `ispic`, `uid`, `view`, `status`, `replynum`, `create_time`, `update_time`, `list`, `picurl`, `content`, `price`, `province_id`, `city_id`, `zone_id`, `street_id`, `ext_sys`, `type1`, `type2`, `type3`, `ext_id`) VALUES(6, 1, 1, 'efdsa', 0, 1, 6, 1, 0, 1523501487, 0, 0, '', '<p>fdsafds</p>', '0.00', 0, 0, 0, 0, 0, '', '', '', 0);
+INSERT INTO `qb_shop_content1` (`id`, `mid`, `fid`, `title`, `ispic`, `uid`, `view`, `status`, `replynum`, `create_time`, `update_time`, `list`, `picurl`, `content`, `price`, `province_id`, `city_id`, `zone_id`, `street_id`, `ext_sys`, `type1`, `type2`, `type3`, `ext_id`) VALUES
+(3, 1, 1, '魅族蓝牙小音箱', 1, 1, 36, 1, 0, 1517981293, 1526352423, 0, 'uploads/images/20180302/CnQOjVikE4qAYN55AAMAoDa-ghQ407.jpg', '<p><img class="lazy" width="1240" alt="" src="https://openfile.meizu.com/group1/M00/01/1E/CnQOjVij_geANlzXAAJ4JdyIZ7g421.jpg"/><img class="lazy" width="1240" alt="" src="https://openfile.meizu.com/group1/M00/01/1E/Cix_s1ij_giAVoRwAALyOhoZT6k135.jpg"/><img class="lazy" width="1240" alt="" src="https://openfile.meizu.com/group1/M00/01/1E/Cix_s1ij_giAcddhAAIAdrNbQ5I909.jpg"/></p>', '100.22', 0, 0, 0, 0, 0, '["16G|32","32G","64G|45"]', '["红色","白色"]', '[]', 30),
+(2, 1, 1, '魅族手机M9最新款隆重上市了', 1, 1, 243, 1, 0, 1516259334, 1526352365, 0, 'uploads/images/20180302/Cgbj0FnCGy2AQhMOAA5ZxbK1GIo722.jpg', '<p><img class="lazy" width="1240" alt="" src="https://openfile.meizu.com/group1/M00/04/1E/Cgbj0VrcdgOAf_cEAAHV1O1wNn4780.jpg"/><a href="https://detail.meizu.com/item/spx.html" target="_blank"><img class="lazy" width="1240" alt="" src="https://openfile.meizu.com/group1/M00/03/86/Cgbj0FqzftuAFRuEAAFDN8UQ57I852.jpg"/></a><img class="lazy" width="1240" alt="" src="https://openfile.meizu.com/group1/M00/04/10/Cgbj0FrcdgOADH3rAAJvD1XrMDg850.jpg"/><img class="lazy" width="1240" alt="" src="https://openfile.meizu.com/group1/M00/04/1E/Cgbj0VrcdgOAV3G7AAVRP964D3A280.jpg"/><img class="lazy" width="1240" alt="" src="https://openfile.meizu.com/group1/M00/04/10/Cgbj0FrcdgWAbRd5AAFG0cWJKug303.jpg"/><img class="lazy" width="1240" alt="" src="https://openfile.meizu.com/group1/M00/04/10/Cgbj0FrcdgWAZNLyAAHNcu8f9V8672.jpg"/><img class="lazy" width="1240" alt="" src="https://openfile.meizu.com/group1/M00/04/1E/Cgbj0VrcdgWAMuu2AAVk0BJBeg4924.jpg"/><img class="lazy" width="1240" alt="" src="https://openfile.meizu.com/group1/M00/04/1E/Cgbj0VrcdgaAPMMqAAJ5D3ohZpM015.jpg"/></p>', '2020.02', 0, 0, 0, 0, 0, '["大份|10","中份|20","小份|40"]', '["XX","XL","XXXL"]', '["红","黄","蓝"]', 30);
 
 -- --------------------------------------------------------
 
@@ -152,13 +146,14 @@ CREATE TABLE IF NOT EXISTS `qb_shop_field` (
 -- 转存表中的数据 `qb_shop_field`
 --
 
-INSERT INTO `qb_shop_field` (`id`, `name`, `title`, `type`, `field_type`, `value`, `options`, `about`, `show`, `mid`, `ajax_url`, `next_items`, `param`, `format`, `table`, `level`, `key`, `option`, `pid`, `list`, `listshow`, `ifsearch`, `ifmust`, `nav`) VALUES(10, 'title', '商品名称', 'text', 'varchar(256) NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 100, 1, 1, 1, '');
-INSERT INTO `qb_shop_field` (`id`, `name`, `title`, `type`, `field_type`, `value`, `options`, `about`, `show`, `mid`, `ajax_url`, `next_items`, `param`, `format`, `table`, `level`, `key`, `option`, `pid`, `list`, `listshow`, `ifsearch`, `ifmust`, `nav`) VALUES(11, 'picurl', '商品介绍图', 'images', 'text NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 98, 0, 0, 0, '');
-INSERT INTO `qb_shop_field` (`id`, `name`, `title`, `type`, `field_type`, `value`, `options`, `about`, `show`, `mid`, `ajax_url`, `next_items`, `param`, `format`, `table`, `level`, `key`, `option`, `pid`, `list`, `listshow`, `ifsearch`, `ifmust`, `nav`) VALUES(12, 'content', '商品介绍', 'ueditor', 'text NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 0, 0, 0, 0, '');
-INSERT INTO `qb_shop_field` (`id`, `name`, `title`, `type`, `field_type`, `value`, `options`, `about`, `show`, `mid`, `ajax_url`, `next_items`, `param`, `format`, `table`, `level`, `key`, `option`, `pid`, `list`, `listshow`, `ifsearch`, `ifmust`, `nav`) VALUES(47, 'price', '商品价格', 'money', 'decimal(10, 2 ) UNSIGNED NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 99, 0, 0, 0, '');
-INSERT INTO `qb_shop_field` (`id`, `name`, `title`, `type`, `field_type`, `value`, `options`, `about`, `show`, `mid`, `ajax_url`, `next_items`, `param`, `format`, `table`, `level`, `key`, `option`, `pid`, `list`, `listshow`, `ifsearch`, `ifmust`, `nav`) VALUES(48, 'type1', '型号', 'array', 'varchar(255) NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 0, 0, 0, 0, '商品属性');
-INSERT INTO `qb_shop_field` (`id`, `name`, `title`, `type`, `field_type`, `value`, `options`, `about`, `show`, `mid`, `ajax_url`, `next_items`, `param`, `format`, `table`, `level`, `key`, `option`, `pid`, `list`, `listshow`, `ifsearch`, `ifmust`, `nav`) VALUES(49, 'type2', '尺寸', 'array', 'varchar(255) NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 0, 0, 0, 0, '商品属性');
-INSERT INTO `qb_shop_field` (`id`, `name`, `title`, `type`, `field_type`, `value`, `options`, `about`, `show`, `mid`, `ajax_url`, `next_items`, `param`, `format`, `table`, `level`, `key`, `option`, `pid`, `list`, `listshow`, `ifsearch`, `ifmust`, `nav`) VALUES(50, 'type3', '颜色', 'array', 'varchar(255) NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 0, 0, 0, 0, '商品属性');
+INSERT INTO `qb_shop_field` (`id`, `name`, `title`, `type`, `field_type`, `value`, `options`, `about`, `show`, `mid`, `ajax_url`, `next_items`, `param`, `format`, `table`, `level`, `key`, `option`, `pid`, `list`, `listshow`, `ifsearch`, `ifmust`, `nav`) VALUES
+(10, 'title', '商品名称', 'text', 'varchar(256) NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 100, 1, 1, 1, ''),
+(11, 'picurl', '商品介绍图', 'images', 'text NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 98, 0, 0, 0, ''),
+(12, 'content', '商品介绍', 'ueditor', 'text NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 0, 0, 0, 0, ''),
+(47, 'price', '商品价格', 'money', 'decimal(10, 2 ) UNSIGNED NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 99, 0, 0, 0, ''),
+(48, 'type1', '型号', 'array', 'varchar(255) NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 0, 0, 0, 0, '商品属性'),
+(49, 'type2', '尺寸', 'array', 'varchar(255) NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 0, 0, 0, 0, '商品属性'),
+(50, 'type3', '颜色', 'array', 'varchar(255) NOT NULL', '', '', '', 0, 1, '', '', '', '', '', 2, '', '', '', 0, 0, 0, 0, '商品属性');
 
 -- --------------------------------------------------------
 
@@ -183,7 +178,8 @@ CREATE TABLE IF NOT EXISTS `qb_shop_module` (
 -- 转存表中的数据 `qb_shop_module`
 --
 
-INSERT INTO `qb_shop_module` (`id`, `keyword`, `title`, `layout`, `icon`, `list`, `create_time`, `status`) VALUES(1, '', '商品模型', '', '', 100, 1515221331, 0);
+INSERT INTO `qb_shop_module` (`id`, `keyword`, `title`, `layout`, `icon`, `list`, `create_time`, `status`) VALUES
+(1, '', '商品模型', '', '', 100, 1515221331, 0);
 
 -- --------------------------------------------------------
 
@@ -222,24 +218,7 @@ CREATE TABLE IF NOT EXISTS `qb_shop_order` (
   KEY `create_time` (`create_time`),
   KEY `uid` (`uid`),
   KEY `order_sn` (`order_sn`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='商品订单' AUTO_INCREMENT=15 ;
-
---
--- 转存表中的数据 `qb_shop_order`
---
-
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(4, 'kqlub2z6wb', '3-1-2-0-0,2-3-2-2-2', 1, 1, '50.22', '0.00', '50.22', '0.00', 0, 1519631489, 0, 0, '', '', '', '', 0, 0, 0, 0, '', '', '', '');
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(3, 'hdy36zdk4a', '3-2-2-0-0', 1, 1, '10.22', '0.00', '10.22', '0.00', 0, 1519631402, 0, 0, '', '张三', '', '13585544', 0, 0, 0, 0, '', '', '', '');
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(5, 'g1um11j3ep', '3-1-2-0-0,2-3-2-2-2', 1, 1, '50.22', '0.00', '50.22', '0.00', 0, 1519633419, 0, 0, '', '', '', '', 0, 0, 0, 0, '', '', '', '');
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(6, '1os5nkh7bf', '3-1-2-0-0,2-3-2-2-2', 1, 1, '50.22', '0.00', '50.22', '0.00', 0, 1519633465, 0, 0, '', '', '', '', 0, 0, 0, 0, '', '', '', '');
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(7, 'w4z3313pe5', '3-1-2-0-0,2-3-2-2-2', 1, 1, '50.22', '0.00', '50.22', '0.00', 0, 1519633593, 0, 0, '', '', '', '', 0, 0, 0, 0, '', '', '', '');
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(8, '001ea0616d', '3-2-1-1-1,2-4-1-1-1', 1, 5, '30.22', '0.00', '30.22', '0.00', 0, 1521192321, 0, 0, '', '张三69999', '市桥103号3', '13654545454', 0, 0, 0, 0, '', '', '', '');
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(9, 'd1f1b3ddf7', '3-2-1-1-1,2-4-1-1-1', 1, 5, '30.22', '0.00', '30.22', '0.00', 0, 1521193985, 0, 0, '', '李四88', '天河区123号', '18698545212', 0, 0, 0, 0, '', '', '', '');
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(10, 'e78456b589', '3-2-1-1-1,2-4-1-1-1', 1, 5, '30.22', '0.00', '30.22', '0.00', 0, 1521194239, 0, 0, '', '李四88', '天河区123号', '18698545212', 0, 0, 0, 0, '', '', '', '');
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(11, '0bb7cba27c', '3-2-1-1-1,2-4-1-1-1', 1, 5, '30.22', '0.00', '30.22', '0.00', 0, 1521195905, 0, 0, '', '李四88', '天河区123号', '18698545212', 0, 0, 0, 0, '', '', '', '');
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(12, 'eda3dfc0dc', '3-2-1-1-1,2-4-1-1-1', 1, 5, '30.22', '0.00', '30.22', '0.00', 0, 1521196062, 0, 0, '', '李四88', '天河区123号', '18698545212', 0, 0, 0, 0, '', '', '', '');
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(13, '3febf9e176', '3-2-1-1-1', 1, 5, '10.22', '0.00', '10.22', '0.00', 0, 1521196820, 0, 0, '', '李四88', '天河区123号', '18698545212', 0, 0, 0, 0, '', '', '', '');
-INSERT INTO `qb_shop_order` (`id`, `order_sn`, `shop`, `shop_uid`, `uid`, `totalmoney`, `shipping_price`, `pay_money`, `user_rmb`, `user_jf`, `create_time`, `pay_time`, `pay_status`, `pay_name`, `linkman`, `address`, `telphone`, `shipping_time`, `receive_time`, `receive_status`, `shipping_status`, `shipping_name`, `shipping_code`, `user_note`, `admin_note`) VALUES(14, '43b8404376', '2-1-1-1-1', 1, 5, '20.00', '0.00', '20.00', '0.00', 0, 1521528492, 0, 0, '', '张三69999', '市桥103号3', '13654545454', 0, 0, 0, 0, '', '', '', '');
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='商品订单' AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
@@ -258,9 +237,9 @@ CREATE TABLE IF NOT EXISTS `qb_shop_sort` (
   `template` varchar(255) NOT NULL COMMENT '模板',
   `allowpost` varchar(100) NOT NULL COMMENT '允许发布信息的用户组',
   `allowview` varchar(100) NOT NULL COMMENT '允许浏览内容的用户组',
-  `seo_title` int(100) NOT NULL COMMENT 'SEO标题',
-  `seo_keywords` int(100) NOT NULL COMMENT 'SEO关键字',
-  `seo_description` int(150) NOT NULL COMMENT 'SEO描述',
+  `seo_title` varchar(255) NOT NULL COMMENT 'SEO标题',
+  `seo_keywords` varchar(255) NOT NULL COMMENT 'SEO关键字',
+  `seo_description` varchar(255) NOT NULL COMMENT 'SEO描述',
   PRIMARY KEY (`id`),
   KEY `mid` (`mid`),
   KEY `pid` (`pid`),
@@ -271,5 +250,8 @@ CREATE TABLE IF NOT EXISTS `qb_shop_sort` (
 -- 转存表中的数据 `qb_shop_sort`
 --
 
-INSERT INTO `qb_shop_sort` (`id`, `pid`, `mid`, `name`, `list`, `logo`, `template`, `allowpost`, `allowview`, `seo_title`, `seo_keywords`, `seo_description`) VALUES(1, 0, 1, '数码产品', 0, '', '', '', '', 0, 0, 0);
-INSERT INTO `qb_shop_sort` (`id`, `pid`, `mid`, `name`, `list`, `logo`, `template`, `allowpost`, `allowview`, `seo_title`, `seo_keywords`, `seo_description`) VALUES(2, 0, 1, '家居用品', 0, '', '', '', '', 0, 0, 0);
+INSERT INTO `qb_shop_sort` (`id`, `pid`, `mid`, `name`, `list`, `logo`, `template`, `allowpost`, `allowview`, `seo_title`, `seo_keywords`, `seo_description`) VALUES
+(1, 0, 1, '数码产品', 0, '', '', '', '', '', '', ''),
+(2, 0, 1, '家居用品', 0, '', '', '', '', '', '', '');
+
+

BIN
public/uploads/images/20180302/09eb406c7b68b32f4f1a08d91e0405a4.jpg


BIN
public/uploads/images/20180302/1271aa70880157872ecd4c1cac3f6eca.jpg


BIN
public/uploads/images/20180302/1cb8ca8badefa49403b56d02365b5246.JPG


BIN
public/uploads/images/20180302/2334683a87b83f94f7106d31fc6ce0be.jpg


BIN
public/uploads/images/20180302/2ba8be29121f32954e1f7feb5d34e897.JPG


BIN
public/uploads/images/20180302/2fca054b5a1adda5a4867a3dab39339c.jpg


BIN
public/uploads/images/20180302/47ec268298550dbaf723f63f9c8068f8.JPG


BIN
public/uploads/images/20180302/4e130207d16de8e9325372e10f24b1c6.jpg


BIN
public/uploads/images/20180302/Cgbj0FnCGy2AQhMOAA5ZxbK1GIo722.jpg


BIN
public/uploads/images/20180302/CnQOjVikE4qAYN55AAMAoDa-ghQ407.jpg


BIN
public/uploads/images/20180302/acc5222477f61f1791a5f1c3e1029a33.jpg


BIN
public/uploads/images/20180302/b30dd5deccce4e1bab04274c4c7695d9.jpg


BIN
public/uploads/images/20180302/bbdad5bba94b25b1eb45004c3a946b06.jpg


BIN
public/uploads/images/20180302/d27a7a45c3fcd543a5a5dc4b1cb22d16.jpg


BIN
public/uploads/images/20180302/e04c0b963510abd7a6a75770ac73cfe5.jpg


BIN
public/uploads/images/20180302/ed46f4c7a30f7036bdb4182c2e91ce85.jpg


BIN
public/uploads/images/20180302/f4cb941062607e7ece08699e2955eaf3.jpg


BIN
public/uploads/images/20180312/1d988146be839a28964429913a06e336.jpeg


BIN
public/uploads/images/20180312/5518ce3a2f1c8eb669146b67bffc7a56.jpeg


BIN
public/uploads/images/20180312/895ef8c2ff3060b9a8c9c175d5b366bd.jpeg


BIN
public/uploads/images/20180312/ec67f52bfa1046b48dfb0887fa62b314.png


BIN
public/uploads/images/20180312/efebd1b5ec8979134a8da76c539b8f05.jpeg


+ 1 - 1
template/index_style/default/cms/content/pc_list2.htm

@@ -33,7 +33,7 @@
 				</ol>
 				<li>
 				{volist name="rs.picurls" id="pic"}
-					<div><a href="{$rs.url}"><img src="{$pic}" onmouseover='thisimg_over($(this))' onmouseout='thisimg_out($(this))'/></a></div>
+					{if ($key<5)}<div><a href="{$rs.url}"><img src="{$pic}" onmouseover='thisimg_over($(this))' onmouseout='thisimg_out($(this))'/></a></div>{/if}
 				{/volist}
 				</li>
 			</ul>

+ 1 - 1
template/index_style/default/cms/index/pc_index.htm

@@ -27,7 +27,7 @@
 					<dl><dt>{:date("d",$rs.create_time)}</dt><dd>{:date("Y-m",$rs.create_time)}</dd></dl>
 				</ol>
 				<li>
-					<h3><a href="{$rs.url}">{$rs.title|get_word=100}-{$rs.title|get_word=100}</a></h3>
+					<h3><a href="{$rs.url}">{$rs.title|get_word=100}</a></h3>
 					<p>{$rs.content|get_word=200}</p>
 				</li>
 			</ul>

Some files were not shown because too many files changed in this diff