'save'

pages/cinema/orderdes.vue

@@ -1,63 +1,90 @@
 <template>
 	<view>
-		<view class="remind">请到影院现场柜台或取票机取票</view>
-		<view class="des-box">
-			<view class="code-box">
-				<view class="code">
-					<text>取票码</text>
-					<text>{{JSON.parse(orderDes.orderDataJson.FilmOrderNotifyDTO.ticketCode).join(' ')}}</text>
-				</view>
-				<image class="qrcode" :src="JSON.parse(orderDes.orderDataJson.FilmOrderNotifyDTO.ticketImage)[0]"
-				 mode="widthFix"></image>
-			</view>
-			<view class="order-num">
-				<text>订单号：{{orderDes.outTradeNo}}</text>
-				<text>已兑换</text>
-			</view>
-			<view class="des">
-				<text class="film-name">{{orderDes.orderDataJson.cinemaData.filmName}}</text>
-				<view class="film-time">
-					<text>时间</text>
-					<text>{{orderDes.orderDataJson.cinemaData.showTime}}</text>
-				</view>
-				<view class="film-address">
-					<text>影院</text>
-					<text>{{orderDes.orderDataJson.cinemaData.showTime}}</text>
-				</view>
-				<view class="film-video">
-					<text>影厅</text>
-					<text>{{orderDes.orderDataJson.cinemaData.hallName}}</text>
+		<loadSke :loading='loading'>
+			<view class="remind">请到影院现场柜台或取票机取票</view>
+			<view class="des-box">
+				<loadSke :loading='!orderDes.orderDataJson.FilmOrderNotifyDTO'>
+					<view class="code-box">
+						<view class="code">
+							<text>取票码</text>
+							<text>{{JSON.parse(orderDes.orderDataJson.FilmOrderNotifyDTO.ticketCode).join(' ')}}</text>
+						</view>
+						<image class="qrcode" :src="JSON.parse(orderDes.orderDataJson.FilmOrderNotifyDTO.ticketImage)[0]" mode="widthFix"></image>
+					</view>
+				</loadSke>
+				<view class="order-num">
+					<text>订单号：{{orderDes.outTradeNo}}</text>
+					<text>{{orderDes.orderDataJson.FilmOrderNotifyDTO ?  `出票成功` : `正在出票`}}</text>
 				</view>
-				<view class="film-seat">
-					<text>座位</text>
-					<view class="seat-box">
-						<text v-for="(item,index) in orderDes.orderDataJson.FilmOrderNotifyDTO.realSeat.split(',')" :key='index'>6排6列</text>
+				<view class="des">
+					<text class="film-name">{{orderDes.orderDataJson.cinemaData.filmName}}</text>
+					<view class="film-time">
+						<text>时间</text>
+						<text>{{orderDes.orderDataJson.cinemaData.showTime}}</text>
+					</view>
+					<view class="film-address">
+						<text>影院</text>
+						<text>{{orderDes.orderDataJson.cinemaData.cinemaName}}</text>
+					</view>
+					<view class="film-video">
+						<text>影厅</text>
+						<text>{{orderDes.orderDataJson.cinemaData.hallName}}</text>
+					</view>
+					<view class="film-seat">
+						<text>座位</text>
+						<view class="seat-box">
+							<text v-for="(item,index) in seatList" :key='index'>{{item}}</text>
+						</view>
 					</view>
 				</view>
+				<view class="price">
+					<text>总价</text>
+					<text>¥{{orderDes.total/100}}</text>
+				</view>
 			</view>
-			<view class="price">
-				<text>总价</text>
-				<text>¥79.8</text>
-			</view>
-		</view>
+		</loadSke>
 	</view>
 </template>
 
 <script>
-	import { getWxOrder } from '@/api/order.js'
+	import {
+		getWxOrder
+	} from '@/api/order.js'
 	export default {
 		data: () => ({
-			orderDes:{}
+			orderDes: {},
+			seatList: [],
+			outTradeNo: null,
+			loading: true,
+			pollingTiemId:null
 		}),
+		onLoad: function(option) {
+			this.outTradeNo = option.outTradeNo
+		},
 		mounted() {
 			this.init()
 		},
-		methods:{
-			async init(){
-				let orderRes =  await getWxOrder('12021051714143017548116012554780')
-				orderRes.data.orderDataJson=JSON.parse(orderRes.data.orderDataJson)
+		methods: {
+			async init() {
+				let orderRes = await getWxOrder(this.outTradeNo)
+				orderRes.data.orderDataJson = JSON.parse(orderRes.data.orderDataJson)
 				this.orderDes = orderRes.data
+				this.seatList = this.orderDes.orderDataJson.filmOrderCreateDTO.seat.split(',')
+				this.loading = false
+				this.polling()
+			},
+			polling() {
+				this.pollingTiemId = setInterval(async () => {
+					let orderRes = await getWxOrder(this.outTradeNo)
+					orderRes.data.orderDataJson = JSON.parse(orderRes.data.orderDataJson)
+					this.orderDes = orderRes.data
+					this.seatList = this.orderDes.orderDataJson.filmOrderCreateDTO.seat.split(',')
+					if(false) clearInterval(this.pollingTiemId)
+				}, 3000)
 			}
+		},
+		beforeDestroy() {
+			clearInterval(this.pollingTiemId)
 		}
 	}
 </script>
@@ -83,7 +110,6 @@
 			flex-direction: column;
 			align-items: center;
 			padding-bottom: 38rpx;
-			border-bottom: 1rpx solid #D9D9D9;
 
 			.code {
 				margin-top: 43rpx;
@@ -112,10 +138,11 @@
 			justify-content: space-between;
 			align-items: center;
 			padding: 34rpx 31rpx;
-			border-bottom: 1rpx solid #D9D9D9;
+			border-top: 1rpx dashed #D9D9D9;
+			border-bottom: 1rpx dashed #D9D9D9;
 			position: relative;
-			
-			&::after{
+
+			&::after {
 				content: '';
 				width: 24rpx;
 				height: 24rpx;
@@ -124,9 +151,10 @@
 				position: absolute;
 				top: 0;
 				left: 0;
-				transform: translate(-50%,-50%);
+				transform: translate(-50%, -50%);
 			}
-			&::before{
+
+			&::before {
 				content: '';
 				width: 24rpx;
 				height: 24rpx;
@@ -135,19 +163,20 @@
 				position: absolute;
 				top: 0;
 				right: 0;
-				transform: translate(50%,-50%);
+				transform: translate(50%, -50%);
 			}
-			
+
 			text {
 				&:nth-child(1) {
+					width: 60%;
+					word-break: break-all;
 					font-size: 26rpx;
 					font-weight: 400;
 					color: #666666;
 				}
 
 				&:nth-child(2) {
-					width: 91rpx;
-					height: 34rpx;
+					padding: 10rpx;
 					display: flex;
 					justify-content: center;
 					align-items: center;
@@ -160,48 +189,56 @@
 				}
 			}
 		}
-	
-		.des{
+
+		.des {
 			padding: 45rpx 30rpx;
-			border-bottom: 1rpx solid #D9D9D9;
+			border-bottom: 1rpx dashed #D9D9D9;
 			display: flex;
 			flex-direction: column;
-			.film-name{
+
+			.film-name {
 				font-size: 30rpx;
 				font-weight: 400;
 				color: #0F0404;
 			}
-			text{
+
+			text {
 				font-size: 26rpx;
 				font-weight: 400;
 				color: #666666;
 				margin-right: 20rpx;
 				white-space: nowrap;
 			}
-			.film-time{
-				text:nth-child(2){
+
+			.film-time {
+				text:nth-child(2) {
 					color: #999999;
 				}
 			}
-			.film-address{
-				text:nth-child(2){
+
+			.film-address {
+				text:nth-child(2) {
 					color: #999999;
 				}
 			}
-			.film-video{
-				text:nth-child(2){
+
+			.film-video {
+				text:nth-child(2) {
 					color: #999999;
 				}
 			}
-			.film-seat{
+
+			.film-seat {
 				display: flex;
 				justify-content: flex-start;
 				align-items: stretch;
 				margin-top: 10rpx;
-				.seat-box{
+
+				.seat-box {
 					display: flex;
 					flex-wrap: wrap;
-					text{
+
+					text {
 						height: 40rpx;
 						padding: 4rpx 15rpx;
 						margin-bottom: 10rpx;
@@ -212,15 +249,17 @@
 				}
 			}
 		}
-	
-		.price{
+
+		.price {
 			padding: 40rpx 30rpx;
-			text{
+
+			text {
 				font-size: 26rpx;
 				font-weight: 400;
 				color: #666666;
 				margin-right: 20rpx;
-				&:nth-child(2){
+
+				&:nth-child(2) {
 					color: #E31818;
 				}
 			}

pages/cinema/placeorder.vue

@@ -190,6 +190,9 @@
 				}).then(async res => {
 					this.orderRes = res
 					let payRes = await wx.requestPayment(this.orderRes.data)
+					if(payRes.errMsg=='requestPayment:ok'){
+						this.goPage(`/pages/cinema/orderdes?outTradeNo=${this.orderRes.data.outTradeNo}`,'reLaunch')
+					}
 					console.log(payRes)
 				})
 			}

pages/cinema/schedulelist.vue

@@ -22,8 +22,8 @@
 			</view>
 
 			<view class="schedule-box">
-				<van-tabs :active='tabActive' :swipe-threshold='3' bind:change="onChange" animated swipeable id="tabs">
-					<van-tab class='schedule-tab' :title="index" v-for='(item,index) in scheduleList[filmId]' :key='index'>
+				<van-tabs  v-if="tabShow" :active='tabActive' :swipe-threshold='3' bind:change="onChange" animated swipeable id="tabs">
+					<van-tab class='schedule-tab' :title="index" v-for='(item,index) in scheduleItem' :key='item[0][0].showId'>
 						<view v-for="(sonItem,sonIndex) in item" :key='sonItem.showId' class="schedule-des">
 							<view class="left-box">
 								<view class="item-box">
@@ -71,7 +71,8 @@
 			cinemaName: '',
 			scheduleList: null,
 			scheduleListKey: null,
-			discountRule: {}
+			discountRule: {},
+			tabShow: true
 		}),
 		computed: {
 			filmList() {
@@ -83,6 +84,9 @@
 			},
 			filmDiscount() {
 				return this.$store.state.cinema.filmDiscount;
+			},
+			scheduleItem() {
+				return this.scheduleList[this.filmId]
 			}
 		},
 		onLoad: function(option) {
@@ -122,6 +126,7 @@
 				this.filmId = this.scheduleListKey[this.current]
 				this.selectComponent('#tabs').resize();
 				this.tabActive = 0
+				this.tabShow = true
 			}
 		}
 	}

pages/user/order.vue

@@ -1,61 +1,88 @@
 <template>
 	<view>
-		<van-tabs :active="active" @change="onChange" animated>
+		<van-tabs :active="active" @change="onChange" animated sticky>
 			<van-tab title="近7日订单">
-				<view class="order-item" v-for="(item,index) in orderList" :key='item' @click="goPage('/pages/cinema/orderdes')">
-					<image class="img" :src="item.goodsPictureUrl"
-					 mode="widthFix"></image>
-					 <view class="des-box">
-					 	<text>订单名称：{{item.orderDataJson.cinemaData.filmName}}</text>
-					 	<text>订单日期：{{item.createTime}}</text>
-					 	<text> </text>
-					 	<text>订单价格：{{item.total/100}}</text>
-					 </view>
-					 <van-icon class='icon' name="arrow" />
-				</view>
+				<loadSke :loading='orderLoading'>
+					<view class="order-item" v-for="(item,index) in orderList" :key='item' @click="goPage(`/pages/cinema/orderdes?outTradeNo=${item.outTradeNo}`)">
+						<image class="img" :src="item.goodsPictureUrl" mode="widthFix"></image>
+						<view class="des-box">
+							<text>订单名称：{{item.orderDataJson.cinemaData.filmName}}</text>
+							<text>订单日期：{{item.createTime}}</text>
+							<text> </text>
+							<text>订单价格：{{item.total/100}}</text>
+						</view>
+						<van-icon class='icon' name="arrow" />
+					</view>
+				</loadSke>
 			</van-tab>
 			<van-tab title="历史订单">
-				<view class="order-item" v-for="(item,index) in 3" :key='item' @click="goPage('/pages/cinema/orderdes')">
-					<image class="img" src="https://t1-1305573081.cos.ap-shanghai.myqcloud.com/wxapp/static/imgs/%E7%94%B5%E5%BD%B1%E5%9B%BE.png"
-					 mode="widthFix"></image>
-					 <view class="des-box">
-					 	<text>订单名称：指环王</text>
-					 	<text>订单日期：2021年02月20日</text>
-					 	<text>订单数量：2</text>
-					 	<text>订单价格：79.9</text>
-					 </view>
-					 <van-icon class='icon' name="arrow" />
-				</view>
+				<loadSke :loading='orderLoading2'>
+					<view class="order-item ios-bottom" v-for="(item,index) in orderList2" :key='item' @click="goPage(`/pages/cinema/orderdes?outTradeNo=${item.outTradeNo}`)">
+						<image class="img" :src="item.goodsPictureUrl" mode="widthFix"></image>
+						<view class="des-box">
+							<text>订单名称：{{item.orderDataJson.cinemaData.filmName}}</text>
+							<text>订单日期：{{item.createTime}}</text>
+							<text> </text>
+							<text>订单价格：{{item.total/100}}</text>
+						</view>
+						<van-icon class='icon' name="arrow" />
+					</view>
+				</loadSke>
 			</van-tab>
 		</van-tabs>
 	</view>
 </template>
 
 <script>
-	import { getOrderList } from '@/api/order.js'
+	import {
+		getOrderList
+	} from '@/api/order.js'
 	export default {
 		data: () => ({
 			active: 0,
-			orderList:{}
+			orderLoading: true,
+			orderLoading2: true,
+			orderList: {},
+			orderList2: {}
 		}),
 		mounted() {
 			this.init()
+			this.init2()
 		},
-		methods:{
-			async init(){
-				let orderListRes =await getOrderList()
-				console.log(orderListRes)
-				orderListRes.rows.map(val=>{
-					val.orderDataJson=JSON.parse(val.orderDataJson)
+		methods: {
+			async init() {
+				let orderListRes = await getOrderList({
+					days: 7,
+					pageNum: 1,
+					pageSize: 10
+				})
+				orderListRes.rows.map(val => {
+					val.orderDataJson = JSON.parse(val.orderDataJson)
+					return val
+				})
+				this.orderList = orderListRes.rows
+				this.orderLoading = false
+			},
+			async init2() {
+				let orderListRes = await getOrderList({
+					pageNum: 1,
+					pageSize: 10
+				})
+				orderListRes.rows.map(val => {
+					val.orderDataJson = JSON.parse(val.orderDataJson)
 					return val
 				})
-				this.orderList=orderListRes.rows
+				this.orderList2 = orderListRes.rows
+				this.orderLoading2 = false
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
+	.ios-bottom{
+		padding-bottom: calc(10px + env(safe-area-inset-bottom)/2);
+	}
 	.order-item {
 		background-color: #FFFFFF;
 		margin-top: 10rpx;
@@ -64,29 +91,34 @@
 		justify-content: flex-start;
 		align-items: stretch;
 		position: relative;
-		&:nth-child(1){
+
+		&:nth-child(1) {
 			margin-top: 20rpx;
 		}
-		
+
 		.img {
 			width: 112rpx;
 			height: 156rpx;
 			margin-right: 50rpx;
 		}
-		.des-box{
+
+		.des-box {
 			display: flex;
 			flex-direction: column;
 			justify-content: space-between;
-			text{
+
+			text {
 				font-size: 26rpx;
 				font-weight: 400;
 				color: #666666;
 			}
-			text:nth-child(2){
+
+			text:nth-child(2) {
 				color: #0F0404 !important;
 			}
 		}
-		.icon{
+
+		.icon {
 			position: absolute;
 			right: 30rpx;
 			top: 50%;

unpackage/dist/dev/mp-weixin/app.json

@@ -60,5 +60,6 @@
     "van-index-bar": "/wxcomponents/vant/index-bar/index",
     "van-index-anchor": "/wxcomponents/vant/index-anchor/index",
     "load-ske": "/components/skeleton/index/index"
-  }
+  },
+  "sitemapLocation": "sitemap.json"
 }

unpackage/dist/dev/mp-weixin/common/main.js

@@ -13,7 +13,7 @@ var _store = _interopRequireDefault(__webpack_require__(/*! ./store */ 11));
 var _toast = _interopRequireDefault(__webpack_require__(/*! @/wxcomponents/vant/toast/toast */ 24));
 
 
-var _utils = __webpack_require__(/*! @/utils/utils.js */ 26);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var loadSke = function loadSke() {__webpack_require__.e(/*! require.ensure | components/skeleton/index/index */ "components/skeleton/index/index").then((function () {return resolve(__webpack_require__(/*! @/components/skeleton/index/index.vue */ 304));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};_vue.default.component('loadSke', loadSke);
+var _utils = __webpack_require__(/*! @/utils/utils.js */ 26);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var loadSke = function loadSke() {__webpack_require__.e(/*! require.ensure | components/skeleton/index/index */ "components/skeleton/index/index").then((function () {return resolve(__webpack_require__(/*! @/components/skeleton/index/index.vue */ 321));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};_vue.default.component('loadSke', loadSke);
 
 
 

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -10537,7 +10537,19 @@ function goMiniApp(data, item) {
 }
 
 //跳转页面
-function goPage(url) {
+function goPage(url, type) {
+  if (type == 'reLaunch') {
+    uni.reLaunch({
+      url: url });
+
+    return;
+  }
+  if (type == 'redirectTo') {
+    uni.redirectTo({
+      url: url });
+
+    return;
+  }
   uni.navigateTo({
     url: url });
 
@@ -36417,7 +36429,36 @@ module.exports = function (str, opts) {
 /* 307 */,
 /* 308 */,
 /* 309 */,
-/* 310 */,
+/* 310 */
+/*!******************************************!*\
+  !*** F:/uniapp/sqxp-uniapp/api/order.js ***!
+  \******************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });exports.getOrderList = getOrderList;exports.getWxOrder = getWxOrder;var _request = _interopRequireDefault(__webpack_require__(/*! @/utils/request */ 18));
+var _baseurl = __webpack_require__(/*! @/api/baseurl */ 21);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+
+
+
+
+// 查询订单列表
+function getOrderList(params) {
+  return (0, _request.default)({
+    url: _baseurl.baseUrl + '/student/film/wxpay/order/list',
+    params: params });
+
+}
+
+// 查询订单列表
+function getWxOrder(path) {
+  return (0, _request.default)({
+    url: _baseurl.baseUrl + "/student/film/wxpay/".concat(path) });
+
+}
+
+/***/ }),
 /* 311 */,
 /* 312 */,
 /* 313 */,
@@ -36437,7 +36478,24 @@ module.exports = function (str, opts) {
 /* 327 */,
 /* 328 */,
 /* 329 */,
-/* 330 */
+/* 330 */,
+/* 331 */,
+/* 332 */,
+/* 333 */,
+/* 334 */,
+/* 335 */,
+/* 336 */,
+/* 337 */,
+/* 338 */,
+/* 339 */,
+/* 340 */,
+/* 341 */,
+/* 342 */,
+/* 343 */,
+/* 344 */,
+/* 345 */,
+/* 346 */,
+/* 347 */
 /*!**********************************************!*\
   !*** F:/uniapp/sqxp-uniapp/api/studytime.js ***!
   \**********************************************/
@@ -36489,28 +36547,28 @@ function getStudentInfo(data) {
 }
 
 /***/ }),
-/* 331 */,
-/* 332 */,
-/* 333 */,
-/* 334 */,
-/* 335 */,
-/* 336 */,
-/* 337 */,
-/* 338 */,
-/* 339 */,
-/* 340 */,
-/* 341 */,
-/* 342 */,
-/* 343 */,
-/* 344 */,
-/* 345 */,
-/* 346 */,
-/* 347 */,
 /* 348 */,
 /* 349 */,
 /* 350 */,
 /* 351 */,
-/* 352 */
+/* 352 */,
+/* 353 */,
+/* 354 */,
+/* 355 */,
+/* 356 */,
+/* 357 */,
+/* 358 */,
+/* 359 */,
+/* 360 */,
+/* 361 */,
+/* 362 */,
+/* 363 */,
+/* 364 */,
+/* 365 */,
+/* 366 */,
+/* 367 */,
+/* 368 */,
+/* 369 */
 /*!*****************************************!*\
   !*** F:/uniapp/sqxp-uniapp/api/home.js ***!
   \*****************************************/
@@ -36614,14 +36672,14 @@ function getPddWxData() {return _getPddWxData.apply(this, arguments);}function _
             getPDDRes.goods_basic_detail_response.list);case 16:case "end":return _context.stop();}}}, _callee);}));return _getPddWxData.apply(this, arguments);}
 
 /***/ }),
-/* 353 */,
-/* 354 */,
-/* 355 */,
-/* 356 */,
-/* 357 */,
-/* 358 */,
-/* 359 */,
-/* 360 */
+/* 370 */,
+/* 371 */,
+/* 372 */,
+/* 373 */,
+/* 374 */,
+/* 375 */,
+/* 376 */,
+/* 377 */
 /*!****************************************!*\
   !*** F:/uniapp/sqxp-uniapp/api/pay.js ***!
   \****************************************/
@@ -36649,7 +36707,7 @@ function getPayData(data) {
 }
 
 /***/ }),
-/* 361 */
+/* 378 */
 /*!*****************************************!*\
   !*** F:/uniapp/sqxp-uniapp/api/amap.js ***!
   \*****************************************/
@@ -36672,109 +36730,6 @@ function amapRegeo(params) {
 
 }
 
-/***/ }),
-/* 362 */,
-/* 363 */,
-/* 364 */,
-/* 365 */,
-/* 366 */,
-/* 367 */,
-/* 368 */,
-/* 369 */,
-/* 370 */,
-/* 371 */,
-/* 372 */,
-/* 373 */,
-/* 374 */,
-/* 375 */,
-/* 376 */,
-/* 377 */,
-/* 378 */,
-/* 379 */,
-/* 380 */,
-/* 381 */,
-/* 382 */,
-/* 383 */,
-/* 384 */,
-/* 385 */,
-/* 386 */,
-/* 387 */,
-/* 388 */,
-/* 389 */,
-/* 390 */,
-/* 391 */,
-/* 392 */,
-/* 393 */,
-/* 394 */,
-/* 395 */,
-/* 396 */,
-/* 397 */,
-/* 398 */,
-/* 399 */,
-/* 400 */,
-/* 401 */,
-/* 402 */,
-/* 403 */,
-/* 404 */,
-/* 405 */,
-/* 406 */,
-/* 407 */,
-/* 408 */,
-/* 409 */,
-/* 410 */,
-/* 411 */,
-/* 412 */,
-/* 413 */,
-/* 414 */,
-/* 415 */,
-/* 416 */,
-/* 417 */,
-/* 418 */,
-/* 419 */,
-/* 420 */,
-/* 421 */,
-/* 422 */,
-/* 423 */,
-/* 424 */,
-/* 425 */,
-/* 426 */,
-/* 427 */,
-/* 428 */,
-/* 429 */,
-/* 430 */,
-/* 431 */,
-/* 432 */,
-/* 433 */,
-/* 434 */,
-/* 435 */
-/*!******************************************!*\
-  !*** F:/uniapp/sqxp-uniapp/api/order.js ***!
-  \******************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.getOrderList = getOrderList;exports.getWxOrder = getWxOrder;var _request = _interopRequireDefault(__webpack_require__(/*! @/utils/request */ 18));
-var _baseurl = __webpack_require__(/*! @/api/baseurl */ 21);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
-
-
-
-
-// 查询订单列表
-function getOrderList(params) {
-  return (0, _request.default)({
-    url: _baseurl.baseUrl + '/student/film/wxpay/order/list',
-    params: params });
-
-}
-
-// 查询订单列表
-function getWxOrder(path) {
-  return (0, _request.default)({
-    url: _baseurl.baseUrl + "/student/film/wxpay/".concat(path) });
-
-}
-
 /***/ })
 ]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/common/vendor.js.map

unpackage/dist/dev/mp-weixin/pages/browserecord/index.js

@@ -155,7 +155,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 
 
-var _applist = __webpack_require__(/*! @/api/applist.js */ 27);var loadSke = function loadSke() {__webpack_require__.e(/*! require.ensure | components/skeleton/index/index */ "components/skeleton/index/index").then((function () {return resolve(__webpack_require__(/*! @/components/skeleton/index/index.vue */ 304));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+var _applist = __webpack_require__(/*! @/api/applist.js */ 27);var loadSke = function loadSke() {__webpack_require__.e(/*! require.ensure | components/skeleton/index/index */ "components/skeleton/index/index").then((function () {return resolve(__webpack_require__(/*! @/components/skeleton/index/index.vue */ 321));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/cinema/cinemalist.js

@@ -146,7 +146,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 
 
-var _cinema = __webpack_require__(/*! @/api/cinema.js */ 272);var loadSke = function loadSke() {__webpack_require__.e(/*! require.ensure | components/skeleton/index/index */ "components/skeleton/index/index").then((function () {return resolve(__webpack_require__(/*! @/components/skeleton/index/index.vue */ 304));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+var _cinema = __webpack_require__(/*! @/api/cinema.js */ 272);var loadSke = function loadSke() {__webpack_require__.e(/*! require.ensure | components/skeleton/index/index */ "components/skeleton/index/index").then((function () {return resolve(__webpack_require__(/*! @/components/skeleton/index/index.vue */ 321));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/cinema/orderdes.wxml

@@ -1 +1 @@
-<view><view class="remind">请到影院现场柜台或取票机取票</view><view class="des-box"><view class="code-box"><view class="code"><text>取票码</text><text>{{$root.g0}}</text></view><image class="qrcode" src="{{$root.g1[0]}}" mode="widthFix"></image></view><view class="order-num"><text>{{"订单号："+orderDes.outTradeNo}}</text><text>已兑换</text></view><view class="des"><text class="film-name">{{orderDes.orderDataJson.cinemaData.filmName}}</text><view class="film-time"><text>时间</text><text>{{orderDes.orderDataJson.cinemaData.showTime}}</text></view><view class="film-address"><text>影院</text><text>{{orderDes.orderDataJson.cinemaData.showTime}}</text></view><view class="film-video"><text>影厅</text><text>{{orderDes.orderDataJson.cinemaData.hallName}}</text></view><view class="film-seat"><text>座位</text><view class="seat-box"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><text>6排6列</text></block></view></view></view><view class="price"><text>总价</text><text>¥79.8</text></view></view></view>
+<view><load-ske vue-id="b1010da6-1" loading="{{loading}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="remind">请到影院现场柜台或取票机取票</view><view class="des-box"><load-ske vue-id="{{('b1010da6-2')+','+('b1010da6-1')}}" loading="{{!orderDes.orderDataJson.FilmOrderNotifyDTO}}" bind:__l="__l" vue-slots="{{['default']}}"><view class="code-box"><view class="code"><text>取票码</text><text>{{$root.g0}}</text></view><image class="qrcode" src="{{$root.g1[0]}}" mode="widthFix"></image></view></load-ske><view class="order-num"><text>{{"订单号："+orderDes.outTradeNo}}</text><text>{{orderDes.orderDataJson.FilmOrderNotifyDTO?'出票成功':'正在出票'}}</text></view><view class="des"><text class="film-name">{{orderDes.orderDataJson.cinemaData.filmName}}</text><view class="film-time"><text>时间</text><text>{{orderDes.orderDataJson.cinemaData.showTime}}</text></view><view class="film-address"><text>影院</text><text>{{orderDes.orderDataJson.cinemaData.cinemaName}}</text></view><view class="film-video"><text>影厅</text><text>{{orderDes.orderDataJson.cinemaData.hallName}}</text></view><view class="film-seat"><text>座位</text><view class="seat-box"><block wx:for="{{seatList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><text>{{item}}</text></block></view></view></view><view class="price"><text>总价</text><text>{{"¥"+orderDes.total/100}}</text></view></view></load-ske></view>

unpackage/dist/dev/mp-weixin/pages/cinema/orderdes.wxss

@@ -50,7 +50,6 @@
   -webkit-align-items: center;
           align-items: center;
   padding-bottom: 38rpx;
-  border-bottom: 1rpx solid #D9D9D9;
 }
 .des-box .code-box .code {
   margin-top: 43rpx;
@@ -80,7 +79,8 @@
   -webkit-align-items: center;
           align-items: center;
   padding: 34rpx 31rpx;
-  border-bottom: 1rpx solid #D9D9D9;
+  border-top: 1rpx dashed #D9D9D9;
+  border-bottom: 1rpx dashed #D9D9D9;
   position: relative;
 }
 .des-box .order-num::after {
@@ -108,13 +108,14 @@
           transform: translate(50%, -50%);
 }
 .des-box .order-num text:nth-child(1) {
+  width: 60%;
+  word-break: break-all;
   font-size: 26rpx;
   font-weight: 400;
   color: #666666;
 }
 .des-box .order-num text:nth-child(2) {
-  width: 91rpx;
-  height: 34rpx;
+  padding: 10rpx;
   display: -webkit-box;
   display: -webkit-flex;
   display: flex;
@@ -133,7 +134,7 @@
 }
 .des-box .des {
   padding: 45rpx 30rpx;
-  border-bottom: 1rpx solid #D9D9D9;
+  border-bottom: 1rpx dashed #D9D9D9;
   display: -webkit-box;
   display: -webkit-flex;
   display: flex;

unpackage/dist/dev/mp-weixin/pages/cinema/placeorder.js

@@ -373,7 +373,10 @@ var _cinema = __webpack_require__(/*! @/api/cinema.js */ 272);function _interopR
                 then( /*#__PURE__*/function () {var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee(res) {var payRes;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
                             _this2.orderRes = res;_context.next = 3;return (
                               wx.requestPayment(_this2.orderRes.data));case 3:payRes = _context.sent;
-                            console.log(payRes);case 5:case "end":return _context.stop();}}}, _callee);}));return function (_x) {return _ref2.apply(this, arguments);};}());case 9:case "end":return _context2.stop();}}}, _callee2);}))();
+                            if (payRes.errMsg == 'requestPayment:ok') {
+                              _this2.goPage("/pages/cinema/orderdes?outTradeNo=".concat(_this2.orderRes.data.outTradeNo), 'reLaunch');
+                            }
+                            console.log(payRes);case 6:case "end":return _context.stop();}}}, _callee);}));return function (_x) {return _ref2.apply(this, arguments);};}());case 9:case "end":return _context2.stop();}}}, _callee2);}))();
 
     } } };exports.default = _default;
 

unpackage/dist/dev/mp-weixin/pages/cinema/schedulelist.js

@@ -97,37 +97,38 @@ var render = function() {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var l1 = _vm.__map(_vm.scheduleList[_vm.filmId], function(item, index) {
-    var $orig = _vm.__get_orig(item)
-
-    var l0 = _vm.__map(item, function(sonItem, sonIndex) {
-      var $orig = _vm.__get_orig(sonItem)
-
-      var g0 = sonItem.showTime.slice(-5)
-      var g1 = (
-        (sonItem.netPrice / 100) *
-        (sonItem.netPrice > 3900
-          ? _vm.discountRule.upDiscountRate
-          : _vm.discountRule.downDiscountRate) *
-        _vm.filmDiscount
-      ).toFixed(2)
-      var m0 = _vm.discontinued(sonItem.stopSellTime)
-      var g2 = m0 ? JSON.stringify(sonItem) : null
-      return {
-        $orig: $orig,
-        g0: g0,
-        g1: g1,
-        m0: m0,
-        g2: g2
-      }
-    })
-
-    return {
-      $orig: $orig,
-      l0: l0
-    }
-  })
-
+  var l1 = _vm.tabShow
+    ? _vm.__map(_vm.scheduleItem, function(item, index) {
+        var $orig = _vm.__get_orig(item)
+
+        var l0 = _vm.__map(item, function(sonItem, sonIndex) {
+          var $orig = _vm.__get_orig(sonItem)
+
+          var g0 = sonItem.showTime.slice(-5)
+          var g1 = (
+            (sonItem.netPrice / 100) *
+            (sonItem.netPrice > 3900
+              ? _vm.discountRule.upDiscountRate
+              : _vm.discountRule.downDiscountRate) *
+            _vm.filmDiscount
+          ).toFixed(2)
+          var m0 = _vm.discontinued(sonItem.stopSellTime)
+          var g2 = m0 ? JSON.stringify(sonItem) : null
+          return {
+            $orig: $orig,
+            g0: g0,
+            g1: g1,
+            m0: m0,
+            g2: g2
+          }
+        })
+
+        return {
+          $orig: $orig,
+          l0: l0
+        }
+      })
+    : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -225,7 +226,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 
 
-var _cinema = __webpack_require__(/*! @/api/cinema.js */ 272);var loadSke = function loadSke() {__webpack_require__.e(/*! require.ensure | components/skeleton/index/index */ "components/skeleton/index/index").then((function () {return resolve(__webpack_require__(/*! @/components/skeleton/index/index.vue */ 304));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+var _cinema = __webpack_require__(/*! @/api/cinema.js */ 272);var loadSke = function loadSke() {__webpack_require__.e(/*! require.ensure | components/skeleton/index/index */ "components/skeleton/index/index").then((function () {return resolve(__webpack_require__(/*! @/components/skeleton/index/index.vue */ 321));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -242,7 +243,8 @@ var _cinema = __webpack_require__(/*! @/api/cinema.js */ 272);var loadSke = func
       cinemaName: '',
       scheduleList: null,
       scheduleListKey: null,
-      discountRule: {} };},
+      discountRule: {},
+      tabShow: true };},
 
   computed: {
     filmList: function filmList() {
@@ -254,6 +256,9 @@ var _cinema = __webpack_require__(/*! @/api/cinema.js */ 272);var loadSke = func
     },
     filmDiscount: function filmDiscount() {
       return this.$store.state.cinema.filmDiscount;
+    },
+    scheduleItem: function scheduleItem() {
+      return this.scheduleList[this.filmId];
     } },
 
   onLoad: function onLoad(option) {
@@ -293,6 +298,7 @@ var _cinema = __webpack_require__(/*! @/api/cinema.js */ 272);var loadSke = func
       this.filmId = this.scheduleListKey[this.current];
       this.selectComponent('#tabs').resize();
       this.tabActive = 0;
+      this.tabShow = true;
     } } };exports.default = _default;
 
 /***/ }),

unpackage/dist/dev/mp-weixin/pages/collectionList/index.js

@@ -155,7 +155,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 
 
-var _applist = __webpack_require__(/*! @/api/applist.js */ 27);var loadSke = function loadSke() {__webpack_require__.e(/*! require.ensure | components/skeleton/index/index */ "components/skeleton/index/index").then((function () {return resolve(__webpack_require__(/*! @/components/skeleton/index/index.vue */ 304));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+var _applist = __webpack_require__(/*! @/api/applist.js */ 27);var loadSke = function loadSke() {__webpack_require__.e(/*! require.ensure | components/skeleton/index/index */ "components/skeleton/index/index").then((function () {return resolve(__webpack_require__(/*! @/components/skeleton/index/index.vue */ 321));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -1 +0,0 @@
-/* pages/index/index.wxss */

unpackage/dist/dev/mp-weixin/pages/question/mockExam.js

@@ -331,7 +331,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 var _dialog = _interopRequireDefault(__webpack_require__(/*! @/wxcomponents/vant/dialog/dialog */ 249));
-var _answer = __webpack_require__(/*! @/api/answer.js */ 224);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};}var selectSwitch = function selectSwitch() {__webpack_require__.e(/*! require.ensure | components/xuan-switch/xuan-switch */ "components/xuan-switch/xuan-switch").then((function () {return resolve(__webpack_require__(/*! @/components/xuan-switch/xuan-switch.vue */ 364));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+var _answer = __webpack_require__(/*! @/api/answer.js */ 224);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};}var selectSwitch = function selectSwitch() {__webpack_require__.e(/*! require.ensure | components/xuan-switch/xuan-switch */ "components/xuan-switch/xuan-switch").then((function () {return resolve(__webpack_require__(/*! @/components/xuan-switch/xuan-switch.vue */ 381));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 {

unpackage/dist/dev/mp-weixin/pages/question/random.js

@@ -350,7 +350,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _answer = __webpack_require__(/*! @/api/answer.js */ 224);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};}var selectSwitch = function selectSwitch() {__webpack_require__.e(/*! require.ensure | components/xuan-switch/xuan-switch */ "components/xuan-switch/xuan-switch").then((function () {return resolve(__webpack_require__(/*! @/components/xuan-switch/xuan-switch.vue */ 364));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+var _answer = __webpack_require__(/*! @/api/answer.js */ 224);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};}var selectSwitch = function selectSwitch() {__webpack_require__.e(/*! require.ensure | components/xuan-switch/xuan-switch */ "components/xuan-switch/xuan-switch").then((function () {return resolve(__webpack_require__(/*! @/components/xuan-switch/xuan-switch.vue */ 381));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/question/sequential.js

@@ -351,7 +351,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _answer = __webpack_require__(/*! @/api/answer.js */ 224);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};}var selectSwitch = function selectSwitch() {__webpack_require__.e(/*! require.ensure | components/xuan-switch/xuan-switch */ "components/xuan-switch/xuan-switch").then((function () {return resolve(__webpack_require__(/*! @/components/xuan-switch/xuan-switch.vue */ 364));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+var _answer = __webpack_require__(/*! @/api/answer.js */ 224);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};}var selectSwitch = function selectSwitch() {__webpack_require__.e(/*! require.ensure | components/xuan-switch/xuan-switch */ "components/xuan-switch/xuan-switch").then((function () {return resolve(__webpack_require__(/*! @/components/xuan-switch/xuan-switch.vue */ 381));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 {

unpackage/dist/dev/mp-weixin/pages/question/wrongTitle.js

@@ -347,7 +347,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _answer = __webpack_require__(/*! @/api/answer.js */ 224);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};}var selectSwitch = function selectSwitch() {__webpack_require__.e(/*! require.ensure | components/xuan-switch/xuan-switch */ "components/xuan-switch/xuan-switch").then((function () {return resolve(__webpack_require__(/*! @/components/xuan-switch/xuan-switch.vue */ 364));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+var _answer = __webpack_require__(/*! @/api/answer.js */ 224);function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {try {var info = gen[key](arg);var value = info.value;} catch (error) {reject(error);return;}if (info.done) {resolve(value);} else {Promise.resolve(value).then(_next, _throw);}}function _asyncToGenerator(fn) {return function () {var self = this,args = arguments;return new Promise(function (resolve, reject) {var gen = fn.apply(self, args);function _next(value) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);}function _throw(err) {asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);}_next(undefined);});};}var selectSwitch = function selectSwitch() {__webpack_require__.e(/*! require.ensure | components/xuan-switch/xuan-switch */ "components/xuan-switch/xuan-switch").then((function () {return resolve(__webpack_require__(/*! @/components/xuan-switch/xuan-switch.vue */ 381));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 {

unpackage/dist/dev/mp-weixin/pages/user/order.wxss

@@ -24,6 +24,9 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.ios-bottom {
+  padding-bottom: calc(10px + env(safe-area-inset-bottom)/2);
+}
 .order-item {
   background-color: #FFFFFF;
   margin-top: 10rpx;

unpackage/dist/dev/mp-weixin/pages/webview/webview.wxss

@@ -1 +0,0 @@
-/* pages/webview/webview.wxss */

utils/utils.js

@@ -47,7 +47,19 @@ export function goMiniApp(data, item) {
 }
 
 //跳转页面
-export function goPage(url) {
+export function goPage(url,type) {
+	if(type=='reLaunch'){
+		uni.reLaunch({
+			url
+		});
+		return
+	}
+	if(type=='redirectTo'){
+		uni.redirectTo({
+			url
+		});
+		return
+	}
 	uni.navigateTo({
 		url
 	});