diff --git a/pages/billing/addUser.vue b/pages/billing/addUser.vue index 2ef7313..1702e7e 100644 --- a/pages/billing/addUser.vue +++ b/pages/billing/addUser.vue @@ -202,7 +202,7 @@ icon: 'none' }) let pages = - getCurrentPages(); // 获取当前页面栈的实例,以数组形式按栈的顺序给出,第一个元素为首页,最后一个元素为当前页面。 + getCurrentPages(); let prevPage = pages[pages.length - 2]; //上一页页面实例 prevPage.$vm.popleType = 'gysName' uni.navigateBack({ diff --git a/pages/billing/changeGoods1.vue b/pages/billing/changeGoods1.vue index aca6b9f..cd3eb1e 100644 --- a/pages/billing/changeGoods1.vue +++ b/pages/billing/changeGoods1.vue @@ -418,9 +418,6 @@ if (item.delFlag == 0) { title = '请将商品上架后再操作!' } - // else if(item.delFlag == 1){ - // title = '请将商品入库后再操作!' - // } uni.showToast({ title: title, icon: 'none' @@ -438,9 +435,6 @@ this.categoryId = this.indexList[index].id this.getShareList(this.indexList[index].id) }, - // inputDialogToggle() { - // this.$refs.inputDialog.open() - // }, //临时改价 changePrice(val) { this.goodsDetail.price = this.temporaryList[0].price = val diff --git a/pages/index/addHangOrder.vue b/pages/index/addHangOrder.vue index fe9ab01..bc2ad25 100644 --- a/pages/index/addHangOrder.vue +++ b/pages/index/addHangOrder.vue @@ -625,9 +625,6 @@ let obj = {} obj.saleDetailQueryDTO = item.saleDetailDTOList[i].stockLogList1 obj.num = 0 - // for(let m = 0; m < obj.saleDetailQueryDTO.length; m++){ - // obj.num += obj.saleDetailQueryDTO[m].productCount - // } obj.id = item.saleDetailDTOList[i].productId obj.price = 0 obj.lsprice = item.saleDetailDTOList[i].price diff --git a/pages/index/index.vue b/pages/index/index.vue index e72b446..ca5d2ab 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -129,7 +129,6 @@ chartData: {}, shopName:'', opts: { - // color: ["#1890FF", "#73C0DE"], padding: [15, 10, 0, 15], dataLabel: true, dataPointShape: false, diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue index b7aea80..07954c2 100644 --- a/pages/index/orderDetail.vue +++ b/pages/index/orderDetail.vue @@ -265,19 +265,6 @@ kkPrinter }, computed: { - // returnAmount() { - // // if (this.changeAmount) { - // // if (this.sales.noEarn >= this.changeAmount) { - // // this.sales.newNoEarn = (this.sales.noEarn - this.changeAmount).toFixed(2); - // // return 0 - // // } else { - // // this.sales.newNoEarn = 0 - // // return (this.changeAmount - this.sales.noEarn).toFixed(2) - // // } - // // } - // console.log() - // return this.changeAmount - // }, changeAmount() { if (this.isReturn) { let sum = 0 @@ -493,7 +480,6 @@ }) }) - // this.sales.noEarn = this.sales.newNoEarn; this.sales.saleId = this.sales.id; this.sales.totalAomount = this.returnAmount; this.tui.request("/app/return/rtg", "post", { @@ -657,13 +643,11 @@ .tui-size-24 { font-size: 24rpx; - // line-height: 24rpx; } .tui-price-large { font-size: 32rpx; - // line-height: 30rpx; .lineText { text-decoration: line-through; font-size: 12px; diff --git a/pages/index/shareStyle.vue b/pages/index/shareStyle.vue index cdd2650..94640be 100644 --- a/pages/index/shareStyle.vue +++ b/pages/index/shareStyle.vue @@ -200,9 +200,6 @@ if (item.delFlag == 0) { title = '请将商品上架后再操作!' } - // else if(item.delFlag == 1){ - // title = '请将商品入库后再操作!' - // } uni.showToast({ title: title, icon: 'none' @@ -219,7 +216,6 @@ } this.categoryId = this.shopList[index].id this.goodsList = this.shopList[index] - // this.getShareList(this.indexList[index].id) }, //选中商品 checkboxChange(item) { @@ -255,13 +251,11 @@ let data = {} if (e == 'all') { data = { - // shopId: , shareType: '1', //1 分享全部 } } else { data = { - // shopId: '002', shareType: '2', //2 分享勾选商品 shareProductId: this.carList //勾选商品的id string类型 中间通过”,“连接 } @@ -274,7 +268,6 @@ this.tui.toast(res.message) } }).catch((res) => {}) - // this.info++ }, //点击的是转发朋友圈还是微信好友 select(index) { diff --git a/pages/index/shopInfo.vue b/pages/index/shopInfo.vue index 51db61d..0c09dda 100644 --- a/pages/index/shopInfo.vue +++ b/pages/index/shopInfo.vue @@ -69,7 +69,6 @@ export default { setTimeout(() => { uni.reLaunch({ url: '/pages/index/index' - // url: '/pages/index/index' }) }, 200) }else { diff --git a/pages/index/uparrears.vue b/pages/index/uparrears.vue index 3820b0f..8126ec4 100644 --- a/pages/index/uparrears.vue +++ b/pages/index/uparrears.vue @@ -37,18 +37,9 @@ return { supplierId: '', consigneeName: '', - list: [], - // status: 'loadmore', - // page: 1, - // totalPages: 0, + list: [], } }, - // onReachBottom() { - // if (this.page >= this.totalPages) return; - // this.status = 'loading'; - // this.page = ++this.page; - // this.getList(); - // }, onShow(){ this.getList() }, diff --git a/pages/index/waitStorage.vue b/pages/index/waitStorage.vue index 07a55c2..d3495f6 100644 --- a/pages/index/waitStorage.vue +++ b/pages/index/waitStorage.vue @@ -53,17 +53,8 @@ endDate: '', type: '', page: 1, - // status: 'loadmore', - // page: 1, - // totalPages: 0, } - }, - // onReachBottom() { - // if (this.page >= this.totalPages) return; - // this.status = 'loading'; - // this.page = ++this.page; - // this.getList(); - // }, + }, onShow(){ this.getList() }, diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue index 480c6c9..4ae08d5 100644 --- a/pages/inventory/goodsList1.vue +++ b/pages/inventory/goodsList1.vue @@ -699,10 +699,6 @@ //整体选择是批发价还是零售价 priceChange(e) { let that = this; - // if(this.carList.size == 0){ - // this.tui.toast("请先选择商品") - // return - // } this.priceType = e this.carList.forEach(function(value, key) { that.index = value.productId @@ -1040,13 +1036,6 @@ this.tui.toast('请选择配送公司!') return } - // if(this.radioType1 == 0){ - // if(this.lbgName == ''){ - // this.tui.toast('请选择配送人员!') - // return - // } - - // } } else if (this.radioType == 3) { if (this.pbAddress == '') { this.tui.toast('请输入拼包地址!') @@ -1484,12 +1473,6 @@ height: 80rpx !important; } - // .shop-name { - // .uni-icons { - // color: #088FEB !important; - // } - // } - .shop-collapse { display: flex; height: 80rpx; @@ -1500,7 +1483,6 @@ .shop-collapse text { width: 40%; text-align: center; - // padding-right: 40rpx; border-right: 1px solid #eee; } @@ -1726,11 +1708,6 @@ border-radius: 70rpx; } } - - // .uni-select__input-text{ - // text-align: center !important; - // padding-left: 80rpx; - // } .uni-data-checklist { .checklist-box { margin-left: 100rpx !important; diff --git a/pages/login/login.vue b/pages/login/login.vue index d23d761..793e7d4 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -274,10 +274,6 @@ }, //切换登录方式 switchLoginWay() { - // this.username = '' - // this.password = '' - // this.code = '' - // this.phone = '' this.loginWay = !this.loginWay }, protocol() { diff --git a/pages/other/custom.vue b/pages/other/custom.vue index 29cabdd..3fbbd9c 100644 --- a/pages/other/custom.vue +++ b/pages/other/custom.vue @@ -56,8 +56,6 @@ name: '', shopList: [], list: ['采购单', '退货单'], - // 或者如下,也可以配置keyName参数修改对象键名 - // list: [{name: '未付款'}, {name: '待评价'}, {name: '已付款'}], current: 0, userId:'', shopId: '',