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
ce6d52b6
Commit
ce6d52b6
authored
Dec 11, 2019
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化bug,plus前端开启设置
parent
4b63f6bd
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
116 additions
and
21 deletions
+116
-21
index.js
src/config/index.js
+61
-5
confirmOrder.wxml
src/pages/confirmOrder/confirmOrder.wxml
+1
-1
my.js
src/pages/my/my.js
+20
-2
my.json
src/pages/my/my.json
+3
-1
my.wxml
src/pages/my/my.wxml
+4
-1
userCenter.wxml
src/pages/userCenter/userCenter.wxml
+3
-0
project.config.json
src/project.config.json
+1
-1
home.js
src/shoppingGuid/page/pages/home/home.js
+13
-0
myMemberList.js
src/shoppingGuid/page/pages/myMemberList/myMemberList.js
+1
-0
qrcode.js
src/shoppingGuid/page/pages/qrcode/qrcode.js
+6
-6
welfare.js
src/shoppingGuid/page/pages/welfare/welfare.js
+0
-1
paymentStatus.wxml
src/subPackage/page/pages/paymentStatus/paymentStatus.wxml
+1
-1
currentLinkRouter.js
src/utils/currentLinkRouter.js
+0
-1
wxService.js
src/utils/wxService.js
+2
-1
No files found.
src/config/index.js
View file @
ce6d52b6
...
@@ -5,14 +5,69 @@
...
@@ -5,14 +5,69 @@
// 组件plus 中数据请求 token 修改
// 组件plus 中数据请求 token 修改
// app.js 中brandId 修改为对应
// app.js 中brandId 修改为对应
const
PROJECT_ENV
=
'
dev
'
// 生产 prod, 开发 dev, 测试 test, 预生产 pre
const
PROJECT_ENV
=
'
test
'
// 生产 prod, 开发 dev, 测试 test, 预生产 pre
const
needMock
=
''
//
const
needMock
=
''
//
// 舞象联系我 :766c50920993bf9c41c6c3d2761a2df5
//泰华 联系我 :6e4314d558e55fbc64fe2e757e24d61f
//配置信息
/** ***********************************开发环境************************************ */
//舞象开发环境
/**
* appId = wxc3b64b09b1d3dfc2
* tunnel-token = brand1001
* brandId = 1001
*/
/** ***********************************测试环境************************************ */
/**
* 舞象测试环境1
* appId = wx857ea77f4f7f4f34
* tunnel-token = aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD
* brandId = 1002
*/
/**
* 舞象测试环境2 常用
* appId = wxac09792264c49b5c
* tunnel-token = aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD
* brandId = 1002
*/
/** ***********************************生产环境************************************ */
/**
* 舞象测试 3001商户
* appId = wx313ec36b710125d4
* tunnel-token = d6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8
* brandId=3001
* contactUspluginId = 766c50920993bf9c41c6c3d2761a2df5 联系我插件id
*/
/**
* 711 生产环境配置
* appId = wx700028bf32a3be66
* tunnel-token = d6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8
* brandId= 2711
*/
/**
* 泰华 生产环境配置
* appId = wx40fec8944623c8b3
* tunnel-token = 8724303981a00b56869f3d26f7a6c643
* brandId= 2006
* contactUspluginId = 6e4314d558e55fbc64fe2e757e24d61f 联系我插件id
*/
// appid_dev_wx wxc3b64b09b1d3dfc2
// appid_dev_wx wxc3b64b09b1d3dfc2
// appid_test_wx wx857ea77f4f7f4f34// wxac09792264c49b5c // 1002商城
// appid_test_wx wx857ea77f4f7f4f34// wxac09792264c49b5c // 1002商城
// appid_pre_711 wx358b56af62edbde1
// appid_pre_711 wx358b56af62edbde1 tunnel-token: d6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8
// appid_prod_711 wx700028bf32a3be66
// appid_prod_711 wx700028bf32a3be66 tunnel-token: d6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8
// appid_prod_3001 wx313ec36b710125d4
// appid_prod_3001 wx313ec36b710125d4
// 3001测试商城 tunnel-token: d6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8 brandId : 3001
//泰华 appid : wx40fec8944623c8b3 brandId : 2006 tunnel-token : 8724303981a00b56869f3d26f7a6c643
// 1 2 3 4步!!!!!!!!!!!!!!!!!!!!!! prod appid brandId tunnel-token
// 1 2 3 4步!!!!!!!!!!!!!!!!!!!!!! prod appid brandId tunnel-token
...
@@ -40,7 +95,7 @@ const appId = {
...
@@ -40,7 +95,7 @@ const appId = {
dev
:
'wxc3b64b09b1d3dfc2'
,
//appid_dev_wx
dev
:
'wxc3b64b09b1d3dfc2'
,
//appid_dev_wx
test
:
'wxac09792264c49b5c'
,
//appid_test_wx 1002商城
test
:
'wxac09792264c49b5c'
,
//appid_test_wx 1002商城
pre
:
'wxac09792264c49b5c'
,
//appid_test_wx 1002商城
pre
:
'wxac09792264c49b5c'
,
//appid_test_wx 1002商城
prod
:
'wx313ec36b710125d4'
,
//appid_prod_
3001 3001商城
prod
:
'wx313ec36b710125d4'
,
//appid_prod_
}
}
const
imgConfig
=
{
const
imgConfig
=
{
...
@@ -64,7 +119,8 @@ const envInfo = (() => {
...
@@ -64,7 +119,8 @@ const envInfo = (() => {
imgCtx
:
imgConfig
[
PROJECT_ENV
],
imgCtx
:
imgConfig
[
PROJECT_ENV
],
tunnelToken
:
token
[
PROJECT_ENV
],
tunnelToken
:
token
[
PROJECT_ENV
],
appId
:
appId
[
PROJECT_ENV
],
appId
:
appId
[
PROJECT_ENV
],
brandId
:
'1001'
,
// 1001 1002 3001 3002 //2711 711生产brandId
brandId
:
1002
,
// 1001 1002 3001 3002 //2711 711生产brandId,
plusIsOpen
:
true
,
//是否开启plus
}
}
})()
})()
...
...
src/pages/confirmOrder/confirmOrder.wxml
View file @
ce6d52b6
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
<!-- 商品合计 -->
<!-- 商品合计 -->
<view class="pro-sum">
<view class="pro-sum">
<view class="vip-info" wx:if="{{!isVip}}">
<view class="vip-info" wx:if="{{!isVip
&& plusIsOpen
}}">
<view class="vip-left">
<view class="vip-left">
<view class="left-top">
<view class="left-top">
<image class="top-image" src="/assets/imgs/7_1_0/plus-icon-3x.png" />
<image class="top-image" src="/assets/imgs/7_1_0/plus-icon-3x.png" />
...
...
src/pages/my/my.js
View file @
ce6d52b6
...
@@ -31,6 +31,7 @@ wxService.page({
...
@@ -31,6 +31,7 @@ wxService.page({
currHomePageId
:
''
,
currHomePageId
:
''
,
skuVOList
:
[],
skuVOList
:
[],
isQiye
:
false
,
isQiye
:
false
,
contactUsModal
:
false
},
},
/**
/**
* 生命周期函数--监听页面加载
* 生命周期函数--监听页面加载
...
@@ -80,8 +81,25 @@ wxService.page({
...
@@ -80,8 +81,25 @@ wxService.page({
// console.log('startmessage', e)
// console.log('startmessage', e)
},
},
completemessage
(
e
)
{
completemessage
(
e
)
{
console
.
log
(
'联系我插件信息completemessage----'
,
e
)
let
ret
=
e
.
detail
;
// console.log('completemessage', e)
console
.
log
(
'联系我插件信息completemessage----'
,
ret
)
if
(
ret
.
errcode
==
-
3002
||
ret
.
errcode
==
-
3004
||
ret
.
errcode
==
-
3005
)
{
wx
.
showToast
({
title
:
'联系失败,请联系管理员'
,
icon
:
'none'
});
}
else
if
(
ret
.
errcode
==
-
3008
)
{
wx
.
showToast
({
title
:
'暂无客服人员'
,
icon
:
'none'
});
}
else
{
this
.
setData
({
contactUsModal
:
true
,
});
}
},
},
/**
/**
* 生命周期函数--监听页面显示
* 生命周期函数--监听页面显示
...
...
src/pages/my/my.json
View file @
ce6d52b6
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
"bottom-tabs"
:
"/component/bottomTabs/bottomTabs"
,
"bottom-tabs"
:
"/component/bottomTabs/bottomTabs"
,
"authorization-modal"
:
"/component/authorization-modal/authorization-modal"
,
"authorization-modal"
:
"/component/authorization-modal/authorization-modal"
,
"plus"
:
"/component/plus/plus"
,
"plus"
:
"/component/plus/plus"
,
"cell"
:
"plugin://contactPlugin/cell"
"cell"
:
"plugin://contactPlugin/cell"
,
"contact-us-modal"
:
"/component/contactUsModal/contactUsModal"
}
}
}
}
\ No newline at end of file
src/pages/my/my.wxml
View file @
ce6d52b6
...
@@ -47,4 +47,7 @@
...
@@ -47,4 +47,7 @@
bubbleColor="cb3c3c"
bubbleColor="cb3c3c"
bind:completemessage="completemessage"
bind:completemessage="completemessage"
plugid='766c50920993bf9c41c6c3d2761a2df5' />
plugid='766c50920993bf9c41c6c3d2761a2df5' />
</view>
</view>
<!-- 联系我点击成功之后的回调 -->
<contact-us-modal contactShow="{{contactUsModal}}"/>
src/pages/userCenter/userCenter.wxml
View file @
ce6d52b6
...
@@ -58,6 +58,8 @@
...
@@ -58,6 +58,8 @@
bubbleColor="cb3c3c"
bubbleColor="cb3c3c"
bind:completemessage="completemessage"
bind:completemessage="completemessage"
plugid='766c50920993bf9c41c6c3d2761a2df5' />
plugid='766c50920993bf9c41c6c3d2761a2df5' />
<!-- 766c50920993bf9c41c6c3d2761a2df5 -->
<!-- 泰华 6e4314d558e55fbc64fe2e757e24d61f -->
</view>
</view>
<!-- 联系我点击成功之后的回调 -->
<!-- 联系我点击成功之后的回调 -->
<contact-us-modal contactShow="{{contactUsModal}}"/>
<contact-us-modal contactShow="{{contactUsModal}}"/>
\ No newline at end of file
src/project.config.json
View file @
ce6d52b6
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
},
},
"compileType"
:
"miniprogram"
,
"compileType"
:
"miniprogram"
,
"libVersion"
:
"2.8.2"
,
"libVersion"
:
"2.8.2"
,
"appid"
:
"wx
c3b64b09b1d3dfc2
"
,
"appid"
:
"wx
ac09792264c49b5c
"
,
"projectname"
:
"%E5%BE%AE%E5%95%86%E5%9F%8E"
,
"projectname"
:
"%E5%BE%AE%E5%95%86%E5%9F%8E"
,
"debugOptions"
:
{
"debugOptions"
:
{
"hidedInDevtools"
:
[]
"hidedInDevtools"
:
[]
...
...
src/shoppingGuid/page/pages/home/home.js
View file @
ce6d52b6
...
@@ -428,6 +428,19 @@ wxService.page({
...
@@ -428,6 +428,19 @@ wxService.page({
},
},
/**
/**
* 用户点击右上角分享
*/
onShareAppMessage
:
function
(
res
)
{
if
(
res
.
from
==
'button'
)
{
return
{
title
:
this
.
data
.
shareModel
.
title
,
path
:
this
.
data
.
shareModel
.
path
,
imageUrl
:
this
.
data
.
shareModel
.
imageUrl
}
}
},
/**
* 页面相关事件处理函数--监听用户下拉动作
* 页面相关事件处理函数--监听用户下拉动作
*/
*/
onPullDownRefresh
:
function
()
{
onPullDownRefresh
:
function
()
{
...
...
src/shoppingGuid/page/pages/myMemberList/myMemberList.js
View file @
ce6d52b6
...
@@ -39,6 +39,7 @@ wxService.page({
...
@@ -39,6 +39,7 @@ wxService.page({
let
list
=
data
?
data
:
[];
let
list
=
data
?
data
:
[];
list
.
forEach
(
item
=>
{
list
.
forEach
(
item
=>
{
item
.
name
=
item
.
name
?
item
.
name
:
'暂无名称'
;
item
.
disabled
=
item
.
qiyeExternalUserid
?
false
:
true
;
item
.
disabled
=
item
.
qiyeExternalUserid
?
false
:
true
;
item
.
logo
=
item
.
member
?
(
item
.
member
.
memberWeixin
?
(
item
.
logo
=
item
.
member
?
(
item
.
member
.
memberWeixin
?
(
item
.
member
.
memberWeixin
.
headimgurl
?
item
.
member
.
memberWeixin
.
headimgurl
:
defaultImg
)
:
defaultImg
item
.
member
.
memberWeixin
.
headimgurl
?
item
.
member
.
memberWeixin
.
headimgurl
:
defaultImg
)
:
defaultImg
...
...
src/shoppingGuid/page/pages/qrcode/qrcode.js
View file @
ce6d52b6
...
@@ -16,12 +16,12 @@ wxService.page({
...
@@ -16,12 +16,12 @@ wxService.page({
cardImg
:
''
,
cardImg
:
''
,
companyName
:
''
,
companyName
:
''
,
bottomTypeArr
:
[
bottomTypeArr
:
[
{
//
{
name
:
"关注公众号"
,
//
name: "关注公众号",
url
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_focus_wx_no_bg.png'
,
//
url: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_focus_wx_no_bg.png',
active
:
false
,
//
active: false,
type
:
1
//
type:1
},
//
},
{
{
name
:
"企业微信"
,
name
:
"企业微信"
,
url
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_qiye_wx_no_bg.png'
,
url
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_qiye_wx_no_bg.png'
,
...
...
src/shoppingGuid/page/pages/welfare/welfare.js
View file @
ce6d52b6
...
@@ -9,7 +9,6 @@ const diyongBg = 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_diy
...
@@ -9,7 +9,6 @@ const diyongBg = 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_diy
const
defaultGoodsImg
=
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/product_defalut.jpg'
;
const
defaultGoodsImg
=
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/product_defalut.jpg'
;
wxService
.
page
({
wxService
.
page
({
/**
/**
* 页面的初始数据
* 页面的初始数据
*/
*/
...
...
src/subPackage/page/pages/paymentStatus/paymentStatus.wxml
View file @
ce6d52b6
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<official-account style="width:100%;height:168rpx;"></official-account>
<official-account style="width:100%;height:168rpx;"></official-account>
</view>
</view>
<view class="status-vip df" wx:if="{{!isVip}}">
<view class="status-vip df" wx:if="{{!isVip
&& plusIsOpen
}}">
<view class="vip-tips">
<view class="vip-tips">
<view class="tips-desc">
<view class="tips-desc">
<image
<image
...
...
src/utils/currentLinkRouter.js
View file @
ce6d52b6
...
@@ -84,7 +84,6 @@ function currentLinkRouter(event, _this) {
...
@@ -84,7 +84,6 @@ function currentLinkRouter(event, _this) {
}
}
else
if
(
rowObj
.
type
==
9
)
{
else
if
(
rowObj
.
type
==
9
)
{
// 分类
// 分类
console
.
log
(
'aaaacurrentClickType'
,
currentClickType
)
wxService
.
router
(
`/subPackage/page/pages/categoryPro/categoryPro?id=
${
currentClickRow
}
`
)
wxService
.
router
(
`/subPackage/page/pages/categoryPro/categoryPro?id=
${
currentClickRow
}
`
)
}
}
}
}
...
...
src/utils/wxService.js
View file @
ce6d52b6
...
@@ -15,6 +15,7 @@ import {
...
@@ -15,6 +15,7 @@ import {
import
Http
from
'./Http'
import
Http
from
'./Http'
const
Promise
=
require
(
'../lib/bluebird'
)
const
Promise
=
require
(
'../lib/bluebird'
)
const
config
=
require
(
'../config/index'
).
envInfo
const
config
=
require
(
'../config/index'
).
envInfo
const
envInfo
=
require
(
'../config/index'
).
envInfo
import
utils
from
'./util'
import
utils
from
'./util'
const
citysData
=
require
(
'./city.js'
)
const
citysData
=
require
(
'./city.js'
)
import
{
Integer
}
from
'./integerDigitalConvertion'
import
{
Integer
}
from
'./integerDigitalConvertion'
...
@@ -574,7 +575,7 @@ class WXService extends Http {
...
@@ -574,7 +575,7 @@ class WXService extends Http {
config
.
data
.
isVip
=
''
config
.
data
.
isVip
=
''
// 集点体验者
// 集点体验者
config
.
data
.
experAccessible
;
config
.
data
.
experAccessible
;
config
.
data
.
plusIsOpen
=
envInfo
.
plusIsOpen
;
const
CONFIG_PAPGE
=
{
const
CONFIG_PAPGE
=
{
onLoad
:
function
(...
args
)
{
onLoad
:
function
(...
args
)
{
...
...
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