From a7cbabbb4c86f9778158fb3f0c3f47885963f4d5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 26 Sep 2021 11:19:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/resources/templates/febs/views/modules/order/updateAddress.html | 6 +++---
src/main/resources/templates/febs/views/modules/order/addAddress.html | 6 +++---
src/main/resources/templates/febs/views/modules/mallMember/detail.html | 16 ++++++++--------
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/detail.html b/src/main/resources/templates/febs/views/modules/mallMember/detail.html
index 36606ba..7f8229e 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/detail.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/detail.html
@@ -60,13 +60,13 @@
autocomplete="off" class="layui-input" readonly>
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">邮箱：</label>
- <div class="layui-input-block">
- <input type="text" name="email" data-th-id="${member.email}"
- autocomplete="off" class="layui-input" readonly>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label febs-form-item-require">邮箱：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="email" data-th-id="${member.email}"-->
+<!-- autocomplete="off" class="layui-input" readonly>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">邀请码：</label>
<div class="layui-input-block">
@@ -121,7 +121,7 @@
"id": member.id,
"name": member.name,
"phone": member.phone,
- "email": member.email,
+ // "email": member.email,
"sex": member.sex,
"balance": member.balance,
"inviteId": member.inviteId,
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index cffe25b..6f8ef47 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -132,7 +132,7 @@
url: ctx + 'admin/mallMember/getMallMemberList',
cols: [[
{field: 'phone', title: '手机号', minWidth: 150,align:'left'},
- {field: 'email', title: '邮箱', minWidth: 150,align:'left'},
+ // {field: 'email', title: '邮箱', minWidth: 150,align:'left'},
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'referrerId', title: '推荐人邀请码', minWidth: 100,align:'left'},
diff --git a/src/main/resources/templates/febs/views/modules/order/addAddress.html b/src/main/resources/templates/febs/views/modules/order/addAddress.html
index b3ca5a6..1a74dd2 100644
--- a/src/main/resources/templates/febs/views/modules/order/addAddress.html
+++ b/src/main/resources/templates/febs/views/modules/order/addAddress.html
@@ -22,19 +22,19 @@
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">联系人：</label>
<div class="layui-input-block">
- <input type="text" name="name" autocomplete="off" class="layui-input" >
+ <input type="text" name="name" lay-verify="required" autocomplete="off" class="layui-input" >
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">联系电话：</label>
<div class="layui-input-block">
- <input type="text" name="phone" autocomplete="off" class="layui-input" >
+ <input type="text" name="phone" lay-verify="required" autocomplete="off" class="layui-input" >
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">地址：</label>
<div class="layui-input-block">
- <input type="text" name="address" autocomplete="off" class="layui-input" >
+ <input type="text" name="address" lay-verify="required" autocomplete="off" class="layui-input" >
</div>
</div>
<div class="layui-form-item febs-hide">
diff --git a/src/main/resources/templates/febs/views/modules/order/updateAddress.html b/src/main/resources/templates/febs/views/modules/order/updateAddress.html
index 481cd6a..1b9be78 100644
--- a/src/main/resources/templates/febs/views/modules/order/updateAddress.html
+++ b/src/main/resources/templates/febs/views/modules/order/updateAddress.html
@@ -28,21 +28,21 @@
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">联系人：</label>
<div class="layui-input-block">
- <input type="text" name="name"
+ <input type="text" name="name" lay-verify="required"
autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">联系方式：</label>
<div class="layui-input-block">
- <input type="text" name="phone"
+ <input type="text" name="phone" lay-verify="required"
autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">地址：</label>
<div class="layui-input-block">
- <input type="text" name="address"
+ <input type="text" name="address" lay-verify="required"
autocomplete="off" class="layui-input">
</div>
</div>
--
Gitblit v1.9.1