[修改银行卡列表返回上一页app和H5兼容问题]

components/store-boss/store-boss.vue

@@ -72,11 +72,11 @@
                 	<view class="text">在售权证</view>
                 </view>
 				<view class="general-item" @click="$Router.push({name: 'Return'})">
-					<view class="number">{{wordData.order.deliver || 0}}</view>
+					<view class="number">{{wordData.order.refund || 0}}</view>
 					<view class="text">退货单处理</view>
 				</view>
                 <view class="general-item" @click="$Router.push({name: 'Deliver'})">
-                	<view class="number">{{wordData.order.refund || 0}}</view>
+                	<view class="number">{{wordData.order.deliver|| 0}}</view>
                 	<view class="text">发货单处理</view>
                 </view>
 			</view>

pages/property/index.vue

@@ -36,7 +36,7 @@
 						<view class="title-text">我的资产</view>
 					</view>
 					<view class="group-flex group-flex-4">
-						<view class="item" @click="showToast">
+						<view class="item" @click="$Router.push({name:'Extract'})">
 							<view class="item-num">{{base.account.token}}</view>
 							<view class="item-title">原石</view>
 						</view>

pages/store/return.vue

@@ -28,6 +28,9 @@
                 navList     : [{
                     name    : '待审核',
                     id      : 'apply'
+                  },{
+                    name    : '已驳回',
+                    id      : 'refuse'
                   },{
                     name    : '待返货',
                     id      : 'deliver'

pages/wallet/bankList.vue

@@ -1,21 +1,25 @@
 <template>
 	<view class="selectCard">
-		<view class="demo" v-if="lists.length>0"><u-icon name="info-circle-fill" label-color='#e93340' color='#e93340'  label='长按删除添加银行卡'/></view>
+		<block  v-if="lists.length>0" >
-		<view class="bankInfo" v-if="lists.length>0" v-for="(item,index) in lists" :key='index'
+			<view class="demo11">
-			@longpress='delBank(item.bank_account_id,index)'>
+				<icon type="warn" size="16"/>
-			<image class="bankLogin" @click="selectBank(item)" :src="item.bank.cover" mode="widthFix" />
+				长按删除添加银行卡
-			<view class="right" @click="selectBank(item)">
-				<view class="left">
-					<view class="title">{{item.bank.name}}
-						<view class="tags">快捷支付</view>
-					</view>
-					<view class="des">储值卡</view>
-					<view class="no">{{item.no}}</view>
-				</view>
 			</view>
-			<u-icon name="edit-pen-fill" @click='editBank(item.bank_account_id)' color="rgba(255,255,255,0.6)"
+			<view class="bankInfo" v-for="(item,index) in lists" :key='index' @longpress='delBank(item.bank_account_id,index)'>
-				size='50' />
+				<image class="bankLogin" @click="selectBank(item)" :src="item.bank.cover" mode="widthFix" />
-		</view>
+				<view class="right" @click="selectBank(item)">
+					<view class="left">
+						<view class="title">{{item.bank.name}}
+							<view class="tags">快捷支付</view>
+						</view>
+						<view class="des">储值卡</view>
+						<view class="no">{{item.no}}</view>
+					</view>
+				</view>
+				<u-icon name="edit-pen-fill" @click='editBank(item.bank_account_id)' color="rgba(255,255,255,0.6)"
+					size='50' />
+			</view>
+		</block>
 		<!-- 底部新增按钮 -->
 		<view class="addBtn" @click="$Router.push({	name: 'addBank'})">
 			<u-icon name="plus" label-pos='bottom' color='#fff' label-color='#fff' label='新增' />
@@ -129,8 +133,8 @@
 				}
 				let pages = getCurrentPages()
 				let prevPage = pages[pages.length - 2]
-				console.log(bankInfo)
+				// prevPage._data.bankInfo = bankInfo
-				prevPage._data.bankInfo = bankInfo
+				prevPage.$vm.bankInfo = bankInfo;
 				uni.navigateBack() //返回上一页面
 			}
 		}
@@ -162,10 +166,17 @@
 		padding-top: 30rpx;
 		background-color: #fff;
 		padding-bottom: 80rpx;
-		.demo{
+		
-			color: #cacaca;
+		.demo11{
+			color: #e93340;
 			font-size: 26rpx;
 			text-align: center;
+			display: flex;
+			justify-content: center;
+			// background-color: #e93340;
+			icon{
+				margin-right: 10rpx;
+			}
 		}
 		.bankInfo {
 			width: calc(100% - 60rpx);

pages/wallet/extract.vue

@@ -3,7 +3,7 @@
 		<view class="propery">
 			<image src="/static/imgs/account-bg.png" mode="aspectFill" class="record-bg" />
 			<view class="propery-content">
-				<view class="currency">能量球钱包
+				<view class="currency">原石钱包
 					<span>(≈ {{ cost || '0.00' }} CNY)</span>
 				</view>
 				<view class="balance">{{ balance || '0.00' }}</view>
@@ -38,12 +38,12 @@
 	export default {
 		data() {
 			return {
-				balance: 0, // 钱包能量球数量
+				balance: 0, // 钱包原石数量
 				tax: 0, // 当前手续费
-				cost: 1, // 每个能量球的价格
+				cost: 1, // 每个原石的价格
 				total: 0, // 约合人民币
 				card: '', // 银行卡号
-				withdraw_input: '', // 提现能量球数量
+				withdraw_input: '', // 提现原石数量
 				bank_accounts: 0,
 				bankInfo: {}
 			};
@@ -73,7 +73,7 @@
 					})
 				})
 			},
-			//  输入提现能量球数量
+			//  输入提现原石数量
 			inputNum(e) {
 				let number = Number(e.detail.value)
 				if (number <= Number(this.balance)) {
@@ -120,7 +120,7 @@
 				}
 				if (data.amount === 0) {
 					uni.showToast({
-						title: '请输入能量球数量',
+						title: '请输入原石数量',
 						icon: 'none'
 					})
 					return;
@@ -194,7 +194,7 @@
 		.propery {
 			position: relative;
 			padding-top: var(--status-bar-height);
-			background-image: linear-gradient(to top, #7c52fc, #976dff);
+			background-image: linear-gradient(to bottom, #e93340, #e93340);
 			position: relative;
 			overflow: hidden;
 
@@ -346,7 +346,7 @@
 	}
 
 	.btn {
-		background-image: linear-gradient(to right, #7c52fc, #976dff);
+		background-image: linear-gradient(to bottom, #e93340, #e93340);
 		color: #fff;
 		border-radius: 10rpx;
 		text-align: center;