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

api/set.js

@@ -27,6 +27,15 @@ export function registerReset(data) {
 	});
 }
 
+//修改交易密码
+export function Reset(data) {
+	return request({
+		url: '/api/password/reset/trade_password',
+		method: 'post',
+		data
+	});
+}
+
 //绑定手机
 export function binding(data) {
 	return request({

libs/i18n/lang/cn.json

@@ -167,8 +167,7 @@
 		"a6": "已开奖",
 		"a7": "押注类型",
 		"a8": "返还金额",
-		"a9": "开始价格",
-		"a0": "结束价格"
+		"a9": "开奖结果"
 	},
 	"huiyuan": {
 		"a1": "直推人数",

libs/i18n/lang/en.json

@@ -147,8 +147,7 @@
 		"a6": "Awarded",
 		"a7": "Bet type",
 		"a8": " Return amount",
-		"a9": "Starting Price",
-		"a0": "End Price"
+		"a9": "Lottery results"
 	},
 	"huiyuan": {
 		"a1": "Recommends",

libs/i18n/lang/tw.json

@@ -167,8 +167,7 @@
 		"a6": "已開獎",
 		"a7": "押註類型",
 		"a8": "返還金額",
-		"a9": "開始價格",
-		"a0": "結束價格"
+		"a9": "開獎結果"
 	},
 	"huiyuan": {
 		"a1": "直推人數",

pages/user/money/withdrawal.vue

@@ -23,7 +23,7 @@
 				<view class="btn" @click="withdrawal=userWallet">USDT {{$t('userinfo.u20')}}</view>
 			</view>
 			<view class="topO ">
-				{{$t('userinfo.u21')}}
+				{{$t('userinfo.u21')}} (3%)
 			</view>
 			<view class="topF flex">
 				<text v-if="type==1">{{charge}}</text>

pages/user/set/transaction.vue

@@ -155,7 +155,7 @@ page {
 	background-color: $color-gray;
 }
 .code {
-	color: #5dbc7c;
+	color: #000s;
 	font-size: 23rpx;
 	border-left: 1px solid #eeeeee;
 	width: 150rpx;

pages/user/shareQrCode.vue

@@ -37,10 +37,6 @@
 					<view class="lsT">{{$t('gameList.a9')}}</view>
 					<view class="lisT" v-if="item.room.result_info">{{item.room.result_info.o}}</view>
 				</view>
-				<view class="TT flex">
-					<view class="lsT">{{$t('gameList.a0')}}</view>
-					<view class="lisT" v-if="item.room.result_info">{{item.room.result_info.c}}</view>
-				</view>
 				<view class="TT flex">
 					<view class="lsT">{{$t('gameList.a5')}}</view>
 					<view class="lisT">{{item.open_time}}</view>