Merge remote-tracking branch 'origin/feature/20240918_1005_091801' into release_prod

src/views/shop/components/NoPassIdentifyDialog.vue

@@ -8,10 +8,7 @@
     height="600px"
     title="审核结果">
     <el-form ref="cancel" :model="cancelForm" :rules="cancelRules">
-      <el-form-item label="" label-width="80px" prop="content">
-        <div>该商家不通过原因：</div>
-      </el-form-item>
-      <el-form-item label="" label-width="80px" prop="remark">
+      <el-form-item label="原因：" label-width="80px" prop="remark">
         <el-input
           v-model="cancelForm.remark"
           :autosize="{ minRows: 8, maxRows: 8}"

src/views/shop/shopManagerDetail.vue

@@ -87,22 +87,25 @@
         </el-table>
       </div>
     </el-card>
+
+    <el-card class="box-card" style="margin: 0 16px">
+      <div class="title">
+        <div class="title_content">备注</div>
+      </div>
+      <div class="user_info flex">
+        <el-form ref="addInviteRef" label-width="100px" style="width: 30%">
+          <el-form-item label="备注：">
+            <div>{{ itemContent.remark || '-' }}</div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
     <NoPassIdentifyDialog
       :show-no-pass-identify-dialog-show="showNoPassIdentifyDialog"
-      :distribution-order-id="itemContent.distributionOrderId"
-      :identify-order-id="itemContent.identifyOrderId"
+      :open-shop-apply-order-id="itemContent.openShopApplyOrderId"
       @refreshItem="handleRefreshItem"
       @cancelDialog="showNoPassIdentifyDialog = false"
     />
-    <ReturnLogisticIdentifyDialog
-      v-if="logisticDialogShow"
-      :logistic-dialog-show="logisticDialogShow"
-      :distribution-order-id="itemContent.distributionOrderId"
-      :identify-order-id="itemContent.identifyOrderId"
-      :type="logisticType"
-      @cancelDialog="handleCancelLogisticDialog"
-      @refreshDelivery="handleRefreshLogisticItem"
-      @refreshSendBack="handleRefreshLogisticItem"/>
   </div>
 </template>
 
@@ -110,15 +113,13 @@
 import Line2Hidden from '@/components/line2Hidden'
 import NoPassIdentifyDialog from './components/NoPassIdentifyDialog'
 import ReturnLogisticIdentifyDialog from './components/ReturnLogisticIdentifyDialog'
-import { requestSigned, requestIdentify, requestTransferDetail } from '@/api/business/order'
-import { shopManagerDetail,shopManagerCheck} from '@/api/business/shop'
+import { shopManagerDetail, shopManagerCheck } from '@/api/business/shop'
 export default {
-  name: 'shopManagerDetail',
+  name: 'ShopManagerDetail',
   components: { ReturnLogisticIdentifyDialog, NoPassIdentifyDialog, Line2Hidden },
   data() {
     return {
       itemContent: {},
-      distributionOrderId: '',
       showNoPassIdentifyDialog: false,
       logisticDialogShow: false,
       logisticType: 1,
@@ -142,7 +143,7 @@ export default {
         openShopApplyOrderId: this.openShopApplyOrderId
       }
       shopManagerDetail(params).then(response => {
-        console.log('===response=', response)
+        console.log('===response=', response.data.data)
         this.itemContent = response.data.data || {}
         const model = {
           cardId: this.itemContent.cardId,
@@ -150,7 +151,7 @@ export default {
           name: this.itemContent.name,
           openShopAmount: this.itemContent.openShopAmount,
           idCardFrontImage: this.itemContent.idCardFrontImage,
-          idCardBackImage: this.itemContent.idCardBackImage,
+          idCardBackImage: this.itemContent.idCardBackImage
         }
         this.list = [model]
       }).catch((e) => {
@@ -158,30 +159,6 @@ export default {
         this.$message.error(e.data && e.data.errmsg || '请求失败， 请重试')
       })
     },
-    /**
-     * 收货
-     * @param item
-     */
-    handleReceive() {
-      this.$confirm('请确认包裹的物流信息是否正确？', '确认收货', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'message'
-      }).then(() => {
-        const params = {
-          identifyOrderId: this.itemContent.identifyOrderId
-        }
-        requestSigned(params).then(response => {
-          this.handleGetDetail()
-          this.$notify.success({
-            message: '确认收货成功'
-          })
-        }).catch((e) => {
-          console.log('===报错=', e)
-          this.$message.error(e.data && e.data.errmsg || '请求失败， 请重试')
-        })
-      })
-    },
     /**
      * 通过
      * @param item
@@ -193,18 +170,11 @@ export default {
         type: 'message'
       }).then(() => {
         const params = {
-          openShopApplyOrderId:this.openShopApplyOrderId,
+          openShopApplyOrderId: this.openShopApplyOrderId,
           state: 20
         }
         shopManagerCheck(params).then(response => {
-          this.list = this.list.filter((itemContent) => {
-            if (itemContent.openShopApplyOrderId === row.openShopApplyOrderId) {
-              itemContent.stateName = '审核通过'
-              itemContent.state = 20
-              return  itemContent
-            }
-            return itemContent
-          })
+          this.handleGetDetail()
           this.$notify.success({
             message: '操作成功'
           })