Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
E
etaoshop-dz
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张志伟
etaoshop-dz
提交
764487d0
提交
764487d0
编写于
6月 03, 2024
作者:
zhangzhiwei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
更换logo接口
上级
61e7de7a
变更
3
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
42 行增加
和
23 行删除
+42
-23
workspace.xml
.idea/workspace.xml
+22
-21
login.js
pages/login/login.js
+18
-0
login.wxml
pages/login/login.wxml
+2
-2
未找到文件。
.idea/workspace.xml
浏览文件 @
764487d0
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"8836328f-bafb-4666-8053-185078535f28"
name=
"Default"
comment=
""
>
<list
default=
"true"
id=
"8836328f-bafb-4666-8053-185078535f28"
name=
"Default"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/pages/login/login.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/pages/login/login.js"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/pages/login/login.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/pages/login/login.js"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/pages/login/login.wxml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/pages/login/login.wxml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/pages/login/login.wxml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/pages/login/login.wxml"
afterDir=
"false"
/>
</list>
</list>
...
@@ -18,11 +17,11 @@
...
@@ -18,11 +17,11 @@
</component>
</component>
<component
name=
"FileEditorManager"
>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"login.wxml"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"login.wxml"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/pages/login/login.wxml"
>
<entry
file=
"file://$PROJECT_DIR$/pages/login/login.wxml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"4
95
"
>
<state
relative-caret-position=
"4
29
"
>
<caret
line=
"1
8"
lean-forward=
"true"
selection-start-line=
"18"
selection-end-line=
"1
8"
/>
<caret
line=
"1
6"
column=
"38"
selection-start-line=
"16"
selection-start-column=
"38"
selection-end-line=
"16"
selection-end-column=
"3
8"
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -57,11 +56,11 @@
...
@@ -57,11 +56,11 @@
<provider
selected=
"true"
editor-type-id=
"images"
/>
<provider
selected=
"true"
editor-type-id=
"images"
/>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"login.js"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"login.js"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/pages/login/login.js"
>
<entry
file=
"file://$PROJECT_DIR$/pages/login/login.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2
64
"
>
<state
relative-caret-position=
"2
79
"
>
<caret
line=
"
8"
column=
"10"
selection-start-line=
"8"
selection-start-column=
"4"
selection-end-line=
"8"
selection-end-column=
"1
0"
/>
<caret
line=
"
50"
column=
"40"
lean-forward=
"true"
selection-start-line=
"50"
selection-start-column=
"40"
selection-end-line=
"50"
selection-end-column=
"4
0"
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -98,6 +97,8 @@
...
@@ -98,6 +97,8 @@
<find>
weixin/wxsession
</find>
<find>
weixin/wxsession
</find>
<find>
globalData
</find>
<find>
globalData
</find>
<find>
getwxsession
</find>
<find>
getwxsession
</find>
<find>
getOpenId
</find>
<find>
getInfo
</find>
</findStrings>
</findStrings>
</component>
</component>
<component
name=
"Git.Settings"
>
<component
name=
"Git.Settings"
>
...
@@ -108,8 +109,8 @@
...
@@ -108,8 +109,8 @@
<list>
<list>
<option
value=
"$PROJECT_DIR$/pages/index.js"
/>
<option
value=
"$PROJECT_DIR$/pages/index.js"
/>
<option
value=
"$PROJECT_DIR$/app.js"
/>
<option
value=
"$PROJECT_DIR$/app.js"
/>
<option
value=
"$PROJECT_DIR$/pages/login/login.js"
/>
<option
value=
"$PROJECT_DIR$/pages/login/login.wxml"
/>
<option
value=
"$PROJECT_DIR$/pages/login/login.wxml"
/>
<option
value=
"$PROJECT_DIR$/pages/login/login.js"
/>
</list>
</list>
</option>
</option>
</component>
</component>
...
@@ -123,7 +124,7 @@
...
@@ -123,7 +124,7 @@
<packageJsonPaths
/>
<packageJsonPaths
/>
</component>
</component>
<component
name=
"ProjectFrameBounds"
extendedState=
"6"
>
<component
name=
"ProjectFrameBounds"
extendedState=
"6"
>
<option
name=
"x"
value=
"
1912
"
/>
<option
name=
"x"
value=
"
-8
"
/>
<option
name=
"y"
value=
"-8"
/>
<option
name=
"y"
value=
"-8"
/>
<option
name=
"width"
value=
"1936"
/>
<option
name=
"width"
value=
"1936"
/>
<option
name=
"height"
value=
"1056"
/>
<option
name=
"height"
value=
"1056"
/>
...
@@ -204,15 +205,15 @@
...
@@ -204,15 +205,15 @@
<workItem
from=
"1715406876636"
duration=
"2102000"
/>
<workItem
from=
"1715406876636"
duration=
"2102000"
/>
<workItem
from=
"1715584189355"
duration=
"846000"
/>
<workItem
from=
"1715584189355"
duration=
"846000"
/>
<workItem
from=
"1716252238008"
duration=
"1078000"
/>
<workItem
from=
"1716252238008"
duration=
"1078000"
/>
<workItem
from=
"1717395807496"
duration=
"1
83
000"
/>
<workItem
from=
"1717395807496"
duration=
"1
026
000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"2
3624
000"
/>
<option
name=
"totallyTimeSpent"
value=
"2
4467
000"
/>
</component>
</component>
<component
name=
"ToolWindowManager"
>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
1912
"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"6"
/>
<frame
x=
"
-8
"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"6"
/>
<editor
active=
"true"
/>
<editor
active=
"true"
/>
<layout>
<layout>
<window_info
active=
"true"
content_ui=
"combo"
id=
"Project"
order=
"1"
visible=
"true"
weight=
"0.18018967"
/>
<window_info
active=
"true"
content_ui=
"combo"
id=
"Project"
order=
"1"
visible=
"true"
weight=
"0.18018967"
/>
...
@@ -500,20 +501,20 @@
...
@@ -500,20 +501,20 @@
<entry
file=
"file://$PROJECT_DIR$/pages/login/login.json"
>
<entry
file=
"file://$PROJECT_DIR$/pages/login/login.json"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/pages/login/login.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"264"
>
<caret
line=
"8"
column=
"10"
selection-start-line=
"8"
selection-start-column=
"4"
selection-end-line=
"8"
selection-end-column=
"10"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/asstes/img/wxLogin.png"
>
<entry
file=
"file://$PROJECT_DIR$/asstes/img/wxLogin.png"
>
<provider
selected=
"true"
editor-type-id=
"images"
/>
<provider
selected=
"true"
editor-type-id=
"images"
/>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/pages/login/login.wxml"
>
<entry
file=
"file://$PROJECT_DIR$/pages/login/login.wxml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"495"
>
<state
relative-caret-position=
"429"
>
<caret
line=
"18"
lean-forward=
"true"
selection-start-line=
"18"
selection-end-line=
"18"
/>
<caret
line=
"16"
column=
"38"
selection-start-line=
"16"
selection-start-column=
"38"
selection-end-line=
"16"
selection-end-column=
"38"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/pages/login/login.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"279"
>
<caret
line=
"50"
column=
"40"
lean-forward=
"true"
selection-start-line=
"50"
selection-start-column=
"40"
selection-end-line=
"50"
selection-end-column=
"40"
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
...
pages/login/login.js
浏览文件 @
764487d0
const
app
=
getApp
();
const
app
=
getApp
();
Page
({
Page
({
data
:
{
data
:
{
headImg
:
''
,
storeName
:
''
,
showPrivacy
:
false
,
showPrivacy
:
false
,
defurl
:
app
.
globalData
.
defurl
,
defurl
:
app
.
globalData
.
defurl
,
userInfo
:
''
,
userInfo
:
''
,
...
@@ -9,6 +11,7 @@ Page({
...
@@ -9,6 +11,7 @@ Page({
imgLgo
:
'https://img.edsmall.com/ETao/ETao/jinyanxia/jinyanxia_pc_h5.jpg?t='
+
new
Date
().
getTime
()
imgLgo
:
'https://img.edsmall.com/ETao/ETao/jinyanxia/jinyanxia_pc_h5.jpg?t='
+
new
Date
().
getTime
()
},
},
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
this
.
getInfo
()
try
{
try
{
wx
.
getPrivacySetting
({
wx
.
getPrivacySetting
({
success
:
res
=>
{
success
:
res
=>
{
...
@@ -39,6 +42,21 @@ Page({
...
@@ -39,6 +42,21 @@ Page({
this
.
getOpenId
();
this
.
getOpenId
();
},
},
getInfo
(){
let
that
=
this
wx
.
request
({
url
:
app
.
globalData
.
defurl
+
'/api/store/info?link=jinyanxia'
,
success
:
function
(
res
)
{
that
.
setData
({
headImg
:
res
.
data
.
data
.
headImg
,
storeName
:
res
.
data
.
data
.
storeName
,
})
},
complete
(){
wx
.
hideLoading
();
}
})
},
getOpenId
(){
getOpenId
(){
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中...'
,
title
:
'加载中...'
,
...
...
pages/login/login.wxml
浏览文件 @
764487d0
...
@@ -13,8 +13,8 @@
...
@@ -13,8 +13,8 @@
</view>
</view>
<view wx:if='{{openId&&!showPrivacy}}'>
<view wx:if='{{openId&&!showPrivacy}}'>
<view class='ETaoLogoBox'>
<view class='ETaoLogoBox'>
<image class='ETaoLogo' mode='widthFix' src='{{
imgLgo
}}'></image>
<image class='ETaoLogo' mode='widthFix' src='{{
headImg
}}'></image>
<view class='ETaoName'>
商城
</view>
<view class='ETaoName'>
{{storeName}}
</view>
</view>
</view>
<view class='btn-box'>
<view class='btn-box'>
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录