更新

packageIntegral/productList/index.vue

@@ -16,16 +16,22 @@
 		</view>
 
 		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
-			<view class="item" v-for="item,index in dataList" :key="index" @click="toDetails(item)">
+			<view class="item" v-for="item,index in dataList" :key="index">
-				<view class="header">用户手机：{{item.customerPhone}}<text
+				<view class="header" @click="toDetails(item)">
-						:style="{color:statusEnum[item.orderStatus].color}">{{statusEnum[item.orderStatus].value}}</text>
+					<view class="identifying" :style="{background:identifying[1].background,opacity:identifying[1].opacity}">已上架</view>
 				</view>
-				<view class="introduce">
+				<view class="introduce" @click="toDetails(item)">
 					<image :src="item.oderDetailImg"></image>
 					<view>{{item.productName}}</view>
-					<view>规格：1</view>
+					<view>规格：默认</view>
 					<view>￥{{item.marketPrice}} X{{item.orderNum}}</view>
-					<view>共{{item.orderNum}}件商品已支付积分：{{item.payIntegral}}</view>
+					<view>库存：{{item.orderNum}}</view>
+				</view>
+				<view class="examine" :style="{background:statusEnum[1].color}" >{{statusEnum[1].value}}</view>
+				<view class="footer">
+					<view class="button" @click="orderDelete">删除</view>
+					<view class="button">编辑</view>
+					<view class="button" @click="upDownFrame">上架</view>
 				</view>
 			</view>
 			<view style="height: 30rpx; background: #fff;"></view>
@@ -34,6 +40,27 @@
 			<image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/yunsite-empty.png"></image>
 			<view>还没有订单哦~</view>
 		</view>
+		
+		<uni-popup ref="delete">
+			<view class="determine-frame">
+				<view class="title">是否删除该商品？</view>
+				<view class="buttons">
+					<view @click="$refs.delete.close()">取消</view>
+					<view>确认</view>
+				</view>
+			</view>
+		</uni-popup>
+		
+		<uni-popup ref="popup">
+			<view class="determine-frame">
+				<view class="title">是否上架/下架该商品？</view>
+				<view class="buttons">
+					<view @click="$refs.popup.close()">取消</view>
+					<view>确认</view>
+				</view>
+			</view>
+		</uni-popup>
+		
 	</view>
 </template>
 
@@ -59,7 +86,7 @@
 						customerphone: ''
 					},
 				},
-				dataList: [{},{}],
+				dataList: [{},{},{}],
 				optionsList: [{
 					text: '全部',
 					count: 0,
@@ -77,22 +104,30 @@
 					count: 0,
 					value: ''
 				}],
-				statusEnum: {
+				identifying:{
-					'-1': {
-						color: 'red',
-						value: "已取消"
-					},
 					0: {
-						color: 'blue',
+						background: '#F83D3D',
-						value: "订单新建"
+						opacity: 1,
+						value: "已上架"
 					},
 					1: {
-						color: 'orange',
+						background: '#F83D3D',
-						value: "待核销"
+						opacity: 0.5,
+						value: "待上架"
+					}
+				},
+				statusEnum: {
+					'-1': {
+						color: '#F83D3D',
+						value: "已驳回"
+					},
+					1: {
+						color: '#8D38FC',
+						value: "待审核"
 					},
 					2: {
-						color: 'blue',
+						color: '#FCB438',
-						value: "已核销"
+						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;
+					// padding: 26rpx 23rpx 0;
-					height: 80rpx;
+					height: 60rpx;
 					// line-height: 83rpx;
 					width: 100%;
 					font-size: 30rpx;
 					color: #666;
-					border-bottom: 1rpx solid #D7D7D7;
+					border-top: 1rpx solid #D7D7D7;
 
-					>text {
+					.identifying{
-						float: right;
+						width: 120rpx;
-						// color: #F83D3D;
+						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;
+							font-size: 28rpx;
-							color: #333;
+							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;
+					height: 58rpx;
-					line-height: 78rpx;
+					line-height: 58rpx;
 					padding: 0 34rpx 40rpx;
 					font-size: 32rpx;
 					color: #000;
@@ -289,16 +342,71 @@
 					.button {
 						position: absolute;
 						top: 0;
-						right: 40rpx;
+						width: 128rpx;
-						width: 198rpx;
+						height: 58rpx;
-						height: 78rpx;
+						line-height: 58rpx;
-						line-height: 78rpx;
 						text-align: center;
 						font-size: 28rpx;
-						color: #FFF;
+						color: #999;
-						background: #FE0606;
+						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;
+					}
 				}
 			}
 		}

packageIntegral/takeGoods/index.vue

@@ -47,7 +47,7 @@
 			<view class="determine-frame">
 				<view class="title">是否立即提货</view>
 				<view class="buttons">
-					<view>取消</view>
+					<view @click="$refs.popup.close()">取消</view>
 					<view>确认</view>
 				</view>
 			</view>
@@ -78,6 +78,7 @@
 			determine() {
 				this.$refs.popup.open('center')
 			},
+		
 			confirm() {
 				this.controlWindows.code = false
 			}