Merge branch 'main' of https://git.yuzhankeji.cn/TmOct5/BlockChainH5 into main

pages/news/index.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="News">
     <view class="list" v-for="(item,index) in items" :key="index" v-if="items.length>0">
-      <navigator class="item" open-type="navigate" hover-class="none" :url="'/pages/news/detail?type='+item.type">
+      <view class="item" @click="$Router.push({name:'newsDetail',params:{type:item.type}})" >
         <view class="left">
           <image class="img" v-if='item.type ==="SystemNotification"' :src="item.icon?item.icon:'/static/imgs/news_1.png'" mode="aspectFill"></image>
           <image class="img" v-if='item.type ==="OrderNotification"' :src="item.icon?item.icon:'/static/imgs/news_2.png'" mode="aspectFill"></image>
@@ -12,7 +12,7 @@
           </view>
         </view>
         <view class="num" v-if="item.count>0">{{item.count}}</view>
-      </navigator>
+      </view>
     </view>
     <view class="no-news" v-else>
       <image src="/static/img/no-news.png" mode="widthFix"></image>

pages/wallet/addBank.vue

@@ -4,7 +4,7 @@
 			<view class="item-name">{{bank_account_id===''?'添加':'编辑'}}提现银行</view>
 			<view class="item">
 				<view class="title">收款人姓名</view>
-				<input class="input_num" v-model="name" maxlength="16" placeholder="请输入收款人姓名"
+				<input class="input_num" v-model="name" maxlength="13" placeholder="请输入收款人姓名"
 					placeholder-style="color:#999;font-weight:normal; font-size:30rpx;" />
 			</view>
 			<view class="item">
@@ -22,12 +22,12 @@
 			</view>
 			<view class="item">
 				<view class="title">收款人账号</view>
-				<input class="input_num" v-model="no" type="number" placeholder="请输入收款人账号"
+				<input class="input_num" v-model="no" maxlength="20" type="number" placeholder="请输入收款人账号"
 					placeholder-style="color:#999;font-weight:normal; font-size:30rpx;" />
 			</view>
 			<view class="item">
 				<view class="title">支行名称</view>
-				<input class="input_num" v-model="branch_name" maxlength="30" placeholder="省-市-区-支行名称"
+				<input class="input_num" v-model="branch_name" maxlength="20" placeholder="省-市-区-支行名称"
 					placeholder-style="color:#999;font-weight:normal; font-size:30rpx;" />
 			</view>
 		</view>

pages/wallet/bankList.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="selectCard">
+		<view class="demo" v-if="lists.length>0"><u-icon name="info-circle-fill" label-color='#cacaca' color='#cacaca'  label='长按删除添加银行卡'/></view>
 		<view class="bankInfo" v-if="lists.length>0" v-for="(item,index) in lists" :key='index'
 			@longpress='delBank(item.bank_account_id,index)'>
 			<image class="bankLogin" @click="selectBank(item)" :src="item.bank.cover" mode="widthFix" />
@@ -110,7 +111,7 @@
 									uni.setStorageSync('refresh', true)
 								}
 							}).catch(err => {
-								this.$refs.uToast.show({
+								that.$refs.uToast.show({
 									title: err.message,
 									type: 'primary',
 									duration: 3000
@@ -161,7 +162,11 @@
 		padding-top: 30rpx;
 		background-color: #fff;
 		padding-bottom: 80rpx;
-
+		.demo{
+			color: #cacaca;
+			font-size: 26rpx;
+			text-align: center;
+		}
 		.bankInfo {
 			width: calc(100% - 60rpx);
 			background-image: linear-gradient(to right, #7c52fc, #976dff);

router/index.js

@@ -24,11 +24,11 @@ const router = createRouter({
 router.beforeEach((to, from, next) => {
 	const token  = store.getters.getToken || uni.getStorageSync('token')
 	// 检查是否需要微信授权
-	if(store.getters.getCode === '' && to.name != 'wxAuth'){
+	// if(store.getters.getCode === '' && to.name != 'wxAuth'){
-		next({
+	// 	next({
-			name: 'wxAuth'
+	// 		name: 'wxAuth'
-		})
+	// 	})
-	}
+	// }
 	// 检查是否需要登录
 	if(to.auth && token === ''){
 		next({