Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

components/goods/style5.vue

@@ -28,7 +28,6 @@
 					:src="goodsInfo.goodsTagPicUrl"
 					mode="widthFix"
 					style="width: 100%" v-if="goodsInfo.goodsTagPicUrl.indexOf('goods-tag-xp.png')==-1"/>
-				<span style="background: #F7DFA4;border-radius: 4rpx;padding:4rpx 8rpx;font-size: 18rpx;color: #584825;">新品首发</span>
 			</view>
 			<view style="position: absolute; z-index: 2; top:135rpx;left:12rpx;right: 12rpx;display: flex;font-size: 18rpx;color:#FFF">
 				<view style="height: 24rpx;line-height: 24prx;padding: 0 8rpx;background-color: #18A86B;">
@@ -225,11 +224,11 @@ export default {
   overflow: hidden;
 }
 .her-scoller .good-five .tips {
-  width: 64rpx;
-  height: 64rpx;
+  width: 94rpx;
+  height: 37rpx;
   position: absolute;
-  top: 8rpx;
-  left: 10rpx;
+  top: 18rpx;
+  left: -4rpx;
   z-index: 4;
 }
 .her-scoller .good-five .img-box-style5 {

components/header/header.vue

@@ -7,7 +7,7 @@
                 </view>
             </view>
             <view class="carrHeader-title">
-                <slot>{{title}}</slot>
+                <slot>{{title?title:''}}</slot>
             </view>
         </view>
     </view>

pages/coupon/details/details.vue

@@ -201,7 +201,6 @@
 	}
 	.couponDetailsHeadeBox{
 		position: relative;
-		/* position: fixed; */
 		width: 100%;
 		height: 328rpx;
 		top: 0;
@@ -270,7 +269,6 @@
 	.cdTiaojian_box{
 		padding: 0 66rpx;
 		margin-top: 143rpx;
-		/* margin-top: 480rpx; */
 	}
 	.cdTiaojianB{
 		display: flex;

pages/index/index.vue

@@ -567,6 +567,7 @@
 			}, 500);
 			this.mainColor = this.$uiConfig.mainColor;
 			this.getIsOpenReserve();
