修改h5登录不跳转的错误

components/recommend/index.vue

@@ -74,9 +74,14 @@
 		</view>
 
 		<view class='recommendList' :class="indexP?'on':''">
+			<view class="loadingicon acea-row row-center-wrapper"
+				v-if="!hostProduct || hostProduct.length == 0 || loading">
+				<text class="loading iconfont icon-jiazai loading-flex"></text>
+				{{ hotTitle }}
+			</view>
 			<WaterfallsFlow v-if="hostProduct.length>0" :wfList='hostProduct' @itemTap="goDetail" :type="0"
 				:sale_type="sale_type" />
-			<view class='pictrue' v-if="!loading&&hostProduct.length==0">
+			<view class='pictrue' v-if="!loading && hostProduct.length==0">
 				<image :src="`${domain}/static/images/noCart.png`"></image>
 				<view>暂无商品，看点别的吧</view>
 			</view>
@@ -139,6 +144,10 @@
 				type: Boolean,
 				default: false
 			},
+			hotTitle: {
+				type: String,
+				default: '加载更多'
+			}
 		},
 		data() {
 			return {
@@ -161,12 +170,14 @@
 					val: 4
 				}],
 				currTabs: 1,
-				list: []
+				list: [],
+				tabsTop: ''
 			};
 		},
 		mounted() {
 			this.getArticleList();
 		},
+
 		methods: {
 			changeTab(e) {
 				this.currTabs = e;
@@ -186,6 +197,18 @@
 					limit: 10
 				}).then(res => {
 					this.list = res.data.list;
+
+					setTimeout(() => {
+						this.$util.getDom(this, '.tabs', res => {
+							// #ifdef APP
+							this.tabsTop = res.top + 10;
+							// #endif
+
+							// #ifdef H5
+							this.tabsTop = res.top;
+							// #endif
+						})
+					}, 300)
 				})
 			},
 			goDetail(item) {
@@ -288,7 +311,7 @@
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		margin: 0 -20rpx 30rpx;
+		margin: 0 -20rpx 10rpx;
 		padding-top: 20rpx;
 
 		.tabs-item {
@@ -340,10 +363,6 @@
 	}
 
 	.information {
-		// display: flex;
-		// justify-content: space-between;
-		// margin-bottom: 20rpx;
-
 		.nav-item {
 			width: 227rpx;
 			overflow: hidden;
@@ -389,6 +408,11 @@
 		}
 	}
 
+	.loading-flex {
+		width: auto !important;
+		margin-right: 10rpx;
+	}
+
 	.pictrue {
 		display: flex;
 		flex-direction: column;

pages/cloud_warehouse/home/home.vue

@@ -312,7 +312,7 @@
 				<view>
 					<!-- 流水瀑布 -->
 					<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
-					<loadmore :type="isLoading" style="background-color: #fff;padding: 12rpx 0;"></loadmore>
+					<loadmore :type="isLoading" style="padding: 12rpx 0;"></loadmore>
 				</view>
 			</scroll-view>
 		</view>

pages/cloud_warehouse/market/market.vue

@@ -114,7 +114,7 @@
 						</view>
 					</view>
 				</view>
-				<loadmore :type="isLoading" style="background-color: #fff;padding: 12rpx 0;"></loadmore>
+				<loadmore :type="isLoading" style="padding: 12rpx 0;"></loadmore>
 			</scroll-view>
 		</view>
 

pages/cloud_warehouse/specialty/specialty.vue

@@ -70,7 +70,7 @@
 				<view>
 					<!-- 流水瀑布 -->
 					<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
-					<loadmore :type="isLoading" style="background-color: #fff;padding: 12rpx 0;"></loadmore>
+					<loadmore :type="isLoading" style="padding: 12rpx 0;"></loadmore>
 				</view>
 			</scroll-view>
 		</view>

pages/gather/subnvue/concat.nvue

@@ -14,7 +14,7 @@
 			<image src="/static/images/greenLineDown.png" style="width:35px;height: 60px;" mode=""></image>
 		</view>
 		<view class="tips-box" :style="{ left:left+'px',top:(top+80)+'px'}">
-			<view class="tips" style="position: absolute;padding-left: 20px;">
+			<view class="tips" style="position: absolute;padding-left: 10rpx;">
 				<view class="tras" :class="{act:isActive}">
 					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击供销助农平台进入商户平台</text>
 				</view>
@@ -151,7 +151,7 @@
 
 
 	.tras {
-		padding-left: 20rpx;
+		padding-left: 10rpx;
 		position: absolute;
 		z-index: 999 !important;
 		width: 20px;

pages/helpPeople/helpPeople.vue

@@ -19,7 +19,7 @@
 			</view>
 		</view>
 		<view class="li" style="margin-top: 50rpx;" @click="navSw('/pages/index/index',true)">
-			<u-image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/48aed202402260946123969.webp" width="690rpx"
+			<u-image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/static/merchant.webp" width="690rpx"
 				height="200rpx" style="position: absolute;"></u-image>
 			<view class="btn">
 				我是商户

pages/index/index.vue

@@ -45,7 +45,7 @@
 							<!-- 首发新品 -->
 							<recommend ref="recommendRef" :hostProduct="hostProduct[hostIndex]"
 								@changeRecommedTab="changeRecommedTab" showTab :indexP="true" :isLogin="isLogin"
-								:loading="loading">
+								:loading="hotLoading[hostIndex]" :hotTitle="hotTitle">
 							</recommend>
 							<view class="loadingicon acea-row row-center-wrapper"
 								v-if="hostProduct[hostIndex].length > 0 || hotLoading[hostIndex]">
@@ -110,7 +110,7 @@
 							<!-- 首发新品 -->
 							<recommend ref="recommendRef" :hostProduct="hostProduct[hostIndex]"
 								@changeRecommedTab="changeRecommedTab" showTab :indexP="true" :isLogin="isLogin"
-								:loading="loading">
+								:loading="hotLoading[hostIndex]" :hotTitle="hotTitle">
 							</recommend>
 							<view class="loadingicon acea-row row-center-wrapper"
 								v-if="hostProduct[hostIndex].length > 0 || hotLoading[hostIndex]">
@@ -548,7 +548,7 @@
 				isSupport: true,
 				isIndexClick: true,
 				scrollTop: 0,
-				// newStore:
+				tabScroll: 0
 			};
 		},
 
@@ -626,8 +626,6 @@
 			this.activeRouter = '/' + curRoute
 		},
 		onLoad(options) {
-
-
 			let that = this
 			this._options = options;
 			this.diyId = options.diyId || 0;
@@ -797,7 +795,7 @@
 			},
 			bindHeighta(data) {
 				// #ifdef APP-PLUS
-				this.sortMpTop = data.top + data.height;
+				// this.sortMpTop = data.top + data.height;
 				// #endif
 			},
 			// 重新链接
@@ -1080,6 +1078,7 @@
 					// #endif
 				});
 			},
+
 			// 记录会员访问
 			setVisit() {
 				setVisit({
@@ -1113,6 +1112,7 @@
 					self.sortMarTop = 10;
 				}
 			},
+
 			//分类产品
 			get_product_list: function() {
 				let that = this;
@@ -1133,10 +1133,10 @@
 					that.loadTitle = '加载更多';
 				});
 			},
-			/**
+
-			 * 点击组件选项卡
+			//点击组件选项卡
-			 */
 			changeRecommedTab(e) {
+				let that = this;
 				this.hotPage = 1;
 				this.hotScroll = true;
 				this.hostIndex = e - 1;
@@ -1144,11 +1144,14 @@
 				hostList[e - 1] = [];
 				this.$set(this, 'hostProduct', hostList);
 				this.loadGoods(e);
+
+				uni.pageScrollTo({
+					scrollTop: that.$refs.recommendRef.tabsTop,
+					duration: 200
+				})
 			},
+
 			loadGoods(e = 1) {
-
-				console.log(e);
-
 				this.$nextTick(() => {
 					if (e == 1) return this.get_host_product(0);
 					if (e == 2) return this.get_host_home({
@@ -1162,12 +1165,12 @@
 					}, 3);
 				})
 			},
-			/**
+
-			 * 获取我的推荐
+			// 获取我的推荐
-			 */
 			get_host_product: function(e = 0) {
 				let that = this;
 				let num = that.hotLimit;
+
 				if (!that.hotScroll) return;
 				if (that.hotLoading[e]) return;
 
@@ -1177,24 +1180,25 @@
 					uni.stopPullDownRefresh();
 					res.data.list = this.shuffleArray(res.data.list);
 					let list = res.data.list;
+
 					let productList = that.hostProduct;
 					if (!productList[e]) productList[e] = [];
 					productList[e] = [...productList[e], ...res.data.list];
+
 					let hotScroll = list.length <= res.data.limit && list.length != 0;
 					that.hotScroll = hotScroll;
 					that.hotLoading[e] = false;
 					that.hotTitle = !hotScroll ? '已全部加载' : '加载更多';
 
 					that.$set(that, 'hostProduct', productList);
-					if (this.hostIndex == e) this.$forceUpdate();
-
 					that.$set(that, 'hotPage', res.data.page + 1);
 					that.$set(that, 'hotLimit', res.data.limit);
+
+					this.$forceUpdate();
 				});
 			},
-			/**
+
-			 * 获取里海云仓, 云市场, 名优特产
+			// 获取里海云仓, 云市场, 名优特产
-			 */
 			get_host_home: function(query = {}, e = 1) {
 				let that = this;
 				let num = that.hotLimit;
@@ -1243,11 +1247,13 @@
 					this.$set(this, 'navTop', res.data);
 				});
 			},
+
 			reloadData() {
 				setTimeout(() => {
 					this.showSkeleton = false
 				}, 500)
 			},
+
 			// 首发新品详情
 			goDetail(item) {
 				if (item.activity && item.activity.type === '2' && !this.isLogin) {
@@ -1291,6 +1297,7 @@
 					});
 				}
 			},
+
 			//#ifdef H5
 			ShareInfo(datas) {
 				let data = this.storeInfo;
@@ -1326,6 +1333,7 @@
 				this.domHeight = res[0].height;
 			})
 		},
+
 		// 滚动到底部
 		onReachBottom() {
 			if (this.recommend_switch == 1 && this.navIndex == 0) {
@@ -1337,9 +1345,6 @@
 					this.get_product_list();
 				}
 			}
-		},
-		onReady() {
-
 		}
 	};
 </script>

pages/index/subnvue/concat.nvue

@@ -7,9 +7,9 @@
 			<text class="next-btn-text font" @click="next">下一步(1/4)</text>
 		</view>
 		<view class="tips-box" :style="{right:20, top:(offsetY-218)+'px'}">
-			<view class="tips" style="position: absolute;padding-left: 20px;">
+			<view class="tips" style="position: absolute;padding-left: 10rpx;">
 				<view class="tras" :class="{act:isActive}">
-					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击生产页面，进入办公助手</text>
+					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击工作台，进入办公助手</text>
 				</view>
 			</view>
 			<image src="/static/images/starpng.png" class="start" mode="">
@@ -164,7 +164,7 @@
 	}
 
 	.tras {
-		padding-left: 20rpx;
+		padding-left: 10rpx;
 		position: absolute;
 		z-index: 999 !important;
 		width: 0px;

pages/index/subnvue/newUser.nvue

@@ -7,7 +7,8 @@
 			<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">下一步(1/2)</text>
 		</view>
 		<view class="target" :style="{left:screenWidth/4*3,top:screenHeight-68}">
-			<image src="/static/images/ydwd.png" class="target-icon"></image>
+			<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/96aba202405171618278261.png"
+				class="target-icon"></image>
 			<text class="target-text">我的</text>
 		</view>
 		<view :style="{left:screenWidth/4*3,top:screenHeight-130}">

pages/store/applicationRecord/index.vue

@@ -141,6 +141,9 @@
 					}
 					uni.hideLoading();
 					this.loading = false
+				}).catch(() => {
+					uni.hideLoading();
+					this.loading = false
 				})
 			},
 			navgo() {

pages/store/settled/index.vue

@@ -219,10 +219,10 @@
 				<u-transition :show="step==3" mode="slide-right">
 					<view class="step3" v-if='step==3'>
 						<view style="font-size: 36rpx;margin: 50rpx 0 34rpx 0;text-align:center">
-							店铺等待审核
+							{{formData.status==0?'店铺等待审核':'店铺审核完成'}}
 						</view>
 						<view style="font-size: 32rpx;font-family: PFR;margin-bottom: 40rpx;text-align:center">
-							店铺已提交入驻申请
+							{{formData.status==0?'店铺已提交入驻申请':formData.status == 1?'恭喜您的店铺审核成功':'审核失败'}}
 						</view>
 						<view class="step3-card">
 							<view class="" style="display: flex;justify-content: space-between;font-size: 32rpx;">
@@ -289,10 +289,6 @@
 			</view>
 		</view>
 	</view>
-
-
-
-
 </template>
 
 <script>
@@ -618,6 +614,9 @@
 				if (option.type == 1) {
 					this.step = 1
 				}
+				if (option.step) {
+					this.step = 3
+				}
 				if (this.formData.status == 1) {
 					getUnimpInfo().then(res => {
 						this.uniMpInfo = res.data

pages/user/index.vue

@@ -178,7 +178,7 @@
 					<view class="menu-box">
 						<block v-for="(item,index) in personalMenu" :key="index" :id="'target'+index">
 							<view v-if="item.isShow" class="item ">
-								<view @click="authTo(item.url)" class="item-count">
+								<view @click="authTo(item.url,item.name)" class="item-count">
 									<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
 									<image v-else :src="item.pic" class="targets"></image>
 									<text>{{item.name}}</text>
@@ -541,10 +541,16 @@
 			}, 500)
 		},
 		methods: {
-			authTo(url) {
+			authTo(url, name) {
 				if (this.isLogin) {
+					let txt = "";
+					if (this.userInfo && this.userInfo.service && name == "商家入驻") {
+						txt = url + '?step=3'
+					} else {
+						txt = url;
+					}
 					uni.navigateTo({
-						url: url
+						url: txt
 					})
 				} else {
 					this.openAuto()

pages/user/subnvue/index.nvue

@@ -17,7 +17,7 @@
 		<view class="tips-box" :style="{left:left-13.5,top:top-154}">
 			<view class="tips" style="position: absolute;padding-left: 20px;">
 				<view class="tras" :class="{act:isAct}">
-					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
+					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击商户入驻，轻松开店</text>
 				</view>
 			</view>
 			<image src="/static/images/starpng.png" class="start" mode="">

pages/users/login/login_copy.vue

@@ -1241,7 +1241,7 @@
 				console.log(data, 'hanshu')
 				let that = this
 				this.checkOpenId(data.user)
-				const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
+				let backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) ||
 					"/pages/index/index";
 				that.$store.commit("LOGIN", {
 					'token': data.token,
@@ -1264,6 +1264,9 @@
 					'/pages/goods_cate/goods_cate',
 					'/pages/user/index'
 				]
+				// #ifdef H5
+				backUrl = backUrl.replace('/h5', '')
+				// #endif
 				if (indexPat.includes(this.getPath(backUrl))) {
 					method = 'switchTab'
 				} else {

pages/users/order_list/index.vue

@@ -891,7 +891,8 @@
 
 				this.loadend = false;
 				this.loading = false;
-				this.$set(this, 'orderList', []);
+				this.orderList = [];
+				this.sale_type = type;
 
 				if (this.orderStatus == 4) {
 					this.refundParam.identity = type;
@@ -904,7 +905,6 @@
 					this.getUserInfo();
 					this.getpreSellOrderList();
 				}
-				this.sale_type = type;
 			},
 
 			// 获取退款列表

pages/whole_sale/index.vue

@@ -195,8 +195,7 @@
 					</view>
 				</view>
 
-				<loadmore :type="isLoading" v-if="isLoading || hostProduct.length > 0"
+				<loadmore :type="isLoading" v-if="isLoading || hostProduct.length > 0" style="padding: 12rpx 0;">
-					style="background-color: #fff;padding: 12rpx 0;">
 				</loadmore>
 				<view class='pictrue' v-if="!isLoading && hostProduct.length == 0">
 					<image :src="`${domain}/static/images/noCart.png`"></image>