Skip to content

M
mallapp
Commit 9e9643d4 authored by Mac's avatar Mac
Browse files
Options

样式修改

parent 0191fac5
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 25 deletions
pages/guidecar/components/guidecarDraw.vue
View file @ 9e9643d4
......@@ -305,12 +305,11 @@ export default {
data: {
goodsId: this.id,
// path: "/pages/goods/goods?id=" + this.id + "&user_id=" + u.UserId,
path: "/pages/index/index?id=" + this.id + "&user_id=" + u.UserId+ "&SmallShopId=" + SmallShopId
+'&address='+encodeURIComponent(JSON.stringify(this.address))
+'&Pickcar='+encodeURIComponent(JSON.stringify(this.Pickcar))
+'&StartTime='+this.StartTime
+'&EndTime='+this.EndTime
+'&JumpType=3',
path: "/pages/index/index?id=" + this.id + "&ud=" + u.UserId+ "&Sd=" + SmallShopId
+'&P='+encodeURIComponent(JSON.stringify(this.Pickcar))
+'&S='+this.StartTime
+'&E='+this.EndTime
+'&J=3',
},
},
(res) => {
......
pages/guidecar/guidecarGoodsdetails.vue
View file @ 9e9643d4
......@@ -42,6 +42,46 @@
</swiper-item>
</block>
</swiper>
<view class="is_share" v-if="g.share > 0" style="top:200px;">
<image
src="@/static/images/icon/WechatIMG424.png"
style="width: 20px; margin-left: 12px; opacity: 1;height: auto;"
mode="widthFix"
/>
<view
style="
display: flex;
flex-direction: column;
margin-left: 8px;
font-size: 11px;
color: #fff;
opacity: 1;
"
>
<Text>即刻分享赚</Text>
<Text>￥ {{ g.share }}</Text>
</view>
</view>
<view class="is_share" v-if="g.myBuyCommission > 0">
<image
src="@/static/images/icon/WechatIMG424.png"
style="width: 20px; margin-left: 12px; opacity: 1;height: auto;"
mode="widthFix"
/>
<view
style="
display: flex;
flex-direction: column;
margin-left: 8px;
font-size: 11px;
color: #fff;
opacity: 1;
"
>
<Text>即刻购买省</Text>
<Text>￥ {{ g.myBuyCommission }}</Text>
</view>
</view>
</view>
<view class="g-info">
<view class="g-name u-skeleton-rect" style="font-family: aa;">
......@@ -100,7 +140,7 @@
size="20"
:disabled="true"
></u-rate>
<span style='font-size: 11px;color: #A8A8A8;margin-left: 5px;'>{{g.guide_score}}</span>
<span style='font-size: 11px;color: #A8A8A8;margin-left: 5px;'>{{g.guide_score.toFixed(1)}}</span>
</view>
</view>
......@@ -343,6 +383,9 @@
if(option && option.GoodsId){
this.GoodsId = option.GoodsId
}
if(option && option.id){
this.GoodsId = option.id
}
if (option && option.custom_params) {
let custom_params = JSON.parse(decodeURIComponent(option.custom_params));
console.log(custom_params);
......@@ -940,4 +983,18 @@
border-bottom: 1px solid rgba(0, 0, 0, 0.03);
width: 100%;
}
.guidecarOrderdetails .is_share {
width: 120px;
height: 45px;
border-top-left-radius: 22.5px;
border-bottom-left-radius: 22.5px;
background: #111;
opacity: 0.8;
display: flex;
flex-direction: row;
align-items: center;
position: absolute;
top: 260px;
right: 0;
}
</style>
pages/guidecar/guidecarList.vue
View file @ 9e9643d4
......@@ -32,9 +32,14 @@
<scroll-view
:scroll-y="true"
:enable-back-to-top="true"
style="max-height: 283px;">
style="max-height: 321px;">
<view class="tanchu_item" v-for="(item, index) in screenList" :key="index" @click="onItemSelect(item)">
<span>{{item.Name}}</span>
<view style="display: flex;flex-direction: row;align-items: center;">
<image v-if='current==1' style="width:15px;height:15px;margin-right: 10px;" :src="item.BrandLogo" ></image>
<span>{{item.Name}}</span>
</view>
<u-icon name="success" :color="mainColor" size="30" v-if='item.ID==msg.OrderBy && current==0'></u-icon>
<u-icon name="success" :color="mainColor" size="30" v-if='item.ID==msg.CarBrandId && current==1'></u-icon>
</view>
......@@ -44,7 +49,7 @@
</view>
<div style='display: flex;width: 100%;overflow: hidden;overflow-y: auto;'>
<view v-if="screenshow==true" class="Mask" @click="screenshow=false"></view>
<div class="left-slider">
<div class="left-slider" :style="{ 'height': `calc(100vh - ${scrollHeight})`,}">
<sidebar
:active="tic"
bg='#FAF8F9'
......@@ -90,7 +95,7 @@
<view class="itemb">
<span style='font-size: 11px;color: #111111;'>{{x.guidename}}</span>
<view style="background-image: linear-gradient( to right,#FF8585, #EE4454);color: #FFF;font-size: 10px;border-radius: 1px;margin-left: 5px;padding: 0 2px;">
{{x.guidescore==0?'5':x.guidescore}}
{{x.guidescore==0?'5.0':x.guidescore.toFixed(1)}}
</view>
</view>
<view class="itemb" style='font-size: 11px;color: #666666;'>
......@@ -540,12 +545,12 @@ getGuideCarBrandList(){
.guidecarList .tanchu_item{
width: 94%;
margin-left: 3%;
height: 40px;
height: 45px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #E2E2E2;
border-bottom: 1px solid #f1f1f1;
}
.guidecarList .numfont {
font-family: "oswald";
......
pages/guidecar/guidedetails.vue
View file @ 9e9643d4
......@@ -9,7 +9,7 @@
<view class="row">
<span>{{guideModel.Name}}</span>
</view>
<view class="row">
<view class="row" style="display: flex;flex-direction: row;align-items: center;">
<u-rate
:current="guideModel.Score"
active-color="#FF8C10"
......@@ -19,7 +19,7 @@
size="34"
:disabled="true"
></u-rate>
<span style='font-size: 14px;color: #A8A8A8;margin-left: 10px;'>{{guideModel.Score}}</span>
<span style='font-size: 14px;color: #A8A8A8;margin-left: 10px;'>{{guideModel.Score.toFixed(1)}}</span>
</view>
</view>
......@@ -75,7 +75,7 @@
<image :src="carModel.CarLogo" mode="aspectFill" style="width: 25px;height: 25px;margin-right: 10px;"></image>
{{carModel.CarBrand!=''?carModel.CarBrand:'无'}}
</view>
<view style="margin-top: 5px;" >
<view class="row" >
<u-rate
:current="carModel.Score"
active-color="#FF8C10"
......@@ -85,7 +85,7 @@
size="34"
:disabled="true"
></u-rate>
<span style='font-size: 14px;color: #A8A8A8;margin-left: 10px;'>{{guideModel.Score}}</span>
<span style='font-size: 14px;color: #A8A8A8;margin-left: 10px;'>{{carModel.Score.toFixed(1)}}</span>
</view>
<view style="width: 98%;height: 1px;background: #E2E2E2;margin-top: 10px;"></view>
<view class="guide-info">
......
pages/guidecar/index.vue
View file @ 9e9643d4
......@@ -22,7 +22,7 @@
<view class="content_box">
<view class="c_row">
<view class="topB" v-if="info.IsShowCity==1" @click="gocity">
<span class='titext'>取车城市</span>
<span class='titext'>城市</span>
<view style="display: flex;flex-direction: row;align-items: center;">
<span class='ztext'>{{Pickcar}}</span><u-icon name="arrow-down" size="28" color="#C8C8C8"></u-icon>
</view>
......
pages/guidecar/place_order.vue
View file @ 9e9643d4
......@@ -694,8 +694,8 @@
obj.year = myDate.getFullYear(); //年
obj.month = myDate.getMonth() + 1; //月
obj.day = myDate.getDate(); //日
obj.hour = myDate.getHours(); //时
obj.minute = myDate.getMinutes(); //分
obj.hour = (myDate.getHours()<10)?"0"+myDate.getHours() : myDate.getHours(); //时
obj.minute = (myDate.getMinutes()<10)?"0"+myDate.getMinutes() : myDate.getMinutes(); //分
let days = myDate.getDay();
obj.week = this.getweek(days) //星期几
return obj
......
pages/guidecar/rili.vue
View file @ 9e9643d4
......@@ -103,6 +103,9 @@
},
methods:{
changeDate(data){ //选择日期事件 可以将data绑定到此页面以用来提交等操作
data= data.replace(/-/g,"/")
console.log(data)
this.selectedData = data;
this.STime = this.getTime(data+' '+this.qutime)
let myDate = new Date(data);
......@@ -114,7 +117,7 @@
let year = myDate.getFullYear(); //年
let month = myDate.getMonth() + 1; //月
let day = myDate.getDate(); //日
let data2 = year+'-'+month+'-'+day
let data2 = year+'/'+month+'/'+day
this.ETime = this.getTime(data2+' '+this.stilltime)
}
......@@ -230,8 +233,8 @@
obj.year = myDate.getFullYear(); //年
obj.month = myDate.getMonth() + 1; //月
obj.day = myDate.getDate(); //日
obj.hour = myDate.getHours(); //时
obj.minute = myDate.getMinutes(); //分
obj.hour = (myDate.getHours()<10)?"0"+myDate.getHours() : myDate.getHours(); //时
obj.minute = (myDate.getMinutes()<10)?"0"+myDate.getMinutes() : myDate.getMinutes(); //分
let days = myDate.getDay();
obj.week = this.getweek(days)//星期几
if(type==1){
......@@ -241,7 +244,7 @@
if(obj.day<10){
obj.day = ('0' + obj.day)
}
this.defaultSelect = obj.year+'/'+obj.month+'/'+obj.day;
this.defaultSelect = obj.year+'-'+obj.month+'-'+obj.day;
this.qutime=obj.hour+':'+obj.minute//初始取车时间
}else if(type==2){
this.stilltime=obj.hour+':'+obj.minute//初始还车时间
......
pages/index/index.vue
View file @ 9e9643d4
......@@ -28,7 +28,7 @@
:bold="false"
@change="changeHandler"
></u-tabs>
<button @click="gosid">司导</button>
<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">
......@@ -237,6 +237,24 @@ export default {
this.guidecar.EndTime = options.EndTime?options.EndTime:'';
}
}
if (options && options.J) {//司导分享的的特殊处理
console.log(options.J)
this.JumpType = options.J;
if(options.J == 3){
this.guidecar.GoodsId = options.id;
this.guidecar.address = options.address?JSON.parse(decodeURIComponent(options.address)):'';
this.guidecar.Pickcar = options.P?JSON.parse(decodeURIComponent(options.P)):'';
this.guidecar.StartTime = options.S?options.S:'';
this.guidecar.EndTime = options.E?options.E:'';
}
if (options && options.ud) {
uni.setStorageSync("pid", { pid: options.ud });
}
if (options && options.Sd) {
uni.setStorageSync("SmallShopId", { SmallShopId: options.Sd });
}
}
if (options && options.id) {
//商品详情
this.GoodsId = options.id;
......@@ -402,6 +420,11 @@ export default {
},
methods: {
gosid(){
uni.navigateTo({
url:'/pages/guidecar/index'
})
},
//调用获取code
getCode(obj) {
var that = this;
......
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