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

src/views/shop/shopManagerDetail.vue

@@ -38,11 +38,13 @@
             <div>{{ itemContent.fansNum || '-' }}</div>
           </el-form-item>
         </el-form>
-        <el-form ref="addInviteRef" label-width="200px" style="width: 30%">
-          <el-form-item label="已上架的商品：">
-            <div>{{ itemContent.uploadItemNum || '-' }}</div>
-          </el-form-item>
-        </el-form>
+        <div @click="handleToDetail">
+          <el-form ref="addInviteRef" label-width="200px" style="width: 30%">
+            <el-form-item label="已上架的商品：" >
+              <div>{{ itemContent.uploadItemNum || '-' }}</div>
+            </el-form-item>
+          </el-form>
+        </div>
 
       </div>
     </el-card>
@@ -83,6 +85,7 @@
           <el-table-column align="center" label="开户行" prop="bankName" />
           <el-table-column align="center" label="持卡人姓名" prop="name" />
           <el-table-column align="center" label="开店费" prop="openShopAmount" />
+          <el-table-column align="center" label="开店费" prop="guaranteeAmount" />
           <!-- <el-table-column align="center" label="质保金" prop="itemPrice" /> -->
         </el-table>
       </div>
@@ -94,7 +97,7 @@
       </div>
       <div class="user_info flex">
         <el-form ref="addInviteRef" label-width="100px" style="width: 30%">
-          <el-form-item label="备注：">
+          <el-form-item label="不通过原因：">
             <div>{{ itemContent.remark || '-' }}</div>
           </el-form-item>
         </el-form>
@@ -114,6 +117,7 @@ import Line2Hidden from '@/components/line2Hidden'
 import NoPassIdentifyDialog from './components/NoPassIdentifyDialog'
 import ReturnLogisticIdentifyDialog from './components/ReturnLogisticIdentifyDialog'
 import { shopManagerDetail, shopManagerCheck } from '@/api/business/shop'
+
 export default {
   name: 'ShopManagerDetail',
   components: { ReturnLogisticIdentifyDialog, NoPassIdentifyDialog, Line2Hidden },
@@ -138,6 +142,11 @@ export default {
     this.handleGetDetail()
   },
   methods: {
+    handleToDetail() {
+      if (this.itemContent.userId) {
+        this.$router.push({ path: '/user/userDetail', query: { id: this.itemContent.userId }})
+      }
+    },
     handleGetDetail() {
       const params = {
         openShopApplyOrderId: this.openShopApplyOrderId
@@ -149,6 +158,7 @@ export default {
           cardId: this.itemContent.cardId,
           bankName: this.itemContent.bankName,
           name: this.itemContent.name,
+          guaranteeAmount: this.itemContent.guaranteeAmount,
           openShopAmount: this.itemContent.openShopAmount,
           idCardFrontImage: this.itemContent.idCardFrontImage,
           idCardBackImage: this.itemContent.idCardBackImage
@@ -228,20 +238,23 @@ export default {
 }
 </script>
 
-<style  lang="scss" scoped>
+<style lang="scss" scoped>
 .page_transferDetail {
   height: 100%;
   display: flex;
   flex-direction: column;
   padding: 0 10px 10px;
+
   .detail_button {
     text-align: end;
     margin: 16px;
   }
+
   .title {
     display: flex;
     flex-direction: row;
     margin-bottom: 10px;
+
     .title_content {
       font-weight: 600;
       font-size: 22px;
@@ -249,6 +262,7 @@ export default {
     }
   }
 }
+
 .image_preview {
   width: 60px;
   height: 60px;
@@ -256,6 +270,12 @@ export default {
   justify-content: center;
 }
 
+.table-td-thumb {
+  width: 60px;
+  height: 60px;
+  margin-right: 10px;
+}
+
 /deep/ .el-card__body {
   padding: 12px;
 }
@@ -263,6 +283,7 @@ export default {
 /deep/ .el-form-item {
   margin-bottom: 0;
 }
+
 /deep/ .el-switch {
   height: 30px;
 }

src/views/shop/shopManagerList.vue

@@ -127,7 +127,6 @@ export default {
   },
   created() {
     this.getList()
-    this.getLogisticsList()
   },
 
   methods: {