From e6e18b1e4962d56e7612c25a58e0200b82f54cf4 Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Fri, 1 Mar 2024 17:37:18 +0800 Subject: [PATCH] 11 --- pages/billing/changeGoods1.vue | 1 + pages/index/addHangOrder.vue | 4 +- pages/index/downStearmList.vue | 3 - pages/index/index.vue | 21 +++++-- pages/index/orderDetail.vue | 7 ++- pages/index/shareStyle.vue | 1 + pages/index/waitStorageDetail.vue | 1 + pages/inventory/addGoods.vue | 85 ++++++++++++----------------- pages/inventory/addinventory.vue | 1 + pages/inventory/changeGoods1.vue | 1 + pages/inventory/gategory.vue | 49 ++++++++++++++--- pages/inventory/goodsList1.vue | 9 +-- pages/inventory/inventory.vue | 1 + pages/inventory/inventoryDetail.vue | 1 + pages/login/login.vue | 9 ++- pages/other/customDetail.vue | 1 + pages/other/logistics.vue | 2 +- pages/rebate/rebate.vue | 26 ++++++--- pages/staff/staff.vue | 30 +++++++--- 19 files changed, 158 insertions(+), 95 deletions(-) diff --git a/pages/billing/changeGoods1.vue b/pages/billing/changeGoods1.vue index 7e9a1b3..4f8fb7d 100644 --- a/pages/billing/changeGoods1.vue +++ b/pages/billing/changeGoods1.vue @@ -916,6 +916,7 @@ .noPic{ width: 150rpx; height: 150rpx; + border-radius: 10px; // margin: 30rpx 0 0 30rpx; text-align: center; line-height: 140rpx; diff --git a/pages/index/addHangOrder.vue b/pages/index/addHangOrder.vue index aeca93a..9052f7a 100644 --- a/pages/index/addHangOrder.vue +++ b/pages/index/addHangOrder.vue @@ -705,7 +705,7 @@ obj.productPicture = item.saleDetailDTOList[i].productPicture+'?time='+new Date().getTime() obj.productSn = item.saleDetailDTOList[i].productSn obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice - obj.saleId = item.saleDetailDTOList[i].saleId + obj.saleId = item.id obj.remark = item.remark obj.xsyId = item.createBy obj.createByName = item.createByName @@ -715,6 +715,7 @@ let obj = {} obj.num = 0 obj.price = 0 + obj.saleId = item.id obj.remark = item.remark obj.xsyId = item.createBy obj.createByName = item.createByName @@ -1097,6 +1098,7 @@ border-radius: 50%; } .noPic{ + border-radius: 10px; width: 150rpx; height: 150rpx; // margin: 30rpx 0 0 30rpx; diff --git a/pages/index/downStearmList.vue b/pages/index/downStearmList.vue index de4dde0..6f0d7ec 100644 --- a/pages/index/downStearmList.vue +++ b/pages/index/downStearmList.vue @@ -240,9 +240,6 @@ }, } }, - created() { - uni.hideHomeButton() //左上角HOME按钮 - }, onLoad(options) { this.khid = options.khid; this.getShareList(options.khid); diff --git a/pages/index/index.vue b/pages/index/index.vue index 4da8d1a..ece1395 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -141,8 +141,8 @@ - 宣传图 - X + 宣传图 + X @@ -231,13 +231,22 @@ this.type = uni.getStorageSync('type') this.getSaleInfo() }, - onLoad() { - this.$refs.publicizepopup.open('center') + onLoad() { + if(uni.getStorageSync('publicize')){ + + }else{ + uni.setStorageSync("publicize", true) + this.$refs.publicizepopup.open('center') + } + }, onTabItemTap(e){ this.getSaleInfo() }, - methods: { + methods: { + popClose(){ + this.$refs.publicizepopup.close() + }, getSaleInfo() { this.tui.request("/app/sale/getShopAll", "POST", { pageVo: { @@ -508,7 +517,7 @@ background: rgba(255, 255, 255, 0) !important; } .publicize-content{ - width: 400rpx; + width: 460rpx; height: 600rpx; } diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue index 34930cd..f96db4c 100644 --- a/pages/index/orderDetail.vue +++ b/pages/index/orderDetail.vue @@ -582,6 +582,10 @@ if (this.radio1 == 0 && this.changeA == '') { this.tui.toast("请输入取货地址") return + } + if(this.$refs.returnClose.val == ''){ + this.tui.toast("金额不能为空") + return } this.list.forEach(item1 => { item1.stockLogList1.forEach((item2, index) => { @@ -987,7 +991,8 @@ border-right: 1px solid #eee; } - .noPic { + .noPic { + border-radius: 10px; width: 140rpx; height: 140rpx; margin: 30rpx 0 0 30rpx; diff --git a/pages/index/shareStyle.vue b/pages/index/shareStyle.vue index 994169b..43a34db 100644 --- a/pages/index/shareStyle.vue +++ b/pages/index/shareStyle.vue @@ -650,6 +650,7 @@ color: #fff; } .noPic{ + border-radius: 10px; width: 150rpx; height: 150rpx; text-align: center; diff --git a/pages/index/waitStorageDetail.vue b/pages/index/waitStorageDetail.vue index 81f7bda..a8e44bc 100644 --- a/pages/index/waitStorageDetail.vue +++ b/pages/index/waitStorageDetail.vue @@ -529,6 +529,7 @@ width: 500rpx; } .noPic{ + border-radius: 10px; width: 140rpx; height: 140rpx; text-align: center; diff --git a/pages/inventory/addGoods.vue b/pages/inventory/addGoods.vue index 7033d09..2d92287 100644 --- a/pages/inventory/addGoods.vue +++ b/pages/inventory/addGoods.vue @@ -22,27 +22,25 @@ - - - - - - - - - - + - - + + + + + + + + { - if (res.code == 200) { - this.categoryList = res.result.map(item => { - return { - value: item.id, - text: item.categoryName - } - }) - } else { - this.tui.toast(res.message) - } - }) }, methods: { // 删除图片 @@ -240,16 +232,11 @@ }) }, - //跳转子分类页 + //跳转分类页 goGategoryLow() { - if(this.categoryId){ - uni.navigateTo({ - url: '/pages/inventory/gategoryLow?id='+this.categoryId - }) - }else{ - this.tui.toast('请选择分类后再查看商品规格！') - } - + uni.navigateTo({ + url: '/pages/inventory/gategory' + }) } } } diff --git a/pages/inventory/addinventory.vue b/pages/inventory/addinventory.vue index 176f41d..35d9348 100644 --- a/pages/inventory/addinventory.vue +++ b/pages/inventory/addinventory.vue @@ -997,6 +997,7 @@ } } .noPic{ + border-radius: 10px; width: 150rpx; height: 150rpx; // margin: 30rpx 0 0 30rpx; diff --git a/pages/inventory/changeGoods1.vue b/pages/inventory/changeGoods1.vue index 31a9f2b..8d258b2 100644 --- a/pages/inventory/changeGoods1.vue +++ b/pages/inventory/changeGoods1.vue @@ -906,6 +906,7 @@ background: rgba(0, 0, 0, 0.1); } .noPic{ + border-radius: 10px; width: 150rpx; height: 150rpx; // margin: 30rpx 0 0 30rpx; diff --git a/pages/inventory/gategory.vue b/pages/inventory/gategory.vue index 6f2e9d3..77ad4e5 100644 --- a/pages/inventory/gategory.vue +++ b/pages/inventory/gategory.vue @@ -5,10 +5,12 @@
    -
  • - {{item.categoryName}} - - +
  • + + {{item.categoryName}} + + +
@@ -49,7 +51,7 @@ computed: { }, - onLoad() { + onShow() { this.getGategoryList() }, methods: { @@ -83,6 +85,35 @@ } }, + //查询分类下有没有库存 + getTypeToNum(){ + // this.tui.request("/app/stock/getlistByAttributeList", "post", { + // categoryId: , + // }, false, true).then((res) => { + // if (res.code == 200) { + // this.getGategoryList() + // uni.showToast({ + // title:"添加成功", + // icon: 'none' + // }) + // } else { + // uni.showToast({ + // title:"添加失败", + // icon: 'none' + // }) + // } + + // }).catch((res) => {}) + }, + //点击选择列表，带参数 返回上一页 + clickList(item) { + let pages = getCurrentPages(); // 获取当前页面栈的实例，以数组形式按栈的顺序给出，第一个元素为首页，最后一个元素为当前页面。 + let prevPage = pages[pages.length - 2]; //上一页页面实例 + prevPage.$vm.typeItem = item + uni.navigateBack({ + delta: 1 + }) + }, //分类编辑（新增，修改） dialogInputConfirm(e) { switch (this.typeModel) { @@ -266,19 +297,19 @@ margin: 0 auto; } .bj-btn{ - width: 95rpx; + width: 120rpx; height: 60rpx; font-size: 26rpx; background: red; - margin: 0; - margin: 20rpx; + margin: 20rpx 0; float: left; padding: 0; line-height: 60rpx; } .name{ - width: 70%; + width: 75%; float: left; + display: flex; } .data-v-5ff5d986{ diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue index 322dff2..a5a990a 100644 --- a/pages/inventory/goodsList1.vue +++ b/pages/inventory/goodsList1.vue @@ -465,8 +465,7 @@ this.gysName = JSON.parse(JSON.stringify(this.gysName)) this.wlName = JSON.parse(JSON.stringify(this.wlName)) this.kdyName = JSON.parse(JSON.stringify(this.kdyName)) - this.lbgName = JSON.parse(JSON.stringify(this.lbgName)) - console.log(this.wlName) + this.lbgName = JSON.parse(JSON.stringify(this.lbgName)) if (uni.getStorageSync('carList1') != '') { this.carList.clear() this.carList1 = JSON.parse(uni.getStorageSync('carList1')) @@ -1094,7 +1093,7 @@ } let obj = { orderByWorker: this.lbgName.workerId, - oldSaleId: this.saleId, + oldSaleId: this.saleId || '', sale: { // relPrice:, alreadyEarn: this.priceOk, //已付金额 @@ -1136,7 +1135,8 @@ }) this.saleDetailList = purchaseDetails; obj.saleDetailList = purchaseDetails; - let url = '' + let url = '' + console.log(this.saleId) if (this.saleId != '') { url = '/app/sale/shareToBuyNew' } else { @@ -1806,6 +1806,7 @@ } } .noPic{ + border-radius: 10px; width: 140rpx; height: 140rpx; margin: 30rpx 0 0 30rpx; diff --git a/pages/inventory/inventory.vue b/pages/inventory/inventory.vue index e1d80f2..dfb1541 100644 --- a/pages/inventory/inventory.vue +++ b/pages/inventory/inventory.vue @@ -422,6 +422,7 @@ border-radius: 10px; } .noPic{ + border-radius: 10px; width: 140rpx; height: 140rpx; // margin: 30rpx 0 0 30rpx; diff --git a/pages/inventory/inventoryDetail.vue b/pages/inventory/inventoryDetail.vue index 4871784..051802f 100644 --- a/pages/inventory/inventoryDetail.vue +++ b/pages/inventory/inventoryDetail.vue @@ -272,6 +272,7 @@ overflow: hidden; } .noPic{ + border-radius: 10px; width: 150rpx; height: 150rpx; // margin: 30rpx 0 0 30rpx; diff --git a/pages/login/login.vue b/pages/login/login.vue index 15ac9df..f0ff6fe 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -108,7 +108,9 @@ }, computed: mapState(['type']), onLoad() { - this.getCaptchaImg(); + this.getCaptchaImg(); + // this.username = uni.getStorageSync('username') + // this.password = uni.getStorageSync('password') }, methods: { ...mapMutations(['login']), @@ -154,7 +156,7 @@ } loginUrl='/auth/smsLogin' } - if(this.wayValue == 1){ //15630117759 19950123kang + if(this.wayValue == 1){ //物流公司 this.tui.request("/app/logitics/login", "POST", { username: this.username, password: this.password, @@ -225,7 +227,8 @@ deviceId:res1.deviceId }, false, true).then((res) => { if (res.code == 200) { - uni.setStorageSync('shopName',item.shopName) + // uni.setStorageSync('username',this.username) + // uni.setStorageSync('password',this.password) uni.setStorageSync('type',item.type) uni.setStorageSync('shopId',item.shopId) setTimeout(() => { diff --git a/pages/other/customDetail.vue b/pages/other/customDetail.vue index b6c18ea..dffa353 100644 --- a/pages/other/customDetail.vue +++ b/pages/other/customDetail.vue @@ -554,6 +554,7 @@ border-right: 1px solid #eee; } .noPic{ + border-radius: 10px; width: 140rpx; height: 140rpx; margin: 30rpx 0 0 30rpx; diff --git a/pages/other/logistics.vue b/pages/other/logistics.vue index e0c00ab..9bf8ad4 100644 --- a/pages/other/logistics.vue +++ b/pages/other/logistics.vue @@ -111,7 +111,7 @@ id:this.id }, header: { - 'content-type': 'application/json', + 'content-type': 'application/x-www-form-urlencoded', 'appWLToken': this.tui.getToken() }, method: 'POST', //'GET','POST' diff --git a/pages/rebate/rebate.vue b/pages/rebate/rebate.vue index f21c7f2..58ab811 100644 --- a/pages/rebate/rebate.vue +++ b/pages/rebate/rebate.vue @@ -6,13 +6,13 @@ 累计返佣(元) - {{allrebateAmount}} + {{allrebateAmount?allrebateAmount:'0'}} 返佣余额(元) - {{rebateAmount}} + {{rebateAmount?rebateAmount:'0'}} @@ -23,19 +23,19 @@ + activeColor="#5fd9ee">
  • - 物流返佣：{{item.companyName}} - 返佣金额：{{item.companyRebateAmount}}元 + 物流返佣：{{item.companyName?item.companyName:'暂无'}} + 返佣金额：{{item.companyRebateAmount?item.companyRebateAmount:'暂无'}} - 拉包返佣：{{item.workerName}} - 返佣金额：{{item.workerRebateAmount}}元 + 拉包返佣：{{item.workerName?item.workerName:'暂无'}} + 返佣金额：{{item.workerRebateAmount?item.workerRebateAmount:'暂无'}}
    • @@ -47,10 +47,10 @@ 返佣状态：{{item.isOpen == 1?'已返佣':'未返佣'}} - 返佣金额：{{item.shopRebateAmount}}元 + 返佣金额：{{item.shopRebateAmount?item.shopRebateAmount:'暂无'}} - 邀请店铺名：{{item.registerShopName}} + 邀请店铺名：{{item.registerShopName?item.registerShopName:'暂无'}} @@ -128,6 +128,14 @@ this.status = 'nomore'; if (res.code == 200) { this.commissionList = res.result.records + for(let i=0;i - @@ -57,17 +57,25 @@ return { staffList: [], avatar: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png', - size: 30, + size: 30, + type:'' }; + }, + onLoad() { + this.type = uni.getStorageSync('type') }, onShow() { this.getStaffList() }, methods: { onDotClick(type,item) { - uni.navigateTo({ - url: `/pages/staff/addStaff/addStaff?type=${type}&item=`+ JSON.stringify(item) - }) + if(this.type == 0){ + uni.navigateTo({ + url: `/pages/staff/addStaff/addStaff?type=${type}&item=`+ JSON.stringify(item) + }) + }else{ + this.tui.toast("暂无添加权限") + } }, getStaffList() { this.tui.request('/app/common/user/findAllUserByShopId', 'get', {}, false, false, true).then((res) => { @@ -86,9 +94,13 @@ }) }, goGuide(){ - uni.navigateTo({ - url: '/pages/staff/signRule/signRule' - }) + if(this.type == 0){ + uni.navigateTo({ + url: '/pages/staff/signRule/signRule' + }) + }else{ + this.tui.toast("暂无编辑权限") + } } } }