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
6c8a4293
Commit
6c8a4293
authored
Dec 24, 2019
by
程默
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
8bdb4fd5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
config/dev.env.js
+6
-4
src/pages/index/index.vue
+3
-4
src/utils/request.js
+1
-1
No files found.
config/dev.env.js
View file @
6c8a4293
...
...
@@ -3,9 +3,11 @@ var prodEnv = require('./prod.env')
module
.
exports
=
merge
(
prodEnv
,
{
SHOP_MIXID
:
"'zjgyl'"
,
NODE_ENV
:
'"development"'
,
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"'
BASE_URL
:
"'https://shop.mayi888.com'"
,
// 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"'
})
src/pages/index/index.vue
View file @
6c8a4293
...
...
@@ -10,11 +10,10 @@ import { serialize, getQueryVariable, DFSImg } from "@/utils/index";
export
default
{
data
()
{
return
{
shopId
:
"zjgyl"
,
shopId
:
process
.
env
.
SHOP_MIXID
,
options
:
{},
session_key
:
""
,
// baseUrl:"https://test-m-shop.mayi888.cn",
baseUrl
:
"https://shop.mayi888.com"
,
baseUrl
:
process
.
env
.
BASE_URL
,
link
:
this
.
baseUrl
,
page
:
"/"
,
params
:
"?mixid="
+
this
.
shopId
,
...
...
@@ -39,7 +38,7 @@ export default {
onLoad
(
options
)
{
Object
.
assign
(
this
.
$data
,
this
.
$options
.
data
());
console
.
log
(
options
,
"index
"
);
console
.
log
(
options
,
"index
------"
,
this
.
shopId
,
'-----'
,
this
.
baseUrl
);
this
.
options
=
options
;
if
(
options
.
share
)
{
//来自分享
...
...
src/utils/request.js
View file @
6c8a4293
let
shopMixid
=
"zjgyl"
;
let
shopMixid
=
process
.
env
.
SHOP_MIXID
;
// wx.getStore
export
async
function
requestGET
(
url
,
options
)
{
...
...
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