Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang

pages/index/index.vue

@@ -184,7 +184,7 @@
 			overflow: hidden;
 			margin: 20rpx 32rpx;
 			background-color: #FFFFFF;
-			box-shadow:0 0 10px 5px #e5e5e5;
+			box-shadow: 0 10rpx 20rpx 0 rgba(0, 0, 0, 0.1);
 			align-items: flex-start;
 			.left{
 				overflow: hidden;

pages/order/confirm-order.vue

@@ -1,12 +1,13 @@
 <template>
 	<view>
 		<!-- 商品信息 -->
+		<block v-if="isRight(orderDetails)">
 			<self-line/>
 			<view class="bg-white padding-tb-sm">
 				<skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true">
 			
 					<view class="flex justify-between align-start padding-top-sm padding-lr">
-					<image v-if="orderDetails.goods.cover" :src="orderDetails.goods.cover" mode="aspectFill" style="width: 150rpx; height: 150rpx;"></image>
+						<image :src="orderDetails.goods.cover" mode="aspectFill" style="width: 150rpx; height: 150rpx;"></image>
 						<view class="flex-sub padding-left-sm">
 							<view class="bref-box margin-top-xs">
 								{{orderDetails.goods.name}}
@@ -71,6 +72,8 @@
 					</view>
 				</view>
 			</skeleton>
+		</block>
+		
 	</view>
 </template>
 
@@ -89,12 +92,18 @@
 				goods_id: 1,
 				goods_specs_id: 1,
 				orderDetails: {},
-				ifchoose: true
+				ifchoose: true,
+				ifCheck: true
 			}
 		},
 		computed: {
 			total(){
 				return this.num * this.price
+			},
+			isRight(){
+				return function(val){
+					return this.$shared.isRight(val);
+				}
 			}
 		},
 		onLoad(e) {
@@ -107,6 +116,11 @@
 					if(res.code == 0) {
 						this.orderDetails = res.data
 						this.skeletonLoading = false
+						if( Object.keys(res.metal_data).length != 0 ) {
+							this.ifCheck = false
+						}else {
+							this.ifCheck = true
+						}
 					}else {
 						this.$msg(res.msg)
 					}
@@ -136,6 +150,9 @@
 			},
 			submit(){
 				if(this.ifchoose == true) {
+					if(this.ifCheck == false) {
+						this.$routerGo('/pages/login/index?type=phone')
+					}else {
 						this.$http(this.API.API_PRPAID, {
 							goods_id: this.goods_id,
 							goods_specs_id: this.goods_specs_id,
@@ -143,17 +160,6 @@
 							token: 'fdf12000e774e48bc60c6b6d42055602'
 						}).then(res => {
 							console.log(res)
-						
-						// let nonceStr = res.data.nonceStr
-						// appId: "wxb35ef055a4dd8ad4"
-						// nonceStr: "60d3125d138af"
-						// order_num: "2842855348400816128"
-						// package: "prepay_id=wx23185213000285e14ea77ac97acc670000"
-						// paySign: "6DC330CBDF6C29BEDD4D254D9DA97364"
-						// signType: "MD5"
-						// timeStamp: "1624445533"
-						
-						
 							uni.requestPayment({
 								orderInfo: res.data.order_num,
 								timeStamp: res.data.timeStamp,
@@ -161,14 +167,17 @@
 								package: res.data.package,
 								signType: res.data.signType,
 								paySign: res.data.paySign,
-							complete: result => {
-								console.log(result)
+								success: function (res) {
+									this.$routerGo('/pages/order/pay-success?ifSuccess='+1)
+								},
+								fail: function (err) {
+									this.$routerGo('/pages/order/pay-success?ifSuccess='+2)
 								}
 							})
 							
 						})
-					return
-					this.$routerGo('/pages/order/pay-success')
+					}
+					
 				}else {
 					this.$msg('请认真阅读并同意协议!')
 					return

pages/order/index.vue

@@ -224,7 +224,8 @@
 			overflow: hidden;
 			margin: 20rpx 32rpx;
 			background-color: #FFFFFF;
-			box-shadow: 0 0 10px 5px #e5e5e5;
+			// box-shadow: 0 0 10px 5px #e5e5e5;
+			box-shadow: 0 10rpx 20rpx 0 rgba(0, 0, 0, 0.1);
 			align-items: flex-start;
 
 			.left {

pages/order/order-details.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
-
 		<!-- 商品信息 -->
+		<block v-if="isRight(orderDetails)">
 			<self-line/>
 			<view class="bg-white padding-tb-sm">
 				<skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true">
@@ -25,7 +25,6 @@
 							</view>
 						</view>
 					</view>
-
 				</skeleton>
 			</view>
 			
@@ -94,6 +93,7 @@
 					</view>
 				</view>
 			</skeleton>
+		</block>
 	</view>
 </template>
 
@@ -116,6 +116,11 @@
 		computed: {
 			total(){
 				return this.num * this.price
+			},
+			isRight(){
+				return function(val){
+					return this.$shared.isRight(val);
+				}
 			}
 		},
 		onLoad(e) {

pages/order/pay-success.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view v-if="false" class="flex flex-direction justify-around text-center align-center margin-bottom margin-top-lg">
+		<view v-if="ifpaySuccess==1" class="flex flex-direction justify-around text-center align-center margin-bottom margin-top-lg">
 			<view>
 				<image src="@/static/images/system/paysuccess.png" mode="widthFix" style="height: 100px;width: 100px;"></image>
 			</view>
@@ -37,7 +37,7 @@
 	export default {
 		data() {
 			return {
-				
+				ifpaySuccess:1
 			}
 		},
 		methods: {
@@ -46,6 +46,9 @@
 					url: '/pages/order/index'
 				})
 			}
+		},
+		onLoad(e) {
+			this.ifpaySuccess = e.ifSuccess
 		}
 	}
 </script>

pages/order/unpay-details.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
 		<!-- 商品信息 -->
+		<block v-if="isRight(orderDetails)">
 			<self-line/>
 			<view class="bg-white padding-tb-sm">
 				<skeleton :loading="skeletonLoading" :row="2" :showAvatar="false" :showTitle="true">
@@ -61,6 +62,7 @@
 					</view>
 				</view>
 			</skeleton>
+		</block>
 	</view>
 </template>
 
@@ -78,6 +80,11 @@
 		computed: {
 			total(){
 				return this.num * this.price
+			},
+			isRight(){
+				return function(val){
+					return this.$shared.isRight(val);
+				}
 			}
 		},
 		onLoad(e) {