Skip to content

T
tl_estate
Commit 46dd5b53 authored by agping's avatar agping
Browse files
Options

app

parent 87868515
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 80 deletions
application/index/view/opensquare/opensquareLogList.html
View file @ 46dd5b53
...@@ -3,25 +3,24 @@ ...@@ -3,25 +3,24 @@
<style> <style>
/*关联商铺*/ /*关联商铺*/
.left-phone{ .left-phone{
margin-left: 10px;
width: 326px; width: 326px;
position: relative; position: relative;
} }
.user-ul-agent{ .user-ul-agent{
width: 320px; width: 326px;
height: auto; height: auto;
float: left; float: left;
position: absolute; position: absolute;
background: #fff; background: #fff;
border: .5px solid #ccc; border: .5px solid #ccc;
border-top: none; border-top: none;
left: 11px;
z-index: 999; z-index: 999;
text-align: left;
} }
.user-ul-agent li{ .user-ul-agent li{
list-style: none; list-style: none;
line-height: 30px; line-height: 30px;
margin-left: -28px; margin-left: -24px;
} }
/*关联商铺*/ /*关联商铺*/
.modal-body{ .modal-body{
...@@ -352,45 +351,6 @@ ...@@ -352,45 +351,6 @@
<!-- /#wrapper --> <!-- /#wrapper -->
<!-- /#关联商铺 --> <!-- /#关联商铺 -->
<div class="modal fade" id="modal-associatedShops" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>
<h4 class="modal-title">
关联商铺
</h4>
</div>
<div class="modal-body">
<div class="modal-body">
<div class="left-phone">
<input class="form-control ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="dish_name" placeholder="请输入商铺名称、商铺编号关键词" type="text" value="">
<ul class="user-ul-agent"></ul>
</div>
</div>
<br />
<br />
<br />
<br />
<br />
<br />
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary" id="confirm_delete">
确定
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- /#删除模态框 --> <!-- /#删除模态框 -->
<div class="modal fade" id="modal-delete" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="modal-delete" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
...@@ -477,6 +437,16 @@ ...@@ -477,6 +437,16 @@
<tr> <tr>
<td> <td>
<form class="form-horizontal" action="/agents/add_user" id=""> <form class="form-horizontal" action="/agents/add_user" id="">
<div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">关联商铺：</label>
<div class="col-sm-9">
<div class="left-phone">
<input class="form-control" data-rule-phoneus="false" data-rule-required="false" id="dish_name" placeholder="请输入商铺名称、商铺编号关键词" type="text" value="">
<ul class="user-ul-agent"></ul>
</div>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label for="inputEmail3" class="col-sm-2 control-label">标题：</label> <label for="inputEmail3" class="col-sm-2 control-label">标题：</label>
<div class="col-sm-9"> <div class="col-sm-9">
......
public/app/dist/index.html
View file @ 46dd5b53
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
if(!doc.addEventListener) return; if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false); win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false); doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.1ee47d509944001e4ab50c1176ae19f1.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.7adcfccd308be8e896dc.js></script></body></html> })(document, window);</script><link href=./static/css/app.b3c8efcd73d8ef975473c87dd0aecfb5.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.686856989799f212c215.js></script></body></html>
\ No newline at end of file \ No newline at end of file
public/app/dist/static/js/app.686856989799f212c215.js 0 → 100644
View file @ 46dd5b53
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.7adcfccd308be8e896dc.js deleted 100644 → 0
View file @ 87868515
This source diff could not be displayed because it is too large. You can view the blob instead.
public/appnew/src/components/inviteRules/shareRedEnvelope.vue
View file @ 46dd5b53
<template> <template>
<div class="con-rule"> <div class="con-rule">
<!--<header-pulic :data="headerData"></header-pulic>--> <header-pulic :data="headerData" v-if="!isShare">
<a href="javascript:;" class="icon-link icon-link-share" @click="share"></a>
</header-pulic>
<div class="bg_pic"> <div class="bg_pic">
<div class="img_con"><img :src="bg_pic" alt="" /></div> <div class="img_con"><img :src="bg_pic" alt="" /></div>
<div class="img_erweima"><img :src="C_download" alt="" /></div> <div class="img_erweima"><img :src="C_download" alt="" /></div>
...@@ -16,16 +18,40 @@ ...@@ -16,16 +18,40 @@
import C_download from '@/components/inviteRules/images/C_download@2x.png'; import C_download from '@/components/inviteRules/images/C_download@2x.png';
import '@/assets/js/layer041002.js'; import '@/assets/js/layer041002.js';
export default { export default {
data: () => ({ data() {
headerData: { let _this = this;
'title': '邀请活动规则', return {
'noborder': false, headerData: {
'isBack': false 'title': '',
}, 'noborder': false,
bg_pic, 'isBack': false
C_download },
}), isShare: _this.$route.query.share?true:false,
bg_pic,
C_download
};
},
methods: { methods: {
share() {
let _this = this;
let _url = location.href+'&share=1';
let _title = _this.$route.query.title;
let _content = "海量真实商铺，就在同联商业";
_this.common.Compatible({
paraIos: {
'route': 'shareClick',
'url': _url,
'title': _title,
'content': _content
},
fnAndroid() {
window.android.shareClick(_url, _title, _content);
},
fn() {
console.warn('error');
}
});
}
} }
} }
......
public/appnew/src/components/inviteRules/shareVideoDetails.vue
View file @ 46dd5b53
<template> <template>
<div class="con-rule"> <div class="con-rule">
<!--<header-pulic :data="headerData"></header-pulic>--> <header-pulic :data="headerData" v-if="!isShare">
<a href="javascript:;" class="icon-link icon-link-share" @click="share"></a>
</header-pulic>
<div class="bg_pic"> <div class="bg_pic">
<div class="img_erweima"><img :src="C_download" alt="" /></div> <div class="img_erweima"><img :src="C_download" alt="" /></div>
<p>识别二维码</p> <p>识别二维码</p>
...@@ -13,15 +15,39 @@ ...@@ -13,15 +15,39 @@
import C_download from '@/components/inviteRules/images/C_download@2x.png'; import C_download from '@/components/inviteRules/images/C_download@2x.png';
import '@/assets/js/layer041002.js'; import '@/assets/js/layer041002.js';
export default { export default {
data: () => ({ data() {
headerData: { let _this = this;
'title': '邀请活动规则', return {
'noborder': false, headerData: {
'isBack': false 'title': '',
}, 'noborder': false,
C_download 'isBack': false
}), },
isShare: _this.$route.query.share?true:false,
C_download
};
},
methods: { methods: {
share() {
let _this = this;
let _url = location.href+'&share=1';
let _title = _this.$route.query.title;
let _content = "海量真实商铺，就在同联商业";
_this.common.Compatible({
paraIos: {
'route': 'shareClick',
'url': _url,
'title': _title,
'content': _content
},
fnAndroid() {
window.android.shareClick(_url, _title, _content);
},
fn() {
console.warn('error');
}
});
}
} }
} }
......
public/resource/js/opensquareList.js
View file @ 46dd5b53
...@@ -20,7 +20,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde ...@@ -20,7 +20,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
is_add:1,//是否新增 is_add:1,//是否新增
switchUrl:'', switchUrl:'',
liu_iframe:'', liu_iframe:'',
agent_id_choose_p:'',
agent_id_choose:'', agent_id_choose:'',
init: function () { init: function () {
//初始化dot //初始化dot
...@@ -35,7 +34,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde ...@@ -35,7 +34,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
_doc.on("input", "#dish_name", function() { //关联商铺 显示下拉列表 _doc.on("input", "#dish_name", function() { //关联商铺 显示下拉列表
if($("#dish_name").val() == '') { if($("#dish_name").val() == '') {
user.agent_id_choose=''; user.agent_id_choose='';
user.agent_id_choose_p='';
$(".user-ul-agent").html(''); $(".user-ul-agent").html('');
} else { } else {
user.search_phone_agent(); user.search_phone_agent();
...@@ -67,6 +65,8 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde ...@@ -67,6 +65,8 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
//新增开盘 编辑开盘 //新增开盘 编辑开盘
_doc.on('click', '.new-pan', function(){ _doc.on('click', '.new-pan', function(){
//置空内容 //置空内容
$('#dish_name').val('');
user.agent_id_choose='';//置空商铺关联id
$('#announcement_title_add').val(''); $('#announcement_title_add').val('');
$('#add_city_id').val(''); $('#add_city_id').val('');
$('#add_city_id').val(''); $('#add_city_id').val('');
...@@ -206,7 +206,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde ...@@ -206,7 +206,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
_doc.on('click','.edit_modal_btn' ,function(e){//点击编辑 _doc.on('click','.edit_modal_btn' ,function(e){//点击编辑
user.announcementdel_id = $ (this).attr ("data-id"); user.announcementdel_id = $ (this).attr ("data-id");
user.is_add = 0; user.is_add = 0;
// $('#ifram-kaipan').attr('src',ServerHostImageLiu + '/index/test');
$('#ifram-kaipan').attr('src',ServerHostImageLiu + '/index/baiduText'); $('#ifram-kaipan').attr('src',ServerHostImageLiu + '/index/baiduText');
user.text_details(); user.text_details();
...@@ -229,6 +228,9 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde ...@@ -229,6 +228,9 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
if(data.code == 200) { if(data.code == 200) {
$('#dish_name').val(data.data.external_title);
user.agent_id_choose = data.data.house_id//编辑获取关联商铺id
$('#announcement_title_add').val(data.data.title); $('#announcement_title_add').val(data.data.title);
$("#add_city_id").val(data.data.site_id); $("#add_city_id").val(data.data.site_id);
$("#add_district_id").val(data.data.district_lable_id); $("#add_district_id").val(data.data.district_lable_id);
...@@ -263,7 +265,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde ...@@ -263,7 +265,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
if(data.code == 200) { if(data.code == 200) {
// console.log(555)
$(".detail-title").html(data.data.title); $(".detail-title").html(data.data.title);
$(".detail-time").html(data.data.create_time); $(".detail-time").html(data.data.create_time);
$(".detail-content").html(data.data.content); $(".detail-content").html(data.data.content);
...@@ -340,20 +341,21 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde ...@@ -340,20 +341,21 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
}, },
search_phone_agent: function() { //关联商铺 search_phone_agent: function() { //关联商铺
$.ajax({ $.ajax({
url: '/index/getAgentsTohouses', url: '/broker/getShopListByReport',
type: 'GET', type: 'GET',
async: true, async: true,
data: { data: {
"type":2, "keyword":$('#dish_name').val(),
"agent_name":$('#dish_name').val() "AuthToken": JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))).AuthToken,
"pageNo": 1,
"pageSize": 20
}, },
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
if(data.code == 200) { if(data.code == 200) {
var user_ul = ""; var user_ul = "";
$.each(data.data.data, function(i, item) { $.each(data.data, function(i, item) {
user_ul += '<li class="addphone-agent" data-id="' + item.name +'"' +'data-ids="' + item.id + '">' + item.id + '-' + item.name + '-' + item.phone + '</li>'; user_ul += '<li class="addphone-agent" data-id="' + item.id +'"' +'data-ids="' + item.id + '">' + item.title + '，ID：' + item.id + '</li>';
}); });
$(".user-ul-agent").html(user_ul); $(".user-ul-agent").html(user_ul);
...@@ -369,7 +371,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde ...@@ -369,7 +371,6 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
$("#dish_name").val(user_ht); $("#dish_name").val(user_ht);
$(".user-ul-agent").html(''); $(".user-ul-agent").html('');
user.agent_id_choose = $(obj).attr("data-id"); user.agent_id_choose = $(obj).attr("data-id");
user.agent_id_choose_p = $(obj).attr("data-ids");
}, },
add_news: function(con) { //新增开盘 编辑开盘 add_news: function(con) { //新增开盘 编辑开盘
if ($('.titleImg')) { if ($('.titleImg')) {
...@@ -381,15 +382,19 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde ...@@ -381,15 +382,19 @@ define (['doT', 'text!temp/opensquareList_template_tpl.html','ckfinder','ckfinde
} }
_data.title = $("#announcement_title_add").val(); _data.title = $("#announcement_title_add").val();
_data.site_id = $("#add_city_id").val(); //商学院标签id _data.site_id = $("#add_city_id").val(); //商学院标签id
// _data.district_id = $("#add_district_id").val(); //商学院标签id
_data.district_lable_id = $("#add_district_id").val(); //商学院标签id _data.district_lable_id = $("#add_district_id").val(); //商学院标签id
if(!pic){ if(!pic){
alert('封面图至少上传一张'); alert('封面图至少上传一张');
return return
} }
console.log(pic)
_data.cover_img = pic; //封面图 剪切后的字符串 _data.cover_img = pic; //封面图 剪切后的字符串
_data.content = con; _data.content = con;
if(!user.agent_id_choose){
alert('请选择关联商铺');
return
}else{
_data.house_id = user.agent_id_choose; //关联商铺id
}
$.ajax({ $.ajax({
url: user.switchUrl, url: user.switchUrl,
type: 'POST', type: 'POST',
......
public/resource/js/user.js
View file @ 46dd5b53
...@@ -2002,7 +2002,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -2002,7 +2002,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
//客户编辑日志 //客户编辑日志
customerEditLog: function(id) { customerEditLog: function(id) {
$.ajax({ $.ajax({
url: '/index/getUserBindHistory', url: '/index/userHistoryLog',
type: 'GET', type: 'GET',
async: true, async: true,
data: { data: {
......
public/resource/js/user_genjing_modal.js
View file @ 46dd5b53
...@@ -1321,7 +1321,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c ...@@ -1321,7 +1321,7 @@ define(['doT', 'text!temp/user_model_template_tpl.html','css!style/home.css', 'c
//客户编辑日志 //客户编辑日志
watchShopLog: function(id) { watchShopLog: function(id) {
$.ajax({ $.ajax({
url: '/index/getUserBindHistory', url: '/index/lookShopUser',
type: 'GET', type: 'GET',
async: true, async: true,
data: { data: {
......
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