✨ feat(merchant):资质信息接口对接和文件改动

src/api/merchant/merchantAuth.js

@@ -4,7 +4,7 @@ import { request } from '@/utils/request';
  * @param {*} data
  * @returns
  */
-export function addMerchantAuth( data) {
+export function addMerchantAuth(data) {
   return request({
     url: `/maintain/merchantAuth`,
     method: 'post',
@@ -13,4 +13,21 @@ export function addMerchantAuth( data) {
       'Content-Type': 'application/json',
     },
   });
-}
+}
+
+/**
+ * @description 获取商家资质信息
+ * @param {*} data 
+ * @returns 
+ */
+
+export function getMerchantAuthData(data) {
+  return request({
+    url: `/maintain/merchantAuth/queryById`,
+    method: 'post',
+    data: data,
+    header: {
+      'Content-Type': 'application/json',
+    },
+  });
+}

src/components/tabbar/index.vue

@@ -89,35 +89,35 @@ export default {
         {
           text: '订单',
           name: 'merchantOrder',
-          pagePath: 'pages/merchant/tabBar/order/index',
+          pagePath: 'pages/merchant/order/index',
           iconPath: '/static/images/home.png',
           selectedIconPath: '/static/images/home-select.png',
         },
         {
           text: '消息',
           name: 'merchantMessage',
-          pagePath: 'pages/merchant/tabBar/message/index',
+          pagePath: 'pages/merchant/message/index',
           iconPath: '/static/images/community.png',
           selectedIconPath: '/static/images/community-select.png',
         },
         // {
         //   text: '推广',
         //   name: 'merchantExtend',
-        //   pagePath: 'pages/merchant/tabBar/extend/index',
+        //   pagePath: 'pages/merchant/extend/index',
         //   iconPath: '/static/images/community.png',
         //   selectedIconPath: '/static/images/community-select.png',
         // },
         {
           text: '店铺',
           name: 'merchantStore',
-          pagePath: 'pages/merchant/tabBar/store/index',
+          pagePath: 'pages/merchant/store/index',
           iconPath: '/static/images/message.png',
           selectedIconPath: '/static/images/message-select.png',
         },
         {
           text: '我的',
           name: 'merchantMine',
-          pagePath: 'pages/merchant/tabBar/mine/index',
+          pagePath: 'pages/merchant/mine/index',
           iconPath: '/static/images/mine.png',
           selectedIconPath: '/static/images/mine-select.png',
         },

src/pages.json

@@ -298,54 +298,54 @@
 		"root": "pages/merchant",
 		"pages": [
 			{
-			  "path": "tabBar/extend/index",
+			  "path": "extend/index",
 			  "style": {
 			    "navigationBarTitleText": "推广",
 			    "navigationStyle": "custom"
 			  }
 			},
 			{
-			  "path": "tabBar/mine/index",
+			  "path": "mine/index",
 			  "style": {
 			    "navigationBarTitleText": "我的",
 			    "navigationStyle": "custom"
 			  }
 			},
 			{
-			  "path": "tabBar/mine/setting/index",
+			  "path": "mine/setting/index",
 			  "style": {
 			    "navigationBarTitleText": "设置",
 			    "navigationStyle": "default"
 			  }
 			},
 			{
-			  "path": "tabBar/mine/setting/accountSafety",
+			  "path": "mine/setting/accountSafety",
 			  "style": {
 			    "navigationBarTitleText": "账号与安全"
 			  }
 			},
 			{
-			  "path": "tabBar/mine/setting/bindPhoneAndEmail",
+			  "path": "mine/setting/bindPhoneAndEmail",
 			  "style": {
 			    "navigationBarTitleText": ""
 			  }
 			},
 			{
-			  "path": "tabBar/mine/setting/phoneAndEmail",
+			  "path": "mine/setting/phoneAndEmail",
 			  "style": {
 			    "navigationBarTitleText": ""
 			  }
 			},
 
 			{
-			  "path": "tabBar/mine/setting/privacyPolicy",
+			  "path": "mine/setting/privacyPolicy",
 			  "style": {
 			    "navigationBarTitleText": ""
 			  }
 			},
 
 			{
-			  "path": "tabBar/mine/openStore/index",
+			  "path": "mine/openStore/index",
 			  "style": {
 			    "navigationBarTitleText": "我要开店",
 			    "navigationStyle": "default"
@@ -353,86 +353,83 @@
 			},
 
 			{
-			  "path": "tabBar/mine/openStore/storeInformation",
+			  "path": "mine/openStore/storeInformation",
 			  "style": {
 			    "navigationBarTitleText": "1/3门店信息",
 			    "navigationStyle": "default"
 			  }
 			},
 			{
-			  "path": "tabBar/mine/openStore/corporateInformation",
+			  "path": "mine/openStore/corporateInformation",
 			  "style": {
 			    "navigationBarTitleText": "2/3法人信息"
 			  }
 			},
 			{
-			  "path": "tabBar/mine/openStore/messageSubmit",
+			  "path": "mine/openStore/messageSubmit",
 			  "style": {
 			    "navigationBarTitleText": "审核信息"
 			  }
 			},
 			{
-			  "path": "tabBar/mine/openStore/openStoreAppealDetail",
+			  "path": "mine/openStore/openStoreAppealDetail",
 			  "style": {
 			    "navigationBarTitleText": "资质信息"
-			    // "navigationBarTitleText": "开店申请详情"
 			  }
 			},
 			{
-			  "path": "tabBar/mine/openStore/qualificationInformation",
+			  "path": "mine/openStore/qualificationInformation",
 			  "style": {
 			    "navigationBarTitleText": "2/3资质信息"
 			  }
 			},
-
-
 			{
-			  "path": "tabBar/message/index",
+			  "path": "message/index",
 			  "style": {
 			    "navigationBarTitleText": "消息",
 			    "navigationStyle": "custom"
 			  }
 			},
 			{
-			  "path": "tabBar/message/systemNotice",
+			  "path": "message/systemNotice",
 			  "style": {
 			    "navigationBarTitleText": "订单",
 			    "navigationStyle": "custom"
 			  }
 			},
 			{
-			  "path": "tabBar/store/index",
+			  "path": "store/index",
 			  "style": {
 			    "navigationBarTitleText": "店铺",
 			    "navigationStyle": "custom"
 			  }
 			},
 			{
-			  "path": "tabBar/store/evaluateBack",
+			  "path": "store/evaluateBack",
 			  "style": {
 			    "navigationBarTitleText": "回复评价"
 			  }
 			},
 			{
-			  "path": "tabBar/store/evaluateManagement",
+			  "path": "store/evaluateManagement",
 			  "style": {
 			    "navigationBarTitleText": "评价管理"
 			  }
 			},
 			{
-			  "path": "tabBar/store/myTeam",
+			  "path": "store/myTeam",
 			  "style": {
 			    "navigationBarTitleText": "我的团队"
 			  }
 			},
 			{
-			  "path": "tabBar/store/shopManage",
+			  "path": "store/shopManage",
 			  "style": {
 			    "navigationBarTitleText": "店铺管理"
 			  }
 			},
 			{
-			  "path": "tabBar/order/index",
+			  "path": "order/index",
 			  "style": {
 			    "navigationBarTitleText": "订单",
 			    "navigationStyle": "custom"

src/pages/client/clientUser/mine/setting.vue

@@ -51,7 +51,7 @@
         this.showSwitchDialog = false;
         uni.setStorageSync('tabbar_type', false);
         uni.navigateTo({
-          url: '/pages/merchant/tabBar/mine/index',
+          url: '/pages/merchant/mine/index',
         });
       },
     },

src/pages/client/tabBar/mine/TapList.vue

@@ -115,7 +115,7 @@ export default {
       this.showSwitchDialog = false;
       uni.setStorageSync('tabbar_type', false);
       uni.navigateTo({
-        url: '/pages/merchant/tabBar/mine/index',
+        url: '/pages/merchant/mine/index',
       });
     },
   },

src/pages/merchant/tabBar/message/index.vue → src/pages/merchant/message/index.vue

@@ -134,7 +134,7 @@ export default {
     // 点击跳转到系统通知
     handlerSkipSystemNotice(value){
       uni.navigateTo({
-        url:`/pages/merchant/tabBar/message/systemNotice?type=${value.id}`
+        url:`/pages/merchant/message/systemNotice?type=${value.id}`
       })
     }
   }

src/pages/merchant/tabBar/mine/index.vue → src/pages/merchant/mine/index.vue

@@ -119,12 +119,12 @@ export default {
         {
           id: '2',
           name: '我要开店',
-          url: '/pages/merchant/tabBar/mine/openStore/index',
+          url: '/pages/merchant/mine/openStore/index',
         },
         {
           id: '3',
           name: '资质信息',
-          url: '/pages/merchant/tabBar/mine/openStore/openStoreAppealDetail',
+          url: '/pages/merchant/mine/openStore/openStoreAppealDetail',
         },
       ],
 
@@ -137,7 +137,7 @@ export default {
         {
           id: '2',
           name: '设置',
-          url: '/pages/merchant/tabBar/mine/setting/index',
+          url: '/pages/merchant/mine/setting/index',
         },
       ],
     };
@@ -181,7 +181,7 @@ export default {
     // 点击跳转到设置
     handlerSkipSetting() {
       uni.navigateTo({
-        url: '/pages/merchant/tabBar/mine/setting/index',
+        url: '/pages/merchant/mine/setting/index',
       });
     },
 

src/pages/merchant/tabBar/mine/openStore/corporateInformation.vue → src/pages/merchant/mine/openStore/corporateInformation.vue

@@ -52,7 +52,7 @@
 </template>
 
 <script>
-  import ImgsUpload from "@/pages/merchant/tabBar/mine/openStore/components/ImgsUpload.vue"
+  import ImgsUpload from "@/pages/merchant/mine/openStore/components/ImgsUpload.vue"
   export default {
     data() {
       return {
@@ -71,7 +71,7 @@
       // 跳转到4/4资质信息
       handlerSkipNext() {
         uni.navigateTo({
-          url: '/pages/merchant/tabBar/mine/openStore/qualificationInformation'
+          url: '/pages/merchant/mine/openStore/qualificationInformation'
         })
       },
       change(e) {

src/pages/merchant/tabBar/mine/openStore/index.vue → src/pages/merchant/mine/openStore/index.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import topProcess from '@/pages/merchant/tabBar/mine/openStore/components/top-process.vue';
+import topProcess from '@/pages/merchant/mine/openStore/components/top-process.vue';
 export default {
   data() {
     return {
@@ -58,7 +58,7 @@ export default {
     handlerSkipOpenShop() {
       if (this.checked.length != 0) {
         uni.navigateTo({
-          url: 'pages/merchant/tabBar/mine/openStore/storeInformation',
+          url: 'pages/merchant/mine/openStore/storeInformation',
         });
       } else {
         uni.showToast({

src/pages/merchant/tabBar/mine/openStore/messageSubmit.vue → src/pages/merchant/mine/openStore/messageSubmit.vue

@@ -33,7 +33,7 @@ export default {
     // 点击跳转到开店详情页面
     handlerSkipComplate() {
       uni.redirectTo({
-        url: '/pages/merchant/tabBar/mine/openStore/openStoreAppealDetail',
+        url: '/pages/merchant/mine/openStore/openStoreAppealDetail',
       });
     },
   },

src/pages/merchant/tabBar/mine/openStore/openStoreAppealDetail.vue → src/pages/merchant/mine/openStore/openStoreAppealDetail.vue

@@ -7,33 +7,22 @@
 
     <view class="content-item">
       <view class="item-l">
-        <p>负责人 : 张店长</p>
-        <p>手机号 : +6819932049921</p>
+        <p>负责人 : {{ merchantAuthList.legalRepresentativeName || "--" }}</p>
+        <p>手机号 : {{ merchantAuthList.mobileNumber || "--" }}</p>
       </view>
       <img class="img" src="@/static/mine/icon_mine_underReview.png" alt="" />
     </view>
 
     <view class="content-item">
       <view class="item-l">
-        <p>店铺类型 : 餐饮店铺</p>
-        <p>手机号 : +6819932049921</p>
-
-        <p>中文店名字 : yizhiyang的鲜花店(云岩区店)</p>
-        <p>英文店名字 : yizhiyang Flowers Shop(Yunyan District Store)</p>
-        <p>所在地 : yizhiyang的鲜花店</p>
-        <p>详细地址 : yizhiyang的鲜花店</p>
+        <p>店名 :  {{ merchant.name || "--" }}</p>
+        <p>店铺类型 : {{ merchantAuthList.mobileNumber || "--" }}</p>
+        <p>手机号 :   {{ merchantAuthList.mobileNumber || "--" }}</p>
+        <p>所在地 :  {{ merchantAuthList.storeAddress || "--" }}</p>
+        <p>详细地址 :  {{ merchant.address || "--" }}</p>
       </view>
     </view>
 
-    <!-- <view class="content-item">
-      <view class="item-l">
-        <p>中文店名字 : yizhiyang的鲜花店(云岩区店)</p>
-        <p>英文店名字 : yizhiyang Flowers Shop(Yunyan District Store)</p>
-        <p>所在地 : yizhiyang的鲜花店</p>
-        <p>详细地址 : yizhiyang的鲜花店</p>
-      </view>
-    </view> -->
-
     <view class="content-item2">
       <view class="item2-box">
         <img class="img2" src="@/static/logo.png" alt="" />
@@ -47,11 +36,10 @@
 
     <view class="content-item2">
       <view class="item-l">
-        <p>法人姓名 : yizhiyang的鲜花店(云岩区店)</p>
-        <p>性别 : yizhiyang Flowers Shop(Yunyan District Store)</p>
-        <p>证件类型 : yizhiyang的鲜花店</p>
-        <p>证件号码 : yizhiyang的鲜花店</p>
-        <p>有效期 : yizhiyang的鲜花店</p>
+        <p>法人姓名 :  {{ merchantAuthList.legalRepresentativeName || "--" }}</p>
+        <p>性别 :  {{ merchantAuthList.legalRepresentativeGender || "--" }}</p>
+        <p>证件号码 : {{ merchantAuthList.idCardNumber || "--" }}</p>
+        <p>有效期 :  {{ merchantAuthList.idCardExpirationDate || "--" }}</p>
       </view>
       <view class="item2-box">
         <img class="img2" src="@/static/logo.png" alt="" />
@@ -65,9 +53,21 @@
 
     <view class="content-item2">
       <view class="item-l">
-        <p>证件名称 : yizhiyang的鲜花店(云岩区店)</p>
-        <p>证件编号 : yizhiyang Flowers Shop(Yunyan District Store)</p>
-        <p>有效期 : yizhiyang的鲜花店</p>
+        <p>证件名称 :  营业执照</p>
+        <p>证件编号 :  {{ merchantAuthList.mobileNumber || "--" }}</p>
+        <p>有效期 : {{ merchantAuthList.mobileNumber || "--" }}</p>
+      </view>
+      <view class="item2-box">
+        <img class="img2" src="@/static/logo.png" alt="" />
+        <view class="img-text">证件正面图</view>
+      </view>
+    </view>
+
+    <view class="content-item2">
+      <view class="item-l">
+        <p>证件名称 :  经营许可证</p>
+        <p>证件编号 :  {{ merchantAuthList.mobileNumber || "--" }}</p>
+        <p>有效期 : {{ merchantAuthList.mobileNumber || "--" }}</p>
       </view>
       <view class="item2-box">
         <img class="img2" src="@/static/logo.png" alt="" />
@@ -75,29 +75,37 @@
       </view>
     </view>
 
-    <button class="btn" @click="handlerSkipHome">确定</button>
   </view>
 </template>
 
 <script>
+import { getMerchantAuthData } from '@/api/merchant/merchantAuth';
 export default {
   data() {
-    return {};
+    return {
+      merchantAuthList: {},
+      merchant: {},
+    };
   },
   methods: {
-    // 点击跳转到主页
-    handlerSkipHome() {
-      uni.switchTab({
-        url: '/pages/merchant/tabBar/mine/index',
-      });
+
+    async getMerchantAuth() {
+      let res = await getMerchantAuthData();
+      console.log('@@@res', res);
+
+      if (res.code == 200) {
+        this.merchantAuthList = res.data;
+        this.merchant = res.data = res.data.merchant;
+      }
     },
   },
+  created() {
+    this.getMerchantAuth();
+  },
 };
 </script>
 
 <style lang="scss" scoped>
-page {
-}
 .container {
   padding: 20rpx;
   background-color: #f5f5f5 !important;
@@ -145,13 +153,5 @@ page {
       }
     }
   }
-  .btn {
-    background-color: #5992bb !important;
-    color: #fff;
-    font-size: 32rpx;
-    border-radius: 40rpx;
-    margin-top: 40rpx;
-    width: 95%;
-  }
 }
 </style>

src/pages/merchant/tabBar/mine/openStore/qualificationInformation.vue → src/pages/merchant/mine/openStore/qualificationInformation.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script>
-  import ImgsUpload from "@/pages/merchant/tabBar/mine/openStore/components/ImgsUpload.vue"
+  import ImgsUpload from "@/pages/merchant/mine/openStore/components/ImgsUpload.vue"
   export default {
     data() {
       return {
@@ -73,7 +73,7 @@
       // 跳转到提交成功页面
       handlerSkipNext() {
         uni.navigateTo({
-          url: '/pages/merchant/tabBar/mine/openStore/messageSubmit'
+          url: '/pages/merchant/mine/openStore/messageSubmit'
         })
       },
       change(e) {

src/pages/merchant/tabBar/mine/openStore/selectCategory.vue → src/pages/merchant/mine/openStore/selectCategory.vue

@@ -328,7 +328,7 @@ export default {
     // 跳转到下一步
     handlerSkipNext() {
       uni.navigateTo({
-        url: 'pages/merchant/tabBar/mine/openStore/storeInformation',
+        url: 'pages/merchant/mine/openStore/storeInformation',
       });
     },
   },

src/pages/merchant/tabBar/mine/openStore/storeInformation copy.vue → src/pages/merchant/mine/openStore/storeInformation copy.vue

@@ -105,7 +105,7 @@
 </template>
 
 <script>
-import ImgsUpload from '@/pages/merchant/tabBar/mine/openStore/components/ImgsUpload.vue';
+import ImgsUpload from '@/pages/merchant/mine/openStore/components/ImgsUpload.vue';
 export default {
   data() {
     return {
@@ -135,7 +135,7 @@ export default {
   methods: {
     handlerSkipNext() {
       uni.navigateTo({
-        url: '/pages/merchant/tabBar/mine/openStore/corporateInformation',
+        url: '/pages/merchant/mine/openStore/corporateInformation',
       });
     },
     change(e) {

src/pages/merchant/tabBar/mine/openStore/storeInformation.vue → src/pages/merchant/mine/openStore/storeInformation.vue

@@ -105,7 +105,7 @@
 </template>
 
 <script>
-import ImgsUpload from '@/pages/merchant/tabBar/mine/openStore/components/ImgsUpload.vue';
+import ImgsUpload from '@/pages/merchant/mine/openStore/components/ImgsUpload.vue';
 export default {
   data() {
     return {
@@ -135,7 +135,7 @@ export default {
   methods: {
     handlerSkipNext() {
       uni.navigateTo({
-        url: '/pages/merchant/tabBar/mine/openStore/corporateInformation',
+        url: '/pages/merchant/mine/openStore/corporateInformation',
       });
     },
     change(e) {

src/pages/merchant/tabBar/order/index.vue → src/pages/merchant/order/index.vue

@@ -32,7 +32,7 @@
 </template>
 
 <script>
-  import orderItem from "@/pages/merchant/tabBar/order/components/orderItem.vue"
+  import orderItem from "@/pages/merchant/order/components/orderItem.vue"
   import {getOrderListApi } from "@/api/merchant/order"
 export default {
   data() {

src/pages/merchant/tabBar/store/evaluateManagement.vue → src/pages/merchant/store/evaluateManagement.vue

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-  import evaluateItem from "@/pages/merchant/tabBar/store/components/evaluateItem.vue"
+  import evaluateItem from "@/pages/merchant/store/components/evaluateItem.vue"
   import {getEvaluateListApi} from "@/api/merchant/evaluate"
   export default {
     data() {

src/pages/merchant/tabBar/store/index.vue → src/pages/merchant/store/index.vue

@@ -132,17 +132,17 @@ export default {
       switch (index) {
         case 0:
           uni.navigateTo({
-            url: '/pages/merchant/tabBar/store/shopManage',
+            url: '/pages/merchant/store/shopManage',
           });
           break;
         case 1:
           uni.navigateTo({
-            url: '/pages/merchant/tabBar/store/evaluateManagement',
+            url: '/pages/merchant/store/evaluateManagement',
           });
           break;
         case 5:
           uni.navigateTo({
-            url: '/pages/merchant/tabBar/store/myTeam',
+            url: '/pages/merchant/store/myTeam',
           });
           break;
       }