diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js
index 11e118c..11b1296 100644
--- a/components/goods_list/goods_list.js
+++ b/components/goods_list/goods_list.js
@@ -1,139 +1,159 @@
-var t = getApp(), a = t.request, o = t.globalData.setting, os = o,
- i = require("../../utils/util.js"), ut = i, s = require("../../utils/common.js");
-
+var t = getApp(),
+ a = t.request,
+ o = t.globalData.setting,
+ os = o,
+ i = require("../../utils/util.js"),
+ ut = i,
+ s = require("../../utils/common.js");
Component({
data: {
url: o.imghost,
object: null,
- curPage:1,
- is_no_more:1,//加载完所有数据的控制器
- load_complete:0,//加载完成,
- rank_switch:false,
- card_field:"",
- card_name:"",
- max_card_field:"",
- card_list:null
+ curPage: 1,
+ is_no_more: 1, //加载完所有数据的控制器
+ load_complete: 0, //加载完成,
+ rank_switch: false,
+ card_field: "",
+ card_name: "",
+ max_card_field: "",
+ card_list: null
},
properties: {
- // 这里定义了innerText属性，属性值可以在组件使用时指定
+ // 这⾥定义了innerText属性，属性值可以在组件使⽤时指定
},
ready: function () {
-
},
-
- methods: {
- init:function(){
- var th = this;
- getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
- success: function (e) {
- getApp().globalData.userInfo = e.data.data;
- getApp().getConfig2(function (e) {
- var swithc_list = e.switch_list;
- var sw_arr = JSON.parse(swithc_list);
- //---如果后台又开等级卡的开关---
- if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
- th.setData({ rank_switch: true });
- //---回调卡的列表---
- th.getPlusCardType(function (ob) {
- th.setData({ card_list: ob.card_list });
- var ti = setInterval(function () {
- var user = getApp().globalData.userInfo;
- if (!user) return false;
- clearInterval(ti);
-
- 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 > 4) card_name = card_name.substring(0, 4);
- th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list });
- }
- }
- }, 500)
- })
-
- }
- })
- }
- })
-
- },
-
-
- get_list:function(){
- var that = this;
- if (that.data.is_no_more == 0) return false;
- var curPage = that.data.curPage;
- getApp().request.get('/api/weshop/goods/page?page', {
- data: {
- is_mainshow: 1, isonsale: 1,
- is_recommend: 1, is_on_sale: 1,
- store_id: o.stoid,
- page: curPage,
- pageSize: 6,
- },
- success: function (res) {
- var data = res.data;
- var total = data.data.total;
- if (total <= curPage * 6) {
- that.setData({ is_no_more: 0 });
- } else {
- that.data.curPage++;
- }
-
- //加载完成
- if (data.data.pageData) {
- that.setData({ load_complete: 1 });
- }
- if (that.data.recommend != null) {
- var ra = that.data.recommend.concat(data.data.pageData);
- that.setData({ recommend: ra });
- } else {
- that.setData({ recommend: data.data.pageData });
- }
- }
- })
- },
-
-
+ methods: {
+ init: function () {
+ var th = this;
+ getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+ success: function (e) {
+ getApp().globalData.userInfo = e.data.data;
+ getApp().getConfig2(function (e) {
+ var swithc_list = e.switch_list;
+ var sw_arr = JSON.parse(swithc_list);
+ //---如果后台有开等级卡的开关---
+ if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+ th.setData({
+ rank_switch: true
+ });
+ //---回调卡的列表---
+ th.getPlusCardType(function (ob) {
+ th.setData({
+ card_list: ob.card_list
+ });
+ var ti = setInterval(function () {
+ var user = getApp().globalData.userInfo;
+ if (!user) return false;
+ clearInterval(ti);
+ 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 > 4) card_name = card_name.substring(0, 4);
+ th.setData({
+ card_field: user.card_field,
+ card_name: card_name,
+ card_list: ob.card_list
+ });
+ }
+ }
+ }, 500)
+ })
+ }
+ })
+ }
+ })
+ },
+ // get_list: function () {
+ // var th = this;
+ // var url = "http://172.20.0.233:8022/api/weshop/display";
+ // wx.request({
+ // url: url,
+ // success: function (res) {
+ // th.setData({
+ // recommend: res.data.data.pageData
+ // })
+ // }
+ // })
+ // },
+ get_list: function() {
+ var that = this;
+ if (that.data.is_no_more == 0) return false;
+ var curPage = that.data.curPage;
+ getApp().request.get('/api/weshop/goods/page?page', {
+ data: {
+ is_mainshow: 1,
+ isonsale: 1,
+ is_recommend: 1,
+ is_on_sale: 1,
+ store_id: o.stoid,
+ page: curPage,
+ pageSize: 6,
+ },
+ success: function(res) {
+ var data = res.data;
+ var total = data.data.total;
+ if (total <= curPage * 6) {
+ that.setData({
+ is_no_more: 0
+ });
+ } else {
+ that.data.curPage++;
+ }
+ //加载完成
+ if (data.data.pageData) {
+ that.setData({
+ load_complete: 1
+ });
+ }
+ if (that.data.recommend != null) {
+ var ra = that.data.recommend.concat(data.data.pageData);
+ that.setData({
+ recommend: ra
+ });
+ } else {
+ that.setData({
+ recommend: data.data.pageData
+ });
+ }
+ }
+ })
+ },
bind_bnerr_xc: function (e) {
- var _errImg = e.target.dataset.errorimg;
- var _errurl = e.target.dataset.url;
- var _errObj = {};
- _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
- this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+ var _errImg = e.target.dataset.errorimg;
+ var _errurl = e.target.dataset.url;
+ var _errObj = {};
+ _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+ this.setData(_errObj) //注意这⾥的赋值⽅式,只是将数据列表中的此项图⽚路径值替换掉 ;
},
-
- reset:function(){
- curPage=1;
- },
-
- //--- 获取卡类列表 ---
- getPlusCardType: function (func) {
- var storid = o.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();
- for (var i = 0; i < plusCard.length; i++) {
- var name="card"+plusCard[i].CorrPrice.toLowerCase();
- card_name_map.set(name,plusCard[i].CardName);
- }
-
- var ob={"card_list":plusCard,"name_map":card_name_map};
- func(ob);
- })
- },
-
+ reset: function () {
+ curPage = 1;
},
-
-
-
+ //--- 获取卡类列表 ---
+ getPlusCardType: function (func) {
+ var storid = o.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();
+ for (var i = 0; i < plusCard.length; i++) {
+ var name = "card" + plusCard[i].CorrPrice.toLowerCase();
+ card_name_map.set(name, plusCard[i].CardName);
+ }
+ var ob = {
+ "card_list": plusCard,
+ "name_map": card_name_map
+ };
+ func(ob);
+ })
+ },
+ },
})
\ No newline at end of file
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 13a075c..8273aa9 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -1,128 +1,144 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.goods_name}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item[card_field],2)}}
- {{card_name}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
- {{g_filter.get_card_price(item,card_list,1)}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+
+
+ ￥
+ {{item.activity_price}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
+
+ {{g_filter.get_card_price(item,card_list,1)}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
-
-
-
- 没有更多内容了
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+ 没有更多内容了
+
+
+
\ No newline at end of file
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 688da7e..15ae34e 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -1,141 +1,153 @@
-
- 综合
-
-
-
-
-
- 销量
-
-
-
-
-
-
-
- 价格
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+ ￥{{item.activity_price}}
+
-
- {{item.goods_name}}
-
-
-
-
-
-
-
-
- ￥{{item[card_field]}}
-
- {{card_name}}
-
-
-
-
- ￥{{item.shop_price}}
-
-
-
-
-
-
- ￥{{item.shop_price}}
- ￥{{item.market_price}}
-
-
-
-
- ￥{{item.shop_price}}
-
-
-
-
-
- ￥{{item.shop_price}}
-
-
+
+
+
+
+
+
+
+
+
+ ￥{{item[card_field]}}
+
+
+ {{card_name}}
+
+
+
+
+
+ ￥{{item.shop_price}}
+
+
+
+
+
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
+ ￥{{item.shop_price}}
+
+
+
+
+
+ ￥{{item.shop_price}}
+
-
+
+
+
+
-
- 没有相关的数据
- 去逛逛
+
+ 没有相关的数据
+ 去逛逛
-
-
+
+
-
-
-
- {{item.name}}
-
-
- {{item.name}}
-
+
+
+
+ {{item.name}}
+
+
+ {{item.name}}
-
- {{item.name}}
-
-
- {{item.name}}
-
+
+
+ {{item.name}}
+
+
+ {{item.name}}
-
- 相关品牌
-
-
- {{item.name}}
-
+
+
+ 相关品牌
+
+
+ {{item.name}}
-
- 价格区间
-
-
- {{item.name}}
-
+
+
+ 价格区间
+
+
+ {{item.name}}
+
-
+
\ No newline at end of file
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 39df1db..4802634 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -1,158 +1,170 @@
-
- 综合
-
-
-
-
-
- 销量
-
-
-
-
-
- 价格
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.goods_name}}
-
-
-
-
-
-
-
- ￥{{item[card_field]}}
-
- {{card_name}}
-
-
-
-
-
- ￥{{item.shop_price}}
-
-
-
-
-
-
- ￥{{item.shop_price}}
- ￥{{item.market_price}}
-
-
-
-
- ￥{{item.shop_price}}
-
-
-
-
-
- ￥{{item.shop_price}}
-
-
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+ ￥{{item.activity_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥{{item[card_field]}}
+
+
+ {{card_name}}
+
+
+
+
+
+ ￥{{item.shop_price}}
+
+
+
+
+
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
+ ￥{{item.shop_price}}
+
+
+
+
+
+ ￥{{item.shop_price}}
+
-
-
-
-
- 没有相关的数据
- 去逛逛
-
+
+
+
+
+
+
+
+ 没有相关的数据
+ 去逛逛
+
-
-
-
-
-
- {{item.name}}
-
-
- {{item.name}}
-
-
-
- {{item.name}}
-
-
- {{item.name}}
-
-
-
- 相关品牌
-
-
- {{item.name}}
-
-
-
- 价格区间
-
-
- {{item.name}}
-
-
+
+
+
+
+
+ {{item.name}}
+
+
+ {{item.name}}
+
+
+
+ {{item.name}}
+
+
+ {{item.name}}
+
+
+
+ 相关品牌
+
+
+ {{item.name}}
+
+
+ 价格区间
+
+
+ {{item.name}}
+
+
+
-
-
-
-
-
- 热门搜索
-
-
- {{item}}
-
-
+
+
+
+
+
+ 热门搜索
+
+
+ {{item}}
+
-
+
+
\ No newline at end of file