认证入口

src/pageMerchant/mineModule/certification/messageSubmit.vue

@@ -1,116 +1,120 @@
-<template>
-	<view class="container">
-		<view class="top-box">
-			<img class="img" src="@/static/mine/icon_mine_success.png" alt="" />
-			<p class="top-text">提交成功</p>
-		</view>
-
-		<view class="content-box">
-			<view class="content-item">
-				<view class="item-l">店铺名称</view>
-				<view class="item-r">{{ listInfo.storeName }}</view>
-			</view>
-			<view class="content-item">
-				<view class="item-l">法人名称</view>
-				<view class="item-r">{{ listInfo.legalRepresentativeName }}</view>
-			</view>
-			<view class="content-item">
-				<view class="item-l">详情地址</view>
-				<view class="item-r">{{ listInfo.storeAddressDetail }}</view>
-			</view>
-		</view>
-
-		<button class="btn" @click="handlerBackHome">返回首页</button>
-		<button class="btn" @click="handlerViewDetail">查看详情</button>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				listInfo: {},
-			};
-		},
-		onShow() {
-			let legalInfo = this.$store.state.data.legalInfo;
-			let storeInfo = this.$store.state.data.storeInfo;
-			let aptitudeInfo = this.$store.state.data.aptitudeInfo;
-
-			this.listInfo = Object.assign({}, {
-				...legalInfo,
-				...storeInfo,
-				...aptitudeInfo,
-			}, );
-			console.log(this.listInfo);
-		},
-		methods: {
-			// 点击跳转到开店详情页面
-			handlerViewDetail() {
-				uni.redirectTo({
-					url: '/pageMerchant/mineModule/certification/openStoreAppealDetail',
-				});
-			},
-			// 点击跳转到首页
-			handlerBackHome() {
-				uni.redirectTo({
-					url: '/pageMerchant/tabbar/mine',
-				});
-			}
-		},
-	};
-</script>
-
-<style lang="scss" scoped>
-	.container {
-		.top-box {
-			text-align: center;
-			margin-top: 100rpx;
-
-			.img {
-				width: 200rpx;
-				height: 200rpx;
-			}
-
-			.top-text {
-				font-size: 40rpx;
-				font-weight: bold;
-				margin-top: 20rpx;
-			}
-		}
-
-		.content-box {
-			margin: 200rpx auto 50rpx;
-			width: 80%;
-			border-top: 2rpx solid #f3f3f3;
-			border-bottom: 2rpx solid #f3f3f3;
-			padding: 20rpx;
-
-			.content-item {
-				display: flex;
-				justify-content: space-between;
-				margin: 20rpx 0;
-				font-size: 28rpx;
-
-				.item-l {
-					color: #000;
-				}
-
-				.item-r {
-					color: #9a9a9a;
-				}
-			}
-		}
-
-		.btn {
-			background-color: #5992bb !important;
-			color: #fff;
-			font-size: 32rpx;
-			border-radius: 40rpx;
-			margin-top: 100rpx;
-			margin-bottom: 100rpx;
-			width: 90%;
-		}
-	}
-</style>
+<template>
+	<view class="container">
+		<view class="top-box">
+			<img class="img" src="@/static/mine/icon_mine_success.png" alt="" />
+			<p class="top-text">提交成功</p>
+		</view>
+
+		<view class="content-box">
+			<view class="content-item">
+				<view class="item-l">店铺名称</view>
+				<view class="item-r">{{ listInfo.storeName }}</view>
+			</view>
+			<view class="content-item">
+				<view class="item-l">法人名称</view>
+				<view class="item-r">{{ listInfo.legalRepresentativeName }}</view>
+			</view>
+			<view class="content-item">
+				<view class="item-l">详情地址</view>
+				<view class="item-r">{{ listInfo.storeAddressDetail }}</view>
+			</view>
+		</view>
+
+		<button class="btn" @click="handlerBackHome">返回首页</button>
+		<button class="btn" @click="handlerViewDetail">查看详情</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				listInfo: {},
+			};
+		},
+		onShow() {
+			let legalInfo = this.$store.state.data.legalInfo;
+			let storeInfo = this.$store.state.data.storeInfo;
+			let aptitudeInfo = this.$store.state.data.aptitudeInfo;
+
+			this.listInfo = Object.assign({}, {
+				...legalInfo,
+				...storeInfo,
+				...aptitudeInfo,
+			}, );
+			console.log(this.listInfo);
+		},
+		methods: {
+			// 点击跳转到开店详情页面
+			handlerViewDetail() {
+				uni.redirectTo({
+					url: '/pageMerchant/mineModule/certification/openStoreAppealDetail',
+				});
+			},
+			// 点击跳转到首页
+			handlerBackHome() {
+				// uni.redirectTo({
+				// 	url: '/pageMerchant/tabbar/mine',
+
+				// });
+				uni.switchTab({
+					url: '/pages/tabbar/home'
+				});
+			}
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		.top-box {
+			text-align: center;
+			margin-top: 100rpx;
+
+			.img {
+				width: 200rpx;
+				height: 200rpx;
+			}
+
+			.top-text {
+				font-size: 40rpx;
+				font-weight: bold;
+				margin-top: 20rpx;
+			}
+		}
+
+		.content-box {
+			margin: 200rpx auto 50rpx;
+			width: 80%;
+			border-top: 2rpx solid #f3f3f3;
+			border-bottom: 2rpx solid #f3f3f3;
+			padding: 20rpx;
+
+			.content-item {
+				display: flex;
+				justify-content: space-between;
+				margin: 20rpx 0;
+				font-size: 28rpx;
+
+				.item-l {
+					color: #000;
+				}
+
+				.item-r {
+					color: #9a9a9a;
+				}
+			}
+		}
+
+		.btn {
+			background-color: #5992bb !important;
+			color: #fff;
+			font-size: 32rpx;
+			border-radius: 40rpx;
+			margin-top: 100rpx;
+			margin-bottom: 100rpx;
+			width: 90%;
+		}
+	}
+</style>
 s

