diff --git a/pages/customerChooseTemplate/customerChooseTemplate.js b/pages/customerChooseTemplate/customerChooseTemplate.js index 1b893d9..dc40d4a 100644 --- a/pages/customerChooseTemplate/customerChooseTemplate.js +++ b/pages/customerChooseTemplate/customerChooseTemplate.js @@ -80,6 +80,57 @@ Page({ }, + // 点击了收藏按钮 + storegeBtnClick: function () { + var that = this; + + // 获取收藏的存货信息 + var oldCollectionArr = this.data.collectionArray; + var waitStorageArr = this.data.checkBoxArray; + var goodsNameArrayAll = this.data.goodsArray; + + if (waitStorageArr.length <= 0) { + wx.showToast({ + title: '请选择存货', + }) + return; + } else { + + // 对比所选存货是否已经存在于收藏中 有:不重复添加 返回未添加过的数组 + for (var i = 0; i < waitStorageArr.length; i++) { + for (var j = 0; j < oldCollectionArr.length; j++) { + if (Number(waitStorageArr[i]) == Number(oldCollectionArr[j].SaleGoods_ID)) { + waitStorageArr.splice(i, 1); + } + } + } + + // 对比原有数组和选中的数组 存在,将数组包含的其他值也取出加载 + let choseCheck = []; + for (var i = 0; i < that.data.goodsArray.length; i++) { + for (var j = 0; j < waitStorageArr.length; j++) { + if (Number(goodsNameArrayAll[i].SaleGoods_ID) == waitStorageArr[j]) { + choseCheck.push(goodsNameArrayAll[i]) + } + } + } + oldCollectionArr = oldCollectionArr.concat(choseCheck); + that.setData({ + collectionArray: oldCollectionArr, + currentTab: 1, + }); + wx.setStorage({ + key: "storageGoodsKey", + data: oldCollectionArr, + success: function () { + wx.showToast({ + title: '收藏成功', + }); + }, + }) + } + }, + /** * 滑动切换tab */ diff --git a/pages/customerChooseTemplate/customerChooseTemplate.wxml b/pages/customerChooseTemplate/customerChooseTemplate.wxml index 8d4b0eb..eff34e8 100644 --- a/pages/customerChooseTemplate/customerChooseTemplate.wxml +++ b/pages/customerChooseTemplate/customerChooseTemplate.wxml @@ -1,8 +1,15 @@ - + + + 全部 + 收藏夹 + + + + 收藏 diff --git a/pages/customerChooseTemplate/customerChooseTemplate.wxss b/pages/customerChooseTemplate/customerChooseTemplate.wxss index 5afea93..850a3d8 100644 --- a/pages/customerChooseTemplate/customerChooseTemplate.wxss +++ b/pages/customerChooseTemplate/customerChooseTemplate.wxss @@ -35,7 +35,6 @@ page{ margin-top: 3px; display: block; width: 100%; - height: 100%; overflow: hidden; } @@ -75,6 +74,7 @@ page{ } .scroll-views { + position: absolute; margin-top: 25rpx; height: calc(100% - 97px); width: 100%; diff --git a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml index ac3a0d2..604498d 100644 --- a/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml +++ b/pages/goodaNameChooseTemplate/goodaNameChooseTemplate.wxml @@ -5,7 +5,7 @@ 收藏夹 - + diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js index 5fb0010..ff5156a 100644 --- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js +++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.js @@ -166,6 +166,39 @@ Page({ } }, + // 存货明细页面更多按钮 + moreBtnClick:function(e){ + var that = this; + var itemList = [ + "审核", + "撤销" + ]; + wx.showActionSheet({ + itemList: itemList, + itemColor: "#2689f8", + success: function (res) { + // res.cancel 用户是不是点击了取消按钮 + // res.tapIndex 数组元素的序号,从0开始 + that.moreBtnClickedDetailInfo(itemList[res.tapIndex]); + } + }) + }, + + // 更多 -> 撤销 -> 审核 + moreBtnClickedDetailInfo:function (item){ + if (item == "审核"){ + wx.showModal({ + title: "提示", + content: "++++" + item + "++++", + }) + } else { + wx.showModal({ + title: "提示", + content: "++++" + item + "++++", + }) + } + }, + /** * 滑动切换tab */ diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml index acd606b..26e0c4c 100644 --- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml +++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxml @@ -118,13 +118,35 @@ - + + + + + + + 更多 + + + + + + + + 保存 + + + + + + + + diff --git a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss index 4c4a6f9..58c9b54 100644 --- a/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss +++ b/pages/specialOrderApplication/creatNewSpecialOrder/creatNewSpecialOrder.wxss @@ -226,6 +226,14 @@ page { height: 100%; } +.bottomGroupView{ + margin-top: -10rpx; + width: 100%; + height: 80px; + display: flex; + flex-direction: row; +} + .btnTextView { position: absolute; width: 100%;