t

pages/agent/activity/join.vue

@@ -17,10 +17,10 @@
 					<u-input placeholder="请输入抖音账号" v-model="form.info2" type="text"></u-input>
 				</u-form-item>
 				<u-form-item label-width="150" label="姓名" prop="info3" required>
-					<u-input placeholder="请输入姓名" v-model="form.info3" type="text"></u-input>
+					<u-input placeholder="请输入姓名" v-model="form.info3" disabled type="text"></u-input>
 				</u-form-item>
 				<u-form-item label-width="150" label="电话" prop="info4" required>
-					<u-input placeholder="请输入电话" v-model="form.info4" type="number"></u-input>
+					<u-input placeholder="请输入电话" v-model="form.info4" disabled type="number"></u-input>
 				</u-form-item>
 				<u-form-item label-width="150" label="微信号" prop="info5" required>
 					<u-input placeholder="请输入微信号" v-model="form.info5" type="text"></u-input>
@@ -46,6 +46,7 @@
 import { arrToObj } from '@/utils'
 export default {
 	data() {
+		const userInfo2 = uni.getStorageSync('MD_userInfo2')
 		return {
 			curId: '',
 			curObj: {},
@@ -54,8 +55,8 @@ export default {
 			form: {
 				info1: null,
 				info2: null,
-				info3: null,
-				info4: null,
+				info3: userInfo2.nickname,
+				info4: userInfo2.phone,
 				info5: null,
 				info6: null,
 				info7: null,
@@ -206,7 +207,7 @@ export default {
 		},
 		
 		getEstateList () {
-			uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_inner: 2, estate_name: this.curEstateName}).then(res => {
+			uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_pub: 1, estate_name: this.curEstateName}).then(res => {
 				let list = res.list || []
 				this.estateList = [...list]
 			})

pages/agent/activity/join2.vue

@@ -14,14 +14,14 @@
 					<u-input placeholder="请输入公司/门店" v-model="form.info1" type="text"></u-input>
 				</u-form-item>
 				<u-form-item label-width="150" label="名字" prop="info2" required>
-					<u-input placeholder="请输入名字" v-model="form.info2" type="text"></u-input>
+					<u-input placeholder="请输入名字" v-model="form.info2" disabled type="text"></u-input>
 				</u-form-item>
 				<u-form-item label-width="150" label="电话" prop="info3" required>
-					<u-input placeholder="请输入电话" v-model="form.info3" type="number"></u-input>
+					<u-input placeholder="请输入电话" v-model="form.info3" disabled type="number"></u-input>
 				</u-form-item>
-				<u-form-item label-width="150" label="参加人数" prop="info4" required>
+				<!-- <u-form-item label-width="150" label="参加人数" prop="info4" required>
 					<u-input placeholder="请输入参加人数" v-model="form.info4" type="number"></u-input>
-				</u-form-item>
+				</u-form-item> -->
 				<u-form-item label-width="150" label="办公区域" prop="info5" required>
 					<u-input placeholder="请输入办公区域" v-model="form.info5" disabled @click="areaOpen" type="text"></u-input>
 				</u-form-item>
@@ -36,6 +36,7 @@
 import { arrToObj } from '@/utils'
 export default {
 	data() {
+		const userInfo2 = uni.getStorageSync('MD_userInfo2')
 		return {
 			curId: '',
 			curObj: {},
@@ -43,8 +44,8 @@ export default {
 			areaList: [],
 			form: {
 				info1: null,
-				info2: null,
-				info3: null,
+				info2: userInfo2.nickname,
+				info3: userInfo2.phone,
 				info4: null,
 				info5: null,
 			},
@@ -76,13 +77,13 @@ export default {
 						trigger: ['change', 'blur']
 					},
 				],
-				info4: [
-					{
-						required: true,
-						message: '参加人数不得为空',
-						trigger: ['change', 'blur']
-					},
-				],
+				// info4: [
+				// 	{
+				// 		required: true,
+				// 		message: '参加人数不得为空',
+				// 		trigger: ['change', 'blur']
+				// 	},
+				// ],
 				info5: [
 					{
 						required: true,
@@ -180,7 +181,7 @@ export default {
 		},
 		
 		getEstateList () {
-			uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_inner: 2, estate_name: this.curEstateName}).then(res => {
+			uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_pub: 1, estate_name: this.curEstateName}).then(res => {
 				let list = res.list || []
 				this.estateList = [...list]
 			})
@@ -247,7 +248,7 @@ export default {
 						info1: that.form.info1,
 						info2: that.form.info2,
 						info3: that.form.info3,
-						info4: that.form.info4,
+						// info4: that.form.info4,
 						info5: that.form.info5,
 					}
 					uni.api.cust.apiactivityenroll(params).then(res => {

pages/agent/recommend/create.vue

@@ -172,7 +172,7 @@ export default {
 		this.userInfo2 = uni.getStorageSync('MD_userInfo2')
 		const dictObj = uni.getStorageSync('MD_dict')
 		this.areaTypeObj = arrToObj(dictObj.area_type)
-		uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_inner: 2}).then(res => {
+		uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_pub: 1}).then(res => {
 			let list = res.list || []
 			this.estateList = [...list]
 		})
@@ -190,7 +190,7 @@ export default {
 		},
 		
 		getEstateList () {
-			uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_inner: 2, estate_name: this.curEstateName}).then(res => {
+			uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_pub: 1, estate_name: this.curEstateName}).then(res => {
 				let list = res.list || []
 				this.estateList = [...list]
 			})

pages/agent/recommend/createin.vue

@@ -155,7 +155,7 @@ export default {
 		this.userInfo2 = uni.getStorageSync('MD_userInfo2')
 		const dictObj = uni.getStorageSync('MD_dict')
 		this.areaTypeObj = arrToObj(dictObj.area_type)
-		uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_inner: 1}).then(res => {
+		uni.api.estate.apiestatelist({page_size: 100, is_inner: 1}).then(res => {
 			let list = res.list || []
 			let propertySelectList = []
 			this.estateList = [...list]
@@ -174,7 +174,7 @@ export default {
 	},
 	methods: {
 		getEstateList () {
-			uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_inner: 1, estate_name: this.curEstateName}).then(res => {
+			uni.api.estate.apiestatelist({page_size: 100, is_inner: 1, estate_name: this.curEstateName}).then(res => {
 				let list = res.list || []
 				this.estateList = [...list]
 			})
@@ -201,6 +201,7 @@ export default {
 				if (valid) {
 					// 验证成功
 					uni.api.estate.apireportadd({
+						is_inner: 1,
 						phone_type: 1,
 						name: that.form.name,
 						phone: that.form.phone.replace(/\s+/g, ''),

pages/agent/recommend/estate.vue

@@ -36,10 +36,7 @@
 							<u-icon class="u-m-r-5" name="home" size="28"></u-icon>
 							{{ item.estate_name }}
 						</view>
-						<!-- <view class="item">
-							<u-icon class="u-m-r-5" name="rmb" size="22"></u-icon>
-							预期最高收益{{ item.commission }}元
-						</view> -->
+						<view class="item" v-if="item.remark">备注：{{ item.remark}}</view>
 					</view>
 					<view class="data-wrap">
 						<view class="date u-m-t-5">报备时间：{{item.create_at}}</view>

pages/agent/recommend/join.vue

@@ -160,7 +160,7 @@ export default {
 		this.userInfo2 = uni.getStorageSync('MD_userInfo2')
 		const dictObj = uni.getStorageSync('MD_dict')
 		this.areaTypeObj = arrToObj(dictObj.area_type)
-		uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_inner: 2}).then(res => {
+		uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_pub: 1}).then(res => {
 			let list = res.list || []
 			this.estateList = [...list]
 		})
@@ -178,7 +178,7 @@ export default {
 		},
 		
 		getEstateList () {
-			uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_inner: 2, estate_name: this.curEstateName}).then(res => {
+			uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_pub: 1, estate_name: this.curEstateName}).then(res => {
 				let list = res.list || []
 				this.estateList = [...list]
 			})

pages/agent/recommend/list.vue

@@ -36,14 +36,11 @@
 							<u-icon class="u-m-r-5" name="home" size="28"></u-icon>
 							{{ item.estate_name }}
 						</view>
-						<!-- <view class="item">
-							<u-icon class="u-m-r-5" name="rmb" size="22"></u-icon>
-							预期最高收益{{ item.commission }}元
-						</view> -->
+						<view class="item" v-if="item.remark">备注：{{ item.remark}}</view>
 					</view>
 					<view class="data-wrap">
-						<view class="date u-m-t-5">报备时间：{{item.create_at}}</view>
-						<view class="date" v-if="item.lock_at">保护期截止：{{item.lock_at}}</view>
+						<view class="date u-m-t-5">报备：{{item.create_at}}</view>
+						<view class="date" v-if="item.lock_at">截止：{{item.lock_at}}</view>
 					</view>
 				</view>
 				<view class="tool-wrap">

pages/estate/list.vue

@@ -162,7 +162,7 @@ export default {
 			}
 			uni.api.estate.apiestatelist({
 				page: that.loadmore.currnetPage,
-				is_inner: 2,
+				is_pub: 1,
 				...params,
 			}).then(res => {
 				const list = res.list || []

pages/index/index.vue

@@ -102,7 +102,7 @@
 			<view v-if="curRoles == 1 || curRoles == 5 || curRoles == 7 || curRoles == 10 || curRoles == 11" class="op" @click="pageTo('/pages/trade/list')">
 				<u-image src="/static/index/i_e_9.png" mode="heightFix" height="146rpx" class="icon"></u-image>
 			</view>
-			<view class="op" @click="pageTo('/pages/agent/activity/list')">
+			<view v-if="userInfo.phone !== '18702530371'" class="op" @click="pageTo('/pages/agent/activity/list')">
 				<u-image src="/static/index/i_e_10.png" mode="heightFix" height="146rpx" class="icon"></u-image>
 			</view>
 			<!-- <view v-if="curRoles == 1 || curRoles == 5 || curRoles == 7" class="op" @click="pageTo('/pages/agent/report/buycheck')">
@@ -444,7 +444,7 @@ export default {
 				})
 				this.reportStepCountObj = {...reportStepCountObj}
 			})
-			uni.api.estate.apiestatelist({page_size: 100, is_inner: 2}).then(res => {
+			uni.api.estate.apiestatelist({page_size: 100, is_pub: 1, hide_state: 1}).then(res => {
 				const list = res.list || []
 				
 				const dictObj = uni.getStorageSync('MD_dict')

pages/user/setting/profile.vue

@@ -5,9 +5,9 @@
 				<u-form-item label-width="150" label="修改头像" prop="nickname" @click.native="pageTo('/pages/user/setting/avatar')">
 					<u-icon name="arrow-right" style="float: right;" size="24" label="请选择" labelPos="left"></u-icon>
 				</u-form-item>
-				<u-form-item label-width="150" label="昵称" prop="nickname" required>
+				<!-- <u-form-item label-width="150" label="昵称" prop="nickname" required>
 					<u-input placeholder="请输入昵称" v-model="form.nickname" inputAlign="right" type="text"></u-input>
-				</u-form-item>
+				</u-form-item> -->
 				<!-- <u-form-item label-width="150" label="身份" prop="groupTypeName" required>
 					<u-input type="select"  inputAlign="right" :select-open="groupTypeSelectShow" v-model="form.groupTypeName" placeholder="请选择身份" @click="groupTypeSelectShow = true"></u-input>
 				</u-form-item> -->

pages/user/setting/setting.vue

@@ -38,7 +38,7 @@
 						修改个人信息
 					</view>
 				</view>
-				<u-icon name="arrow-right" size="24" labelPos="left" label="修改昵称/密码"></u-icon>
+				<u-icon name="arrow-right" size="24" labelPos="left" label="重置密码"></u-icon>
 			</view>
 			<view class="menu-item" @click="pageTo('/pages/user/setting/bank')">
 				<view class="menu-title-wrap">

unpackage/dist/build/mp-weixin/project.private.config.json

@@ -0,0 +1,4 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "condition": {}
+}

unpackage/dist/build/mp-weixin/uni_modules/HM-filterDropdown/components/HM-filterDropdown/HM-filterDropdown.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/uni_modules/vk-uview-ui/components/u-navbar/u-navbar.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uni_modules/vk-uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }