7-30-1

src/request/user.js

@@ -223,4 +223,13 @@ export function getrecharge(data) {
 	  method: 'get',
 	  params:data
 	})
-}
+}
+
+//获取地址和时间
+export function getrechange(data) {
+	return request({
+	  url: '/api/user/getrecharge',
+	  method: 'get',
+	  params:data
+	})
+}

src/views/home/addOrder.vue

@@ -208,7 +208,7 @@
 					<div class="flex">
 						<el-input v-model="xdForm.phone" type="number" :disabled="loading || auto_order" v-if="xgaddress"></el-input>
 						<el-input v-model="showAddress" type="text" :disabled="loading || auto_order" v-else disabled></el-input>
-						<el-button style="margin-left: 10px;" @click="xgaddress = true">随机</el-button>
+						<el-button style="margin-left: 10px;" @click="xgaddress = true">修改</el-button>
 						<el-button style="margin-left: 10px;" @click="sjPhone">随机</el-button>
 					</div>
 				</el-form-item>
@@ -360,15 +360,15 @@
 					area: '',
 					zip: '000000',
 					// 虚假数据
-					lls: '5',
-					lle: '10',
-					lds: '5',
-					lde: '10',
+					lls: 3,
+					lle: 10,
+					lds: 3,
+					lde: 10,
 					hbmin: 3,
 					hbmax: 5,
-					hbs: '5',
-					hbe: '10',
-					xl: '300',
+					hbs: 3,
+					hbe: 10,
+					xl: 300,
 					xtype: '拼团',
 					scxz: '店铺',
 					// 无效数据
@@ -864,8 +864,8 @@
 					if (that.xdForm.lls == '') {
 						return that.$msg.error('请输入浏览最小时间')
 					}
