Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mayi-mp-shop
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
程默
mayi-mp-shop
Commits
f65a4ac7
Commit
f65a4ac7
authored
Sep 24, 2020
by
李嘉林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
922c9e74
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
13 deletions
+15
-13
build/webpack.dev.conf.js
+1
-1
config/dev.env.js
+9
-7
project.config.json
+1
-2
src/App.vue
+1
-1
src/pages/wxPay/index.vue
+3
-2
No files found.
build/webpack.dev.conf.js
View file @
f65a4ac7
...
...
@@ -82,6 +82,6 @@ module.exports = merge(baseWebpackConfig, {
// inject: true
// }),
new
FriendlyErrorsPlugin
(),
new
UglifyJsPlugin
({
sourceMap
:
true
})
//
new UglifyJsPlugin({ sourceMap: true })
]
})
config/dev.env.js
View file @
f65a4ac7
...
...
@@ -2,16 +2,17 @@ var merge = require('webpack-merge')
var
prodEnv
=
require
(
'./prod.env'
)
module
.
exports
=
merge
(
prodEnv
,
{
//zjgyl
SHOP_MIXID
:
"'antgood'"
,
module
.
exports
=
merge
(
prodEnv
,
{
//zjgyl
SHOP_MIXID
:
"'antgood'"
,
NODE_ENV
:
'"development"'
,
// BASE_URL:"'https://shop.mayi888.com'",
// BASE_URL:"'https://shop.mayi888.com'",
// BASE_URL:"'http://192.168.1.146:3005'",
// BASE_URL:"'http://192.168.1.127
:3000'",
BASE_URL
:
"'https://test-m-shop.mayi888.cn'"
,
BASE_URL
:
"'http://172.16.1.14
:3000'"
,
// BASE_URL:
"'https://test-m-shop.mayi888.cn'",
OLSHOP_URL
:
'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"'
,
OLSHOP_URL
:
'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"'
,
// OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
IMG_DOMAIN
:
'"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"'
// IMG_DOMAIN: '"http://cdn.mayi888.com"'
})
})
;
\ No newline at end of file
project.config.json
View file @
f65a4ac7
...
...
@@ -25,9 +25,8 @@
"useCompilerModule"
:
true
,
"userConfirmedUseCompilerModuleSwitch"
:
false
},
"miniprogramRoot"
:
"dist/wx/"
,
"compileType"
:
"miniprogram"
,
"appid"
:
"
wxae95a07ffdf11548
"
,
"appid"
:
"
tt7020069def1a8a37
"
,
"projectname"
:
"mayi-mp-shop"
,
"simulatorType"
:
"wechat"
,
"simulatorPluginLibVersion"
:
{},
...
...
src/App.vue
View file @
f65a4ac7
...
...
@@ -8,7 +8,7 @@ export default {
extConfig
=
{
mixid
:
'XgyGood'
}
}
else
{
if
(
MINI_ENV
==
'tt'
){
extConfig
=
{
mixid
:
'
ant
'
}
extConfig
=
{
mixid
:
'
xgyshop
'
}
}
else
{
extConfig
=
wx
.
getExtConfigSync
?
wx
.
getExtConfigSync
():
{}
}
...
...
src/pages/wxPay/index.vue
View file @
f65a4ac7
...
...
@@ -32,8 +32,9 @@ export default {
this
.
options_orderType
=
options
.
orderType
;
this
.
options_isCard
=
options
.
isCard
;
this
.
options_isCardTitle
=
options
.
isCardTit
;
let
getSessionid
=
wx
.
getStorageSync
(
"sessionid"
);
if
(
options
.
sessionid
&&!
getSessionid
){
// let getSessionid = wx.getStorageSync("sessionid");
console
.
log
(
options
.
sessionid
,
'---------------------------36'
)
if
(
options
.
sessionid
){
wx
.
setStorage
({
key
:
"sessionid"
,
data
:
options
.
sessionid
...
...
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