diff --git a/packageIntegral/productList/index.vue b/packageIntegral/productList/index.vue index c27b988..c598dcb 100644 --- a/packageIntegral/productList/index.vue +++ b/packageIntegral/productList/index.vue @@ -16,16 +16,22 @@ - - 用户手机:{{item.customerPhone}}{{statusEnum[item.orderStatus].value}} + + + 已上架 - + {{item.productName}} - 规格:1 + 规格:默认 ¥{{item.marketPrice}} X{{item.orderNum}} - 共{{item.orderNum}}件商品已支付积分:{{item.payIntegral}} + 库存:{{item.orderNum}} + + {{statusEnum[1].value}} + + 删除 + 编辑 + 上架 @@ -34,6 +40,27 @@ 还没有订单哦~ + + + + 是否删除该商品? + + 取消 + 确认 + + + + + + + 是否上架/下架该商品? + + 取消 + 确认 + + + + @@ -59,7 +86,7 @@ customerphone: '' }, }, - dataList: [{},{}], + dataList: [{},{},{}], optionsList: [{ text: '全部', count: 0, @@ -77,22 +104,30 @@ count: 0, value: '' }], + identifying:{ + 0: { + background: '#F83D3D', + opacity: 1, + value: "已上架" + }, + 1: { + background: '#F83D3D', + opacity: 0.5, + value: "待上架" + } + }, statusEnum: { '-1': { - color: 'red', - value: "已取消" - }, - 0: { - color: 'blue', - value: "订单新建" + color: '#F83D3D', + value: "已驳回" }, 1: { - color: 'orange', - value: "待核销" + color: '#8D38FC', + value: "待审核" }, 2: { - color: 'blue', - value: "已核销" + color: '#FCB438', + value: "已审核" }, } } @@ -146,7 +181,10 @@ this.paramter.currentPage += 1 this.getByPageCloudMini() }, - determine() { + orderDelete(){ + this.$refs.delete.open('center') + }, + upDownFrame() { this.$refs.popup.open('center') }, confirm() { @@ -223,17 +261,22 @@ } .header { - padding: 26rpx 23rpx 0; - height: 80rpx; + // padding: 26rpx 23rpx 0; + height: 60rpx; // line-height: 83rpx; width: 100%; font-size: 30rpx; color: #666; - border-bottom: 1rpx solid #D7D7D7; + border-top: 1rpx solid #D7D7D7; - >text { - float: right; - // color: #F83D3D; + .identifying{ + width: 120rpx; + height: 60rpx; + line-height: 60rpx; + // background-color: #F83D3D; + color: #FFF; + text-align: center; + border-bottom-right-radius: 30rpx; } } @@ -271,16 +314,26 @@ &:nth-of-type(4) { margin-top: 11rpx; - font-size: 26rpx; - color: #333; + font-size: 28rpx; + color: #F83D3D; } } } + .examine{ + width: 120rpx; + height: 45rpx; + color: #FFF; + text-align: center; + line-height: 45rpx; + position: absolute; + right: 50rpx; + top: 180rpx; + } >.footer { position: relative; - margin-top: 40rpx; - line-height: 78rpx; + height: 58rpx; + line-height: 58rpx; padding: 0 34rpx 40rpx; font-size: 32rpx; color: #000; @@ -289,16 +342,71 @@ .button { position: absolute; top: 0; - right: 40rpx; - width: 198rpx; - height: 78rpx; - line-height: 78rpx; + width: 128rpx; + height: 58rpx; + line-height: 58rpx; text-align: center; font-size: 28rpx; - color: #FFF; - background: #FE0606; + color: #999; + background: #FFF; + border: 1px solid #999; border-radius: 10rpx; } + + >.button{ + &:nth-of-type(1){ + right: 360rpx; + } + &:nth-of-type(2){ + right: 200rpx; + } + &:nth-of-type(3){ + right: 40rpx; + } + + } + } + } + } + + .determine-frame { + padding-top: 85rpx; + width: 681rpx; + height: 340rpx; + background: #FFFFFF; + border-radius: 15rpx; + + >.title { + text-align: center; + font-size: 38rpx; + color: #000; + + } + + >.buttons { + + display: flex; + justify-content: space-evenly; + margin-top: 80rpx; + + >view { + width: 250rpx; + height: 76rpx; + text-align: center; + line-height: 76rpx; + border-radius: 10rpx; + font-size: 28rpx; + + &:nth-of-type(1) { + background: #FFFFFF; + border: 1rpx solid #B6B6B6; + color: #333; + } + + &:nth-of-type(2) { + background: #FE0505; + color: #fff; + } } } } diff --git a/packageIntegral/takeGoods/index.vue b/packageIntegral/takeGoods/index.vue index 871f00d..f4d7e50 100644 --- a/packageIntegral/takeGoods/index.vue +++ b/packageIntegral/takeGoods/index.vue @@ -47,7 +47,7 @@ 是否立即提货 - 取消 + 取消 确认 @@ -78,6 +78,7 @@ determine() { this.$refs.popup.open('center') }, + confirm() { this.controlWindows.code = false }