緩存、返回按钮

api/serve/index.js

@@ -82,15 +82,16 @@ x.fn = x.prototype = {
 		return new Promise((resolve, reject) => {
             let reg=new RegExp('/','g')//g代表全部
             let newMsg=options.url.replace(reg,'_');
-						console.info(newMsg)
+						// console.info(newMsg)
             if(Cache.get(newMsg).data){
-				if(newMsg!='_user_walletImage'&& newMsg!='_user_getAuthInfo' && newMsg!='_user_withdrawalBalance' 
+								if(newMsg!='_user_walletImage'&& newMsg!='_user_getAuthInfo' && newMsg!='_user_withdrawalBalance' 
-				&& newMsg!='_article_detail' && newMsg!='_contract_getSymbolDetail' && newMsg!='_categoryList' && newMsg!='_articleList'
+									&& newMsg!='_article_detail' && newMsg!='_contract_getSymbolDetail' && newMsg!='_categoryList' && newMsg!='_articleList'
-				&& newMsg!='_user_wdcode' && newMsg!='_register_Graph_che' && newMsg!='_register_sendEmailCode'
+									&& newMsg!='_user_wdcode' && newMsg!='_register_Graph_che' && newMsg!='_register_sendEmailCode'
-				 && newMsg!='_college' && newMsg!='_exchange_getCoinInfo' && newMsg!='_user_primaryAuth' && newMsg!='_exchange_getCurrentEntrust'
+									&& newMsg!='_exchange_storeEntrust' && newMsg!='_contract_holdPosition'
-				&& newMsg!='_wallet_getBalance' && newMsg!='_contract_getMarketInfo'&& newMsg!='_contract_openNum'){
+									 && newMsg!='_college' && newMsg!='_exchange_getCoinInfo' && newMsg!='_user_primaryAuth' && newMsg!='_exchange_getCurrentEntrust'
-					resolve(Cache.get(newMsg).data);
+									&& newMsg!='_wallet_getBalance' && newMsg!='_contract_getMarketInfo'&& newMsg!='_contract_openNum'){
-				}
+									// resolve(Cache.get(newMsg).data);//获取缓存中的数据
+								}
                 uni.request({
                 	url: this.url,
                 	data: this.data,
@@ -99,7 +100,7 @@ x.fn = x.prototype = {
                 	dataType: this.dataType,
                 	sslVerify: false,
                 	success: (res) => {
-										console.info(res)
+										// console.info(res)
                 		let message = res.data.message
                 		let code = res.data.code
                 		if (code != 200) {

layout/vCode.vue

@@ -52,15 +52,6 @@ export default {
 	watch: {
 		sendAAA(n,o){
 			if(n){
-				// console.log(n, '-------');
-				// setTimeout(()=>{
-				// 	this.inSend = false;
-				// 	this.load = true;
-				// 	this.countDown();
-				// 	this.$toast(this.$t('common.sendSuccess'));
-				// 	this.$emit('changeSendAAA', false)
-				// }, 500)
-				// return;
 				this.send();
 			}
 		}

layout/vHeader.vue

@@ -38,7 +38,7 @@ export default {
   },
   methods: {
     onClickLeft() {
-			console.info(this.leftClick)
+			// console.info(this.leftClick)
       if (this.leftClick) {
         this.leftClick();
       } else {

pages/exchange/exchange-transaction.vue

@@ -673,7 +673,9 @@ export default {
         .then((res) => {
           this.form.amount = "";
           this.form.total = "";
-          this.$toast.success(this.$t("exchange.e1"));
+					if(res.code===200){
+						this.$toast.success(this.$t("exchange.e1"));
+					}
           this.getUserBalance();
           this.dtime = setInterval(() => {
               this.getCurrentEntrust(true)

plugins/method.js

@@ -53,7 +53,17 @@ function copy(txt) {
 
 // 页面后退方法
 vue.prototype.$back = (num = 1) => {
-	uni.navigateBack(num)
+	let arr = getCurrentPages();
+	let arr2 = arr.map(item=>{
+		return item.route;
+	})
+	console.log(arr,'页面栈路由', arr2);
+	if(arr.length===1){
+		history.back();
+	}else{
+		uni.navigateBack(num)
+	}
+	
 	navFontColor()
 }