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
0c88743f
Commit
0c88743f
authored
Feb 27, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交版本
parent
da5dd35d
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
22 additions
and
22 deletions
+22
-22
loading.wxss
src/component/loading/loading.wxss
+2
-10
index.js
src/config/index.js
+2
-2
project.config.json
src/project.config.json
+1
-1
guidCollegeInfo.js
...hoppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.js
+4
-0
guidCollegeInfo.json
...ppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.json
+1
-1
guidCollegeInfo.wxml
...ppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.wxml
+4
-4
guidCollegeInfo.wxss
...ppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.wxss
+1
-1
saleTaskInfo.wxml
src/shoppingGuid/page/pages/saleTaskInfo/saleTaskInfo.wxml
+6
-2
saleTaskInfo.wxss
src/shoppingGuid/page/pages/saleTaskInfo/saleTaskInfo.wxss
+1
-1
No files found.
src/component/loading/loading.wxss
View file @
0c88743f
/* component/loading/loading.wxss */
/* pages/laoding/loading.wxss */
page{
background: #ffffff;
box-sizing: border-box;
-webkit-box-sizing: border-box;
height: 100vh;
}
view{
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.loading-container{
position: fixed;
...
...
@@ -24,6 +14,8 @@ view{
align-items: center;
justify-content: center;
flex-direction: column;
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.loading-container .loading-text{
...
...
src/config/index.js
View file @
0c88743f
...
...
@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id
// app.js 中brandId 修改为对应
const
PROJECT_ENV
=
'
prod
'
// 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
const
PROJECT_ENV
=
'
test
'
// 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
//仅生产环境时 配置 :
//3001 3001 , wx313ec36b710125d4
//2006 泰华 , wx40fec8944623c8b3
...
...
@@ -20,7 +20,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
//2014 包鞋
//2015 花在花园
//2016 阿吉豆
const
BRANCH_ID
=
3001
const
BRANCH_ID
=
1002
const
isMall
=
true
// const needMock = '' //
...
...
src/project.config.json
View file @
0c88743f
...
...
@@ -13,7 +13,7 @@
},
"compileType"
:
"miniprogram"
,
"libVersion"
:
"2.8.2"
,
"appid"
:
"wx
313ec36b710125d4
"
,
"appid"
:
"wx
ac09792264c49b5c
"
,
"projectname"
:
"%E5%BE%AE%E5%95%86%E5%9F%8E"
,
"debugOptions"
:
{
"hidedInDevtools"
:
[]
...
...
src/shoppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.js
View file @
0c88743f
...
...
@@ -21,6 +21,10 @@ wxService.page({
getCollegeInfo
(
id
){
wxService
.
post
(
`/merchant/guideCollege/byIdQuery?id=
${
id
}
`
).
then
(
res
=>
{
let
data
=
res
.
data
.
data
;
wx
.
setNavigationBarTitle
({
title
:
data
.
title
,
});
this
.
setData
({
info
:
data
,
});
...
...
src/shoppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.json
View file @
0c88743f
{
"navigationBarTitleText"
:
"
导购学院内容详情
"
,
"navigationBarTitleText"
:
"
加载中..
"
,
"usingComponents"
:
{
"x-html"
:
"/component/html2wxml/wxHtml"
}
...
...
src/shoppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.wxml
View file @
0c88743f
<!--shoppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.wxml-->
<
view class='top-image'
>
<
!-- <view class='top-image'> --
>
<!-- top image -->
<
image src='{{info.titleUrl}}' mode='widthFix'></image
>
<
/view
>
<
!-- <image src='{{info.titleUrl}}' mode='widthFix'></image> --
>
<
!-- </view> --
>
<!-- 内容标题 -->
<
view class='content-title'>{{info.title}}</view
>
<
!-- <view class='content-title'>{{info.title}}</view> --
>
<!-- 富文本内容展示区 -->
<view class='full-text'>
...
...
src/shoppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.wxss
View file @
0c88743f
...
...
@@ -33,6 +33,6 @@ view{
}
.full-text{
padding: 0 30rpx;
/* padding: 0 30rpx; */
}
src/shoppingGuid/page/pages/saleTaskInfo/saleTaskInfo.wxml
View file @
0c88743f
...
...
@@ -6,7 +6,11 @@
<image src='/assets/imgs/shoppingGuide/kpi_task_time.png' mode='widthFix' />
<text>{{saleDetail.task.startTime}}~{{saleDetail.task.endTime}}</text>
</view>
<view class='rg' bindtap='onTapToNotice'>活动说明?</view>
<!-- <view class='rg' bindtap='onTapToNotice'>活动说明?</view> -->
<image class="rg"
src="https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/git_button.gif"
mode="aspectFit"
bindtap='onTapToNotice'></image>
</view>
<view class='info-item'>
<view class='lf'>
...
...
@@ -14,7 +18,7 @@
<text class='bolder'>{{saleDetail.task.name}}</text>
</view>
</view>
<view class='info-item'>
<view class='info-item'
wx:if="{{saleDetail.task.remark}}"
>
<view class='lf'>
<image src='/assets/imgs/shoppingGuide/award.png' mode='widthFix' />
<text class='bolder'>{{saleDetail.task.remark}}</text>
...
...
src/shoppingGuid/page/pages/saleTaskInfo/saleTaskInfo.wxss
View file @
0c88743f
...
...
@@ -66,7 +66,7 @@ view{
display: flex;
align-items: center;
justify-content: center;
border: solid 2rpx #0091FF;
/* border: solid 2rpx #0091FF; */
}
.task-info-top-container .info-container .info-item .rg:active{
...
...
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