src/pageMerchant/mineModule/certification/openStoreAppealDetail.vue

@@ -101,7 +101,9 @@ export default {
   },
   methods: {},
   onShow() {
-    this.list = this.$store.state.data.merchantInfo;
+    this.list = this.$store.state.data.merchantInfo;
+	console.log(this.list,"查看信息")
+	 
   },
 };
 </script>

src/pageMerchant/tabbar/mine.vue

@@ -1,363 +1,364 @@
-<template>
-  <view class="mine">
-    <!-- 状态栏占位 -->
-    <view class="mine__nav" :style="{ height: 77 + 'px' }" />
-    <view class="mine__person">
-      <view class="mine__person--info">
-        <view @click="$Router.push('/pageMerchant/mineModule/personalInfo')">
-          <image :src="merchantInfo.merchant.logo" style="width: 140rpx; height: 140rpx; border-radius: 50%"
-            v-if="merchantInfo.merchant.logo" />
-          <image src="@/static/QR57a.jpg" style="width: 140rpx; height: 140rpx; border-radius: 50%" v-else />
-        </view>
-        <view class="userName">
-          <view>
-            <view v-if="merchantInfo.storeName"> {{ merchantInfo.storeName }}</view>
-            <view v-else> 微信用户</view>
-          </view>
-          <view>
-            <view v-if="merchantInfo.mobileNumber" class="text">
-              +86 {{ merchantInfo.mobileNumber }}
-            </view>
-            <view v-else class="text">
-              <text style="color: #f6bf3f"> 您当前还未认证，</text>
-              <text @click="$Router.push('/pageMerchant/mineModule/certification/index')">
-                去认证>
-              </text>
-            </view>
-          </view>
-        </view>
-        <view class="status" :style="{ 'background-color': getStatusColor(state) }" @click="show = true">
-          <view style="margin-right: 6rpx">{{ stateName }}</view>
-          <u-icon name="play-right-fill" color="#fff" size="12" />
-        </view>
-      </view>
-    </view>
-
-    <view class="mine__main">
-      <view class="mine__main--purse" @click="toMyPurse">
-       <view class="wallet">
-          <view class="wallet--title">我的钱包</view>
-          <view class="wallet--more">
-            <text>查看钱包余额</text>
-            <u-icon name="arrow-right" color="#333" size="14" />
-          </view>
-        </view>
-        <view class="walletInfo">
-          <view v-for="item,index in incomeList" :key="index">
-            <view class="text-title">{{item.title}}</view>
-            <view class="text-data">￥{{item.num}}</view>
-            <!-- <view class="text-info">最高可用</view> -->
-          </view>
-        </view>
-        <!--        <view class="shortcut">
-          <view style="display: flex">
-            <view>快捷支付</view>
-            <view style="margin: 0 20rpx">|</view>
-            <view>一银升级银行卡用于麦付</view>
-          </view>
-          <u-icon name="arrow-right" color="#fff" size="14" />
-        </view> -->
-      </view>
-
-      <view class="mine__main--setting">
-        <template v-for="item in list1">
-          <u-cell size="large" :border="false" :key="item.name" :title="item.name" isLink :url="item.url">
-            <image slot="icon" src="@/static/tools.jpg" style="width: 60rpx; height: 60rpx" />
-          </u-cell>
-        </template>
-      </view>
-
-      <view class="mine__main--setting">
-        <template v-for="item in list2">
-          <u-cell size="large" :border="false" :key="item.name" :title="item.name" isLink :url="item.url">
-            <image slot="icon" src="@/static/tools.jpg" style="width: 60rpx; height: 60rpx" />
-          </u-cell>
-        </template>
-      </view>
-    </view>
-
-    <!-- 营业状态选择弹框 -->
-    <u-picker :show="show" :columns="columns" @cancel="cancel" @confirm="confirm" keyName="label"></u-picker>
-
-    <!-- 商家认证的弹框 -->
-    <u-modal :show="showAut" :title="title" :content="content" :confirmText="'开始认证'" :cancelText="'返回用户端'"
-      :showCancelButton="true" @confirm="confirmSwitch" @cancel="showAut = false"></u-modal>
-
-    <!-- <tabbar currentTab="merchantMine" /> -->
-  </view>
-</template>
-
-<script>
-  import {
-    getMerchantAuthData
-  } from '@/api/merchant/merchantAuth';
-  import {
-    updateBusinessStatus
-  } from '@/api/merchant/mine';
-  import {
-    phoneEncryption
-  } from '@/utils/tools';
-
-  export default {
-    data() {
-      return {
-        state: 0,
-        stateName: '营业中',
-        show: false,
-        showAut: false,
-        title: '商家认证',
-        content: '进入商家端前，我们需要一定的认证',
-        merchantInfo: {},
-        incomeList: [{
-            num: '0.00',
-            title: '总收益',
-          },
-          {
-            num: '0.00',
-            title: '本月收益',
-          },
-          {
-            num: '0.00',
-            title: '本周收益',
-          },
-          {
-            num: '0.00',
-            title: '可提现',
-          },
-        ],
-        columns: [
-          // 营业状态 0-营业中，1-休息中
-          [{
-              label: '营业中',
-              id: '0',
-            },
-            {
-              label: '休息中',
-              id: '1',
-            },
-          ],
-        ],
-        list1: [{
-            id: '1',
-            name: '门店环境',
-            url: '/pageMerchant/mineModule/storeEnviron',
-          },
-          // {
-          //   id: '2',
-          //   name: '我要开店',
-          //   url: '/pages/merchant/mine/openStore/index',
-          // },
-          {
-            id: '3',
-            name: '资质信息',
-            url: '/pageMerchant/mineModule/openStoreAppealDetail',
-			// url: '/pageMerchant/mineModule/certification/storeInformation',
-          },
-        ],
-
-        list2: [{
-            id: '1',
-            name: '意见反馈',
-            url: 'PageMine/feedback?channelType=1',
-          },
-          {
-            id: '2',
-            name: '设置',
-            url: '/pageMerchant/mineModule/setting/index',
-          },
-        ],
-      };
-    },
-
-    created() {
-      this.getMerchantAuth();
-    },
-
-    mounted() {
-      if (this.merchantInfo) {
-        this.showAut = false;
-      } else {
-        this.showAut = true;
-      }
-    },
-
-    methods: {
-      /*===========================================================*/
-      // 获取商家信息
-      async getMerchantAuth() {
-        let res = await getMerchantAuthData();
-        if (res.code === 'OK') {
-          // 将数据存储到vuex中
-          this.merchantInfo = Object.assign({}, {
-            ...res.data,
-            mobileNumber: phoneEncryption(res.data.mobileNumber),
-          }, );
-
-          this.$store.commit('SET_MERCHANTINFO', res.data);
-        }
-      },
-
-      /*===========================================================*/
-      // 开始认证
-      confirmSwitch() {
-        uni.navigateTo({
-          url: '/pageMerchant/mineModule/certification/index'
-        });
-      },
-
-      /*===========================================================*/
-
-      // 修改商家状态
-      confirm(val) {
-        this.state = val.value[0].id;
-        this.stateName = val.value[0].label;
-        this.show = false;
-
-        updateBusinessStatus(this.merchantInfo.merchant.id, {
-          businessStatus: this.state
-        }).then(
-          res => {
-            if (res.code === 'OK') {
-              this.$u.toast('修改成功');
-            }
-          },
-        );
-      },
-
-      getStatusColor(state) {
-        if (state === 0) {
-          return '#19be6b';
-        } else if (state === 1) {
-          return '#ff9900';
-        }
-      },
-	  toMyPurse(){
-		  uni.navigateto({
-			  url:""
-		  })
-	  }
-
-
-    },
-  };
-</script>
-
-<style lang="scss" scoped>
-  .mine {
-    min-height: calc(100vh - 80rpx);
-    box-sizing: border-box;
-
-    &__nav {
-      background-color: $uni-bg-color-primary;
-    }
-
-    &__person {
-      height: 160rpx;
-      padding: $uni-bg-padding-sm;
-      background-color: $uni-bg-color-primary;
-      position: relative;
-
-      &--info {
-        color: #fff;
-        display: flex;
-
-        .userName {
-          width: 400rpx;
-          font-size: 36rpx;
-          margin: 20rpx 0 0 16rpx;
-
-          .text {
-            margin-top: 15rpx;
-            font-size: 28rpx;
-          }
-        }
-
-        .status {
-          display: flex;
-          position: absolute;
-          bottom: 80rpx;
-          padding-left: 20rpx;
-          right: 0;
-          width: 150rpx;
-          height: 60rpx;
-          font-size: 25rpx;
-          align-items: center;
-          justify-content: center;
-          box-sizing: border-box;
-          border-radius: 30rpx 0 0 30rpx;
-          background-color: rgba(255, 255, 255, 0.3);
-        }
-      }
-    }
-
-    &__main {
-      padding: $uni-bg-padding-sm;
-
-      &--purse {
-        background-color: $uni-bg-color;
-        padding: $uni-bg-padding-sm;
-        border-radius: $uni-border-radius-base;
-
-        .wallet {
-          display: flex;
-          justify-content: space-between;
-          font-size: 28rpx;
-
-          &--title {
-            color: #000;
-            font-size: 36rpx;
-            font-weight: 700;
-          }
-
-          &--more {
-            color: #333;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-          }
-        }
-
-        .walletInfo {
-          margin: 40rpx 0;
-          color: #333;
-          display: flex;
-          text-align: center;
-          justify-content: space-around;
-        }
-
-        // .shortcut {
-        //   height: 70rpx;
-        //   padding: 0 20rpx;
-        //   color: #fff;
-        //   font-size: 28rpx;
-        //   display: flex;
-        //   align-items: center;
-        //   justify-content: space-between;
-        //   background-color: $uni-bg-color-primary;
-        //   border-radius: $uni-border-radius-sm;
-        // }
-      }
-
-      &--setting {
-        margin: 20rpx 0;
-        background-color: $uni-bg-color;
-        padding: $uni-bg-padding-sm;
-        border-radius: $uni-border-radius-base;
-      }
-    }
-  }
-
-  .text-title {
-    font-size: 34rpx;
-  }
-
-  .text-data {
-    font-size: 40rpx;
-    margin: 15rpx 0;
-    font-weight: 700;
-  }
-
-  .text-info {
-    font-size: 24rpx;
-  }
-</style>
+<template>
+	<view class="mine">
+		<!-- 状态栏占位 -->
+		<view class="mine__nav" :style="{ height: 77 + 'px' }" />
+		<view class="mine__person">
+			<view class="mine__person--info">
+				<view @click="$Router.push('/pageMerchant/mineModule/personalInfo')">
+					<image :src="merchantInfo.merchant.logo" style="width: 140rpx; height: 140rpx; border-radius: 50%"
+						v-if="merchantInfo.merchant.logo" />
+					<image src="@/static/QR57a.jpg" style="width: 140rpx; height: 140rpx; border-radius: 50%" v-else />
+				</view>
+				<view class="userName">
+					<view>
+						<view v-if="merchantInfo.storeName"> {{ merchantInfo.storeName }}</view>
+						<view v-else> 微信用户</view>
+					</view>
+					<view>
+						<view v-if=" merchantInfo.mobileNumber" class="text">
+							+86 {{ merchantInfo.mobileNumber }}
+						</view>
+						<view v-else class="text">
+							<text style="color: #f6bf3f"> 您当前还未认证，</text>
+							<text @click="$Router.push('/pageMerchant/mineModule/certification/index')">
+								去认证>
+							</text>
+						</view>
+					</view>
+				</view>
+				<view class="status" :style="{ 'background-color': getStatusColor(state) }" @click="show = true">
+					<view style="margin-right: 6rpx">{{ stateName }}</view>
+					<u-icon name="play-right-fill" color="#fff" size="12" />
+				</view>
+			</view>
+		</view>
+
+		<view class="mine__main">
+			<view class="mine__main--purse" @click="toMyPurse">
+				<view class="wallet">
+					<view class="wallet--title">我的钱包</view>
+					<view class="wallet--more">
+						<text>查看钱包余额</text>
+						<u-icon name="arrow-right" color="#333" size="14" />
+					</view>
+				</view>
+				<view class="walletInfo">
+					<view v-for="item,index in incomeList" :key="index">
+						<view class="text-title">{{item.title}}</view>
+						<view class="text-data">￥{{item.num}}</view>
+						<!-- <view class="text-info">最高可用</view> -->
+					</view>
+				</view>
+				<!--        <view class="shortcut">
+          <view style="display: flex">
+            <view>快捷支付</view>
+            <view style="margin: 0 20rpx">|</view>
+            <view>一银升级银行卡用于麦付</view>
+          </view>
+          <u-icon name="arrow-right" color="#fff" size="14" />
+        </view> -->
+			</view>
+
+			<view class="mine__main--setting">
+				<template v-for="item in list1">
+					<u-cell size="large" :border="false" :key="item.name" :title="item.name" isLink :url="item.url">
+						<image slot="icon" src="@/static/tools.jpg" style="width: 60rpx; height: 60rpx" />
+					</u-cell>
+				</template>
+			</view>
+
+			<view class="mine__main--setting">
+				<template v-for="item in list2">
+					<u-cell size="large" :border="false" :key="item.name" :title="item.name" isLink :url="item.url">
+						<image slot="icon" src="@/static/tools.jpg" style="width: 60rpx; height: 60rpx" />
+					</u-cell>
+				</template>
+			</view>
+		</view>
+
+		<!-- 营业状态选择弹框 -->
+		<u-picker :show="show" :columns="columns" @cancel="cancel" @confirm="confirm" keyName="label"></u-picker>
+
+		<!-- 商家认证的弹框 -->
+		<u-modal :show="showAut" :title="title" :content="content" :confirmText="'开始认证'" :cancelText="'返回用户端'"
+			:showCancelButton="true" @confirm="confirmSwitch" @cancel="showAut = false"></u-modal>
+
+		<!-- <tabbar currentTab="merchantMine" /> -->
+	</view>
+</template>
+
+<script>
+	import {
+		getMerchantAuthData
+	} from '@/api/merchant/merchantAuth';
+	import {
+		updateBusinessStatus
+	} from '@/api/merchant/mine';
+	import {
+		phoneEncryption
+	} from '@/utils/tools';
+
+	export default {
+		data() {
+			return {
+				state: 0,
+				stateName: '营业中',
+				show: false,
+				showAut: false,
+				title: '商家认证',
+				content: '进入商家端前，我们需要一定的认证',
+				merchantInfo: {},
+				incomeList: [{
+						num: '0.00',
+						title: '总收益',
+					},
+					{
+						num: '0.00',
+						title: '本月收益',
+					},
+					{
+						num: '0.00',
+						title: '本周收益',
+					},
+					{
+						num: '0.00',
+						title: '可提现',
+					},
+				],
+				columns: [
+					// 营业状态 0-营业中，1-休息中
+					[{
+							label: '营业中',
+							id: '0',
+						},
+						{
+							label: '休息中',
+							id: '1',
+						},
+					],
+				],
+				list1: [{
+						id: '1',
+						name: '门店环境',
+						url: '/pageMerchant/mineModule/storeEnviron',
+					},
+					// {
+					//   id: '2',
+					//   name: '我要开店',
+					//   url: '/pages/merchant/mine/openStore/index',
+					// },
+					{
+						id: '3',
+						name: '资质信息',
+						url: '/pageMerchant/mineModule/openStoreAppealDetail',
+						// url: '/pageMerchant/mineModule/certification/storeInformation',
+					},
+				],
+
+				list2: [{
+						id: '1',
+						name: '意见反馈',
+						url: 'PageMine/feedback?channelType=1',
+					},
+					{
+						id: '2',
+						name: '设置',
+						url: '/pageMerchant/mineModule/setting/index',
+					},
+				],
+			};
+		},
+
+		created() {
+			this.getMerchantAuth();
+		},
+
+		mounted() {
+			if (this.merchantInfo) {
+				this.showAut = false;
+			} else {
+				this.showAut = true;
+			}
+		},
+
+		methods: {
+			/*===========================================================*/
+			// 获取商家信息
+			async getMerchantAuth() {
+				let res = await getMerchantAuthData();
+				if (res.code === 'OK') {
+					// 将数据存储到vuex中
+					console.log(res.data, "存储到vuex的数据")
+					this.merchantInfo = Object.assign({}, {
+						...res.data,
+						mobileNumber: phoneEncryption(res.data && res.data.mobileNumber),
+					}, );
+
+					this.$store.commit('SET_MERCHANTINFO', res.data);
+				}
+			},
+
+			/*===========================================================*/
+			// 开始认证
+			confirmSwitch() {
+				uni.navigateTo({
+					url: '/pageMerchant/mineModule/certification/index'
+				});
+			},
+
+			/*===========================================================*/
+
+			// 修改商家状态
+			confirm(val) {
+				this.state = val.value[0].id;
+				this.stateName = val.value[0].label;
+				this.show = false;
+
+				updateBusinessStatus(this.merchantInfo.merchant.id, {
+					businessStatus: this.state
+				}).then(
+					res => {
+						if (res.code === 'OK') {
+							this.$u.toast('修改成功');
+						}
+					},
+				);
+			},
+
+			getStatusColor(state) {
+				if (state === 0) {
+					return '#19be6b';
+				} else if (state === 1) {
+					return '#ff9900';
+				}
+			},
+			toMyPurse() {
+				uni.navigateto({
+					url: ""
+				})
+			}
+
+
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.mine {
+		min-height: calc(100vh - 80rpx);
+		box-sizing: border-box;
+
+		&__nav {
+			background-color: $uni-bg-color-primary;
+		}
+
+		&__person {
+			height: 160rpx;
+			padding: $uni-bg-padding-sm;
+			background-color: $uni-bg-color-primary;
+			position: relative;
+
+			&--info {
+				color: #fff;
+				display: flex;
+
+				.userName {
+					width: 400rpx;
+					font-size: 36rpx;
+					margin: 20rpx 0 0 16rpx;
+
+					.text {
+						margin-top: 15rpx;
+						font-size: 28rpx;
+					}
+				}
+
+				.status {
+					display: flex;
+					position: absolute;
+					bottom: 80rpx;
+					padding-left: 20rpx;
+					right: 0;
+					width: 150rpx;
+					height: 60rpx;
+					font-size: 25rpx;
+					align-items: center;
+					justify-content: center;
+					box-sizing: border-box;
+					border-radius: 30rpx 0 0 30rpx;
+					background-color: rgba(255, 255, 255, 0.3);
+				}
+			}
+		}
+
+		&__main {
+			padding: $uni-bg-padding-sm;
+
+			&--purse {
+				background-color: $uni-bg-color;
+				padding: $uni-bg-padding-sm;
+				border-radius: $uni-border-radius-base;
+
+				.wallet {
+					display: flex;
+					justify-content: space-between;
+					font-size: 28rpx;
+
+					&--title {
+						color: #000;
+						font-size: 36rpx;
+						font-weight: 700;
+					}
+
+					&--more {
+						color: #333;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+					}
+				}
+
+				.walletInfo {
+					margin: 40rpx 0;
+					color: #333;
+					display: flex;
+					text-align: center;
+					justify-content: space-around;
+				}
+
+				// .shortcut {
+				//   height: 70rpx;
+				//   padding: 0 20rpx;
+				//   color: #fff;
+				//   font-size: 28rpx;
+				//   display: flex;
+				//   align-items: center;
+				//   justify-content: space-between;
+				//   background-color: $uni-bg-color-primary;
+				//   border-radius: $uni-border-radius-sm;
+				// }
+			}
+
+			&--setting {
+				margin: 20rpx 0;
+				background-color: $uni-bg-color;
+				padding: $uni-bg-padding-sm;
+				border-radius: $uni-border-radius-base;
+			}
+		}
+	}
+
+	.text-title {
+		font-size: 34rpx;
+	}
+
+	.text-data {
+		font-size: 40rpx;
+		margin: 15rpx 0;
+		font-weight: 700;
+	}
+
+	.text-info {
+		font-size: 24rpx;
+	}
+</style>

src/pages.json

@@ -71,14 +71,14 @@
 					"path": "home/popularRecommend",
 					"style": {
 						"navigationBarTitleText": "热门推荐",
-            "onReachBottomDistance": 0
+						"onReachBottomDistance": 0
 					}
 				},
 				{
 					"path": "home/nearbyBusiness",
 					"style": {
 						"navigationBarTitleText": "附近商家",
-            "onReachBottomDistance": 0
+						"onReachBottomDistance": 0
 					}
 				},
 				{
@@ -100,10 +100,9 @@
 					}
 				},
 				{
-					"path" : "marketer/submitOrder",
-					"style" : 
-					{
-						"navigationBarTitleText" : "提交订单"
+					"path": "marketer/submitOrder",
+					"style": {
+						"navigationBarTitleText": "提交订单"
 					}
 				},
 				{
@@ -255,18 +254,18 @@
 						"navigationBarTitleText": "关于我们"
 					}
 				},
-        {
-        	"path": "profit/index",
-        	"style": {
-        		"navigationBarTitleText": "提现"
-        	}
-        },
-        {
-        	"path": "profit/withdraw",
-        	"style": {
-        		"navigationBarTitleText": "提现"
-        	}
-        }
+				{
+					"path": "profit/index",
+					"style": {
+						"navigationBarTitleText": "提现"
+					}
+				},
+				{
+					"path": "profit/withdraw",
+					"style": {
+						"navigationBarTitleText": "提现"
+					}
+				}
 			]
 		},
 		{
@@ -323,7 +322,9 @@
 				{
 					"path": "mineModule/certification/messageSubmit",
 					"style": {
-						"navigationBarTitleText": "审核信息"
+						"navigationBarTitleText": "审核信息",
+						"navigationStyle": "default",
+						"disableBack": true
 					}
 				},
 				{
@@ -381,17 +382,15 @@
 					}
 				},
 				{
-					"path" : "storeModule/components/queryWriteOff",
-					"style" :
-					{
-						"navigationBarTitleText" : "查询核销"
+					"path": "storeModule/components/queryWriteOff",
+					"style": {
+						"navigationBarTitleText": "查询核销"
 					}
 				},
 				{
-					"path" : "storeModule/components/verificationList",
-					"style" :
-					{
-						"navigationBarTitleText" : "核销记录"
+					"path": "storeModule/components/verificationList",
+					"style": {
+						"navigationBarTitleText": "核销记录"
 					}
 				}
 			]
@@ -447,4 +446,4 @@
 			"query": ""
 		}]
 	}
