Skip to content

T
tl_estate
Commit b92d5d21 authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/0702-v.2.2.0' into 0702-v.2.2.0

parents ce93d946 9ae6f5e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 802 additions and 204 deletions
application/api_broker/controller/CollectHouse.php 0 → 100644
View file @ b92d5d21
<?php
namespace app\api_broker\controller;
/**
* Created by PhpStorm.
* User: zhuwei
* Date: 2018/7/4
* Time: 下午3:25
*/
use app\api_broker\extend\Basic;
use app\model\ACollectHouse;
use think\Request;
class CollectHouse extends Basic
{
protected $aCollectHouse;
public function __construct($request = null)
{
parent::__construct($request);
$this->aCollectHouse = new ACollectHouse();
}
/**
* 收藏或取消收藏商铺
* User: 朱伟
* Date: 2018-07-04
* Time: 15:35:40
*/
public function addCollectHouse(){
$params = $this->params;
/*$params = array(
"agents_id" => 1,
"house_id" => 4,
"status" => 2,
);*/
if (!isset($params["agents_id"]) or !isset($params["house_id"]) or !isset($params["status"])) {
return $this->response("101", "请求参数错误");
}
//先判断是否已经存在数据
$field = 'id,status';
$get_params['agents_id'] = $params["agents_id"];
$get_params['house_id'] = $params["house_id"];
$res = $this->aCollectHouse->getCollectHouse($field,$get_params);
if($res){//如果存在
if($res[0]['status'] != $params["status"] ){//如果存在-并且状态一致 不作处理 不一致则更新状态
$insert["id"] = $res[0]['id'];
$insert["status"] = $params["status"];
$res = $this->aCollectHouse->updateCollectHouse($insert);//int(1)
}else{
$res = true ;
}
}else{//不存在则新增数据
$insert["agents_id"] = $params['agents_id'];
$insert["house_id"] = $params['house_id'];
$insert["status"] = 1;
$res = $this->aCollectHouse->saveCollectHouse($insert);//int(1)
}
if ($res) {
return $this->response("200", "成功");
} else {
return $this->response("101", "失败");
}
}
}
\ No newline at end of file
application/api_broker/controller/CollectUser.php 0 → 100644
View file @ b92d5d21
<?php
namespace app\api_broker\controller;
/**
* Created by PhpStorm.
* User: zhuwei
* Date: 2018/7/4
* Time: 下午3:25
*/
use app\api_broker\extend\Basic;
use app\model\ACollectUser;
use think\Request;
class CollectUser extends Basic
{
protected $aCollectUser;
public function __construct($request = null)
{
parent::__construct($request);
$this->aCollectUser = new ACollectUser();
}
/**
* 收藏或取消收藏客户
* User: 朱伟
* Date: 2018-07-04
* Time: 15:35:40
*/
public function addCollectUser()
{
$params = $this->params;
/*$params = array(
"agents_id" => 2,
"user_id" => 3,
"status" => 2,
);*/
if (!isset($params["agents_id"]) or !isset($params["user_id"]) or !isset($params["status"])) {
return $this->response("101", "请求参数错误");
}
//先判断是否已经存在数据
$field = 'id,status';
$get_params['agents_id'] = $params["agents_id"];
$get_params['user_id'] = $params["user_id"];
$res = $this->aCollectUser->getCollectUser($field,$get_params);
if($res){//如果存在
if($res[0]['status'] != $params["status"] ){//如果存在-并且状态一致 不作处理 不一致则更新状态
$insert["id"] = $res[0]['id'];
$insert["status"] = $params["status"];
$res = $this->aCollectUser->updateCollectUser($insert);//int(1)
}else{
$res = true ;
}
}else{//不存在则新增数据
$insert["agents_id"] = $params['agents_id'];
$insert["user_id"] = $params['user_id'];
$insert["status"] = 1;
$res = $this->aCollectUser->saveCollectUser($insert);//int(1)
}
if ($res) {
return $this->response("200", "成功");
} else {
return $this->response("101", "失败");
}
}
}
\ No newline at end of file
application/api_broker/controller/OrderLog.php
View file @ b92d5d21
...@@ -332,8 +332,8 @@ class OrderLog extends Basic ...@@ -332,8 +332,8 @@ class OrderLog extends Basic
public function selectReportAll() public function selectReportAll()
{ {
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"order_id" => 2, "order_id" => 38024,
);*/ );*/
if (!isset($params["order_id"])) { if (!isset($params["order_id"])) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
......
application/api_broker/service/OrderLogService.php
View file @ b92d5d21
...@@ -79,7 +79,7 @@ class OrderLogService ...@@ -79,7 +79,7 @@ class OrderLogService
if ($father_id > 0) { if ($father_id > 0) {
//保存图片 //保存图片
$oImgModel = new OImg(); $oImgModel = new OImg();
$oImgModel->addImgAll($father_id,2,$transfer_img); $oImgModel->addImgAll($father_id, 2, $transfer_img);
$pushMarchIn = new PushMessageService($params["report_id"], 2); $pushMarchIn = new PushMessageService($params["report_id"], 2);
$pushMarchIn->pushMarchInMessage($params["report_id"], 2); //推送 $pushMarchIn->pushMarchInMessage($params["report_id"], 2); //推送
...@@ -283,12 +283,12 @@ class OrderLogService ...@@ -283,12 +283,12 @@ class OrderLogService
} }
//收款 //收款
$field_pay_log = "id,order_no,order_id,agent_id,agent_name,type,pay_type,money,house_number,industry_type, $field_pay_log = "id,order_no,father_id,order_id,agent_id,agent_name,type,pay_type,money,house_number,industry_type,
remark,transfer_img,real_money,source,create_time"; remark,transfer_img,real_money,source,create_time";
$payLogData = $oPayLogModel->selectPayLogByOrderNo($field_pay_log, [ "order_id" => $order_id ]); $payLogData = $oPayLogModel->selectPayLogByOrderNo($field_pay_log, [ "order_id" => $order_id ]);
if (count($payLogData) > 0) { if (count($payLogData) > 0) {
foreach ($payLogData as $k => $v) { $sortPayLogData = $this->arr2tree($payLogData);
foreach ($sortPayLogData as $k => $v) {
$v["step_name"] = "pay_log"; $v["step_name"] = "pay_log";
$v["img_path"] = CHAT_IMG_URL; $v["img_path"] = CHAT_IMG_URL;
$result[$sort++] = $v; $result[$sort++] = $v;
...@@ -321,6 +321,33 @@ class OrderLogService ...@@ -321,6 +321,33 @@ class OrderLogService
return $this->sortByTime($result); return $this->sortByTime($result);
} }
public function arr2tree($list)
{
$tree = $trees = [];
foreach ($list as $key => $item) {
if ($item["father_id"] == 0) {
$list[$key]["father_id"] = $item["id"];
}
}
foreach ($list as $value) {
$tree[$value["father_id"]][] = $value;
}
foreach ($tree as $i => $v) {
//查询图片
$oImgModel = new OImg();
$params["img_id"] = $v[0]["father_id"];
$params["img_type"] = 2;
$img_arr = $oImgModel->getImgList($params);
$trees[$i]["img"] = $img_arr;
$trees[$i]["list"] = $v;
$trees[$i]["create_time"] = $v[0]["create_time"];
}
sort($trees);
return $trees;
}
/** /**
* 查询流程 客户动态 * 查询流程 客户动态
......
application/app_broker/view/index/timeline_pc.html
View file @ b92d5d21
...@@ -32,11 +32,20 @@ ...@@ -32,11 +32,20 @@
<p v-if="item.step_name==='follow_up_log'">对面积的要求：<span>{{item.area_requirement}}</span></p> <p v-if="item.step_name==='follow_up_log'">对面积的要求：<span>{{item.area_requirement}}</span></p>
<p v-if="item.step_name==='follow_up_log'">对价格的要求：<span>{{item.price_requirement}}</span></p> <p v-if="item.step_name==='follow_up_log'">对价格的要求：<span>{{item.price_requirement}}</span></p>
<p v-if="item.step_name==='follow_up_log'">所在区域：<span>{{item.area_detail+' '+item.business_area}}</span></p> <p v-if="item.step_name==='follow_up_log'">所在区域：<span>{{item.area_detail+' '+item.business_area}}</span></p>
<p v-if="item.step_name==='pay_log'">入账类型：<span>{{switchRzType(item.type)}}</span></p> <div v-if="item.step_name==='pay_log'">
<p v-if="item.step_name==='pay_log'">支付方式：<span>{{switchPayType(item.pay_type)}}</span></p> <div class="sp-pay-log-div" v-for="(item2, idnex2) in item.list">
<p v-if="item.step_name==='pay_log'">入账金额：<span class="span-active">{{item.money}}元</span></p> <p>入账类型：<span>{{switchRzType(item2.type)}}</span></p>
<p>支付方式：<span>{{switchPayType(item2.pay_type)}}</span></p>
<p>入账金额：<span class="span-active">{{item2.money}}元</span></p>
</div>
</div>
<p v-if="item.step_name==='pay_log'">商铺号：<span class="span-active">{{item.house_number}}</span></p> <p v-if="item.step_name==='pay_log'">商铺号：<span class="span-active">{{item.house_number}}</span></p>
<p v-if="item.step_name==='pay_log'">业态/品牌：<span>{{item.industry_type}}</span></p> <p v-if="item.step_name==='pay_log'">业态/品牌：<span>{{item.industry_type}}</span></p>
<ol v-if="item.step_name==='pay_log'" class="li-img-list">
<li v-for="(item2, idnex2) in item.img">
<a href="javascript:;" data-id="item2.id"><img :src="item.img_path+item2.img_name"></a>
</li>
</ol>
<p v-if="item.step_name==='refund'">退款金额：<span class="span-active">{{item.refund_money}}元</span></p> <p v-if="item.step_name==='refund'">退款金额：<span class="span-active">{{item.refund_money}}元</span></p>
<p v-if="item.step_name==='refund'" class="yinhangka-info">退款银行卡信息</p> <p v-if="item.step_name==='refund'" class="yinhangka-info">退款银行卡信息</p>
<p v-if="item.step_name==='refund'">姓名：<span>{{item.agent_name}}</span></p> <p v-if="item.step_name==='refund'">姓名：<span>{{item.agent_name}}</span></p>
...@@ -74,4 +83,14 @@ ...@@ -74,4 +83,14 @@
<script src="/app/js/libs/require.min.js" data-js="/app/js/timeline_pc.js" data-main="/app/js/main" defer async="true"></script> <script src="/app/js/libs/require.min.js" data-js="/app/js/timeline_pc.js" data-main="/app/js/main" defer async="true"></script>
</body> </body>
</html> </html>
\ No newline at end of file
<!--
report 报备
march_in 进场
follow_up_log 跟进
pay_log 收款
refund 退款
bargain 成交报告
-->
\ No newline at end of file
application/index/controller/Collection.php
View file @ b92d5d21
...@@ -168,9 +168,9 @@ class Collection extends Basic ...@@ -168,9 +168,9 @@ class Collection extends Basic
*/ */
public function receiptImgList(){ public function receiptImgList(){
$params = $this->params; $params = $this->params;
$params = array( /*$params = array(
"id" => 6, "id" => 6,
); );*/
if(!isset($params["id"])){ if(!isset($params["id"])){
return $this->response("101","请求参数错误"); return $this->response("101","请求参数错误");
......
application/index/view/collection/getCollection.html
View file @ b92d5d21
...@@ -127,6 +127,53 @@ ...@@ -127,6 +127,53 @@
.delet-pic-btn{ .delet-pic-btn{
color:red; color:red;
} }
/*css样式*/
.img-cont{
width:1000px;
height:570px;
border:2px solid #317ef3;
margin:50px auto;
}
.img-cont>div{
width:300px;
height:260px;
border:1px solid #777;
float:left;
margin:20px 0 0 20px;
}
.img-cont>div>div{
width:300px;
height:220px;
border:1px solid red;
}
.img-cont>div>a{
width:60px;
height:30px;
border-radius:4px;
line-height: 30px;
text-align: center;
color:#fff;
display: block;
background: #317ef3;
margin:5px 0 0 0px;
cursor: pointer;
}
.hide{
display: none !important;
}
.result{
width: 600px;
}
.result>img{
width: 200px;
height: 200px;
}
/*css样式*/
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -258,10 +305,11 @@ ...@@ -258,10 +305,11 @@
<li class="list-group-item"> <li class="list-group-item">
<div class="form-group full-width-100 full-pic-area"> <div class="form-group full-width-100 full-pic-area">
<!--<label for="">详情页轮播图(至少4张)</label>--> <!--input上传图片-->
<input readonly="readonly" type="text" name="xiangqing_pic_input" class="form-control" style="display: none" id="xiangqing_pic_input" placeholder="请选择图片"> <div id="container_body">
<button class="btn btn-default upload-image-btn" id="xiangqing_pic_btn" type="button" data-limittop="20">上传图片</button> <label>请选择一个图像文件：</label>
<span class="tip"></span> <input type="file" id="file_input"/>
</div>
</div> </div>
<ul class="img-pre-ul" id="xiangqing_pic_ul"> <ul class="img-pre-ul" id="xiangqing_pic_ul">
</ul> </ul>
......
application/index/view/finance/account_statement.html
View file @ b92d5d21
...@@ -119,8 +119,7 @@ ...@@ -119,8 +119,7 @@
</select> <br /> </select> <br />
<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br> <span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
<!--<span>预计收款时间：</span><span id="bargaininfo_expect_payback_time"></span><br>--> <!--<span>预计收款时间：</span><span id="bargaininfo_expect_payback_time"></span><br>-->
<span>预计收款时间：</span><input type="date" id="bargaininfo_expect_payback_time" placeholder="请输入"> <span>预计收款时间：</span><input type="date" id="bargaininfo_expect_payback_time" placeholder="请输入"><br>
<br>
<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br> <span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
<span>成交日期：</span><span id="bargaininfo_create_time"></span><br> <span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
<span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" type="number">元 <span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" type="number">元
......
application/index/view/finance/commission.html
View file @ b92d5d21
...@@ -150,6 +150,7 @@ ...@@ -150,6 +150,7 @@
</select> <br /> </select> <br />
<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br> <span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br> <span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
<span>预计收款时间：</span><input type="date" id="bargaininfo_expect_payback_time" readonly="readonly" placeholder="请输入"><br>
<span>成交日期：</span><span id="bargaininfo_create_time"></span><br> <span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
<span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" disabled="disabled" type="number">元 <span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" disabled="disabled" type="number">元
</div> </div>
......
application/index/view/finance/tax.html
View file @ b92d5d21
...@@ -150,6 +150,7 @@ ...@@ -150,6 +150,7 @@
</select> <br /> </select> <br />
<span>商铺号：</span><span id="bargaininfo_shop_num"></span><br> <span>商铺号：</span><span id="bargaininfo_shop_num"></span><br>
<span>客户电话：</span><span id="bargaininfo_user_phone"></span><br> <span>客户电话：</span><span id="bargaininfo_user_phone"></span><br>
<span>预计收款时间：</span><input type="date" id="bargaininfo_expect_payback_time" readonly="readonly" placeholder="请输入"><br>
<span>成交日期：</span><span id="bargaininfo_create_time"></span><br> <span>成交日期：</span><span id="bargaininfo_create_time"></span><br>
<span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" disabled="disabled" type="number">元 <span>成交价：</span>&nbsp;<input class="form-control" id="bargaininfo_chengjiao_price" disabled="disabled" type="number">元
</div> </div>
......
application/index/view/news/index.html
View file @ b92d5d21
...@@ -461,4 +461,7 @@ ...@@ -461,4 +461,7 @@
<!-- /.modal-content --> <!-- /.modal-content -->
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div> </div>
\ No newline at end of file <div id="img_mask_area" title="点击任意位置可关闭">
<img />
</div>
\ No newline at end of file
application/index/view/news/new_text.html
View file @ b92d5d21
...@@ -518,4 +518,7 @@ ...@@ -518,4 +518,7 @@
<!-- /.modal-content --> <!-- /.modal-content -->
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div> </div>
\ No newline at end of file <div id="img_mask_area" title="点击任意位置可关闭">
<img />
</div>
\ No newline at end of file
application/model/ACollectHouse.php 0 → 100755
View file @ b92d5d21
<?php
namespace app\model;
use think\Db;
use think\Model;
class ACollectHouse extends Model
{
// 设置当前模型对应的完整数据表名称
protected $table = 'a_collect_house';
public function saveCollectHouse($data) {
$time = date("Y-m-d h:i:sa", time());
$data['create_time'] = $time;
$data['update_time'] = $time;
return $this->insert($data);
}
/**
* 查询数据
* 朱伟 2018-07-04
*/
public function getCollectHouse($field,$params)
{
$result = Db::table($this->table)
->field($field)
//->alias('a')
->where($params)
->select();
//dump($this->getLastSql());
return $result;
}
/**
* 更新数据
* 朱伟 2018-07-04
*/
public function updateCollectHouse($params)
{
$result = $this->update($params);
//dump($this->getLastSql());
return $result;
}
}
application/model/ACollectUser.php 0 → 100755
View file @ b92d5d21
<?php
namespace app\model;
use think\Db;
use think\Model;
class ACollectUser extends Model
{
// 设置当前模型对应的完整数据表名称
protected $table = 'a_collect_user';
public function saveCollectUser($data) {
$time = date("Y-m-d h:i:sa", time());
$data['create_time'] = $time;
$data['update_time'] = $time;
return $this->insert($data);
}
/**
* 查询数据
* 朱伟 2018-07-04
*/
public function getCollectUser($field,$params)
{
$result = Db::table($this->table)
->field($field)
//->alias('a')
->where($params)
->select();
//dump($this->getLastSql());
return $result;
}
/**
* 更新数据
* 朱伟 2018-07-04
*/
public function updateCollectUser($params)
{
$result = $this->update($params);
//dump($this->getLastSql());
return $result;
}
}
application/model/OImg.php
View file @ b92d5d21
...@@ -104,7 +104,7 @@ class OImg extends BaseModel ...@@ -104,7 +104,7 @@ class OImg extends BaseModel
* @param string $field * @param string $field
* @return false|\PDOStatement|string|\think\Collection * @return false|\PDOStatement|string|\think\Collection
*/ */
public function getImgList(array $params, string $field = "id") public function getImgList(array $params, string $field = "id,img_name")
{ {
if (isset($params["img_id"])) { if (isset($params["img_id"])) {
$where_["img_id"] = $params["img_id"]; $where_["img_id"] = $params["img_id"];
...@@ -114,13 +114,12 @@ class OImg extends BaseModel ...@@ -114,13 +114,12 @@ class OImg extends BaseModel
} }
$where_["img_status"] = 0; $where_["img_status"] = 0;
$res = $this $data = $this->db_
->field($field) ->field($field)
->where($where_) ->where($where_)
->select(); ->select();
//var_dump($this->getLastSql()); // echo $this->getLastSql();
return $res; return $data;
} }
/** /**
......
application/route.php
View file @ b92d5d21
...@@ -501,6 +501,9 @@ Route::group('broker', [ ...@@ -501,6 +501,9 @@ Route::group('broker', [
'getComment' => [ 'api_broker/news/getComment', [ 'method' => 'GET' ] ], //商学院评论列表 'getComment' => [ 'api_broker/news/getComment', [ 'method' => 'GET' ] ], //商学院评论列表
'commentNews' => [ 'api_broker/news/commentNews', [ 'method' => 'POST' ] ], //评论商学院文章 'commentNews' => [ 'api_broker/news/commentNews', [ 'method' => 'POST' ] ], //评论商学院文章
'addCollectUser' => [ 'api_broker/CollectUser/addCollectUser', [ 'method' => 'POST|GET' ] ], //监督执行列表 朱伟 2018-06-15
'addCollectHouse' => [ 'api_broker/CollectHouse/addCollectHouse', [ 'method' => 'POST|GET' ] ], //新增-监督执行 朱伟 2018-06-20
]); ]);
......
public/app/css/timeline_pc.css
View file @ b92d5d21
...@@ -129,4 +129,8 @@ body{ ...@@ -129,4 +129,8 @@ body{
} }
#main_list>li.main-li-first>.main-area>.right-area>h6{ #main_list>li.main-li-first>.main-area>.right-area>h6{
color: #ff9419; color: #ff9419;
} }
\ No newline at end of file
.sp-pay-log-div+.sp-pay-log-div{
padding-top: .3rem;
}
public/appnew/src/components/businessCollege/articleCommentLi.vue
View file @ b92d5d21
<template> <template>
<li @click="goPage"> <li>
<div class="flex"> <div class="flex">
<div class="flex"> <div class="flex">
<p>{{data.content}}</p>
<p>{{data.time}}</p>
</div>
<div class="flex-center">
<img-error :datasrc="data.img" :imgtype="'avatar'"></img-error> <img-error :datasrc="data.img" :imgtype="'avatar'"></img-error>
</div> </div>
<div>
<p>{{data.name}}</p>
<p>{{data.create_time}}</p>
<div>
<p>{{showContent}}</p>
<a class="comment-a-lookmore oh" href="javascript:;" @click="lookMore" v-show="!isLookMore"><span class="fl">查看更多</span></a>
<a class="comment-a-shouqi oh" href="javascript:;" @click="shouqi" v-show="isLookMore"><span>收起</span></a>
</div>
</div>
</div> </div>
</li> </li>
</template> </template>
...@@ -32,25 +37,31 @@ ...@@ -32,25 +37,31 @@
}, },
data: () => ({ data: () => ({
dealContent: '',
showContent: '',
isLookMore: false,
limitNumberNum: 40
}), }),
created() { created() {
let _this = this; let _this = this;
let _str = _this.data.comment_content;
let _len = _str.length;
let _lim = _this.limitNumberNum;
_this.showContent = _this.dealContent = _len>_lim ? _str.slice(0,_lim)+'...' : _str;
}, },
mounted() { mounted() {
let _this = this; let _this = this;
}, },
methods: { methods: {
goPage() { lookMore() {
let _this = this;
_this.isLookMore = true;
_this.showContent = _this.data.comment_content;
},
shouqi() {
let _this = this; let _this = this;
_this.$router.push({ _this.isLookMore = false;
path: '/articleDetail', _this.showContent = _this.dealContent;
query: {
'id': '123'
}
});
} }
}, },
computed: { computed: {
...@@ -60,34 +71,63 @@ ...@@ -60,34 +71,63 @@
</script> </script>
<style scoped> <style scoped>
li{
padding: 0 .3rem;
background-color: white;
}
li>div{ li>div{
height: 2.2rem; padding: .3rem 0;
border-bottom: 1px solid #eee;
} }
li>div>div:nth-of-type(1){ li>div>div:nth-of-type(1){
flex-direction: column; padding-right: .24rem;
justify-content: center; }
padding-right: .5rem; li>div>div:nth-of-type(1)>img{
width: .75rem;
height: .75rem;
border-radius: .375rem;
} }
li>div>div:nth-of-type(1)>p:nth-of-type(1){ li>div>div:nth-of-type(2){}
color: #343434; li>div>div:nth-of-type(2)>p:nth-of-type(1){
color: #808080;
font-size: .3rem; font-size: .3rem;
} }
li>div>div:nth-of-type(1)>p:nth-of-type(2){ li>div>div:nth-of-type(2)>p:nth-of-type(2){
color: #999; color: #808080;
font-size: .24rem; font-size: .24rem;
padding-top: .2rem; padding-top: .1rem;
}
li>div>div:nth-of-type(2)>div{
padding: .2rem 0 .2rem;
color: #1a1a1a;
position: relative;
}
.comment-a-lookmore,.comment-a-shouqi{
display: block;
line-height: .4rem;
color: #FF9419;
font-size: .26rem;
position: relative;
}
.comment-a-lookmore{
width: 1.4rem;
position: absolute;
right: 0;
bottom: .2rem;
}
.comment-a-shouqi{
text-align: right;
} }
li>div>div:nth-of-type(2){ .comment-a-lookmore::after{
content: '';
float: right;
width: .18rem;
height: .4rem;
padding-left: .18rem;
background: url(images/icon_down@2x.png) no-repeat center center/.18rem .13rem;
transform: rotate(180deg);
} }
li>div>div:nth-of-type(2)>img{ .comment-a-shouqi::after{
width: 2.2rem; content: '';
height: 1.6rem; width: .18rem;
object-fit: cover; height: .4rem;
padding-left: .36rem;
background: url(images/icon_down@2x.png) no-repeat center center/.18rem .13rem;
} }
</style> </style>
\ No newline at end of file
public/appnew/src/components/businessCollege/articleDetail.vue
View file @ b92d5d21
...@@ -2,55 +2,36 @@ ...@@ -2,55 +2,36 @@
<div> <div>
<header-pulic :data="headerData"></header-pulic> <header-pulic :data="headerData"></header-pulic>
<article> <article>
<p>示例文字示例文字示例文字</p> <div class="article-bar">
<p>示例文字示例文字示例文字</p> <h1>{{articleTitle}}</h1>
<p>示例文字示例文字示例文字</p> <p>{{articleTime}}</p>
<p>示例文字示例文字示例文字</p> </div>
<p>示例文字示例文字示例文字</p> <div v-html="articleContent">{{articleContent}}</div>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
<p>示例文字示例文字示例文字</p>
</article> </article>
<div class="list-commnet-area"> <div class="list-commnet-area">
<h2>最新评论</h2> <h2>最新评论</h2>
<ul> <pagination-load :canload="!isStop" :distance="10" @load="getCommentList">
<!--<li is="self-defined-li" v-for="(item2, index2) in item.dataList" :data="item2" :dataindex="index2"></li>--> <ul>
</ul> <li is="self-defined-li" v-for="(item, index) in commentDataList" :data="item" :dataindex="index"></li>
</ul>
</pagination-load>
<div class="loading-gif-block" v-show="isLoading">正在加载...</div>
<div class="no-data-block" v-if="noDataFlag">暂无数据</div>
<div class="no-more-block" v-if="!noDataFlag&&isStop">没有更多了...</div>
</div> </div>
<div class="comment-area-seat"></div>
<div class="txt-comment-area" v-show="isCommentingFlag"> <div class="txt-comment-area" v-show="isCommentingFlag">
<div> <div class="mask-comment-area" @click="isCommentingFlag = false"></div>
<div class="real-comment-area">
<div class="flex-center"> <div class="flex-center">
<textarea v-model="commentContent"></textarea> <textarea v-model="commentContent"></textarea>
</div> </div>
<div class="oh"> <div class="oh">
<a class="fl flex-center" href="javascript:;" @click="isCommentingFlag = false">取消</a> <a class="fl flex-center" href="javascript:;" @click="isCommentingFlag = false">取消</a>
<a class="fr flex-center" href="javascript:;" @click="commentSend">发送</a> <a class="fr flex-center" href="javascript:;" @click="commentSend" v-show="!isSending">发送</a>
<a class="fr flex-center" href="javascript:;" v-show="isSending">发送ing</a>
</div> </div>
</div> </div>
</div> </div>
...@@ -83,23 +64,76 @@ ...@@ -83,23 +64,76 @@
'pagination-load': paginationLoad, 'pagination-load': paginationLoad,
'self-defined-li': selfDefinedLi 'self-defined-li': selfDefinedLi
}, },
data: () => ({ data() {
headerData: {
'title': '文章详情',
'noborder': false,
'isBack': true
},
commentIcon,
isCommentingFlag: false,
commentContent: ''
}),
created() {
let _this = this; let _this = this;
return {
headerData: {
'title': '文章详情',
'noborder': false,
'isBack': true
},
articleId: _this.$route.query.id,
token: localStorage.getItem('token'),
articleTitle: '',
articleTime: '',
articleContent: '',
commentIcon,
isCommentingFlag: false,//是否正在写评论
commentContent: '',//评论的内容
isSending: false,//是否正在提交评论
isStop: false,
isLoading: false,
noDataFlag: false,
pageSize: 10,
page: 1,
commentDataList: []
};
}, },
mounted() { created() {
let _this = this; let _this = this;
_this.common.duringRequest({
'urlStr': '/broker/getComment',
startAction() {
_this.isLoading = true;
},
endAction() {
_this.isLoading = false;
}
},{
'urlStr': '/broker/commentNews',
startAction() {
_this.isSending = true;
},
endAction() {
_this.isSending = false;
}
});
_this.axios({
method: 'get',
url: '/broker/getNewsInfo',
responseType: 'json',
data: {
'id': _this.articleId,
'AuthToken': _this.token
}
})
.then(function(response) {
if(response.data.code == 200) {
let _news = response.data.data.news;
_this.articleTitle = _news.title;
_this.articleTime = _news.create_time;
_this.articleContent = _news.content;
} else {
layer.tipsX(response.data.msg);
}
})
.catch(function(error) {
layer.tipsX(error);
});
//获取评论列表
_this.getCommentList();
}, },
methods: { methods: {
commentSend() { commentSend() {
...@@ -108,8 +142,70 @@ ...@@ -108,8 +142,70 @@
if(_len<100 || _len>500){ if(_len<100 || _len>500){
layer.tipsX('评论字数需在100~500之间，当前字数为'+_len); layer.tipsX('评论字数需在100~500之间，当前字数为'+_len);
}else{ }else{
_this.isCommentingFlag = false; _this.axios({
method: 'POST',
url: '/broker/commentNews',
responseType: 'json',
data: {
'content': _this.commentContent,
'news_id': _this.articleId,
'AuthToken': _this.token
}
})
.then(function(response) {
if(response.data.code == 200) {
_this.resetCommentList();
_this.getCommentList();
_this.isCommentingFlag = false;
} else {
layer.tipsX(response.data.msg);
}
})
.catch(function(error) {
layer.tipsX(error);
});
} }
},
getCommentList() {
let _this = this;
_this.axios({
method: 'get',
url: '/broker/getComment',
responseType: 'json',
data: {
'pageNo': _this.page,
'pageSize': _this.pageSize,
'news_id': _this.articleId,
'AuthToken': _this.token
}
})
.then(function(response) {
if(response.data.code == 200) {
let _list = response.data.data;
if(Array.isArray(_list)){
if(_list.length === 0) {
_this.page === 1 && (_this.noDataFlag = true);
_this.isStop = true;
} else {
_this.commentDataList.push(..._list); //这里使用push要注意，先把数组展开
_list.length < _this.pageSize && (_this.isStop = true);
_this.page++;
};
};
} else {
layer.tipsX(response.data.msg);
}
})
.catch(function(error) {
layer.tipsX(error);
});
},
resetCommentList() {
//重置评论列表的内容
let _this = this;
_this.commentDataList = [];
_this.page = 1;
_this.noDataFlag = false;
} }
}, },
computed: { computed: {
...@@ -119,6 +215,36 @@ ...@@ -119,6 +215,36 @@
</script> </script>
<style scoped> <style scoped>
article,.list-commnet-area{
background-color: white;
padding: .3rem;
}
article{
}
.article-bar>h1{
font-size: .4rem;
color: #1a1a1a;
}
.article-bar>p{
font-size: .3rem;
color: #999;
}
.article-bar+div{
padding-top: .3rem;
}
.list-commnet-area{
margin-top: .2rem;
}
.list-commnet-area>h2{
font-size: .32rem;
color: #1a1a1a;
}
.comment-area-seat{
height: .98rem;
}
.btn-comment-area{ .btn-comment-area{
position: fixed; position: fixed;
bottom: 0; bottom: 0;
...@@ -148,7 +274,11 @@ ...@@ -148,7 +274,11 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.txt-comment-area>div{ .mask-comment-area{
width: 100%;
height: 100%;
}
.real-comment-area{
position: fixed; position: fixed;
left: 0; left: 0;
bottom: 0; bottom: 0;
...@@ -156,20 +286,20 @@ ...@@ -156,20 +286,20 @@
height: 2.6rem; height: 2.6rem;
background-color: #f4f4f4; background-color: #f4f4f4;
} }
.txt-comment-area>div>div:nth-of-type(1){ .real-comment-area>div:nth-of-type(1){
height: 1.8rem; height: 1.8rem;
} }
.txt-comment-area>div>div:nth-of-type(1)>textarea{ .real-comment-area>div:nth-of-type(1)>textarea{
width: 6.86rem; width: 6.86rem;
height: 1.4rem; height: 1.4rem;
border: #1px solid #e0e0e0; border: #1px solid #e0e0e0;
border-radius: .1rem; border-radius: .1rem;
background-color: white; background-color: white;
} }
.txt-comment-area>div>div:nth-of-type(2){ .real-comment-area>div:nth-of-type(2){
padding: 0 .3rem; padding: 0 .3rem;
} }
.txt-comment-area>div>div:nth-of-type(2)>a{ .real-comment-area>div:nth-of-type(2)>a{
box-sizing: border-box; box-sizing: border-box;
width: 1.2rem; width: 1.2rem;
height: .6rem; height: .6rem;
...@@ -178,8 +308,12 @@ ...@@ -178,8 +308,12 @@
color: #999; color: #999;
border: 1px solid #e0e0e0; border: 1px solid #e0e0e0;
} }
.txt-comment-area>div>div:nth-of-type(2)>a:nth-of-type(2){ .real-comment-area>div:nth-of-type(2)>a:nth-of-type(2){
background-color: #FA903F; background-color: #FA903F;
color: white; color: white;
} }
.real-comment-area>div:nth-of-type(2)>a:nth-of-type(3){
background-color: #999;
color: white;
}
</style> </style>
\ No newline at end of file
public/appnew/src/components/businessCollege/articleList.vue
View file @ b92d5d21
...@@ -3,24 +3,25 @@ ...@@ -3,24 +3,25 @@
<header-pulic :data="headerData"></header-pulic> <header-pulic :data="headerData"></header-pulic>
<nav> <nav>
<div class="nav-main"> <div class="nav-main">
<ul :style="'width: '+ulWid+'rem'"> <ul class="oh" :style="'width: '+ulWid+'rem'">
<li v-for="(item, index) in mainData" :key="item.labelName" :data-id="item.id" :class="{active:index === initTabNumMain}" @click="tabMain(index)">{{item.labelName}}</li> <li v-for="(item, index) in mainData" :key="item.labelName" :data-id="item.id" class="pointer-click-item" :class="{active:index === initTabNumMain}" @click="tabMain(index)">{{item.labelName}}</li>
</ul> </ul>
<div class="nav-bg-right"></div>
</div> </div>
<div class="nav-seat"></div> <div class="nav-seat"></div>
</nav> </nav>
<main> <main>
<section v-for="(item, index) in mainData"> <section v-for="(item, index) in mainData" v-show="index === initTabNumMain">
<pagination-load :canload="!isStop" :distance="10" @load="getLoad"> <pagination-load :canload="!item.isStop" :distance="30" @load="getList">
<ul> <ul>
<li is="self-defined-li" v-for="(item2, index2) in item.dataList" :data="item2" :dataindex="index2"></li> <li is="self-defined-li" v-for="(item2, index2) in item.dataList" :data="item2" :dataindex="index2"></li>
</ul> </ul>
</pagination-load> </pagination-load>
<div class="no-data-block" v-if="noDataFlag">暂无数据</div> <div class="no-data-block" v-show="item.noDataFlag">暂无数据</div>
<div class="no-more-block" v-if="!noDataFlag&&isStop">没有更多了...</div> <div class="no-more-block" v-show="!item.noDataFlag&&item.isStop">没有更多了...</div>
<div class="loading-gif-block" v-show="isLoading">正在加载...</div>
</section> </section>
</main> </main>
<div class="loading-gif-block" v-show="isLoading">正在加载...</div>
</div> </div>
</template> </template>
...@@ -46,31 +47,67 @@ ...@@ -46,31 +47,67 @@
'pagination-load': paginationLoad, 'pagination-load': paginationLoad,
'self-defined-li': selfDefinedLi 'self-defined-li': selfDefinedLi
}, },
data: () => ({ data() {
headerData: {
'title': '商学院',
'noborder': true,
'isBack': false
},
ulWid: 6.9,
initTabNumMain: 0,
isStop: false,
isLoading: false,
noDataFlag: false,
mainData: []
}),
created() {
let _this = this; let _this = this;
_this.getLabel(()=>{ let _token = _this.$route.query.token;
console.log(99); if(!_token) {
_this.getPageList(); layer.tipsX('token获取出错');
}) return false;
};
return {
headerData: {
'title': '商学院',
'noborder': true,
'isBack': false
},
token: _token,
ulWid: 6.9,
pageSize: 10,
initTabNumMain: 0,
isLoading: false,//是否正在加载
mainData: [{
'dataList': [],
'id': 0,
'page': 1,//页码
'isLoadOnce': false,//是否请求过一次数据
'isStop': false,//是否所有页的数据加载完毕
'noDataFlag': false,//是否是无数据
'labelName': '全部'
}]
}
}, },
mounted() { created() {
let _this = this; let _this = this;
_this.common.duringRequest({
'urlStr': '/broker/business_school',
startAction() {
_this.isLoading = true;
},
endAction() {
_this.isLoading = false;
}
});
_this.common.h5PageC(_this.token, () => {
_this.loadMain();
});
}, },
methods: { methods: {
loadMain() {
let _this = this;
_this.token = localStorage.getItem('token');
_this.getLabel(()=>{
_this.getList();
});
},
tabMain(index) {
let _this = this;
_this.initTabNumMain = index;
if(!_this.mainData[index].isLoadOnce) {
_this.getList();
};
},
getLabel(fn) { getLabel(fn) {
let _this = this; let _this = this;
_this.axios({ _this.axios({
...@@ -78,7 +115,7 @@ ...@@ -78,7 +115,7 @@
url: '/broker/getNewsLabel', url: '/broker/getNewsLabel',
responseType: 'json', responseType: 'json',
data: { data: {
'AuthToken': _this.$route.query.token, 'AuthToken': _this.token,
} }
}) })
.then(function(response) { .then(function(response) {
...@@ -87,12 +124,17 @@ ...@@ -87,12 +124,17 @@
let _len = _data.length; let _len = _data.length;
for(let i = 0;i<_len;i++){ for(let i = 0;i<_len;i++){
_this.mainData.push({ _this.mainData.push({
'isLoadOnce': false,
'dataList': [], 'dataList': [],
'id': _data[i].id, 'id': _data[i].id,
'page': 1,//页码
'isLoadOnce': false,//是否请求过一次数据
'isStop': false,//是否所有页的数据加载完毕
'noDataFlag': false,//是否是无数据
'labelName': _data[i].label_name 'labelName': _data[i].label_name
}); });
}; };
_this.ulWid = (_len*1.6>_this.ulWid)?(_len*1.6):_this.ulWid; _this.ulWid = ((_len+1)*1.6>_this.ulWid)?((_len+1)*1.6):_this.ulWid;
fn && fn(); fn && fn();
} else { } else {
layer.tipsX(response.data.msg); layer.tipsX(response.data.msg);
...@@ -102,36 +144,43 @@ ...@@ -102,36 +144,43 @@
layer.tipsX(error); layer.tipsX(error);
}); });
}, },
getPageList() { getList() {
let _this = this; let _this = this;
_this.axios({ let _index = _this.initTabNumMain;
method: 'get', if(!_this.isLoading && !_this.mainData[_index].isStop) {
//url: '/broker/business_school', _this.axios({
url: 'http://c.tonglianjituan.com/broker/business_school', method: 'get',
responseType: 'json', url: '/broker/business_school',
data: { responseType: 'json',
'AuthToken': _this.$route.query.token, data: {
'pageNo': 1, 'AuthToken': _this.token,
'pageSize': 1000 'pageNo': _this.mainData[_index].page,
} 'pageSize': _this.pageSize,
}) 'label_id': _index
.then(function(response) { }
if(response.data.code == 200) { })
let _data = response.data.data; .then(function(response) {
_this.mainData[_index].isLoadOnce = true;
} else { if(response.data.code == 200) {
layer.tipsX(response.data.msg); let _list = response.data.data.list;
} if(Array.isArray(_list)){
}) if(_list.length === 0) {
.catch(function(error) { _this.mainData[_index].page === 1 && (_this.mainData[_index].noDataFlag = true);
layer.tipsX(error); _this.mainData[_index].isStop = true;
}); } else {
}, _this.mainData[_index].dataList.push(..._list); //这里使用push要注意，先把数组展开
tabMain() { _list.length < _this.pageSize && (_this.mainData[_index].isStop = true);
_this.mainData[_index].page += 1;
}, };
getLoad() { };
} else {
layer.tipsX(response.data.msg);
}
})
.catch(function(error) {
layer.tipsX(error);
});
};
} }
}, },
computed: { computed: {
...@@ -145,9 +194,8 @@ ...@@ -145,9 +194,8 @@
width: 7.5rem; width: 7.5rem;
} }
nav>.nav-main { nav>.nav-main {
box-sizing: border-box;
background-color: white; background-color: white;
width: 7.5rem; width: 6.9rem;
height: .9rem; height: .9rem;
line-height: .9rem; line-height: .9rem;
padding: 0 .3rem; padding: 0 .3rem;
...@@ -160,6 +208,14 @@ ...@@ -160,6 +208,14 @@
nav>.nav-main>ul{ nav>.nav-main>ul{
/*width: 10rem;*/ /*width: 10rem;*/
} }
nav>.nav-main>.nav-bg-right{
position: fixed;
right: 0;
top: .88rem;
width: .8rem;
height: .9rem;
background: url(images/img_more@2x.png) repeat-y center center/.8rem .27rem;
}
nav>.nav-seat { nav>.nav-seat {
height: .9rem; height: .9rem;
} }
......
public/appnew/src/components/businessCollege/articleListLi.vue
View file @ b92d5d21
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<li @click="goPage"> <li @click="goPage">
<div class="flex"> <div class="flex">
<div class="flex"> <div class="flex">
<p>{{data.content}}</p> <p>{{data.title}}</p>
<p>{{data.time}}</p> <p>{{data.create_time}}</p>
</div> </div>
<div class="flex-center"> <div class="flex-center">
<img-error :datasrc="data.img" :imgtype="'avatar'"></img-error> <img-error :datasrc="data.cover_plan" :imgtype="'div'"></img-error>
</div> </div>
</div> </div>
</li> </li>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
_this.$router.push({ _this.$router.push({
path: '/articleDetail', path: '/articleDetail',
query: { query: {
'id': '123' 'id': _this.data.id
} }
}); });
} }
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
padding-right: .5rem; padding-right: .5rem;
flex: 1;
} }
li>div>div:nth-of-type(1)>p:nth-of-type(1){ li>div>div:nth-of-type(1)>p:nth-of-type(1){
color: #343434; color: #343434;
...@@ -83,7 +84,7 @@ ...@@ -83,7 +84,7 @@
padding-top: .2rem; padding-top: .2rem;
} }
li>div>div:nth-of-type(2){ li>div>div:nth-of-type(2){
flex: 2.2rem 0 0;
} }
li>div>div:nth-of-type(2)>img{ li>div>div:nth-of-type(2)>img{
width: 2.2rem; width: 2.2rem;
......
public/appnew/src/components/publicEg/errorImg.vue
View file @ b92d5d21
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
}, },
imgtype: { imgtype: {
type: String, type: String,
default: () => 'avatar' default: () => 'div'
} }
}, },
data() { data() {
......
public/resource/js/commission.js
View file @ b92d5d21
...@@ -472,6 +472,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_s ...@@ -472,6 +472,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_s
$("#bargaininfo_type").val(data.data.trade_type); $("#bargaininfo_type").val(data.data.trade_type);
$("#bargaininfo_total_commission").val(data.data.commission); $("#bargaininfo_total_commission").val(data.data.commission);
$("#bargaininfo_create_time").html(data.data.create_time); $("#bargaininfo_create_time").html(data.data.create_time);
$("#bargaininfo_expect_payback_time").val(data.data.estimated_receipt_date);
$("#bargaininfo_yetai").val(data.data.industry_type); $("#bargaininfo_yetai").val(data.data.industry_type);
$("#bargaininfo_chengjiao_price").val(data.data.price); $("#bargaininfo_chengjiao_price").val(data.data.price);
......
public/resource/js/getCollection.js
View file @ b92d5d21
This diff is collapsed.
public/resource/js/reportList.js
View file @ b92d5d21
...@@ -450,7 +450,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -450,7 +450,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
$("#bargaininfo_type").val(data.data.trade_type); $("#bargaininfo_type").val(data.data.trade_type);
$("#bargaininfo_total_commission").val(data.data.commission); $("#bargaininfo_total_commission").val(data.data.commission);
$("#bargaininfo_create_time").html(data.data.create_time); $("#bargaininfo_create_time").html(data.data.create_time);
$("#bargaininfo_expect_payback_time").html(data.data.payback_time); $("#bargaininfo_expect_payback_time").val(data.data.estimated_receipt_date);
$("#bargaininfo_yetai").val(data.data.industry_type); $("#bargaininfo_yetai").val(data.data.industry_type);
$("#bargaininfo_chengjiao_price").val(data.data.price); $("#bargaininfo_chengjiao_price").val(data.data.price);
...@@ -490,7 +490,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s ...@@ -490,7 +490,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
'trade_type': $('#bargaininfo_type').val(), 'trade_type': $('#bargaininfo_type').val(),
'industry_type': $.trim($('#bargaininfo_yetai').val()), 'industry_type': $.trim($('#bargaininfo_yetai').val()),
'price': $('#bargaininfo_chengjiao_price').val(), 'price': $('#bargaininfo_chengjiao_price').val(),
'payback_time': $('#bargaininfo_expect_payback_time').val(), 'estimated_receipt_date': $('#bargaininfo_expect_payback_time').val(),
'step': bargain.mainTabIndex+1 'step': bargain.mainTabIndex+1
}; };
......
public/resource/js/schoolBusiness.js
View file @ b92d5d21
...@@ -487,7 +487,7 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde ...@@ -487,7 +487,7 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde
// 封面图一张 // 封面图一张
if(_data['cover_plan']){ if(_data['cover_plan']){
_imgUploadLiebiao.html('<li><img title="点击查看大图" src="{0}" /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({ _imgUploadLiebiao.html('<li><img title="点击查看大图" src="{0}" /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
'0': _urlCut + _data['cover_plan'] '0': _data['cover_plan']
})); }));
}; };
// 封面图一张 // 封面图一张
...@@ -532,15 +532,15 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde ...@@ -532,15 +532,15 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde
var _data = {}; var _data = {};
//字符串形式 传过去 //字符串形式 传过去
$.each(_liebiaoPicObj, function(i, item) { // $.each(_liebiaoPicObj, function(i, item) {
_data['file_img[' + i + ']'] = item.src.replace(_urlCut, ''); // _data['file_img'] = item.src.replace(_urlCut, '');
// _data['file_img[' + i + ']'] = item.src; //// _data['file_img[' + i + ']'] = item.src;
//
}); // });
_data.title = $("#announcement_title").val(); _data.title = $("#announcement_title").val();
_data.title2 = $("#district_id2").val();//商学院标签id _data.s_label_id = $("#district_id2").val();//商学院标签id
// _data.file_img = _liebiaoPicObj[0].src.replace(_urlCut, '');//封面图 剪切后的字符串 _data.file_img = _liebiaoPicObj[0].src.replace(_urlCut, '');//封面图 剪切后的字符串
_data.content = _dajiangtangVal; _data.content = _dajiangtangVal;
// if (params.title == '') { // if (params.title == '') {
// alert('标题不能为空'); // alert('标题不能为空');
......
public/resource/js/tax.js
View file @ b92d5d21
...@@ -468,6 +468,7 @@ define(['doT', 'text!temp/tax_template_tpl.html', 'text!temp/reportList_shuiFee2 ...@@ -468,6 +468,7 @@ define(['doT', 'text!temp/tax_template_tpl.html', 'text!temp/reportList_shuiFee2
$("#bargaininfo_type").val(data.data.trade_type); $("#bargaininfo_type").val(data.data.trade_type);
$("#bargaininfo_total_commission").val(data.data.commission); $("#bargaininfo_total_commission").val(data.data.commission);
$("#bargaininfo_create_time").html(data.data.create_time); $("#bargaininfo_create_time").html(data.data.create_time);
$("#bargaininfo_expect_payback_time").val(data.data.estimated_receipt_date);
$("#bargaininfo_yetai").val(data.data.industry_type); $("#bargaininfo_yetai").val(data.data.industry_type);
$("#bargaininfo_chengjiao_price").val(data.data.price); $("#bargaininfo_chengjiao_price").val(data.data.price);
......
public/resource/js/user.js
View file @ b92d5d21
...@@ -399,9 +399,9 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', ' ...@@ -399,9 +399,9 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
var params = {}; var params = {};
// 增加客户id的搜索 客户姓名和手机号搜索分开 // 增加客户id的搜索 客户姓名和手机号搜索分开
// params.name = $("input[name='user']").val(); params.user_nick = $("input[name='user']").val();
// params.phone = $("input[name='phone']").val(); params.phone = $("input[name='phone']").val();
// params.nameID = $("input[name='nameID']").val(); params.id = $("input[name='userID']").val();
params.phone = $("input[name='phone']").val(); params.phone = $("input[name='phone']").val();
params.invite_phone = $("input[name='invite_phone']").val(); params.invite_phone = $("input[name='invite_phone']").val();
params.start_date = $("#start_date").val(); params.start_date = $("#start_date").val();
......
public/resource/template/schoolBusiness_template_tpl.html
View file @ b92d5d21
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</td> </td>
<!--<td>[%= it[item]["label_name"] %]</td>--> <!--<td>[%= it[item]["label_name"] %]</td>-->
<!--没有评论数字段--> <!--没有评论数字段-->
<td>[%= it[item]["create_time"] %]</td> <td>[%= it[item]["comment_number"] %]</td>
<td> <td>
<a class="btn1 btn-success" href="new_text.html?id=[%= it[item]["id"] %]" data-createTime='[%= it[item]["create_time"] %]' data-title='[%= it[item]["title"] %]' data-id='[%= it[item]["id"] %]' data-content='[%= it[item]["content"] %]' target="_blank"> <a class="btn1 btn-success" href="new_text.html?id=[%= it[item]["id"] %]" data-createTime='[%= it[item]["create_time"] %]' data-title='[%= it[item]["title"] %]' data-id='[%= it[item]["id"] %]' data-content='[%= it[item]["content"] %]' target="_blank">
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</a> </a>
[% if(check_auth('index/delNews')) { %] [% if(check_auth('index/delNews')) { %]
<!--删除权限--> <!--删除权限-->
<a class="btn1 btn-success announcement-del" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"] %]'>删除</a> <a class="btn1 btn-danger announcement-del" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"] %]'>删除</a>
[% } %] [% } %]
</td> </td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment