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
ea92cb7c
Commit
ea92cb7c
authored
Dec 20, 2019
by
程默
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
0c6204a1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
config/dev.env.js
+4
-4
project.config.json
+1
-1
src/pages/index/index.vue
+1
-1
src/pages/login/index.vue
+4
-4
src/utils/request.js
+1
-1
No files found.
config/dev.env.js
View file @
ea92cb7c
...
@@ -4,8 +4,8 @@ var prodEnv = require('./prod.env')
...
@@ -4,8 +4,8 @@ var prodEnv = require('./prod.env')
module
.
exports
=
merge
(
prodEnv
,
{
module
.
exports
=
merge
(
prodEnv
,
{
NODE_ENV
:
'"development"'
,
NODE_ENV
:
'"development"'
,
//
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"'
,
//
OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
//
IMG_DOMAIN: '"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"'
IMG_DOMAIN
:
'"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"'
IMG_DOMAIN
:
'"http://cdn.mayi888.com"'
//
IMG_DOMAIN: '"http://cdn.mayi888.com"'
})
})
project.config.json
View file @
ea92cb7c
{
{
"description"
:
"项目配置文件。"
,
"description"
:
"项目配置文件。"
,
"setting"
:
{
"setting"
:
{
"urlCheck"
:
tru
e
,
"urlCheck"
:
fals
e
,
"es6"
:
false
,
"es6"
:
false
,
"postcss"
:
true
,
"postcss"
:
true
,
"minified"
:
true
,
"minified"
:
true
,
...
...
src/pages/index/index.vue
View file @
ea92cb7c
...
@@ -10,7 +10,7 @@ import { serialize, getQueryVariable, DFSImg } from "@/utils/index";
...
@@ -10,7 +10,7 @@ import { serialize, getQueryVariable, DFSImg } from "@/utils/index";
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
shopId
:
"
ant
"
,
shopId
:
"
zjgyl
"
,
options
:
{},
options
:
{},
session_key
:
""
,
session_key
:
""
,
// baseUrl:"https://test-m-shop.mayi888.cn",
// baseUrl:"https://test-m-shop.mayi888.cn",
...
...
src/pages/login/index.vue
View file @
ea92cb7c
...
@@ -120,11 +120,11 @@ export default {
...
@@ -120,11 +120,11 @@ export default {
});
});
},
},
getUserInfo
:
function
(
e
)
{
getUserInfo
:
function
(
e
)
{
wx
.
showLoading
({
//
wx.showLoading({
title
:
"加载中"
//
title: "加载中"
});
//
});
if
(
e
.
target
.
errMsg
==
"getUserInfo:ok"
&&
this
.
isShow
)
{
if
(
e
.
target
.
errMsg
==
"getUserInfo:ok"
&&
this
.
isShow
)
{
wx
.
hideLoading
();
//
wx.hideLoading();
if
(
this
.
isHaveUnion
)
{
if
(
this
.
isHaveUnion
)
{
//是会员 直接登录
//是会员 直接登录
wx
.
reLaunch
({
wx
.
reLaunch
({
...
...
src/utils/request.js
View file @
ea92cb7c
let
shopMixid
=
"
ant
"
;
let
shopMixid
=
"
zjgyl
"
;
// wx.getStore
// wx.getStore
export
async
function
requestGET
(
url
,
options
)
{
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