Browse Source

2023-6-25

cmy 1 year ago
parent
commit
b114e255f7
4 changed files with 51 additions and 25 deletions
  1. 1 1
      pages/cart/cart2.vue
  2. 26 15
      pages/order/createOrder.vue
  3. 9 3
      pages/product/classify.vue
  4. 15 6
      pages/product/product.vue

+ 1 - 1
pages/cart/cart2.vue

@@ -302,7 +302,7 @@
 				});
 
 				uni.navigateTo({
-					url: '/pages/order/createOrder?id=' + goodsData.join(',')
+					url: '/pages/order/createOrder?isRz=1&id=' + goodsData.join(',')
 				});
 			},
 		}

File diff suppressed because it is too large
+ 26 - 15
pages/order/createOrder.vue


+ 9 - 3
pages/product/classify.vue

@@ -84,9 +84,15 @@
 					});
 			},
 			navTo: function(ls) {
-				uni.navigateTo({
-					url: '/pages/product/product?id=' + ls.id
-				});
+				if (this.type == 7) {
+					uni.navigateTo({
+						url: '/pages/product/product?isRz=1&id=' + ls.id
+					});
+				}else{
+					uni.navigateTo({
+						url: '/pages/product/product?id=' + ls.id
+					});
+				}
 			},
 			// 请求载入数据
 			async loadData() {

+ 15 - 6
pages/product/product.vue

@@ -21,8 +21,8 @@
 				<view class="flex timeStop">
 					<view>距离结束</view>
 					<uni-countdown color="#ffffff" background-color="#D65B3F" splitor-color="#FFFFFF" :show-day="false"
-						:hour="seckillObj.stopTimeH" :minute="seckillObj.stopTimeM"
-						:second="seckillObj.stopTimeS"></uni-countdown>
+						:hour="seckillObj.stopTimeH" :minute="seckillObj.stopTimeM" :second="seckillObj.stopTimeS">
+					</uni-countdown>
 				</view>
 			</view>
 		</view>
@@ -297,13 +297,18 @@
 					h: '', //时
 					i: '', //分
 					s: '' //秒
-				}
+				},
+				isRz: 0,
 			};
 		},
 		async onLoad(options) {
+
 			let obj = this;
 			//保存商品id
 			this.goodsid = options.id;
+			if (options.isRz) {
+				obj.isRz = +options.isRz;
+			}
 			// 判断有无人邀请
 			if (options.spread) {
 				// 存储邀请人
@@ -672,10 +677,14 @@
 					}) {
 						uni.hideLoading()
 						if (obj.type == 1) {
+							let url = '/pages/order/createOrder?id=' + data.cartId + '&goodsType=' + obj.goodsType;
+							// 判断是否需要入驻说明
+							if(obj.isRz===1){
+								url+='&isRz=1'
+							}
 							// 跳转到支付页
 							uni.navigateTo({
-								url: '/pages/order/createOrder?id=' + data.cartId + '&goodsType=' + obj
-									.goodsType
+								url
 							});
 						}
 						if (obj.type == 2) {
@@ -1446,4 +1455,4 @@
 			line-height: 1;
 		}
 	}
-</style>
+</style>

Some files were not shown because too many files changed in this diff