flqFront.git - Gitblit

parent: c6b8dd48 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of ssh://193.112.35.168:29418/flqFront

admin

2020-05-26 2d59a9d05057050fa54a465e33547676282616f7

Merge branch 'master' of ssh://193.112.35.168:29418/flqFront

9个文件已修改

	AppInside/dataPreview/css/fund.css	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	AppInside/dataPreview/css/txRecord.css	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	AppInside/dataPreview/fund.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	AppInside/dataPreview/receivedData.html	69 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	AppInside/dataPreview/txRecord.html	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	AppInside/openVip/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	AppInside/teamBonus/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	AppInside/teamBonus/teamBonusDetail.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	AppInside/teamFans/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 AppInside/dataPreview/css/fund.css

@@ -272,3 +272,7 @@
        padding-bottom: env(safe-area-inset-bottom);

    }

}

[v-cloak] {
 display: none;
}

 AppInside/dataPreview/css/txRecord.css

@@ -264,4 +264,4 @@
        padding-bottom: constant(safe-area-inset-bottom);

        padding-bottom: env(safe-area-inset-bottom);

    }

}
}

 AppInside/dataPreview/fund.html

@@ -17,7 +17,7 @@
        <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>

    </head>

    <body>

        <div id="root">

        <div id="root" v-cloak>

            <!-- 账户余额 -->

            <div class="div_balance">

                <div>账户余额</div>


 AppInside/dataPreview/receivedData.html

@@ -31,8 +31,7 @@
                <div class="div_item">

                    <div class="div_item_top">

                        <div class="title">金额</div>

                        <input id="inpunt_money" class="input" type="number" placeholder="不要超过7位数，支持小数点后两位" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1').replace(/^0{1,}/g,'')"

                         maxlength="10">

                        <input id="inpunt_money" class="input" type="number" placeholder="不要超过4位数，支持小数点后两位" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1').replace(/^0{1,}/g,'')">

                    </div>

                    <div style="height: 1px; background-color: #E0E0E0; margin-left: 0.3rem;"></div>

                </div>

@@ -44,12 +43,12 @@
                    <div style="height: 1px; background-color: #E0E0E0; margin-left: 0.3rem;"></div>

                </div>



                <div class="div_item">

                <!-- <div class="div_item">

                    <div class="div_item_top">

                        <div class="title">订单号</div>

                        <input id="inpunt_order" class="input" type="number" placeholder="你可复制一个订单号填写于此处">

                    </div>

                </div>

                </div> -->

            </div>



            <!-- 重要提示  -->