-}
+}

src/pages/tabbar/components/TapList.vue

@@ -1,119 +1,173 @@
-<template>
-  <view>
-    <!-- 预约列表 -->
-    <view class="appointList">
-      <template>
-        <u-cell v-for="item in isLinkList1" :key="item.id" :border="false" :icon="item.icon" :title="item.title" isLink
-          :url="item.url" />
-      </template>
-    </view>
-
-    <view class="other-out-box">
-      <u-cell v-for="item in isLinkList2" :key="item.id" :border="false" :icon="item.icon" :title="item.title"
-        :isLink="item.isLink" :url="item.url" @click="handleCellClick(item)" />
-    </view>
-
-    <u-modal :show="showSwitchDialog" :showCancelButton="true" :title="title" :content="content"
-      @confirm="confirmSwitch" @cancel="showSwitchDialog = false"></u-modal>
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        isLinkList1: [{
-            id: '0',
-            icon: 'list-dot',
-            title: '预约列表',
-            url: '/PageMine/goodsReserve',
-          }
-          // ,
-          // {
-          //   id: '1',
-          //   icon: 'list',
-          //   title: '询价列表',
-          //   url: '/pages/client/clientUser/inquiryList',
-          // },
-        ],
-        isLinkList2: [{
-            id: '0',
-            icon: 'home-fill',
-            title: '我的店铺',
-            url: '',
-            isLink: true,
-          },
-          {
-            id: '1',
-            icon: 'plus-people-fill',
-            title: '我的团队',
-            url: '/PageMine/myTeam',
-            isLink: true,
-          },
-          {
-            id: '2',
-            icon: 'server-man',
-            title: '客服中心',
-            url: '/PageMine/serviceCenter/index',
-            isLink: true,
-          },
-          {
-            id: '3',
-            icon: 'share-square',
-            title: '意见反馈',
-            url: '/PageMine/feedback?channelType=0',
-            isLink: true,
-          },
-          {
-            id: '4',
-            icon: 'thumb-up',
-            title: '关于我们',
-            url: '/PageMine/aboutUs',
-            isLink: true,
-          },
-        ],
-
-        showSwitchDialog: false,
-        title: '提醒',
-        content: '您确定要从用户端切换到商家端吗?',
-      };
-    },
-
-    methods: {
-      handleCellClick(item) {
-        console.log('item', item);
-        if (item.id == 0) {
-          this.showSwitchDialog = true;
-        } else {
-          console.log('点击了非链接项');
-        }
-      },
-
-    confirmSwitch() {
-      this.showSwitchDialog = false;
-      // this.$store.dispatch('SwitchIdentity','MERCHANT')
-      uni.navigateTo({
-        url: '/pageMerchant/index',
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-  .appointList {
-    margin: 20rpx;
-    padding: 20rpx 10rpx;
-    border-radius: 10rpx;
-    background-color: #fff;
-  }
-
-  .other-out-box {
-    margin: 20rpx;
-    padding: 20rpx 10rpx;
-    border-radius: 10rpx;
-    margin-top: 0;
-    box-sizing: border-box;
-    background-color: $uni-bg-color;
-  }
-</style>
+<template>
+	<view>
+		<!-- 预约列表 -->
+		<view class="appointList">
+			<template>
+				<u-cell v-for="item in isLinkList1" :key="item.id" :border="false" :icon="item.icon" :title="item.title"
+					isLink :url="item.url" />
+			</template>
+		</view>
+
+		<view class="other-out-box">
+			<u-cell v-for="item in isLinkList2" :key="item.id" :border="false" :icon="item.icon" :title="item.title"
+				:isLink="item.isLink" :url="item.url" @click="handleCellClick(item)" />
+		</view>
+
+		<u-modal :show="showSwitchDialog" :showCancelButton="true" :title="title" :content="content"
+			@confirm="confirmSwitch" @cancel="cancelSwitch  "></u-modal>
+	</view>
+</template>
+
+<script>
+	import {
+		getMerchantAuthData
+	} from '@/api/merchant/merchantAuth';
+	export default {
+
+		data() {
+			return {
+				isLinkList1: [{
+						id: '0',
+						icon: 'list-dot',
+						title: '预约列表',
+						url: '/PageMine/goodsReserve',
+					}
+					// ,
+					// {
+					//   id: '1',
+					//   icon: 'list',
+					//   title: '询价列表',
+					//   url: '/pages/client/clientUser/inquiryList',
+					// },
+				],
+				isLinkList2: [{
+						id: '0',
+						icon: 'home-fill',
+						title: '我的店铺',
+						url: '',
+						isLink: true,
+					},
+					{
+						id: '1',
+						icon: 'plus-people-fill',
+						title: '我的团队',
+						url: '/PageMine/myTeam',
+						isLink: true,
+					},
+					{
+						id: '2',
+						icon: 'server-man',
+						title: '客服中心',
+						url: '/PageMine/serviceCenter/index',
+						isLink: true,
+					},
+					{
+						id: '3',
+						icon: 'share-square',
+						title: '意见反馈',
+						url: '/PageMine/feedback?channelType=0',
+						isLink: true,
+					},
+					{
+						id: '4',
+						icon: 'thumb-up',
+						title: '关于我们',
+						url: '/PageMine/aboutUs',
+						isLink: true,
+					},
+				],
+
+				showSwitchDialog: false,
+				title: '提醒',
+				content: '您确定要从用户端切换到商家端吗?',
+			};
+		},
+
+		methods: {
+			handleCellClick(item) {
+				console.log('item', item);
+				if (item.id == 0) {
+					this.showSwitchDialog = true;
+				} else {
+					// console.log('点击了非链接项');
+				}
+			},
+			//点击取消时
+			cancelSwitch() {
+				this.showSwitchDialog = false
+				this.title = "提醒"
+				this.content = "您确定要从用户端切换到商家端吗?"
+			},
+			// 点击确认时
+			confirmSwitch() {
+				// this.showSwitchDialog = false;
+				// this.$store.dispatch('SwitchIdentity','MERCHANT')
+				if (this.title == "提醒") {
+					this.getMerchantAuth()
+
+				} else {
+					uni.navigateTo({
+						url: '/pageMerchant/mineModule/certification/index'
+					});
+				}
+
+
+
+				// uni.navigateTo({
+				//   url: '/pageMerchant/index',
+				// });
+			},
+
+			/*===========================================================*/
+			// 获取商家信息
+			async getMerchantAuth() {
+				let res = await getMerchantAuthData();
+				console.log(res, "获取商家信息")
+				if (res.code === 'OK' && res.data) {
+					if (res.data.reviewStatus == 2) {
+						uni.navigateTo({
+							url: '/pageMerchant/mineModule/certification/openStoreAppealDetail'
+						});
+						this.cancelSwitch();
+					} else if (res.data.reviewStatus == 1) {
+						// 将数据存储到vuex中
+						this.merchantInfo = Object.assign({}, {
+							...res.data,
+							mobileNumber: res.data.mobileNumber,
+						});
+						this.$store.commit('SET_MERCHANTINFO', res.data);
+						uni.navigateTo({
+							url: '/pageMerchant/index',
+						});
+						this.cancelSwitch();
+					} else {
+						this.title = "警告！"
+						this.content = `认证未通过,审核意见：${res.data.message}`
+					}
+				} else {
+					this.title = "温馨提示！"
+					this.content = "您还没有自己的店铺，如果您确定要开店，请点击确定进入开店流程"
+				}
+			},
+
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.appointList {
+		margin: 20rpx;
+		padding: 20rpx 10rpx;
+		border-radius: 10rpx;
+		background-color: #fff;
+	}
+
+	.other-out-box {
+		margin: 20rpx;
+		padding: 20rpx 10rpx;
+		border-radius: 10rpx;
+		margin-top: 0;
+		box-sizing: border-box;
+		background-color: $uni-bg-color;
+	}
+</style>

src/utils/request.js

@@ -11,10 +11,10 @@ import {
 
 // 每次请求都创建一个新的实例
 const instance = axios.create({
-  baseURL: 'https://test.api.chelvc.com',
+  // baseURL: 'https://test.api.chelvc.com',
   // baseURL: "http://192.168.68.77:11000",
   // baseURL: "https://358175z5l5.yicp.fun",
-  // baseURL: "http://localhost:11000",
+  baseURL: "http://localhost:11000",
   timeout: 10000,
   adapter: UniAdapter,
 });