diff --git a/pages/index/index.vue b/pages/index/index.vue index ca5d2ab..e37f0d8 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,25 +2,29 @@ - + - - 待退货 - {{waitCount.waitReturnCount > 99 ? '99+' :waitCount.waitReturnCount}} - - - 待配货 - {{waitCount.waitAddProductCount > 99 ? '99+' :waitCount.waitAddProductCount}} - - - 挂单 - - - 推款 - - - 待入库 - {{waitCount.waitPurchaseCount > 99 ? '99+' :waitCount.waitPurchaseCount}} + + 待退货 + {{waitCount.waitReturnCount > 99 ? '99+' :waitCount.waitReturnCount}} + + + 待配货 + {{waitCount.waitAddProductCount > 99 ? '99+' :waitCount.waitAddProductCount}} + + + 挂单 + + + 推款 + + + 待入库 + {{waitCount.waitPurchaseCount > 99 ? '99+' :waitCount.waitPurchaseCount}} @@ -64,11 +68,14 @@
  • - - {{ item.createByName == null ?'暂无':item.createByName}} - {{ item.createTime }} - - 订单状态：{{item.status == 0 ?'待抢单' :item.status == 1 ?'待取货' :item.status == 3 ?'待送达' :item.status == 4 ?'已完成' :item.status == 5 ?'下游客户待退货' :item.status == 00 ?'退货待抢单' :item.status == 01 ?'退货待取货' :item.status == 03 ?'退货待送达' :item.status == 04 ?'待确认退货' :item.status == 6 ?'待配货' :'挂单'}} + {{ item.createByName == null ?'暂无':item.createByName}} - + {{ item.createTime }} + + + 订单状态：{{item.status == 0 ?'待抢单' :item.status == 1 ?'待取货' :item.status == 3 ?'待送达' :item.status == 4 ?'已完成' :item.status == 5 ?'下游客户待退货' :item.status == 00 ?'退货待抢单' :item.status == 01 ?'退货待取货' :item.status == 03 ?'退货待送达' :item.status == 04 ?'待确认退货' :item.status == 6 ?'待配货' :'挂单'}}
    • @@ -90,20 +97,24 @@ arrow-direction="left"> - + + - - - + + + + - - - + @@ -121,13 +132,13 @@ export default { computed: mapState(['shopName', 'userId', 'shopIndex', 'avatar']), data() { - return { - type:'', + return { + type: '', src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg', inventoryList: [], settingShow: false, - chartData: {}, - shopName:'', + chartData: {}, + shopName: '', opts: { padding: [15, 10, 0, 15], dataLabel: true, @@ -163,50 +174,50 @@ } }, }, - shopInfo: {}, - waitCount:{} + shopInfo: {}, + waitCount: {} } }, components: { cmdNavBar - }, - filters: { - spliceMsg(val) { - val == null || undefined ? '暂无' : val - return val; - } - }, - onShow(){ - this.shopName = uni.getStorageSync('shopName') - this.type = uni.getStorageSync('type') + }, + filters: { + spliceMsg(val) { + val == null || undefined ? '暂无' : val + return val; + } + }, + onShow() { + this.shopName = uni.getStorageSync('shopName') + this.type = uni.getStorageSync('type') }, onLoad() { this.getSaleInfo() this.getServerData(); - this.getOrderInfoList(); + this.getOrderInfoList(); this.getWaitCount() }, - methods: { - getWaitCount(){ - this.tui.request("/app/sale/getWaitCount", "POST", {}, false, false).then((res) => { - if(res.code == 200){ - this.waitCount = res.result - }else{ - this.tui.toast(res.message) - } - - }) + methods: { + getWaitCount() { + this.tui.request("/app/sale/getWaitCount", "POST", {}, false, false).then((res) => { + if (res.code == 200) { + this.waitCount = res.result + } else { + this.tui.toast(res.message) + } + + }) }, getSaleInfo() { this.tui.request("/app/sale/getShopAll", "POST", { shopId: this.shopIndex - }, false, false).then((res) => { - if(res.code == 200){ - this.shopInfo = res.result - }else{ - this.tui.toast(res.message) + }, false, false).then((res) => { + if (res.code == 200) { + this.shopInfo = res.result + } else { + this.tui.toast(res.message) } - + }) }, goToInfo() { @@ -231,70 +242,72 @@ }, }, false, false).then((res) => { this.status = 'nomore'; - if (res.code == 200) { - for (var i=0;i<= res.result.records.length;i++) { - res.result.records[i].img='/static/images/dingdan/dd'+i+'.png' - this.inventoryList = res.result.records + if (res.code == 200) { + for (var i = 0; i <= res.result.records.length; i++) { + res.result.records[i].img = '/static/images/dingdan/dd' + i + '.png' + this.inventoryList = res.result.records } - this.totalPages = res.result.pages - + this.totalPages = res.result.pages + } else { this.tui.toast(res.message) } }).catch((res) => {}) }, - getServerData() { - - this.tui.request("/app/sale/getShopWeek", "POST", {}, false, false).then((res) => { - if(res.code == 200){ - let dataList = { - categories: this.getWeek(), - series: [{ - name: "七天营收统计", - linearColor: [ - [0,"#1890FF"], - [0.33,"#00B5FF"], - [0.66,"#00D1ED"], - [1,"#00E6BB"], - [1,"#90F489"] - ], - setShadow: [3,8,10,"#00E6BB"], - data: res.result - }] - }; - this.chartData = JSON.parse(JSON.stringify(dataList)); - }else{ - this.tui.toast(res.message) - } + getServerData() { + + this.tui.request("/app/sale/getShopWeek", "POST", {}, false, false).then((res) => { + if (res.code == 200) { + let dataList = { + categories: this.getWeek(), + series: [{ + name: "七天营收统计", + linearColor: [ + [0, "#1890FF"], + [0.33, "#00B5FF"], + [0.66, "#00D1ED"], + [1, "#00E6BB"], + [1, "#90F489"] + ], + setShadow: [3, 8, 10, "#00E6BB"], + data: res.result + }] + }; + this.chartData = JSON.parse(JSON.stringify(dataList)); + } else { + this.tui.toast(res.message) + } + }) + }, + getWeek() { + let days = 7 + let week = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"]; + let dateList = Array.from({ + length: days + }, (v, i) => i).map(day => { + let date = new Date(); + date.setDate(date.getDate() - day); + return week[date.getDay()] + }) + return dateList.reverse() + }, + //跳转订单详情 + gotoDetail(id) { + uni.navigateTo({ + url: '/pages/index/orderDetail?id=' + id + }) + }, + //首页头部四个按钮的菜单 + goSonPage(url) { + if (url == '/pages/index/waitStorage?inStorageStatus=0') { + if (this.type != 0) { + this.tui.toast('暂无查看权限！') + return; + } + } + uni.navigateTo({ + url: url }) - }, - getWeek() { - let days = 7 - let week = ["周日","周一","周二","周三","周四","周五","周六"]; - let dateList = Array.from({length:days},(v,i)=> i).map(day =>{ - let date = new Date(); - date.setDate(date.getDate() - day); - return week[date.getDay()] - }) - return dateList.reverse() - }, - //跳转订单详情 - gotoDetail(id) { - uni.navigateTo({ - url: '/pages/index/orderDetail?id=' + id - }) - }, - //首页头部四个按钮的菜单 - goSonPage(url){ - if(url=='/pages/index/waitStorage?inStorageStatus=0'){ - if(this.type!= 0){ - this.tui.toast('暂无查看权限！') - return; - } - } - uni.navigateTo({ - url: url - }) } } } @@ -369,8 +382,8 @@ .dianpu-img { width: 60upx; height: 60upx; - float: left; - margin-left:20upx; + float: left; + margin-left: 20upx; } .dianpu-text { @@ -378,31 +391,36 @@ height: 60upx; line-height: 65upx; padding-left: 20upx; - } - .title-btn-sbtn{ - flex: 1; - line-height: 80upx; - text-align: center; - position: relative; - } - .title-btn-sbtn:hover{ - color: #B22222; - } - .title-btn-sbtn:nth-child(1),.title-btn-sbtn:nth-child(2){ - border-right: 1px solid #fff; - } - .red-circle{ - position: absolute; - top: 0; - right: 0; - width: 40rpx; - height: 40rpx; - line-height: 40rpx; - font-size: 22rpx; - border-radius: 50%; - background: red; - color: #fff; - text-align: center; + } + + .title-btn-sbtn { + flex: 1; + line-height: 80upx; + text-align: center; + position: relative; + } + + .title-btn-sbtn:hover { + color: #B22222; + } + + .title-btn-sbtn:nth-child(1), + .title-btn-sbtn:nth-child(2) { + border-right: 1px solid #fff; + } + + .red-circle { + position: absolute; + top: 0; + right: 0; + width: 40rpx; + height: 40rpx; + line-height: 40rpx; + font-size: 22rpx; + border-radius: 50%; + background: red; + color: #fff; + text-align: center; } \ No newline at end of file diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue index 55bbf71..5f6803c 100644 --- a/pages/inventory/goodsList1.vue +++ b/pages/inventory/goodsList1.vue @@ -1,6 +1,9 @@