Skip to content

E
etaoshop-dz
提交 5a19383d 编写于 作者: zhangzhiwei's avatar zhangzhiwei
浏览文件
操作

.

上级 ada861a0
显示空白字符变更
内嵌 并排
正在显示 包含 299 行增加 和 5 行删除
.idea/etaoshop-dz.iml 0 → 100644
浏览文件 @ 5a19383d
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/misc.xml 0 → 100644
浏览文件 @ 5a19383d
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml 0 → 100644
浏览文件 @ 5a19383d
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/etaoshop-dz.iml" filepath="$PROJECT_DIR$/.idea/etaoshop-dz.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
浏览文件 @ 5a19383d
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml 0 → 100644
浏览文件 @ 5a19383d
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="8836328f-bafb-4666-8053-185078535f28" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index.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/pay/pay.json" beforeDir="false" afterPath="$PROJECT_DIR$/pages/pay/pay.json" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="app.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="541">
<caret line="39" column="36" selection-start-line="39" selection-start-column="36" selection-end-line="39" selection-end-column="36" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="util.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/utils/util.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="login.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/login/login.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="login.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/login/login.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="logs.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/logs/logs.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="logs.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/logs/logs.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="logs.wxml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="logs.wxss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="22" column="54" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="54" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.wxml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>globalData</find>
<find>E淘</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/pages/index.js" />
<option value="$PROJECT_DIR$/app.js" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<option name="height" value="1056" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="etaoshop-dz" type="b2602c69:ProjectViewProjectNode" />
<item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="etaoshop-dz" type="b2602c69:ProjectViewProjectNode" />
<item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="etaoshop-dz" type="b2602c69:ProjectViewProjectNode" />
<item name="etaoshop-dz" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="logs" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../fenxiao_h5-dz" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="8836328f-bafb-4666-8053-185078535f28" name="Default" comment="" />
<created>1714790536207</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1714790536207</updated>
<workItem from="1714790537418" duration="2717000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2717000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.18018967" />
<window_info anchor="bottom" id="TODO" order="10" />
<window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
<window_info anchor="bottom" id="Find" order="5" />
<window_info anchor="bottom" id="Version Control" order="1" />
<window_info anchor="bottom" id="Run" order="6" />
<window_info id="Structure" order="2" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Terminal" order="3" />
<window_info id="Favorites" order="0" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="9" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="8" weight="0.25" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Message" order="4" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/utils/util.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/logs/logs.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/login/login.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="22" column="54" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="54" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="541">
<caret line="39" column="36" selection-start-line="39" selection-start-column="36" selection-end-line="39" selection-end-column="36" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
app.js
浏览文件 @ 5a19383d
...@@ -37,7 +37,7 @@ App({ ...@@ -37,7 +37,7 @@ App({
//正式：https://wxapplets.edstao.com //正式：https://wxapplets.edstao.com
globalData: { globalData: {
userInfo: null, userInfo: null,
defurl:'https://wxapplets.edstao.com', defurl:'http://192.168.0.17:3000',
userInfo:'' userInfo:''
} }
}) })
\ No newline at end of file
app.json
浏览文件 @ 5a19383d
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff", "navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "E淘商城", "navigationBarTitleText": "商城",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "black"
}, },
"sitemapLocation": "sitemap.json" "sitemapLocation": "sitemap.json"
......
pages/index.js
浏览文件 @ 5a19383d
...@@ -94,7 +94,7 @@ Page({ ...@@ -94,7 +94,7 @@ Page({
let that = this; let that = this;
let data = that.data; let data = that.data;
let newUrl = options.webViewUrl.replace(data.defurl, ''); let newUrl = options.webViewUrl.replace(data.defurl, '');
let title = data.proName ? data.proName : 'E淘商城'; let title = data.proName ? data.proName : '商城';
let time =new Date().getTime() let time =new Date().getTime()
let imageUrl = data.imgUrl ? data.imgUrl : 'http://app.edsmall.com/ETaoShopMiniApp/images/share.jpg?t='+time let imageUrl = data.imgUrl ? data.imgUrl : 'http://app.edsmall.com/ETaoShopMiniApp/images/share.jpg?t='+time
const weburl = encodeURIComponent(data.defurl + '/weixin/QRCode&&from=wx&url=' + newUrl + '&name=' + data.userInfo); const weburl = encodeURIComponent(data.defurl + '/weixin/QRCode&&from=wx&url=' + newUrl + '&name=' + data.userInfo);
......
pages/login/login.wxml
浏览文件 @ 5a19383d
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<view wx:if='{{openId&&!showPrivacy}}'> <view wx:if='{{openId&&!showPrivacy}}'>
<view class='ETaoLogoBox'> <view class='ETaoLogoBox'>
<image class='ETaoLogo' mode='widthFix' src='/asstes/img/ETaoLogo.png'></image> <image class='ETaoLogo' mode='widthFix' src='/asstes/img/ETaoLogo.png'></image>
<view class='ETaoName'>E淘商城</view> <view class='ETaoName'>商城</view>
</view> </view>
<view class='btn-box'> <view class='btn-box'>
......
pages/pay/pay.json
浏览文件 @ 5a19383d
{ {
"navigationBarTitleText": "E淘商城-支付" "navigationBarTitleText": "商城-支付"
} }
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或