Skip to content

Commit

Permalink
edit:配置文件
Browse files Browse the repository at this point in the history
  • Loading branch information
Sssitmonkey committed Dec 23, 2020
1 parent 78aeb2a commit 90ec38a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 20 deletions.
1 change: 0 additions & 1 deletion common/utils/check-appPermission.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/**
*app权限检测
*/

// #ifdef APP-VUE
import permision from "@/common/permission.js"
// #endif
Expand Down
17 changes: 9 additions & 8 deletions env.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
/**
* Shopro全局配置文件
* @version 1.1.2
* @version 1.2.0
*/

// 不同环境访问不同的路径
import store from '@/common/store/index'
export const IMG_URL = 'https://shopro.7wpp.com'; //全局网络图片地址变量,css背景图片地址变量在uni.scss
const domain = 'http://dev.7wpp.com'


// #ifdef H5
let protocol = window.location.protocol;
let mDomain = domain.split(':');
// #endif

const ENV_BASE_URL = {
development: 'https://dev.7wpp.com', //开发环境
production: 'https://dev.7wpp.com', //生产环境
development: protocol === 'https:' ? protocol + mDomain[1] : domain, //开发环境
production: protocol === 'https:' ? protocol + mDomain[1] : domain, //生产环境
}

const ENV_API_URL = {
development: `${ENV_BASE_URL.development}/addons/shopro/`, //开发环境
production: `${ENV_BASE_URL.production}/addons/shopro/`, //生产环境
Expand All @@ -21,5 +24,3 @@ const ENV_API_URL = {
export const BASE_URL = ENV_BASE_URL[process.env.NODE_ENV || 'development']; //后台根域名
export const API_URL = ENV_API_URL[process.env.NODE_ENV || 'development']; //后台接口域名
export const HAS_LIVE = false; //后台是否开通直播权限,根据情况在manifest.json中,开启注释相应组件的引入。

export const IMG_URL = 'http://shopro.7wpp.com'; //全局网络图片地址变量,css背景图片地址变量在uni.scss
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name" : "Shopro",
"appid" : "__UNI__5B85585",
"description" : "",
"versionName" : "Shopro 1.1.2",
"versionName" : "Shopro 1.2.0",
"versionCode" : 215,
"transformPx" : false,
"app-plus" : {
Expand Down
1 change: 0 additions & 1 deletion pages/public/kefu/wm/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,6 @@ export default {
textarea_focus: function(e) {
var that = this;
this.showTool = false;
console.log('获取焦点',e)
// that.writeBottom = e.detail.height ? e.detail.height : 0;
},
// 输入框输入
Expand Down
9 changes: 0 additions & 9 deletions vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ module.exports = {
})
],
},
// css: { // 暂时没用,uni-app,scss的变量入口文件,强制集成到uni.scss。
// sourceMap: true,
// loaderOptions: {
// sass: {
// prependData: `@import "~@/static/style/index.scss";` //scss需要加分号
// }
// }
// },

// chainWebpack: (config) => { //高版本,HBuilder X,可以开启。
// // 发行或运行时启用了压缩时会生效,在package.json中配置压缩
// config.optimization.minimizer('terser').tap((args) => {
Expand Down

0 comments on commit 90ec38a

Please sign in to comment.