lilei 4 lat temu
rodzic
commit
b7bca68df4

+ 2 - 2
components/uni-cart-fix/uni-cart-fix.vue

@@ -39,11 +39,11 @@
 					let _this = this
 					if(_this.closeCurPage){
 						uni.redirectTo({
-							url:"/pages/cart/cart"
+							url:"/pagesA/cart/cart"
 						})
 					}else{
 						uni.navigateTo({
-							url:"/pages/cart/cart"
+							url:"/pagesA/cart/cart"
 						})
 					}
 				},

+ 8 - 9
pages.json

@@ -103,15 +103,6 @@
 				"navigationBarTitleText": "注意事项及服务协议"
 			}
 		}
-        ,{
-            "path" : "pages/cart/cart",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "购物车",
-                "enablePullDownRefresh": false
-            }
-        }
-		
         ,{
             "path" : "pages/goods/goods",
             "style" :                                                                                    
@@ -169,6 +160,14 @@
 	"subPackages": [{
 		"root": "pagesA",
 		"pages": [
+			{
+			    "path" : "cart/cart",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "购物车",
+			        "enablePullDownRefresh": false
+			    }
+			},
 			{
 				"path": "order/order",
 				"style": {

+ 0 - 0
pages/cart/cart.vue → pagesA/cart/cart.vue


+ 5 - 5
pagesA/luckDraw/luckDraw.vue

@@ -22,7 +22,7 @@
 					抽奖剩余次数:
 					<text>{{ reTimes }}</text>
 				</view>
-				<view v-else @click="showPayWin">
+				<view v-else @click="showPayWin('win_4')">
 					支付10乐豆继续抽奖 >
 				</view>
 			</view>
@@ -74,7 +74,7 @@
 		<!-- 更多任务 -->
 		<view class="taskBar" @click="toTaskList">做任务,赚更多抽奖次数</view>
 		<!-- 抽奖活动弹框 -->
-		<u-popup v-model="showLottery" mode="center" close-icon-color="#ffffff" closeable :border-radius="30" width="500rpx" height="450rpx">
+		<u-popup v-model="showLottery" :duration="50" mode="center" close-icon-color="#ffffff" closeable :border-radius="30" width="500rpx" height="450rpx">
 			<view class="lottery-content win_0" v-if="winTypes == 'win_0'">
 				<view class="lottery-title">
 					<image src="../../static/nozj.png"></image>
@@ -281,9 +281,9 @@ export default {
 			this.reTimes = 3
 		},
 		// 抽奖次数用完了
-		showPayWin(){
+		showPayWin(winTypes){
 			this.showLottery = true
-			this.winTypes = 'win_1'
+			this.winTypes = winTypes
 			this.prizeIndex = -1
 			clearCacheFile()
 		},
@@ -293,7 +293,7 @@ export default {
 			this.targetPrize = null;
 			// 抽奖次数用完了
 			if(this.reTimes<=0){
-				this.showPayWin()
+				this.showPayWin('win_1')
 				return
 			}
 			let list = [...this.prizeList];