修改bug提交最终版本

pages/changan/index.vue

@@ -39,8 +39,9 @@
 			</view>
 			<tm-poup v-model="show_1" :position="pos" class="tcc">
 				<view style="position: relative !important;" v-if="chukudata.length !=0">
-					<view style="height: 10px;"></view>
-					<tm-swiper @change="qiehuanLb" :current="current" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
+					<image @click="quxiao()" class="close" src="/static/img/close.png" mode="widthFix"></image>
+					<view style="clear: both;"></view>
+					<tm-swiper class="lunbohhh" @change="qiehuanLb" :current="current" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
 					<view class="text-white text-align-center mt-15">{{chukudata[current].brand}}{{chukudata[current].color}}{{chukudata[current].goods_name}}</view>
 					<view class="text-white text-align-center mt-10 text-size-s">{{chukudata[current].description}}</view>
 					<image class="guayi" :src="chukudata[current].ygimage" mode="widthFix"></image>
@@ -49,10 +50,28 @@
 						<image class="aniOn deng" src="/static/img/101.png" mode="widthFix"></image>
 						<text style="vertical-align: middle;">指示灯已亮，请取出衣柜</text>
 					</view>
-					<view class="anniu">
+					<view class="daojishi">
+						<text>倒计时：</text>
+						<tm-countdown format="HH时MM分数SS秒哈"  ref="testCountdown"  :time="2*60*60*1000">
+							<template 
+							v-slot:default=" { timeData } ">
+								<view class="flex-center">
+									<view v-for="(item,key) in timeData.data" :key="key" class="pa-10 primary  mr-10 round-2" :class="$tm.vx.state().tmVuetify.black?'bk':''">
+										{{item}}
+									</view>
+								</view>
+							</template> 
+						</tm-countdown>
+						<text>结束后若衣服仍未取出，出库将自动取消</text>
+					</view>
+					<!-- <view class="anniu">
+						<tm-button  theme="gray" size="n">关闭弹框</tm-button>
+						<tm-button @click="chuFun()" theme="primary" :round="24" block>取消出库</tm-button>
+					</view> -->
+					<!-- <view class="anniu">
 						<tm-button @click="quxiao()" theme="gray" size="n">关闭弹框</tm-button>
 						<tm-button @click="chuFun()" class="fr" theme="primary" size="n">取消出库</tm-button>
-					</view>
+					</view> -->
 				</view>
 			</tm-poup>
 			<!-- 弹出层消息 -->
