1

pages/qianggou/productList.vue

@@ -22,19 +22,25 @@
 		<view class="recommend-info">
 			
 			<view class="goods-list">
-				<view class="list" v-for="(item,index) in goodsList" @click="onSkip(item)" :key="index">
+				<view class="list" v-for="(item,index) in goodsList"  :key="index">
-					<view class="pictrue">
+					<view class="" @click="onSkip(item)">
-						<image :src="item.image" mode="heightFix"></image>
+						<view class="pictrue">
-					</view>
+							<image :src="item.image" mode="heightFix"></image>
-					<view class="title-tag">
+						</view>
-						{{item.name}}
+						<view class="title-tag">
-					</view>
+							{{item.name}}
-					<view class="price-info">
+						</view>
-						<view class="user-price">
+						<view class="price-info">
-							<text class="min">￥</text>
+							<view class="user-price">
-							<text class="max">{{item.price}}</text>
+								<text class="min">￥</text>
+								<text class="max">{{item.price}}</text>
+							</view>
+							
 						</view>
-						
+					</view>
+					<view class="shouqing" v-if="item.status=='hidden'">
+						<image src="../../static/image/shouqin.png" mode="widthFix"></image>
+						<text>已售罄</text>
 					</view>
 				</view>
 			</view>
@@ -52,6 +58,7 @@ export default {
 			pagesList: [],
 			page:1,
 			limit:10,
+			warehouse_id:null,
 		}
 	},
 	
@@ -63,7 +70,7 @@ export default {
 		},
 		getGoodsList(){
 			this.pagesList=[]
-			getGoodsList({page:this.page,limit:10}).then(res=>{
+			getGoodsList({page:this.page,limit:10,warehouse_id:this.warehouse_id}).then(res=>{
 				this.goodsList = res.data.data;
 				this.total = res.data.total;
 				
@@ -88,8 +95,10 @@ export default {
 	onReady() {
 		
 	},
-	onLoad() {
+	onLoad(option) {
+		this.warehouse_id = option.id
 		this.getGoodsList()
+		
 	},
 	onPageScroll(e){
 		
@@ -139,6 +148,7 @@ export default {
 		flex-wrap: wrap;
 		justify-content: space-between;
 		padding: 0 30rpx;
+		
 		.list{
 			width: 49%;
 			height: 480rpx;
@@ -146,6 +156,28 @@ export default {
 			background-color: #FFFFFF;
 			border-radius: 10rpx;
 			overflow: hidden;
+			position: relative;
+			.shouqing{
+				height:100%;
+				width:100%;
+				background-color: rgba(0,0,0,0.7);
+				position: absolute;
+				top:0;
+				left:0;
+				z-index:9;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex-direction: column;
+				image{
+					width:45%;
+					height:auto;
+				}
+				text{
+					color:#ffffff;
+					font-size:25rpx;
+				}
+			}
 			.pictrue{
 				display: flex;
 				justify-content: center;

pages/qianggou/qianggou.vue

@@ -141,7 +141,7 @@ export default{
 					})
 				}else{
 					uni.navigateTo({
-						url:'/pages/qianggou/productList'
+						url:'/pages/qianggou/productList?id='+item.id
 					})
 				}
 			}else{

pages/warehouse/buy.vue

@@ -32,7 +32,8 @@
 							<text>订单号：{{item.order_sn}}</text>
 						</view>
 						<view class="status">
-							<text>{{item.status==0?'待支付':item.status==1?'待确认':item.status==2?'待委托':item.status==3?'已投诉':item.status==4?'待发货':item.status==5?'待收货':item.status==-1?'已取消':''}}</text>
+							<text>{{getstatusLabel(item.status)}}</text>
+							<!-- <text>{{item.status==0?'待支付':item.status==1?'待确认':item.status==2?'待委托':item.status==3?'已投诉':item.status==4?'待发货':item.status==5?'待收货':item.status==-1?'已取消':''}}</text> -->
 						</view>
 					</view>
 					<view class="goods-list">
@@ -70,6 +71,13 @@
 						</view>
 						
 					</view>
+					<view class="status-btn" v-if="item.status==4">
+						<view class="btnGroup">
+							<view class="btn" @click.native.stop="tixingHandle(item)">提醒发货</view>
+							
+						</view>
+						
+					</view>
 					
 				</view>
 			</view>
@@ -101,6 +109,7 @@
 </template>
 
 <script>
+	// 0待支付1待确认,2待委托,3已投诉，4待发货，5待收货-1已取消6已完成7已上架
 	import {getToken} from '@/common/auth.js'
 	import {getBuyerOrderList,cancelOrder,orderPay} from '@/common/api.js'
 	export default {
@@ -116,7 +125,17 @@
 				tiqushow:false,
 				orderObj:{},
 				selectedIndex:-1,
-				tiquSelected:{}
+				tiquSelected:{},
+				statusList:[
+					{id:0,name:'待支付'},
+					{id:1,name:'待确认'},
+					{id:2,name:'待委托'},
+					{id:3,name:'已投诉'},
+					{id:4,name:'待发货'},
+					{id:5,name:'待收货'},
+					{id:-1,name:'已取消'},
+					{id:7,name:'已上架'},
+				]
 			};
 		},
 		onLoad(params) {
@@ -124,6 +143,21 @@
 			this.getList()
 		},
 		methods:{
+			tixingHandle(){
+				this.$refs.uToast.show({
+					message:'提醒发货成功'
+				})
+			},
+			getstatusLabel(val){
+				let arr = this.statusList.filter(item=>{
+					return item.id==val;
+				})
+				if(arr.length>0){
+					return arr[0].name
+				}else{
+					return '-'
+				}
+			},
 			goPay(item){
 				console.log(item)
 				uni.navigateTo({
@@ -197,7 +231,6 @@
 				})
 			},
 			confirmPay(item){
-				console.log(item,"0000")
 				if(!item.pay_voucher){
 					this.$refs.uToast.show({
 						message:'请上传支付凭证'
@@ -221,7 +254,11 @@
 			 * 订单tab点击
 			 */
 			onOrderTab(type){
-				this.status = type
+				if(type==4){
+					this.status="4,5"
+				}else{
+					this.status = type;
+				}
 				this.getList()
 			},
 			/**

pages/warehouse/sell.vue

@@ -32,7 +32,7 @@
 							<text>订单号：{{item.order_sn}}</text>
 						</view>
 						<view class="status">
-							<text>{{item.status==0?'待支付':item.status==1?'待确认':item.status==2?'已完成':item.status==3?'已投诉':item.status==4?'待发货':item.status==5?'待收货':item.status==-1?'已取消':''}}</text>
+							<text>{{getstatusLabel(item.status)}}</text>
 						</view>
 					</view>
 					<view class="goods-list">
@@ -90,6 +90,16 @@
 				status:null,
 				tableData:[],
 				total:0,
+				statusList:[
+					{id:0,name:'待支付'},
+					{id:1,name:'待确认'},
+					{id:2,name:'待委托'},
+					{id:3,name:'已投诉'},
+					{id:4,name:'待发货'},
+					{id:5,name:'待收货'},
+					{id:-1,name:'已取消'},
+					{id:7,name:'已上架'},
+				]
 			};
 		},
 		onLoad(params) {
@@ -97,6 +107,16 @@
 			this.getList()
 		},
 		methods:{
+			getstatusLabel(val){
+				let arr = this.statusList.filter(item=>{
+					return item.id==val;
+				})
+				if(arr.length>0){
+					return arr[0].name
+				}else{
+					return '-'
+				}
+			},
 			getList(val){
 				let params={
 					page:this.page,
@@ -116,7 +136,12 @@
 			 * 订单tab点击
 			 */
 			onOrderTab(type){
-				this.status = type;
+				if(type==4){
+					this.status="4,5"
+				}else{
+					this.status = type;
+				}
+				
 				this.getList()
 			},
 			/**

pages/warehouse/weituo.vue

@@ -159,6 +159,9 @@
 									title:"支付成功",
 									icon:'none'
 								});
+								uni.redirectTo({
+									url:"/pages/warehouse/buy"
+								})
 							},
 							cancel: function(res) {
 								   console.log(res)

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c321b385.js></script><script src=/static/js/index.71a66657.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.fd0c9014.js></script><script src=/static/js/index.08e28b8c.js></script></body></html>