Commit 8142caac authored by Mac's avatar Mac

样式修改

parent 41c04d09
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="Xbox"> <view class="Xbox">
<img src="../../static/images/couponsbg.png" mode="widthFix" /> <img src="../../static/images/couponsbg.png" mode="widthFix" />
<view class="coupons-box"> <view class="coupons-box">
<text style="font-size: 18px;color: #FFFFFF;">恭喜获得优惠券</text> <text style="font-size: 18px;color: #FFFFFF;">恭喜获得{{msgtype==1?'优惠券':'积分'}}</text>
<text style="font-size: 14px;color: #FFFFFF;margin-top: 20rpx;">{{couponMessage}}</text> <text style="font-size: 14px;color: #FFFFFF;margin-top: 20rpx;">{{couponMessage}}</text>
<view class="btn" @click="goLook"> <view class="btn" @click="goLook">
<text>立即查看</text> <text>立即查看</text>
...@@ -22,6 +22,10 @@ props: { ...@@ -22,6 +22,10 @@ props: {
couponMessage: { couponMessage: {
type: String, type: String,
default:0 default:0
},
msgtype:{
type: String,
default:1
} }
}, },
data() { data() {
...@@ -32,15 +36,23 @@ props: { ...@@ -32,15 +36,23 @@ props: {
}, },
created() { created() {
console.log(this.couponMessage) console.log(this.couponMessage)
console.log(this.msgtype)
}, },
methods: { methods: {
goLook(){ goLook(){
this.showDialog = false; this.showDialog = false;
if(this.msgtype==1){
uni.navigateTo({ uni.navigateTo({
url: "/pages/coupon/index/index", url: "/pages/coupon/index/index",
}); });
}else if(this.msgtype==2){
uni.navigateTo({
url: "/pages/user-center/integral-detail/integral-detail",
});
}
this.$emit('goLook'); this.$emit('goLook');
}, },
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<view class="right-box"> <view class="right-box">
<view class="good-info">{{dataList.DetailList[0].GoodsName}}</view> <view class="good-info">{{dataList.DetailList[0].GoodsName}}</view>
<view class="op-box"> <view class="op-box">
天数:{{dataList.DetailList[0].UseDay}} 天数:{{dataList.DetailList[0].UseDay==0.5?'半天':dataList.DetailList[0].UseDay+'天'}}
颜色:{{dataList.DetailList[0].CarColorName}} 颜色:{{dataList.DetailList[0].CarColorName}}
类型:{{dataList.DetailList[0].RideNum}} 类型:{{dataList.DetailList[0].RideNum}}
</view> </view>
...@@ -77,11 +77,22 @@ ...@@ -77,11 +77,22 @@
<u-loading mode="circle" style="margin-right: 5px;" v-if="submitStatus"></u-loading>提交评价 <u-loading mode="circle" style="margin-right: 5px;" v-if="submitStatus"></u-loading>提交评价
</u-button> </u-button>
</view> </view>
<coupon
v-if="showCoupons"
:coupon-message="couponMessage"
:msgtype="msgType"
@goLook="goLook"
@closeBtn="closeBtn"
></coupon>
</view> </view>
</template> </template>
<script> <script>
import coupon from "@/components/coupons/coupons";
export default { export default {
components: {
coupon
},
data() { data() {
return { return {
pageTitle: "发表评价", pageTitle: "发表评价",
...@@ -111,7 +122,10 @@ ...@@ -111,7 +122,10 @@
action: this.host2 + "/api/File/UploadTencent", action: this.host2 + "/api/File/UploadTencent",
fileList: [], //商品上传图 fileList: [], //商品上传图
fileList2: [], //导游上传图 fileList2: [], //导游上传图
dataList: {} //商品详情数据 dataList: {} ,//商品详情数据
couponMessage: "",//弹出优惠券的内容
showCoupons: false,
msgType:1,//类型
}; };
}, },
onLoad(option) { onLoad(option) {
...@@ -177,6 +191,11 @@ ...@@ -177,6 +191,11 @@
this.msg[1].CommentScore = val this.msg[1].CommentScore = val
}, },
submitForm() { submitForm() {
this.couponMessage = '获取10积分';
// this.couponMessage = res.couponMessage;
// this.msgType = res.msgType;
this.msgType = 2;
this.showCoupons = true;
if (this.msg[0].CommentScore == 0) { if (this.msg[0].CommentScore == 0) {
this.$refs.uTips.show({ this.$refs.uTips.show({
title: "请您为车打打分吧", title: "请您为车打打分吧",
...@@ -223,7 +242,16 @@ ...@@ -223,7 +242,16 @@
} }
} }
); );
} },
goLook() {
this.showCoupons = true;
uni.navigateTo({
url: "/pages/user-center/integral-detail/integral-detail",
});
},
closeBtn() {
this.showCoupons = false;
},
} }
}; };
</script> </script>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="commit-box"> <view class="commit-box">
<u-empty text="没有找到未评价的商品信息" font-size="36" mode="list" v-if="g.length == 0 && !loading"></u-empty> <u-empty text="没有找到未评价的商品信息" font-size="36" mode="list" v-if="g.length == 0 && !loading"></u-empty>
<view <view
v-if="g.length > 0" v-if="g.length > 0&& !loading"
style="height: 100vh;width: 100vw;overflow: hidden;padding:0 0 10px 0;" style="height: 100vh;width: 100vw;overflow: hidden;padding:0 0 10px 0;"
> >
<scroll-view <scroll-view
...@@ -139,6 +139,7 @@ export default { ...@@ -139,6 +139,7 @@ export default {
data: this.msg, data: this.msg,
}, },
(res) => { (res) => {
this.loading = false;
this.isloading = false; this.isloading = false;
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.g = this.g.concat(res.data.pageData); this.g = this.g.concat(res.data.pageData);
......
...@@ -180,6 +180,10 @@ ...@@ -180,6 +180,10 @@
<view class="label">下单时间:</view> <view class="label">下单时间:</view>
<view class="content">{{ orders.CreateDate }}</view> <view class="content">{{ orders.CreateDate }}</view>
</view> </view>
<view class="field">
<view class="label">备注:</view>
<view class="content">{{ orders.BuyerMessage }}</view>
</view>
</view> </view>
<view class="order-info-item"> <view class="order-info-item">
<view class="field"> <view class="field">
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
:style="{ height: '100%' }"> :style="{ height: '100%' }">
<view style="display: flex;flex-direction: column;align-items: center;"> <view style="display: flex;flex-direction: column;align-items: center;">
<view v-for="(item, index) in g" :key="index" class="listbox"> <view v-for="(item, index) in g" :key="index" class="listbox">
<view class="box_top"> <view class="box_top" @click="redirectToDetail(item.OrderId)">
<Text style='font-size: 14px;'>订单号:{{item.OrderNo}}</Text> <Text style='font-size: 14px;'>订单号:{{item.OrderNo}}</Text>
<Text :style="{'font-size':'14px','color':mainColor}">{{item.StatusName}}</Text> <Text :style="{'font-size':'14px','color':mainColor}">{{item.StatusName}}</Text>
</view> </view>
...@@ -176,6 +176,11 @@ ...@@ -176,6 +176,11 @@
this.status = "nomore"; this.status = "nomore";
} }
}, },
redirectToDetail(id) {
uni.navigateTo({
url: "/pages/order/order-detail?id=" + id,
});
},
} }
} }
</script> </script>
......
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