feat:询价历史、备注、我的个人中心卡片

components/add-inquiry-dialog/index.scss

@@ -49,12 +49,24 @@
 	.img_wrap{
 		display: flex;
 	}
+	.history_wrap{
+		max-height: 300rpx;
+		overflow: auto;
+		.title{
+			font-size: 26rpx;
+			color: #333;
+			white-space: nowrap;
+			flex-shrink: 0;
+		}
+	}
 	.price{
 		.u-input__content__field-wrapper__field{
 			font-size: 34rpx !important;
 			color: red !important;
 			font-weight: 600;
 		}
-		
 	}
+}
+::v-deep .u-cell__title-text{
+	width:max-content !important;
 }

components/add-inquiry-dialog/index.vue

@@ -25,8 +25,16 @@
             </view>
             <u--input v-if="editOrAdd === 'edit'" class="price" placeholder="价格" border="bottom" v-model="info.price"
                 clearable></u--input>
+            <u--input v-if="editOrAdd === 'edit'" placeholder="备注" border="bottom" v-model="info.remark"
+                clearable></u--input>
             <qiun-data-charts v-if="isShowChart" type="column" :chartData="chartData" canvasId="priceChart" :opts="opts" :ontouch="true"
                 width="700rpx" height="600rpx" backgroundColor="#fff" />
+            <view v-if="isShowHistory" class="history_wrap">
+                <view class="title">
+                    询价历史
+                </view>
+                <u-cell v-for="(item, index) in historyList" :key="index" :title="(index+1)+'. ￥'+item.price" :value="'备注：'+ (item.remark || '无') "></u-cell>
+            </view>
         </u-modal>
         <brandList ref="brandListRef" @selectedBrand="handleSelectedBrand"></brandList>
     </view>
@@ -73,6 +81,10 @@ export default {
         isShowChart: {
             type: Boolean,
             default: false
+        },
+        isShowHistory: {
+            type: Boolean,
+            default: false
         }
     },
     emits: ['submitSuccess'],
@@ -91,8 +103,10 @@ export default {
                 price: '',
                 dictLabel: '',
                 dictValue: '',
-                imgsUrl: []
+                imgsUrl: [],
+                remark: ''
             },
