no message

src/pagesB/cinema/choiceMovie.vue

@@ -114,7 +114,7 @@ export default {
                     let movies = uni.getStorageSync("movies")
 					let MS = []
 					for (let m of movies) {
-						if(arr.includes(m.movieId)) MS.push(m)
+						if(arr.includes(m.movieId)) MS.unshift(m)
 					}
 					this.movieList = MS
         			this.chooseMovice = this.movieList[0]
@@ -288,7 +288,7 @@ page {
     }
 
     .tab-sel {
-        color: #E8627B !important;
+        color: #EB5A5F !important;
         font-size: 28rpx;
         font-weight: 550;
     }
@@ -301,7 +301,7 @@ page {
         transform: translate(-50%, -50%);
         width: 52rpx;
         height: 8rpx;
-        background-color: #E8627B;
+        background-color: #EB5A5F;
         // border-radius: 5rpx 5rpx 0px 0px;
     }
 }
@@ -331,7 +331,7 @@ page {
     }
 
     .ret-price {
-        color: #E8627B;
+        color: #EB5A5F;
         font-size: 38rpx;
         font-weight: bold;
         &::before{
@@ -387,7 +387,7 @@ page {
     height: 58rpx;
     text-align: center;
     line-height: 58rpx;
-    background: linear-gradient(207deg, #EA525F 0%, #E8627B 100%);
+    background: linear-gradient(207deg, #EA525F 0%, #EB5A5F 100%);
     border-radius: 30rpx;
     color: #FFFFFF;
     font-size: 24rpx;

src/pagesB/cinema/cinemaTicket.vue

@@ -14,7 +14,7 @@
                             <p class="p">{{ ticket.hallName }} {{ ticket.seatInfos }}</p>
                         </div>
                     </div>
-                    <image class="poster" mode="aspectFill" :src="ticket.posterUrl" />
+                    <image class="poster" mode="aspectFill" :src="order.posterUrl" />
                 </div>
             </div>
             <div class="card qupiao">
@@ -104,29 +104,31 @@ export default {
     },
     methods: {
         getTicket(da){
+            // da = { ML20230602756506924 }
             post("local/orderMovie",da).then(res=>{
                 if (res.code == 0) {
                     if(res.data.detail.code == 200){
                         this.ticket = res.data.detail.data
                     }
                     let da =  res.data.order
-                    let arr = JSON.parse(da.product_detail)
-                    let obj = {
-                        trade_no: da.trade_no,
-                        cinemaName: da.restaurant_name,
-                        movieName: da.orderGoods[0].product_name,
-                        amount: da.orderGoods[0].number,
-                        posterUrl: da.orderGoods[0].product_img,
-                        seatInfos: arr.map(item => item.seatName).join("，"),
-                        pay_amount: da.pay_amount,
-                        order_amount: da.order_amount,
-                        create_time: da.create_time,
-                        status: da.status
+                    if(da){
+                        let arr = JSON.parse(da.product_detail)
+                        let obj = {
+                            trade_no: da.trade_no,
+                            cinemaName: da.restaurant_name,
+                            movieName: da.orderGoods[0].product_name,
+                            amount: da.orderGoods[0].number,
+                            posterUrl: da.orderGoods[0].product_img,
+                            seatInfos: arr.map(item => item.seatName).join("，"),
+                            pay_amount: da.pay_amount,
+                            order_amount: da.order_amount,
+                            create_time: da.create_time,
+                            status: da.status
+                        }
+                        this.order = obj;
+                        this.getIntegral();
+                        this.ispay = this.$day().unix() < this.$day(this.order.create_time).add(15, 'm').unix()
                     }
-                    this.order = obj;
-                    this.getIntegral();
-
-                    this.ispay = this.$day().unix() < this.$day(this.order.create_time).add(15, 'm').unix()
                 }
             })
         },
@@ -244,14 +246,14 @@ export default {
         }
     }
     .corg{
-        color: #E8627B;
+        color: #EB5A5F;
         margin-left: 5rpx;
     }
 }
 .btnbar{
   width: calc(100% - 60rpx);
   height: 80rpx;
-  background: #E8627B;
+  background: #EB5A5F;
   border-radius: 45rpx;
   position: fixed;
   bottom: 50rpx;
@@ -282,7 +284,7 @@ export default {
         font-size: 30rpx;
         margin-bottom: 30rpx;
         padding-left: 12rpx;
-        border-left: 6rpx solid #E8627B;
+        border-left: 6rpx solid #EB5A5F;
     }
 }
 </style>

src/pagesB/cinema/confirmOrder.vue

@@ -175,7 +175,7 @@ export default {
         }
     }
     .corg{
-        color: #E8627B;
+        color: #EB5A5F;
         margin-left: 5rpx;
     }
 }
@@ -193,7 +193,7 @@ export default {
 .btnbar{
   width: calc(100% - 60rpx);
   height: 80rpx;
-  background: #E8627B;
+  background: #EB5A5F;
   border-radius: 45rpx;
   position: fixed;
   bottom: 50rpx;

src/pagesB/cinema/selectSeat.vue

@@ -28,7 +28,7 @@
             <view class="pt-f bottom-bar left-0 dp-f fd-cr z1000">
                 <view class="bg-white p-all-32">
                     <view class="seatNo_box flex_r flex_ac" v-if="optArr.length">
-                        <view class="ti">已选</view>
+                        <!-- <view class="ti">已选</view> -->
                         <view class="seatNos">
                             <view class="seatNo" v-for="(optItem,optindex) in optArr" :key="optindex" @click="delSelectItem(optItem)">
                                 <view>{{ optItem.seatNo }}</view>
@@ -43,7 +43,7 @@
                             {{numindex+1}}人
                         </view>
                     </view>
-                    <view style="width: 686rpx;height: 90rpx;" class="dp-f jc-c ai-c br-10 fz-34 color-fff" :class="SelectNum>0?'bg-red-1':'bg-unbtn'" @click="buySeat">
+                    <view style="width: 686rpx;height: 90rpx;" class="dp-f jc-c ai-c br-45 fz-34 color-fff" :class="SelectNum>0?'bg-red-1':'bg-unbtn'" @click="buySeat">
                         {{SelectNum>0?('￥ '+aPrice+' 确认座位'):'请选座位'}}
                     </view>
                 </view>
@@ -474,7 +474,7 @@ export default {
     .seatNo{
         display: inline-block;
         font-size: 24rpx;
-        text-align: center;
+        // text-align: center;
         background-color: rgba($color: #000, $alpha: 0.05);
         border-radius: 8rpx;
         padding: 4rpx 50rpx 4rpx 18rpx;
@@ -486,7 +486,7 @@ export default {
         }
         .Price{
             font-size: 24rpx;
-            color: #E8627B;
+            color: #EB5A5F;
             &::before{
                 content: "￥";
                 font-size: 20rpx;
@@ -518,11 +518,11 @@ export default {
 }
 
 .bg-red-1 {
-    background-color: #E8627B;
+    background-color: #EB5A5F;
 }
 
-.br-10 {
-    border-radius: 10rpx;
+.br-45 {
+    border-radius: 45rpx;
 }
 
 .ml-20 {

src/pagesB/orderingfood/orderlist.vue

@@ -5,14 +5,25 @@
                 <span class="name_tit ellipsis">{{ i.restaurant_name }}</span>
                 <span class="status">{{ typeto(i.status) }}</span>
             </div>
-            <div class="p2 flex_r flex_jb">
+            <div class="p2 flex_r flex_jb" v-if="i.type==0">
                 <div class="goods ellipsis">
                     <div class="imgs" v-for="(a,b) in i.orderGoods" :key="b">
                         <img :src="a.product_img" alt="" class="g_img">
                         <div class="na ellipsis">{{ a.product_name }}</div>
                     </div>
                 </div>
-                <div class="g_amount"><span class="amount dinB">{{ i.order_amount }}</span></div>
+                <div class="g_amount"><span class="amount dinB">{{ i.pay_amount }}</span></div>
+            </div>
+            <div class="p2 flex_r flex_jb " v-else-if="i.type==1">
+                <div class="Movie flex_r flex_jb" v-for="(a,b) in i.orderGoods" :key="b">
+                    <div class="info flex_c flex_jb">
+                        <p class="pt">{{ a.product_name }}</p>
+                        <p class="p">{{ a.number }}张</p>
+                        <p class="p">原价 ￥{{ i.order_amount }}</p>
+                        <p class="p">{{ seatInfos(i.product_detail) }}</p>
+                    </div>
+                    <image class="poster" mode="aspectFill" :src="a.product_img" />
+                </div>
             </div>
             <div class="p3">下单时间：{{ i.create_time }}</div>
         </div>
@@ -50,6 +61,10 @@ export default {
         entrance(i) {
             if (i.type == 1) this.goto('/pagesB/cinema/cinemaTicket', { tradeNo: i.trade_no })
             else this.goto('/pagesB/orderingfood/detail', { trade_no: i.trade_no, brand_id: i.brand_id })
+        },
+        seatInfos(va){
+            let arr = JSON.parse(va)
+            return arr.map(item => item.seatName).join("，")
         }
     },
     onLoad(da) {
@@ -115,12 +130,49 @@ export default {
                 object-fit: cover;
             }
 
+            .g_img1 {
+                height: 220rpx;
+            }
+
             .na {
                 font-size: 24rpx;
+                text-align: center;
             }
         }
     }
 
+    .Movie {
+        // padding: 25rpx 28rpx;
+        width: 100%;
+        .info,.poster{
+            vertical-align: text-top;
+        }
+        .info{
+            width: calc(100% - 150rpx);
+            padding-right: 30rpx;
+            min-height: 220rpx;
+            p{
+                font-size: 26rpx;
+                color: #666;
+                margin-bottom: 8rpx;
+            }
+            .pt{
+                font-weight: bold;
+                color: #000;
+                font-size: 30rpx;
+                margin-bottom: 8rpx;
+            }
+            .p{
+                color: #000;
+            }
+        }
+        .poster{
+            width: 150rpx;
+            height: 220rpx;
+            border-radius: 12rpx;
+        }
+    }
+
     .g_amount {
         display: flex;
         flex-direction: column;

src/request/config.js

@@ -15,6 +15,6 @@ if (process.env.UNI_PLATFORM === "h5") {
 export default apis == 1 ? {
 	Hhost: "https://shop-api.haocha13.cn/",
 } : {
-	// Hhost: "https://shop-api.haocha13.cn/",  //正式接口
-	Hhost: "https://test-api.haocha13.cn/",
+	Hhost: "https://shop-api.haocha13.cn/",  //正式接口
+	// Hhost: "https://test-api.haocha13.cn/",
 }