合并

pages/index/consumer/index.vue

@@ -1114,6 +1114,11 @@
 					this.screen.agentId = e[0].value;
 					this.agentIdtext = e[0].label;
 				}
+				
+				this.nextPage = 1;
+				this.recordList = [];
+				this.isRefresh = false;
+				this.getMyCustom();
 			},
 
 			//重置

pages/index/guide.vue

@@ -1,7 +1,10 @@
 <template>
 	<view class="boox">
+<<<<<<< HEAD
 		 <!-- <digital-human :width="400" rootStyle="position: fixed; left: 50%; top: 100rpx; transform: translateX(-50%);"></digital-human> -->
 		
+=======
+>>>>>>> yunzhu
 		<view class="booximg">
 			<image v-if="domainObj.domain == 'zh.aihxz.com'" class="img"
 				src="https://autoiot.oss-cn-beijing.aliyuncs.com/static/wabIndexs.png" mode=""></image>
@@ -49,7 +52,10 @@
 	var app = getApp();
 	var config = require("../../config");
 	const domainObj = require('@/utils/domain.js');
+<<<<<<< HEAD
 	// import human from './mathManIndex.js'
+=======
+>>>>>>> yunzhu
 	export default {
 		// mixins: [human],
 		data() {

utils/domain.js

@@ -1,8 +1,14 @@
 import Vue from 'vue';
 /**
  * env文件里配置自定义运行菜单每一个js代表一个域名
+<<<<<<< HEAD
  */
 const obj = process.env.ENV_PATH == undefined ? require('../env/dev.js') : require(process.env.ENV_PATH)
+=======
+ */ 
+import Vue from 'vue';
+const obj =  process.env.ENV_PATH == undefined ? require('../env/dev.js')  : require(process.env.ENV_PATH)
+>>>>>>> yunzhu
 const base = obj.baseUrl
 // http.js使用
 const baseUrl = `${base}/autoSR/api`;
@@ -15,7 +21,10 @@ const domain = obj.domain || '';
 const iMServiceHost = 'https://im.quhouse.com/'; //IM的后端地址正式
 
 Vue.prototype.$domain = obj.domain || '';
+<<<<<<< HEAD
 
+=======
+>>>>>>> yunzhu
 export {
 	domain,
 	baseUrl,