admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Template_1025

Browse Source
This commit is contained in:
dengbw
2021-10-25 15:31:26 +08:00
committed by lccsw
parent bd1fb1fd77
commit 1f2174d334
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/app/material/Template.php
+7 -1
View File
@@ -150,7 +150,7 @@ class Template extends HD_Controller
$value['img'] = $value['img_url'] = '';
} else {
$value['img_url'] = $value['img'] ? build_qiniu_image_url($value['img']) : '';
$value['video_file_url'] = $value['video_url'] = $value['video_cover'] = '';
$value['video_file_url'] = $value['video_url'] = $value['video_cover'] = $value['width'] = $value['height'] = '';
}
} else if ($re['type'] == 2 || $re['type'] == 4) {
$value['img_url'] = $value['img'] ? build_qiniu_image_url($value['img']) : '';
@@ -242,6 +242,9 @@ class Template extends HD_Controller
if ($value['video_type'] == 1) {
$value['video'] = $value['video_file_url'];
unset($value['img']);
} else {
unset($value['width']);
unset($value['height']);
}
unset($value['video_file_url']);
unset($value['video_url']);
@@ -299,6 +302,9 @@ class Template extends HD_Controller
if ($value['video_type'] == 1) {
$value['video'] = $value['video_file_url'];
unset($value['img']);
} else {
unset($value['width']);
unset($value['height']);
}
unset($value['video_file_url']);
unset($value['video_url']);
admin/views/app/material/template/edit.php
+16 -1
View File
@@ -195,7 +195,18 @@
</div>
</div>
</div>
<div class="form-group" style="margin-left: 0px;margin-right: 0px;">
<div class="form-group" style="margin-left: 0px;margin-right: 0px;" v-if="json_item[1].video_type==1">
<label class="col-sm-2 control-label">宽度/高度</label>
<div class="col-sm-4">
<input type="text" class="form-control" v-model="json_item[1].width"
placeholder="请输入宽度">
</div>
<div class="col-sm-4">
<input type="text" class="form-control" v-model="json_item[1].height"
placeholder="请输入高度">
</div>
</div>
<div class="form-group" style="margin-left: 0px;margin-right: 0px;" v-else>
<label class="col-sm-2 control-label">链接</label>
<div class="col-sm-8">
<input type="text" class="form-control" v-model="json_item[1].link"
@@ -793,6 +804,8 @@
"img": "",
"img_url": "",
"link": "",
"width": "",
"height": "",
"video_type": 1,
"order_view": 50
};
@@ -827,6 +840,8 @@
video_url: that.info.video_url,
video_cover: that.info.video_cover,
video_type: that.json_item[1].video_type,
width: that.json_item[1].width,
height: that.json_item[1].height,
img: _img,
img_url: _img_url,
link: that.json_item[1].link,
api/controllers/plan/Licheb.php
+6 -2
View File
@@ -143,6 +143,7 @@ class Licheb extends HD_Controller
echo '执行到当前客户id：' . $c_id . '暂无数据';
return;
}
$this->load->library('receiver/customers_entity');
foreach ($res_c as $key => $value) {
$c_id = $value['id'];
$level = $value['level'];
@@ -158,8 +159,11 @@ class Licheb extends HD_Controller
$count >= 4 && $up_level = 'C';
}
if ($up_level) {//降级更新
$this->mdCustomers->update(array('level' => $up_level), array('id' => $c_id));
$log[] = array('id' => $c_id, 'level' => $level, 'up_level' => $up_level);
$ret = $this->mdCustomers->update(array('level' => $up_level), array('id' => $c_id));
if ($ret) {
$this->customers_entity->add_log($c_id, 0, '系统', '客户等级从' . $level . '降级到' . $up_level);
$log[] = array('id' => $c_id, 'level' => $level, 'up_level' => $up_level);
}
}
}
$redis->save($redisVisit, $c_id);//保存最后客户id
api/controllers/wxapp/material/Topic.php
+2
View File
@@ -68,6 +68,8 @@ class Topic extends Wxapp
if ($value['video_type'] == 1) {
$setValue['video'] = $value['video'] ? build_qiniu_image_url($value['video'], 0, 0, 'video') : '';
$setValue['video_cover'] = $value['video'] ? $value['video'] . '?vframe/jpg/offset/1' : '';
$setValue['width'] = $value['width'] ? $value['width'] : 16;
$setValue['height'] = $value['height'] ? $value['height'] : 9;
} else {
$setValue['img'] = $value['img'] ? build_qiniu_image_url($value['img']) : '';
$setValue['link'] = $value['link'];