Merge branch 'cc-wap' of http://git.lcpcp.cc/root/bn-q-icon into cc-wap

common/router/router.js

@@ -12,25 +12,26 @@ const router = createRouter({
 const whiteList = ['/pages/login/register','/pages/login/index','/pages/login/invite']
 
 router.beforeEach((to, from, next) => {
-    if(to.path!=='/pages/index/error'){
-        let token = to.query.token;
-        let inviteCode = to.query.inviteCode;
-        if (token) {
-            uni.setStorageSync('token',token);
-        }
-        if (inviteCode) {
-            uni.setStorageSync('inviteCode',inviteCode);
-        }
-        const userToken = uni.getStorageSync('token')
-        if(!userToken){
-            if(whiteList.indexOf(to.path)<0){
-                next('/pages/login/index');
-            }
-        }
-        next();
-    }else {
-        next();
-    }
+    // if(to.path!=='/pages/index/error'){
+    //     let token = to.query.token;
+    //     let inviteCode = to.query.inviteCode;
+    //     if (token) {
+    //         uni.setStorageSync('token',token);
+    //     }
+    //     if (inviteCode) {
+    //         uni.setStorageSync('inviteCode',inviteCode);
+    //     }
+    //     const userToken = uni.getStorageSync('token')
+    //     if(!userToken){
+    //         if(whiteList.indexOf(to.path)<0){
+    //             next('/pages/login/index');
+    //         }
+    //     }
+    //     next();
+    // }else {
+    //     next();
+    // }
+	next();
 });
 // 全局路由后置守卫
 router.afterEach((to, from) => {

pages/convert/convert-index.vue

@@ -3,20 +3,23 @@
 	import {
 		getTotalMoney
 	} from "@/api/money";
-  import {
-    addDeal,
-    getAddress, getDealList
-  } from "@/api/deal";
+	import {
+		addDeal,
+		getAddress,
+		getDealList
+	} from "@/api/deal";
 	import tools from "@/common/js/tools";
 	import web3 from "web3";
 	import {
 		ethers
 	} from "ethers";
-  import blank from "@/components/en-utils/en-blank/en-blank.vue";
+	import blank from "@/components/en-utils/en-blank/en-blank.vue";
 
 	export default {
 		name: "convert-index",
-		components: {blank},
+		components: {
+			blank
+		},
 		data() {
 			return {
 				usdtNum: '',
@@ -28,8 +31,8 @@
 				address: '',
 				dealAddress: '',
 				change_num: 0,
-        list:[],
-        page: 1,
+				list: [],
+				page: 1,
 			};
 		},
 		watch: {
@@ -132,149 +135,165 @@
 
 			},
 			setType() {
-        return
+				return
 				this.type = (this.type === 1 ? 2 : 1)
 				this.formNUm = ''
 			},
-      abbreviateString(str) {
-        let startLength = 4;
-        let endLength = 4;
-        if (str.length <= startLength + endLength + 1) {
-          return str; // 如果字符串长度不足以被截断，则返回原字符串
-        }
-        return str.slice(0, startLength) + '...' + str.slice(-endLength);
-      },
-      getDealList(){
-        if(this.total>=this.list.length){
-          return
-        }
-        getDealList({'page': this.page}).then(res=>{
-          if(res.code===1){
-            this.list.push(...res.data.items)
-            this.total = res.data.total
-            ++this.page
-          }
+			abbreviateString(str) {
+				let startLength = 4;
+				let endLength = 4;
+				if (str.length <= startLength + endLength + 1) {
+					return str; // 如果字符串长度不足以被截断，则返回原字符串
+				}
+				return str.slice(0, startLength) + '...' + str.slice(-endLength);
+			},
+			getDealList() {
+				if (this.total >= this.list.length) {
+					return
+				}
+				getDealList({
+					'page': this.page
+				}).then(res => {
+					if (res.code === 1) {
+						this.list.push(...res.data.items)
+						this.total = res.data.total
+							++this.page
+					}
 
-        })
-      }
+				})
+			}
 		},
 	}
 </script>
 
 <template>
 	<view class="flex-common-box  box-sizing-border">
-    <view class="top-b bgc-f plr-20 box-sizing-border align-items-center flex-justify-space">
-      <image class="img-box" src="@/static/img/logo/logo.png"></image>
-      <view class="fs-30">
-        {{abbreviateString(address)}}
-      </view>
-    </view>
-    <view class="p-20">
-      <view class="bgc-f p-40 box-sizing-border b-rad-20 ">
+		<view class="top-b bgc-f plr-20 box-sizing-border align-items-center flex-justify-space">
+			<image class="img-box" src="@/static/img/logo/logo.png"></image>
+			<view class="fs-30">
+				{{abbreviateString(address)}}
+			</view>
+		</view>
+		<scroll-view :scroll-y="true" class="scroll-view-css" @scrolltolower="getDealList">
+			<view class="p-20 box-sizing-border">
+				<view class="bgc-f p-40 box-sizing-border b-rad-20 ">
+					<view class="">
+						<view class="bgc-F6F7FA b-rad-20 mb-20 p-20 box-sizing-border mb-20" v-if="type===1">
+							<view class="align-items-start flex-justify-space mb-20">
+								<view class="align-items-center">
+									<image class="t-img mr-8" :src="require('@/static/img/index/index/usdt.png')">
+									</image>
+									<view class="fs-28">USDT</view>
+								</view>
+								<view class="max-box b-rad-20 fs-28" @click="setMax">
+									Max {{usdtNum}}
+								</view>
+							</view>
+							<view>
+								<input v-model="formNUm" placeholder="输入要兑换的USDT数量" placeholder-class="fs-28"></input>
+							</view>
+						</view>
+						<view class="bgc-F6F7FA b-rad-20 mb-20 p-20 box-sizing-border mb-20" v-else>
+							<view class="align-items-start flex-justify-space mb-20">
+								<view class="align-items-center">
+									<image class="t-img mr-8" :src="require('@/static/img/logo/logo.png')"></image>
+									<view class="fs-28">DAO</view>
+								</view>
+								<view class="max-box b-rad-20 fs-28" @click="setMax">
+									Max {{iconNum}}
+								</view>
+							</view>
+							<view>
+								<input v-model="formNUm" placeholder="输入要兑换的DAO数量" placeholder-class="fs-28"></input>
+							</view>
+						</view>
+					</view>
 
-        <view class="">
-          <view class="bgc-F6F7FA b-rad-20 mb-20 p-20 box-sizing-border mb-20" v-if="type===1">
-            <view class="align-items-start flex-justify-space mb-20">
-              <view class="align-items-center">
-                <image class="t-img mr-8" :src="require('@/static/img/index/index/usdt.png')"></image>
-                <view class="fs-28">USDT</view>
-              </view>
-              <view class="max-box b-rad-20 fs-28" @click="setMax">
-                Max {{usdtNum}}
-              </view>
-            </view>
-            <view>
-              <input v-model="formNUm" placeholder="输入要兑换的USDT数量" placeholder-class="fs-28"></input>
-            </view>
-          </view>
-          <view class="bgc-F6F7FA b-rad-20 mb-20 p-20 box-sizing-border mb-20" v-else>
-            <view class="align-items-start flex-justify-space mb-20">
-              <view class="align-items-center">
-                <image class="t-img mr-8" :src="require('@/static/img/logo/logo.png')"></image>
-                <view class="fs-28">DAO</view>
-              </view>
-              <view class="max-box b-rad-20 fs-28" @click="setMax">
-                Max {{iconNum}}
-              </view>
-            </view>
-            <view>
-              <input v-model="formNUm" placeholder="输入要兑换的DAO数量" placeholder-class="fs-28"></input>
-            </view>
-          </view>
-        </view>
+					<view class="flex-direction-column align-items-center flex-justify-center mb-20" @click="setType">
+						<view class="fs-28">
+							FORM
+						</view>
+						<image class="jh-img" :src="require('@/static/img/index/index/jiaohuan.png')"></image>
+						<view class="fs-28">
+							TO
+						</view>
+					</view>
+					<view>
+						<view class="bgc-F6F7FA b-rad-20 mb-20 p-20 box-sizing-border mb-50" v-if="type===1">
+							<view class="align-items-start flex-justify-space mb-20">
+								<view class="align-items-center">
+									<image class="logo-img mr-8" :src="require('@/static/img/logo/logo.png')"></image>
+									<view class="fs-28">DAO</view>
+								</view>
+							</view>
+							<view class="fs-28" :class="toNum?'':'fc-808080'">
+								{{toNum?toNum:'请输入需要兑换的USDT数量'}}
+							</view>
+						</view>
+						<view class="bgc-F6F7FA b-rad-20 mb-20 p-20 box-sizing-border mb-50" v-else>
+							<view class="align-items-start flex-justify-space mb-20">
+								<view class="align-items-center">
+									<image class="logo-img mr-8" :src="require('@/static/img/index/index/usdt.png')">
+									</image>
+									<view class="fs-28">USDT</view>
+								</view>
+							</view>
+							<view class="fs-28" :class="toNum?'':'fc-808080'">
+								{{toNum?toNum:'请输入需要兑换的DAO数量'}}
+							</view>
+						</view>
+					</view>
 
-        <view class="flex-direction-column align-items-center flex-justify-center mb-20" @click="setType">
-          <view class="fs-28">
-            FORM
-          </view>
-          <image class="jh-img" :src="require('@/static/img/index/index/jiaohuan.png')"></image>
-          <view class="fs-28">
-            TO
-          </view>
-        </view>
-        <view>
-          <view class="bgc-F6F7FA b-rad-20 mb-20 p-20 box-sizing-border mb-50" v-if="type===1">
-            <view class="align-items-start flex-justify-space mb-20">
-              <view class="align-items-center">
-                <image class="logo-img mr-8" :src="require('@/static/img/logo/logo.png')"></image>
-                <view class="fs-28">DAO</view>
-              </view>
-            </view>
-            <view class="fs-28" :class="toNum?'':'fc-808080'">
-              {{toNum?toNum:'请输入需要兑换的USDT数量'}}
-            </view>
-          </view>
-          <view class="bgc-F6F7FA b-rad-20 mb-20 p-20 box-sizing-border mb-50" v-else>
-            <view class="align-items-start flex-justify-space mb-20">
-              <view class="align-items-center">
-                <image class="logo-img mr-8" :src="require('@/static/img/index/index/usdt.png')"></image>
-                <view class="fs-28">USDT</view>
-              </view>
-            </view>
-            <view class="fs-28" :class="toNum?'':'fc-808080'">
-              {{toNum?toNum:'请输入需要兑换的DAO数量'}}
-            </view>
-          </view>
-        </view>
+					<view class="convent-but b-rad-20 text-align-center fs-28 fc-f" @click="addDeal">
+						兑换
+					</view>
+				</view>
+				<view class="bgc-f p-20 box-sizing-border b-rad-20 m-t-40">
+					<view class="fs-28 pt-5 mb-8">
+						兑换记录
+					</view>
+					<view v-if="list.length<=0" class="blank-box align-items-center flex-justify-center">
+						<blank :showBlank="list.length<=0?true:false" message="暂无数据"></blank>
+					</view>
+					<view class="bgc-F6F7FA" v-else>
+						<view class="item-box align-items-center flex-justify-space" v-for="item in list" :key="item.id">
+							<view>
+								<view class="mb-8 fs-28 fw-b">兑换 {{item.money}} USDT</view>
+								<view class="fs-24">{{item.created_date}}</view>
+							</view>
+							<view class="flex-direction-column flex-justify-end align-items-flex-end">
+								<view class="fs-24" :class="item.id<=3?'fc-ED930F':item.id === 4?'fc-FF3B30':'fc-27AE60'">
+									{{item.status_str}}</view>
+								<view class="fs-28 ">到账: <text class="fc-ED301D">{{item.to_money}} DAO</text></view>
+								<view class="but-b bgc-3489FF fs-24 text-align-center fc-f b-rad-20">
+									授权
+								</view>
+							</view>
+						</view>
 
-        <view class="convent-but b-rad-20 text-align-center fs-28 fc-f" @click="addDeal">
-          兑换
-        </view>
-      </view>
-      <view class="bgc-f p-20 box-sizing-border b-rad-20 m-t-40">
-        <view class="fs-28 pt-5 mb-8">
-          兑换记录
-        </view>
-        <view v-if="list.length<=0" class="blank-box align-items-center flex-justify-center">
-          <blank :showBlank="list.length<=0?true:false" message="暂无数据"></blank>
-        </view>
-        <view class="bgc-F6F7FA" v-else>
-          <view class="item-box align-items-center flex-justify-space" v-for="item in list" :key="item.id">
-            <view>
-              <view class="mb-8 fs-28 fw-b">兑换 {{item.money}} USDT</view>
-              <view class="fs-24">{{item.created_date}}</view>
-            </view>
-            <view class="align-items-center">
-              <view class="fs-24">{{item.status_str}}</view>
-              <view class="fs-28 ">到账: <text class="fc-ED301D">{{item.to_money}} DAO</text></view>
-            </view>
-          </view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
 
-        </view>
-      </view>
-    </view>
 
 	</view>
 
 </template>
 
 <style scoped lang="scss">
+	.but-b{
+		width: 120rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+	}
 	.flex-common-box {
 		width: 100%;
 		height: calc(100vh - 138rpx);
 		display: flex;
 		flex-direction: column;
 	}
+
 	.t-img {
 		width: 70rpx;
 		height: 60rpx;
@@ -295,7 +314,7 @@
 	.jh-img {
 		width: 60rpx;
 		height: 60rpx;
-    transform: rotate(90deg);
+		transform: rotate(90deg);
 	}
 
 	.logo-img {
@@ -310,20 +329,22 @@
 		line-height: 80rpx;
 	}
 
-  .img-box {
-    width: 78rpx;
-    height: 60rpx;
-  }
-  .top-b {
-    width: 100%;
-    height: 98rpx;
-    line-height: 98rpx;
-  }
-  .item-box {
-    width: 100%;
-    height: 120rpx;
-    padding: 10rpx 20rpx;
-    box-sizing: border-box;
-    border-top: 2rpx solid #e5e5e5;
-  }
-</style>
+	.img-box {
+		width: 78rpx;
+		height: 60rpx;
+	}
+
+	.top-b {
+		width: 100%;
+		height: 98rpx;
+		line-height: 98rpx;
+	}
+
+	.item-box {
+		width: 100%;
+		// height: 120rpx;
+		padding: 10rpx 20rpx;
+		box-sizing: border-box;
+		border-top: 2rpx solid #e5e5e5;
+	}
+</style>

pages/home/home-index.vue

@@ -82,17 +82,17 @@
 					this.pledgeNUm = ''
 				}
 			},
-      getDividendList() {
-        if(this.total>=this.list.length){
-          return
-        }
-        getDividendList({
+			getDividendList() {
+				if (this.total >= this.list.length) {
+					return
+				}
+				getDividendList({
 					'page': this.page
 				}).then(res => {
 					if (res.code === 1) {
 						this.list.push(...res.data.items)
 						this.total = res.data.total
-            this.page++
+						this.page++
 					}
 				})
 			},
@@ -119,7 +119,7 @@
 					data = '0xa9059cbb'
 					//icon转账
 					let formHex = web3.utils.numberToHex(ethers.utils.parseEther(this.pledgeNUm.toString())
-				.toString());
+						.toString());
 					data = data + tools.replenishZero(this.pledgeAddress) + tools.replenishZero(formHex)
 					transactionData = await tokenpocketBnb.getContractTransaction(data, 0);
 				} else {
@@ -263,34 +263,34 @@
 			<view v-if="list.length<=0" class="blank-box align-items-center flex-justify-center">
 				<blank :showBlank="list.length<=0?true:false" message="暂无数据"></blank>
 			</view>
-      <view class="bgc-F6F7FA" v-else>
-        <view class="item-box align-items-center flex-justify-space" v-for="item in list" :key="item.id">
-          <view>
-            <view class="mb-8 fs-28 fw-b">贡献 {{item.pledge_money}} DAO</view>
-            <view class="fs-24">{{item.created_date}}</view>
-          </view>
-          <view class="align-items-center">
-            <view class="fs-24">分红:</view>
-            <view class="fs-28 fc-ED301D">{{item.sorting_money}}</view>
-          </view>
-        </view>
-
-      </view>
-<!--			<view class="bgc-F6F7FA" v-else>-->
-<!--				<view class="item-box align-items-center flex-justify-space" v-for="item in list" :key="item.id">-->
-<!--					<view>-->
-<!--						<view class="mb-8 fs-28 fw-b">{{item.type===1?'质押':'解压'}}</view>-->
-<!--						<view class="fs-24">{{item.created_date}}</view>-->
-<!--					</view>-->
-<!--					<view class="">-->
-<!--						<view class="fs-24" v-if="item.status===1">执行中</view>-->
-<!--						<view class="fs-24" v-else-if="item.status===2">已完成</view>-->
-<!--						<view class="fs-24" v-else>已作废</view>-->
-<!--						<view class="fs-28 ">数量：<text class="fc-ED301D">{{item.money}}</text></view>-->
-<!--					</view>-->
-<!--				</view>-->
+			<view class="bgc-F6F7FA" v-else>
+				<view class="item-box align-items-center flex-justify-space" v-for="item in list" :key="item.id">
+					<view>
+						<view class="mb-8 fs-28 fw-b">贡献 {{item.pledge_money}} DAO</view>
+						<view class="fs-24">{{item.created_date}}</view>
+					</view>
+					<view class="align-items-center">
+						<view class="fs-24">分红:</view>
+						<view class="fs-28 fc-ED301D">{{item.sorting_money}}</view>
+					</view>
+				</view>
 
 			</view>
+			<!--			<view class="bgc-F6F7FA" v-else>-->
+			<!--				<view class="item-box align-items-center flex-justify-space" v-for="item in list" :key="item.id">-->
+			<!--					<view>-->
+			<!--						<view class="mb-8 fs-28 fw-b">{{item.type===1?'质押':'解压'}}</view>-->
+			<!--						<view class="fs-24">{{item.created_date}}</view>-->
+			<!--					</view>-->
+			<!--					<view class="">-->
+			<!--						<view class="fs-24" v-if="item.status===1">执行中</view>-->
+			<!--						<view class="fs-24" v-else-if="item.status===2">已完成</view>-->
+			<!--						<view class="fs-24" v-else>已作废</view>-->
+			<!--						<view class="fs-28 ">数量：<text class="fc-ED301D">{{item.money}}</text></view>-->
+			<!--					</view>-->
+			<!--				</view>-->
+
+		</view>
 	</view>
 </template>
 
@@ -393,4 +393,4 @@
 		color: #fff;
 		line-height: 80rpx;
 	}
-</style>
+</style>