Merge branch 'master' of http://106.52.242.177:3000/askqvn/crm-app

manifest.json

@@ -2,7 +2,7 @@
     "name" : "小葫芦",
     "appid" : "__UNI__DDAE2E0",
     "description" : "",
-    "versionName" : "1.2.6",
+    "versionName" : "1.2.7",
     "versionCode" : 123,
     "transformPx" : false,
     "app-plus" : {

pages/orderDetailRefactored/components/PageFour.vue

@@ -148,7 +148,7 @@
         </u-row>
 
         <!-- 是否入库 -->
-        <u-row class="info-row">
+        <!-- <u-row class="info-row">
           <u-col span="12">
             <view @tap="selectIsWarehouse">
               <u-form-item label="是否入库" prop="isWarehouse">
@@ -160,7 +160,7 @@
                 @confirm="handleConfirmIsWarehouse" @cancel="showIsWarehousePicker = false" />
             </view>
           </u-col>
-        </u-row>
+        </u-row> -->
 
         <!-- 收单备注 -->
         <u-row class="info-row">
@@ -243,13 +243,22 @@
       </view>
     </view>
 
-    <!-- 确认入库按钮 -->
+    <!-- 确认收单、确认入库按钮 -->
     <view class="confirm-button-container">
-      <u-button class="next-btn" type="success" @click="confirmWarehouseEntry">
-        <u-icon name="checkmark-circle-fill" size="28rpx" color="#fff" />
-        <text style="margin-left: 8rpx;" v-show="isWarehouse == '2'">确认收单</text>
-        <text style="margin-left: 8rpx;" v-show="isWarehouse == '1'">确认收单并入库</text>
-      </u-button>
+      <u-row gutter="24">
+        <u-col span="6">
+          <u-button class="next-btn" type="success" @click="confirmReceiveOrder">
+            <u-icon name="checkmark-circle-fill" size="28rpx" color="#fff" />
+            <text style="margin-left: 8rpx;">确认收单</text>
+          </u-button>
+        </u-col>
+        <u-col span="6">
+          <u-button class="next-btn" type="success" @click="confirmWarehouseEntry">
+            <u-icon name="checkmark-circle-fill" size="28rpx" color="#fff" />
+            <text style="margin-left: 8rpx;">确认入库</text>
+          </u-button>
+        </u-col>
+      </u-row>
     </view>
 
     <!-- 组织选择器 -->
@@ -723,12 +732,12 @@ export default {
     },
 
     /**
-     * 确认入库
+     * 确认收单
      */
-    async confirmWarehouseEntry() {
+    async confirmReceiveOrder() {
       uni.showModal({
-        title: '确认入库',
-        content: `是否确认入库该订单：${this.orderDetail.item}？`,
+        title: '确认收单',
+        content: `是否确认收单该订单：${this.orderDetail.item}？`,
         success: async (res) => {
           if (res.confirm) {
             try {
@@ -762,11 +771,95 @@ export default {
               // 上传分成数据
               await this.addShare()
 
-              //新增仓库或者编辑仓库
-              //等于1的时候放入仓库表
-              if (this.isWarehouse == '1') {
-                // 获取品牌ID
-                const brandObj = this.brandList.find(item => item.dictLabel === this.currentReceipt.brand)
+              // //新增仓库或者编辑仓库
+              // //等于1的时候放入仓库表
+              // if (this.isWarehouse == '1') {
+              //   // 获取品牌ID
+              //   const brandObj = this.brandList.find(item => item.dictLabel === this.currentReceipt.brand)
+              //   const brandId = brandObj ? brandObj.dictValue : ''
+
+              //   //建立入库data
+              //   // 获取 PageThree 的高清实物图的 fileUrl 数组
+              //   // 直接使用 imageUpload 获取图片列表，与 PageThree 保持一致
+              //   let goodPicFileUrls = []
+              //   if (this.currentReceipt.id && this.orderDetail.itemBrand) {
+              //     try {
+              //       const list = await imageUpload.getFileList(
+              //         '2',
+              //         '3',
+              //         this.currentReceipt.id,
+              //         this.orderDetail.itemBrand,
+              //         this.currentReceipt.clueId
+              //       )
+              //       // 获取前6个图片的 fileUrl（与 PageThree 的 displayImages 保持一致）
+              //       // goodPicFileUrls = (list || []).slice(0, 6).map(item => item.fileUrl).filter(url => url)
+              //       goodPicFileUrls = (list || []).map(item => item.fileUrl).filter(url => url)
+              //     } catch (error) {
+              //       console.error('获取高清实物图失败:', error)
+              //     }
+              //   }
+                
+              //   const warehouseData = {
+              //     goodPicFileList: goodPicFileUrls,//商品图片 page3的高清实物图的url数组
+              //     type: this.warehouseInfo.category || '',//商品分类 
+              //     dictLabel: this.currentReceipt.brand || '',//品牌名称 
+              //     dictValue: brandId || '',//品牌id 
+              //     indentifyCode:this.warehouseInfo.codeStorage|| '',//独立编码
+              //     costPrice: this.computedTotalCost || '',//总成本价
+              //     recycleTime: dayjs().format('YYYY-MM-DD'),//回收时间 必填
+              //     stockStatus:0,//库存状态，0待入库，1已入库，因为是我们是预入库，所以是0
+              //     origin:this.orderDetail.website//来源
+              //   }
+              //   if (!this.currentReceipt.warehouseId) {
+              //     //当没有仓库id的时候调用新增仓库接口
+              //     await uni.$u.api.wareHouseAdd(warehouseData)
+              //   } else {
+              //     //当有仓库id的时候调用编辑仓库接口
+              //     warehouseData.id = this.currentReceipt.warehouseId
+              //     await uni.$u.api.wareHouseUpdate(warehouseData)
+              //   }
+              // } else if (this.isWarehouse == '2') {
+              //   //等于2的时候不放入仓库表
+              // }
+
+              this.$refs.uToast.show({
+                type: 'success',
+                message: '收单成功',
+                complete: () => {
+                  uni.navigateBack({
+                    delta: 1
+                  })
+                }
+              })
+            } catch (error) {
+              console.error('收单失败:', error)
+              uni.$u.toast('收单失败')
+            }
+          }
+        }
+      })
+    },
+
+
+    //确认入库
+     confirmWarehouseEntry() {
+      //点击了入库按钮
+      //首先判断该大单的status是否为3，3代表已收单，如果为3，则提示已收单，不能入库
+      console.log('xxxxx',this.orderDetail)
+      if (this.orderDetail.status != '3') {
+        uni.$u.toast('该订单未收单，不能入库')
+        return
+      }
+
+      uni.showModal({
+        title: '确认入库',
+        content: `是否确认入库该订单：${this.orderDetail.item}-${this.currentReceipt.brand}？`,
+        success: async (res) => {
+          if (res.confirm) {
+            //点击了确认入库，执行入库方法
+            try {
+              // 获取品牌ID
+              const brandObj = this.brandList.find(item => item.dictLabel === this.currentReceipt.brand)
                 const brandId = brandObj ? brandObj.dictValue : ''
 
                 //建立入库data
@@ -805,15 +898,12 @@ export default {
                   //当没有仓库id的时候调用新增仓库接口
                   await uni.$u.api.wareHouseAdd(warehouseData)
                 } else {
-                  //当有仓库id的时候调用编辑仓库接口
-                  warehouseData.id = this.currentReceipt.warehouseId
-                  await uni.$u.api.wareHouseUpdate(warehouseData)
+                  // //当有仓库id的时候调用编辑仓库接口
+                  // warehouseData.id = this.currentReceipt.warehouseId
+                  // await uni.$u.api.wareHouseUpdate(warehouseData)
                 }
-              } else if (this.isWarehouse == '2') {
-                //等于2的时候不放入仓库表
-              }
 
-              this.$refs.uToast.show({
+                this.$refs.uToast.show({
                 type: 'success',
                 message: '入库成功',
                 complete: () => {
@@ -1023,15 +1113,12 @@ export default {
 }
 
 .confirm-button-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
   padding: 40rpx 0;
   margin-top: 20rpx;
 }
 
-.next-btn {
-  width: 95%;
+.confirm-button-container .next-btn {
+  width: 100%;
   height: 80rpx;
   line-height: 80rpx;
   text-align: center;

pages/orderDetailRefactored/components/PageThree.vue

@@ -32,11 +32,11 @@
       <u-row class="info-row">
         <u-col span="12">
           <view class="info-label">支付方式选择</view>
-          <u-radio-group iconPlacement="left" v-model="paymentMethodRadio" placement="row"
+          <u-radio-group iconPlacement="left" v-model="paymentMethodRadio" placement="column"
             @change="handlePaymentMethodRadioChange">
-            <u-radio shape="circle" label="小葫芦线上支付" name="online" />
-            <u-radio shape="circle" label="小葫芦线上支付宝" name="online_alipay" />
-            <u-radio shape="circle" label="线下支付" name="offline" />
+            <u-radio shape="circle" label="小葫芦线上支付" name="online"  :customStyle="{marginBottom: '16rpx'}"/>
+            <u-radio shape="circle" label="小葫芦线上支付宝" name="online_alipay" :customStyle="{marginBottom: '16rpx'}" />
+            <u-radio shape="circle" label="线下支付" name="offline"  :customStyle="{marginBottom: '16rpx'}"/>
           </u-radio-group>
         </u-col>
       </u-row>

pages/pagereceivecenter/pagereceivecenter.vue

@@ -174,6 +174,13 @@ export default {
         },
         //获取列表数据
         async getOrderList() {
+            // 记录本次请求的筛选条件，用于避免“加载中切换 tab”导致旧请求覆盖新数据
+            const requestType = this.activeType;
+            const requestStatus = this.activeStatus;
+            const requestPageNum = this.activeType === 3
+                ? this.commissionQueryParams.pageNum
+                : this.queryParams.pageNum;
+
             try {
                 let result;
 
@@ -212,9 +219,20 @@ export default {
                     })
                 }
 
+                // 若用户在请求期间切换了类型或状态，丢弃本次结果，避免错误显示
+                if (this.activeType !== requestType || (this.activeType !== 3 && this.activeStatus !== requestStatus)) {
+                    return;
+                }
+                const currentPageNum = this.activeType === 3
+                    ? this.commissionQueryParams.pageNum
+                    : this.queryParams.pageNum;
+                if (currentPageNum !== requestPageNum) {
+                    return;
+                }
+
                 // 获取当前使用的查询参数
                 const params = this.activeType === 3 ? this.commissionQueryParams : this.queryParams;
-                
+
                 // 如果是第一页（下拉刷新或初始加载），直接替换列表
                 if (params.pageNum === 1) {
                     this.orderList = result.rows;

pages/person/cards/index.vue

@@ -96,7 +96,7 @@
             </view>
 
             <!-- 折线图 -->
-            <view class="card_item">
+            <view class="card_item" v-if="false">
                 <view class="chart_header">
                     <image class="chart_icon" src="../../../static/icons/line.png" alt=""></image>
                     <text class="card_title">近7天排名折线图</text>

pages/wareHouse/components/edit.vue

@@ -482,27 +482,26 @@ export default {
     },
     onLoad(options) {
         this.getTypeList();
-        this.$nextTick(()=>{
+        this.$nextTick(async()=>{
             if(options.formType == 'add'){
                 this.clearForm()
             }else if(options.formType == 'edit'){
-                uni.$u.api.wareHouseDetail({
+                const res = await uni.$u.api.wareHouseDetail({
                     id: options.id,
                     userId: this.$store.state.user.userInfo.userId,
-                }).then(res => {
-                    const keys = Object.keys(res.data)
-                    keys.forEach(item => {
-                        this.formData[item] = res.data[item]
-                    })
-                    this.formData.recycleTime = this.$dayjs(res.data.recycleTime).format('YYYY-MM-DD') || ''
-                    this.echoInfoType = res.data.type || '1'
-                    this.echoInfoProductAttribute = res.data.productAttribute || '1'
-                    this.echoInfoProductCondition = res.data.productCondition || '1'
-                    this.echoInfoStockStatus = res.data.stockStatus || '0'
-                    this.$nextTick(()=>{
-                        this.$refs.addForm.resetFields();
-                    })
-                });
+                })
+                this.formData = res.data
+                this.formData.recycleTime = this.$dayjs(res.data.recycleTime).format('YYYY-MM-DD') || ''
+                this.echoInfoType = res.data.type || '1'
+                this.formData.type = res.data.type || '1'
+                this.echoInfoProductAttribute = res.data.productAttribute || '1'
+                this.formData.productAttribute = res.data.productAttribute || '1'
+                this.echoInfoProductCondition = res.data.productCondition || '1'
+                this.formData.productCondition = res.data.productCondition || '1'
+                this.echoInfoStockStatus = res.data.stockStatus || '0'
+                this.formData.stockStatus = res.data.stockStatus || '0'
+                this.formData.stock = res.data.stock ? res.data.stock : 1
+                
             }
         })
     },