feat:询价核价接口联调

components/add-inquiry-dialog/index.vue

@@ -130,6 +130,13 @@ export default {
                 })
                 return
             }
+            if(this.info.imgsUrl.length == 0){
+                uni.showToast({
+                    title: '请上传图片',
+                    icon: 'none'
+                })
+                return
+            }
             const data = {
                 clueId: this.clueId,
                 dictValue: this.info.dictValue,

components/brand-list/index.scss

@@ -26,8 +26,8 @@
                 align-items: center;
 
                 .brand_img {
-                    width: 100rpx;
-                    height: 100rpx;
+                    width: 160rpx;
+                    height: 80rpx;
                 }
 
                 .brand_name {
@@ -77,7 +77,7 @@
     gap: 20rpx;
     padding: 16rpx;
     border-bottom: 1rpx solid #f0eded;
-    img{
+    .brand_img{
         width: 160rpx;
         height: 80rpx;
     }

components/brand-list/index.vue

@@ -11,7 +11,7 @@
                 <u-search placeholder="搜索" v-model="keyword" @custom="handleSearch" @change="handleSearch"></u-search>
                 <view class="suggest_list">
                     <view class="brand_item" v-for="item in adviceList" :key="item.id" @click="handleBrandClick(item)">
-                        <img class="brand_img" :src="item.imgUrl ? item.imgUrl : '/static/no-img.png'" alt="">
+                        <image class="brand_img" :src="item.imgUrl ? item.imgUrl : '/static/no-img.png'" alt=""></image>
                         <view class="brand_name">{{ item.dictLabel }}</view>
                     </view>
                 </view>
@@ -26,7 +26,7 @@
                         <u-index-anchor :text="indexList[index]"></u-index-anchor>
                         <!-- #endif -->
                         <view class="list-cell" v-for="cell in item" :key="cell.dictValue" @click="handleBrandClick(cell)">
-                            <img :src="cell.imgUrl ? cell.imgUrl : '/static/no-img.png'" alt="">
+                            <image class="brand_img" :src="cell.imgUrl ? cell.imgUrl : '/static/no-img.png'" alt=""></image>
                             {{ cell.dictLabel }}
                         </view>
                     </u-index-item>
@@ -82,7 +82,7 @@ export default {
             this.$getDicts('crm_form_brand').then(res => {
                 this.filterData(res)
                 this.list = res
-                this.adviceList = res.filter(item => item.remark == 'R')
+                this.adviceList = res.filter(item => item.recommend)
             })
         },
         filterData(res){

components/imgs-row-scroll/index.scss

@@ -1,4 +1,6 @@
 .imgs-row-scroll {
+	width: 100%;
+    overflow: auto;
 	::v-deep .uni-scroll-view {
 		height: 100% !important;
 	}

components/inquiry-verification-list/index.vue

@@ -10,8 +10,7 @@
                         <text class="desc">{{ type == '1' ? '意向' : item.model }}</text>
                     </view>
                     <view class="top_right">
-                        <text :class="['status', type == '1' ? 'inquiry' : 'verification']">{{
-                            formtterStatus(item.status) }}</text>
+                        <u-tag plain plainFill :text="formtterStatus(item.status)" :type="item.status == '1' ? 'warning' : item.status == '2' ? 'primary' : 'success'"></u-tag>
                     </view>
                 </view>
                 <view class="imgs">
@@ -25,7 +24,7 @@
                     </view>
                     <view class="bottom">
                         <u-icon name="clock" size="16" color="#9ca3af"></u-icon>
-                        <text class="time">{{ item.date }}</text>
+                        <text class="time">{{ item.updateTime }}</text>
                     </view>
                 </view>
             </view>

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

@@ -43,14 +43,18 @@ export default {
         formtterStatus(status) {
             switch (status) {
                 case '1':
-                    return this.type == '1' ? '待询价' : '待核价';
+                    return '待询价'
                 case '2':
-                    return this.type == '1' ? '询价完成' : '核价完成';
+                    return '待核价'//待核价=询价完成
+                case '3':
+                    return '核价完成'
             }
         },
         handleClick(item) {
             this.editInfo = item;
-            this.$refs.addInquiryDialog.showDialog();
+            this.$nextTick(() => {
+                this.$refs.addInquiryDialog.showDialog();
+            })
         },
         handleInquirySuccess() {
             this.$refs.addInquiryDialog.closeDialog();

components/inquiry-verification-list/styles/index.scss

@@ -46,26 +46,6 @@
                     display: flex;
                     flex-direction: column;
                     justify-content: flex-end;
-
-                    .status {
-                        font-size: 24rpx;
-                        padding: 6rpx 12rpx;
-                        border-radius: 12rpx;
-                        border: 2rpx solid #2563eb;
-                        font-weight: 600;
-                    }
-
-                    .inquiry {
-                        color: #2563eb;
-                        background-color: #eff6ff;
-                        border-color: #dceafe;
-                    }
-
-                    .verification {
-                        color: #ed590e;
-                        background-color: #fff7ed;
-                        border-color: #fff2e2;
-                    }
                 }
 
             }

pages/person/cards/index.vue

@@ -23,7 +23,7 @@
             <!-- 条数统计 -->
             <view class="card_item card_item_full">
                 <view class="card_header count">
-                    <img src="../../../static/icons/statistics.png" alt="" width="16px" height="16px">
+                    <image class="count_icon" src="../../../static/icons/statistics.png" alt=""></image>
                     <text class="card_title">条数统计</text>
                 </view>
                 <view class="card_content">
@@ -74,7 +74,7 @@
                     <view class="ranking_stats">
                         <view class="ranking_info">
                             <view class="ranking_icon">
-                                <img src="../../../static/icons/trophy.png" alt="" width="16px" height="16px">
+                                <image class="ranking_icon_img" src="../../../static/icons/trophy.png" alt=""></image>
                             </view>
                             <view class="ranking_info_text">
                                 <text class="card_title">当前排名</text>
@@ -98,7 +98,7 @@
             <!-- 折线图 -->
             <view class="card_item">
                 <view class="chart_header">
-                    <img src="../../../static/icons/line.png" alt="" width="16px" height="16px">
+                    <image class="chart_icon" src="../../../static/icons/line.png" alt=""></image>
                     <text class="card_title">近7天排名折线图</text>
                 </view>
                 <view class="charts_box">

pages/person/cards/styles/index.scss

@@ -56,6 +56,10 @@
       font-weight: 600;
       color: #333333;
     }
+    .count_icon{
+      width: 30rpx;
+      height: 30rpx;
+    }
   }
   
   // 卡片内容样式
@@ -150,6 +154,10 @@
       justify-content: center;
       align-items: center;
       margin-right: 20rpx;
+      .ranking_icon_img{
+        width: 30rpx;
+        height: 30rpx;
+      }
     }
     .ranking_info {
       display: flex;
@@ -214,6 +222,10 @@
     font-weight: 600;
     display: flex;
     align-items: center;
+    .chart_icon{
+      width: 40rpx;
+      height: 40rpx;
+    }
     .card_title{
       margin-left: 10rpx;
     }

pages/setting/index.vue

@@ -71,9 +71,9 @@
 			},
 			confirm() {
 				// 停止电话监听
-				this.$store.dispatch("call/stopPhoneListener").catch(error => {
-					console.error('退出登录时停止电话监听失败:', error);
-				});
+				// this.$store.dispatch("call/stopPhoneListener").catch(error => {
+				// 	console.error('退出登录时停止电话监听失败:', error);
+				// });
 				
 				this.$store.dispatch("user/logout").then(()=>{
 					uni.$u.toast("退出成功");

pages/wareHouse/components/detail.vue

@@ -190,7 +190,7 @@
                 <text class="bar_text">{{ lockStatus === '1' ? '解锁' : '锁单' }}</text>
             </view>
             <view class="bar_item">
-                <img src="../../../static//icons/print.png" alt="" width="20px" height="20px">
+                <image class="bar_icon" src="../../../static//icons/print.png" alt=""></image>
                 <text class="bar_text">打印</text>
             </view>
             <view :class="['bar_item', { 'disabled': lockStatus === '1' }]" @click="handleOpenOrder">

pages/wareHouse/components/fakeRegistration.vue

@@ -25,7 +25,7 @@
           </template>
           <template #cell-phone="{ row, rowIndex }">
             <view v-double-tap="() => editCell(row, rowIndex)"">
-            <u--input v-if="row.edit" border="surround" v-model="row.phone"></u--input>
+            <u--input v-if="row.edit" border="surround" v-model="row.phone" type="number"></u--input>
               <view v-else>{{ row.phone }}</view>
             </view>
           </template>
@@ -110,6 +110,8 @@ export default {
               this.$set(this.tableData[0], 'edit', false)
               this.isAdd = false
               uni.$u.toast('新增成功')
+              this.pageNum = 1
+              this.getWareHouseFakeList()
             }
           })
         }
@@ -121,6 +123,7 @@ export default {
               this.$set(this.tableData[this.editIndex], 'edit', false)
               this.isEdit = false
               uni.$u.toast('编辑成功')
+              this.getWareHouseFakeList()
             }
           })
         }
