Skip to content

T
tl_estate
Commit 0ca3d9f2 authored by clone's avatar clone
Browse files
Options

Merge branch 'test_0507' of https://gitee.com/zwyjjc/tl_estate into test_0507

parents bdb4f22d 1242202b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 34 deletions
application/index/controller/Member.php
View file @ 0ca3d9f2
......@@ -61,7 +61,7 @@ class Member extends Basic{
//客户手机号
if (!empty($params['phone'])) {
$where['concat(a.user_phone,a.user_nick)'] = ['like','%'.$this->params['phone'].'%'];
$where[0] = ['EXP','a.user_phone LIKE "%'.$this->params['phone'].'%" or a.user_nick LIKE "%'.$this->params['phone'].'%"'];
}
//是否公客
......
application/index/controller/Store.php
View file @ 0ca3d9f2
......@@ -43,7 +43,7 @@ class Store extends Basic
}
if (!empty($this->params['district'])) {
$where['province'] = $this->params['district'];
$where['district'] = $this->params['district'];
}
//店长姓名
......
public/app/css/achieve_temp.css
View file @ 0ca3d9f2
......@@ -296,7 +296,7 @@ p.ul_title>span{
box-sizing: border-box;
}
p.ul_title_add>span{
font-size: 0.3rem;
font-size: 0.28rem;
color: #666;
line-height: .7rem;
text-align: center;
......
public/app/dist/index.html
View file @ 0ca3d9f2
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript>!function(n,e){var t=n.documentElement,i="orientationchange" in window?"orientationchange":"resize",d=function(){var n=t.clientWidth;n&&(t.style.fontSize=n/750*100+"px")};n.addEventListener&&(e.addEventListener(i,d,!1),n.addEventListener("DOMContentLoaded",d,!1))}(document,window);</script><link href=./static/css/app.a70b828a28d595331ed4f4d528057ad5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.8ffd82b342bc2a4ca245.js></script><script type=text/javascript src=./static/js/app.50b76cb9cc7de6300620.js></script><script type=text/javascript src=./static/js/vconsole.min.js></script><script type=text/javascript>var vConsole = new VConsole();</script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript>!function(n,e){var t=n.documentElement,i="orientationchange" in window?"orientationchange":"resize",d=function(){var n=t.clientWidth;n&&(t.style.fontSize=n/750*100+"px")};n.addEventListener&&(e.addEventListener(i,d,!1),n.addEventListener("DOMContentLoaded",d,!1))}(document,window);</script><link href=./static/css/app.0777ebc6ef10681dbbea47dbab29dc9c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.8ffd82b342bc2a4ca245.js></script><script type=text/javascript src=./static/js/app.43b8e072dc482652020f.js></script><script type=text/javascript src=./static/js/vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script></body></html>
\ No newline at end of file
public/app/dist/static/js/app.43b8e072dc482652020f.js 0 → 100644
View file @ 0ca3d9f2
This diff is collapsed.
public/app/dist/static/js/app.43b8e072dc482652020f.js.map 0 → 100644
View file @ 0ca3d9f2
This diff is collapsed.
public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
View file @ 0ca3d9f2
{"version":3,"sources":["webpack:///webpack/bootstrap b0afed8b8ca9d582b075"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap b0afed8b8ca9d582b075"],"sourceRoot":""}
\ No newline at end of file
{"version":3,"sources":["webpack:///webpack/bootstrap cb35a3cac05e05d0791b"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap cb35a3cac05e05d0791b"],"sourceRoot":""}
\ No newline at end of file
public/app/js/achieve_fork.js
View file @ 0ca3d9f2
......@@ -55,9 +55,9 @@ require(['vue', 'vconsole', 'css!style/achieve_fork.css', 'jquery0325', 'common'
},
loadMain: function(){
var _this =this;
this.userLevel = localStorage.getItem('level');
this.linkAchieveYwy = 'achieve_ywy?ywyId='+localStorage.getItem('id');
this.linkAchieveQy = 'achieve_region?ywyId='+localStorage.getItem('id');
this.userLevel = localStorage.getItem('userlevel');
this.linkAchieveYwy = 'achieve_ywy?ywyId='+localStorage.getItem('userid');
this.linkAchieveQy = 'achieve_region?ywyId='+localStorage.getItem('userid');
}
}
});
......
public/app/js/achieve_region.js
View file @ 0ca3d9f2
......@@ -71,7 +71,7 @@ require(['vue', 'css!style/achieve_temp.css', 'jquery0325', 'common'], function(
methods: {
loadMain: function() {
var _this = this;
_this.userLevel = localStorage.getItem('level');
_this.userLevel = localStorage.getItem('userlevel');
_this.token = localStorage.getItem('token');
if(_this.userLevel == '30'||_this.userLevel == '40'){
_this.headerTitle = '区域业绩';
......
public/app/js/achieve_ywy.js
View file @ 0ca3d9f2
......@@ -79,7 +79,7 @@ require(['vue', 'css!style/achieve_tonglian_ac.css', 'jquery0325', 'common'], fu
methods: {
loadMain: function() {
var _this = this;
_this.userId = localStorage.getItem('id');
_this.userId = localStorage.getItem('userid');
_this.token = localStorage.getItem('token');
_this.initTime(function(start_date, end_date) {
_this.startDate = start_date;
......
public/app/js/common.js
View file @ 0ca3d9f2
......@@ -119,7 +119,16 @@ function h5PageC(token, fn) {
success: function(data) {
if(typeof data === 'object'){
if(data['code'] == '200'){
setLoginStorage(data.data, token, 'agents');
localStorage.removeItem('id');
localStorage.removeItem('phone');
localStorage.removeItem('name');
localStorage.setItem('token', data.data.token);//存储登录的token值
localStorage.setItem('userid', data.data.id);//存储用户id
localStorage.setItem('userlevel', data.data.level);//存储用户id
localStorage.setItem('userphone', data.data.phone);//存储用户名字
localStorage.setItem('username', data.data.name);//存储用户电话号码
localStorage.setItem('userinfo', encodeURIComponent(JSON.stringify(data.data)));//存储用户所有信息
fn(data);
}else{
try{
......@@ -156,10 +165,10 @@ function setLoginStorage(data, _token, _usertable){
//每次登录成功，记录下token,用户身份类别,id,level
localStorage.setItem("token",_token);//存储登录的token值
//localStorage.setItem("openid",data.device_id);
localStorage.setItem("usertable",_usertable);//存储身份类型
//localStorage.setItem("usertable",_usertable);//存储身份类型
if(_usertable === "agents"){
//不是案场人员
localStorage.setItem("level",data.level);//不是案场人员时存储身份类型
localStorage.setItem("userlevel",data.level);//不是案场人员时存储身份类型
localStorage.removeItem("roleId");
localStorage.setItem('username',data.name);//存储用户名字
}else if(_usertable === "admins"){
......
public/app/js/customer_gj.js
View file @ 0ca3d9f2
......@@ -74,7 +74,7 @@ require(['vue', 'vconsole', 'css!style/customerinfo_sub_page.css', 'css!style/cu
loadMain: function() {
var _this = this;
_this.token = localStorage.getItem('token');
_this.userid = localStorage.getItem('id');
_this.userid = localStorage.getItem('userid');
_this.userName = localStorage.getItem('username');
$.ajax({
url: ServerHostTempC + "/broker/getFollowUpList",
......
public/app/js/customerinfo_customer_add.js
View file @ 0ca3d9f2
......@@ -43,9 +43,9 @@ $(function() {
function loadMain(){
var _token = localStorage.getItem('token'),
_customerId = getUrlParam('customerId'),
_userId = localStorage.getItem('id'), //用户id
_userName = localStorage.getItem('realname'),
_userPhone = localStorage.getItem('phone'),
_userId = localStorage.getItem('userid'), //用户id
_userName = localStorage.getItem('username'),
_userPhone = localStorage.getItem('userphone'),
_kefangObj = $('#kefang'),
ulHtml = $('.list-area'),
loadItem = $("#loading_pic"),
......
public/app/js/customerinfo_details_new.js
View file @ 0ca3d9f2
......@@ -45,11 +45,11 @@ function loadMain(){
_genjinCloseBtn = $('#close_btn'),//跟进模态框关闭按钮
_btnSave = $('#btn_save'),//跟进的保存按钮
_btnSaveTemp = $('#btn_save_temp'),//跟进保存按钮临时
_userId = localStorage.getItem('id'),//当前用户id
_userId = localStorage.getItem('userid'),//当前用户id
isCallFlag = true,//是否是电话跟进，默认不是
_addPhoneBtn = $('#add_phone_btn'),//添加电话按钮
_addPhoneListObj = $('#call_modal_phone_list'),//添加电话列表对象dom
_userPhone = localStorage.getItem('phone'),//当前用户的手机号
_userPhone = localStorage.getItem('userphone'),//当前用户的手机号
_selectPhone = '',//拨号列表里选择的号码,也是当前用户对应的手机号，可能和_userPhone是一样的
_customerPhone = '',//当前客户的手机号
_backPhone = '';//绑定之后返回的号码
......@@ -84,7 +84,7 @@ function loadMain(){
_customerPhone = data['data']['user_info']['user_phone'];//当前客户手机号
$('#customer_phone').html(hideTel(data['data']['user_info']['user_phone']));
$('#call_modal_phone_self').val(_userPhone);
if(data['data']['user_info']['agent_id'] == _userId || localStorage.getItem('level') != '10'){
if(data['data']['user_info']['agent_id'] == _userId || localStorage.getItem('userlevel') != '10'){
//客方和当前登录用户一致,或者当前登录用户为店长或者总监时，才能进行编辑客户
$('.edit-icon').show();
$('.edit-btn').click(function(e){
......
public/app/js/daily_achieve_dz.js
View file @ 0ca3d9f2
......@@ -83,7 +83,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
var _this = this;
_this.token = localStorage.getItem('token');
_this.userName = localStorage.getItem('username');
_this.userId = localStorage.getItem('id');
_this.userId = localStorage.getItem('userid');
$.ajax({
type: 'POST',
url: ServerHostTempC + '/broker/dayStatement',
......
public/app/js/daily_achieve_mdzj.js
View file @ 0ca3d9f2
......@@ -80,7 +80,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
var _this = this;
_this.token = localStorage.getItem('token');
_this.userName = localStorage.getItem('username');
_this.userId = localStorage.getItem('id');
_this.userId = localStorage.getItem('userid');
$.ajax({
type: 'POST',
url: ServerHostTempC + '/broker/dayStatement',
......
public/app/js/daily_achieve_ywy.js
View file @ 0ca3d9f2
......@@ -74,7 +74,7 @@ require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jque
var _this = this;
_this.token = localStorage.getItem('token');
_this.userName = localStorage.getItem('username');
_this.userId = localStorage.getItem('id');
_this.userId = localStorage.getItem('userid');
$.ajax({
type: 'POST',
url: ServerHostTempC + '/broker/dayStatement',
......
public/app/js/details.js
View file @ 0ca3d9f2
......@@ -180,7 +180,7 @@ $(document).ready(function(e){
var id=getUrlParam("id");
var _usertable = localStorage.getItem('usertable');
if(_usertable === 'agents'){
var _level = localStorage.getItem('level');
var _level = localStorage.getItem('userlevel');
if(_level == '4' || _level == '6'){
$('#caipan_link').css("display","block");
}
......
public/app/js/weekly.js
View file @ 0ca3d9f2
......@@ -29,11 +29,11 @@ require(['vue', 'vconsole', 'css!style/weekly.css', 'jquery0325', 'common'], fun
var _this = this;
_this.dateEnd = backNowDate();
_this.dateStart = _this.countDate(_this.dateEnd, 6, 'jian');
_this.level = localStorage.getItem('level');
_this.level = localStorage.getItem('userlevel');
//如果之前有存储的用户输入数据，则打开询问框
var _mdzjZbData = localStorage.getItem('mdzjZbData') == null?'':JSON.parse(decodeURIComponent(localStorage.getItem('mdzjZbData'))); //用户输入的存储
if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('id')){
if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('userid')){
layer.open({
content: '您有未完成的内容，是否继续？',
btn: ['前往', '留在本页'],
......
public/app/js/weekly_achieve_dz.js
View file @ 0ca3d9f2
......@@ -11,7 +11,7 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
var _weekly_data = JSON.parse(decodeURIComponent(getUrlParam('weekly_data'))); //从url获取所需的参数，解码，转json格式
var _token = localStorage.getItem('token');
var _id = localStorage.getItem('id');
var _id = localStorage.getItem('userid');
var _userInfo = JSON.parse(decodeURIComponent(localStorage.getItem('userinfo'))); //用户信息
var vm = new Vue({
......
public/app/js/weekly_achieve_mdzj.js
View file @ 0ca3d9f2
......@@ -29,7 +29,7 @@ $(function() {
function loadMain() {
var _token = localStorage.getItem('token');
var _id = localStorage.getItem('id');
var _id = localStorage.getItem('userid');
var _weekly_data = JSON.parse(decodeURIComponent(getUrlParam('weekly_data'))); //从url获取所需的参数，解码，转json格式
var _sjcnObjMbsz = $('#sjcn_mb_sz');
var _sjcnObjMbxz = $('#sjcn_mb_xz');
......@@ -58,7 +58,7 @@ $(function() {
};
};
var _data = {
'userId': localStorage.getItem('id'),
'userId': localStorage.getItem('userid'),
'sjcn': {},
'zjyj': {},
'yjData': [],
......@@ -129,8 +129,8 @@ $(function() {
//读取本地存储的用户输入文字和数字
function readLocalCache(_contentFlag, _dataServer, _timeFlag) {
console.log(_mdzjZbData);
//if((_mdzjZbData || _dataServer) && _mdzjZbData['userId'] == localStorage.getItem('id')) {
if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('id')) {
//if((_mdzjZbData || _dataServer) && _mdzjZbData['userId'] == localStorage.getItem('userid')) {
if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('userid')) {
if(_timeFlag) {
//判断日期是否是对应存储的日期，如果对得上才进入下边的内容
_sjcnObjMbsz.val(_mdzjZbData['sjcn']['mbsz'] == '' ? '' : _mdzjZbData['sjcn']['mbsz']);
......
public/appnew/build/utils.js
View file @ 0ca3d9f2
......@@ -47,7 +47,8 @@ exports.cssLoaders = function (options) {
if (options.extract) {
return ExtractTextPlugin.extract({
use: loaders,
fallback: 'vue-style-loader'
fallback: 'vue-style-loader',
publicPath: '../../'
})
} else {
return ['vue-style-loader'].concat(loaders)
......
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