Commit ce058cb8 by 谢中龙

修改bug

parent 30dc7441
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id // 修改 BRANCH_ID 为对应的商户id
// app.js 中brandId 修改为对应 // 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 //3001 3001 , wx313ec36b710125d4
//2006 泰华 , wx40fec8944623c8b3 //2006 泰华 , wx40fec8944623c8b3
...@@ -20,7 +20,8 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门 ...@@ -20,7 +20,8 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
//2014 包鞋 //2014 包鞋
//2015 花在花园 //2015 花在花园
//2016 阿吉豆 //2016 阿吉豆
const BRANCH_ID = 1002 //2017 ACTREE wx2aae34874e88cdf5
const BRANCH_ID = 2006
const isMall = true const isMall = true
// const needMock = '' // // const needMock = '' //
...@@ -288,7 +289,21 @@ const prod_brand_config = { ...@@ -288,7 +289,21 @@ const prod_brand_config = {
shareTitle: '【阿吉豆微商城】', shareTitle: '【阿吉豆微商城】',
logo: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png', 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',
},
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.8.2", "libVersion": "2.8.2",
"appid": "wxac09792264c49b5c", "appid": "wx40fec8944623c8b3",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E", "projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
......
...@@ -278,7 +278,7 @@ wxService.page({ ...@@ -278,7 +278,7 @@ wxService.page({
this.getProductFiles(); this.getProductFiles();
} }
else { else {
if (this.data.getProductFiles.pageNum > 1) { if (this.data.productFiles.pageNum > 1) {
wx.showToast({ wx.showToast({
title: '暂无更多数据啦~', title: '暂无更多数据啦~',
icon: 'none' icon: 'none'
......
{ {
"navigationBarTitleText": "发券中心", "navigationBarTitleText": "发券中心",
"enablePullDownRefresh" : true, "enablePullDownRefresh" : true,
"usingComponents": {} "usingComponents": {
"empty": "/component/empty/empty"
}
} }
\ No newline at end of file
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</view> </view>
</view> </view>
<!-- list --> <!-- list -->
<view class='coupons'> <view class='coupons' wx:if="{{coupon.couponList.length > 0}}">
<view class='coupon-item' <view class='coupon-item'
wx:for="{{coupon.couponList}}" wx:for="{{coupon.couponList}}"
wx:for-item="item" wx:for-item="item"
...@@ -40,8 +40,10 @@ ...@@ -40,8 +40,10 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<!-- 空 -->
<empty text="商家还未设置优惠券哦~" wx:else/>
</view>
</view> </view>
<!-- 分享 --> <!-- 分享 -->
<!-- 分享好友 --> <!-- 分享好友 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment