Sfoglia il codice sorgente

Merge branch 'dev' into 'master'

Dev

See merge request quanshu/mp-ui-user!46
zhong chunping 2 anni fa
parent
commit
40f03e778d

+ 7 - 2
src/packageGoods/order/logistics.vue

@@ -53,7 +53,7 @@
 				</view>
 			</view>
 		</view>
-
+		<u-toast ref="uToast"></u-toast>
 		<!-- 物流信息 -->
 		<view class="logistics" v-if="deliverListData[listIndex][0].companyName && logistics!==''">
 			<!-- #ifdef MP-ALIPAY -->
@@ -163,7 +163,12 @@
 			copyDeliveryFlowId(id) {
 				uni.setClipboardData({
 					data: id,
-				});
+				})
+				// #ifdef MP-ALIPAY
+				this.$refs.uToast.show({
+					message: "内容已复制"
+				})
+				// #endif
 			},
 		}
 	}

+ 2 - 2
src/packageOther/about/index.vue

@@ -11,10 +11,10 @@
 			<view class="flex about-logo">
 				<image src="../../static/public/logo.png" mode="scaleToFill"></image>
 				<!-- #ifndef MP-ALIPAY -->
-				<view class="edition">v 1.0.11</view>
+				<view class="edition">v 1.0.13</view>
 				<!-- #endif -->
 				<!-- #ifdef MP-ALIPAY -->
-				<view class="edition">v 2.2.4</view>
+				<view class="edition">v 2.2.6</view>
 				<!-- #endif -->
 			</view>
 			<view class="about-action">

+ 3 - 0
src/packagePrize/rolling/animation.vue

@@ -117,6 +117,9 @@
 								if (num == 10) {
 									uni.hideLoading();
 									clearInterval(time)
+									uni.navigateBack({
+										delta: 2
+									})
 								}
 							}, 1000)
 						}

+ 6 - 2
src/pages/ticketBox/detail.vue

@@ -62,7 +62,8 @@
 			
 			<!-- 开启盲票 -->
 			<view class="ticket-btn flex">
-				<image class="ticket-btn-game" src="../../static/ticketBox/ticket_game.png" mode="scaleToFill" @click="toRollingGame"></image>
+				<!-- <image class="ticket-btn-game" src="../../static/ticketBox/ticket_game.png" mode="scaleToFill" @click="toRollingGame"></image> -->
+				<image class="ticket-btn-game" src="" mode="scaleToFill" ></image>
 				<view class="ticket-btn-center flex" @click="exchange">
 					<image src="../../static/ticketBox/ticket_btn_center.png" mode="scaleToFill"></image>
 					<view class="ticket-btn-center-txt">刮开盲票</view>
@@ -295,8 +296,11 @@
 
 			toProcess(id) {
 				this.payShow = false
+				// uni.navigateTo({
+				// 	url: `/packagePrize/rolling/index?boxId=${ this.info.boxId }&orderId=${ id }&isTry=0`
+				// })
 				uni.navigateTo({
-					url: `/packagePrize/rolling/index?boxId=${ this.info.boxId }&orderId=${ id }&isTry=0`
+					url: `/packagePrize/purchase/index?boxId=${ this.info.boxId }&orderId=${ id }&isTry=0`
 				})
 			},