Browse Source

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

lilei 4 years ago
parent
commit
78b5017d6b

+ 6 - 1
pages/cart/cart.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="cart-pages">
 		<view class="cart-bar" v-if="cartList.length>0">
-			<view>共{{count}}件商品</view>
+			<view>共<text class="special-val">{{count}}</text>件商品</view>
 			<view @click="editCart">
 				<text class="edit" v-if="!isEdit">管理</text>
 				<text class="save" v-else>完成</text>
@@ -346,6 +346,11 @@ page{
 		.save{
 			color: #00aaff;
 		}
+		.special-val{
+			color: #FA3534;
+			font-weight: bold;
+			margin: 0 10rpx;
+		}
 	}
 	.goods-list{
 		flex-grow: 1;

+ 1 - 1
pages/order/LogList.vue

@@ -104,7 +104,7 @@
 			handleGet(item) {
 				console.log(item,'iiiiiiiiii')
 				let params = {
-					  "expressNo": item.expressNum,
+					  "expressNo": item.expressNo,
 						"orderNo": item.orderNo,
 				}
 				finishOrder(params).then(res=>{

+ 7 - 0
pages/order/order.vue

@@ -333,6 +333,13 @@
 			},
 			// 支付
 			toPayOrder() {
+				if (this.password === '') {
+					uni.showToast({
+						title: '请先输入支付密码',
+						icon: 'none'
+					})
+					return false
+				}
 				let params = {
 					payPwd: this.password,
 					id: this.orderId

+ 8 - 1
pages/order/orderDetail.vue

@@ -154,7 +154,7 @@
 			// 跳转到设置支付密码页
 			toSetPwd () {
 				uni.navigateTo({
-					url:"/pages/userCenter/userInfo/paymentPwd"
+					url:"/pages/userCenter/userInfo/smsVerification"
 				})
 			},
 			// 设置密码成功, 打开输入密码弹窗
@@ -197,6 +197,13 @@
 			},
 			// 支付
 			toPayOrder() {
+				if (this.password === '') {
+					uni.showToast({
+						title: '请先输入支付密码',
+						icon: 'none'
+					})
+					return false
+				}
 				let id = this.orderInfo.id
 				let params = {
 					payPwd: this.password,

+ 14 - 0
pages/toOrder/index.vue

@@ -210,6 +210,13 @@
 			},
 			// 支付  保存订单
 			toSaveOrder () {
+				if (!this.userInfo.receiveAddress) {
+					uni.showToast({
+						title: '请先输入收货地址',
+						icon: 'none'
+					})
+					return false
+				}
 				// 已生成订单
 				if(this.orderId) {
 					// 校验用户是否设置过支付密码
@@ -247,6 +254,13 @@
 			},
 			// 支付
 			toPay() {
+				if (this.password === '') {
+					uni.showToast({
+						title: '请先输入支付密码',
+						icon: 'none'
+					})
+					return false
+				}
 				let params = {
 					payPwd: this.password,
 					id: this.orderId

+ 1 - 1
pages/userCenter/userInfo/changePayPwd.vue

@@ -2,7 +2,7 @@
 	<view class="changePayPwd-container">
 		<text class="pwd-describe">请输入当前支付密码</text>
 		<view class="pwd-item">
-			<u-input v-model="oldPwd" border type="text" input-align="center" placeholder="请输入支付密码" maxlength="50" class="inp-pwd" />
+			<u-input v-model="oldPwd" border type="password" input-align="center" placeholder="请输入支付密码" :maxlength="30" class="inp-pwd" />
 		</view>
 		<view class="btn-con">
 			<u-button class="handle-btn" type="info" size="medium" @click="cancel">取消</u-button>