Merge branch 'master' of http://git.liuniu946.com/zhang/jingcai

api/set.js

@@ -3,7 +3,8 @@ import request from '@/utils/request'
 // 修改用户信息
 export function userEdit(data) {
 	return request({
-		url: '/api/password/reset/trade_password',
+		// url: '/api/password/reset/trade_password',
+		url: '/api/user/edit',
 		method: 'post',
 		data
 	});

pages/index/entertainment.vue

@@ -111,7 +111,7 @@
 					<view v-if="item.bet==4" class="nametip green">{{$t('enter.u7')}}</view>
 				</view>
 				<view class="biwe">{{item.num*1}}</view>
-				<view class="biwe">{{item.get-item.num}}</view>
+				<view class="biwe">{{item.sexy}}</view>
 				<view class="biwe flex-center">
 					<view v-if="item.status==0" class="list-buttom primary margin-r-10">
 						{{$t('enter.a4')}}
@@ -359,10 +359,10 @@
 				const that = this;
 				that.upOnBtnData.passwordArr = val;
 				that.colsePayPassword();
-				const typeList = [this.$t('enter.u6'),this.$t('enter.u4'),this.$t('enter.u5'),this.$t('enter.u7')];
+				const typeList = [that.$t('enter.u6'),that.$t('enter.u4'),that.$t('enter.u5'),that.$t('enter.u7')];
 				uni.showModal({
-					title: this.$t('enter.c4'),
-					content: `this.$t('enter.a8')${that.upOnBtnData.value}USDTthis.$t('enter.a10')${typeList[that.upOnBtnData.type-1]}`,
+					title: that.$t('enter.c4'),
+					content: `${that.$t('enter.a8')}${that.upOnBtnData.value}USDT${that.$t('enter.a10')}${typeList[that.upOnBtnData.type-1]}`,
 					success: res => {
 						if(res.confirm){
 							that.gameBetIn();
@@ -482,7 +482,12 @@
 					limit: 10,
 					id: this.history.base.id,
 				}).then((res) => {
-					this.betList.list = res.data.bet_log;
+					this.betList.list = res.data.bet_log.map((res)=>{
+						res.num=Number(res.num);
+						res.get=Number(res.get);
+						res.sexy = res.get-res.num
+						return res
+					});
 				})
 			},
 			// 获取游戏K线信息

pages/index/index.vue

@@ -164,7 +164,7 @@
 							arr.push({
 								name: key,
 								newVlaue: ar.idxPx,
-								new24Value: Number(((ar.idxPx - ar.high24h) / ar.high24h).toFixed(5))
+								new24Value: Number(((ar.idxPx - ar.open24h) / ar.open24h).toFixed(5))
 							})
 						}
 						that.navList = arr

pages/user/money/team.vue

@@ -21,12 +21,12 @@
 		<view class="info-box flex">
 			<view class="info-item">
 				<view class="info-font">{{$t('money.a7')}}</view>
-				<view class="info-num">{{userInfo.brokerage || '0'}}</view>
+				<view class="info-num">{{userInfo.sum_recharge || '0'}}</view>
 			</view>
 			<view class="shu"></view>
 			<view class="info-item">
 				<view class="info-font">{{$t('money.a8')}}</view>
-				<view class="info-num">{{userInfo.extract || '0'}}</view>
+				<view class="info-num">{{userInfo.sum_extract || '0'}}</view>
 			</view>
 		</view>