Skip to content

T
tl_estate
Commit 8591ec67 authored by agping's avatar agping
Browse files
Options

商铺列表 优化

parent 373ee1d1
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 10 deletions
public/app/dist/index.html
View file @ 8591ec67
......@@ -23,4 +23,4 @@
if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.4163fb48f556a91cddcdbb7d6a131d9f.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.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.08746a611266f49c81e9.js></script></body></html>
\ No newline at end of file
})(document, window);</script><link href=./static/css/app.61eaa290fa09b9d6b97a9a74c20ae6df.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.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.6394b6f3dc39cf9757d1.js></script></body></html>
\ No newline at end of file
public/app/dist/static/js/app.08746a611266f49c81e9.js deleted 100644 → 0
View file @ 373ee1d1
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.08746a611266f49c81e9.js.map deleted 100644 → 0
View file @ 373ee1d1
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.6394b6f3dc39cf9757d1.js 0 → 100644
View file @ 8591ec67
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.6394b6f3dc39cf9757d1.js.map 0 → 100644
View file @ 8591ec67
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
View file @ 8591ec67
{"version":3,"sources":["webpack:///webpack/bootstrap b3c3b95720f57b988294"],"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 b3c3b95720f57b988294"],"sourceRoot":""}
\ No newline at end of file
{"version":3,"sources":["webpack:///webpack/bootstrap 46f411ec3655fc948904"],"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 46f411ec3655fc948904"],"sourceRoot":""}
\ No newline at end of file
public/appnew/src/components/shop/shopList.vue
View file @ 8591ec67
......@@ -388,6 +388,7 @@
_this.ajax_rent_price_end = parseIntStart*10000;
};
}else{
_this.initMoreNumRent = 1;
var parseIntEnd = parseInt(rent[1]);
_this.ajax_rent_price_start = parseIntStart*10000;
_this.ajax_rent_price_end = parseIntEnd*10000;
......@@ -402,7 +403,6 @@
if(item == '全部'){
_this.arrShop=[];
}
console.log( _this.arrShop);
var _shopIndex =_this.arrShop.indexOf(item);
if(_shopIndex > -1){
_this.arrShop.splice(_shopIndex, 1);
......@@ -434,7 +434,10 @@
_this.initTabNumRent = 0;
_this.ajax_rent_price_start = '';
_this.ajax_rent_price_end = '';
_this.initMoreNum = 0;
_this.initMoreNumRent = 0;
_this.arrShop = ['全部'];
_this.ajaxShopSign = '';
},
saveMore(){
let _this = this;
......
public/appnew/src/components/shopSearch/shopSearchList.vue
View file @ 8591ec67
......@@ -15,10 +15,10 @@
取消
</div>
<div class="nav-main-choose" v-show="isShowChoose == 1">
<div v-for="(item, index) in mainDataChoose" :key="item.title" :class="{active:index === initTabNumMainChoose}" @click="tabMainChoose(index)">
<div v-for="(item, index) in mainDataChoose" :key="item.title" :class="{active:((index === initTabNumMainChoose) || (lableColorArr[index]))}" @click="tabMainChoose(index)">
{{item.title}}
<img :src="icon_down02" v-show="index === initTabNumMainChoose" class="icon-select-img"/>
<img :src="icon_down" v-show="!(index === initTabNumMainChoose)" class="icon-select-img"/>
<img :src="icon_down02" v-show="((index === initTabNumMainChoose) || (lableColorArr[index]))" class="icon-select-img"/>
<img :src="icon_down" v-show="!((index === initTabNumMainChoose) || (lableColorArr[index]))" class="icon-select-img"/>
</div>
</div>
<div class="nav-seat"></div>
......@@ -135,6 +135,7 @@
ajax_input_value:'',
isShowChoose:0,
arrShop: ['全部'],
lableColorArr: [0,0,0,0],
mainDataChoose:[{
'title': '区域',
'isShow': false,
......@@ -223,7 +224,7 @@
if(_list.length === 0) {
_this.mainData[_index].page === 1 && (_this.mainData[_index].noDataFlag = true);
_this.mainData[_index].isStop = true;
_this.isShowChoose = 0;
// _this.isShowChoose = 0;
} else {
_this.isShowChoose = 1;
_this.mainData[_index].dataList.push(..._list); //这里使用push要注意，先把数组展开
......@@ -283,8 +284,12 @@
_this.ajaxYeTai = yetai
if(_this.ajaxYeTai == '全部'){
_this.mainDataChoose[_this.initTabNumMainChoose].title = '业态';
_this.lableColorArr[_this.initTabNumMainChoose] = 0;
}else{
_this.mainDataChoose[_this.initTabNumMainChoose].title = yetai;
_this.lableColorArr[_this.initTabNumMainChoose] = 1;
};
_this.mainDataChoose[_this.initTabNumMainChoose].isShow = false;
_this.resetConditions();
......@@ -295,11 +300,14 @@
let _this = this;
_this.initTabNumArea = index;
_this.mainDataChoose[_this.initTabNumMainChoose].title = area.join('-');
_this.lableColorArr[_this.initTabNumMainChoose] = 1;
if(area[0] != '全部' ){
var parseIntStart_area = parseInt(area[0]);
}
if(area[0] == '全部'){
_this.mainDataChoose[_this.initTabNumMainChoose].title = '面积';
_this.lableColorArr[_this.initTabNumMainChoose] = 0;
_this.ajax_shop_area_start = '';
_this.ajax_shop_area_end = '';
}else if((area.length == 1) && (area[0] != '全部')){
......@@ -330,10 +338,16 @@
_this.initTabNumBusiness = index;
if(business == 0 && (('全' + _this.initSelectCity) == _this.ajaxDisc ) || _this.ajaxDisc == ''){
_this.mainDataChoose[_this.initTabNumMainChoose].title = '区域';
_this.lableColorArr[_this.initTabNumMainChoose] = 0;
}else if(business != 0){
_this.mainDataChoose[_this.initTabNumMainChoose].title = businessStr;
_this.lableColorArr[_this.initTabNumMainChoose] = 1;
}else{
_this.mainDataChoose[_this.initTabNumMainChoose].title = _this.ajaxDisc;
_this.lableColorArr[_this.initTabNumMainChoose] = 1;
}
_this.mainDataChoose[_this.initTabNumMainChoose].isShow = false;
......@@ -347,11 +361,15 @@
_this.initTabNumRent = index;
if(rent[0] != '全部' ){
var parseIntStart = parseInt(rent[0]);
_this.initMoreNumRent = 0;
}
if(rent[0] == '全部'){
_this.initMoreNumRent = 0;
_this.ajax_rent_price_start = '';
_this.ajax_rent_price_end = '';
}else if((rent.length == 1) && (rent[0] != '全部')){
_this.initMoreNumRent = 1;
if(parseIntStart > 1){
_this.ajax_rent_price_start = parseIntStart*10000;
_this.ajax_rent_price_end = '';
......@@ -360,6 +378,7 @@
_this.ajax_rent_price_end = parseIntStart*10000;
};
}else{
_this.initMoreNumRent = 1;
var parseIntEnd = parseInt(rent[1]);
_this.ajax_rent_price_start = parseIntStart*10000;
_this.ajax_rent_price_end = parseIntEnd*10000;
......@@ -380,25 +399,47 @@
}else{
_this.arrShop.push(item);
};
if(!(_this.arrShop[0] == '全部')){
_this.initMoreNum =_this.arrShop.length;
}else{
_this.initMoreNum = 0;
}
_this.ajaxShopSign = _this.arrShop.join(',');
},
toShopDetail(id){
var user_img = localStorage.getItem('shop_list_b_user_img');
var user_name = localStorage.getItem('shop_list_b_user');
var user_tel = localStorage.getItem('shop_list_b_user_tel');
var str = this.common.ServerHost + "/app.php/app/share_detail?share=1&isC=0&client=b&id=" + id +'&user_name=' + user_name +'&user_img=' + user_img +'&user_tel=' + user_tel;
var str = this.common.ServerHost + "/index/shareShop?id=" + id +'&share=1&isC=0&client=b&user_name=' + user_name +'&user_img=' + user_img +'&user_tel=' + user_tel;
// var str = this.common.ServerHost + "/app.php/app/share_detail?id=" + id +'&share=1&isC=0&client=b&user_name=' + user_name +'&user_img=' + user_img +'&user_tel=' + user_tel;
location.href = str;
},
toShopSearchList(){
location.href = '/app/dist/#/shopSearchList';
localStorage.setItem('shop_list_b_user_city',this.initSelectCity);
localStorage.setItem('shop_list_b_user_shoptype',this.initTabNumMain);
},
delMore(){
let _this = this;
_this.initTabNumRent = 0;
_this.ajax_rent_price_start = '';
_this.ajax_rent_price_end = '';
_this.initMoreNum = 0;
_this.initMoreNumRent = 0;
_this.arrShop = ['全部'];
_this.ajaxShopSign = '';
},
saveMore(){
let _this = this;
_this.mainDataChoose[_this.initTabNumMainChoose].isShow = false;
if((_this.initMoreNum*1 + _this.initMoreNumRent*1) > 0 ){
_this.mainDataChoose[_this.initTabNumMainChoose].title = '更多' + '(' + (_this.initMoreNum*1 + _this.initMoreNumRent*1) + ')';
_this.lableColorArr[_this.initTabNumMainChoose] = 1;
}else{
_this.mainDataChoose[_this.initTabNumMainChoose].title = '更多';
_this.lableColorArr[_this.initTabNumMainChoose] = 0;
};
_this.resetConditions();
_this.getList();
},
......
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