Skip to content

M
mallapp
Commit 0bdd3548 authored by Mac's avatar Mac
Browse files
Options

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

parents 9bb2cf7d 807453fe
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 31 deletions
pages/guidecar/index.vue
View file @ 0bdd3548
......@@ -82,8 +82,8 @@
</view>
</view>
<view class="c_row_t">
<image :src="info.TipsIco" mode="aspectFill" style="width: 13px;height: 11px;"></image>
<span style='font-size: 11px;color: #121212;margin-left: 5px;'>{{info.Tips}}</span>
<image :src="info.TipsIco" mode="aspectFill" style="width: 15px;height: 13px;"></image>
<span style='font-size: 12px;color: #121212;margin-left: 5px;'>{{info.Tips}}</span>
</view>
<view class="btnstyle" :style="{'color':info.ButtonTextColor,'background':info.ButtonColor,'border-radius':info.ButtonFilletPX+'px'}" @click="goList">
{{info.ButtonText?info.ButtonText:''}}
......@@ -105,7 +105,7 @@
:scroll-y="true"
style="max-height: 420px;">
<view class="txtype">
<view class="typeitem" v-for="(item, index) in classList" :key="index" >
<view class="typeitem" v-for="(item, index) in classList" :key="index" @click="radioChange(item)">
<Text>{{item.Name}}</Text>
<u-radio-group v-model="carName">
<u-radio
......@@ -113,7 +113,6 @@
active-color="#EE4454"
shape="circle"
:name="item.Name"
@change="radioChange(item)"
>
</u-radio>
</u-radio-group>
......@@ -137,7 +136,7 @@
:scroll-y="true"
style="max-height: 420px;">
<view class="txtype">
<view class="typeitem" v-for="(item, index) in EnumList" :key="index" >
<view class="typeitem" v-for="(item, index) in EnumList" :key="index" @click="radioChange2(item)">
<Text>{{item.Name}}</Text>
<u-radio-group v-model="EnumName">
<u-radio
......@@ -145,7 +144,6 @@
active-color="#EE4454"
shape="circle"
:name="item.Name"
@change="radioChange2(item)"
>
</u-radio>
</u-radio-group>
......@@ -269,7 +267,6 @@
this.amapPlugin.getRegeo({
success: (data) => {
console.log(data)
this.address =data[0].name
this.Pickcar = data[0].regeocodeData.addressComponent.city;
this.latitude = data[0].latitude;
......@@ -462,7 +459,6 @@
},
res => {
console.log('res', res);
if(res.data.length==3){
this.msg.RegionIds = res.data[0].ID+','+res.data[1].ID+','+res.data[2].ID
}else{
......@@ -491,7 +487,6 @@
let tic= 0;
that.classList.forEach((x,i)=>{
if(x.Id == msg.CarClass){
console.log(i)
tic = i
}
})
......
pages/guidecar/orderList.vue
View file @ 0bdd3548
......@@ -140,7 +140,7 @@
<view class="order_Btn_inner">
<view class="order_Btn_Com" @click.stop="buy(item)" style="color:#FF4048;border-color:#FF4048;">再次购买</view>
<!-- <view class="order_Btn_Com">评价晒单</view> -->
<view class="order_Btn_Com" @click="cancel(item,index)" v-if="item.OrderStatus==1||item.OrderStatus==2||item.OrderStatus==3">取消订单</view>
<view class="order_Btn_Com" @click.stop="cancel(item,index)" v-if="item.OrderStatus==1||item.OrderStatus==2||item.OrderStatus==3">取消订单</view>
</view>
</view>
</view>
......@@ -236,8 +236,8 @@
}, 1000);
},
onLoad(option) {
this.current = option.status || -1;
this.getHeadList();
this.getContent();
this.u = uni.getStorageSync("mall_UserInfo");
},
methods: {
......@@ -265,6 +265,8 @@
Name: '全部'
}
this.headData.unshift(obj)
this.msg.OrderStatus=this.headData[this.current].Id;
this.getContent();
}
}
);
......@@ -324,7 +326,7 @@
this.Cancelmsg.OrderId = e.OrderId;
this.Cancelmsg.Type = e.OrderStatus == 1 ? 1 : 2;
},
//取消订单
//确认订单
confirm() {
let that = this
// that.showModal = false;
......
pages/guidecar/place_order.vue
View file @ 0bdd3548
......@@ -207,13 +207,13 @@
<view class="order_GName" style="border-top:0;">
<view class="order_big order_comLeft">联系人</view>
<view style="display: flex;align-items: center;">
<input class="uni-input" v-model="orderMsg.Consignee" style="border:none;padding-left:5px;text-align: right;" />
<input class="uni-input" v-model="orderMsg.Consignee" placeholder="请输入联系人" style="border:none;padding-left:5px;text-align: right;" />
</view>
</view>
<view class="order_GName" style="border-top:0;border-top: 1px solid rgba(0, 0, 0, 0.05);">
<view class="order_big order_comLeft">联系电话</view>
<view style="display: flex;align-items: center;">
<input class="uni-input" v-model="orderMsg.Mobile" style="border:none;padding-left:5px;text-align: right;" />
<input class="uni-input" v-model="orderMsg.Mobile" placeholder="请输入联系电话" style="border:none;padding-left:5px;text-align: right;" />
</view>
</view>
<view class="order_GName" style="border-top:0;border-top: 1px solid rgba(0, 0, 0, 0.05);">
......@@ -542,9 +542,9 @@
data: this.msg
},
res => {
console.log(res, '列表数据');
if (res.resultCode == 1) {
this.dataList = res.data;
if(res.data.mch_list){
this.mchs = res.data.mch_list;
this.intervalDay = this.dataList.mch_list[0].goods_list[0].goods_attr.use_day; //获取多少天
......@@ -555,6 +555,7 @@
j.marketingLogo = JSON.parse(j.marketingLogo)
})
})
}
this.initCoupon();
}
}
......
pages/user-center/user-center.vue
View file @ 0bdd3548
......@@ -129,22 +129,22 @@
<view v-if="item.link_url == '/pages/guidecar/orderList?status=1' && user_info.MyGuideCarOrder.NonPayment > 0" class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.NonPayment }}
</view>
<!-- 待发货 -->
<!-- 待确认 -->
<view v-if="item.link_url == '/pages/guidecar/orderList?status=2' && user_info.MyGuideCarOrder.WaitSendGoods > 0" class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.WaitSendGoods }}
</view>
<!-- 待收货 -->
<!-- 待出行 -->
<view v-if="item.link_url == '/pages/guidecar/orderList?status=3' && user_info.MyGuideCarOrder.WaitReceiving > 0" class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.WaitReceiving }}
</view>
<!-- 出行中 -->
<view v-if="item.link_url == '/pages/guidecar/orderList?status=4' && user_info.MyGuideCarOrder.Completed > 0" class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.Completed }}
</view>
<!-- 待评价 -->
<view v-if="item.link_url == '/pages/guidecar/order-commit' && user_info.MyGuideCarOrder.GuideCarWaitCommentNum > 0" class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.GuideCarWaitCommentNum }}
</view>
<!-- 售后 -->
<view v-if="item.link_url == '/pages/guidecar/orderList?status=5' && user_info.MyGuideCarOrder.Completed > 0" class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.Completed }}
</view>
</view>
</view>
</view>
......
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