temp save

pages/agent/recommend/create.vue

@@ -65,11 +65,11 @@
 							</view>
 						</view>
 					</view>
-					<view class="popup-footer" style="position: fixed;bottom: 10rpx;">
-						<u-button size="medium" @click="propertySelectShow = false">关闭</u-button>
-						<u-button size="medium" type="primary" @click="propertySelectShow = false">确定</u-button>
-					</view>
 				</scroll-view>
+				<view class="popup-footer" style="position: fixed;bottom: 12rpx;">
+					<u-button size="medium" @click="propertySelectShow = false">关闭</u-button>
+					<u-button size="medium" type="primary" @click="propertySelectShow = false">确定</u-button>
+				</view>
 			</view>
 		</u-popup>
 		

pages/cust/my.vue

@@ -6,13 +6,16 @@
 				<view class="info">
 					<view class="customer">
 						<view class="relname">
-							[{{item.record_level}}]{{ item.name }}
-							<u-icon
-								class="u-m-l-5"
-								:name="item.sex == 'male' ? 'man' : 'woman'"
-								size="22"
-								:color="item.sex == 'male' ? '#2080f0' : '#f85f69'"
-							></u-icon>
+							<View class="n-key" @click="pageTo(`/pages/cust/myrecord?id=${item.id}&str=${item.name}(${item.sex === 'male' ? '男' : '女'})-${item.phone}`)">
+								<view class="n">{{item.record_level}}</view>
+								{{ item.name }}
+								<u-icon
+									class="u-m-l-5"
+									:name="item.sex == 'male' ? 'man' : 'woman'"
+									size="22"
+									:color="item.sex == 'male' ? '#2080f0' : '#f85f69'"
+								></u-icon>
+							</View>
 							
 							<u-icon
 								name="attach"
@@ -20,8 +23,8 @@
 								label="快速报备"
 								label-size="28"
 								class="u-m-l-20"
-								color="#f00"
-								label-color="#f00"
+								color="#19be6b"
+								label-color="#19be6b"
 								@click="pageTo('/pages/agent/recommend/create', { info: item })"
 							></u-icon>
 							<u-icon
@@ -36,18 +39,17 @@
 							></u-icon>
 						</view>
 
-						<view class="item">
+						<view class="item" @click="pageTo(`/pages/cust/myrecord?id=${item.id}&str=${item.name}(${item.sex === 'male' ? '男' : '女'})-${item.phone}`)">
 							<u-icon class="u-m-r-5" name="phone" size="22"></u-icon>
 							{{ item.phone }}
 						</view>
-						<view class="item" v-if="item.remark">
+						<view class="item" v-if="item.remark" @click="pageTo(`/pages/cust/myrecord?id=${item.id}&str=${item.name}(${item.sex === 'male' ? '男' : '女'})-${item.phone}`)">
 							{{ item.remark }}
 						</view>
-						<view class="item" v-if="item.record_remark">
-							最新跟进：{{ item.record_remark }}
-						</view>
+						
 					</view>
 					
+					
 					<view class="data-wrap">
 						<u-tag
 							icon="edit-pen"
@@ -70,6 +72,10 @@
 					</view>
 					
 				</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>
 			</view>
 		</view>
 
@@ -246,13 +252,27 @@ export default {
 				display: flex;
 				flex-direction: column;
 				align-items: flex-start;
-
+				width: 80%;
 				.relname {
 					color: $u-main-color;
 					font-size: $u-p;
 					font-weight: bold;
 					margin-bottom: 10rpx;
 				}
+				.n-key {
+					display: inline-block;
+					.n {
+						background: #f00;
+						color: #fff;
+						width: 40rpx;
+						height: 40rpx;
+						line-height: 38rpx;
+						text-align: center;
+						border-radius: 50%;
+						display: inline-block;
+						margin-right: 10rpx;
+					}
+				}
 
 				.item {
 					margin-bottom: 10rpx;
@@ -266,6 +286,14 @@ export default {
 				}
 			}
 		}
+		
+		.more-wrap {
+			background: #fdf6ec;
+			color: #666;
+			padding: 10rpx;
+			border-radius: 10rpx;
+			font-size: 26rpx;
+		}
 
 		.tool-wrap {
 			display: flex;

pages/cust/myrecord.vue

@@ -12,8 +12,8 @@
 						<view>
 							<view class="u-order-title">日常维护:</view>
 							<view class="u-order-desc">{{item.record_remark}}</view>
-							<view class="u-order-img" v-if="item.record_img">
-								<image class="img" :src="item.record_img" mode="aspectFill" @click="previewImgHandle(item.record_img, [item.record_img])"></image>
+							<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>
 							</view>
 							<view class="u-order-time">{{ item.create_at}}</view>
 						</view>
@@ -46,7 +46,11 @@ export default {
 	methods: {
 		getData () {
 			uni.api.cust.apiprivaterecordlist({customer_id:this.curId, page_size: 100}).then(res =>{
-				this.stepsLogList = res.list || []
+				let stepsLogList = res.list || []
+				stepsLogList.map(item => {
+					item.recordImgArr = item.record_img.split(',')
+				})
+				this.stepsLogList = [...stepsLogList]
 			})
 		},
 		previewImgHandle (current, urls){
@@ -91,6 +95,8 @@ export default {
 		.img {
 			width: 160rpx;
 			height: 160rpx;
+			margin-bottom: 10rpx;
+			margin-right: 20rpx;
 		}
 	}
 	.u-order-time {

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

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

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -2722,7 +2722,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -9742,7 +9742,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -9763,14 +9763,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9866,7 +9866,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -12766,7 +12766,7 @@ function _extends() {
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
+if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"房票科技","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {
       if (errors.every(function (e) {

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

@@ -316,6 +316,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 var that;
 var _default = {

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

@@ -101,6 +101,7 @@
   display: flex;
   flex-direction: column;
   align-items: flex-start;
+  width: 80%;
 }
 .customer-list-wrap .customer-item .info .customer .relname {
   color: #303133;
@@ -108,6 +109,20 @@
   font-weight: bold;
   margin-bottom: 10rpx;
 }
+.customer-list-wrap .customer-item .info .customer .n-key {
+  display: inline-block;
+}
+.customer-list-wrap .customer-item .info .customer .n-key .n {
+  background: #f00;
+  color: #fff;
+  width: 40rpx;
+  height: 40rpx;
+  line-height: 38rpx;
+  text-align: center;
+  border-radius: 50%;
+  display: inline-block;
+  margin-right: 10rpx;
+}
 .customer-list-wrap .customer-item .info .customer .item {
   margin-bottom: 10rpx;
 }
@@ -117,6 +132,13 @@
 .customer-list-wrap .customer-item .info .data-wrap .date {
   font-size: 20rpx;
 }
+.customer-list-wrap .customer-item .more-wrap {
+  background: #fdf6ec;
+  color: #666;
+  padding: 10rpx;
+  border-radius: 10rpx;
+  font-size: 26rpx;
+}
 .customer-list-wrap .customer-item .tool-wrap {
   display: flex;
   align-items: center;

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

@@ -138,11 +138,20 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var g0 = _vm.stepsLogList.length
+  var l0 = _vm.__map(_vm.stepsLogList, function (item, index) {
+    var $orig = _vm.__get_orig(item)
+    var g1 = item.recordImgArr && item.recordImgArr.length > 0
+    return {
+      $orig: $orig,
+      g1: g1,
+    }
+  })
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
         g0: g0,
+        l0: l0,
       },
     }
   )
@@ -181,10 +190,12 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 //
 //
 //
@@ -236,7 +247,11 @@ var _default = {
         customer_id: this.curId,
         page_size: 100
       }).then(function (res) {
-        _this.stepsLogList = res.list || [];
+        var stepsLogList = res.list || [];
+        stepsLogList.map(function (item) {
+          item.recordImgArr = item.record_img.split(',');
+        });
+        _this.stepsLogList = (0, _toConsumableArray2.default)(stepsLogList);
       });
     },
     previewImgHandle: function previewImgHandle(current, urls) {

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

@@ -1 +1 @@
-<view class="page scoped-box"><view class="buystep-info u-p-32 box-shadow u-skeleton-fillet"><view class="name">{{"跟进记录:"+(custTips||'')}}</view><block wx:if="{{$root.g0==0}}"><u-empty vue-id="11c9b9f6-1" mode="list" text="暂无流水记录" bind:__l="__l"></u-empty></block><u-time-line vue-id="11c9b9f6-2" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{stepsLogList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><u-time-line-item vue-id="{{('11c9b9f6-3-'+index)+','+('11c9b9f6-2')}}" bind:__l="__l" vue-slots="{{['node','content']}}"><view class="u-node" slot="node"><u-icon vue-id="{{('11c9b9f6-4-'+index)+','+('11c9b9f6-3-'+index)}}" name="checkmark-circle" size="28" color="#2080f0" bind:__l="__l"></u-icon></view><view slot="content"><view class="u-order-title">日常维护:</view><view class="u-order-desc">{{item.record_remark}}</view><block wx:if="{{item.record_img}}"><view class="u-order-img"><image class="img" src="{{item.record_img}}" mode="aspectFill" data-event-opts="{{[['tap',[['previewImgHandle',['$0',[item.record_img]],[[['stepsLogList','',index,'record_img']]]]]]]}}" bindtap="__e"></image></view></block><view class="u-order-time">{{item.create_at}}</view></view></u-time-line-item></block></u-time-line></view><u-button class="f-btn bwin-btn-80 u-m-b-10" vue-id="11c9b9f6-5" type="primary" data-event-opts="{{[['^click',[['addHandle']]]]}}" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}">添加跟进记录</u-button></view>
+<view class="page scoped-box"><view class="buystep-info u-p-32 box-shadow u-skeleton-fillet"><view class="name">{{"跟进记录:"+(custTips||'')}}</view><block wx:if="{{$root.g0==0}}"><u-empty vue-id="11c9b9f6-1" mode="list" text="暂无流水记录" bind:__l="__l"></u-empty></block><u-time-line vue-id="11c9b9f6-2" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><u-time-line-item vue-id="{{('11c9b9f6-3-'+index)+','+('11c9b9f6-2')}}" bind:__l="__l" vue-slots="{{['node','content']}}"><view class="u-node" slot="node"><u-icon vue-id="{{('11c9b9f6-4-'+index)+','+('11c9b9f6-3-'+index)}}" name="checkmark-circle" size="28" color="#2080f0" bind:__l="__l"></u-icon></view><view slot="content"><view class="u-order-title">日常维护:</view><view class="u-order-desc">{{item.$orig.record_remark}}</view><block wx:if="{{item.g1}}"><view class="u-order-img"><block wx:for="{{item.$orig.recordImgArr}}" wx:for-item="url" wx:for-index="urlIndex"><image class="img" src="{{url}}" mode="aspectFill" data-event-opts="{{[['tap',[['previewImgHandle',['$0','$1'],[[['stepsLogList','',index],['recordImgArr','{urlIndex}',{urlIndex}]],[['stepsLogList','',index,'recordImgArr']]]]]]]}}" bindtap="__e"></image></block></view></block><view class="u-order-time">{{item.$orig.create_at}}</view></view></u-time-line-item></block></u-time-line></view><u-button class="f-btn bwin-btn-80 u-m-b-10" vue-id="11c9b9f6-5" type="primary" data-event-opts="{{[['^click',[['addHandle']]]]}}" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}">添加跟进记录</u-button></view>

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

@@ -99,6 +99,8 @@
 .buystep-info .u-order-img .img {
   width: 160rpx;
   height: 160rpx;
+  margin-bottom: 10rpx;
+  margin-right: 20rpx;
 }
 .buystep-info .u-order-time {
   color: #c8c8c8;

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,7 +11,12 @@
     "minified": true,
     "newFeature": true,
     "bigPackageSizeSupport": true,
-    "checkSiteMap": false
+    "checkSiteMap": false,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
   },
   "compileType": "miniprogram",
   "libVersion": "",
@@ -33,5 +39,9 @@
       "current": -1,
       "list": []
     }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

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

@@ -9,10 +9,24 @@
       "list": [
         {
           "name": "",
-          "pathName": "pages/estate/lib",
+          "pathName": "pages/cust/my",
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/cust/myrecordedit",
+          "query": "id=81",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/cust/myrecord",
+          "query": "id=81&str=abc-18700001111",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

unpackage/dist/dev/mp-weixin/uni_modules/vk-uview-ui/components/u-form-item/u-form-item.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/uni_modules/vk-uview-ui/components/u-gap/u-gap.json

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

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
+  }
 }

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

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "u-line": "/uni_modules/vk-uview-ui/components/u-line/u-line",
     "u-loading": "/uni_modules/vk-uview-ui/components/u-loading/u-loading"
-  },
-  "component": true
+  }
 }

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

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

unpackage/dist/dev/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
+  }
 }

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

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