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
ce058cb8
Commit
ce058cb8
authored
Feb 29, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
30dc7441
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
8 deletions
+28
-8
index.js
src/config/index.js
+18
-3
project.config.json
src/project.config.json
+1
-1
college.js
src/shoppingGuid/page/pages/college/college.js
+1
-1
moreCoupons.json
src/shoppingGuid/page/pages/moreCoupons/moreCoupons.json
+4
-1
moreCoupons.wxml
src/shoppingGuid/page/pages/moreCoupons/moreCoupons.wxml
+4
-2
No files found.
src/config/index.js
View file @
ce058cb8
...
...
@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id
// app.js 中brandId 修改为对应
const
PROJECT_ENV
=
'
test
'
// 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
const
PROJECT_ENV
=
'
prod
'
// 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
//仅生产环境时 配置 :
//3001 3001 , wx313ec36b710125d4
//2006 泰华 , wx40fec8944623c8b3
...
...
@@ -20,7 +20,8 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
//2014 包鞋
//2015 花在花园
//2016 阿吉豆
const
BRANCH_ID
=
1002
//2017 ACTREE wx2aae34874e88cdf5
const
BRANCH_ID
=
2006
const
isMall
=
true
// const needMock = '' //
...
...
@@ -288,7 +289,21 @@ const prod_brand_config = {
shareTitle
:
'【阿吉豆微商城】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
},
//
2017
:
{
appId
:
'wx2aae34874e88cdf5'
,
tunnelToken
:
'5b621e41ea6ed4ad302c5d07b8685c32'
,
brandId
:
2017
,
plusIsOpen
:
false
,
contactUsIsOpen
:
false
,
contactUsPluginId
:
''
,
hasTrial
:
false
,
isMall
:
isMall
,
orderingMustOpenCard
:
true
,
isOpenSelfMention
:
false
,
// 是否开启门店自提
shareTitle
:
'【ACTREE】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/actree_logo.png'
,
},
}
...
...
src/project.config.json
View file @
ce058cb8
...
...
@@ -13,7 +13,7 @@
},
"compileType"
:
"miniprogram"
,
"libVersion"
:
"2.8.2"
,
"appid"
:
"wx
ac09792264c49b5c
"
,
"appid"
:
"wx
40fec8944623c8b3
"
,
"projectname"
:
"%E5%BE%AE%E5%95%86%E5%9F%8E"
,
"debugOptions"
:
{
"hidedInDevtools"
:
[]
...
...
src/shoppingGuid/page/pages/college/college.js
View file @
ce058cb8
...
...
@@ -278,7 +278,7 @@ wxService.page({
this
.
getProductFiles
();
}
else
{
if
(
this
.
data
.
getP
roductFiles
.
pageNum
>
1
)
{
if
(
this
.
data
.
p
roductFiles
.
pageNum
>
1
)
{
wx
.
showToast
({
title
:
'暂无更多数据啦~'
,
icon
:
'none'
...
...
src/shoppingGuid/page/pages/moreCoupons/moreCoupons.json
View file @
ce058cb8
{
"navigationBarTitleText"
:
"发券中心"
,
"enablePullDownRefresh"
:
true
,
"usingComponents"
:
{}
"usingComponents"
:
{
"empty"
:
"/component/empty/empty"
}
}
\ No newline at end of file
src/shoppingGuid/page/pages/moreCoupons/moreCoupons.wxml
View file @
ce058cb8
...
...
@@ -16,7 +16,7 @@
</view>
</view>
<!-- list -->
<view class='coupons'>
<view class='coupons'
wx:if="{{coupon.couponList.length > 0}}"
>
<view class='coupon-item'
wx:for="{{coupon.couponList}}"
wx:for-item="item"
...
...
@@ -40,8 +40,10 @@
</view>
</view>
</view>
</view>
<!-- 空 -->
<empty text="商家还未设置优惠券哦~" wx:else/>
</view>
</view>
<!-- 分享 -->
<!-- 分享好友 -->
...
...
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