Explorar el Código

Merge branch 'new-dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-app into new-dev

@dongkboy hace 2 años
padre
commit
f085d841c7

+ 4 - 3
config/baseUrl.js

@@ -4,16 +4,17 @@ let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
 	// baseUrl = "http://192.168.0.115:8080"; //屈晨
-	// baseUrl = "http://192.168.0.52:8080"; //贺礼霄
+	baseUrl = "http://192.168.0.52:8080"; //贺礼霄
 	// baseUrl = "http://192.168.0.253:8080"; //田智
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
 	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/test"; //生产
-	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
+	// baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
 	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
-	socketUrl = "ws://sxzgkj.baoxianzhanggui.com/web-api/websocket";
+	// socketUrl = "wss://sxzgkj.baoxianzhanggui.com/web-api/websocket";
+	socketUrl = "ws://192.168.0.52:8080/websocket";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试

+ 1 - 0
pages/carInsure/entry.vue

@@ -596,6 +596,7 @@
 		},
 
 		async onLoad() {
+			this.$http.get('/sysMenuRecord/add?type=1&menuType=1')
 			this.getDicType("businessVehicleUse"); //车辆用途(营业)
 			this.getDicType("outOfBusinessVehicleUse"); //车辆用途(非营业)
 			this.getDicType("natureOfVehicleUse"); //车辆性质

+ 1 - 0
pages/tools/addStaff/addStaff.vue

@@ -100,6 +100,7 @@
 			this.recommendCode();
 			this.codeDownload();
 			this.orderissuer();
+			this.$http.get('/sysMenuRecord/add?type=1&menuType=4')
 		},
 		computed: {
 			...mapState(['userInfo', 'sources']),

+ 1 - 0
pages/tools/poster/poster.vue

@@ -71,6 +71,7 @@
 			}
 		},
 		async onLoad() {
+			this.$http.get('/sysMenuRecord/add?type=1&menuType=6')
 			let res1 = await this.$http.post('/sysPoster/posterListApp', {
 				type: 'P0002'
 			});

+ 1 - 0
pages/tools/team/team.vue

@@ -208,6 +208,7 @@
 			}
 		},
 		async onLoad(params) {
+			this.$http.get('/sysMenuRecord/add?type=1&menuType=5')
 			this.pageTtile = this.userInfo.sysUser.name + "会员管理"
 			// this.queryPeopleId = params.id
 			if ((!!params.id) && (!!params.name)) {

+ 3 - 1
pages/wallet/bankCard.vue

@@ -317,7 +317,9 @@
 				},
 			},
 		},
-		onLoad() {},
+		onLoad() {
+			this.$http.get('/sysMenuRecord/add?type=1&menuType=3')
+		},
 		methods: {
 			async updateSubmit() {
 				if (!this.form.bankNumber || !this.form.realUserName || !this.form.bankAccount || !this.form

+ 1 - 0
pages/wallet/wallet.vue

@@ -65,6 +65,7 @@
 		},
 		onLoad() {
 			this.getAdvanceMoney(); //手续费金额
+			this.$http.get('/sysMenuRecord/add?type=1&menuType=3')
 		},
 		methods: {
 			// 预收账户金额查询