diff --git a/components/merchantAudit/merchantAudit.vue b/components/merchantAudit/merchantAudit.vue
new file mode 100644
index 0000000..2b2f7bb
--- /dev/null
+++ b/components/merchantAudit/merchantAudit.vue
@@ -0,0 +1,143 @@
+<template>
+  <view class="card">
+    <view class="nav_bar">
+      <view class="left">
+        <image src="../../static/img/company/company.png"></image>
+        <view>爱读蛋糕</view>
+      </view>
+      <view class="right" @click="navTo(`/subpkg/merchantDetails/merchantDetails?id=${id=1}`)">
+        <text>查看</text>
+        <u-icon name="arrow-right" size="12" color="#fff"></u-icon>
+      </view>
+    </view>
+    <view class="body">
+      <view class="b_item name">
+        <view class="text">
+          <view>商户姓名:</view>
+          <view>某moods v你的伤口v技能大赛空军第三空间</view>
+        </view>
+        <view class="type">
+          <text v-if="true" style="color: #ff7c32;">未审核</text>
+          <text v-else-if="true" style="color: #47be62;">已通过</text>
+          <text v-else style="color: #FF0000;">未通过</text>
+        </view>
+      </view>
+      <view class="b_item">
+        <view>商户分类:</view>
+        <view>商超</view>
+      </view>
+      <view class="b_item">
+        <view>店铺分类:</view>
+        <view>分类</view>
+      </view>
+      <view class="b_item">
+        <view>镇街店铺:</view>
+        <view>店铺</view>
+      </view>
+      <view class="b_item">
+        <view>联系方式:</view>
+        <view>1999999999</view>
+      </view>
+      <view class="b_item">
+        <view>申请时间:</view>
+        <view>2023-09-09</view>
+      </view>
+      <view class="img">
+        <image src="../../uni_modules/guyue-updater/assets/bg1.png"></image>
+        <image src="../../uni_modules/guyue-updater/assets/bg1.png"></image>
+        <image src="../../uni_modules/guyue-updater/assets/bg1.png"></image>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: "merchantAudit",
+    data() {
+      return {
+
+      };
+    },
+    methods:{
+      navTo (url) {
+        if (url) {
+          uni.navigateTo({
+            url: url,
+          })
+        } else Toast('暂未开放')
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+.card{
+    margin: 0 auto;
+    margin-bottom: 28rpx;
+    width: 694rpx;
+    background-color: #fff;
+    border-radius: 26rpx;
+    overflow: hidden;
+    .nav_bar{
+      background-color: #0122c7;
+      padding: 28rpx;
+      color: #fff;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .left{
+        display: flex;
+        font-size: 32rpx;
+        image{
+          width: 40rpx;
+          height: 40rpx;
+          margin-right: 16rpx;
+        }
+      }
+      .right{
+        display: flex;
+        font-size: 28rpx;
+        align-items: center;
+      }
+    }
+    .body{
+      font-size: 28rpx;
+      padding: 28rpx;
+      .b_item{
+        padding-bottom: 16rpx;
+        display: flex;
+        view:nth-child(1){
+          flex-shrink: 0;
+          padding-right: 10rpx;
+        }
+      }
+      .name{
+        display: flex;
+        justify-content: space-between;
+        .text{
+          flex: 1;
+          display: flex;
+          view:nth-child(1){
+            flex-shrink: 0;
+          }
+        }
+        .type{
+          flex-shrink: 0;
+        }
+      }
+      .img{
+        display: flex;
+        
+        image{
+          width: 200rpx;
+          height: 150rpx;
+          margin-right: 19rpx;
+          &:last-child{
+            margin-right: 0;
+          }
+        }
+      }
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 2091997..affb009 100644
--- a/pages.json
+++ b/pages.json
@@ -1,39 +1,39 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+  "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 
-		{
-			"path": "pages/oaHome/oaHome",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true,
-				"app-plus": {
-					"titleNView": false
-				},
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/oaLogin/oaLogin",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"app-plus": {
-					"titleNView": false,
-					"bounce": "none"
-				},
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    {
+      "path": "pages/oaHome/oaHome",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": true,
+        "app-plus": {
+          "titleNView": false
+        },
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+    },
+    {
+      "path": "pages/oaLogin/oaLogin",
+      "style": {
+        "navigationBarTitleText": "登录",
+        "app-plus": {
+          "titleNView": false,
+          "bounce": "none"
+        },
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		},
-		{
-			"path": "pages/business/business",
-			"style": {
-				"navigationBarTitleText": "商机信息",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    },
+    {
+      "path": "pages/business/business",
+      "style": {
+        "navigationBarTitleText": "商机信息",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
     },
     {
@@ -81,271 +81,271 @@
         "navigationBarTextStyle": "white"
       }
 
-		}, {
-			"path": "pages/oaNews/oaNews",
-			"style": {
-				"navigationBarTitleText": "公告详情",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "pages/oaNews/oaNews",
+      "style": {
+        "navigationBarTitleText": "公告详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "pages/logistics/index",
-			"style": {
-				"navigationBarTitleText": "订单列表",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "pages/logistics/index",
+      "style": {
+        "navigationBarTitleText": "订单列表",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "pages/logistics/te",
-			"style": {
-				"navigationBarTitleText": "测试",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "pages/logistics/te",
+      "style": {
+        "navigationBarTitleText": "测试",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "pages/logistics/logisticDetil",
-			"style": {
-				"navigationBarTitleText": "订单详情",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "pages/logistics/logisticDetil",
+      "style": {
+        "navigationBarTitleText": "订单详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "pages/logistics/deliveryDetil",
-			"style": {
-				"navigationBarTitleText": "配送信息",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "pages/logistics/deliveryDetil",
+      "style": {
+        "navigationBarTitleText": "配送信息",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "pages/logistics/post",
-			"style": {
-				"navigationBarTitleText": "驿站",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "pages/logistics/post",
+      "style": {
+        "navigationBarTitleText": "驿站",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "pages/updatePassword/updatePassword",
-			"style": {
-				"navigationBarTitleText": "修改密码",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "pages/updatePassword/updatePassword",
+      "style": {
+        "navigationBarTitleText": "修改密码",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "uni_modules/guyue-updater/pages/updater",
-			"style": {
-				"app-plus": {
-					"animationDuration": 200,
-					"animationType": "fade-in",
-					"background": "transparent",
-					"backgroundColorTop": "transparent",
-					"bounce": "none",
-					"popGesture": "none",
-					"scrollIndicator": false,
-					"titleNView": false
-				},
-				"backgroundColor": "transparent",
-				"disableScroll": true,
-				"navigationStyle": "custom"
-			}
-		}, {
-			"path": "pages/moreFun/moreFun",
-			"style": {
-				"navigationBarTitleText": "更多功能",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "uni_modules/guyue-updater/pages/updater",
+      "style": {
+        "app-plus": {
+          "animationDuration": 200,
+          "animationType": "fade-in",
+          "background": "transparent",
+          "backgroundColorTop": "transparent",
+          "bounce": "none",
+          "popGesture": "none",
+          "scrollIndicator": false,
+          "titleNView": false
+        },
+        "backgroundColor": "transparent",
+        "disableScroll": true,
+        "navigationStyle": "custom"
+      }
+    }, {
+      "path": "pages/moreFun/moreFun",
+      "style": {
+        "navigationBarTitleText": "更多功能",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "pages/otherSetting/otherSetting",
-			"style": {
-				"navigationBarTitleText": "其他设置",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
-		}, {
-			"path": "pages/webView/webView",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "pages/otherSetting/otherSetting",
+      "style": {
+        "navigationBarTitleText": "其他设置",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+    }, {
+      "path": "pages/webView/webView",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}
-	],
-	"subPackages": [{
-		"root": "pages/views",
-		"name": "views",
-		"pages": [{
-				"path": "application",
-				"style": {
-					"navigationBarTitleText": "地图首页",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path": "new_task",
-				"style": {
-					"navigationBarTitleText": "新建任务",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path": "com_approve",
-				"style": {
-					"navigationBarTitleText": "通用审批",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "personal_center",
-				"style": {
-					"navigationBarTitleText": "个人中心1",
-					"enablePullDownRefresh": false
-				}
+    }
+  ],
+  "subPackages": [{
+    "root": "pages/views",
+    "name": "views",
+    "pages": [{
+        "path": "application",
+        "style": {
+          "navigationBarTitleText": "地图首页",
+          "enablePullDownRefresh": false
+        }
+      },
+      {
+        "path": "new_task",
+        "style": {
+          "navigationBarTitleText": "新建任务",
+          "enablePullDownRefresh": false
+        }
+      },
+      {
+        "path": "com_approve",
+        "style": {
+          "navigationBarTitleText": "通用审批",
+          "enablePullDownRefresh": false
+        }
+      }, {
+        "path": "personal_center",
+        "style": {
+          "navigationBarTitleText": "个人中心1",
+          "enablePullDownRefresh": false
+        }
 
-			}, {
-				"path": "task_details",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
+      }, {
+        "path": "task_details",
+        "style": {
+          "navigationBarTitleText": "",
+          "enablePullDownRefresh": false
+        }
 
-			}, {
-				"path": "personal_center_two",
-				"style": {
-					"navigationBarTitleText": "个人中心2",
-					"enablePullDownRefresh": false
-				}
+      }, {
+        "path": "personal_center_two",
+        "style": {
+          "navigationBarTitleText": "个人中心2",
+          "enablePullDownRefresh": false
+        }
 
-			}, {
-				"path": "public_document",
-				"style": {
-					"navigationBarTitleText": "公司公示文档",
-					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#0122C7",
-					"navigationBarTextStyle": "white"
-				}
+      }, {
+        "path": "public_document",
+        "style": {
+          "navigationBarTitleText": "公司公示文档",
+          "enablePullDownRefresh": false,
+          "navigationBarBackgroundColor": "#0122C7",
+          "navigationBarTextStyle": "white"
+        }
 
-			}, {
-				"path": "leave_request",
-				"style": {
-					"navigationBarTitleText": "请假申请",
-					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#0122C7",
-					"navigationBarTextStyle": "white"
-				}
+      }, {
+        "path": "leave_request",
+        "style": {
+          "navigationBarTitleText": "请假申请",
+          "enablePullDownRefresh": false,
+          "navigationBarBackgroundColor": "#0122C7",
+          "navigationBarTextStyle": "white"
+        }
 
-			}
-		]
-	}, {
-		"root": "subpkg",
-		"name": "subpkg",
-		"pages": [{
-			"path": "personnel/personnel",
-			"style": {
-				"navigationBarTitleText": "人员管理",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+      }
+    ]
+  }, {
+    "root": "subpkg",
+    "name": "subpkg",
+    "pages": [{
+      "path": "personnel/personnel",
+      "style": {
+        "navigationBarTitleText": "人员管理",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "finance/finance",
-			"style": {
-				"navigationBarTitleText": "财务管理",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "finance/finance",
+      "style": {
+        "navigationBarTitleText": "财务管理",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "topUp/topUp",
-			"style": {
-				"navigationBarTitleText": "账户充值",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"titleNView": {
-						"buttons": [{
-							"color": "#fff",
-							"text": "充值记录",
-							"fontSize": "15",
-							"width": "90"
-						}]
-					}
-				}
-			}
+    }, {
+      "path": "topUp/topUp",
+      "style": {
+        "navigationBarTitleText": "账户充值",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white",
+        "app-plus": {
+          "titleNView": {
+            "buttons": [{
+              "color": "#fff",
+              "text": "充值记录",
+              "fontSize": "15",
+              "width": "90"
+            }]
+          }
+        }
+      }
 
-		}, {
-			"path": "contract/contract",
-			"style": {
-				"navigationBarTitleText": "合同管理",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0022C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "contract/contract",
+      "style": {
+        "navigationBarTitleText": "合同管理",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0022C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "contractDetail/contractDetail",
-			"style": {
-				"navigationBarTitleText": "合同详情",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "contractDetail/contractDetail",
+      "style": {
+        "navigationBarTitleText": "合同详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "pdfView/pdfView",
-			"style": {
-				"navigationBarTitleText": "合同内容",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "pdfView/pdfView",
+      "style": {
+        "navigationBarTitleText": "合同内容",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "companyInfo/companyInfo",
-			"style": {
-				"navigationBarTitleText": "公司信息",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "companyInfo/companyInfo",
+      "style": {
+        "navigationBarTitleText": "公司信息",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "companySign/companySign",
-			"style": {
-				"navigationBarTitleText": "签约公司详情",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "companySign/companySign",
+      "style": {
+        "navigationBarTitleText": "签约公司详情",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "personnelDetails/personnelDetails",
-			"style": {
-				"navigationBarTitleText": "人员详细信息",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "personnelDetails/personnelDetails",
+      "style": {
+        "navigationBarTitleText": "人员详细信息",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
     }, {
       "path": "orderDetail/orderDetail",
@@ -374,7 +374,7 @@
           }
         }
       }
-    },{
+    }, {
       "path": "withdrawDeposit/company",
       "style": {
         "navigationBarTitleText": "提现",
@@ -392,7 +392,7 @@
           }
         }
       }
-    },{
+    }, {
       "path": "withdrawList/withdrawList",
       "style": {
         "navigationBarTitleText": "提现记录",
@@ -401,77 +401,77 @@
         "navigationBarTextStyle": "white"
       }
 
-		}, {
-			"path": "noticeList/noticeList",
-			"style": {
-				"navigationBarTitleText": "公告列表",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "noticeList/noticeList",
+      "style": {
+        "navigationBarTitleText": "公告列表",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "topUpList/topUpList",
-			"style": {
-				"navigationBarTitleText": "充值记录",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "topUpList/topUpList",
+      "style": {
+        "navigationBarTitleText": "充值记录",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "companyAdmin/companyAdmin",
-			"style": {
-				"navigationBarTitleText": "公司管理",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "companyAdmin/companyAdmin",
+      "style": {
+        "navigationBarTitleText": "公司管理",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "newPersonnel/newPersonnel",
-			"style": {
-				"navigationBarTitleText": "新增人员",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "newPersonnel/newPersonnel",
+      "style": {
+        "navigationBarTitleText": "新增人员",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "archives/archives",
-			"style": {
-				"navigationBarTitleText": "档案管理",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "archives/archives",
+      "style": {
+        "navigationBarTitleText": "档案管理",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "newArchives/newArchives",
-			"style": {
-				"navigationBarTitleText": "信息登记",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "newArchives/newArchives",
+      "style": {
+        "navigationBarTitleText": "信息登记",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "updateArchives/updateArchives",
-			"style": {
-				"navigationBarTitleText": "信息更新",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "updateArchives/updateArchives",
+      "style": {
+        "navigationBarTitleText": "信息更新",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "fixedAssets/fixedAssets",
-			"style": {
-				"navigationBarTitleText": "固定资产",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "fixedAssets/fixedAssets",
+      "style": {
+        "navigationBarTitleText": "固定资产",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
     }, {
       "path": "taskAdmin/taskAdmin",
@@ -482,218 +482,245 @@
         "navigationBarTextStyle": "white"
       }
 
-		}, {
-			"path": "archivesDetail/archivesDetail",
-			"style": {
-				"navigationBarTitleText": "档案详情",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "archivesDetail/archivesDetail",
+      "style": {
+        "navigationBarTitleText": "档案详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "captain/captain",
-			"style": {
-				"navigationBarTitleText": "队长列表",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "captain/captain",
+      "style": {
+        "navigationBarTitleText": "队长列表",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "companyFinance/companyFinance",
-			"style": {
-				"navigationBarTitleText": "公司财务",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "companyFinance/companyFinance",
+      "style": {
+        "navigationBarTitleText": "公司财务",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "companyUnsign/companyUnsign",
-			"style": {
-				"navigationBarTitleText": "未签约公司列表",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "companyUnsign/companyUnsign",
+      "style": {
+        "navigationBarTitleText": "未签约公司列表",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "submit/submit",
-			"style": {
-				"navigationBarTitleText": "提交审核",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "submit/submit",
+      "style": {
+        "navigationBarTitleText": "提交审核",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "dispatching/dispatching",
-			"style": {
-				"navigationBarTitleText": "任务:宣传配送",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "dispatching/dispatching",
+      "style": {
+        "navigationBarTitleText": "任务:宣传配送",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "blockTransaction/blockTransaction",
-			"style": {
-				"navigationBarTitleText": "任务:片区交易",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "blockTransaction/blockTransaction",
+      "style": {
+        "navigationBarTitleText": "任务:片区交易",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "fileTask/fileTask",
-			"style": {
-				"navigationBarTitleText": "已更新商机",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "fileTask/fileTask",
+      "style": {
+        "navigationBarTitleText": "已更新商机",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "property/index",
-			"style": {
-				"navigationBarTitleText": "资产管理",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "property/index",
+      "style": {
+        "navigationBarTitleText": "资产管理",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "property/chosseCompany",
-			"style": {
-				"navigationBarTitleText": "选择公司",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "property/chosseCompany",
+      "style": {
+        "navigationBarTitleText": "选择公司",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "property/vehicle",
-			"style": {
-				"navigationBarTitleText": "三轮车游走",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "property/vehicle",
+      "style": {
+        "navigationBarTitleText": "三轮车游走",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "property/vehicle_a",
-			"style": {
-				"navigationBarTitleText": "三轮车详情",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "property/vehicle_a",
+      "style": {
+        "navigationBarTitleText": "三轮车详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "property/success",
-			"style": {
-				"navigationBarTitleText": "生成合同",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "property/success",
+      "style": {
+        "navigationBarTitleText": "生成合同",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "property/contractList",
-			"style": {
-				"navigationBarTitleText": "合同列表",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "property/contractList",
+      "style": {
+        "navigationBarTitleText": "合同列表",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "buyShare/buyShare",
-			"style": {
-				"navigationBarTitleText": "任务:入股任务",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "buyShare/buyShare",
+      "style": {
+        "navigationBarTitleText": "任务:入股任务",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "otherTask/otherTask",
-			"style": {
-				"navigationBarTitleText": "任务:其他任务",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "otherTask/otherTask",
+      "style": {
+        "navigationBarTitleText": "任务:其他任务",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "property/agencyList",
-			"style": {
-				"navigationBarTitleText": "签约列表",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "property/agencyList",
+      "style": {
+        "navigationBarTitleText": "签约列表",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}, {
-			"path": "shareCapital/shareCapital",
-			"style": {
-				"navigationBarTitleText": "股金管理",
-				"enablePullDownRefresh": true,
-				"navigationBarBackgroundColor": "#0122C7",
-				"navigationBarTextStyle": "white"
-			}
+    }, {
+      "path": "shareCapital/shareCapital",
+      "style": {
+        "navigationBarTitleText": "股金管理",
+        "enablePullDownRefresh": true,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
 
-		}]
-	}],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	},
-	"tabBar": {
-		"color": "#282828",
-		"selectedColor": "#0122C7",
-		"borderStyle": "white",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/oaHome/oaHome",
-				"text": "首页",
-				"iconPath": "static/tabs-icon/home.png",
-				"selectedIconPath": "static/tabs-icon/home-a.png"
-			},
-			{
-				"pagePath": "pages/oaExamine/oaExamine",
-				"text": "审批",
-				"iconPath": "static/tabs-icon/Task.png",
-				"selectedIconPath": "static/tabs-icon/Task-a.png"
-			},
-			{
-				"pagePath": "pages/oaTask/oaTask",
-				"text": "任务",
-				"iconPath": "static/tabs-icon/approval.png",
-				"selectedIconPath": "static/tabs-icon/approval-a.png"
-			},
-			// {
-			//   "pagePath": "pages/oaManager/oaManager",
-			//   "text": "片区经理",
-			//   "iconPath": "static/tabs-icon/manager.png",
-			//   "selectedIconPath": "static/tabs-icon/manager-a.png"
-			// },
-			{
-				"pagePath": "pages/business/business",
-				"text": "商机",
-				"iconPath": "static/tabs-icon/manager.png",
-				"selectedIconPath": "static/tabs-icon/manager-a.png"
-			},
-			{
-				"pagePath": "pages/oaMy/oaMy",
-				"text": "我的",
-				"iconPath": "static/tabs-icon/my.png",
-				"selectedIconPath": "static/tabs-icon/my-a.png"
-			}
-		]
-	},
-	"uniIdRouter": {}
+    }, {
+      "path": "merchantAudit/merchantAudit",
+      "style": {
+        "navigationBarTitleText": "商户入驻审核",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "merchantTransaction/merchantTransaction",
+      "style": {
+        "navigationBarTitleText": "商户交易审核",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "merchantDetails/merchantDetails",
+      "style": {
+        "navigationBarTitleText": "商户详情",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#0122C7",
+        "navigationBarTextStyle": "white"
+      }
+
+    }]
+  }],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8"
+  },
+  "tabBar": {
+    "color": "#282828",
+    "selectedColor": "#0122C7",
+    "borderStyle": "white",
+    "backgroundColor": "#ffffff",
+    "list": [{
+        "pagePath": "pages/oaHome/oaHome",
+        "text": "首页",
+        "iconPath": "static/tabs-icon/home.png",
+        "selectedIconPath": "static/tabs-icon/home-a.png"
+      },
+      {
+        "pagePath": "pages/oaExamine/oaExamine",
+        "text": "审批",
+        "iconPath": "static/tabs-icon/Task.png",
+        "selectedIconPath": "static/tabs-icon/Task-a.png"
+      },
+      {
+        "pagePath": "pages/oaTask/oaTask",
+        "text": "任务",
+        "iconPath": "static/tabs-icon/approval.png",
+        "selectedIconPath": "static/tabs-icon/approval-a.png"
+      },
+      // {
+      //   "pagePath": "pages/oaManager/oaManager",
+      //   "text": "片区经理",
+      //   "iconPath": "static/tabs-icon/manager.png",
+      //   "selectedIconPath": "static/tabs-icon/manager-a.png"
+      // },
+      {
+        "pagePath": "pages/business/business",
+        "text": "商机",
+        "iconPath": "static/tabs-icon/manager.png",
+        "selectedIconPath": "static/tabs-icon/manager-a.png"
+      },
+      {
+        "pagePath": "pages/oaMy/oaMy",
+        "text": "我的",
+        "iconPath": "static/tabs-icon/my.png",
+        "selectedIconPath": "static/tabs-icon/my-a.png"
+      }
+    ]
+  },
+  "uniIdRouter": {}
 }
\ No newline at end of file
diff --git a/pages/oaExamine/oaExamine.vue b/pages/oaExamine/oaExamine.vue
index d7a42f1..965c82f 100644
--- a/pages/oaExamine/oaExamine.vue
+++ b/pages/oaExamine/oaExamine.vue
@@ -1,263 +1,56 @@
 <template>
   <view class="all_box">
-    <!-- 审批选项 -->
-    <view class="examine_box">
-      <u-sticky bgColor="#fff">
-        <u-tabs :list="list1" @click="click" lineColor='#3274F9' :scrollable="false" lineWidth='20'
-          inactiveStyle='color:#666' activeStyle="color:#3274F9"></u-tabs>
-      </u-sticky>
+    <u-sticky bgColor="#0022C7">
+      <u-tabs :list="tabLists" @click="changeCurrent" lineColor='white' :scrollable="false" lineWidth='20'
+        inactiveStyle='color:white' activeStyle="color:white"></u-tabs>
+    </u-sticky>
+    <!-- <u-empty icon="/static/img/empty/data.png"></u-empty> -->
+    <view class="p_list">
+      <merchantAudit></merchantAudit>
     </view>
-    <!-- 事项 -->
-    <view class="out_box">
-      <view class="eventList_box" v-for="item in myEventList" :key="item.id">
-        <view class="banner">
-          <view class="title">{{item.name}}</view>
-          <view class="department">{{item.department_name ? item.department_name : '' }}</view>
-          <view v-if="item.check_status==0" class="wait">待审核</view>
-          <view v-if="item.check_status==1" class="underway">审核中</view>
-          <view v-if="item.check_status==2" class="pass">审核通过</view>
-          <view v-if="item.check_status==3" class="refuse">审核不通过</view>
-          <view v-if="item.check_status==4" class="withdraw">撤回审核</view>
-        </view>
-        <view class="line"></view>
-        <view class="task_approval">{{item.content}}</view>
-        <view class="approval_time">{{item.create_time}}</view>
-      </view>
-    </view>
-    <u-empty icon="/static/img/empty/data.png"></u-empty>
     <!-- <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" /> -->
-    <!-- <tabbar></tabbar> -->
   </view>
 </template>
 
 <script>
-  import {
-    getApproveMyListAPI,
-    getHandleListAPI,
-    getCopyOfMyListAPI
-  } from '@/api/oaApi.js'
   import { Toast } from '@/libs/uniApi.js'
-
-  // import tabbar from '../components/tabbar'
+  import merchantAudit from '@/components/merchantAudit/merchantAudit.vue'
   export default {
     components: {
-      // tabbar
+      merchantAudit
     },
     data() {
       return {
-        list1: [{
+        tabLists: [{
           name: '全部',
         }, {
-          name: '审核中',
+          name: '待审批',
         }, {
-          name: '审核完成'
+          name: '已通过'
         }, {
           name: '未通过'
         }, ],
-        myEventList: [],
-        params: {
-          limit: '8', //默认每次请求数据
-          page: '1',
-        },
-        last_page: '',
-        status: 'loadmore',
-        loadingText: '努力加载中',
-        loadmoreText: '轻轻上拉',
-        nomoreText: '我也是有底线的~~',
-        flag: '0', //
-
       }
     },
     onLoad() {
-      this.myEventList = []
-      // this.getApproveMyList(this.params)
+      
     },
     onShow() {
 
     },
     methods: {
-      //我审批的
-      async getHandleList(data) {
-        const res = await getHandleListAPI(data)
-        this.publicMethods(res)
+      changeCurrent(e) {
+        this.current = e.index;
       },
-      // 我发起的审批
-      async getApproveMyList(data) {
-        const res = await getApproveMyListAPI(data)
-        this.publicMethods(res)
-      },
-      //抄送给我的
-      async getCopyOfMyList(data) {
-        const res = await getCopyOfMyListAPI(data)
-        this.publicMethods(res)
-      },
-      //公共方法1
-      publicMethods(res) {
-        console.log(res);
-        this.myEventList = [...this.myEventList, ...res.data]
-        if (this.myEventList.length < this.params.limit) {
-          this.status = 'nomore'
-        }
-        this.last_page = res.last_page
-      },
-      //公共方法2
-      publicMethods2(fun) {
-        if (this.params.page < this.last_page) {
-          this.params.page++
-          fun(this.params)
-        } else {
-          this.status = 'nomore'
-          return
-        }
-      },
-      click(item) {
-        // Toast('暂无内容')
-        return
-        this.myEventList = []
-        this.params.page = '1'
-        switch (item.index) {
-          case 0:
-            this.flag = '0'
-            this.getApproveMyList(this.params)
-            break;
-          case 1:
-            this.flag = '1'
-            this.getHandleList(this.params)
-            break;
-          case 2:
-            this.flag = '2'
-            this.getCopyOfMyList(this.params)
-            break;
-        }
-      }
     },
-    onPullDownRefresh() {
-      uni.stopPullDownRefresh()
-    },
-    onReachBottom() {
-      if (this.flag == '0') {
-        this.publicMethods2(this.getApproveMyList)
-      } else if (this.flag == '1') {
-        this.publicMethods2(this.getHandleList)
-      } else {
-        this.publicMethods2(this.getCopyOfMyList)
-      }
-    },
-
-    filters: {
-      formatDate(nS, format) {
-        return new Date(nS).format('yyyy-MM-dd hh:mm:ss');
-      }
-    }
   }
 </script>
 
 <style lang="scss" scoped>
-  /deep/.u-tabs__wrapper__nav__item {
-    // padding: 0 56rpx;
-    height: 77rpx !important;
-  }
-
-  /deep/.u-tabs__wrapper__nav__item__text {
-    font-size: 32rpx;
-  }
-
-  /deep/.u-tabs__wrapper__nav {
-    height: 77rpx;
-    // justify-content: space-between;
-  }
-
-  /deep/.u-tabs__wrapper__nav__item-1 {
-    flex-grow: 2;
-  }
-
   .all_box {
     padding-bottom: 21rpx;
   }
-
-  .examine_box {
-    // position: fixed;
-    // top: 0;
-    // width: 750rpx;
-    // height: 77rpx;
-    // background: #FFFFFF;
-
-  }
-
-  .out_box {
-    padding-top: 75rpx;
-  }
-
-  .eventList_box {
-    margin: 0 auto;
-    margin-top: 21rpx;
-    width: 694rpx;
-    min-height: 221rpx;
-    background: #FFFFFF;
-    border-radius: 7rpx;
-    padding: 0 24.53rpx 10.53rpx 24.53rpx;
-
-    .banner {
-      display: flex;
-      align-items: center;
-      flex: 1 1 3;
-      width: 100%;
-      height: 82rpx;
-      font-size: 32rpx;
-
-      .title {
-        // width: 438.6rpx;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      .department {
-        color: $theme-oa-color;
-        font-size: 25rpx;
-        margin-left: 17.52rpx;
-        flex-grow: 2;
-      }
-
-      .underway {
-        color: #34A853;
-      }
-
-      .pass {
-        color: $theme-oa-color;
-      }
-
-      .wait {
-        color: #F9AA32;
-      }
-
-      .refuse {
-        color: #F02828;
-      }
-
-      .withdraw {
-        color: #CCCCCC;
-      }
-    }
-
-    .line {
-      margin: 0 auto;
-      width: 646rpx;
-      height: 0rpx;
-      border-bottom: 1rpx solid #CCCCCC;
-      margin-bottom: 14.02rpx;
-    }
-
-    .task_approval {
-      font-size: 28rpx;
-      margin-bottom: 26rpx;
-    }
-
-    .approval_time {
-      font-size: 25rpx;
-      color: #999;
-      // position: relative;
-    }
-
+  .p_list{
+    padding-top: 28rpx;
   }
 </style>
\ No newline at end of file
diff --git a/static/img/company/SHZZ.png b/static/img/company/SHZZ.png
new file mode 100644
index 0000000..dfe9c3b
Binary files /dev/null and b/static/img/company/SHZZ.png differ
diff --git a/subpkg/merchantAudit/merchantAudit.vue b/subpkg/merchantAudit/merchantAudit.vue
new file mode 100644
index 0000000..9b814bb
--- /dev/null
+++ b/subpkg/merchantAudit/merchantAudit.vue
@@ -0,0 +1,154 @@
+<template>
+  <view class="">
+    <u-sticky bgColor="#0022C7">
+      <u-tabs :list="tabLists" @click="changeCurrent" lineColor='white' :scrollable="false" lineWidth='20'
+        inactiveStyle='color:white' activeStyle="color:white"></u-tabs>
+    </u-sticky>
+    <view class="p_list">
+      <view class="card">
+        <view class="nav_bar">
+          <view class="left">
+            <image src="../../static/img/company/company.png"></image>
+            <view>爱读蛋糕</view>
+          </view>
+          <view class="right" @click="navTo(`/subpkg/merchantDetails/merchantDetails?id=${id=1}`)">
+            <text>查看</text>
+            <u-icon name="arrow-right" size="12" color="#fff"></u-icon>
+          </view>
+        </view>
+        <view class="body">
+          <view class="b_item name">
+            <view class="text"><view>商户姓名:</view> <view>某moods v你的伤口v技能大赛空军第三空间</view></view>
+            <view class="type">
+              <text v-if="true" style="color: #ff7c32;">未审核</text>
+              <text v-else-if="true" style="color: #47be62;">已通过</text>
+              <text v-else style="color: #FF0000;">未通过</text>
+            </view>
+          </view>
+          <view class="b_item"><view>商户分类:</view> <view>商超</view></view>
+          <view class="b_item"><view>店铺分类:</view> <view>分类</view></view>
+          <view class="b_item"><view>镇街店铺:</view> <view>店铺</view></view>
+          <view class="b_item"><view>联系方式:</view> <view>1999999999</view></view>
+          <view class="b_item"><view>申请时间:</view> <view>2023-09-09</view></view>
+          <view class="img">
+            <image src="../../uni_modules/guyue-updater/assets/bg1.png"></image>
+            <image src="../../uni_modules/guyue-updater/assets/bg1.png"></image>
+            <image src="../../uni_modules/guyue-updater/assets/bg1.png"></image>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        tabLists: [{
+            name: '全部',
+          }, {
+            name: '未审核'
+          }, {
+            name: '已开通'
+          },
+          {
+            name: '未通过'
+          },
+        ],
+      }
+    },
+    onLoad() {},
+    onShow() {},
+    onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    },
+    methods: {
+      changeCurrent(e) {
+        this.current = e.index;
+      },
+      navTo (url) {
+        if (url) {
+          uni.navigateTo({
+            url: url,
+          })
+        } else Toast('暂未开放')
+      },
+    },
+
+  }
+</script>
+
+<style lang="scss">
+.p_list{
+  padding-top: 28rpx;
+  .card{
+    margin: 0 auto;
+    margin-bottom: 28rpx;
+    width: 694rpx;
+    background-color: #fff;
+    border-radius: 26rpx;
+    overflow: hidden;
+    .nav_bar{
+      background-color: #0122c7;
+      padding: 28rpx;
+      color: #fff;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .left{
+        display: flex;
+        font-size: 32rpx;
+        image{
+          width: 40rpx;
+          height: 40rpx;
+          margin-right: 16rpx;
+        }
+      }
+      .right{
+        display: flex;
+        font-size: 28rpx;
+        align-items: center;
+      }
+    }
+    .body{
+      font-size: 28rpx;
+      padding: 28rpx;
+      .b_item{
+        padding-bottom: 16rpx;
+        display: flex;
+        view:nth-child(1){
+          flex-shrink: 0;
+          padding-right: 10rpx;
+        }
+      }
+      .name{
+        display: flex;
+        justify-content: space-between;
+        .text{
+          flex: 1;
+          display: flex;
+          view:nth-child(1){
+            flex-shrink: 0;
+          }
+        }
+        .type{
+          flex-shrink: 0;
+        }
+      }
+      .img{
+        display: flex;
+        
+        image{
+          width: 200rpx;
+          height: 150rpx;
+          margin-right: 19rpx;
+          &:last-child{
+            margin-right: 0;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/subpkg/merchantDetails/merchantDetails.vue b/subpkg/merchantDetails/merchantDetails.vue
new file mode 100644
index 0000000..57bfe8b
--- /dev/null
+++ b/subpkg/merchantDetails/merchantDetails.vue
@@ -0,0 +1,169 @@
+<template>
+  <view class="">
+    <view class="p_list">
+      <view class="card">
+        <view class="nav_bar">
+          <view class="left">
+            <image src="../../static/img/company/company.png"></image>
+            <view>爱读蛋糕</view>
+          </view>
+        </view>
+        <view class="body">
+          <view class="b_item name">
+            <view class="text"><view>商户分类:</view> <view>商超</view></view>
+            <view class="type">
+              <text v-if="true" style="color: #ff7c32;">未审核</text>
+              <text v-else-if="true" style="color: #47be62;">已通过</text>
+              <text v-else style="color: #FF0000;">未通过</text>
+            </view>
+          </view>
+          <view class="b_item"><view>商户分类:</view> <view>商超</view></view>
+          <view class="b_item"><view>店铺类型:</view> <view>镇街店铺</view></view>
+          <view class="b_item"><view>申请时间:</view> <view>1999999999</view></view>
+          <view class="b_item"><view>联系方式:</view> <view>2023-09-18  14:00:01</view></view>
+          <view class="b_item"><view>店铺所在地:</view> <view>泸州市江阳区通滩镇通滩社区</view></view>
+          <view class="b_item"><view>详细地址:</view> <view>泸州市江阳区通滩镇通滩社区龙南路125号</view></view>
+          <view class="b_item"><view>公司名称:</view> <view>2023-09-09</view></view>
+          <view class="b_item"><view>法人姓名:</view> <view>2023-09-09</view></view>
+          <view class="b_item"><view>社会代码:</view> <view>1515616516516516516565465</view></view>
+        </view>
+      </view>
+      <view class="card">
+        <view class="nav_bar">
+          <view class="left">
+            <image src="../../static/img/company/SHZZ.png"></image>
+            <view>商户资质信息</view>
+          </view>
+        </view>
+        <view class="body">
+          <image @click="priview('../../uni_modules/guyue-updater/assets/bg1.png')" src="../../uni_modules/guyue-updater/assets/bg1.png"></image>
+          <view style="border-top: 1px dashed #0022c7;margin: 28rpx 0;"></view>
+          <image @click="priview('../../uni_modules/guyue-updater/assets/bg1.png')" src="../../uni_modules/guyue-updater/assets/bg1.png"></image>
+        </view>
+      </view>
+    </view>
+    <button class="btn">通过</button>
+    <button class="btn" style="background-color: #fff;color: #0122c7;">拒绝</button>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+       
+    }
+  },
+  onLoad() {},
+  onShow() {},
+  methods: {
+    priview(url) {
+    	uni.previewImage({
+    		urls: [url],
+    		longPressActions: {
+    			itemList: ['保存图片'],
+    			success: function(data) {
+    				if (data.tapIndex === 0) {
+    					uni.saveImageToPhotosAlbum({
+    						filePath: url,
+    						success: function() {
+    							uni.showToast({
+    								title: '保存成功',
+    								icon: 'success'
+    							})
+    						},
+    						fail: function() {
+    							uni.showToast({
+    								title: '保存失败',
+    								icon: 'none'
+    							})
+    						}
+    					})
+    				}
+    			}
+    		}
+    	})
+    },
+  },
+  onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    }
+  }
+</script>
+
+<style lang="scss">
+.p_list{
+  padding-top: 28rpx;
+  .card{
+    margin: 0 auto;
+    margin-bottom: 28rpx;
+    width: 694rpx;
+    background-color: #fff;
+    border-radius: 26rpx;
+    overflow: hidden;
+    .nav_bar{
+      background-color: #0122c7;
+      padding: 28rpx;
+      color: #fff;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .left{
+        display: flex;
+        font-size: 32rpx;
+        image{
+          width: 40rpx;
+          height: 40rpx;
+          margin-right: 16rpx;
+        }
+      }
+      .right{
+        display: flex;
+        font-size: 28rpx;
+        align-items: center;
+      }
+    }
+    .body{
+      font-size: 28rpx;
+      padding: 28rpx;
+      .b_item{
+        padding-bottom: 16rpx;
+        display: flex;
+        view:nth-child(1){
+          flex-shrink: 0;
+          padding-right: 10rpx;
+        }
+      }
+      .name{
+        display: flex;
+        justify-content: space-between;
+        .text{
+          flex: 1;
+          display: flex;
+          view:nth-child(1){
+            flex-shrink: 0;
+          }
+        }
+        .type{
+          flex-shrink: 0;
+        }
+      }
+      image{
+        width: 638rpx;
+        height: 400rpx;
+      }
+    }
+  }
+}
+.btn{
+  width: 694rpx;
+  height: 100rpx;
+  margin: 28rpx auto;
+  background-color: #0122c7;
+  border: 1rpx solid #0122c7;
+  color: #fff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>
diff --git a/subpkg/merchantTransaction/merchantTransaction.vue b/subpkg/merchantTransaction/merchantTransaction.vue
new file mode 100644
index 0000000..bee39cf
--- /dev/null
+++ b/subpkg/merchantTransaction/merchantTransaction.vue
@@ -0,0 +1,23 @@
+<template>
+  <view class=""></view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+       
+    }
+  },
+  onLoad() {},
+  onShow() {},
+  methods: {},
+  onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    }
+  }
+</script>
+
+<style lang="scss">
+
+</style>