Skip to content

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

Merge remote-tracking branch 'origin/test' into test

parents 4c5c3265 96239c22
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 11 deletions
public/app/dist/index.html
View file @ 48780222
<!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.d784b3dac7d6e73c7c27af97ed77d2ad.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.7992330c69a938f831d3.js></script></body></html> <!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.d784b3dac7d6e73c7c27af97ed77d2ad.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.59f8105c5ce9e4677459.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 \ No newline at end of file
public/app/dist/static/js/app.59f8105c5ce9e4677459.js 0 → 100644
View file @ 48780222
This diff is collapsed.
public/app/dist/static/js/app.59f8105c5ce9e4677459.js.map 0 → 100644
View file @ 48780222
This diff is collapsed.
public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
View file @ 48780222
{"version":3,"sources":["webpack:///webpack/bootstrap 563741ec77199dcc931b"],"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 563741ec77199dcc931b"],"sourceRoot":""} {"version":3,"sources":["webpack:///webpack/bootstrap 1ed533054904d07e4f7d"],"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 1ed533054904d07e4f7d"],"sourceRoot":""}
\ No newline at end of file \ No newline at end of file
public/appnew/src/components/achieveMain/achieveFork.vue
View file @ 48780222
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
headerData: { headerData: {
'title': '本周业绩', 'title': '本周业绩',
'noborder': true, 'noborder': true,
'isBack': true 'isBack': false
}, },
token: '', token: '',
userid: '', userid: '',
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
_this.token = localStorage.getItem('token'); _this.token = localStorage.getItem('token');
_this.userid = localStorage.getItem('userid'); _this.userid = localStorage.getItem('userid');
_this.userLevel = localStorage.getItem('userlevel'); _this.userLevel = localStorage.getItem('userlevel');
_this.linkAchieveYwy = 'achieve_ywy?ywyId=' + _this.userid; _this.linkAchieveYwy = '/app_broker/achieve_ywy?ywyId=' + _this.userid;
_this.linkAchieveQy = 'achieve_region?ywyId=' + _this.userid; _this.linkAchieveQy = '/app_broker/achieve_region?ywyId=' + _this.userid;
_this.ajaxUl(); _this.ajaxUl();
}, },
tabMain(index) { tabMain(index) {
......
public/appnew/src/components/publicEg/headPublic.vue
View file @ 48780222
...@@ -35,7 +35,18 @@ ...@@ -35,7 +35,18 @@
if(_this.data.isBack){ if(_this.data.isBack){
history.go(-1); history.go(-1);
}else{ }else{
_this.common.Compatible({
paraIos: {
'route': 'aabb',
'url': 'back'
},
fnAndroid: function() {
window.android.onBackPressed();
},
fn: function() {
console.warn('error');
}
});
} }
} }
} }
......
public/resource/js/edit.js
View file @ 48780222
...@@ -9,15 +9,15 @@ define(['ckfinder', 'ckfinderStart', 'bootstrapJs'], function() { ...@@ -9,15 +9,15 @@ define(['ckfinder', 'ckfinderStart', 'bootstrapJs'], function() {
var _objThis = this, //user对象 var _objThis = this, //user对象
_id = getUrlParam('id'), //地址栏获取的商铺或者街铺id _id = getUrlParam('id'), //地址栏获取的商铺或者街铺id
_source = getUrlParam('source'), _source = getUrlParam('source'),
_sublet_id = getUrlParam('sublet_id'); _sublet_id = getUrlParam('sublet_id'),
_doc = $(document), _doc = $(document),
_urlCut = location.origin + '/resource/lib/Attachments/images/', //要截取的部分url _urlCut = location.origin + '/resource/lib/Attachments/images/', //要截取的部分url
_loadMainItem = $('#main_loading_pic'), //整个页面的加载图标 _loadMainItem = $('#main_loading_pic'), //整个页面的加载图标
_shangpuTypeObj = $('#shangpuType'), //商铺类型 _shangpuTypeObj = $('#shangpuType'), //商铺类型
_showCdObj = $('#showCd'), //显示给C端用户看 _showCdObj = $('#showCd'), //显示给C端用户看
_exclusiveTypeObj = $('#exclusiveType'), //是否独家 _exclusiveTypeObj = $('#exclusiveType'), //是否独家
_yetaiObj = $('.yetai'), //业态 _yetaiObj = $('.yetai'), //业态
_roomTagObj = $('.roomTag'), //商铺标签 _roomTagObj, //商铺标签,初始化
//_landlordPhoneObj = $('#landlordPhone'),//房东手机号 //_landlordPhoneObj = $('#landlordPhone'),//房东手机号
_landlordPhoneObj = $('.li_landlord_phone input'), //房东手机号 _landlordPhoneObj = $('.li_landlord_phone input'), //房东手机号
_internalNameObj = $('#internalName'), //对内商铺名称 _internalNameObj = $('#internalName'), //对内商铺名称
...@@ -143,6 +143,7 @@ define(['ckfinder', 'ckfinderStart', 'bootstrapJs'], function() { ...@@ -143,6 +143,7 @@ define(['ckfinder', 'ckfinderStart', 'bootstrapJs'], function() {
success: function(data) { success: function(data) {
if(typeof data === 'object') { if(typeof data === 'object') {
var _data = data['data']; var _data = data['data'];
_roomTagObj = $('.roomTag'); //商铺标签,重新获取一次
if(data.code == 200) { if(data.code == 200) {
_objThis.upload_id = _data['upload_id']; _objThis.upload_id = _data['upload_id'];
if(_data['shop_type'] !== undefined) { if(_data['shop_type'] !== undefined) {
...@@ -246,6 +247,7 @@ define(['ckfinder', 'ckfinderStart', 'bootstrapJs'], function() { ...@@ -246,6 +247,7 @@ define(['ckfinder', 'ckfinderStart', 'bootstrapJs'], function() {
_landlordPhoneObj.val(_data['landlord_phone']); //房东手机号 _landlordPhoneObj.val(_data['landlord_phone']); //房东手机号
_internalNameObj.val(_data['internal_title']); //对内商铺名称 _internalNameObj.val(_data['internal_title']); //对内商铺名称
_zujinTypeObj.val(_data['rent_type']); //租金模式 _zujinTypeObj.val(_data['rent_type']); //租金模式
_zujinTypeObj.change();//触发change事件
_moonPriceObj.val(_data['rent_price']); //月租均价 _moonPriceObj.val(_data['rent_price']); //月租均价
_wuyePriceObj.val(_data['management_fee']); //物业管理费 _wuyePriceObj.val(_data['management_fee']); //物业管理费
_jinchangPriceObj.val(_data['slotting_fee']); //进场费（转让费） _jinchangPriceObj.val(_data['slotting_fee']); //进场费（转让费）
......
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