From 692495f1080bfa314e1c4c5fcba6d0b3a3f37fef Mon Sep 17 00:00:00 2001
From: Gdpao <1341331954@qq.com>
Date: Tue, 4 Aug 2020 21:46:52 +0800
Subject: [PATCH] gdpaoup

---
 components/informations/notice/notice.vue |  3 +--
 components/logininput/identifying.vue     |  3 ++-
 components/mine/order-item/index.vue      |  5 +++--
 components/shop/list/index.vue            | 23 ++++++++++++++++-------
 components/shop/list/item.vue             |  1 +
 components/shop/youhq/index.vue           |  3 ++-
 pageA/register/register.vue               | 20 +++++++++++++++-----
 pageB/photo/index.vue                     |  8 +++++---
 pageD/notice/notice.vue                   |  3 +++
 pageE/order/Details.vue                   |  1 +
 10 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/components/informations/notice/notice.vue b/components/informations/notice/notice.vue
index 36dcd48..e63c347 100644
--- a/components/informations/notice/notice.vue
+++ b/components/informations/notice/notice.vue
@@ -7,7 +7,7 @@
 				<view class="text_view">{{item.content}}</view>
 				<view class="notice_list">
 					<text>查看详情</text>
-					<view> > </view>
+					<u-icon name="arrow-right" color="#666"></u-icon>
 				</view>
 			</view>
 		</view>
@@ -15,7 +15,6 @@
 </template>
 <style lang="scss" scoped>
 	.notice {
-		background: #ECECEC;
 		.notice_view{
 			width: 690rpx;
 			height: 489rpx;
diff --git a/components/logininput/identifying.vue b/components/logininput/identifying.vue
index 67a15d5..384eb1b 100644
--- a/components/logininput/identifying.vue
+++ b/components/logininput/identifying.vue
@@ -68,7 +68,8 @@
 							this.$refs.uCode.start();
 						}, 2000);
 					} else {
-						this.$u.toast('倒计时结束后再发送');
+						// this.$u.toast('倒计时结束后再发送');
+                        console.log("倒计时结束后再发送");
 					}
 				}
 
diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue
index e9f1c02..5f59d40 100644
--- a/components/mine/order-item/index.vue
+++ b/components/mine/order-item/index.vue
@@ -31,7 +31,7 @@
 			<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
 			<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
 			<view class="cancel" v-if="order.view_type == 1" @click="cancelOrder">取消支付</view>
-			<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount)">立即支付</view>
+			<view class="payment" v-if="order.view_type == 1" @click="payNow(order.pay_sn, order.order_amount,order.order_id)">立即支付</view>
 			<view class="service" v-if="order.view_type == 8">联系官方客服</view>
 			<view class="submit" v-if="order.view_type == 8">提交官方审核</view>
 		</view>
@@ -109,10 +109,11 @@ export default {
 				oid: this.order.order_id,
 			});
 		},
-		payNow(pay_sn, order_amount) {
+		payNow(pay_sn, order_amount, id) {
 			this.$u.route('/pageC/cart/cashier', {
 				pay_sn: pay_sn,
 				price: order_amount,
+                order_id: id
 			});
 		},
 	},
diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue
index 268be23..a67bfba 100644
--- a/components/shop/list/index.vue
+++ b/components/shop/list/index.vue
@@ -4,7 +4,7 @@
 		<view>
 			<u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60" ></u-tabs-swiper>
 		</view>
-		<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
+		<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
 				<view class="goods-item">
 					<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
@@ -128,11 +128,20 @@ export default {
         text-align: center;
         color: #333;
     }
-	.goods-item {
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-		margin-top: 20rpx;
-	}
+    .swiper-box {
+        height: 100%;
+        margin-bottom: 10rpx;
+        .swiper-item {
+            height: 100%;
+            .goods-item {
+            	display: flex;
+            	flex-wrap: wrap;
+            	justify-content: space-between;
+                width: 100%;
+                height: 100%;
+                overflow-y: scroll;
+            }
+        }
+    }
 }
 </style>
\ No newline at end of file
diff --git a/components/shop/list/item.vue b/components/shop/list/item.vue
index 56bdefa..0332252 100644
--- a/components/shop/list/item.vue
+++ b/components/shop/list/item.vue
@@ -44,6 +44,7 @@ export default {
 <style lang="scss" scoped>
 .item{
     width: 330rpx;
+    height: 500rpx;
     margin-bottom: 26rpx;
     background-color: #f8f8f8;
     border-radius: 10rpx 10rpx 0rpx 0rpx;
diff --git a/components/shop/youhq/index.vue b/components/shop/youhq/index.vue
index 97a0431..4c9baa3 100644
--- a/components/shop/youhq/index.vue
+++ b/components/shop/youhq/index.vue
@@ -78,7 +78,7 @@ export default {
 			num = this.couponList.length 
 				? this.couponList.length > 4 ? 4 : this.couponList.length
 				: 1
-			this.swiperHeight = (97 + 10) * num + 'px';
+			this.swiperHeight = (200 + 20) * num + 'rpx';
 		},
 		toCouponPage() {
 			this.$u.route({
@@ -116,6 +116,7 @@ export default {
 		box-sizing: border-box;
 		background-color: #ffffff;
 		.coupon-item {
+            height: 200rpx;
 			margin-bottom: 20rpx;
 		}
 	}
diff --git a/pageA/register/register.vue b/pageA/register/register.vue
index c449518..8579985 100644
--- a/pageA/register/register.vue
+++ b/pageA/register/register.vue
@@ -71,6 +71,7 @@
 				value: '',
 				login: '注册',
 				show: false,
+                is_check: null,
 				member_mobile: '', //手机号
 				smslog_type : '1',//状态
 				sms_code : '', //验证码
@@ -107,25 +108,32 @@
 				let type_phone = this.$u.test.mobile( this.member_mobile)
 				if( this.member_mobile == ''){
 					this.$refs.uToast.show({
-						title: '手机号不能为空',
+						title: '手机号不能为空！',
 						type: 'error'
 					})
 					return false;
 				}
 				if (type_phone == false) {
 					this.$refs.uToast.show({
-						title: '手机号格式不正确',
+						title: '手机号格式不正确！',
 						type: 'error'
 					});
 					return false;
 				}
 				if( this.sms_code == ''){
 					this.$refs.uToast.show({
-						title: '验证码不能为空',
+						title: '验证码不能为空！',
 						type: 'error'
 					})
 					return false;
 				}
+                if (this.is_check) {
+                    this.$refs.uToast.show({
+                    	title: '请同意协议！',
+                    	type: 'error'
+                    })
+                    return false;
+                }
 				this.$u.api.phoneRegister({
 					member_mobile: this.member_mobile,
 					sms_code: this.sms_code
@@ -169,11 +177,13 @@
 			},
 			// 选中某个复选框时，由checkbox时触发
 			checkboxChange(e) {
-				//console.log(e);
+				// console.log(e,1);
+                this.is_check = e.value;
+                console.log(this.is_check);
 			},
 			// 选中任一checkbox时，由checkbox-group触发
 			checkboxGroupChange(e) {
-				// console.log(e);
+				// console.log(e,2);
 			},
 			mask_u() {
 				this.show = !this.show
diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue
index aa21314..4183d16 100644
--- a/pageB/photo/index.vue
+++ b/pageB/photo/index.vue
@@ -10,7 +10,7 @@
             </swiper-item>
         </swiper>
         <view class="bottom">
-            <view class="item">
+            <view class="item" :style="{ width: photo_len * 20 + 100 + 'rpx' }">
                 <text>图片</text>
                 <view v-for="(item,index) in list.photo" :key="index" :style="{'background-color':index == swiper_id ? '#fff' : '#ede8e8'}"></view>
             </view>
@@ -46,7 +46,7 @@
                         <view>
                             
                         </view>
-                        <view class="more-reply" v-if="item.reply_count">展开更多回复<u-icon name="arrow-down"></u-icon></view>
+                        <!-- <view class="more-reply" v-if="item.reply_count">展开更多回复<u-icon name="arrow-down"></u-icon></view> -->
                     </view>
 				</block>
 				<view class="no-data" v-else>111</view>
@@ -120,7 +120,6 @@
         .item{
             display: flex;
             align-items: center;
-			width: 50%;
             padding: 8rpx 16rpx;
             font-size: 24rpx;
             color: #fff;
@@ -349,6 +348,7 @@
 			.content {
 				height: 60rpx;
 				margin: 10rpx 0;
+                line-height: 30rpx;
 				font-size: 24rpx;
 			}
 			.price {
@@ -379,6 +379,7 @@ export default {
 			send_value: "", // 输入的值
 			cartList: [],
 			cart_len: 0,
+			photo_len: 0,
 			edit_text: "有爱评论，说点好听的 ~",
 			edit_text_other: "有爱评论，说点好听的 ~",
 			commentList: [], // 评论
@@ -408,6 +409,7 @@ export default {
             this.$u.api.articleInfo({article_id}).then((res)=>{
                 this.list = res.data.info;
 				this.cart_len = res.data.info.goods.length;
+                this.photo_len = res.data.info.photo.length;
             })
         },
 		// 改变swiper
diff --git a/pageD/notice/notice.vue b/pageD/notice/notice.vue
index d4fb54a..aaa702b 100644
--- a/pageD/notice/notice.vue
+++ b/pageD/notice/notice.vue
@@ -32,6 +32,9 @@
 </script>
 
 <style lang="scss" scoped>
+    page {
+        background-color: #ECECEC;
+    }
 	.sousuo {
 		height: 113rpx;
 		border: 1px #f00 solid;
diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue
index 992a662..5c5bd79 100644
--- a/pageE/order/Details.vue
+++ b/pageE/order/Details.vue
@@ -251,6 +251,7 @@ export default {
 			this.$u.route('/pageC/cart/cashier', {
 				pay_sn: this.orderInfo.pay_sn,
 				price: this.orderInfo.order_amount,
+				order_id: this.orderInfo.order_id,
 			});
 		},
 		toOtherPage(url) {