Merge branch 'master' of https://gitea.lihaink.cn/weipengfei/purchase-let

pages/index/index.vue

@@ -22,9 +22,9 @@
 		<up-navbar placeholder style="z-index: 10080;">
 			<template #left>
 
-				<view class="store-info" @click="navgo('/multipleShop/index/index')">
+				<view class="store-info">
 					<view style="display: flex;font-size: 30rpx;font-weight: bold;">
-						<text v-if="userStore.userInfo.vip_name=='行业会员'"
+						<text v-if="userStore.userInfo.user_ship==1"
 							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{(shareInfo.real_name||userStore.userInfo.nickname + '的供销个人门店' )}}</text>
 						<text v-else
 							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{shareInfo.real_name?(shareInfo.real_name + '的' + STORE_INFO.name):STORE_INFO.store_name}}</text>
@@ -259,13 +259,7 @@
 		return shareInfo;
 	})
 
-	const navgo = (url) => {
-		if (userStore.userInfo.vip_name) return
 
-		// uni.navigateTo({
-		// 	url
-		// })
-	}
 
 	/*商品列表滚动隐藏头部导航 */
 	const instance = getCurrentInstance(); // 获取组件实例

pagesOrder/settle/settle.vue

@@ -356,9 +356,7 @@
 
 	const createOrder = () => {
 		if (!pay_type.value) return uni.$u.toast('请选择支付方式');
-
 		let shareInfo = uni.getStorageSync('SHARE_INFO');
-
 		createOrderApi({
 			spread_uid: (shareInfo && shareInfo.uid) ? shareInfo.uid : '',
 			cart_id: cartStore.cartList,