Commit bdd2af9b authored by 罗超's avatar 罗超

1

parent 6b08fb1d
This diff is collapsed.
...@@ -251,28 +251,23 @@ export default { ...@@ -251,28 +251,23 @@ export default {
padding-bottom: 0; */ padding-bottom: 0; */
} }
.good-two .good-info .good-name { .good-two .good-info .good-name {
width: 100%;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box;
/* -webkit-line-clamp: 2;
-webkit-box-orient: vertical; */
white-space: nowrap;
margin-bottom: 10rpx; margin-bottom: 10rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 600; font-weight: 600;
/* height: 37px; */
} }
.good-two .good-info .good-sub-name { .good-two .good-info .good-sub-name {
width: 100%;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box;
/* -webkit-line-clamp: 2;
-webkit-box-orient: vertical; */
white-space: nowrap;
margin-bottom: 10rpx; margin-bottom: 10rpx;
font-size: 22rpx; font-size: 22rpx;
color: #999999; color: #999999;
/* height: 37px; */
} }
.good-two .good-info .good-price-info { .good-two .good-info .good-price-info {
display: flex; display: flex;
......
...@@ -864,7 +864,15 @@ export default { ...@@ -864,7 +864,15 @@ export default {
}, },
(res) => { (res) => {
this.orderInfo = JSON.parse(res.data); this.orderInfo = JSON.parse(res.data);
// this.PayAli(OrderId); if (res.data) {
this.PayAli(res.data);
} else {
uni.showToast({
title: "获取交易号失败",
duration: 2000,
});
}
console.log(873, res); console.log(873, res);
} }
); );
......
...@@ -16,21 +16,20 @@ ...@@ -16,21 +16,20 @@
name="picUrl" name="picUrl"
v-if="active == 1" v-if="active == 1"
></u-swiper> ></u-swiper>
<!-- #ifdef MP-WEIXIN -->
<view <view
@click="goback" @click="goback"
:style="[titleStyle, { opacity: '100% !important' }]" :style="[titleStyle, { opacity: '100% !important' }]"
style="position: fixed; top: 0; left: 0; padding-left: 6rpx" style="position: fixed; top: 0; left: 0; padding-left: 6rpx"
> >
<!-- #ifdef MP-WEIXIN -->
<u-icon <u-icon
name="arrow-left" name="arrow-left"
size="44" size="44"
color="#FFF" color="#FFF"
style="margin-top: 22rpx" style="margin-top: 22rpx"
></u-icon> ></u-icon>
<!-- #endif -->
</view> </view>
<!-- #endif -->
</view> </view>
<view class="restaurant-title" :style="[titleStyle]"> <view class="restaurant-title" :style="[titleStyle]">
<view @click="goback"> <view @click="goback">
...@@ -284,20 +283,7 @@ import calendar from "./components/uni-calendar/uni-calendar.vue"; ...@@ -284,20 +283,7 @@ import calendar from "./components/uni-calendar/uni-calendar.vue";
export default { export default {
data() { data() {
return { return {
imgsList: [ imgsList: [],
// {
// picUrl: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622459632000_216.png"
// },
// {
// picUrl: "https://ak-d.tripcdn.com/images/t1/hotel/533000/532930/3fcc6398b3c44c08bb1b57aef579793e_R_1080_808_R5_D.jpg"
// },
// {
// picUrl: "https://ak-d.tripcdn.com/images/20010r000000hmqk32EF2_R_1080_808_R5_D.jpg"
// },
// {
// picUrl: "https://ak-d.tripcdn.com/images/200v0f0000007d6wgBCD6_R_1080_808_R5_D.jpg"
// }
],
ID: 0, ID: 0,
details: {}, details: {},
typeList: [ typeList: [
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
" "
:style="{ opacity: 100 - boxOption + '%' }" :style="{ opacity: 100 - boxOption + '%' }"
> >
<!-- #ifdef MP-WEIXIN -->
<view <view
@click="goback" @click="goback"
:style="[titleStyle, { opacity: '100% !important' }]" :style="[titleStyle, { opacity: '100% !important' }]"
...@@ -28,15 +29,14 @@ ...@@ -28,15 +29,14 @@
padding-left: 6rpx; padding-left: 6rpx;
" "
> >
<!-- #ifdef MP-WEIXIN -->
<u-icon <u-icon
name="arrow-left" name="arrow-left"
size="44" size="44"
color="#ffffff" color="#ffffff"
style="margin-top: 22rpx" style="margin-top: 22rpx"
></u-icon> ></u-icon>
<!-- #endif -->
</view> </view>
<!-- #endif -->
<image <image
class="banner-img" class="banner-img"
:src="details.AllPicList[0].TagPicList[0].Path" :src="details.AllPicList[0].TagPicList[0].Path"
......
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