内部客户模块优化

pages/cust/my.vue

@@ -7,7 +7,8 @@
 					<view class="customer" @click="pageTo(`/pages/cust/myrecord?id=${item.id}&str=${item.name}(${item.sex === 'male' ? '男' : '女'})-${item.phone}`)">
 						<view class="relname">
 							<View class="n-key">
-								<view class="n">{{item.record_level}}</view>
+								<view class="n" v-if="item.remind">{{item.remind}}</view>
+								[{{item.nickname}}]
 								{{ item.name }}
 								<u-icon
 									class="u-m-l-5"
@@ -82,8 +83,8 @@
 					
 				</view>
 				
-				<view class="more-wrap" v-if="item.record_remark" @click="pageTo(`/pages/cust/myrecord?id=${item.id}&str=${item.name}(${item.sex === 'male' ? '男' : '女'})-${item.phone}`)">
-					最新跟进：{{ item.record_remark }}
+				<view class="more-wrap" v-if="item.record && item.record.record_remark" @click="pageTo(`/pages/cust/myrecord?id=${item.id}&str=${item.name}(${item.sex === 'male' ? '男' : '女'})-${item.phone}`)">
+					最新跟进({{item.record.create_at}})：{{ item.record.action ? item.record.action + ':' : '' }}{{ item.record.estate_name ? `[${item.record.estate_name}]--` : '' }}  {{ item.record.record_remark }}
 				</view>
 			</view>
 		</view>
@@ -150,10 +151,10 @@ export default {
 			this.filterDropdownValue = [[],[],[],[that.filterStepStatus],[]]
 		}
 
-		// this.getDataList()
+		this.getDataList()
 	},
 	onShow () {
-		this.getDataList()
+		// this.getDataList()
 	},
 	onReachBottom() {
 		if (that.loadmore.status == 'nomore') return;

pages/cust/mycreate.vue

@@ -14,11 +14,11 @@
 				<u-form-item label-width="150" label="手机号" prop="phone" required>
 					<u-input placeholder="请输入手机号" v-model="form.phone" type="number"></u-input>
 				</u-form-item>
-				<u-form-item label-width="150" label="客户级别" prop="record_level" required label-position="top">
+				<!-- <u-form-item label-width="150" label="客户级别" prop="record_level" required label-position="top">
 					<u-radio-group v-model="form.record_level" active-color="#2979ff" wrap="true">
 						<u-radio :name="rl.val" v-for="(rl, i) in recordLevelList" :key="rl.val">{{rl.key}}</u-radio>
 					</u-radio-group>
-				</u-form-item>
+				</u-form-item> -->
 				<u-form-item label-width="150" label="备注信息" prop="remark" required label-position="top">
 					<u-input placeholder="客户描述说明,如客户意向户型或面积等信息" v-model="form.remark" type="textarea"></u-input>
 				</u-form-item>

pages/cust/myrecord.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page scoped-box">
 		<view class="buystep-info u-p-32 box-shadow u-skeleton-fillet">
-			<view class="name">跟进记录:{{custTips || ''}}</view>
+			<view class="name" @click="dial()">跟进记录:{{custTips || ''}}</view>
 			<u-empty v-if="stepsLogList.length == 0" mode="list" text="暂无流水记录"></u-empty>
 			<u-time-line>
 				<u-time-line-item v-for="(item, index) in stepsLogList" :key="index">
@@ -10,10 +10,11 @@
 					</template>
 					<template v-slot:content>
 						<view>
-							<view class="u-order-title">日常维护:</view>
+							<view class="u-order-title" v-if="item.estate_name">{{item.action}}了<navigator :url="`/pages/estate/dtl?id=${item.estate_id}`" class="c">【{{item.estate_name}}】</navigator></view>
+							<view class="u-order-title" v-else>日常维护:<view v-if="item.action" class="c2">{{item.action}}</view></view>
 							<view class="u-order-desc">{{item.record_remark}}</view>
 							<view class="u-order-img" v-if="item.recordImgArr && item.recordImgArr.length > 0">
-								<image v-for="(url, urlIndex) in item.recordImgArr" :key={urlIndex} class="img" :src="url" mode="aspectFill" @click="previewImgHandle(url, item.recordImgArr)"></image>
+								<image v-for="(url, urlIndex) in item.recordImgArr" :key="urlIndex" class="img" :src="url" mode="aspectFill" @click="previewImgHandle(url, item.recordImgArr)"></image>
 							</view>
 							<view class="u-order-time">{{ item.create_at}}</view>
 						</view>
@@ -44,11 +45,16 @@ export default {
 		this.getData()
 	},
 	methods: {
+		dial() {
+			uni.makePhoneCall({
+				phoneNumber: this.custTips.split("-")[1]
+			});
+		},
 		getData () {
 			uni.api.cust.apiprivaterecordlist({customer_id:this.curId, page_size: 100}).then(res =>{
 				let stepsLogList = res.list || []
 				stepsLogList.map(item => {
-					item.recordImgArr = item.record_img.split(',')
+					item.recordImgArr = item.record_img ? item.record_img.split(',') : []
 				})
 				this.stepsLogList = [...stepsLogList]
 			})
@@ -82,6 +88,16 @@ export default {
 	.u-order-title {
 		color: $u-main-color;
 		font-size: $u-p2;
+		.c {
+			display: inline-block;
+			color: #2979ff;
+			font-weight: bold;
+		}
+		.c2 {
+			display: inline-block;
+			color: #5a7fbd;
+			font-weight: bold;
+		}
 	}
 	.u-order-desc {
 		// color: $u-content-color;

pages/cust/myrecordedit.vue

@@ -2,14 +2,14 @@
 	<view class="page">
 		<view class="form">
 			<u-form :model="form" ref="uForm">
-				<u-form-item label-width="150" label="意向方式" prop="groupTypeName">
-					<u-input type="select"  inputAlign="right" :select-open="groupTypeSelectShow" v-model="form.groupTypeName"  placeholder="请选择身份" @click="groupTypeSelectShow = true"></u-input>
+				<u-form-item label-width="150" label="跟进方式" prop="recordEstateActionName">
+					<u-input type="select"  inputAlign="right" :select-open="actionSelectShow" v-model="form.recordEstateActionName"  placeholder="请选择跟进方式" @click="actionSelectShow = true"></u-input>
 				</u-form-item>
-				<u-form-item label-width="150" label="意向项目" prop="estate_name">
-					<u-input type="select" :select-open="propertySelectShow" v-model="form.estate_name" inputAlign="right" placeholder="请选择推荐项目" @click="propertySelectShow = true"></u-input>
+				<u-form-item label-width="150" label="跟进楼盘" prop="estate_name">
+					<u-input type="select" :select-open="propertySelectShow" v-model="form.estate_name" inputAlign="right" placeholder="请选择跟进楼盘" @click="propertySelectShow = true"></u-input>
 				</u-form-item>
-				<u-form-item label-width="150" label="提醒时间" prop="cur_time" required>
-					<u-input placeholder="请输入" v-model="form.cur_time" type="number" inputAlign="right"></u-input>
+				<u-form-item label-width="150" label="提醒时间" prop="remind" required>
+					<u-input placeholder="请输入" v-model="form.remind" type="number" inputAlign="right"></u-input>
 					<view style="color: #333" slot="right">天后提醒我</view>
 				</u-form-item>
 				<u-form-item label-width="150" label="备注信息" prop="record_remark" required label-position="top">
@@ -37,7 +37,7 @@
 		
 		
 		
-		<u-select mode="single-column" :list="groupTypeSelectList" v-model="groupTypeSelectShow" @confirm="groupTypeSelectConfirm"></u-select>
+		<u-select mode="single-column" :list="groupTypeSelectList" v-model="actionSelectShow" @confirm="groupTypeSelectConfirm"></u-select>
 		
 		
 		<!-- modal -->
@@ -86,7 +86,7 @@
 	export default {
 		data() {
 			return {
-				groupTypeSelectShow: false,
+				actionSelectShow: false,
 				groupTypeSelectList: [],
 				estateList: [],
 				areaTypeObj: {},
@@ -97,7 +97,7 @@
 				form: {
 					estate_id: '',
 					estate_name: '',
-					cur_time: '',
+					remind: '',
 					record_remark: null,
 				},
 				customer_id: null,
@@ -109,7 +109,7 @@
 							trigger: ['change']
 						},
 					],
-					cur_time: [
+					remind: [
 						{ required: true, message: "提醒时间不能为空", trigger: ['blur', 'change'] }
 					],
 				},
@@ -124,12 +124,12 @@
 			const dictObj = uni.getStorageSync('MD_dict')
 			this.areaTypeObj = arrToObj(dictObj.area_type)
 			this.getEstateList()
-			this.form.group_type = userInfo2.group_type || '1'
-			let list = dictObj.group_type || []
+			this.form.action = userInfo2.record_estate_action || ''
+			let list = dictObj.record_estate_action || []
 			let groupTypeSelectList = []
 			list.forEach(item => {
-				if (item.val == userInfo2.group_type) {
-					this.form.groupTypeName = item.key
+				if (item.val == userInfo2.record_estate_action) {
+					this.form.recordEstateActionName = item.key
 				}
 				groupTypeSelectList.push({
 					value: item.val,
@@ -148,8 +148,8 @@
 		methods: {
 			groupTypeSelectConfirm(e) {
 				e.map((val, index) => {
-					this.form.group_type = val.value;
-					this.form.groupTypeName = val.label;
+					this.form.action = val.value;
+					this.form.recordEstateActionName = val.label;
 				});
 			},
 			getEstateList () {
@@ -164,7 +164,7 @@
 			},
 			addImg () {
 				this.uploadComImg((arr) => {
-					this.imgArr = [...this.imgArr, ...arr]
+					let imgArr = [...this.imgArr, ...arr]
 					this.imgArr = [...imgArr]
 				}, 9)
 			},
@@ -224,13 +224,15 @@
 			submitHandle() {
 				const that = this
 				this.$refs.uForm.validate(valid => {
-					console.log(valid)
-					return
 					if (valid) {
 						// 验证成功
 						let apiStr = 'apiprivaterecordadd'
 						let params = {
 							record_remark: that.form.record_remark,
+							estate_id: that.form.estate_id,
+							estate_name: that.form.estate_name,
+							action: that.form.action,
+							remind: that.form.remind,
 							customer_id: that.customer_id
 						}
 						if (that.imgArr) params.record_img = that.imgArr.join(',')
@@ -253,7 +255,8 @@
 								uni.$msgConfirm('添加跟进记录成功,是否前往列表？', () => {
 									uni.navigateBack()
 								}, () => {
-									this.form = {
+									that.imgArr = []
+									that.form = {
 										record_remark: null,
 									}
 								})

unpackage/dist/build/mp-weixin/pages/cust/my.json

@@ -5,6 +5,7 @@
     "u-empty": "/uni_modules/vk-uview-ui/components/u-empty/u-empty",
     "u-icon": "/uni_modules/vk-uview-ui/components/u-icon/u-icon",
     "u-tag": "/uni_modules/vk-uview-ui/components/u-tag/u-tag",
+    "u-gap": "/uni_modules/vk-uview-ui/components/u-gap/u-gap",
     "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-divider": "/uni_modules/vk-uview-ui/components/u-divider/u-divider",

unpackage/dist/build/mp-weixin/pages/cust/myrecord.wxss

@@ -1 +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}.buystep-info{width:100%;padding:32rpx 0rpx;background-color:#fff;margin-bottom:20rpx;border-radius:10rpx}.buystep-info .name{font-weight:700;margin-bottom:20rpx}.buystep-info .u-order-title{color:#303133;font-size:24rpx}.buystep-info .u-order-desc{color:#777;font-size:24rpx;margin-bottom:6rpx;padding-top:10rpx}.buystep-info .u-order-img{padding:10rpx}.buystep-info .u-order-img .img{width:160rpx;height:160rpx}.buystep-info .u-order-time{color:#c8c8c8;font-size:24rpx}.scoped-box{padding-bottom:100rpx}.scoped-box .f-btn{position:fixed;bottom:0;left:20rpx;right:20rpx}
+.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}.buystep-info{width:100%;padding:32rpx 0rpx;background-color:#fff;margin-bottom:20rpx;border-radius:10rpx}.buystep-info .name{font-weight:700;margin-bottom:20rpx}.buystep-info .u-order-title{color:#303133;font-size:24rpx}.buystep-info .u-order-title .c{display:inline-block;color:#2979ff;font-weight:700}.buystep-info .u-order-title .c2{display:inline-block;color:#5a7fbd;font-weight:700}.buystep-info .u-order-desc{color:#777;font-size:24rpx;margin-bottom:6rpx;padding-top:10rpx}.buystep-info .u-order-img{padding:10rpx}.buystep-info .u-order-img .img{width:160rpx;height:160rpx;margin-bottom:10rpx;margin-right:20rpx}.buystep-info .u-order-time{color:#c8c8c8;font-size:24rpx}.scoped-box{padding-bottom:100rpx}.scoped-box .f-btn{position:fixed;bottom:0;left:20rpx;right:20rpx}

unpackage/dist/build/mp-weixin/pages/cust/myrecordedit.json

@@ -5,9 +5,12 @@
     "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-image": "/uni_modules/vk-uview-ui/components/u-image/u-image",
     "u-gap": "/uni_modules/vk-uview-ui/components/u-gap/u-gap",
     "u-button": "/uni_modules/vk-uview-ui/components/u-button/u-button",
+    "u-toast": "/uni_modules/vk-uview-ui/components/u-toast/u-toast",
     "u-select": "/uni_modules/vk-uview-ui/components/u-select/u-select",
-    "u-toast": "/uni_modules/vk-uview-ui/components/u-toast/u-toast"
+    "u-popup": "/uni_modules/vk-uview-ui/components/u-popup/u-popup",
+    "u-tag": "/uni_modules/vk-uview-ui/components/u-tag/u-tag"
   }
 }

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

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

unpackage/dist/dev/mp-weixin/pages/cust/my.js

@@ -334,6 +334,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 //
 //
 //
+//
 
 var that;
 var _default = {
@@ -364,11 +365,10 @@ var _default = {
       that.filterStepStatus = parseInt(params.filterStepStatus);
       this.filterDropdownValue = [[], [], [], [that.filterStepStatus], []];
     }
-
-    // this.getDataList()
+    this.getDataList();
   },
   onShow: function onShow() {
-    this.getDataList();
+    // this.getDataList()
   },
   onReachBottom: function onReachBottom() {
     if (that.loadmore.status == 'nomore') return;

unpackage/dist/dev/mp-weixin/pages/cust/myrecord.js

@@ -223,6 +223,7 @@ var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {
@@ -241,6 +242,11 @@ var _default = {
     this.getData();
   },
   methods: {
+    dial: function dial() {
+      uni.makePhoneCall({
+        phoneNumber: this.custTips.split("-")[1]
+      });
+    },
     getData: function getData() {
       var _this = this;
       uni.api.cust.apiprivaterecordlist({
@@ -249,7 +255,7 @@ var _default = {
       }).then(function (res) {
         var stepsLogList = res.list || [];
         stepsLogList.map(function (item) {
-          item.recordImgArr = item.record_img.split(',');
+          item.recordImgArr = item.record_img ? item.record_img.split(',') : [];
         });
         _this.stepsLogList = (0, _toConsumableArray2.default)(stepsLogList);
       });

unpackage/dist/dev/mp-weixin/pages/cust/myrecord.wxss

@@ -87,6 +87,16 @@
   color: #303133;
   font-size: 24rpx;
 }
+.buystep-info .u-order-title .c {
+  display: inline-block;
+  color: #2979ff;
+  font-weight: bold;
+}
+.buystep-info .u-order-title .c2 {
+  display: inline-block;
+  color: #5a7fbd;
+  font-weight: bold;
+}
 .buystep-info .u-order-desc {
   color: #777;
   font-size: 24rpx;

unpackage/dist/dev/mp-weixin/pages/cust/myrecordedit.js

@@ -154,7 +154,7 @@ var render = function () {
   var _c = _vm._self._c || _h
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
-      _vm.groupTypeSelectShow = true
+      _vm.actionSelectShow = true
     }
     _vm.e1 = function ($event) {
       _vm.propertySelectShow = true
@@ -294,7 +294,7 @@ var _utils = __webpack_require__(/*! @/utils */ 65);
 var _default = {
   data: function data() {
     return {
-      groupTypeSelectShow: false,
+      actionSelectShow: false,
       groupTypeSelectList: [],
       estateList: [],
       areaTypeObj: {},
@@ -305,7 +305,7 @@ var _default = {
       form: {
         estate_id: '',
         estate_name: '',
-        cur_time: '',
+        remind: '',
         record_remark: null
       },
       customer_id: null,
@@ -315,7 +315,7 @@ var _default = {
           message: '备注不能为空',
           trigger: ['change']
         }],
-        cur_time: [{
+        remind: [{
           required: true,
           message: "提醒时间不能为空",
           trigger: ['blur', 'change']
@@ -331,12 +331,12 @@ var _default = {
     var dictObj = uni.getStorageSync('MD_dict');
     this.areaTypeObj = (0, _utils.arrToObj)(dictObj.area_type);
     this.getEstateList();
-    this.form.group_type = userInfo2.group_type || '1';
-    var list = dictObj.group_type || [];
+    this.form.action = userInfo2.record_estate_action || '';
+    var list = dictObj.record_estate_action || [];
     var groupTypeSelectList = [];
     list.forEach(function (item) {
-      if (item.val == userInfo2.group_type) {
-        _this.form.groupTypeName = item.key;
+      if (item.val == userInfo2.record_estate_action) {
+        _this.form.recordEstateActionName = item.key;
       }
       groupTypeSelectList.push({
         value: item.val,
@@ -354,8 +354,8 @@ var _default = {
     groupTypeSelectConfirm: function groupTypeSelectConfirm(e) {
       var _this2 = this;
       e.map(function (val, index) {
-        _this2.form.group_type = val.value;
-        _this2.form.groupTypeName = val.label;
+        _this2.form.action = val.value;
+        _this2.form.recordEstateActionName = val.label;
       });
     },
     getEstateList: function getEstateList() {
@@ -376,7 +376,7 @@ var _default = {
     addImg: function addImg() {
       var _this4 = this;
       this.uploadComImg(function (arr) {
-        _this4.imgArr = [].concat((0, _toConsumableArray2.default)(_this4.imgArr), (0, _toConsumableArray2.default)(arr));
+        var imgArr = [].concat((0, _toConsumableArray2.default)(_this4.imgArr), (0, _toConsumableArray2.default)(arr));
         _this4.imgArr = (0, _toConsumableArray2.default)(imgArr);
       }, 9);
     },
@@ -436,16 +436,17 @@ var _default = {
       });
     },
     submitHandle: function submitHandle() {
-      var _this5 = this;
       var that = this;
       this.$refs.uForm.validate(function (valid) {
-        console.log(valid);
-        return;
         if (valid) {
           // 验证成功
           var apiStr = 'apiprivaterecordadd';
           var params = {
             record_remark: that.form.record_remark,
+            estate_id: that.form.estate_id,
+            estate_name: that.form.estate_name,
+            action: that.form.action,
+            remind: that.form.remind,
             customer_id: that.customer_id
           };
           if (that.imgArr) params.record_img = that.imgArr.join(',');
@@ -468,7 +469,8 @@ var _default = {
               uni.$msgConfirm('添加跟进记录成功,是否前往列表？', function () {
                 uni.navigateBack();
               }, function () {
-                _this5.form = {
+                that.imgArr = [];
+                that.form = {
                   record_remark: null
                 };
               });

unpackage/dist/dev/mp-weixin/uni_modules/vk-uview-ui/components/u-image/u-image.json

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