Merge pull request 'tem-fixed' (#1) from tem-fixed into dev-1021

Reviewed-on: #1

pages/OrderDetails/OrderDetails.vue

@@ -17,9 +17,9 @@
 			<view class="goods-list">
 				<view class="list" v-for="(item,index) in orderInfo" :key="index">
 					<view class="sellerInfo">
-						<view class="title">{{orderDetails.seller?orderDetails.seller.nickname:'-'}}</view>
+						<view class="title">{{tool!='buy'?(orderDetails.buyer?orderDetails.buyer.nickname:'-'):(orderDetails.seller?orderDetails.seller.nickname:'-')}}</view>
 						<view class="content" style="margin-left:20rpx;">
-							<text>{{orderDetails.seller?orderDetails.seller.mobile:'-'}}</text>
+							<text>{{tool!='buy'?(orderDetails.buyer?orderDetails.buyer.mobile:'-'):(orderDetails.seller?orderDetails.seller.mobile:'-')}}</text>
 						</view>
 					</view>
 					<view class="orderNum">
@@ -98,11 +98,11 @@
 			<image :src="orderDetails.pay_voucher" v-if="orderDetails.pay_voucher" @click="lookPic([orderDetails.pay_voucher])" mode="aspectFit"></image>
 			<text v-else>暂无付款凭证</text>
 		</view>
-		<view class="btnContainer"  v-if="orderDetails.status==0">
+		<!-- <view class="btnContainer"  v-if="orderDetails.status==0">
 			<view class="btnItem" @click="uploadPay">上传凭证</view>
 			<view class="btnItem" @click="goPayHandle">去支付</view>
 			<view class="btnItem" @click="confirmPay">支付确认</view>
-		</view>
+		</view> -->
 		<u-upload
 			:previewFullImage="false" 
 			@afterRead="afterRead"
@@ -123,6 +123,7 @@
 			return {
 				orderInfo:[],
 				warehouse:[],
+				tool:'',
 				orderDetails:{}
 			};
 		},
@@ -236,6 +237,7 @@
 			}
 		},
 		onLoad(option) {
+			this.tool=option.tool
 			this.id = option.id;
 			this.getOrderDetails()
 		}

pages/fenxiao/fansOrder.vue

@@ -29,7 +29,8 @@
 						<text>订单号：{{item.order_sn}}</text>
 					</view>
 					<view class="status">
-						<text>{{item.status==0?'付款确认':item.status==1?'收款确认':item.status==3?'投诉':''}}</text>
+						<text>{{getstatusLabel(item.status)}}</text>
+						<!-- <text>{{item.status==0?'付款确认':item.status==1?'收款确认':item.status==3?'投诉':''}}</text> -->
 					</view>
 				</view>
 				<view class="goods-list">
@@ -86,6 +87,16 @@
 				limit:10,
 				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:'已上架'},
+				]
 			};
 		},
 		methods:{
@@ -110,6 +121,16 @@
 					}
 				})
 			},
+			getstatusLabel(val){
+				let arr = this.statusList.filter(item=>{
+					return item.id==val;
+				})
+				if(arr.length>0){
+					return arr[0].name
+				}else{
+					return '-'
+				}
+			},
 		
 		},
 		onReachBottom() {

pages/qianggou/productDetails.vue

@@ -43,7 +43,7 @@
       </view>
     </view>
     <!-- 底部 -->
-    <view class="page-footer" @click="buyHandle" v-if="isDeadLine">
+    <view :class="ends?'page-footer isend':'page-footer'" @click="!ends?buyHandle():''" v-if="isDeadLine">
        立即抢购
     </view>
 	<view class="page-footer"  v-if="!isDeadLine">
@@ -79,6 +79,7 @@ export default {
 	  isDeadLine:true,
 	  finalSecondNum:"",
 	  timer:null,
+	  ends:false
     };
   },
 	onLoad(params) {
@@ -160,9 +161,20 @@ export default {
 			    url: res.data.image
 			  })
 			  let timeNum = res.data.warehouse.start
+			  let endTimeNum = res.data.warehouse.end
 			  // let timeNum = "16:02";
 			  let time = this.timestampToTime()+timeNum+":00"
+			  let endTime = this.timestampToTime()+endTimeNum+":00"
 			  let finishTime = this.dateDifference(new Date(time).getTime())
+			  let endFinishTime = this.dateDifference(new Date(endTime).getTime())
+			  console.log("endFinishTime=============》"+endFinishTime)
+			  if(endFinishTime>0){
+				  this.ends = false
+				  console.log(false)
+			  }else{
+				  console.log(true)
+				  this.ends = true
+			  }
 			  if(finishTime>0){
 			  	this.timer = setInterval(()=>{
 			  		let secondNum = finishTime--;
@@ -359,5 +371,11 @@ export default {
 			}
 		}
 	}
-}
+	}
+.isend{
+		//opacity:0.4;
+		background:#eaeaea !important;
+		color: gray;
+		
+	}
 </style>

