Skip to content

A
allCampaign
Commit fe59ef9f by Sweet Zhang
Options

双十二增加缓存用户信息

parent 27c54b70
Showing with 73 additions and 27 deletions
2019Double11/.idea/workspace.xml
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442"> <state relative-caret-position="2938">
<caret line="113" column="14" lean-forward="false" selection-start-line="113" selection-start-column="14" selection-end-line="113" selection-end-column="14" /> <caret line="113" column="14" lean-forward="false" selection-start-line="113" selection-start-column="14" selection-end-line="113" selection-end-column="14" />
<folding /> <folding />
</state> </state>
...@@ -41,12 +41,13 @@ ...@@ -41,12 +41,13 @@
<file leaf-file-name="base.js" pinned="false" current-in-tab="true"> <file leaf-file-name="base.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/base.js"> <entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="362"> <state relative-caret-position="3462">
<caret line="495" column="19" lean-forward="true" selection-start-line="493" selection-start-column="15" selection-end-line="495" selection-end-column="19" /> <caret line="497" column="53" lean-forward="true" selection-start-line="497" selection-start-column="53" selection-end-line="497" selection-end-column="53" />
<folding> <folding>
<element signature="e#9219#13523#0" expanded="false" /> <element signature="e#9219#13523#0" expanded="false" />
<element signature="e#13724#14654#0" expanded="false" /> <element signature="e#13724#14654#0" expanded="false" />
<element signature="e#18067#20998#0" expanded="false" /> <element signature="e#18067#20998#0" expanded="false" />
<element signature="e#21092#22127#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -314,11 +315,12 @@ ...@@ -314,11 +315,12 @@
<workItem from="1574129560249" duration="3623000" /> <workItem from="1574129560249" duration="3623000" />
<workItem from="1574156824521" duration="20000" /> <workItem from="1574156824521" duration="20000" />
<workItem from="1574419099358" duration="901000" /> <workItem from="1574419099358" duration="901000" />
<workItem from="1575008769676" duration="26000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="90771000" /> <option name="totallyTimeSpent" value="90797000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -364,6 +366,19 @@ ...@@ -364,6 +366,19 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="9932">
<caret line="495" column="19" lean-forward="true" selection-start-line="493" selection-start-column="15" selection-end-line="495" selection-end-column="19" />
<folding>
<element signature="e#9219#13523#0" expanded="false" />
<element signature="e#13724#14654#0" expanded="false" />
<element signature="e#18067#20998#0" expanded="false" />
<element signature="e#21092#22127#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
...@@ -388,6 +403,7 @@ ...@@ -388,6 +403,7 @@
<element signature="e#9219#13523#0" expanded="false" /> <element signature="e#9219#13523#0" expanded="false" />
<element signature="e#13724#14654#0" expanded="false" /> <element signature="e#13724#14654#0" expanded="false" />
<element signature="e#18067#20998#0" expanded="false" /> <element signature="e#18067#20998#0" expanded="false" />
<element signature="e#21092#22127#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -432,6 +448,7 @@ ...@@ -432,6 +448,7 @@
<element signature="e#9219#13523#0" expanded="false" /> <element signature="e#9219#13523#0" expanded="false" />
<element signature="e#13724#14654#0" expanded="false" /> <element signature="e#13724#14654#0" expanded="false" />
<element signature="e#18067#20998#0" expanded="false" /> <element signature="e#18067#20998#0" expanded="false" />
<element signature="e#21092#22127#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -468,6 +485,7 @@ ...@@ -468,6 +485,7 @@
<element signature="e#9219#13523#0" expanded="false" /> <element signature="e#9219#13523#0" expanded="false" />
<element signature="e#13724#14654#0" expanded="false" /> <element signature="e#13724#14654#0" expanded="false" />
<element signature="e#18067#20998#0" expanded="false" /> <element signature="e#18067#20998#0" expanded="false" />
<element signature="e#21092#22127#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -504,6 +522,7 @@ ...@@ -504,6 +522,7 @@
<element signature="e#9219#13523#0" expanded="false" /> <element signature="e#9219#13523#0" expanded="false" />
<element signature="e#13724#14654#0" expanded="false" /> <element signature="e#13724#14654#0" expanded="false" />
<element signature="e#18067#20998#0" expanded="false" /> <element signature="e#18067#20998#0" expanded="false" />
<element signature="e#21092#22127#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -524,6 +543,7 @@ ...@@ -524,6 +543,7 @@
<element signature="e#9219#13523#0" expanded="false" /> <element signature="e#9219#13523#0" expanded="false" />
<element signature="e#13724#14654#0" expanded="false" /> <element signature="e#13724#14654#0" expanded="false" />
<element signature="e#18067#20998#0" expanded="false" /> <element signature="e#18067#20998#0" expanded="false" />
<element signature="e#21092#22127#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -552,6 +572,7 @@ ...@@ -552,6 +572,7 @@
<element signature="e#9219#13523#0" expanded="false" /> <element signature="e#9219#13523#0" expanded="false" />
<element signature="e#13724#14654#0" expanded="false" /> <element signature="e#13724#14654#0" expanded="false" />
<element signature="e#18067#20998#0" expanded="false" /> <element signature="e#18067#20998#0" expanded="false" />
<element signature="e#21092#22127#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -572,6 +593,7 @@ ...@@ -572,6 +593,7 @@
<element signature="e#9219#13523#0" expanded="false" /> <element signature="e#9219#13523#0" expanded="false" />
<element signature="e#13724#14654#0" expanded="false" /> <element signature="e#13724#14654#0" expanded="false" />
<element signature="e#18067#20998#0" expanded="false" /> <element signature="e#18067#20998#0" expanded="false" />
<element signature="e#21092#22127#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -592,6 +614,7 @@ ...@@ -592,6 +614,7 @@
<element signature="e#9219#13523#0" expanded="false" /> <element signature="e#9219#13523#0" expanded="false" />
<element signature="e#13724#14654#0" expanded="false" /> <element signature="e#13724#14654#0" expanded="false" />
<element signature="e#18067#20998#0" expanded="false" /> <element signature="e#18067#20998#0" expanded="false" />
<element signature="e#21092#22127#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -745,7 +768,7 @@ ...@@ -745,7 +768,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442"> <state relative-caret-position="2938">
<caret line="113" column="14" lean-forward="false" selection-start-line="113" selection-start-column="14" selection-end-line="113" selection-end-column="14" /> <caret line="113" column="14" lean-forward="false" selection-start-line="113" selection-start-column="14" selection-end-line="113" selection-end-column="14" />
<folding /> <folding />
</state> </state>
...@@ -753,12 +776,13 @@ ...@@ -753,12 +776,13 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/js/base.js"> <entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="362"> <state relative-caret-position="3462">
<caret line="495" column="19" lean-forward="true" selection-start-line="493" selection-start-column="15" selection-end-line="495" selection-end-column="19" /> <caret line="497" column="53" lean-forward="true" selection-start-line="497" selection-start-column="53" selection-end-line="497" selection-end-column="53" />
<folding> <folding>
<element signature="e#9219#13523#0" expanded="false" /> <element signature="e#9219#13523#0" expanded="false" />
<element signature="e#13724#14654#0" expanded="false" /> <element signature="e#13724#14654#0" expanded="false" />
<element signature="e#18067#20998#0" expanded="false" /> <element signature="e#18067#20998#0" expanded="false" />
<element signature="e#21092#22127#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
2019Double12/index.html
...@@ -30,9 +30,11 @@ ...@@ -30,9 +30,11 @@
<ul> <ul>
<li id="task01"> <li id="task01">
<img src="./images/red_pocket_active.png" alt=""> <img src="./images/red_pocket_active.png" alt="">
<span style="position: absolute;bottom: 5%;color: #ffd899;font-size: 12px;" class="login">点我领取</span>
</li> </li>
<li id="task02"> <li id="task02">
<img src="./images/red_pocket_active.png" alt=""> <img src="./images/red_pocket_active.png" alt="">
<span style="position: absolute;bottom: 5%;color: #ffd899;font-size: 12px;" class="login">点我领取</span>
</li> </li>
<li id="task03"> <li id="task03">
<img src="./images/red_pocket_active.png" alt=""> <img src="./images/red_pocket_active.png" alt="">
...@@ -151,6 +153,10 @@ ...@@ -151,6 +153,10 @@
<div class="codeSection inputControl"> <div class="codeSection inputControl">
<input id="code" type='tel' maxlength="4" placeholder="请输入短信验证码"/> <input id="code" type='tel' maxlength="4" placeholder="请输入短信验证码"/>
</div> </div>
<!--姓名 -->
<div class="nameSection inputControl">
<input id="inviteeName" type='text' placeholder="请输入姓名"/>
</div>
<!--登录 --> <!--登录 -->
<div style="text-align: center;" id="loginBtn"> <div style="text-align: center;" id="loginBtn">
<button class='commonBtn loginIn'>登录去分享</button> <button class='commonBtn loginIn'>登录去分享</button>
......
2019Double12/js/base.js
$(function () { $(function () {
var api = 'https://' + window.location.host; // var api = 'https://' + window.location.host;
// var api = 'https://mdev.zuihuibi.cn'; var api = 'https://mdev.zuihuibi.cn';
var gitUrlParam = window.location.search; var gitUrlParam = window.location.search;
var shareCode, customerId = null; var shareCode, customerId = null;
var customerEncryptResult = null; var customerEncryptResult = null;
...@@ -236,7 +236,6 @@ $(function () { ...@@ -236,7 +236,6 @@ $(function () {
// 登录 1.活动主页面登录分享 2.被分享者页面注册 3.抽奖 // 登录 1.活动主页面登录分享 2.被分享者页面注册 3.抽奖
function loginIn(type) { function loginIn(type) {
if (type === 2) {
const NAME_REGEXP = /(^[\u4e00-\u9fa5]{1}[\u4e00-\u9fa5\.·()（）。]{0,48}[\u4e00-\u9fa5]{1}$)|(^[a-zA-Z]{1}[a-zA-Z\s]{0,48}[a-zA-Z]{1}$)/; const NAME_REGEXP = /(^[\u4e00-\u9fa5]{1}[\u4e00-\u9fa5\.·()（）。]{0,48}[\u4e00-\u9fa5]{1}$)|(^[a-zA-Z]{1}[a-zA-Z\s]{0,48}[a-zA-Z]{1}$)/;
if (!NAME_REGEXP.test($('#inviteeName').val()) || !$('#inviteeName').val()) { if (!NAME_REGEXP.test($('#inviteeName').val()) || !$('#inviteeName').val()) {
layer.open({ layer.open({
...@@ -246,7 +245,6 @@ $(function () { ...@@ -246,7 +245,6 @@ $(function () {
}); });
return; return;
} }
}
if ($("#code").val().length == 4) { if ($("#code").val().length == 4) {
const verificationCodeRequest = { const verificationCodeRequest = {
mobileNo: $("#loginPhone").val(), mobileNo: $("#loginPhone").val(),
...@@ -292,14 +290,7 @@ $(function () { ...@@ -292,14 +290,7 @@ $(function () {
customerId = param.customerId = res.data.customerId; customerId = param.customerId = res.data.customerId;
var double12_customerInfo = { var double12_customerInfo = {
customerId: res.data.customerId, customerId: res.data.customerId,
customerName: res.data.customerName, customerName: $('#inviteeName').val(),
customerNickName: res.data.customerNickName,
headImgPath: res.data.headImgePath,
cusLevel: res.data.cusLevel,
cusLevelDesc: res.data.cusLevelDesc,
referralLevel: res.data.referralLevel,
referralLevelDesc: res.data.referralLevelDesc,
totalFortune: res.data.totalFortune,
mobileNo: $("#loginPhone").val() mobileNo: $("#loginPhone").val()
}; };
localStorage.setItem('double12_customerInfo', JSON.stringify(double12_customerInfo)); localStorage.setItem('double12_customerInfo', JSON.stringify(double12_customerInfo));
...@@ -507,6 +498,7 @@ $(function () { ...@@ -507,6 +498,7 @@ $(function () {
$('#task01 img').attr('src', './images/red_pocket_active.png') $('#task01 img').attr('src', './images/red_pocket_active.png')
} else if (task01.activityOpportunityUsedInfo.drawTimes > 0) { } else if (task01.activityOpportunityUsedInfo.drawTimes > 0) {
$('#task01 img').attr('src', './images/red_pocket_finish.png'); $('#task01 img').attr('src', './images/red_pocket_finish.png');
$('.login').hide();
} else { } else {
$('#task01 img').attr('src', './images/red_pocket_disabled.png') $('#task01 img').attr('src', './images/red_pocket_disabled.png')
} }
...@@ -523,7 +515,8 @@ $(function () { ...@@ -523,7 +515,8 @@ $(function () {
if (task02.activityOpportunityUsedInfo.leftTimes > 0) { if (task02.activityOpportunityUsedInfo.leftTimes > 0) {
$('#task02 img').attr('src', './images/red_pocket_active.png') $('#task02 img').attr('src', './images/red_pocket_active.png')
} else if (task02.activityOpportunityUsedInfo.drawTimes > 0) { } else if (task02.activityOpportunityUsedInfo.drawTimes > 0) {
$('#task02 img').attr('src', './images/red_pocket_finish.png') $('#task02 img').attr('src', './images/red_pocket_finish.png');
$('.login').hide();
} else { } else {
$('#task02 img').attr('src', './images/red_pocket_disabled.png') $('#task02 img').attr('src', './images/red_pocket_disabled.png')
} }
......
consulting/.idea/workspace.xml
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
<file leaf-file-name="base.js" pinned="false" current-in-tab="true"> <file leaf-file-name="base.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/base.js"> <entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335"> <state relative-caret-position="13104">
<caret line="487" column="113" lean-forward="false" selection-start-line="487" selection-start-column="29" selection-end-line="487" selection-end-column="113" /> <caret line="504" column="18" lean-forward="false" selection-start-line="504" selection-start-column="18" selection-end-line="504" selection-end-column="18" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -98,6 +99,20 @@ ...@@ -98,6 +99,20 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="consulting" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="consulting" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="css" /> <option name="myItemId" value="css" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
...@@ -105,7 +120,6 @@ ...@@ -105,7 +120,6 @@
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -235,11 +249,12 @@ ...@@ -235,11 +249,12 @@
<workItem from="1559636711683" duration="1314000" /> <workItem from="1559636711683" duration="1314000" />
<workItem from="1573023672063" duration="181000" /> <workItem from="1573023672063" duration="181000" />
<workItem from="1574756860923" duration="25000" /> <workItem from="1574756860923" duration="25000" />
<workItem from="1574993364352" duration="831000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="10493000" /> <option name="totallyTimeSpent" value="11324000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -251,7 +266,7 @@ ...@@ -251,7 +266,7 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="1912" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19978914" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19978914" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
...@@ -325,6 +340,14 @@ ...@@ -325,6 +340,14 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1716"> <state relative-caret-position="1716">
...@@ -417,8 +440,8 @@ ...@@ -417,8 +440,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/js/base.js"> <entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335"> <state relative-caret-position="13104">
<caret line="487" column="113" lean-forward="false" selection-start-line="487" selection-start-column="29" selection-end-line="487" selection-end-column="113" /> <caret line="504" column="18" lean-forward="false" selection-start-line="504" selection-start-column="18" selection-end-line="504" selection-end-column="18" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment