Commit ea92cb7c by 程默

fix

parent 0c6204a1
...@@ -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"'
}) })
{ {
"description": "项目配置文件。", "description": "项目配置文件。",
"setting": { "setting": {
"urlCheck": true, "urlCheck": false,
"es6": false, "es6": false,
"postcss": true, "postcss": true,
"minified": true, "minified": true,
......
...@@ -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",
......
...@@ -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({
......
let shopMixid = "ant"; let shopMixid = "zjgyl";
// wx.getStore // wx.getStore
export async function requestGET(url, options) { export async function requestGET(url, options) {
......
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