diff --git a/app.json b/app.json index a8cf5e3..2a1a647 100644 --- a/app.json +++ b/app.json @@ -160,7 +160,10 @@ "pages": [ "pages/presell/list/list", "pages/presell/cart/cart", - "pages/presell/goodsInfo/goodsInfo" + "pages/presell/goodsInfo/goodsInfo", + "pages/goods/distributionCategoryList/index", + "pages/goods/goodsList/goodsList", + "pages/payForAnother/payForAnother" ] } diff --git a/app.wxss b/app.wxss index 683d317..ffb6526 100644 --- a/app.wxss +++ b/app.wxss @@ -630,7 +630,7 @@ background: #ffe3e2; font-size: 20rpx; } .fs22{ - font-size: 22rpx; + font-size: 22rpx !important; } .fs24{ font-size: 24rpx !important; @@ -708,9 +708,9 @@ background: #ffe3e2; /* 图标字体(ty) */ @font-face { font-family: 'iconfont'; /* Project id 2054717 */ - src: url('//at.alicdn.com/t/font_2054717_x1u9bka6w7.woff2?t=1630899459000') format('woff2'), - url('//at.alicdn.com/t/font_2054717_x1u9bka6w7.woff?t=1630899459000') format('woff'), - url('//at.alicdn.com/t/font_2054717_x1u9bka6w7.ttf?t=1630899459000') format('truetype'); + src: url('//at.alicdn.com/t/font_2054717_wjskcibo8k8.woff2?t=1631859488939') format('woff2'), + url('//at.alicdn.com/t/font_2054717_wjskcibo8k8.woff?t=1631859488939') format('woff'), + url('//at.alicdn.com/t/font_2054717_wjskcibo8k8.ttf?t=1631859488939') format('truetype'); } .iconfont { @@ -721,6 +721,10 @@ background: #ffe3e2; -moz-osx-font-smoothing: grayscale; } + +.icon-arrowup:before { + content: "\e61e"; +} .icon-aixin:before { content: "\e8c3"; } diff --git a/components/diy_picMax/diy_picMax.wxml b/components/diy_picMax/diy_picMax.wxml index eb44d4d..f344a39 100644 --- a/components/diy_picMax/diy_picMax.wxml +++ b/components/diy_picMax/diy_picMax.wxml @@ -2,15 +2,15 @@ - - + + - + - + diff --git a/components/diy_picMax/diy_picMax.wxss b/components/diy_picMax/diy_picMax.wxss index 14553f9..433579f 100644 --- a/components/diy_picMax/diy_picMax.wxss +++ b/components/diy_picMax/diy_picMax.wxss @@ -1,7 +1,7 @@ .picMax{ width: 100%; overflow: hidden; - margin-top: -0.01rpx; + /* margin-top: -0.01rpx; */ display: flex; flex-wrap: wrap; } @@ -9,11 +9,12 @@ float: left; margin: 0; padding: 0;font-size: 0; } /* .pic_item image{width: 100%;} */ -.pic_item image{width: 100.1%;vertical-align: bottom; margin: 0;margin-left: -1rpx;font-size: 0; } -.picMax-clear{clear: both;} +/* .pic_item image{width: 100%;vertical-align: bottom; margin: 0;margin-left: -1rpx;font-size: 0; } */ +.pic_item image{width: 100%;vertical-align: bottom; margin: 0;display: block;} +/* .picMax-clear{clear: both;} */ .mgt2 { - margin-top: -2rpx; + margin-bottom: -2rpx !important; } .picMax2{ @@ -22,11 +23,17 @@ .pic_item2{ position:absolute;top:0; left:0; } -.pic_item2 image{} +.pic_item2 image{ + display: block; + vertical-align: top; + vertical-align: text-top; + vertical-align: bottom; + vertical-align: text-bottom; +} /* .width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:750rpx;} */ .width_1{width: 25%}.width_2{width: 50%}.width_3{width: 75%}.width_4{width:100%} -.height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;} -.mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;} -.mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top: 562.5rpx}.mar_y4{margin-top: 748rpx;} \ No newline at end of file +.height_1{height: 186rpx;}.height_2{height: 372rpx;}.height_3{height: 558rpx}.height_4{height: 744rpx;} +.mar_x1{left:187rpx;}.mar_x2{left:374rpx;}.mar_x3{left:561rpx}.mar_x4{left: 748rpx;} +.mar_y1{top: 186rpx;}.mar_y2{top: 372rpx;}.mar_y3{top: 558rpx}.mar_y4{top: 744rpx;} \ No newline at end of file diff --git a/components/diy_store_select/diy_store_select.js b/components/diy_store_select/diy_store_select.js index c83e633..9fb9018 100644 --- a/components/diy_store_select/diy_store_select.js +++ b/components/diy_store_select/diy_store_select.js @@ -218,10 +218,18 @@ Component({ } e.splice(0, 0, th.data.top_store); //添加 } - - + + var ishas_cate=0; + for(let i in e){ + let item=e[i]; + if(item.category_id>0) { + ishas_cate=1;break; + } + } + + //单总量超出5个的时候 - if (e.length > 5) { + if (e.length > 10 && ishas_cate) { getApp().request.get("/api/weshop/storagecategory/page", { data: { store_id: o.stoid, diff --git a/components/nav_box/nav_box.wxss b/components/nav_box/nav_box.wxss index 6356b8e..d95652c 100644 --- a/components/nav_box/nav_box.wxss +++ b/components/nav_box/nav_box.wxss @@ -11,6 +11,7 @@ right: 10rpx; bottom:300rpx; overflow: hidden; + z-index: 1000; } .box_isopen{ diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml index 498596d..cfe266f 100644 --- a/custom-tab-bar/index.wxml +++ b/custom-tab-bar/index.wxml @@ -1,28 +1,29 @@ - + - - - {{cartGoodsNum}} - + + + + + + {{cartGoodsNum}} - - {{item.nav_name}} - + {{item.nav_name}} - - - - + + + + + - - {{item.nav_name}} - + {{item.nav_name}} diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss index a48f6ac..71558c6 100644 --- a/custom-tab-bar/index.wxss +++ b/custom-tab-bar/index.wxss @@ -7,40 +7,51 @@ z-index: 10000; display: flex; justify-content: space-around; + height: 100rpx; +} +.main_bar.custom { + border-top: none; } .tabbar_item { position: relative; - height: 100%; - float: left; + /* height: 100%; */ + /* float: left; */ text-align: center; - padding: 0px 0; + padding: 0; + display: flex; + flex: 1; + flex-direction: column; + justify-content: center; } .tab_img { display: flex; justify-content: center; - align-items: center + position: relative; } .nav_imgage { - height: 52rpx; - width: 52rpx; - background-position: center; + display: block; + height: 48rpx; + width: 48rpx; background-repeat: no-repeat; + /* background-position: center; + background-repeat: no-repeat; */ background-size: 100%; } .cart_num { - top: 0; + /* top: 8rpx; */ background-color: red; color: #fff; font-size: 20rpx; border-radius: 50%; - width: 40rpx; - line-height: 40rpx; - height: 40rpx; + width: 36rpx; + line-height: 36rpx; + height: 36rpx; position: absolute; z-index: 100; - right: 30rpx; + right: 34rpx; + /* margin-right: -70rpx; */ } diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js index 7f81900..4c6f9f9 100644 --- a/packageA/pages/cart2_ser/cart2_ser.js +++ b/packageA/pages/cart2_ser/cart2_ser.js @@ -373,6 +373,7 @@ Page({ //--------------------提交订单----------------------- submit_func: async function(){ + if(this.data.is_summit_ing==1) return false; //--提交中退出-- this.data.is_summit_ing=1; var th=this,pdata=new Array(); @@ -391,6 +392,11 @@ Page({ var gglist = list[i].goods; for(var j in gglist){ var gg=gglist[j]; + if(!gg.pick_id){ + getApp().showWarning("未找到门店"); + return false; + } + var goods={ 'card_id': gg.service_id, 'itemid': gg.erpItemID, @@ -415,12 +421,12 @@ Page({ } } }else{ + var gg = getApp().globalData.service_now; if(!gg.pick_id){ getApp().showWarning("未找到门店"); return false; } - var gg = getApp().globalData.service_now; var goods={ 'card_id': th.data.bn_goods.id, 'itemid': th.data.bn_goods.erpItemID, diff --git a/packageA/pages/distribution/shop/shop.js b/packageA/pages/distribution/shop/shop.js index 32c1409..a412f34 100644 --- a/packageA/pages/distribution/shop/shop.js +++ b/packageA/pages/distribution/shop/shop.js @@ -1,260 +1,265 @@ // packageA//pages/distribution/commision/commision.js -const app = getApp(); +const app = getApp(); let self = null; -var os = app.globalData.setting, - ut= require("../../../../utils/util.js"); - - +var os = app.globalData.setting, + ut = require("../../../../utils/util.js"); + + Page({ /** * 页面的初始数据 */ data: { - isInputFocus: false,//记录搜索输入框是否聚焦 - inputVal: '',//记录搜索输入框的内容 - isSort: false,//控制排序开关状态，true开启排序 - isDescending: false, //isDescending降序，ascending升序 - imghost: '', - url: os.imghost, - - tabArr: ['最新','销量','评论','价格'], - currentTabIndex: 0, - isShowRow: false,//控制视图切换状态 - isHiddenDropdown: true,//控制筛选下拉菜单显隐 - - list: null, - isLoading: false, // 检测是否已经发送请求,防止重复发送请求 - noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 - pageNum: 1, // 当前页数 - - - rank_switch: false, - card_field: "", - card_name: "", - max_card_field: "", - card_list: null, - - isAll: true, - - default_img: '/miniapp/images/default_g_img.gif', + isInputFocus: false,//记录搜索输入框是否聚焦 + inputVal: '',//记录搜索输入框的内容 + isSort: false,//控制排序开关状态，true开启排序 + isDescending: false, //isDescending降序，ascending升序 + imghost: '', + url: os.imghost, + + tabArr: ['最新', '销量', '评论', '价格'], + currentTabIndex: 0, + isShowRow: false,//控制视图切换状态 + isHiddenDropdown: true,//控制筛选下拉菜单显隐 + + list: null, + isLoading: false, // 检测是否已经发送请求,防止重复发送请求 + noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 + pageNum: 1, // 当前页数 + + + rank_switch: false, + card_field: "", + card_name: "", + max_card_field: "", + card_list: null, + + isAll: true, + + default_img: '/miniapp/images/default_g_img.gif', }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - - wx.setNavigationBarTitle({ - title: "我的小店", - }); - self = this;//保存全局指针 - app.isLogin().then(function(data) {//进入页面前已经授权登录成功 - self.setData({ - userInfo: data, - }); - }); - - //从别人的分享的跳转过来 - var first_leader = decodeURIComponent(options.scene); - if(first_leader && first_leader!='undefined'){ - getApp().globalData.first_leader=first_leader; - this.data.first_leader=first_leader; - - getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + first_leader, { - isShowLoading:false, - data:{r:Math.random()}, - success: function (e) { - if(e.data.code==0){ - self.setData({ - userInfo2:e.data.data, - }); - }; - - }, - }); - - } - - - // 判断会员是否授权登录， - // 没有登录则跳转到登录页， - // 已登录则设置已登录状态，请求加载签到数据 - // isLogin记录登录状态 - // app.isLogin().then(function(data) { - // // 1.登录成功 - // self.setData({ - // isLogin: true, - // userInfo: data, - // currentQuery: { - // store_id: app.globalData.setting.stoid, - // user_id: app.globalData.user_id, - // }, - // }); - // // 2.请求全部商品数据 - // self.getData(true, '/api/weshop/users/distribut/pagemyshop', self.data.currentQuery); - // // 3.请求新品 - // app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?type=2', { - // data: self.data.currentQuery, - // }).then(function(res) { - // self.setData({ - // newList: res.data.data, - // }); - // }) - // }); + console.log(options); + wx.setNavigationBarTitle({ + title: "我的小店", + }); + + self = this;//保存全局指针 + app.isLogin().then(function (data) {//进入页面前已经授权登录成功 + self.setData({ + userInfo: data, + }); + }); + //从别人的分享的跳转过来 + var first_leader = decodeURIComponent(options.scene); + if (first_leader && first_leader != 'undefined') { + getApp().globalData.first_leader = first_leader; + this.data.first_leader = first_leader; + + getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + first_leader, { + isShowLoading: false, + data: { r: Math.random() }, + success: function (e) { + if (e.data.code == 0) { + self.setData({ + userInfo2: e.data.data, + }); + }; + + }, + }); + + } + + + // 判断会员是否授权登录， + // 没有登录则跳转到登录页， + // 已登录则设置已登录状态，请求加载签到数据 + // isLogin记录登录状态 + // app.isLogin().then(function(data) { + // // 1.登录成功 + // self.setData({ + // isLogin: true, + // userInfo: data, + // currentQuery: { + // store_id: app.globalData.setting.stoid, + // user_id: app.globalData.user_id, + // }, + // }); + // // 2.请求全部商品数据 + // self.getData(true, '/api/weshop/users/distribut/pagemyshop', self.data.currentQuery); + // // 3.请求新品 + // app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?type=2', { + // data: self.data.currentQuery, + // }).then(function(res) { + // self.setData({ + // newList: res.data.data, + // }); + // }) + // }); }, /** * 生命周期函数--监听页面初次渲染完成 */ - onReady: function () {}, + onReady: function () { }, /** * 生命周期函数--监听页面显示 */ onShow: function () { - //自己登录的 - if(app.globalData.userInfo && !this.data.first_leader) { - if(!this.data.isLogin) { - this.setData({ - userInfo: app.globalData.userInfo, - imghost: app.globalData.setting.imghost, - currentQuery: { - store_id: app.globalData.setting.stoid, - user_id: app.globalData.user_id, - }, - isLogin: true, - }); - - // 请求数据 - app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?orderType=desc', { - data: this.data.currentQuery, - }).then(res => { - self.setData({ - list: res.data.data, - total: res.data.data.total, - }); - }); - - // 新品 - app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?type=2&orderType=desc', { - data: self.data.currentQuery, - }).then(res => { - self.setData({ - newList: res.data.data, - }); - }); - // 广告banner - app.request.promiseGet("/api/weshop/ad/page", { - data: { - pid: 401, - enabled: 1, - store_id: app.globalData.setting.stoid, - } - }).then(res => { - if(res.data.code == 0 && res.data.data) { - let item = res.data.data.pageData[0]; - if(item && item.ad_code) { - self.setData({ - ad_img: item.ad_code, - }); - }; - }; - }); - - }; - } - //被人分享点击开的 - else if(this.data.first_leader){ - this.setData({ - imghost: app.globalData.setting.imghost, - currentQuery: { - store_id: app.globalData.setting.stoid, - user_id: this.data.first_leader, - }, - isLogin: true, - }); - - // 请求数据 - this.getData(true, '/api/weshop/users/distribut/pagemyshop', this.data.currentQuery); - // 新品 - app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?type=2', { - data: self.data.currentQuery, - }).then(res => { - self.setData({ - newList: res.data.data, - }); - }); - // 广告banner - app.request.promiseGet("/api/weshop/ad/page", { - data: { - pid: 401, - enabled: 1, - store_id: app.globalData.setting.stoid, - } - }).then(res => { - if(res.data.code == 0 && res.data.data) { - let item = res.data.data.pageData[0]; - if(item && item.ad_code) { - self.setData({ - ad_img: item.ad_code, - }); - }; - }; - }); - } - var th=this; - //更新一下会员的信息 - if(getApp().globalData.user_id) { - if(!getApp().globalData.userInfo['is_distribut']){ - th.setData({ishidden_comise:1}) - } - getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { - isShowLoading:false, - 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 && user['card_expiredate']) { - 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, 8); - th.setData({ - card_field: user.card_field, - card_name: card_name, - card_list: ob.card_list - }); - } - } - }, 500) - }) - } - }) - } - }) - } - - + //自己登录的 + if (app.globalData.userInfo && !this.data.first_leader) { + if (!this.data.isLogin) { + this.setData({ + userInfo: app.globalData.userInfo, + imghost: app.globalData.setting.imghost, + isLogin: true, + currentQuery: { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + }, + }); + // 请求数据 + app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?orderType=desc', { + data: this.data.currentQuery, + }).then(res => { + self.setData({ + list: res.data.data, + total: res.data.data.total, + }); + }); + + // 新品 + app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?type=2&orderType=desc', { + data: self.data.currentQuery, + }).then(res => { + self.setData({ + newList: res.data.data, + }); + }); + // 广告banner + app.request.promiseGet("/api/weshop/ad/page", { + data: { + pid: 401, + enabled: 1, + store_id: app.globalData.setting.stoid, + } + }).then(res => { + if (res.data.code == 0 && res.data.data) { + let item = res.data.data.pageData[0]; + if (item && item.ad_code) { + self.setData({ + ad_img: item.ad_code, + }); + }; + }; + }); + + }; + } + //被人分享点击开的 + else if (this.data.first_leader) { + console.log(11); + this.setData({ + imghost: app.globalData.setting.imghost, + currentQuery: { + store_id: app.globalData.setting.stoid, + user_id: this.data.first_leader, + }, + isLogin: true, + }); + console.log('fenxiang'); + // 请求数据 + this.getData(true, '/api/weshop/users/distribut/pagemyshop', this.data.currentQuery); + // 新品 + app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?type=2', { + data: self.data.currentQuery, + }).then(res => { + self.setData({ + newList: res.data.data, + }); + }); + // 广告banner + app.request.promiseGet("/api/weshop/ad/page", { + data: { + pid: 401, + enabled: 1, + store_id: app.globalData.setting.stoid, + } + }).then(res => { + if (res.data.code == 0 && res.data.data) { + let item = res.data.data.pageData[0]; + if (item && item.ad_code) { + self.setData({ + ad_img: item.ad_code, + }); + }; + }; + }); + } + var th = this; + //更新一下会员的信息 + if (getApp().globalData.user_id) { + if (!getApp().globalData.userInfo['is_distribut']) { + th.setData({ ishidden_comise: 1 }) + } + getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { + isShowLoading: false, + 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 && user['card_expiredate']) { + 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, 8); + th.setData({ + card_field: user.card_field, + card_name: card_name, + card_list: ob.card_list + }); + } + } + }, 500) + }) + } + }) + } + }) + } + + if (app.globalData.key_word) { + this.setData({ + inputVal: app.globalData.key_word, + }) + this.search(); + } }, /** @@ -268,7 +273,7 @@ Page({ * 生命周期函数--监听页面卸载 */ onUnload: function () { - + app.globalData.key_word=null; }, /** @@ -282,449 +287,449 @@ Page({ * 页面上拉触底事件的处理函数 */ onReachBottom: function () { - let url = ''; - if(this.data.isAll) { - url = '/api/weshop/users/distribut/pagemyshop'; - } else { - url = '/api/weshop/users/distribut/pagemyshop?type=2'; - }; - this.scrollToLower(url, this.data.currentQuery); + let url = ''; + if (this.data.isAll) { + url = '/api/weshop/users/distribut/pagemyshop'; + } else { + url = '/api/weshop/users/distribut/pagemyshop?type=2'; + }; + this.scrollToLower(url, this.data.currentQuery); }, /** * 用户点击右上角分享 *--点击分享事件--分享我的小店 *--*/ - onShareAppMessage: function(t) { - + onShareAppMessage: function (t) { + var th = this; - var title= "我的小店"; - var user_id=this.data.first_leader; - if(!user_id){ - user_id=getApp().globalData.user_id - } - var url="/packageA/pages/distribution/shop/shop?scene=" + user_id; - if(getApp().globalData.user_id){ - url+="&first_leader="+getApp().globalData.user_id; + var title = "我的小店"; + var user_id = this.data.first_leader; + if (!user_id) { + user_id = getApp().globalData.user_id } - - var ob={ + var url = "/packageA/pages/distribution/shop/shop?scene=" + user_id; + if (getApp().globalData.user_id) { + url += "&first_leader=" + getApp().globalData.user_id; + } + + var ob = { title: title, - path:url, - }; + path: url, + }; return ob; - + + }, + + /** + * 点击下拉菜单 + */ + clickDropdown() { + this.setData({ + isHiddenDropdown: !this.data.isHiddenDropdown, + }); + }, + + /** + * 点击遮罩层 + */ + clickMask() { + this.setData({ + isHiddenDropdown: true, + }); + }, + + /** + * 选择下拉菜单项 + */ + selectDropdown(e) { + let currentIndex = e.target.dataset.index; + this.setData({ + isHiddenDropdown: true, + currentSelect: this.data.dropdownArr[currentIndex], + }); + }, + + /** + * 搜索输入框聚焦 + */ + inputFocus() { + this.setData({ + isInputFocus: true, + }); + }, + + + /** + * 搜索输入框失焦 + */ + inputBlur() { + this.setData({ + isInputFocus: false, + }); + }, + + /** + * 获取搜索输入框输入的内容 + */ + input(e) { + this.data.inputVal = e.detail.value; + }, + + /** + * 搜索输入框清空内容 + */ + inputClear() { + let inputVal = this.data.inputVal; + console.log('input', inputVal); + if (inputVal) { + this.setData({ + inputVal: '', + }); + }; + }, + + /** + * 搜索输入框聚焦 + */ + search() { + let data = this.data.currentQuery; + data.key = this.data.inputVal; + if (data.orderField) { + delete data.orderField; + }; + if (data.page) { + delete data.page; + }; + this.setData({ + currentTabIndex: 4, + isSort: false, + isDescending: false, + currentQuery: data, + pageNum: 1, + }); + this.getData(true, '/api/weshop/users/distribut/pagemyshop', data); + }, + + /** + * 点击排序 + */ + clickSort(e) { + let data = this.data.currentQuery; + // data.orderField = 'shop_price'; + data.orderField = 'prom_price'; + if (data.page) { + delete data.page; + }; + if (!this.data.isSort) { + this.setData({ + isSort: true, + }); + data.orderType = 'asc'; + } else { + this.setData({ + isDescending: !this.data.isDescending, + }); + + if (this.data.isDescending) { + data.orderType = 'desc'; + } else { + data.orderType = 'asc'; + }; + + }; + console.log('当前参数:', data); + + this.setData({ + currentQuery: data, + noMore: false, + }); + + // 请求数据 + this.getData(true, '/api/weshop/users/distribut/pagemyshop', data); + }, + + /** + * 点击视图切换按钮 + */ + change() { + this.setData({ + isShowRow: !this.data.isShowRow + }); + }, + + /** + * 点击Tab + */ + clickTab(e) { + let data = this.data.currentQuery; + let isSort = this.data.isSort; + let currentIndex = e.target.dataset.index; + if (currentIndex != 3) { + if (isSort) { + isSort = false; + }; + if (data.orderType) {// 清除orderType + delete data.orderType; + }; + }; + this.setData({ + list: null, + isAll: true, + currentTabIndex: currentIndex, + isSort, + pageNum: 1, + noMore: false, + }); + if (data.page) {// 清除page + delete data.page; + }; + + + + if (currentIndex == 0) { + if (data.orderField) {// 清除orderField + delete data.orderField; + }; + }; + if (currentIndex == 1) { + data.orderField = 'sales_sum'; + }; + if (currentIndex == 2) { + data.orderField = 'comment_count'; + }; + + if (currentIndex == 3) { + // console.log('点击价格'); + if (data.orderType) {// 清除orderType + delete data.orderType; + }; + return; + }; + data.orderType = 'desc'; + this.data.currentQuery = data; + this.getData(true, '/api/weshop/users/distribut/pagemyshop', data); + }, + + /** + * 点击筛选 + */ + clickFilter() { + this.setData({ + isHiddenDropdown: !this.data.isHiddenDropdown, + }); + }, + + /** + * 点击遮罩层，关闭筛选下拉菜单 + */ + clickMask() { + if (!this.data.isHiddenDropdown) { + this.setData({ + isHiddenDropdown: true, + }); + } + }, + + /** + * 请求数据 + */ + getData: function (isInit, url, data) { + + app.request.promiseGet(url, { + data: data, + isShowLoading: true, + }) + .then(function (res) { + // console.log('1121', res.data.code); + if (res.data.code == 0) { + + self.setData({ + isLoading: false + }); + + if (isInit) {// 第一次加载 + self.setData({ + list: res.data.data, + }); + } else { + self.setData({ + 'list.pageData': self.data.list.pageData.concat(res.data.data.pageData) + }); + }; + + if ((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) { + self.setData({ + noMore: true + }); + }; + + } else { + self.setData({ + 'list.pageData': [] + }); + }; + + }) + .catch(function (err) { + console.log('出错拉！！！！', err); + self.setData({ + 'list.pageData': [] + }); + }); + }, + + + /** + * 上拉加载 + */ + scrollToLower(url, requestData) { + + // 数据总量 + let total = this.data.list.total; + // 单页最大数据量 + let pageSize = this.data.list.pageSize; + // 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’ + if ((total != 0) && (total <= pageSize)) { + this.setData({ + noMore: true + }); + }; + + if (!this.data.isLoading && !this.data.noMore) { + this.setData({ + isLoading: true, + pageNum: this.data.pageNum + 1 + }); + requestData.page = this.data.pageNum; + console.log('滚动data:', requestData); + this.getData(false, url, requestData); + }; + }, + + /** + * 点击跳转 + */ + goto(e) { + let url = ''; + if (e.target.dataset.url) { + url = e.target.dataset.url; + } else { + url = e.currentTarget.dataset.url; + } + app.goto(url); + }, + + + //--- 获取卡类列表 --- + getPlusCardType: function (func) { + var storid = os.stoid; + var th = this; + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, + {}).then(res => { + + if (res.data.code != 0 || !res.data.data) { + var ob = { + "card_list": [], + "name_map": "" + }; + func(ob); + return false; + } + + 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; + if (plusCard) { + 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); + }) + }, + + + /** + * 点击全部 + */ + clickAll() { + let data = this.data.currentQuery; + + if (data.page) delete data.page; + if (data.orderField) delete data.orderField; + if (data.orderType) delete data.orderType; + if (data.key) delete data.key; + + this.setData({ + pageNum: 1, + noMore: false, + isAll: true, + }); + + this.getData(true, '/api/weshop/users/distribut/pagemyshop', data); + }, + + /** + * 点击新品 + */ + clickNew() { + let data = this.data.currentQuery; + + if (data.page) delete data.page; + if (data.orderField) delete data.orderField; + if (data.orderType) delete data.orderType; + if (data.key) delete data.key; + + this.setData({ + pageNum: 1, + noMore: false, + isAll: false, + }); + + this.getData(true, '/api/weshop/users/distribut/pagemyshop?type=2&orderType=desc', data); + // app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?type=2', { + // data: data, + // }).then(res => { + // self.setData({ + // list: res.data.data, + // }); + // }); + }, + + + /** + * 点击新品 + */ + // imgError(e) { + // this.setData({ + // noImg: true, + // }); + // }, + + + bind_bnerr2: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errurl = e.target.dataset.url; + var ii = _errurl.indexOf(oo.imghost); + if (ii != -1) { + var _errObj = {}; + _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } }, - - /** - * 点击下拉菜单 - */ - clickDropdown() { - this.setData({ - isHiddenDropdown: !this.data.isHiddenDropdown, - }); - }, - - /** - * 点击遮罩层 - */ - clickMask() { - this.setData({ - isHiddenDropdown: true, - }); - }, - - /** - * 选择下拉菜单项 - */ - selectDropdown(e) { - let currentIndex = e.target.dataset.index; - this.setData({ - isHiddenDropdown: true, - currentSelect: this.data.dropdownArr[currentIndex], - }); - }, - - /** - * 搜索输入框聚焦 - */ - inputFocus() { - this.setData({ - isInputFocus: true, - }); - }, - - - /** - * 搜索输入框失焦 - */ - inputBlur() { - this.setData({ - isInputFocus: false, - }); - }, - - /** - * 获取搜索输入框输入的内容 - */ - input(e) { - this.data.inputVal = e.detail.value; - }, - - /** - * 搜索输入框清空内容 - */ - inputClear() { - let inputVal = this.data.inputVal; - console.log('input', inputVal); - if(inputVal) { - this.setData({ - inputVal: '', - }); - }; - }, - - /** - * 搜索输入框聚焦 - */ - search() { - let data = this.data.currentQuery; - data.key = this.data.inputVal; - if(data.orderField) { - delete data.orderField; - }; - if(data.page) { - delete data.page; - }; - this.setData({ - currentTabIndex: 4, - isSort: false, - isDescending: false, - currentQuery: data, - pageNum: 1, - }); - this.getData(true, '/api/weshop/users/distribut/pagemyshop', data); - }, - - /** - * 点击排序 - */ - clickSort(e) { - let data = this.data.currentQuery; - // data.orderField = 'shop_price'; - data.orderField = 'prom_price'; - if(data.page) { - delete data.page; - }; - if(!this.data.isSort) { - this.setData({ - isSort: true, - }); - data.orderType = 'asc'; - } else { - this.setData({ - isDescending: !this.data.isDescending, - }); - - if(this.data.isDescending) { - data.orderType = 'desc'; - } else { - data.orderType = 'asc'; - }; - - }; - console.log('当前参数:', data); - - this.setData({ - currentQuery: data, - noMore: false, - }); - - // 请求数据 - this.getData(true, '/api/weshop/users/distribut/pagemyshop', data); - }, - - /** - * 点击视图切换按钮 - */ - change() { - this.setData({ - isShowRow: !this.data.isShowRow - }); - }, - - /** - * 点击Tab - */ - clickTab(e) { - let data = this.data.currentQuery; - let isSort = this.data.isSort; - let currentIndex = e.target.dataset.index; - if(currentIndex != 3) { - if(isSort) { - isSort = false; - }; - if(data.orderType) {// 清除orderType - delete data.orderType; - }; - }; - this.setData({ - list: null, - isAll: true, - currentTabIndex: currentIndex, - isSort, - pageNum: 1, - noMore: false, - }); - if(data.page) {// 清除page - delete data.page; - }; - - - - if(currentIndex == 0) { - if(data.orderField) {// 清除orderField - delete data.orderField; - }; - }; - if(currentIndex == 1) { - data.orderField = 'sales_sum'; - }; - if(currentIndex == 2) { - data.orderField = 'comment_count'; - }; - - if(currentIndex == 3) { - // console.log('点击价格'); - if(data.orderType) {// 清除orderType - delete data.orderType; - }; - return; - }; - data.orderType = 'desc'; - this.data.currentQuery = data; - this.getData(true, '/api/weshop/users/distribut/pagemyshop', data); - }, - - /** - * 点击筛选 - */ - clickFilter() { - this.setData({ - isHiddenDropdown: !this.data.isHiddenDropdown, - }); - }, - - /** - * 点击遮罩层，关闭筛选下拉菜单 - */ - clickMask() { - if(!this.data.isHiddenDropdown) { - this.setData({ - isHiddenDropdown: true, - }); - } - }, - - /** - * 请求数据 - */ - getData: function(isInit, url, data) { - - app.request.promiseGet(url, { - data: data, - isShowLoading: true, - }) - .then(function(res) { - // console.log('1121', res.data.code); - if(res.data.code == 0) { - - self.setData({ - isLoading: false - }); - - if(isInit) {// 第一次加载 - self.setData({ - list: res.data.data, - }); - } else { - self.setData({ - 'list.pageData': self.data.list.pageData.concat(res.data.data.pageData) - }); - }; - - if((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) { - self.setData({ - noMore: true - }); - }; - - } else { - self.setData({ - 'list.pageData': [] - }); - }; - - }) - .catch(function(err) { - console.log('出错拉！！！！',err); - self.setData({ - 'list.pageData': [] - }); - }); - }, - - - /** - * 上拉加载 - */ - scrollToLower(url, requestData) { - - // 数据总量 - let total = this.data.list.total; - // 单页最大数据量 - let pageSize = this.data.list.pageSize; - // 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’ - if((total != 0)&&(total <= pageSize)) { - this.setData({ - noMore: true - }); - }; - - if(!this.data.isLoading && !this.data.noMore) { - this.setData({ - isLoading: true, - pageNum: this.data.pageNum + 1 - }); - requestData.page = this.data.pageNum; - console.log('滚动data:', requestData); - this.getData(false, url, requestData); - }; - }, - - /** - * 点击跳转 - */ - goto(e) { - let url = ''; - if(e.target.dataset.url) { - url = e.target.dataset.url; - } else { - url = e.currentTarget.dataset.url; - } - app.goto(url); - }, - - - //--- 获取卡类列表 --- - getPlusCardType: function (func) { - var storid = os.stoid; - var th = this; - getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, - {}).then(res => { - - if(res.data.code!=0 || !res.data.data){ - var ob = { - "card_list": [], - "name_map": "" - }; - func(ob); - return false; - } - - 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; - if(plusCard) { - 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); - }) - }, - - - /** - * 点击全部 - */ - clickAll() { - let data = this.data.currentQuery; - - if(data.page) delete data.page; - if(data.orderField) delete data.orderField; - if(data.orderType) delete data.orderType; - if(data.key) delete data.key; - - this.setData({ - pageNum: 1, - noMore: false, - isAll: true, - }); - - this.getData(true, '/api/weshop/users/distribut/pagemyshop', data); - }, - - /** - * 点击新品 - */ - clickNew() { - let data = this.data.currentQuery; - - if(data.page) delete data.page; - if(data.orderField) delete data.orderField; - if(data.orderType) delete data.orderType; - if(data.key) delete data.key; - - this.setData({ - pageNum: 1, - noMore: false, - isAll: false, - }); - - this.getData(true, '/api/weshop/users/distribut/pagemyshop?type=2&orderType=desc', data); - // app.request.promiseGet('/api/weshop/users/distribut/pagemyshop?type=2', { - // data: data, - // }).then(res => { - // self.setData({ - // list: res.data.data, - // }); - // }); - }, - - - /** - * 点击新品 - */ - // imgError(e) { - // this.setData({ - // noImg: true, - // }); - // }, - - - bind_bnerr2: function (e) { - var _errImg = e.target.dataset.errorimg; - var _errurl = e.target.dataset.url; - var ii = _errurl.indexOf(oo.imghost); - if (ii != -1) { - var _errObj = {}; - _errObj[_errImg] = this.data.iurl+"/miniapp/images/default_g_img.gif"; - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; - } - }, }) \ No newline at end of file diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml index b1a4555..dfa6459 100644 --- a/packageA/pages/distribution/shop/shop.wxml +++ b/packageA/pages/distribution/shop/shop.wxml @@ -37,6 +37,7 @@ + diff --git a/packageA/pages/distribution/shop/shop.wxss b/packageA/pages/distribution/shop/shop.wxss index 6842380..c4028f6 100644 --- a/packageA/pages/distribution/shop/shop.wxss +++ b/packageA/pages/distribution/shop/shop.wxss @@ -100,10 +100,6 @@ page { margin-top: 20rpx; } */ -.money { - /* word-break: break-all; - word-wrap: break-word; */ -} .money::before { content: '￥'; font-size: 22rpx; @@ -236,10 +232,10 @@ page { /*checkbox 整体大小 */ -checkbox { +/* checkbox { */ /* width: 240rpx; height: 90rpx; */ -} +/* } */ /*checkbox 选项框大小 */ checkbox .wx-checkbox-input { width: 34rpx; diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 069d73a..2189a74 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -893,6 +893,16 @@ Page({ }).then(res => { var e = res; if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) { + + var his_cate_num=0; + for(let i in e.data.data.pageData){ + let item=e.data.data.pageData[i]; + if(item.category_id>0){ + his_cate_num=1;break; + } + } + e.his_cate_num=his_cate_num; + //--普通门店排版-- setTimeout(function(){ var sto_list=th.data.data.storageId; @@ -944,7 +954,7 @@ Page({ if(!th.data.data) return false wx.hideLoading(); //单总量超出5个的时候 - if (e.data.data.total > 5) { + if (e.data.data.total > 10 && e.his_cate_num) { getApp().request.get("/api/weshop/storagecategory/page", { data: { store_id: o.stoid, diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index e368494..207cf67 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -158,19 +158,19 @@ - + - - + 客服 - - + + {{cartGoodsNum}} 购物车 diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index b69427e..2524de5 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -70,7 +70,9 @@ Page({ is_lable_set: "", //是否启用我的兴趣标签 check_label: [], //我选择的兴趣标签 fir_guide_id:null, //存储会员详情接口出来的美导ID - isLunar: 0, + isLunar: 0, + lat: null, //维度 + lon: null, //经度 }, //通过路径跳转到其他页面 @@ -258,6 +260,15 @@ Page({ success:function(res){ var e = res; if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) { + + var ishas_cate=0; + for(let i in e){ + let item=e[i]; + if(item.category_id>0) { + ishas_cate=1;break; + } + } + //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- if (th.data.def_pick_store) { for (var k = 0; k < e.data.data.pageData.length; k++) { @@ -270,7 +281,7 @@ Page({ } //单总量超出5个的时候 - if (e.data.data.total > 5) { + if (e.data.data.total > 10 && ishas_cate) { i.get("/api/weshop/storagecategory/page", { data: { store_id: r.stoid, @@ -613,6 +624,9 @@ Page({ sto_sele_id: data.pickup_id, }); } + if(!self.data.sto_sele_id){ + self.get_store_set(); + } }) }else{ self.setData({ @@ -622,7 +636,11 @@ Page({ stoname: data.pickup_name, sto_sele_id: data.pickup_id, }); - } + } + + if(!self.data.sto_sele_id){ + self.get_store_set(); + } }; } }); @@ -1174,6 +1192,83 @@ Page({ // } // }) }, + + + get_store_set:function () { + var th=this; + //如果是扫码进来的 + if(getApp().globalData.store_number){ + var dd = { + store_id: r.stoid, + isstop: 0, + pageSize: 1, + page:1, + pickup_no:getApp().globalData.store_number + }; + + //获取扫码的门店 + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: dd, + }).then(res => { + var top_store=res.data.data.pageData[0]; + th.setData({ + stoname: top_store.pickup_name, + sto_sele_name: top_store.pickup_name, + sto_sele_id: top_store.pickup_id, + sto_sele_distr: top_store.distr_type, + }) + }) + + }else{ + wx.getLocation({ + type: 'gcj02', + success: function(res) { + th.data.lat = res.latitude; + th.data.lon = res.longitude; + th.set_fir_store_to_def(); + }, + fail: function(res) { + if(res.errCode == 2) { + getApp().confirmBox("请开启GPS定位", null, 25000, !1); + } + } + }) + } + }, + + + //-- 设置最近的店为默认的店,一开始加载的时候 -- + set_fir_store_to_def(){ + var th=this; + var dd = { + store_id: r.stoid, + isstop: 0, + pageSize: 1, + page:1, + }; + dd.lat = th.data.lat; + dd.lon = th.data.lon; + + var top_store=getApp().globalData.pk_store; + if(top_store){ + dd.pickup_id=top_store.pickup_id; + } + + //----------获取门店,最近的门店---------------- + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: dd, + }).then(res => { + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + var top_store=res.data.data.pageData[0]; + th.setData({ + stoname: top_store.pickup_name, + sto_sele_name: top_store.pickup_name, + sto_sele_id: top_store.pickup_id, + sto_sele_distr: top_store.distr_type, + }) + } + }) + }, diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index cb2b603..f97efbd 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -765,7 +765,15 @@ Page({ data: dd, }).then(res => { var e = res; - if (e.data.code == 0) { + if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) { + var his_cate_num=0; + for(let i in e.data.data.pageData){ + let item=e.data.data.pageData[i]; + if(item.category_id>0){ + his_cate_num=1;break; + } + } + e.his_cate_num=his_cate_num; //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){ @@ -811,7 +819,7 @@ Page({ deal_pickup(e){ var th=this; //单总量超出5个的时候 - if (e.data.data.total > 5) { + if (e.data.data.total > 10 && e.his_cate_num ){ getApp().request.get("/api/weshop/storagecategory/page", { data: { store_id: o.stoid, @@ -1024,8 +1032,9 @@ Page({ //数据组装下 var em={};em.data={};em.data.data={}; em.data.data.total=new_list.length; - em.data.data.pageData=new_list; - + em.data.data.pageData=new_list; + em.data.his_cate_num=e.his_cate_num; + if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id){ th.data.fir_def_store.CanOutQty=0; //--当选择的门店是客户默认的门店的时候-- diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index c0a7545..7b4283d 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -125,7 +125,29 @@ Page({ */ onLoad: function (options) { self = this; - this.data.id = options.id; + var the_id = options.id; + var first_leader=''; + //--如果tg_id是空的话，分享回来-- + if (the_id == undefined || the_id == null || the_id == "") { + var gid_str = decodeURIComponent(options.scene); + gid_str=gid_str.split("_"); + the_id=gid_str[0]; + if(gid_str.length>1){ + first_leader=gid_str[1]; + } + } + + this.data.id=the_id; + if(first_leader){ + getApp().globalData.first_leader=first_leader; + //调用接口判断是不是会员 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{ + if(res.data.code==0){ + getApp().globalData.guide_id=res.data.data.id; + } + }) + } + //如果有会员的时候 var userInfo = getApp().globalData.userInfo; if(!userInfo){ @@ -204,7 +226,7 @@ Page({ scene += "_" + user_id; ///二微码 var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; + os.stoid + "?sceneValue=" + scene + "&pageValue=packageB/pages/zuhegou/index/index"; wx.getImageInfo({ src: path3, success: function (res) { @@ -1139,7 +1161,7 @@ Page({ get_sto(e) { var th = this; this.waitfor2(15, 'is_get_local_ok', function () { - if (!th.data.sele_g) return false; + //if (!th.data.sele_g) return false; var dd = null; var g_distr_type =0; if(th.data.sele_g) g_distr_type=th.data.sele_g.distr_type; @@ -1411,9 +1433,10 @@ Page({ item = th.data.sec_sto.s_arr[index]; } - if (!th.data.sele_g) return false; //判断门店的配送方式是不是匹配 - var g_distr_type = th.data.sele_g.distr_type; + var g_distr_type=0; + if (th.data.sele_g) + g_distr_type = th.data.sele_g.distr_type; if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) { wx.showToast({ title: "门店配送方式不匹配", @@ -1652,6 +1675,9 @@ Page({ this.setData({ store: 1 }) + + + this.get_sto() }, // -- 加入之前，先判断有没有在购物车中,没有商品就添加 -- diff --git a/packageB/pages/zuhegou/index/index.wxml b/packageB/pages/zuhegou/index/index.wxml index 55fa95d..3528c56 100644 --- a/packageB/pages/zuhegou/index/index.wxml +++ b/packageB/pages/zuhegou/index/index.wxml @@ -17,7 +17,11 @@ 门店: - {{def_pick_store.pickup_name}} + + {{def_pick_store.pickup_name}} + {{def_pick_store.pickup_name}} + + 请选择门店 diff --git a/packageC/pages/goods/distributionCategoryList/g_filter.wxs b/packageC/pages/goods/distributionCategoryList/g_filter.wxs new file mode 100644 index 0000000..429e75a --- /dev/null +++ b/packageC/pages/goods/distributionCategoryList/g_filter.wxs @@ -0,0 +1,91 @@ +var g_filters = { + //-- 判断是不是有等级价 -- + is_has_rank:function(rank_switch,item){ + if(!rank_switch) return false; + if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true} + return false; + }, + + //-- 判断,不是等级会员时候，要显示的最低等级价和名称 -- + get_card_price:function(goods,all_card,type){ + var price1=parseFloat(goods['cardprice1']); + var price2=parseFloat(goods['cardprice2']); + var price3=parseFloat(goods['cardprice3']); + if(!all_card){ + if(type==0) return 0; + return ""; + } + + + var arr=[]; + var min_price= 0; + var min_name=""; + + var min_price=null; + var min_name=null; + //---设置对应的价格名字---- + for(var i=0;i<3;i++) { + var vl=all_card[i]; + if(!vl) continue; + if(vl['CorrPrice']=="Price1" && price1>0) + { + + if(min_price==null) { + min_price=price1;min_name=vl['CardName']; + } + else if(price10) + { + if(min_price==null) { + min_price=price2;min_name=vl['CardName']; + } + else if(price20) + { + if(min_price==null) { + min_price=price3;min_name=vl['CardName']; + } + else if(price34) min_name=min_name.substring(0, 8); + return min_name; + }, +} +module.exports = { + is_has_rank:g_filters.is_has_rank, + get_card_price:g_filters.get_card_price, +} \ No newline at end of file diff --git a/packageC/pages/goods/distributionCategoryList/index.js b/packageC/pages/goods/distributionCategoryList/index.js new file mode 100644 index 0000000..d0f6d6d --- /dev/null +++ b/packageC/pages/goods/distributionCategoryList/index.js @@ -0,0 +1,724 @@ +const { app } = require("../../../../utils/common"); +let startY = 0; +let endY = 0; +let isReachBt = 0; +let moveDistance = 0; +const t = getApp(), e = t.request, oo = t.globalData.setting; +var i = function (i) { + return i && i.__esModule ? i : { + default: i + }; +}(require("../../../../utils/LoadMore")), a = new i.default(), ut = require("../../../../utils/util.js"); +//t = i,e = t +Page({ + data: { + is_date: true, + scrollHeight: 0, + currentTab: -1, + abc: 0, + windowHeight: 0, + windowWidth: 0, + eachLetterHeight: 0, + lettersPosition: 0, + catelist: null, //分类读取 + nationlist: null,//国家读取 + groups: null, //品牌读取 + iurl: oo.imghost,//图片地址 + + //控制新旧分类版本 + is_used_share: 0, + //国家的控制属性 + is_country: 1, + //品牌的控制属性 + is_brand: 1, + //选择分类的控制属性 + select_classify_on: 223, + index: 223, + classify_name: "国家",//项目类型 + brand_list: null,//品牌列表 + + catelist: [],// 新的版本左边的边分类1级 + is_level_three: 0,//判断有没有3级 + cat_id: 0, + pl_timer: null,//只有品类的定时器 + is_pl_time: 0, + requestData: null, //风格三的商品数据列表 分页 + stylePage: 1, //商品列表分页标识 + + //风格三使用 + url: t.globalData.setting.imghost, + currentPage: 1, + allData: null, + openFilterModal: !1, + baseUrl: "/api/weshop/users/distribut/pagemyshop?orderType=desc", + requestUrl: "", + tabname: "goods_id", //排序的字段 + adname: "desc", //升降的字段 + is_new: 0, + is_hot: 0, + msgStatus: false, //页面显示暂无数据状态 + countDownNum: 3, + timer: '', //定时器 + lastMsg: false, + toView: "", + is_show_class: false,//是否添加新样式 + status_show: 0, + currentTab: 0, //预设当前项的值 + load: 0, + }, + + + //判断当前滚动超过一屏时，设置tab标题滚动条。 + checkCor: function () { + let that = this; + //这里计算按照实际情况进行修改，动态数据要进行动态分析 + //思路：窗体高度/单个分类高度 200rpx 转px计算 =>得到一屏幕所显示的个数，结合后台传回分类总数进行计算 + //数据很多可以多次if判断然后进行滚动距离计算即可 + if (that.data.currentTab > 7) { + that.setData({ + scrollTop: 500 + }) + } else { + that.setData({ + scrollTop: 0 + }) + } + }, + /* onPageScroll(e){ + console.log(e); + }, + calcHeight: function calcHeight(callback) { + var query = this.createSelectorQuery(); + query.select('.weui-vtabs-content__item').boundingClientRect(function (rect) { + callback && callback(rect); + }).exec(); +}, */ + + onLoad: function (tt) { + wx.setNavigationBarTitle({ + title: "分类", + }); + var that = this;//保存全局指针 + t.isLogin().then(function (data) {//进入页面前已经授权登录成功 + console.log(data); + that.setData({ + userInfo: data, + }); + }); + var first_leader = tt.first_leader; + if (first_leader) { + //-- user_id代过来免登录 -- + getApp().globalData.first_leader = first_leader; + } + + that.get_brand(); + clearInterval(that.data.timer); + that.setData({ countDownNum: 3, stylePage: 1 }); + + const res = wx.getSystemInfoSync(), + letters = this.data.letters; + this.setData({ + abc: t.globalData.heigth - 88 - 88 - 16, + windowHeight: res.windowHeight, + windowWidth: res.windowWidth, + + }); + + if (this.data.is_used_share == 0) { + this.get_nation(); + } + + getApp().getConfig2(function (e) { + var data = e; + var switch_list_data = data.switch_list; + var switch_list = JSON.parse(switch_list_data); + var is_newsgoodstype = switch_list.is_newsgoodstype; + if (is_newsgoodstype == undefined) { + is_newsgoodstype = 0; + } + that.setData({ is_used_share: is_newsgoodstype }); + if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); } + if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); } + if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); } + that.setData({ store_config: e, is_do: 1 }); + + //---有勾品类--- + if (that.data.is_show_pl) { + that.getGoodsCategoris(); + } + if (that.data.is_show_gb != 1 && that.data.is_show_pp != 1 && that.data.is_show_pl) { + that.data.pl_timer = setInterval(function () { + if (that.data.catelist.length > 0) { + console.log(catelist); + var item = that.data.catelist[0], arr = item.array; + //----如果有下级的时候----- + if (item.array && item.array.length > 0) { + var is_lev_thr = 0 + for (var i = 0; i < arr.length; i++) { + if (arr[i].arrays.length > 0) { is_lev_thr = 1; break; } + } + that.setData({ is_level_three: is_lev_thr }); + if (is_lev_thr != 1) { + that.setData({ select_classify_on: 0, index: 0, classify_name: item.items.name, cat_id: item.items.id, goodslist: item.array }); + console.log("id:=" + item.items.id) + that.style(that.data.stylePage, that.data.cat_id); + } else { + that.setData({ select_classify_on: 0, index: 0, classify_name: item.items.name, cat_id: item.items.id, goodslist: arr }); + console.log("id:=" + item.items.id) + that.style(that.data.stylePage, that.data.cat_id); + } + } + else { + that.setData({ select_classify_on: 0, index: 0, goodslist: null, classify_name: item.items.name, is_level_three: 0 }); + } + clearInterval(that.data.pl_timer); + } + }, 1000); + + } else if (that.data.is_show_gb != 1 && that.data.is_show_pp) { + that.setData({ select_classify_on: 220, classify_name: "品牌" }); + } + + //---如果后台又开等级卡的开关--- + if (switch_list.rank_switch && switch_list.rank_switch == "2") { + that.setData({ rank_switch: true }); + var user = getApp().globalData.userInfo; + var ti = setInterval(function () { + if (!user) return false; + clearInterval(ti); + //---回调卡的列表--- + that.getPlusCardType(function (ob) { + that.setData({ card_list: ob.card_list }); + if (user.card_field && user['card_expiredate']) { + 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); + that.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list }); + } + } + }) + }, 500) + } + var catelist = that.data.catelist; + + if (that.data.is_show_pl) that.setData({ currentTab: 0 }); + else if (that.data.is_show_gb) { that.setData({ currentTab: 1 }); that.get_nation(); } + else if (that.data.is_show_pp) { that.setData({ currentTab: 2 }); that.get_brand(); } + + //----求传参过来的控制----- + if (getApp().globalData.cat_type == 1 && that.data.is_show_gb) { + that.setData({ currentTab: 1 }); + that.get_nation(); + } else if (getApp().globalData.cat_type == 2 && that.data.is_show_pp) { + that.setData({ currentTab: 2 }); + that.get_brand(); + } else if (that.data.is_show_pl) { + that.setData({ currentTab: 0 }); + } + // 获取默认选中的第一个 + if (that.data.is_show_gb && that.data.select_classify_on == 223) { + that.setData({ status_show: 1 }); + } else if (that.data.is_show_pp && that.data.select_classify_on == 220) { + that.setData({ status_show: 2 }); + } + that.data.load = 1; + }) + }, + onShow: function () { + if (t.globalData.userInfo) { + let currentData = { + store_id: t.globalData.setting.stoid, + user_id: t.globalData.user_id, + }; + this.setData({ + userInfo: t.globalData.userInfo, + imghost: t.globalData.setting.imghost, + currentData, + }); + this.getGoodsCategoris(); + } + + }, + + + + //获取分类 + async getGoodsCategoris() { + + let { currentData } = this.data; + let Plurl = `/api/weshop/users/distribut/listmyshopCat`; + const categoris = await e.promiseGet(Plurl, { + data: currentData, + isShowLoading: false, + }); + console.log(categoris); + if (categoris.data.code == 0 && categoris.data.data.length > 0) { + let catelist = categoris.data.data; + this.setData({ + catelist, + }) + } + + }, + requestCategories: function (t) { + var s = this; + e.get("/api/goods/goodsSecAndThirdCategoryList", { + data: { + parent_id: t + }, + success: function (e) { + s.setData({ + categories: e.data.result, + currentCategoryId: t + }); + } + }); + }, + + //跳转到分类的商品列表 + go_cate: function (t) { + var cid = t.currentTarget.dataset.cid; + var pid = t.currentTarget.dataset.pid; + var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid; + lurl += "&pid=" + pid; + wx.navigateTo({ url: lurl }); + }, + + //跳转到品牌的商品列表 + go_brand: function (t) { + var cid = t.currentTarget.dataset.bid; + var lurl = "../../goods/goodsList/goodsList?brand_id=" + cid; + wx.navigateTo({ url: lurl }); + }, + + //跳转到国别的商品列表 + go_nation: function (t) { + var cid = t.currentTarget.dataset.nid; + var lurl = "../../goods/goodsList/goodsList?nation_id=" + cid; + wx.navigateTo({ url: lurl }); + }, + //获取国别 + get_nation: function () { + var s = this; + e.get("/api/weshop/users/distribut/listmyshopNation", { + data: { + store_id: oo.stoid, + user_id: t.globalData.user_id, + }, + success: function (e) { + console.log(e); + var dda = e.data.data; + s.setData({ nationlist: dda }) + } + }); + }, + + //获取品牌 + get_brand: function () { + var compare = function (prop) { + return function (obj1, obj2) { + var val1 = obj1[prop]; var val2 = obj2[prop]; + if (!isNaN(Number(val1)) && !isNaN(Number(val2))) { + val1 = Number(val1); val2 = Number(val2); + } + if (val1 < val2) { + return -1; + } else if (val1 > val2) { + return 1; + } else { return 0; } + } + } + + var s = this; + e.get("/api/weshop/users/distribut/listmyshopBrand", { + data: { + store_id: oo.stoid, + user_id: t.globalData.user_id, + }, + success: function (e) { + console.log(e); + var arr = new Array(); + var dda = e.data.data; + s.setData({ brand_list: dda }); + + for (var i = 0; i < dda.length; i++) { + //console.log(dda[i].logo) + if (dda[i].logo == "") { + dda[i].logo = s.data.iurl + "/miniapp/images/no_brand_def.jpg"; + } else if (dda[i].logo && dda[i].logo.indexOf("http") < 0) { + dda[i].logo = oo.imghost + dda[i].logo; + } + + //进行排序，只有是默认排序的时候，才按首字母排序 + if (parseInt(s.data.is_used_share) != 0) continue; + + if (arr.length > 0) { + var find = 0; + //寻找字母在arr数组中是否存在，不存在就要添加，存在就在要这个数组添加元素 + for (var k = 0; k < arr.length; k++) { + if (dda[i].zm == arr[k].zm) { find = k + 1; break; } + } + if (find == 0) { + var item = { zm: dda[i].zm, array: new Array() } + item.array.push(dda[i]); + arr.push(item); + } else { + arr[find - 1].array.push(dda[i]); + } + } else { + var item = { zm: dda[i].zm, array: new Array() } + item.array.push(dda[i]); + arr.push(item); + } + } + if (parseInt(s.data.is_used_share) == 0) { + arr.sort(compare("zm")); + } else { + var ob = { array: dda }; + arr.push(ob); + } + + s.setData({ groups: arr }); + //console.log(s.data.groups) + } + }); + }, + //---------分享配置-------- + onShareAppMessage: function (e) { + + var url = "pages/goods/categoryList/categoryList"; + var userInfo = getApp().globalData.userInfo; + //是分销商才带 + if (userInfo) { + url += "?first_leader=" + userInfo.user_id; + } + console.log("--分类分享---分享--"); + console.log(url); + + return { + title: "商品分类", + path: url, + } + }, + //图片失败，默认图片 + bind_bnerr: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, + + + getInput(e) { + this.setData({ + keyword: e.detail.value.trim(), + }); + }, + + search: function (t) { + let keyword = this.data.keyword; + if (!keyword) { + t.showWarning("请输入搜索关键词"); + return false + } + // this.search(val); + // wx.navigateTo({ + // url: `/packageA/pages/distribution/shop/shop?key_word=${val}`, + // }); + wx.navigateBack({ + delta: 1 + }); + getApp().globalData.key_word = keyword; + }, + //图片失败，默认图片 + bind_bnerr_t3: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = "/miniapp/images/default_g_img.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + + }, + + async click_classify(e) { + + clearInterval(this.data.timer); + + let { cid, current } = e.currentTarget.dataset; + this.setData({ + select_classify_on: current, + cat_id: cid, + is_no_more: 0, + isLoading: 0, + countDownNum: 3, + stylePage: 1, + is_none: 0, + }); + if (current == 220 || current == 223) { + console.log(111); + let classify_name = null; + current == 220 ? classify_name = '品牌' : classify_name = '国家'; + this.setData({ + classify_name, + }) + } else { + this.setData({ + classify_name: this.data.catelist[current].name, + }) + wx.pageScrollTo({ + scrollTop: 0 + }) + this.checkCor(); + this.requestGoodsList(); + } + // classify_name + }, + /* //分销小店的商品 + async getShopGoods() { + let { currentData, baseUrl } = this.data; + console.log(currentData); + currentData.pageSize = 2000; + console.log(currentData); + const distriGoods = await e.promiseGet(baseUrl, { + data: currentData, + isShowLoading: false, + }); + console.log(distriGoods); + if (distriGoods.data.code == 0 && distriGoods.data.data.pageData.length > 0) { + this.setData({ + shopGoodsData: distriGoods.data.data.pageData, + }) + } + }, */ + + requestGoodsList() { + if(this.data.isLoading) return false; + if(this.data.is_no_more) return false + this.data.isLoading = 1; + var th=this; + + let { currentData } = this.data; + currentData.cat_id = this.data.cat_id; + currentData.page = this.data.stylePage; + + let url = '/api/weshop/users/distribut/pagemyshop'; + getApp().promiseGet(url, { + isShowLoading: true, + data: currentData, + }).then(res=>{ + var res=res.data; + let index = this.getCurrentIndex(); + let next_classify_name = this.data.catelist[index].name; + th.setData({ + isLoading: 0, + is_get: 1, + select_classify_on: index, + classify_name: next_classify_name, + next_classify_name, + }); + + if (res.code == 0 && res.data.pageData.length > 0) { + if (res.data.page > 1) { + th.setData({ + requestData: th.data.requestData.concat(res.data.pageData), + }); + } else { + th.setData({ + requestData: res.data.pageData, + }); + } + isReachBt = 0; + + if(res.data.pageData.length<10){ + this.setData({ + is_no_more: 1, + }) + } + + } else { + //上拉加载 + if (res.data.page > 1) { + th.setData({ + is_no_more: 1, + }) + } else { + th.setData({ + requestData: [], + }); + + //如果类目为空则3秒后加载下一类目 + if(th.data.timer) { + th.data.timer=clearInterval(th.data.timer); + th.data.timer=0; + } + th.data.timer = setInterval(() => { + if(th.data.countDownNum<0){ + clearInterval(th.data.timer); + return false; + } + + th.setData({ + countDownNum: this.data.countDownNum - 1, + }); + if (th.data.countDownNum <= 0) { + clearInterval(th.data.timer); + th.get_next_cate(index); + return false; + } + }, 1000); + } + } + }) + + + }, + + //查找当前类目在 catelist的下标 为后面下一个类目使用 + getCurrentIndex() { + + let index = this.data.catelist.findIndex(item => { + return item.id == this.data.cat_id + }); + //当前处于类目最后一个 + if (index + 1 == this.data.catelist.length) { + this.setData({ + is_none: 1, + }) + }; + return index; + }, + + get_next_cate(index) { + if(this.data.isLoading) return false; + index = index + 1; + if(index==this.data.catelist.length){ + this.setData({ + is_none:1 + }) + return false; + } + let nex_cat_id = this.data.catelist[index].id; + this.setData({ + cat_id: nex_cat_id, + stylePage: 1, + is_get: 0, + is_no_more:0, + next_classify_name: this.data.catelist[index].name, + }); + this.data.car_scroll=0; + isReachBt = 0; + this.requestGoodsList(); + }, + + //选择更多 + select_more: function (e) { + var cid = e.currentTarget.dataset.cid; + var pid = e.currentTarget.dataset.pid; + var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid; + wx.navigateTo({ url: lurl }); + + }, + //扫一扫 + getScancode: function () { + // 允许从相机和相册扫码 + wx.scanCode({ + success: (res) => { + console.log(res); + var key_word = res.result; + wx.navigateBack({ + delta: 1 + }); + getApp().globalData.key_word = key_word; + } + }) + }, + onUnload: function () { + //this.destroyActivityTimer(); + }, + + onPullDownRefresh: function () { + + }, + touchstart(e) { + startY=0; + if (!this.data.is_no_more) return false; + if(isReachBt<=0) return false; + startY = e.changedTouches[0].clientY; + + }, + touchend(e) { + var th=this; + let {select_classify_on}=th.data; + setTimeout(function () { + if(!th.data.car_scroll){ + console.log('df'); + th.get_next_cate(select_classify_on); + return false; + } + + if(!startY) return false; + endY = e.changedTouches[0].clientY; + moveDistance = startY - endY; + if(moveDistance<=0){ + isReachBt=0; + return false; + } + if (th.data.is_no_more && moveDistance >= 10 && isReachBt > 0) { + th.get_next_cate(select_classify_on); + } + },50) + + + }, + // 左侧更新 + scrollLower: function () { + + console.log("low111"); + if (this.data.isLoading) return false; + if (this.data.is_no_more) { + isReachBt = 1; + return false; + } + + this.setData({ + stylePage: this.data.stylePage + 1, + countDownNum: 3, + }); + !this.data.is_none && this.requestGoodsList(); + + }, + + //--- 获取卡类列表 --- + 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.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); + }) + }, + + bd_scroll:function (e) { + this.data.car_scroll=1; + } + +}); \ No newline at end of file diff --git a/packageC/pages/goods/distributionCategoryList/index.json b/packageC/pages/goods/distributionCategoryList/index.json new file mode 100644 index 0000000..9dde39f --- /dev/null +++ b/packageC/pages/goods/distributionCategoryList/index.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "分类", + "enablePullDownRefresh": false +} \ No newline at end of file diff --git a/packageC/pages/goods/distributionCategoryList/index.wxml b/packageC/pages/goods/distributionCategoryList/index.wxml new file mode 100644 index 0000000..0e31077 --- /dev/null +++ b/packageC/pages/goods/distributionCategoryList/index.wxml @@ -0,0 +1,238 @@ + + + + + + + + + + + + + + 搜索 + + + + + + + + + 国家 + + + + + 品牌 + + + + + + {{item.name}} + + + + + + + + + + + + {{ishaf_three==1?good_list.name:classify_name}} + + + + + + + + {{bitem.name}} + + + {{bitem.enname}} + + + + + + + + + + + {{classify_name}} + + + + + + + {{user.name}} + + + + + + + + + + + {{classify_name}} + + + + + + + + + + + + + + + {{item.goods_name}} + + + + + {{item.prom_integral}}积分 + + + ￥{{item.prom_price}} + + + ￥{{item.market_price}} + + + 分成金额：{{filter.toFix(item.commission,2)}} + 评论{{item.comment_count}} + + + + + + + + + + + ￥{{item[card_field]}} + + + {{card_name}} + + + + ￥{{item.market_price}} + + + 分成金额：{{filter.toFix(item.commission,2)}} + 评论{{item.comment_count}} + + + + ￥{{item.shop_price}} + + ￥{{item.market_price}} + + + 分成金额：{{filter.toFix(item.commission,2)}} + 评论{{item.comment_count}} + + + + + + + ￥{{item.shop_price}} + ￥{{item.market_price}} + + + + ￥{{g_filter.get_card_price(item,card_list,0)}} + + + + {{g_filter.get_card_price(item,card_list,1)}} + + + + + + 分成金额：{{filter.toFix(item.commission,2)}} + 评论{{item.comment_count}} + + + + ￥{{item.shop_price}} + + ￥{{item.market_price}} + + + + 分成金额：{{filter.toFix(item.commission,2)}} + + 评论{{item.comment_count}} + + + + + + ￥{{item.shop_price}} + + ￥{{item.market_price}} + + + 分成金额：{{filter.toFix(item.commission,2)}} + 评论{{item.comment_count}} + + + + + + + + + 向上拉继续浏览下一个类别 + + + 没有更多了 + + + + + + 该类别暂无推荐商品 + {{countDownNum}} 秒后自动跳到下一个类别 + + + + + + + + + + + + + + + + 商家暂未设置分类 + 去逛逛 + + \ No newline at end of file diff --git a/packageC/pages/goods/distributionCategoryList/index.wxss b/packageC/pages/goods/distributionCategoryList/index.wxss new file mode 100644 index 0000000..89fc5fd --- /dev/null +++ b/packageC/pages/goods/distributionCategoryList/index.wxss @@ -0,0 +1,567 @@ +/*---nyf 2018-9-7---*/ + +page{height: 100%; background: #fff !important;} +.top_view{ width: 100%;background: #fff;} + +.swiper-tab{ + width: 70%; + text-align: center; + height: 88rpx; + line-height: 88rpx; + display: flex; + flex-flow: row; + justify-content: center; + margin-left: 15%; + +} +.swiper-tab-item{ + width: 30%; + color:#434343; +} +.active{ + color:#F65959; + /* border-bottom: 4rpx solid #F65959; */ +} +swiper{ + text-align: center; + min-height:200rpx; + height: auto; +} + +/*--搜索--*/ +.search-box { + width: 100% !important; + height: 88rpx !important; + z-index: 10 !important; + border-radius: 0 !important; + /*-background: linear-gradient(rgba(0,0,0,.2),rgba(255,255,255,0));-*/ + background: #f2f2f2 !important; + padding: 0 !important; + font-size: medium !important; +} + +.logo { + width: 48rpx; + height: 48rpx; + margin: 0 18rpx; + border-radius: 50%; + overflow: hidden; +} + +.search-inner { + display: flex; + align-items: center; + margin: 0rpx 30rpx; + width: 675rpx; + height: 58rpx; + border-radius: 29rpx; + background-color: #fff; + position: relative; + top: 15rpx; +} + +.search-img { + margin-right: 12rpx; + width: 30rpx; + height: 30rpx; + margin-top: -8rpx; + margin-left: 20rpx; +} + +.search-cont { + /* height: 58rpx; + width: 536rpx; */ + /* padding-left: 12rpx; */ + line-height: 58rpx; + font-size: 28rpx; + color: #666; +} + +.search-fixed { + background: rgba(242,48,48,0.8); +} + +/*--分类--*/ +.f_item{position: relative;} +.f_item .pic_view{position: relative; height: 240rpx;} + +.fl_img{width: 100%; height: 100%;} +.fenlei_text_v{text-align: left; margin-bottom: 10rpx; margin-top: 15rpx} +.over_view{width: 100%; height: 100%; position: absolute;top: 0; left: 0; background-color: rgba(0,0,0,0.1);} +.f_item_over_t{margin: 0 auto; position: absolute; top:80rpx;left: 50%; color: #fff; font-weight: bold; + + + margin-left: -100rpx; z-index: 8; width: 200rpx; text-align: center; font-size: 50rpx } +.f_text{width: 25%; +text-align: center; +display: inline-block; +font-size: 30rpx; +color: #9f9f9f; +overflow: hidden; +text-overflow: ellipsis; +white-space: nowrap; +line-height: 50rpx; + +} + +/*--国家--*/ +.nation_box{ position: absolute;width: 260rpx; height: 160rpx; background-size: 100% 100%; background-repeat: no-repeat; + top:110rpx;left: 50%; /* margin-left: -130rpx; */z-index: 8; background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAACACAYAAACLIbwOAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MkVDREM1NjhCMDU3MTFFNjg3NEZDNzlCNDg1N0FGRjUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MkVDREM1NjlCMDU3MTFFNjg3NEZDNzlCNDg1N0FGRjUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoyRUNEQzU2NkIwNTcxMUU2ODc0RkM3OUI0ODU3QUZGNSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDoyRUNEQzU2N0IwNTcxMUU2ODc0RkM3OUI0ODU3QUZGNSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PlO56qEAAAFJSURBVHja7NfRCYAgFIbRDMd0Doe4a9ietxWUIjDOeZYefvhIS2aOA/jcaQIQH4gPEB+IDxAfiA8QH2ynzhyKiGYqWNN7vx7HN/MhYO2H5doJ3nwgPkB8ID5AfCA+QHwgPkB8ID5AfCA+EJ8JQHwgPkB8ID5AfCA+QHwgPkB8ID5AfCA+EB8gPhAfID4QHyA+EB8gPhAfID4QHyA+EB+IDxAfiA8QH4gPEB+IDxAfiA8QH4gPEB+ID8QHiA/EB4gPxAeID8QHiA/EB4gPxAeID8QH4gPEB+IDxAfiA8QH4gPEB+IDxAfiA8QH4gPxAeID8QHiA/EB4gPxAeID8QHiA/EB4gPxgfgA8YH4APGB+ADxgfgA8YH4APGB+ADxgfhAfID4QHyA+OB/6uzBiGjmgveUzBxmANdOEB8gPhAfID4QHyA+2MotwAD/ZBI/EDK5cgAAAABJRU5ErkJggg==");} + + .n_img{width: 100%; height: 375rpx;} + .nt_1{height:82rpx; line-height: 100rpx;} + .nt_1_t{ border-bottom: 1rpx solid #999; font-size: 32rpx; display: inline-block; height: 82rpx} + .nt_2{height: 66rpx;font-size: 32rpx; line-height: 66rpx;color:#999} + /*---品牌---*/ + .nav { + position: fixed; + right: 3rpx; + height: 300rpx; + width: 48rpx; + top:0rpx; + font-family: Arial, Helvetica, sans-serif; + z-index: 99999999999; +} +.letter { + width: 35.6rpx; + height: 35.6rpx; + font-size: 30rpx; +} +.letter-text { + display: inline-block; + width: 100%; + height: 100%; + text-align: center; + line-height: 30rpx; + border-radius: 50%; +} +.letter-actived { + background-color: #ccc; +} + +.group-name { + padding: 10rpx 30rpx; + height: 50rpx; + line-height: 50rpx; + text-align: left; +} +.group-users { + background-color: #fff; text-align: left; padding-bottom: 10rpx; +} +.user { + height: 88rpx; + width: 208rpx; + border: 1px solid #eee; + display: inline-block; + margin-top:15rpx; + margin-left:20rpx; +} +.user-avatar { + border-right: 1px solid #eee; + width: 100rpx; +} +.user-avatar-img { + width: 100%; + height: 100%; +} +.user-name { + padding-left: 30rpx; +} +.fenlei-list{z-index: -1;} + + + + + +/* 商品分类新的版本 */ +/* 分享样式*/ +.xc-search-box { + width: 95%; + height: 120rpx; + padding: 0 20rpx; + z-index: 10; + background: #fff; + /* border-top: 4rpx solid #eee; */ + border-bottom: 1rpx solid #eee; +} + +.share-height{ + line-height: 20rpx; +/* margin-right: 15rpx; */ +margin-top: 8rpx; + +} +.scanning_black-img{ + width:50rpx; + height: 45rpx; + margin-bottom: 5rpx; + +} +/* .search-img.left{ */ + /* margin-left: 35rpx; */ +/* } */ + +.xc-search-inner { + margin: 0 20rpx; + display: flex; + align-items: center; + flex: 1; + /* width: 600rpx; */ + height: 58rpx; + border-radius: 29rpx; + background-color: #f2f2f2; +} +.project_height{ + height: 100%; + +} +.project_type{ + box-sizing: border-box; + width: 26%; + height: 100%; + padding-bottom: 100rpx; + border-right: 1rpx solid #eee; + white-space: nowrap; + overflow: hidden; + overflow-y: scroll; +} +.share_type{ + margin: auto; + width: 58%; + /* margin-top: 40rpx; */ +} +.xc-letter-spacing{ +padding-left: 20rpx; +padding-right: 29rpx; +width: 58%; +margin: auto; +margin-top: 40rpx; +margin-left:28rpx; +} + + +#two_type .xc-letter-spacing{ + padding-left: 20rpx; + padding-right: 29rpx; + width: 58%; + margin: auto; + margin-top: 40rpx; + margin-left:28rpx; + } + +/* 左边菜单点击样式 20200601 luca */ +.is_show_class{ +width: 100%; +background-color: white; +height: 50rpx; +line-height: 50rpx; +color:black; +font-weight: 700; +} + +.world_sn{ +white-space: nowrap; +overflow: hidden; +width: 58%; +/* letter-spacing: 60rpx; */ +margin: auto; +margin-top: 35rpx; +} +/* .select_classify{ */ + /* 20200530 update 转用.is_show_class*/ +/* background: #d60021; +border-radius: 30rpx; +color: #fff; +height: 48rpx; +line-height: 45rpx; */ +/* font-weight:700; */ + +/* } */ +/* .select_classify.width80{ */ + /* 20200530updata */ + /* width: 74.5%; */ + /* height: 100rpx; + line-height: 100rpx; */ +/* } */ +.class_set_height{ + height: 50rpx; + line-height: 50rpx; + padding: 20rpx 0; +} + + .select_classify.width80.text-indent{ + text-indent: 38rpx; + padding-right: 20px; +width: 60%; + + } + .classify_name{ + /* width: 90%; + margin: auto; */ + height: 70rpx; + border-bottom: 1rpx solid #f5f6f6; + line-height: 70rpx; + font-weight: 600; + padding-left: 20rpx; + padding-right: 20rpx; + } + .classify_content{ + width: 100% + + } + .classify_content-frame{ + box-sizing: border-box; + width: 100%; + padding: 0 20rpx; + flex-wrap:wrap; + overflow-y:scroll; + } + .country_img-frame{ + width: 48%; + height: 140rpx; + + } + .country_img{ + width: 100%; + height: 100%; + } + .outer_location{ + top:0rpx; + left: 0rpx; + margin-top: 20rpx; + + } + .nation_box.box{ + width:80%; + height:70%; + top: 50%; + left: 50%; + overflow: hidden; + transform: translate(-50%, -50%); + } + .nt_1.line-height{ + line-height: 65rpx; + height: 72rpx; +margin-top: -5rpx; + + } + .nt_1_t.height{ + height: 54rpx; + } + .nt_1.height{ + height: 56rpx; +line-height: 65rpx; + } + .nt_2.line-height{ + height: 0rpx; + line-height: 0rpx; + + } + .nt_1_t.fs24{ + font-size: 24rpx; + } + .nt_2.fs24{ + font-size: 24rpx; + } + .brand_img_frame{ + width: 50%; + margin-top: 18rpx; + /* margin-right: 15rpx; */ + height: 160rpx; + } + .brand_img{ + width:220rpx; + height:86rpx; + margin-bottom: 10rpx; + margin-top: 10rpx; + + } + .type_img_frame { + width: calc(100% / 3); + height: 140rpx; + margin-top: 20rpx; + margin-bottom: 20rpx; + /* margin-right: 15rpx; */ + } + /* .choice_item{ + position: relative; + } */ + .img-wrap::after { + content: attr(data-txt); + position: absolute; + right: 0; + bottom: 0; + background-color: rgba(0,0,0,.4); + color: white; + font-size: 20rpx; + /* padding: 4rpx; */ + border-radius: 6rpx 6rpx 6rpx 0; +} + + .type_img{ + width:80rpx; + height:80rpx; + margin-bottom: 10rpx; + margin-top: 10rpx; + + } + .brand_img-name{ + width: 100%; + height: 80rpx; + } + .select_classify.width80.text3{ +padding-right: 20rpx; +padding-left: 20rpx; +width: 62%; + + } + .width_height{ + width: 13rpx; + height: 13rpx; + margin-top:12rpx; + } + .select_more{ +line-height: 37rpx; +height: 35rpx; +margin-top: 24rpx; + } + .divider_line{ + width: 100%; + border-bottom: 6rpx solid #eee; + } + .sort-name{ + width: 132rpx; +overflow: hidden; +margin: auto; + +} + +.nation_z_name{ max-width: 130rpx} +.nation_y_name{ max-width: 130rpx; color: #888} + +.no_child_lev{width: 100%; text-align: center; color: #adadad; padding-top: 30rpx} +/* .classify_title { */ + /* width: 80%; */ +/* } */ + +.brand_img_name {color: #666;} + + +.tab-view { + /* height: 100%; */ + width: 200rpx; + /* position: fixed; + left: 0; + top: 92rpx; + z-index: 10; */ +} + +#thress_type3 .tab-bar-item { + width: 200rpx; + height: 110rpx; + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: left; + font-size: 30rpx; + padding-left: 30rpx; + color: #444; + font-weight: 400; +} + +#thress_type3 .active { + position: relative; + color: #000; + font-size: 30rpx; + font-weight: 600; + background: #fff; +} + +#thress_type3 .active::before { + content: ""; + position: absolute; + border-left: 8rpx solid #E41F19; + height: 50rpx; + left: 0; +} + + + + + + +#two_type .tab-bar-item { + width: 200rpx; + height: 110rpx; + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: left; + font-size: 30rpx; + padding-left: 30rpx; + color: #444; + font-weight: 400; +} +#two_type .select_classify { + position: relative; + color: #000; + font-size: 30rpx; + font-weight: 600; + background: #fff; +} + +#two_type .select_classify::before { + content: ""; + position: absolute; + border-left: 8rpx solid #E41F19; + height: 50rpx; + left: 0; + top:50%; + transform: translateY(-50%); +} + + + +#two_type .is_show_class{ + width: 100%; + background-color: white; + color:black; + font-weight: 700; + height: 110rpx; + + } + + + .classify_content > view:last-of-type .classify_content-frame { + padding-bottom: 100rpx; + } + + /* .classify_content > view:only-child .classify_content-frame { */ + /* padding-bottom: 0; */ + /* } */ + + .classify_content > .classify_content-frame { + padding-bottom: 118rpx; + } + + .img-wrap { + position: relative; + width: 180rpx !important; + height: 180rpx !important; + } + + .rmb::before { + content: '￥'; + font-size: 24rpx; + } + + + .item-cont .title { + margin-bottom: 0 !important; + } + + + + +/* 风格三商品列表样式引入 */ +@import "/pages/goods/goodsList/goodsList.wxss"; \ No newline at end of file diff --git a/packageC/pages/goods/goodsList/g_filter.wxs b/packageC/pages/goods/goodsList/g_filter.wxs new file mode 100644 index 0000000..52b2ba5 --- /dev/null +++ b/packageC/pages/goods/goodsList/g_filter.wxs @@ -0,0 +1,86 @@ +var g_filters = { + //-- 判断是不是有等级价 -- + is_has_rank:function(rank_switch,item){ + if(!rank_switch) return false; + if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true} + return false; + }, + + //-- 判断,不是等级会员时候，要显示的最低等级价和名称 -- + get_card_price:function(goods,all_card,type){ + var price1=parseFloat(goods['cardprice1']); + var price2=parseFloat(goods['cardprice2']); + var price3=parseFloat(goods['cardprice3']); + if(!all_card){ + if(type==0) return 0; + return ""; + } + + var arr=[]; + var min_price= 0; + var min_name=""; + + var min_price=null; + var min_name=null; + //---设置对应的价格名字---- + for(var i=0;i<3;i++) { + var vl=all_card[i]; + if(!vl) continue; + if(vl['CorrPrice']=="Price1" && price1>0) + { + if(min_price==null) { + min_price=price1;min_name=vl['CardName']; + } + else if(price10) + { + if(min_price==null) { + min_price=price2;min_name=vl['CardName']; + } + else if(price20) + { + if(min_price==null) { + min_price=price3;min_name=vl['CardName']; + } + else if(price34) min_name=min_name.substring(0, 8); + return min_name; + }, +} +module.exports = { + is_has_rank:g_filters.is_has_rank, + get_card_price:g_filters.get_card_price, +} \ No newline at end of file diff --git a/packageC/pages/goods/goodsList/goodsList.js b/packageC/pages/goods/goodsList/goodsList.js new file mode 100644 index 0000000..036cb27 --- /dev/null +++ b/packageC/pages/goods/goodsList/goodsList.js @@ -0,0 +1,396 @@ +var t = function (t) { + return t && t.__esModule ? t : { + default: t + }; +}(require("../../../../utils/LoadMore.js")), e = getApp(), a = new t.default(), oo = e.globalData.setting, ut = require("../../../../utils/util.js"); +var regeneratorRuntime = require('../../../../utils/runtime.js'); + +Page({ + data: { + url: e.globalData.setting.imghost, + resourceUrl: e.globalData.setting.resourceUrl, + iurl: e.globalData.setting.imghost, + currentPage: 1, + requestData: null, + allData: null, + openFilterModal: !1, + baseUrl: "/api/weshop/goods/page?1=1", + requestUrl: "", + tabname: "sort", //排序的字段 + adname: "asc", //升降的字段 + is_new: 0, + is_hot: 0, + page:1, + prom_goods_list: null, + rq_data: null, + isToggle: false, //切换商品视图控制符 + }, + + onLoad: function (t) { + + this.data.rq_data = t; + + //接受有没有导购的参数 + 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; + } + }) + } + // this.getShopGoods(); + var th = this; + a.init(this, "", "requestData"); + var url = this.data.baseUrl; + this.data.is_new = t.is_new; + this.data.is_hot = t.is_hot; + if (0 != t.cat_id && t.cat_id != undefined) { + url += "&cat_id=" + t.cat_id; + if (t.pid == undefined || t.pid == null) { + url += "&parent_id=0"; + } else { + if (t.pid != "three") { + url += "&parent_id=" + t.pid; + } + } + } + + 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.group_id && t.group_id != undefined) { url += "&group_id=" + t.group_id; } + if (0 != t.gid && t.gid != undefined) { url += "&group_id=" + t.gid; } + + if (0 != t.max_price && t.max_price != undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price; } + + if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; } + if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; } + + if (getApp().globalData.userInfo) { + url += "&user_id=" + getApp().globalData.userInfo.user_id; + } + this.setData({ + baseUrl:url, + }) + //优惠活动的凑单 + if (t.prom_type == 3) { + if (0 != t.prom_id && t.prom_id != undefined) { url += "&prom_id=" + t.prom_id; } + if (0 != t.prom_type && t.prom_type != undefined) { url += "&prom_type=" + t.prom_type; } + //-- 获取 -- + getApp().request.promiseGet("/api/weshop/promgoodslist/list", { + data: { prom_id: t.prom_id } + }).then(res => { + if (res.data.code == 0) { + var arr = res.data.data; + th.set_prom_list(arr); + } + }) + } + this.getInitData() + + getApp().getConfig2(function (rs) { + //计算等级价相关 + 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 && 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) + } + }); + + }, + async getInitData(){ + await this.getShopGoods(); + await this.requestGoodsList(this.data.baseUrl); + }, + //设置优惠券的 + set_prom_list: async function (arr) { + var th = this; + for (var i in arr) { + //优惠的实际内容 + var content = JSON.parse(arr[i].preferential_type); + arr[i].content = content; + + //--送礼包-- + if (content.is_libao) { + //-- 获取 -- + await getApp().request.promiseGet("/api/weshop/libao/libaoForm/page?id=" + content.libao + "&store_id=" + oo.stoid, { + }).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) + arr[i].content.lb_name = res.data.data.pageData[0].lbtitle; + }) + } + //--送赠品-- + if (content.is_gift) { + //-- 获取 -- + await getApp().request.promiseGet("/api/weshop/prom/gift/page?id=" + content.gift + "&store_id=" + oo.stoid, { + }).then(res => { + if (res.data.code == 0) + arr[i].content.gift_name = res.data.data.pageData[0].goods_name; + }) + } + } + th.setData({ prom_goods_list: arr }); + }, + + changeTab: function (t) { + var ord = t.currentTarget.dataset.href; + var ad = t.currentTarget.dataset.ad; + 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.requestGoodsList(url); + }, + + //分销小店的商品 + async getShopGoods() { + let data= { + store_id: oo.stoid, + user_id: getApp().globalData.user_id, + page:this.data.page, + pageSize:2000, + }; + // this.setData({ + // is_go:0 + // }) + // a.init(this, "", "shopGoodsData"); + // let url=`/api/weshop/users/distribut/pagemyshop?orderType=desc&store_id=${oo.stoid}&user_id=${getApp().globalData.user_id}`; + let url=`/api/weshop/users/distribut/pagemyshop?orderType=desc`; + const distriGoods = await getApp().request.promiseGet(url, { + data: data, + isShowLoading: false, + }); + console.log(distriGoods,1); + if (distriGoods.data.code == 0 && distriGoods.data.data.pageData.length > 0) { + this.setData({ + shopGoodsData: distriGoods.data.data.pageData, + }) + } + // this.requestGoodsList(url) + }, + + + requestGoodsList: async function (t) { + + if(this.data.is_no_more){ + getApp().showWarning("加载完啦", null, 500, !1); + return false + } + var e = this; + this.data.requestUrl = t; + + //不是商品分组的，不是默认排序的 + if (t.indexOf("group_id") == -1 || e.data.tabname != "sort") { + t += "&orderField=" + e.data.tabname; + t += "&orderType=" + e.data.adname; + } + + t += "&page=" + e.data.currentPage; + t += "&pageSize=" + 2000; + t +="&store_id=" +oo.stoid; + const { data: res } = await getApp().request.promiseGet(t, { + isShowLoading: true, + }) + console.log(res); + + if (res.code == 0 && res.data.pageData.length > 0) { + let arr = []; + arr = res.data.pageData.filter(obj => this.data.shopGoodsData.some(item => item.goods_id == obj.goods_id)); + console.log(arr); + this.setData({ + requestData: arr, + is_no_more:1, + }); + // if (res.data.page > 1) { + // this.setData({ + // requestData: this.data.requestData.concat(arr), + // // select_classify_on: index, + // }); + // } else { + // this.setData({ + // requestData: arr, + // // select_classify_on: index, + // }); + // }; + } + // a.request(t, + // function (t) { + // let arr=[]; + // e.setData({ is_go: 1 }); + // null == e.data.allData && (e.data.allData = Object.assign({}, t.data.result)), + // wx.stopPullDownRefresh(); + + // arr = e.data.requestData.filter(obj => e.data.shopGoodsData.some(item => item.goods_id == obj.goods_id)); + // // e.data.requestData.map(item => { + // // e.data.shopGoodsData.forEach(i => { + // // if (i.nation_id = item.nation_id) { + // // return item + // // } + // // }); + // // arr.push(item); + // // }); + // console.log(arr); + // // e.setData({ + // // requestData: arr, + // // }); + // }, + // null, { is_mainshow: 1, isonsale: 1, store_id: oo.stoid } + // ); + + }, + getInput(e) { + this.setData({ + keyword: e.detail.value.trim(), + }); + }, + + search: function (t) { + let keyword = this.data.keyword; + if (!keyword) { + t.showWarning("请输入搜索关键词"); + return false + } + // this.search(val); + // wx.navigateTo({ + // url: `/packageA/pages/distribution/shop/shop?key_word=${val}`, + // }); + wx.navigateBack({ + delta: 2 + }); + getApp().globalData.key_word = keyword; + }, + onReachBottom: function () { + a.canloadMore() && this.requestGoodsList(this.data.requestUrl); + }, + onPullDownRefresh: function () { + this.resetData(), this.requestGoodsList(this.data.requestUrl); + }, + openFilterModal: function () { + this.setData({ + openFilterModal: !0 + }); + }, + closeFilterModal: function () { + this.setData({ + openFilterModal: !1 + }); + }, + filterGoods: function (t) { + this.resetData(), this.requestGoodsList(t.currentTarget.dataset.href), this.closeFilterModal(); + }, + resetData: function () { + a.resetConfig(), this.data.requestData = null, this.data.currentPage = 1; + }, + + //---回复最初的设置--- + restoreData: function () { + this.setData({ + requestData: null, + }); + this.data.currentPage = 2; + }, + //---------分享配置-------- + onShareAppMessage: function (e) { + var curPage = this; + var pagePath = curPage.route; //当前页面url + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + + if (this.data.rq_data && JSON.stringify(this.data.rq_data) != "{}") { + var parm = ut.ob_to_parm(this.data.rq_data); + pagePath += "?" + parm; + } + + if (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); + return { + title: "商品列表", + path: pagePath, + } + }, + //---图片失败，默认图片--- + bind_bnerr2: function (e) { + var _errImg = e.target.dataset.errorimg; + var _errurl = e.target.dataset.url; + var ii = _errurl.indexOf(oo.imghost); + if (ii != -1) { + // var _errObj = {}; + // _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif"; + this.setData({ + [_errImg] : "/miniapp/images/default_g_img.gif", + }) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } + }, + + //--- 获取卡类列表 --- + 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); + }) + }, + + + + // 切换显示 + bindToggleDisplay() { + this.setData({ + isToggle: !this.data.isToggle, + }); + }, + + +}); \ No newline at end of file diff --git a/packageC/pages/goods/goodsList/goodsList.json b/packageC/pages/goods/goodsList/goodsList.json new file mode 100644 index 0000000..3dc51e0 --- /dev/null +++ b/packageC/pages/goods/goodsList/goodsList.json @@ -0,0 +1,6 @@ + { + "navigationBarTitleText": "商品列表", + "usingComponents": { + "share_box": "/components/share_box/share_box" + } +} \ No newline at end of file diff --git a/packageC/pages/goods/goodsList/goodsList.wxml b/packageC/pages/goods/goodsList/goodsList.wxml new file mode 100644 index 0000000..784b74b --- /dev/null +++ b/packageC/pages/goods/goodsList/goodsList.wxml @@ -0,0 +1,338 @@ + + + + + + 满{{item.condition}}元 件 + 减{{item.content.money}}元 + 打{{item.content.sale}}折 + 送{{item.content.int}}积分 + 送{{item.content.coupon}}元优惠券 + 送{{item.content.gift_name}} + 送{{item.content.lb_name}} + + + + + + + + + 搜索 + + + + + + + + + + + + + + + + + + + + + {{item.goods_name}} + + + + + + {{item.prom_integral}}积分 + + + ￥{{item.prom_price}} + + {{item.market_price}} + + + + + + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + + + + + + + + ￥{{item[card_field]}} + + + {{card_name}} + + + + ￥{{item.market_price}} + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + ￥{{item.shop_price}} + + ￥{{item.market_price}} + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + + + + {{item.shop_price}} + {{item.market_price}} + + + + {{g_filter.get_card_price(item,card_list,0)}} + + + {{g_filter.get_card_price(item,card_list,1)}} + + + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + + ￥{{item.shop_price}} + ￥{{item.market_price}} + + + + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + + + + {{item.shop_price}} + {{item.market_price}} + + + + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + + + + + + + + + + + + {{item.goods_name}} + + + + + + {{item.prom_integral}}积分 + + + ￥{{item.prom_price}} + + {{item.market_price}} + + + + + + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + + + + + + + + ￥{{item[card_field]}} + + + {{card_name}} + + + + ￥{{item.market_price}} + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + ￥{{item.shop_price}} + + ￥{{item.market_price}} + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + + + + {{item.shop_price}} + {{item.market_price}} + + + + {{g_filter.get_card_price(item,card_list,0)}} + + + {{g_filter.get_card_price(item,card_list,1)}} + + + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + + ￥{{item.shop_price}} + ￥{{item.market_price}} + + + + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + + + + {{item.shop_price}} + {{item.market_price}} + + + + + 评论{{item.comment_count}} + 已售{{item.sales_sum}} + + + + + + + + + + + + + + + + + + + 没有相关的数据 + 去逛逛 + + + + + \ No newline at end of file diff --git a/packageC/pages/goods/goodsList/goodsList.wxss b/packageC/pages/goods/goodsList/goodsList.wxss new file mode 100644 index 0000000..130fb83 --- /dev/null +++ b/packageC/pages/goods/goodsList/goodsList.wxss @@ -0,0 +1,307 @@ +page { + background-color: #f0f0f0; +} + +.container { + color: #666; +} + +.nav { + display: flex; + border-radius: 30rpx 30rpx 0 0; + overflow: hidden; +} + +.nav-item { + /* float: left; */ + flex: 1; + /* width: 30%; */ + height: 80rpx; + /* line-height: 90rpx; */ + display: flex; + align-items: center; + justify-content: center; + font-size: 26rpx; + border-bottom: 1px solid #f5f5f5; + background-color: #fff; +} + +.nav-item .ico-dg { + width: 12rpx; + height: 8rpx; + margin-left: 10rpx; + line-height: 0; +} + +.nav-item .ico-filter { + width: 20rpx; + height: 20rpx; + margin-left: 10rpx; + line-height: 0; +} + +.ico-dir { + width: 16rpx; + height: 22rpx; + margin-left: 10rpx; + background-repeat: no-repeat; + background-size: cover; + background-position-x: 0; +} + +.ico-dir-dn { + background-position-x: -16rpx; +} + +.ico-dir-up { + background-position-x: -32rpx; +} + +.search-box { + color: #BEBEBE; + font-size: 24rpx; + /* border: 2rpx solid #f23030; */ + border-radius: 40rpx; + padding: 16rpx; + display: flex; + justify-content: space-between; + background-color: #e0e0e0; +} + +.icon-sousuo { + font-size: 26rpx !important; +} + +.search { + width: 10%; +} + +.search-img { + width: 30rpx; + height: 30rpx; +} + +.choice_list { + background-color: #fff; + /* padding-left: 20rpx; + padding-right: 20rpx; */ +} + +.choice_item { + position: relative; + width: 100%; + /* min-height: 200rpx; */ + /* padding: 10rpx 0; */ + /* border-bottom: 1px solid #f5f6f6; */ + font-size: 30rpx; + display: flex; + padding: 20rpx; + box-sizing: border-box; +} + +.img-wrap { + /* float: left; */ + width: 270rpx; + height: 270rpx; + margin-right: 22rpx; + border-radius: 15rpx; + overflow: hidden; + flex-shrink: 0; + /* padding: 0 10rpx 10rpx; */ +} + +.img-wrap image { + width: 100%; + height: 100%; +} + +.item-cont .title { + font-size: 26rpx; + height: 72rpx; + margin-bottom: 20rpx; + /* padding-right: 10rpx; */ + line-height: 36rpx; + color: #2C2C2C; + text-align: justify; + overflow: hidden; +} + +.price { + display: inline-block; + color: #f23030; + /* line-height: 24rpx; */ + font-size: 30rpx; + /* font-weight: bold; + font-size: 28rpx; */ + /* padding-bottom: 20rpx; */ +} + +.rmb::before { + content: '￥'; + font-size: 24rpx; +} + +.comment { + font-size: 24rpx; + /* margin-top: 4rpx; */ + color: #8d8d8d; + /* padding-right: 30rpx; */ +} + +.filter-modal { + position: fixed; + left: 150rpx; + top: 0; + right: 0; + bottom: 0; + z-index: 20; + background-color: white; + overflow-x: hidden; + padding-bottom: 30rpx; +} + +.filter-box { + box-sizing: border-box; + width: 100%; + font-size: 28rpx; + padding: 20rpx; +} + +.filter-name { + width: 100%; + padding: 20rpx 0; + word-break: keep-all; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + font-size: 30rpx; +} + +.filter-items { + width: 100%; +} + +.filter-item { + float: left; + width: fit-content; + max-width: 500rpx; + word-break: keep-all; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + padding: 10rpx; + border-radius: 10rpx; + border: 1rpx #ddd solid; + margin: 0 10rpx 10rpx 0; + background-color: #fdfdfd; + color: #666; +} + +.viewall-btn { + margin-top: 20rpx; + width: 300rpx; +} + +.card_bg { + /* display: flex; + max-width: 110rpx; + height: 25rpx; + align-items: center; + border-radius: 26rpx; + font-size: 19rpx; + background: #333; + color: #fff; + justify-content: center; + margin-left: 8rpx; + margin-top: 7rpx; + line-height: 25rpx; + padding: 2rpx 10rpx; + width: auto; */ + + + box-sizing: border-box; + padding: 2rpx 10rpx; + height: 28rpx; + border-radius: 26rpx; + font-size: 18rpx; + line-height: 28rpx; + max-width: 220rpx; + background: #333; + color: #fff; + margin-left: 8rpx; +} + +/* .card_bg .card_name { + max-width: 76rpx; + width: auto; + overflow: hidden; + white-space: nowrap; +} */ + +.card_name { + position: relative; + top: -3rpx; + display: inline-block; +} + + +.card_bg image { + width: 19rpx; + height: 19rpx; + margin-right: 8rpx; +} + +.mk_price { + margin-left: 10rpx; + font-size: 24rpx; +} + +.item-cont { + line-height: 38rpx; + display: flex; + flex-direction: column; + justify-content: space-evenly; + flex: 1; +} + + +.choice_list.on { + display: flex; + flex-wrap: wrap; + padding-bottom: 12rpx; + padding-left: 16rpx; + padding-right: 16rpx; + background-color: #f0f0f0; +} + +.choice_list.on .choice_item { + padding: 0; + margin-top: 16rpx; + display: block; + width: 350rpx; + background-color: white; + border-radius: 15rpx; +} + +.choice_list.on .choice_item:nth-child(even) { + margin-left: 18rpx; +} + +.choice_list.on .img-wrap { + width: 350rpx; + height: 350rpx; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} + +.choice_list.on .item-cont { + padding: 10rpx; + display: flex; + flex-direction: column; + justify-content: space-between; +} + + +.choice_list.on .item-cont .flex.on { + display: block; +} diff --git a/packageC/pages/goods/search/g_filter.wxs b/packageC/pages/goods/search/g_filter.wxs new file mode 100644 index 0000000..88f50d8 --- /dev/null +++ b/packageC/pages/goods/search/g_filter.wxs @@ -0,0 +1,87 @@ +var g_filters = { + //-- 判断是不是有等级价 -- + is_has_rank:function(rank_switch,item){ + if(!rank_switch) return false; + if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true} + return false; + }, + + //-- 判断,不是等级会员时候，要显示的最低等级价和名称 -- + get_card_price:function(goods,all_card,type){ + var price1=parseFloat(goods['cardprice1']); + var price2=parseFloat(goods['cardprice2']); + var price3=parseFloat(goods['cardprice3']); + if(!all_card){ + if(type==0) return 0; + return ""; + } + + var arr=[]; + var min_price= 0; + var min_name=""; + + var min_price=null; + var min_name=null; + //---设置对应的价格名字---- + for(var i=0;i<3;i++) { + var vl=all_card[i]; + if(!vl) continue; + if(vl['CorrPrice']=="Price1" && price1>0) + { + if(min_price==null) { + min_price=price1;min_name=vl['CardName']; + } + else if(price10) + { + if(min_price==null) { + min_price=price2;min_name=vl['CardName']; + } + else if(price20) + { + if(min_price==null) { + min_price=price3;min_name=vl['CardName']; + } + else if(price37 ) min_name=min_name.substring(0, 8); + return min_name; + }, +} +module.exports = { + is_has_rank:g_filters.is_has_rank, + get_card_price:g_filters.get_card_price, +} \ No newline at end of file diff --git a/packageC/pages/goods/search/search.js b/packageC/pages/goods/search/search.js new file mode 100644 index 0000000..f94fc8b --- /dev/null +++ b/packageC/pages/goods/search/search.js @@ -0,0 +1,370 @@ +const { app } = require("../../../../utils/common.js"); + +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; + +Page({ + data: { + url: a.globalData.setting.imghost, + resourceUrl: a.globalData.setting.resourceUrl, + currentPage: 1, + requestData: null, + allData: null, + openFilterModal: !1, + openSearchModal: !1, + baseUrl: "/api/weshop/goods/page?1=1", + requestUrl: "", + //hotWords: [ [ "手机", "小米", "iphone" ], [ "三星", "华为", "冰箱" ] ] + hotWords: null, + + tabname: "sort", //排序的字段 + adname: "asc", //升降的字段 + rq_data: null, + + + searchRecord: [], + keyword: '', + is_his: 0, + }, + + onLoad: function (t) { + this.data.rq_data = t; + + //接受有没有导购的参数 + 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; + } + }) + } + + 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]); + } + } + 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 && 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) + } + + + + }) + 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 (url != this.data.baseUrl) return this.requestSearch(url); + this.openSearchModal(); + + // 获取历史搜索记录 + this.getHistorySearch(); + }, + changeTab: function (t) { + var ord = t.currentTarget.dataset.href; + var ad = t.currentTarget.dataset.ad; + + 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); + + }, + + //-----------真的调用地址进行搜索------------ + requestSearch: function (t) { + var a = this; + + if (getApp().globalData.userInfo) { + t += "&user_id=" + getApp().globalData.userInfo.user_id; + } + + this.data.requestUrl = t, + //t += "&orderField=" + a.data.tabname; + //t += "&orderType=" + a.data.adname; + //t += "&page=" + a.data.currentPage, + e.request(t, function (t) { + a.data.currentPage++, + null == a.data.allData && (a.data.allData = t.data.data.pageData), + a.closeSearchModal(); + }, + null, { + is_mainshow: 1, isonsale: 1, store_id: oo.stoid, + orderField: a.data.tabname, orderType: a.data.adname, page: a.data.currentPage + } + ); + }, + onReachBottom: function () { + this.data.openSearchModal || e.canloadMore() && this.requestSearch(this.data.requestUrl); + }, + openFilterModal: function () { + this.setData({ + openFilterModal: !0 + }); + }, + closeFilterModal: function () { + this.setData({ + openFilterModal: !1 + }); + }, + filterGoods: function (t) { + this.resetData(), this.requestSearch(t.currentTarget.dataset.href), this.closeFilterModal(); + }, + resetData: function () { + e.resetConfig(), this.data.requestData = null, this.data.currentPage = 1; + }, + + //---回复最初的设置---显示全部分类-- + restoreData: function () { + this.setData({ + requestData: this.data.allData, + }); + this.data.currentPage = 2; + }, + openSearchModal: function () { + this.setData({ + openSearchModal: !0 + }); + }, + 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("请输入搜索关键词"); + return false + } + // this.search(val); + // wx.navigateTo({ + // url: `/packageA/pages/distribution/shop/shop?key_word=${val}`, + // }); + wx.navigateBack({ + delta: 2 + }); + getApp().globalData.key_word = val; + }, + + //热搜关键字 + searchHotWord: function (t) { + + var word = t.currentTarget.dataset.word; + this.historyRecord(word); + wx.navigateBack({ + delta: 2 + }); + getApp().globalData.key_word = word; + // this.search(word); + }, + + //-----点击搜索按钮---- + search: function (t) { + if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词"); + 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 pagePath = curPage.route; //当前页面url + if (pagePath.indexOf('/') != 0) { + pagePath = '/' + pagePath; + } + + if (this.data.key_str) { + pagePath += "?s_key=" + this.data.key_str; + } + + if (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); + return { + title: "商品搜索", + 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) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, + + //--- 获取卡类列表 --- + 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: [] + }); + }, +}); \ No newline at end of file diff --git a/packageC/pages/goods/search/search.json b/packageC/pages/goods/search/search.json new file mode 100644 index 0000000..0aa7add --- /dev/null +++ b/packageC/pages/goods/search/search.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "商品搜索", + "enablePullDownRefresh": false, + "usingComponents": { + "share_box": "/components/share_box/share_box" + } +} \ No newline at end of file diff --git a/packageC/pages/goods/search/search.wxml b/packageC/pages/goods/search/search.wxml new file mode 100644 index 0000000..18c65f1 --- /dev/null +++ b/packageC/pages/goods/search/search.wxml @@ -0,0 +1,33 @@ + + + + +
+ + +
+ + + 热门搜索 + + + {{item}} + + + + + + 历史搜索 + + + + + {{item}} + + + 暂无历史搜索记录 + + + \ No newline at end of file diff --git a/packageC/pages/goods/search/search.wxss b/packageC/pages/goods/search/search.wxss new file mode 100644 index 0000000..1711e17 --- /dev/null +++ b/packageC/pages/goods/search/search.wxss @@ -0,0 +1,311 @@ +.container { + color: #666; +} + +.nav-item { + float: left; + width: 30%; + height: 90rpx; + line-height: 90rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 32rpx; + border-bottom: 2rpx solid #E6E6E6; + background-color: #fff; +} + +.nav-item .ico-dg { + width: 18rpx; + height: 12rpx; + margin-left: 10rpx; + line-height: 0; +} + +.nav-item .ico-filter { + width: 20rpx; + height: 20rpx; + margin-left: 10rpx; + line-height: 0; +} + +.ico-dir { + width: 16rpx; + height: 22rpx; + margin-left: 10rpx; + background-repeat: no-repeat; + background-size: cover; + background-position-x: 0; +} + +.ico-dir-dn { + background-position-x: -16rpx; +} + +.ico-dir-up { + background-position-x: -32rpx; +} + +.nav-search { + width: 10%; +} + +.nav-item .search-img { + width: 30rpx; + height: 30rpx; +} + +.choice_list { + background-color: #fff; +} + +.choice_item { + position: relative; + width: 100%; + min-height: 200rpx; + padding: 10rpx 0; + border-bottom: 2rpx solid #E6E6E6; + font-size: 30rpx; +} + +.img-wrap { + /* float: left; */ + width: 180rpx; + height: 180rpx; + padding: 0 10rpx 0 30rpx; + flex-shrink: 0; + /* padding: 10rpx; */ +} + +.img-wrap image { + width: 100%; + height: 100%; +} + +.item-cont .title { + height: 72rpx; + margin: 16rpx 0; + padding-right: 30rpx; + line-height: 36rpx; + color: #333; + overflow: hidden; + text-align: justify; +} + +.price { + display: inline-block; + color: #f23030; + /* line-height: 24rpx; */ + /* padding-bottom: 20rpx; */ +} + +.comment { + font-size: 25rpx; + padding-right: 30rpx; + margin-top: 4rpx; +} + +.filter-modal { + position: fixed; + left: 150rpx; + top: 0; + right: 0; + bottom: 0; + z-index: 20; + background-color: white; + overflow-x: hidden; + padding-bottom: 30rpx; +} + +.filter-box { + box-sizing: border-box; + width: 100%; + font-size: 28rpx; + padding: 20rpx; +} + +.filter-name { + width: 100%; + padding: 20rpx 0; + word-break: keep-all; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + font-size: 30rpx; +} + +.filter-items { + width: 100%; +} + +.filter-item { + float: left; + width: fit-content; + max-width: 500rpx; + word-break: keep-all; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + padding: 10rpx; + border-radius: 10rpx; + border: 1rpx #ddd solid; + margin: 0 10rpx 10rpx 0; + background-color: #fdfdfd; + color: #666; +} + +.viewall-btn { + margin-top: 20rpx; + width: 300rpx; +} + +.search-modal { + position: fixed; + top: 0; + right: 0; + left: 0; + bottom: 0; + z-index: 20; + background-color: white; + overflow-x: hidden; + padding: 80rpx 30rpx; + font-size: 30rpx; + color: #555; +} + +.search-bar { + width: 100%; + box-sizing: border-box; +} + +.search-input { + width: 80%; + float: left; + border: 1rpx solid #e0e0e0; + box-sizing: border-box; + height: 80rpx; + padding-left: 20rpx; + border-top-left-radius: 10rpx; + border-bottom-left-radius: 10rpx; +} + +.search-btn { + width: 20%; + height: 80rpx; + background-color: #f23030; + display: inline-block; + text-align: center; + border-top-right-radius: 10rpx; + border-bottom-right-radius: 10rpx; +} + +.search-btn .search-img { + height: 45rpx; + width: 45rpx; + padding: 20rpx; +} + +.search-hot { + margin-top: 40rpx; +} + +.hot-title { + font-size: 35rpx; + color: black; + margin-bottom: 30rpx; +} + +.hot-row { + display: flex; + /*--justify-content: space-between---*/ + padding: 15rpx 10rpx; +} + +.hot-item { + padding: 8rpx 8rpx; + border: 1rpx solid #e0e0e0; + border-radius: 10rpx; + font-size: 28rpx; + margin-left: 15rpx; +} + +/* .card_bg { + display: flex; + max-width: 110rpx; + height: 25rpx; + align-items: center; + border-radius: 26rpx; + font-size: 19rpx; + padding: 2rpx 10rpx; + background: #333; + color: #fff; + justify-content: center; + margin-left: 8rpx; + margin-top: 7rpx; + line-height: 25rpx; + width: auto; +} */ + +.card_bg { + box-sizing: border-box; + padding: 2rpx 10rpx; + /* height: 28rpx; */ + border-radius: 26rpx; + font-size: 18rpx; + /* line-height: 28rpx; */ + max-width: 210rpx; + background: #333; + color: #fff; + margin-left: 8rpx; +} + +.card_bg image { + width: 19rpx; + height: 19rpx; + margin-right: 8rpx; + flex-shrink: 0; +} + +.card_name { + position: relative; + top: -4rpx; +} + +/* .card_bg image { + width: 19rpx; + height: 19rpx; + margin-right: 1rpx; + vertical-align: middle; +} + +.card_bg .card_name { + max-width: 76rpx; + width: auto; + overflow: hidden; + white-space: nowrap; +} */ + +.navigator-hover { + opacity: 1; +} + +.mk_price { + margin-left: 10rpx; + font-size: 25rpx; +} + +.item-cont { + /* line-height: 38rpx; */ + flex-grow: 1; +} + +.history { + background-color: #f0f0f0; + color: #7b7b7b; + border: none; + margin-bottom: 8rpx; +} + +.history:first-of-type { + margin-left: 0; +} diff --git a/packageC/pages/presell/goodsInfo/buy_integral.wxml b/packageC/pages/presell/goodsInfo/buy_integral.wxml deleted file mode 100644 index 5d268cb..0000000 --- a/packageC/pages/presell/goodsInfo/buy_integral.wxml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - {{data.goods_name}} - - - {{prom_integral}}积分 - + - {{prom_price}}元 - 0积分 - - - - - - 已售：{{prom_act.buy_num}} - 可售：{{prom_act.limitqty-prom_act.buy_num}} - - - - - - - - - {{def_pick_store.pickup_name}} - - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} - - - - - - - - 选择门店 - - - - 更多门店 - - - - (库存不足) - - (库存不足) - - (配送不匹配) - (库存不足) - - - - 地址:{{def_pick_store.fulladdress}} - - - - - - - - - - 购买数量 - - - - - + - - - - - - - - - 配送不匹配 - - - - - - - 库存不足 - - - - - - 库存不足 - - - - 库存不足 - - - - 请先选择门店 - - - - 库存不足 - - - 立即兑换 - - - - - - - - - - - - - \ No newline at end of file diff --git a/packageC/pages/presell/goodsInfo/buy_integral_normal.wxml b/packageC/pages/presell/goodsInfo/buy_integral_normal.wxml deleted file mode 100644 index b57806c..0000000 --- a/packageC/pages/presell/goodsInfo/buy_integral_normal.wxml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - {{sele_g.goods_name}} - - ￥ - - {{sele_g[card_field]}} - {{sele_g.shop_price}} - - - - 已售：{{sele_g.sales_sum}} - - 可售：{{def_pick_store.CanOutQty}} - 可售:0 - - 可售：{{sele_g.store_count}} - - - - - - - - - - {{def_pick_store.pickup_name}} - - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} - - - - - - - - 选择门店 - - - - 更多门店 - - - - (库存不足) - - (库存不足) - - (配送不匹配) - (库存不足) - - - 地址:{{def_pick_store.fulladdress}} - - - - - - - - - - 购买数量 - - - - - + - - - - - - - - 再买{{hui_condition.need}} - ，免{{hui_condition.money}}元 - ，打{{hui_condition.sale}}折 - ，包邮 - ，送{{hui_condition.intValue}}积分 - ，送优惠券 - ，送赠品 - ，送礼包 - - - - - - - - - - 配送不匹配 - - - - - 库存不足 - - - - - - 库存不足 - - - - 库存不足 - - - - 请先选择门店 - - - - 库存不足 - - - - 加入购物车 - 立即购买 - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packageC/pages/presell/goodsInfo/buy_pt.wxml b/packageC/pages/presell/goodsInfo/buy_pt.wxml deleted file mode 100644 index 62168aa..0000000 --- a/packageC/pages/presell/goodsInfo/buy_pt.wxml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - {{sele_g.goods_name}} - - - - - ￥ {{sele_g[card_field]}} - - - ￥ {{sele_g.shop_price}} - - - ￥ {{prom_price}} - - - - - 已售：{{sele_g.sales_sum}} - - 可售：{{def_pick_store.CanOutQty}} - 可售:0 - - 可售：{{sele_g.store_count}} - - - - - 已售：{{prom_act.buy_num}} - 已售：{{prom_act.buy_num}} - 可售：{{prom_act.goods_num-prom_act.buy_num}} - - - - - - - - - - - - - {{def_pick_store.pickup_name}} - - - - 距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} - - - - - - - - 选择门店 - - - - 更多门店 - - - - (配送不匹配) - (库存不足) - 地址:{{def_pick_store.fulladdress}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 再买{{hui_condition.need}} - ，免{{hui_condition.money}}元 - ，打{{hui_condition.sale}}折 - ，包邮 - ，送{{hui_condition.intValue}}积分 - ，送优惠券 - ，送赠品 - ，送礼包 - - - - - - - - - - - - - - - 配送不匹配 - - - - - - 库存不足 - - - - - - 库存不足 - - - - 库存不足 - - - - 请先选择门店 - - - - 库存不足 - - - 立即购买 - - - - - - - - - - - - - - 配送不匹配 - - - 确定 - - - - - - - \ No newline at end of file diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index bd7ac13..8ccc19d 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -1,20 +1,20 @@ var t = require("../../../../utils/util.js"), - ut = t, - e = require("../../../../utils/common.js"), - a = require("../../../../utils/wxParse/wxParse.js"), - s = getApp(), - i = s.request, - rq = i, - oo = s.globalData, - o = s.globalData.setting, - os = o; + ut = t, + e = require("../../../../utils/common.js"), + a = require("../../../../utils/wxParse/wxParse.js"), + s = getApp(), + i = s.request, + rq = i, + oo = s.globalData, + o = s.globalData.setting, + os = o; //评价加载更多 -var more = function(e) { - return e && e.__esModule ? e : { - default: e - }; - }(require("../../../../utils/LoadMore.js")), - n = new more.default(); +var more = function (e) { + return e && e.__esModule ? e : { + default: e + }; +}(require("../../../../utils/LoadMore.js")), + n = new more.default(); var utils = require('../../../../utils/util.js'); var regeneratorRuntime = require('../../../../utils/runtime.js'); @@ -25,13 +25,13 @@ Page({ color_type_one: 0, color_type_two: 1, - gid: "", + gid: '', stoid: o.stoid, url: o.url, resourceUrl: o.h5_url, //公众号那边的图片文件域名 iurl: o.imghost, defaultAvatar: o.resourceUrl + "/static/images/user68.jpg", - + data: null, content: "", //商品详情 comments: null, //商品评论 @@ -80,25 +80,25 @@ Page({ id: 1, num: 0 }, - { - name: "有图", - id: 5, - num: 0 - }, + { + name: "有图", + id: 5, + num: 0 + }, - { - name: "好评", - id: 2, - num: 0 - }, { - name: "中评", - id: 3, - num: 0 - }, { - name: "差评", - id: 4, - num: 0 - }, + { + name: "好评", + id: 2, + num: 0 + }, { + name: "中评", + id: 3, + num: 0 + }, { + name: "差评", + id: 4, + num: 0 + }, ], select: { @@ -126,7 +126,7 @@ Page({ def_pickpu_list: null, //一开始5个门店list sec_pick_index: 0, //第二级门店选择ID fir_pick_index: 0, //第一级门店选择ID - all_pick_list:null,//所有的门店先记录起来 + all_pick_list: null,//所有的门店先记录起来 //同一条形码的所有商品 sku_g: null, sku_g_pt: null, //---拼单的普通购买--- @@ -137,7 +137,7 @@ Page({ brand_name: '', nation_name: '', - //商品的活动类型 0普通 1秒杀 2团购 3优惠 4 积分购 6拼单 + //商品的活动类型 0普通 1秒杀 2团购 3优惠 4 积分购 6拼单 8预售 prom_type: 0, prom_time_text: "", prom_price: null, @@ -219,7 +219,7 @@ Page({ new_user: 0, //新用户 def_pick_store: null, // 默认的门店 - fir_def_store:null, //客户默认的门店的 + fir_def_store: null, //客户默认的门店的 lat: null, //维度 lon: null, //经度 @@ -229,121 +229,119 @@ Page({ open_ind_store: 0, //哪里打开的门店列表的控制属性 default_store: {}, //创建添加默认门店地址的对象 - comments_no_more:0, - get_c:0, //获取评价是不是成 - is_collect_load:0, //是不是处理 - is_newsales_rules:0, //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存 - sales_rules:1, //默认是线上销售 + comments_no_more: 0, + get_c: 0, //获取评价是不是成 + is_collect_load: 0, //是不是处理 + is_newsales_rules: 0, //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存 + sales_rules: 1, //默认是线上销售 - wait_for_user_store:null, - prom_goods:null, //商品优惠列表 - order_prom:null, //订单优惠 - collocationGoods:null, //搭配购 - - poster:null, //自定义海报 - share_b_img:'', //自定义分享的背景 - - showPoster: false, - hui_condition:null, - sto_sele_name_1:'',//分享的门店名称 - fir_goods:null, + wait_for_user_store: null, + prom_goods: null, //商品优惠列表 + order_prom: null, //订单优惠 + collocationGoods: null, //搭配购 - share_hidden: false, + poster: null, //自定义海报 + share_b_img: '', //自定义分享的背景 + + showPoster: false, + hui_condition: null, + sto_sele_name_1: '',//分享的门店名称 + fir_goods: null, + + share_hidden: false, }, //------初始化加载---------- - onLoad: function(t) { + onLoad: function (t) { + var ee = this, + that = ee, + th = ee, + gid =t.goods_id, + first_leader = t.first_leader, + room_id = t.room_id, + room_user_share = t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id + + //-- 自定义海报 -- + getApp().request.promiseGet("/api/weshop/goods/poster/page", { + data: { store_id: os.stoid, type: 1, is_use: 1 } + }).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]) { + + var poster_data = res.data.data.pageData[0]; + var json_str = poster_data.jsonStr; + + if (json_str) { + var json_data = JSON.parse(json_str); + if (json_data.bg_img) { + + //-- 把图片那到本地 -- + wx.getImageInfo({ + src: json_data.bg_img, + success: function (res) { + var path = res.path; + th.setData({ share_b_img: path }) + }, + fail: function (res) { } + }); + } + th.setData({ poster: json_data }) + } + } + }) - var ee = this, - that = ee, - th = ee, - gid = t.goods_id, - first_leader=t.first_leader, - room_id=t.room_id, - room_user_share=t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id - - //-- 自定义海报 -- - getApp().request.promiseGet("/api/weshop/goods/poster/page", { - data:{store_id:os.stoid, type:1, is_use:1} - }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]){ - - var poster_data=res.data.data.pageData[0]; - var json_str=poster_data.jsonStr; - - if(json_str){ - var json_data=JSON.parse(json_str); - if(json_data.bg_img){ - - //-- 把图片那到本地 -- - wx.getImageInfo({ - src:json_data.bg_img, - success: function(res) { - var path= res.path; - th.setData({share_b_img:path}) - }, - fail: function(res) {} - }); - } - th.setData({poster:json_data}) - - } - } - }) - //---获取手机地址坐标-- //--如果tg_id是空的话，分享回来-- if (gid == undefined || gid == null || gid == "") { - var gid_str = decodeURIComponent(t.scene); - gid_str=gid_str.split("_"); - gid=gid_str[0]; - if(gid_str.length>1){ - first_leader=gid_str[1]; - } - //-- 如果有room_id的获取 -- - if(gid_str.length>2 && gid_str[2]){ - room_id=gid_str[2]; - room_user_share=1; - } - + var gid_str = decodeURIComponent(t.scene); + gid_str = gid_str.split("_"); + gid = gid_str[0]; + if (gid_str.length > 1) { + first_leader = gid_str[1]; + } + //-- 如果有room_id的获取 -- + if (gid_str.length > 2 && gid_str[2]) { + room_id = gid_str[2]; + room_user_share = 1; + } + } - ee.setData({ gid: gid}); - if(first_leader){ - console.log("log---".first_leader); - getApp().globalData.first_leader=first_leader; + ee.setData({ gid: gid }); + if (first_leader) { + console.log("log---".first_leader); + getApp().globalData.first_leader = first_leader; //调用接口判断是不是会员 - getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.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/" + os.stoid + "/" + first_leader, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; } }) } //-- 如果有房间号 -- - if(room_id){ - getApp().globalData.room_id=room_id; - getApp().globalData.room_goods_id=gid; - //如果是会员分享过来的要记录 - if(room_user_share) - getApp().globalData.room_user_share=room_user_share; + if (room_id) { + getApp().globalData.room_id = room_id; + getApp().globalData.room_goods_id = gid; + //如果是会员分享过来的要记录 + if (room_user_share) + getApp().globalData.room_user_share = room_user_share; } - var c_guide_id=t.c_guide_id; - if(c_guide_id){ - th.data.c_guide_id=c_guide_id; + var c_guide_id = t.c_guide_id; + if (c_guide_id) { + th.data.c_guide_id = c_guide_id; } - - getApp().getConfig(function(e) { - ee.setData({sto_sele_name_1:e.store_name}) - }) + + getApp().getConfig(function (e) { + ee.setData({ sto_sele_name_1: e.store_name }) + }) //----获取系统参数----- - getApp().getConfig2(function(e) { + getApp().getConfig2(function (e) { ee.setData({ bconfig: e, - sales_rules:e.sales_rules, + sales_rules: e.sales_rules, }); if (e.categoryset.indexOf("," + 1 + ",") != -1) { @@ -365,9 +363,9 @@ Page({ var json_d = JSON.parse(e.switch_list); ee.setData({ store_config: e, - sys_switch:json_d, + sys_switch: json_d, is_closecoupon: json_d.is_closecoupon, - is_newsales_rules:json_d.is_newsales_rules + is_newsales_rules: json_d.is_newsales_rules }); ee.init(gid); //------几人评价------- @@ -378,39 +376,39 @@ Page({ }); //计算等级价相关 - var swithc_list=e.switch_list; - var sw_arr=JSON.parse(swithc_list); + 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}); + 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}); + 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 && user['card_expiredate']){ + if (user.card_field && user['card_expiredate']) { 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 && now6) card_name=card_name.substring(0,6); - var is_near_date=0; - if(end-now<60*60*30*24) is_near_date=1; //如果小于30天 - th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date}); + var is_near_date = 0; + if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天 + th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date }); } } }, 500) }) } - },1); + }, 1); //获取用户设备信息，屏幕宽度 wx.getSystemInfo({ @@ -420,164 +418,172 @@ Page({ }) } }); - + //获取用户的默认门店 - getApp().get_user_store(function(e) { - if(!e) { - th.data.fir_def_store={}; //赋值空对象 + getApp().get_user_store(function (e) { + if (!e) { + th.data.fir_def_store = {}; //赋值空对象 return false; } - var ee=JSON.parse(JSON.stringify(e)); + var ee = JSON.parse(JSON.stringify(e)); //--定时器推迟一下-- setTimeout(function () { - if(th.data.fir_goods) var g_distr_type=th.data.fir_goods.distr_type; + if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对-- - if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){ + if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { //th.data.fir_def_store={}; //赋值空对象 //return false; - //th.data.fir_def_store.is_no_dis=1; - ee.is_no_dis=1; + //th.data.fir_def_store.is_no_dis=1; + ee.is_no_dis = 1; } - var appd=getApp().globalData; - var w_time = setInterval(function() { + var appd = getApp().globalData; + var w_time = setInterval(function () { if (that.data.is_get_local_ok == 0) return false; clearInterval(w_time); var distance = null; - var e=JSON.parse(JSON.stringify(ee)); + var e = JSON.parse(JSON.stringify(ee)); //如果有开启近距离的话,同时距离优不一样了 if (that.data.lat != null) { //如果经纬度有变化的话 - if(e && appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){ - //that.data.fir_def_store=e; - // that.setData({ - // def_pick_store: e, - // sto_sele_name: e.pickup_name, - // sto_sele_id: e.pickup_id, - // sto_sele_distr: e.distr_type - // }) - that.set_def_storage(e); - - }else{ + if (e && appd.lat == that.data.lat && appd.lon == that.data.lon && e.distance > 0) { + that.set_def_storage(e); + + } else { //要用接口是获取距离，js的计算不准 - getApp().request.promiseGet("/api/weshop/pickup/list",{ - data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon}, - }).then(res=>{ - if(res.data.code==0){ - e=res.data.data.pageData[0]; - if (e){ - e.is_no_dis=ee.is_no_dis; - appd.pk_store=e; - // that.data.fir_def_store=e; - // that.setData({ - // def_pick_store: e, - // sto_sele_name: e.pickup_name, - // sto_sele_id: e.pickup_id, - // sto_sele_distr: e.distr_type - // }) - that.set_def_storage(e); + getApp().request.promiseGet("/api/weshop/pickup/list", { + data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon }, + }).then(res => { + if (res.data.code == 0) { + e = res.data.data.pageData[0]; + if (e) { + e.is_no_dis = ee.is_no_dis; + appd.pk_store = e; + that.set_def_storage(e); } } }) } - //e.distance = distance; - appd.lat=that.data.lat; - appd.lon=that.data.lon; + appd.lat = that.data.lat; + appd.lon = that.data.lon; - }else{ + } else { if (e) { e.distance = null; - // that.data.fir_def_store=e; - // that.setData({ - // def_pick_store: e, - // sto_sele_name: e.pickup_name, - // sto_sele_id: e.pickup_id, - // sto_sele_distr: e.distr_type - // }) - that.set_def_storage(e); + + that.set_def_storage(e); } } }, 500) - },700) - }); - + }, 700) + }); + //更新点击量 - getApp().request.put("/api/weshop/goods/updateClick",{ - data:{store_id:os.stoid,goods_id:gid} - }) + getApp().request.put("/api/weshop/goods/updateClick", { + data: { store_id: os.stoid, goods_id: gid } + }) }, - - + + //--- 设置一下默认库存的数量 ---- - set_def_storage(ee){ - var that=this,th=this; - getApp().getConfig2(function(e){ - var sales_rules=e.sales_rules; - if(sales_rules==2){ - getApp().waitfor2(that,"wait_for_user_store","fir_goods",function(){ - var lock=0,plist=null; - var gd=that.data.fir_goods; - //先读取门店的lock,采用链式写法，少用await - getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ - data:{store_id:os.stoid,wareId:that.data.fir_goods.goods_id,storageId:ee.pickup_id,pageSize:1000} - }).then(res=>{ - if(res.data.code==0 && res.data.data.total>0){ - for(var i in res.data.data.pageData) - lock+=res.data.data.pageData[i].outQty - } - //---通过接口获取门店的线下库存信息-- - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:ee.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid} - }) - }).then(res=>{ - if(res.data.code==0 && res.data.data.total>0){ - plist=res.data.data.pageData[0]; - } - if(plist && plist.CanOutQty-lock>0){ - ee.CanOutQty=plist.CanOutQty-lock; - }else{ - ee.CanOutQty=0; - } - //--给门店赋值线下库存-- - that.data.fir_def_store=ee; - that.setData({ - def_pick_store: ee, - sto_sele_name: ee.pickup_name, - sto_sele_id: ee.pickup_id, - sto_sele_distr: ee.distr_type - }) - }) - }) - }else{ - that.data.fir_def_store=ee; - that.setData({ - def_pick_store: ee, - sto_sele_name: ee.pickup_name, - sto_sele_id: ee.pickup_id, - sto_sele_distr: ee.distr_type - }) - } - }) - - }, - + set_def_storage(ee) { + var that = this, th = this; + getApp().getConfig2(function (e) { + var sales_rules = e.sales_rules; + if (sales_rules == 2) { + getApp().waitfor2(that, "wait_for_user_store", "fir_goods", function () { + var lock = 0, plist = null; + var gd = that.data.fir_goods; + //先读取门店的lock,采用链式写法，少用await + getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + data: { store_id: os.stoid, wareId: that.data.fir_goods.goods_id, storageId: ee.pickup_id, pageSize: 1000 } + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + for (var i in res.data.data.pageData) + lock += res.data.data.pageData[i].outQty + } + //---通过接口获取门店的线下库存信息-- + return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + data: { storageNos: ee.pickup_no, wareIds: encodeURIComponent(th.data.data.erpwareid), storeId: os.stoid } + }) + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + plist = res.data.data.pageData[0]; + } + if (plist && plist.CanOutQty - lock > 0) { + ee.CanOutQty = plist.CanOutQty - lock; + } else { + ee.CanOutQty = 0; + } + //--给门店赋值线下库存-- + that.data.fir_def_store = ee; + that.setData({ + def_pick_store: ee, + sto_sele_name: ee.pickup_name, + sto_sele_id: ee.pickup_id, + sto_sele_distr: ee.distr_type + }) + }) + }) + } else { + that.data.fir_def_store = ee; + that.setData({ + def_pick_store: ee, + sto_sele_name: ee.pickup_name, + sto_sele_id: ee.pickup_id, + sto_sele_distr: ee.distr_type + }) + } + }) + + }, + //------------程序初始化入口------------- async init(gid) { var ee = this, - th = ee, - gallery = null, - is_collect = 0, - collect_id = 0, - categories3 = ee.data.categories3, - fir_com = null, - fir_quan = null, - mapurl = null, - mapurl_f_img = null; - - + th = ee, + gallery = null, + is_collect = 0, + collect_id = 0, + categories3 = ee.data.categories3, + fir_com = null, + fir_quan = null, + mapurl = null, + mapurl_f_img = null; + //------获取预售从表---------- + await getApp().request.get("/api/weshop/marketing/marketingPresellList/page", { + data: { + is_end: 0, + store_id: os.stoid, + timetype: 1, + goods_id: gid + }, + success: function (res) { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { + var arr = res.data.data.pageData[0]; + let presell_id=arr.presell_id; + th.setData({ + presellList: arr, + }) + //------获取预售主表---------- + getApp().request.get(`/api/weshop/marketing/marketingPresellForm/get/${os.stoid}/${presell_id}`, { + success: function (res) { + console.log(res); + if (res.data.code == 0 && res.data.data) { + th.setData({ + presellForm: res.data.data, + }); + th.countDown(res.data.data.end_time) + } + } + }) + } + } + }); + this.get_sto(); //------图片滚动---------- await getApp().request.promiseGet("/api/weshop/goodsimages/page", { data: { @@ -628,6 +634,7 @@ Page({ //failRollback: !0, }).then(res => { + console.log(res); var t = res; var g = t.data.data[0]; if (g != null && g != undefined) { @@ -654,10 +661,11 @@ Page({ goods_id: gid, pageSize: 3, parent_id: 0, - page:1, - is_show:1, + page: 1, + is_show: 1, }, }).then(res => { + console.log(res); fir_com = res.data.data.pageData; }) @@ -677,7 +685,7 @@ Page({ type: 1, pageSize: 3, page: 1, - is_share:0, + is_share: 0, }, }).then(res1 => { fir_quan = res1.data.data.pageData; @@ -708,21 +716,21 @@ Page({ }, //---展示--- - onShow: function() { - console.log('djfijsaoifjoisadjfoij'); - var goods_list = null,th = this,that=this; - var show_prew_img= this.data.show_prew_img - if(show_prew_img){ - show_prew_img=0; + onShow: function () { + console.log('djfijsaoifjoisadjfoij'); + var goods_list = null, th = this, that = this; + var show_prew_img = this.data.show_prew_img + if (show_prew_img) { + show_prew_img = 0; return false; } //优惠券要实时更新 - getApp().getConfig2(function(e) { + getApp().getConfig2(function (e) { var json_d = JSON.parse(e.switch_list); - th.setData({is_closecoupon: json_d.is_closecoupon}) - th.setData({is_open_offline: json_d.is_pricing_open}) - },1) + th.setData({ is_closecoupon: json_d.is_closecoupon }) + th.setData({ is_open_offline: json_d.is_pricing_open }) + }, 1) var ui = setInterval(function () { @@ -736,20 +744,20 @@ Page({ this.data.is_timer = 1; var ee = this, - gid = this.data.gid, - i = getApp().request; + gid = this.data.gid, + i = getApp().request; this.wait_for_store_config(); - i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, { failRollback: !0, - success: function(t) { + success: function (t) { + console.log(t); if (t.data.code == 0) { if (t.data.data.is_on_sale != 1) { wx.showModal({ title: '商品已经下架', showCancel: !1, - complete: function() { + complete: function () { wx.navigateBack(); } }); @@ -761,7 +769,7 @@ Page({ wx.showModal({ title: '商品还未上架', showCancel: !1, - complete: function() { + complete: function () { wx.navigateBack(); } }); @@ -772,7 +780,7 @@ Page({ wx.showModal({ title: '商品已经到期下架', showCancel: !1, - complete: function() { + complete: function () { wx.navigateBack(); } }); @@ -780,46 +788,46 @@ Page({ } //动态获取商品名称 wx.setNavigationBarTitle({ - title: t.data.data.goods_name, + title: t.data.data.goods_name, }); //-- 判断是不是组合购活动,必须要登录后才能判断 -- - if(getApp().globalData.userInfo && t.data.data.prom_type==7 ){ - //获取活动信息 - var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + - t.data.data.prom_id+"/"+getApp().globalData.userInfo.user_id; - getApp().request.get(url, { - success:function (e) { - if (e.data.code == 0 && e.data.data) { - if(ut.gettimestamp(){ - if(res.data.code==0 && res.data.data.total>0){ - for(var i in res.data.data.pageData) - lock+=res.data.data.pageData[i].outQty - } - //---通过接口获取门店的线下库存信息-- - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid} - }) - }).then(res=>{ - if(res.data.code==0 && res.data.data.total>0){ - plist=res.data.data.pageData[0]; - } - if(plist && plist.CanOutQty-lock>0){ - that.data.fir_def_store.CanOutQty=plist.CanOutQty-lock; - }else{ - that.data.fir_def_store.CanOutQty=0; - } - //--给门店赋值线下库存-- - th.setData({def_pick_store:that.data.fir_def_store}); - }) - } - })--*/ - }else{ + } else { //获取门店 ee.get_sto(); } @@ -886,8 +863,8 @@ Page({ else { var gg = "", item = t.data.data; - if(item.goods_spec=="null" || item.goods_spec==null ) item.goods_spec=""; - if(item.goods_color=="null" || item.goods_color==null) item.goods_color=""; + if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = ""; + if (item.goods_color == "null" || item.goods_color == null) item.goods_color = ""; if (item.goods_spec != "" && item.goods_color != "") { gg = item.goods_spec + "/" + item.goods_color; @@ -910,7 +887,7 @@ Page({ if (ee.data.cat_name == '') { //过去国别，分类，品牌的名称 i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, { - success: function(t) { + success: function (t) { var dd = t.data.data; if (t.data.code == 0) { th.setData({ @@ -921,7 +898,7 @@ Page({ }); //过去国别，分类，品牌的名称 i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, { - success: function(t) { + success: function (t) { var dd = t.data.data; if (t.data.code == 0) { th.setData({ @@ -932,7 +909,7 @@ Page({ }); //过去国别，分类，品牌的名称 i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, { - success: function(t) { + success: function (t) { var dd = t.data.data; if (t.data.code == 0) { th.setData({ @@ -944,77 +921,77 @@ Page({ } } - else{ - wx.showModal({ - title: t.data.msg, - showCancel: !1, - complete: function() { - wx.navigateBack(); - } - }); - } - } + else { + wx.showModal({ + title: t.data.msg, + showCancel: !1, + complete: function () { + wx.navigateBack(); + } + }); + } + } }); this.data.enterAddressPage && (this.data.enterAddressPage = !1); }, - enterAddress: function() { + enterAddress: function () { this.data.enterAddressPage = !0, wx.navigateTo({ url: "/pages/user/address_list/address_list?operate=selectAddress" }); }, - onUnload: function() { - for(var i = 1; i < 100; i++) { - clearInterval(i); - } + onUnload: function () { + for (var i = 1; i < 100; i++) { + clearInterval(i); + } }, - onHide: function() { + onHide: function () { this.data.is_timer = 0; - for(var i = 1; i < 100; i++) { + for (var i = 1; i < 100; i++) { clearInterval(i); } }, //----------三个选项按钮----------- - tabClick: function(t) { + tabClick: function (t) { var e = t.currentTarget.id; this.setData({ activeCategoryId: e }), 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment(); }, - tabClick2: function(t) { + tabClick2: function (t) { this.setData({ activeCategoryId2: t.currentTarget.id }); }, - tabClick3: function(t) { + tabClick3: function (t) { var e = this; if (t.currentTarget.id != this.data.activeCategoryId3) { e.data.c_curr_p = 1; this.setData({ activeCategoryId3: t.currentTarget.id, - comments: null,comments_no_more:0,get_c:0, + comments: null, comments_no_more: 0, get_c: 0, }); this.requestComments_new(); } }, - doScrollTop: function() { + doScrollTop: function () { wx.pageScrollTo({ scrollTop: 0 }); }, - tabComment: function() { + tabComment: function () { this.setData({ - activeCategoryId: 2,comments_no_more:0,get_c:0 + activeCategoryId: 2, comments_no_more: 0, get_c: 0 }), this.data.comments || this.requestComments_new(); }, //商品详情的时候调用 - tabGoodsContent: function() { + tabGoodsContent: function () { var th = this, - i = getApp().request; + i = getApp().request; this.setData({ activeCategoryId: 1 }); @@ -1022,7 +999,7 @@ Page({ if (th.data.cat_name == '') { //过去国别，分类，品牌的名称 i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, { - success: function(t) { + success: function (t) { var dd = t.data.data; if (t.data.code == 0) { th.setData({ @@ -1033,7 +1010,7 @@ Page({ }); //过去国别，分类，品牌的名称 i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, { - success: function(t) { + success: function (t) { var dd = t.data.data; if (t.data.code == 0) { th.setData({ @@ -1044,7 +1021,7 @@ Page({ }); //过去国别，分类，品牌的名称 i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, { - success: function(t) { + success: function (t) { var dd = t.data.data; if (t.data.code == 0) { th.setData({ @@ -1059,8 +1036,8 @@ Page({ //获取redis中的数量 async getactLen(func) { var r_num = 0, - prom_type = this.data.prom_type, - prom_id = this.data.prom_id; + prom_type = this.data.prom_type, + prom_id = this.data.prom_id; await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, { 1: 1 }).then(res => { @@ -1073,16 +1050,16 @@ Page({ }, //------------加入购物车-------------- - addCart: function(t) { + addCart: function (t) { var th = this; var ind = t.currentTarget.dataset.openSpecModal_ind; - if(!ind) ind = t.currentTarget.dataset.openspecmodal_ind; + if (!ind) ind = t.currentTarget.dataset.openspecmodal_ind; th.setData({ open_ind_store: ind }); //如果是秒杀的话，要看redis够不够 if (this.data.prom_type == 1) { - this.getactLen(function(num) { + this.getactLen(function (num) { if (num < th.data.goodsInputNum) { getApp().my_warnning("秒杀库存不足!", 0, th); return false; @@ -1094,27 +1071,27 @@ Page({ th.add_cart_func(t); } }, - - - + + + //-- 加入购物的函数 -- - add_cart_func_inte: function(t) { + add_cart_func_inte: function (t) { var i = getApp().request; if (oo.user_id == null) { return s.my_warnning("还未登录！", 0, this); } - if(!getApp().globalData.userInfo){ - return s.my_warnning("还未登录！", 0, this); - } - + if (!getApp().globalData.userInfo) { + return s.my_warnning("还未登录！", 0, this); + } + var e = this, - th = e, - a = 0, - o = this.data.data; + th = e, + a = 0, + o = this.data.data; a = o.goods_id; - + //----------添加到购物车时，要判断限购数量，-------- - e.get_buy_num(o, function(ee) { + e.get_buy_num(o, function (ee) { //---判断商品是否超出限购--- if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) { @@ -1135,14 +1112,14 @@ Page({ return false; } } - + if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) this.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); - + //--------------此时操作的数据------------ var newd = { goods_id: o.goods_id, @@ -1151,72 +1128,72 @@ Page({ user_id: oo.user_id, store_id: th.data.stoid, goods_price: th.data.prom_price, - integral:th.data.prom_integral, + integral: th.data.prom_integral, member_goods_price: o.shop_price, goods_name: o.goods_name, goods_sn: o.goods_sn, sku: o.sku, - }; - + }; + //---是不是从收藏夹出来的--- - if(th.data.c_guide_id){ + if (th.data.c_guide_id) { newd['guide_id'] = th.data.c_guide_id; - newd['guide_type']=2; - if ("add" == t.currentTarget.dataset.action) newd['guide_type']=3; - }else{ - if(getApp().globalData.guide_id){ + newd['guide_type'] = 2; + if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 3; + } else { + if (getApp().globalData.guide_id) { newd['guide_id'] = getApp().globalData.guide_id; - newd['guide_type']=0; - if ("add" == t.currentTarget.dataset.action) newd['guide_type']=1; + newd['guide_type'] = 0; + if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1; } } - + //让商品带上房间号 //让商品带上房间号 - if(th.data.sys_switch.is_skuroom_id==1){ - if(th.data.data.goods_id==getApp().globalData.room_goods_id){ - newd.room_id=getApp().globalData.room_id; + if (th.data.sys_switch.is_skuroom_id == 1) { + if (th.data.data.goods_id == getApp().globalData.room_goods_id) { + newd.room_id = getApp().globalData.room_id; } - }else{ - if(newd.goods_id==getApp().globalData.room_goods_id) newd.room_id=getApp().globalData.room_id; + } else { + if (newd.goods_id == getApp().globalData.room_goods_id) newd.room_id = getApp().globalData.room_id; } - + //如果是积分够，is_integral_normal就要有积分购普通购买字段 //if(o.prom_type==4){ - //newd.is_integral_normal=1; + //newd.is_integral_normal=1; //} - - //-----如果是秒杀，团购，积分购,拼团----- - newd.prom_type = th.data.prom_type; - newd.prom_id = th.data.prom_id; - if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); - if (o.store_count 0) { if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) { @@ -1257,193 +1234,193 @@ Page({ goods_name: o.goods_name, goods_sn: o.goods_sn, sku: o.sku, - }; - + }; + //---是不是从收藏夹出来的--- - if(th.data.c_guide_id){ + if (th.data.c_guide_id) { newd['guide_id'] = th.data.c_guide_id; - newd['guide_type']=2; - if ("add" == t.currentTarget.dataset.action) newd['guide_type']=3; - }else{ - if(getApp().globalData.guide_id){ + newd['guide_type'] = 2; + if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 3; + } else { + if (getApp().globalData.guide_id) { newd['guide_id'] = getApp().globalData.guide_id; - newd['guide_type']=0; - if ("add" == t.currentTarget.dataset.action) newd['guide_type']=1; + newd['guide_type'] = 0; + if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1; } } //让商品带上房间号 //让商品带上房间号 - if(th.data.sys_switch.is_skuroom_id==1){ - if(th.data.data.goods_id==getApp().globalData.room_goods_id){ - newd.room_id=getApp().globalData.room_id; + if (th.data.sys_switch.is_skuroom_id == 1) { + if (th.data.data.goods_id == getApp().globalData.room_goods_id) { + newd.room_id = getApp().globalData.room_id; } - }else{ - if(newd.goods_id==getApp().globalData.room_goods_id) newd.room_id=getApp().globalData.room_id; + } else { + if (newd.goods_id == getApp().globalData.room_goods_id) newd.room_id = getApp().globalData.room_id; } //如果是积分够，is_integral_normal就要有积分购普通购买字段 - if(o.prom_type==4){ - newd.is_integral_normal=1; + if (o.prom_type == 4) { + newd.is_integral_normal = 1; + } + + //如果有线下取价 + if (o.offline_price) { + newd.offline_price = o.offline_price; + newd.pricing_type = o.pricing_type; } - - //如果有线下取价 - if(o.offline_price){ - newd.offline_price=o.offline_price; - newd.pricing_type=o.pricing_type; - } - + //-----如果是秒杀，团购，积分购,拼团----- if (th.data.prom_type == 1) { newd.goods_price = th.data.prom_price; newd.member_goods_price = th.data.prom_price, - newd.prom_type = th.data.prom_type; + newd.prom_type = th.data.prom_type; newd.prom_id = th.data.prom_id; if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); - if (o.store_count 0){ - var CanOutQty=res.data.data.pageData[0].CanOutQty; - if(CanOutQty0){ - - var lock=0; - for(var i in res_data.data.data.pageData){ - lock+=res_data.data.data.pageData[i].outQty; - } - - if(CanOutQty<=lock){ - return s.my_warnning("库存不足！", 0, th); - } - th.add_cart_next(e,t,a,o,newd,CanOutQty-lock); - }else{ - th.add_cart_next(e,t,a,o,newd,CanOutQty); - } - } - }) - }else{ - return s.my_warnning("库存不足！", 0, th); - } - - } - } - }) - }else{ - if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); - if (o.store_count 0) { + var CanOutQty = res.data.data.pageData[0].CanOutQty; + if (CanOutQty < e.data.goodsInputNum) { + return s.my_warnning("库存不足！", 0, th); + } + //在调一次接口,读取商品的预出库的数量，lock + getApp().request.get("/api/weshop/order/ware/lock/page", { + data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, storageId: pick.pickup_id, pageSize: 1000 }, + success: function (res_data) { + if (res_data.data.code == 0 && res_data.data.data.total > 0) { + + var lock = 0; + for (var i in res_data.data.data.pageData) { + lock += res_data.data.data.pageData[i].outQty; + } + + if (CanOutQty <= lock) { + return s.my_warnning("库存不足！", 0, th); + } + th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); + } else { + th.add_cart_next(e, t, a, o, newd, CanOutQty); + } + } + }) + } else { + return s.my_warnning("库存不足！", 0, th); + } + + } + } + }) + } else { + if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); + if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th); + th.add_cart_next(e, t, a, o, newd); //加入购物车下一步 + } + } + }) } - else if ( th.data.prom_type == 0 || th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) { + else if (th.data.prom_type == 0 || th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) { newd.prom_type = 0; newd.prom_id = 0; //---如果是线下门店销售的时候--- - if(th.data.sales_rules==2){ - var pick=th.get_pick_from_list(th.data.sto_sele_id) + if (th.data.sales_rules == 2) { + var pick = th.get_pick_from_list(th.data.sto_sele_id) //---通过接口获取门店的线下库存信息-- - getApp().request.get("/api/weshop/goods/getWareStorages",{ - data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid}, - success:function(res){ - if(res.data.code==0){ - if(res.data.data.pageData.length>0){ - var CanOutQty=res.data.data.pageData[0].CanOutQty; - if(CanOutQty 0) { + var CanOutQty = res.data.data.pageData[0].CanOutQty; + if (CanOutQty < e.data.goodsInputNum) { return s.my_warnning("库存不足！", 0, th); } //在调一次接口,读取商品的预出库的数量，lock - getApp().request.get("/api/weshop/order/ware/lock/page",{ - data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id,pageSize:1000}, - success:function(res_data){ - if(res_data.data.code==0 && res_data.data.data.total>0){ - - var lock=0; - for(var i in res_data.data.data.pageData){ - lock+=res_data.data.data.pageData[i].outQty; + getApp().request.get("/api/weshop/order/ware/lock/page", { + data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, storageId: pick.pickup_id, pageSize: 1000 }, + success: function (res_data) { + if (res_data.data.code == 0 && res_data.data.data.total > 0) { + + var lock = 0; + for (var i in res_data.data.data.pageData) { + lock += res_data.data.data.pageData[i].outQty; } - if(CanOutQty<=lock){ + if (CanOutQty <= lock) { return s.my_warnning("库存不足！", 0, th); } - th.add_cart_next(e,t,a,o,newd,CanOutQty-lock); - }else{ - th.add_cart_next(e,t,a,o,newd,CanOutQty); + th.add_cart_next(e, t, a, o, newd, CanOutQty - lock); + } else { + th.add_cart_next(e, t, a, o, newd, CanOutQty); } } }) - }else{ + } else { return s.my_warnning("库存不足！", 0, th); } } } }) - }else{ + } else { if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); - if (o.store_count now){ - var card_price=o[getApp().globalData.userInfo['card_field']]; + if (parseInt(s_list.rank_switch) == 2 && end > now) { + var card_price = o[getApp().globalData.userInfo['card_field']]; //如果会员有等级价 - if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null - && getApp().globalData.userInfo['card_field']!="" && card_price>0){ - newd.goods_price=card_price; - newd.member_goods_price=card_price; + if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null + && getApp().globalData.userInfo['card_field'] != "" && card_price > 0) { + newd.goods_price = card_price; + newd.member_goods_price = card_price; } } } @@ -1452,7 +1429,7 @@ Page({ //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d); if ("add" == t.currentTarget.dataset.action) { - if(th.data.prom_goods){ + if (th.data.prom_goods) { newd.prom_type = 3; newd.prom_id = th.data.prom_goods[0].prom_id; } @@ -1465,7 +1442,7 @@ Page({ goods_id: a, pick_id: e.data.sto_sele_id, }, - success: function(re) { + success: function (re) { //-------如果购物车中有相关的数据--------- if (re.data.data.total > 0) { @@ -1473,12 +1450,12 @@ Page({ var item = re.data.data.pageData[0]; //判断数量，要看下购物车中有没有该商品 - if(CanOutQty){ - if(item.goods_num+ th.data.goodsInputNum>CanOutQty){ + if (CanOutQty) { + if (item.goods_num + th.data.goodsInputNum > CanOutQty) { return s.my_warnning("库存不足！", 0, th); } - }else{ - if(item.goods_num+ th.data.goodsInputNum>o.store_count){ + } else { + if (item.goods_num + th.data.goodsInputNum > o.store_count) { return s.my_warnning("库存不足！", 0, th); } } @@ -1487,15 +1464,15 @@ Page({ id: item.id, goods_num: e.data.goodsInputNum + item.goods_num, goods_price: newd.goods_price, - member_goods_price:newd.goods_price, + member_goods_price: newd.goods_price, store_id: th.data.stoid, }; //---是不是从收藏夹出来的--- - if(th.data.c_guide_id){ + if (th.data.c_guide_id) { updata['guide_id'] = th.data.c_guide_id; - updata['guide_type']=3; //加入购物车之后就变成了3 - }else { + updata['guide_type'] = 3; //加入购物车之后就变成了3 + } else { if (getApp().globalData.guide_id) { updata['guide_id'] = getApp().globalData.guide_id; updata['guide_type'] = 0; @@ -1504,7 +1481,7 @@ Page({ i.put("/api/weshop/cart/update", { data: updata, - success: function(t) { + success: function (t) { getApp().my_warnning('加入购物车成功', 1, th, 450); var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; th.setData({ @@ -1518,7 +1495,7 @@ Page({ i.post("/api/weshop/cart/save", { data: newd, - success: function(t) { + success: function (t) { getApp().my_warnning('加入购物车成功', 1, th, 450); var c_num = th.data.cartGoodsNum + e.data.goodsInputNum; th.setData({ @@ -1535,20 +1512,20 @@ Page({ //else "exchange" == t.currentTarget.dataset.action ? this.exchange(d) : this.buyNow(d); else { - if(th.data.prom_goods){ - var prom_d=th.data.prom_goods; - for(var i in prom_d){ + if (th.data.prom_goods) { + var prom_d = th.data.prom_goods; + for (var i in prom_d) { //判断活动有俩种条件，0元 1件 - var condition_t=prom_d[i].prom_type; - switch(condition_t) { + var condition_t = prom_d[i].prom_type; + switch (condition_t) { case 0: //按钱 - if(newd.goods_price>=condition_t){ + if (newd.goods_price >= condition_t) { newd.prom_type = 3; newd.prom_id = prom_d[i].prom_id; } break case 1://按购买数量 - if(newd.goods_num>=condition_t){ + if (newd.goods_num >= condition_t) { newd.prom_type = 3; newd.prom_id = prom_d[i].prom_id; } @@ -1566,7 +1543,7 @@ Page({ //----------购买虚拟商品------ - buyVirtualGoods: function(e) { + buyVirtualGoods: function (e) { Object.assign(e, { goods_name: this.data.data.goods.goods_name, spec_name: this.data.select.specName, @@ -1576,102 +1553,102 @@ Page({ }); }, //----------积分兑换--------- - exchange: function(e) { + exchange: function (e) { this.data.shippingCost < 0 || this.data.select.stock <= 0 || wx.navigateTo({ url: "/pages/cart/integral/integral?" + t.Obj2Str(e) }); }, - - + + //----------立即购买----------- - buyNow: function(e) { + buyNow: function (e) { // this.data.shippingCost < 0 || this.data.select.stock <= 0 || (Object.assign(e, { // action: "buy_now" // }), this.setData({ - openSpecModal:0, - openSpecModal_inte:0, - openSpecModal_inte_normal:0, - openSpecModal_pt:0, + openSpecModal: 0, + openSpecModal_inte: 0, + openSpecModal_inte_normal: 0, + openSpecModal_pt: 0, }) - - if(e.prom_type==4){ - s.set_b_now(e); - var url="/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id; - getApp().goto(url); - }else{ - //要判断积分购的普通购买有没有参加优惠活动 - if(e.is_integral_normal==1){ - this.check_nor_promgood(e.goods_id,function(res){ - if(res && res.cat_id){ - e.prom_type=3; - e.prom_id=res.cat_id - } - s.set_b_now(e); - /*-- - wx.redirectTo({ - url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id, - });--*/ - getApp().goto("/packageC/pages/presell/cart/cart?is_bnow=1&goods_id=" + e.goods_id) - - }) - }else{ - s.set_b_now(e); - /*-- - wx.redirectTo({ - url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id, - });--*/ - getApp().goto("/packageC/pages/presell/cart/cart?is_bnow=1&goods_id=" + e.goods_id) - } - - } + + if (e.prom_type == 4) { + s.set_b_now(e); + var url = "/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id; + getApp().goto(url); + } else { + //要判断积分购的普通购买有没有参加优惠活动 + if (e.is_integral_normal == 1) { + this.check_nor_promgood(e.goods_id, function (res) { + if (res && res.cat_id) { + e.prom_type = 3; + e.prom_id = res.cat_id + } + s.set_b_now(e); + /*-- + wx.redirectTo({ + url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id, + });--*/ + getApp().goto("/packageC/pages/presell/cart/cart?is_bnow=1&goods_id=" + e.goods_id) + + }) + } else { + s.set_b_now(e); + /*-- + wx.redirectTo({ + url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id, + });--*/ + getApp().goto("/packageC/pages/presell/cart/cart?is_bnow=1&goods_id=" + e.goods_id) + } + + } }, //----------增加购买数量----------- - addCartNum: function(t) { + addCartNum: function (t) { this.checkCartNum(this.data.goodsInputNum + 1); }, //----------减少购买数量----------- - subCartNum: function(t) { + subCartNum: function (t) { this.checkCartNum(this.data.goodsInputNum - 1); }, //----------输入框输入购买数量----------- - inputCartNum: function(t) { + inputCartNum: function (t) { this.checkCartNum(Number(t.detail.value)); }, - + //----------增加购买数量----------- - addCartNum_inte: function(t) { + addCartNum_inte: function (t) { this.checkCartNum_inte(this.data.goodsInputNum + 1); }, //----------减少购买数量----------- - subCartNum_inte: function(t) { + subCartNum_inte: function (t) { this.checkCartNum_inte(this.data.goodsInputNum - 1); }, //----------输入框输入购买数量----------- - inputCartNum_inte: function(t) { + inputCartNum_inte: function (t) { this.checkCartNum_inte(Number(t.detail.value)); }, - + //------检查数量是不是超出限购------ - checkCartNum: function(t) { + checkCartNum: function (t) { var th = this; - this.get_buy_num(this.data.sele_g, async function() { + this.get_buy_num(this.data.sele_g, async function () { //--判断商品是否超出限购-- if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { - var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id); + var gd_buy_num = th.data.g_buy_num.get(th.data.sele_g.goods_id); if (t + gd_buy_num > th.data.sele_g.viplimited) { wx.showModal({ title: '超出商品限购', }); - var num= th.data.sele_g.viplimited-gd_buy_num; - if(num<0) num=0; - th.setData({goodsInputNum:num}) + var num = th.data.sele_g.viplimited - gd_buy_num; + if (num < 0) num = 0; + th.setData({ goodsInputNum: num }) return false; } } @@ -1683,9 +1660,9 @@ Page({ title: '超出商品活动限购', }); - var num=th.data.prom_buy_limit- th.data.prom_buy_num ; - if(num<0) num=0; - th.setData({goodsInputNum:num}) + var num = th.data.prom_buy_limit - th.data.prom_buy_num; + if (num < 0) num = 0; + th.setData({ goodsInputNum: num }) return false; } } @@ -1694,7 +1671,7 @@ Page({ var redis_num = 0; //------判断活动是否抢光----- await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + - os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, { + os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, { 1: 1 }).then(res => { redis_num = res.data.data; @@ -1704,131 +1681,133 @@ Page({ wx.showModal({ title: '超出商品活动库存', }); - th.setData({goodsInputNum:redis_num}) + th.setData({ goodsInputNum: redis_num }) return false; } } var e = th.data.sele_g.store_count; - var p_type=th.data.prom_type; //&& p_type!=1 && p_type!=4 - if(th.data.sales_rules==2 && (p_type!=1 && p_type!=4 && p_type!=6 || th.data.openSpecModal_inte_normal==1 || th.data.is_normal== 1) ){ - if(!th.data.def_pick_store){ + var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4 + if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { + if (!th.data.def_pick_store) { wx.showModal({ title: '请选择门店', }); return false; - }else{ - e=th.data.def_pick_store.CanOutQty; + } else { + e = th.data.def_pick_store.CanOutQty; } } - if(!e) e=0; + if (!e) e = 0; //库存不足，不增加 - if(e e || 0 == e ? t = e : t < 1 && (t = 1); th.setData({ goodsInputNum: t }); - th.is_show_more_buy(); + th.is_show_more_buy(); }) }, //----- 检查一下积分购的限购之类的问题 ----- - checkCartNum_inte: function(t) { + checkCartNum_inte: function (t) { var th = this; - this.get_buy_num(this.data.data, async function() { - + this.get_buy_num(this.data.data, async function () { + //--判断商品是否超出限购-- if (th.data.g_buy_num != null && th.data.data.viplimited > 0) { - - var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id); - + + var gd_buy_num = th.data.g_buy_num.get(th.data.sele_g.goods_id); + if (t + gd_buy_num > th.data.sele_g.viplimited) { wx.showModal({ title: '超出商品限购', }); - - var num= th.data.sele_g.viplimited-gd_buy_num; - if(num<0) num=0; - th.setData({goodsInputNum:num}) + + var num = th.data.sele_g.viplimited - gd_buy_num; + if (num < 0) num = 0; + th.setData({ goodsInputNum: num }) return false; } } - + //--判断商品是否超出活动限购-- if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) { if (t + th.data.prom_buy_num > th.data.prom_buy_limit) { wx.showModal({ title: '超出商品活动限购', }); - - var num=th.data.prom_buy_limit- th.data.prom_buy_num ; - if(num<0) num=0; - th.setData({goodsInputNum:num}) + + var num = th.data.prom_buy_limit - th.data.prom_buy_num; + if (num < 0) num = 0; + th.setData({ goodsInputNum: num }) return false; } } - + if (th.data.sele_g.prom_type == 1 || th.data.sele_g.prom_type == 6) { var redis_num = 0; //------判断活动是否抢光----- await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + - os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, { + os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, { 1: 1 }).then(res => { redis_num = res.data.data; }); - + if (t > redis_num) { wx.showModal({ title: '超出商品活动库存', }); - th.setData({goodsInputNum:redis_num}) + th.setData({ goodsInputNum: redis_num }) return false; } - + } - + var e = th.data.sele_g.store_count; - var p_type=th.data.prom_type; //&& p_type!=1 && p_type!=4 - if(th.data.sales_rules==2 && (p_type!=1 && p_type!=4 && p_type!=6 || th.data.openSpecModal_inte_normal==1 || th.data.is_normal== 1) ){ - if(!th.data.def_pick_store){ + var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4 + if (th.data.sales_rules == 2 && (p_type != 1 && p_type != 4 && p_type != 6 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { + if (!th.data.def_pick_store) { wx.showModal({ title: '请选择门店', }); return false; - }else{ - e=th.data.def_pick_store.CanOutQty; + } else { + e = th.data.def_pick_store.CanOutQty; } } - if(!e) e=0; + if (!e) e = 0; //库存不足，不增加 - if(e e || 0 == e ? t = e : t < 1 && (t = 1); - th.setData({ goodsInputNum: t }); + th.setData({ goodsInputNum: t }); }) }, - closeSpecModal: function() { - if(this.data.openSpecModal_pt && this.data.is_normal){ - this.get_sto(); - this.setData({ - sele_g:this.data.data, - gid:this.data.data.goods_id - }) - - this.sele_spec_chech_activity(); - - } - + closeSpecModal: function () { + if (this.data.openSpecModal_pt && this.data.is_normal) { + this.get_sto(); + this.setData({ + sele_g: this.data.data, + gid: this.data.data.goods_id + }) + + this.sele_spec_chech_activity(); + + } + this.setData({ openSpecModal: !1, openSpecModal_pt: !1 }); }, - - openSpecModel: function(t) { - var th=this; + + openSpecModel: function (t) { + var th = this; var open_store = t.currentTarget.dataset.ind; this.setData({ store: 0, @@ -1848,7 +1827,7 @@ Page({ var ind = t.currentTarget.dataset.ind; //回调。判断是不是优惠促销 - th.check_is_prom_goods(function (){ + th.check_is_prom_goods(function () { th.setData({ openSpecModal: !0, openSpecModal_ind: ind, @@ -1857,127 +1836,129 @@ Page({ th.get_off_price(); }) }, - + //判断是不是优惠促销 - check_is_prom_goods:function(callback){ - var th=this; - var usr=getApp().globalData.userInfo; - if(this.data.sele_g.prom_type!=0 && this.data.sele_g.prom_type!=3){ - callback(); - }else{ - //-- 判断有没有优惠活动 -- - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+th.data.sele_g.goods_id+"/0", {}).then(res => { - if(res.data.code==0){ - var r_data=res.data.data; - th.data.prom_goods=r_data.promGoodsLists; - if(!th.data.prom_goods){ - callback(); - return false; - } - - ///api/weshop/order/getWPayOrder?store_id=1&user_id=5682366&prom_id=1&goods_id=1 - getApp().promiseGet("/api/weshop/order/getWPayOrder",{ - data:{store_id:os.stoid,user_id:usr.user_id,goods_id:th.data.sele_g.goods_id,prom_id:th.data.prom_goods[0].prom_id} - }).then(res=>{ - if(res.data.code==0){ - wx.showToast({ - title: "您已经购买了该商品待支付中", - icon: 'none', - duration: 2000 - }) - setTimeout(function (){ - getApp().goto("/pages/user/order_detail/order_detail?order_id=" + res.data.data.order_id,) - },1000) - } - //未找到相关记录 - else{ - callback(); - } - }) - } - - }) - - } - }, - - - + check_is_prom_goods: function (callback) { + var th = this; + var usr = getApp().globalData.userInfo; + if (this.data.sele_g.prom_type != 0 && this.data.sele_g.prom_type != 3) { + callback(); + } else { + //-- 判断有没有优惠活动 -- + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + th.data.sele_g.goods_id + "/0", {}).then(res => { + if (res.data.code == 0) { + var r_data = res.data.data; + th.data.prom_goods = r_data.promGoodsLists; + if (!th.data.prom_goods) { + callback(); + return false; + } + + ///api/weshop/order/getWPayOrder?store_id=1&user_id=5682366&prom_id=1&goods_id=1 + getApp().promiseGet("/api/weshop/order/getWPayOrder", { + data: { store_id: os.stoid, user_id: usr.user_id, goods_id: th.data.sele_g.goods_id, prom_id: th.data.prom_goods[0].prom_id } + }).then(res => { + if (res.data.code == 0) { + wx.showToast({ + title: "您已经购买了该商品待支付中", + icon: 'none', + duration: 2000 + }) + setTimeout(function () { + getApp().goto("/pages/user/order_detail/order_detail?order_id=" + res.data.data.order_id,) + }, 1000) + } + //未找到相关记录 + else { + callback(); + } + }) + } + + }) + + } + }, + + + //----获取线下价格------- - get_off_price(){ - var th=this; - //没有开启就返回 - if(!th.data.is_open_offline) return false; - //先看下购买的功能有没有到期 - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=6",{}).then(res=>{ - //未购买 - if(res.data.code!=0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length){ - return false; - }else{ - //已经过期 - var item=res.data.data.pageData[0]; - if(item.end_time0){ - cur_price=cur_goods[th.data.card_field]; - } - - var user_info = getApp().globalData.userInfo; - //获取一下接口，判断是不是有线下接口,必须是普通商品，全局优惠活动也是不行 - if(cur_goods.prom_type==0 && !this.data.prom_goods){ - cur_goods.offline_price=null; - //如果没有门店，不用计算线下价格 - var def_pick_store=this.data.def_pick_store; - if(!def_pick_store) return false; - getApp().request.get("/api/weshop/goods/listWarePrice", { - data:{VIPId:encodeURIComponent(user_info.erpvipid), - store_id:os.stoid, - PickupId:def_pick_store.pickup_id, - WareIds:encodeURIComponent(cur_goods.erpwareid)}, - success:function(res){ - if(res.data.code==0 && res.data.data && res.data.data.length>0){ - var datalist=res.data.data; - if(datalist[0].WarePrice { + //未购买 + if (res.data.code != 0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length) { + return false; + } else { + //已经过期 + var item = res.data.data.pageData[0]; + if (item.end_time < ut.gettimestamp()) { + return false; + } + } + + + var cur_goods = this.data.sele_g; + var cur_price = cur_goods.shop_price; + if (th.data.card_field && cur_goods[th.data.card_field] > 0) { + cur_price = cur_goods[th.data.card_field]; + } + + var user_info = getApp().globalData.userInfo; + //获取一下接口，判断是不是有线下接口,必须是普通商品，全局优惠活动也是不行 + if (cur_goods.prom_type == 0 && !this.data.prom_goods) { + cur_goods.offline_price = null; + //如果没有门店，不用计算线下价格 + var def_pick_store = this.data.def_pick_store; + if (!def_pick_store) return false; + getApp().request.get("/api/weshop/goods/listWarePrice", { + data: { + VIPId: encodeURIComponent(user_info.erpvipid), + store_id: os.stoid, + PickupId: def_pick_store.pickup_id, + WareIds: encodeURIComponent(cur_goods.erpwareid) + }, + success: function (res) { + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { + var datalist = res.data.data; + if (datalist[0].WarePrice < cur_price) { + cur_goods.offline_price = datalist[0].WarePrice; //存储线下活动的价格 + cur_goods.pricing_type = datalist[0].PriceType; //存储线下活动的类型 + } + } + th.setData({ sele_g: cur_goods }); + } + + }) + } + + }) + + + }, + + //---------点击收藏和不收藏------------ - collectGoods: function() { + collectGoods: function () { var t = this, - i = getApp().request; + i = getApp().request; var user_id = s.globalData.user_id; if (user_id == '') { - getApp().getUserFir(function() {}); + getApp().getUserFir(function () { }); getApp().showWarning("未登录"); return false; } else { - if(t.data.is_collect_load) return false; - t.data.is_collect_load=1; + if (t.data.is_collect_load) return false; + t.data.is_collect_load = 1; if (t.data.is_collect == 1) { //删除收藏 i.delete("/api/weshop/goodscollect/del/" + o.stoid + "/" + t.data.collect_id, { - success: function(e) { - t.data.is_collect_load=0; + success: function (e) { + t.data.is_collect_load = 0; if (e.data.code == 0) { t.setData({ is_collect: 0, @@ -1996,15 +1977,15 @@ Page({ add_time: timestamp, }; //加入收藏夹就是导购的ID - if(getApp().globalData.guide_id){ - d.guide_id=getApp().globalData.guide_id; - d.guide_type=2; + if (getApp().globalData.guide_id) { + d.guide_id = getApp().globalData.guide_id; + d.guide_type = 2; } i.post("/api/weshop/goodscollect/save", { //添加收藏 data: d, - success: function(e) { - t.data.is_collect_load=0; + success: function (e) { + t.data.is_collect_load = 0; if (e.data.code == 0) { t.setData({ is_collect: 1, @@ -2018,13 +1999,13 @@ Page({ }, //---------联系客服------------ - contactService: function() { - s.getConfig(function(t) { + contactService: function () { + s.getConfig(function (t) { if (t.store_tel == undefined) { getApp().request.get("/api/weshop/store/get/" + os.stoid, { isShowLoading: 1, data: {}, - success: function(rs) { + success: function (rs) { getApp().globalData.config = rs.data.data; if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) { getApp().my_warnning("商家未设置电话", 0, th); @@ -2039,44 +2020,44 @@ Page({ }); }, //-------获取购物车数量---------- - requestCardNum: function() { + requestCardNum: function () { var t = this; getApp().request.get("/api/weshop/cart/page", { data: { store_id: o.stoid, user_id: s.globalData.user_id, - state:0, - is_gift:0 + state: 0, + is_gift: 0 }, - success: function(e) { + success: function (e) { var num = 0; for (var i = 0; i < e.data.data.pageData.length; i++) { num += e.data.data.pageData[i].goods_num; } //-- 读取服务卡的数量 -- - getApp().promiseGet("/api/weshop/cartService/page",{ - data:{ + getApp().promiseGet("/api/weshop/cartService/page", { + data: { store_id: s.globalData.setting.stoid, user_id: s.globalData.user_id, } - }).then(res=>{ + }).then(res => { for (var i = 0; i < res.data.data.pageData.length; i++) { num += res.data.data.pageData[i].goods_num; } - t.setData({cartGoodsNum:num}); + t.setData({ cartGoodsNum: num }); }) } }); }, - previewCommentImgs: function(t) { + previewCommentImgs: function (t) { var e = this.data.comments[t.currentTarget.dataset.cidx].img; var b = e.slice() - for(var i in b){ + for (var i in b) { b[i] = this.data.iurl + e[i]; } - this.data.show_prew_img=1; + this.data.show_prew_img = 1; wx.previewImage({ current: b[t.currentTarget.dataset.id], @@ -2084,106 +2065,106 @@ Page({ }); }, - previewCommentImgs_w: function(t) { + previewCommentImgs_w: function (t) { var e = this.data.comments[t.currentTarget.dataset.cidx].weapp_img; var b = e.slice() for (var i in b) { b[i] = this.data.iurl + e[i]; } - this.data.show_prew_img=1; + this.data.show_prew_img = 1; wx.previewImage({ current: b[t.currentTarget.dataset.id], urls: b }); }, - previewGoodsCommentImgs: function(t) { + previewGoodsCommentImgs: function (t) { var e = this, - a = this.data.data.comment[t.currentTarget.dataset.cidx].img; - a = a.map(function(t) { + a = this.data.data.comment[t.currentTarget.dataset.cidx].img; + a = a.map(function (t) { return e.data.url + t; }), wx.previewImage({ current: a[t.currentTarget.dataset.id], urls: a }); - this.data.show_prew_img=1; + this.data.show_prew_img = 1; }, - closePromModal: function() { + closePromModal: function () { this.setData({ openPromModal: !1 }); }, - openPromModal: function() { + openPromModal: function () { this.setData({ openPromModal: !0 }); }, //--点击分享事件--- - onShareAppMessage: function(t) { - + onShareAppMessage: function (t) { + var th = this; var price = th.data.data.shop_price; if (th.data.prom_act) { price = th.data.prom_act.price; } - var title= th.data.data.goods_name; - var img=th.data.data.original_img; - if(th.data.prom_type==6 || th.data.prom_type==1 || th.data.prom_type==4){ - title=th.data.prom_act.share_title; - if(!title) title=th.data.prom_act.title; - if(th.data.prom_type==4) title=th.data.prom_act.name; - - if(th.data.prom_act.share_imgurl) - img=th.data.iurl+th.data.prom_act.share_imgurl; + var title = th.data.data.goods_name; + var img = th.data.data.original_img; + if (th.data.prom_type == 6 || th.data.prom_type == 1 || th.data.prom_type == 4) { + title = th.data.prom_act.share_title; + if (!title) title = th.data.prom_act.title; + if (th.data.prom_type == 4) title = th.data.prom_act.name; + + if (th.data.prom_act.share_imgurl) + img = th.data.iurl + th.data.prom_act.share_imgurl; + } + + + var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid; + if (getApp().globalData.user_id) { + url += "&first_leader=" + getApp().globalData.user_id; } - - var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid; - if(getApp().globalData.user_id){ - url+="&first_leader="+getApp().globalData.user_id; + //-- 如果房间分享，且不是会员分享的 -- + if (getApp().globalData.room_id && + th.data.data.goods_id == getApp().globalData.room_goods_id && + !getApp().globalData.room_user_share + ) { + url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1"; } - - //-- 如果房间分享，且不是会员分享的 -- - if(getApp().globalData.room_id && - th.data.data.goods_id==getApp().globalData.room_goods_id && - !getApp().globalData.room_user_share - ){ - url+="&room_id="+getApp().globalData.room_id+"&room_user_share=1"; - } - - var ob={ - title: price + "元 " +title, - path:url, + + var ob = { + title: price + "元 " + title, + path: url, imageUrl: img, - }; - if(th.data.prom_type==6){ - title+='\n'+th.data.prom_act.share_remark; - ob.title=title; - ob.desc=th.data.prom_act.share_remark; - } - - //如果是积分购的时候 - if(th.data.prom_type==4){ - var name = th.data.prom_act.name; - //-- 积分购的 -- - var pri0 = th.data.prom_act.addmoney; - var integral=th.data.prom_act.integral; - var text=""; - if(integral){text=integral+"积分"; } - if(pri0 && integral){ text+="+";} - if(pri0){ text+="￥"+pri0;} - - ob.title= text+" "+name; - } - + }; + if (th.data.prom_type == 6) { + title += '\n' + th.data.prom_act.share_remark; + ob.title = title; + ob.desc = th.data.prom_act.share_remark; + } + + //如果是积分购的时候 + if (th.data.prom_type == 4) { + var name = th.data.prom_act.name; + //-- 积分购的 -- + var pri0 = th.data.prom_act.addmoney; + var integral = th.data.prom_act.integral; + var text = ""; + if (integral) { text = integral + "积分"; } + if (pri0 && integral) { text += "+"; } + if (pri0) { text += "￥" + pri0; } + + ob.title = text + " " + name; + } + return ob; - + }, //-----图片失败，默认图片----- - bind_bnerr: function(e) { + bind_bnerr: function (e) { var _errImg = e.target.dataset.errorimg; var _errObj = {}; _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif"; @@ -2191,7 +2172,7 @@ Page({ }, //-----图片失败，默认图片----- - bind_bnerr2: function(e) { + bind_bnerr2: function (e) { var _errImg = e.target.dataset.errorimg; var _errObj = {}; @@ -2201,79 +2182,79 @@ Page({ //----------装载同一条形码的商品---------- async get_sku(stoid, gd, g_id, is_normal, func) { - var tt = this,arrdata=null; - var now=ut.gettimestamp(); + var tt = this, arrdata = null; + var now = ut.gettimestamp(); await getApp().request.promiseGet("/api/weshop/goods/page", { data: { store_id: o.stoid, sku: gd.sku, - more_spec:gd.more_spec, + more_spec: gd.more_spec, isonsale: 1, is_on_sale: 1, - pageSize:500, - orderField: 'sort' + pageSize: 500, + orderField: 'sort' } }).then(res => { var e = res; if (e.data.code == 0) arrdata = e.data.data.pageData; }) - if(!arrdata) return false; + if (!arrdata) return false; var arrsku = new Array(); var gitem = null; - var gb = 1,gg = ""; + var gb = 1, gg = ""; for (var i = 0; i < arrdata.length; i++) { - var goodsinfo=arrdata[i],prom=null; + var goodsinfo = arrdata[i], prom = null; if (goodsinfo.goods_id != g_id) { - - switch(goodsinfo.prom_type){ - case 1: - await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0) prom=res.data.data; - }) - - break; - case 6: - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0) prom=res.data.data; - }) - - break; - case 2: - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/"+os.stoid+"/"+goodsinfo.goods_id+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0) prom=res.data.data; - }) - break; - case 4: - await getApp().request.promiseGet("/api/weshop/integralbuy/getActInfo/"+os.stoid+"/"+goodsinfo.goods_id+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0) prom=res.data.data; - }) - break - - } - - - } - //---如果有活动，不算在一起--- - if(prom){ - if(goodsinfo.prom_type==1 || goodsinfo.prom_type==6){ - if(prom.is_end==0 && prom.end_time>now && prom.start_time { + if (res.data.code == 0) prom = res.data.data; + }) + + break; + case 6: + await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + goodsinfo.prom_id, { + }).then(res => { + if (res.data.code == 0) prom = res.data.data; + }) + + break; + case 2: + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + goodsinfo.goods_id + "/" + goodsinfo.prom_id, { + }).then(res => { + if (res.data.code == 0) prom = res.data.data; + }) + break; + case 4: + await getApp().request.promiseGet("/api/weshop/integralbuy/getActInfo/" + os.stoid + "/" + goodsinfo.goods_id + "/" + goodsinfo.prom_id, { + }).then(res => { + if (res.data.code == 0) prom = res.data.data; + }) + break - if (item.goods_spec != "" && item.goods_color != "") { - gg = item.goods_spec + "/" + item.goods_color; + } + + + } + //---如果有活动，不算在一起--- + if (prom) { + if (goodsinfo.prom_type == 1 || goodsinfo.prom_type == 6) { + if (prom.is_end == 0 && prom.end_time > now && prom.start_time < now) continue; + } else { + continue; + } + } + + + var item = arrdata[i], gg = ""; + if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = ""; + if (item.goods_color == "null" || item.goods_color == null) item.goods_color = ""; + + if (item.goods_spec != "" && item.goods_color != "") { + gg = item.goods_spec + "/" + item.goods_color; } else if (item.goods_spec != "" || item.goods_color != "") { gg = item.goods_spec + item.goods_color; } else { @@ -2282,10 +2263,10 @@ Page({ } item.gg = gg; - if(item.spec_img) - item.original_img=os.imghost+item.spec_img; + if (item.spec_img) + item.original_img = os.imghost + item.spec_img; else - item.original_img=os.imghost+item.original_img; + item.original_img = os.imghost + item.original_img; if (item.goods_id == g_id) { @@ -2311,16 +2292,16 @@ Page({ }, //-----------选择属性的按钮事件---------- - sele_spec: function(e) { - var that=this,ee=this,th=this; + sele_spec: function (e) { + var that = this, ee = this, th = this; var gid = e.currentTarget.dataset.gid; - var nor=e.currentTarget.dataset.nor; - + var nor = e.currentTarget.dataset.nor; + var sku_g = this.data.sku_g; - if(nor){ - sku_g = this.data.sku_g_pt; - } - + if (nor) { + sku_g = this.data.sku_g_pt; + } + var item = null; for (var i in sku_g) { if (sku_g[i].goods_id == gid) { @@ -2332,41 +2313,41 @@ Page({ sele_g: item, gid: gid }); - - - that.check_is_youhui(gid,that.data.is_normal); - - var ty=0; + + + that.check_is_youhui(gid, that.data.is_normal); + + var ty = 0; this.get_sto(that.data.is_normal); - - + + //默认门店要拿下门店库存 - if(that.data.sales_rules==2 && that.data.def_pick_store){ - var lock=0,plist=null; + if (that.data.sales_rules == 2 && that.data.def_pick_store) { + var lock = 0, plist = null; //先读取门店的lock,采用链式写法，少用await - getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ - data:{store_id:os.stoid,wareId:ee.data.sele_g.goods_id,storageId:that.data.def_pick_store.pickup_id,pageSize:1000} - }).then(res=>{ - if(res.data.code==0 && res.data.data.total>0){ - for(var i in res.data.data.pageData) - lock+=res.data.data.pageData[i].outQty + getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + data: { store_id: os.stoid, wareId: ee.data.sele_g.goods_id, storageId: that.data.def_pick_store.pickup_id, pageSize: 1000 } + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + for (var i in res.data.data.pageData) + lock += res.data.data.pageData[i].outQty } //---通过接口获取门店的线下库存信息-- - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:that.data.def_pick_store.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid} + return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + data: { storageNos: that.data.def_pick_store.pickup_no, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid } }) - }).then(res=>{ - if(res.data.code==0 && res.data.data.total>0){ - plist=res.data.data.pageData[0]; + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + plist = res.data.data.pageData[0]; } - if(plist && plist.CanOutQty-lock>0){ - that.data.def_pick_store.CanOutQty=plist.CanOutQty-lock; - }else{ - that.data.def_pick_store.CanOutQty=0; + if (plist && plist.CanOutQty - lock > 0) { + that.data.def_pick_store.CanOutQty = plist.CanOutQty - lock; + } else { + that.data.def_pick_store.CanOutQty = 0; } //--给门店赋值线下库存-- - th.setData({def_pick_store:that.data.def_pick_store}); + th.setData({ def_pick_store: that.data.def_pick_store }); }) } @@ -2375,58 +2356,58 @@ Page({ }, //选择了不同的规格的时候要判断是不是有活动正在进行中 - async sele_spec_chech_activity(){ + async sele_spec_chech_activity() { //---如果是活动的时候--- - var prom=null,goodsinfo=this.data.sele_g,th=this; - if(goodsinfo.prom_type==1){ - await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; + var prom = null, goodsinfo = this.data.sele_g, th = this; + if (goodsinfo.prom_type == 1) { + await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + goodsinfo.prom_id, { + }).then(res => { + if (res.data.code == 0) { + prom = res.data.data; + } + }) + } + if (goodsinfo.prom_type == 6) { + await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + goodsinfo.prom_id, { + }).then(res => { + if (res.data.code == 0) { + prom = res.data.data; } }) } - if(goodsinfo.prom_type==6){ - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; + + if (goodsinfo.prom_type == 4) { + await getApp().request.promiseGet("/api/weshop/integralbuy/getActInfo/" + os.stoid + "/" + goodsinfo.goods_id + "/" + goodsinfo.prom_id, { + }).then(res => { + if (res.data.code == 0) { + prom = res.data.data; } }) } - - if(goodsinfo.prom_type==4){ - await getApp().request.promiseGet("/api/weshop/integralbuy/getActInfo/"+os.stoid+"/"+goodsinfo.goods_id+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - } - }) - } - + //----------如果有活动，并且在进行中，就不计算线下库存--------------- - var now=ut.gettimestamp(); - if(prom){ - if(prom.is_end==0 && prom.end_time>now && prom.start_time now && prom.start_time < now) { th.setData({ - prom_type:goodsinfo.prom_type, - prom_price:prom.price, - prom_buy_limit:prom.buy_limit, - prom_end_time:prom.end_time, - prom_start_time:prom.start_time, - prom_st:1, + prom_type: goodsinfo.prom_type, + prom_price: prom.price, + prom_buy_limit: prom.buy_limit, + prom_end_time: prom.end_time, + prom_start_time: prom.start_time, + prom_st: 1, }) return false; } } //---设置普通商品--- th.setData({ - prom_type:0, - prom_price:null, - prom_buy_limit:null, - prom_end_time:null, - prom_start_time:null, - prom_st:null, + prom_type: 0, + prom_price: null, + prom_buy_limit: null, + prom_end_time: null, + prom_start_time: null, + prom_st: null, }) }, @@ -2434,20 +2415,20 @@ Page({ //---------拿出门店分类和门店------------ get_sto(e) { - var th = this,that=this; - var is_normal=e; - - if(e==1){ - th.setData({is_normal:1}) - }else{ - th.setData({is_normal:0}) - } - - var timer_get = setInterval(function() { + var th = this, that = this; + var is_normal = e; + + if (e == 1) { + th.setData({ is_normal: 1 }) + } else { + th.setData({ is_normal: 0 }) + } + + var timer_get = setInterval(function () { if (th.data.is_get_local_ok == 0) return false; - var dd = null,i = getApp().request; - if (!th.data.sele_g) return false; - + var dd = null, i = getApp().request; + if (!th.data.sele_g) return false; + var g_distr_type = th.data.sele_g.distr_type; if (g_distr_type != 0) { dd = { @@ -2469,42 +2450,42 @@ Page({ dd.lon = th.data.lon; } clearInterval(timer_get); - - //如果会员是有默认的门店话 - if(!th.data.def_pick_store && th.data.fir_def_store){ - th.setData({def_pick_store:th.data.fir_def_store}); - } - - /*--最新的，不用这里筛选配送方式 - if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){ - th.setData({def_pick_store:null}); - }--*/ - - - wx.showLoading({ - title:'加载中.' - }); + + //如果会员是有默认的门店话 + if (!th.data.def_pick_store && th.data.fir_def_store) { + th.setData({ def_pick_store: th.data.fir_def_store }); + } + + /*--最新的，不用这里筛选配送方式 + if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){ + th.setData({def_pick_store:null}); + }--*/ + + + wx.showLoading({ + title: '加载中.' + }); //----------获取门店---------------- getApp().request.promiseGet("/api/weshop/pickup/list", { data: dd, }).then(res => { var e = res; - - if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) { + + if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length > 0) { //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 - if(dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig && th.data.bconfig.is_sort_storage){ + if (dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store) == '{}') && th.data.bconfig && th.data.bconfig.is_sort_storage) { th.setData({ - def_pick_store:e.data.data.pageData[0], + def_pick_store: e.data.data.pageData[0], sto_sele_name: e.data.data.pageData[0].pickup_name, sto_sele_id: e.data.data.pageData[0].pickup_id, sto_sele_distr: e.data.data.pageData[0].distr_type }); - th.data.fir_def_store=e.data.data.pageData[0]; + th.data.fir_def_store = e.data.data.pageData[0]; } //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 -- - if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){ + if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store) != '{}') { for (var k = 0; k < e.data.data.pageData.length; k++) { if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) { e.data.data.pageData.splice(k, 1); //删除 @@ -2515,17 +2496,17 @@ Page({ } - th.setData({all_pick_list:e.data.data.pageData}); + th.setData({ all_pick_list: e.data.data.pageData }); //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购-- - if(th.data.sales_rules==2 && !th.data.is_newsales_rules && ((th.data.prom_type!=1 && th.data.prom_type!=6 && th.data.prom_type!=4) || is_normal==1)){ - setTimeout(function(){ + if (th.data.sales_rules == 2 && !th.data.is_newsales_rules && ((th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4) || is_normal == 1)) { + setTimeout(function () { th.deal_pickup_dline(e); - },800) - }else{ - setTimeout(function(){ + }, 800) + } else { + setTimeout(function () { th.deal_pickup(e); //--普通门店排版-- - },800) + }, 800) } } }) @@ -2533,14 +2514,14 @@ Page({ }, - + //------------处理门店--------------- - deal_pickup(e){ - var th=this; - if(!th.data.sele_g) return false - - var g_distr_type=th.data.sele_g.distr_type; - wx.hideLoading(); + deal_pickup(e) { + var th = this; + if (!th.data.sele_g) return false + + var g_distr_type = th.data.sele_g.distr_type; + wx.hideLoading(); //单总量超出5个的时候 if (e.data.data.total > 5) { @@ -2549,13 +2530,13 @@ Page({ store_id: o.stoid, is_show: 1, pageSize: 1000, - orderField:"sort", - orderType:'asc', + orderField: "sort", + orderType: 'asc', }, - success: function(ee) { + success: function (ee) { if (ee.data.code == 0) { - - if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { + + if (ee.data.data && ee.data.data.pageData && ee.data.data.pageData.length > 0) { var def_arr = new Array(); var ishas = 0; //-- 开始就看5个门店 -- @@ -2576,7 +2557,7 @@ Page({ //----要进行门店分组-------- for (var i = 0; i < sto_arr.length; i++) { //找一下这个门店有没有在分类数组内 - var find2 = 0, find2name = "",sort=0; + var find2 = 0, find2name = "", sort = 0; for (var m = 0; m < sto_cate.length; m++) { if (sto_arr[i].category_id == sto_cate[m].cat_id) { find2 = sto_cate[m].cat_id; @@ -2603,7 +2584,7 @@ Page({ var item = { cat_id: find2, name: find2name, - sort:sort, + sort: sort, s_arr: arr0 }; newarr.push(item); @@ -2619,7 +2600,7 @@ Page({ var item = { cat_id: find2, name: find2name, - sort:sort, + sort: sort, s_arr: arr0 }; newarr.push(item); @@ -2628,18 +2609,18 @@ Page({ } } } - - //门店分类要排序下 - function compare(property){ - return function(a,b){ - var value1 = a[property]; - var value2 = b[property]; - return value1 - value2; - } - } - if(newarr.length>0) - newarr.sort(compare("sort")); - + + //门店分类要排序下 + function compare(property) { + return function (a, b) { + var value1 = a[property]; + var value2 = b[property]; + return value1 - value2; + } + } + if (newarr.length > 0) + newarr.sort(compare("sort")); + //----安排其他的分类----- if (qita.length > 0) { @@ -2650,7 +2631,7 @@ Page({ }; newarr.push(item); } - + th.setData({ is_show_sto_cat: 1, all_sto: newarr @@ -2663,7 +2644,7 @@ Page({ }); //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ if (!th.data.def_pick_store) { - th.setData({def_pick_store:e.data.data.pageData[0]}) + th.setData({ def_pick_store: e.data.data.pageData[0] }) } } } else { @@ -2673,13 +2654,13 @@ Page({ }); //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------ if (!th.data.def_pick_store) { - th.setData({def_pick_store:e.data.data.pageData[0]}) + th.setData({ def_pick_store: e.data.data.pageData[0] }) } } } }); - } else { + } else { th.setData({ is_show_sto_cat: 0, only_pk: e.data.data.pageData @@ -2687,7 +2668,7 @@ Page({ //-----如果没有默认门店，要取第一个门店作为默认店------ if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) { th.setData({ - def_pick_store:e.data.data.pageData[0], + def_pick_store: e.data.data.pageData[0], sto_sele_name: e.data.data.pageData[0].pickup_name, sto_sele_id: e.data.data.pageData[0].pickup_id, sto_sele_distr: e.data.data.pageData[0].distr_type @@ -2695,66 +2676,66 @@ Page({ } } }, - + //------------处理线下门店库存-------- - deal_pickup_dline(e){ - var pkno=[],th=this; - if(!th.data.sele_g) return false; - - if(this.data.def_pick_store){ + deal_pickup_dline(e) { + var pkno = [], th = this; + if (!th.data.sele_g) return false; + + if (this.data.def_pick_store) { pkno.push(this.data.def_pick_store.pickup_no); } - for(var i in e.data.data.pageData){ - var item=e.data.data.pageData[i]; - if(pkno.indexOf(item.pickup_no)<0) + for (var i in e.data.data.pageData) { + var item = e.data.data.pageData[i]; + if (pkno.indexOf(item.pickup_no) < 0) pkno.push(item.pickup_no); } - pkno.sort(); - var pkno_str=pkno.join(","); - var o_plist=e.data.data.pageData; - var new_list=[]; - var is_find_def_store=0; + pkno.sort(); + var pkno_str = pkno.join(","); + var o_plist = e.data.data.pageData; + var new_list = []; + var is_find_def_store = 0; - var g_distr_type=th.data.sele_g.distr_type; - var lock=[]; + var g_distr_type = th.data.sele_g.distr_type; + var lock = []; //先读取门店的lock,采用链式写法，少用await - getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ - data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,pageSize:1000} - }).then(res=>{ - if(res.data.code==0 && res.data.data.total>0){ - lock=res.data.data.pageData + getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, pageSize: 1000 } + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + lock = res.data.data.pageData } //---通过接口获取门店的线下库存信息-- - return getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid,pageSize:2000} + return getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + data: { storageNos: pkno_str, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid, pageSize: 2000 } }) - }).then(res=>{ + }).then(res => { - wx.hideLoading(); - if(res.data.code==0){ - if(res.data.data.pageData && res.data.data.pageData.length>0){ - var plist=res.data.data.pageData; - var def_pick_store=th.data.def_pick_store; + wx.hideLoading(); + if (res.data.code == 0) { + if (res.data.data.pageData && res.data.data.pageData.length > 0) { + var plist = res.data.data.pageData; + var def_pick_store = th.data.def_pick_store; //以原来的数组为外循环，保证距离的顺序 - for(var kk in o_plist){ - for(var ii in plist){ + for (var kk in o_plist) { + for (var ii in plist) { //线下的门店小心 - var n_item=plist[ii]; - if(n_item.StorageNo==o_plist[kk].pickup_no){ + var n_item = plist[ii]; + if (n_item.StorageNo == o_plist[kk].pickup_no) { //拿到锁库的数量 - var lock_num=th.find_lock_num(o_plist[kk].pickup_id,lock); + var lock_num = th.find_lock_num(o_plist[kk].pickup_id, lock); //可出库数大于预出库库存的数量，可以判断为有库存 - if(n_item.CanOutQty>lock_num){ - o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num; + if (n_item.CanOutQty > lock_num) { + o_plist[kk].CanOutQty = n_item.CanOutQty - lock_num; new_list.push(o_plist[kk]); //--如果找到默认门店,同时也应该判断配送方式对不对-- - if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no && (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){ - th.data.fir_def_store.CanOutQty=n_item.CanOutQty-lock_num; - if(def_pick_store.pickup_id==th.data.fir_def_store.pickup_id) - th.setData({def_pick_store:th.data.fir_def_store}) - is_find_def_store=1; + if (th.data.fir_def_store && n_item.StorageNo == th.data.fir_def_store.pickup_no && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { + th.data.fir_def_store.CanOutQty = n_item.CanOutQty - lock_num; + if (def_pick_store.pickup_id == th.data.fir_def_store.pickup_id) + th.setData({ def_pick_store: th.data.fir_def_store }) + is_find_def_store = 1; } } break; @@ -2763,54 +2744,54 @@ Page({ } //数据组装下 - var em={};em.data={};em.data.data={}; - em.data.data.total=new_list.length; - em.data.data.pageData=new_list; + var em = {}; em.data = {}; em.data.data = {}; + em.data.data.total = new_list.length; + em.data.data.pageData = new_list; //--如果找到默认门店,同时也应该判断配送方式对不对-- - if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){ - th.data.fir_def_store.CanOutQty=0; + if (th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { + th.data.fir_def_store.CanOutQty = 0; //--当选择的门店是客户默认的门店的时候-- - if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id) { - th.setData({def_pick_store:th.data.fir_def_store}); + if (th.data.def_pick_store && th.data.fir_def_store.pickup_id == th.data.def_pick_store.pickup_id) { + th.setData({ def_pick_store: th.data.fir_def_store }); em.data.data.pageData.unshift(th.data.def_pick_store); - }else{ - em.data.data.pageData.splice(1,0,th.data.fir_def_store); + } else { + em.data.data.pageData.splice(1, 0, th.data.fir_def_store); } } //---把数组组装进去--- th.deal_pickup(em); - }else{ - th.setData({def_pick_store:null,all_sto:null,only_pk:null,def_pickpu_list:null}) + } else { + th.setData({ def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null }) } - }else{ - th.setData({def_pick_store:null,all_sto:null,only_pk:null,def_pickpu_list:null}) + } else { + th.setData({ def_pick_store: null, all_sto: null, only_pk: null, def_pickpu_list: null }) } }) }, - find_lock_num(pick_id,lock){ - var lock_num=0; - if(!lock) return 0; - if(lock.length<0) return 0; - for(var i in lock){ - if(pick_id==lock[i].pickupId){ - lock_num+=lock[i].outQty; + find_lock_num(pick_id, lock) { + var lock_num = 0; + if (!lock) return 0; + if (lock.length < 0) return 0; + for (var i in lock) { + if (pick_id == lock[i].pickupId) { + lock_num += lock[i].outQty; } } return lock_num; }, //----------取货门店被点击的效果------ - getmendian: function(t) { + getmendian: function (t) { this.setData({ ismend: 1, }); }, //----------隐藏取货门店，选取门店---------- - hidemend: function(e) { + hidemend: function (e) { var pid = e.target.dataset.p_id; var pname = e.target.dataset.p_name; var p_distr_t = e.target.dataset.p_dis; @@ -2824,7 +2805,7 @@ Page({ }, //------显示取货2级---------- - show_sec: function(t) { + show_sec: function (t) { var index = t.target.dataset.index; var item = this.data.all_sto[index]; this.setData({ @@ -2834,43 +2815,43 @@ Page({ }, //------隐藏取货门店2级---- - hide_sec_mend: function() { + hide_sec_mend: function () { this.setData({ is_sec_mend: 0, }); }, //评论的调用 - requestComments_new: async function(){ - var e = this, th = e,ee=e; var tp = e.data.activeCategoryId3; + requestComments_new: async function () { + var e = this, th = e, ee = e; var tp = e.data.activeCategoryId3; var t = '/api/weshop/comment/pageComment?page=' + e.data.c_curr_p; wx.showLoading(); var req_where = { - store_id: o.stoid, pageSize: 5,is_show:1, + store_id: o.stoid, pageSize: 5, is_show: 1, parent_id: 0, goods_id: th.data.gid, commenttype: tp, } if (getApp().globalData.userInfo) { req_where.userId = getApp().globalData.userInfo.user_id; } - var rs_data=null; - await getApp().request.promiseGet(t, { data: req_where}).then(res=>{ + var rs_data = null; + await getApp().request.promiseGet(t, { data: req_where }).then(res => { var tot = res.data.data.total; e.data.c_curr_p++; e.setData({ com_num: tot, //已经有加载 }); - if (res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ - rs_data=res.data.data.pageData; - }else{ - th.setData({comments_no_more:1,auto:1}); + if (res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) { + rs_data = res.data.data.pageData; + } else { + th.setData({ comments_no_more: 1, auto: 1 }); } }) - if (rs_data){ + if (rs_data) { //var cda = th.data.comments; - var cda = rs_data,com_data=th.data.comments; + var cda = rs_data, com_data = th.data.comments; for (var ind in cda) { var ep = cda[ind]; if (cda[ind].head_pic == '') { @@ -2884,13 +2865,13 @@ Page({ } //--测量多有字的宽带，计算有多少行-- - var widh=ut.measureText(ep.content,30); - var lines=widh/712; - cda[ind].seeMore=false; - if(lines>3) cda[ind].seeMore=true; + var widh = ut.measureText(ep.content, 30); + var lines = widh / 712; + cda[ind].seeMore = false; + if (lines > 3) cda[ind].seeMore = true; await getApp().request.promiseGet("/api/weshop/comment/pageComment", { - data: {store_id: o.stoid, parent_id: ep.comment_id } + data: { store_id: o.stoid, parent_id: ep.comment_id } }).then(res => { if (res.data.data.pageData && res.data.data.pageData.length > 0) { cda[ind].replay_list = res.data.data.pageData; @@ -2901,16 +2882,16 @@ Page({ if (!com_data) com_data = cda; else com_data = com_data.concat(cda); - th.setData({ comments: com_data}); + th.setData({ comments: com_data }); } - th.setData({get_c: 1}); + th.setData({ get_c: 1 }); wx.hideLoading(); }, //加载更多是靠这个函数 - onReachBottom: function() { - if (this.data.activeCategoryId == 2){ - if(!this.data.comments_no_more) this.requestComments_new(); + onReachBottom: function () { + if (this.data.activeCategoryId == 2) { + if (!this.data.comments_no_more) this.requestComments_new(); } var goods_list = this.selectComponent("#goods_list"); //组件的id @@ -2920,361 +2901,37 @@ Page({ //--------检查是否活动，活动是否开始，或者是否结束------- async check_prom(gid, prom_type, prom_id) { var ee = this, - th = ee; - if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 5 || prom_type == 7) { + th = ee; + if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 5 || prom_type == 7) { this.setData({ prom_type: 0, isshow: 1, }); return false; - } - - - - //if (prom_type != 3 && prom_type!=0){ - //---判断秒杀---- - if (prom_type == 1) { - //-------判断活动是否抢光--------- - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, { - 1: 1 - }).then(res => { - var em = res; - if (em.data.code == 0) { - - if (em.data.data <= 0) ee.setData({ - prom_r_null: 1 - }); - //拿取价格并且判断时间-- - getApp().request.get("/api/ms/flash_sale/get/" + - os.stoid + "/" + prom_id, { - success: function(t) { - if (t.data.code != 0) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - return false; - } - //----已经结束----- - if (t.data.data.is_end == 1) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); - return false; - } - //----已经过期----- - var now = ut.gettimestamp(); - if (t.data.data.end_time < now) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - return false; - } - - /*-- 还没有开始预热的也不显示 --*/ - if (t.data.data.show_time > now) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); - return false; - } - - var t_gd = ee.data.data; - var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); - var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); - - ee.setData({ - prom_price: t.data.data.price, - prom_type: 1, - prom_id: prom_id, - prom_buy_limit: t.data.data.buy_limit, - prom_act: t.data.data, - prom_end_time: prom_end_time, - prom_start_time: prom_start_time, - isshow: 1, - }); - - ee.get_sto(); - - - var newTime = ut.gettimestamp(); - var endTime2 = t.data.data.end_time; - var endTime1 = t.data.data.start_time; - - //---苹果机不兼容--- - /*---- - var endTime2 = new Date(prom_end_time).getTime(); - var endTime1 = new Date(prom_start_time).getTime();----*/ - - if (endTime1 > newTime) { - ee.setData({ - prom_time_text: '距秒杀开始还有' - }) - ee.countDown(endTime1, 0); - } else { - if (endTime2 > newTime) { - ee.setData({ - prom_time_text: '距秒杀结束还有', - prom_st: 1 - }) - ee.countDown(endTime2); - } - } - } - }); - } - }) - } - - if(prom_type==4){ - //th.setData({is_integral_normal:1}); - var rdata={ - store_id:o.stoid,stype:1,stypeup:1,goods_id:gid - } - - var integrals=0; - var get_datas= { - user_id:getApp().globalData.user_id, store_id:o.stoid, - }; - await getApp().request.promiseGet("/api/weshop/users/getAllPoints", { - data: get_datas - }).then(res => { - if(res.data.code==0){ - integrals=res.data.data.Integral; - } - }) - - //获取一下积分活动 - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList", { - data: rdata - }).then(res => { - //调用接口有数据的时候 - if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) { - var inte_data=res.data.data.pageData[0]; - var can_integral=(parseFloat(integrals)>=parseFloat(inte_data.integral)); - ee.setData({ - prom_price:parseFloat(inte_data.addmoney), - prom_integral:parseFloat(inte_data.integral), - prom_type: 4, - prom_id: inte_data.id, - prom_buy_limit: inte_data.limitvipqty, - prom_act: inte_data, - isshow: 1, - can_integral:can_integral, - is_shopbuy: parseInt(inte_data.is_shopbuy?inte_data.is_shopbuy:0) - }); - ee.get_sto(); - - }else{ - ee.setData({prom_type: 0, isshow: 1,}); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); - return false; - } - }) - - } - - - //---判断拼单---- - if (prom_type == 6) { - //-------判断活动是否抢光--------- - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, { - 1: 1 - }).then(res => { - var em = res; - if (em.data.code == 0) { - - - if (em.data.data <= 0) ee.setData({ - prom_r_null: 1 - }); - //拿取价格并且判断时间-- - getApp().request.get("/api/weshop/teamlist/get/" + - os.stoid + "/" + prom_id, { - success: function(t) { - if (t.data.code != 0) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); - return false; - } - //----已经结束----- - if (t.data.data.is_end == 1) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - return false; - } - //----已经过期----- - var now = ut.gettimestamp(); - if (t.data.data.end_time < now) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); - return false; - } - - /*-- 还没有开始预热的也不显示 --*/ - if (t.data.data.show_time > now) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); - return false; - } - - //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中------- - getApp().request.get("/api/weshop/order/page", { - data: { - pt_prom_id: prom_id, - user_id: oo.user_id, - store_id: os.stoid, - pageSize: 1, - page: 1 - }, - success: function(e) { - if (e.data.code == 0 && e.data.data.pageData.length > 0) { - var odr = e.data.data.pageData[0]; - th.data.buy_order = odr; - if (odr.pt_status == 0 && odr.order_status == 1) { - th.setData({ - user_order_pt_state: 1 - }); - } - if (odr.pt_status == 1 && odr.order_status == 1) { - if (odr.is_zsorder == 4) { - getApp().request.promiseGet("/api/weshop/teamgroup/page/", { - data: { - store_id: os.stoid, - team_id: odr.pt_prom_id, - listno: odr.pt_listno - } - }).then(res => { - var now = ut.gettimestamp(); - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ - var tgr = res.data.data.pageData[0]; - //如果团的时间已经到了 - if (now >= tgr.kt_end_time) { - th.update_jiti(tgr.id); - } else { - th.setData({ - user_order_pt_state: 2 - }); - } - } - }) - - } else { - th.setData({ - user_order_pt_state: 2 - }); - } - } - - if (odr.pt_status == 2 && odr.is_zsorder == 4) { - th.setData({ - user_order_pt_state: 3, - }); - th.data.wk_order_id = odr.order_id; - } - } - }, - }); - - //----------查看阶梯团------------ - if (t.data.data.ct_rylist != "null" && t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) { - t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist); - var max_num = 0; - t.data.data.ct_rylist.forEach(function(val, ind) { - if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum); - }) - t.data.data.max_ct_num = max_num; - } - - var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); - var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); - ee.setData({ - prom_price: t.data.data.price, - prom_type: 6, - prom_id: prom_id, - prom_buy_limit: t.data.data.buy_limit, - prom_act: t.data.data, - prom_end_time: prom_end_time, - prom_start_time: prom_start_time, - isshow: 1, - }); - - ee.get_sto(); - - var newTime = now; - var endTime2 = t.data.data.end_time; - var endTime1 = t.data.data.start_time; - - if (endTime1 > newTime) { - ee.setData({ - prom_time_text: '距拼单开始还剩:' - }) - ee.countDown(endTime1, 0); - } else { - if (endTime2 > newTime) { - ee.setData({ - prom_time_text: '距拼单结束还剩:', - prom_st: 1 - }) - ee.countDown(endTime2); - } - } - //-------查看有多少人在开这个团------- - th.get_team_group(prom_id); - } - }); - } - }) - } - + } }, //--获取有多少人在开团-- async get_team_group(prom_id) { var teamgroup = [], - th = this, - grounp_tatal = 0; + th = this, + grounp_tatal = 0; //如果活动是开团不是商家团 if (this.data.prom_act.kttype > 1) { - - var req_data={ - store_id: os.stoid, - pageSize: 3, - page: 1, - state: 2, - team_id: prom_id, - ordernum:1 - }; - - if(this.data.prom_act.kttype==3 && this.data.prom_act.max_ct_num ){ - req_data.max_num=this.data.prom_act.max_ct_num; - } - + + var req_data = { + store_id: os.stoid, + pageSize: 3, + page: 1, + state: 2, + team_id: prom_id, + ordernum: 1 + }; + + if (this.data.prom_act.kttype == 3 && this.data.prom_act.max_ct_num) { + req_data.max_num = this.data.prom_act.max_ct_num; + } + //获取活动从表信息team_id await getApp().request.promiseGet("/api/weshop/teamgroup/page", { data: req_data @@ -3346,7 +3003,7 @@ Page({ prom_time_text: '距结束还剩:', prom_st: 1 }) - setTimeout(function() { + setTimeout(function () { th.countDown(endTime2) }, 1000); return false; @@ -3373,17 +3030,17 @@ Page({ th.setData({ djs: obj }); - setTimeout(function() { + setTimeout(function () { th.countDown(endTime) }, 1000); }, //-------------获取购买数量的总函数---------------- - get_buy_num: function(gd, func) { + get_buy_num: function (gd, func) { var map = this.data.g_buy_num, - th = this, - user_id = getApp().globalData.user_id; + th = this, + user_id = getApp().globalData.user_id; if (user_id == null) { map.set(gd.goods_id, 0); th.setData({ @@ -3404,7 +3061,7 @@ Page({ user_id: user_id, goods_id: gd.goods_id }, - success: function(t) { + success: function (t) { if (t.data.code == 0) { var g_buy_num = t.data.data.goodsbuynum; if (gd.prom_type == 1 || gd.prom_type == 2 || gd.prom_type == 4 || gd.prom_type == 6) { @@ -3418,7 +3075,7 @@ Page({ prom_id: gd.prom_id }, //-----获取----- - success: function(tt) { + success: function (tt) { if (tt.data.code == 0) { map.set(gd.goods_id, g_buy_num); th.setData({ @@ -3443,7 +3100,7 @@ Page({ }, //--拼单推荐的显示--- - tj_Click: function(e) { + tj_Click: function (e) { var ind = parseInt(e.target.dataset.ind); this.setData({ is_show_gz: ind @@ -3451,113 +3108,20 @@ Page({ }, //--------拼团玩法显示详情-------- - show_pt_xx: function(e) { + show_pt_xx: function (e) { this.setData({ pd_xx: 1, }) }, - close_pt_xx: function() { + close_pt_xx: function () { this.setData({ pd_xx: 0, }) }, - //--点击弹起拼单-- - openSpecModel_pt: function(e) { - - - this.setData({ open_ind_store: 4,goodsInputNum:1});//拼团直接给4 - - - //--先判断会员状态-- - var user_info = getApp().globalData.userInfo; - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ - url: '/pages/togoin/togoin', - }) - return false; - } - - var th = this; - var ind = parseInt(e.currentTarget.dataset.it); - //如果是拼单活动的普通购买 - if (ind == 1) { - //如果拼单的sku data是空的，就要先获取一下 - if (th.data.sku_g_pt) { - th.get_sto(1); - th.setData({ - is_normal: ind, - openSpecModal_pt: 1 - }); - } else { - th.get_sto(1); - th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function() { - th.setData({ - is_normal: ind, - openSpecModal_pt: 1 - }); - }); - } - th.check_is_youhui(th.data.gid,1); - } else { - - //拼单商品从这里进，先判断有没有买过商品， - getApp().request.get("/api/weshop/order/page", { - data: { - pt_prom_id: th.data.prom_act.id, - user_id: oo.user_id, - store_id: os.stoid, - pageSize: 1, - page: 1 - }, - success: function(e) { - //--跳转到已经购买的情况-- - if (e.data.data.pageData.length > 0) { - var odr = e.data.data.pageData[0]; - //还未支付 - if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) { - wx.showModal({ - title: "您已经购买了该商品待支付中", - success: function(a) { - if (a.confirm) { - wx.navigateTo({ - url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, - }); - } - } - }); - } else if (odr.pt_status == 1 && odr.order_status == 1) { - - if(this.data.is_go_to_team_show) return false; - this.data.is_go_to_team_show=1; - wx.showLoading(); - - /*--- - wx.redirectTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, - });--*/ - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); - - } else { - th.setData({ - is_normal: ind, - openSpecModal_pt: 1 - }); - } - - } else { - th.setData({ - is_normal: ind, - openSpecModal_pt: 1 - }); - } - } - }); - } - }, //-----------------拼单生成方法--------------------- - addCart_pt: function() { + addCart_pt: function () { var th = this; if (this.data.is_normal == 0) { //看一下有没有起购数，如果有起购数，要计算起购数 @@ -3573,18 +3137,18 @@ Page({ } }, - addcart_pt_func: function() { + addcart_pt_func: function () { if (oo.user_id == null) { s.my_warnning("还未登录！", 0, this); return; } var e = this, - th = e, - o = this.data.sele_g; + th = e, + o = this.data.sele_g; if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); //----------添加到购物车时，要判断限购数量，-------- - e.get_buy_num(o, async function(ee) { + e.get_buy_num(o, async function (ee) { //---判断商品是否超出限购--- if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { @@ -3594,30 +3158,30 @@ Page({ content: '超出商品限购' }); - var num=th.data.prom_buy_limit-th.data.prom_buy_num; - if(num<0) num=0; - th.setData({goodsInputNum:num}) + var num = th.data.prom_buy_limit - th.data.prom_buy_num; + if (num < 0) num = 0; + th.setData({ goodsInputNum: num }) return false; } } //---判断商品是否超出活动限购,拼团的普通购买不计算活动的限购--- - if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal!=1) { + if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal != 1) { if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) { wx.showModal({ title: '提示', content: '超出商品活动限购' }); - var num=th.data.prom_buy_limit-th.data.prom_buy_num; - if(num<0) num=0; - th.setData({goodsInputNum:num}) + var num = th.data.prom_buy_limit - th.data.prom_buy_num; + if (num < 0) num = 0; + th.setData({ goodsInputNum: num }) return false; } } var redis_num = 0 //不是普通购买的时候 - if(th.data.is_normal!=1){ + if (th.data.is_normal != 1) { //-------判断活动是否抢光--------- await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, { 1: 1 @@ -3631,7 +3195,7 @@ Page({ content: '超出商品活动库存' }); - th.setData({goodsInputNum:redis_num}) + th.setData({ goodsInputNum: redis_num }) return false; } @@ -3639,7 +3203,7 @@ Page({ if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); if (th.data.goodsInputNum > o.store_count) { - th.setData({goodsInputNum:o.store_count}) + th.setData({ goodsInputNum: o.store_count }) return s.my_warnning("超出商品库存", 0, th); } @@ -3662,42 +3226,42 @@ Page({ }; //---是不是从收藏夹出来的--- - if(th.data.c_guide_id){ + if (th.data.c_guide_id) { newd['guide_id'] = th.data.c_guide_id; - newd['guide_type']=2; + newd['guide_type'] = 2; - }else{ - if(getApp().globalData.guide_id){ + } else { + if (getApp().globalData.guide_id) { newd['guide_id'] = getApp().globalData.guide_id; - newd['guide_type']=0; + newd['guide_type'] = 0; } } //让商品带上房间号 - if(th.data.sys_switch.is_skuroom_id==1){ - if(th.data.data.goods_id==getApp().globalData.room_goods_id){ - newd.room_id=getApp().globalData.room_id; + if (th.data.sys_switch.is_skuroom_id == 1) { + if (th.data.data.goods_id == getApp().globalData.room_goods_id) { + newd.room_id = getApp().globalData.room_id; } - }else{ - if(newd.goods_id==getApp().globalData.room_goods_id){ - newd.room_id=getApp().globalData.room_id; + } else { + if (newd.goods_id == getApp().globalData.room_goods_id) { + newd.room_id = getApp().globalData.room_id; } } //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ - if(th.data.is_normal == 1){ - var conf=th.data.bconfig; - if(conf.switch_list){ - var s_list=JSON.parse(conf.switch_list); + if (th.data.is_normal == 1) { + var conf = th.data.bconfig; + if (conf.switch_list) { + var s_list = JSON.parse(conf.switch_list); //如果后台有开启等级价的功能 - if(parseInt(s_list.rank_switch)==2){ - var card_price=o[getApp().globalData.userInfo['card_field']]; + if (parseInt(s_list.rank_switch) == 2) { + var card_price = o[getApp().globalData.userInfo['card_field']]; //如果会员有等级价 - if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null - && getApp().globalData.userInfo['card_field']!="" && card_price>0){ - newd.goods_price=card_price; + if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null + && getApp().globalData.userInfo['card_field'] != "" && card_price > 0) { + newd.goods_price = card_price; } } } @@ -3705,7 +3269,7 @@ Page({ //-----如果是秒杀，团购，积分购,拼团,且不是普通购买----- - if (th.data.prom_type == 6 && th.data.is_normal!= 1) { + if (th.data.prom_type == 6 && th.data.is_normal != 1) { newd.goods_price = th.data.prom_price; newd.prom_type = th.data.prom_type; newd.prom_id = th.data.prom_id; @@ -3727,23 +3291,23 @@ Page({ newd['pick_name'] = th.data.sto_sele_name; newd['pick_dis'] = th.data.sto_sele_distr; newd['is_normal'] = th.data.is_normal; - - if(newd['is_normal']){ - newd['is_pd_normal']=1; - //判断一下有没有全局优惠活动 - th.check_nor_promgood(newd.goods_id,function(e){ - if(e && e.act_id){ - newd['prom_type']=3; - newd['prom_id']=e.act_id; - } - th.buyNow(newd) - }) - } + + if (newd['is_normal']) { + newd['is_pd_normal'] = 1; + //判断一下有没有全局优惠活动 + th.check_nor_promgood(newd.goods_id, function (e) { + if (e && e.act_id) { + newd['prom_type'] = 3; + newd['prom_id'] = e.act_id; + } + th.buyNow(newd) + }) + } else th.buyNow_pt(newd); }) }, //----------立即购买_pt----------- - buyNow_pt: function(e) { + buyNow_pt: function (e) { s.set_b_now(e); wx.navigateTo({ url: "/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + e.goods_id, @@ -3751,27 +3315,27 @@ Page({ }, //-------跳转pt商品------- - go_to_nopay: function() { - var th = this; - url="/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id; - getApp().goto(url); - + go_to_nopay: function () { + var th = this; + url = "/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id; + getApp().goto(url); + }, //-------跳转pt teamshow------- - go_to_team_show: function() { - - if(this.data.is_go_to_team_show) return false; - this.data.is_go_to_team_show=1; - wx.showLoading(); - - var th = this; - var url="/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; - /*-- - wx.redirectTo({ - url:url, - })--*/ - getApp().goto(url); - + go_to_team_show: function () { + + if (this.data.is_go_to_team_show) return false; + this.data.is_go_to_team_show = 1; + wx.showLoading(); + + var th = this; + var url = "/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn; + /*-- + wx.redirectTo({ + url:url, + })--*/ + getApp().goto(url); + }, //---拼团倒计时--- @@ -3816,7 +3380,7 @@ Page({ setTimeout(th.countDown2, 1000); }, //跳转参加团 - go_cj_team: function(e) { + go_cj_team: function (e) { var ind = e.currentTarget.dataset.ind; var item = this.data.teamgroup[ind]; var id = item.id; @@ -3830,7 +3394,7 @@ Page({ pageSize: 1, page: 1 }, - success: function(e) { + success: function (e) { if (e.data.code != 0) { getApp().my_warnning("读取订单失败", 0, th); return fasle; @@ -3842,7 +3406,7 @@ Page({ if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) { wx.showModal({ title: "您已经购买了该商品待支付中", - success: function(a) { + success: function (a) { if (a.confirm) { wx.navigateTo({ url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, @@ -3851,16 +3415,16 @@ Page({ } }); } else if (odr.pt_status == 1 && odr.order_status == 1) { - - if(this.data.is_go_to_team_show) return false; - this.data.is_go_to_team_show=1; - wx.showLoading(); - /*-- - wx.redirectTo({ - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, - });--*/ - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); + if (this.data.is_go_to_team_show) return false; + this.data.is_go_to_team_show = 1; + wx.showLoading(); + /*-- + wx.redirectTo({ + url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, + });--*/ + + getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); } else { wx.navigateTo({ @@ -3880,7 +3444,7 @@ Page({ }, //跳到团更多 - go_t_more: function() { + go_t_more: function () { var team_id = this.data.prom_id; wx.navigateTo({ url: "/pages/team/team_more/team_more?team_id=" + team_id, @@ -3888,11 +3452,11 @@ Page({ }, //--点赞功能-- - click_zan: function(e) { + click_zan: function (e) { var com_id = e.currentTarget.dataset.com_id; var item_id = e.currentTarget.dataset.item_id; var app = getApp(), - th = this; + th = this; if (app.globalData.userInfo == null || app.globalData.userInfo == undefined) { app.confirmBox("您还未登录"); @@ -3911,7 +3475,7 @@ Page({ goods_id: th.data.gid, comment_id: com_id }, - success: function(ee) { + success: function (ee) { if (ee.data.code == "-1") { app.my_warnning("不能给自己点赞", 0, th); @@ -3940,7 +3504,7 @@ Page({ th.setData(_errObj); } - setTimeout(function() { + setTimeout(function () { th.data.iszaning = 0; }, 500) @@ -3949,7 +3513,7 @@ Page({ }, /*----券的开关---*/ - switchCoupon: async function(event) { + switchCoupon: async function (event) { var coupon = event.currentTarget.dataset.coupon; var app = getApp(); var url = "/api/weshop/prom/coupon/pageCouponList"; @@ -3966,7 +3530,7 @@ Page({ pageSize: 100, page: 1, user_id: app.globalData.user_id, - is_share:0 + is_share: 0 } }).then(res => { wx.hideLoading(); @@ -3997,13 +3561,13 @@ Page({ }, //--查看评价-- - look_pj: function() { + look_pj: function () { this.tabComment(); this.doScrollTop(); }, //-----领取券----- - get_quan: function(e) { + get_quan: function (e) { var cid = e.currentTarget.dataset.cid; var index = e.currentTarget.dataset.ind; var item = this.data.quan_list[index]; @@ -4039,17 +3603,17 @@ Page({ 'store_id': os.stoid, 'type': 5 }; - - //-- 导购ID -- - if(getApp().globalData.guide_id){ - pdata.guide_id=getApp().globalData.guide_id; - } - + + //-- 导购ID -- + if (getApp().globalData.guide_id) { + pdata.guide_id = getApp().globalData.guide_id; + } + var app = getApp(), - th = this; + th = this; app.request.post("/api/weshop/couponList/saveCouponList", { data: pdata, - success: function(res) { + success: function (res) { if (res.data.code == 0) { app.my_warnning("领取成功", 1, th); lq_num++; @@ -4069,9 +3633,9 @@ Page({ } }) }, - + //--定义的保存图片方法，分享团--- - saveImageToPhotosAlbum: function() { + saveImageToPhotosAlbum: function () { //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { @@ -4079,12 +3643,12 @@ Page({ wx.navigateTo({ url: '/pages/togoin/togoin', }) return false; } - - if(this.data.share_hidden) { - this.setData({ - share_hidden: false, - }); - }; + + if (this.data.share_hidden) { + this.setData({ + share_hidden: false, + }); + }; //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 4阶梯团 var type = this.data.prom_type; @@ -4095,7 +3659,7 @@ Page({ title: '生成中...', }) var that = this, - th = that; + th = that; //设置画板显示，才能开始绘图 that.setData({ canvasHidden: false @@ -4104,230 +3668,230 @@ Page({ var app = getApp(); var unit = that.data.screenWidth / 750 * 1.35; //基础单位， var path2 = that.data.data.original_img; - var scene = th.data.gid+""; - var user_id = getApp().globalData.user_id?getApp().globalData.user_id:0; - if(user_id>0) { - scene+="_"+user_id; + var scene = th.data.gid + ""; + var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0; + if (user_id > 0) { + scene += "_" + user_id; + } + //-- 如果不是会员分享过来的要分享给别人 -- + if (getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) { + //固定房间是第3个字符 + if (!user_id) scene += "_0"; + scene += "_" + getApp().globalData.room_id; } - //-- 如果不是会员分享过来的要分享给别人 -- - if(getApp().globalData.room_id && th.data.data.goods_id==getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) { - //固定房间是第3个字符 - if(!user_id) scene+="_0"; - scene+="_"+getApp().globalData.room_id ; - } ///二微码 var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; console.log(path3); //读取文件成功则OK-- wx.getImageInfo({ src: path3, - success: function(res) { + success: function (res) { //回调写法 - th.get_head_temp(th.get_goods_temp, function() { + th.get_head_temp(th.get_goods_temp, function () { var vpath = res.path; var context = wx.createCanvasContext('share'); //先画背景 var pg_path = "../../../../images/share/share_bg.png"; - - // context.fillStyle="#FFFFFF"; - // context.fillRect(0,0,554 * unit, 899 * unit); - - //-- 如果有自定义海报的时候，判断背景的图片 -- - if(th.data.share_b_img){ - pg_path=th.data.share_b_img; - } + + // context.fillStyle="#FFFFFF"; + // context.fillRect(0,0,554 * unit, 899 * unit); + + //-- 如果有自定义海报的时候，判断背景的图片 -- + if (th.data.share_b_img) { + pg_path = th.data.share_b_img; + } context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit); - - //-- 是自定义海报的情况下 -- - if(th.data.poster && parseInt(th.data.poster.style)==2) { - //在线上分享人的情况下 - if(parseInt(th.data.poster.show_headpic)){ - //获取坐标 - var x=parseFloat(th.data.poster.head_x)*2; - var y=parseFloat(th.data.poster.head_y)*2; - var x1=(x+90) *unit; - var y1=(y+50) *unit; - //--昵称--- - context.setFontSize(24 * unit) - context.setFillStyle("black") - context.fillText(app.globalData.userInfo.nickname, x1, y1); - var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit; - //强烈推荐 改许程 - var tj_path = "../../../../images/share/q_tj.png"; - context.drawImage(tj_path, x1 + width, y1-22*unit, 85 * unit, 30 * unit); - context.setFontSize(16 * unit) - context.setLineJoin('round'); //交点设置成圆角 - context.setFillStyle("white") - context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); - - //context.setFillStyle("black") - //context.setFontSize(24 * unit) - //context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit); - } - } else { - //--昵称--- - context.setFontSize(24 * unit) - context.setFillStyle("black") - context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit); - var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit; - //强烈推荐 改许程 - var tj_path = "../../../../images/share/q_tj.png"; - context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit); - context.setFontSize(16 * unit); - context.setLineJoin('round'); //交点设置成圆角 - context.setFillStyle("white"); - context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit); - } - - var share_title=th.data.data.goods_name; - if(th.data.prom_type==1 || th.data.prom_type==6 || th.data.prom_type==4){ - share_title=th.data.prom_act.share_title; - if(!share_title) share_title=th.data.prom_act.title; - if(th.data.prom_type==4) share_title=th.data.prom_act.name; + + //-- 是自定义海报的情况下 -- + if (th.data.poster && parseInt(th.data.poster.style) == 2) { + //在线上分享人的情况下 + if (parseInt(th.data.poster.show_headpic)) { + //获取坐标 + var x = parseFloat(th.data.poster.head_x) * 2; + var y = parseFloat(th.data.poster.head_y) * 2; + var x1 = (x + 90) * unit; + var y1 = (y + 50) * unit; + //--昵称--- + context.setFontSize(24 * unit) + context.setFillStyle("black") + context.fillText(app.globalData.userInfo.nickname, x1, y1); + var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit; + //强烈推荐 改许程 + var tj_path = "../../../../images/share/q_tj.png"; + context.drawImage(tj_path, x1 + width, y1 - 22 * unit, 85 * unit, 30 * unit); + context.setFontSize(16 * unit) + context.setLineJoin('round'); //交点设置成圆角 + context.setFillStyle("white") + context.fillText('强烈推荐', x1 + width + 8 * unit, y1 - 1 * unit); + + //context.setFillStyle("black") + //context.setFontSize(24 * unit) + //context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit); + } + } else { + //--昵称--- + context.setFontSize(24 * unit) + context.setFillStyle("black") + context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit); + var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit; + //强烈推荐 改许程 + var tj_path = "../../../../images/share/q_tj.png"; + context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit); + context.setFontSize(16 * unit); + context.setLineJoin('round'); //交点设置成圆角 + context.setFillStyle("white"); + context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit); + } + + var share_title = th.data.data.goods_name; + if (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) { + share_title = th.data.prom_act.share_title; + if (!share_title) share_title = th.data.prom_act.title; + if (th.data.prom_type == 4) share_title = th.data.prom_act.name; } //---产品名称--- //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 - if(type!=4){ - context.setFillStyle("black"); - context.setFontSize(21.3 * unit) - th.draw_Text(context, share_title, - 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit); - - //------产品的价格------- - context.setFontSize(23 * unit) - context.setFillStyle("red") - - - var pri0 = th.data.data.shop_price; - if (th.data.prom_act) - pri0 = th.data.prom_act.price; - pri0 = parseFloat(pri0).toFixed(2); - var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25; - context.fillText("￥", wd1-15, 185 * unit); - context.setFontSize(31 * unit) - context.fillText(pri0, wd1, 185 * unit); - - //---市场价划掉--- - context.setFillStyle("gray") - context.setFontSize(22 * unit) - pri0="￥" + th.data.data.market_price.toFixed(2); - var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25; - context.fillText(pri0, wd2, 213 * unit); - - context.setStrokeStyle('gray'); - context.setLineWidth(1 * unit); - context.moveTo(wd2-5, 206 * unit); - context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 206 * unit); - context.stroke(); - - }else{ - context.setFillStyle("black"); - context.setFontSize(21.3 * unit) - th.draw_Text(context, share_title, - 38 * unit, 170 * unit, 20 * unit, 300*unit, unit); - //------ 产品的价格 ----- - var pri0 = th.data.prom_act.addmoney; - var integral=th.data.prom_act.integral; - var text= ""; - if(integral){text=integral+"积分"; } - if(pri0 && integral){ text+="+";} - if(pri0){ text+="￥"+pri0;} - - if(!pri0 && !integral){ text="0积分";} - context.setFillStyle("red"); - context.fillText(text, 38 * unit, 235 * unit); - - } - + if (type != 4) { + context.setFillStyle("black"); + context.setFontSize(21.3 * unit) + th.draw_Text(context, share_title, + 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit); + + //------产品的价格------- + context.setFontSize(23 * unit) + context.setFillStyle("red") + + + var pri0 = th.data.data.shop_price; + if (th.data.prom_act) + pri0 = th.data.prom_act.price; + pri0 = parseFloat(pri0).toFixed(2); + var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25; + context.fillText("￥", wd1 - 15, 185 * unit); + context.setFontSize(31 * unit) + context.fillText(pri0, wd1, 185 * unit); + + //---市场价划掉--- + context.setFillStyle("gray") + context.setFontSize(22 * unit) + pri0 = "￥" + th.data.data.market_price.toFixed(2); + var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25; + context.fillText(pri0, wd2, 213 * unit); + + context.setStrokeStyle('gray'); + context.setLineWidth(1 * unit); + context.moveTo(wd2 - 5, 206 * unit); + context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit); + context.stroke(); + + } else { + context.setFillStyle("black"); + context.setFontSize(21.3 * unit) + th.draw_Text(context, share_title, + 38 * unit, 170 * unit, 20 * unit, 300 * unit, unit); + //------ 产品的价格 ----- + var pri0 = th.data.prom_act.addmoney; + var integral = th.data.prom_act.integral; + var text = ""; + if (integral) { text = integral + "积分"; } + if (pri0 && integral) { text += "+"; } + if (pri0) { text += "￥" + pri0; } + + if (!pri0 && !integral) { text = "0积分"; } + context.setFillStyle("red"); + context.fillText(text, 38 * unit, 235 * unit); + + } + //---中间大图--- context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit); //-------大图后面就不一样了----------- switch (type) { case 0: //普通商品的展示 - case 4: + case 4: //中间的几个字 - if(th.data.poster && parseInt(th.data.poster.style)==2 ){ - if(parseInt(th.data.poster.show_quality)){ - var g_path = "../../../../images/share/s_gou.png"; - context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); - context.setFillStyle("red") - context.setFontSize(18 * unit) - context.fillText("正品保证", 84 * unit, 690 * unit); - - context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit); - context.setFillStyle("red") - context.setFontSize(18 * unit) - context.fillText("纯实体店", 246 * unit, 690 * unit); - - context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit); - context.setFillStyle("red") - context.setFontSize(18 * unit) - context.fillText("官方验证", 420 * unit, 690 * unit); - } - - }else{ - var g_path = "../../../../images/share/s_gou.png"; - context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); - context.setFillStyle("red") - context.setFontSize(18 * unit) - context.fillText("正品保证", 84 * unit, 690 * unit); - - context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit); - context.setFillStyle("red") - context.setFontSize(18 * unit) - context.fillText("纯实体店", 246 * unit, 690 * unit); - - context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit); - context.setFillStyle("red") - context.setFontSize(18 * unit) - context.fillText("官方验证", 420 * unit, 690 * unit); - } - - - //---画线--- - context.setLineWidth(1 * unit) - context.moveTo(32 * unit, 710 * unit) - context.lineTo(520 * unit, 710 * unit) - context.stroke(); - - //---文字--- - context.setFillStyle("black") - context.setFontSize(22 * unit) - - if(type==0){ - // 原来start ---> - context.setFontSize(24 * unit) - context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit); - - context.setFontSize(22 * unit) - context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 806 * unit); - context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit); - - }else{ - context.setFontSize(24 * unit) - context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit); - context.setFontSize(22 * unit) - context.fillText("长按识别二维码", 40 * unit, 806 * unit); - context.fillText("立即开始兑换", 40 * unit, 846 * unit); - - - } - + if (th.data.poster && parseInt(th.data.poster.style) == 2) { + if (parseInt(th.data.poster.show_quality)) { + var g_path = "../../../../images/share/s_gou.png"; + context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("正品保证", 84 * unit, 690 * unit); + + context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("纯实体店", 246 * unit, 690 * unit); + + context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("官方验证", 420 * unit, 690 * unit); + } + + } else { + var g_path = "../../../../images/share/s_gou.png"; + context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("正品保证", 84 * unit, 690 * unit); + + context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("纯实体店", 246 * unit, 690 * unit); + + context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit); + context.setFillStyle("red") + context.setFontSize(18 * unit) + context.fillText("官方验证", 420 * unit, 690 * unit); + } + + + //---画线--- + context.setLineWidth(1 * unit) + context.moveTo(32 * unit, 710 * unit) + context.lineTo(520 * unit, 710 * unit) + context.stroke(); + + //---文字--- + context.setFillStyle("black") + context.setFontSize(22 * unit) + + if (type == 0) { + // 原来start ---> + context.setFontSize(24 * unit) + context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit); + + context.setFontSize(22 * unit) + context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 806 * unit); + context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit); + + } else { + context.setFontSize(24 * unit) + context.fillText(th.data.sto_sele_name_1, 40 * unit, 766 * unit); + context.setFontSize(22 * unit) + context.fillText("长按识别二维码", 40 * unit, 806 * unit); + context.fillText("立即开始兑换", 40 * unit, 846 * unit); + + + } + //---二维吗图--- - //-- 自定义海报 -- - if(th.data.poster){ - var erm_x= parseFloat(th.data.poster.ewm_x)*2; - var erm_y= parseFloat(th.data.poster.ewm_y)*2; - context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit); - }else{ - //---二维吗图--- - context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); - } - + //-- 自定义海报 -- + if (th.data.poster) { + var erm_x = parseFloat(th.data.poster.ewm_x) * 2; + var erm_y = parseFloat(th.data.poster.ewm_y) * 2; + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit); + } else { + //---二维吗图--- + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); + } + break; case 1: //秒杀商品的展示 //---画线--- @@ -4339,27 +3903,27 @@ Page({ //画秒杀的图片 var miaos_path = '../../../../images/share/miao_share.png'; context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit); - - context.setFillStyle("black") - context.setFontSize(24 * unit) - context.fillText(th.data.sto_sele_name_1, 40 * unit, 786 * unit); + + context.setFillStyle("black") + context.setFontSize(24 * unit) + context.fillText(th.data.sto_sele_name_1, 40 * unit, 786 * unit); //---文字--- context.setFontSize(22 * unit) context.setFillStyle("black") context.fillText("特惠好物，限时秒杀", 40 * unit, 826 * unit); context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 866 * unit); - - + + //---二维吗图--- //-- 自定义海报 -- - if(th.data.poster){ - var erm_x= parseFloat(th.data.poster.ewm_x)*2; - var erm_y= parseFloat(th.data.poster.ewm_y)*2; - context.drawImage(vpath, erm_x * unit, erm_y * unit, 135 * unit, 135 * unit); - }else{ - //---二维吗图--- - context.drawImage(vpath, 390 * unit, 726 * unit, 135 * unit, 135 * unit); - } + if (th.data.poster) { + var erm_x = parseFloat(th.data.poster.ewm_x) * 2; + var erm_y = parseFloat(th.data.poster.ewm_y) * 2; + context.drawImage(vpath, erm_x * unit, erm_y * unit, 135 * unit, 135 * unit); + } else { + //---二维吗图--- + context.drawImage(vpath, 390 * unit, 726 * unit, 135 * unit, 135 * unit); + } break; case 2: //会员团和商家团的展示 @@ -4369,10 +3933,10 @@ Page({ context.lineTo(520 * unit, 670 * unit) context.stroke(); //---文字--- - - context.setFillStyle("black") - context.setFontSize(24 * unit) - context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit); + + context.setFillStyle("black") + context.setFontSize(24 * unit) + context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit); //绘制成团图片 var ct_img = "../../../../images/share/ct_num.png"; @@ -4388,25 +3952,25 @@ Page({ } context.setFontSize(22 * unit) context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit); - - context.setFillStyle("gray") + + context.setFillStyle("gray") context.fillText("快来和我一起拼团吧！", 40 * unit, 806 * unit); context.setFillStyle("black") context.font = 'normal bold 18px sans-serif'; context.setFontSize(21.3 * unit) context.fillText("长按识别二维码，立即参团", 40 * unit, 836 * unit); - - + + //---二维吗图--- //-- 自定义海报 -- - if(th.data.poster){ - var erm_x= parseFloat(th.data.poster.ewm_x)*2; - var erm_y= parseFloat(th.data.poster.ewm_y)*2; - context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit); - }else{ - //---二维吗图--- - context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); - } + if (th.data.poster) { + var erm_x = parseFloat(th.data.poster.ewm_x) * 2; + var erm_y = parseFloat(th.data.poster.ewm_y) * 2; + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit); + } else { + //---二维吗图--- + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); + } break case 3: //阶梯团的展示 //---画线--- @@ -4415,11 +3979,11 @@ Page({ context.lineTo(520 * unit, 670 * unit) context.stroke(); //---文字--- - - context.setFillStyle("black") - context.setFontSize(24 * unit) - context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit); - + + context.setFillStyle("black") + context.setFontSize(24 * unit) + context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit); + //---绘制中间阶梯的价格--- var list = th.data.prom_act.ct_rylist; for (var i = 0; i < list.length; i++) { @@ -4436,80 +4000,80 @@ Page({ context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit); } //----------------下面部分---------------- - // context.setFillStyle("gray") - // context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit); - // context.setFillStyle("black") - // context.font = 'normal bold 18px sans-serif'; - // context.setFontSize(22 * unit) - // context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit); + // context.setFillStyle("gray") + // context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit); + // context.setFillStyle("black") + // context.font = 'normal bold 18px sans-serif'; + // context.setFontSize(22 * unit) + // context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit); //context.setFillStyle("gray") - context.setFillStyle("black") - context.fillText("快来和我一起拼团吧！", 40 * unit, 820 * unit); + context.setFillStyle("black") + context.fillText("快来和我一起拼团吧！", 40 * unit, 820 * unit); //context.font = 'normal bold 18px sans-serif'; context.setFontSize(21 * unit) context.fillText("长按识别二维码，立即参团", 40 * unit, 850 * unit); - - - //-- 自定义海报 -- - if(th.data.poster){ - var erm_x= parseFloat(th.data.poster.ewm_x)*2; - var erm_y= parseFloat(th.data.poster.ewm_y)*2; - context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit); - }else{ - //---二维吗图--- - context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); - } + + + //-- 自定义海报 -- + if (th.data.poster) { + var erm_x = parseFloat(th.data.poster.ewm_x) * 2; + var erm_y = parseFloat(th.data.poster.ewm_y) * 2; + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit); + } else { + //---二维吗图--- + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); + } break - - + + } - - - //--- 如果是自定义海报的时候 --- - if(th.data.poster && parseInt(th.data.poster.style)==2){ - - //如果显示会员信息的话 - if(parseInt(th.data.poster.show_headpic)){ - //获取坐标 - var x= parseFloat(th.data.poster.head_x)*2; - var y=parseFloat(th.data.poster.head_y)*2; - //---绘制圆形要放在最后---- - context.save(); - context.beginPath(); - var h_x = x* unit; - var h_y = y * unit; - var h_r = 40 * unit; - var cx = h_x + h_r; - var cy = h_y + h_r; - context.arc(cx, cy, h_r, 0, Math.PI * 2, false); - context.closePath(); - context.fill(); - context.clip(); - context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2); - context.restore(); - } - - }else{ - //---绘制圆形要放在最后---- - context.save(); - context.beginPath(); - var h_x = 60 * unit; - var h_y = 24 * unit; - var h_r = 40 * unit; - var cx = h_x + h_r; - var cy = h_y + h_r; - context.arc(cx, cy, h_r, 0, Math.PI * 2, false); - context.closePath(); - context.fill(); - context.clip(); - context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2); - context.restore(); - } - - + + + //--- 如果是自定义海报的时候 --- + if (th.data.poster && parseInt(th.data.poster.style) == 2) { + + //如果显示会员信息的话 + if (parseInt(th.data.poster.show_headpic)) { + //获取坐标 + var x = parseFloat(th.data.poster.head_x) * 2; + var y = parseFloat(th.data.poster.head_y) * 2; + //---绘制圆形要放在最后---- + context.save(); + context.beginPath(); + var h_x = x * unit; + var h_y = y * unit; + var h_r = 40 * unit; + var cx = h_x + h_r; + var cy = h_y + h_r; + context.arc(cx, cy, h_r, 0, Math.PI * 2, false); + context.closePath(); + context.fill(); + context.clip(); + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2); + context.restore(); + } + + } else { + //---绘制圆形要放在最后---- + context.save(); + context.beginPath(); + var h_x = 60 * unit; + var h_y = 24 * unit; + var h_r = 40 * unit; + var cx = h_x + h_r; + var cy = h_y + h_r; + context.arc(cx, cy, h_r, 0, Math.PI * 2, false); + context.closePath(); + context.fill(); + context.clip(); + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2); + context.restore(); + } + + //把画板内容绘制成图片，并回调 画板图片路径 - context.draw(false, function() { - setTimeout(function() { + context.draw(false, function () { + setTimeout(function () { wx.canvasToTempFilePath({ x: 0, y: 0, @@ -4518,40 +4082,40 @@ Page({ destWidth: 1.2 * 750 * 750 / that.data.screenWidth, destHeight: 1.2 * 1217 * 750 / that.data.screenWidth, canvasId: 'share', - success: function (res) { + success: function (res) { - that.setData({ - shareImgPath: res.tempFilePath, - canvasHidden: true - }) - - if (!res.tempFilePath) { - wx.showModal({ - title: '提示', - content: '图片绘制中，请稍后重试', - showCancel: false - }) - return false; - } + that.setData({ + shareImgPath: res.tempFilePath, + canvasHidden: true + }) - // wx.previewImage({ - // //将图片预览出来 - // urls: [that.data.shareImgPath] - // }); - that.setData({ - showPoster: true, - }); - wx.hideLoading(); + if (!res.tempFilePath) { + wx.showModal({ + title: '提示', + content: '图片绘制中，请稍后重试', + showCancel: false + }) + return false; } + + // wx.previewImage({ + // //将图片预览出来 + // urls: [that.data.shareImgPath] + // }); + that.setData({ + showPoster: true, + }); + wx.hideLoading(); + } }) }, 500) }); }); }, - fail: function(res) { - console.log(res); - wx.hideLoading(); + fail: function (res) { + console.log(res); + wx.hideLoading(); } }); @@ -4559,7 +4123,7 @@ Page({ //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 - draw_Text: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) { + draw_Text: function (ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) { var lineWidth = 0; var lastSubStrIndex = 0; //每次开始截取的字符串的索引 var han = 0; @@ -4588,7 +4152,7 @@ Page({ // ----视频图片---- // 图片计数器 - swiperChange: function(e) { + swiperChange: function (e) { var that = this; if (e.detail.current > 0) { that.setData({ @@ -4609,7 +4173,7 @@ Page({ }, /*---视频相关--*/ - videopicture: function(e) { + videopicture: function (e) { var vipi = e.currentTarget.dataset.vipi; this.setData({ videopicture: vipi, @@ -4619,14 +4183,14 @@ Page({ }); }, - videoPlay: function(e) { + videoPlay: function (e) { var _index = e.currentTarget.id this.setData({ _index: _index, noon: 1 }) - setTimeout(function() { + setTimeout(function () { //将点击视频进行播放 var videoContext = wx.createVideoContext(_index) videoContext.play(); @@ -4636,7 +4200,7 @@ Page({ //--获取头像的本地缓存,回调写法-- - get_head_temp: function(tt, func) { + get_head_temp: function (tt, func) { var ee = this; if (ee.data.share_head) { tt(func); @@ -4652,12 +4216,12 @@ Page({ path2 = path2.replace("https://thirdwx.qlogo.cn", "https://wx.qlogo.cn"); wx.getImageInfo({ src: path2, - success: function(res) { + success: function (res) { //res.path是网络图片的本地地址 ee.data.share_head = res.path; tt(func); }, - fail: function(res) { + fail: function (res) { ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 tt(func); } @@ -4665,35 +4229,35 @@ Page({ } }, //--获取商品图片的本地缓存，回调写法-- - get_goods_temp: function(tt) { + get_goods_temp: function (tt) { var ee = this; if (ee.data.share_goods_img) { tt(); return false; } - var img_url=ee.data.data.original_img; - if((this.data.prom_type==1 || this.data.prom_type==6) && this.data.prom_act.share_imgurl){ - img_url=this.data.iurl+this.data.prom_act.share_imgurl; + var img_url = ee.data.data.original_img; + if ((this.data.prom_type == 1 || this.data.prom_type == 6) && this.data.prom_act.share_imgurl) { + img_url = this.data.iurl + this.data.prom_act.share_imgurl; } //获取商品是分享图信息 wx.getImageInfo({ src: img_url, - success: function(res) { - //res.path是网络图片的本地地址 - ee.data.share_goods_img = res.path; - tt(); + success: function (res) { + //res.path是网络图片的本地地址 + ee.data.share_goods_img = res.path; + tt(); }, - fail: function(res) { - ee.data.share_goods_img = "../../../../images/share/default_g_img.gif"; //分享的图片不能用网络的 - tt(); + fail: function (res) { + ee.data.share_goods_img = "../../../../images/share/default_g_img.gif"; //分享的图片不能用网络的 + tt(); } }); }, //--外侧评价的点击效果--- - clik_evaluate: function(e) { + clik_evaluate: function (e) { var val = e.currentTarget.dataset.val; this.setData({ activeCategoryId: 2, @@ -4704,19 +4268,19 @@ Page({ }, //--跳转到商品详情页面-- - go_goods: function(e) { + go_goods: function (e) { var gid = e.currentTarget.dataset.gid; var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid; getApp().goto(url); }, //--跳转到支付尾款界面-- - go_pay_wk: function() { + go_pay_wk: function () { var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id; getApp().goto(url); }, - pop_err_img: function(e) { + pop_err_img: function (e) { var txt = e.currentTarget.dataset.errorimg; var ob = {}; ob[txt] = this.data.iurl + "/miniapp/images/default_g_img.gif"; @@ -4724,11 +4288,11 @@ Page({ }, //--调用更新阶梯团的接口-- - update_jiti: function(id) { + update_jiti: function (id) { var th = this; //--更新阶梯团-- getApp().request.put("/api/weshop/teamgroup/updateTeamOrder/" + os.stoid + "/" + id, { - success: function(ee) { + success: function (ee) { //--等于0是要去支付尾款，接口调用失败，就要去查看参团详情-- if (ee.data.code == 0) { th.setData({ @@ -4743,21 +4307,21 @@ Page({ }) }, // 选择门店 - choice_store: function(ee) { + choice_store: function (ee) { var th = this; - var ind=ee.currentTarget.dataset.ind; + var ind = ee.currentTarget.dataset.ind; var bconfig = th.data.bconfig; - if(!th.data.only_pk && !th.data.def_pickpu_list){ + if (!th.data.only_pk && !th.data.def_pickpu_list) { getApp().confirmBox("门店库存不足", null, 25000, !1); return false; } - if(th.data.only_pk && !th.data.only_pk.length){ + if (th.data.only_pk && !th.data.only_pk.length) { getApp().confirmBox("门店库存不足", null, 25000, !1); return false; } - if(th.data.def_pickpu_list && !th.data.def_pickpu_list.length){ + if (th.data.def_pickpu_list && !th.data.def_pickpu_list.length) { getApp().confirmBox("门店库存不足", null, 25000, !1); return false; } @@ -4766,7 +4330,7 @@ Page({ if (bconfig && bconfig.is_sort_storage) { wx.getLocation({ type: 'gcj02', - success: function(res) { + success: function (res) { th.data.lat = res.latitude; th.data.lon = res.longitude; @@ -4777,7 +4341,7 @@ Page({ //th.onShow(); th.get_sto(th.data.is_normal); }, - fail: function(res) { + fail: function (res) { //th.onShow(); th.data.is_get_local_ok = 1; th.get_sto(th.data.is_normal); @@ -4796,19 +4360,19 @@ Page({ } }) - }else{ + } else { th.data.is_get_local_ok = 1; th.get_sto(th.data.is_normal); } - if(ind!=undefined && ind!=null ){ + if (ind != undefined && ind != null) { this.setData({ open_ind_store: ind, store: 1, openSpecModal: !1, openSpecModal_pt: !1 }) - }else{ + } else { this.setData({ store: 1, openSpecModal: !1, @@ -4817,17 +4381,17 @@ Page({ } }, //关闭选择门店 - close_popup: function(e) { - var th=this; + close_popup: function (e) { + var th = this; this.setData({ store: 0, choice_sort_store: 0, sort_store: 0, - fir_pick_index:0, - sec_pick_index:0 + fir_pick_index: 0, + sec_pick_index: 0 }) - var openindstore=this.data.open_ind_store; + var openindstore = this.data.open_ind_store; if (openindstore == 1) { th.setData({ openSpecModal: !0, @@ -4859,23 +4423,23 @@ Page({ }, //选择更多门店 - more_store: function() { + more_store: function () { this.setData({ sort_store: 1 }); }, - sort_store: function() { + sort_store: function () { }, // 返回按钮 - returns: function() { + returns: function () { this.setData({ sort_store: 0, choice_sort_store: 0 }); }, //---选择分类门店--- - choice_sort_store: function(e) { + choice_sort_store: function (e) { var index = e.currentTarget.dataset.index; var region_name = e.currentTarget.dataset.region; var item = this.data.all_sto[index]; @@ -4888,9 +4452,9 @@ Page({ }); }, - choose_for_store_fir: function(e) { + choose_for_store_fir: function (e) { var index_c = e.currentTarget.dataset.ind; - var th=this; + var th = this; th.setData({ fir_pick_index: index_c }) @@ -4898,53 +4462,53 @@ Page({ }, //如果开启线下库存，已经急速库存才会使用 - async check_the_pick(item,func){ - var th=this; - var goodsinfo=th.data.sele_g; - var erpwareid=goodsinfo.erpwareid; - var plist=null; - var lock=0; + async check_the_pick(item, func) { + var th = this; + var goodsinfo = th.data.sele_g; + var erpwareid = goodsinfo.erpwareid; + var plist = null; + var lock = 0; //---如果是活动的时候,同时不是普通购买--- - if((th.data.prom_type==1 || th.data.prom_type==6 || th.data.prom_type==4) && !th.data.is_normal ) { + if ((th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) && !th.data.is_normal) { func(); return false; } - if(this.data.sales_rules!=2){ + if (this.data.sales_rules != 2) { func(); - }else{ + } else { //先读取门店的lock - await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{ - data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id,pageSize:1000} - }).then(res=>{ - if(res.data.code==0 && res.data.data.total>0){ - for(var i in res.data.data.pageData ) - lock+=res.data.data.pageData[i].outQty; + await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", { + data: { store_id: os.stoid, wareId: goodsinfo.goods_id, storageId: item.pickup_id, pageSize: 1000 } + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + for (var i in res.data.data.pageData) + lock += res.data.data.pageData[i].outQty; } }) //读取线下的门店库存 - await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ - data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid} - }).then(res=>{ - if(res.data.code==0 && res.data.data.total>0){ - plist=res.data.data.pageData[0]; + await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", { + data: { storageNos: item.pickup_no, wareIds: encodeURIComponent(erpwareid), storeId: os.stoid } + }).then(res => { + if (res.data.code == 0 && res.data.data.total > 0) { + plist = res.data.data.pageData[0]; } }) - if(plist && plist.CanOutQty-lock>0){ - item.CanOutQty=plist.CanOutQty-lock; + if (plist && plist.CanOutQty - lock > 0) { + item.CanOutQty = plist.CanOutQty - lock; func(); return false; } - getApp().my_warnning(item.pickup_name+"库存不足！", 0, th); + getApp().my_warnning(item.pickup_name + "库存不足！", 0, th); } }, //确定def_pick为选择的门店 - sure_pick: function(e) { + sure_pick: function (e) { var th = this; var item = null; var openindstore = th.data.open_ind_store; @@ -4962,20 +4526,20 @@ Page({ item = th.data.sec_sto.s_arr[index]; } - if(!th.data.sele_g) return false; - //判断门店的配送方式是不是匹配 - var g_distr_type = th.data.sele_g.distr_type; - if(item.distr_type!=0 && g_distr_type!=0 && item.distr_type!=g_distr_type){ - wx.showToast({ - title: "门店配送方式不匹配", - icon: 'none', - duration: 2000 - }); - return false; - } - + if (!th.data.sele_g) return false; + //判断门店的配送方式是不是匹配 + var g_distr_type = th.data.sele_g.distr_type; + if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) { + wx.showToast({ + title: "门店配送方式不匹配", + icon: 'none', + duration: 2000 + }); + return false; + } + //--回调函数的用法-- - th.check_the_pick(item,function(){ + th.check_the_pick(item, function () { th.setData({ def_pick_store: item, sto_sele_name: item.pickup_name, @@ -5011,15 +4575,15 @@ Page({ choice_sort_store: 0, sort_store: 0 }) - } - //如果商品没有其他活动,要取一下线下价格 - th.get_off_price(); + } + //如果商品没有其他活动,要取一下线下价格 + th.get_off_price(); }) }, //---点击二级之后的选择--- - choose_for_store: function(e) { + choose_for_store: function (e) { var index_c = e.currentTarget.dataset.ind; - var th=this; + var th = this; th.setData({ sec_pick_index: index_c, fir_pick_index: index_c @@ -5027,7 +4591,7 @@ Page({ }, //把选择的门店设置成默认的门店def_pick - set_def_pick: function(e) { + set_def_pick: function (e) { var th = this; var item = null; if (th.data.choice_sort_store == 0) { @@ -5041,30 +4605,30 @@ Page({ var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } - - //判断门店的配送方式是不是匹配 - var g_distr_type = th.data.sele_g.distr_type; - if(item.distr_type!=0 && g_distr_type!=0 && item.distr_type!=g_distr_type){ - wx.showToast({ - title: "门店配送方式不匹配", - icon: 'none', - duration: 2000 - }); - return false; - } + + //判断门店的配送方式是不是匹配 + var g_distr_type = th.data.sele_g.distr_type; + if (item.distr_type != 0 && g_distr_type != 0 && item.distr_type != g_distr_type) { + wx.showToast({ + title: "门店配送方式不匹配", + icon: 'none', + duration: 2000 + }); + return false; + } //先设置之前,要判断是不是有库存 - th.check_the_pick(item,function(){ + th.check_the_pick(item, function () { var store_id = o.stoid; var user_id = getApp().globalData.user_id; var def_pickup_id = item.pickup_id; getApp().request.put('/api/weshop/users/update', { data: { - user_id:user_id, - def_pickup_id:def_pickup_id + user_id: user_id, + def_pickup_id: def_pickup_id }, - success: function(res) { + success: function (res) { if (res.data.code == 0) { if (th.data.choice_sort_store == 0) th.setData({ fir_pick_index: 0 @@ -5072,7 +4636,7 @@ Page({ getApp().globalData.pk_store = item; } else { //s.showWarning("设置默认门店地址失败", null, 500, !1); - getApp().my_warnning("设置默认门店地址失败",0,th) + getApp().my_warnning("设置默认门店地址失败", 0, th) } } @@ -5121,27 +4685,27 @@ Page({ sort_store: 0, }) } - - //如果商品没有其他活动,要取一下线下价格 - th.get_off_price(); - + + //如果商品没有其他活动,要取一下线下价格 + th.get_off_price(); + }) }, - wait_for_store_config: function() { + wait_for_store_config: function () { var th = this; - var t_time = setInterval(function() { + var t_time = setInterval(function () { if (th.data.bconfig == null) false; var e = th.data.bconfig; if (e && e.is_sort_storage) { wx.getLocation({ type: 'gcj02', - success: function(res) { + success: function (res) { th.data.lat = res.latitude; th.data.lon = res.longitude; th.data.is_get_local_ok = 1; }, - fail: function(res) { + fail: function (res) { if (res.errCode == 2) { th.setData({ is_gps: 0 @@ -5166,9 +4730,9 @@ Page({ }, 500) }, //显示全部 - toggleHandler: function(e) { + toggleHandler: function (e) { var that = this, - index = e.currentTarget.dataset.index; + index = e.currentTarget.dataset.index; for (var i = 0; i < that.data.comments.length; i++) { if (index == i) { for (var i = 0; i < that.data.comments.length; i++) { @@ -5183,9 +4747,9 @@ Page({ }, //收起更多 - toggleContent: function(e) { + toggleContent: function (e) { var that = this, - index = e.currentTarget.dataset.index; + index = e.currentTarget.dataset.index; for (var i = 0; i < that.data.comments.length; i++) { if (index == i) { that.data.comments[index].auto = true; @@ -5201,390 +4765,385 @@ Page({ getPlusCardType: function (func) { var storid = os.stoid; var th = this; - var user=getApp().globalData.userInfo; - if(!user) return false; + var user = getApp().globalData.userInfo; + if (!user) return false; 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 list=[]; - 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); - list.push(plusCard[i]); + var card_name_map = new Map(); + + var list = []; + 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); + list.push(plusCard[i]); } - - var ob={"card_list":list,"name_map":card_name_map}; + + var ob = { "card_list": list, "name_map": card_name_map }; func(ob); }) }, - go_plus:function(){ + go_plus: function () { getApp().goto("/pages/user/plus/plus"); }, - go_card_info:function(){ + go_card_info: function () { getApp().goto("/pages/user/cardinfo/cardinfo"); }, //-- 根据ID拿出门店 -- - get_pick_from_list(pid){ - var all_pick_list=this.data.all_pick_list; - for(var i in all_pick_list){ - var item=all_pick_list[i]; - if(item.pickup_id==pid){ + get_pick_from_list(pid) { + var all_pick_list = this.data.all_pick_list; + for (var i in all_pick_list) { + var item = all_pick_list[i]; + if (item.pickup_id == pid) { return item; } } }, //-----显示优惠券的时候情况----- - show_more_cx:function () { - if(this.data.is_more_cx){ - this.setData({is_more_cx:0}); - }else{ - this.setData({is_more_cx:1}); + show_more_cx: function () { + if (this.data.is_more_cx) { + this.setData({ is_more_cx: 0 }); + } else { + this.setData({ is_more_cx: 1 }); } }, //----跳转到搭配购买---- - go_prom_list:function () { - - var url= "../../../../packageA/pages/prom_list/prom_list?goods_id="+this.data.gid; - var room_id= getApp().globalData.room_id; - if(room_id && this.data.gid==getApp().globalData.room_goods_id){ - url+="&room_id="+room_id; - } - wx.navigateTo({ url: url,}) + go_prom_list: function () { + + var url = "../../../../packageA/pages/prom_list/prom_list?goods_id=" + this.data.gid; + var room_id = getApp().globalData.room_id; + if (room_id && this.data.gid == getApp().globalData.room_goods_id) { + url += "&room_id=" + room_id; + } + wx.navigateTo({ url: url, }) }, //---检查有没有优惠活动--- - check_is_youhui:function(gid,is_nor){ - var th=this; - //如果是普通购买的时候，要进行调用 - if(is_nor){ - getApp().request.get("/api/weshop/goods/getGoodsPromNormal/" + os.stoid+"/"+gid, { - success:function(res){ - if(res.data.code==0){ - var r_data=res.data.data; - th.setData({ - prom_goods:r_data.promGoodsLists, - }) - th.is_show_more_buy(); - } - }, - }) - - }else{ - //调用接口判断订单优惠， - getApp().request.get("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+gid+"/0", { - success:function(res){ - if(res.data.code==0){ - var r_data=res.data.data; - var max=0,min=0; - if(r_data.collocationList){ - for(var i in r_data.collocationList){ - if(max==0) max=r_data.collocationList[i].price; - if(min==0) min=r_data.collocationList[i].price; - - if(maxparseFloat(r_data.collocationList[i].price)) min=r_data.collocationList[i].price; - } - r_data.collocationPromList.max=(max+th.data.data.shop_price).toFixed(2); - r_data.collocationPromList.min=(min+th.data.data.shop_price).toFixed(2); - } - th.setData({ - order_prom:r_data.promOrder, - collocationGoods:r_data.collocationPromList, - prom_goods:r_data.promGoodsLists, - }) - th.is_show_more_buy(); - } - } - - }) - } - - - }, - - closePoster() { - this.setData({ - showPoster: false, - }); - }, - - // 保存图片到手机 - savePic() { - console.log('保存图片'); - var self = this; - // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限 - this.getSetting().then((res) => { - // 判断用户是否授权了保存到相册的权限，如果没有发起授权 - if (!res.authSetting['scope.writePhotosAlbum']) { - this.authorize().then(() => { - // 同意授权后保存下载文件 - this.saveImage(self.data.shareImgPath) - .then(() => { - self.setData({ - showPoster: false - }); - }); - }) - } else { - // 如果已经授权，保存下载文件 - this.saveImage(self.data.shareImgPath) - .then(() => { - self.setData({ - showPoster: false - }); - }); - } - - }) - }, - - // 获取用户已经授予了哪些权限 - getSetting() { - return new Promise((resolve, reject) => { - wx.getSetting({ - success: res => { - resolve(res) - } - }) - }) - }, - - // 发起首次授权请求 - authorize() { - // isFirst 用来记录是否为首次发起授权， - // 如果首次授权拒绝后，isFirst赋值为1 - let isFirst = wx.getStorageSync('isFirst') || 0; - return new Promise((resolve, reject) => { - wx.authorize({ - scope: 'scope.writePhotosAlbum', - // 同意授权 - success: () => { - resolve(); - }, - // 拒绝授权,这里是用户拒绝授权后的回调 - fail: res => { - if(isFirst === 0) { - wx.setStorageSync('isFirst', 1); - wx.showToast({ - title: '保存失败', - icon: 'none', - duration: 1000 - }) - } else { - this.showModal(); - } - console.log('拒绝授权'); - reject(); - } - }) - }) - }, - - - // 保存图片到系统相册 - saveImage(saveUrl) { - var self = this; - return new Promise((resolve, reject) => { - wx.saveImageToPhotosAlbum({ - filePath: saveUrl, - success: (res) => { - wx.showToast({ - title: '保存成功', - duration: 1000, - }); - self.setData({ - showPlaybill: 'true' - }); - resolve(); - }, - fail: () => { - wx.showToast({ - title: '保存失败', - duration: 1000, - }); - } - }) - }) - }, - - previewImage() { - this.data.show_prew_img=1; - wx.previewImage({ - //将图片预览出来 - urls: [this.data.shareImgPath] - }); - }, - - is_show_more_buy:function(){ - var prom_goods=this.data.prom_goods; - var per_price=this.data.sele_g.shop_price - if(this.data.card_field && this.data.sele_g[this.data.card_field]>0){ - per_price=this.data.sele_g[this.data.card_field]; - } - var all_price=per_price*this.data.goodsInputNum; - var con=null; - for(var i in prom_goods){ - var item=prom_goods[i]; - if(item.prom_type==1){ - if(item.condition>this.data.goodsInputNum) { - con=item; - con.need=(item.condition-this.data.goodsInputNum).toFixed(2)+"件"; - break; - } - }else{ - if(item.condition>all_price){ - con=item; - con.need=(item.condition-all_price).toFixed(2)+"元"; - break; - } - } - } - - this.setData({hui_condition:con}); - - }, - - //-- 积分购 -- - go_pay_integral:function(){ - this.get_sto(0) - this.setData({openSpecModal_inte:1,goodsInputNum:1}); - }, - //-- 积分购普通购买 -- - go_pay_integral_normal:function(){ - var th=this; - if (th.data.sku_g_pt) { - this.get_sto(1) - this.setData({openSpecModal_inte_normal:1}); - }else{ - th.get_sto(1); - th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function() { - th.setData({ - is_normal: 1, - openSpecModal_inte_normal:1 - }); - }); - } - this.check_is_youhui(th.data.gid,1); - }, - - closeSpecModal_inte:function(){ - this.setData({openSpecModal_inte:0}); - } , - closeSpecModal_inte_normal:function(){ - this.setData({openSpecModal_inte_normal:0}); - //要进行还原 - this.get_sto(); - this.setData({ - sele_g:this.data.data, - gid:this.data.data.goods_id - }) - - this.sele_spec_chech_activity(); - }, - - addCart_inte:function(t){ - this.add_cart_func_inte(t); - }, - - - - - onShareTimeline() { - var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; - if(!store_name) - store_name=getApp().globalData.setting.appName; - return { - title:this.data.data.goods_name + '-' + store_name, - imageUrl:this.data.gallery[0].image_url, - } - }, - - - clickCollapse() { - this.setData({ - flag: !this.data.flag, - }) - }, - - clickShare() { - this.setData({ - share_hidden: true, - }); - }, - - send() { - this.setData({ - share_hidden:false, - }); - }, - - cancel() { - this.setData({ - share_hidden:false, - }); - }, - - //积分购和拼团的普通购买的的时候，要判断有没有全场优惠活动 - check_nor_promgood(goods_id,back){ - getApp().request.get("/api/weshop/goods/getGoodsPromNormal/"+os.stoid+"/"+goods_id,{ - success:function(res){ - if(res.data.code==0 && res.data.data && res.data.data.promGoodsLists && res.data.data.promGoodsLists.length>0){ - var obj={ - act_id:res.data.data.promGoodsLists[0].prom_id, - } - back(obj); - }else{ - back(0) - } - } - }) - }, - - go_zh:function (e) { - var id=e.currentTarget.dataset.id; - getApp().goto("/packageB/pages/zuhegou/index/index?id="+id); - }, - - check_zh_acting:function (func) { - var isok = 1,item=this.data.sele_g; - //如果有组合购 - var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+item.prom_id+"/"+getApp().globalData.userInfo.user_id; - getApp().request.promiseGet(url, {}).then(res => { - if(res.data.code==0 && res.data.data){ - if(res.data.data.is_show!=1){ - isok=0; - } - //如果活动已经结束 - if(res.data.data.is_end==1){ - isok=0; - } - //已经结束 - if(ut.gettimestamp()>res.data.data.end_time){ - isok=0; - } - //还未开始 - if(ut.gettimestamp() parseFloat(r_data.collocationList[i].price)) min = r_data.collocationList[i].price; + } + r_data.collocationPromList.max = (max + th.data.data.shop_price).toFixed(2); + r_data.collocationPromList.min = (min + th.data.data.shop_price).toFixed(2); + } + th.setData({ + order_prom: r_data.promOrder, + collocationGoods: r_data.collocationPromList, + prom_goods: r_data.promGoodsLists, + }) + th.is_show_more_buy(); + } + } + + }) + } + + + }, + + closePoster() { + this.setData({ + showPoster: false, + }); + }, + + // 保存图片到手机 + savePic() { + console.log('保存图片'); + var self = this; + // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限 + this.getSetting().then((res) => { + // 判断用户是否授权了保存到相册的权限，如果没有发起授权 + if (!res.authSetting['scope.writePhotosAlbum']) { + this.authorize().then(() => { + // 同意授权后保存下载文件 + this.saveImage(self.data.shareImgPath) + .then(() => { + self.setData({ + showPoster: false + }); + }); + }) + } else { + // 如果已经授权，保存下载文件 + this.saveImage(self.data.shareImgPath) + .then(() => { + self.setData({ + showPoster: false + }); + }); + } + + }) + }, + + // 获取用户已经授予了哪些权限 + getSetting() { + return new Promise((resolve, reject) => { + wx.getSetting({ + success: res => { + resolve(res) + } + }) + }) + }, + + // 发起首次授权请求 + authorize() { + // isFirst 用来记录是否为首次发起授权， + // 如果首次授权拒绝后，isFirst赋值为1 + let isFirst = wx.getStorageSync('isFirst') || 0; + return new Promise((resolve, reject) => { + wx.authorize({ + scope: 'scope.writePhotosAlbum', + // 同意授权 + success: () => { + resolve(); + }, + // 拒绝授权,这里是用户拒绝授权后的回调 + fail: res => { + if (isFirst === 0) { + wx.setStorageSync('isFirst', 1); + wx.showToast({ + title: '保存失败', + icon: 'none', + duration: 1000 + }) + } else { + this.showModal(); + } + console.log('拒绝授权'); + reject(); + } + }) + }) + }, + + + // 保存图片到系统相册 + saveImage(saveUrl) { + var self = this; + return new Promise((resolve, reject) => { + wx.saveImageToPhotosAlbum({ + filePath: saveUrl, + success: (res) => { + wx.showToast({ + title: '保存成功', + duration: 1000, + }); + self.setData({ + showPlaybill: 'true' + }); + resolve(); + }, + fail: () => { + wx.showToast({ + title: '保存失败', + duration: 1000, + }); + } + }) + }) + }, + + previewImage() { + this.data.show_prew_img = 1; + wx.previewImage({ + //将图片预览出来 + urls: [this.data.shareImgPath] + }); + }, + + is_show_more_buy: function () { + var prom_goods = this.data.prom_goods; + var per_price = this.data.sele_g.shop_price + if (this.data.card_field && this.data.sele_g[this.data.card_field] > 0) { + per_price = this.data.sele_g[this.data.card_field]; + } + var all_price = per_price * this.data.goodsInputNum; + var con = null; + for (var i in prom_goods) { + var item = prom_goods[i]; + if (item.prom_type == 1) { + if (item.condition > this.data.goodsInputNum) { + con = item; + con.need = (item.condition - this.data.goodsInputNum).toFixed(2) + "件"; + break; + } + } else { + if (item.condition > all_price) { + con = item; + con.need = (item.condition - all_price).toFixed(2) + "元"; + break; + } + } + } + + this.setData({ hui_condition: con }); + + }, + + //-- 积分购 -- + go_pay_integral: function () { + this.get_sto(0) + this.setData({ openSpecModal_inte: 1, goodsInputNum: 1 }); + }, + //-- 积分购普通购买 -- + go_pay_integral_normal: function () { + var th = this; + if (th.data.sku_g_pt) { + this.get_sto(1) + this.setData({ openSpecModal_inte_normal: 1 }); + } else { + th.get_sto(1); + th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () { + th.setData({ + is_normal: 1, + openSpecModal_inte_normal: 1 + }); + }); + } + this.check_is_youhui(th.data.gid, 1); + }, + + closeSpecModal_inte: function () { + this.setData({ openSpecModal_inte: 0 }); + }, + closeSpecModal_inte_normal: function () { + this.setData({ openSpecModal_inte_normal: 0 }); + //要进行还原 + this.get_sto(); + this.setData({ + sele_g: this.data.data, + gid: this.data.data.goods_id + }) + + this.sele_spec_chech_activity(); + }, + + addCart_inte: function (t) { + this.add_cart_func_inte(t); + }, + + + + + onShareTimeline() { + var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; + if (!store_name) + store_name = getApp().globalData.setting.appName; + return { + title: this.data.data.goods_name + '-' + store_name, + imageUrl: this.data.gallery[0].image_url, + } + }, + + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) + }, + + clickShare() { + this.setData({ + share_hidden: true, + }); + }, + + send() { + this.setData({ + share_hidden: false, + }); + }, + + cancel() { + this.setData({ + share_hidden: false, + }); + }, + + //积分购和拼团的普通购买的的时候，要判断有没有全场优惠活动 + check_nor_promgood(goods_id, back) { + getApp().request.get("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + goods_id, { + success: function (res) { + if (res.data.code == 0 && res.data.data && res.data.data.promGoodsLists && res.data.data.promGoodsLists.length > 0) { + var obj = { + act_id: res.data.data.promGoodsLists[0].prom_id, + } + back(obj); + } else { + back(0) + } + } + }) + }, + + go_zh: function (e) { + var id = e.currentTarget.dataset.id; + getApp().goto("/packageB/pages/zuhegou/index/index?id=" + id); + }, + + check_zh_acting: function (func) { + var isok = 1, item = this.data.sele_g; + //如果有组合购 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item.prom_id + "/" + getApp().globalData.userInfo.user_id; + getApp().request.promiseGet(url, {}).then(res => { + if (res.data.code == 0 && res.data.data) { + if (res.data.data.is_show != 1) { + isok = 0; + } + //如果活动已经结束 + if (res.data.data.is_end == 1) { + isok = 0; + } + //已经结束 + if (ut.gettimestamp() > res.data.data.end_time) { + isok = 0; + } + //还未开始 + if (ut.gettimestamp() < res.data.data.start_time) { + isok = 0; + } + + } else { + //未找到商品的活动 + isok = 0; + } + item.act = res.data.data; + func(isok); + }) + } + }); diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml index ba4e328..c0ed359 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml +++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml @@ -1,1255 +1,738 @@ - + - - - - - - - {{item.name}} - + + + + + {{item.name}} - - - + + {{djs.hou}} - 距活动结束还有 - 距活动开始还有 - - - {{djs.day}} - 天 - - {{djs.hou}} - 时 - {{djs.min}} - 分 - {{djs.sec}} - 秒 + 时 + + {{djs.min}} + + 分 + + {{djs.sec}} + 秒 - - - - - - - + + + + + + {{data.goods_name}} - - - + + - - - - - - - ￥{{item.price}} - 满{{item.rynum}}人 - - + + + 尾款：{{filters.format_time(presellForm.pay_begindate,1)}}-{{filters.format_time(presellForm.pay_enddate,1)}} + + + + 总数量：{{presellList.presell_sumqty+presellList.virtual_qty}}件 + 限购:{{presellList.vip_butyqty}}件 + 已购:{{presellList.buy_goodnum+presellList.virtual_qty}}件 + + + 总数量：{{presellList.presell_sumqty}}件 + 限购:{{presellList.vip_butyqty}}件 + 已购:{{presellList.buy_goodnum}}件 - - - {{prom_act.remark}} + + {{prom_act.remark}} + + + + + + + + 选择门店 + + + 更多门店 + + - - - - - - 以下小伙伴正在拼单，可直接参与 - 查看详细 - - + + + + {{def_pick_store.pickup_name}} + + + 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} - - - - - - - - - {{item.user.nickname}} - - - - - - 还差{{prom_act.max_ct_num - item.open_num}}人享最低优惠您已经享最低优惠 - 还差{{prom_act.ct_num - item.open_num}}人成团 - - 剩余 - {{timer[t_ind].day}}天: - {{timer[t_ind].hou}}: - {{timer[t_ind].min}}: - {{timer[t_ind].sec}} + (库存不足) + + + (库存不足) + + + + (配送不匹配) + + + (库存不足) + + + + 地址:{{def_pick_store.fulladdress}} + + + + + + + 宝贝评价({{categories3[0].num}}) + + 查看全部 + + + + + + 有图({{categories3[1].num}}) + + + 好评({{categories3[2].num}}) + + + 中评({{categories3[3].num}}) + + + 差评({{categories3[4].num}}) + + + + + + + + + + + + + {{item.is_anonymous!=1?item.username:'匿名'}} + - - - 去参团 + + {{item.content?item.content:'此用户没有填写评价。'}} + + + {{item.add_time}} - + + + + + - - + + + + + + + 商品详情 - - - - - - - - - {{prom_integral}}积分 - + - {{filters.toFix(prom_price,2)}}元 - 0积分 -    零售价:￥{{filters.toFix(data.market_price,2)}} - - - - - - - - - - - {{data.goods_name}} - - - - 销量：{{prom_act.buy_num}}件 - 折扣：{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折 - {{categories3[0].num}}人评价 - - - - - - - - - - - - - - - {{card_name}} - - ￥{{filters.toFix(data[card_field],2)}} - - 零售价:￥{{filters.toFix(data.market_price,2)}} - - - - ￥{{filters.toFix(data.shop_price,2)}} - 零售价:￥{{filters.toFix(data.market_price,2)}} - - - - - - - - - - - - - - - - - - - {{g_filters.get_card_price(data,card_list,1)}} - - - - ￥{{g_filters.get_card_price(data,card_list,0)}} - - - - - - - - - - - - - - 成为{{g_filters.get_card_price(data,card_list,1)}}立省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}元 - 开通会员 尽享更多优惠 - - - - 立即开卡 - - - - + + + + + 商品名称 + + + {{data.goods_name}} + - - - - - - - 成为{{card_name}}立省{{filters.toFix(data.shop_price[card_field],2)}}元 - 开通会员 尽享更多优惠 - - - - 立即续费 - - - - - - - - - - - - - {{data.goods_name}} + + + 商品编号 + + + {{data.goods_sn}} - - - 销量：{{data.sales_sum}}件 - 折扣：{{data.disc}}折 - {{categories3[0].num}}人评价 + + + 商品条码 + + + {{data.sku}} + - - - - ￥{{prom_price}} - 零售价￥{{filters.toFix(data.market_price,2)}} - - - - - - + + + 品类 + + + {{cat_name}} - - - {{data.goods_name}} + + + 品牌 + + + {{brand_name}} + - - - - - - - - 总数量：{{prom_act.goods_num+prom_act.virtual}}件 - 限购:{{prom_act.buy_limit}}件 - - 已购:0件 - - - 已购:{{prom_act.buy_num+prom_act.virtual}}件 - - - - - 总数量：{{prom_act.goods_num}}件 - 限购:{{prom_act.buy_limit}}件 - 已购:{{prom_act.buy_num}}件 - - + + + 国别 + + + {{nation_name}} - - - - - - - - - - - 选择门店 - - - 更多门店 - - - - - - - - {{def_pick_store.pickup_name}} - - - 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} - - - - - - (库存不足) - - (库存不足) - - (配送不匹配) - (库存不足) - - - - 地址:{{def_pick_store.fulladdress}} - - - + + + 规格 + + + {{filters.show_gui_ge(data.goods_spec,data.goods_color)}} + - - - - - 领券 - - - - 满{{item.condition}}减{{item.money}} - - - - - - + + + 上架时间 + + + {{data.on_time}} + - - - - - - - - 促销 - - - - - 消费满{{item.condition}}件元 - - 减价{{item.money}}元; - 打{{item.sale}}折; - 包邮; - 送{{tem.intValue}}积分; - 送{{item.couponMoney}}元优惠券; - 送商品{{item.goods_name}}; - 送{{item.lbtitle}}; - - - - - - - - - - - - - 订单优惠 - - - - - {{order_prom.name}} - (活动时间：{{tool.format_tt(order_prom.start_time)}} - {{tool.format_tt(order_prom.end_time)}}) - - - - - - - - - - 组合购 - - - - - - {{zh_act.name}} - (活动时间：{{tool.format_tt(zh_act.start_time)}} - {{tool.format_tt(zh_act.end_time)}}) - - - - - - - - - - - - {{bconfig.service_bz}} - - - - - - - + + + - - - - - - 优惠热配 - 查看全部 - - + + + + + + + 推荐 + + + + + + + + 提供技术支持 + + + + + + + 暂无评价 + + + 已经加载到底部 + - - - - - + + + + + + + + + + + + 客服 - - - - - - - - 客服 - - - - - - 收藏 - - - - - {{cartGoodsNum}} - 购物车 - + + + + 收藏 + + + + + {{cartGoodsNum}} + 购物车 + + + + 立即购买 + + + + {{filters.format_time(presellForm.end_time,2)}} 预售结束 + + {{filters.format_time(presellForm.delivery_date,2)}} 开始发货 + 付款{{presellForm.delivery_daynum}} 天后发货 - 立即购买 - - - - - - - 加入购物车 - 立即购买 - - - 库存不足 - - - - - - - - - 08.30 23:59:59 预售结束 - - 付款3天后发货 - - - 支付定金 - 定金9.9 - - - - - - - - - - - {{filters.toFix(sele_g[card_field],2)}} - - - {{filters.toFix(sele_g.shop_price,2)}} - - - 单独购买 + + 支付定金 + + 定金 + {{presellList.presell_money}} - - - - - ￥{{prom_act.price}} - 去参团 - - - - - - 一键开团 - 佣金￥{{filters.toFix(prom_act.tz_yyhjg,2)}} - 团长免单 - - - ￥{{ filters.toFix(prom_act.price,2)}} - 一键开团 - - - - - - ￥{{filters.toFix(prom_act.yf_price,2)}} - 支付定金 - - - 即将开始 - 已抢光 - 活动已经结束 - - - 您还未支付 - 查看支付详情 - 支付尾款 - - - - - - - - - - - - {{filters.toFix(sele_g[card_field],2)}} - - - {{filters.toFix(sele_g.shop_price,2)}} - - - 单独购买 - - 立即兑换 - 积分不足 - - - - 立即兑换 - 积分不足 - - - - - + - - - - - - - + + + + - + 暂无更多 diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 546c335..e81aed8 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -309,6 +309,7 @@ Page({ } } + ee.setData({ gid: gid}); if(first_leader){ console.log("log---".first_leader); @@ -2492,6 +2493,16 @@ Page({ if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) { + var his_cate_num=0; + for(let i in e.data.data.pageData){ + let item=e.data.data.pageData[i]; + if(item.category_id>0){ + his_cate_num=1;break; + } + } + e.his_cate_num=his_cate_num; + + //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 if(dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig && th.data.bconfig.is_sort_storage){ th.setData({ @@ -2542,8 +2553,8 @@ Page({ var g_distr_type=th.data.sele_g.distr_type; wx.hideLoading(); - //单总量超出5个的时候 - if (e.data.data.total > 5) { + //单总量超出10个的时候，同时门店有分类 + if (e.data.data.total > 10 && e.his_cate_num ) { getApp().request.get("/api/weshop/storagecategory/page", { data: { store_id: o.stoid, @@ -2559,7 +2570,7 @@ Page({ var def_arr = new Array(); var ishas = 0; //-- 开始就看5个门店 -- - for (var k = 0; k < 5; k++) { + for (var k = 0; k < 10; k++) { if (k == e.data.data.pageData.length) break; def_arr.push(e.data.data.pageData[k]); } @@ -2766,6 +2777,7 @@ Page({ var em={};em.data={};em.data.data={}; em.data.data.total=new_list.length; em.data.data.pageData=new_list; + em.data.data.pageData=new_list; //--如果找到默认门店,同时也应该判断配送方式对不对-- if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){ @@ -5580,7 +5592,11 @@ Page({ item.act=res.data.data; func(isok); }) - } + } + + + + diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index abcc6d5..6731237 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -2,28 +2,24 @@ - - + {{item.name}} - + - - - - + - - 距活动结束还有 距活动开始还有 - {{djs.day}} + + {{djs.day}} + 天 - {{djs.hou}} + + {{djs.hou}} + 时 - {{djs.min}} - 分 - {{djs.sec}} + + {{djs.min}} + + 分 + + {{djs.sec}} + 秒 - - + - + ￥ {{prom_price}} - 零售价￥{{filters.toFix(data.market_price,2)}} + + 零售价￥{{filters.toFix(data.market_price,2)}} + 已拼{{prom_act.buy_num}}件 @@ -101,251 +99,267 @@ - - {{prom_act.ct_num}}人拼 - + {{prom_act.ct_num}}人拼 距活动结束还有 距活动开始还有 - {{djs.day}} - 天 + + {{djs.day}} + + + 天 + - {{djs.hou}} + + {{djs.hou}} + 时 - {{djs.min}} - 分 - {{djs.sec}} + + {{djs.min}} + + 分 + + {{djs.sec}} + 秒 - - + - + {{data.goods_name}} - - - - + - ￥{{item.price}} + ￥ + {{item.price}} + 满{{item.rynum}}人 - - - {{prom_act.remark}} - - - + {{prom_act.remark}} + - 以下小伙伴正在拼单，可直接参与 - 查看详细 + 以下小伙伴正在拼单，可直接参与 + + 查看详细 - - - - - - - {{item.user.nickname}} - - - + + + + + + + {{item.user.nickname}} + + - 还差{{prom_act.max_ct_num - item.open_num}}人享最低优惠您已经享最低优惠 - 还差{{prom_act.ct_num - item.open_num}}人成团 + + + 还差 + {{prom_act.max_ct_num - item.open_num}} + 人享最低优惠 + + 您已经享最低优惠 + + + 还差 + {{prom_act.ct_num - item.open_num}} + 人成团 + 剩余 - {{timer[t_ind].day}}天: - {{timer[t_ind].hou}}: - {{timer[t_ind].min}}: + {{timer[t_ind].day}}天: + {{timer[t_ind].hou}} + : + {{timer[t_ind].min}} + : {{timer[t_ind].sec}} - - - 去参团 - + + 去参团 - - - - - - - - - - {{prom_integral}}积分 - + - {{filters.toFix(prom_price,2)}}元 - 0积分 -    零售价:￥{{filters.toFix(data.market_price,2)}} - - - - - - - - - - - {{data.goods_name}} - - - - 销量：{{prom_act.buy_num}}件 - 折扣：{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折 - {{categories3[0].num}}人评价 - - - - - + + + + + + + + {{prom_integral}} + 积分 + + + + {{filters.toFix(prom_price,2)}}元 + 0积分 + +    零售价:￥{{filters.toFix(data.market_price,2)}} + + + + + + + + {{data.goods_name}} + + + 销量：{{prom_act.buy_num}}件 + + 折扣：{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折 + + {{categories3[0].num}}人评价 + + + + - - - - - - - - {{card_name}} - - ￥{{filters.toFix(data[card_field],2)}} - - 零售价:￥{{filters.toFix(data.market_price,2)}} - - - - ￥{{filters.toFix(data.shop_price,2)}} - 零售价:￥{{filters.toFix(data.market_price,2)}} - - - - - - - - - - - - + + + + + + + {{card_name}} + + ￥ + {{filters.toFix(data[card_field],2)}} + + 零售价:￥{{filters.toFix(data.market_price,2)}} + + + + ￥ + {{filters.toFix(data.shop_price,2)}} + + 零售价:￥{{filters.toFix(data.market_price,2)}} + + + + + + + + - + - - - - {{g_filters.get_card_price(data,card_list,1)}} + + + + {{g_filters.get_card_price(data,card_list,1)}} + + + + ￥ + {{g_filters.get_card_price(data,card_list,0)}} + + + + + + + + + + + + 成为{{g_filters.get_card_price(data,card_list,1)}}立 + + 省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}} + + 元 + + 开通会员 尽享更多优惠 + - - - ￥{{g_filters.get_card_price(data,card_list,0)}} + + 立即开卡 + - - - - - - - - - - - - - 成为{{g_filters.get_card_price(data,card_list,1)}}立省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}元 - 开通会员 尽享更多优惠 - - - - 立即开卡 - - - - - - - - - - - - 成为{{card_name}}立省{{filters.toFix(data.shop_price[card_field],2)}}元 - 开通会员 尽享更多优惠 - - - - 立即续费 - - - - - - - - - - + + + + + + + + + + 成为{{card_name}}立 + + 省{{filters.toFix(data.shop_price[card_field],2)}} + + 元 + + 开通会员 尽享更多优惠 + + + + 立即续费 + + + + + + {{data.goods_name}} - 销量：{{data.sales_sum}}件 折扣：{{data.disc}}折 @@ -354,18 +368,20 @@ - ￥{{prom_price}} + + ￥ + {{prom_price}} + 零售价￥{{filters.toFix(data.market_price,2)}} - - - - + + + - {{data.goods_name}} - - - + 总数量：{{prom_act.goods_num+prom_act.virtual}}件 限购:{{prom_act.buy_limit}}件 - 已购:0件 - - - 已购:{{prom_act.buy_num+prom_act.virtual}}件 - + 已购:0件 + + + 已购:{{prom_act.buy_num+prom_act.virtual}}件 + - - 总数量：{{prom_act.goods_num}}件 - 限购:{{prom_act.buy_limit}}件 - 已购:{{prom_act.buy_num}}件 + 总数量：{{prom_act.goods_num}}件 + 限购:{{prom_act.buy_limit}}件 + 已购:{{prom_act.buy_num}}件 - - - - - - - - - - 选择门店 - - - 更多门店 - - + + + + + + + 选择门店 + + + 更多门店 + + + + + + + {{def_pick_store.pickup_name}} + + + 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} + + + (库存不足) + + + (库存不足) + + + + (配送不匹配) - - - - - {{def_pick_store.pickup_name}} - - - 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}} - - - - - - (库存不足) - - (库存不足) - - (配送不匹配) - (库存不足) - - - - 地址:{{def_pick_store.fulladdress}} + + (库存不足) - - + + + 地址:{{def_pick_store.fulladdress}} - - + + + 领券 - - - - 满{{item.condition}}减{{item.money}} - - - - + + + + + 满{{item.condition}}减{{item.money}} + + + + - - - - - + 促销 - - - 消费满{{item.condition}}件元 - - 减价{{item.money}}元; - 打{{item.sale}}折; - 包邮; - 送{{tem.intValue}}积分; - 送{{item.couponMoney}}元优惠券; - 送商品{{item.goods_name}}; - 送{{item.lbtitle}}; - - + + + 消费满{{item.condition}} + 件 + 元 + + + 减价{{item.money}}元; + 打{{item.sale}}折; + 包邮; + 送{{tem.intValue}}积分; + 送{{item.couponMoney}}元优惠券; + 送商品{{item.goods_name}}; + 送{{item.lbtitle}}; + + - - + 订单优惠 - - - {{order_prom.name}} - (活动时间：{{tool.format_tt(order_prom.start_time)}} - {{tool.format_tt(order_prom.end_time)}}) - + + + {{order_prom.name}} + + (活动时间：{{tool.format_tt(order_prom.start_time)}} - {{tool.format_tt(order_prom.end_time)}}) + + - - - - 组合购 - - - - - - {{zh_act.name}} - (活动时间：{{tool.format_tt(zh_act.start_time)}} - {{tool.format_tt(zh_act.end_time)}}) - - - + + 组合购 + + + + + + {{zh_act.name}} + + (活动时间：{{tool.format_tt(zh_act.start_time)}} - {{tool.format_tt(zh_act.end_time)}}) + - - - + + + + + + - - {{bconfig.service_bz}} - - - - - - - + + {{bconfig.service_bz}} + + + + + + - - - + 优惠热配 - 查看全部 + + 查看全部 - - - - {{collocationGoods.title}} - 搭配价￥{{collocationGoods.min}}-{{collocationGoods.max}} - 搭配价￥{{collocationGoods.min}} - 活动至{{filters.format_time(collocationGoods.end_time,1)}} - + + + {{collocationGoods.title}} + + 搭配价￥{{collocationGoods.min}}-{{collocationGoods.max}} + + 搭配价￥{{collocationGoods.min}} + + 活动至{{filters.format_time(collocationGoods.end_time,1)}} + + - - - + 宝贝评价({{categories3[0].num}}) - 查看全部 + + 查看全部 - - 有图({{categories3[1].num}}) - 好评({{categories3[2].num}}) - 中评({{categories3[3].num}}) - 差评({{categories3[4].num}}) + + 有图({{categories3[1].num}}) + + + 好评({{categories3[2].num}}) + + + 中评({{categories3[3].num}}) + + + 差评({{categories3[4].num}}) + - - - - - - - - - - - {{item.is_anonymous!=1?item.username:'匿名'}} - - - - - {{item.content?item.content:'此用户没有填写评价。'}} - - - {{item.add_time}} - - - - - - - - - - + + + + + + + + + + {{item.is_anonymous!=1?item.username:'匿名'}} + + + + + + {{item.content?item.content:'此用户没有填写评价。'}} + + + {{item.add_time}} + + + + + + + + + - + + + + + 商品名称 + + + {{data.goods_name}} + + + + + 商品编号 + + + {{data.goods_sn}} + + + + + 商品条码 + + + {{data.sku}} + + + + + 品类 + + + {{cat_name}} + + + + + 品牌 + + + {{brand_name}} + + + + + 国别 + + + {{nation_name}} + + + + + 规格 + + + {{filters.show_gui_ge(data.goods_spec,data.goods_color)}} + + + + + 上架时间 + + + {{data.on_time}} + + + + + - - - + 推荐 - - - + - - + - - + - - - - - - - {{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}} - + + + + + + + {{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}} + + + - - - - {{item.content?item.content:'此用户没有填写评价。'}} - - - 全部显示 - 收起 - - - - - + + + {{item.content?item.content:'此用户没有填写评价。'}} + + + + 全部显示 + + + 收起 + + + + + - - + + - + - - - - - {{item.add_time}} - - - - {{item.zan_num}} + + + + {{item.add_time}} + + + + + {{item.zan_num}} + + - - - - - 店家回复: - - {{r_item.content}} + + + 店家回复: + + {{r_item.content}} + - - 暂无评价 + 暂无评价 已经加载到底部 - - - - 提供技术支持 - - + + + + + 提供技术支持 + + - + - - + - - - - - 客服 - - + + + 客服 + @@ -896,27 +908,25 @@ - {{cartGoodsNum}} + {{cartGoodsNum}} 购物车 - 立即购买 - + + 立即购买 + - - - - 加入购物车 - 立即购买 + + + 加入购物车 + 立即购买 + + + 库存不足 - - 库存不足 - - - - + 加入购物车 @@ -932,307 +942,321 @@ 活动已经结束 - - + - - - {{filters.toFix(sele_g[card_field],2)}} - - - {{filters.toFix(sele_g.shop_price,2)}} - - + + + {{filters.toFix(sele_g[card_field],2)}} + + {{filters.toFix(sele_g.shop_price,2)}} + 单独购买 - - + ￥{{prom_act.price}} 去参团 - + - - - 一键开团 - 佣金￥{{filters.toFix(prom_act.tz_yyhjg,2)}} - 团长免单 - - - ￥{{ filters.toFix(prom_act.price,2)}} - 一键开团 + + + 一键开团 + + 佣金 + ￥ + {{filters.toFix(prom_act.tz_yyhjg,2)}} + + 团长免单 + + + ￥{{ filters.toFix(prom_act.price,2)}} + 一键开团 - - + ￥{{filters.toFix(prom_act.yf_price,2)}} 支付定金 - 即将开始 已抢光 活动已经结束 - 您还未支付 - 查看支付详情 - 支付尾款 + + 您还未支付 + + + 查看支付详情 + + + 支付尾款 + - - - - - - - - - - {{filters.toFix(sele_g[card_field],2)}} - - - {{filters.toFix(sele_g.shop_price,2)}} - - - 单独购买 - - 立即兑换 - 积分不足 - - - - 立即兑换 - 积分不足 - - - - - + + + + + + + {{filters.toFix(sele_g[card_field],2)}} + + {{filters.toFix(sele_g.shop_price,2)}} + + 单独购买 + + + 立即兑换 + + 积分不足 + + + + 立即兑换 + + + 积分不足 + + + + - - + - - - +