+			this.$utils.VersionUpdate()
 		},
 
 		methods: {

pages/jiuzhai/components/headerLine.vue

-<template>
-	<view class="lienHeader" :style="[titleStyle]">
-        <view class="lienHeaderBox">
-            <view class="lienHeader-left">
-                <view class="lienHeader-left-icon" @click="goBack">
-					<u-icon name="arrow-left" size="38" :color="type==1?'#000':'#000'"></u-icon>
-                </view>
-            </view>
-            <!-- <view class="lienHeader-title" :style="{'color':type==1?'#FFF':'#000'}">
-                <slot>{{title}}</slot>
-            </view> -->
-        </view>
-    </view>
-</template>
-<script>
-export default {
-    props:['title','type'],   
-    data() {
-        return {
-			titleStyle:{}
-        }
-    },
-    mounted() {
-		const that = this
-        uni.getSystemInfo({
-          success(res) {
-            that.titleStyle = {
-              paddingTop: `${res.statusBarHeight}px`
-            };
-          },
-        });
-    },
-    methods:{
-        goBack(){
-			uni.navigateBack({delta:-1})
-        }
-    }
-}
-</script>
-<style>
-.lienHeader-title{
-    width: 100%;
-    position: relative;
-    left: 0;
-    right: 0;
-    text-align: center;
-    font-size: 32rpx;
-}
-.lienHeader-left{
-    /* position: absolute;
-    left: 32rpx;
-    top: 83rpx;
-    z-index: 3; */
-}
-.lienHeaderBox{
-    width: 100%;
-    height: 88rpx;
-    padding: 0 32rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    position: relative;
-}
-.lienHeader{
-    padding-top: 48rpx;
-}
-</style>
\ No newline at end of file

pages/jiuzhai/jz_Line.vue

 <style>
 .jz_LineHeadeBox{
-	/* position: fixed;
-	left: 0;
-	right: 0;
-	top: 0;
-	z-index: 1; */
-	    padding-top: 41.2vw;
+	padding-top: 41.2vw;
 	position: relative;
 }
 .jz_LineHeade{
@@ -63,6 +58,13 @@
 		font-size: 28rpx;
 		font-family: 'nav-font';
 	}
+	.jz_TuNewImg{
+		width: 94rpx;
+		height: 37rpx;
+		position: absolute;
+		left: -4px;
+		top: 10px;
+	}
 
 	.jz_Right {
 		width: 432rpx;
@@ -193,17 +195,17 @@
 	}
 
 	.jz_Content .search-box {
-		height: 88rpx;
+		height: 70rpx;
 		background: #FFF;
 		border-radius:18rpx;
 		display: flex;
 		align-items: center;
 		padding: 19rpx 30rpx;
 		margin: 0 30rpx;
-		    position: absolute;
-		    bottom: 22rpx;
-		    left: 0;
-		    right: 0;
+		position: absolute;
+		bottom: 29rpx;
+		left: 0;
+		right: 0;
 	}
 
 	.jz_Content .search-box .date {
@@ -341,7 +343,7 @@
 					'active0':msg.teamType==0,
 					'active1':msg.teamType==1,
 					'active2':msg.teamType==2}">
-					<headerLine :type="msg.teamType" :title="msg.teamType==1?'小包团':''"></headerLine>
+					<headerLine></headerLine>
 					<view class="search-box" style="margin-top: 24rpx;">
 						<view class="date" @click="showBranch=true">
 							<u-icon name="location" color="#B99846" size="24"></u-icon>
@@ -359,7 +361,7 @@
 					</view>
 				</view>
 			</view>
-			<view style="height: 100rpx;width: 100%;">
+			<view style="height: 80rpx;width: 100%;">
 				<u-dropdown ref="uDropdown" @open="open" @close="close" active-color="#000" inactive-color="#444">
 					<u-dropdown-item v-model="msg.orderBy" :title="optionsTitle[0]" :options="orderBys" @change="changeOrderBy">
 					</u-dropdown-item>
@@ -470,6 +472,7 @@
 									<view class="jz_TuDiv">
 										<img class="jz_TuBigImg" mode="aspectFill" :src="getImgs(item.imgCover)" alt="" v-if="item.imgCover && item.imgCover.length>0 && getImgs(item.imgCover)!=''" />
 										<view class="none-image" v-else>暂无图片</view>
+										<img v-if="item.isNewArrival&&item.isNewArrival==1" class="jz_TuNewImg" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638733097518452353.png" />
 									</view>
 									<view class="jz_Right">
 										<view class="jz_LineName">{{item.title}}</view>
@@ -518,7 +521,7 @@
 <script>
 	import canlendar from "./components/time/index.vue"
 	import auth from "@/components/auth/index.vue";
-	import headerLine from "./components/headerLine";
+	import headerLine from "@/components/header/header";//"./components/headerLine";
 	export default {
 		components: {
 			canlendar,

pages/jiuzhai/jz_MyOrder.vue

@@ -2,8 +2,13 @@
 	.jz_MyOrder {
 		height: 100vh;
 		background-color: #ecf1f4;
+		display: flex;
+		flex-direction: column;
 	}
 
+	.jz_OrderList:first-child{
+		margin-top: 15px;
+	}
 	.jz_OrderList {
 		width: 100%;
 		min-height: 334rpx;
@@ -91,7 +96,7 @@
 		 bar-height="4" height="100"></u-tabs>
 		<u-empty v-if="dataList.length == 0" text="暂无数据" mode="data"></u-empty>
 		<template v-else>
-			<view class="jz_MyOrderMain" style="height: calc(100vh - 140px); overflow: hidden">
+			<view class="jz_MyOrderMain" style="height: 1px; flex: 1; overflow: hidden">
 				<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
 					<view class="jz_OrderList" v-for="(item, index) in dataList" :key="index" @click="goOrderDetail(item)">
 						<view class="jz_OrderTop">

pages/jiuzhai/jz_Reserve.vue

@@ -528,7 +528,7 @@
 				realCurrentPriceInfo: {},
 				customer: {},
 				CreateBy: 0,
-				showPz:true,
+				showPz:false,
 				pzCoupon:null
 			};
 		},

pages/user-center/integral-detail/integral-detail.vue

@@ -106,6 +106,9 @@ export default {
       showBar: true,
     };
   },
+  onShow() {
+    this.$utils.VersionUpdate()
+  },
   created() {
     this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
     this.mainColor = this.$uiConfig.mainColor;

pages/user-center/user-center.vue

@@ -48,9 +48,7 @@
 							<view style="font-size:12px; margin-top:3px;">
 								<template v-if="b2b_user_info&&b2b_user_info.customerName&&b2b_user_info.customerName!=''">
 									{{b2b_user_info.customerName}}
-									<template v-if="b2b_user_info&&b2b_user_info.salesBaseInfo&&b2b_user_info.salesBaseInfo.emName!=''">
-										（销售经理:{{b2b_user_info.salesBaseInfo.emName}})
-									</template>
+								 
 								</template>
 								<template v-else>
 									{{b2b_user_info ? b2b_user_info.name : ""}}