From 4d45173f5acda5c45fec8d5fa1a54de068684316 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Wed, 18 Aug 2021 12:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=91=E9=81=93=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA/=E7=BA=BF=E4=B8=8B=E6=94=AF=E4=BB=98=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E4=BC=98=E5=8C=96/=E4=BF=A1=E6=81=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/channel/index.vue       |  2 --
 pages/message/index.vue       |  4 ++--
 pages/order/confirm_order.vue | 20 +++++++++++++-------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pages/channel/index.vue b/pages/channel/index.vue
index e88a54b..f69df56 100644
--- a/pages/channel/index.vue
+++ b/pages/channel/index.vue
@@ -92,7 +92,6 @@
 					this.channel_list.forEach((item,index) => {
 						item.content.forEach((item2,index2) => {
 							this.my_list.forEach((item3,index3) => {
-								console.log(item3)
 								if(item3 == item2.id) {
 									this.activaItem(item2,index2,index,item,1)
 								}
@@ -113,7 +112,6 @@
 						this.select_list[item2.name] = {p_index: index, c_index: index2};
 						this.chanel_id.push(item2.id);
 						this.channel_list[index].content[index2].checked = true;
-						console.log('频道',this.select_list)
 					}
 				}
 				if(type != 1) {
diff --git a/pages/message/index.vue b/pages/message/index.vue
index e52f8f1..5dd1e28 100644
--- a/pages/message/index.vue
+++ b/pages/message/index.vue
@@ -4,7 +4,7 @@
 			<view class="lf-row-between lf-m-b-20">
 				<view class="lf-color-black lf-flex">
 					<text class="hot" v-if="item.is_read == 0"></text>
-					<text class="gray" v-else></text>
+					<!-- <text class="gray" v-else></text> -->
 					<text class="lf-font-28 lf-m-l-10">收到一条新消息</text>
 				</view>
 				<view class="lf-color-gray lf-font-22">{{item.created_at}} </view>
@@ -32,7 +32,7 @@
 				isPage: false
 			}
 		},
-		onLoad(){
+		onShow(){
 			this.getMessageList()
 		},
 		methods: {
diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue
index 607c866..ebe9720 100644
--- a/pages/order/confirm_order.vue
+++ b/pages/order/confirm_order.vue
@@ -60,25 +60,34 @@
 			
 			<view class="lf-p-r-32 lf-p-l-32 lf-m-t-30">
 				<button class="cu-btn bg-white margin-self" :class="pay_type==1?'border-green':'border'" @tap="payStatus(1)">
-					<text class="lf-font-32" :class="pay_type==1?'text-green':'lf-color-333'">定金支付</text>
+					<text class="lf-font-32" :class="pay_type==1?'text-green':'lf-color-333'">线下支付</text>
 					<text class="lf-iconfont lf-icon-dui lf-font-44 lf-color-primary" v-if="pay_type==1" style="position: absolute;right: 22rpx;"></text>
 				</button>
 			</view>
 			
 			<view class="lf-p-r-32 lf-p-l-32 lf-m-t-30">
 				<button class="cu-btn bg-white margin-self" :class="pay_type==2?'border-green':'border'" @tap="payStatus(2)">
-					<text class="lf-font-32" :class="pay_type==2?'text-green':'lf-color-333'">首款支付</text>
+					<text class="lf-font-32" :class="pay_type==2?'text-green':'lf-color-333'">订金支付</text>
 					<text class="lf-iconfont lf-icon-dui lf-font-44 lf-color-primary" v-if="pay_type==2" style="position: absolute;right: 22rpx;"></text>
 				</button>
 			</view>
 			
 			<view class="lf-p-r-32 lf-p-l-32 lf-m-t-30">
 				<button class="cu-btn bg-white margin-self" :class="pay_type==3?'border-green':'border'" @tap="payStatus(3)">
-					<text class="lf-font-32" :class="pay_type==3?'text-green':'lf-color-333'">线下支付</text>
+					<text class="lf-font-32" :class="pay_type==3?'text-green':'lf-color-333'">定金支付</text>
 					<text class="lf-iconfont lf-icon-dui lf-font-44 lf-color-primary" v-if="pay_type==3" style="position: absolute;right: 22rpx;"></text>
 				</button>
 			</view>
 			
+			<view class="lf-p-r-32 lf-p-l-32 lf-m-t-30">
+				<button class="cu-btn bg-white margin-self" :class="pay_type==4?'border-green':'border'" @tap="payStatus(4)">
+					<text class="lf-font-32" :class="pay_type==4?'text-green':'lf-color-333'">首款支付</text>
+					<text class="lf-iconfont lf-icon-dui lf-font-44 lf-color-primary" v-if="pay_type==4" style="position: absolute;right: 22rpx;"></text>
+				</button>
+			</view>
+			
+			
+			
 		</view>
 		
 		<view class="btn-bottom solid-top1">
@@ -153,10 +162,7 @@
 				this.ifPay = false;
 				this.$http(this.API.API_CREATEORDER,{id: this.goods_id,num: 1,pay_type: this.pay_type,name:this.contact,mobile:this.phone}).then(res => {
 					this.order_id = res.data.id
-					console.log(res)
-					
-					
-					if(this.pay_type == 3) {
+					if(this.pay_type == 1) {
 						this.ifPay = true
 						this.$url('/pages/payState/paystate?ifSuccess=1&order_id='+this.order_id,{type: 'redirect'})
 					}else {