no message

pages/jiuzhai/jz_LineDetail.vue

@@ -3,7 +3,7 @@
 		<scroll-view scroll-y="true" style="height: 1px; flex: 1; box-sizing: border-box" @scroll="scroll">
 			<view class="jz_TopImg">
 				<view class="media" :style="{ opacity: 100 - boxOption + '%' }">
-					<u-swiper :list="dataList.tempImgCover" :effect3d="false" :height="535" :interval="5000" :border-radius="0" @click="openPicture"
+					<u-swiper :list="dataList.tempImgCover" :effect3d="false" 	:height="535" :interval="5000" :border-radius="0" @click="openPicture"
 					 name="Url"></u-swiper>
 					<view class="media-info">
 						<view style="display: flex; align-items: center">

pages/teamLeader/index.vue

@@ -284,10 +284,10 @@ export default {
         }
     },
     onLoad(option){
+        if(option.TCIDs) this.msg.TCIDs = option.TCIDs
         if(option.datas){
             const datas = JSON.parse(decodeURIComponent(option.datas));
-            this.msg.TCIDs = datas.TCIDs
-            this.pageTitle = `${datas.LineName}(${datas.TCIDs})`
+            this.pageTitle = `${datas.LineName}(${this.msg.TCIDs})`
         }
         this.b2b_user_info = uni.getStorageSync('b2b_user')
         this.init()

pages/teamLeader/itineraryInformation.vue

@@ -142,8 +142,8 @@
                     <view class="triangle ML10" v-if="datas.length>1"></view>
                 </view>
                 <view class="itinInfoNum row justify-center fz24">
-                    <view>{{ datas[currentIndex].BusType?datas[currentIndex].BusType:'暂无车型'}}（{{ datas[currentIndex].BusSeatNum}}席）</view>
-                    <view>{{ datas[currentIndex].TotalGuest}}人</view>
+                    <view>{{ datas[currentIndex].BusType?datas[currentIndex].BusType:'暂无车型'}}（{{ datas[currentIndex].BusSeatNum?datas[currentIndex].BusSeatNum:0}}席）</view>
+                    <view>{{ datas[currentIndex].TotalGuest?datas[currentIndex].TotalGuest:0}}人</view>
                 </view>
                 <view class="itinInfoCarNum row fz24">
                     <view class="flex1 row justify-center">
@@ -170,7 +170,7 @@
                 <img style="width: 25rpx;height: 32rpx;display: inline-block;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638874931415480953.png"/>
                 <text class="ML20 fz28">行程概要</text>
             </view>
-            <view class="itineraryInformationCBox PX30">
+            <view class="itineraryInformationCBox PX30" v-if="datas[currentIndex]&&datas[currentIndex].JourneyInfoList&&datas[currentIndex].JourneyInfoList.length>0">
                 <view class="MT30 itineraryInformationCenter" v-for="(item,index) in datas[currentIndex].JourneyInfoList">
                     <view class="itineraryInformationCtime PY20 text-center fz24">{{item.JourneyTimeStr}}</view>
                     <view class="itineraryInformationCtext row">
@@ -235,10 +235,10 @@
                 <text class="ML20 fz28">购物店</text>
             </view>
             <view class="itineraryInformationCBox PX30">
-                <view v-if="datas[currentIndex].ShopList.length>0" class="MT30 PB30 itineraryInformationSCenter">
+                <view v-if="datas[currentIndex]&&datas[currentIndex].ShopList&&datas[currentIndex].ShopList.length>0" class="MT30 PB30 itineraryInformationSCenter">
                     <view class="row" v-for="(item,index) in datas[currentIndex].ShopList">
-                        <view class="fz24">{{item.PolicyAttention}}</view>
-                        <view class="flex1 fz28 ML30 MT20">{{item.ShopName}}</view>
+                        <view class="fz24 MR30" v-if="item.PolicyAttention">{{item.PolicyAttention?item.PolicyAttention:''}}</view>
+                        <view class="flex1 fz28 MT20">{{item.ShopName}}</view>
                     </view>
                 </view>
                 <view v-else class="fz26 text-center MT20">无购物店安排</view>
@@ -337,8 +337,7 @@ export default {
     methods: {
         goUrl(url){
             uni.navigateTo({
-                url: `${url}?TCIDs=${this.msg.TCIDs}`,
-
+                url: `${url}?configId=${this.datas[this.currentIndex].ConfigId}&TCID=${this.datas[this.currentIndex].PrincipalList[0].TCID}`,
             })
         },
         popupCurrency(value){
@@ -357,6 +356,7 @@ export default {
             this.optionVisible = false
             let findIndex = this.optionList.findIndex(x=>x.id==value)
             this.currentIndex = findIndex
+            this.optionObj = this.optionList[findIndex]
         },
         init() {
             uni.showLoading()
@@ -364,14 +364,14 @@ export default {
                 if (res.resultCode == 1) {
                     uni.hideLoading()
                     this.datas = res.data
-                    res.data.forEach(x => {
+                    res.data.forEach((x,index) => {
                         this.tcunmList.push({
                             name: x.TCUNM,
-                            id: x.TCUNM
+                            id: index+1
                         })
                     });
                     this.optionList = this.tcunmList
-                    this.optionObj = this.optionList[0]
+                    this.optionObj = this.tcunmList[0]
                 }
             }, (failed) => {
                 uni.hideLoading()
@@ -380,7 +380,6 @@ export default {
                     icon: "none",
                 });
             }, (error) => {
-                this.loading = false;
                 uni.hideLoading()
             })
         },

pages/teamLeader/list.vue

@@ -207,7 +207,8 @@ export default {
                 // noData:'',//
                 // currentPage: 1,//		
                 TCStatus: 2,//	团期状态 0不限 1未开始，2进行中，3已结束	
-                LeaderId: '3036',//	领队id
+                LeaderId: '2811',//	领队id3036
+                orderBy: 1,
             },
             b2b_user_info: {}
         }
@@ -227,11 +228,10 @@ export default {
     methods: {
         goTeamLeader(item){
             let datas = {
-                TCIDs: item.TCIDs,
                 LineName: item.LineName,
             }
             uni.navigateTo({
-                url: `/pages/teamLeader/index?datas=${encodeURIComponent(JSON.stringify(datas))}`,
+                url: `/pages/teamLeader/index?TCIDs=${item.TCIDs}&datas=${encodeURIComponent(JSON.stringify(datas))}`,
             })
         },
         changeState(item){