Commit 2703a404 authored by youjie's avatar youjie

优化及修复

parent ff1ad60b
...@@ -250,7 +250,7 @@ export default { ...@@ -250,7 +250,7 @@ export default {
this.OtherList = this.params.OtherOrderInfo.OtherList this.OtherList = this.params.OtherOrderInfo.OtherList
this.OtherList.forEach(x=>{ this.OtherList.forEach(x=>{
x.UseDate = x.UseDate?this.$utils.formatDates(new Date(x.UseDate),'yyyy-MM-dd'):'' x.UseDate = x.UseDate?this.$utils.formatDates(new Date(x.UseDate),'yyyy-MM-dd'):''
let findIndex = this.options.findIndex(y=>y.id==x.CostProject) let findIndex = this.options.findIndex(y=>y.id==x.CostProject&&x.ID>0)
if(findIndex!=-1) x.CostProjectStr =this.options[findIndex].name if(findIndex!=-1) x.CostProjectStr =this.options[findIndex].name
let findIndex2 = this.currencyList.findIndex(y=>y.id==x.Currency) let findIndex2 = this.currencyList.findIndex(y=>y.id==x.Currency)
if(findIndex2!=-1) x.CurrencyName =this.currencyList[findIndex2].name if(findIndex2!=-1) x.CurrencyName =this.currencyList[findIndex2].name
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</view> </view>
</view> </view>
<view class="infor1-c-r PY30 colorFFF flex1"> <view class="infor1-c-r PY30 colorFFF flex1">
<view class="day fz32 PX30">Day{{ item.DayNum>9?item.DayNum:'0'+item.DayNum }}</view> <view class="day fz32 PX30">Day{{ item.DayNum>9?item.DayNum:item.DayNum }}</view>
<view class="color333 text row items-center MT10 PX30"> <view class="color333 text row items-center MT10 PX30">
{{ item.Title }} {{ item.Title }}
</view> </view>
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
z-index: 2; z-index: 2;
} }
.richText{ .richText{
white-space: pre-wrap; // white-space: pre-wrap;
} }
.name-ali{ .name-ali{
overflow: hidden; overflow: hidden;
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
<view v-if="dataList.productRecommend" class="fz28 PB20"> <view v-if="dataList.productRecommend" class="fz28 PB20">
<rich-text :nodes="dataList.productRecommend" class="richText"></rich-text> <rich-text :nodes="dataList.productRecommend" class="richText"></rich-text>
</view> </view>
<view v-else class="fz28 PB20" style="color: #7B7B7B;">填写</view> <view v-else class="fz28 PB20" style="color: #7B7B7B;">填写</view>
</view> </view>
</view> </view>
<view class="bjLine"></view> <view class="bjLine"></view>
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
</view> </view>
</view> </view>
</template> </template>
<view v-else class="fz28 PB20" style="color: #7B7B7B;">航班信息</view> <view v-else class="fz28 PB20" style="color: #7B7B7B;">航班信息</view>
</view> </view>
</view> </view>
<view class="bjLine"></view> <view class="bjLine"></view>
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
<text class="fz32 fontBold ML20">预定须知</text> <text class="fz32 fontBold ML20">预定须知</text>
</view> </view>
<view class="PB20"> <view class="PB20">
<text class="itiner-win">重要提示</text> <text class="itiner-win colorE1432E fontBold">重要提示</text>
</view> </view>
<view class="PB20"> <view class="PB20">
<view class="fz26"> <view class="fz26">
......
...@@ -71,33 +71,17 @@ ...@@ -71,33 +71,17 @@
:style="[boxOption>0?'titleStyle':'']"> :style="[boxOption>0?'titleStyle':'']">
<headers textAlign="left" :title="pageTitle" color="#fff"></headers> <headers textAlign="left" :title="pageTitle" color="#fff"></headers>
<scroll-view class="reimbursementInforTsBox" :scroll-x="true" <scroll-view class="reimbursementInforTsBox" :scroll-x="true"
> :scroll-left="scrollLeft">
<view class="reimbursementInforT-text row-aic-n"> <view class="reimbursementInforT-text row-aic-n">
<view class="reimbursementInforText" <view class="reimbursementInforText"
:class="[params.type==item.id?'active':'']" :class="[params.type==item.id?'active':'']"
v-for="(item,index) in titles" v-for="(item,index) in titles"
:id="`refs_${index+1}`"
:key="index" :key="index"
@click="getType(item)">{{ item.name }}</view> @click="getType(item)">{{ item.name }}</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<!--
<view class="reimbursementInforTitle fixed"
:style="{ opacity: boxOption + '%' }">
<headers textAlign="left" :title="pageTitle" color="#fff"></headers>
<scroll-view class="reimbursementInforTsBox" :scroll-x="true"
:style="[titleStyle]"
:scroll-left="scrollLeft"
@scroll="scrollHandler">
<view class="reimbursementInforT-text row-aic-n">
<view class="reimbursementInforText"
:class="[params.type==item.id?'active':'']"
v-for="(item,index) in titles"
:key="index"
@click="getType(item)">{{ item.name }}</view>
</view>
</scroll-view>
</view>-->
<headeDatas v-show="params.type<5" :currencyList="currencyList" :data="params" @change="getNewData"></headeDatas> <headeDatas v-show="params.type<5" :currencyList="currencyList" :data="params" @change="getNewData"></headeDatas>
</view> </view>
<!-- 车信息--> <!-- 车信息-->
...@@ -171,42 +155,62 @@ export default { ...@@ -171,42 +155,62 @@ export default {
{ {
name:'车辆', name:'车辆',
id: 1, id: 1,
val: 'refs1',
left: 0,
}, },
{ {
name:'酒店', name:'酒店',
id: 2, id: 2,
val: 'refs2',
left: 0,
}, },
{ {
name:'餐食', name:'餐食',
id: 3, id: 3,
val: 'refs3',
left: 0,
}, },
{ {
name:'门票', name:'门票',
id: 4, id: 4,
val: 'refs4',
left: 0,
}, },
{ {
name:'其他费用', name:'其他费用',
id: 5, id: 5,
val: 'refs5',
left: 0,
}, },
{ {
name:'小费收入', name:'小费收入',
id: 6, id: 6,
val: 'refs6',
left: 0,
}, },
{ {
name:'团费小计', name:'团费小计',
id: 7, id: 7,
val: 'refs7',
left: 0,
}, },
{ {
name:'自费收入', name:'自费收入',
id: 8, id: 8,
val: 'refs8',
left: 0,
}, },
{ {
name:'自费支出', name:'自费支出',
id: 9, id: 9,
val: 'refs9',
left: 0,
}, },
{ {
name:'购物报账', name:'购物报账',
id: 10, id: 10,
val: 'refs10',
left: 0,
}, },
], ],
currencyVisible: false, currencyVisible: false,
...@@ -290,6 +294,28 @@ export default { ...@@ -290,6 +294,28 @@ export default {
}); });
this.getOptionData() this.getOptionData()
this.getCurrencyList() this.getCurrencyList()
this.$nextTick(() => {
this.titles.forEach((x, index) => {
// 查询当前元素的位置
uni.createSelectorQuery()
.in(this) // 限定在当前组件内查询(关键!)
.select(`#refs_${index + 1}`) // 匹配元素的 id
.fields({
position: true, // 获取位置信息(left/top)
size: true // 获取尺寸(width/height)
})
.exec((res) => {
if (res[0]) {
const { left, top, width, height } = res[0];
// console.log(`元素 ${index} 的横向位置(left):`, left); // 单位:px
// console.log(`元素 ${index} 的宽度:`, width);
x.left = width*(index)
} else {
console.log(`未找到元素 refs_${index + 1}`);
}
});
});
});
}, },
methods: { methods: {
saveData(){ saveData(){
...@@ -319,6 +345,7 @@ export default { ...@@ -319,6 +345,7 @@ export default {
getType(item){ getType(item){
this.params.type = item.id this.params.type = item.id
this.oldDataIndex = item.id this.oldDataIndex = item.id
this.scrollLeft = item.left
}, },
init() { init() {
uni.showLoading() uni.showLoading()
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
background: #FF8445; background: #FF8445;
} }
.roomListCenter.active4 .roomListC-L-type{ .roomListCenter.active4 .roomListC-L-type{
background: #e0a015; background: #FF528B;
} }
.roomListC-box{ .roomListC-box{
background: #F8F8F8; background: #F8F8F8;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment