Przeglądaj źródła

Signed-off-by: 1004749546@qq.com <1004749546@qq.com>
登录修改

1004749546@qq.com 4 lat temu
rodzic
commit
d012ecee57
4 zmienionych plików z 88 dodań i 32 usunięć
  1. 1 1
      App.vue
  2. 38 28
      pages/getOrder/getOrder.vue
  3. 49 3
      pages/login/login.vue
  4. BIN
      static/img/logo.png

+ 1 - 1
App.vue

@@ -1,6 +1,6 @@
 <script>
 	// const uat_URL = 'http://md.test.zyucgj.com/saas/clz/' // 预发布
-	const uat_URL = 'http://192.168.16.103:8103/cw-wechat/' // 本地
+	const uat_URL = 'http://192.168.16.102:8103/cw-wechat/' // 本地
 	const pro_URL = 'https://car.zyucgj.com/saas/clz/'  // 生产
 	const buildType = 0 // 打包环境对应类型,1 生产 0 预发布
 	const buildURL = buildType ? pro_URL : uat_URL // 打包后实际对应的url

+ 38 - 28
pages/getOrder/getOrder.vue

@@ -12,14 +12,14 @@
 			<!-- 检查 -->
 			<view v-if="stepIndex===1" class="step-item step-two">
 				<view class="item top">
-					<text>-请完成以下操作-</text>
+					<text class="item-text">-请完成以下操作-</text>
 					<image src="/static/img/cztis.png" mode="aspectFit"></image>
 					<view class="care">
 						注意:洗车过程中禁止移动车辆和上下车
 					</view>
 				</view>
 				<view class="item bottom">
-					<text>超高加装件不能清洗</text>
+					<text class="item-text">超高加装件不能清洗</text>
 					<image src="/static/img/zyts.png" mode="aspectFit"></image>
 				</view>
 			</view>
@@ -294,10 +294,10 @@
 					if (res.status==200) {
 						let data = res.data
 						// 保存成功后 请求预支付返回吊起微信支付所需参数
-						// this.getPayData(data)
-						uni.redirectTo({
-							url:`/pages/work/index/index?washCarType=${data.itemCode}&orderNo=${data.orderNo}`
-						})
+						this.getPayData(data)
+						// uni.redirectTo({
+						// 	url:`/pages/work/index/index?washCarType=${data.itemCode}&orderNo=${data.orderNo}`
+						// })
 					} else {
 						uni.hideLoading()
 						// 刷新服务项
@@ -313,24 +313,32 @@
 					uni.hideLoading()
 					if (res.status == 200) {
 						let data = res.data
-						uni.requestPayment({
-						    provider: 'wxpay',
-						    timeStamp: data.timeStamp,
-						    nonceStr: data.nonceStr,
-						    package: data.package,
-						    signType: data.signType,
-						    paySign: data.paySign,
-						    success: function (res) {
-						        console.log('success:' + JSON.stringify(res));
-								// 付款成功后开始洗车
-								uni.redirectTo({
-									url:`/pages/work/index/index?washCarType=${data.itemCode}&orderNo=${data.orderNo}`
-								})
-						    },
-						    fail: function (err) {
-						        console.log('fail:' + JSON.stringify(err));
-						    }
-						});
+						// 0元订单直接支付成功,不用吊微信支付
+						if (data.tradeStatus && data.tradeStatus=="PAID") {
+							// 付款成功后开始洗车
+							uni.redirectTo({
+								url:`/pages/work/index/index?washCarType=${data.itemCode}&orderNo=${data.orderNo}`
+							})
+						} else {
+							uni.requestPayment({
+							    provider: 'wxpay',
+							    timeStamp: data.timeStamp,
+							    nonceStr: data.nonceStr,
+							    package: data.package,
+							    signType: data.signType,
+							    paySign: data.paySign,
+							    success: function (res) {
+							        console.log('success:' + JSON.stringify(res));
+									// 付款成功后开始洗车
+									uni.redirectTo({
+										url:`/pages/work/index/index?washCarType=${data.itemCode}&orderNo=${data.orderNo}`
+									})
+							    },
+							    fail: function (err) {
+							        console.log('fail:' + JSON.stringify(err));
+							    }
+							});
+						}
 					} else {
 						this.toashMsg(res.message)
 					}
@@ -383,18 +391,19 @@
 					display: flex;
 					flex-direction: column;
 					align-items: center;
-					// margin-top: 20rpx;
-					// padding-top: 20rpx;
 					image{
 						width: 80%;
 						flex: 1;
 					}
+					
 				}
 				.top{
 					text{
 						color: #df928e;
 						font-size: 24rpx;
-						// margin-top: 20rpx;
+					}
+					.item-text{
+						padding-top: 20rpx;
 					}
 					.care{
 						padding: 10rpx 20rpx;
@@ -409,8 +418,9 @@
 					text{
 						font-size: 24rpx;
 						color: #333;
+					}
+					.item-text{
 						padding-top: 20rpx;
-						// margin-top: 20rpx;
 					}
 				}
 			}

+ 49 - 3
pages/login/login.vue

@@ -1,6 +1,15 @@
 <template>
 	<view class="content">
-		<u-button type="success" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">微信一键登录</u-button>
+		<image class="logo-img" mode="aspectFit" src="/static/img/logo.png"></image>
+		<u-button shape="circle" type="succes" plain class="login-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+			<view class="login-btn-content">
+			  <view class="wechat-img"></view>
+			  <view>微信登陆</view>
+			</view>
+		</u-button>
+		<view class="canseLogin" @click="gotoHome()">
+		  取消登录
+		</view>
 	</view>
 </template>
 
@@ -81,16 +90,53 @@
 						duration: 2500
 					});
 				}
+			},
+			gotoHome () {
+			  wx.reLaunch({
+			    url: '/pages/index/index'
+			  })
 			}
 		}
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.content {
+		width: 100%;
+		height: 100%;
 		padding: 0;
 		display: flex;
 		align-items: center;
-		justify-content: center;
+		padding-top: 35%;
+		.logo-img {
+			width: 400rpx;
+			height: 100rpx;
+		}
+	}
+	.wechat-img {
+	  width: 40px;
+	  height: 35px;
+	  margin-right: 10px;
+	  padding-top: 10px;
+	  background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyBjbGFzcz0iaWNvbiIgd2lkdGg9IjMwcHgiIGhlaWdodD0iMzBweCIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGZpbGw9IiMwOUJCMDciIGQ9Ik0xMDEwLjggNjI4YzAtMTQxLjItMTQxLjMtMjU2LjItMjk5LjktMjU2LjItMTY4IDAtMzAwLjMgMTE1LjEtMzAwLjMgMjU2LjIgMCAxNDEuNCAxMzIuMyAyNTYuMiAzMDAuMyAyNTYuMiAzNS4yIDAgNzAuNy04LjkgMTA2LTE3LjdsOTYuOCA1My0yNi42LTg4LjJjNzAuOS01My4yIDEyMy43LTEyMy43IDEyMy43LTIwMy4zek02MTggNTg4LjhjLTIyLjEgMC00MC0xNy45LTQwLTQwczE3LjktNDAgNDAtNDAgNDAgMTcuOSA0MCA0MGMwIDIyLTE3LjkgNDAtNDAgNDB6IG0xOTQuMy0wLjNjLTIyLjEgMC00MC0xNy45LTQwLTQwczE3LjktNDAgNDAtNDAgNDAgMTcuOSA0MCA0MC0xNy45IDQwLTQwIDQweiIgIC8+PHBhdGggZmlsbD0iIzA5QkIwNyIgZD0iTTM2Ni4zIDEwNi45Yy0xOTQuMSAwLTM1My4xIDEzMi4zLTM1My4xIDMwMC4zIDAgOTcgNTIuOSAxNzYuNiAxNDEuMyAyMzguNGwtMzUuMyAxMDYuMiAxMjMuNC02MS45YzQ0LjIgOC43IDc5LjYgMTcuNyAxMjMuNyAxNy43IDExLjEgMCAyMi4xLTAuNSAzMy0xLjQtNi45LTIzLjYtMTAuOS00OC4zLTEwLjktNzQgMC0xNTQuMyAxMzIuNS0yNzkuNSAzMDAuMi0yNzkuNSAxMS41IDAgMjIuOCAwLjggMzQgMi4xQzY5MiAyMTIuNiA1MzkuOSAxMDYuOSAzNjYuMyAxMDYuOXpNMjQ3LjcgMzQ5LjJjLTI2LjUgMC00OC0yMS41LTQ4LTQ4czIxLjUtNDggNDgtNDggNDggMjEuNSA0OCA0OC0yMS41IDQ4LTQ4IDQ4eiBtMjQ2LjYgMGMtMjYuNSAwLTQ4LTIxLjUtNDgtNDhzMjEuNS00OCA0OC00OCA0OCAyMS41IDQ4IDQ4LTIxLjUgNDgtNDggNDh6IiAgLz48L3N2Zz4K') no-repeat center  center;
+	}
+	
+	.login-btn {
+	  margin-top: 30px;
+	}
+	
+	.login-btn-content {
+	  width: 65vw;
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	}
+	.canseLogin{
+	  width: 65vw;
+	  padding : 20rpx 15rpx;
+	  text-align : center;
+	  font-size: 1em;
+	  margin-top: 1.8em;
+	  color: #666;
 	}
 </style>

BIN
static/img/logo.png