1-17

lang/zh_cn.js

@@ -79,7 +79,7 @@ module.exports =  {
 		yzfkxx:'援助付款信息',
 		scpz:'上传凭证',
 		qxz:'请选择TRC20',
-		zfcbdz:'复制充币地址',
+		zfcbdz:'复制地址',
 		qxxyzbbcjtxgpzbsc:'请线下援助并保存截图相关凭证并上传，每一度援助金分为两笔任意金额支付，总和',
 		ysclbjt:'元上传两笔截图',
 		xtptwsf:'系统平台维护费收款信息',

manifest.json

@@ -2,8 +2,8 @@
     "name" : "BYTC",
     "appid" : "__UNI__F3A92A0",
     "description" : "",
-    "versionName" : "1.2.4",
-    "versionCode" : 124,
+    "versionName" : "1.2.9",
+    "versionCode" : 129,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -115,8 +115,8 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    // "target" : "http://www.boyingtc.com/api",
-                    "target" : "http://bowin.frp.liuniu946.com/api",
+                    "target" : "http://www.boyingtc.com/api",
+                    // "target" : "http://bowin.frp.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages/index/index.vue

@@ -39,7 +39,7 @@ import { mapState, mapMutations } from 'vuex';
 import { activityList,activitys } from '@/api/active.js';
 import { article } from '@/api/index.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
-
+import { children } from '@/api/user.js';
 import { getApplyList } from '../../api/apply.js';
 import store from '../../store/index.js';
 export default {
@@ -60,6 +60,7 @@ export default {
 	data() {
 		return {
 			list: [],
+			num: 0,
 			image: ['../../static/img/index/youhui1.png', '../../static/img/index/youhui2.png'],
 			revenueList: [],
 			isShow:false,
@@ -89,12 +90,9 @@ export default {
 	},
 	onShow() {
 		if (this.hasLogin) {
-			activitys({},1).then(e =>{
-				console.log(e.data.income,'11111')
-				if(e.data.income >= 10000){
-					obj.isShow = true
-				}
-			})
+			let obj = this;
+			obj.isShow = false;
+			obj.list = [];
 			this.loadData();
 		} else {
 			let obj = this;
@@ -119,14 +117,32 @@ export default {
 				url: '/pages/index/infoDetail?id=' + id
 			});
 		},
-		loadData() {
+		async loadData() {
+			uni.showLoading({
+				title:'数据加载中',
+			})
 			const obj = this;
-			activityList({}).then(({ data }) => {
-				this.list = data.list;
-				if(!obj.isShow){
-					this.list.pop()
-				}
-			});
+			await activitys({},1).then(e =>{
+				children({}, this.userInfo.id).then(({ data }) => {
+					obj.num = data.length
+					console.log(e.data.income,'11111')
+					console.log(obj.num,'22222')
+					if(e.data.income >= 20000 && obj.num >= 5){
+						console.log(111111111)
+						obj.isShow = true
+					}
+					activityList({}).then(({ data }) => {
+						uni.hideLoading()
+						this.list = data.list;
+						if(!obj.isShow){
+							console.log(22222222222222222)
+							this.list.pop()
+						}
+					});
+				});
+
+			})
+			
 			article({
 				page: 1,
 				limit: 10000,

pages/index/info.vue

@@ -18,7 +18,7 @@
 					</view>
 				</view>
 				<view class="right" v-if="item.system_get == 0">{{ $t('foo.yzje') }}：￥{{ item.money * 1 }}</view>
-				<view class="right" v-if="item.system_get == 1">{{ $t('foo.xtptwhf')}}：{{ item.money * 1 }}U</view>
+				<view class="right" v-if="item.system_get == 1">{{ $t('foo.xtptwhf')}}：￥{{ item.money * 6.5 }}</view>
 			</view>
 			<view class="main flex" v-if="item.system_get == 0">
 				<view class="left flex">
@@ -33,9 +33,9 @@
 					<view class="right-box" @click="nav(item,2)">{{ $t('foo.scpz') }}</view>
 				</view>
 			</view>
-			<view class="" v-if="item.system_get == 1">
-				<view class="change">{{ $t('foo.qxz') }}</view>
-				<view class="erweima">
+			<view class="main" v-if="item.system_get == 1">
+				<!-- <view class="change">{{ $t('foo.qxz') }}</view> -->
+				<!-- <view class="erweima">
 					<tki-qrcode
 						:cid="cid"
 						ref="qrcode"
@@ -51,10 +51,12 @@
 						:loadMake="loadMake"
 						:usingComponents="usingComponents"
 					/>
-				</view>
+				</view> -->
 				<view class="address">{{ num }}</view>
-				<view class="btn" style="margin-top: 50rpx;" @click="setData">{{ $t('foo.zfcbdz') }}</view>
-				<view class="btn" @click="nav(item,1)">{{ $t('foo.scpz') }}</view>
+				<view class="right flex" style="margin-top: 50rpx;">
+					<view class="right-box"  @click="setData">{{ $t('foo.zfcbdz') }}</view>
+					<view class="right-box" @click="nav(item,1)">{{ $t('foo.scpz') }}</view>
+				</view>
 			</view>
 		</view>
 

pages/user/applyList.vue

@@ -5,7 +5,7 @@
 		</view>
 		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" :style="{ height: height }">
+				<scroll-view scroll-y="true" class="list-scroll-content" :style="{ height: height }" @scrolltolower='loadData()'>
 					<!-- 申请列表 -->
 					<!-- 空白页 -->
 					<!-- <empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty> -->
@@ -123,13 +123,20 @@ export default {
 		}
 	},
 	onShow() {
-		this.navList[0].orderList = [],
-		this.navList[1].orderList = [],
 		uni.setNavigationBarTitle({
 			title: this.$t('foo.shlb')
 		});
+		this.navList[0].orderList = [];
+		this.navList[0].page = 1;
+		this.navList[0].loadingType = 'more';
+		this.navList[0].loaded = false;
+		this.navList[1].orderList = [];
+		this.navList[1].page = 1;
+		this.navList[1].loadingType = 'more';
+		this.navList[1].loaded = false;
 		this.loadData();
 	},
+	
 	methods: {
 		//顶部tab点击
 		tabClick(index) {
@@ -139,7 +146,7 @@ export default {
 			this.tabCurrentIndex = e.target.current;
 			this.loadData('tabChange');
 		},
-		loadData(source) {
+		loadData(source,show) {
 			console.log('swiper');
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
@@ -148,6 +155,9 @@ export default {
 				//tab切换只有第一次需要加载数据
 				return;
 			}
+			if (navItem.loadingType === 'noMore') {
+				return;
+			}
 			if (navItem.loadingType === 'loading') {
 				//防止重复加载
 				return;

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/d8135600-385d-11ec-8402-67ad53fdab8d
+https://ide.dcloud.net.cn/build/download/e8fcbd40-6934-11ec-923e-d1bbedffd1c7

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>博赢同创</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.d0f128df.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.fbd06a90.js></script><script src=/index/static/js/index.6d48f691.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.be22caa2.js></script><script src=/index/static/js/index.0d9d1617.js></script></body></html>

unpackage/dist/build/h5/static/js/pages-index-video.7cf5df1e.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-index-video"],{3774:function(t,n,e){"use strict";e.r(n);var i=e("4228"),a=e.n(i);for(var c in i)"default"!==c&&function(t){e.d(n,t,(function(){return i[t]}))}(c);n["default"]=a.a},4228:function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var i={onLoad:function(){var t=uni.createInnerAudioContext();t.autoplay=!0,t.startTime=2,t.src="../../static/icon/video.mp3",t.onPlay((function(){console.log("开始播放")})),setTimeout((function(){t.stop(),uni.switchTab({url:"/pages/index/index"})}),5e3)}};n.default=i},"4dce":function(t,n,e){"use strict";var i=e("78fe"),a=e.n(i);a.a},"5f81":function(t,n,e){"use strict";var i;e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return c})),e.d(n,"a",(function(){return i}));var a=function(){var t=this,n=t.$createElement,i=t._self._c||n;return i("v-uni-view",{staticClass:"center"},[i("v-uni-image",{attrs:{src:e("6aef"),mode:""}})],1)},c=[]},6509:function(t,n,e){var i=e("24fb");n=i(!1),n.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/*颜色*/\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 功能栏字体大小 */\n/*功能栏左侧小图标*/.center[data-v-1ce5c91e]{width:100%;height:100vh}.center uni-image[data-v-1ce5c91e]{width:100%;height:100%}',""]),t.exports=n},"6aef":function(t,n,e){t.exports=e.p+"static/img/start.c535ab34.gif"},"78fe":function(t,n,e){var i=e("6509");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=e("4f06").default;a("063363dc",i,!0,{sourceMap:!1,shadowMode:!1})},bb47:function(t,n,e){"use strict";e.r(n);var i=e("5f81"),a=e("3774");for(var c in a)"default"!==c&&function(t){e.d(n,t,(function(){return a[t]}))}(c);e("4dce");var r,u=e("f0c5"),o=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"1ce5c91e",null,!1,i["a"],r);n["default"]=o.exports}}]);