Commit 6c8a4293 by 程默

fix

parent 8bdb4fd5
...@@ -3,9 +3,11 @@ var prodEnv = require('./prod.env') ...@@ -3,9 +3,11 @@ var prodEnv = require('./prod.env')
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
SHOP_MIXID:"'zjgyl'",
NODE_ENV: '"development"', NODE_ENV: '"development"',
OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"', BASE_URL:"'https://shop.mayi888.com'",
// OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"', // OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"',
IMG_DOMAIN: '"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"' OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
// IMG_DOMAIN: '"http://cdn.mayi888.com"' // IMG_DOMAIN: '"http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com"'
IMG_DOMAIN: '"http://cdn.mayi888.com"'
}) })
...@@ -10,11 +10,10 @@ import { serialize, getQueryVariable, DFSImg } from "@/utils/index"; ...@@ -10,11 +10,10 @@ import { serialize, getQueryVariable, DFSImg } from "@/utils/index";
export default { export default {
data() { data() {
return { return {
shopId: "zjgyl", shopId: process.env.SHOP_MIXID,
options: {}, options: {},
session_key: "", session_key: "",
// baseUrl:"https://test-m-shop.mayi888.cn", baseUrl: process.env.BASE_URL,
baseUrl: "https://shop.mayi888.com",
link: this.baseUrl, link: this.baseUrl,
page: "/", page: "/",
params: "?mixid=" + this.shopId, params: "?mixid=" + this.shopId,
...@@ -39,7 +38,7 @@ export default { ...@@ -39,7 +38,7 @@ export default {
onLoad(options) { onLoad(options) {
Object.assign(this.$data, this.$options.data()); Object.assign(this.$data, this.$options.data());
console.log(options, "index"); console.log(options, "index------",this.shopId,'-----',this.baseUrl);
this.options = options; this.options = options;
if (options.share) { if (options.share) {
//来自分享 //来自分享
......
let shopMixid = "zjgyl"; let shopMixid =process.env.SHOP_MIXID;
// 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