Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高淑倩
7-Eleven
Commits
9699f923
Commit
9699f923
authored
Apr 24, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mall_dev_7.11.0' into 'mall_dev_7.12.0'
修改弹出框 See merge request
!195
parents
7f87cfa7
7823e3bf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
my.wxml
src/pages/my/my.wxml
+2
-2
subPage.wxml
src/subPackage/page/pages/subPage/subPage.wxml
+2
-2
No files found.
src/pages/my/my.wxml
View file @
9699f923
...
...
@@ -53,4 +53,4 @@
<contact-us-modal contactShow="{{contactUsModal}}"/>
<!-- 广告 -->
<ad-dialog pageInfo="{{pageInfo}}" currentHasUserInfo="{{currentHasUserInfo}}" bind:getAuth="_getUserInfo"/>
\ No newline at end of file
<ad-dialog pageInfo="{{pageInfo}}" bind:updatePage="updatePage" currentHasUserInfo="{{currentHasUserInfo}}" bind:getAuth="_getUserInfo"/>
\ No newline at end of file
src/subPackage/page/pages/subPage/subPage.wxml
View file @
9699f923
...
...
@@ -38,4 +38,4 @@
<go-guid/>
<!-- 广告 -->
<ad-dialog pageInfo="{{pageInfo}}" currentHasUserInfo="{{currentHasUserInfo}}" bind:getAuth="_getUserInfo"/>
\ No newline at end of file
<ad-dialog pageInfo="{{pageInfo}}" bind:updatePage="updatePage" currentHasUserInfo="{{currentHasUserInfo}}" bind:getAuth="_getUserInfo"/>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment