From 1d8b0e05ae2ff956dcf1271db51ea994c4f135f0 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Tue, 25 Jan 2022 10:33:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8E=88=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/client-detail/index.vue | 21 +++++++++------------
 pages/client/index.nvue       | 10 +++++++++-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pages/client-detail/index.vue b/pages/client-detail/index.vue
index 43e7e9d..f2eb3d8 100644
--- a/pages/client-detail/index.vue
+++ b/pages/client-detail/index.vue
@@ -103,7 +103,15 @@ export default {
         this.dialogType = 3
         this.$refs.popup.open()
       } else {
-        go2('client-credit')
+        let info = this.$refs.basicInformationRef.getCompanyInfo()
+        if (info.id) {
+          go2('client-credit', { enterpriseId: info.id, name: info.name })
+        } else {
+          uni.showToast({
+            title: '该企业基础信息不完善',
+            icon: 'error'
+          })
+        }
       }
     },
     cancelTap() {
@@ -131,17 +139,6 @@ export default {
         default:
           break
       }
-    },
-    makeCredit() {
-      let info = this.$refs.basicInformationRef.getCompanyInfo()
-      if (info.id) {
-        go2('client-credit', { enterpriseId: info.id, name: info.name })
-      } else {
-        uni.showToast({
-          title: '该企业基础信息不完善',
-          icon: 'error'
-        })
-      }
     }
   }
 }
diff --git a/pages/client/index.nvue b/pages/client/index.nvue
index 260f947..f521398 100644
--- a/pages/client/index.nvue
+++ b/pages/client/index.nvue
@@ -35,7 +35,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="enquiry-submit">
+					<view class="enquiry-submit" @click="jumpEnquiryDetail">
 						<text class="text">去报价</text>
 						<image style="width: 32rpx; height: 32rpx" src="/static/imgs/client/next-icon.png"></image>
 					</view>
@@ -80,6 +80,7 @@ export default {
 		}
 	},
 	methods: {
+		go2,
 		mapChange(data) {
 			let params = {
 				cooperationState: 0,
@@ -170,6 +171,13 @@ export default {
 				clearInterval(this.transitionTimer)
 				this.transitionTimer = null
 			}
+		},
+		// 前往询价详情
+		jumpEnquiryDetail() {
+			let target = this.enquiryList[this.curIndex]
+			if(target) {
+				go2('submit-quotation',{title:'提交报价',id:target.id})
+			}
 		}
 	},
 	computed: {

From d3433f0df75220ae1fa32ca876603098b441e008 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Tue, 25 Jan 2022 14:33:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/client-credit/index.vue     |   7 +
 pages/follow-up-records/index.vue | 484 +++++++++++++++---------------
 pages/mine/index.vue              |   4 +-
 3 files changed, 251 insertions(+), 244 deletions(-)

diff --git a/pages/client-credit/index.vue b/pages/client-credit/index.vue
index 873c48d..05f4460 100644
--- a/pages/client-credit/index.vue
+++ b/pages/client-credit/index.vue
@@ -95,6 +95,13 @@ export default {
     if (option.enterpriseId) {
       this.form.name = option.name
       this.form.enterpriseId = option.enterpriseId
+      if (option.name) {
+        getCompanyList({ enterpriseName: option.name }).then((res) => {
+          if (res) {
+            this.searchList = res.records
+          }
+        })
+      }
     }
   },
   methods: {
diff --git a/pages/follow-up-records/index.vue b/pages/follow-up-records/index.vue
index 8fe2f22..5946918 100644
--- a/pages/follow-up-records/index.vue
+++ b/pages/follow-up-records/index.vue
@@ -1,260 +1,260 @@
 <template>
-	<view class="warpper">
-		<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
-		<timeline>
-			<timelineItem v-for="(item, index) in list" :key="index">
-				<view class="time">
-					{{item.createTime}}
-				</view>
-				<view class="tripItem">
-					<view class="row">
-						<view class="title">跟进人：</view>
-						<view class="value">{{item.visitorName}}</view>
-					</view>
-					<view class="row">
-						<view class="title">拜访对象：</view>
-						<view class="value">{{item.respondent}}</view>
-					</view>
-					<view class="row">
-						<view class="title">沟通内容：</view>
-						<view class="value">{{item.content}}</view>
-					</view>
-					<view class="row">
-						<view class="title">备注信息：</view>
-						<view class="value">{{item.remark}}</view>
-					</view>
-					<view class="row">
-						<view class="title"></view>
-						<view class="value">
-							<image class="icon" src="/static/imgs/client-detail/address-icon.png"></image>
-							<text class="location">{{item.address}}</text>
-						</view>
-					</view>
-				</view>
-			</timelineItem>
-			<!-- <view class="see-more">
+  <view class="wrapper">
+    <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="跟进记录"></uni-nav-bar>
+    <scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
+      <timeline>
+        <timelineItem v-for="(item, index) in list" :key="index">
+          <view class="time">
+            {{ item.createTime }}
+          </view>
+          <view class="tripItem">
+            <view class="row">
+              <view class="title">跟进人：</view>
+              <view class="value">{{ item.visitorName }}</view>
+            </view>
+            <view class="row">
+              <view class="title">拜访对象：</view>
+              <view class="value">{{ item.respondent }}</view>
+            </view>
+            <view class="row">
+              <view class="title">沟通内容：</view>
+              <view class="value">{{ item.content }}</view>
+            </view>
+            <view class="row">
+              <view class="title">备注信息：</view>
+              <view class="value">{{ item.remark }}</view>
+            </view>
+            <view class="row">
+              <view class="title"></view>
+              <view class="value">
+                <image class="icon" src="/static/imgs/client-detail/address-icon.png"></image>
+                <text class="location">{{ item.address }}</text>
+              </view>
+            </view>
+          </view>
+        </timelineItem>
+        <!-- <view class="see-more">
 				<text>查看更多</text>
 				<image class="icon" :src="!seemoreFlag ? '/static/imgs/client-detail/arrow-up-icon.png' : '/static/imgs/client-detail/arrow-down-icon.png'"></image>
 			</view> -->
-		</timeline>
-		 </scroll-list>
-		<qn-footer fixed height="120rpx">
-		  <view class="button-area">
-		    <!-- <view class="button button__cancel" @click="back">
+      </timeline>
+    </scroll-list>
+    <qn-footer fixed height="120rpx">
+      <view class="button-area">
+        <!-- <view class="button button__cancel" @click="back">
 		      <text class="text">取消</text>
 		    </view> -->
-		    <view class="button button__submit" @click="addTap">
-		      <text class="text" style="color: white">新增跟进</text>
-		    </view>
-		  </view>
-		</qn-footer>
-		   
-	</view>
+        <view class="button button__submit" @click="addTap">
+          <text class="text" style="color: white">新增跟进</text>
+        </view>
+      </view>
+    </qn-footer>
+  </view>
 </template>
 
 <script>
 import timeline from './timeLine.vue'
 import timelineItem from './timelineItem.vue'
 import qnFooter from '@/components/qn-footer/qn-footer.vue'
-import { go2 } from '@/utils/hook.js'
-import {getVisitRecordList} from '@/apis/followUpRecords.js'
+import { go2, back } from '@/utils/hook.js'
+import { getVisitRecordList } from '@/apis/followUpRecords.js'
 export default {
-	components: {
-		timeline,
-		timelineItem,
-		qnFooter
-	},
-	data() {
-		return {
-			option: {
-			  size: 10,
-			  auto: true,
-			  height: 0,
-			  emptyText: '暂无数据~',
-			  background: '#F7F8FA',
-			  disabled: false
-			},
-			params: {
-				asc: '',
-				desc: '',
-				customerEnterpriseId  : [this.$store.state.supplierInfo.id],
-				mallSupplierId : this.$store.state.supplierInfo.supplierId || null,
-				// enterpriseIds : ['651107734133018624'],
-				// mallSupplierId : '670334117090562048',
-			},
-			pagination: {
-			  pageNum: 0, // 初始会执行一次下拉加载
-			  pageSize: 10
-			},
-			list: [],
-		}
-	},
-	created() {
-		let that = this
-		uni.getSystemInfo({
-		    success: function (res) {
-		        // console.log( '状态栏的高', res.statusBarHeight);
-				that.option.height = (res.windowHeight) * (750/res.windowWidth) - 120
-				
-		    }
-		});
-	},
-	onShow() {
-		console.log('onShow')
-		this.getList()
-	},
-	methods:{
-		getList() {
-		  return new Promise((resolve, reject) => {
-		    getVisitRecordList({ ...this.params, ...this.pagination })
-		      .then((res) => {
-		        // console.log('跟踪记录', res)
-		        if (res) {
-		          if (this.pagination.pageNum == 1) {
-		            this.list = res.records
-		          } else {
-		            this.list = this.list.concat(res.records)
-		          }
-		          // this.list = []
-		          // this.list = [...this.list, ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
-		          resolve({ list: this.list, total: res.total })
-		        } else {
-		          reject()
-		        }
-		      })
-		      .catch((err) => {
-		        reject(err)
-		      })
-		  })
-		},
-		addTap() {
-			go2('add-record')
-		},
-		downCallback() {
-			this.pagination.pageNum = 1
-			this.getList()
-			  .then(({ list, total }) => {
-			    this.$refs.list.refreshSuccess({ list, total })
-			  })
-			  .catch(() => {
-			    this.$refs.list.refreshFail()
-			  })
-		},
-		upCallback() {
-			this.pagination.pageNum++
-			this.getList()
-			  .then(({ list, total }) => {
-			    this.$refs.list.loadSuccess({ list, total })
-			  })
-			  .catch(() => {
-			    this.$refs.list.loadFail()
-			  })
-		}
-	}
+  components: {
+    timeline,
+    timelineItem,
+    qnFooter
+  },
+  data() {
+    return {
+      option: {
+        size: 10,
+        auto: true,
+        height: 0,
+        emptyText: '暂无数据~',
+        background: '#F7F8FA',
+        disabled: false
+      },
+      params: {
+        asc: '',
+        desc: '',
+        customerEnterpriseId: [this.$store.state.supplierInfo.id],
+        mallSupplierId: this.$store.state.supplierInfo.supplierId || null
+        // enterpriseIds : ['651107734133018624'],
+        // mallSupplierId : '670334117090562048',
+      },
+      pagination: {
+        pageNum: 0, // 初始会执行一次下拉加载
+        pageSize: 10
+      },
+      list: []
+    }
+  },
+  created() {
+    let that = this
+    uni.getSystemInfo({
+      success: function (res) {
+        // console.log( '状态栏的高', res.statusBarHeight);
+        that.option.height = res.windowHeight * (750 / res.windowWidth) - 120
+      }
+    })
+  },
+  onShow() {
+    console.log('onShow')
+    this.getList()
+  },
+  methods: {
+    back,
+    getList() {
+      return new Promise((resolve, reject) => {
+        getVisitRecordList({ ...this.params, ...this.pagination })
+          .then((res) => {
+            // console.log('跟踪记录', res)
+            if (res) {
+              if (this.pagination.pageNum == 1) {
+                this.list = res.records
+              } else {
+                this.list = this.list.concat(res.records)
+              }
+              // this.list = []
+              // this.list = [...this.list, ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]]
+              resolve({ list: this.list, total: res.total })
+            } else {
+              reject()
+            }
+          })
+          .catch((err) => {
+            reject(err)
+          })
+      })
+    },
+    addTap() {
+      go2('add-record')
+    },
+    downCallback() {
+      this.pagination.pageNum = 1
+      this.getList()
+        .then(({ list, total }) => {
+          this.$refs.list.refreshSuccess({ list, total })
+        })
+        .catch(() => {
+          this.$refs.list.refreshFail()
+        })
+    },
+    upCallback() {
+      this.pagination.pageNum++
+      this.getList()
+        .then(({ list, total }) => {
+          this.$refs.list.loadSuccess({ list, total })
+        })
+        .catch(() => {
+          this.$refs.list.loadFail()
+        })
+    }
+  }
 }
 </script>
 
 <style lang="scss">
-.warpper {
-	background-color: #FFFFFF;
-	.time {
-		font-size: 26rpx;
-		color: #000000;
-		letter-spacing: 0;
-		font-weight: 400;
-	}
-	.tripItem {
-		margin-top: 20rpx;
-		// height: 140rpx;
-		padding: 20rpx 30rpx;
-		// height: 376rpx;
-		background: #F7F8FA;
-		border-radius: 8rpx;
-		.row {
-			display: flex;
-			flex-direction: row;
-			padding: 16rpx 0rpx;
-			.title {
-				flex: 0 0 140rpx;
-				font-size: 28rpx;
-				color: #888888;
-				letter-spacing: 0;
-				font-weight: 400;
-			}
-			.value {
-				display: flex;
-				align-items: center;
-				flex: 1;
-				font-size: 28rpx;
-				color: #333333;
-				letter-spacing: 0;
-				font-weight: 400;
-				line-height: 1.3;
-			}
-			.icon {
-				width: 32rpx;
-				height: 32rpx;
-			}
-			.location{
-				font-size: 26rpx;
-				color: #888888;
-				letter-spacing: 0;
-				text-align: left;
-				line-height: 32rpx;
-				font-weight: 400;
-				padding-left: 10rpx;
-			}
-		}
-	}
-	.see-more {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		padding-top: 20rpx;
-		background: #ffffff;
-		// border-top: 2rpx solid #dddddd;
-		// padding: 0rpx 32rpx;
-		font-size: 28rpx;
-		color: #007aff;
-		letter-spacing: 0;
-		text-align: center;
-		font-weight: 400;
-		.icon {
-			width: 24rpx;
-			height: 24rpx;
-		}
-	}
-	.button-area {
-	  width: 750rpx;
-	  padding: 0 32rpx;
-	  display: flex;
-	  flex-direction: row;
-	  align-items: center;
-	  // justify-content: space-between;
-	  .button {
-	    flex-grow: 0;
-	    flex-shrink: 0;
-	    display: flex;
-	    align-items: center;
-	    justify-content: center;
-	    border-radius: 10rpx;
-	    .text {
-	      font-size: 30rpx;
-	      font-weight: 500;
-	      text-align: center;
-	    }
-	  }
-	  .button__cancel {
-	    width: 270rpx;
-	    height: 88rpx;
-	    border: 2rpx solid #979797;
-	  }
-	  .button__submit {
-	    width: 100%;
-	    height: 88rpx;
-	    background: #007aff;
-	  }
-	}
+.wrapper {
+  background-color: #ffffff;
+  .time {
+    font-size: 26rpx;
+    color: #000000;
+    letter-spacing: 0;
+    font-weight: 400;
+  }
+  .tripItem {
+    margin-top: 20rpx;
+    // height: 140rpx;
+    padding: 20rpx 30rpx;
+    // height: 376rpx;
+    background: #f7f8fa;
+    border-radius: 8rpx;
+    .row {
+      display: flex;
+      flex-direction: row;
+      padding: 16rpx 0rpx;
+      .title {
+        flex: 0 0 140rpx;
+        font-size: 28rpx;
+        color: #888888;
+        letter-spacing: 0;
+        font-weight: 400;
+      }
+      .value {
+        display: flex;
+        align-items: center;
+        flex: 1;
+        font-size: 28rpx;
+        color: #333333;
+        letter-spacing: 0;
+        font-weight: 400;
+        line-height: 1.3;
+      }
+      .icon {
+        width: 32rpx;
+        height: 32rpx;
+      }
+      .location {
+        font-size: 26rpx;
+        color: #888888;
+        letter-spacing: 0;
+        text-align: left;
+        line-height: 32rpx;
+        font-weight: 400;
+        padding-left: 10rpx;
+      }
+    }
+  }
+  .see-more {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    padding-top: 20rpx;
+    background: #ffffff;
+    // border-top: 2rpx solid #dddddd;
+    // padding: 0rpx 32rpx;
+    font-size: 28rpx;
+    color: #007aff;
+    letter-spacing: 0;
+    text-align: center;
+    font-weight: 400;
+    .icon {
+      width: 24rpx;
+      height: 24rpx;
+    }
+  }
+  .button-area {
+    width: 750rpx;
+    padding: 0 32rpx;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    // justify-content: space-between;
+    .button {
+      flex-grow: 0;
+      flex-shrink: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 10rpx;
+      .text {
+        font-size: 30rpx;
+        font-weight: 500;
+        text-align: center;
+      }
+    }
+    .button__cancel {
+      width: 270rpx;
+      height: 88rpx;
+      border: 2rpx solid #979797;
+    }
+    .button__submit {
+      width: 100%;
+      height: 88rpx;
+      background: #007aff;
+    }
+  }
 }
-</style>
+</style>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index a3ac149..ac4482d 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -112,10 +112,10 @@
           <image class="icon" src="/static/imgs/mine/contract-icon.png"></image>
           <text class="label">合同管理</text>
         </view>
-        <view class="icon-item" @click="loginGo2('credit-management')">
+        <!-- <view class="icon-item" @click="loginGo2('credit-management')">
           <image class="icon" src="/static/imgs/mine/credit-icon.png"></image>
           <text class="label">征信管理</text>
-        </view>
+        </view> -->
         <view class="icon-item" @click="loginGo2('client-credit-list')">
           <image class="icon" src="/static/imgs/mine/credit-icon.png"></image>
           <text class="label">授信记录</text>