From 4c77d25cebc53bab91b341c9c3fd8890ee51f269 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 5 Nov 2021 14:46:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=B8=AD=E5=BF=83t-1?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/no-list-components/index.vue | 1 -
 pages/news/detail.vue                   | 2 +-
 pages/user/index.vue                    | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/no-list-components/index.vue b/components/no-list-components/index.vue
index ce6f5e2..49f4ffe 100644
--- a/components/no-list-components/index.vue
+++ b/components/no-list-components/index.vue
@@ -21,7 +21,6 @@
 		 * no-goods（没有商品）
 		 * no-list（没有订单列表）
 		 * no-news（没有任何消息）
-		 * no-new1（没有任何消息1）
 		 * no-chain （没有区块链信息）
 		 * no-collection（没有任何收藏信息）
 		 * no-foot （没有足迹信息）
diff --git a/pages/news/detail.vue b/pages/news/detail.vue
index a7da768..922813e 100644
--- a/pages/news/detail.vue
+++ b/pages/news/detail.vue
@@ -12,7 +12,7 @@
       <view class="time">{{item.created_at}}</view>
       <view class="read_at" v-if="item.read_at === ''"></view>
     </view>
-	  <no-list v-if="items.length === 0" name='no-new1' txt="空空如也~" />
+	  <no-list v-if="items.length === 0" name='no-news' txt="空空如也~" />
   </view>
 </template>
 
diff --git a/pages/user/index.vue b/pages/user/index.vue
index a3a76a6..ea72dfe 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -361,9 +361,9 @@
 							name:'companyApprove'
 						})
 					}).catch(err=>{
-						this.$refs.uToast.show({
+						uni.showToast({
 							title: err.message,
-							type: 'primary',
+							icon:'none',
 							duration: 3000
 						})
 					})

From e4d777887b73f0592c9d19686647d401d7585e30 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 5 Nov 2021 15:06:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=8E=B0=E9=87=91=E7=BA=A2=E5=8C=85?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/confirmOrder.vue | 2 +-
 pages/user/index.vue         | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pages/goods/confirmOrder.vue b/pages/goods/confirmOrder.vue
index 26697c0..1fa9a8f 100644
--- a/pages/goods/confirmOrder.vue
+++ b/pages/goods/confirmOrder.vue
@@ -200,7 +200,7 @@
 								success: res => {
 									uni.showToast({
 										title: '支付成功',
-										duration: 10000,
+										duration: 3000,
 										mask: true,
 										icon: 'none'
 									})
diff --git a/pages/user/index.vue b/pages/user/index.vue
index ea72dfe..a98bd18 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -136,7 +136,7 @@
 						</view>
 						<view class="assets-label" @click="$Router.push({name:'walletRedProperty'})">
 							<view class="assets-label-name">现金红包
-								<image @click.stop="showHelp('wallet')" class="assets-label-icon"
+								<image @click.stop="showHelp('money')" class="assets-label-icon"
 									src="/static/user/userAssets_tips.png" />
 							</view>
 							<view class="assets-label-number">{{userData.account.cash || 0}}</view>
@@ -481,8 +481,11 @@
 			},
 			// 友情提示信息
 			showHelp(type) {
-				let title = '通证',
+				console.log(type)
+				let title = '通证钱包',
 					content = this.helpDoc.energy_ball.description
+				if (type == 'money') title = '现金红包'
+				if (type == 'money') content = this.helpDoc.red_bag.description
 				if (type == 'chip') title = '贡献值'
 				if (type == 'chip') content = this.helpDoc.energy_shard.description
 				uni.showModal({