+            historyList: [],
             rules: {
                 brand: [
                     { required: true, message: '请输入品牌', trigger: 'blur' }
@@ -152,7 +166,6 @@ export default {
         initData() {
             this.$nextTick(() => {
                 this.info = JSON.parse(JSON.stringify(this.editInfo))
-                console.log(this.info)
                 if(this.isShowChart){
                     this.chartData = {
                         categories: this.info.priceChart.map((item, index) => item.userName),
@@ -164,6 +177,9 @@ export default {
                         ]
                     };
                 }
+                if(this.isShowHistory){
+                    this.historyList = JSON.parse(this.info.myPriceHistory)
+                }
                 this.showModal = true;
             })
         },
@@ -212,13 +228,13 @@ export default {
                 })
                 return
             }
-            if (this.info.imgsUrl.length == 0) {
-                uni.showToast({
-                    title: '请上传图片',
-                    icon: 'none'
-                })
-                return
-            }
+            // if (this.info.imgsUrl.length == 0) {
+            //     uni.showToast({
+            //         title: '请上传图片',
+            //         icon: 'none'
+            //     })
+            //     return
+            // }
             if (this.editOrAdd === 'edit' && !this.info.price) {
                 uni.showToast({
                     title: '请输入价格',
@@ -236,7 +252,8 @@ export default {
                 price: this.editOrAdd === 'edit' ? this.info.price : '',
                 imgsUrl: this.info.imgsUrl,
                 status: this.editOrAdd === 'edit' ? '2' : '1',
-                type: this.type
+                type: this.type,
+                remark: this.info.remark
             }
             uni.$u.api.addInquiry(data).then(res => {
                 uni.$u.toast('保存成功')

components/inquiry-verification-list/index.vue

@@ -36,7 +36,7 @@
             </view>
         </scroll-view>
 
-        <add-inquiry-dialog ref="addInquiryDialog" editOrAdd="edit" :editInfo="editInfo" :type="type" :title="type == '1' ? '询价' : '核价'" @submitSuccess="onRefresh" />
+        <add-inquiry-dialog ref="addInquiryDialog" editOrAdd="edit" :editInfo="editInfo" :isShowHistory="true" :type="type" :title="type == '1' ? '询价' : '核价'" @submitSuccess="onRefresh" />
     </view>
 </template>
 <script>

components/inquiry-verification-list/mixins/inquiryVerificationList.js

@@ -52,6 +52,7 @@ export default {
         handleClick(item) {
             this.editInfo = item;
             this.editInfo.price = item.myPrice
+            this.editInfo.remark = item.myRemark
             this.$nextTick(() => {
                 this.$refs.addInquiryDialog.showDialog();
             })

pages/clue/post/index.vue

@@ -77,7 +77,7 @@
 				<view>发单</view>
 			</view>
 		</view>
-		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :isShowChart="true" :isClue="true" :editOrAdd="editOrAdd" :editInfo="editInfo" title="询价" @cancel="handleInquiryCancel" :type="1"/>
+		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :isShowChart="isShowChart" :isClue="true" :editOrAdd="editOrAdd" :editInfo="editInfo" title="询价" @cancel="handleInquiryCancel" :type="1"/>
 		<!-- 最新跟进记录详情弹窗；关闭时记时间戳，避免蒙层点击冒泡触发详情跳转 -->
 		<u-popup :show="followPopupVisible" mode="bottom" round="16" @close="onFollowPopupClose"
 			:closeOnClickOverlay="true" @open="loadFollowList">
@@ -136,7 +136,8 @@ export default {
 			followLoading: false,
 			followListError: '',
 			currentFollowClue: null,
-			closedFollowPopupAt: 0
+			closedFollowPopupAt: 0,
+			isShowChart: false
 		}
 	},
 	methods: {
@@ -210,7 +211,7 @@ export default {
 		// 询价
 		async handleInquiry(item) {
 			this.clueId = item.id
-			if(Number(item.count) > 0){//count 默认是0，新增之后变为1，之后每编辑一次就会+1
+			if(Number(item.count) > 0 || Number(item.count) === 0){//null:未生成询价数据 0:已生成询价数据但是没有询过价 >0:询过价人数
 				const data = {
 					clueId: item.id,
 					type:1
@@ -220,12 +221,19 @@ export default {
 					if(res.code === 200){
 						this.$nextTick(()=>{
 							this.editInfo = res.data
+							if(Number(item.count) === 0){
+								this.isShowChart = false
+							}else{
+								this.isShowChart = true
+							}
 							this.$refs.inquiryDialog.showDialog()
 						})
 					}
 				})
-			}else if(!item.count){
+			}
+			else if(!item.count){
 				this.editOrAdd = 'add'
+				this.isShowChart = false
 				this.$refs.inquiryDialog.showDialog()
 			}
 		},

pages/person/cards/index.vue

@@ -1,27 +1,29 @@
 <template>
     <view class="person_cards_wrap">
         <view class="cards_container">
-            <!-- 今天消耗 -->
+            <view class="tab_container">
+                 <u-tabs :list="tabList" :current="currentTab" @change="changeTab" active-color="#2563eb" :is-scroll="false"></u-tabs>
+            </view>
             <view class="card_item today">
                 <view class="card_item_content">
                     <view class="card_header">
-                        <text class="card_title">抖音<br />今天消耗（元）</text>
+                        <text class="card_title">抖音<br />消耗（元）</text>
                     </view>
                     <view class="card_content">
-                        <text class="card_value">{{ formatMoney(cardData.todayConsumeDy) }}</text>
+                        <text class="card_value">{{ formatMoney(cardData.consumeDy) }}</text>
                     </view>
                 </view>
                 <view class="card_item_content">
                     <view class="card_header">
-                        <text class="card_title">广点通<br />今天消耗（元）</text>
+                        <text class="card_title">广点通<br />消耗（元）</text>
                     </view>
                     <view class="card_content">
-                        <text class="card_value">{{ formatMoney(cardData.todayConsumeGdt) }}</text>
+                        <text class="card_value">{{ formatMoney(cardData.consumeGdt) }}</text>
                     </view>
                 </view>
                 <view class="card_item_content">
                     <view class="card_header">
-                        <text class="card_title">今天业绩（元）</text>
+                        <text class="card_title">业绩（元）</text>
                     </view>
                     <view class="card_content">
                         <text class="card_value">{{ cardData.todayPerformance }}</text>
@@ -194,10 +196,25 @@ export default {
                 }
             },
             clueList: [],
+            currentTab: 0,
+            tabList: [{
+                name: '当日',
+                value: 'today'
+            }, {
+                name: '当周',
+                value: 'week'
+            }, {
+                name: '当月',
+                value: 'month'
+            }],
         };
     },
 
     methods: {
+        changeTab(val) {
+            this.currentTab = val.index;
+            this.getCardData();
+        },
         formatMoney(val) {
             if (val === null || val === undefined || val === '' || val === '-') return '-';
             const num = Number(val);
@@ -205,7 +222,11 @@ export default {
             return num.toFixed(2);
         },
         getCardData() {
-            uni.$u.api.getPersonCards({ userId: this.$store.state.user.userInfo.userId }).then(res => {
+            const time = this.tabList[this.currentTab].value;
+            uni.$u.api.getPersonCards({
+                userId: this.$store.state.user.userInfo.userId,
+                time: time
+            }).then(res => {
                 if (res.code === 200) {
                     this.cardData = res.data;
                 }

pages/person/cards/styles/index.scss

@@ -12,6 +12,11 @@
   flex-direction: column;
 }
 
+.tab_container{
+  width: 100%;
+  display: flex;
+  justify-content: right;
+}
 // 卡片基础样式
 .card_item {
   background-color: #ffffff;