@@ -135,10 +138,22 @@ export default {
         uni.$u.toast('请输入身份证号')
         return false
       }
+      // 身份证号正则校验
+      const idCardRegex = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+      if (!idCardRegex.test(row.idCard)) {
+        uni.$u.toast('请输入有效的身份证号')
+        return false
+      }
       if (row.phone == '') {
         uni.$u.toast('请输入电话')
         return false
       }
+      // 电话号码正则校验
+      const phoneRegex = /^1[3-9]\d{9}$/
+      if (!phoneRegex.test(row.phone)) {
+        uni.$u.toast('请输入有效的电话号码')
+        return false
+      }
       if (row.itemName == '') {
         uni.$u.toast('请输入物品')
         return false

pages/wareHouse/components/openOrder.vue

@@ -3,7 +3,7 @@
       <u-navbar class="nav-bar" title="销售业务开单" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
       <view class="open_order_content">
          <view class="header">
-            <img :src="openOrderForm.url" alt="">
+            <image class="header_img" :src="openOrderForm.url" alt=""></image>
             <view class="header_box">
                <view class="title">
                   {{ openOrderForm.dictLabel }} | {{ openOrderForm.model }}

pages/wareHouse/index.vue

@@ -73,21 +73,21 @@
 							<view class="price-items">
 								<view class="price-item">
 									<text class="price-type">成本价</text>
-									<text class="price">¥{{ priceVisible ? goods.costPrice : '****' }}</text>
+									<text class="price">¥{{ priceVisible ? goods.costPrice || '-' : '****' }}</text>
 								</view>
 								<view class="price-item">
 									<text class="price-type">销售价</text>
-									<text class="price sales">¥{{ priceVisible ? goods.salesPrice : '****' }}</text>
+									<text class="price sales">¥{{ priceVisible ? goods.salesPrice || '-' : '****' }}</text>
 								</view>
 							</view>
 							<view class="price-items">
 								<view class="price-item">
 									<text class="price-type">同行价</text>
-									<text class="price">¥{{ priceVisible ? goods.peerPrice : '****' }}</text>
+									<text class="price">¥{{ priceVisible ? goods.peerPrice || '-' : '****' }}</text>
 								</view>
 								<view class="price-item">
 									<text class="price-type">代理价</text>
-									<text class="price">¥{{ priceVisible ? goods.agentPrice : '****' }}</text>
+									<text class="price">¥{{ priceVisible ? goods.agentPrice || '-' : '****' }}</text>
 								</view>
 							</view>
 						</view>
@@ -257,7 +257,6 @@ export default {
 			});
 		},
 		handleAdd() {
-			console.log("点击添加按钮");
 			uni.navigateTo({
 				url: `/pages/wareHouse/components/add`
 			});
@@ -287,10 +286,11 @@ export default {
 			});
 		},
 	},
-	mounted() {
-		this.getCard();
+	onShow() {
+		this.pageNum = 1;
 		this.getList();
-	}
+		this.getCard();
+	},
 };
 </script>
 

pages/wareHouse/styles/detail.scss

@@ -154,6 +154,11 @@
                 cursor: not-allowed;
                 opacity: 0.5;
             }
+
+            .bar_icon{
+                width: 40rpx;
+                height: 40rpx;
+            }
         }
     }
     

pages/wareHouse/styles/openOrder.scss

@@ -10,7 +10,7 @@
             border-radius: 20rpx;
             margin: 20rpx;
 
-            img {
+            .header_img {
                 width: 150rpx;
                 height: 150rpx;
                 border-radius: 20rpx;

store/modules/user.js

@@ -28,8 +28,8 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			// ip: "https://crm.nanjingshiyu.com/prod-api", // ip
-			ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			ip: "https://crm.nanjingshiyu.com/prod-api", // ip
+			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip