diff --git a/app/Http/Controllers/Api/FeedBackController.php b/app/Http/Controllers/Api/FeedBackController.php index 2e6fe6f..83a011a 100644 --- a/app/Http/Controllers/Api/FeedBackController.php +++ b/app/Http/Controllers/Api/FeedBackController.php @@ -35,6 +35,8 @@ class FeedBackController extends CommonController //参数 $data['content'] = $request->input('content',null); if($request->input('title', null) !== null){$data['title'] = $request->input('title');} + if($request->input('mobile', null) !== null){$data['mobile'] = $request->input('mobile');} + if($request->input('type', null) !== null){$data['type'] = $request->input('type');} $data['user_id'] = Token::$uid; if($data['content']===null) diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index e9f8956..4b86e32 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -7,6 +7,7 @@ use App\Common\ReturnData; use App\Common\Token; use App\Common\Helper; use App\Http\Model\User; +use DB; class UserController extends CommonController { @@ -182,14 +183,14 @@ class UserController extends CommonController $data['user_name'] = $request->input('user_name',''); $data['password'] = $request->input('password',''); $data['parent_id'] = $request->input('parent_id',''); - $parent_mobile = $request->input('parent_mobile',''); + $parent_mobile = $request->input('parent_mobile',null); if (($data['mobile']=='' && $data['user_name']=='') || $data['password']=='') { return ReturnData::create(ReturnData::PARAMS_ERROR); } - if ($parent_mobile!='') + if ($parent_mobile!=null) { if($user = User::getOneUser(array('mobile'=>$parent_mobile))) { @@ -232,6 +233,7 @@ class UserController extends CommonController public function wxOauthRegister(Request $request) { $data['openid'] = $request->input('openid',''); + $data['unionid'] = $request->input('unionid',''); $data['sex'] = $request->input('sex',''); $data['head_img'] = $request->input('head_img',''); $data['nickname'] = $request->input('nickname',''); @@ -239,6 +241,7 @@ class UserController extends CommonController $parent_mobile = $request->input('parent_mobile',''); $data['mobile'] = $request->input('mobile',''); $data['user_name'] = date('YmdHis').dechex(rand(1000,9999)); + $data['password'] = md5('123456'); if ($data['openid']=='') { @@ -281,6 +284,10 @@ class UserController extends CommonController return ReturnData::create(ReturnData::SYSTEM_FAIL); } + //更新用户名user_name，微信登录没有用户名 + $uid = DB::table('user')->where(array('openid'=>$data['openid']))->value('id'); + if($uid){User::modify(array('openid'=>$data['openid']),array('user_name'=>'a'.$uid));} + return ReturnData::create(ReturnData::SUCCESS,User::wxLogin(array('openid'=>$data['openid']))); } diff --git a/app/Http/Controllers/Weixin/FeedbackController.php b/app/Http/Controllers/Weixin/FeedbackController.php new file mode 100644 index 0000000..0f5b53d --- /dev/null +++ b/app/Http/Controllers/Weixin/FeedbackController.php @@ -0,0 +1,20 @@ + $_SESSION['weixin_oauth']['token']['openid'], + 'unionid' => isset($_SESSION['weixin_oauth']['userinfo']['unionid']) ? $_SESSION['weixin_oauth']['userinfo']['unionid'] : '', 'nickname' => $_SESSION['weixin_oauth']['userinfo']['nickname'], 'sex' => $_SESSION['weixin_oauth']['userinfo']['sex'], 'head_img' => $_SESSION['weixin_oauth']['userinfo']['headimgurl'], - 'parent_id' => '', + 'parent_id' => isset($_SESSION['weixin_user_invite_code']) ? $_SESSION['weixin_user_invite_code'] : '', 'parent_mobile' => '', 'mobile' => '' ); diff --git a/app/Http/Model/User.php b/app/Http/Model/User.php index 28a0a81..cb0ce3b 100644 --- a/app/Http/Model/User.php +++ b/app/Http/Model/User.php @@ -184,6 +184,7 @@ class User extends BaseModel if(isset($password)){$data['password'] = $password;} //md5加密 if(isset($parent_id) && !empty($parent_id)){$data['parent_id'] = $parent_id;} if(isset($openid)){$data['openid'] = $openid;} + if(isset($unionid)){$data['unionid'] = $unionid;} if(isset($sex)){$data['sex'] = $sex;} if(isset($head_img)){$data['head_img'] = $head_img;} if(isset($nickname)){$data['nickname'] = $nickname;} @@ -244,6 +245,13 @@ class User extends BaseModel return $res; } + //描述-文字 + public function getSexAttr($data) + { + $arr = [0 => '不限', 1 => '黑色', 2 => '白色', 3 => '银色', 4 => '橙色', 5 => '绿色', 6 => '红色', 7 => '蓝色', 8 => '紫色', 9 => '黄色', 10 => '香槟色', 11 => '咖啡色']; + return $arr[$data['des']]; + } + //获取用户状态文字：1正常 2 删除 3锁定 public static function getStatusText($where) { diff --git a/app/Http/Model/UserMoney.php b/app/Http/Model/UserMoney.php index 329b99f..bb039a7 100644 --- a/app/Http/Model/UserMoney.php +++ b/app/Http/Model/UserMoney.php @@ -80,4 +80,11 @@ class UserMoney extends BaseModel return true; } + + //描述-文字 + public function getDesAttr($data) + { + $arr = [0 => '不限', 1 => '黑色', 2 => '白色', 3 => '银色', 4 => '橙色', 5 => '绿色', 6 => '红色', 7 => '蓝色', 8 => '紫色', 9 => '黄色', 10 => '香槟色', 11 => '咖啡色']; + return $arr[$data['des']]; + } } \ No newline at end of file diff --git a/lqycms.sql b/lqycms.sql index 5ca5c09..adc9be4 100644 --- a/lqycms.sql +++ b/lqycms.sql @@ -325,14 +325,16 @@ CREATE TABLE `fl_feedback` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `content` text NOT NULL COMMENT '意见反馈内容', `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间', - `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '用户id', - `title` varchar(150) NOT NULL DEFAULT '' COMMENT '标题', + `user_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '用户id', + `title` varchar(150) NOT NULL DEFAULT '' COMMENT '标题，选填', + `mobile` varchar(20) NOT NULL DEFAULT '' COMMENT '手机号码，选填', + `type` varchar(20) NOT NULL DEFAULT '' COMMENT '意见反馈类型，选填', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC COMMENT='意见反馈表'; +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8; /*Data for the table `fl_feedback` */ -insert into `fl_feedback`(`id`,`content`,`created_at`,`user_id`,`title`) values (1,'发过火对光反射','2017-07-27 14:13:31',127,''),(3,'content六角恐龙','2017-08-08 15:46:49',1,'title螺丝款计划'); +insert into `fl_feedback`(`id`,`content`,`created_at`,`user_id`,`title`,`mobile`,`type`) values (1,'发过火对光反射','2017-07-27 14:13:31',127,'','',''),(3,'content六角恐龙','2017-08-08 15:46:49',1,'title螺丝款计划','',''),(4,'asfa','2018-03-30 11:40:44',3,'','',''),(5,'sdgsd','2018-03-30 11:43:06',3,'','15280719685','积分/优惠券'),(6,'dgsg','2018-03-30 11:43:33',3,'','','购物流程'); /*Table structure for table `fl_friendlink` */ @@ -876,11 +878,11 @@ CREATE TABLE `fl_sysconfig` ( `is_show` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '是否显示，默认0显示，让客户看不到', PRIMARY KEY (`id`), UNIQUE KEY `varname` (`varname`) -) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC COMMENT='系统参数配置表'; +) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC COMMENT='系统参数配置表'; /*Data for the table `fl_sysconfig` */ -insert into `fl_sysconfig`(`id`,`varname`,`info`,`value`,`is_show`) values (1,'CMS_WEBNAME','网站名称','LQYCMS企业建站系统',0),(2,'CMS_BASEHOST','站点根网址','http://www.lqycms.com',0),(3,'CMS_UPLOADS','图片/上传文件默认路径','/uploads',0),(4,'CMS_CSS','css默认存放路径','/css',0),(5,'CMS_JS','js默认存放路径','/js',0),(6,'CMS_INDEXNAME','主页链接名','首页',0),(7,'CMS_POWERBY','网站版权信息','Copyright © LQYCMS 版权所有',0),(8,'CMS_IMGWIDTH','缩略图默认宽度','240',0),(9,'CMS_IMGHEIGHT','缩略图默认高度','180',0),(10,'CMS_SEOTITLE','网站seotitle','lqycms是一套完全免费、开源、无授权限制的网站管理系统',0),(11,'CMS_KEYWORDS','网站关键词Keywords','lqycms,无授权限制网站系统cms,免费cms系统,开源网站管理系统,开源cms',0),(12,'CMS_DESCRIPTION','网站描述','lqycms完全免费、开源、无授权限制，您可以使用lqycms在任何商业或者非商业网站上使用而不必支付任何费用，系统采用主流的mvc架构开发，更加容易进行二次开发。',0),(13,'CMS_ISCACHE','是否开启缓存，1开启，0关闭','1',0),(14,'CMS_MAXARC','最大返回列表结果数，默认300','300',0),(15,'CMS_PAGESIZE','列表每页显示的数量，默认15','15',0),(16,'CMS_SIGN_POINT','签到积分','5',0),(17,'CMS_WX_APPID','微信appid','wx2ac97c40c4050e24',0),(18,'CMS_WX_APPSECRET','微信appsecret','a0aad71844bbacbe8928447741c82a43',0),(19,'CMS_WX_MCHID','微信支付商户号','1331184301',0),(20,'CMS_WXSHAER_TITLE','微信分享标题','微信分享测试-标题',0),(21,'CMS_WXSHAER_DESC','微信分享描述','微信分享描述',0),(22,'CMS_WXSHAER_LINK','微信分享链接','http://www.lqycms.com/weixin',0),(23,'CMS_WXSHAER_IMGURL','微信分享图标','http://www.lqycms.com/images/weixin/no_user.jpg',0),(24,'CMS_MIN_WITHDRAWAL_MONEY','最低提现金额(元)','100',0),(25,'CMS_SHOPPING_POINT','购物赠送积分','10',0); +insert into `fl_sysconfig`(`id`,`varname`,`info`,`value`,`is_show`) values (1,'CMS_WEBNAME','网站名称','LQYCMS企业建站系统',0),(2,'CMS_BASEHOST','站点根网址','http://www.lqycms.com',0),(3,'CMS_UPLOADS','图片/上传文件默认路径','/uploads',0),(4,'CMS_CSS','css默认存放路径','/css',0),(5,'CMS_JS','js默认存放路径','/js',0),(6,'CMS_INDEXNAME','主页链接名','首页',0),(7,'CMS_POWERBY','网站版权信息','Copyright © LQYCMS 版权所有',0),(8,'CMS_IMGWIDTH','缩略图默认宽度','240',0),(9,'CMS_IMGHEIGHT','缩略图默认高度','180',0),(10,'CMS_SEOTITLE','网站seotitle','lqycms是一套完全免费、开源、无授权限制的网站管理系统',0),(11,'CMS_KEYWORDS','网站关键词Keywords','lqycms,无授权限制网站系统cms,免费cms系统,开源网站管理系统,开源cms',0),(12,'CMS_DESCRIPTION','网站描述','lqycms完全免费、开源、无授权限制，您可以使用lqycms在任何商业或者非商业网站上使用而不必支付任何费用，系统采用主流的mvc架构开发，更加容易进行二次开发。',0),(13,'CMS_ISCACHE','是否开启缓存，1开启，0关闭','1',0),(14,'CMS_MAXARC','最大返回列表结果数，默认300','300',0),(15,'CMS_PAGESIZE','列表每页显示的数量，默认15','15',0),(16,'CMS_SIGN_POINT','签到积分','5',0),(17,'CMS_WX_APPID','微信appid','wx2ac97c40c4050e24',0),(18,'CMS_WX_APPSECRET','微信appsecret','a0aad71844bbacbe8928447741c82a43',0),(19,'CMS_WX_MCHID','微信支付商户号','1331184301',0),(20,'CMS_WXSHAER_TITLE','微信分享标题','微信分享测试-标题',0),(21,'CMS_WXSHAER_DESC','微信分享描述','微信分享描述',0),(22,'CMS_WXSHAER_LINK','微信分享链接','http://www.lqycms.com/weixin',0),(23,'CMS_WXSHAER_IMGURL','微信分享图标','http://www.lqycms.com/images/weixin/no_user.jpg',0),(24,'CMS_MIN_WITHDRAWAL_MONEY','最低提现金额(元)','100',0),(25,'CMS_SHOPPING_POINT','购物赠送积分','10',0),(26,'CMS_COMMISSION_PERCENT','推介赚钱计划-提成比例(5%)','0.05',0); /*Table structure for table `fl_tagindex` */ @@ -934,11 +936,11 @@ CREATE TABLE `fl_token` ( `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `expired_at` timestamp NULL DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='token表'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='token表'; /*Data for the table `fl_token` */ -insert into `fl_token`(`id`,`token`,`type`,`uid`,`data`,`created_at`,`expired_at`) values (1,'72d623d26a1a6d61186a97f9ccf752f7',1,1,'','2017-08-07 13:29:01','2018-05-22 11:15:27'),(2,'70a0c1ba8fb4a4c394dd2bdf7d6106ec',2,3,'','2018-03-09 12:22:03','2018-04-08 12:22:03'); +insert into `fl_token`(`id`,`token`,`type`,`uid`,`data`,`created_at`,`expired_at`) values (1,'72d623d26a1a6d61186a97f9ccf752f7',1,1,'','2017-08-07 13:29:01','2018-05-22 11:15:27'),(2,'70a0c1ba8fb4a4c394dd2bdf7d6106ec',2,3,'','2018-03-09 12:22:03','2018-04-08 12:22:03'),(3,'0ecd2dd522d64f10d39ba95d4fb6adc2',2,3,'','2018-03-30 14:38:19','2018-04-29 14:38:19'); /*Table structure for table `fl_user` */ @@ -969,7 +971,7 @@ CREATE TABLE `fl_user` ( `updated_at` timestamp NULL DEFAULT NULL COMMENT '更新时间', `signin_time` timestamp NULL DEFAULT NULL COMMENT '签到时间', `openid` varchar(100) NOT NULL DEFAULT '' COMMENT 'openid', - `unionid` varchar(100) NOT NULL DEFAULT '' COMMENT 'unionid', + `unionid` varchar(128) NOT NULL DEFAULT '' COMMENT 'unionid', `push_id` varchar(30) NOT NULL DEFAULT '' COMMENT '推送id', `refund_account` varchar(30) NOT NULL DEFAULT '' COMMENT '退款账户，支付宝账号', `refund_name` varchar(20) NOT NULL DEFAULT '' COMMENT '退款姓名', @@ -1073,7 +1075,7 @@ CREATE TABLE `fl_user_money` ( `type` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '0增加,1减少', `money` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '金额', `add_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '添加时间', - `des` varchar(250) NOT NULL DEFAULT '' COMMENT '描述', + `des` varchar(100) NOT NULL DEFAULT '' COMMENT '描述', `user_money` decimal(10,2) unsigned NOT NULL DEFAULT '0.00' COMMENT '余额，每次增减后面的金额记录', PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC COMMENT='用户余额明细'; diff --git a/public/css/weixin/style.css b/public/css/weixin/style.css index f12424e..2d92e0c 100644 --- a/public/css/weixin/style.css +++ b/public/css/weixin/style.css @@ -253,451 +253,415 @@ margin:5px 0 .signup-find span,.radio span {font-size:24px;cursor: pointer} .sc_list { - padding:10px; - overflow: hidden; - border-bottom: 1px solid #f8f8f8 +padding:10px; +overflow: hidden; +border-bottom: 1px solid #f8f8f8 } .sc_list .radio-img{ - width:120px; - height:80px; - float: left; - margin-right:5px; - display: block; +width:120px; +height:80px; +float: left; +margin-right:5px; +display: block; } .sc_list .radio { - padding-top:24px; - margin-right:10px; +padding-top:24px; +margin-right:10px; } .sc_list .shopimg img { - width:80px; - height:80px; +width:80px; +height:80px; } .sc_list .deleshow .deletes { - position: relative; +position: relative; } .sc_list .deleshow .deletes .tit{ - padding-right:28px; - font-size: 1rem; - height:28px;overflow: hidden; - line-height:28px; +padding-right:28px; +font-size: 1rem; +height:28px;overflow: hidden; +line-height:28px; } .sc_list .deleshow .deletes a.delescj { - position: absolute; - top:4px; - right:0; +position: absolute; +top:4px; +right:0; } .sc_list .deleshow .deletes a.delescj img { - width:18px; - height:18px; +width:18px; +height:18px; } .sc_list .deleshow .weight { - font-size:16px; - color:#999999 +font-size:16px; +color:#999999 } .sc_list .deleshow .prices { - overflow: hidden; - margin-top:8px; +overflow: hidden; +margin-top:8px; } .sc_list .deleshow .prices .sc_pri { - color: #f23030; - font-size:18px; +color: #f23030; +font-size:18px; } .plus span { - width:28px; - height:28px; - line-height:28px; - font-size:16px; - display: block; - float: left; - border: 1px solid #f1f1f1; - margin-left: -1px; - text-align:center; - color: #686868; - cursor: pointer +width:28px; +height:28px; +line-height:28px; +font-size:16px; +display: block; +float: left; +border: 1px solid #f1f1f1; +margin-left: -1px; +text-align:center; +color: #686868; +cursor: pointer } .plus span input { - font-size:14px; - outline: none; - border: 0; - color: #686868; - width: 100%; - text-align: center +font-size:14px; +outline: none; +border: 0; +color: #686868; +width: 100%; +text-align: center } .payallb { - position: fixed; - z-index: 99; - bottom: 0; - background-color: #f3f5f7 +position: fixed; +z-index: 99; +bottom: 0; +background-color: #f3f5f7 } .payallb .radio { - padding-top:14px; - margin-right:8px; +padding-top:14px; +margin-right:8px; } .payallb .radio .all { - font-size:14px; - position: relative; - top:-12px; - margin-left:6px +font-size:14px; +position: relative; +top:-12px; +margin-left:6px } .payallb .youbia { - overflow: hidden;line-height:52px; +overflow: hidden;line-height:52px; } .payallb .youbia p { - text-align: right;margin-right:10px; +text-align: right;margin-right:10px; } .payit {border-top:1px solid #efefef; - height:52px;width:100%; - background-color: white; - overflow: hidden; - padding-left:10px; +height:52px;width:100%; +background-color: white; +overflow: hidden; +padding-left:10px; } .payit .fl { - line-height:40px; +line-height:40px; } .payit .youbia p { - font-size:16px; - color: #f23030 +font-size:16px; +color: #f23030 } .payit .youbia p .pmo { - color: #222222 +color: #222222 } .payit .youbia .lastime { - color: #666666 +color: #666666 } .payit .fr { - width:120px; +width:120px; } .payit .fr a { - color: white; - font-size:18px; - text-align: center; - background-color: #f23030; - display: block; - height:52px;line-height:52px; +color: white; +font-size:18px; +text-align: center; +background-color: #f23030; +display: block; +height:52px;line-height:52px; } .myhearder { - position: relative; - height:180px; +position: relative; +/* height:180px; */ } .myhearder .user_bg{position: absolute;left: 0;top: 0;z-index:-999;} .myhearder .person { - position: absolute; - top:40px; - left:20px +text-align:center; } .myhearder .person .personicon { - -moz-border-radius: 50%; - -webkit-border-radius: 50%; - border-radius: 50%; - overflow: hidden; - width:72px; - height:72px; + } .myhearder .person .personicon img { - width:72px; - height:72px; +width:72px; +height:72px;margin-bottom:10px;margin-top:50px; +-moz-border-radius: 50%; +-webkit-border-radius: 50%; +border-radius: 50%; } -.myhearder .person .lors { - margin-top:10px; - margin-left:8px; - color: #fff; - font-size:18px; - width: 220px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis +.myhearder .person .lors{ +color:#fff; +font-size:16px; +padding-bottom:25px; } .myhearder .set { - position: absolute; - right:15px; - top:15px +position: absolute; +right:15px; +top:15px } .myhearder .set a { - display: block; - float: left +display: block; +float: left } .myhearder .set a i { - background-image: url("../../images/weixin/set.png"); - background-repeat: no-repeat; - background-size: cover; - width:28px; - height:28px; - display: block; +background-image: url("../../images/weixin/set.png"); +background-repeat: no-repeat; +background-size: cover; +width:28px; +height:28px; +display: block; } .myhearder .set .setting i { - background-position: 0 0 +background-position: 0 0 } .myhearder .set .massage { - margin-left:15px; +margin-left:15px; } .myhearder .set .massage i { - background-position: -38px 0; +background-position: -38px 0; } .myhearder .scgz { - position: absolute; - bottom: 0; - width: 100% +position: absolute; +bottom: 0; +width: 100% } .myhearder .scgz ul li { - float: left; - text-align: center; - width: 50% +float: left; +text-align: center; +width: 50% } .myhearder .scgz ul li a h2 { - font-size:18px; - font-weight: normal; - height:24px; - line-height:24px; - color: #fff +font-size:18px; +font-weight: normal; +height:24px; +line-height:24px; +color: #fff } .myhearder .scgz ul li a p { - font-size:14px; - color: #fff; - margin-bottom:5px; +font-size:14px; +color: #fff; +margin-bottom:5px; } .bankhearder { - background-image: url(../../images/zjgl.jpg); - height: 11.73333rem +background-image: url(../../images/zjgl.jpg); +height: 11.73333rem } .bankhearder .hh { - color: white; - text-align: center; - padding-top: 3.2rem +color: white; +text-align: center; +padding-top: 3.2rem } .bankhearder .hh h2 { - font-size: .64rem; - font-weight: normal +font-size: .64rem; +font-weight: normal } .bankhearder .hh h1 { - font-size: .768rem; - font-weight: normal +font-size: .768rem; +font-weight: normal } .bankhearder .scgz ul li { - position: relative; - top: -.64rem +position: relative; +top: -.64rem } .bankhearder .scgz ul li a img { - display: inline-block; - width: .59733rem; - height: .59733rem +display: inline-block; +width: .59733rem; +height: .59733rem } .bankhearder .scgz ul li a p { - display: inline-block; - position: relative; - top: .10667rem +display: inline-block; +position: relative; +top: .10667rem } .myorder { - padding:0 20px; - height:44px; - line-height:44px; - background-color: #fff; - border-bottom: 1px solid #f4f4f4 +padding:0 20px; +height:44px; +line-height:44px; +background-color: #fff; +border-bottom: 1px solid #f4f4f4 } .myorder a { - overflow: hidden; - display: block +overflow: hidden; +display: block } -.myorder .order { - overflow: hidden -} - -.myorder .order .fl img { - width:20px; - height:22px; - vertical-align: middle -} - -.myorder .order .fl span { - font-size:18px; - vertical-align: middle; - font-weight: normal; - margin-left:5px -} +.myorder .order {overflow: hidden} -.myorder .order .fr a { - display: block; - overflow: hidden -} +.myorder .order .fl img {width:20px;/* height:22px; */height:20px;vertical-align: middle} -.myorder .order .fr span { - font-size:14px; - color: #4c4c4c; - float: left; -} +.myorder .order .fl span {font-size:18px;vertical-align: middle;font-weight: normal;margin-left:5px} -.myorder .order .fr i { - margin-top:14px; - margin-left:8px -} +.myorder .order .fr a {display:block;overflow:hidden} +.myorder .order .fr span {font-size:14px;color:#9b9b9b;/* color: #4c4c4c; */float:left;} +.myorder .order .fr i {margin-top:14px;margin-left:8px} .list7 .myorder { - height:50px; - line-height:50px; +height:50px; +line-height:50px; } .list7 .myorder .fr i { - margin-top:18px; +margin-top:18px; } .Mright { - background-image: url(../../images/weixin/yr.png); - background-repeat: no-repeat; - background-size: cover; - width:8px; - height:15px; - display: block; - float: left; +background-image: url(../../images/weixin/yr.png); +background-repeat: no-repeat; +background-size: cover; +width:8px; +height:15px; +display: block; +float: left; } .my {background-color: #f1f1f1;} - -.my .content { - margin: 0 -} - +.my .content {margin: 0} .my .content .floor { - background-color: #fff +background-color: #fff } .my .content .floor ul .fr { - float: right +float: right } .my .content .floor ul li.br { - border-left: 0 !important +border-left: 0 !important } .my .content .floor ul li.br:before { - content: ""; - background-image: inherit !important +content: ""; +background-image: inherit !important } .my .content .floor ul li { - position: relative; - float: left; - width: 25%; - text-align: center +position: relative; +float: left; +width: 25%; +text-align: center } .my .content .floor ul li a { - padding:15px 0 20px 0; - display: block +padding:15px 0 20px 0; +display: block } .my .content .floor ul li a span { - background-color: rgba(217,81,99,0.9); - border-radius: 50%; - font-size:14px; - width:24px; - height:24px; - display: block; - line-height:24px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - position: absolute; - right:15px; - top:8px; - color: white +background-color: rgba(217,81,99,0.9); +border-radius: 50%; +font-size:14px; +width:24px; +height:24px; +display: block; +line-height:24px; +overflow: hidden; +white-space: nowrap; +text-overflow: ellipsis; +position: absolute; +right:15px; +top:8px; +color: white } .my .content .floor ul li a img { - height:36px +height:36px } .my .content .floor ul li a .tit{ - font-size:18px; - font-weight: normal; - height:32px; - line-height:32px; - color: #e3110b +font-size:18px; +font-weight: normal; +height:32px; +line-height:32px; +color: #e3110b } .my .content .floor ul li a p { - font-size:12px; - margin-top:2px; - color: #4c4c4c; - font-weight: normal +font-size:12px; +margin-top:2px; +color: #4c4c4c; +font-weight: normal } .my .content .floor ul li a p.or:after { - content: ""; - background-image: url(../../images/weixin/or.png); - width: .17067rem; - height: .29867rem; - background-repeat: no-repeat; - position: absolute; - margin-top: .08533rem; - margin-left: .04267rem; - background-size: .17067rem +content: ""; +background-image: url(../../images/weixin/or.png); +width: .17067rem; +height: .29867rem; +background-repeat: no-repeat; +position: absolute; +margin-top: .08533rem; +margin-left: .04267rem; +background-size: .17067rem } .my .content .w3 { - width: inherit +width: inherit } .my .content .w3 ul li { - width: 33.33333% +width: 33.33333% } .my .content .action { - background-image: url(../../images/weixin/rb.png); - background-repeat: no-repeat; - background-position: 0 1.96267rem; - width: 100%; - background-size: 16rem +background-image: url(../../images/weixin/rb.png); +background-repeat: no-repeat; +background-position: 0 1.96267rem; +width: 100%; +background-size: 16rem } .my .content .action ul li { - width: 25% +width: 25% } .my .content .tyby { - background-image: inherit +background-image: inherit } .setting .close { - margin:15px 20px +margin:15px 20px } .setting .close a{display: block;background: #ec5151;text-align: center;padding:10px;color: #fff;font-size:18px;border-radius:2px;} @@ -722,89 +686,89 @@ h1.arc_tit, h2.arc_tit{font-weight: normal;font-size: 1.4em;padding: 10px;} /*商品详情*/ .goods-header { - display: block; - height: auto; - padding: 10px 0 0; - -webkit-tap-highlight-color: transparent; - border-top: 1px solid #f2f2f2; - background-color: #fff; - margin-bottom: 10px; - position: relative; +display: block; +height: auto; +padding: 10px 0 0; +-webkit-tap-highlight-color: transparent; +border-top: 1px solid #f2f2f2; +background-color: #fff; +margin-bottom: 10px; +position: relative; } .goods-header .title { - font-weight: normal; - padding: 0 10px; - font-size:18px; - line-height: 1.3; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; +font-weight: normal; +padding: 0 10px; +font-size:18px; +line-height: 1.3; +display: -webkit-box; +-webkit-line-clamp: 2; +-webkit-box-orient: vertical; } .goods-header .wish-add { - position: relative; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - color:#ea6f5a; - background-color: transparent; - border: 1px solid #ea6f5a; - border-radius:2px; - font-size:14px; - padding:0 3px; - display: inline-block; - margin-right:10px; +position: relative; +-webkit-user-select: none; +-moz-user-select: none; +-ms-user-select: none; +user-select: none; +color:#ea6f5a; +background-color: transparent; +border: 1px solid #ea6f5a; +border-radius:2px; +font-size:14px; +padding:0 3px; +display: inline-block; +margin-right:10px; } .goods-header .wish-add-activate{color:#fff;background-color:#ea6f5a;} .goods-header .goods-price { - padding: 10px 10px 2px; - text-align: left; +padding: 10px 10px 2px; +text-align: left; } .goods-header .current-price { - color: #f60; - display: inline-block; +color: #f60; +display: inline-block; } .goods-header .current-price span { - font-size: 16px; - display: inline-block; - vertical-align: middle; +font-size: 16px; +display: inline-block; +vertical-align: middle; } .goods-header .current-price .price { - display: inline-block; - vertical-align: middle; - font-size: 20px; +display: inline-block; +vertical-align: middle; +font-size: 20px; } .goods-header .btn-retail { - padding: 0 3px; - border-radius:2px; - color: #fff; - background-color: #1cbb7f; - display: inline-block; - text-align: center; - font-size: 12px; - cursor: pointer; - line-height: 1.5; - -webkit-appearance: none; +padding: 0 3px; +border-radius:2px; +color: #fff; +background-color: #1cbb7f; +display: inline-block; +text-align: center; +font-size: 12px; +cursor: pointer; +line-height: 1.5; +-webkit-appearance: none; } .goods-header .stock-detail { - position: relative; - line-height:1.5; - color: #999; - background-color: #fff; - padding:5px 10px; +position: relative; +line-height:1.5; +color: #999; +background-color: #fff; +padding:5px 10px; } .goods-header .stock-detail dl {display:table-cell; - margin-top: 10px; - margin-bottom: 10px; - font-size: 14px; - zoom: 1; +margin-top: 10px; +margin-bottom: 10px; +font-size: 14px; +zoom: 1; } .goods-header .stock-detail dt { - display: inline-block; +display: inline-block; } .goods-header .stock-detail dd { - display: inline-block; - word-wrap: break-word; +display: inline-block; +word-wrap: break-word; } .goods-header .goods-comment{margin-top:10px;border-top:10px solid #f1f1f1;height: 44px;line-height: 44px;padding: 0 10px 0 10px;} .goods-header .goods-comment span{float:right;color:#999;} @@ -879,57 +843,57 @@ top: 0; .cart_sum{color:#ff5000; font-size:16px; font-weight:700;} .goods_type { - display: block; - line-height: 20px; - color: #999; - margin: 0; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; +display: block; +line-height: 20px; +color: #999; +margin: 0; +white-space: nowrap; +text-overflow: ellipsis; +overflow: hidden; } .pop_num { - margin-left: 10px;margin-right: 10px; - height: 48px; - display: block; - border-bottom: 1px solid #e1e1e1;border-top: 1px solid #e1e1e1; +margin-left: 10px;margin-right: 10px; +height: 48px; +display: block; +border-bottom: 1px solid #e1e1e1;border-top: 1px solid #e1e1e1; } .pop_num span{ color:#999; display:inline-block; float:left; line-height:48px;} .pop_sum{ display:inline-block; float:left; margin-left:15px; margin-top:5px; position:relative !important;} .pop_btn{ margin-top:10px; margin-bottom:10px;} .cart_num_control { - border: 1px solid #DADADA; - height: 24px; - display: inline-block; - margin: 7px 0px; +border: 1px solid #DADADA; +height: 24px; +display: inline-block; +margin: 7px 0px; } .cart_num_button { - width: 24px; - height: 24px; - display: inline-block; - border: 0px solid #DADADA; - text-decoration: none; - color: #585858; - font-size: 16px; - background-color: #f0f0f0; +width: 24px; +height: 24px; +display: inline-block; +border: 0px solid #DADADA; +text-decoration: none; +color: #585858; +font-size: 16px; +background-color: #f0f0f0; } .cart_num_text { - width: 24px; - text-align: center; - font-size: 12px; - height: 16px; - display: inline-block; - border: 0px solid #DADADA; +width: 24px; +text-align: center; +font-size: 12px; +height: 16px; +display: inline-block; +border: 0px solid #DADADA; } .registered_btn { - display: block; - margin:10px; - height: 42px; - line-height: 42px; - background-color: #ff5000; - text-align: center; - border-radius:2px; - color: #fff; - font-size: 16px; +display: block; +margin:10px; +height: 42px; +line-height: 42px; +background-color: #ff5000; +text-align: center; +border-radius:2px; +color: #fff; +font-size: 16px; } .banner_headline{height:30px;overflow:hidden;background-color:#f1f1f1;padding-bottom:20px;} diff --git a/public/images/weixin/w10.png b/public/images/weixin/w10.png new file mode 100644 index 0000000..106cf11 Binary files /dev/null and b/public/images/weixin/w10.png differ diff --git a/public/images/weixin/w11.png b/public/images/weixin/w11.png new file mode 100644 index 0000000..9750408 Binary files /dev/null and b/public/images/weixin/w11.png differ diff --git a/public/images/weixin/w9.png b/public/images/weixin/w9.png new file mode 100644 index 0000000..589bda7 Binary files /dev/null and b/public/images/weixin/w9.png differ diff --git a/resources/views/weixin/feedback/userFeedbackAdd.blade.php b/resources/views/weixin/feedback/userFeedbackAdd.blade.php new file mode 100644 index 0000000..36cdb06 --- /dev/null +++ b/resources/views/weixin/feedback/userFeedbackAdd.blade.php @@ -0,0 +1,120 @@ + +意见与反馈 + + + + +
+
返回
+
意见与反馈
+
菜单
+
+ +@include('weixin.common.headerNav') + + +
+
+问题类型： + +
+
+ + +
+ +
+ + +
+
+提交 + + + \ No newline at end of file diff --git a/resources/views/weixin/user/index.blade.php b/resources/views/weixin/user/index.blade.php index 3302cf1..2d2eeec 100644 --- a/resources/views/weixin/user/index.blade.php +++ b/resources/views/weixin/user/index.blade.php @@ -3,16 +3,14 @@ -
+
-
-
- -
+
+
-
- +
+
@@ -20,9 +18,9 @@ - +
-
+
-
+
@@ -152,13 +150,13 @@
- - +
- +
- - 领券中心 + + 地址管理
@@ -199,11 +197,11 @@
- +
- - 我的足迹 + + 推介赚钱
@@ -214,11 +212,11 @@
- +
- - 地址管理 + + 帮助中心
@@ -227,15 +225,13 @@
- - + +