wesmiler

addons/xlapp/common/locales/zh-cn.js

@@ -903,6 +903,18 @@ export default {
 	"请选择支持的支付方式": "请选择支持的支付方式",
 	"请输入商户姓名": "请输入商户姓名",
 	"交易额度": "交易额度",
+	"盲盒抽奖": "盲盒抽奖",
+	"抽奖次数": "抽奖次数",
+	"抽奖中": "抽奖中",
+	"恭喜您，抽中了一台矿机": "恭喜您，抽中了一台矿机",
+	"很遗憾，您没有抽中": "很遗憾，您没有抽中",
+	"请输入额度提现金额": '请输入额度提现金额',
+	"不可超出剩余交易额度": "不可超出剩余交易额度",
+	"请输入您的提现数量": "请输入您的提现数量",
+	"额度": "额度",
+	"请输入额度提现数量": "请输入额度提现数量",
+	"次": "次",
+	"您的抽奖次数": "您的抽奖次数",
 
 
 }

addons/xlapp/pages.json

@@ -308,22 +308,6 @@
 			}
 		},
 		{
-			"path": "pages/trade/withdraw/index",
-			"style": {
-				"navigationBarTitleText": "承兑商提现",
-				"navigationStyle": "custom", // 隐藏系统导航栏
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/trade/withdraw/log",
-			"style": {
-				"navigationBarTitleText": "承兑商提现记录",
-				"navigationStyle": "custom", // 隐藏系统导航栏
-				"enablePullDownRefresh": true
-			}
-		},
-		{
 			"path": "pages/shop/carts",
 			"style": {
 				"navigationBarTitleText": "购物车",
@@ -602,6 +586,38 @@
 				"navigationStyle": "custom", // 隐藏系统导航栏
 				"enablePullDownRefresh": true
 			}
+		},
+		{
+			"path": "pages/trade/withdraw/quota",
+			"style": {
+				"navigationBarTitleText": "额度提现",
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/trade/recharge/quota",
+			"style": {
+				"navigationBarTitleText": "额度充值",
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/trade/recharge/record",
+			"style": {
+				"navigationBarTitleText": "额度充值记录",
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/machine/box",
+			"style": {
+				"navigationBarTitleText": "盲盒抽奖",
+				"navigationStyle": "custom", // 隐藏系统导航栏
+				"enablePullDownRefresh": true
+			}
 		}
 
 	],

addons/xlapp/pages/trade/center.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="app">
-		<u-navbar :title="$t('商家服务')" :height="'90rpx'" :titleStyle="{color: '#fff','fontSize':'36rpx'}"
+		<u-navbar :title="$t('承兑商后台')" :height="'90rpx'" :titleStyle="{color: '#fff','fontSize':'36rpx'}"
 			bgColor="transparent" :autoBack="false" :placeholder="true" :safeAreaInsetTop="true">
 			<view slot="left" @click="goBack()">
 				<u-icon class="icon" name="arrow-left" size="46" color="#fff"></u-icon>
@@ -10,11 +10,11 @@
 			<view class="main-box">
 				<view class="account-box">
 					<view class="info">
-						<image class="icon" :src="info.logo" mode="aspectFit"></image>
+						<text class="logo">{{info.name.substr(0,1)}}</text>
 						<text class="name">{{info.name}}</text>
 					</view>
 					<view class="count-box">
-						<view class="count-item" @click="gotoPage('/pages/merchant/withdraw/usdt')">
+						<view class="count-item" @click="gotoPage('/pages/trade/withdraw/usdt')">
 							<view class="num">
 								{{info.usdt||'0.00'}}
 							</view>
@@ -22,7 +22,7 @@
 								{{$t('交易佣金')}}
 							</view>
 						</view>
-						<view class="count-item" @click="gotoPage('/pages/merchant/withdraw/usdt')">
+						<view class="count-item" @click="gotoPage('/pages/trade/withdraw/quota')">
 							<view class="num">
 								{{info.quota||'0.00'}}
 							</view>
@@ -37,12 +37,12 @@
 						<image class="icon" src="../../static/icons/user/icon-trade-log.png" mode="aspectFit"></image>
 						<text class="text">{{$t('交易订单')}}</text>
 					</view>
-					<view class="menu-item" @click="gotoPage('/pages/trade/quota?id='+info.id)">
-						<image class="icon" src="../../static/icons/user/icon-recharge.png" mode="aspectFit">
+					<view class="menu-item" @click="gotoPage('/pages/trade/recharge/quota?id='+info.id)">
+						<image class="icon" src="../../static/icons/user/icon-quota.png" mode="aspectFit">
 						</image>
 						<text class="text">{{$t('额度充值')}}</text>
 					</view>
-					<view class="menu-item" @click="gotoPage('/pages/user/profile/pay_password?type=merch')">
+					<view class="menu-item" @click="gotoPage('/pages/user/profile/pay_password?type=acceptor')">
 						<image class="icon" src="../../static/icons/user/icon-password.png" mode="aspectFit"></image>
 						<text class="text">{{$t('设置密码')}}</text>
 					</view>
@@ -167,6 +167,17 @@
 						border-radius: 100rpx;
 					}
 
+					.logo {
+						width: 48rpx;
+						height: 48rpx;
+						line-height: 48rpx;
+						text-align: center;
+						background-color: #333;
+						border-radius: 100rpx;
+						display: inline-block;
+						color: #fff;
+					}
+
 					.name {
 						font-weight: bold;
 						margin-left: 10rpx;
@@ -192,7 +203,7 @@
 							padding: 10rpx 0;
 							font-size: 36rpx;
 							font-weight: bold;
-							color: #579DC1;
+							color: #14ECCC;
 						}
 
 						.text {

addons/xlapp/pages/trade/withdraw/index.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

addons/xlapp/pages/trade/withdraw/log.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

addons/xlapp/pages/user/index.vue

@@ -254,7 +254,7 @@
 								</image>
 								<text class="grid-text">{{$t('商家入驻')}}</text>
 							</u-grid-item>
-							<u-grid-item @click="gotoPage('/pages/machine/index')">
+							<u-grid-item @click="gotoPage('/pages/machine/box')">
 								<image class="icon" src="../../static/icons/user/machine.png" :lazy-load="true"></image>
 								<text class="grid-text">{{$t('盲盒矿机')}}</text>
 							</u-grid-item>

app/Http/Controllers/Api/v1/TestController.php

@@ -22,10 +22,9 @@ class TestController extends webApp
 //        var_dump($result);
 //        $result = GoodsService::make()->updateGoodsCategory();
 //        var_dump($result);
-//        $result = GoodsService::make()->updateGoods(20,['title'=>'测试商品']);
-        $result = FinanceService::make()->grantScore();
-        $result = FinanceService::make()->returnWaitScore();
-        $result = FinanceService::make()->globalBonus();
+        $title = request()->post('kw','');
+        $result = GoodsService::make()->updateGoods(20,['title'=>$title]);
+
 //        $result = SupplyService::make()->getApiData('getGoodsCategory');
         return showJson('获取结果',true, $result);
     }