@@ -84,12 +83,16 @@
                    commitInfo: function() {

                        var money = $('#inpunt_money').val();

                        var dayTime = $('#inpunt_date').val();

                        var orderNo = $('#inpunt_order').val();

                        // var orderNo = $('#inpunt_order').val();



                        if (money.length == 0 || money == null ||

                            dayTime.length == 0 || dayTime == null ||

                            orderNo.length == 0 || orderNo == null) {

                            dayTime.length == 0 || dayTime == null) {

                            yesApp.toast('请将信息填写完整')

                            return;

                        };



                        if (parseFloat(money) > 1000) {

                            yesApp.toast('最大提现金额不得超过1000')

                            return;

                        }



@@ -99,10 +102,9 @@
                            uid: uid,

                            dayTime: dayTime,

                            money: money,

                            orderNo: orderNo

                        };

                        params = yesApp.getRequestBaseParams(params);



						
                        $.ajax({

                            type: "GET",

                            data: JSON.parse(params),

@@ -115,7 +117,6 @@
                                    yesApp.savePicture(result.data.link);



                                } else {

                                    yesApp.toast('222')

                                    yesApp.hideLoading();

                                    yesApp.toast(result.msg);

                                }

@@ -135,30 +136,30 @@


            app.fetchMoneyArrivalImg();



            setTimeout(function() {
                var currYear = (new Date()).getFullYear();
                var opt = {};
                opt.date = {
                    preset: 'date'
                };
                opt.datetime = {
                    preset: 'datetime'
                };
                opt.time = {
                    preset: 'time'
                };
                opt.default = {
                    theme: 'android-ics light', //皮肤样式
                    display: 'modal', //显示方式 
                    mode: 'scroller', //日期选择模式
                    dateFormat: 'yyyy-mm-dd',
                    lang: 'zh',
                    showNow: true,
                    nowText: "今天",
                    startYear: currYear - 10, //开始年份
                    endYear: currYear + 10 //结束年份
                };
                var optDateTime = $.extend(opt['datetime'], opt['default']);
            setTimeout(function() {

                var currYear = (new Date()).getFullYear();

                var opt = {};

                opt.date = {

                    preset: 'date'

                };

                opt.datetime = {

                    preset: 'datetime'

                };

                opt.time = {

                    preset: 'time'

                };

                opt.default = {

                    theme: 'android-ics light', //皮肤样式

                    display: 'modal', //显示方式 
                    mode: 'scroller', //日期选择模式

                    dateFormat: 'yyyy-mm-dd',

                    lang: 'zh',

                    showNow: true,

                    nowText: "今天",

                    startYear: currYear - 10, //开始年份

                    endYear: currYear + 10 //结束年份

                };

                var optDateTime = $.extend(opt['datetime'], opt['default']);

                $("#inpunt_date").mobiscroll(optDateTime).datetime(optDateTime);



            }, 1000);


 AppInside/dataPreview/txRecord.html

@@ -198,16 +198,11 @@
                            return;

                        }



                        if (!dateBoll) {

                        if (!timeBoll) {

                            yesApp.toast('提现时间不得选择早于当前时间')

                            return;

                        }



                        if (!timeBoll) {

                            yesApp.toast('时间哟吴恩题现在')

                            return;

                        }



                        }
						
                        if (parseInt(txMoney) > 1000) {

                            yesApp.toast('单笔最大提现金额不超过1000')

                            return;


 AppInside/openVip/index.html

@@ -100,7 +100,7 @@
                        </div>

                        <div class="div_applystate_content_bg" @click="jumpLink(item.link)">

                            <img src="img/icon_arrow.png">

                            <div v-if="item.state==-1" style="color: #000000;">需要提交资料</div>

                            <div v-if="item.state==-1" style="color: #000000;">TA需要提交资料</div>

                            <div v-else-if="item.state==0" style="color: #E5005B;">待审核</div>

                            <div v-else-if="item.state==1" style="color: #000000;">拒绝</div>

                            <div v-else-if="item.state==2" style="color: #0AA118;">已经通过</div>


 AppInside/teamBonus/index.html

@@ -107,7 +107,7 @@
                        </div>



                        <div class="div_incomeDetail" @click="touchBonusDetail(index+1)">

                            <div class="incomeDetail">查看收益详情</div>

                            <div class="incomeDetail">查看团队分红详情</div>

                            <img src="img/icon_arrow.png">

                        </div>

                    </div>


 AppInside/teamBonus/teamBonusDetail.html

@@ -38,7 +38,7 @@
                    </div>

                    <div class="TeamSubsidyBG">

                        <div class="teamSubsidyContent">{{dividents}}</div>

                        <div class="teamSubsidyTitle">累计预估团队奖励元)</div>

                        <div class="teamSubsidyTitle">累计预估团队奖励(元)</div>

                    </div>

                </div>



@@ -120,7 +120,11 @@
                },

                methods: {

                    copy: function(orderNo) {

                        yesApp.copyText(orderNo);

                        yesApp.copyText(orderNo);
                        var type = yesApp.getPlatform();
                        if (type == 1) {
                            yesApp.toast('复制成功');
                        }

                    },



                    touchSearch: function() {


 AppInside/teamFans/index.html

@@ -115,7 +115,7 @@


                        </div>



                        <div v-if="item.number!=null&&item.number.length!=0" class="div_items_right">{{item.number}}笔</div>

                        <div v-if="item.number!=null&&item.number.length!=0" class="div_items_right">{{item.number}}</div>

                        <div v-else class="div_items_right" style="width: 0.76rem;background-color: #CDCDCD; height: 0.44rem;border-radius: 0.04rem;margin-top: 0.41rem;">

                        </div>

                    </div>

			@@ -272,3 +272,7 @@
			padding-bottom: env(safe-area-inset-bottom);
			}
			}

			[v-cloak] {
			display: none;
			}

			@@ -264,4 +264,4 @@
			padding-bottom: constant(safe-area-inset-bottom);
			padding-bottom: env(safe-area-inset-bottom);
			}
			}
			}

			@@ -17,7 +17,7 @@
			<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
			</head>
			<body>
			<div id="root">
			<div id="root" v-cloak>
			<!-- 账户余额 -->
			<div class="div_balance">
			<div>账户余额</div>

			@@ -31,8 +31,7 @@
			<div class="div_item">
			<div class="div_item_top">
			<div class="title">金额</div>
			<input id="inpunt_money" class="input" type="number" placeholder="不要超过7位数，支持小数点后两位" onkeyup="value=value.replace(/^\D(\d(?:\.\d{0,2})?).*$/g, '$1').replace(/^0{1,}/g,'')"
			maxlength="10">
			<input id="inpunt_money" class="input" type="number" placeholder="不要超过4位数，支持小数点后两位" onkeyup="value=value.replace(/^\D(\d(?:\.\d{0,2})?).*$/g, '$1').replace(/^0{1,}/g,'')">
			</div>
			<div style="height: 1px; background-color: #E0E0E0; margin-left: 0.3rem;"></div>
			</div>
			@@ -44,12 +43,12 @@
			<div style="height: 1px; background-color: #E0E0E0; margin-left: 0.3rem;"></div>
			</div>

			<div class="div_item">
			<!-- <div class="div_item">
			<div class="div_item_top">
			<div class="title">订单号</div>
			<input id="inpunt_order" class="input" type="number" placeholder="你可复制一个订单号填写于此处">
			</div>
			</div>
			</div> -->
			</div>

			<!-- 重要提示 -->
			@@ -84,12 +83,16 @@
			commitInfo: function() {
			var money = $('#inpunt_money').val();
			var dayTime = $('#inpunt_date').val();
			var orderNo = $('#inpunt_order').val();
			// var orderNo = $('#inpunt_order').val();

			if (money.length == 0 \|\| money == null \|\|
			dayTime.length == 0 \|\| dayTime == null \|\|
			orderNo.length == 0 \|\| orderNo == null) {
			dayTime.length == 0 \|\| dayTime == null) {
			yesApp.toast('请将信息填写完整')
			return;
			};

			if (parseFloat(money) > 1000) {
			yesApp.toast('最大提现金额不得超过1000')
			return;
			}

			@@ -99,10 +102,9 @@
			uid: uid,
			dayTime: dayTime,
			money: money,
			orderNo: orderNo
			};
			params = yesApp.getRequestBaseParams(params);


			$.ajax({
			type: "GET",
			data: JSON.parse(params),
			@@ -115,7 +117,6 @@
			yesApp.savePicture(result.data.link);

			} else {
			yesApp.toast('222')
			yesApp.hideLoading();
			yesApp.toast(result.msg);
			}
			@@ -135,30 +136,30 @@

			app.fetchMoneyArrivalImg();

			setTimeout(function() {
			var currYear = (new Date()).getFullYear();
			var opt = {};
			opt.date = {
			preset: 'date'
			};
			opt.datetime = {
			preset: 'datetime'
			};
			opt.time = {
			preset: 'time'
			};
			opt.default = {
			theme: 'android-ics light', //皮肤样式
			display: 'modal', //显示方式
			mode: 'scroller', //日期选择模式
			dateFormat: 'yyyy-mm-dd',
			lang: 'zh',
			showNow: true,
			nowText: "今天",
			startYear: currYear - 10, //开始年份
			endYear: currYear + 10 //结束年份
			};
			var optDateTime = $.extend(opt['datetime'], opt['default']);
			setTimeout(function() {
			var currYear = (new Date()).getFullYear();
			var opt = {};
			opt.date = {
			preset: 'date'
			};
			opt.datetime = {
			preset: 'datetime'
			};
			opt.time = {
			preset: 'time'
			};
			opt.default = {
			theme: 'android-ics light', //皮肤样式
			display: 'modal', //显示方式
			mode: 'scroller', //日期选择模式
			dateFormat: 'yyyy-mm-dd',
			lang: 'zh',
			showNow: true,
			nowText: "今天",
			startYear: currYear - 10, //开始年份
			endYear: currYear + 10 //结束年份
			};
			var optDateTime = $.extend(opt['datetime'], opt['default']);
			$("#inpunt_date").mobiscroll(optDateTime).datetime(optDateTime);

			}, 1000);

			@@ -198,16 +198,11 @@
			return;
			}

			if (!dateBoll) {
			if (!timeBoll) {
			yesApp.toast('提现时间不得选择早于当前时间')
			return;
			}

			if (!timeBoll) {
			yesApp.toast('时间哟吴恩题现在')
			return;
			}

			}

			if (parseInt(txMoney) > 1000) {
			yesApp.toast('单笔最大提现金额不超过1000')
			return;

			@@ -100,7 +100,7 @@
			</div>
			<div class="div_applystate_content_bg" @click="jumpLink(item.link)">
			<img src="img/icon_arrow.png">
			<div v-if="item.state==-1" style="color: #000000;">需要提交资料</div>
			<div v-if="item.state==-1" style="color: #000000;">TA需要提交资料</div>
			<div v-else-if="item.state==0" style="color: #E5005B;">待审核</div>
			<div v-else-if="item.state==1" style="color: #000000;">拒绝</div>
			<div v-else-if="item.state==2" style="color: #0AA118;">已经通过</div>

			@@ -107,7 +107,7 @@
			</div>

			<div class="div_incomeDetail" @click="touchBonusDetail(index+1)">
			<div class="incomeDetail">查看收益详情</div>
			<div class="incomeDetail">查看团队分红详情</div>
			<img src="img/icon_arrow.png">
			</div>
			</div>

			@@ -38,7 +38,7 @@
			</div>
			<div class="TeamSubsidyBG">
			<div class="teamSubsidyContent">{{dividents}}</div>
			<div class="teamSubsidyTitle">累计预估团队奖励元)</div>
			<div class="teamSubsidyTitle">累计预估团队奖励(元)</div>
			</div>
			</div>

			@@ -120,7 +120,11 @@
			},
			methods: {
			copy: function(orderNo) {
			yesApp.copyText(orderNo);
			yesApp.copyText(orderNo);
			var type = yesApp.getPlatform();
			if (type == 1) {
			yesApp.toast('复制成功');
			}
			},

			touchSearch: function() {

			@@ -115,7 +115,7 @@

			</div>

			<div v-if="item.number!=null&&item.number.length!=0" class="div_items_right">{{item.number}}笔</div>
			<div v-if="item.number!=null&&item.number.length!=0" class="div_items_right">{{item.number}}</div>
			<div v-else class="div_items_right" style="width: 0.76rem;background-color: #CDCDCD; height: 0.44rem;border-radius: 0.04rem;margin-top: 0.41rem;">
			</div>
			</div>