From ceca76a0a4eea3c7c35a5883aef149f8f98c9938 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 16 Jul 2021 23:23:05 +0800
Subject: [PATCH] 2.5.1
---
js/common.js | 7 +++--
js/my_help_sale.js | 2 +-
js/register.js | 62 +++++++++++++++++++++++++++++++++++++-
js/start.js | 5 +++
js/vouchers.js | 6 ++--
manifest.json | 4 +--
templete/my.html | 6 ++--
templete/my_help_sale.html | 2 +-
templete/register.html | 10 ++++++
templete/register1.html | 5 +++
10 files changed, 95 insertions(+), 14 deletions(-)
diff --git a/js/common.js b/js/common.js
index c76954e..11c64fe 100644
--- a/js/common.js
+++ b/js/common.js
@@ -2,9 +2,10 @@ var is_app = 1;
var imgUrl = 'http://img.zgqlg.com.cn/';
var webUrl = 'http://www.zgqlg.com.cn/';
// var webUrl = 'http://qlg.qgmzbxs.com/';
-var cssUrl = localStorage.getItem("cssUrl");
-var jsUrl = localStorage.getItem("jsUrl");
-var version = localStorage.getItem("version");
+var cssUrl = "../css/";
+var jsUrl = "../js/";
+var version = "98";
+
function qlgUrl(url) {
return webUrl + url;
}
diff --git a/js/my_help_sale.js b/js/my_help_sale.js
index f893aaf..defa3f3 100644
--- a/js/my_help_sale.js
+++ b/js/my_help_sale.js
@@ -27,7 +27,7 @@ mui.plusReady(function(){
userId = parseInt(data.data.user.userId);
localStorage.setItem("userName", data.data.user.loginName)
$("#userName").text(data.data.user.loginName)
- $("#preGetCouponCount").text("预获产品券：￥"+data.data.expectedProductNum);
+ $("#preGetCouponCount").text("购物股：￥"+data.data.expectedProductNum);
}
})
$("#preGetCoupon").on("tap",function(){
diff --git a/js/register.js b/js/register.js
index b6ae7a3..f5b09c9 100644
--- a/js/register.js
+++ b/js/register.js
@@ -36,6 +36,54 @@ mui.plusReady(function() {
}
})
})
+ // 判断用户名是否存在
+ $('#householdName').on('blur', function() {
+ var householdName = $('#householdName').val();
+ if ('' == householdName) {
+ mui.mui.alert('户主姓名不能为空')
+ return;
+ }
+ JZL.ajax(qlgUrl('app/users/check_real_name'), {
+ householdName: householdName
+ }, function(data) {
+ // //console.log(data);
+ if (1 != data.status) {
+ mui.confirm(data.msg, "提示", [
+ "我要核实",
+ "继续注册"
+ ], function(result) {
+ if (result.index == 0) {
+ mui.back()
+ }
+ })
+ }
+ })
+ })
+
+ // 判断用户名是否存在
+ $('#householdIdCard').on('blur', function() {
+ var householdIdCard = $('#householdIdCard').val();
+ if ('' == householdIdCard) {
+ mui.mui.alert('户主身份证不能为空')
+ return;
+ }
+ JZL.ajax(qlgUrl('app/users/check_real_no'), {
+ householdIdCard: householdIdCard
+ }, function(data) {
+ // //console.log(data);
+ if (1 != data.status) {
+ mui.confirm(data.msg, "提示", [
+ "我要核实",
+ "继续注册"
+ ], function(result) {
+ if (result.index == 0) {
+ mui.back()
+ }
+ })
+ }
+ })
+ })
+
// 推荐人信息
$('.pNameCode').hide();
@@ -129,6 +177,8 @@ mui.plusReady(function() {
var payPwd = $('#loginPaywd').val();
var reUserPaywd = $('#reUserPaywd').val();
var pName = $('#pName').val();
+ var householdName = $('#householdName').val();
+ var householdIdCard = $('#householdIdCard').val();
// var verifyCode = $('.tpyzm').val();
var regConfirmImg = $('#regConfirmImg').val();
@@ -136,6 +186,14 @@ mui.plusReady(function() {
mui.alert('用户名不能为空！');
return;
}
+ if (householdName == '') {
+ mui.alert('户主姓名不能为空！');
+ return;
+ }
+ if (householdIdCard == '') {
+ mui.alert('户主身份证号不能为空！');
+ return;
+ }
if (loginPwd.length < 6) {
mui.alert('登录密码不能小于6位！');
return;
@@ -170,7 +228,9 @@ mui.plusReady(function() {
pName: pName,
// nameType: 3,
regConfirmImg: regConfirmImg,
- mobileCode: mobileCode
+ householdName: householdName,
+ householdIdCard: householdIdCard,
+ mobileCode: mobileCode
};
var that = $(this)
diff --git a/js/start.js b/js/start.js
index 7ea2db5..5103eb3 100644
--- a/js/start.js
+++ b/js/start.js
@@ -1,6 +1,11 @@
+
function init(data) {
//console.log(data.apk_version)
// console.log(localStorage.getItem('jsUrl'))
+ localStorage.setItem('jsUrl', "../js/");
+ localStorage.setItem('cssUrl', "../css/");
+ localStorage.setItem('version', "96");
+
apk_version = data.apk_version;
apkUrl = data.apk_down_url;
iosUrl = data.ios_down_url;
diff --git a/js/vouchers.js b/js/vouchers.js
index bff4f29..33c8228 100644
--- a/js/vouchers.js
+++ b/js/vouchers.js
@@ -16,14 +16,14 @@ mui.plusReady(function() {
switch (data_href) {
case "expectedProduct":
- $('.title').html('预获产品券');
+ $('.title').html('购物股');
break;
case "expectedCoupons":
$('.title').text('预获优惠券');
break;
case "expectedWang":
- $('.title').text('预获旺旺券');
+ $('.title').text('购物抵');
break
case "coupons":
$('.title').text('已获优惠券');
@@ -32,7 +32,7 @@ mui.plusReady(function() {
$('.title').text('已获产品券');
break
case "wang":
- $('.title').text('已获旺旺券');
+ $('.title').text('售物券');
break
}
diff --git a/manifest.json b/manifest.json
index c09c3db..385a0d5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
"id" : "H5436787D",
"name" : "全亮共商城",
"version" : {
- "name" : "2.4.5",
- "code" : 95
+ "name" : "2.5.1",
+ "code" : 100
},
"description" : "",
"icons" : {
diff --git a/templete/my.html b/templete/my.html
index 79fc1af..ea2ec21 100644
--- a/templete/my.html
+++ b/templete/my.html
@@ -43,7 +43,7 @@
<div class="myYouhuiquan_con clearfix">
<div class="myYouhuiquan_cb indent_btn" data-type="1" data-expect="1" data-href="expectedProduct">
<p class="orange" id="expectedProductNum">￥0.00</p>
- <p>预获产品券</p>
+ <p>购物股</p>
</div>
<div class="myYouhuiquan_cb indent_btn" data-type="2" data-expect="1" data-href="expectedCoupons">
<p class="orange" id="expectedCouponsNum">￥0.00</p>
@@ -51,7 +51,7 @@
</div>
<div class="myYouhuiquan_cb indent_btn" data-type="3" data-expect="1" data-href="expectedWang">
<p class="orange" id="expectedWangNum">￥0.00</p>
- <p>预获旺旺券</p>
+ <p>购物抵</p>
</div>
<div class="myYouhuiquan_cb indent_btn" data-type="1" data-expect="0" data-href="product">
<p class="orange" id="productNum" >￥0.00</p>
@@ -63,7 +63,7 @@
</div>
<div class="myYouhuiquan_cb indent_btn" data-type="3" data-expect="0" data-href="wang">
<p class="orange" id="wangNum">￥0.00</p>
- <p>已获旺旺券</p>
+ <p>售物券</p>
</div>
diff --git a/templete/my_help_sale.html b/templete/my_help_sale.html
index 82f88ab..0613eaa 100644
--- a/templete/my_help_sale.html
+++ b/templete/my_help_sale.html
@@ -21,7 +21,7 @@
<div class="row shadown_wai zgThing" style="margin-top: 6px;"><span class="r1">助购值</span><span class="r2"><span id="zgAmounts"></span></span></div>
<div class="row" style="margin: 0;font-weight: bolder;">对应层的被助购上滑至对应层是该层的助购券值≤15元</div>
<div class="row" style="margin: 0;font-weight: bolder;">所有层的被助购上滑至对应层是任意层的助购券值＜0元</div>
- <div class="row" style="margin: 0;font-weight: bolder;">每天耗损预获产品券值或预获优惠券值是各券负数值的1%</div>
+ <div class="row" style="margin: 0;font-weight: bolder;">每天耗损购物股或预获优惠券值是各券负数值的1%</div>
<div class="row shadown_wai" style="margin-top: 6px;"><img class="img" src="../img/setting_user1.png" /><span class="r1" id="userName"></div>
<div class="row shadown_wai zgThing" style="margin-top: 6px;"><span class="r1">助购奉献</span><span class="r2"><span id="zgTimes"></span>次|￥<span id="myZgA">0</span></span></div>
<div class="row shadown_wai" id="preGetCoupon" style="margin-top: 6px;"></span><span
diff --git a/templete/register.html b/templete/register.html
index a8eefbb..19990e9 100644
--- a/templete/register.html
+++ b/templete/register.html
@@ -47,6 +47,16 @@
<span class="s_reg">确认操作密码:</span>
<input type="password" name="reUserPaywd" id="reUserPaywd" maxlength="20" value="" placeholder="请输入确认操作密码" />
</div>
+ <div class="row shadown_wai">
+ <img src="../img/icon_pwd1.png" />
+ <span class="s1">户主姓名:</span>
+ <input type="text" name="householdName" id="householdName" value="" placeholder="户主姓名" />
+ </div>
+ <div class="row shadown_wai">
+ <img src="../img/icon_pwd1.png" />
+ <span class="s1">户主身份证号:</span>
+ <input type="text" name="householdIdCard" id="householdIdCard" value="" placeholder="户主身份证号" />
+ </div>
<div class="row shadown_wai">
<img src="../img/icon_pwd1.png" />
<span class="s_reg">推荐人:</span>
diff --git a/templete/register1.html b/templete/register1.html
index 44a87fa..3fde9a1 100644
--- a/templete/register1.html
+++ b/templete/register1.html
@@ -45,6 +45,11 @@
<span class="s1">确认操作密码:</span>
<input type="password" name="reUserPwd" id="reUserPwd" maxlength="20" value="" placeholder="请确认密码" />
</div>
+ <div class="row shadown_wai">
+ <img src="../img/icon_pwd1.png" />
+ <span class="s1">户主姓名:</span>
+ <input type="text" name="realName" id="realName" value="" placeholder="户主姓名" />
+ </div>
<div class="row shadown_wai">
<img src="../img/icon_pwd1.png" />
<span class="s1">推荐人:</span>