wangfukang 3 years ago
parent
commit
affc0944b7
  1. 2
      pages/billing/addUser.vue
  2. 6
      pages/billing/changeGoods1.vue
  3. 3
      pages/index/addHangOrder.vue
  4. 1
      pages/index/index.vue
  5. 16
      pages/index/orderDetail.vue
  6. 7
      pages/index/shareStyle.vue
  7. 1
      pages/index/shopInfo.vue
  8. 11
      pages/index/uparrears.vue
  9. 11
      pages/index/waitStorage.vue
  10. 23
      pages/inventory/goodsList1.vue
  11. 4
      pages/login/login.vue
  12. 2
      pages/other/custom.vue

2
pages/billing/addUser.vue

@ -202,7 +202,7 @@
icon: 'none' icon: 'none'
}) })
let pages = let pages =
getCurrentPages(); // 获取当前页面栈的实例,以数组形式按栈的顺序给出,第一个元素为首页,最后一个元素为当前页面。 getCurrentPages();
let prevPage = pages[pages.length - 2]; //上一页页面实例 let prevPage = pages[pages.length - 2]; //上一页页面实例
prevPage.$vm.popleType = 'gysName' prevPage.$vm.popleType = 'gysName'
uni.navigateBack({ uni.navigateBack({

6
pages/billing/changeGoods1.vue

@ -418,9 +418,6 @@
if (item.delFlag == 0) { if (item.delFlag == 0) {
title = '请将商品上架后再操作!' title = '请将商品上架后再操作!'
} }
// else if(item.delFlag == 1){
// title = '请将商品入库后再操作!'
// }
uni.showToast({ uni.showToast({
title: title, title: title,
icon: 'none' icon: 'none'
@ -438,9 +435,6 @@
this.categoryId = this.indexList[index].id this.categoryId = this.indexList[index].id
this.getShareList(this.indexList[index].id) this.getShareList(this.indexList[index].id)
}, },
// inputDialogToggle() {
// this.$refs.inputDialog.open()
// },
//临时改价 //临时改价
changePrice(val) { changePrice(val) {
this.goodsDetail.price = this.temporaryList[0].price = val this.goodsDetail.price = this.temporaryList[0].price = val

3
pages/index/addHangOrder.vue

@ -625,9 +625,6 @@
let obj = {} let obj = {}
obj.saleDetailQueryDTO = item.saleDetailDTOList[i].stockLogList1 obj.saleDetailQueryDTO = item.saleDetailDTOList[i].stockLogList1
obj.num = 0 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.id = item.saleDetailDTOList[i].productId
obj.price = 0 obj.price = 0
obj.lsprice = item.saleDetailDTOList[i].price obj.lsprice = item.saleDetailDTOList[i].price

1
pages/index/index.vue

@ -129,7 +129,6 @@
chartData: {}, chartData: {},
shopName:'', shopName:'',
opts: { opts: {
// color: ["#1890FF", "#73C0DE"],
padding: [15, 10, 0, 15], padding: [15, 10, 0, 15],
dataLabel: true, dataLabel: true,
dataPointShape: false, dataPointShape: false,

16
pages/index/orderDetail.vue

@ -265,19 +265,6 @@
kkPrinter kkPrinter
}, },
computed: { 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() { changeAmount() {
if (this.isReturn) { if (this.isReturn) {
let sum = 0 let sum = 0
@ -493,7 +480,6 @@
}) })
}) })
// this.sales.noEarn = this.sales.newNoEarn;
this.sales.saleId = this.sales.id; this.sales.saleId = this.sales.id;
this.sales.totalAomount = this.returnAmount; this.sales.totalAomount = this.returnAmount;
this.tui.request("/app/return/rtg", "post", { this.tui.request("/app/return/rtg", "post", {
@ -657,13 +643,11 @@
.tui-size-24 { .tui-size-24 {
font-size: 24rpx; font-size: 24rpx;
// line-height: 24rpx;
} }
.tui-price-large { .tui-price-large {
font-size: 32rpx; font-size: 32rpx;
// line-height: 30rpx;
.lineText { .lineText {
text-decoration: line-through; text-decoration: line-through;
font-size: 12px; font-size: 12px;

7
pages/index/shareStyle.vue

@ -200,9 +200,6 @@
if (item.delFlag == 0) { if (item.delFlag == 0) {
title = '请将商品上架后再操作!' title = '请将商品上架后再操作!'
} }
// else if(item.delFlag == 1){
// title = '请将商品入库后再操作!'
// }
uni.showToast({ uni.showToast({
title: title, title: title,
icon: 'none' icon: 'none'
@ -219,7 +216,6 @@
} }
this.categoryId = this.shopList[index].id this.categoryId = this.shopList[index].id
this.goodsList = this.shopList[index] this.goodsList = this.shopList[index]
// this.getShareList(this.indexList[index].id)
}, },
//选中商品 //选中商品
checkboxChange(item) { checkboxChange(item) {
@ -255,13 +251,11 @@
let data = {} let data = {}
if (e == 'all') { if (e == 'all') {
data = { data = {
// shopId: ,
shareType: '1', //1 分享全部 shareType: '1', //1 分享全部
} }
} else { } else {
data = { data = {
// shopId: '002',
shareType: '2', //2 分享勾选商品 shareType: '2', //2 分享勾选商品
shareProductId: this.carList //勾选商品的id string类型 中间通过”,“连接 shareProductId: this.carList //勾选商品的id string类型 中间通过”,“连接
} }
@ -274,7 +268,6 @@
this.tui.toast(res.message) this.tui.toast(res.message)
} }
}).catch((res) => {}) }).catch((res) => {})
// this.info++
}, },
//点击的是转发朋友圈还是微信好友 //点击的是转发朋友圈还是微信好友
select(index) { select(index) {

1
pages/index/shopInfo.vue

@ -69,7 +69,6 @@ export default {
setTimeout(() => { setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/index' url: '/pages/index/index'
// url: '/pages/index/index'
}) })
}, 200) }, 200)
}else { }else {

11
pages/index/uparrears.vue

@ -37,18 +37,9 @@
return { return {
supplierId: '', supplierId: '',
consigneeName: '', consigneeName: '',
list: [], list: [],
// status: 'loadmore',
// page: 1,
// totalPages: 0,
} }
}, },
// onReachBottom() {
// if (this.page >= this.totalPages) return;
// this.status = 'loading';
// this.page = ++this.page;
// this.getList();
// },
onShow(){ onShow(){
this.getList() this.getList()
}, },

11
pages/index/waitStorage.vue

@ -53,17 +53,8 @@
endDate: '', endDate: '',
type: '', type: '',
page: 1, 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(){ onShow(){
this.getList() this.getList()
}, },

23
pages/inventory/goodsList1.vue

@ -699,10 +699,6 @@
//整体选择是批发价还是零售价 //整体选择是批发价还是零售价
priceChange(e) { priceChange(e) {
let that = this; let that = this;
// if(this.carList.size == 0){
// this.tui.toast("请先选择商品")
// return
// }
this.priceType = e this.priceType = e
this.carList.forEach(function(value, key) { this.carList.forEach(function(value, key) {
that.index = value.productId that.index = value.productId
@ -1040,13 +1036,6 @@
this.tui.toast('请选择配送公司!') this.tui.toast('请选择配送公司!')
return return
} }
// if(this.radioType1 == 0){
// if(this.lbgName == ''){
// this.tui.toast('请选择配送人员!')
// return
// }
// }
} else if (this.radioType == 3) { } else if (this.radioType == 3) {
if (this.pbAddress == '') { if (this.pbAddress == '') {
this.tui.toast('请输入拼包地址!') this.tui.toast('请输入拼包地址!')
@ -1484,12 +1473,6 @@
height: 80rpx !important; height: 80rpx !important;
} }
// .shop-name {
// .uni-icons {
// color: #088FEB !important;
// }
// }
.shop-collapse { .shop-collapse {
display: flex; display: flex;
height: 80rpx; height: 80rpx;
@ -1500,7 +1483,6 @@
.shop-collapse text { .shop-collapse text {
width: 40%; width: 40%;
text-align: center; text-align: center;
// padding-right: 40rpx;
border-right: 1px solid #eee; border-right: 1px solid #eee;
} }
@ -1726,11 +1708,6 @@
border-radius: 70rpx; border-radius: 70rpx;
} }
} }
// .uni-select__input-text{
// text-align: center !important;
// padding-left: 80rpx;
// }
.uni-data-checklist { .uni-data-checklist {
.checklist-box { .checklist-box {
margin-left: 100rpx !important; margin-left: 100rpx !important;

4
pages/login/login.vue

@ -274,10 +274,6 @@
}, },
//切换登录方式 //切换登录方式
switchLoginWay() { switchLoginWay() {
// this.username = ''
// this.password = ''
// this.code = ''
// this.phone = ''
this.loginWay = !this.loginWay this.loginWay = !this.loginWay
}, },
protocol() { protocol() {

2
pages/other/custom.vue

@ -56,8 +56,6 @@
name: '', name: '',
shopList: [], shopList: [],
list: ['采购单', '退货单'], list: ['采购单', '退货单'],
// 或者如下,也可以配置keyName参数修改对象键名
// list: [{name: '未付款'}, {name: '待评价'}, {name: '已付款'}],
current: 0, current: 0,
userId:'', userId:'',
shopId: '', shopId: '',

Loading…
Cancel
Save