From 0331c61b7c68f93f713ab6268c10bd4f56bb09fb Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Mon, 12 Oct 2020 22:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=E6=8F=90=E7=8E=B0=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9C=80=E4=BD=8E=E9=87=91=E9=A2=9D=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.txt                                 |  1 +
 .../plugins/wallet/cash-auth/cash-auth.axml   | 82 ++++++++++---------
 .../plugins/wallet/cash-auth/cash-auth.js     |  5 +-
 .../wallet/cash-create/cash-create.axml       |  3 +-
 .../plugins/wallet/cash-auth/cash-auth.js     |  5 +-
 .../plugins/wallet/cash-auth/cash-auth.qml    | 81 ++++++++++--------
 .../wallet/cash-create/cash-create.qml        |  3 +-
 .../plugins/wallet/cash-auth/cash-auth.js     |  4 +
 .../plugins/wallet/cash-auth/cash-auth.ttml   | 82 ++++++++++---------
 .../wallet/cash-create/cash-create.ttml       |  3 +-
 sourcecode/weixin/app.js                      |  2 +-
 .../plugins/wallet/cash-auth/cash-auth.js     |  5 +-
 .../plugins/wallet/cash-auth/cash-auth.wxml   | 81 ++++++++++--------
 .../wallet/cash-create/cash-create.wxml       |  3 +-
 14 files changed, 206 insertions(+), 154 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 04c54be48..60308b104 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -25,6 +25,7 @@ web端
 	1. 汇率插件支持货币自由切换
 	2. 新增IEPay新西兰货币支付（支付宝+微信）
 	3. 新增博客插件、写文章增加商城的搜索引擎收录、关联推荐商品
+	4. 钱包插件支持修改余额输入操作密码、提现支持配置最低金额
 
 
 +=========================================================+
diff --git a/sourcecode/alipay/pages/plugins/wallet/cash-auth/cash-auth.axml b/sourcecode/alipay/pages/plugins/wallet/cash-auth/cash-auth.axml
index 1ce12c95d..4f34c15d8 100644
--- a/sourcecode/alipay/pages/plugins/wallet/cash-auth/cash-auth.axml
+++ b/sourcecode/alipay/pages/plugins/wallet/cash-auth/cash-auth.axml
@@ -1,51 +1,59 @@
 <view a:if="{{data_list_loding_status != 1}}">
-  <form a:if="{{check_account_list.length > 0}}" onSubmit="form_submit" class="form-container oh">
-    <view class="form-gorup bg-white">
-      <view class="form-gorup-title">选择身份认证方式<text class="form-group-tips-must">必选</text></view>
-      <view class="section">
-        <picker name="account_type" onChange="select_check_account_event" value="{{check_account_value}}" range="{{check_account_list}}" range-key="msg">
-            <view class="picker name {{(check_account_value == null) ? 'cr-ccc' : 'cr-666' }}">
-              <view a:if="{{check_account_value == null}}">
-                请选择认证账号
+  <view a:if="{{(data_base.cash_minimum_amount || null) == null || data_base.cash_minimum_amount <= 0 || (user_wallet.normal_money >= data_base.cash_minimum_amount)}}">
+    <form a:if="{{check_account_list.length > 0}}" onSubmit="form_submit" class="form-container oh">
+      <view class="form-gorup bg-white">
+        <view class="form-gorup-title">选择身份认证方式<text class="form-group-tips-must">必选</text></view>
+        <view class="section">
+          <picker name="account_type" onChange="select_check_account_event" value="{{check_account_value}}" range="{{check_account_list}}" range-key="msg">
+              <view class="picker name {{(check_account_value == null) ? 'cr-ccc' : 'cr-666' }}">
+                <view a:if="{{check_account_value == null}}">
+                  请选择认证账号
+                </view>
+                <view a:else>
+                  {{check_account_list[check_account_value]['msg']}}
+                </view>
               </view>
-              <view a:else>
-                {{check_account_list[check_account_value]['msg']}}
-              </view>
-            </view>
-        </picker>
+          </picker>
+        </view>
       </view>
-    </view>
 
-    <view class="form-gorup bg-white verify-input">
-      <view class="form-gorup-title">请输入安全验证码<text class="form-group-tips-must">必填</text></view>
-      <input type="number" name="verify" placeholder-class="cr-ccc" class="cr-666" placeholder="验证码格式 4 位数字" maxlength="4" />
-      <button type="default" hover-class="none" size="mini" loading="{{verify_loading}}" disabled="{{verify_disabled}}" onTap="verify_send_event" class="verify-sub {{verify_disabled ? 'sub-disabled' : ''}}">{{verify_submit_text}}</button>
-    </view>
+      <view class="form-gorup bg-white verify-input">
+        <view class="form-gorup-title">请输入安全验证码<text class="form-group-tips-must">必填</text></view>
+        <input type="number" name="verify" placeholder-class="cr-ccc" class="cr-666" placeholder="验证码格式 4 位数字" maxlength="4" />
+        <button type="default" hover-class="none" size="mini" loading="{{verify_loading}}" disabled="{{verify_disabled}}" onTap="verify_send_event" class="verify-sub {{verify_disabled ? 'sub-disabled' : ''}}">{{verify_submit_text}}</button>
+      </view>
+
+      <view class="form-gorup">
+        <button class="bg-main" type="default" formType="submit" hover-class="none" disabled="{{form_submit_disabled_status}}">提交</button>
+      </view>
+    </form>
 
-    <view class="form-gorup">
-      <button class="bg-main" type="default" formType="submit" hover-class="none" disabled="{{form_submit_disabled_status}}">提交</button>
+    <view class="view-tips spacing-mt">
+      <view class="tips">
+        <view>操作提示</view>
+        <view>1. 请选择 "<text class="cr-main">绑定邮箱</text>" 或 "<text class="cr-main">绑定手机</text>" 方式其一作为安全校验码的获取方式并正确输入。</view>
+        <view>2. 如果您未绑定手机或者邮箱已失效，可以绑定手机后通过接收手机短信完成验证。</view>
+        <view>3. 如果您未绑定邮箱或者已失效，可以绑定邮箱后通过接收邮件完成验证。</view>
+        <view>4. 请正确输入下方图形验证码，如看不清可点击图片进行更换，输入完成后进行下一步操作。</view>
+        <view>5. 收到安全验证码后，请在10分钟内完成验证。</view>
+        <view>6. 安全验证成功后，请在30分钟内完成提现申请。</view>
+      </view>
     </view>
-  </form>
 
-  <view class="view-tips spacing-mt">
-    <view class="tips">
-      <view>操作提示</view>
-      <view>1. 请选择 "<text class="cr-main">绑定邮箱</text>" 或 "<text class="cr-main">绑定手机</text>" 方式其一作为安全校验码的获取方式并正确输入。</view>
-      <view>2. 如果您未绑定手机或者邮箱已失效，可以绑定手机后通过接收手机短信完成验证。</view>
-      <view>3. 如果您未绑定邮箱或者已失效，可以绑定邮箱后通过接收邮件完成验证。</view>
-      <view>4. 请正确输入下方图形验证码，如看不清可点击图片进行更换，输入完成后进行下一步操作。</view>
-      <view>5. 收到安全验证码后，请在10分钟内完成验证。</view>
-      <view>6. 安全验证成功后，请在30分钟内完成提现申请。</view>
+    <view a:if="{{check_account_list.length == 0}}" class="bind-mobile-container">
+      <navigator url="/pages/login/login" hover-class="none">
+        <button type="warn" class="mobile-submit">绑定手机号码</button>
+      </navigator>
     </view>
   </view>
-
-  <view a:if="{{check_account_list.length == 0}}" class="bind-mobile-container">
-    <navigator url="/pages/login/login" hover-class="none">
-      <button type="warn" class="mobile-submit">绑定手机号码</button>
-    </navigator>
+  <view a:else>
+    <view class="view-tips spacing-mt">
+      <view class="tips">
+        <view>提现最低金额 <text class="cr-main">{{data_base.cash_minimum_amount}}</text> 元起</view>
+      </view>
+    </view>
   </view>
 </view>
-</view>
 
 <view a:else>
   <import src="/pages/common/nodata.axml" />
diff --git a/sourcecode/alipay/pages/plugins/wallet/cash-auth/cash-auth.js b/sourcecode/alipay/pages/plugins/wallet/cash-auth/cash-auth.js
index 64dd5a0b1..e04da2c87 100644
--- a/sourcecode/alipay/pages/plugins/wallet/cash-auth/cash-auth.js
+++ b/sourcecode/alipay/pages/plugins/wallet/cash-auth/cash-auth.js
@@ -4,8 +4,9 @@ Page({
     params: null,
     data_list_loding_status: 1,
     data_list_loding_msg: '',
+    data_base: null,
+    user_wallet: null,
     check_account_list: [],
-
     verify_submit_text: '获取验证码',
     verify_loading: false,
     verify_disabled: false,
@@ -65,6 +66,8 @@ Page({
         if (res.data.code == 0) {
           var data = res.data.data;
           this.setData({
+            data_base: data.base || null,
+            user_wallet: data.user_wallet || null,
             check_account_list: data.check_account_list || [],
           });
         } else {
diff --git a/sourcecode/alipay/pages/plugins/wallet/cash-create/cash-create.axml b/sourcecode/alipay/pages/plugins/wallet/cash-create/cash-create.axml
index 5be17ac48..85b76aec6 100644
--- a/sourcecode/alipay/pages/plugins/wallet/cash-create/cash-create.axml
+++ b/sourcecode/alipay/pages/plugins/wallet/cash-create/cash-create.axml
@@ -1,9 +1,10 @@
 <form a:if="{{check_status == 1}}" onSubmit="form_submit" class="form-container oh">
   <view class="form-gorup bg-white">
     <view class="form-gorup-title">提现金额<text class="form-group-tips-must">必填</text></view>
-    <input type="digit" name="money" value="{{default_data.money || ''}}" placeholder-class="cr-ccc" class="cr-666" placeholder="提现金额，最低0.01元，最高{{can_cash_max_money}}元" />
+    <input type="digit" name="money" value="{{default_data.money || ''}}" placeholder-class="cr-ccc" class="cr-666" placeholder="提现金额，最低{{(data_base.cash_minimum_amount || 0) <= 0 ? 0.01 : data_base.cash_minimum_amount}}元，最高{{can_cash_max_money}}元" />
     <view class="tips form-tips">
       <view a:if="{{(data_base || null) == null || data_base.is_cash_retain_give != 0}}">赠送金额不可提现</view>
+      <view a:if="{{(data_base || null) != null && data_base.cash_minimum_amount > 0}}">提现最低金额 {{data_base.cash_minimum_amount}} 元起</view>
       <view>当前可提现金额 <text class="cr-main">{{can_cash_max_money}}</text> 元</view>
       <view>当前可用金额 <text class="cr-666">{{user_wallet.normal_money}}</text> 元</view>
       <view>当前赠送金额 <text class="cr-666">{{user_wallet.give_money}}</text> 元</view>
diff --git a/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.js b/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.js
index a21169a07..f4b70a33a 100644
--- a/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.js
+++ b/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.js
@@ -4,8 +4,9 @@ Page({
     params: null,
     data_list_loding_status: 1,
     data_list_loding_msg: '',
+    data_base: null,
+    user_wallet: null,
     check_account_list: [],
-
     verify_submit_text: '获取验证码',
     verify_loading: false,
     verify_disabled: false,
@@ -65,6 +66,8 @@ Page({
         if (res.data.code == 0) {
           var data = res.data.data;
           this.setData({
+            data_base: data.base || null,
+            user_wallet: data.user_wallet || null,
             check_account_list: data.check_account_list || [],
           });
         } else {
diff --git a/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.qml b/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.qml
index 1944a51be..e943787a3 100644
--- a/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.qml
+++ b/sourcecode/qq/pages/plugins/wallet/cash-auth/cash-auth.qml
@@ -1,48 +1,57 @@
 <view qq:if="{{data_list_loding_status != 1}}">
-  <form qq:if="{{check_account_list.length > 0}}" bindsubmit="form_submit" class="form-container oh">
-    <view class="form-gorup bg-white">
-      <view class="form-gorup-title">选择身份认证方式<text class="form-group-tips-must">必选</text></view>
-      <view class="section">
-        <picker name="account_type" bindchange="select_check_account_event" value="{{check_account_value}}" range="{{check_account_list}}" range-key="msg">
-            <view class="picker name {{(check_account_value == null) ? 'cr-ccc' : 'cr-666' }}">
-              <view qq:if="{{check_account_value == null}}">
-                请选择认证账号
+  <view qq:if="{{(data_base.cash_minimum_amount || null) == null || data_base.cash_minimum_amount <= 0 || (user_wallet.normal_money >= data_base.cash_minimum_amount)}}">
+    <form qq:if="{{check_account_list.length > 0}}" bindsubmit="form_submit" class="form-container oh">
+      <view class="form-gorup bg-white">
+        <view class="form-gorup-title">选择身份认证方式<text class="form-group-tips-must">必选</text></view>
+        <view class="section">
+          <picker name="account_type" bindchange="select_check_account_event" value="{{check_account_value}}" range="{{check_account_list}}" range-key="msg">
+              <view class="picker name {{(check_account_value == null) ? 'cr-ccc' : 'cr-666' }}">
+                <view qq:if="{{check_account_value == null}}">
+                  请选择认证账号
+                </view>
+                <view qq:else>
+                  {{check_account_list[check_account_value]['msg']}}
+                </view>
               </view>
-              <view qq:else>
-                {{check_account_list[check_account_value]['msg']}}
-              </view>
-            </view>
-        </picker>
+          </picker>
+        </view>
       </view>
-    </view>
 
-    <view class="form-gorup bg-white verify-input">
-      <view class="form-gorup-title">请输入安全验证码<text class="form-group-tips-must">必填</text></view>
-      <input type="number" name="verify" placeholder-class="cr-ccc" class="cr-666" placeholder="验证码格式 4 位数字" maxlength="4" />
-      <button type="default" hover-class="none" size="mini" loading="{{verify_loading}}" disabled="{{verify_disabled}}" bindtap="verify_send_event" class="verify-sub {{verify_disabled ? 'sub-disabled' : ''}}">{{verify_submit_text}}</button>
-    </view>
+      <view class="form-gorup bg-white verify-input">
+        <view class="form-gorup-title">请输入安全验证码<text class="form-group-tips-must">必填</text></view>
+        <input type="number" name="verify" placeholder-class="cr-ccc" class="cr-666" placeholder="验证码格式 4 位数字" maxlength="4" />
+        <button type="default" hover-class="none" size="mini" loading="{{verify_loading}}" disabled="{{verify_disabled}}" bindtap="verify_send_event" class="verify-sub {{verify_disabled ? 'sub-disabled' : ''}}">{{verify_submit_text}}</button>
+      </view>
+
+      <view class="form-gorup">
+        <button class="bg-main" type="default" formType="submit" hover-class="none" disabled="{{form_submit_disabled_status}}">提交</button>
+      </view>
+    </form>
 
-    <view class="form-gorup">
-      <button class="bg-main" type="default" formType="submit" hover-class="none" disabled="{{form_submit_disabled_status}}">提交</button>
+    <view class="view-tips spacing-mt">
+      <view class="tips">
+        <view>操作提示</view>
+        <view>1. 请选择 "<text class="cr-main">绑定邮箱</text>" 或 "<text class="cr-main">绑定手机</text>" 方式其一作为安全校验码的获取方式并正确输入。</view>
+        <view>2. 如果您未绑定手机或者邮箱已失效，可以绑定手机后通过接收手机短信完成验证。</view>
+        <view>3. 如果您未绑定邮箱或者已失效，可以绑定邮箱后通过接收邮件完成验证。</view>
+        <view>4. 请正确输入下方图形验证码，如看不清可点击图片进行更换，输入完成后进行下一步操作。</view>
+        <view>5. 收到安全验证码后，请在10分钟内完成验证。</view>
+        <view>6. 安全验证成功后，请在30分钟内完成提现申请。</view>
+      </view>
     </view>
-  </form>
 
-  <view class="view-tips spacing-mt">
-    <view class="tips">
-      <view>操作提示</view>
-      <view>1. 请选择 "<text class="cr-main">绑定邮箱</text>" 或 "<text class="cr-main">绑定手机</text>" 方式其一作为安全校验码的获取方式并正确输入。</view>
-      <view>2. 如果您未绑定手机或者邮箱已失效，可以绑定手机后通过接收手机短信完成验证。</view>
-      <view>3. 如果您未绑定邮箱或者已失效，可以绑定邮箱后通过接收邮件完成验证。</view>
-      <view>4. 请正确输入下方图形验证码，如看不清可点击图片进行更换，输入完成后进行下一步操作。</view>
-      <view>5. 收到安全验证码后，请在10分钟内完成验证。</view>
-      <view>6. 安全验证成功后，请在30分钟内完成提现申请。</view>
+    <view qq:if="{{check_account_list.length == 0}}" class="bind-mobile-container">
+      <navigator url="/pages/login/login" hover-class="none">
+        <button type="warn" class="mobile-submit">绑定手机号码</button>
+      </navigator>
     </view>
   </view>
-
-  <view qq:if="{{check_account_list.length == 0}}" class="bind-mobile-container">
-    <navigator url="/pages/login/login" hover-class="none">
-      <button type="warn" class="mobile-submit">绑定手机号码</button>
-    </navigator>
+  <view qq:else>
+    <view class="view-tips spacing-mt">
+      <view class="tips">
+        <view>提现最低金额 <text class="cr-main">{{data_base.cash_minimum_amount}}</text> 元起</view>
+      </view>
+    </view>
   </view>
 </view>
 
diff --git a/sourcecode/qq/pages/plugins/wallet/cash-create/cash-create.qml b/sourcecode/qq/pages/plugins/wallet/cash-create/cash-create.qml
index 580bd9b30..c6c9380cb 100644
--- a/sourcecode/qq/pages/plugins/wallet/cash-create/cash-create.qml
+++ b/sourcecode/qq/pages/plugins/wallet/cash-create/cash-create.qml
@@ -1,9 +1,10 @@
 <form qq:if="{{check_status == 1}}" bindsubmit="form_submit" class="form-container oh">
   <view class="form-gorup bg-white">
     <view class="form-gorup-title">提现金额<text class="form-group-tips-must">必填</text></view>
-    <input type="digit" name="money" value="{{default_data.money || ''}}" placeholder-class="cr-ccc" class="cr-666" placeholder="提现金额，最低0.01元，最高{{can_cash_max_money}}元" />
+    <input type="digit" name="money" value="{{default_data.money || ''}}" placeholder-class="cr-ccc" class="cr-666" placeholder="提现金额，最低{{(data_base.cash_minimum_amount || 0) <= 0 ? 0.01 : data_base.cash_minimum_amount}}元，最高{{can_cash_max_money}}元" />
     <view class="tips form-tips">
       <view qq:if="{{(data_base || null) == null || data_base.is_cash_retain_give != 0}}">赠送金额不可提现</view>
+      <view qq:if="{{(data_base || null) != null && data_base.cash_minimum_amount > 0}}">提现最低金额 {{data_base.cash_minimum_amount}} 元起</view>
       <view>当前可提现金额 <text class="cr-main">{{can_cash_max_money}}</text> 元</view>
       <view>当前可用金额 <text class="cr-666">{{user_wallet.normal_money}}</text> 元</view>
       <view>当前赠送金额 <text class="cr-666">{{user_wallet.give_money}}</text> 元</view>
diff --git a/sourcecode/toutiao/pages/plugins/wallet/cash-auth/cash-auth.js b/sourcecode/toutiao/pages/plugins/wallet/cash-auth/cash-auth.js
index ac8eb45bc..874610866 100644
--- a/sourcecode/toutiao/pages/plugins/wallet/cash-auth/cash-auth.js
+++ b/sourcecode/toutiao/pages/plugins/wallet/cash-auth/cash-auth.js
@@ -4,6 +4,8 @@ Page({
     params: null,
     data_list_loding_status: 1,
     data_list_loding_msg: '',
+    data_base: null,
+    user_wallet: null,
     check_account_list: [],
     verify_submit_text: '获取验证码',
     verify_loading: false,
@@ -66,6 +68,8 @@ Page({
         if (res.data.code == 0) {
           var data = res.data.data;
           this.setData({
+            data_base: data.base || null,
+            user_wallet: data.user_wallet || null,
             check_account_list: data.check_account_list || []
           });
         } else {
diff --git a/sourcecode/toutiao/pages/plugins/wallet/cash-auth/cash-auth.ttml b/sourcecode/toutiao/pages/plugins/wallet/cash-auth/cash-auth.ttml
index afdcaf659..65e2ee716 100644
--- a/sourcecode/toutiao/pages/plugins/wallet/cash-auth/cash-auth.ttml
+++ b/sourcecode/toutiao/pages/plugins/wallet/cash-auth/cash-auth.ttml
@@ -1,51 +1,59 @@
 <view tt:if="{{data_list_loding_status != 1}}">
-  <form tt:if="{{check_account_list.length > 0}}" bindsubmit="form_submit" class="form-container oh">
-    <view class="form-gorup bg-white">
-      <view class="form-gorup-title">选择身份认证方式<text class="form-group-tips-must">必选</text></view>
-      <view class="section">
-        <picker name="account_type" bindchange="select_check_account_event" value="{{check_account_value}}" range="{{check_account_list}}" range-key="msg">
-            <view class="picker name {{(check_account_value == null) ? 'cr-ccc' : 'cr-666' }}">
-              <view tt:if="{{check_account_value == null}}">
-                请选择认证账号
+  <view tt:if="{{(data_base.cash_minimum_amount || null) == null || data_base.cash_minimum_amount <= 0 || (user_wallet.normal_money >= data_base.cash_minimum_amount)}}">
+    <form tt:if="{{check_account_list.length > 0}}" bindsubmit="form_submit" class="form-container oh">
+      <view class="form-gorup bg-white">
+        <view class="form-gorup-title">选择身份认证方式<text class="form-group-tips-must">必选</text></view>
+        <view class="section">
+          <picker name="account_type" bindchange="select_check_account_event" value="{{check_account_value}}" range="{{check_account_list}}" range-key="msg">
+              <view class="picker name {{(check_account_value == null) ? 'cr-ccc' : 'cr-666' }}">
+                <view tt:if="{{check_account_value == null}}">
+                  请选择认证账号
+                </view>
+                <view tt:else>
+                  {{check_account_list[check_account_value]['msg']}}
+                </view>
               </view>
-              <view tt:else>
-                {{check_account_list[check_account_value]['msg']}}
-              </view>
-            </view>
-        </picker>
+          </picker>
+        </view>
       </view>
-    </view>
 
-    <view class="form-gorup bg-white verify-input">
-      <view class="form-gorup-title">请输入安全验证码<text class="form-group-tips-must">必填</text></view>
-      <input type="number" name="verify" placeholder-class="cr-ccc" class="cr-666" placeholder="验证码格式 4 位数字" maxlength="4" />
-      <button type="default" hover-class="none" size="mini" loading="{{verify_loading}}" disabled="{{verify_disabled}}" bindtap="verify_send_event" class="verify-sub {{verify_disabled ? 'sub-disabled' : ''}}">{{verify_submit_text}}</button>
-    </view>
+      <view class="form-gorup bg-white verify-input">
+        <view class="form-gorup-title">请输入安全验证码<text class="form-group-tips-must">必填</text></view>
+        <input type="number" name="verify" placeholder-class="cr-ccc" class="cr-666" placeholder="验证码格式 4 位数字" maxlength="4" />
+        <button type="default" hover-class="none" size="mini" loading="{{verify_loading}}" disabled="{{verify_disabled}}" bindtap="verify_send_event" class="verify-sub {{verify_disabled ? 'sub-disabled' : ''}}">{{verify_submit_text}}</button>
+      </view>
+
+      <view class="form-gorup">
+        <button class="bg-main" type="default" formType="submit" hover-class="none" disabled="{{form_submit_disabled_status}}">提交</button>
+      </view>
+    </form>
 
-    <view class="form-gorup">
-      <button class="bg-main" type="default" formType="submit" hover-class="none" disabled="{{form_submit_disabled_status}}">提交</button>
+    <view class="view-tips spacing-mt">
+      <view class="tips">
+        <view>操作提示</view>
+        <view>1. 请选择 "<text class="cr-main">绑定邮箱</text>" 或 "<text class="cr-main">绑定手机</text>" 方式其一作为安全校验码的获取方式并正确输入。</view>
+        <view>2. 如果您未绑定手机或者邮箱已失效，可以绑定手机后通过接收手机短信完成验证。</view>
+        <view>3. 如果您未绑定邮箱或者已失效，可以绑定邮箱后通过接收邮件完成验证。</view>
+        <view>4. 请正确输入下方图形验证码，如看不清可点击图片进行更换，输入完成后进行下一步操作。</view>
+        <view>5. 收到安全验证码后，请在10分钟内完成验证。</view>
+        <view>6. 安全验证成功后，请在30分钟内完成提现申请。</view>
+      </view>
     </view>
-  </form>
 
-  <view class="view-tips spacing-mt">
-    <view class="tips">
-      <view>操作提示</view>
-      <view>1. 请选择 "<text class="cr-main">绑定邮箱</text>" 或 "<text class="cr-main">绑定手机</text>" 方式其一作为安全校验码的获取方式并正确输入。</view>
-      <view>2. 如果您未绑定手机或者邮箱已失效，可以绑定手机后通过接收手机短信完成验证。</view>
-      <view>3. 如果您未绑定邮箱或者已失效，可以绑定邮箱后通过接收邮件完成验证。</view>
-      <view>4. 请正确输入下方图形验证码，如看不清可点击图片进行更换，输入完成后进行下一步操作。</view>
-      <view>5. 收到安全验证码后，请在10分钟内完成验证。</view>
-      <view>6. 安全验证成功后，请在30分钟内完成提现申请。</view>
+    <view tt:if="{{check_account_list.length == 0}}" class="bind-mobile-container">
+      <navigator url="/pages/login/login" hover-class="none">
+        <button type="warn" class="mobile-submit">绑定手机号码</button>
+      </navigator>
     </view>
   </view>
-
-  <view tt:if="{{check_account_list.length == 0}}" class="bind-mobile-container">
-    <navigator url="/pages/login/login" hover-class="none">
-      <button type="warn" class="mobile-submit">绑定手机号码</button>
-    </navigator>
+  <view tt:else>
+    <view class="view-tips spacing-mt">
+      <view class="tips">
+        <view>提现最低金额 <text class="cr-main">{{data_base.cash_minimum_amount}}</text> 元起</view>
+      </view>
+    </view>
   </view>
 </view>
-</view>
 
 <view tt:else>
   <import src="/pages/common/nodata.ttml" />
diff --git a/sourcecode/toutiao/pages/plugins/wallet/cash-create/cash-create.ttml b/sourcecode/toutiao/pages/plugins/wallet/cash-create/cash-create.ttml
index 3b25587f2..1e023e77f 100644
--- a/sourcecode/toutiao/pages/plugins/wallet/cash-create/cash-create.ttml
+++ b/sourcecode/toutiao/pages/plugins/wallet/cash-create/cash-create.ttml
@@ -1,9 +1,10 @@
 <form tt:if="{{check_status == 1}}" bindsubmit="form_submit" class="form-container oh">
   <view class="form-gorup bg-white">
     <view class="form-gorup-title">提现金额<text class="form-group-tips-must">必填</text></view>
-    <input type="digit" name="money" value="{{default_data.money || ''}}" placeholder-class="cr-ccc" class="cr-666" placeholder="提现金额，最低0.01元，最高{{can_cash_max_money}}元" />
+    <input type="digit" name="money" value="{{default_data.money || ''}}" placeholder-class="cr-ccc" class="cr-666" placeholder="提现金额，最低{{(data_base.cash_minimum_amount || 0) <= 0 ? 0.01 : data_base.cash_minimum_amount}}元，最高{{can_cash_max_money}}元" />
     <view class="tips form-tips">
       <view tt:if="{{(data_base || null) == null || data_base.is_cash_retain_give != 0}}">赠送金额不可提现</view>
+      <view tt:if="{{(data_base || null) != null && data_base.cash_minimum_amount > 0}}">提现最低金额 {{data_base.cash_minimum_amount}} 元起</view>
       <view>当前可提现金额 <text class="cr-main">{{can_cash_max_money}}</text> 元</view>
       <view>当前可用金额 <text class="cr-666">{{user_wallet.normal_money}}</text> 元</view>
       <view>当前赠送金额 <text class="cr-666">{{user_wallet.give_money}}</text> 元</view>
diff --git a/sourcecode/weixin/app.js b/sourcecode/weixin/app.js
index 481a271b6..03b77e0c2 100755
--- a/sourcecode/weixin/app.js
+++ b/sourcecode/weixin/app.js
@@ -71,7 +71,7 @@ App({
     // 请求地址
     request_url: "{{request_url}}",
      request_url: 'http://shopxo.com/',
-     request_url: 'https://dev.shopxo.net/',
+    // request_url: 'https://dev.shopxo.net/',
 
     // 基础信息
     application_title: "{{application_title}}",
diff --git a/sourcecode/weixin/pages/plugins/wallet/cash-auth/cash-auth.js b/sourcecode/weixin/pages/plugins/wallet/cash-auth/cash-auth.js
index 02b2ed711..04ae63d99 100644
--- a/sourcecode/weixin/pages/plugins/wallet/cash-auth/cash-auth.js
+++ b/sourcecode/weixin/pages/plugins/wallet/cash-auth/cash-auth.js
@@ -4,8 +4,9 @@ Page({
     params: null,
     data_list_loding_status: 1,
     data_list_loding_msg: '',
+    data_base: null,
+    user_wallet: null,
     check_account_list: [],
-
     verify_submit_text: '获取验证码',
     verify_loading: false,
     verify_disabled: false,
@@ -65,6 +66,8 @@ Page({
         if (res.data.code == 0) {
           var data = res.data.data;
           this.setData({
+            data_base: data.base || null,
+            user_wallet: data.user_wallet || null,
             check_account_list: data.check_account_list || [],
           });
         } else {
diff --git a/sourcecode/weixin/pages/plugins/wallet/cash-auth/cash-auth.wxml b/sourcecode/weixin/pages/plugins/wallet/cash-auth/cash-auth.wxml
index 8d8e1f7e5..3290eedc1 100644
--- a/sourcecode/weixin/pages/plugins/wallet/cash-auth/cash-auth.wxml
+++ b/sourcecode/weixin/pages/plugins/wallet/cash-auth/cash-auth.wxml
@@ -1,48 +1,57 @@
 <view wx:if="{{data_list_loding_status != 1}}">
-  <form wx:if="{{check_account_list.length > 0}}" bindsubmit="form_submit" class="form-container oh">
-    <view class="form-gorup bg-white">
-      <view class="form-gorup-title">选择身份认证方式<text class="form-group-tips-must">必选</text></view>
-      <view class="section">
-        <picker name="account_type" bindchange="select_check_account_event" value="{{check_account_value}}" range="{{check_account_list}}" range-key="msg">
-            <view class="picker name {{(check_account_value == null) ? 'cr-ccc' : 'cr-666' }}">
-              <view wx:if="{{check_account_value == null}}">
-                请选择认证账号
+  <view wx:if="{{(data_base.cash_minimum_amount || null) == null || data_base.cash_minimum_amount <= 0 || (user_wallet.normal_money >= data_base.cash_minimum_amount)}}">
+    <form wx:if="{{check_account_list.length > 0}}" bindsubmit="form_submit" class="form-container oh">
+      <view class="form-gorup bg-white">
+        <view class="form-gorup-title">选择身份认证方式<text class="form-group-tips-must">必选</text></view>
+        <view class="section">
+          <picker name="account_type" bindchange="select_check_account_event" value="{{check_account_value}}" range="{{check_account_list}}" range-key="msg">
+              <view class="picker name {{(check_account_value == null) ? 'cr-ccc' : 'cr-666' }}">
+                <view wx:if="{{check_account_value == null}}">
+                  请选择认证账号
+                </view>
+                <view wx:else>
+                  {{check_account_list[check_account_value]['msg']}}
+                </view>
               </view>
-              <view wx:else>
-                {{check_account_list[check_account_value]['msg']}}
-              </view>
-            </view>
-        </picker>
+          </picker>
+        </view>
       </view>
-    </view>
 
-    <view class="form-gorup bg-white verify-input">
-      <view class="form-gorup-title">请输入安全验证码<text class="form-group-tips-must">必填</text></view>
-      <input type="number" name="verify" placeholder-class="cr-ccc" class="cr-666" placeholder="验证码格式 4 位数字" maxlength="4" />
-      <button type="default" hover-class="none" size="mini" loading="{{verify_loading}}" disabled="{{verify_disabled}}" bindtap="verify_send_event" class="verify-sub {{verify_disabled ? 'sub-disabled' : ''}}">{{verify_submit_text}}</button>
-    </view>
+      <view class="form-gorup bg-white verify-input">
+        <view class="form-gorup-title">请输入安全验证码<text class="form-group-tips-must">必填</text></view>
+        <input type="number" name="verify" placeholder-class="cr-ccc" class="cr-666" placeholder="验证码格式 4 位数字" maxlength="4" />
+        <button type="default" hover-class="none" size="mini" loading="{{verify_loading}}" disabled="{{verify_disabled}}" bindtap="verify_send_event" class="verify-sub {{verify_disabled ? 'sub-disabled' : ''}}">{{verify_submit_text}}</button>
+      </view>
+
+      <view class="form-gorup">
+        <button class="bg-main" type="default" formType="submit" hover-class="none" disabled="{{form_submit_disabled_status}}">提交</button>
+      </view>
+    </form>
 
-    <view class="form-gorup">
-      <button class="bg-main" type="default" formType="submit" hover-class="none" disabled="{{form_submit_disabled_status}}">提交</button>
+    <view class="view-tips spacing-mt">
+      <view class="tips">
+        <view>操作提示</view>
+        <view>1. 请选择 "<text class="cr-main">绑定邮箱</text>" 或 "<text class="cr-main">绑定手机</text>" 方式其一作为安全校验码的获取方式并正确输入。</view>
+        <view>2. 如果您未绑定手机或者邮箱已失效，可以绑定手机后通过接收手机短信完成验证。</view>
+        <view>3. 如果您未绑定邮箱或者已失效，可以绑定邮箱后通过接收邮件完成验证。</view>
+        <view>4. 请正确输入下方图形验证码，如看不清可点击图片进行更换，输入完成后进行下一步操作。</view>
+        <view>5. 收到安全验证码后，请在10分钟内完成验证。</view>
+        <view>6. 安全验证成功后，请在30分钟内完成提现申请。</view>
+      </view>
     </view>
-  </form>
 
-  <view class="view-tips spacing-mt">
-    <view class="tips">
-      <view>操作提示</view>
-      <view>1. 请选择 "<text class="cr-main">绑定邮箱</text>" 或 "<text class="cr-main">绑定手机</text>" 方式其一作为安全校验码的获取方式并正确输入。</view>
-      <view>2. 如果您未绑定手机或者邮箱已失效，可以绑定手机后通过接收手机短信完成验证。</view>
-      <view>3. 如果您未绑定邮箱或者已失效，可以绑定邮箱后通过接收邮件完成验证。</view>
-      <view>4. 请正确输入下方图形验证码，如看不清可点击图片进行更换，输入完成后进行下一步操作。</view>
-      <view>5. 收到安全验证码后，请在10分钟内完成验证。</view>
-      <view>6. 安全验证成功后，请在30分钟内完成提现申请。</view>
+    <view wx:if="{{check_account_list.length == 0}}" class="bind-mobile-container">
+      <navigator url="/pages/login/login" hover-class="none">
+        <button type="warn" class="mobile-submit">绑定手机号码</button>
+      </navigator>
     </view>
   </view>
-
-  <view wx:if="{{check_account_list.length == 0}}" class="bind-mobile-container">
-    <navigator url="/pages/login/login" hover-class="none">
-      <button type="warn" class="mobile-submit">绑定手机号码</button>
-    </navigator>
+  <view wx:else>
+    <view class="view-tips spacing-mt">
+      <view class="tips">
+        <view>提现最低金额 <text class="cr-main">{{data_base.cash_minimum_amount}}</text> 元起</view>
+      </view>
+    </view>
   </view>
 </view>
 
diff --git a/sourcecode/weixin/pages/plugins/wallet/cash-create/cash-create.wxml b/sourcecode/weixin/pages/plugins/wallet/cash-create/cash-create.wxml
index 53974bd89..141bccf15 100644
--- a/sourcecode/weixin/pages/plugins/wallet/cash-create/cash-create.wxml
+++ b/sourcecode/weixin/pages/plugins/wallet/cash-create/cash-create.wxml
@@ -1,9 +1,10 @@
 <form wx:if="{{check_status == 1}}" bindsubmit="form_submit" class="form-container oh">
   <view class="form-gorup bg-white">
     <view class="form-gorup-title">提现金额<text class="form-group-tips-must">必填</text></view>
-    <input type="digit" name="money" value="{{default_data.money || ''}}" placeholder-class="cr-ccc" class="cr-666" placeholder="提现金额，最低0.01元，最高{{can_cash_max_money}}元" />
+    <input type="digit" name="money" value="{{default_data.money || ''}}" placeholder-class="cr-ccc" class="cr-666" placeholder="提现金额，最低{{(data_base.cash_minimum_amount || 0) <= 0 ? 0.01 : data_base.cash_minimum_amount}}元，最高{{can_cash_max_money}}元" />
     <view class="tips form-tips">
       <view wx:if="{{(data_base || null) == null || data_base.is_cash_retain_give != 0}}">赠送金额不可提现</view>
+      <view wx:if="{{(data_base || null) != null && data_base.cash_minimum_amount > 0}}">提现最低金额 {{data_base.cash_minimum_amount}} 元起</view>
       <view>当前可提现金额 <text class="cr-main">{{can_cash_max_money}}</text> 元</view>
       <view>当前可用金额 <text class="cr-666">{{user_wallet.normal_money}}</text> 元</view>
       <view>当前赠送金额 <text class="cr-666">{{user_wallet.give_money}}</text> 元</view>
-- 
GitLab