合并代码

jiuyi2/pages/index/wallet/wallet.vue

@@ -59,15 +59,9 @@
 	// 待释放列表
 	const releasedLst = ref([])
 	// 用户信息
-	const userinfo = computed(() => {
-		let result = store.state.userinfo || {}
-		return result
-	})
+	const userinfo = computed(() => store.state.userinfo || {})
 	// 我的钱包
-	const wallet = computed(() => {
-		let result = store.state.purse || {}
-		return result
-	})
+	const wallet = computed(() => store.state.purse || {})
 
 	onLoad(() => {
 		// 获取待释放
@@ -190,7 +184,7 @@
 			<uni-icons type="right" color="" />
 		</view>
 
-		<view class="rows mtb30 ptb20 plr30 cfff f34 b000 br10">
+		<view class="rows mtb30 ptb20 plr30 cfff f34 b000 br10" v-if="userinfo.isShop == 1">
 			<text>商家明细</text>
 			<uni-icons type="right" c1olor="" />
 		</view>

jiuyi2/pages/shop/store/index.vue

@@ -236,7 +236,7 @@ defineExpose({
 			</view>
 
 			<!-- 按钮区 -->
-			<view class="btns w150">
+			<view class="btns w180">
 				<view>
 					<view @click="handleCollectStore" class="btn sm warm fmid fdr plr30">
 						<uni-icons class="mr10" color="#fff" type="plusempty" size="13" v-if="detail.isFollow != 1" />