李涵 / integral · 提交

转到一个项目

作者 李涵
提交 79c4ef16d081995f1bfaec2953ae2785a578cfe3 2 个父辈 8abc5aa7 dbe972ad

合并分支 'xv' 到 'master' 

Xv



查看合并请求 !11
内嵌 并排对比
正在显示 10 个修改的文件 包含 179 行增加 和 20 行删除
... ... @@ -37,6 +37,12 @@ class ZjNewsController extends AdminBaseController
if ($this->request->param()){
$arr=input('param.');
$arr['create_time']=time();
if($arr['is_sta']==1){
$num=Db::name('zj_news')->where(['is_sta'=>1,'delete_time'=>0])->count();
if ($num>=3){
$this->error('最多同时发布三条系统消息');
}
}
$add=Db::name('zj_news')->insert($arr);
if ($add){
$this->success('添加成功',url('index'));
... ... @@ -63,6 +69,12 @@ class ZjNewsController extends AdminBaseController
public function editPost(){
if ($this->request->param()){
$arr=input('param.');
if($arr['is_sta']==1){
$num=Db::name('zj_news')->where(['is_sta'=>1,'delete_time'=>0])->count();
if ($num>=3){
$this->error('最多同时发布三条系统消息');
}
}
$edit=Db::name('zj_news')->update($arr);
if ($edit){
$this->success('保存成功',url('index'));
... ... @@ -73,11 +85,17 @@ class ZjNewsController extends AdminBaseController
}
/**
* 系统消息启用禁用
* 系统消息发布状态
*/
public function sta(){
if ($this->request->param()){
$arr=input('param.');
if($arr['is_sta']==1){
$num=Db::name('zj_news')->where(['is_sta'=>1,'delete_time'=>0])->count();
if ($num>=3){
$this->error('最多同时发布三条系统消息');
}
}
$edit=Db::name('zj_news')->update($arr);
if ($edit){
$this->success('设置成功');
... ...
... ... @@ -22,7 +22,7 @@ class ZjCartController extends HomeBaseController
// $id=session('user.id');
$id=8;
$all=Db::name('zj_cart')->alias('c')->join('zj_goods g','c.gid=g.id')->join('zj_category ca','g.cid=ca.id')
->where('c.uid',$id)->field('c.id as cartid,c.gid,c.num,g.*,ca.cid as caid')->select();
->where('c.uid',$id)->where(['g.is_sta'=>'1','g.delete_time'=>'0'])->field('c.id as cartid,c.gid,c.num,g.*,ca.cid as caid')->select();
if (empty($all[0])){
$you=1;
}else{
... ...
此 diff 太大无法显示。
... ... @@ -111,7 +111,7 @@
<else>
<a href="{:url('state',array('id'=>$vo['id'],'is_sta'=>'1'))}" class="js-ajax-dialog-btn" data-msg="确定上架商品">上架</a>
</eq>
<a href="{:url('delete',array('id'=>$vo['id']))}" class="js-ajax-delete">{:lang('DELETE')}</a>
<!--<a href="{:url('delete',array('id'=>$vo['id']))}" class="js-ajax-delete">{:lang('DELETE')}</a>-->
<a href="{:url('eva',array('id'=>$vo.id))}">查看评论</a>
</td>
</tr>
... ...
... ... @@ -3,8 +3,8 @@
<body>
<div class="wrap js-check-wrap">
<ul class="nav nav-tabs">
<li><a href="{:url('index')}">分类管理</a></li>
<li class="active"><a href="{:url('add')}">添加分类</a></li>
<li><a href="{:url('index')}">系统消息列表</a></li>
<li class="active"><a href="{:url('add')}">添加系统消息</a></li>
</ul>
<div class="row margin-top-20">
<div class="col-md-6">
... ...
... ... @@ -3,9 +3,9 @@
<body>
<div class="wrap js-check-wrap">
<ul class="nav nav-tabs">
<li><a href="{:url('index')}">分类管理</a></li>
<li><a href="{:url('add')}">添加分类</a></li>
<li class="active"><a href="javascript:;">编辑分类</a></li>
<li><a href="{:url('index')}">系统消息列表</a></li>
<li><a href="{:url('add')}">添加系统消息</a></li>
<li class="active"><a href="javascript:;">编辑系统消息</a></li>
</ul>
<div class="row margin-top-20">
<div class="col-md-6">
... ...
... ... @@ -14,7 +14,7 @@
<th>标题</th>
<th>内容</th>
<th style="width: 130px;">添加时间</th>
<th style="width: 50px;">状态</th>
<th style="width: 80px;">状态</th>
<th style="width: 130px;">操作</th>
</tr>
</thead>
... ...
... ... @@ -14,7 +14,7 @@
<div class="form-group">
<label for="mobile"><span class="form-required">*</span>退款客服电话</label>
<div>
<input type="text" class="form-control" value="{$one.mobile}" id="mobile" name="mobile">
<input type="text" class="form-control" required value="{$one.mobile}" id="mobile" name="mobile">
</div>
</div>
<div class="form-group">
... ... @@ -26,7 +26,32 @@
<div class="form-group">
<label for="integral"><span class="form-required">*</span>返佣比例</label>
<div>
<input type="number" class="form-control" id="integral" value="{$one.integral}" name="integral">
<input type="number" class="form-control" required id="integral" value="{$one.integral}" name="integral">
</div>
</div>
<div class="form-group">
<label for="integral"><span class="form-required">*</span>发货人信息</label>
<div>
<div class="col-md-5">发货人：<input type="text" required style="width: 80%;display: inline-block;" class="form-control" id="name" value="{$one.name}" name="name"></div>
<div class="col-md-5">手机号：<input type="number" required style="width: 80%;display: inline-block;" class="form-control" id="fmobile" value="{$one.fmobile}" name="fmobile"></div>
</div>
</div>
<br/>
<br/>
<br/>
<div class="form-group">
<label><span class="form-required">*</span>发货地址</label><br/>
<div class="col-md-3">省：<select required class="form-control " name="province" style="width: 80%;display: inline-block;" id="province" onchange="province1(this)"></select></div>
<div class="col-md-3">市：<select required class="form-control " name="city" style="width: 80%;display: inline-block;" id="city" onchange="city1(this)"></select></div>
<div class="col-md-3">区：<select required class="form-control " name="county" style="width: 80%;display: inline-block;" id="county"></select></div>
</div>
<br/>
<br/>
<br/>
<div class="form-group">
<label for="integral"><span class="form-required">*</span>详细地址</label>
<div>
<input type="text" required class="form-control" id="place" value="{$one.place}" name="place">
</div>
</div>
</div>
... ... @@ -39,6 +64,81 @@
</div>
</div>
<script type="text/javascript" src="__STATIC__/js/admin.js"></script>
<script type="text/javascript" src="__STATIC__/js/city-picker.js"></script>
<script>
var pla=$.rawCitiesData
var ci=document.getElementById('city')
var co=document.getElementById('county')
$(function () {
var pr=document.getElementById('province')
var arr1=[];
var arr2=[];
for (i=0;i<pla.length;i++){
if (pla[i].name=="{$one.province}"){
arr1=pla[i].sub
for (l=0;l<arr1.length;l++){
if (arr1[l].name=="{$one.city}"){
arr2=arr1[l].sub
}
}
}
}
ff(pr,pla,"{$one.province}")
ff(ci,arr1,"{$one.city}")
ff(co,arr2,"{$one.county}")
})
//选择省
function province1(_this) {
var arr1=[];
for (i=0;i<pla.length;i++){
if (pla[i].name==_this.value){
arr1=pla[i].sub
}
}
rem(ci)
rem(co)
ff(ci,arr1)
}
//选择市
function city1(_this) {
var pr=document.getElementById('province')
var arr1=[];
for (i=0;i<pla.length;i++){
if (pla[i].name==pr.value){
for (l=0;l<pla[i].sub.length;l++){
if (pla[i].sub[l].name==_this.value){
arr1=pla[i].sub[l].sub
}
}
}
}
rem(co)
ff(co,arr1)
}
//添加option
function ff(_this,arr,_name) {
for(i=0;i<arr.length;i++){
var opt=document.createElement('option');
if (arr[i].name==_name){
opt.selected=true;
}
opt.text=arr[i].name;
opt.value=arr[i].name;
_this.add(opt);
}
}
//删除option
function rem(_this) {
for(i=_this.options.length-1;i>=0;i--){
_this.remove(i)
}
}
</script>
<script type="text/javascript">
//编辑器路径定义
var editorURL = GV.WEB_ROOT;
... ...
... ... @@ -271,17 +271,14 @@
$(".settle").click(function(){
var one=$('.one').filter('.icon-xuanzhong');
if (one.length>0){
data=[];
var data='';
for (i=0;i<one.length;i++){
var ii=one.eq(i).attr('data-id')
var nm=one.eq(i).attr('data-num')
data.push([ii,nm])
data+=ii+',';
}
$.ajax({
url:"{:url('')}",
type:'POST',
data:{data}
})
data=data.substr(0,data.length-1)
window.location.href="/cart/zj_cart/cart/id/"+ data +".html"
}
})
$(".see").click(function(){
... ...
... ... @@ -10,11 +10,44 @@
<link rel="stylesheet" href="__INDEX__/css/swiper.min.css">
<script type="text/javascript" src="__INDEX__/js/base.js" charset="utf-8"></script>
<title>商品详情</title>
<style>
.swiper-container{
height:7.5rem;
font-size: 0.24rem;
}
.swiper-pagination-fraction{
color:#fff;
bottom:8px;
left:3.1rem;
}
.swiper-pagination-current{
color:#fff;
font-size: 0.38rem;
}
.swiper-pagination-current{
color:#fff;
}
</style>
</head>
<body>
<div class="container">
<div class="good_head">
<img src="{$data.thumb}" alt="">
<div class="swiper-container">
<div class="swiper-wrapper">
<div class="swiper-slide">
<img src="__INDEX__/img/gooddetail.png" alt="" >
</div>
<div class="swiper-slide">
<img src="__INDEX__/img/gooddetail.png" alt="" >
</div>
<div class="swiper-slide">
<img src="__INDEX__/img/gooddetail.png" alt="" >
</div>
</div>
<div class="swiper-pagination"></div>
</div>
</div>
<div class="good_info">
<p class="good_name">
... ... @@ -95,7 +128,18 @@
</div>
</div>
<script src="__INDEX__/js/jquery.min.js"></script>
<script type="text/javascript" src="__INDEX__/js/swiper.min.js"></script>
<script>
//轮播图
var mySwiper = new Swiper('.swiper-container', {
pagination: {
el: '.swiper-pagination',
type: 'fraction',
},
autoplay: true,//可选选项，自动滑动
})
$(".good_content p").click(function(){
console.log($(this).html())
$(this).addClass("active");
... ...