@@ -85,7 +104,8 @@ export default {
 			pos:'center',
 			chukudata:[],
 			ids:[],
-			current:0
+			current:0,
+			qiu_id:''
 		};
 	},
 	onLoad() {
@@ -103,7 +123,7 @@ export default {
 			myRequest({
 				url: "/api/Goods/cancelDelivery",
 				method:'post',
-				data:{qiu_id:that.qiuid,id:that.chukudata[that.current].id}
+				data:{qiu_id:that.qiu_id,id:that.chukudata[that.current].id}
 			}).then(res => {
 				console.log(res.data)
 				if (res.data.code == 200) {
@@ -176,11 +196,23 @@ export default {
 			}).then(res => {
 				if (res.data.code == 200) {
 					that.show_1=true;
-					that.chukudata=res.data.data;
-					for(let i=0;i<res.data.data.length;i++){
-						that.list1.push(res.data.data[i].image)
-						that.qiu_id=res.data.data[0].qiu_id;
+					that.chukudata=res.data.data.goodInfo;
+					for(let i=0;i<res.data.data.goodInfo.length;i++){
+						that.list1.push(res.data.data.goodInfo[i].image)
+						
+					}
+					// 倒计时开始
+					var countdownstart=Date.parse(new Date(res.data.data[0].stock_time))/1000;
+					var countdownend=countdownstart+2*60*60;
+					var countdownnow=Date.parse(new Date())/1000
+					var daojishi=countdownend-countdownnow;
+					if(daojishi<0){
+						that.countdown=0;
+					}else{
+						that.countdown=daojishi*1000;
 					}
+					// 倒计时结束
+					that.qiu_id=res.data.data.qiu_id;
 					that.$refs.toast.show({model:'success',label:'出库成功'})
 				}else{
 					that.$refs.toast.show({model:'error',label:res.data.msg})
@@ -397,7 +429,7 @@ export default {
 	/deep/ .tcc .uni-swiper-slides{width: 100%;}
 	/deep/ .tcc uni-swiper{width: 100% !important;}
 	/deep/ .uni-swiper-slides{width: 160px !important;}
-	/deep/ .tcc uni-image{width: 160px !important;}
+	/deep/ .tcc .lunbohhh uni-image{width: 160px !important;}
 	.tcc .guayi{width: 70% !important;display: block;margin:0 auto;margin-top:15px !important;}
 	.tcc .deng{width:25px !important;height:25px !important;vertical-align: middle;margin-right:8px;}
 	.aniOn{
@@ -425,4 +457,6 @@ export default {
 	/deep/ .tcc .anniu .gray.bk{color: white !important;}
 	.tcc .anniu{width: 88%;margin: 0 auto;margin-top: 20px;}
 	/deep/ .hui{position: absolute;background: rgba(0,0,0,0.4);z-index: 1;top: 0;left: 0;width: 100%;height: 100%;}
+	/deep/ .close{width: 30px !important;height: 30px !important;float: right;right: 6px;}
+	.daojishi{width: 90%;margin: 15px auto;font-size: 14px;}
 </style>

pages/dapei/index.vue

@@ -66,10 +66,10 @@
 				</view>
 				<view style="clear: both;"></view>
 				<tm-empty v-if="quanbuList.length ==0" label="暂无数据" color="white" icon="icon-paperplane-fill"></tm-empty>
-				<!-- <view style="clear: both;" class="more ma-30 pt-40" @click="gengmore()">
+				<view v-if="total>quanbuList.length" style="clear: both;" class="more ma-40 pt-40" @click="gengmore()">
 					<image src="/static/img/30.png" mode="widthFix"></image>
 					<text class="text-size-s">下拉加载更多~</text>
-				</view> -->
+				</view>
 			</tm-sheet>
 			<tm-button :round="24" class="sao" block @click="zidingyi()">自定义搭配</tm-button>
 		</div>
@@ -96,7 +96,8 @@ export default {
 			alltouList:[],
 			tianqiList:[],
 			page:1,
-			pagesize:2,
+			total:0,
+			pagesize:10,
 			city:'南京'
 		};
 	},
@@ -104,6 +105,7 @@ export default {
 		
 	},
 	onShow(){
+		this.page=1;
 		this.getFl();
 		this.touFun();
 		this.getCity()
@@ -170,8 +172,8 @@ export default {
 			this.touFun();
 		},
 		fenlei(e){
-			var id=this.listflall[e].id;
-			this.getKxuan(id)
+			this.page=1;
+			this.getKxuan()
 		},
 		touFun(){
 			var that=this;
@@ -231,23 +233,33 @@ export default {
 							that.listfl.push(res.data.data[i].category_name)
 						}
 						that.listflall=res.data.data;
-						that.getKxuan(that.listflall[that.activeIndex1].id);
+						that.getKxuan();
 					}
 				}else{
 					that.listfl=[];
 				}
 			})
 		},
-		getKxuan(id){
+		gengmore() {
+			this.page=this.page+1;
+			console.log(111)
+			this.getKxuan();
+		},
+		getKxuan(){
 			var that=this;
 			myRequest({
 				url: "/api/Collocation/getCollocationList",
 				method:'post',
-				data:{category_id:id,page:that.page,pagesize:that.pagesize}
+				data:{category_id:that.listflall[that.activeIndex1].id,page:that.page,pagesize:that.pagesize}
 			}).then(res => {
 				if (res.data.code == 200) {
 					if(res.data.data.length != 0){
-						that.quanbuList=res.data.data.data;
+						if(this.page==1){
+							that.quanbuList=res.data.data.data;
+						}else{
+							that.quanbuList=that.quanbuList.concat(res.data.data.data);
+						}
+						that.total=res.data.data.total;
 					}else{
 						that.quanbuList=[];
 					}
@@ -326,9 +338,6 @@ export default {
 			})
 			
 		},
-		gengmore(){
-			
-		},
 		zidingyi(){
 			uni.navigateTo({
 				url: "/pages/changan/index",

pages/genghuan/index.vue

@@ -159,10 +159,12 @@ export default {
 			}).then(res => {
 				if (res.data.code == 200) {
 					that.show_1=true;
-					that.chukudata=res.data.data;
-					for(let i=0;i<res.data.data.length;i++){
-						that.list1.push(res.data.data[i].image)
+					that.chukudata=res.data.data.goodInfo;
+					for(let i=0;i<res.data.data.goodInfo.length;i++){
+						that.list1.push(res.data.data.goodInfo[i].image)
+						
 					}
+					that.qiu_id=res.data.data.qiu_id;
 					that.$refs.toast.show({model:'success',label:'出库成功'})
 				}else{
 					that.$refs.toast.show({model:'error',label:res.data.msg})

pages/wardrobe/index.vue

@@ -92,8 +92,9 @@
 		<!-- 弹出 -->
 		<tm-poup v-model="show_1" :position="pos" class="tcc">
 			<view style="position: relative !important;" v-if="chukudata.length !=0">
-				<view style="height: 10px;"></view>
-				<tm-swiper @change="qiehuanLb" :current="current" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
+				<image @click="quxiao()" class="close" src="/static/img/close.png" mode="widthFix"></image>
+				<view style="clear: both;"></view>
+				<tm-swiper class="lunbo" @change="qiehuanLb" :current="current" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
 				<view class="text-white text-align-center mt-15">{{chukudata[current].brand}}{{chukudata[current].color}}{{chukudata[current].goods_name}}</view>
 				<view class="text-white text-align-center mt-10 text-size-s">{{chukudata[current].description}}</view>
 				<image class="guayi" :src="chukudata[current].ygimage" mode="widthFix"></image>
@@ -102,9 +103,23 @@
 					<image class="aniOn deng" src="/static/img/101.png" mode="widthFix"></image>
 					<text style="vertical-align: middle;">指示灯已亮，请取出衣柜</text>
 				</view>
+				<view class="daojishi">
+					<text>倒计时：</text>
+					<tm-countdown format="HH时MM分数SS秒哈"  ref="testCountdown"  :time="countdown">
+						<template 
+						v-slot:default=" { timeData } ">
+							<view class="flex-center">
+								<view v-for="(item,key) in timeData.data" :key="key" class="pa-10 primary  mr-10 round-2" :class="$tm.vx.state().tmVuetify.black?'bk':''">
+									{{item}}
+								</view>
+							</view>
+						</template> 
+					</tm-countdown>
+					<text>结束后若衣服仍未取出，出库将自动取消</text>
+				</view>
 				<view class="anniu">
-					<tm-button @click="quxiao()" theme="gray" size="n">关闭弹框</tm-button>
-					<tm-button @click="chuFun()" class="fr" theme="primary" size="n">取消出库</tm-button>
+					<!-- <tm-button  theme="gray" size="n">关闭弹框</tm-button> -->
+					<tm-button @click="chuFun()" theme="primary" :round="24" block>取消出库</tm-button>
 				</view>
 			</view>
 		</tm-poup>
@@ -139,7 +154,8 @@ export default {
 			chukudata:[],
 			current:0,
 			qiuid:'',
-			quanbuchang:[]
+			quanbuchang:[],
+			countdown:''
 		};
 	},
 	onLoad(e) {
@@ -161,6 +177,39 @@ export default {
 		
 	},
 	methods: {
+		formatSeconds(value) {
+			var secondTime = parseInt(value);// 秒
+			var minuteTime = 0;// 分
+			var hourTime = 0;// 小时
+			var arr=[];
+			if(secondTime > 60) {//如果秒数大于60，将秒数转换成整数
+				//获取分钟，除以60取整数，得到整数分钟
+				minuteTime = parseInt(secondTime / 60);
+				//获取秒数，秒数取佘，得到整数秒数
+				secondTime = parseInt(secondTime % 60);
+				//如果分钟大于60，将分钟转换成小时
+				if(minuteTime > 60) {
+					//获取小时，获取分钟除以60，得到整数小时
+					hourTime = parseInt(minuteTime / 60);
+					//获取小时后取佘的分，获取分钟除以60取佘的分
+					minuteTime = parseInt(minuteTime % 60);
+				}
+			}
+			// 时
+			if(hourTime > 0) {
+				var result =parseInt(hourTime);
+				arr.push(result)
+			}
+			// 分
+			if(minuteTime > 0) {
+				var result =parseInt(minuteTime);
+				arr.push(result)
+			}
+			// 秒
+			var result =parseInt(secondTime);
+			arr.push(result)
+			return arr;
+		},
 		shuaxin(){
 			// console.log(99999)
 			// this.quanbuList=[];
@@ -185,6 +234,18 @@ export default {
 					that.show_1=true;
 					that.chukudata=res.data.data;
 					that.list1=[];
+					
+					// 倒计时开始
+					var countdownstart=Date.parse(new Date(res.data.data[0].stock_time))/1000;
+					var countdownend=countdownstart+2*60*60;
+					var countdownnow=Date.parse(new Date())/1000
+					var daojishi=countdownend-countdownnow;
+					if(daojishi<0){
+						that.countdown=0;
+					}else{
+						that.countdown=daojishi*1000;
+					}
+					// 倒计时结束
 					for(let i=0;i<res.data.data.length;i++){
 						that.list1.push(res.data.data[i].image)
 					}
@@ -417,12 +478,12 @@ export default {
 	.fudong{position:fixed;right:10px;bottom:150px;background: #303030;width: 130px;height: 60px;
 	border-radius: 30px 0px 0px 30px;font-size: 14px;text-align: center;}
 	.fudimg{width: 60px;height:60px}
-	/deep/ .tcc .tm-poup-wk{width: 90% !important;position:relative;height: 580px !important;}
+	/deep/ .tcc .tm-poup-wk{width: 90% !important;position:relative;height: 600px !important;}
 	/deep/ .tcc .uni-swiper-slides{width: 100%;}
 	/deep/ .tcc uni-swiper{width: 100% !important;}
 	/deep/ .uni-swiper-slides{width: 160px !important;}
-	/deep/ .tcc uni-image{width: 160px !important;}
-	.tcc .guayi{width: 70% !important;display: block;margin:0 auto;margin-top:15px !important;}
+	/deep/ .tcc .lunbo uni-image{width: 160px !important;}
+	.tcc .guayi{width: 60% !important;display: block;margin:0 auto;margin-top:15px !important;}
 	.tcc .deng{width:25px !important;height:25px !important;vertical-align: middle;margin-right:8px;}
 	.anniu{width: 80%;margin: 0 auto;margin-top: 20px;}
 	/deep/ .anniu .gray.bk{color: white !important;}
@@ -453,4 +514,6 @@ export default {
 	/deep/ .showValue{display: none !important;}
 	/deep/ .menulistAction{height: 350px;overflow: auto;}
 	/deep/ .hui{position: absolute;background: rgba(0,0,0,0.4);z-index: 1;top: 0;left: 0;width: 100%;height: 100%;}
+	/deep/ .close{width: 30px !important;height: 30px !important;float: right;right: 6px;}
+	.daojishi{width: 90%;margin: 15px auto;font-size: 14px;}
 </style>

pages/yifu/index.vue

@@ -102,8 +102,9 @@
 		
 		<tm-poup v-model="show_1" :position="pos" class="tcc">
 			<view style="position: relative !important;" v-if="chukudata.length !=0">
-				<view style="height: 10px;"></view>
-				<tm-swiper :current="0" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
+				<image @click="quxiao()" class="close" src="/static/img/close.png" mode="widthFix"></image>
+				<view style="clear: both;"></view>
+				<tm-swiper class="lunbohhh" :current="0" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
 				<view class="text-white text-align-center mt-15">{{chukudata[0].brand}}{{chukudata[0].color}}{{chukudata[0].goods_name}}</view>
 				<view class="text-white text-align-center mt-10 text-size-s">{{chukudata[0].description}}</view>
 				<image class="guayi" :src="chukudata[0].ygimage" mode="widthFix"></image>
@@ -112,9 +113,23 @@
 					<image class="aniOn deng" src="/static/img/101.png" mode="widthFix"></image>
 					<text style="vertical-align: middle;">指示灯已亮，请取出衣柜</text>
 				</view>
+				<view class="daojishi">
+					<text>倒计时：</text>
+					<tm-countdown format="HH时MM分数SS秒哈"  ref="testCountdown"  :time="2*60*60*1000">
+						<template 
+						v-slot:default=" { timeData } ">
+							<view class="flex-center">
+								<view v-for="(item,key) in timeData.data" :key="key" class="pa-10 primary  mr-10 round-2" :class="$tm.vx.state().tmVuetify.black?'bk':''">
+									{{item}}
+								</view>
+							</view>
+						</template> 
+					</tm-countdown>
+					<text>结束后若衣服仍未取出，出库将自动取消</text>
+				</view>
 				<view class="anniu">
-					<tm-button @click="quxiao()" theme="gray" size="n">关闭弹框</tm-button>
-					<tm-button @click="quxchuFun()" class="fr" theme="primary" size="n">取消出库</tm-button>
+					<!-- <tm-button  theme="gray" size="n">关闭弹框</tm-button> -->
+					<tm-button @click="quxchuFun()" theme="primary" :round="24" block>取消出库</tm-button>
 				</view>
 			</view>
 		</tm-poup>
@@ -173,7 +188,7 @@ export default {
 			quanbuList1:[],
 			alldata:0,
 			chukudata:[],
-			qiuid:''
+			qiu_id:''
 		};
 	},
 	onLoad(e) {
@@ -227,7 +242,7 @@ export default {
 			myRequest({
 				url: "/api/Goods/cancelDelivery",
 				method:'post',
-				data:{qiu_id:that.qiuid,id:that.chukudata[0].id}
+				data:{qiu_id:that.qiu_id,id:that.chukudata[0].id}
 			}).then(res => {
 				console.log(res.data)
 				if (res.data.code == 200) {
@@ -372,9 +387,20 @@ export default {
 			}).then(res => {
 				if (res.data.code == 200) {
 					that.show_1=true;
-					that.chukudata=res.data.data;
-					that.qiuid=res.data.data[0].qiu_id
-					that.list1.push(res.data.data[0].image)
+					that.chukudata=res.data.data.goodInfo;
+					that.qiu_id=res.data.data.qiu_id;
+					that.list1.push(res.data.data.goodInfo[0].image)
+					// 倒计时开始
+					var countdownstart=Date.parse(new Date(res.data.data[0].stock_time))/1000;
+					var countdownend=countdownstart+2*60*60;
+					var countdownnow=Date.parse(new Date())/1000
+					var daojishi=countdownend-countdownnow;
+					if(daojishi<0){
+						that.countdown=0;
+					}else{
+						that.countdown=daojishi*1000;
+					}
+					// 倒计时结束
 					that.$refs.toast.show({model:'success',label:'出库成功'})
 				}else{
 					that.$refs.toast.show({model:'error',label:res.data.msg})
@@ -477,7 +503,7 @@ export default {
 	/deep/ .tcc .uni-swiper-slides{width: 100%;}
 	/deep/ .tcc uni-swiper{width: 100% !important;}
 	/deep/ .uni-swiper-slides{width: 160px !important;}
-	/deep/ .tcc uni-image{width: 160px !important;}
+	/deep/ .tcc .lunbohhh uni-image{width: 160px !important;}
 	.tcc .guayi{width: 60% !important;display: block;margin:0 auto;margin-top:15px !important;}
 	.tcc .deng{width:25px !important;height:25px !important;vertical-align: middle;margin-right:8px;}
 	.aniOn{
@@ -524,4 +550,6 @@ export default {
 	.more{text-align: center;}
 	.more image{margin-right: 10px;vertical-align: middle;width: 30px;}
 	.seka{width: 40px;height: 20px;border:1px solid white;}
+	/deep/ .close{width: 30px !important;height: 30px !important;float: right;right: 6px;}
+	.daojishi{width: 90%;margin: 15px auto;font-size: 14px;}
 </style>

pages/zidingyikan/index.vue

@@ -45,8 +45,9 @@
 		</view>
 		<tm-poup v-model="show_1" :position="pos" class="tcc">
 			<view style="position: relative !important;" v-if="chukudata.length !=0">
-				<view style="height: 10px;"></view>
-				<tm-swiper @change="qiehuanLb" :current="current" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
+				<image @click="quxiao()" class="close" src="/static/img/close.png" mode="widthFix"></image>
+				<view style="clear: both;"></view>
+				<tm-swiper class="lunbohhh" @change="qiehuanLb" :current="current" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
 				<view class="text-white text-align-center mt-15">{{chukudata[current].brand}}{{chukudata[current].color}}{{chukudata[current].goods_name}}</view>
 				<view class="text-white text-align-center mt-10 text-size-s">{{chukudata[current].description}}</view>
 				<image class="guayi" :src="chukudata[current].ygimage" mode="widthFix"></image>
@@ -55,10 +56,24 @@
 					<image class="aniOn deng" src="/static/img/101.png" mode="widthFix"></image>
 					<text style="vertical-align: middle;">指示灯已亮，请取出衣柜</text>
 				</view>
-				<view class="anniu">
+				<view class="daojishi">
+					<text>倒计时：</text>
+					<tm-countdown format="HH时MM分数SS秒哈"  ref="testCountdown"  :time="2*60*60*1000">
+						<template 
+						v-slot:default=" { timeData } ">
+							<view class="flex-center">
+								<view v-for="(item,key) in timeData.data" :key="key" class="pa-10 primary  mr-10 round-2" :class="$tm.vx.state().tmVuetify.black?'bk':''">
+									{{item}}
+								</view>
+							</view>
+						</template> 
+					</tm-countdown>
+					<text>结束后若衣服仍未取出，出库将自动取消</text>
+				</view>
+				<!-- <view class="anniu">
 					<tm-button @click="quxiao()" theme="gray" size="n">关闭弹框</tm-button>
 					<tm-button @click="quxchuFun()" class="fr" theme="primary" size="n">取消出库</tm-button>
-				</view>
+				</view> -->
 			</view>
 		</tm-poup>
 		<!-- 弹出层消息 -->
@@ -95,7 +110,8 @@ export default {
 			chukudata:[],
 			current:0,
 			list1:[],
-			mingriyuanList:[]
+			mingriyuanList:[],
+			qiu_id:''
 		};
 	},
 	onLoad(e) {
@@ -212,7 +228,7 @@ export default {
 			myRequest({
 				url: "/api/Goods/cancelDelivery",
 				method:'post',
-				data:{qiu_id:that.qiuid,id:that.chukudata[that.current].id}
+				data:{qiu_id:that.qiu_id,id:that.chukudata[that.current].id}
 			}).then(res => {
 				if (res.data.code == 200) {
 					that.show_1=false;
@@ -228,7 +244,6 @@ export default {
 		qiehuanLb(e){
 			var that=this;
 			this.current=e;
-			console.log(e)
 		},
 		chuku(){
 			var ids=[];
@@ -243,12 +258,24 @@ export default {
 			}).then(res => {
 				if (res.data.code == 200) {
 					that.show_1=true;
-					that.chukudata=res.data.data;
 					that.list1=[];
-					for(let i=0;i<res.data.data.length;i++){
-						that.qiuid=res.data.data[i].qiu_id
-						that.list1.push(res.data.data[i].image)
+					that.chukudata=res.data.data.goodInfo;
+					for(let i=0;i<res.data.data.goodInfo.length;i++){
+						that.list1.push(res.data.data.goodInfo[i].image)
+						
 					}
+					that.qiu_id=res.data.data.qiu_id;
+					// 倒计时开始
+					var countdownstart=Date.parse(new Date(res.data.data.stock_time))/1000;
+					var countdownend=countdownstart+2*60*60;
+					var countdownnow=Date.parse(new Date())/1000
+					var daojishi=countdownend-countdownnow;
+					if(daojishi<0){
+						that.countdown=0;
+					}else{
+						that.countdown=daojishi*1000;
+					}
+					// 倒计时结束
 					that.$refs.toast.show({model:'success',label:'出库成功'})
 				}else{
 					that.$refs.toast.show({model:'error',label:res.data.msg})
@@ -272,12 +299,23 @@ export default {
 				}).then(res => {
 					if (res.data.code == 200) {
 						that.show_1=true;
-						that.chukudata=res.data.data;
 						that.list1=[];
-						for(let i=0;i<res.data.data.length;i++){
-							that.qiuid=res.data.data[i].qiu_id
-							that.list1.push(res.data.data[i].image)
+						that.chukudata=res.data.data.goodInfo;
+						for(let i=0;i<res.data.data.goodInfo.length;i++){
+							that.list1.push(res.data.data.goodInfo[i].image)
+						}
+						that.qiu_id=res.data.data.qiu_id;
+						// 倒计时开始
+						var countdownstart=Date.parse(new Date(res.data.data.stock_time))/1000;
+						var countdownend=countdownstart+2*60*60;
+						var countdownnow=Date.parse(new Date())/1000
+						var daojishi=countdownend-countdownnow;
+						if(daojishi<0){
+							that.countdown=0;
+						}else{
+							that.countdown=daojishi*1000;
 						}
+						// 倒计时结束
 						that.$refs.toast.show({model:'success',label:'出库成功'})
 					}else{
 						that.$refs.toast.show({model:'error',label:res.data.msg})
@@ -337,7 +375,7 @@ export default {
 	/deep/ .tcc .uni-swiper-slides{width: 100%;}
 	/deep/ .tcc uni-swiper{width: 100% !important;}
 	/deep/ .uni-swiper-slides{width: 160px !important;}
-	/deep/ .tcc uni-image{width: 160px !important;}
+	/deep/ .tcc .lunbohhh uni-image{width: 160px !important;}
 	.tcc .guayi{width: 70% !important;display: block;margin:0 auto;margin-top:15px !important;}
 	.tcc .deng{width:25px !important;height:25px !important;vertical-align: middle;margin-right:8px;}
 	.aniOn{
@@ -364,4 +402,6 @@ export default {
 	}
 	/deep/ .tcc .anniu .gray.bk{color: white !important;}
 	.tcc .anniu{width: 88%;margin: 0 auto;margin-top: 20px;}
+	/deep/ .close{width: 30px !important;height: 30px !important;float: right;right: 6px;}
+	.daojishi{width: 90%;margin: 15px auto;font-size: 14px;}
 </style>

tm-vuetify/components/tm-countdown/tm-countdown.vue

@@ -69,17 +69,17 @@
 		},
 		methods: {
 			formatTime(my_time){
-				var daysRound = Math.floor(my_time/1000/60/60/24);
+				// var daysRound = Math.floor(my_time/1000/60/60/24);
 				var hoursRound = Math.floor(my_time/1000/60/60%24);
 				var minutesRound = Math.floor(my_time/1000/60%60);
 				var secondsRound = Math.floor(my_time/1000%60);
-				var millisecondRound = Math.floor(my_time % 1000);
+				// var millisecondRound = Math.floor(my_time % 1000);
 				let time = {
-						day:daysRound>9?daysRound:'0'+daysRound,//天
+						// day:daysRound>9?daysRound:'0'+daysRound,//天
 						hour:hoursRound>9?hoursRound:'0'+hoursRound,//小时,
 						minutes:minutesRound>9?minutesRound:'0'+minutesRound,//分.
 						seconds:secondsRound>9?secondsRound:'0'+secondsRound,//秒。
-						millisecond:millisecondRound>9?millisecondRound:'0'+millisecondRound//毫秒。
+						// millisecond:millisecondRound>9?millisecondRound:'0'+millisecondRound//毫秒。
 					};
 					this.time_data = time;
 				return time;