pages/shoukuan/shoukuan.scss

@@ -121,11 +121,29 @@
 }
 .zfb{
 	text-align: center;
-	image{
+	.hasPic{
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		justify-items: center;
+		image{
+			width:200rpx;
+			height:200rpx;
+			margin:100rpx auto 40rpx auto;
+		}
+		.lookBig{
+			background: rgb(35, 96, 48);
+			color:#fff;
+			padding:10rpx 15rpx;
+			border-radius: 10rpx;
+		}
+	}
+	.emptyPic{
 		width:200rpx;
 		height:200rpx;
 		margin:100rpx auto;
 	}
+	
 	.mesInfo{
 		margin-top: 26rpx;
 		font-size: 26rpx;

pages/shoukuan/shoukuan.vue

@@ -55,8 +55,13 @@
 					name="1"
 					
 				></u-upload>
-				<image :src="zfburl" v-if="zfburl" mode="aspectFit" @click="uploadZfb"></image>
-				<image src="/static/image/up_img.png" v-else mode="aspectFit" @click="uploadZfb"></image>
+				
+				<view class="hasPic" v-if="zfburl" >
+					<image :src="zfburl" mode="aspectFit" @click="uploadZfb"></image>
+					<view class="lookBig" @click="lookPic([zfburl])">查看大图</view>
+					
+				</view>
+				<image src="/static/image/up_img.png" class="emptyPic" v-else mode="aspectFit" @click="uploadZfb"></image>
 				
 			</view>
 			<view class="zfb" v-show="activeIndex==3">
@@ -70,8 +75,15 @@
 					name="2"
 					
 				></u-upload>
-				<image :src="wxurl" mode="aspectFit" v-if="wxurl"  @click="uploadwx"></image>
-				<image src="/static/image/up_img.png" mode="aspectFit" v-else  @click="uploadwx"></image>
+				<view class="hasPic" v-if="wxurl" >
+					<image :src="wxurl" mode="aspectFit" @click="uploadwx"></image>
+					<view class="lookBig" @click="lookPic([wxurl])">查看大图</view>
+					
+				</view>
+				<image src="/static/image/up_img.png" class="emptyPic" v-else mode="aspectFit" @click="uploadwx"></image>
+				
+				<!-- <image :src="wxurl" mode="aspectFit" v-if="wxurl"  @click="uploadwx"></image> -->
+				<!-- <image src="/static/image/up_img.png" mode="aspectFit" v-else  @click="uploadwx"></image> -->
 				<view class="mesInfo">
 					微信收款码，上传后将无法修改，请认真上传。
 				</view>
@@ -165,6 +177,15 @@
 			this.getText()
 		},
 		methods:{
+			lookPic(item){
+				uni.previewImage({
+					// current: imgArr[indez],
+					urls: item,
+					success: (res) => {
+						
+					}
+				});
+			},
 			close() {
 				this.show = false
 			},

pages/warehouse/buy.vue

@@ -126,6 +126,7 @@
 				orderObj:{},
 				selectedIndex:-1,
 				tiquSelected:{},
+				tool:'',
 				statusList:[
 					{id:0,name:'待支付'},
 					{id:1,name:'待确认'},
@@ -266,7 +267,7 @@
 			 */
 			onOrderList(item){
 				uni.navigateTo({
-					url: '/pages/OrderDetails/OrderDetails?id='+item.id,
+					url: '/pages/OrderDetails/OrderDetails?id='+item.id+'&tool=buy',
 				})
 			},
 			cancelOrderHandle(item){

pages/warehouse/sell.vue

@@ -90,6 +90,7 @@
 				status:null,
 				tableData:[],
 				total:0,
+				tool:'',
 				statusList:[
 					{id:0,name:'待支付'},
 					{id:1,name:'待确认'},
@@ -147,9 +148,9 @@
 			/**
 			 * 订单列表点击
 			 */
-			onOrderList(){
+			onOrderList(item){
 				uni.navigateTo({
-					url: '/pages/OrderDetails/OrderDetails?id='+item.id,
+					url: '/pages/OrderDetails/OrderDetails?id='+item.id+'&tool=sell',
 				})
 			},
 			confirmPay(item,status){

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.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.4cb2825c.js></script><script src=/static/js/index.f351af91.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.a1e8ef11.js></script><script src=/static/js/index.33b549b2.js></script></body></html>