-					if (that.xdForm.lls < 5) {
-						return that.$msg.error('浏览最小时间需大于5秒')
+					if (that.xdForm.lls < 3) {
+						return that.$msg.error('浏览最小时间需大于3秒')
 					}
 					if (that.xdForm.lle == '') {
 						return that.$msg.error('请输入浏览最大时间')
@@ -877,8 +877,8 @@
 					if (that.xdForm.lds == '') {
 						return that.$msg.error('请输入浏览店铺最小时间')
 					}
-					if (that.xdForm.lds < 5) {
-						return that.$msg.error('浏览店铺最小时间需大于5秒')
+					if (that.xdForm.lds < 3) {
+						return that.$msg.error('浏览店铺最小时间需大于3秒')
 					}
 					if (that.xdForm.lde == '') {
 						return that.$msg.error('请输入浏览店铺最大时间')
@@ -902,8 +902,8 @@
 					if (that.xdForm.hbs == '') {
 						return that.$msg.error('请输入商品比较最小时间')
 					}
-					if (that.xdForm.hbs < 5) {
-						return that.$msg.error('商品比较时间最小需大于5秒')
+					if (that.xdForm.hbs < 3) {
+						return that.$msg.error('商品比较时间最小需大于3秒')
 					}
 					if (that.xdForm.hbe == '') {
 						return that.$msg.error('请输入商品比较最大时间')
@@ -976,8 +976,8 @@
 						if (that.xdForm.lls == '') {
 							return that.$msg.error('请输入浏览最小时间')
 						}
-						if (that.xdForm.lls < 5) {
-							return that.$msg.error('浏览最小时间需大于5秒')
+						if (that.xdForm.lls < 3) {
+							return that.$msg.error('浏览最小时间需大于3秒')
 						}
 						if (that.xdForm.lle == '') {
 							return that.$msg.error('请输入浏览最大时间')
@@ -989,8 +989,8 @@
 						if (that.xdForm.lds == '') {
 							return that.$msg.error('请输入浏览店铺最小时间')
 						}
-						if (that.xdForm.lds < 5) {
-							return that.$msg.error('浏览店铺最小时间需大于5秒')
+						if (that.xdForm.lds < 3) {
+							return that.$msg.error('浏览店铺最小时间需大于3秒')
 						}
 						if (that.xdForm.lde == '') {
 							return that.$msg.error('请输入浏览店铺最大时间')
@@ -1014,8 +1014,8 @@
 						if (that.xdForm.hbs == '') {
 							return that.$msg.error('请输入商品比较最小时间')
 						}
-						if (that.xdForm.hbs < 5) {
-							return that.$msg.error('商品比较时间最小需大于5秒')
+						if (that.xdForm.hbs < 3) {
+							return that.$msg.error('商品比较时间最小需大于3秒')
 						}
 						if (that.xdForm.hbe == '') {
 							return that.$msg.error('请输入商品比较最大时间')
@@ -1099,8 +1099,8 @@
 				if (that.xdForm.lls == '') {
 					return that.$msg.error('请输入浏览最小时间')
 				}
-				if (that.xdForm.lls < 5) {
-					return that.$msg.error('浏览最小时间需大于5秒')
+				if (that.xdForm.lls < 3) {
+					return that.$msg.error('浏览最小时间需大于3秒')
 				}
 				if (that.xdForm.lle == '') {
 					return that.$msg.error('请输入浏览最大时间')
@@ -1112,8 +1112,8 @@
 				if (that.xdForm.lds == '') {
 					return that.$msg.error('请输入浏览店铺最小时间')
 				}
-				if (that.xdForm.lds < 5) {
-					return that.$msg.error('浏览店铺最小时间需大于5秒')
+				if (that.xdForm.lds < 3) {
+					return that.$msg.error('浏览店铺最小时间需大于3秒')
 				}
 				if (that.xdForm.lde == '') {
 					return that.$msg.error('请输入浏览店铺最大时间')
@@ -1137,8 +1137,8 @@
 				if (that.xdForm.hbs == '') {
 					return that.$msg.error('请输入商品比较最小时间')
 				}
-				if (that.xdForm.hbs < 5) {
-					return that.$msg.error('商品比较时间最小需大于5秒')
+				if (that.xdForm.hbs < 3) {
+					return that.$msg.error('商品比较时间最小需大于3秒')
 				}
 				if (that.xdForm.hbe == '') {
 					return that.$msg.error('请输入商品比较最大时间')
@@ -1173,7 +1173,7 @@
 					return that.$msg.error('请输入收货人')
 				}
 				if (that.xdForm.phone == '') {
-					return that.$msg.error('请输入手机号码')
+					// return that.$msg.error('请输入手机号码')
 				}
 				if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(that.xdForm.phone)) {
 					return that.$msg.error('请输入正确的手机号码')

src/views/user/rechangeList.vue

@@ -5,7 +5,7 @@
 			<!-- 搜索区域 -->
 			<el-col>
 				<div class="flex" style="justify-content: space-between;padding-bottom: 20px;">
-					<el-button type="primary" @click="openBuy">充值</el-button>
+					<!-- <el-button type="primary" @click="openBuy">充值</el-button> -->
 					<el-button type="primary" icon="el-icon-refresh-right" @click="getList('reload')">刷新</el-button>
 				</div>
 

src/views/user/setUserinfo.vue

@@ -40,7 +40,7 @@
 			<div class="u-item flex">
 				<div>
 					<div class="base">开通二次验证</div>
-					<el-tag type="danger">开通二次验证可以保障你的资金安全 否则被盗号所产生的一切问题,自行负责</el-tag>
+					<el-tag type="danger">开通二次验证可以保障你的资金安全 否则被盗号所产生的一切问题,自行负责。</el-tag>
 				</div>
 				<div>
 					<el-button type="text" v-if="userInfo.is_binding == 1">已开通</el-button>
@@ -110,45 +110,57 @@
 			</div>
 		</el-dialog>
 		<el-dialog title="充值" :visible.sync="cztVisible" width="500px" @close="closeCz()">
-			<div class="biaoti">
-				温馨提示
-			</div>
-			<div class="tis" style="color: red;">
-				充值地址请以当前地址为准，如转错地址导致货币丢失，责任自负
-			</div>
-			<div class="biaoti">
-				钱包二维码
-			</div>
-			<div class="tis">
-				<vueQrCode :size=qrCodeSize :text="czForm.address"> </vueQrCode>
-				<div v-if="timer && time.isend == false" style="color: red;">充值剩余时间 :
-					{{time.minutes + ':' + time.seconds }}</div>
-				<div v-if="timer && time.isend" style="color: red;">当前地址已过期</div>
-			</div>
-
-			<div class="biaoti">
-				钱包地址
-			</div>
-			<div class="flex tis">
-				<el-input v-model="czForm.address" type="text" disabled></el-input>
-				<el-button @click="onCopy(czForm.address)" style="margin-left: 20px;">复制地址</el-button>
-			</div>
-			<div class="biaoti">
-				充值金额
-			</div>
-			<div class="tis">
-				<el-input v-model="czForm.recharge_num" type="text" disabled></el-input>
-			</div>
-			<div class="biaoti">
-				充值金额提示
-			</div>
-			<div style="color: red;">
-				请按照实际到账金额(扣除手续费之后的到账):{{czForm.recharge_num}}进行充值,错误到账金额不予到账!
-			</div>
-			<div class="dialog-footer">
-				<el-button @click="cztVisible = false">取 消</el-button>
-				<el-button type="primary" @click="cztVisible = false">确 定</el-button>
-			</div>
+				<div class="biaoti">
+					温馨提示
+				</div>
+				<div class="tis" style="color: red;">
+					充值地址请以当前地址为准，如转错地址导致货币丢失，责任自负
+				</div>
+				<div class="biaoti">
+					钱包二维码(TRC20)
+				</div>
+				<div class="tis">
+					<vueQrCode :size=qrCodeSize :text="czForm.address"> </vueQrCode>
+					<div v-if="timer && time.isend == false" style="color: red;">充值剩余时间 :
+						{{time.minutes + ':' + time.seconds }}
+					</div>
+					<div v-if="timer && time.isend" style="color: red;">当前地址已过期</div>
+				</div>
+				
+				<div class="biaoti">
+					钱包地址(TRC20)
+				</div>
+				<div class="flex tis">
+					<el-input v-model="czForm.address" type="text" disabled></el-input>
+					<el-button @click="onCopy(czForm.address)" style="margin-left: 20px;">复制地址</el-button>
+				</div>
+				<div class="biaoti">
+					充值金额
+				</div>
+				<div class="tis">
+					<el-input v-model="czForm.recharge_num" type="text" disabled></el-input>
+				</div>
+				<div class="biaoti">
+					上传凭证
+				</div>
+				<div>
+					<el-upload class="avatar-uploader" action="https://dingdanzhushou.xyz/api/common/upload"
+						:show-file-list="false" :headers="headers" :on-success="handleCzSuccess"
+						:before-upload="beforeAvatarUpload">
+						<img v-if="czForm.image" :src="czForm.image" class="czimg">
+						<i v-else class="el-icon-plus avatar-uploader-icon"></i>
+					</el-upload>
+				</div>
+				<div class="biaoti">
+					充值金额提示
+				</div>
+				<div style="color: red;">
+					请按照实际到账金额(扣除手续费之后的到账):{{czForm.recharge_num}}进行充值,错误到账金额不予到账!
+				</div>
+				<div class="dialog-footer">
+					<el-button @click="cztVisible = false">取 消</el-button>
+					<el-button type="primary" @click="goCz()">确 定</el-button>
+				</div>
 		</el-dialog>
 		<!-- 账号续费 -->
 		<el-dialog title="提示" :visible.sync="xfVisible" width="350px">
@@ -343,7 +355,8 @@
 		repwd,
 		address,
 		xfZh,
-		getrecharge
+		getrecharge,
+		getrechange
 	} from '@/request/user.js'
 	import {
 		showTime,
@@ -374,7 +387,7 @@
 				czVisible: false,
 				czForm: {
 					recharge_num: '',
-					// image: ''
+					image: ''
 				},
 				txVisible: false,
 				txForm: {
@@ -457,11 +470,12 @@
 				clearInterval(that.timer)
 				that.timer = null
 				that.time = {}
-				getrecharge(that.czForm).then(res => {
+				getrechange(that.czForm).then(res => {
 					console.log(res);
 					that.czVisible = false
 					that.cztVisible = true
-					that.czForm = res.data
+					that.czForm.address = res.data.address
+					that.czForm.endtime = res.data.endtime
 					that.qrCodeText = res.data.address
 					if (that.timer) {
 						clearInterval(that.timer)
@@ -690,7 +704,6 @@
 				}
 				that.czloading = true
 				rechange(that.czForm).then(res => {
-
 					that.$msg.success('提交成功，请等待审核')
 					that.czVisible = false
 					that.czloading = false
@@ -840,6 +853,7 @@
 		width: 178px;
 		height: 178px;
 	}
+
 	.biaoti {
 		font-size: 18px;
 		color: #000;

src/views/user/tokenOrderList.vue

@@ -40,8 +40,8 @@
 				</el-table-column>
 				<el-table-column fixed="right" label="操作" width="150">
 					<template slot-scope="scope">
-						<el-button type="text" size="small" @click="downToken(scope.row)">下载Token</el-button>
-
+						<el-button type="text" size="small" @click="downToken(scope.row)" v-if="scope.row.status == 2">下载Token</el-button>
+						<el-button type="text" size="small" v-if="scope.row.status == 1">待发放</el-button>
 					</template>
 				</el-table-column>
 			</el-table>