Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/guidecar/guidecarGoodsdetails.vue

@@ -15,7 +15,7 @@
 						</view>
 						<view class="topB" style="height: 20px;align-items: center;">
 							<span style='font-size: 11px;color: #1C1E1F;'>{{intervalDay}}</span>
-							<image src="../../static/images/sanjiao.png" mode="aspectFill" style="width: 55px;height: 4px;"></image>
+							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/sanjiao.png" mode="aspectFill" style="width: 55px;height: 4px;"></image>
 						</view>
 						<view class="topB" @click="">
 							<span class='ztext'>{{ETime.month}}月{{ETime.day}}日</span>

pages/guidecar/guidecarList.vue

@@ -7,7 +7,7 @@
 		</view>
 		<view class="topB" style="height: 20px;align-items: center;">
 			<span style='font-size: 11px;color: #1C1E1F;'>{{intervalDay}}</span>
-			<image src="../../static/images/sanjiao.png" mode="aspectFill" style="width: 55px;height: 4px;"></image>
+			<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/sanjiao.png" mode="aspectFill" style="width: 55px;height: 4px;"></image>
 		</view>
 		<view class="topB" @click="">
 			<span class='ztext'>{{ETime.month}}月{{ETime.day}}日</span>

pages/guidecar/index.vue

@@ -73,7 +73,7 @@
 							</view>
 							<view class="topB" style="height: 20px;align-items: center;">
 								<span style='font-size: 11px;color: #1C1E1F;'>{{intervalDay}}</span>
-								<image src="../../static/images/sanjiao.png" mode="aspectFill" style="width: 55px;height: 4px;"></image>
+								<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/sanjiao.png" mode="aspectFill" style="width: 55px;height: 4px;"></image>
 								
 							</view>
 							<view class="topB" @click="showStart=true,timeType=2,defaultTime = msg.EndTime">

pages/guidecar/place_order.vue

@@ -159,6 +159,7 @@
 </style>
 <template>
 	<view class="place_order">
+		<template v-if="mchs.length>0">
 		<view class="orderItem">
 			<view class="orderCar">
 				<view class="order_carImg">
@@ -203,6 +204,7 @@
 				</view>
 			</view>
 		</view>
+		</template>
 		<view class="orderItem">
 			<view class="order_GName" style="border-top:0;">
 				<view class="order_big order_comLeft">联系人</view>

pages/guidecar/rili.vue

@@ -7,7 +7,7 @@
 				</view>
 				<view class="topB" style="height: 20px;align-items: center;">
 					<span style='font-size: 11px;color: #1C1E1F;'>{{intervalDay}}</span>
-					<image src="../../static/images/sanjiao.png" mode="aspectFill" style="width: 55px;height: 4px;"></image>
+					<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/sanjiao.png" mode="aspectFill" style="width: 55px;height: 4px;"></image>
 				</view>
 				<view class="topB" @click="">
 					<span class='ztext'>{{ETime.month}}月{{ETime.day}}日</span>

pages/index/index.vue

@@ -8,7 +8,10 @@
         class="index-title"
         :style="[myPageData.home_pages.navs[active].templateBg,titleStyle,{color:myPageData.home_pages.navs[active].templateBg?myPageData.home_pages.navs[active].templateBg.titleColor:''}]"
       >
-        <text>{{pageTitleStr}}</text>
+        <text v-if="isNavPosition==0">{{pageTitleStr}}</text>
+		<view v-if="isNavPosition==1" style="width:78%">
+			<search :style-str="searchData"></search>
+		</view>
         <view class="back-arrow" v-if="showBack" @click="goback">
           <u-icon name="arrow-left" size="44"></u-icon>
         </view>
@@ -28,7 +31,7 @@
       <template v-for="(item, i) in myPageData.home_pages.navs">
         <view :key="i" v-if="active == i">
           <template v-for="(d, di) in item.template.data">
-            <search v-if="d.id == 'search'" :style-str="d.data" :key="di"></search>
+            <search v-if="d.id == 'search'&&isNavPosition==0" :style-str="d.data" :key="di"></search>
             <swiper v-if="d.id == 'banner'" :swipers="d.data" :key="di"></swiper>
             <empty v-if="d.id == 'empty'" :block="d.data" :key="di"></empty>
             <rubik v-if="d.id == 'rubik'" :ad="d.data" :key="di"></rubik>
@@ -132,6 +135,8 @@ export default {
       JumpType: 0,
       GoodsId: 29,
 	  guidecar:{},
+	  searchData:{}, //传递给search data
+	  isNavPosition:0, //设置搜索框位置
     };
   },
   components: {
@@ -554,6 +559,20 @@ export default {
             uni.setStorageSync("navs", res.data.navbar.navs);
           }
           uni.setStorageSync("basedata", res.data);
+		  		  
+		  if(this.myPageData.home_pages.navs.length>0&&this.myPageData.home_pages.navs[0].template.data.length>0){
+			  this.myPageData.home_pages.navs[0].template.data.forEach(x=>{
+				  if(x.id=='search'){
+					this.searchData = x.data;  
+					this.isNavPosition=x.data.searchPosition;
+					if(this.isNavPosition==1){
+						this.searchData.top=-5;
+						this.searchData.left=10;
+					}
+				  }
+			  })
+		  }
+		  
           if (res.data.home_pages.title != "") {
             if (this.pageId == 0) {
               uni.setNavigationBarTitle({