From b8a4dca775119a84c31d09778d62d5b31545a3ec Mon Sep 17 00:00:00 2001 From: abson Date: Sat, 26 Feb 2022 09:36:30 +0800 Subject: [PATCH] oa2dan --- pages/goods/goodsInfo/goodsInfo.js | 19 ++++++++++++++++++- pages/goods/goodsInfo/goodsInfo.wxml | 4 ++-- pages/goods/search/search.js | 614 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ pages/goods/search/search.wxml | 50 +++++++++++++++++++++++++------------------------- 4 files changed, 359 insertions(+), 328 deletions(-) diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index fd0256c..b71267e 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -25,7 +25,7 @@ Page({ color_type: 0, //线条控制 color_type_one: 0, color_type_two: 1, - + is_no_plus:1, gid: "", stoid: o.stoid, url: o.url, @@ -354,6 +354,22 @@ Page({ th.data.c_guide_id = c_guide_id; } + //调用接口判断商家plus有没有过期 + i.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { + if (res.data.code == 0) { + var arr = res.data.data.pageData; + if (arr.length > 0) { + var item = arr[0]; + if (item.is_sy == 0) { + var now = Date.parse(new Date()); now = now / 1000; + if (item.end_time < now) { + th.setData({ is_no_plus: 0 }) + } + } + } + } + }) + getApp().getConfig(function (e) { ee.setData({sto_sele_name_1: e.store_name}) }) @@ -3526,6 +3542,7 @@ Page({ //---判断拼单---- if (prom_type == 6) { + console.log('判断拼单'); //-------判断活动是否抢光--------- await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, { 1: 1 diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index fb306f1..48e0aec 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -324,7 +324,7 @@ - + @@ -336,7 +336,7 @@ - + diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index fa3aab4..2fb8bb1 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -1,9 +1,9 @@ -var t = function(t) { +var t = function (t) { return t && t.__esModule ? t : { default: t }; }(require("../../../utils/LoadMore.js")), ut = require("../../../utils/util.js"), - a = getApp(), e = new t.default(), rq = a.request, oo = a.globalData.setting; + a = getApp(), e = new t.default(), rq = a.request, oo = a.globalData.setting; Page({ data: { @@ -18,143 +18,157 @@ Page({ requestUrl: "", //hotWords: [ [ "手机", "小米", "iphone" ], [ "三星", "华为", "冰箱" ] ] hotWords: null, - + is_no_plus:1, tabname: "sort", //排序的字段 adname: "asc", //升降的字段 - rq_data:null, - - - searchRecord: [], - keyword: '', - is_his:0, + rq_data: null, + searchRecord: [], + keyword: '', + is_his: 0, }, - - onLoad: function(t) { - this.data.rq_data=t; + + onLoad: function (t) { + this.data.rq_data = t; //接受有没有导购的参数 - var first_leader=t.first_leader; - if(first_leader){ - getApp().globalData.first_leader=first_leader; + var first_leader = t.first_leader; + if (first_leader) { + getApp().globalData.first_leader = first_leader; //调用接口判断是不是会员 - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+first_leader,{}).then(res=>{ - if(res.data.code==0){ - getApp().globalData.guide_id=res.data.data.id; + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + oo.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; } }) } - - var th=this; - a.getConfig2(function(rs){ - var arr=new Array(),arr2=new Array(); - if (rs.hot_keywords != null && ut.trim(rs.hot_keywords)!="" ){ - var arr1 = rs.hot_keywords.split('|'); - for (var i = 0; i < arr1.length;i++){ - if(i%5==0 && i!=0){ - arr.push(arr2); - arr2=[]; - }else{ - arr2.push(arr1[i]); + var th = this; + //调用接口判断商家plus有没有过期 + rq.promiseGet("/store/storemoduleendtime/page?store_id=" + oo.stoid + "&type=3", {}).then(res => { + if (res.data.code == 0) { + var arr = res.data.data.pageData; + if (arr.length > 0) { + var item = arr[0]; + if (item.is_sy == 0) { + var now = Date.parse(new Date()); now = now / 1000; + if (item.end_time < now) { + th.setData({ is_no_plus: 0 }) + } + } } } - if (arr2.length > 0) arr.push(arr2); - th.setData({ hotWords: arr}); - } - - - //计算等级价相关 - var swithc_list=rs.switch_list; - var sw_arr=JSON.parse(swithc_list); - //---如果后台又开等级卡的开关--- - if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){ - th.setData({rank_switch:true}); - var user=getApp().globalData.userInfo; - var ti=setInterval(function(){ - if(!user) return false; - clearInterval(ti); - //---回调卡的列表--- - th.getPlusCardType(function(ob){ - th.setData({card_list:ob.card_list}); - if(user.card_field ){ - var str = user['card_expiredate'].replace(/-/g, '/'); - var end = new Date(str); - end = Date.parse(end) / 1000; - var now = ut.gettimestamp(); - - //--- 判断是等级会员，且在有效期范围内 --- - if(user.card_field && now7) card_name=card_name.substring(0,8); - th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list}); - } - } - }) - },500) - } - - - - }) - //e.init(this, "", "requestData"); - var url = this.data.baseUrl; - - //扫一扫过来，显示搜索的内容 - var s_key = t.s_key; - if (s_key){ - s_key=s_key.trim(); - this.search(s_key); this.openSearchModal(); - return; - } - - if (0 != t.brand_id && t.brand_id!=undefined){ url += "&brand_id=" + t.brand_id;} - if (0 != t.nation_id && t.nation_id!=undefined) { url += "&nation_id=" + t.nation_id;} - if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;} - if (0 != t.ladder_id && t.ladder_id != undefined) { - url += "&ladder_id=" + t.ladder_id; - this.setData({ - baseUrl:url, + }) + a.getConfig2(function (rs) { + console.log('getConfig2', rs); + var arr = new Array(), arr2 = new Array(); + if (rs.hot_keywords != null && ut.trim(rs.hot_keywords) != "") { + var arr1 = rs.hot_keywords.split('|'); + for (var i = 0; i < arr1.length; i++) { + if (i % 5 == 0 && i != 0) { + arr.push(arr2); + arr2 = []; + } else { + arr2.push(arr1[i]); + } + } + if (arr2.length > 0) arr.push(arr2); + th.setData({ hotWords: arr }); + } + + + //计算等级价相关 + var swithc_list = rs.switch_list; + var sw_arr = JSON.parse(swithc_list); + console.log('sw_arr', sw_arr); + //---如果后台又开等级卡的开关--- + if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { + th.setData({ rank_switch: true }); + var user = getApp().globalData.userInfo; + var ti = setInterval(function () { + if (!user) return false; + clearInterval(ti); + //---回调卡的列表--- + th.getPlusCardType(function (ob) { + th.setData({ card_list: ob.card_list }); + if (user.card_field) { + var str = user['card_expiredate'].replace(/-/g, '/'); + var end = new Date(str); + end = Date.parse(end) / 1000; + var now = ut.gettimestamp(); + + //--- 判断是等级会员，且在有效期范围内 --- + if (user.card_field && now < end) { + var card_name = ob.name_map.get(user.card_field); + if (card_name.length > 7) card_name = card_name.substring(0, 8); + th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list }); + } + } + }) + }, 500) + } + + }) - } - if (url != this.data.baseUrl) return this.requestSearch(url); - this.openSearchModal(); + //e.init(this, "", "requestData"); + var url = this.data.baseUrl; + + //扫一扫过来，显示搜索的内容 + var s_key = t.s_key; + if (s_key) { + s_key = s_key.trim(); + this.search(s_key); this.openSearchModal(); + return; + } + + if (0 != t.brand_id && t.brand_id != undefined) { url += "&brand_id=" + t.brand_id; } + if (0 != t.nation_id && t.nation_id != undefined) { url += "&nation_id=" + t.nation_id; } + if (0 != t.max_price && t.max_price != undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price; } + if (0 != t.ladder_id && t.ladder_id != undefined) { + url += "&ladder_id=" + t.ladder_id; + this.setData({ + baseUrl: url, + + }) + } + if (url != this.data.baseUrl) return this.requestSearch(url); + this.openSearchModal(); // 获取历史搜索记录 - this.getHistorySearch(); + this.getHistorySearch(); }, - changeTab: function(t) { - var ord = t.currentTarget.dataset.href; - var ad = t.currentTarget.dataset.ad; + changeTab: function (t) { + var ord = t.currentTarget.dataset.href; + var ad = t.currentTarget.dataset.ad; - var url = this.data.requestUrl; + var url = this.data.requestUrl; - if (this.data.tabname != ord) { - this.setData({ tabname: ord, adname: "desc" }); - } else { - ad = ad == "desc" ? "asc" : "desc"; - this.setData({ adname: ad }); - } - this.resetData(), this.requestSearch(url); + if (this.data.tabname != ord) { + this.setData({ tabname: ord, adname: "desc" }); + } else { + ad = ad == "desc" ? "asc" : "desc"; + this.setData({ adname: ad }); + } + this.resetData(), this.requestSearch(url); }, //-----------真的调用地址进行搜索------------ - requestSearch: function(t) { - if(this.data.loading) return false; - this.data.loading=1; - var e = this,th=e; - if(getApp().globalData.userInfo){ - t += "&user_id=" + getApp().globalData.userInfo.user_id; - } + requestSearch: function (t) { + if (this.data.loading) return false; + this.data.loading = 1; + var e = this, th = e; + if (getApp().globalData.userInfo) { + t += "&user_id=" + getApp().globalData.userInfo.user_id; + } this.data.requestUrl = t; - var user_id=getApp().globalData.user_id; - if(!user_id) user_id=0; + var user_id = getApp().globalData.user_id; + if (!user_id) user_id = 0; - getApp().request.promiseGet(t, {data:{is_mainshow: 1, isonsale: 1, store_id: oo.stoid,orderField: e.data.tabname, orderType: e.data.adname, page: e.data.currentPage}}).then(async res=>{ - th.data.loading=0; - if(ut.ajax_ok(res)){ - if(!e.data.requestData) e.data.requestData=[]; - for(let i in res.data.data.pageData){ - let item=res.data.data.pageData[i]; + getApp().request.promiseGet(t, { data: { is_mainshow: 1, isonsale: 1, store_id: oo.stoid, orderField: e.data.tabname, orderType: e.data.adname, page: e.data.currentPage } }).then(async res => { + th.data.loading = 0; + if (ut.ajax_ok(res)) { + if (!e.data.requestData) e.data.requestData = []; + for (let i in res.data.data.pageData) { + let item = res.data.data.pageData[i]; item.original_img = th.data.url + item.original_img; /*-- @@ -171,48 +185,48 @@ Page({ })--*/ var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 - var prom_id=item.prom_id; - var now=ut.gettimestamp(); + var prom_id = item.prom_id; + var now = ut.gettimestamp(); var url = ""; - switch (prom_type){ + switch (prom_type) { case 1: - url = "/api/ms/flash_sale/getNew/" +oo.stoid + "/" +user_id+"/"+ prom_id; + url = "/api/ms/flash_sale/getNew/" + oo.stoid + "/" + user_id + "/" + prom_id; break; case 2: - url ="/api/weshop/goods/groupBuy/getActInfo/" +oo.stoid + "/" +item.goods_id+"/"+ prom_id + url = "/api/weshop/goods/groupBuy/getActInfo/" + oo.stoid + "/" + item.goods_id + "/" + prom_id break; case 4: - url ="/api/weshop/integralbuy/get/"+oo.stoid +"/"+prom_id; + url = "/api/weshop/integralbuy/get/" + oo.stoid + "/" + prom_id; break; case 6: url = "/api/weshop/teamlist/get/" + oo.stoid + "/" + prom_id; - await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1",{ - data:{ - store_id: oo.stoid, - is_end: 0, - is_show: 1, - user_id: getApp().globalData.user_id, - pageSize:1000, + await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1", { + data: { + store_id: oo.stoid, + is_end: 0, + is_show: 1, + user_id: getApp().globalData.user_id, + pageSize: 1000, } - }).then(pd=>{ - let pd_list=pd.data.data.pageData; - if(res.data.code==0 && pd_list.length>0){ - var flag = pd_list.some(pd=>{ - return pd.goods_id==item.goods_id - }) - - if(!flag){ - item.prom_type=0; - item.prom_id=0; - item.prom_price=null; - } + }).then(pd => { + let pd_list = pd.data.data.pageData; + if (res.data.code == 0 && pd_list.length > 0) { + var flag = pd_list.some(pd => { + return pd.goods_id == item.goods_id + }) + + if (!flag) { + item.prom_type = 0; + item.prom_id = 0; + item.prom_price = null; + } } - }) + }) break; case 8: var presell_id = prom_id; var url1 = "/api/weshop/marketing/marketingPresellList/list"; - var rd= { + var rd = { store_id: oo.stoid, presell_id: presell_id, goods_id: item.goods_id @@ -224,247 +238,247 @@ Page({ if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { var arr = res.data.data[0]; item.prom_price = arr.luck_goods_price; - item.sales_sum=arr.buy_goodnum+(arr.virtual_qty?arr.virtual_qty:0); + item.sales_sum = arr.buy_goodnum + (arr.virtual_qty ? arr.virtual_qty : 0); } }) break; default: break } - if(url!=null && url!=''){ + if (url != null && url != '') { await getApp().request.promiseGet(url, {}).then(async res => { - var prom =null; - if(res.data.code==0 && res.data.data){ - prom=res.data.data; + var prom = null; + if (res.data.code == 0 && res.data.data) { + prom = res.data.data; - if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) { item.prom_price = res.data.data.price; - if(res.data.data.user_price) item.prom_price=res.data.data.user_price; - var vNum=prom.virtual_num?prom.virtual_num:0; - var vNum1=prom.virtualNum?prom.virtualNum:0; - var vNum2=prom.virtual?prom.virtual:0; - item.sales_sum=prom.buy_num+(vNum+vNum1+vNum2); - }else{ - item.prom_type=0; - item.prom_id=0; - item.prom_price=null; + if (res.data.data.user_price) item.prom_price = res.data.data.user_price; + var vNum = prom.virtual_num ? prom.virtual_num : 0; + var vNum1 = prom.virtualNum ? prom.virtualNum : 0; + var vNum2 = prom.virtual ? prom.virtual : 0; + item.sales_sum = prom.buy_num + (vNum + vNum1 + vNum2); + } else { + item.prom_type = 0; + item.prom_id = 0; + item.prom_price = null; } } }) } - if(!th.data.requestData) th.data.requestData=[]; + if (!th.data.requestData) th.data.requestData = []; th.data.requestData.push(item); - e.setData({requestData: e.data.requestData}); + e.setData({ requestData: e.data.requestData }); } } e.closeSearchModal(); }) }, - onReachBottom: function() { + onReachBottom: function () { this.data.currentPage++ this.data.openSearchModal || e.canloadMore() && this.requestSearch(this.data.requestUrl); }, - openFilterModal: function() { + openFilterModal: function () { this.setData({ openFilterModal: !0 }); }, - closeFilterModal: function() { + closeFilterModal: function () { this.setData({ openFilterModal: !1 }); }, - filterGoods: function(t) { + filterGoods: function (t) { this.resetData(), this.requestSearch(t.currentTarget.dataset.href), this.closeFilterModal(); }, - resetData: function() { + resetData: function () { e.resetConfig(), this.data.requestData = null, this.data.currentPage = 1; }, //---回复最初的设置---显示全部分类-- - restoreData: function() { + restoreData: function () { this.setData({ requestData: this.data.allData, }); - this.data.currentPage=2; + this.data.currentPage = 2; }, - openSearchModal: function() { + openSearchModal: function () { this.setData({ openSearchModal: !0 }); }, - closeSearchModal: function() { + closeSearchModal: function () { this.setData({ openSearchModal: !1 }); }, - submitSearch: function(t) { - console.log(111,t); - var val=t.detail.value.word; - if(val==undefined) val=t.detail.value; - val=val?val.trim():''; - if(!val){ - a.showWarning("请输入搜索关键词"); - } + submitSearch: function (t) { + console.log(111, t); + var val = t.detail.value.word; + if (val == undefined) val = t.detail.value; + val = val ? val.trim() : ''; + if (!val) { + a.showWarning("请输入搜索关键词"); + } this.search(val); - + }, //热搜关键字 - searchHotWord: function(t) { - - var word= t.currentTarget.dataset.word; - this.historyRecord(word); - this.search(word); + searchHotWord: function (t) { + + var word = t.currentTarget.dataset.word; + this.historyRecord(word); + this.search(word); }, //-----点击搜索按钮---- - search: function(t) { + search: function (t) { if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词"); - this.data.key_str=t; - this.historyRecord(); + this.data.key_str = t; + this.historyRecord(); this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t)); }, //---------分享配置-------- onShareAppMessage: function (e) { - var curPage=this; + var curPage = this; var pagePath = curPage.route; //当前页面url if (pagePath.indexOf('/') != 0) { pagePath = '/' + pagePath; } - if(this.data.key_str) { + if (this.data.key_str) { pagePath += "?s_key=" + this.data.key_str; } - if(getApp().globalData.user_id){ + if (getApp().globalData.user_id) { - if(pagePath.indexOf("?")>0){ - pagePath+="&first_leader="+getApp().globalData.user_id; - }else{ - pagePath+="?first_leader="+getApp().globalData.user_id; + if (pagePath.indexOf("?") > 0) { + pagePath += "&first_leader=" + getApp().globalData.user_id; + } else { + pagePath += "?first_leader=" + getApp().globalData.user_id; } } - console.log("11-11"+pagePath); + console.log("11-11" + pagePath); return { title: "商品搜索", - path:pagePath, + path: pagePath, } }, //---------图片失败，默认图片-------- bind_bnerr: function (e) { - var _errImg = e.target.dataset.errorimg; - var _errObj = {}; - _errObj[_errImg] = this.data.url+ "/miniapp/images/default_g_img.gif"; - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = this.data.url + "/miniapp/images/default_g_img.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, + + //--- 获取卡类列表 --- + getPlusCardType: function (func) { + var storid = oo.stoid; + var th = this; + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { + var plusCard = res.data.data; + var arr = [1219, 2089, 3031]; + var new_arr = new Array(); + var card_name_map = new Map(); + var user = getApp().globalData.userInfo; + + for (var i = 0; i < plusCard.length; i++) { + if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) { + continue; + } + var name = "card" + plusCard[i].CorrPrice.toLowerCase(); + card_name_map.set(name, plusCard[i].CardName); + new_arr.push(plusCard[i]); + + } + + var ob = { "card_list": new_arr, "name_map": card_name_map }; + func(ob); + }) + }, + + + getInput(e) { + this.setData({ + keyword: e.detail.value + }); + }, + + historyRecord(w) { + let keyword = w; + let self = this; + if (!keyword) { + keyword = this.data.key_str.trim(); + } + let searchRecord = this.data.searchRecord; + if (!searchRecord || searchRecord.length == 0) searchRecord = wx.getStorageSync('searchRecord') || []; + + if (keyword) { + + var index = searchRecord.indexOf(keyword); + if (index > -1) { + // 已经存在该值 + searchRecord.splice(index, 1); + searchRecord.unshift(keyword); + + // 将历史记录添加到缓存中 + wx.setStorage({ + key: 'searchRecord', + data: searchRecord, + success: function (res) { + self.setData({ + searchRecord, + }) + } + }) + + return; + } else { + if (searchRecord.length >= 10) { + searchRecord.pop(); // 删除最早的一条记录 + }; + searchRecord.unshift(keyword); + + // // 将历史记录添加到缓存中 + wx.setStorage({ + key: 'searchRecord', + data: searchRecord, + success: function (res) { + self.setData({ + searchRecord, + }) + } + }) + }; + }; }, - - //--- 获取卡类列表 --- - getPlusCardType: function (func) { - var storid = oo.stoid; - var th = this; - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => { - var plusCard = res.data.data; - var arr = [1219, 2089, 3031]; - var new_arr = new Array(); - var card_name_map=new Map(); - var user = getApp().globalData.userInfo; - - for (var i = 0; i < plusCard.length; i++) { - if ((!user || user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) { - continue; - } - var name="card"+plusCard[i].CorrPrice.toLowerCase(); - card_name_map.set(name,plusCard[i].CardName); - new_arr.push(plusCard[i]); - - } - - var ob={"card_list":new_arr,"name_map":card_name_map}; - func(ob); - }) - }, - - - getInput(e) { - this.setData({ - keyword: e.detail.value - }); - }, - - historyRecord(w) { - let keyword =w; - let self = this; - if(!keyword){ - keyword = this.data.key_str.trim(); - } - let searchRecord = this.data.searchRecord; - if(!searchRecord || searchRecord.length==0) searchRecord=wx.getStorageSync('searchRecord') || []; - - if(keyword) { - - var index=searchRecord.indexOf(keyword); - if(index > -1) { - // 已经存在该值 - searchRecord.splice(index,1); - searchRecord.unshift(keyword); - - // 将历史记录添加到缓存中 - wx.setStorage({ - key: 'searchRecord', - data: searchRecord, - success: function(res) { - self.setData({ - searchRecord, - }) - } - }) - - return; - } else { - if(searchRecord.length >= 10) { - searchRecord.pop(); // 删除最早的一条记录 - }; - searchRecord.unshift(keyword); - - // // 将历史记录添加到缓存中 - wx.setStorage({ - key: 'searchRecord', - data: searchRecord, - success: function(res) { - self.setData({ - searchRecord, - }) - } - }) - }; - }; - }, - - - - - getHistorySearch() { - this.setData({ - searchRecord: wx.getStorageSync('searchRecord') || [] //若无存储则为空 - }); - }, - - clearSearchRecord() { - wx.clearStorageSync('searchRecord'); - this.setData({ - searchRecord: [] - }); - }, - - go_url:function (e) { - var url=e.currentTarget.dataset.url; + + + + + getHistorySearch() { + this.setData({ + searchRecord: wx.getStorageSync('searchRecord') || [] //若无存储则为空 + }); + }, + + clearSearchRecord() { + wx.clearStorageSync('searchRecord'); + this.setData({ + searchRecord: [] + }); + }, + + go_url: function (e) { + var url = e.currentTarget.dataset.url; getApp().goto(url); } }); \ No newline at end of file diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml index 6b27d1c..e4196f4 100644 --- a/pages/goods/search/search.wxml +++ b/pages/goods/search/search.wxml @@ -38,10 +38,10 @@ - {{item.prom_integral}}积分 - + - ￥{{item.prom_price}} - + {{item.prom_integral}}积分 + + + ￥{{item.prom_price}} + ￥{{item.market_price}} 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -49,7 +49,7 @@ - + @@ -57,9 +57,9 @@ ￥{{item[card_field]}} - - - {{card_name}} + + + {{card_name}} @@ -85,10 +85,10 @@ ￥{{g_filter.get_card_price(item,card_list,0)}} - - - {{g_filter.get_card_price(item,card_list,1)}} - + + + {{g_filter.get_card_price(item,card_list,1)}} + 评论{{item.comment_count}} 已售{{item.sales_sum}} @@ -120,7 +120,7 @@ 没有相关的数据 - 去逛逛 + 去逛逛 - - - 历史搜索 - - - - - {{item}} - - - 暂无历史搜索记录 - + + + 历史搜索 + + + + + {{item}} + + + 暂无历史搜索记录 + \ No newline at end of file -- libgit2 0.21.4