Merge remote-tracking branch 'origin/tianyi' into clientDemo

src/api/merchant/evaluate.js

@@ -38,7 +38,7 @@ export function getMerchantQueryApi(params) {
 
 export function addEvaluateRecoverApi(data) {
   return request({
-    url: `/maintain/assess/addAssessRecover`,
+    url: `/assess/recover/add`,
     method: 'post',
     data: data,
     headers: {

src/api/merchant/merchantAuth.js

@@ -47,4 +47,36 @@ export function editMerchantAuth(id, data) {
     },
     data,
   });
+}
+
+/**
+ * @description 获取主营业务数组
+ * @param {*} data
+ * @returns
+ */
+export function getParentCategoriesData(data) {
+  return request({
+    url: "/maintain/getParentCategories",
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+}
+
+/**
+ * @description 获取辅营业务数组
+ * @param {*} data
+ * @returns
+ */
+export function getRootCategoriesData(data) {
+  return request({
+    url: "/maintain/getRootCategories",
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
 }

src/pageMerchant/mineModule/certification/storeInformation.vue

@@ -42,7 +42,7 @@
 				<view class="content-item">
 					<u-form-item prop="storeAddress" required label="所在地区" right>
 						<view class="item-r">
-							<u--input placeholder="请选择所在地区" border="surround" v-model="storeInfo.storeAddress"
+							<u--input placeholder="请选择所在地区" border="surround" v-model="storeAddress"
 								@focus="handlerChange"></u--input>
 						</view>
 						<view class="icon-right-box">
@@ -65,6 +65,51 @@
 					</u-form-item>
 				</view>
 			</view>
+			<!-- 商家信息 -->
+			<view class="content-box">
+				<view class="content-item">
+					<u-form-item prop="mainBusiness" required label="主营业务" right>
+						<view class="item-r">
+							<u--input placeholder="请选择主营业务" border="surround" v-model="mainBusinessName"
+								@focus="handlerChangeMainBusiness"></u--input>
+						</view>
+						<view class="icon-right-box">
+							<u-icon name="arrow-right" color="#c5c5c5" size="20"></u-icon>
+						</view>
+					</u-form-item>
+				</view>
+				<view class="content-item">
+					<u-form-item prop="ancillaryBusiness" required label="辅营业务" right>
+						<view class="item-r">
+
+							<!-- #ifndef APP-NVUE -->
+							<u-input placeholder="请选择辅营业务" v-model="ancillaryBusinessName.join(',')" clearable
+								@clear="ancillaryBusinessClear">
+							<!-- #endif -->
+								<!-- #ifdef APP-NVUE -->
+								<u--input placeholder="sadasd">
+								<!-- #endif -->
+									<template slot="suffix">
+										<u-icon @click="handlerChangeAncillaryBusiness" name="arrow-right"
+											color="#c5c5c5" size="20"></u-icon>
+									</template>
+							<!-- #ifndef APP-NVUE -->
+							</u-input>
+							<!-- #endif -->
+						</view>
+					</u-form-item>
+				</view>
+
+
+
+				<view class="content-item">
+					<u-form-item prop="opening" required label="营业时间" right>
+						<view class="item-r">
+							<u--input placeholder="请输入营业时间" border="surround" v-model="storeInfo.opening"></u--input>
+						</view>
+					</u-form-item>
+				</view>
+			</view>
 
 			<view class="content-box">
 				<u-form-item prop="storeImage">
@@ -82,9 +127,10 @@
 		</u-form>
 		<button class="btn" @click="handlerSkipNext">下一步</button>
 
-		<!-- 地区 -->
-		<u-picker :show="show" ref="uPicker" :columns="cityList" @confirm="confirm" @change="changeHandler"
+		<!-- 选择器 -->
+		<u-picker :show="show" ref="uPicker" :columns="list" keyName="name" @confirm="confirm" @change="changeHandler"
 			@cancel="show = false"></u-picker>
+
 	</view>
 </template>
 
@@ -92,6 +138,10 @@
 	import ImgsUpload from './components/ImgsUpload.vue';
 	// 导入城市js文件
 	import cityData from '@/utils/city';
+	import {
+		getParentCategoriesData,
+		getRootCategoriesData
+	} from '@/api/merchant/merchantAuth';
 
 	export default {
 		components: {
@@ -99,20 +149,34 @@
 		},
 		data() {
 			return {
+				storeAddress: "",
+				mainBusinessName: "", // 主营业务，
+				ancillaryBusinessName: [], // 辅营业务
 				storeInfo: {
-					storeAddress: '',
+					region: '',
 					storeAddressDetail: '',
 					legalRepresentativeName: '',
 					mobileNumber: '',
 					storeName: '',
 					storeImage: '',
-					storeInnerImage: '',
+					storeInnerImage: [],
 					email: "",
 					longitude: '',
-					latitude: ''
-
+					latitude: '',
+					opening: '',
+					city: "",
+					province: "",
+					district: "",
+					mainBusiness: "", // 主营业务，
+					ancillaryBusiness: [], // 辅营业务
 				},
 				rules: {
+					opening: {
+						type: 'string',
+						required: true,
+						message: '请输入营业时间',
+						trigger: ['blur', 'change'],
+					},
 					legalRepresentativeName: {
 						type: 'string',
 						required: true,
@@ -157,7 +221,17 @@
 							trigger: ['change', 'blur'],
 						},
 					],
-					storeAddress: [{
+					region: [{
+						required: true,
+						message: '请选择所在地区',
+						trigger: ['change'],
+					}, ],
+					mainBusiness: [{
+						required: true,
+						message: '请选择所在地区',
+						trigger: ['change'],
+					}, ],
+					ancillaryBusiness: [{
 						required: true,
 						message: '请选择所在地区',
 						trigger: ['change'],
@@ -165,10 +239,15 @@
 				},
 				show: false, //显示选择器
 				// 打开选择器显示默认城市
-				cityList: [],
+				cityList: [], // 选择地区数组
 				cityLevel1: [],
 				cityLevel2: [],
 				cityLevel3: [],
+
+				list: [], // 数组控制器
+				mainBusinessList: [], // 主营业务下拉数组
+				ancillaryBusinessList: [], // 辅营业务数组
+
 			};
 		},
 		onReady() {
@@ -177,8 +256,32 @@
 		},
 		onShow() {
 			this.initCityData();
+			this.request()
+			console.log(this.mainBusinessList, this.ancillaryBusinessList)
 		},
 		methods: {
+
+			async request() {
+				const res = await getParentCategoriesData({
+					type: "0"
+				})
+				this.mainBusinessList = res.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id
+					}
+				})
+				const res1 = await getRootCategoriesData({
+					type: "0"
+				})
+				this.ancillaryBusinessList = res.data.map((item) => {
+					return {
+						name: item.name,
+						id: item.id,
+						status: 1
+					}
+				})
+			},
 			// 手动选择城市
 			manualGetLocation() {
 				uni.chooseLocation({
@@ -189,10 +292,11 @@
 							latitude
 						} = res;
 						console.log(this.stereInfo, "this")
-						this.storeInfo.longitude = longitude.toFixed(5);
-						this.storeInfo.latitude = latitude.toFixed(5);
+						this.storeInfo.longitude = parseFloat(longitude.toFixed(5))
+						this.storeInfo.latitude = parseFloat(latitude.toFixed(5));
 						this.storeInfo.storeAddressDetail = res.address
 
+
 					},
 					fail: err => {},
 				});
@@ -201,16 +305,25 @@
 				// 遍历城市js
 				cityData.forEach((item1, index1) => {
 					let temp2 = [];
-					this.cityLevel1.push(item1.provinceName);
+					this.cityLevel1.push({
+						name: item1.provinceName,
+						id: item1.provinceCode
+					});
 
 					let temp4 = [];
 					let temp3 = [];
 					// 遍历市
 					item1.cities.forEach((item2, index2) => {
-						temp2.push(item2.cityName);
+						temp2.push({
+							name: item2.cityName,
+							id: item2.cityCode
+						});
 						// 遍历区
 						item2.counties.forEach((item3, index3) => {
-							temp3.push(item3.countyName);
+							temp3.push({
+								name: item3.countyName,
+								id: item3.countyCode
+							});
 						});
 						temp4[index2] = temp3;
 						temp3 = [];
@@ -220,37 +333,74 @@
 				});
 				// 选择器默认城市
 				this.cityList.push(this.cityLevel1, this.cityLevel2[0], this.cityLevel3[0][0]);
+				console.log(this.cityList, "this.cityList")
 			},
 			// 选中时执行
 			changeHandler(e) {
-				const {
-					columnIndex,
-					index,
-					indexs,
-					value,
-					values,
-					// 微信小程序无法将picker实例传出来，只能通过ref操作
-					picker = this.$refs.uPicker,
-				} = e;
-				if (columnIndex === 0) {
-					// 选择第一列数据时 设置第二列关联数据
-					picker.setColumnValues(1, this.cityLevel2[index]);
-					// 设置第三列关联数据
-					picker.setColumnValues(2, this.cityLevel3[index][columnIndex]);
-				} else if (columnIndex === 1) {
-					// 选择第二列数据时 设置第三列关联数据
-					picker.setColumnValues(2, this.cityLevel3[indexs[0]][index]);
+				if (this.list.length > 1) {
+					const {
+						columnIndex,
+						index,
+						indexs,
+						value,
+						values,
+						// 微信小程序无法将picker实例传出来，只能通过ref操作
+						picker = this.$refs.uPicker,
+					} = e;
+					if (columnIndex === 0) {
+						// 选择第一列数据时 设置第二列关联数据
+						picker.setColumnValues(1, this.cityLevel2[index]);
+						// 设置第三列关联数据
+						picker.setColumnValues(2, this.cityLevel3[index][columnIndex]);
+					} else if (columnIndex === 1) {
+						// 选择第二列数据时 设置第三列关联数据
+						picker.setColumnValues(2, this.cityLevel3[indexs[0]][index]);
+					}
 				}
+
 			},
 			// 单击确认按钮时执行
 			confirm(e) {
-				this.storeInfo.storeAddress = e.value.join('');
-				// 隐藏城市选择器
+				if (e.value.length > 1) {
+					this.storeInfo.province = parseInt(e.value[0].id, 10)
+					this.storeInfo.city = parseInt(e.value[1].id, 10)
+					this.storeInfo.district = parseInt(e.value[2].id, 10)
+					this.storeInfo.region = parseInt(e.value[2].id, 10)
+					this.storeAddress = e.value.map(item => item.name).join('')
+					// 隐藏城市选择器
+				} else {
+					if (e.value[0].status && e.value[0].status == 1) {
+						this.ancillaryBusinessName.push(e.value[0].name)
+						this.storeInfo.ancillaryBusiness.push(e.value[0].id)
+					} else {
+						this.mainBusinessName = e.value[0].name
+						this.storeInfo.mainBusiness = e.value[0].id
+					}
+				}
 				this.show = false;
 			},
+			// 点击选择地区
 			handlerChange() {
+				this.list = this.cityList
+				this.show = true;
+			},
+			//点击选择主营业务
+			handlerChangeMainBusiness() {
+				this.list = [this.mainBusinessList]
 				this.show = true;
 			},
+			//点击选择辅营业务
+			handlerChangeAncillaryBusiness() {
+				console.log("asdsd")
+				this.list = [this.ancillaryBusinessList]
+				console.log(this.list)
+				this.show = true;
+			},
+			//点击清空按钮
+			ancillaryBusinessClear() {
+				this.ancillaryBusinessName = []
+				this.storeInfo.ancillaryBusiness = []
+			},
 			handlerSkipNext() {
 				this.$refs.uForm.validate().then(res => {
 					this.$store.commit('SET_STOREINFO', this.storeInfo);
@@ -266,9 +416,15 @@
 				if (data == 1) {
 					this.storeInfo.storeImage = val[0];
 				} else if (data == 2) {
-					this.storeInfo.storeInnerImage = val[0];
+					this.storeInfo.storeInnerImage = val.map((item) => {
+						return {
+							url: item,
+							media: "IMAGE"
+						}
+					})
 				}
 			},
+			// 点击选择主营业务
 		},
 	};
 </script>

src/pageMerchant/mineModule/openStoreAppealDetail.vue

@@ -1,158 +1,169 @@
-<template>
-  <view class="container">
-    <view class="top-box">
-      <p>您的开店申请已经提交成功。</p>
-      <p>我们将在1-3个工作日内完成线上审核工作，请您耐心等候，并留意审核进程。</p>
-    </view>
-
-    <view class="content-item">
-      <view class="item-l">
-        <p>负责人 : {{ list.legalRepresentativeName || '--' }}</p>
-        <p>手机号 : {{ list.mobileNumber || '--' }}</p>
-      </view>
-      <img class="img" src="@/static/mine/icon_mine_underReview.png" alt="" />
-    </view>
-
-    <view class="content-item">
-      <view class="item-l">
-        <p>店名 : {{ list.merchant.name || '--' }}</p>
-        <p>店铺类型 : {{ list.storeType || '--' }}</p>
-        <p>手机号 : {{ list.mobileNumber || '--' }}</p>
-        <p>所在地 : {{ list.storeAddress || '--' }}</p>
-        <p>详细地址 : {{ list.merchant.address || '--' }}</p>
-      </view>
-    </view>
-
-    <view class="content-item2">
-      <view class="item2-box">
-        <image :src="list.storeImage" mode="" v-if="list.storeImage"></image>
-        <img class="img2" src="@/static/logo.png" alt="" v-else />
-        <view class="img-text">店铺门面图(需包含完整牌匾)</view>
-      </view>
-      <view class="item2-box">
-        <image :src="list.storeInnerImage" mode="" v-if="list.storeInnerImage"></image>
-        <img class="img2" src="@/static/logo.png" alt="" v-else />
-        <view class="img-text">店内真实环境</view>
-      </view>
-    </view>
-
-    <view class="content-item2">
-      <view class="item-l">
-        <p>法人姓名 : {{ list.legalRepresentativeName || '--' }}</p>
-        <p>
-          性别 :
-          {{
-            list.legalRepresentativeGender == 1
-              ? '男'
-              : list.legalRepresentativeGender == 2
-              ? '女'
-              : '保密'
-          }}
-        </p>
-        <p>证件号码 : {{ list.idCardNumber || '--' }}</p>
-        <p>有效期 : {{ $u.timeFormat(list.idCardExpirationDate) || '--' }}</p>
-      </view>
-      <view class="item2-box">
-        <image :src="list.idCardFrontPhoto" mode="" v-if="list.idCardFrontPhoto"></image>
-        <img class="img2" src="@/static/logo.png" alt="" v-else />
-        <view class="img-text">证件正面图(国徽图)</view>
-      </view>
-      <view class="item2-box">
-        <image :src="list.idCardBackPhoto" mode="" v-if="list.idCardBackPhoto"></image>
-        <img class="img2" src="@/static/logo.png" alt="" v-else />
-        <view class="img-text">证件反面图(人像图)</view>
-      </view>
-    </view>
-
-    <view class="content-item2">
-      <view class="item-l">
-        <p>证件名称 : 营业执照</p>
-        <p>证件编号 : {{ list.businessLicenseId || '--' }}</p>
-        <p>有效期 : {{ $u.timeFormat(list.businessLicenseExpirationDate) || '--' }}</p>
-      </view>
-      <view class="item2-box">
-        <image :src="list.businessPhoto" mode="" v-if="list.businessPhoto"></image>
-        <img class="img2" src="@/static/logo.png" alt="" v-else />
-        <view class="img-text">证件正面图</view>
-      </view>
-    </view>
-
-    <view class="content-item2">
-      <view class="item-l">
-        <p>证件名称 : 经营许可证</p>
-        <p>证件编号 : {{ list.businessLicenseNumberValid || '--' }}</p>
-        <p>有效期 : {{ $u.timeFormat(list.businessLicenseExpirationDateValid) || '--' }}</p>
-      </view>
-      <view class="item2-box">
-        <image :src="list.businessLicensePhoto" mode="" v-if="list.businessLicensePhoto"></image>
-        <img class="img2" src="@/static/logo.png" alt="" v-else />
-        <view class="img-text">证件正面图</view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      list: {},
-    };
-  },
-  methods: {},
-  onShow() {
-    this.list = this.$store.state.data.merchantInfo;
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.container {
-  padding: 20rpx;
-  background-color: #f5f5f5 !important;
-  .top-box {
-    color: #8b8b8b;
-    padding: 0 20rpx;
-    background-color: #fff;
-  }
-  .content-item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background-color: #fff;
-    border-radius: 20rpx;
-    padding: 20rpx;
-    margin: 20rpx 0;
-    .item-l {
-      p {
-        margin: 20rpx 0;
-        line-height: 50rpx;
-      }
-    }
-    .img {
-      width: 130rpx;
-      height: 100rpx;
-    }
-  }
-  .content-item2 {
-    background-color: #fff;
-    border-radius: 20rpx;
-    padding: 20rpx;
-    margin: 20rpx 0;
-    .item-l {
-      p {
-        margin: 20rpx 0;
-        line-height: 50rpx;
-      }
-    }
-    .item2-box {
-      text-align: center;
-      margin-bottom: 20rpx;
-      .img2 {
-        width: 100%;
-        height: 400rpx;
-      }
-    }
-  }
-}
-</style>
+<template>
+	<view class="container">
+		<view class="top-box">
+			<p>您的开店申请已经提交成功。</p>
+			<p>我们将在1-3个工作日内完成线上审核工作，请您耐心等候，并留意审核进程。</p>
+		</view>
+
+		<view class="content-item">
+			<view class="item-l">
+				<p>负责人 : {{ list.legalRepresentativeName || '--' }}</p>
+				<p>联系方式 : {{ list.mobileNumber || '--' }}</p>
+				<p>电子邮箱 : {{ '--' }}</p>
+				<p>所属地区 : {{ list.storeAddress || '--' }}</p>
+				<p>详细地址 : {{ list.merchant.address || '--' }}</p>
+			</view>
+			<img class="img" src="@/static/mine/icon_mine_underReview.png" alt="" />
+		</view>
+
+		<view class="content-item">
+			<view class="item-l">
+				<p>店铺名称 : {{ list.merchant.name || '--' }}</p>
+				<p>主营业务 : {{ '--' }}</p>
+				<p>辅营业务 : {{'--' }}</p>
+				<p>营业时间 : {{ '--' }}</p>
+
+			</view>
+		</view>
+
+		<view class="content-item2">
+			<view class="item2-box">
+				<image :src="list.storeImage" mode="" v-if="list.storeImage"></image>
+				<img class="img2" src="@/static/logo.png" alt="" v-else />
+				<view class="img-text">店铺门面图(需包含完整牌匾)</view>
+			</view>
+			<view class="item2-box">
+				<image :src="list.storeInnerImage" mode="" v-if="list.storeInnerImage"></image>
+				<img class="img2" src="@/static/logo.png" alt="" v-else />
+				<view class="img-text">店内真实环境</view>
+			</view>
+		</view>
+
+		<view class="content-item2">
+			<view class="item-l">
+				<p>法人姓名 : {{ list.legalRepresentativeName || '--' }}</p>
+				<p>
+					性别 :
+					{{
+            list.legalRepresentativeGender == 1
+              ? '男'
+              : list.legalRepresentativeGender == 2
+              ? '女'
+              : '保密'
+          }}
+				</p>
+				<p>证件号码 : {{ list.idCardNumber || '--' }}</p>
+				<p>有效期 : {{ $u.timeFormat(list.idCardExpirationDate) || '--' }}</p>
+			</view>
+			<view class="item2-box">
+				<image :src="list.idCardFrontPhoto" mode="" v-if="list.idCardFrontPhoto"></image>
+				<img class="img2" src="@/static/logo.png" alt="" v-else />
+				<view class="img-text">证件正面图(国徽图)</view>
+			</view>
+			<view class="item2-box">
+				<image :src="list.idCardBackPhoto" mode="" v-if="list.idCardBackPhoto"></image>
+				<img class="img2" src="@/static/logo.png" alt="" v-else />
+				<view class="img-text">证件反面图(人像图)</view>
+			</view>
+		</view>
+
+		<view class="content-item2">
+			<view class="item-l">
+				<p>证件名称 : 营业执照</p>
+				<p>证件编号 : {{ list.businessLicenseId || '--' }}</p>
+				<p>有效期 : {{ $u.timeFormat(list.businessLicenseExpirationDate) || '--' }}</p>
+			</view>
+			<view class="item2-box">
+				<image :src="list.businessPhoto" mode="" v-if="list.businessPhoto"></image>
+				<img class="img2" src="@/static/logo.png" alt="" v-else />
+				<view class="img-text">证件正面图</view>
+			</view>
+		</view>
+
+		<view class="content-item2">
+			<view class="item-l">
+				<p>证件名称 : 经营许可证</p>
+				<p>证件编号 : {{ list.businessLicenseNumberValid || '--' }}</p>
+				<p>有效期 : {{ $u.timeFormat(list.businessLicenseExpirationDateValid) || '--' }}</p>
+			</view>
+			<view class="item2-box">
+				<image :src="list.businessLicensePhoto" mode="" v-if="list.businessLicensePhoto"></image>
+				<img class="img2" src="@/static/logo.png" alt="" v-else />
+				<view class="img-text">证件正面图</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: {},
+			};
+		},
+		methods: {},
+		onShow() {
+			this.list = this.$store.state.data.merchantInfo;
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		padding: 20rpx;
+		background-color: #f5f5f5 !important;
+
+		.top-box {
+			color: #8b8b8b;
+			padding: 0 20rpx;
+			background-color: #fff;
+		}
+
+		.content-item {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			background-color: #fff;
+			border-radius: 20rpx;
+			padding: 20rpx;
+			margin: 20rpx 0;
+
+			.item-l {
+				p {
+					margin: 20rpx 0;
+					line-height: 50rpx;
+				}
+			}
+
+			.img {
+				width: 130rpx;
+				height: 100rpx;
+			}
+		}
+
+		.content-item2 {
+			background-color: #fff;
+			border-radius: 20rpx;
+			padding: 20rpx;
+			margin: 20rpx 0;
+
+			.item-l {
+				p {
+					margin: 20rpx 0;
+					line-height: 50rpx;
+				}
+			}
+
+			.item2-box {
+				text-align: center;
+				margin-bottom: 20rpx;
+
+				.img2 {
+					width: 100%;
+					height: 400rpx;
+				}
+			}
+		}
+	}
+</style>

src/pageMerchant/storeModule/shopManage.vue

@@ -137,170 +137,6 @@
         scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
         timer: null, // 定时器
         tabbar: [],
-        tabbar1: [{
-            name: '蔬菜水果',
-            foods: [{
-                cat: 383,
-                name: '蔬菜',
-                icon: 'http://nq348.com/uploads/category/20220315/1aeed6fa43b54cd68cce0c4883160f91.png',
-                key: '蔬菜',
-              },
-              {
-                cat: 384,
-                name: '食用菌',
-                icon: 'http://nq348.com/uploads/category/20220418/09839c618b35b510d50151f9a17793ee.png',
-                key: '食用菌',
-              },
-              {
-                cat: 385,
-                name: '水果',
-                icon: 'http://nq348.com/uploads/category/20220418/5294ad2fc7effc9629cbfdb8baf41773.png',
-                key: '水果',
-              },
-            ],
-          },
-          {
-            name: '畜禽养殖',
-            foods: [{
-                cat: 388,
-                name: '禽类',
-                icon: 'http://nq348.com/uploads/category/20220418/da31895fc5a9aacf93fea6f27f08afd7.png',
-                key: '禽类',
-              },
-              {
-                cat: 389,
-                name: '畜类',
-                icon: 'http://nq348.com/uploads/category/20220418/6352081e3f3b36f9360a933676e9452c.png',
-                key: '畜类',
-              },
-              {
-                cat: 391,
-                name: '蛋类',
-                icon: 'http://nq348.com/uploads/category/20220418/d2e7ab4224679c0c796ba3ddd8a68e2f.png',
-                key: '蛋类',
-              },
-              {
-                cat: 390,
-                name: '水产',
-                icon: 'http://nq348.com/uploads/category/20220418/52a1f1baa7617ef4d4e1a4b344b2fce7.png',
-                key: '水产',
-              },
-            ],
-          },
-
-          {
-            name: '粮油副食',
-            foods: [{
-                cat: 393,
-                name: '米面粮油',
-                icon: 'http://nq348.com/uploads/category/20220418/1bb32e319ecf5aa352b7fe26fc265004.png',
-                key: '米面粮油',
-              },
-              {
-                cat: 394,
-                name: '坚果干果',
-                icon: 'http://nq348.com/uploads/category/20220418/6ded13eae4a3b113b5225ca8b99bbfdd.png',
-                key: '坚果干果',
-              },
-              {
-                cat: 395,
-                name: '加工食品',
-                icon: 'http://nq348.com/uploads/category/20220418/1e1c10838799de5834aa77f0f9eb8f40.png',
-                key: '加工食品',
-              },
-              {
-                cat: 396,
-                name: '茶烟酒',
-                icon: 'http://nq348.com/uploads/category/20220418/c43cd994e49023c7efdf2b18b1bca30b.png',
-                key: '茶烟酒',
-              },
-            ],
-          },
-          {
-            name: '花卉苗木',
-            foods: [{
-                cat: 398,
-                name: '鲜花盆景',
-                icon: 'http://nq348.com/uploads/category/20220418/b21c44045daaa8b8d148981ba9efc2e0.png',
-                key: '鲜花盆景',
-              },
-              {
-                cat: 399,
-                name: '果树苗',
-                icon: 'http://nq348.com/uploads/category/20220418/63ee2b902ff0f4d638d8a5ad770f7641.png',
-                key: '果树苗',
-              },
-              {
-                cat: 400,
-                name: '蔬瓜种子',
-                icon: 'http://nq348.com/uploads/category/20220418/2df521877616ee44fd01aae0434a5815.png',
-                key: '蔬瓜种子',
-              },
-              {
-                cat: 401,
-                name: '经济作物',
-                icon: 'http://nq348.com/uploads/category/20220418/f85be72a98694befd889f30de45a1d64.png',
-                key: '经济作物',
-              },
-            ],
-          },
-          {
-            name: '中草药材',
-            foods: [{
-                cat: 403,
-                name: '全草类',
-                icon: 'http://nq348.com/uploads/category/20220418/01812c1a83f5db7eafbf3bdae927f134.png',
-                key: '全草类',
-              },
-              {
-                cat: 405,
-                name: '根茎皮叶花',
-                icon: 'http://nq348.com/uploads/category/20220418/dca8dcc814401474d4f19ae7394cc209.png',
-                key: '根茎皮叶花',
-              },
-              {
-                cat: 406,
-                name: '滋补品类',
-                icon: 'http://nq348.com/uploads/category/20220418/33b965295811fdd6f5e672e9a3ce34a2.png',
-                key: '滋补品类',
-              },
-              {
-                cat: 404,
-                name: '果实籽仁类',
-                icon: 'http://nq348.com/uploads/category/20220418/1dc8c46c66b4625d458a7f45787ecef9.png',
-                key: '果实籽仁类',
-              },
-            ],
-          },
-          {
-            name: '其他',
-            foods: [{
-                cat: 434,
-                name: '包装',
-                icon: 'http://nq348.com/uploads/category/20220418/ebdfd326333344825adbe81dbd89e2c9.png',
-                key: '包装',
-              },
-              {
-                cat: 435,
-                name: '安全溯源',
-                icon: 'http://nq348.com/uploads/category/20220418/03230c63f066f46005abf5f576df0ed1.png',
-                key: '安全溯源',
-              },
-              {
-                cat: 436,
-                name: '农用百货',
-                icon: 'http://nq348.com/uploads/category/20220418/93393f2df3264faba86bb449a0c10a79.png',
-                key: '农用百货',
-              },
-              {
-                cat: 437,
-                name: '仓储物流',
-                icon: 'http://nq348.com/uploads/category/20220418/f553505ebabbcb1bf762b288716cf1e7.png',
-                key: '仓储物流',
-              },
-            ],
-          },
-        ],
         list1: [{
             name: '在售中',
           },
@@ -311,7 +147,7 @@
         checked: false,
         search: '',
         delete_type: false,
-        rightTabbar: []
+        rightTabbar: [], // 列表
       };
     },
     /**

src/pageMerchant/tabbar/mine.vue

@@ -34,8 +34,8 @@
     </view>
 
     <view class="mine__main">
-      <view class="mine__main--purse">
-        <view class="wallet">
+      <view class="mine__main--purse" @click="toMyPurse">
+       <view class="wallet">
           <view class="wallet--title">我的钱包</view>
           <view class="wallet--more">
             <text>查看钱包余额</text>
@@ -150,8 +150,8 @@
           {
             id: '3',
             name: '资质信息',
-            // url: '/pageMerchant/mineModule/openStoreAppealDetail',
-			url: '/pageMerchant/mineModule/certification/storeInformation',
+            url: '/pageMerchant/mineModule/openStoreAppealDetail',
+			// url: '/pageMerchant/mineModule/certification/storeInformation',
           },
         ],
 
@@ -179,8 +179,6 @@
       } else {
         this.showAut = true;
       }
-
-      console.log(this.merchantInfo.merchant.id, '111111111');
     },
 
     methods: {
@@ -232,9 +230,13 @@
         } else if (state === 1) {
           return '#ff9900';
         }
-      },
+      },
+	  toMyPurse(){
+		  uni.navigateto({
+			  url:""
+		  })
+	  }
 
-      /*===========================================================*/
 
     },
   };

src/store/modules/data.js

@@ -31,7 +31,8 @@ export default {
     SET_APTITUDEINFO(state, data) {
       state.aptitudeInfo = data;
     },
-    SET_MERCHANTINFO(state, data) {
+    SET_MERCHANTINFO(state, data) {
+		console.log("商家信息存储了")
       state.merchantInfo = data;
     },
   },