浏览代码

修改打包编译配置文件

zhengjinyi 5 年之前
父节点
当前提交
bc8bec798c

+ 3 - 3
App.vue

@@ -3,7 +3,7 @@
 	 * vuex管理登陆状态,具体可以参考官方登陆模板示例
 	 */
 	import { mapState,mapMutations} from 'vuex';
-	import authorize from '@/config/authorize.js'
+	import authorize from '@/common/config/authorize.js'
 	export default {
 		onLaunch: function() {
 			this.refresh()
@@ -56,8 +56,8 @@
 
 <style lang="scss">
 	/*每个页面公共css */
-	@import "./common/common.scss";
-	@import "./common/iconfont.scss";
+	@import "@/common/css/common.scss";
+	@import "@/common/css/iconfont.scss";
 
 view,
 scroll-view,

+ 0 - 0
config/addressdata.js → common/config/addressdata.js


+ 0 - 0
config/authorize.js → common/config/authorize.js


+ 1 - 4
config/caimeiApi.js → common/config/caimeiApi.js

@@ -3,10 +3,7 @@
  * @Author Zhengjingyi
  * @Action 全局公共方法
  */
-// const requestUrl ='http://192.168.1.22:8107'//本地联调地址
-// const requestUrl ='http://192.168.1.24:8107'//俊俊联调地址
-// const requestUrl ='https://mall-b.caimei365.com'//测试
-const requestUrl ='https://mall.caimei365.com'//正式
+import requestUrl from './config.js'
 const caimeiApi = {
 	/**
 	 * @封装公共get数据请求方法无加载动画

+ 0 - 0
config/common.js → common/config/common.js


+ 11 - 0
common/config/config.js

@@ -0,0 +1,11 @@
+let URL_CONFIG = ""
+if(process.env.NODE_ENV === 'development'){
+    // 开发环境
+	// URL_CONFIG = 'http://192.168.1.22:8107'//本地联调地址
+	// URL_CONFIG = 'http://192.168.1.24:8107'//俊俊联调地址
+    URL_CONFIG = 'https://mall-b.caimei365.com'//测试地址
+}else{
+    // 生产环境
+    URL_CONFIG = 'https://mall.caimei365.com'
+}
+export default URL_CONFIG

+ 0 - 0
common/common.scss → common/css/common.scss


+ 0 - 0
common/iconfont.scss → common/css/iconfont.scss


+ 1 - 1
components/mpvue-citypicker/mpvueCityPicker.vue

@@ -27,7 +27,7 @@
 	// import provinceData from './city-data/province.js';
 	// import cityData from './city-data/city.js';
 	// import areaData from './city-data/area.js';
-	import { provinceData,cityData,areaData } from '../../config/addressdata.js';
+	import { provinceData,cityData,areaData } from '@/common/config/addressdata.js';
 	export default {
 		data() {
 			return {

+ 1 - 1
components/uni-search/go-search.vue

@@ -29,7 +29,7 @@
 
 <script>
 	import modelAlert from '@/components/module/modelAlert/modelAlert.vue'
-	import authorize from '@/config/authorize.js'
+	import authorize from '@/common/config/authorize.js'
 	export default{
 		name:"go-search",
 		components:{

+ 1 - 1
components/uni-search/or-search.vue

@@ -31,7 +31,7 @@
 
 <script>
 	import modelAlert from '@/components/module/modelAlert/modelAlert.vue'
-	import authorize from '@/config/authorize.js'
+	import authorize from '@/common/config/authorize.js'
 	export default{
 		name:"or-search",
 		components:{

+ 1 - 1
home.vue

@@ -131,7 +131,7 @@
 
 <script>
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import authorize from '@/config/authorize.js'
+	import authorize from '@/common/config/authorize.js'
 	import modalLayer from "@/components/modal-layer"
 	import btSearch from '@/components/uni-search/bt-search.vue'
 	import { mapMutations} from 'vuex';

+ 2 - 2
main.js

@@ -2,8 +2,8 @@ import Vue from 'vue'
 import store from './store'
 import App from './App'
 
-import * as Api from './config/caimeiApi.js'
-import * as Regs from './config/common.js'
+import * as Api from './common/config/caimeiApi.js'
+import * as Regs from './common/config/common.js'
 import Json from './json' //本地数据
 
 const userOrganizeID = 2 //组织ID

+ 1 - 1
pages/login/login.vue

@@ -41,7 +41,7 @@
 
 <script>
 	import { mapMutations } from 'vuex';
-	import authorize from '../../config/authorize.js' 
+	import authorize from '@/common/config/authorize.js' 
 	var self;
 	export default{
 		data() {

+ 1 - 1
pages/search/search-order.vue

@@ -113,7 +113,7 @@
 	import shareAlert from '@/components/module/modelAlert/shareAlert'			 //分享弹窗
 	import modelAlert from '@/components/module/modelAlert/modelAlert'			 //删除弹窗
 	import cancelAlert from '@/components/module/modelAlert/cancelAlert'		 //取消弹窗
-	import authorize from '@/config/authorize.js'
+	import authorize from '@/common/config/authorize.js'
 	export default {
 		components: {
 			orSearch,

+ 1 - 1
pages/search/search.vue

@@ -62,7 +62,7 @@
 	import goSearch from '@/components/uni-search/go-search.vue'
 	import modelAlert from '@/components/module/modelAlert/modelAlert.vue'
 	import modalLayer from "@/components/modal-layer"
-	import authorize from '@/config/authorize.js'
+	import authorize from '@/common/config/authorize.js'
 	export default {
 		components: {
 			// goSearch,

+ 1 - 1
pages/tabBar/home/home.vue

@@ -128,7 +128,7 @@
 
 <script>
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import authorize from '@/config/authorize.js'
+	import authorize from '@/common/config/authorize.js'
 	import modalLayer from "@/components/modal-layer"
 	import btSearch from '@/components/uni-search/bt-search.vue'
 	

+ 1 - 1
pages/user/address/address.vue

@@ -48,7 +48,7 @@
 </template>
 
 <script>
-	import authorize from '@/config/authorize.js'	
+	import authorize from '@/common/config/authorize.js'	
 	import modelAlert from '@/components/module/modelAlert/modelAlert.vue'
 	export default {
 		components:{

+ 1 - 1
pages/user/address/addressManage.vue

@@ -44,7 +44,7 @@
 
 <script>	
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import authorize from '@/config/authorize.js'	
+	import authorize from '@/common/config/authorize.js'	
 	export default {
 		components:{
 			mpvueCityPicker

+ 1 - 1
pages/user/order/orderShareLogin.vue

@@ -15,7 +15,7 @@
 	</view>
 </template>
 <script>
-	import authorize from '../../../config/authorize.js' 
+	import authorize from '@/common/config/authorize.js' 
 	export default{
 		data() {
 			return{

+ 2 - 2
store/index.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import api from '../config/caimeiApi.js'
-import authorize from '../config/authorize.js'
+import api from '../common/config/caimeiApi.js'
+import authorize from '../common/config/authorize.js'
 
 Vue.use(Vuex)
 const store = new Vuex.Store({