首页、订单、个人中心

mer_uniapp/.gitignore

@@ -22,3 +22,4 @@ yarn-error.log*
 build.sh
 .idea
 unpackage/
+.hbuilderx/

mer_uniapp/.hbuilderx/launch.json

@@ -1,33 +0,0 @@
-{
-    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version" : "0.0",
-    "configurations" : [
-        {
-            "app-plus" : {
-                "launchtype" : "remote"
-            },
-            "default" : {
-                "launchtype" : "remote"
-            },
-            "h5" : {
-                "launchtype" : "remote"
-            },
-            "mp-toutiao" : {
-                "launchtype" : "remote"
-            },
-            "mp-weixin" : {
-                "launchtype" : "remote"
-            },
-            "type" : "uniCloud"
-        },
-        {
-            "playground" : "custom",
-            "type" : "uni-app:app-ios"
-        },
-        {
-            "openVueDevtools" : false,
-            "type" : "uni-app:h5"
-        }
-    ]
-}

mer_uniapp/api/home.js

@@ -0,0 +1,19 @@
+import request from "@/utils/request.js";
+
+/**
+ * 获取首页门店列表
+ *
+*/
+export function getMerchantList(data)
+{
+  return request.get('index/merchant/list/10', data, { noAuth : true});
+}
+
+
+/**
+ * 获取首页banner以及活动精选信息
+ * 
+ */
+export function getHomeInfo() {
+  return request.get("index/info", {},{ noAuth : true});
+}

mer_uniapp/manifest.json

@@ -5,6 +5,7 @@
     "versionName" : "1.8.1",
     "versionCode" : 2,
     "transformPx" : false,
+	"sassImplementationName": "node-sass",
     /* 5+App特有相关 */
     "app-plus" : {
         "titleNView" : true,

mer_uniapp/package-lock.json

@@ -1,19 +1,6 @@
 {
-  "name": "mer_uniapp",
-  "lockfileVersion": 2,
   "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "@qiun/ucharts": "^2.5.0-20230101"
-      }
-    },
-    "node_modules/@qiun/ucharts": {
-      "version": "2.5.0-20230101",
-      "resolved": "https://registry.npmjs.org/@qiun/ucharts/-/ucharts-2.5.0-20230101.tgz",
-      "integrity": "sha512-C7ccBgfPuGF6dxTRuMW0NPPMSCf1k/kh3I9zkRVBc5PaivudX/rPL+jd2Wty6gn5ya5L3Ob+YmYe09V5xw66Cw=="
-    }
-  },
+  "lockfileVersion": 1,
   "dependencies": {
     "@qiun/ucharts": {
       "version": "2.5.0-20230101",

mer_uniapp/pages.json

@@ -65,6 +65,13 @@
 			}
 		},
 		{
+			"path": "pages/order/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "订单"
+			}
+		},
+		{
 			"path": "pages/user/index",
 			"style": {
 				"navigationBarTitleText": "个人中心",
@@ -1513,39 +1520,26 @@
 	},
 	"tabBar": {
 		"custom": false,
-		"color": "#282828",
-		"selectedColor": "#fc4141",
+		"color": "#8E8E8E",
+		"selectedColor": "#FF6702",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
-		"list": [
-				{
+		"list": [{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/shouwei.png",
-				"selectedIconPath": "static/tabBar/shouxuan.png",
+				"iconPath": "/static/tabBar/home-false.png",
+				"selectedIconPath": "/static/tabBar/home-true.png",
 				"text": "首页"
 			},
 			{
-				"pagePath": "pages/goods_cate/index",
-				"iconPath": "static/tabBar/fenwei.png",
-				"selectedIconPath": "static/tabBar/fenxuan.png",
-				"text": "分类"
-			},
-			{
-				"pagePath": "pages/discover_index/index",
-				"iconPath": "static/tabBar/tab3wei.png",
-				"selectedIconPath": "static/tabBar/tab3.png",
-				"text": "逛逛"
-			},
-			{
-				"pagePath": "pages/order_addcart/order_addcart",
-				"iconPath": "static/tabBar/gouwei.png",
-				"selectedIconPath": "static/tabBar/gouxuan.png",
-				"text": "购物车"
+				"pagePath": "pages/order/index",
+				"iconPath": "/static/tabBar/order-false.png",
+				"selectedIconPath": "static/tabBar/order-true.png",
+				"text": "订单"
 			},
 			{
 				"pagePath": "pages/user/index",
-				"iconPath": "static/tabBar/wowei.png",
-				"selectedIconPath": "static/tabBar/woxuan.png",
+				"iconPath": "static/tabBar/my-false.png",
+				"selectedIconPath": "static/tabBar/my-true.png",
 				"text": "我的"
 			}
 		]

mer_uniapp/pages/index/index-bak.vue

@@ -0,0 +1,906 @@
+<template>
+	<view id="home" :data-theme="theme" :style="[pageStyle]">
+		<tui-skeleton v-if="showSkeleton"></tui-skeleton>
+		<!-- 有网内容 -->
+		<view v-if="!errorNetwork">
+			<view class="page-index tui-skeleton page_count" :class="{'bgf':navIndex >0}"
+				:style="{visibility: showSkeleton ? 'hidden' : 'visible'}">
+				<!-- 组合组件 -->
+				<homeComb :bgInfo="bgInfo" v-if="showHomeComb" :dataConfig="homeCombData" @changeTab="changeTab"
+					:isScrolled="isScrolled" :navIndex="navIndex"></homeComb>
+				<!-- 顶部搜索框 -->
+				<headerSearch :isScrolled="isScrolled" v-if="showHeaderSerch" :dataConfig="headerSerchCombData">
+				</headerSearch>
+				<!-- 分类 -->
+				<cateNav v-if="showCateNav" :dataConfig="cateNavData" @changeTab="changeTab"></cateNav>
+				<view class="page_content skeleton">
+					<view v-if="navIndex === 0">
+						<view v-for="(item, index) in styleConfig" :key="index">
+							<!-- 新闻简报 -->
+							<news v-if="item.name == 'news'" :dataConfig="item"></news>
+							<!-- 导航组 -->
+							<menus v-if="item.name == 'menus'" :dataConfig="item"></menus>
+							<!-- 文章列表 -->
+							<articleList v-if="item.name == 'homeArticle'" :dataConfig="item"></articleList>
+							<!-- 秒杀 -->
+							<seckill-data v-if="item.name == 'seckill'" :dataConfig="item"></seckill-data>
+							<!-- 小程序直播 -->
+							<!-- #ifdef MP -->
+							<liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item"></liveBroadcast>
+							<!-- #endif -->
+							<!-- 优惠券 -->
+							<coupon v-if="item.name == 'homeCoupon'" :dataConfig="item"></coupon>
+							<!-- 图片魔方 -->
+							<pictureCube v-if="item.name == 'pictureCube'" :dataConfig="item"></pictureCube>
+							<!-- 热区 -->
+							<hotSpot v-if="item.name == 'homeHotspot'" :dataConfig="item"></hotSpot>
+							<!-- 轮播图 -->
+							<swiperBg v-if="item.name == 'swiperBg'" :dataConfig="item"></swiperBg>
+							<!-- 视频 -->
+							<shortVideo v-if="item.name == 'video'" :dataConfig="item"></shortVideo>
+							<!-- 店铺街 -->
+							<merchant-list v-if="item.name == 'homeMerchant'" :dataConfig="item"></merchant-list>
+							<!-- 拼团 -->
+							<group v-if="item.name == 'group'" :dataConfig="item"></group>
+							<!-- 积分 -->
+							<intergralShop v-if="item.name == 'intergral'" :dataConfig="item"></intergralShop>
+							<!-- 辅助线 -->
+							<guide v-if="item.name == 'guide'" :dataConfig="item"></guide>
+							<!-- 富文本-->
+							<rich-text-editor v-if="item.name == 'richTextEditor'"
+								:dataConfig="item"></rich-text-editor>
+							<!-- 辅助空白-->
+							<blank-page v-if="item.name == 'blankPage'" :dataConfig="item"></blank-page>
+							<!-- 标题 -->
+							<home-title v-if="item.name == 'titles'" :dataConfig="item"></home-title>
+							<!-- 逛逛 -->
+							<discover v-if="item.name == 'homeDiscover'" :dataConfig="item" :isLogin="isLogin">
+							</discover>
+							<!-- 商品列表 -->
+							<goodList v-if="item.name == 'goodList'" :dataConfig="item" @detail="goDetail"></goodList>
+							<!-- 选项卡商品列表-->
+							<homeTab v-if="item.name == 'homeTab'" :dataConfig="item" @detail="goDetail"></homeTab>
+						</view>
+					</view>
+
+					<!-- 分类页-->
+					<view class="productList" v-if="navIndex === 1 && sortList.length>0">
+						<view class="sort acea-row" :class="sortList.length ? '' : 'no_pad'"
+							:style="{ marginTop: sortMarTop + 'px' }">
+							<navigator hover-class="none"
+								:url="'/pages/goods/goods_list/index?cid=' + item.id + '&title=' + item.name"
+								class="item" v-for="(item, index) in sortList" :key="index">
+								<view class="pictrue">
+									<image :src="item.icon" class='slide-image tui-skeleton-rect'></image>
+								</view>
+								<view class="text">{{ item.name }}</view>
+							</navigator>
+							<view class="item" @click="bindMore()" v-if="sortList.length >= 9">
+								<view class="pictrues acea-row row-center-wrapper">
+									<text class="iconfont icon-gengduo2"></text>
+								</view>
+								<view class="text">更多</view>
+							</view>
+						</view>
+					</view>
+					<!-- 推荐商品，分类商品列表-->
+					<recommend v-if="categoryId>0" ref="recommendIndex" :categoryId='categoryId'
+						:isShowTitle="isShowTitle" @getRecommendLength="getRecommendLength"></recommend>
+					<view class='noCommodity' v-if="isNoCommodity&& navIndex > 0">
+						<view class='pictrue'>
+							<image :src="urlDomain+'crmebimage/presets/noShopper.png'"></image>
+						</view>
+						<text class="text-ccc">暂无商品</text>
+					</view>
+				</view>
+
+
+				<!-- #ifdef MP -->
+				<aTip :isCustom="true" :text="wxText" :borderR="5"></aTip>
+				<!-- #endif -->
+			</view>
+		</view>
+		<!-- 断网内容 -->
+		<view v-else>
+			<view class="error-network">
+				<image class="img" src="./error-network.png"></image>
+				<view class="title">网络连接断开</view>
+				<view class="con">
+					<view class="label">请检查情况：</view>
+					<view class="item">· 在设置中是否已开启网络权限</view>
+					<view class="item">· 当前是否处于弱网环境</view>
+					<view class="item">· 版本是否过低，升级试试吧</view>
+				</view>
+				<view class="btn" @click="reconnect">重新连接</view>
+			</view>
+		</view>
+		<!-- 备案号、授权信息 -->
+		<!-- #ifdef H5 -->
+		<view v-show="globalData.authorizeFilingNum || globalData.authorizeInfo" class="mt-40 mb-40rpx">
+			<view @click="toInternet" class="text-center text-24rpx text--w111-666 mb-24">
+				{{globalData.authorizeFilingNum}}
+			</view>
+			<view class="text-center text-24rpx text--w111-666">{{globalData.authorizeInfo}}</view>
+		</view>
+		<!-- #endif -->
+
+		<!-- 底部导航距离，做兼容处理的-->
+		<view v-if="bottomNavigationIsCustom" class="footerBottom"></view>
+		<pageFooter></pageFooter>
+		<!-- 优惠券弹窗 -->
+		<coupon-dialog :urlDomain="urlDomain" v-if="couponModal" :couponModal="couponModal"
+			@on-close="closeDialog"></coupon-dialog>
+	</view>
+</template>
+
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import Cache from '../../utils/cache';
+	import tuiSkeleton from '@/components/base/tui-skeleton.vue';
+	import liveBroadcast from '@/components/homeIndex/liveBroadcast';
+	import merchantList from '@/components/homeIndex/merchant.vue'
+	import homeComb from '@/components/homeIndex/homeComb';
+	import recommend from "@/components/base/recommend.vue";
+	import seckillData from "@/components/homeIndex/seckill.vue";
+	import aTip from './components/addTips.vue';
+	import couponDialog from "@/components/homeIndex/couponDialog.vue"
+	import coupon from "@/components/homeIndex/coupon.vue";
+	import menus from "@/components/homeIndex/menus.vue";
+	import pictureCube from '@/components/homeIndex/pictureCube'
+	import news from '@/components/homeIndex/news'
+	import goodList from '@/components/homeIndex/goodList'
+	import guide from '@/components/homeIndex/guide';
+	import articleList from '@/components/homeIndex/articleList'
+	import swiperBg from '@/components/homeIndex/swiperBg'
+	import headerSearch from '@/components/homeIndex/headerSearch';
+	import cateNav from '@/components/homeIndex/cateNav';
+	import richTextEditor from '@/components/homeIndex/richTextEditor';
+	import shortVideo from '@/components/homeIndex/video';
+	import homeTab from '@/components/homeIndex/homeTab';
+	import discover from '@/components/homeIndex/discover';
+	import blankPage from '@/components/homeIndex/blankPage';
+	import homeTitle from '@/components/homeIndex/title';
+	import hotSpot from '@/components/homeIndex/hotSpot.vue';
+	import group from "@/components/homeIndex/group.vue";
+	import pageFooter from "@/components/pageFooter/index.vue";
+	import intergralShop from "@/components/homeIndex/intergralShop.vue";
+	import {
+		getIndexData,
+		getAppVersion,
+		getCategoryThird,
+		getDiy
+	} from '@/api/api.js';
+	// #ifdef MP-WEIXIN || APP-PLUS
+	import {
+		getTemlIds
+	} from '@/api/api.js';
+	// #endif
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		silenceBindingSpread,
+	} from '@/utils/index.js';
+	import animationType from '@/utils/animationType.js'
+	import {
+		goProductDetail
+	} from "@/libs/order";
+	import onShare from "@/mixins/onShare";
+	const arrTemp = ["beforePay", "afterPay", "createBargain", "pink"];
+	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	let app = getApp();
+	export default {
+		mixins: [onShare],
+		computed: mapGetters(['isLogin', 'uid', 'globalData', 'bottomNavigationIsCustom']),
+		components: {
+			aTip,
+			merchantList,
+			homeComb,
+			recommend,
+			tuiSkeleton,
+			seckillData,
+			pageFooter,
+			liveBroadcast,
+			couponDialog,
+			coupon,
+			menus,
+			pictureCube,
+			news,
+			goodList,
+			articleList,
+			swiperBg,
+			headerSearch,
+			cateNav,
+			guide,
+			richTextEditor,
+			shortVideo,
+			homeTab,
+			discover,
+			blankPage,
+			homeTitle,
+			hotSpot,
+			group,
+			intergralShop
+		},
+		data() {
+			return {
+				urlDomain: this.$Cache.get("imgHost"),
+				isNoCommodity: false,
+				isScrolled: false, //是否开始滚动
+				categoryId: 0,
+				showSkeleton: true, //骨架屏显示隐藏
+				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
+				statusBarHeight: statusBarHeight,
+				navIndex: 0, //判断首页显示内容，1显示分类页和商品，0首页
+				listActive: 0, // 当前选中项
+				theme: app.globalData.theme,
+				imgHost: '', //图片域名地址
+				appUpdate: {},
+				wxText: "点击添加到我的小程序，微信首页下拉即可访问商城。",
+				locationContent: '授权位置信息，提供完整服务',
+				sortMpTop: 0,
+				// #ifdef APP-PLUS || MP
+				isFixed: true,
+				// #endif
+				// #ifdef H5
+				isFixed: false,
+				// #endif
+				domOffsetTop: 50,
+				sortList: [],
+				sortMarTop: 0,
+				domHeight: 0,
+				cateNavActive: 0,
+				couponModal: false,
+				styleConfig: [], //DIY数据
+				diyId: 0, //DIYID
+				homeCombData: {}, //组合组件数据
+				showCateNav: false, //是否显示分类导航组件
+				cateNavData: {}, //分类导航组件数据
+				showHomeComb: false, //是否显示组合
+				showHeaderSerch: false, //是否显示搜索框
+				headerSerchCombData: {}, //搜索框对象
+				isShowTitle: false, //是否显示头部标题，同时也判断是否展示分类下的商品列表
+				bgColor: '', //背景颜色
+				bgPic: '', //背景图片
+				bgTabVal: '', //背景图片样式
+				windowHeight: 0,
+				pageStyle: {},
+				isDefault: 1, //是否首页，1是，0不是
+				errorNetwork: false, //是否有网络
+				bgInfo: {
+					colorPicker: '#f5f5f5',
+					isBgColor: 1,
+				},
+				
+			}
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			// #ifdef APP-PLUS
+			setTimeout(() => {
+				uni.reLaunch({
+					url: "/pages/index/index"
+				});
+				uni.stopPullDownRefresh();
+			}, 1000)
+			// #endif
+		},
+		onLoad(options) {
+			// #ifdef APP-PLUS
+			//app刚进入检测有无网络
+			this.snycNetWork();
+			//APP版本检测
+			this.appVersionConfig();
+			// #endif
+
+			//获取浏览器id
+			this.getOptionData(options)
+
+			//首页数据加载
+			this.getIndexConfig();
+
+			let that = this;
+			this.$nextTick(function() {
+				uni.getSystemInfo({
+					success: function(res) {
+						that.windowHeight = res.windowHeight;
+					}
+				});
+			})
+			// #ifdef MP || APP-PLUS
+			// this.getTemlIds()
+			// #endif
+		},
+		onShow() {
+
+			let self = this;
+			// #ifdef APP-PLUS
+			setTimeout(() => {
+				if (self.appUpdate.openUpgrade == 'true') {
+					self.appVersionConfig();
+				}
+			}, 1000)
+			// #endif
+
+			//新人礼的展示判断
+			let newGift = self.$Cache.get('newGift') ? JSON.parse(self.$Cache.get('newGift')) : [];
+			self.couponModal = newGift.length ? true : false;
+		},
+		// 滚动监听
+		onPageScroll(e) {
+			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+			uni.$emit('scroll');
+			if (e.scrollTop > this.domOffsetTop) {
+				this.isScrolled = true;
+			}
+			if (e.scrollTop < this.domOffsetTop) {
+				this.$nextTick(() => {
+					this.isScrolled = false;
+				});
+			}
+		},
+		methods: {
+			//获取扫码或者浏览器传来的值
+			getOptionData(options) {
+				let diyid = 0;
+				if (options.hasOwnProperty('id') || options.scene) {
+					if (options.scene) { // 仅仅小程序扫码进入
+						let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
+						this.$store.commit('Change_Spread', value.sd);
+						//分销绑定
+						silenceBindingSpread(this.isLogin, value.sd);
+						diyid = value.id ? value.id : 0;
+					} else {
+						diyid = options.id ? options.id : 0;
+						this.$store.commit('Change_Spread', options.sd);
+						//分销绑定
+						silenceBindingSpread(this.isLogin, options.sd);
+					}
+				}
+				//diy数据加载
+				this.diyData(diyid, false);
+			},
+			//备案授权跳转
+			toInternet() {
+				window.open('https://beian.miit.gov.cn/#/Integrated/index')
+			},
+			//app刚进入检测有无网络
+			snycNetWork() {
+				uni.getNetworkType({
+					success: res => {
+						//res.networkType === 'none'无网络
+						this.errorNetwork = res.networkType === 'none';
+						//如果没有网络，清除骨架屏
+						if (this.errorNetwork) this.reloadData();
+					}
+				});
+			},
+			// 断网后重新链接
+			reconnect() {
+				uni.getNetworkType({
+					success: res => {
+						this.errorNetwork = res.networkType === 'none';
+						if (!this.errorNetwork) {
+							setTimeout(() => {
+								uni.reLaunch({
+									url: "/pages/index/index"
+								});
+							}, 1000)
+						}
+					}
+				});
+			},
+			/**
+			 * 获取DIY
+			 * @param {number} id
+			 * @param {boolean} type 区分是否是微页面
+			 */
+			diyData(id, type) {
+				let that = this;
+				that.styleConfig = []
+				uni.showLoading({
+					title: '加载中...'
+				});
+				getDiy(id).then(res => {
+					that.errorNetwork = false;
+					uni.setNavigationBarTitle({
+						title: res.data.title
+					});
+					uni.setNavigationBarColor({
+						//必须要16进制小写
+						frontColor: res.data.titleColor,
+						backgroundColor: res.data.titleBgColor.toString().toLowerCase(),
+					})
+					let data = res.data;
+					that.diyId = res.data.id;
+					that.isDefault = data.isDefault; //是否是首页，1是，0不是
+					that.styleConfig = that.$util.objToArr(res.data.value);
+					this.bgInfo.isBgColor = data.isBgColor
+					this.bgInfo.colorPicker = data.colorPicker
+					that.pageStyle = {
+						'background-color': data.isBgColor === 1 ? res.data.colorPicker : '',
+						'background-image': data.isBgPic === 1 ? `url(${res.data.bgPic})` : '',
+						'background-repeat': res.data.bgTabVal === 1 ? 'repeat-y' : 'no-repeat',
+						'background-size': res.data.bgTabVal === 2 ? 'cover' : 'contain'
+					};
+					uni.hideLoading();
+					if (type) {
+						that.styleConfig.forEach((item) => {
+							if (item.name == 'headerSerch' || item.name == 'homeComb' || item.name ==
+								'tabNav') {
+								that.styleConfig.splice(index, 1);
+							}
+						});
+					} else {
+						that.styleConfig.forEach((item) => {
+							if (item.name === 'tabNav') {
+								that.showCateNav = true;
+								that.cateNavData = item;
+							}
+							if (item.name === 'homeComb') {
+								that.showHomeComb = true
+								console.log("homeCombData--",item)
+								that.homeCombData = item;
+							}
+							if (item.name === 'headerSerch') {
+								that.showHeaderSerch = true
+								that.headerSerchCombData = item;
+							}
+						});
+					}
+					setTimeout(() => {
+						that.isNodes++;
+					}, 100);
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+					uni.hideLoading();
+				});
+			},
+			bindMore() {
+				uni.setStorageSync('cateNavActive', this.cateNavActive);
+				uni.setStorageSync('categoryId', this.categoryId);
+				uni.switchTab({
+					url: `/pages/goods_cate/index`
+				})
+			},
+			getRecommendLength(e) {
+				this.isNoCommodity = e == 0 ? true : false;
+			},
+			// 导航分类切换
+			changeTab(index, item) {
+				//type=0微页面，1分类，2首页
+				this.cateNavActive = index;
+				if (item.type == 1) {
+					this.navIndex = 1;
+					if (!item.val) {
+						this.sortList = [];
+						this.categoryId = 0;
+						this.$util.Tips({
+							title: "请在平台端选择商品分类！确保加载商品分类数据。"
+						});
+						return;
+					} else {
+						getCategoryThird(item.val).then(res => {
+							this.sortList = res.data;
+							// #ifdef H5
+							self.sortMarTop = 10;
+							// #endif
+						});
+						this.categoryId = item.val;
+						this.isShowTitle = false;
+					}
+				} else if (item.type == 0) {
+					this.navIndex = 0;
+					this.isShowTitle = true;
+					this.categoryId = 0;
+					if (!item.val) {
+						return this.$util.Tips({
+							title: "请在平台端选择微页面链接！确保加载微页面数据。"
+						});
+					} else {
+						this.styleConfig = [];
+						this.diyData(item.val, true);
+					}
+				} else {
+					this.categoryId = 0;
+					this.navIndex = 0;
+					this.styleConfig = [];
+					this.diyData(item.val, false);
+				}
+			},
+			toNewsList() {
+				uni.navigateTo({
+					animationType: animationType.type,
+					animationDuration: animationType.duration,
+					url: '/pages/goods/news_list/index'
+				})
+			},
+			//清除骨架屏
+			reloadData() {
+				this.showSkeleton = false;
+			},
+			getElementData(el, callback) {
+				uni.createSelectorQuery().in(this).selectAll(el).boundingClientRect().exec((data) => {
+					callback(data[0]);
+				});
+			},
+			xieyiApp() {
+				uni.navigateTo({
+					url: '/pages/users/web_page/index?webUel=https://admin.java.crmeb.net/useragreement/xieyi.html&title=协议内容'
+				})
+			},
+			// #ifdef APP-PLUS
+			xieyiApp() {
+				uni.navigateTo({
+					animationType: animationType.type,
+					animationDuration: animationType.duration,
+					url: '/pages/users/web_page/index?webUel=https://admin.java.crmeb.net/useragreement/xieyi.html&title=协议内容'
+				})
+			},
+			// #endif
+			// #ifdef MP || APP-PLUS
+			getTemlIds() {
+				for (var i in arrTemp) {
+					this.getTem(arrTemp[i]);
+				}
+			},
+			getTem(data) {
+				getTemlIds({
+					type: data
+				}).then(res => {
+					if (res.data) {
+						let arr = res.data.map((item) => {
+							return item.tempId
+						})
+						wx.setStorageSync('tempID' + data, arr);
+					}
+				});
+			},
+			// #endif
+			// 首页数据
+			getIndexConfig: function() {
+				let that = this;
+				getIndexData().then(res => {
+					let imgHost = res.data.logoUrl.split('crmebimage')[0];
+					that.imgHost = imgHost;
+					that.$Cache.set('imgHost', imgHost + '/');
+					// #ifdef H5 || APP-PLUS
+					that.$store.commit("SET_CHATURL", res.data.yzfUrl);
+					Cache.set('chatUrl', res.data.yzfUrl);
+					// #endif
+					Cache.setItem({
+						name: 'platChatConfig',
+						value: {
+							servicePhone: res.data.consumerHotline, //客服电话
+							serviceLink: res.data.consumerH5Url, //云智服
+							serviceType: res.data.consumerType //客服类型四选一
+						}
+					});
+					this.reloadData();
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					});
+				});
+			},
+			appVersionConfig() {
+				var that = this;
+				//app升级
+				// 获取本地应用资源版本号
+				getAppVersion().then(res => {
+					that.$set(that.appUpdate, 'androidAddress', res.data.androidAddress);
+					that.$set(that.appUpdate, 'appVersion', res.data.appVersion);
+					that.$set(that.appUpdate, 'iosAddress', res.data.iosAddress);
+					that.$set(that.appUpdate, 'openUpgrade', res.data.openUpgrade);
+					plus.runtime.getProperty(plus.runtime.appid, function(inf) {
+						let nowVersion = (inf.version).split('.').join('');
+						let appVersion = (res.data.appVersion).split('.').join('');
+						uni.getSystemInfo({
+							success: (res) => {
+								if (appVersion > nowVersion) {
+									uni.showModal({
+										title: '更新提示',
+										content: '发现新版本，是否前去下载?',
+										showCancel: that.appUpdate.openUpgrade == '1' ?
+											true : false,
+										cancelColor: '#eeeeee',
+										confirmColor: '#FF0000',
+										success(response) {
+											if (response.confirm) {
+												switch (res.platform) {
+													case "android":
+														plus.runtime.openURL(that
+															.appUpdate
+															.androidAddress);
+														break;
+													case "ios":
+														plus.runtime.openURL(encodeURI(
+															that.appUpdate
+															.iosAddress));
+														break;
+												}
+
+											}
+										}
+									});
+								}
+							}
+						})
+					});
+				})
+			},
+			// 微信分享；
+			setOpenShare: function(data) {
+				let that = this;
+				if (that.$wechat.isWeixin()) {
+					let configAppMessage = {
+						desc: this.globalData.companyName,
+						title: this.globalData.companyName,
+						link: location.href
+					};
+					that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"],
+						configAppMessage);
+				}
+			},
+			stopTouchMove() {
+				return true //禁止新闻swiper手动滑动
+			},
+			closeDialog() {
+				this.couponModal = false;
+				this.$Cache.clear('newGift');
+			},
+			goDetail(item) {
+				goProductDetail(item.id, 0, '')
+			},
+		},
+		mounted() {
+			let query = uni.createSelectorQuery().in(this);
+			query.select("#home").boundingClientRect();
+			query.exec(res => {
+				this.domHeight = res[0].height;
+			})
+		},
+	}
+</script>
+<style>
+	page {
+		height: auto;
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		/* #ifdef H5 */
+		background-color: #fff;
+		/* #endif */
+
+	}
+</style>
+<style lang="scss" scoped>
+	.error-network {
+		position: fixed;
+		left: 0;
+		top: 0;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 100%;
+		height: 100%;
+		padding-top: 40rpx;
+		background: #fff;
+		padding-top: 30%;
+
+		.img {
+			width: 414rpx;
+			height: 336rpx;
+		}
+
+		.title {
+			position: relative;
+			top: -40rpx;
+			font-size: 32rpx;
+			color: #666;
+		}
+
+		.con {
+			font-size: 24rpx;
+			color: #999;
+
+			.label {
+				margin-bottom: 20rpx;
+			}
+
+			.item {
+				margin-bottom: 20rpx;
+			}
+		}
+
+		.btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 508rpx;
+			height: 86rpx;
+			margin-top: 100rpx;
+			border: 1px solid #d74432;
+			color: #e93323;
+			font-size: 30rpx;
+			border-radius: 120rpx;
+		}
+	}
+
+	.ysize {
+		background-size: 100%;
+	}
+
+	.fullsize {
+		background-size: 100% 100%;
+	}
+
+	.repeat {
+		background-repeat: repeat;
+	}
+
+	.noRepeat {
+		background-repeat: no-repeat;
+	}
+
+	.noCommodity {
+		margin-top: 30%;
+	}
+
+	.icon-gengduo1 {
+		color: #F8F8F8;
+	}
+
+	.pageIndex {
+		padding: 0 24rpx;
+	}
+
+	.productList {
+		background-color: #F5F5F5;
+		margin-top: 20rpx;
+
+		// min-height: 70vh;
+		.sort {
+			width: 710rpx;
+			max-height: 380rpx;
+			background: rgba(255, 255, 255, 1);
+			border-radius: 16rpx;
+			padding: 0rpx 0rpx 20rpx 0rpx !important;
+			flex-wrap: wrap;
+			margin: 25rpx auto 0 auto;
+
+			&.no_pad {
+				padding: 0;
+			}
+
+			.item {
+				width: 20%;
+				margin-top: 20rpx;
+				text-align: center;
+
+				.pictrues {
+					width: 90rpx;
+					height: 90rpx;
+					background: #F5F5F5;
+					border-radius: 50%;
+					margin: 0 auto;
+				}
+
+				.pictrue {
+					width: 90rpx;
+					height: 90rpx;
+					background: #F5F5F5;
+					border-radius: 50%;
+					margin: 0 auto;
+				}
+
+				.slide-image {
+					width: 90rpx;
+					height: 90rpx;
+					border-radius: 50%;
+					overflow: hidden;
+				}
+
+				/deep/ .easy-loadimage,
+				uni-image,
+				.easy-loadimage {
+					width: 90rpx;
+					height: 90rpx;
+					display: inline-block;
+				}
+
+				.text {
+					color: #272727;
+					font-size: 24rpx;
+					margin-top: 10rpx;
+					// overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+	}
+
+	.productList .list {
+		padding: 0 20rpx;
+	}
+
+	.productList .list.on {
+		background-color: #fff;
+		border-top: 1px solid #f6f6f6;
+	}
+
+	.productList .list .item {
+		width: 345rpx;
+		margin-top: 20rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+
+		.name {
+			display: flex;
+			align-items: center;
+
+			.name_text {
+				display: inline-block;
+				max-width: 200rpx;
+			}
+		}
+	}
+
+	.page-index {
+		display: flex;
+		flex-direction: column;
+		min-height: 100%;
+
+		.page_content {
+			overflow-x: hidden;
+
+			// background-color: #f5f5f5;
+			.swiper {
+				position: relative;
+				width: 100%;
+				height: 246rpx;
+				margin: 0 auto;
+				border-radius: 10rpx;
+				overflow: hidden;
+				margin-bottom: 25rpx;
+				/* #ifdef MP */
+				margin-top: 20rpx;
+
+				/* #endif */
+				swiper,
+				swiper-item,
+				.slide-image,
+				image {
+					width: 100%;
+					height: 246rpx;
+					border-radius: 10rpx;
+				}
+			}
+		}
+	}
+
+	.fixed {
+		z-index: 100;
+		position: fixed;
+		left: 0;
+		top: 0;
+		background: linear-gradient(90deg, red 50%, #ff5400 100%);
+
+	}
+
+	.menu-txt {
+		font-size: 24rpx;
+		color: #454545;
+	}
+</style>

mer_uniapp/pages/index/index.vue

@@ -1,674 +1,323 @@
 <template>
-	<view id="home" :data-theme="theme" :style="[pageStyle]">
-		<tui-skeleton v-if="showSkeleton"></tui-skeleton>
-		<!-- 有网内容 -->
-		<view v-if="!errorNetwork">
-			<view class="page-index tui-skeleton page_count" :class="{'bgf':navIndex >0}"
-				:style="{visibility: showSkeleton ? 'hidden' : 'visible'}">
-				<!-- 组合组件 -->
-				<homeComb :bgInfo="bgInfo" v-if="showHomeComb" :dataConfig="homeCombData" @changeTab="changeTab"
-					:isScrolled="isScrolled" :navIndex="navIndex"></homeComb>
-				<!-- 顶部搜索框 -->
-				<headerSearch :isScrolled="isScrolled" v-if="showHeaderSerch" :dataConfig="headerSerchCombData">
-				</headerSearch>
-				<!-- 分类 -->
-				<cateNav v-if="showCateNav" :dataConfig="cateNavData" @changeTab="changeTab"></cateNav>
-				<view class="page_content skeleton">
-					<view v-if="navIndex === 0">
-						<view v-for="(item, index) in styleConfig" :key="index">
-							<!-- 新闻简报 -->
-							<news v-if="item.name == 'news'" :dataConfig="item"></news>
-							<!-- 导航组 -->
-							<menus v-if="item.name == 'menus'" :dataConfig="item"></menus>
-							<!-- 文章列表 -->
-							<articleList v-if="item.name == 'homeArticle'" :dataConfig="item"></articleList>
-							<!-- 秒杀 -->
-							<seckill-data v-if="item.name == 'seckill'" :dataConfig="item"></seckill-data>
-							<!-- 小程序直播 -->
-							<!-- #ifdef MP -->
-							<liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item"></liveBroadcast>
-							<!-- #endif -->
-							<!-- 优惠券 -->
-							<coupon v-if="item.name == 'homeCoupon'" :dataConfig="item"></coupon>
-							<!-- 图片魔方 -->
-							<pictureCube v-if="item.name == 'pictureCube'" :dataConfig="item"></pictureCube>
-							<!-- 热区 -->
-							<hotSpot v-if="item.name == 'homeHotspot'" :dataConfig="item"></hotSpot>
-							<!-- 轮播图 -->
-							<swiperBg v-if="item.name == 'swiperBg'" :dataConfig="item"></swiperBg>
-							<!-- 视频 -->
-							<shortVideo v-if="item.name == 'video'" :dataConfig="item"></shortVideo>
-							<!-- 店铺街 -->
-							<merchant-list v-if="item.name == 'homeMerchant'" :dataConfig="item"></merchant-list>
-							<!-- 拼团 -->
-							<group v-if="item.name == 'group'" :dataConfig="item"></group>
-							<!-- 积分 -->
-							<intergralShop v-if="item.name == 'intergral'" :dataConfig="item"></intergralShop>
-							<!-- 辅助线 -->
-							<guide v-if="item.name == 'guide'" :dataConfig="item"></guide>
-							<!-- 富文本-->
-							<rich-text-editor v-if="item.name == 'richTextEditor'"
-								:dataConfig="item"></rich-text-editor>
-							<!-- 辅助空白-->
-							<blank-page v-if="item.name == 'blankPage'" :dataConfig="item"></blank-page>
-							<!-- 标题 -->
-							<home-title v-if="item.name == 'titles'" :dataConfig="item"></home-title>
-							<!-- 逛逛 -->
-							<discover v-if="item.name == 'homeDiscover'" :dataConfig="item" :isLogin="isLogin">
-							</discover>
-							<!-- 商品列表 -->
-							<goodList v-if="item.name == 'goodList'" :dataConfig="item" @detail="goDetail"></goodList>
-							<!-- 选项卡商品列表-->
-							<homeTab v-if="item.name == 'homeTab'" :dataConfig="item" @detail="goDetail"></homeTab>
-						</view>
-					</view>
+	<view>
 
-					<!-- 分类页-->
-					<view class="productList" v-if="navIndex === 1 && sortList.length>0">
-						<view class="sort acea-row" :class="sortList.length ? '' : 'no_pad'"
-							:style="{ marginTop: sortMarTop + 'px' }">
-							<navigator hover-class="none"
-								:url="'/pages/goods/goods_list/index?cid=' + item.id + '&title=' + item.name"
-								class="item" v-for="(item, index) in sortList" :key="index">
-								<view class="pictrue">
-									<image :src="item.icon" class='slide-image tui-skeleton-rect'></image>
-								</view>
-								<view class="text">{{ item.name }}</view>
-							</navigator>
-							<view class="item" @click="bindMore()" v-if="sortList.length >= 9">
-								<view class="pictrues acea-row row-center-wrapper">
-									<text class="iconfont icon-gengduo2"></text>
-								</view>
-								<view class="text">更多</view>
+		<!-- 状态栏高度 -->
+		<view :style="{ height: `${statusBarHeight}px` }"></view>
+
+		<!-- 导航栏 -->
+		<view class="navigationbar" :style="{ height: `${navigationBarHeight}px` }">
+
+			<view class="bar-left">
+				<image src="/static/img/ic-position.png">
+				</image>
+				<text class="bar-position">{{userAddress}}</text>
+			</view>
+
+			<view class="bar-center">校园外卖</view>
+
+			<view style="flex: 1;">
+				<image src="/static/img/ic-search.png"></image>
+			</view>
+		</view>
+
+		<!-- 主体内容 -->
+		<view class="content">
+
+			<!-- banner轮播图 -->
+			<view style="margin-top: 10rpx;">
+				<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration"
+					circular="true">
+					<block v-for="(item,index) in bannerList" :key='item.id'>
+						<swiper-item catchtouchmove='catchTouchMove'>
+							<view class="swiper-item">
+								<image class="banner-img" :src="item.pic" mode="widthFix" />
 							</view>
+						</swiper-item>
+					</block>
+				</swiper>
+			</view>
+
+			<!-- 新闻 -->
+			<view class="container">
+				<!-- 左侧固定图片 -->
+				<image class="left-image" src="/static/img/ic-message.png"></image>
+
+				<!-- 右侧文字轮播区域 -->
+				<view class="right-text-container">
+					<view class="text-list" :style="{ transform: `translateY(${offset}px)` }">
+						<view class="text-item" v-for="(item, index) in messageList" :key="index">
+							{{ item.title }}
 						</view>
-					</view>
-					<!-- 推荐商品，分类商品列表-->
-					<recommend v-if="categoryId>0" ref="recommendIndex" :categoryId='categoryId'
-						:isShowTitle="isShowTitle" @getRecommendLength="getRecommendLength"></recommend>
-					<view class='noCommodity' v-if="isNoCommodity&& navIndex > 0">
-						<view class='pictrue'>
-							<image :src="urlDomain+'crmebimage/presets/noShopper.png'"></image>
+						<!-- 复制第一条数据实现无缝轮播 -->
+						<view class="text-item" v-if="messageList.length > 0">
+							{{ messageList[0].title }}
 						</view>
-						<text class="text-ccc">暂无商品</text>
 					</view>
 				</view>
+			</view>
 
+			<!-- 九宫格 -->
+			<view class="content-tab">
+				<view class="tab-list">
+					<view class="tab-item">
+						<image class="tab-image" src="/static/img/img1.png" mode="widthFix"></image>
+						<text class="tab-text">外卖</text>
+					</view>
+					<view class="tab-item">
+						<image class="tab-image" src="/static/img/img2.png" mode="widthFix"></image>
+						<text class="tab-text">表白墙</text>
+					</view>
+					<view class="tab-item">
+						<image class="tab-image" src="/static/img/img3.png" mode="widthFix"></image>
+						<text class="tab-text">游戏搭子</text>
+					</view>
+					<view class="tab-item">
+						<image class="tab-image" src="/static/img/img4.png" mode="widthFix"></image>
+						<text class="tab-text">二手交易</text>
+					</view>
+					<view class="tab-item">
+						<image class="tab-image" src="/static/img/img5.png" mode="widthFix"></image>
+						<text class="tab-text">代取快递</text>
+					</view>
+				</view>
+
+				<view class="tab-list">
+					<view class="tab-item">
+						<image class="tab-image" src="/static/img/img6.png" mode="widthFix"></image>
+						<text class="tab-text2">宵夜江湖</text>
+					</view>
+					<view class="tab-item">
+						<image class="tab-image" src="/static/img/img7.png" mode="widthFix"></image>
+						<text class="tab-text2">炸鸡汉堡</text>
+					</view>
+					<view class="tab-item">
+						<image class="tab-image" src="/static/img/img8.png" mode="widthFix"></image>
+						<text class="tab-text2">奶茶甜点</text>
+					</view>
+					<view class="tab-item">
+						<image class="tab-image" src="/static/img/img9.png" mode="widthFix"></image>
+						<text class="tab-text2">超市便利</text>
+					</view>
+					<view class="tab-item">
+						<image class="tab-image" src="/static/img/ic-random.png" mode="widthFix"></image>
+						<text class="tab-text" style="color: #FF9805;font-weight: 600; font-size: 27rpx;">今日吃啥</text>
+					</view>
+				</view>
 
-				<!-- #ifdef MP -->
-				<aTip :isCustom="true" :text="wxText" :borderR="5"></aTip>
-				<!-- #endif -->
 			</view>
-		</view>
-		<!-- 断网内容 -->
-		<view v-else>
-			<view class="error-network">
-				<image class="img" src="./error-network.png"></image>
-				<view class="title">网络连接断开</view>
-				<view class="con">
-					<view class="label">请检查情况：</view>
-					<view class="item">· 在设置中是否已开启网络权限</view>
-					<view class="item">· 当前是否处于弱网环境</view>
-					<view class="item">· 版本是否过低，升级试试吧</view>
+
+
+			<!-- 活动精选 -->
+			<view class="content-goods">
+				<view>
+					<image src="/static/img/img-hdjx.png" style="width: 298rpx;height: 44rpx;"></image>
+
+					<text class="goods-more">更多 》</text>
+				</view>
+
+
+				<view style="display: flex;">
+
+					<view class="goods-list" v-for="item in proList" :key="item.id">
+						<view style="display: flex;">
+							<view style="margin-right: 20rpx;">
+								<image :src="item.image" style="width: 134rpx;height: 134rpx;border-radius: 12rpx;">
+								</image>
+							</view>
+
+							<view>
+								<view class="goods-title">{{item.name}}</view>
+								<view class="goods-desc">{{item.intro}}</view>
+								<view style="margin-top: 10rpx;">
+									<image src="/static/img/ic-ykj.png" style="height: 38rpx;width: 86rpx;"></image>
+									<text class="goods-price">¥</text>
+									<text class="goods-price" style="font-size: 30rpx;">{{item.price}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+
 				</view>
-				<view class="btn" @click="reconnect">重新连接</view>
 			</view>
-		</view>
-		<!-- 备案号、授权信息 -->
-		<!-- #ifdef H5 -->
-		<view v-show="globalData.authorizeFilingNum || globalData.authorizeInfo" class="mt-40 mb-40rpx">
-			<view @click="toInternet" class="text-center text-24rpx text--w111-666 mb-24">
-				{{globalData.authorizeFilingNum}}
+
+			<!-- 销量排行 -->
+			<view class="tab-list" style="margin-top: 10rpx;">
+				<view :class=" item.checked ? 'tab-item2' : 'tab-item2-false' " v-for="item in labelList" :key="item.id"
+					@click="item2Click(item)">{{item.label}}</view>
 			</view>
-			<view class="text-center text-24rpx text--w111-666">{{globalData.authorizeInfo}}</view>
+
+			<view class="content-goods2" v-for="item in merchantList" :key="item.id">
+				<view>
+					<image :src="item.pcLogo" style="width: 230rpx;height: 230rpx;"></image>
+				</view>
+
+				<view style="margin-left: 20rpx;flex: 1;">
+					<view class="">
+						<text class="goods-title">{{item.name}}</text>
+						<image src="/static/img/ic-close.png" style="width: 32rpx;height: 32rpx;float: right; "></image>
+					</view>
+
+					<view style="margin-top: 10rpx;">
+						<text class="goods-score">{{item.score}}</text>
+						<text class="goods-info" style="margin-left: 10rpx;">月销 {{item.salesVolume}}</text>
+						<text class="goods-info" style="margin-left: 25rpx;">人均 ¥ {{item.perCapita}}</text>
+					</view>
+
+					<view style="margin-top: 10rpx;">
+						<text class="goods-info">起送 ¥ {{item.perCapita}}</text>
+						<text v-if="!item.isfreeDeliverfee" class="goods-info"
+							style="color: #E5AD21;margin-left: 16rpx;">免配送费</text>
+						<text v-if="!item.isfreeDeliverfee"
+							style="color: #999999;font-size: 21rpx;margin-left: 10rpx;text-decoration: line-through;">¥
+							{{item.freeDeliverFee}}</text>
+						<text v-if="item.isfreeDeliverfee"
+							style="color: #999999;font-size: 21rpx;margin-left: 10rpx;">配送费¥ {{item.distCosts}}</text>
+						<text class="goods-info" style="margin-left: 38rpx;">10分钟</text>
+						<text class="goods-info" style="margin-left: 10rpx;">{{item.distance}}</text>
+					</view>
+
+					<view style="margin-top: 24rpx;"><text class="goods-sales">已售卖{{item.salesVolume}}件</text></view>
+
+					<view style="margin-top: 14rpx;">
+						<text class="goods-labels" v-for="(item2,index2) in item.discountLabel"
+							:key="index2">{{item2}}</text>
+					</view>
+
+				</view>
+			</view>
+
+
+
 		</view>
-		<!-- #endif -->
-
-		<!-- 底部导航距离，做兼容处理的-->
-		<view v-if="bottomNavigationIsCustom" class="footerBottom"></view>
-		<pageFooter></pageFooter>
-		<!-- 优惠券弹窗 -->
-		<coupon-dialog :urlDomain="urlDomain" v-if="couponModal" :couponModal="couponModal"
-			@on-close="closeDialog"></coupon-dialog>
+
 	</view>
 </template>
 
 <script>
-	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
-	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
-	// +----------------------------------------------------------------------
-	import Cache from '../../utils/cache';
-	import tuiSkeleton from '@/components/base/tui-skeleton.vue';
-	import liveBroadcast from '@/components/homeIndex/liveBroadcast';
-	import merchantList from '@/components/homeIndex/merchant.vue'
-	import homeComb from '@/components/homeIndex/homeComb';
-	import recommend from "@/components/base/recommend.vue";
-	import seckillData from "@/components/homeIndex/seckill.vue";
-	import aTip from './components/addTips.vue';
-	import couponDialog from "@/components/homeIndex/couponDialog.vue"
-	import coupon from "@/components/homeIndex/coupon.vue";
-	import menus from "@/components/homeIndex/menus.vue";
-	import pictureCube from '@/components/homeIndex/pictureCube'
-	import news from '@/components/homeIndex/news'
-	import goodList from '@/components/homeIndex/goodList'
-	import guide from '@/components/homeIndex/guide';
-	import articleList from '@/components/homeIndex/articleList'
-	import swiperBg from '@/components/homeIndex/swiperBg'
-	import headerSearch from '@/components/homeIndex/headerSearch';
-	import cateNav from '@/components/homeIndex/cateNav';
-	import richTextEditor from '@/components/homeIndex/richTextEditor';
-	import shortVideo from '@/components/homeIndex/video';
-	import homeTab from '@/components/homeIndex/homeTab';
-	import discover from '@/components/homeIndex/discover';
-	import blankPage from '@/components/homeIndex/blankPage';
-	import homeTitle from '@/components/homeIndex/title';
-	import hotSpot from '@/components/homeIndex/hotSpot.vue';
-	import group from "@/components/homeIndex/group.vue";
-	import pageFooter from "@/components/pageFooter/index.vue";
-	import intergralShop from "@/components/homeIndex/intergralShop.vue";
+	import QQMapWX from '@/utils/qqmap-wx-jssdk.min.js';
 	import {
-		getIndexData,
-		getAppVersion,
-		getCategoryThird,
-		getDiy
-	} from '@/api/api.js';
-	// #ifdef MP-WEIXIN || APP-PLUS
-	import {
-		getTemlIds
-	} from '@/api/api.js';
-	// #endif
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		silenceBindingSpread,
-	} from '@/utils/index.js';
-	import animationType from '@/utils/animationType.js'
-	import {
-		goProductDetail
-	} from "@/libs/order";
-	import onShare from "@/mixins/onShare";
-	const arrTemp = ["beforePay", "afterPay", "createBargain", "pink"];
+		getMerchantList,
+		getHomeInfo
+	} from '@/api/home.js';
 	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	let app = getApp();
 	export default {
-		mixins: [onShare],
-		computed: mapGetters(['isLogin', 'uid', 'globalData', 'bottomNavigationIsCustom']),
-		components: {
-			aTip,
-			merchantList,
-			homeComb,
-			recommend,
-			tuiSkeleton,
-			seckillData,
-			pageFooter,
-			liveBroadcast,
-			couponDialog,
-			coupon,
-			menus,
-			pictureCube,
-			news,
-			goodList,
-			articleList,
-			swiperBg,
-			headerSearch,
-			cateNav,
-			guide,
-			richTextEditor,
-			shortVideo,
-			homeTab,
-			discover,
-			blankPage,
-			homeTitle,
-			hotSpot,
-			group,
-			intergralShop
-		},
 		data() {
 			return {
-				urlDomain: this.$Cache.get("imgHost"),
-				isNoCommodity: false,
-				isScrolled: false, //是否开始滚动
-				categoryId: 0,
-				showSkeleton: true, //骨架屏显示隐藏
-				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
-				statusBarHeight: statusBarHeight,
-				navIndex: 0, //判断首页显示内容，1显示分类页和商品，0首页
-				listActive: 0, // 当前选中项
-				theme: app.globalData.theme,
-				imgHost: '', //图片域名地址
-				appUpdate: {},
-				wxText: "点击添加到我的小程序，微信首页下拉即可访问商城。",
-				locationContent: '授权位置信息，提供完整服务',
-				sortMpTop: 0,
-				// #ifdef APP-PLUS || MP
-				isFixed: true,
-				// #endif
-				// #ifdef H5
-				isFixed: false,
-				// #endif
-				domOffsetTop: 50,
-				sortList: [],
-				sortMarTop: 0,
-				domHeight: 0,
-				cateNavActive: 0,
-				couponModal: false,
-				styleConfig: [], //DIY数据
-				diyId: 0, //DIYID
-				homeCombData: {}, //组合组件数据
-				showCateNav: false, //是否显示分类导航组件
-				cateNavData: {}, //分类导航组件数据
-				showHomeComb: false, //是否显示组合
-				showHeaderSerch: false, //是否显示搜索框
-				headerSerchCombData: {}, //搜索框对象
-				isShowTitle: false, //是否显示头部标题，同时也判断是否展示分类下的商品列表
-				bgColor: '', //背景颜色
-				bgPic: '', //背景图片
-				bgTabVal: '', //背景图片样式
-				windowHeight: 0,
-				pageStyle: {},
-				isDefault: 1, //是否首页，1是，0不是
-				errorNetwork: false, //是否有网络
-				bgInfo: {
-					colorPicker: '#f5f5f5',
-					isBgColor: 1,
-				},
-				
+				statusBarHeight: app.globalData.statusBarHeight,
+				navigationBarHeight: 0,
+				userAddress: "定位",
+				indicatorDots: true,
+				autoplay: true,
+				interval: 2000, //切换的间隔时间
+				duration: 500, //滑动动画时长
+				bannerList: [],
+				messageList: [],
+				proList: [],
+				labelList: [{
+					id: 1,
+					label: "销量排行",
+					checked: true
+				}, {
+					id: 2,
+					label: "满减大促",
+					checked: false
+				}, {
+					id: 3,
+					label: "首单立减",
+					checked: false
+				}, {
+					id: 4,
+					label: "减配送费",
+					checked: false
+				}],
+				merchantList: [],
+				currentIndex: 0,
+				offset: 0,
 			}
 		},
 		//下拉刷新
 		onPullDownRefresh() {
-			// #ifdef APP-PLUS
-			setTimeout(() => {
-				uni.reLaunch({
-					url: "/pages/index/index"
-				});
-				uni.stopPullDownRefresh();
-			}, 1000)
-			// #endif
+
 		},
 		onLoad(options) {
-			// #ifdef APP-PLUS
-			//app刚进入检测有无网络
-			this.snycNetWork();
-			//APP版本检测
-			this.appVersionConfig();
-			// #endif
-
-			//获取浏览器id
-			this.getOptionData(options)
-
-			//首页数据加载
-			this.getIndexConfig();
-
 			let that = this;
-			this.$nextTick(function() {
-				uni.getSystemInfo({
-					success: function(res) {
-						that.windowHeight = res.windowHeight;
-					}
-				});
-			})
-			// #ifdef MP || APP-PLUS
-			// this.getTemlIds()
+			//首页数据加载
+			// this.getIndexConfig();
+			// #ifdef MP-WEIXIN
+			// 获取微信胶囊的位置信息 width,height,top,right,left,bottom
+			const custom = wx.getMenuButtonBoundingClientRect()
+			// 导航栏高度(标题栏高度) = 胶囊高度 + (顶部距离 - 状态栏高度) * 2
+			this.navigationBarHeight = custom.height + (custom.top - this.statusBarHeight) * 2
+			// console.log("导航栏高度："+this.globalData.navigationBarHeight)
 			// #endif
-		},
-		onShow() {
 
-			let self = this;
-			// #ifdef APP-PLUS
-			setTimeout(() => {
-				if (self.appUpdate.openUpgrade == 'true') {
-					self.appVersionConfig();
+			uni.getLocation({
+				type: 'wgs84',
+				geocode: true, //设置该参数为true可直接获取经纬度及城市信息
+				success: function(res) {
+					that.getAddressInfo(res.latitude, res.longitude);
+					that.getHomeData();
+				},
+				fail: function() {
+					uni.showToast({
+						title: '获取地址失败，将导致部分功能不可用',
+						icon: 'none'
+					});
 				}
-			}, 1000)
-			// #endif
-
-			//新人礼的展示判断
-			let newGift = self.$Cache.get('newGift') ? JSON.parse(self.$Cache.get('newGift')) : [];
-			self.couponModal = newGift.length ? true : false;
-		},
-		// 滚动监听
-		onPageScroll(e) {
-			// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-			uni.$emit('scroll');
-			if (e.scrollTop > this.domOffsetTop) {
-				this.isScrolled = true;
-			}
-			if (e.scrollTop < this.domOffsetTop) {
-				this.$nextTick(() => {
-					this.isScrolled = false;
-				});
-			}
+			})
 		},
 		methods: {
-			//获取扫码或者浏览器传来的值
-			getOptionData(options) {
-				let diyid = 0;
-				if (options.hasOwnProperty('id') || options.scene) {
-					if (options.scene) { // 仅仅小程序扫码进入
-						let value = this.$util.getUrlParams(decodeURIComponent(options.scene));
-						this.$store.commit('Change_Spread', value.sd);
-						//分销绑定
-						silenceBindingSpread(this.isLogin, value.sd);
-						diyid = value.id ? value.id : 0;
-					} else {
-						diyid = options.id ? options.id : 0;
-						this.$store.commit('Change_Spread', options.sd);
-						//分销绑定
-						silenceBindingSpread(this.isLogin, options.sd);
-					}
-				}
-				//diy数据加载
-				this.diyData(diyid, false);
-			},
-			//备案授权跳转
-			toInternet() {
-				window.open('https://beian.miit.gov.cn/#/Integrated/index')
-			},
-			//app刚进入检测有无网络
-			snycNetWork() {
-				uni.getNetworkType({
-					success: res => {
-						//res.networkType === 'none'无网络
-						this.errorNetwork = res.networkType === 'none';
-						//如果没有网络，清除骨架屏
-						if (this.errorNetwork) this.reloadData();
-					}
-				});
-			},
-			// 断网后重新链接
-			reconnect() {
-				uni.getNetworkType({
-					success: res => {
-						this.errorNetwork = res.networkType === 'none';
-						if (!this.errorNetwork) {
-							setTimeout(() => {
-								uni.reLaunch({
-									url: "/pages/index/index"
-								});
-							}, 1000)
-						}
-					}
-				});
-			},
-			/**
-			 * 获取DIY
-			 * @param {number} id
-			 * @param {boolean} type 区分是否是微页面
-			 */
-			diyData(id, type) {
+			getAddressInfo(latitude, longitude) {
 				let that = this;
-				that.styleConfig = []
-				uni.showLoading({
-					title: '加载中...'
+				const qqmapsdk = new QQMapWX({
+					key: '7FJBZ-ACWCN-EFWFQ-SBXR5-QXC7K-LPF2U'
 				});
-				getDiy(id).then(res => {
-					that.errorNetwork = false;
-					uni.setNavigationBarTitle({
-						title: res.data.title
-					});
-					uni.setNavigationBarColor({
-						//必须要16进制小写
-						frontColor: res.data.titleColor,
-						backgroundColor: res.data.titleBgColor.toString().toLowerCase(),
-					})
-					let data = res.data;
-					that.diyId = res.data.id;
-					that.isDefault = data.isDefault; //是否是首页，1是，0不是
-					that.styleConfig = that.$util.objToArr(res.data.value);
-					this.bgInfo.isBgColor = data.isBgColor
-					this.bgInfo.colorPicker = data.colorPicker
-					that.pageStyle = {
-						'background-color': data.isBgColor === 1 ? res.data.colorPicker : '',
-						'background-image': data.isBgPic === 1 ? `url(${res.data.bgPic})` : '',
-						'background-repeat': res.data.bgTabVal === 1 ? 'repeat-y' : 'no-repeat',
-						'background-size': res.data.bgTabVal === 2 ? 'cover' : 'contain'
-					};
-					uni.hideLoading();
-					if (type) {
-						that.styleConfig.forEach((item) => {
-							if (item.name == 'headerSerch' || item.name == 'homeComb' || item.name ==
-								'tabNav') {
-								that.styleConfig.splice(index, 1);
-							}
-						});
-					} else {
-						that.styleConfig.forEach((item) => {
-							if (item.name === 'tabNav') {
-								that.showCateNav = true;
-								that.cateNavData = item;
-							}
-							if (item.name === 'homeComb') {
-								that.showHomeComb = true
-								that.homeCombData = item;
-							}
-							if (item.name === 'headerSerch') {
-								that.showHeaderSerch = true
-								that.headerSerchCombData = item;
-							}
-						});
-					}
-					setTimeout(() => {
-						that.isNodes++;
-					}, 100);
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-					uni.hideLoading();
-				});
-			},
-			bindMore() {
-				uni.setStorageSync('cateNavActive', this.cateNavActive);
-				uni.setStorageSync('categoryId', this.categoryId);
-				uni.switchTab({
-					url: `/pages/goods_cate/index`
-				})
-			},
-			getRecommendLength(e) {
-				this.isNoCommodity = e == 0 ? true : false;
-			},
-			// 导航分类切换
-			changeTab(index, item) {
-				//type=0微页面，1分类，2首页
-				this.cateNavActive = index;
-				if (item.type == 1) {
-					this.navIndex = 1;
-					if (!item.val) {
-						this.sortList = [];
-						this.categoryId = 0;
-						this.$util.Tips({
-							title: "请在平台端选择商品分类！确保加载商品分类数据。"
-						});
-						return;
-					} else {
-						getCategoryThird(item.val).then(res => {
-							this.sortList = res.data;
-							// #ifdef H5
-							self.sortMarTop = 10;
-							// #endif
-						});
-						this.categoryId = item.val;
-						this.isShowTitle = false;
-					}
-				} else if (item.type == 0) {
-					this.navIndex = 0;
-					this.isShowTitle = true;
-					this.categoryId = 0;
-					if (!item.val) {
-						return this.$util.Tips({
-							title: "请在平台端选择微页面链接！确保加载微页面数据。"
+				qqmapsdk.reverseGeocoder({
+					location: {
+						latitude: latitude,
+						longitude: longitude
+					},
+					success: (res2) => {
+						const address = res2.result.address; // 完整地址（如北京市海淀区中关村）
+						const province = res2.result.ad_info.province; // 省份
+						const city = res2.result.ad_info.city; // 城市
+						const recommend = res2.result.formatted_addresses.recommend; // 推荐使用的地址描述，描述精确性较高
+						console.log('地址信息1:', res2);
+						that.userAddress = recommend.length <= 8 ? recommend : recommend.slice(0, 8);
+						getMerchantList({
+							latitude: latitude,
+							longitude: longitude
+						}).then(res => {
+							that.merchantList = res.data.list;
 						});
-					} else {
-						this.styleConfig = [];
-						this.diyData(item.val, true);
+					},
+					fail: (err) => {
+						console.error('逆地理编码失败:', err);
 					}
-				} else {
-					this.categoryId = 0;
-					this.navIndex = 0;
-					this.styleConfig = [];
-					this.diyData(item.val, false);
-				}
-			},
-			toNewsList() {
-				uni.navigateTo({
-					animationType: animationType.type,
-					animationDuration: animationType.duration,
-					url: '/pages/goods/news_list/index'
-				})
-			},
-			//清除骨架屏
-			reloadData() {
-				this.showSkeleton = false;
-			},
-			getElementData(el, callback) {
-				uni.createSelectorQuery().in(this).selectAll(el).boundingClientRect().exec((data) => {
-					callback(data[0]);
 				});
 			},
-			xieyiApp() {
-				uni.navigateTo({
-					url: '/pages/users/web_page/index?webUel=https://admin.java.crmeb.net/useragreement/xieyi.html&title=协议内容'
-				})
-			},
-			// #ifdef APP-PLUS
-			xieyiApp() {
-				uni.navigateTo({
-					animationType: animationType.type,
-					animationDuration: animationType.duration,
-					url: '/pages/users/web_page/index?webUel=https://admin.java.crmeb.net/useragreement/xieyi.html&title=协议内容'
+			getHomeData() {
+				getHomeInfo().then(res => {
+					this.bannerList = res.data.banner;
+					this.proList = res.data.proList;
+					this.messageList = res.data.headline;
+					// this.messageList = [{"id":2,"title":"绿草地活动大促，消费满三十减十五"},{"id":3,"title":"绿草地活动大促，消费满三十减十五33333"}];
+					console.log("this.messageList--", this.messageList)
+					this.startScroll();
 				})
+
 			},
-			// #endif
-			// #ifdef MP || APP-PLUS
-			getTemlIds() {
-				for (var i in arrTemp) {
-					this.getTem(arrTemp[i]);
-				}
-			},
-			getTem(data) {
-				getTemlIds({
-					type: data
-				}).then(res => {
-					if (res.data) {
-						let arr = res.data.map((item) => {
-							return item.tempId
-						})
-						wx.setStorageSync('tempID' + data, arr);
-					}
-				});
-			},
-			// #endif
-			// 首页数据
-			getIndexConfig: function() {
-				let that = this;
-				getIndexData().then(res => {
-					let imgHost = res.data.logoUrl.split('crmebimage')[0];
-					that.imgHost = imgHost;
-					that.$Cache.set('imgHost', imgHost + '/');
-					// #ifdef H5 || APP-PLUS
-					that.$store.commit("SET_CHATURL", res.data.yzfUrl);
-					Cache.set('chatUrl', res.data.yzfUrl);
-					// #endif
-					Cache.setItem({
-						name: 'platChatConfig',
-						value: {
-							servicePhone: res.data.consumerHotline, //客服电话
-							serviceLink: res.data.consumerH5Url, //云智服
-							serviceType: res.data.consumerType //客服类型四选一
-						}
-					});
-					this.reloadData();
-				}).catch(err => {
-					return this.$util.Tips({
-						title: err
-					});
-				});
-			},
-			appVersionConfig() {
-				var that = this;
-				//app升级
-				// 获取本地应用资源版本号
-				getAppVersion().then(res => {
-					that.$set(that.appUpdate, 'androidAddress', res.data.androidAddress);
-					that.$set(that.appUpdate, 'appVersion', res.data.appVersion);
-					that.$set(that.appUpdate, 'iosAddress', res.data.iosAddress);
-					that.$set(that.appUpdate, 'openUpgrade', res.data.openUpgrade);
-					plus.runtime.getProperty(plus.runtime.appid, function(inf) {
-						let nowVersion = (inf.version).split('.').join('');
-						let appVersion = (res.data.appVersion).split('.').join('');
-						uni.getSystemInfo({
-							success: (res) => {
-								if (appVersion > nowVersion) {
-									uni.showModal({
-										title: '更新提示',
-										content: '发现新版本，是否前去下载?',
-										showCancel: that.appUpdate.openUpgrade == '1' ?
-											true : false,
-										cancelColor: '#eeeeee',
-										confirmColor: '#FF0000',
-										success(response) {
-											if (response.confirm) {
-												switch (res.platform) {
-													case "android":
-														plus.runtime.openURL(that
-															.appUpdate
-															.androidAddress);
-														break;
-													case "ios":
-														plus.runtime.openURL(encodeURI(
-															that.appUpdate
-															.iosAddress));
-														break;
-												}
-
-											}
-										}
-									});
-								}
-							}
-						})
-					});
-				})
-			},
-			// 微信分享；
-			setOpenShare: function(data) {
-				let that = this;
-				if (that.$wechat.isWeixin()) {
-					let configAppMessage = {
-						desc: this.globalData.companyName,
-						title: this.globalData.companyName,
-						link: location.href
-					};
-					that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"],
-						configAppMessage);
-				}
-			},
-			stopTouchMove() {
-				return true //禁止新闻swiper手动滑动
-			},
-			closeDialog() {
-				this.couponModal = false;
-				this.$Cache.clear('newGift');
+			item2Click(item) {
+				item.checked = !item.checked;
 			},
-			goDetail(item) {
-				goProductDetail(item.id, 0, '')
+			startScroll() {
+				setInterval(() => {
+					this.currentIndex = (this.currentIndex + 1) % this.messageList.length;
+					this.offset = -this.currentIndex * 20; // 20px 是单行高度
+				}, 2000); // 2秒切换一次
 			},
 		},
-		mounted() {
-			let query = uni.createSelectorQuery().in(this);
-			query.select("#home").boundingClientRect();
-			query.exec(res => {
-				this.domHeight = res[0].height;
-			})
-		},
 	}
 </script>
 <style>
@@ -680,226 +329,271 @@
 		/* #ifdef H5 */
 		background-color: #fff;
 		/* #endif */
-
 	}
 </style>
 <style lang="scss" scoped>
-	.error-network {
-		position: fixed;
-		left: 0;
-		top: 0;
+	.navigationbar {
 		display: flex;
-		flex-direction: column;
+		background-color: #FF6702;
+		color: #fff;
 		align-items: center;
-		width: 100%;
-		height: 100%;
-		padding-top: 40rpx;
-		background: #fff;
-		padding-top: 30%;
-
-		.img {
-			width: 414rpx;
-			height: 336rpx;
-		}
-
-		.title {
-			position: relative;
-			top: -40rpx;
-			font-size: 32rpx;
-			color: #666;
-		}
-
-		.con {
-			font-size: 24rpx;
-			color: #999;
-
-			.label {
-				margin-bottom: 20rpx;
-			}
+	}
 
-			.item {
-				margin-bottom: 20rpx;
-			}
-		}
+	.navigationbar image {
+		width: 35rpx;
+		height: 35rpx;
+		vertical-align: middle;
+	}
 
-		.btn {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 508rpx;
-			height: 86rpx;
-			margin-top: 100rpx;
-			border: 1px solid #d74432;
-			color: #e93323;
-			font-size: 30rpx;
-			border-radius: 120rpx;
-		}
+	.bar-left {
+		flex: 1;
+		margin-left: 40rpx;
 	}
 
-	.ysize {
-		background-size: 100%;
+	.bar-position {
+		margin-left: 16rpx;
+		font-size: 22rpx;
+		overflow: hidden;
+		/*超出部分隐藏*/
+		white-space: nowrap;
+		/*禁止换行*/
+		text-overflow: ellipsis;
+		/*省略号*/
 	}
 
-	.fullsize {
-		background-size: 100% 100%;
+	.bar-center {
+		flex: 1;
+		font-size: 36rpx;
 	}
 
-	.repeat {
-		background-repeat: repeat;
+	.swiper-item {
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		background-color: #999;
+		color: #fff;
+		text-align: center;
+		width: 712rpx;
+		height: 230rpx;
+		border-radius: 10rpx;
+		margin: 0 auto;
 	}
 
-	.noRepeat {
-		background-repeat: no-repeat;
+	.banner-img {
+		width: 712rpx;
+		height: 230rpx;
+		border-radius: 10rpx;
 	}
 
-	.noCommodity {
-		margin-top: 30%;
+	.content {
+		margin: 0 20rpx;
 	}
 
-	.icon-gengduo1 {
-		color: #F8F8F8;
+	.content-message {
+		background-color: #fff;
+		margin-top: 10rpx;
+		padding: 10rpx;
 	}
 
-	.pageIndex {
-		padding: 0 24rpx;
+	.content-message image {
+		width: 38rpx;
+		height: 38rpx;
+		vertical-align: middle;
 	}
 
-	.productList {
-		background-color: #F5F5F5;
-		margin-top: 20rpx;
+	.content-message text {
+		font-size: 23rpx;
+		color: #646464;
+		margin-left: 16rpx;
+	}
 
-		// min-height: 70vh;
-		.sort {
-			width: 710rpx;
-			max-height: 380rpx;
-			background: rgba(255, 255, 255, 1);
-			border-radius: 16rpx;
-			padding: 0rpx 0rpx 20rpx 0rpx !important;
-			flex-wrap: wrap;
-			margin: 25rpx auto 0 auto;
+	.content-tab {
+		background: linear-gradient(225deg, #ECF3FE 0%, #FEFEFE 100%);
+		border-radius: 23rpx;
+		padding: 20rpx;
+	}
 
-			&.no_pad {
-				padding: 0;
-			}
+	.tab-list {
+		display: flex;
+		/* 启用弹性布局 */
+		flex-direction: row;
+		/* 横向排列 */
+		justify-content: space-between;
+		/* 均匀分布子项 */
+		flex-wrap: wrap;
+		/* 允许换行（适用于屏幕宽度不足时） */
+	}
 
-			.item {
-				width: 20%;
-				margin-top: 20rpx;
-				text-align: center;
-
-				.pictrues {
-					width: 90rpx;
-					height: 90rpx;
-					background: #F5F5F5;
-					border-radius: 50%;
-					margin: 0 auto;
-				}
+	.tab-item {
+		width: 19%;
+		/* 5个元素平分宽度，留1%作为间隙 */
+		margin-bottom: 20rpx;
+		/* 底部间距 */
+		text-align: center;
+		/* 内容居中 */
+		color: #141414;
+		font-size: 24rpx;
+	}
 
-				.pictrue {
-					width: 90rpx;
-					height: 90rpx;
-					background: #F5F5F5;
-					border-radius: 50%;
-					margin: 0 auto;
-				}
+	.tab-image {
+		width: 100%;
+		/* 宽度占满父容器 */
+		height: 80rpx;
+		/* 固定图片高度 */
+		border-radius: 10rpx;
+		/* 圆角效果 */
+		background-color: #f5f5f5;
+		/* 占位背景色 */
+	}
 
-				.slide-image {
-					width: 90rpx;
-					height: 90rpx;
-					border-radius: 50%;
-					overflow: hidden;
-				}
+	.tab-text {
+		display: block;
+		font-size: 27rpx;
+		font-weight: 500;
+		color: #141414;
+		margin-top: 10rpx;
+	}
 
-				/deep/ .easy-loadimage,
-				uni-image,
-				.easy-loadimage {
-					width: 90rpx;
-					height: 90rpx;
-					display: inline-block;
-				}
+	.tab-text2 {
+		display: block;
+		font-size: 23rpx;
+		font-weight: 400;
+		color: #141414;
+		margin-top: 10rpx;
+	}
 
-				.text {
-					color: #272727;
-					font-size: 24rpx;
-					margin-top: 10rpx;
-					// overflow: hidden;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-				}
-			}
-		}
+	.content-goods {
+		background: #FFFFFF;
+		border-radius: 23rpx;
+		padding: 20rpx;
+		margin-top: 10rpx;
 	}
 
-	.productList .list {
-		padding: 0 20rpx;
+	.tab-item2 {
+		width: 23%;
+		/* 5个元素平分宽度，留2%作为间隙 */
+		text-align: center;
+		background-color: #FFC127;
+		border-radius: 8rpx;
+		font-size: 23rpx;
+		padding: 6rpx;
+		font-weight: 400;
 	}
 
-	.productList .list.on {
+	.tab-item2-false {
+		width: 23%;
+		/* 5个元素平分宽度，留2%作为间隙 */
+		text-align: center;
 		background-color: #fff;
-		border-top: 1px solid #f6f6f6;
+		border-radius: 8rpx;
+		font-size: 23rpx;
+		padding: 6rpx;
+		font-weight: 400;
 	}
 
-	.productList .list .item {
-		width: 345rpx;
-		margin-top: 20rpx;
-		background-color: #fff;
-		border-radius: 10rpx;
+	.content-goods2 {
+		background: #FFFFFF;
+		border-radius: 23rpx;
+		margin-top: 10rpx;
+		padding: 20rpx;
+		display: flex;
+	}
 
-		.name {
-			display: flex;
-			align-items: center;
+	.goods-more {
+		font-size: 21rpx;
+		color: #999999;
+		float: right;
+		line-height: 44rpx;
+	}
 
-			.name_text {
-				display: inline-block;
-				max-width: 200rpx;
-			}
-		}
+	.goods-list {
+		flex: 0 0 356rpx;
+		margin-right: 18rpx;
+	}
+
+	.goods-title {
+		color: #141414;
+		font-size: 26rpx;
+		font-weight: 600;
 	}
 
-	.page-index {
+	.goods-desc {
+		color: #646464;
+		font-size: 21rpx;
+		margin-top: 10rpx;
+	}
+
+	.goods-price {
+		color: #FF9805;
+		font-size: 34rpx;
+		font-weight: 600;
+	}
+
+	.goods-score {
+		color: #FD6716;
+		font-size: 26rpx;
+	}
+
+	.goods-info {
+		color: #999999;
+		font-size: 21rpx;
+	}
+
+	.goods-sales {
+		background-color: #FEEFE5;
+		color: #FF6702;
+		border-radius: 8rpx;
+		font-size: 21rpx;
+		padding: 4rpx 20rpx;
+	}
+
+	.goods-labels {
+		background-color: #FFF6F6;
+		color: #FF4B4B;
+		border: 2rpx solid #FF4B4B;
+		border-radius: 8rpx;
+		font-size: 21rpx;
+		padding: 4rpx 16rpx;
+		margin-right: 20rpx;
+	}
+
+	.container {
 		display: flex;
-		flex-direction: column;
-		min-height: 100%;
-
-		.page_content {
-			overflow-x: hidden;
-
-			// background-color: #f5f5f5;
-			.swiper {
-				position: relative;
-				width: 100%;
-				height: 246rpx;
-				margin: 0 auto;
-				border-radius: 10rpx;
-				overflow: hidden;
-				margin-bottom: 25rpx;
-				/* #ifdef MP */
-				margin-top: 20rpx;
-
-				/* #endif */
-				swiper,
-				swiper-item,
-				.slide-image,
-				image {
-					width: 100%;
-					height: 246rpx;
-					border-radius: 10rpx;
-				}
-			}
-		}
+		align-items: center;
+		padding: 12rpx;
+		background: #ffffff;
+		margin: 10rpx 0;
 	}
 
-	.fixed {
-		z-index: 100;
-		position: fixed;
-		left: 0;
-		top: 0;
-		background: linear-gradient(90deg, red 50%, #ff5400 100%);
+	.left-image {
+		width: 38rpx;
+		height: 38rpx;
+		margin-left: 20rpx;
+		margin-right: 16rpx;
+	}
 
+	.right-text-container {
+		flex: 1;
+		height: 20px;
+		/* 单行文字高度 */
+		overflow: hidden;
+		position: relative;
 	}
 
-	.menu-txt {
-		font-size: 24rpx;
-		color: #454545;
+	.text-list {
+		position: absolute;
+		width: 100%;
+		transition: transform 0.5s ease;
+		/* 动画过渡 */
+	}
+
+	.text-item {
+		height: 40rpx;
+		line-height: 40rpx;
+		font-size: 23rpx;
+		color: #646464;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
 	}
 </style>

mer_uniapp/pages/order/index.vue

@@ -0,0 +1,243 @@
+<template>
+	<view>
+		<!-- 状态栏高度 -->
+		<view :style="{ height: `${statusBarHeight}px` }"></view>
+
+		<!-- 导航栏 -->
+		<view :style="{ height: `${navigationBarHeight}px`,lineHeight: `${navigationBarHeight}px`}" class="order-nav">订单
+		</view>
+
+		<!-- 进行中/历史订单 -->
+		<view class="status-bar">
+			<view>
+				<text :class="isShow? 'status-true': 'status-false'" @click="statusClick">进行中</text>
+				<text :class="!isShow? 'status-true': 'status-false'" @click="statusClick">历史订单</text>
+
+			</view>
+		</view>
+
+		<view style="background-color: white;border-radius: 23rpx;margin: 10rpx 20rpx;padding-bottom: 40rpx;">
+
+			<view class="container">
+				<text class="left-text">韩式铁板蛋炒饭</text>
+				<view class="right-group">
+					<text style="color: #0FBA42;font-size: 23rpx;">制作中</text>
+					<!-- <text style="color: #FF5500;font-size: 23rpx;">待取餐</text>
+					<text style="color: #999999;font-size: 23rpx;">已完成</text>
+					<text style="color: #999999;font-size: 23rpx;">已取消</text> -->
+					<image src="/static/img/ic-yx.png" class="image" />
+				</view>
+			</view>
+
+			<view class="scroll-container">
+				<view class="item">
+					<img src="/static/img/img8.png">
+					<text>蛋炒饭x1</text>
+				</view>
+			</view>
+
+			<view class="dashed-line"></view>
+
+			<view style="text-align: right; font-size: 23rpx; color: #141414;padding-right: 20rpx;">
+				共2件，实付 ¥16.00元
+			</view>
+
+			<view class="container2">
+				<text class="left-text2">商家正在备餐中</text>
+				<view class="right-group">
+					<image src="/static/img/ic-iphone1.png" class="image2" />
+					<text style="color: #141414;font-size: 21rpx;">联系商家</text>
+					
+					<view style="display: inline-block; width: 2rpx; height: 42rpx;border: 2rpx solid #D5D6DC;"></view>
+					
+					<image src="/static/img/ic-message1.png" class="image2" />
+					<text style="color: #141414;font-size: 21rpx;">留言</text>
+				</view>
+			</view>
+
+
+
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				statusBarHeight: app.globalData.statusBarHeight,
+				navigationBarHeight: 0,
+				isShow: true,
+			}
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+
+		},
+		onLoad(options) {
+			let that = this;
+			//首页数据加载
+			// this.getIndexConfig();
+			// #ifdef MP-WEIXIN
+			// 获取微信胶囊的位置信息 width,height,top,right,left,bottom
+			const custom = wx.getMenuButtonBoundingClientRect()
+			// 导航栏高度(标题栏高度) = 胶囊高度 + (顶部距离 - 状态栏高度) * 2
+			this.navigationBarHeight = custom.height + (custom.top - this.statusBarHeight) * 2
+			// console.log("导航栏高度："+this.globalData.navigationBarHeight)
+			// #endif
+
+		},
+		onShow() {
+
+		},
+		methods: {
+			statusClick() {
+				this.isShow = !this.isShow;
+			},
+		},
+		mounted() {
+
+		},
+	}
+</script>
+
+<style scoped>
+	.order-nav {
+		font-weight: 500;
+		font-size: 35rpx;
+		color: #FFFFFF;
+		background-color: #FF6702;
+		text-align: center;
+	}
+
+	.status-bar {
+		background-color: #FF6702;
+		text-align: center;
+		padding: 20px 0 16rpx 0;
+	}
+
+	.status-bar view {
+		display: inline-block;
+		width: 385rpx;
+		background: #EB5E00;
+		border-radius: 37rpx;
+	}
+
+	.status-true {
+		display: inline-block;
+		width: 192rpx;
+		padding: 10rpx 0;
+		background-color: white;
+		color: #FF6600;
+		border-radius: 37rpx;
+	}
+
+	.status-false {
+		display: inline-block;
+		width: 192rpx;
+		padding: 10rpx 0;
+		color: #FFCBA9;
+		border-radius: 37rpx;
+	}
+
+	.container {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.left-text {
+		font-weight: 600;
+		font-size: 27rpx;
+		color: #141414;
+		margin-left: 40rpx;
+	}
+
+	.right-group {
+		display: flex;
+		align-items: center;
+		gap: 16rpx;
+	}
+
+	.image {
+		width: 42rpx;
+		height: 70rpx;
+		margin-right: 20rpx;
+	}
+
+	.container2 {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		background-color: #F8F9FB;
+		margin: 20rpx 20rpx 0 20rpx;
+		padding: 20rpx 40rpx 20rpx 20rpx;
+	}
+
+	.left-text2 {
+		font-weight: 600;
+		color: #141414;
+		font-size: 23rpx;
+		margin-left: 0;
+	}
+
+	.image2 {
+		width: 42rpx;
+		height: 42rpx;
+	}
+
+	.scroll-container {
+		display: flex;
+		overflow-x: auto;
+		/* 允许水平滚动 */
+		white-space: nowrap;
+		/* 防止项目换行 */
+		padding: 8rpx 20rpx 20rpx 40rpx;
+		/* 添加一些内边距 */
+		-webkit-overflow-scrolling: touch;
+		/* 在iOS上平滑滚动 */
+	}
+
+	.item {
+		display: inline-flex;
+		/* 或者使用 flex 但需要调整 */
+		flex-direction: column;
+		align-items: center;
+		margin-right: 20rpx;
+		/* 项目之间的间距 */
+		flex: 0 0 auto;
+		/* 防止项目伸缩 */
+	}
+
+	.item img {
+		width: 115rpx;
+		height: 115rpx;
+		border-radius: 12rpx;
+		/* 可选：圆形图片 */
+		object-fit: cover;
+		/* 保持图片比例 */
+	}
+
+	.item text {
+		margin-top: 10rpx;
+		/* 图片和文字之间的间距 */
+		font-size: 21rpx;
+		color: #141414;
+		text-align: center;
+		white-space: nowrap;
+		/* 防止文字换行 */
+	}
+
+	.dashed-line {
+		border-bottom: 2rpx dashed #D6D7DC;
+		width: 90%;
+		/* 确保宽度足够 */
+		height: 2rpx;
+		/* 控制线条高度 */
+		margin: 0 40rpx 18rpx 40rpx;
+	}
+</style>

mer_uniapp/pages/user/index-bak.vue

@@ -0,0 +1,1007 @@
+<template>
+	<view :data-theme="theme">
+		<!-- #ifdef MP -->
+		<view class="cart_nav" :style='"height:"+navH+"rpx;"'>
+			<nav-bar iconColor='#fff' ref="navBarRef"  navTitle="个人中心">
+			</nav-bar>
+		</view>
+		<!-- #endif -->
+		<tui-skeleton v-if="showSkeleton"></tui-skeleton>
+		<view class="new-users copy-data tui-skeleton">
+			<view class="mid" style="flex:1;overflow: hidden;">
+				<scroll-view scroll-y="true">
+					<view class="head borderPad">
+						<view class="bg"
+							:style="{'background-image': `url(${urlDomain}crmebimage/presets/user_bg.png)`}">
+							<view class="user-card">
+								<view class="user-info">
+									<image class="avatar tui-skeleton-rect" :src='userInfo.avatar'
+										v-if="userInfo.avatar" @click="goEdit()"></image>
+									<image v-else class="avatar tui-skeleton-rect"
+										:src="urlDomain+'crmebimage/presets/morenT.png'" mode="" @click="goEdit()">
+									</image>
+									<view class="info">
+										<view class="name" v-if="!isLogin" @tap="openAuto">
+											请点击登录
+										</view>
+										<view class="name" v-if="userInfo && uid">
+											<view @click="goEdit()">
+												{{userInfo && userInfo.nickname && uid ? userInfo.nickname : ''}}
+											</view>
+											<view class="vip" v-if="userInfo.vipIcon" @click="goEdit()">
+												<image :src="userInfo.vipIcon" alt=""></image>
+											</view>
+											<view class="vip" v-if="userInfo.isPaidMember"
+												@click="menusTap('/pages/activity/vip_paid/index')">
+												<image
+													:style="{'background-image': `url(${urlDomain}crmebimage/presets/viptu.png)`}">
+												</image>
+											</view>
+										</view>
+										<view class="num mt10" v-if="userInfo && userInfo.phone && uid"
+											@click="goEdit()">
+											<view class="num-txt">{{userInfo.phone}}</view>
+										</view>
+									</view>
+									<view class="app_set" @click="handleUserSetting()">
+										<text class="iconfont icon-shezhi"></text>
+									</view>
+								</view>
+								<view class="num-wrapper tui-skeleton-rect">
+									<view class="num-item" @click="goMenuPage('/pages/merchant/user_integral/index')">
+										<text class="num">{{userInfo.integral && uid ? userInfo.integral: 0}}</text>
+										<view class="txt">积分</view>
+									</view>
+									<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
+										<text
+											class="num">{{userInfo.couponCount && uid ? userInfo.couponCount : 0}}</text>
+										<view class="txt">优惠券</view>
+									</view>
+									<view class="num-item"
+										@click="goMenuPage('/pages/goods/user_goods_collection/index')">
+										<text
+											class="num">{{userInfo.collectCount && uid ? userInfo.collectCount : 0}}</text>
+										<view class="txt">收藏</view>
+									</view>
+									<view class="num-item" @click="goMenuPage('/pages/goods/browsing_history/index')">
+										<text class="num">{{userInfo.browseNum && uid ? userInfo.browseNum:0}}</text>
+										<view class="txt">浏览记录</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view v-show="userInfo.paidMemberPaidEntrance===1"
+							@click="menusTap('/pages/activity/vip_paid/index')" class="h-128 svip-box px-30"
+							:style="{'background-image': `url(${urlDomain}crmebimage/presets/cardbj.png)`}">
+							<view class="acea-row row-middle row-between h-94">
+								<view class="acea-row">
+									<view class="w-34 h-28 no-repeat vipicon"
+										:style="{'background-image': `url(${urlDomain}crmebimage/presets/huangguan.png)`}">
+									</view>
+									<view class="f-s-24 text ml-12">加入SVIP畅享精彩</view>
+								</view>
+								<view class="acea-row row-middle">
+									<view class="f-s-24 text mr10">{{userInfo.isPaidMember?'去查看':'去开通'}}</view>
+									<text class="iconfont icon-gengduo3 text f-s-20"></text>
+								</view>
+							</view>
+						</view>
+						<view class="order-wrapper tui-skeleton-rect"
+							:class="userInfo.paidMemberPaidEntrance===1?'mt34rpx':''">
+							<view class="order-hd flex">
+								<view class="left">订单中心</view>
+								<view class="right flex" @click="menusTap('/pages/goods/order_list/index')">查看全部
+									<text class="iconfont icon-xiangyou"></text>
+								</view>
+							</view>
+							<view class="order-bd">
+								<block v-for="(item,index) in orderMenu" :key="index">
+									<view class="order-item" @click="menusTap(item.url)">
+										<view class="pic">
+											<text class="iconfont pic_status" :class="item.img"></text>
+											<text class="order-status-num" v-if="item.num > 0">{{ item.num }}</text>
+										</view>
+										<view class="txt tui-skeleton-rect">{{item.title}}</view>
+									</view>
+								</block>
+							</view>
+						</view>
+					</view>
+					<view class="contenBox borderPad" id="pageIndex">
+						<!-- 轮播 -->
+						<view class="slider-wrapper tui-skeleton-rect" @click.native="bindEdit('userBanner')"
+							v-if="centerBanner != null && centerBanner.length > 0">
+							<swiper v-if="centerBanner.length>0" indicator-dots="true" :autoplay="autoplay"
+								:circular="circular" :interval="interval" :duration="duration"
+								indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
+								<block v-for="(item,index) in centerBanner" :key="index">
+									<swiper-item class="borRadius14">
+										<image :src="item.pic" class="slide-image" @click="navito(item.url)"></image>
+									</swiper-item>
+								</block>
+							</swiper>
+						</view>
+						<!-- 会员菜单 -->
+						<view class="user-menus mt20" @click.native="bindEdit('userMenus')">
+							<view class="menu-title">我的服务</view>
+							<view class="list-box">
+								<block v-for="(item,index) in centerMenu" :key="index">
+									<view class="item tui-skeleton-rect" @click="menusTap(item.url)"
+										v-if="!(item.url =='/pages/service/index' || (item.url =='/pages/users/user_spread_user/index' && !userInfo.isPromoter)||(!isEmployee&&item.url=='/pages/admin/work/index'))">
+										<image :src="item.pic"></image>
+										<text>{{item.name}}</text>
+									</view>
+								</block>
+								<!-- #ifndef MP -->
+								<view class="item" @click="kefuClick">
+									<image :src="servicePic"></image>
+									<text>联系客服</text>
+								</view>
+								<!-- #endif -->
+								<!-- #ifdef MP -->
+								<button class="item" hover-class='none' @click="kefuClick"
+									v-if="chatConfig.telephone_service_switch === 'true'">
+									<image :src="servicePic"></image>
+									<text>联系客服</text>
+								</button>
+								<button class="item" open-type='contact' hover-class='none' v-else>
+									<image :src="servicePic"></image>
+									<text>联系客服</text>
+								</button>
+								<!-- #endif -->
+							</view>
+						</view>
+						<!-- 商家管理 -->
+						<view class="user-menus mt20" v-if="isEmployee">
+							<view class="menu-title">店铺管理</view>
+							<view class="list-box">
+								<view class="item" @click="toggle('bottom')">
+									<image :src="urlDomain+'crmebimage/presets/adminImg/sjgl.png'"></image>
+									<text>商家管理</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<image :src="copyImage" alt="" class='support'></image>
+				</scroll-view>
+			</view>
+		</view>
+		<!-- <view v-if="bottomNavigationIsCustom" class="footerBottom"></view> -->
+		<!-- <pageFooter></pageFooter> -->
+		<uni-popup ref="popup" type="bottom" background-color="rgba(0,0,0,0)" border-radius="10px 10px 0 0">
+			<view class="popup-content">
+				<view class="item" v-for="(item,index) in merchantEmployeeList" :key="index"
+					:class="{bottom_border:index!=merchantEmployeeList.length-1}">
+					<view class="item_main">
+						<image :src="item.currentMerchant.avatar" mode="" class="item_img"></image>
+						<view class="item_name" :class="{nameColor:item.merId==selectMerId}">
+							{{item.currentMerchant.name}}</view>
+					</view>
+					<text v-if="item.merId==selectMerId" class="iconfont icon-xuanzhong11 icon-size icon_color"></text>
+					<text v-else class="iconfont icon-weixuan icon-size" @click="radioChange(item)"></text>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+<script>
+	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	import Cache from '@/utils/cache';
+	import navBar from '@/components/navBar';
+	import {
+		goPage
+	} from '@/libs/iframe.js'
+	import {
+		BACK_URL,
+		USER_INFO
+	} from '@/config/cache';
+	import {
+		userCenterInfo,
+		copyrightImageApi
+	} from '@/api/user.js';
+	import {
+		MerchantBelongListApi,
+		merchantActive
+	} from '@/api/work.js';
+	import {
+		orderNum
+	} from '@/api/order.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		getCityList
+	} from "@/utils";
+	import {
+		tokenIsExistApi
+	} from '@/api/api.js';
+	// #ifdef H5
+	import Auth from '@/libs/wechat';
+	// #endif
+	import {
+		getShare
+	} from '@/api/public.js';
+	import {
+		setThemeColor
+	} from '@/utils/setTheme.js'
+	import animationType from '@/utils/animationType.js'
+	import {
+		chatConfig
+	} from '@/utils/consumerType.js'
+	import tuiSkeleton from '@/components/base/tui-skeleton.vue';
+	import pageFooter from "@/components/pageFooter/index.vue";
+	const app = getApp();
+	export default {
+		computed: mapGetters(['isLogin', 'chatUrl', 'uid', 'globalData', 'bottomNavigationIsCustom',
+			'merchantEmployeeList', 'isEmployee', 'selectMerId'
+		]),
+		data() {
+			return {
+				scrollHeight: 0,
+				triggered: false,
+				isRefresher: false, //下拉刷新状态
+				urlDomain: this.$Cache.get("imgHost"),
+				showSkeleton: true, //骨架屏显示隐藏
+				orderMenu: [{
+						img: 'icon-daifukuan',
+						title: '待付款',
+						url: '/pages/goods/order_list/index?status=0',
+						num: 0
+					},
+					{
+						img: 'icon-daifahuo',
+						title: '待发货',
+						url: '/pages/goods/order_list/index?status=1',
+						num: 0
+					},
+					{
+						img: 'icon-daihexiao',
+						title: '待核销',
+						url: '/pages/goods/order_list/index?status=3',
+						num: 0
+					},
+					{
+						img: 'icon-daishouhuo',
+						title: '待收货',
+						url: '/pages/goods/order_list/index?status=4',
+						num: 0
+					},
+					{
+						img: 'icon-daipingjia',
+						title: '待评价',
+						url: '/pages/goods/evaluation_list/index',
+						num: 0
+					},
+					{
+						img: 'icon-a-shouhoutuikuan',
+						title: '售后/退款',
+						url: '/pages/goods/user_return_list/index',
+						num: 0
+					},
+				],
+				centerBanner: [],
+				userMenu: [],
+				autoplay: true,
+				circular: true,
+				interval: 3000,
+				duration: 500,
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				orderStatusNum: {},
+				centerMenu: [],
+				wechatUrl: [],
+				servicePic: '',
+				sysHeight: sysHeight,
+				// #ifdef MP
+				pageHeight: '100%',
+				// #endif
+				// #ifdef H5 || APP-PLUS
+				pageHeight: '',
+				// #endif
+				// #ifdef H5
+				isWeixin: Auth.isWeixin(),
+				//#endif
+				configApi: {}, //分享类容配置
+				theme: app.globalData.theme,
+				bgColor: '#e93323',
+				userInfo: {},
+				copyImage: '',
+				navH:''
+			}
+		},
+		components: {
+			tuiSkeleton,
+			pageFooter,
+			navBar
+		},
+		onLoad() {
+			this.servicePic = this.urlDomain + 'crmebimage/presets/customer.png'
+			this.getTokenIsExist();
+			// #ifdef MP
+			this.navH = this.globalData.navHeight;
+			// #endif
+			// #ifndef MP
+			this.navH = 96;
+			// #endif
+			if (this.globalData.isIframe) {
+				setTimeout(() => {
+					let active;
+					document.getElementById('pageIndex').children.forEach(dom => {
+						dom.addEventListener('click', (e) => {
+							e.stopPropagation();
+							e.preventDefault();
+							if (dom === active) return;
+							dom.classList.add('borderShow');
+							active && active.classList.remove('borderShow');
+							active = dom;
+						})
+					})
+				});
+			}
+			// #ifdef APP-PLUS
+			setTimeout(()=>{
+			 	uni.setNavigationBarColor({
+			 		frontColor: '#ffffff',
+			 		backgroundColor:that.bgColor,   
+			 	});
+			 },500)
+			// #endif
+			let that = this;
+			// #ifdef H5 || APP-PLUS
+			that.$set(that, 'pageHeight', this.globalData.windowHeight);
+			// #endif
+			that.$set(that, 'centerMenu', this.globalData.centerMenu);
+			that.bgColor = setThemeColor();
+		},
+		onShow: function() {
+			if (this.isLogin) {
+				this.getUserCenterInfo();
+				this.getOrderData();
+				this.getMerchantList()
+			}
+			this.copyrightImage();
+			this.showSkeleton = false
+			let that = this;
+			if (!that.$Cache.get('cityList')) getCityList();
+			// #ifdef H5
+			uni.getSystemInfo({
+				success: function(res) {
+					that.pageHeight = res.windowHeight + 'px'
+				}
+			});
+			// #endif
+			// #ifdef MP
+			let query = uni.createSelectorQuery();
+			let dom = query.select('.new-users');
+			// #endif
+		},
+		methods: {
+			/**
+			 *  发现列表滑动中用到的方法
+			 */
+			onScroll() {
+				uni.$emit('scroll');
+			},
+			toggle(type) {
+				if (this.merchantEmployeeList.length == 1) {
+					merchantActive(this.merchantEmployeeList[0].merId).then(res => {
+						this.$store.commit('SetSelectMerId', this.merchantEmployeeList[0].merId);
+						this.$store.commit('SetSelectMerchantRole', this.merchantEmployeeList[0].role);
+						this.$store.commit('SET_MANAGER_TOKEN', {
+							managerToken: res.data.token
+						});
+						Cache.set('electrPrintingSwitch', res.data.electrPrintingSwitch);
+						uni.navigateTo({
+							url: '/pages/admin/work/index'
+						})
+						return
+					})
+					return
+				}
+				if (this.selectMerId) {
+					uni.navigateTo({
+						url: '/pages/admin/work/index'
+					})
+				} else {
+					this.type = type
+					// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+					this.$refs.popup.open(type)
+				}
+			},
+			//选中商户
+			radioChange(item) {
+				let that = this
+				merchantActive(item.merId).then(res => {
+					if (res.code == 200) {
+						that.$store.commit('SET_MANAGER_TOKEN', {
+							managerToken: res.data.token
+						});
+						Cache.set('electrPrintingSwitch', res.data.electrPrintingSwitch);
+						that.$store.commit('SetSelectMerId', item.merId);
+						this.$store.commit('SetSelectMerchantRole', item.role);
+						this.$refs.popup.close()
+						uni.navigateTo({
+							url: '/pages/admin/work/index'
+						})
+					}
+				})
+			},
+			//获取商户列表
+			getMerchantList() {
+				let that = this
+				MerchantBelongListApi().then(res => {
+					if (this.selectMerId) {
+						let flag = res.data.find(item => item.merId === this.selectMerId);
+						!flag && that.$store.commit('CLEAR_SELECTMERID');
+					}
+					this.$store.commit("SetMerchantEmployeeList", res.data);
+				})
+			},
+			//校验token是否有效,true为有效，false为无效
+			getTokenIsExist() {
+				tokenIsExistApi().then(res => {
+					let tokenIsExist = res.data;
+					if (!tokenIsExist) {
+						this.$store.commit('UPDATE_LOGIN', '');
+						this.$store.commit('UPDATE_USERINFO', {});
+					}
+				})
+			},
+			copyrightImage() {
+				copyrightImageApi().then(res => {
+					if (res.data) {
+						this.copyImage = res.data;
+					} else {
+						this.copyImage = `${this.urlDomain}crmebimage/presets/support.png`;
+					}
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					})
+				});
+			},
+			bindEdit(name) {
+				if (this.globalData.isIframe) {
+					window.parent.postMessage({
+							name: name
+						},
+						'*'
+					);
+					return;
+				}
+			},
+			menusTap(url) {
+				if (!this.isLogin) {
+					this.openAuto();
+				} else {
+					if (url === '/pages/activity/vip_paid/index' && this.userInfo.paidMemberPaidEntrance === 0) return
+					this.$util.navigateTo(url);
+				}
+			},
+			//轮播图跳转
+			navito(url) {
+				this.$util.navigateTo(url);
+			},
+			kefuClick() {
+				chatConfig(this.$Cache.getItem('platChatConfig'));
+			},
+			getOrderData() {
+				let that = this;
+				orderNum().then(res => {
+					that.orderMenu.forEach((item, index) => {
+						switch (item.title) {
+							case '待付款':
+								item.num = res.data.awaitPayCount
+								break
+							case '待发货':
+								item.num = res.data.awaitShippedCount
+								break
+							case '待收货':
+								item.num = res.data.receiptCount
+								break
+							case '待核销':
+								item.num = res.data.verificationCount
+								break
+							case '待评价':
+								item.num = res.data.awaitReplyCount
+								break
+							default:
+								item.num = res.data.refundCount
+						}
+					})
+					that.$set(that, 'orderMenu', that.orderMenu);
+				})
+			},
+			// 绑定手机
+			bindPhone() {
+				uni.navigateTo({
+					animationType: animationType.type,
+					animationDuration: animationType.duration,
+					url: '/pages/users/app_login/index'
+				})
+			},
+			/**
+			 * 
+			 * 获取个人中心详情
+			 */
+			getUserCenterInfo: function() {
+				userCenterInfo().then(res => {
+					let data = res.data;
+					this.userInfo = data;
+					this.$store.commit("SETUID", data.id);
+					this.$store.commit("SetIsEmployee", data.isEmployee);
+					this.$set(this, 'centerMenu', data.centerMenu);
+					this.$store.commit('UPDATE_USERINFO', {
+						avatar: data.avatar,
+            nickname: data.nickname,
+						phone: data.phone
+					});
+					if (data.centerBanner) {
+						this.centerBanner = data.centerBanner
+					}
+					this.showSkeleton = false;
+				}).catch(err => {
+					this.showSkeleton = false;
+				});
+			},
+			// 编辑页面
+			goEdit() {
+				if (this.isLogin == false) {
+					this.openAuto();
+				} else {
+					uni.navigateTo({
+						animationType: animationType.type,
+						animationDuration: animationType.duration,
+						url: '/pages/users/user_info/index'
+					})
+				}
+			},
+			goMenuPage(url) {
+				if (this.isLogin) {
+					uni.navigateTo({
+						animationType: animationType.type,
+						animationDuration: animationType.duration,
+						url
+					})
+				} else {
+					// #ifdef MP
+					this.openAuto()
+					// #endif
+				}
+			},
+			// 打开授权
+			openAuto() {
+				Cache.set(BACK_URL, '')
+				toLogin();
+			},
+			// 去设置页面
+			handleUserSetting() {
+				if (!this.isLogin) {
+					return this.openAuto();
+				}
+				uni.navigateTo({
+					url: '/pages/users/user_setting/index'
+				})
+			},
+			shareApi: function() {
+				getShare().then(res => {
+					this.$set(this, 'configApi', res.data);
+					// #ifdef H5
+					this.setOpenShare(res.data);
+					// #endif
+				})
+			},
+			// 微信分享；
+			setOpenShare: function() {
+				let that = this;
+				if (that.$wechat.isWeixin()) {
+					let configAppMessage = {
+						desc: 'crmeb',
+						title: 'crmeb',
+						link: location.href,
+						imgUrl: ''
+					};
+					that.$wechat.wechatEvevt([
+							"updateAppMessageShareData",
+							"updateTimelineShareData",
+							"onMenuShareAppMessage",
+							"onMenuShareTimeline",
+						],
+						configAppMessage);
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.vipicon {
+		background-size: 100% 100%;
+	}
+
+	.mt34rpx {
+		margin-top: -34rpx;
+	}
+
+	.svip-box {
+		width: 702rpx;
+		background-repeat: no-repeat;
+		background-size: 702rpx 128rpx;
+
+		.text {
+			color: #FFD89C;
+		}
+	}
+
+	.num-txt {
+		padding: 6rpx 20rpx;
+		border-radius: 36rpx;
+		background: rgba(255, 255, 255, 0.2);
+	}
+
+	page,
+	body {
+		height: 100%;
+		margin: 0;
+	}
+
+	.ma .mp-header {
+		@include main_bg_color(theme);
+	}
+
+	.bg {
+		width: 100%;
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
+	}
+
+	.support {
+		width: 219rpx;
+		height: 74rpx;
+		margin: 20rpx auto;
+		display: block;
+	}
+
+	.new-users {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+
+		.sys-head {
+			position: relative;
+			width: 100%;
+			background: linear-gradient(90deg, $bg-star1 0%, $bg-end1 100%);
+
+			.sys-title {
+				z-index: 10;
+				position: relative;
+				height: 43px;
+				text-align: center;
+				line-height: 43px;
+				font-size: 36rpx;
+				color: #FFFFFF;
+			}
+		}
+
+		.head {
+			width: 100%;
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			@include index-gradient(theme);
+
+			.user-card {
+				width: 100%;
+				margin: 0 auto;
+				padding: 35rpx 0 40rpx 0;
+
+				.user-info {
+					z-index: 20;
+					display: flex;
+					align-items: center;
+					color: #fff;
+
+					.avatar {
+						width: 120rpx;
+						height: 120rpx;
+						border-radius: 50%;
+					}
+
+					.app_set {
+						color: #fff;
+						width: 140rpx;
+						height: 110rpx;
+						text-align: right;
+						line-height: 110rpx;
+
+						.icon-shezhi {
+							font-size: 36rpx;
+						}
+					}
+
+					.info {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						margin-left: 20rpx;
+						padding: 15rpx 0;
+
+						.name {
+							display: flex;
+							align-items: center;
+							color: #fff;
+							font-size: 31rpx;
+
+							.vip {
+								display: flex;
+								align-items: center;
+								border-radius: 18px;
+								font-size: 20rpx;
+								margin-left: 14rpx;
+
+								image {
+									width: 27rpx;
+									height: 27rpx;
+									background-repeat: no-repeat;
+									background-size: 100% 100%;
+								}
+							}
+						}
+
+						.num {
+							display: flex;
+							align-items: center;
+							font-size: 26rpx;
+							color: rgba(255, 255, 255, 0.6);
+
+							image {
+								width: 22rpx;
+								height: 23rpx;
+								margin-left: 20rpx;
+							}
+						}
+					}
+				}
+
+				.num-wrapper {
+					z-index: 30;
+					position: relative;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					margin-top: 30rpx;
+					color: #fff;
+
+					.num-item {
+						width: 33.33%;
+						text-align: center;
+
+						.num {
+							font-size: 42rpx;
+							font-weight: bold;
+						}
+
+						.txt {
+							margin-top: 10rpx;
+							font-size: 26rpx;
+							color: rgba(255, 255, 255, 0.6);
+						}
+					}
+				}
+
+				.sign {
+					z-index: 200;
+					position: absolute;
+					right: -12rpx;
+					top: 80rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 120rpx;
+					height: 60rpx;
+					background: linear-gradient(90deg, rgba(255, 225, 87, 1) 0%, rgba(238, 193, 15, 1) 100%);
+					border-radius: 29rpx 4rpx 4rpx 29rpx;
+					color: #282828;
+					font-size: 28rpx;
+					font-weight: bold;
+				}
+			}
+
+			.order-wrapper {
+				background-color: #fff;
+				border-radius: 14rpx;
+				padding: 30rpx 16rpx;
+				position: relative;
+				z-index: 11;
+
+				.order-hd {
+					justify-content: space-between;
+					font-size: 30rpx;
+					color: #282828;
+					margin-bottom: 40rpx;
+					padding: 0 16rpx;
+
+					.left {
+						color: #282828;
+						font-size: 30rpx;
+						font-weight: 600;
+					}
+
+					.right {
+						align-items: center;
+						color: #666666;
+						font-size: 26rpx;
+
+						.icon-xiangyou {
+							margin-left: 5rpx;
+							font-size: 24rpx;
+						}
+					}
+				}
+
+				.order-bd {
+					display: flex;
+					justify-content: space-between;
+					padding: 0;
+
+					.order-item {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+
+						.pic {
+							position: relative;
+							text-align: center;
+
+							image {
+								width: 48rpx;
+								height: 48rpx;
+							}
+						}
+
+						.txt {
+							margin-top: 15rpx;
+							font-size: 26rpx;
+							color: #454545;
+						}
+					}
+				}
+			}
+		}
+
+		.slider-wrapper {
+			margin: 20rpx 0;
+			height: 138rpx;
+
+			swiper,
+			swiper-item {
+				height: 100%;
+			}
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.user-menus {
+			background-color: #fff;
+			border-radius: 14rpx;
+
+			.menu-title {
+				padding: 30rpx 30rpx 40rpx;
+				font-size: 30rpx;
+				color: #282828;
+				font-weight: 600;
+			}
+
+			.list-box {
+				display: flex;
+				flex-wrap: wrap;
+				padding: 0;
+			}
+
+			.item {
+				position: relative;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				flex-direction: column;
+				width: 25%;
+				margin-bottom: 47rpx;
+				font-size: 26rpx;
+				color: #333333;
+
+				image {
+					width: 52rpx;
+					height: 52rpx;
+					margin-bottom: 18rpx;
+				}
+
+
+				&:last-child::before {
+					display: none;
+				}
+			}
+
+			button {
+				font-size: 28rpx;
+			}
+		}
+
+		.phone {
+			color: #fff;
+		}
+
+		.pic_status {
+			font-size: 43rpx;
+			@include main_color(theme);
+		}
+
+		.order-status-num {
+			min-width: 13rpx;
+			background-color: #fff;
+			@include main_color(theme);
+			border-radius: 15px;
+			position: absolute;
+			right: -14rpx;
+			top: -15rpx;
+			font-size: 20rpx;
+			padding: 0 8rpx;
+			@include coupons_border_color(theme);
+		}
+
+	}
+
+	.sub_btn {
+		width: 690rpx;
+		height: 86rpx;
+		line-height: 86rpx;
+		margin-top: 60rpx;
+		background: $theme-color;
+		border-radius: 43rpx;
+		color: #fff;
+		font-size: 28rpx;
+		text-align: center;
+	}
+
+	.popup-content {
+		border-radius: 16rpx 16rpx 0px 0px;
+
+		.bottom_border {
+			border-bottom: 1px solid #F5F5F5;
+		}
+
+		.item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 20rpx;
+
+			.icon_color {
+				color: #2A7EFB;
+			}
+
+			.item_main {
+				display: flex;
+				align-items: center;
+
+				.item_name {
+					margin-left: 20rpx;
+					font-weight: 500;
+					font-size: 28rpx;
+				}
+			}
+
+			.item_img {
+				width: 60rpx;
+				height: 60rpx;
+				border-radius: 60rpx;
+			}
+		}
+	}
+</style>

mer_uniapp/pages/user/index.vue

@@ -1,1007 +1,85 @@
 <template>
-	<view :data-theme="theme">
-		<!-- #ifdef MP -->
-		<view class="cart_nav" :style='"height:"+navH+"rpx;"'>
-			<nav-bar iconColor='#fff' ref="navBarRef"  navTitle="个人中心">
-			</nav-bar>
+	<view>
+		<!-- 状态栏高度 -->
+		<view :style="{ height: `${statusBarHeight}px` }"></view>
+
+		<!-- 导航栏 -->
+		<view :style="{ height: `${navigationBarHeight}px`,lineHeight: `${navigationBarHeight}px`}" class="order-nav">
+			北京大学校园送
 		</view>
-		<!-- #endif -->
-		<tui-skeleton v-if="showSkeleton"></tui-skeleton>
-		<view class="new-users copy-data tui-skeleton">
-			<view class="mid" style="flex:1;overflow: hidden;">
-				<scroll-view scroll-y="true">
-					<view class="head borderPad">
-						<view class="bg"
-							:style="{'background-image': `url(${urlDomain}crmebimage/presets/user_bg.png)`}">
-							<view class="user-card">
-								<view class="user-info">
-									<image class="avatar tui-skeleton-rect" :src='userInfo.avatar'
-										v-if="userInfo.avatar" @click="goEdit()"></image>
-									<image v-else class="avatar tui-skeleton-rect"
-										:src="urlDomain+'crmebimage/presets/morenT.png'" mode="" @click="goEdit()">
-									</image>
-									<view class="info">
-										<view class="name" v-if="!isLogin" @tap="openAuto">
-											请点击登录
-										</view>
-										<view class="name" v-if="userInfo && uid">
-											<view @click="goEdit()">
-												{{userInfo && userInfo.nickname && uid ? userInfo.nickname : ''}}
-											</view>
-											<view class="vip" v-if="userInfo.vipIcon" @click="goEdit()">
-												<image :src="userInfo.vipIcon" alt=""></image>
-											</view>
-											<view class="vip" v-if="userInfo.isPaidMember"
-												@click="menusTap('/pages/activity/vip_paid/index')">
-												<image
-													:style="{'background-image': `url(${urlDomain}crmebimage/presets/viptu.png)`}">
-												</image>
-											</view>
-										</view>
-										<view class="num mt10" v-if="userInfo && userInfo.phone && uid"
-											@click="goEdit()">
-											<view class="num-txt">{{userInfo.phone}}</view>
-										</view>
-									</view>
-									<view class="app_set" @click="handleUserSetting()">
-										<text class="iconfont icon-shezhi"></text>
-									</view>
-								</view>
-								<view class="num-wrapper tui-skeleton-rect">
-									<view class="num-item" @click="goMenuPage('/pages/merchant/user_integral/index')">
-										<text class="num">{{userInfo.integral && uid ? userInfo.integral: 0}}</text>
-										<view class="txt">积分</view>
-									</view>
-									<view class="num-item" @click="goMenuPage('/pages/users/user_coupon/index')">
-										<text
-											class="num">{{userInfo.couponCount && uid ? userInfo.couponCount : 0}}</text>
-										<view class="txt">优惠券</view>
-									</view>
-									<view class="num-item"
-										@click="goMenuPage('/pages/goods/user_goods_collection/index')">
-										<text
-											class="num">{{userInfo.collectCount && uid ? userInfo.collectCount : 0}}</text>
-										<view class="txt">收藏</view>
-									</view>
-									<view class="num-item" @click="goMenuPage('/pages/goods/browsing_history/index')">
-										<text class="num">{{userInfo.browseNum && uid ? userInfo.browseNum:0}}</text>
-										<view class="txt">浏览记录</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view v-show="userInfo.paidMemberPaidEntrance===1"
-							@click="menusTap('/pages/activity/vip_paid/index')" class="h-128 svip-box px-30"
-							:style="{'background-image': `url(${urlDomain}crmebimage/presets/cardbj.png)`}">
-							<view class="acea-row row-middle row-between h-94">
-								<view class="acea-row">
-									<view class="w-34 h-28 no-repeat vipicon"
-										:style="{'background-image': `url(${urlDomain}crmebimage/presets/huangguan.png)`}">
-									</view>
-									<view class="f-s-24 text ml-12">加入SVIP畅享精彩</view>
-								</view>
-								<view class="acea-row row-middle">
-									<view class="f-s-24 text mr10">{{userInfo.isPaidMember?'去查看':'去开通'}}</view>
-									<text class="iconfont icon-gengduo3 text f-s-20"></text>
-								</view>
-							</view>
-						</view>
-						<view class="order-wrapper tui-skeleton-rect"
-							:class="userInfo.paidMemberPaidEntrance===1?'mt34rpx':''">
-							<view class="order-hd flex">
-								<view class="left">订单中心</view>
-								<view class="right flex" @click="menusTap('/pages/goods/order_list/index')">查看全部
-									<text class="iconfont icon-xiangyou"></text>
-								</view>
-							</view>
-							<view class="order-bd">
-								<block v-for="(item,index) in orderMenu" :key="index">
-									<view class="order-item" @click="menusTap(item.url)">
-										<view class="pic">
-											<text class="iconfont pic_status" :class="item.img"></text>
-											<text class="order-status-num" v-if="item.num > 0">{{ item.num }}</text>
-										</view>
-										<view class="txt tui-skeleton-rect">{{item.title}}</view>
-									</view>
-								</block>
-							</view>
-						</view>
+
+		<view style="background-color: #ffffff; border-radius: 23rpx;padding: 30rpx 20rpx 40rpx 20rpx;">
+
+			<view style="display: flex;padding: 20rpx;">
+				<view style="flex: 1;font-size: 21rpx;color: #999999;">
+					<text style="margin-right: 14rpx;">绑定手机号：185-7033-6037</text>
+					<image src="/static/img/ic-copy.png" style="width: 27rpx;height: 27rpx;vertical-align: middle;"></image>
+				</view>
+				
+				<view style="flex: 1;text-align: right;color: #141414;font-size: 23rpx;font-weight: 600;">
+					个人中心 >
+				</view>
+				
+			</view>
+
+			<view class="item-settled">
+					<view style="flex: 1;">
+						<image src="/static/img/ic-merchant-settled.png" style="width: 116rpx;height: 116rpx;"></image>
+						<text style="margin-right: 14rpx;">商家入驻</text>
 					</view>
-					<view class="contenBox borderPad" id="pageIndex">
-						<!-- 轮播 -->
-						<view class="slider-wrapper tui-skeleton-rect" @click.native="bindEdit('userBanner')"
-							v-if="centerBanner != null && centerBanner.length > 0">
-							<swiper v-if="centerBanner.length>0" indicator-dots="true" :autoplay="autoplay"
-								:circular="circular" :interval="interval" :duration="duration"
-								indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
-								<block v-for="(item,index) in centerBanner" :key="index">
-									<swiper-item class="borRadius14">
-										<image :src="item.pic" class="slide-image" @click="navito(item.url)"></image>
-									</swiper-item>
-								</block>
-							</swiper>
-						</view>
-						<!-- 会员菜单 -->
-						<view class="user-menus mt20" @click.native="bindEdit('userMenus')">
-							<view class="menu-title">我的服务</view>
-							<view class="list-box">
-								<block v-for="(item,index) in centerMenu" :key="index">
-									<view class="item tui-skeleton-rect" @click="menusTap(item.url)"
-										v-if="!(item.url =='/pages/service/index' || (item.url =='/pages/users/user_spread_user/index' && !userInfo.isPromoter)||(!isEmployee&&item.url=='/pages/admin/work/index'))">
-										<image :src="item.pic"></image>
-										<text>{{item.name}}</text>
-									</view>
-								</block>
-								<!-- #ifndef MP -->
-								<view class="item" @click="kefuClick">
-									<image :src="servicePic"></image>
-									<text>联系客服</text>
-								</view>
-								<!-- #endif -->
-								<!-- #ifdef MP -->
-								<button class="item" hover-class='none' @click="kefuClick"
-									v-if="chatConfig.telephone_service_switch === 'true'">
-									<image :src="servicePic"></image>
-									<text>联系客服</text>
-								</button>
-								<button class="item" open-type='contact' hover-class='none' v-else>
-									<image :src="servicePic"></image>
-									<text>联系客服</text>
-								</button>
-								<!-- #endif -->
-							</view>
-						</view>
-						<!-- 商家管理 -->
-						<view class="user-menus mt20" v-if="isEmployee">
-							<view class="menu-title">店铺管理</view>
-							<view class="list-box">
-								<view class="item" @click="toggle('bottom')">
-									<image :src="urlDomain+'crmebimage/presets/adminImg/sjgl.png'"></image>
-									<text>商家管理</text>
-								</view>
-							</view>
-						</view>
+					
+					<view style="flex: 1;">
+						
 					</view>
-					<image :src="copyImage" alt="" class='support'></image>
-				</scroll-view>
 			</view>
+
 		</view>
-		<view v-if="bottomNavigationIsCustom" class="footerBottom"></view>
-		<pageFooter></pageFooter>
-		<uni-popup ref="popup" type="bottom" background-color="rgba(0,0,0,0)" border-radius="10px 10px 0 0">
-			<view class="popup-content">
-				<view class="item" v-for="(item,index) in merchantEmployeeList" :key="index"
-					:class="{bottom_border:index!=merchantEmployeeList.length-1}">
-					<view class="item_main">
-						<image :src="item.currentMerchant.avatar" mode="" class="item_img"></image>
-						<view class="item_name" :class="{nameColor:item.merId==selectMerId}">
-							{{item.currentMerchant.name}}</view>
-					</view>
-					<text v-if="item.merId==selectMerId" class="iconfont icon-xuanzhong11 icon-size icon_color"></text>
-					<text v-else class="iconfont icon-weixuan icon-size" @click="radioChange(item)"></text>
-				</view>
-			</view>
-		</uni-popup>
+
+
 	</view>
 </template>
+
 <script>
-	let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-	import Cache from '@/utils/cache';
-	import navBar from '@/components/navBar';
-	import {
-		goPage
-	} from '@/libs/iframe.js'
-	import {
-		BACK_URL,
-		USER_INFO
-	} from '@/config/cache';
-	import {
-		userCenterInfo,
-		copyrightImageApi
-	} from '@/api/user.js';
-	import {
-		MerchantBelongListApi,
-		merchantActive
-	} from '@/api/work.js';
-	import {
-		orderNum
-	} from '@/api/order.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		getCityList
-	} from "@/utils";
-	import {
-		tokenIsExistApi
-	} from '@/api/api.js';
-	// #ifdef H5
-	import Auth from '@/libs/wechat';
-	// #endif
-	import {
-		getShare
-	} from '@/api/public.js';
-	import {
-		setThemeColor
-	} from '@/utils/setTheme.js'
-	import animationType from '@/utils/animationType.js'
-	import {
-		chatConfig
-	} from '@/utils/consumerType.js'
-	import tuiSkeleton from '@/components/base/tui-skeleton.vue';
-	import pageFooter from "@/components/pageFooter/index.vue";
-	const app = getApp();
+	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	let app = getApp();
 	export default {
-		computed: mapGetters(['isLogin', 'chatUrl', 'uid', 'globalData', 'bottomNavigationIsCustom',
-			'merchantEmployeeList', 'isEmployee', 'selectMerId'
-		]),
 		data() {
 			return {
-				scrollHeight: 0,
-				triggered: false,
-				isRefresher: false, //下拉刷新状态
-				urlDomain: this.$Cache.get("imgHost"),
-				showSkeleton: true, //骨架屏显示隐藏
-				orderMenu: [{
-						img: 'icon-daifukuan',
-						title: '待付款',
-						url: '/pages/goods/order_list/index?status=0',
-						num: 0
-					},
-					{
-						img: 'icon-daifahuo',
-						title: '待发货',
-						url: '/pages/goods/order_list/index?status=1',
-						num: 0
-					},
-					{
-						img: 'icon-daihexiao',
-						title: '待核销',
-						url: '/pages/goods/order_list/index?status=3',
-						num: 0
-					},
-					{
-						img: 'icon-daishouhuo',
-						title: '待收货',
-						url: '/pages/goods/order_list/index?status=4',
-						num: 0
-					},
-					{
-						img: 'icon-daipingjia',
-						title: '待评价',
-						url: '/pages/goods/evaluation_list/index',
-						num: 0
-					},
-					{
-						img: 'icon-a-shouhoutuikuan',
-						title: '售后/退款',
-						url: '/pages/goods/user_return_list/index',
-						num: 0
-					},
-				],
-				centerBanner: [],
-				userMenu: [],
-				autoplay: true,
-				circular: true,
-				interval: 3000,
-				duration: 500,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				orderStatusNum: {},
-				centerMenu: [],
-				wechatUrl: [],
-				servicePic: '',
-				sysHeight: sysHeight,
-				// #ifdef MP
-				pageHeight: '100%',
-				// #endif
-				// #ifdef H5 || APP-PLUS
-				pageHeight: '',
-				// #endif
-				// #ifdef H5
-				isWeixin: Auth.isWeixin(),
-				//#endif
-				configApi: {}, //分享类容配置
-				theme: app.globalData.theme,
-				bgColor: '#e93323',
-				userInfo: {},
-				copyImage: '',
-				navH:''
+				statusBarHeight: app.globalData.statusBarHeight,
+				navigationBarHeight: 0,
 			}
 		},
-		components: {
-			tuiSkeleton,
-			pageFooter,
-			navBar
-		},
-		onLoad() {
-			this.servicePic = this.urlDomain + 'crmebimage/presets/customer.png'
-			this.getTokenIsExist();
-			// #ifdef MP
-			this.navH = this.globalData.navHeight;
-			// #endif
-			// #ifndef MP
-			this.navH = 96;
-			// #endif
-			if (this.globalData.isIframe) {
-				setTimeout(() => {
-					let active;
-					document.getElementById('pageIndex').children.forEach(dom => {
-						dom.addEventListener('click', (e) => {
-							e.stopPropagation();
-							e.preventDefault();
-							if (dom === active) return;
-							dom.classList.add('borderShow');
-							active && active.classList.remove('borderShow');
-							active = dom;
-						})
-					})
-				});
-			}
-			// #ifdef APP-PLUS
-			setTimeout(()=>{
-			 	uni.setNavigationBarColor({
-			 		frontColor: '#ffffff',
-			 		backgroundColor:that.bgColor,   
-			 	});
-			 },500)
-			// #endif
+		onLoad(options) {
 			let that = this;
-			// #ifdef H5 || APP-PLUS
-			that.$set(that, 'pageHeight', this.globalData.windowHeight);
-			// #endif
-			that.$set(that, 'centerMenu', this.globalData.centerMenu);
-			that.bgColor = setThemeColor();
-		},
-		onShow: function() {
-			if (this.isLogin) {
-				this.getUserCenterInfo();
-				this.getOrderData();
-				this.getMerchantList()
-			}
-			this.copyrightImage();
-			this.showSkeleton = false
-			let that = this;
-			if (!that.$Cache.get('cityList')) getCityList();
-			// #ifdef H5
-			uni.getSystemInfo({
-				success: function(res) {
-					that.pageHeight = res.windowHeight + 'px'
-				}
-			});
-			// #endif
-			// #ifdef MP
-			let query = uni.createSelectorQuery();
-			let dom = query.select('.new-users');
+			//首页数据加载
+			// this.getIndexConfig();
+			// #ifdef MP-WEIXIN
+			// 获取微信胶囊的位置信息 width,height,top,right,left,bottom
+			const custom = wx.getMenuButtonBoundingClientRect()
+			// 导航栏高度(标题栏高度) = 胶囊高度 + (顶部距离 - 状态栏高度) * 2
+			this.navigationBarHeight = custom.height + (custom.top - this.statusBarHeight) * 2
+			// console.log("导航栏高度："+this.globalData.navigationBarHeight)
 			// #endif
+
 		},
-		methods: {
-			/**
-			 *  发现列表滑动中用到的方法
-			 */
-			onScroll() {
-				uni.$emit('scroll');
-			},
-			toggle(type) {
-				if (this.merchantEmployeeList.length == 1) {
-					merchantActive(this.merchantEmployeeList[0].merId).then(res => {
-						this.$store.commit('SetSelectMerId', this.merchantEmployeeList[0].merId);
-						this.$store.commit('SetSelectMerchantRole', this.merchantEmployeeList[0].role);
-						this.$store.commit('SET_MANAGER_TOKEN', {
-							managerToken: res.data.token
-						});
-						Cache.set('electrPrintingSwitch', res.data.electrPrintingSwitch);
-						uni.navigateTo({
-							url: '/pages/admin/work/index'
-						})
-						return
-					})
-					return
-				}
-				if (this.selectMerId) {
-					uni.navigateTo({
-						url: '/pages/admin/work/index'
-					})
-				} else {
-					this.type = type
-					// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-					this.$refs.popup.open(type)
-				}
-			},
-			//选中商户
-			radioChange(item) {
-				let that = this
-				merchantActive(item.merId).then(res => {
-					if (res.code == 200) {
-						that.$store.commit('SET_MANAGER_TOKEN', {
-							managerToken: res.data.token
-						});
-						Cache.set('electrPrintingSwitch', res.data.electrPrintingSwitch);
-						that.$store.commit('SetSelectMerId', item.merId);
-						this.$store.commit('SetSelectMerchantRole', item.role);
-						this.$refs.popup.close()
-						uni.navigateTo({
-							url: '/pages/admin/work/index'
-						})
-					}
-				})
-			},
-			//获取商户列表
-			getMerchantList() {
-				let that = this
-				MerchantBelongListApi().then(res => {
-					if (this.selectMerId) {
-						let flag = res.data.find(item => item.merId === this.selectMerId);
-						!flag && that.$store.commit('CLEAR_SELECTMERID');
-					}
-					this.$store.commit("SetMerchantEmployeeList", res.data);
-				})
-			},
-			//校验token是否有效,true为有效，false为无效
-			getTokenIsExist() {
-				tokenIsExistApi().then(res => {
-					let tokenIsExist = res.data;
-					if (!tokenIsExist) {
-						this.$store.commit('UPDATE_LOGIN', '');
-						this.$store.commit('UPDATE_USERINFO', {});
-					}
-				})
-			},
-			copyrightImage() {
-				copyrightImageApi().then(res => {
-					if (res.data) {
-						this.copyImage = res.data;
-					} else {
-						this.copyImage = `${this.urlDomain}crmebimage/presets/support.png`;
-					}
-				}).catch(err => {
-					return this.$util.Tips({
-						title: err
-					})
-				});
-			},
-			bindEdit(name) {
-				if (this.globalData.isIframe) {
-					window.parent.postMessage({
-							name: name
-						},
-						'*'
-					);
-					return;
-				}
-			},
-			menusTap(url) {
-				if (!this.isLogin) {
-					this.openAuto();
-				} else {
-					if (url === '/pages/activity/vip_paid/index' && this.userInfo.paidMemberPaidEntrance === 0) return
-					this.$util.navigateTo(url);
-				}
-			},
-			//轮播图跳转
-			navito(url) {
-				this.$util.navigateTo(url);
-			},
-			kefuClick() {
-				chatConfig(this.$Cache.getItem('platChatConfig'));
-			},
-			getOrderData() {
-				let that = this;
-				orderNum().then(res => {
-					that.orderMenu.forEach((item, index) => {
-						switch (item.title) {
-							case '待付款':
-								item.num = res.data.awaitPayCount
-								break
-							case '待发货':
-								item.num = res.data.awaitShippedCount
-								break
-							case '待收货':
-								item.num = res.data.receiptCount
-								break
-							case '待核销':
-								item.num = res.data.verificationCount
-								break
-							case '待评价':
-								item.num = res.data.awaitReplyCount
-								break
-							default:
-								item.num = res.data.refundCount
-						}
-					})
-					that.$set(that, 'orderMenu', that.orderMenu);
-				})
-			},
-			// 绑定手机
-			bindPhone() {
-				uni.navigateTo({
-					animationType: animationType.type,
-					animationDuration: animationType.duration,
-					url: '/pages/users/app_login/index'
-				})
-			},
-			/**
-			 * 
-			 * 获取个人中心详情
-			 */
-			getUserCenterInfo: function() {
-				userCenterInfo().then(res => {
-					let data = res.data;
-					this.userInfo = data;
-					this.$store.commit("SETUID", data.id);
-					this.$store.commit("SetIsEmployee", data.isEmployee);
-					this.$set(this, 'centerMenu', data.centerMenu);
-					this.$store.commit('UPDATE_USERINFO', {
-						avatar: data.avatar,
-            nickname: data.nickname,
-						phone: data.phone
-					});
-					if (data.centerBanner) {
-						this.centerBanner = data.centerBanner
-					}
-					this.showSkeleton = false;
-				}).catch(err => {
-					this.showSkeleton = false;
-				});
-			},
-			// 编辑页面
-			goEdit() {
-				if (this.isLogin == false) {
-					this.openAuto();
-				} else {
-					uni.navigateTo({
-						animationType: animationType.type,
-						animationDuration: animationType.duration,
-						url: '/pages/users/user_info/index'
-					})
-				}
-			},
-			goMenuPage(url) {
-				if (this.isLogin) {
-					uni.navigateTo({
-						animationType: animationType.type,
-						animationDuration: animationType.duration,
-						url
-					})
-				} else {
-					// #ifdef MP
-					this.openAuto()
-					// #endif
-				}
-			},
-			// 打开授权
-			openAuto() {
-				Cache.set(BACK_URL, '')
-				toLogin();
-			},
-			// 去设置页面
-			handleUserSetting() {
-				if (!this.isLogin) {
-					return this.openAuto();
-				}
-				uni.navigateTo({
-					url: '/pages/users/user_setting/index'
-				})
-			},
-			shareApi: function() {
-				getShare().then(res => {
-					this.$set(this, 'configApi', res.data);
-					// #ifdef H5
-					this.setOpenShare(res.data);
-					// #endif
-				})
-			},
-			// 微信分享；
-			setOpenShare: function() {
-				let that = this;
-				if (that.$wechat.isWeixin()) {
-					let configAppMessage = {
-						desc: 'crmeb',
-						title: 'crmeb',
-						link: location.href,
-						imgUrl: ''
-					};
-					that.$wechat.wechatEvevt([
-							"updateAppMessageShareData",
-							"updateTimelineShareData",
-							"onMenuShareAppMessage",
-							"onMenuShareTimeline",
-						],
-						configAppMessage);
-				}
-			}
-		}
+		methods: {},
 	}
 </script>
 
-<style lang="scss" scoped>
-	.vipicon {
-		background-size: 100% 100%;
-	}
-
-	.mt34rpx {
-		margin-top: -34rpx;
-	}
-
-	.svip-box {
-		width: 702rpx;
-		background-repeat: no-repeat;
-		background-size: 702rpx 128rpx;
-
-		.text {
-			color: #FFD89C;
-		}
-	}
-
-	.num-txt {
-		padding: 6rpx 20rpx;
-		border-radius: 36rpx;
-		background: rgba(255, 255, 255, 0.2);
-	}
-
-	page,
-	body {
-		height: 100%;
-		margin: 0;
-	}
-
-	.ma .mp-header {
-		@include main_bg_color(theme);
-	}
-
-	.bg {
-		width: 100%;
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-	}
-
-	.support {
-		width: 219rpx;
-		height: 74rpx;
-		margin: 20rpx auto;
-		display: block;
-	}
-
-	.new-users {
-		display: flex;
-		flex-direction: column;
-		height: 100%;
-
-		.sys-head {
-			position: relative;
-			width: 100%;
-			background: linear-gradient(90deg, $bg-star1 0%, $bg-end1 100%);
-
-			.sys-title {
-				z-index: 10;
-				position: relative;
-				height: 43px;
-				text-align: center;
-				line-height: 43px;
-				font-size: 36rpx;
-				color: #FFFFFF;
-			}
-		}
-
-		.head {
-			width: 100%;
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-			@include index-gradient(theme);
-
-			.user-card {
-				width: 100%;
-				margin: 0 auto;
-				padding: 35rpx 0 40rpx 0;
-
-				.user-info {
-					z-index: 20;
-					display: flex;
-					align-items: center;
-					color: #fff;
-
-					.avatar {
-						width: 120rpx;
-						height: 120rpx;
-						border-radius: 50%;
-					}
-
-					.app_set {
-						color: #fff;
-						width: 140rpx;
-						height: 110rpx;
-						text-align: right;
-						line-height: 110rpx;
-
-						.icon-shezhi {
-							font-size: 36rpx;
-						}
-					}
-
-					.info {
-						flex: 1;
-						display: flex;
-						flex-direction: column;
-						justify-content: space-between;
-						margin-left: 20rpx;
-						padding: 15rpx 0;
-
-						.name {
-							display: flex;
-							align-items: center;
-							color: #fff;
-							font-size: 31rpx;
-
-							.vip {
-								display: flex;
-								align-items: center;
-								border-radius: 18px;
-								font-size: 20rpx;
-								margin-left: 14rpx;
-
-								image {
-									width: 27rpx;
-									height: 27rpx;
-									background-repeat: no-repeat;
-									background-size: 100% 100%;
-								}
-							}
-						}
-
-						.num {
-							display: flex;
-							align-items: center;
-							font-size: 26rpx;
-							color: rgba(255, 255, 255, 0.6);
-
-							image {
-								width: 22rpx;
-								height: 23rpx;
-								margin-left: 20rpx;
-							}
-						}
-					}
-				}
-
-				.num-wrapper {
-					z-index: 30;
-					position: relative;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					margin-top: 30rpx;
-					color: #fff;
-
-					.num-item {
-						width: 33.33%;
-						text-align: center;
-
-						.num {
-							font-size: 42rpx;
-							font-weight: bold;
-						}
-
-						.txt {
-							margin-top: 10rpx;
-							font-size: 26rpx;
-							color: rgba(255, 255, 255, 0.6);
-						}
-					}
-				}
-
-				.sign {
-					z-index: 200;
-					position: absolute;
-					right: -12rpx;
-					top: 80rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 120rpx;
-					height: 60rpx;
-					background: linear-gradient(90deg, rgba(255, 225, 87, 1) 0%, rgba(238, 193, 15, 1) 100%);
-					border-radius: 29rpx 4rpx 4rpx 29rpx;
-					color: #282828;
-					font-size: 28rpx;
-					font-weight: bold;
-				}
-			}
-
-			.order-wrapper {
-				background-color: #fff;
-				border-radius: 14rpx;
-				padding: 30rpx 16rpx;
-				position: relative;
-				z-index: 11;
-
-				.order-hd {
-					justify-content: space-between;
-					font-size: 30rpx;
-					color: #282828;
-					margin-bottom: 40rpx;
-					padding: 0 16rpx;
-
-					.left {
-						color: #282828;
-						font-size: 30rpx;
-						font-weight: 600;
-					}
-
-					.right {
-						align-items: center;
-						color: #666666;
-						font-size: 26rpx;
-
-						.icon-xiangyou {
-							margin-left: 5rpx;
-							font-size: 24rpx;
-						}
-					}
-				}
-
-				.order-bd {
-					display: flex;
-					justify-content: space-between;
-					padding: 0;
-
-					.order-item {
-						display: flex;
-						flex-direction: column;
-						justify-content: center;
-						align-items: center;
-
-						.pic {
-							position: relative;
-							text-align: center;
-
-							image {
-								width: 48rpx;
-								height: 48rpx;
-							}
-						}
-
-						.txt {
-							margin-top: 15rpx;
-							font-size: 26rpx;
-							color: #454545;
-						}
-					}
-				}
-			}
-		}
-
-		.slider-wrapper {
-			margin: 20rpx 0;
-			height: 138rpx;
-
-			swiper,
-			swiper-item {
-				height: 100%;
-			}
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.user-menus {
-			background-color: #fff;
-			border-radius: 14rpx;
-
-			.menu-title {
-				padding: 30rpx 30rpx 40rpx;
-				font-size: 30rpx;
-				color: #282828;
-				font-weight: 600;
-			}
-
-			.list-box {
-				display: flex;
-				flex-wrap: wrap;
-				padding: 0;
-			}
-
-			.item {
-				position: relative;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				flex-direction: column;
-				width: 25%;
-				margin-bottom: 47rpx;
-				font-size: 26rpx;
-				color: #333333;
-
-				image {
-					width: 52rpx;
-					height: 52rpx;
-					margin-bottom: 18rpx;
-				}
-
-
-				&:last-child::before {
-					display: none;
-				}
-			}
-
-			button {
-				font-size: 28rpx;
-			}
-		}
-
-		.phone {
-			color: #fff;
-		}
-
-		.pic_status {
-			font-size: 43rpx;
-			@include main_color(theme);
-		}
-
-		.order-status-num {
-			min-width: 13rpx;
-			background-color: #fff;
-			@include main_color(theme);
-			border-radius: 15px;
-			position: absolute;
-			right: -14rpx;
-			top: -15rpx;
-			font-size: 20rpx;
-			padding: 0 8rpx;
-			@include coupons_border_color(theme);
-		}
-
-	}
-
-	.sub_btn {
-		width: 690rpx;
-		height: 86rpx;
-		line-height: 86rpx;
-		margin-top: 60rpx;
-		background: $theme-color;
-		border-radius: 43rpx;
-		color: #fff;
-		font-size: 28rpx;
+<style scoped>
+	.order-nav {
+		font-weight: 500;
+		font-size: 35rpx;
+		color: #FFFFFF;
+		background-color: #FF6702;
 		text-align: center;
 	}
 
-	.popup-content {
-		border-radius: 16rpx 16rpx 0px 0px;
-
-		.bottom_border {
-			border-bottom: 1px solid #F5F5F5;
-		}
-
-		.item {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 20rpx;
-
-			.icon_color {
-				color: #2A7EFB;
-			}
-
-			.item_main {
-				display: flex;
-				align-items: center;
-
-				.item_name {
-					margin-left: 20rpx;
-					font-weight: 500;
-					font-size: 28rpx;
-				}
-			}
-
-			.item_img {
-				width: 60rpx;
-				height: 60rpx;
-				border-radius: 60rpx;
-			}
-		}
+	.item-settled {
+		background: linear-gradient(135deg, #FED0A7 0%, #FFF3E2 52%, #FAEDD3 100%);
+		border-radius: 8rpx;
+		border: 2rpx solid;
+		border-image: linear-gradient(200deg, rgba(255, 220, 135, 1), rgba(255, 172, 33, 1), rgba(255, 201, 24, 1)) 2 2;
+		padding: 40rpx;
 	}
 </style>