230320a303 1 tahun lalu
induk
melakukan
157fcdd395
100 mengubah file dengan 491 tambahan dan 9 penghapusan
  1. 7 0
      pages.json
  2. 3 3
      pages/agent/activity/join.vue
  3. 431 0
      pages/agent/activity/join2.vue
  4. 9 3
      pages/agent/activity/list.vue
  5. 1 1
      pages/index/index.vue
  6. 3 0
      unpackage/dist/build/mp-weixin/app.json
  7. 0 0
      unpackage/dist/build/mp-weixin/common/runtime.js
  8. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  9. 0 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/join.js
  10. 11 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/join.json
  11. 0 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/join.wxml
  12. 0 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/join.wxss
  13. 0 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/join2.js
  14. 11 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/join2.json
  15. 0 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/join2.wxml
  16. 0 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/join2.wxss
  17. 0 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/list.js
  18. 12 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/list.json
  19. 0 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/list.wxml
  20. 1 0
      unpackage/dist/build/mp-weixin/pages/agent/activity/list.wxss
  21. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.js
  22. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxml
  23. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxss
  24. 0 0
      unpackage/dist/build/mp-weixin/pages/user/setting/bank.js
  25. 0 0
      unpackage/dist/build/mp-weixin/static/index/i_e_10.png
  26. 2 2
      unpackage/dist/build/mp-weixin/uni_modules/HM-filterDropdown/components/HM-filterDropdown/HM-filterDropdown.json
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/back-top/back-top.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/wm-watermark/wm-watermark.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/activity/join.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/activity/join2.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/activity/list.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/check.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/create.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/createin.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/detail.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/detail2.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/detailGovern.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/estate.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/list.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/visitimg.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/report/buycheck.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/report/deal.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/create.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/list.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/my.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/mycreate.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/myrecord.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/myrecordedit.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/estate/dtl.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/estate/lib.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/estate/libPre.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/estate/list.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/web.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/saler/check.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/saler/deal.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/saler/list.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/map.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/trade/check.js.map
  62. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/trade/create.js.map
  63. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/trade/list.js.map
  64. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/trade/record.js.map
  65. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/trade/recordedit.js.map
  66. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/login/login.js.map
  67. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/login/register.js.map
  68. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/setting/bank.js.map
  69. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/setting/profile.js.map
  70. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/setting/setting.js.map
  71. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/HM-filterDropdown/components/HM-filterDropdown/HM-filterDropdown.js.map
  72. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/okingtz-cropper/components/okingtz-cropper/okingtz-cropper.js.map
  73. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-alert-tips/u-alert-tips.js.map
  74. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-avatar/u-avatar.js.map
  75. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-button/u-button.js.map
  76. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-calendar/u-calendar.js.map
  77. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-divider/u-divider.js.map
  78. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-empty/u-empty.js.map
  79. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.js.map
  80. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-form/u-form.js.map
  81. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-gap/u-gap.js.map
  82. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-icon/u-icon.js.map
  83. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-image/u-image.js.map
  84. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-input/u-input.js.map
  85. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-line/u-line.js.map
  86. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-loading/u-loading.js.map
  87. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-loadmore/u-loadmore.js.map
  88. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-mask/u-mask.js.map
  89. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-modal/u-modal.js.map
  90. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-navbar/u-navbar.js.map
  91. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-parse/libs/trees.js.map
  92. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-parse/u-parse.js.map
  93. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-popup/u-popup.js.map
  94. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-radio-group/u-radio-group.js.map
  95. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-radio/u-radio.js.map
  96. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-select/u-select.js.map
  97. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-skeleton/u-skeleton.js.map
  98. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-steps/u-steps.js.map
  99. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-tag/u-tag.js.map
  100. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-time-line-item/u-time-line-item.js.map

+ 7 - 0
pages.json

@@ -49,6 +49,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/agent/activity/join2",
+			"style": {
+				"navigationBarTitleText": "踩盘报名",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/agent/recommend/createin",
 			"style": {

+ 3 - 3
pages/agent/activity/join.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="page">
-		<view class="scoped-header">
-			<view class="p1" style="color: #f00;font-weight: bold;">{{ curObj.estate_name }} {{ curObj.remark }}</view>
-			<view class="p2" style="color: #f00;font-weight: bold;">截至时间:{{ curObj.end_at }}</view>
+		<view class="scoped-header" v-if="curObj.estate_name">
+			<view class="p1" style="color: #f00;font-weight: bold;">{{ curObj.estate_name || '' }} {{ curObj.remark || '' }}</view>
+			<view class="p2" style="color: #f00;font-weight: bold;">截至时间:{{ curObj.end_at || '' }}</view>
 		</view>
 		<view class="form">
 			<u-form :model="form" ref="uForm">

+ 431 - 0
pages/agent/activity/join2.vue

@@ -0,0 +1,431 @@
+<template>
+	<view class="page">
+		<view class="scoped-header">
+			<view class="p1" style="color: #f00;font-weight: bold;">{{ curObj.estate_name || '' }} {{ curObj.remark || '' }}</view>
+			<view class="p2" style="color: #f00;font-weight: bold;">截至时间:{{ curObj.end_at  || ''}}</view>
+		</view>
+		<view class="form">
+			<u-form :model="form" ref="uForm">
+				<u-form-item label-width="150" label="公司/门店" prop="info1" required>
+					<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-form-item>
+				<u-form-item label-width="150" label="电话" prop="info3" required>
+					<u-input placeholder="请输入电话" v-model="form.info3" type="number"></u-input>
+				</u-form-item>
+				<u-form-item label-width="150" label="参加人数" prop="info4" required>
+					<u-input placeholder="请输入参加人数" v-model="form.info4" type="text"></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>
+				</u-form-item>
+			</u-form>
+			<u-gap height="60"></u-gap>
+			<u-button type="primary" @click="submitHandle">提交</u-button>
+		</view>
+
+		
+	</view>
+</template>
+<script>
+import { arrToObj } from '@/utils'
+export default {
+	data() {
+		return {
+			curId: '',
+			curObj: {},
+			form: {
+				info1: null,
+				info2: null,
+				info3: null,
+				info4: null,
+				info5: null,
+			},
+			eIds: [],
+			eArr: [],
+			phoneBefore3: '',
+			phoneAfter4: '',
+			customer_id: null,
+			submitButtonDisabled: true,
+			rules: {
+				info1: [
+					{
+						required: true,
+						message: '公司/门店不得为空',
+						trigger: ['change', 'blur']
+					},
+				],
+				info2: [
+					{
+						required: true,
+						message: '名字不得为空',
+						trigger: ['change', 'blur']
+					},
+				],
+				info3: [
+					{
+						required: true,
+						message: '电话不得为空',
+						trigger: ['change', 'blur']
+					},
+				],
+				info4: [
+					{
+						required: true,
+						message: '参加人数不得为空',
+						trigger: ['change', 'blur']
+					},
+				],
+				info5: [
+					{
+						required: true,
+						message: '办公区域不得为空',
+						trigger: ['change', 'blur']
+					},
+				],
+			},
+			
+			propertySelectShow: false,
+			propertySelectList: [],
+			estateList: [],
+			areaTypeObj: {},
+			userInfo2: {},
+			curEstateName: '',
+
+			salerSelectShow: false,
+			salerSelectList: [],
+			submitModalShow: false,
+			modalShow: false,
+			modalContent: ''
+		};
+	},
+	onLoad(data) {
+		const curId = data.id
+		this.curId = curId || ''
+		uni.api.cust.apiactivityinfo({id: this.curId}).then(res => {
+			this.curObj = res.activity || {}
+		})
+	},
+	onShareAppMessage(options) {
+		var shareObj = {
+			title: `${this.curObj.estate_name}${this.curObj.remark}`,
+			path: `/pages/agent/activity/join?id=${this.curId}`,
+			success: function(res) {
+			},
+			complete: function(res) {
+				console.log(res)
+			},
+		}
+		return shareObj
+	},
+	onShareTimeline(options) {
+		var shareObj = {
+			title: `${this.curObj.estate_name}${this.curObj.remark}`,
+			path: `/pages/agent/activity/join?id=${this.curId}`,
+			success: function(res) {
+			},
+			complete: function(res) {
+				console.log(res)
+			},
+		}
+		return shareObj
+	},
+	created () {
+		
+	},
+	// 必须要在onReady生命周期,因为onLoad生命周期组件可能尚未创建完毕
+	onReady() {
+		this.$refs.uForm.setRules(this.rules);
+	},
+	methods: {
+		phoneHandle () {
+			let p = this.form.phone
+			p = p.replace(/ /g, '')
+			this.form.phone = p
+			this.form = {...this.form}
+		},
+		
+		getEstateList () {
+			uni.api.estate.apiestatelist({page_size: 100, report_open: 1, is_inner: 2, estate_name: this.curEstateName}).then(res => {
+				let list = res.list || []
+				this.estateList = [...list]
+			})
+		},
+		listItemHandle (val) {
+			let eIds = [...this.eIds]
+			let eArr = [...this.eArr]
+			let cIndex = eIds.indexOf(val.estate_id)
+			if (cIndex > -1 ) {
+				eIds.splice(cIndex,1)
+				eArr.splice(cIndex,1)
+			} else {
+				eIds.push(val.estate_id)
+				eArr.push(val)
+			}
+			this.eIds = [...eIds]
+			this.eArr = [...eArr]
+		},
+		clearListHandle () {
+			this.propertySelectShow = false
+			this.eIds = []
+			this.eArr = []
+			this.form.estate_name = ''
+		},
+		saveListHandle () {
+			let errMsg = ''
+			let eNames = this.eArr.map(item => {
+				if (item.phone_type == '2') {
+					errMsg = item.estate_name
+				}
+				return item.estate_name
+			})
+			this.form.estate_name = eNames.join(',')
+			if (this.eArr.length === 1 && this.eArr[0].phone_type == '2') {
+				this.form.phone_type = '2'
+			} else {
+				this.form.phone_type = '1'
+			}
+			if (errMsg && this.eArr.length > 1) {
+				uni.$msg(`${errMsg}是前三后四报备项目,请单独报备`)
+			} else {
+				this.propertySelectShow = false
+			}
+		},
+		// // 选择所属项目回调
+		// propertySelectConfirm(e) {
+		// 	e.map((val, index) => {
+		// 		this.form.estate_id = val.value;
+		// 		this.form.estate_name = val.label;
+		// 	});
+		// },
+		// openEstateList () {
+		// 	uni.navigateTo({
+		// 		url: `/pages/estate/list?eid=${this.form.estate_id}&ename=${this.form.estate_name}`
+		// 	})
+		// },
+		submitHandle() {
+			const that = this
+			this.$refs.uForm.validate(valid => {
+				if (valid) {
+					// 验证成功
+					let params = {
+						activity_id: that.curId,
+						info1: that.form.info1,
+						info2: that.form.info2,
+						info3: that.form.info3,
+						info4: that.form.info4,
+						info5: that.form.info5,
+					}
+					uni.api.cust.apiactivityenroll(params).then(res => {
+						uni.$msgConfirm('报名成功', () => {
+							uni.redirectTo({
+								url: `/pages/index/index`
+							})
+						}, () => {
+							uni.redirectTo({
+								url: `/pages/index/index`
+							})
+						})
+					})
+					
+
+
+
+				} else {
+					console.log('验证失败');
+				}
+			});
+		},
+
+		// 获取手机号
+		getPhoneNumber: function(e) {
+			// 点击获取手机号码按钮
+			let _that = this;
+			if (e.detail.errMsg == 'getPhoneNumber:fail user deny') {
+				_that.$refs.uToast.show({
+					title: '您可以在个人设置中再次绑定',
+					type: 'warning'
+				});
+				setTimeout(() => {
+					_that.reLunchUser();
+				}, 1500);
+				return; // 即用户拒绝授权
+			}
+			console.log(e.detail.errMsg);
+			console.log(e.detail.iv);
+			console.log(e.detail.encryptedData);
+			let iv = e.detail.iv;
+			let encryptedData = e.detail.encryptedData;
+			// 不是登陆完第一时间授权
+			wx.login({
+				success(res) {
+					if (res.code) {
+						// 设置用户手机号
+						_that.setUserPhoneNumber(encryptedData, iv, res.code);
+					} else {
+						this.$refs.uToast.show({
+							title: res.errMsg,
+							type: 'warning'
+						});
+						console.log('登录失败!' + res.errMsg);
+					}
+				}
+			});
+		},
+		// 以下是工具函数
+		// 关闭键盘
+		hideKeyboard() {
+			uni.hideKeyboard();
+		},
+		// 格式化日期的月份或天数的显示(小于10,在前面增加0)
+		getFormatDate(value) {
+			if (value == undefined || value == '') {
+				return '';
+			}
+			var str = value;
+			if (parseInt(value) < 10) {
+				str = '0' + value;
+			}
+			return str;
+		}
+	}
+};
+</script>
+<style lang="scss">
+.page {
+	padding: 20rpx;
+	background-color: #ffffff;
+}
+
+.form {
+	border-radius: 10rpx;
+	padding: 0 40rpx;
+}
+
+.popup-body {
+	.tips-title {
+		font-size: $u-p;
+		margin-bottom: 20rpx;
+	}
+
+	.tips-content {
+		font-size: $u-p2;
+		color: $u-tips-color;
+		margin-bottom: 60rpx;
+	}
+}
+
+.id_card {
+	color: #606266;
+	width: 100%;
+	height: 350rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background-color: #f4f5f6;
+	font-size: $u-p2;
+}
+
+.footer {
+	position: absolute;
+	text-align: center;
+	bottom: 40rpx;
+	font-size: $u-p2;
+
+	.agreement {
+		color: $u-type-error;
+	}
+}
+
+.slot-content {
+	font-size: 28rpx;
+	color: $u-content-color;
+	padding: 20rpx;
+}
+
+
+
+.scoped-estate-list {
+	.sel-item {
+		display: flex;
+		border-bottom: 1PX solid #dcdcdc;
+		padding: 20rpx;
+		&.cur {
+			background: #369af7;
+			border-radius: 10rpx;
+			overflow: hidden;
+			.img {
+				opacity: .6;
+			}
+			.p1 {
+				color: #fff;
+			}
+			.p3 {
+				color: #fff;
+			}
+		}
+	}
+	.sel-left {
+		width: 180rpx;
+		border-radius: 10rpx;
+		.img {
+			width: 180rpx;
+			height: 120rpx;
+			border-radius: 10rpx;
+		}
+	}
+	.sel-right {
+		// width: 450rpx;
+		margin-left: 20rpx;
+		.p1 {
+			font-size: 30rpx;
+			font-weight: bold;
+			margin-bottom: 10rpx;
+		}
+		.p2 {
+			margin-bottom: 10rpx;
+		}
+		.p3 {
+			color: #369af7;
+			font-size: 24rpx;
+			font-weight: bold;
+		}
+	}
+}
+
+.scoped-estate-popup {
+	height: 100%;
+	padding-bottom: 100rpx;
+	.popup-body {
+		box-sizing: border-box;
+		border-bottom: 1PX solid #dcdcdc;
+	}
+}
+
+.scoped-popup-header-input {
+	position: fixed;
+	width: 90%;
+	display: flex;
+	border-bottom: 1PX solid #dcdcdc;
+	.input {
+		flex: 1;
+		padding-left: 20rpx;
+		height: 80rpx;
+		.u-input__input {
+			height: 80rpx;
+		}
+	}
+	.b {
+		width: 200rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		background: #2d8cf0;
+		color: #fff;
+		text-align: center;
+		margin-left: 20rpx;
+	}
+}
+</style>

+ 9 - 3
pages/agent/activity/list.vue

@@ -101,9 +101,15 @@ export default {
 	methods: {
 		listItemHandle (item) {
 			if (this.userInfo2 && this.userInfo2.auth_state == 1) {
-				uni.navigateTo({
-					url: `/pages/agent/activity/join?id=${item.id}`
-				})
+				if (item.activity_type == 2) {
+					uni.navigateTo({
+						url: `/pages/agent/activity/join2?id=${item.id}`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/pages/agent/activity/join?id=${item.id}`
+					})
+				}
 			}
 			// if (this.curEid) {
 			// 	this.curEid = item.id

+ 1 - 1
pages/index/index.vue

@@ -101,7 +101,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 v-if="curRoles == 1 || curRoles == 5 || curRoles == 7 || curRoles == 10 || curRoles == 11" class="op" @click="pageTo('/pages/agent/activity/list')">
+			<view 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')">

+ 3 - 0
unpackage/dist/build/mp-weixin/app.json

@@ -5,6 +5,9 @@
     "pages/user/login/login",
     "pages/user/login/register",
     "pages/agent/recommend/create",
+    "pages/agent/activity/list",
+    "pages/agent/activity/join",
+    "pages/agent/activity/join2",
     "pages/agent/recommend/createin",
     "pages/agent/recommend/list",
     "pages/agent/recommend/estate",

File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/common/runtime.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/join.js


+ 11 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/join.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "活动报名",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-form": "/uni_modules/vk-uview-ui/components/u-form/u-form",
+    "u-form-item": "/uni_modules/vk-uview-ui/components/u-form-item/u-form-item",
+    "u-input": "/uni_modules/vk-uview-ui/components/u-input/u-input",
+    "u-gap": "/uni_modules/vk-uview-ui/components/u-gap/u-gap",
+    "u-button": "/uni_modules/vk-uview-ui/components/u-button/u-button"
+  }
+}

File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/join.wxml


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/join.wxss


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/join2.js


+ 11 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/join2.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "踩盘报名",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-form": "/uni_modules/vk-uview-ui/components/u-form/u-form",
+    "u-form-item": "/uni_modules/vk-uview-ui/components/u-form-item/u-form-item",
+    "u-input": "/uni_modules/vk-uview-ui/components/u-input/u-input",
+    "u-gap": "/uni_modules/vk-uview-ui/components/u-gap/u-gap",
+    "u-button": "/uni_modules/vk-uview-ui/components/u-button/u-button"
+  }
+}

File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/join2.wxml


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/join2.wxss


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/list.js


+ 12 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/list.json

@@ -0,0 +1,12 @@
+{
+  "navigationBarTitleText": "活动列表",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "wm-watermark": "/components/wm-watermark/wm-watermark",
+    "u-icon": "/uni_modules/vk-uview-ui/components/u-icon/u-icon",
+    "u-popup": "/uni_modules/vk-uview-ui/components/u-popup/u-popup",
+    "u-input": "/uni_modules/vk-uview-ui/components/u-input/u-input",
+    "u-button": "/uni_modules/vk-uview-ui/components/u-button/u-button",
+    "u-loadmore": "/uni_modules/vk-uview-ui/components/u-loadmore/u-loadmore"
+  }
+}

File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/list.wxml


+ 1 - 0
unpackage/dist/build/mp-weixin/pages/agent/activity/list.wxss

@@ -0,0 +1 @@
+.page{background-color:#f3f4f6;padding:20rpx}.empty-wrap{margin-top:200rpx;width:100%;display:flex;justify-content:center;align-items:center}.content-page{min-height:100vh;background-color:#fff}.footer{display:flex;align-items:center;color:#909399;width:100%;padding:20rpx 0;justify-content:center}.box-shadow{box-shadow:0rpx 2rpx 4rpx 0 rgba(0,0,0,.2)}.flex-empty{visibility:hidden;width:120rpx;height:0rpx}.bwin-btn-100{width:100%}.bwin-popup{display:flex;flex-direction:column;width:100%;position:relative;min-height:100%;overflow:hidden}.bwin-popup .popup-header{z-index:2;width:80%;position:fixed;padding:20rpx 0;text-align:center;font-size:32rpx;color:#fff;font-weight:700;background-color:#2080f0;border-top-left-radius:20rpx;border-top-right-radius:20rpx}.bwin-popup .popup-body{z-index:1;position:relative;top:90rpx;margin-bottom:90rpx;padding:20rpx;font-size:32rpx;overflow-y:scroll}.bwin-popup .popup-footer{position:relative;left:0;bottom:20rpx;width:100%;display:flex;justify-content:space-around}.scoped-estate-list .sel-item{display:flex;border-bottom:1PX solid #dcdcdc;padding:20rpx}.scoped-estate-list .sel-item.cur{background:#369af7}.scoped-estate-list .sel-item.cur .img{opacity:.6}.scoped-estate-list .sel-item.cur .p1{color:#fff}.scoped-estate-list .sel-item.cur .p3{color:#fff}.scoped-estate-list .sel-left{width:180rpx;border-radius:10rpx}.scoped-estate-list .sel-left .img{width:180rpx;height:120rpx;border-radius:10rpx}.scoped-estate-list .sel-right{margin-left:20rpx}.scoped-estate-list .sel-right .p1{font-size:30rpx;font-weight:700;margin-bottom:10rpx}.scoped-estate-list .sel-right .p2{margin-bottom:10rpx}.scoped-estate-list .sel-right .p3{color:#369af7;font-size:26rpx;font-weight:700}.float-search{opacity:.9;position:fixed;right:20rpx;bottom:40rpx;padding:20rpx;border-radius:50%;background-color:#2080f0}.scoped-list-more-info{position:absolute;right:20rpx}

File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.js


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxml


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxss


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/user/setting/bank.js


+ 0 - 0
unpackage/dist/dev/mp-weixin/static/index/acc4641c7c49c43fa5163cd234b17ea.png → unpackage/dist/build/mp-weixin/static/index/i_e_10.png


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

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

File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/back-top/back-top.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/wm-watermark/wm-watermark.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/activity/join.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/activity/join2.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/activity/list.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/check.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/create.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/createin.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/detail.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/detail2.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/detailGovern.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/estate.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/list.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/recommend/visitimg.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/report/buycheck.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/agent/report/deal.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/create.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/list.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/my.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/mycreate.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/myrecord.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cust/myrecordedit.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/estate/dtl.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/estate/lib.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/estate/libPre.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/estate/list.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/web.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/saler/check.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/saler/deal.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/saler/list.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/map.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/trade/check.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/trade/create.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/trade/list.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/trade/record.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/trade/recordedit.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/login/login.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/login/register.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/setting/bank.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/setting/profile.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/setting/setting.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/HM-filterDropdown/components/HM-filterDropdown/HM-filterDropdown.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/okingtz-cropper/components/okingtz-cropper/okingtz-cropper.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-alert-tips/u-alert-tips.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-avatar/u-avatar.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-button/u-button.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-calendar/u-calendar.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-divider/u-divider.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-empty/u-empty.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-form/u-form.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-gap/u-gap.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-icon/u-icon.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-image/u-image.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-input/u-input.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-line/u-line.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-loading/u-loading.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-loadmore/u-loadmore.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-mask/u-mask.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-modal/u-modal.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-navbar/u-navbar.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-parse/libs/trees.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-parse/u-parse.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-popup/u-popup.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-radio-group/u-radio-group.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-radio/u-radio.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-select/u-select.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-skeleton/u-skeleton.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-steps/u-steps.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-tag/u-tag.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/vk-uview-ui/components/u-time-line-item/u-time-line-item.js.map


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini