From 3c819cfaa61fbdc3ff6796046dd2ca25e533a655 Mon Sep 17 00:00:00 2001
From: buffeyu <yeqingyu@dimine.net>
Date: Wed, 19 Jan 2022 09:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/add-record/index.vue                |   3 +-
 pages/client-detail/base-paper-deals.vue  | 479 +++++++++++-----------
 pages/client-detail/basic-information.vue |   6 +-
 pages/follow-up-records/index.vue         |   2 +-
 pages/mall/index.vue                      |   6 +-
 pages/trade/index.vue                     |  28 +-
 6 files changed, 267 insertions(+), 257 deletions(-)

diff --git a/pages/add-record/index.vue b/pages/add-record/index.vue
index 9330e75..36a30ef 100644
--- a/pages/add-record/index.vue
+++ b/pages/add-record/index.vue
@@ -41,7 +41,7 @@
 			</view>
 			<view class="">
 				<view class="paper-price-image-title">
-					<text class="add-paper-start"><uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons></text>
+					<!-- <text class="add-paper-start"><uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons></text> -->
 					<text class="add-paper-title">备注信息</text>
 				</view>
 				<view class="paper-price-image">
@@ -72,7 +72,6 @@ import qnHeader from '@/components/qn-header/qn-header.vue'
 import { createVisitRecord } from '@/apis/followUpRecords.js'
 const validateFields = [
 	'content',
-	'remark',
 	'respondent'
 ]
 export default {
diff --git a/pages/client-detail/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue
index 71467c6..07a2252 100644
--- a/pages/client-detail/base-paper-deals.vue
+++ b/pages/client-detail/base-paper-deals.vue
@@ -1,52 +1,50 @@
 <template>
-  <view class="warpper">
-    <scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
-      <view class="sum-box">
-        <view class="">
-          <view class="title">交易金额</view>
-          <view class="value">{{ topInfo.tradingVolume }}</view>
-        </view>
-        <view class="">
-          <view class="title">总交易量(吨)</view>
-          <view class="value">{{ topInfo.volumeOfBusiness }}</view>
-        </view>
-      </view>
-      <uGap></uGap>
-      <view class="card-box" v-for="(item, index) in list" :key="index">
-        <view class="header">
-          <view class="left-title">{{ item.customerEnterpriseName }}</view>
-          <view class="right-title">¥ {{ item.totalOfferPrice }}</view>
-        </view>
-        <view class="content" v-for="(subItem, subIndex) in item.supplierOrderList[0].orderItems" :key="subIndex">
-          <!-- <image class="image" :src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image> -->
-          <image class="image" :src="subItem.productImg" mode=""></image>
-          <view class="">
-            <view class="title">{{ subItem.productName }}</view>
-            <view class="desc">
-              {{ subItem.brandName }}/{{ subItem.categoryName }}/{{ subItem.gramWeight }}g/{{ subItem.length }}*{{ subItem.width }}/{{
-                subItem.pieceQuantity
-              }}张
-            </view>
-          </view>
-        </view>
-        <!-- <view class="content">
+	<view class="warpper">
+		<view class="sum-box">
+			<view class="">
+				<view class="title">交易金额</view>
+				<view class="value">{{ topInfo.tradingVolume }}</view>
+			</view>
+			<view class="">
+				<view class="title">总交易量(吨)</view>
+				<view class="value">{{ topInfo.volumeOfBusiness }}</view>
+			</view>
+		</view>
+		<uGap></uGap>
+		<scroll-list ref="list" :option="option" @load="upCallback" @refresh="downCallback" style="background-color: #ffffff">
+			<view class="card-box" v-for="(item, index) in list" :key="index">
+				<view class="header">
+					<view class="left-title">{{ item.customerEnterpriseName }}</view>
+					<view class="right-title">¥ {{ item.totalOfferPrice }}</view>
+				</view>
+				<view class="content" v-for="(subItem, subIndex) in item.supplierOrderList[0].orderItems" :key="subIndex">
+					<!-- <image class="image" :src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image> -->
+					<image class="image" :src="subItem.productImg" mode=""></image>
+					<view class="">
+						<view class="title">{{ subItem.productName }}</view>
+						<view class="desc">
+							{{ subItem.brandName }}/{{ subItem.categoryName }}/{{ subItem.gramWeight }}g/{{ subItem.length }}*{{ subItem.width }}/{{ subItem.pieceQuantity }}张
+						</view>
+					</view>
+				</view>
+				<!-- <view class="content">
 					<image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif" mode=""></image>
 					<view class="">
 						<view class="title">丽盈白卡</view>
 						<view class="desc">白卡纸/丽盈/350g/787*1092/2200张</view>
 					</view>
 				</view> -->
-        <view class="other">
-          <view class="time">{{ item.createTime }}</view>
-          <view class="btn">
-            更多详情
-            <image class="icon" src="/static/imgs/client-detail/arrow-right-icon.png"></image>
-          </view>
-        </view>
-        <uGap></uGap>
-      </view>
-    </scroll-list>
-  </view>
+				<view class="other">
+					<view class="time">{{ item.createTime }}</view>
+					<view class="btn">
+						更多详情
+						<image class="icon" src="/static/imgs/client-detail/arrow-right-icon.png"></image>
+					</view>
+				</view>
+				<uGap></uGap>
+			</view>
+		</scroll-list>
+	</view>
 </template>
 
 <script>
@@ -54,208 +52,209 @@ import uGap from '@/components/u-gap/u-gap.vue'
 import { getBasePaperDeals, getOrderVolumeStatistics } from '@/apis/clientDetailApi.js'
 
 export default {
-  components: { uGap },
-  data() {
-    return {
-      option: {
-        size: 10,
-        auto: true,
-        emptyText: '暂无数据~',
-        background: '#F7F8FA',
-        disabled: false
-      },
-      params: {
-        asc: '',
-        desc: '',
-        customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效
-        mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id
-        // customerEnterpriseId: '651107734133018624', // 客户企业ID
-        // mallSupplierId: '670334117090562048', // 供应商id
-        status: '0', // 状态 0 全部 待发货/30106,待收货/30107,待借款/30207,已完成/30104
-        enterpriseIds: [] //企业ID集合网关获取
-      },
-      pagination: {
-        pageNum: 0, // 初始会执行一次下拉加载
-        pageSize: 10
-      },
-      orderParams: {
-        beginDate: '',
-        // currentSupplier: '670334117090562048',
-        currentSupplier: this.$store.state.supplierInfo.supplierId || null,
-        endDate: ''
-      },
-      list: [],
-      topInfo: {}
-    }
-  },
-  onLoad() {},
-  methods: {
-    // 顶部统计数据
-    getOrderVolumeStatistics() {
-      getOrderVolumeStatistics(this.orderParams).then((res) => {
-        // console.log('原纸交易顶部统计数据', res)
-        this.topInfo = res
-      })
-    },
-    getList() {
-      this.getOrderVolumeStatistics()
-      return new Promise((resolve, reject) => {
-        getBasePaperDeals({ ...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)
-          })
-      })
-    },
-    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: { uGap },
+	data() {
+		return {
+			option: {
+				size: 10,
+				auto: true,
+				emptyText: '暂无数据~',
+				background: '#F7F8FA',
+				disabled: false
+			},
+			params: {
+				asc: '',
+				desc: '',
+				customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效
+				mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id
+				// customerEnterpriseId: '651107734133018624', // 客户企业ID
+				// mallSupplierId: '670334117090562048', // 供应商id
+				status: '0', // 状态 0 全部 待发货/30106,待收货/30107,待借款/30207,已完成/30104
+				enterpriseIds: [] //企业ID集合网关获取
+			},
+			pagination: {
+				pageNum: 0, // 初始会执行一次下拉加载
+				pageSize: 10
+			},
+			orderParams: {
+				beginDate: '',
+				// currentSupplier: '670334117090562048',
+				currentSupplier: this.$store.state.supplierInfo.supplierId || null,
+				endDate: ''
+			},
+			list: [],
+			topInfo: {}
+		}
+	},
+	created() {
+		this.getOrderVolumeStatistics()
+	},
+	methods: {
+		// 顶部统计数据
+		getOrderVolumeStatistics() {
+			getOrderVolumeStatistics(this.orderParams).then(res => {
+				console.log('原纸交易顶部统计数据', res)
+				this.topInfo = res
+			})
+		},
+		getList() {
+			return new Promise((resolve, reject) => {
+				getBasePaperDeals({ ...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)
+					})
+			})
+		},
+		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 {
-  width: 750rpx;
-  .sum-box {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    align-items: center;
-    // text-align: center;
-    height: 184rpx;
-    background: url('/static/imgs/client-detail/yzjy-icon.png') no-repeat;
-    background-size: 100%;
-    .title {
-      font-size: 26rpx;
-      color: #ffffff;
-      letter-spacing: 0;
-      font-weight: 500;
-    }
-    .value {
-      font-size: 56rpx;
-      color: #ffffff;
-      letter-spacing: 0;
-      text-align: left;
-      font-weight: 500;
-      margin-top: 16rpx;
-    }
-  }
-  .card-box {
-    .header {
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
-      align-items: center;
-      height: 88rpx;
-      background: #ffffff;
-      border-bottom: 2rpx solid #dddddd;
-      padding: 0rpx 32rpx;
-      .left-title {
-        font-size: 30rpx;
-        color: #000000;
-        letter-spacing: 0;
-        font-weight: 600;
-      }
-      .right-title {
-        font-size: 30rpx;
-        color: #ff5368;
-        letter-spacing: 0;
-        text-align: right;
-        font-weight: 500;
-      }
-    }
-    .content {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      height: 148rpx;
-      background: #ffffff;
-      border-bottom: 2rpx solid #dddddd;
-      padding: 0rpx 32rpx;
-      .image {
-        width: 100rpx;
-        height: 100rpx;
-        flex: 0 0 100rpx;
-        margin-right: 20rpx;
-      }
-      .title {
-        font-size: 30rpx;
-        color: #333333;
-        letter-spacing: 0;
-        text-align: left;
-        font-weight: 400;
-      }
-      .desc {
-        padding-top: 26rpx;
-        font-size: 26rpx;
-        color: #888888;
-        letter-spacing: 0;
-        text-align: left;
-        font-weight: 400;
-      }
-    }
-    .other {
-      display: flex;
-      flex-direction: row;
-      justify-content: space-between;
-      align-items: center;
-      height: 80rpx;
-      background: #ffffff;
-      padding: 0rpx 32rpx;
-      .time {
-        font-size: 26rpx;
-        color: #888888;
-        letter-spacing: 0;
-        text-align: left;
-        font-weight: 400;
-      }
-      .btn {
-        font-size: 28rpx;
-        color: #007aff;
-        letter-spacing: 0;
-        text-align: center;
-        font-weight: 500;
-        display: flex;
-        align-items: center;
-      }
-      .icon {
-        width: 24rpx;
-        height: 24rpx;
-        margin-left: 6rpx;
-      }
-    }
-  }
+	width: 750rpx;
+	.sum-box {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-around;
+		align-items: center;
+		// text-align: center;
+		height: 184rpx;
+		background: url('/static/imgs/client-detail/yzjy-icon.png') no-repeat;
+		background-size: 100%;
+		.title {
+			font-size: 26rpx;
+			color: #ffffff;
+			letter-spacing: 0;
+			font-weight: 500;
+		}
+		.value {
+			font-size: 56rpx;
+			color: #ffffff;
+			letter-spacing: 0;
+			text-align: left;
+			font-weight: 500;
+			margin-top: 16rpx;
+		}
+	}
+	.card-box {
+		.header {
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+			align-items: center;
+			height: 88rpx;
+			background: #ffffff;
+			border-bottom: 2rpx solid #dddddd;
+			padding: 0rpx 32rpx;
+			.left-title {
+				font-size: 30rpx;
+				color: #000000;
+				letter-spacing: 0;
+				font-weight: 600;
+			}
+			.right-title {
+				font-size: 30rpx;
+				color: #ff5368;
+				letter-spacing: 0;
+				text-align: right;
+				font-weight: 500;
+			}
+		}
+		.content {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			height: 148rpx;
+			background: #ffffff;
+			border-bottom: 2rpx solid #dddddd;
+			padding: 0rpx 32rpx;
+			.image {
+				width: 100rpx;
+				height: 100rpx;
+				flex: 0 0 100rpx;
+				margin-right: 20rpx;
+			}
+			.title {
+				font-size: 30rpx;
+				color: #333333;
+				letter-spacing: 0;
+				text-align: left;
+				font-weight: 400;
+			}
+			.desc {
+				padding-top: 26rpx;
+				font-size: 26rpx;
+				color: #888888;
+				letter-spacing: 0;
+				text-align: left;
+				font-weight: 400;
+			}
+		}
+		.other {
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+			align-items: center;
+			height: 80rpx;
+			background: #ffffff;
+			padding: 0rpx 32rpx;
+			.time {
+				font-size: 26rpx;
+				color: #888888;
+				letter-spacing: 0;
+				text-align: left;
+				font-weight: 400;
+			}
+			.btn {
+				font-size: 28rpx;
+				color: #007aff;
+				letter-spacing: 0;
+				text-align: center;
+				font-weight: 500;
+				display: flex;
+				align-items: center;
+			}
+			.icon {
+				width: 24rpx;
+				height: 24rpx;
+				margin-left: 6rpx;
+			}
+		}
+	}
 }
 </style>
diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue
index 1fbe9a0..8a62c02 100644
--- a/pages/client-detail/basic-information.vue
+++ b/pages/client-detail/basic-information.vue
@@ -59,7 +59,7 @@
 						</view>
 						<view class="row">
 							<view class="info-title"><text>营业执照：</text></view>
-							<view class="look-over" @tap="previewImg(info.businessLicenseImg, [info.businessLicenseImg])"><text>点击查看</text></view>
+							<view class="look-over" v-if="info.businessLicenseImg !== null" @tap="previewImg(info.businessLicenseImg, [info.businessLicenseImg])"><text>点击查看</text></view>
 						</view>
 						<view class="row">
 							<view class="info-title"><text>所属行业：</text></view>
@@ -90,11 +90,11 @@
 						<view class="row">
 							<view class="left">
 								<view class="title"><text>产房照片：</text></view>
-								<view class="look-over" @tap="previewImg(info.factoryImgList[0], info.factoryImgList)"><text>点击查看</text></view>
+								<view class="look-over" v-if="info.factoryImgList !== null" @tap="previewImg(info.factoryImgList[0], info.factoryImgList)"><text>点击查看</text></view>
 							</view>
 							<view class="right">
 								<view class="title"><text>租赁合同：</text></view>
-								<view class="look-over" @tap="previewImg(info.leaseContract, [info.leaseContract])"><text>点击查看</text></view>
+								<view class="look-over"  v-if="info.leaseContract !== null" @tap="previewImg(info.leaseContract, [info.leaseContract])"><text>点击查看</text></view>
 							</view>
 						</view>
 					</view>
diff --git a/pages/follow-up-records/index.vue b/pages/follow-up-records/index.vue
index 62e023b..8fe2f22 100644
--- a/pages/follow-up-records/index.vue
+++ b/pages/follow-up-records/index.vue
@@ -77,7 +77,7 @@ export default {
 			params: {
 				asc: '',
 				desc: '',
-				enterpriseIds : [this.$store.state.supplierInfo.id],
+				customerEnterpriseId  : [this.$store.state.supplierInfo.id],
 				mallSupplierId : this.$store.state.supplierInfo.supplierId || null,
 				// enterpriseIds : ['651107734133018624'],
 				// mallSupplierId : '670334117090562048',
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 80d9639..1df8007 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -55,7 +55,7 @@
 
 <script>
 import uGap from '@/components/u-gap/u-gap.vue'
-import { back, go2 } from '@/utils/hook.js'
+import { back, go2, loginG2 } from '@/utils/hook.js'
 import { SupplierList,productStatus } from '@/apis/add-paper.js'
 export default {
 	components: { uGap },
@@ -112,7 +112,6 @@ export default {
 			})
 		},
 		downCallback() {
-			return
 			this.orderPagination.pageNum = 1
 			this.quertData()
 				.then(({ list, total }) => {
@@ -123,7 +122,6 @@ export default {
 				})
 		},
 		upCallback() {
-			return
 			this.orderPagination.pageNum++
 			this.quertData()
 				.then(({ list, total }) => {
@@ -157,7 +155,7 @@ export default {
 		},
 		// 详情点击事件
 		detailInfo(){
-			go2('paper-detail')
+			loginGo2('paper-detail')
 		},
 		// 上下架事件
 		productStatusChange(item){
diff --git a/pages/trade/index.vue b/pages/trade/index.vue
index bbdf05c..ac043a7 100644
--- a/pages/trade/index.vue
+++ b/pages/trade/index.vue
@@ -1,6 +1,18 @@
 <template>
 	<view class="trade-index">
-		<view class="top-bar">
+		<uni-nav-bar>
+			<view  class="left-title">
+				<view v-if="mainKey === '0'" class="text-view"><text class="title">交易大厅</text></view>
+				<view v-if="mainKey === '1'">
+					<view class="bar-contant">
+						<view class="check-control title-left36" :class="current === '0' ? 'check-title' : 'oncheck-title'" @click="controlChange('0')"><text>报价</text></view>
+						<view class="check-control title-left" :class="current === '1' ? 'check-title' : 'oncheck-title'" @click="controlChange('1')"><text>订单</text></view>
+					</view>
+				</view>
+		
+			</view>
+		</uni-nav-bar>
+		<!-- <view class="top-bar">
 			<view v-if="mainKey === '0'" class="text-view"><text class="title">交易大厅</text></view>
 			<view v-if="mainKey === '1'">
 				<view class="bar-contant">
@@ -8,7 +20,7 @@
 					<view class="check-control title-left" :class="current === '1' ? 'check-title' : 'oncheck-title'" @click="controlChange('1')"><text>订单</text></view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="" v-if="mainKey === '0'"><not-logged @loginChange="loginChange()"></not-logged></view>
 		<view class="" v-if="mainKey === '1'">
 			<view class="content">
@@ -66,6 +78,10 @@ export default {
 
 <style lang="scss">
 .trade-index {
+	.left-title {
+		position: relative;
+		left: -100rpx;
+	}
 	.top-bar {
 		background-color: rgb(255, 255, 255);
 		border-bottom-width: 2rpx;
@@ -87,29 +103,27 @@ export default {
 		display: flex;
 	}
 	.check-title {
-		font-family: PingFangSC-Medium;
 		font-size: 40rpx;
 		color: #000000;
-		letter-spacing: 0;
+		// letter-spacing: 0;
 		font-weight: 550;
 		border-bottom: 4rpx solid #007aff;
 	}
 	.oncheck-title {
-		font-family: PingFangSC-Regular;
 		font-size: 32rpx;
 		color: #555555;
 		font-weight: 550;
 	}
 	.check-control {
 		line-height: 70rpx;
-		// width: 40px;
+		width: 80rpx;
 		text-align: center;
 	}
 	.title-left {
 		margin-left: 24rpx;
 	}
 	.title-left36 {
-		margin-left: 36rpx;
+		// margin-left: 36rpx;
 	}
 }
 </style>