index

index conf

app.js

@@ -13,8 +13,8 @@ App({
 		xu_content_date: '',
 		xu_content_type: '',
 		payurl: 'https://test.yueguanjia.com/jielin-web/pay/third/prepay/approve',
-    // url: 'http://127.0.0.1:8888'    
-    url: 'https://www.e-jinying.com/jy-ty-1'//正式
+    url: 'https://api.zhumi.tech/mili_admin'    
+    // url: 'https://www.e-jinying.com/jy-ty-1'//正式
 	},
 	onLaunch: function() {
 		this.checkFullSucreen();

app.wxss

@@ -1,5 +1,6 @@
 /**app.wxss**/
 /* @import "/wxParse/wxParse.wxss"; */
+
 .container {
 	height: 100%;
 	display: flex;
@@ -10,26 +11,6 @@
 	box-sizing: border-box;
 }
 
-page {
-	font-size: 28rpx;
-	color: #000;
-	font-family: 'PingFangSC';
-	height: 100%;
-	position: relative;
-	overflow: hidden;
-	box-sizing: border-box;
-}
-
-.view-page {
-	height: 100%;
-	width: 100%;
-	left: 0;
-	top: 0;
-	box-sizing: border-box;
-	position: absolute;
-	overflow: hidden;
-}
-
 .page-content {
 	box-sizing: border-box;
 	position: relative;
@@ -294,4 +275,7 @@ page {
 .loadimg {
 	width: 200rpx;
 	height: 200rpx;
+}
+.endbottomm {
+	height: 200rpx;
 }

components/navBar/navBar.js

@@ -3,7 +3,6 @@ const app = getApp();
 const config = require('../../utils/config.js');
 var util = require("../../utils/util.js")
 Component({
-
 	options: {
 		addGlobalClass: true,
 	},

components/tabBar/tabBar.js

@@ -23,16 +23,16 @@ Component({
 				name: "悦所", //文本
 				current: 0, //是否是当前页，0不是  1是
 				style: 0, //样式
-				typea: "https://yuesuo.yueguanjia.com/MiniProgram/images/phaseI/homeOff.png", //不同图标
-				typec: "https://yuesuo.yueguanjia.com/MiniProgram/images/phaseI/home.png",
+				typea: "https://api.zhumi.tech/MiniProgram/image/home.png", //不同图标
+				typec: "https://api.zhumi.tech/MiniProgram/image/homec.png",
 				fn: 'index'
 			},
 			{
 				name: "服务",
 				current: 0,
 				style: 0,
-				typea: "https://yuesuo.yueguanjia.com/MiniProgram/images/phaseI/serveOff.png", //不同图标
-				typec: "https://yuesuo.yueguanjia.com/MiniProgram/images/phaseI/serve.png",
+				typea: "https://api.zhumi.tech/MiniProgram/image/packages.png", //不同图标
+				typec: "https://api.zhumi.tech/MiniProgram/image/packagesc.png",
 				fn: 'packages'
 			},
 			{
@@ -46,15 +46,15 @@ Component({
 				name: "活动",
 				current: 0,
 				style: 0,
-				typea: "https://yuesuo.yueguanjia.com/MiniProgram/images/phaseI/activityOff.png", //不同图标
-				typec: "https://yuesuo.yueguanjia.com/MiniProgram/images/phaseI/activity.png",
+				typea: "https://api.zhumi.tech/MiniProgram/image/promotion.png", //不同图标
+				typec: "https://api.zhumi.tech/MiniProgram/image/promotionc.png",
         fn: 'promotion'
 			}, {
 				name: "我的",
 				current: 0,
 				style: 0,
-				typea: "https://yuesuo.yueguanjia.com/MiniProgram/images/phaseI/myOff.png", //不同图标
-				typec: "https://yuesuo.yueguanjia.com/MiniProgram/images/phaseI/my.png",
+				typea: "https://api.zhumi.tech/MiniProgram/image/mine.png", //不同图标
+				typec: "https://api.zhumi.tech/MiniProgram/image/minec.png",
 				fn: 'mine'
 			}
 		]
@@ -79,12 +79,6 @@ Component({
 	methods: {
 		// 设置tabbar数据
 		SetNavList: function() {
-			// if (wx.getStorageSync('branche_name') == '北京') {
-			// 	this.setData({
-			// 		'navList[2].name': '简介',
-      //     'navList[3].name': '活动'
-			// 	})
-			// }
 			let index = this.data._tabBarInd
 			let deletedtodo = 'navList[' + index + ']'
 			this.setData({
@@ -95,8 +89,6 @@ Component({
 		},
 		// tabbar跳转页面
 		gotoPage: function(event) {
-      console.log(666)
-      console.log(event)
 			let str = event.currentTarget.dataset.fn
       let url = `/pages/${str}/${str}`
       app.gopage(url)

components/tabBar/tabBar.wxml

@@ -1,5 +1,5 @@
 <view class="flex fix_nav_wp {{isFullscreen ? 'isFullscreen' : ''}}">
-	<image src='https://yuesuo.yueguanjia.com/MiniProgram/images/menuback.png' class="menuback"></image>
+	<image src='https://api.zhumi.tech/MiniProgram/image/menuback.png' class="menuback"></image>
 	<block wx:for="{{navList}}" wx:key="navDataId">
 		<view class="nav_link" data-fn="{{item.fn}}" bindtap="gotoPage">
 			<button class="defalut_btn {{item.current==0?'':'on_cor'}}">
@@ -19,7 +19,7 @@
 				</block>
 				<!-- tabBar中间项 -->
 				<block wx:elif="{{item.style==2}}">
-					<image src='https://yuesuo.yueguanjia.com/MiniProgram/images/phaseI/supper.png' class="ranimg" />
+					<image src='https://api.zhumi.tech/MiniProgram/image/logo.png' class="ranimg" />
 					<text class="txt txt_fb">{{item.name}}</text>
 				</block>
 			</button>

components/tabBar/tabBar.wxss

@@ -1,5 +1,5 @@
 /**app.wxss**/
-@import "../../app.wxss";
+@import "/app.wxss";
 
 .ranimg {
 	width: 100rpx;

pages/index/index.js

@@ -1,6 +1,5 @@
 const app = getApp()
 var util = require("../../utils/util.js")
-let scrollTop = '';
 Page({
 	data: {
 		pushCont: {
@@ -48,82 +47,6 @@ Page({
 		circular: false,
 		canIUse: wx.canIUse('button.open-type.getUserInfo')
 	},
-
-	hidemask() {
-		this.setData({
-			evaluateListNew: [],
-			showmask: false
-		})
-	},
-	showmask(e) {
-		let index = e.currentTarget.dataset['index'];
-		let dianPingImageIndex = e.currentTarget.dataset['imageIndex'];
-		// console.log(index, dianPingImageIndex, e.currentTarget)
-		let arr = []
-		arr.push(this.data.evaluateList[index])
-		this.setData({
-			evaluateListNew: arr,
-			bigimagecurrent: dianPingImageIndex,
-			showmask: true
-		})
-	},
-	//选月嫂
-	tomonthmama() {
-		wx.navigateTo({
-			url: "/pages/testpaper/testpaper"
-		})
-	},
-	onShow() {
-		var that = this;
-		console.log(app.globalData.openid);
-		// 判断用户是否设置过孕期
-		if (app.globalData.openid) {
-			util.getData('/getWXUser', {
-					xu_openid: app.globalData.openid
-				})
-				.then(res => {
-					// console.log(res);
-					if (res.xu_content_type && res.xu_content_date) {
-						that.setData({
-							isSetstatus: true
-						})
-					}
-					// 育儿或孕周内容查询
-					util.postData('/queryUserContent', {
-							openid: app.globalData.openid
-						})
-						.then(res => {
-							// console.log(res)
-							if (res.wc_content == null || res.wc_content == '') {
-								that.setData({
-									isSetstatus: false
-								})
-							}
-							that.setData({
-								pushCont: res
-							})
-						})
-						.catch(err => {
-							console.log(err);
-						})
-				})
-				.catch(err => {
-					console.log(err);
-				})
-		}
-		// 看点评列表
-		util.getData('/getWXDianPing')
-			.then(res => {
-				// console.log(res);
-				that.setData({
-					evaluateList: res.slice(0, 2)
-				})
-			})
-			.catch(err => {
-				console.log(err);
-			})
-
-	},
 	onLoad: function(options) {
 		if (options.skip == 1) {
 			if (options.para == null) {
@@ -140,159 +63,26 @@ Page({
 	},
 	init(options) {
 		var that = this
-		util.getData('/getValidPO')
-			.then(res => {
-				if (res >= 1) {
-					that.setData({
-						pmshow: true
-					})
-				}
-			})
-			.catch(err => {
-				console.log(err);
-			})
-
 		util.getData('/getBanners')
 			.then(res => {
-				console.log(res)
 				that.setData({
 					arr: res
 				})
 			})
-			.catch(err => {
-				console.log(err);
-			})
-
-		// 优品推荐读取
-		util.getData('/getEquipmentTypes').then(res => {
-			that.setData({
-				eqArray: res
-			})
-		})
-		util.getData('/getIndexs').then(res => {
-			for (var i = 0; i < res.length; i++) {
-				if (res[i].wi_type == 1) {
-					that.setData({
-						leaseurl: res[i].wi_url
-					})
-				}
-				if (res[i].wi_type == 2) {
-					that.setData({
-						promotionurl: res[i].wi_url
-					})
-				}
-			}
-		})
-		util.getData('/getIndexPromotions').then(res => {
-			that.setData({
-				pmArray: res
-			})
+		that.setData({
+			navH: app.globalData.navHeight
 		})
-		// 获取门店
-		let branche_code = wx.getStorageSync('branche_code');
-		util.getData('/getMktInfos', {
-			mi_branche_code: branche_code
+		util.getData('/getMktInfos',{
+			mi_branche_code: 110000
 		}).then(res => {
-			let arr = []
-			arr.push(res[0])
-			that.setData({
-				trafficList: arr
-			})
 			that.setData({
-				mktarr: res,
-				map: res[0].mi_mapurl,
-				mktnum: res[0].id,
-				latitude: res[0].mi_latitude,
-				longitude: res[0].mi_longitude,
-				name: res[0].mi_mktname,
-				address: res[0].mi_mktaddress
+				mktarr: res
 			})
 		})
-		if (app.globalData.userInfo) {
-			this.setData({
-				userInfo: app.globalData.userInfo,
-				hasUserInfo: true
-			})
-		} else if (this.data.canIUse) {
-			console.log(this.data.canIUse)
-			// 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
-			// 所以此处加入 callback 以防止这种情况
-			app.userInfoReadyCallback = res => {
-				console.log(res)
-				this.setData({
-					userInfo: res.userInfo,
-					hasUserInfo: true
-				})
-			}
-		} else {
-			console.log('else')
-			// 在没有 open-type=getUserInfo 版本的兼容处理
-			wx.getUserInfo({
-				success: res => {
-					app.globalData.userInfo = res.userInfo
-					this.setData({
-						userInfo: res.userInfo,
-						hasUserInfo: true
-					})
-				},
-				fail() {
-					app.timeOut()
-				}
-			})
-		}
-		if (options.college != null) {
-			// 线下扫码签到
-			util.postData('/college/getPointsByOffline', {
-					openid: app.globalData.openid,
-					c_code: options.college
-				})
-				.then(res => {
-					console.log(res)
-					let n = new Map([
-						['1', '恭喜您，签到成功！'],
-						['52', '抱歉，您暂未预约。'],
-						['54', '签到已完成']
-					])
-					if (n.get(res + '')) {
-						wx.showModal({
-							title: '提示',
-							content: n.get(res + ''),
-							showCancel: false,
-							success(res) {
-								console.log(res)
-							}
-						})
-					}
-				})
-		}
-		//判断介绍人及活动 有介绍人有活动跳转活动页面 ****
-		if (options.scene != null) {
-			app.globalData.introducer = options.scene //记录介绍人手机号
-			//判断活动
-			util.getData('/getPromotionDC').then(res=>{
-				if (res !== null && res !== '') {
-					wx.navigateTo({
-						url: '/pages/dcpromotion/dcpromotion?phone=' + options.scene
-					})
-				}
-			})
-		}
 		that.setData({
 			navH: app.globalData.navHeight
 		})
 	},
-	opencomment(e) {
-		// console.log(e)
-		if (e.currentTarget.dataset.index == this.data.plindex) {
-			this.setData({
-				plindex: '-1'
-			})
-		} else {
-			this.setData({
-				plindex: e.currentTarget.dataset.index
-			})
-		}
-	},
 	//点击轮播图
 	BhrefPm: function(e) {
 		var index = e.currentTarget.dataset.index;
@@ -308,38 +98,13 @@ Page({
 				})
 			}
 		}
-
-	},
-	//优品推荐
-	hrefEq: function(e) {
-		wx.navigateTo({
-			url: '/pages/equipment/equipment'
-		})
-	},
-	//领礼
-	hrefJP: function(e) {
-		wx.navigateTo({
-			url: '/pages/promotion/promotionoffline/promotionoffline'
-		})
 	},
 	onShareAppMessage: function() {
 		return {
-			title: '随时随地 月嫂+',
+			title: '科技强国梦 编程向未来',
 			path: '/pages/index/index?id=888'
 		}
 	},
-	//更多评论
-	toevaluate() {
-		wx.navigateTo({
-			url: "/pages/index/evaluate/evaluate"
-		})
-	},
-	//更多门店
-	tomoreshop() {
-		wx.navigateTo({
-			url: "/pages/index/moreshop/moreshop"
-		})
-	},
 	// map
 	markertap: function(e) {
 		wx.getLocation({
@@ -354,9 +119,6 @@ Page({
 					address: e.currentTarget.dataset.address, //打开后显示的地址汉字
 					scale: 17
 				})
-			},
-			fail() {
-				app.timeOut()
 			}
 		})
 	},

pages/index/index.json

@@ -1,7 +1,6 @@
 {
 	"backgroundTextStyle":"dark",
 	"usingComponents": {
-    "navbar": "/components/navBar/navBar",
     "tabbar": "/components/tabBar/tabBar"
   }
 }

pages/index/index.wxml

@@ -1,25 +1,8 @@
-<!--index.wxml-->
-<view id="id" class="ball">
-	<view class='view-page'>
-		<navbar page-name="悦所"></navbar>
-		<view class='page-content' style='height:calc(100vh - {{navH}}px)'>
-			<!-- <view wx:if="{{isSetstatus}}">
-				<view class="home_title">
-					<image class="headmask" src="https://yuesuo.yueguanjia.com/MiniProgram/images/mask.png"></image>
-					<image class="headimg" wx:if="{{wc_type}}='B01'" src="https://yuesuo.yueguanjia.com/MiniProgram/images/parenting.png"></image>
-					<image class="headimg" wx:else src="https://yuesuo.yueguanjia.com/MiniProgram/images/pregnancy.png"></image>
-				</view>
-				<view class="hide_title" wx:if="{{pushCont.wc_type=='B01'}}">宝宝出生第 <span>{{pushCont.wc_showtime}}</span>
-					{{pushCont.wct_frequency}}</view>
-				<view class="hide_title" wx:if="{{pushCont.wc_type=='P01'}}">孕期第 <span>{{pushCont.wc_showtime}}</span>
-					{{pushCont.wct_frequency}}</view>
-				<view class="textList" animation="{{showAnimation}}">
-					<view class="list">
-						<rich-text wx:if="{{pushCont.wc_content}}" class="text" nodes="{{pushCont.wc_content}}"></rich-text>
-						<view wx:else><image class="icon" src="https://yuesuo.yueguanjia.com/MiniProgram/images/rightHome.png"></image>悦所—悦管家旗下直营母婴服务品牌，我们致力于为妈妈提供科学的孕产育解决方案，为宝宝进行科学式黄金期育儿成长关怀。</view>
-					</view>
-				</view>
-			</view> -->
+
+<view>
+	<view class="container">
+		<view class="view-page ">
+			<navbar page-name="个人中心" none="true"></navbar>
 			<swiper class="swiper" indicator-dots="true" indicator-color="#B5B5B5" indicator-active-color="#6D6D6D" autoplay="true"
 			 interval="5000" duration="{{duration}}">
 				<block wx:for="{{arr}}" wx:key="index">
@@ -29,100 +12,89 @@
 					</swiper-item>
 				</block>
 			</swiper>
-			<!-- <view class="home-function-box">
-				<view class="select-nurse" bindtap="tomonthmama" style="background-image: url(https://yuesuo.yueguanjia.com/MiniProgram/images/ysHome.png);">
-					<span>选月嫂</span>
+		<view class = "cont">
+			<view class = "colum-logo-temp"></view>
+			<view class = "colum-logo">logo</view>
+			<view class = "colum-hot-temp"></view>
+			<view class = "colum-hot">
+				<view class = "hot-box">
+					<view class = "hot-title-temp"></view>
+					<view class = "hot-title">一级标题</view>
+					<view class = "hot-cont-temp"></view>
+					<view class = "hot-cont">十级四阶段</view>
 				</view>
-				<view class="product-recommend" bindtap="hrefEq" style="background-image: url(https://yuesuo.yueguanjia.com/MiniProgram/images/superiorproduct.png);">
-					<span>优品推荐</span>
+				<view class = "hot-box-temp"></view>
+				<view class = "hot-box">
+					<view class = "hot-title-temp"></view>
+					<view class = "hot-title">一级标题</view>
+					<view class = "hot-cont-temp"></view>
+					<view class = "hot-cont">十级四阶段</view>
 				</view>
-			</view> -->
-			<view class="traffic">
-				<view class="title">门店交通<view class="lookmore" bindtap="tomoreshop">更多门店<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/tomore.png"></image>
-					</view>
-				</view>
-
-				<view class="traffic-list">
-					<block wx:for="{{trafficList}}" wx:key="index">
+			</view>
+			<view class = "colum-hot-temp"></view>
+			<view class = "tips-box">
+				<view class = "tips-icon">111</view>
+				<view class = "tips-cont">双11XXXXXXXXXXXXXX</view>
+			</view>
+			<view class = "lang-img">……</view>
+			<view class = "colum-hot-temp"></view>
+			<view class = "recommend"></view>
+			<view class = "colum-hot-temp"></view>
+			<view class = "colum-hot-temp"></view>
+			<view class = "hot-title">优秀师资</view>
+				<scroll-view scroll-x="true" > 
+				<view class="uploadWrap"> 
+				<block wx:for="{{mktarr}}" wx:key="index">
+					<!--bindtap="markertap" -->
+					<view class="upload_Item" 
+					data-name = '{{mktarr[index].mi_mktname}}' 
+					data-address = '{{mktarr[index].mi_mktaddress}}' 
+					data-latitude = '{{mktarr[index].mi_latitude}}' 
+					data-longitude = '{{mktarr[index].mi_longitude}}'> 
+					<image class="upload_Item_img" src="{{mktarr[index].mi_mkturl}}"></image> 
+					<view class = 'mktinfoBox'>
 						<view>
-							<view class="name">
-								{{item.mi_mktname}}
-							</view>
-							<view class="address ys-ellipsis">{{item.mi_mktaddress}}</view>
-						</view>
-						<view class="weizhi_icon" bindtap="markertap" data-name='{{item.mi_mktname}}' data-address='{{item.mi_mktaddress}}'
-						 data-latitude='{{item.mi_latitude}}' data-longitude='{{item.mi_longitude}}'>
-							<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/weizhi.png"></image>
+							<view class = "mktname">{{mktarr[index].mi_mktname}}</view>
 						</view>
-					</block>
-				</view>
-			</view>
-			<view class="view-evaluate">
-				<view class="title">看点评<view class="lookmore" bindtap="toevaluate">更多评论<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/tomore.png"></image>
+						<view class = "mktadd">{{mktarr[index].mi_mktaddress}}</view>
 					</view>
+				</view> 
+				<view class = "viewright" wx:if="{{index == mktarr.length -1}}"></view>
+				</block>
+				</view> 
+				</scroll-view> 
+				<view class = "colum-hot-temp"></view>
+				<view class = "colum-hot-temp"></view>
+				<view class = "hot-title">查找校区</view>
+				<view class = "colum-hot-temp"></view>
+				<view class = "campus-box"></view>
+					<!--bindtap="markertap" -->
+					<view class="campus_Item" 
+					data-name = '{{mktarr[0].mi_mktname}}' 
+					data-address = '{{mktarr[0].mi_mktaddress}}' 
+					data-latitude = '{{mktarr[0].mi_latitude}}' 
+					data-longitude = '{{mktarr[0].mi_longitude}}'> 
+					<view class="mkt-img-box">
+				<scroll-view scroll-x="true" > 
+				<view class="mktWrap"> 
+				<block wx:for="{{mktarr}}" wx:key="index">
+					<!--bindtap="markertap" -->
+					<view class="mkt-img" 
+					data-name = '{{mktarr[0].mi_mktname}}' 
+					data-address = '{{mktarr[0].mi_mktaddress}}' 
+					data-latitude = '{{mktarr[0].mi_latitude}}' 
+					data-longitude = '{{mktarr[0].mi_longitude}}'> 
+					<image class="campus_Item_img" src="{{mktarr[0].mi_mkturl}}"></image> 
+				</view> 
+				<view class = "viewright" wx:if="{{index == mktarr.length -1}}"></view>
+				</block>
 				</view>
-				<view class="content">
-					<block wx:for="{{evaluateList}}" wx:key="index">
-						<view class="cont">
-							<view class="evaluate_name">{{item.wd_username}}</view>
-							<view class="evaluate_date">{{item.wd_date}}</view>
-							<view class="evaluate_score">打分
-								<view class="light">
-									<image wx:for="{{item.wd_result}}" wx:key="index" src="https://yuesuo.yueguanjia.com/MiniProgram/images/lightstar.png"></image>
-								</view>
-								<view class="grey">
-									<image wx:for="{{5}}" wx:key="index" src="https://yuesuo.yueguanjia.com/MiniProgram/images/greystar.png"></image>
-								</view>
-							</view>
-							<view class="evaluate_txt {{plindex==index?'heightauto':''}}">
-								<rich-text nodes="{{item.wd_comment}}"></rich-text>
-							</view>
-							<view  wx:if="{{plindex!==index}}" class="allarticle" bindtap='opencomment' data-index='{{index}}'>全文</view>
-							<view class="evaluate_imgs">
-								<image mode="aspectFill" wx:for="{{item.dianPingImages}}" wx:key="dianPingImageIndex" wx:for-item="dianPingImage"
-								 wx:for-index="dianPingImageIndex" src="{{dianPingImage.wdi_image_path}}" bindtap="showmask" data-index="{{index}}"
-								 data-image-index="{{dianPingImageIndex}}"></image>
-							</view>
-						</view>
-					</block>
-					<view class="seemore" bindtap="toevaluate">查看更多评论<image src="https://yuesuo.yueguanjia.com/MiniProgram/images/tomore.png"></image>
-					</view>
+				</scroll-view> 
 				</view>
+				</view> 
 			</view>
-			<view class="">
-
-			</view>
-			<view class='fx-zx' animation="{{animationData}}">
-				<button open-type="contact" plain="true">
-					<image src='https://yuesuo.yueguanjia.com/MiniProgram/images/kf.png'></image>
-				</button>
-			</view>
-			<block wx:if="{{pmshow}}">
-				<view class="pm_ofl" bindtap="hrefJP">
-					<view class="pm_ofl_img">
-						<image class="pm_img" src="https://yuesuo.yueguanjia.com/MiniProgram/jp.png"></image>
-					</view>
-					<view class="pm_ofl_txt">
-						<span class="pm_txt">领礼</span>
-					</view>
-				</view>
-			</block>
-			<block wx:for="{{evaluateListNew}}" wx:key="index">
-				<view class="cont">
-					<view class="openImg" bindtap="hidemask" wx:if="{{showmask}}">
-						<swiper current="{{bigimagecurrent}}">
-							<block wx:for="{{item.dianPingImages}}" wx:key="dianPingImageIndexBig" wx:for-index="dianPingImageIndexBig"
-							 wx:for-item="dianPingImageBig">
-								<swiper-item>
-									<image mode="widthFix"  src="{{dianPingImageBig.wdi_image_path}}" class="slide-image"  />
-								</swiper-item>
-							</block>
-						</swiper>
-					</view>
-				</view>
-			</block>
-		</view>
-
-    <tabbar _tabBarInd="{{0}}"></tabbar>
+			<view class="endbottomm"></view>
+		<tabbar _tabBarInd="{{0}}"></tabbar>
+	</view>
 	</view>
 </view>

pages/index/index.wxss

@@ -1,99 +1,4 @@
-/**index.wxss**/
-page {
-	background-color: #ffffff;
-}
-
-.load {
-	width: 100%;
-	height: 2400rpx;
-	position: absolute;
-	left: 0;
-	top: 0;
-	z-index: 9999;
-	background-color: #ffffff;
-	text-align: center;
-	line-height: 1300rpx;
-}
-
-.loadimg {
-	width: 200rpx;
-	height: 200rpx;
-}
-
-.fx-zx {
-	position: fixed;
-	width: 141rpx;
-	height: 96rpx;
-	right: -6rpx;
-	bottom: 160rpx;
-	z-index: 2;
-	background-size: 100%;
-}
-
-.fx-zx button {
-	width: 94rpx;
-	height: 94rpx;
-	border: none;
-	padding: 0;
-}
-
-.fx-zx image {
-	width: 94rpx;
-	height: 94rpx;
-}
-
-.pm_ofl {
-	background-color: #ffffff;
-	position: fixed;
-	width: 130rpx;
-	height: 66rpx;
-	right: 0rpx;
-	z-index: 2;
-	background-size: 100%;
-	border-width: 3rpx;
-	border-color: #E0E0E0;
-	border-style: solid;
-	bottom: 260rpx;
-	border-radius: 40rpx 0rpx 0rpx 40rpx;
-	display: flex;
-	box-shadow: 1rpx 1rpx 1rpx 1rpx #E0E0E0;
-}
-
-.pm_ofl_img {
-	flex: 27;
-	text-align: right;
-	line-height: 72rpx;
-}
-
-.pm_ofl_txt {
-	flex: 40;
-	text-align: center;
-	line-height: 63rpx;
-}
-
-.pm_img {
-	width: 32rpx;
-	height: 32rpx;
-}
-
-.pm_txt {
-	font-size: 28rpx;
-	font-weight: 400;
-	color: #414141;
-}
-
-
-
-
-page {
-	height: 100%;
-	position: relative;
-	overflow: hidden;
-	box-sizing: border-box;
-}
-
 .view-page {
-	height: 100%;
 	width: 100%;
 	left: 0;
 	top: 0;
@@ -101,365 +6,200 @@ page {
 	position: absolute;
 	overflow: hidden;
 }
-
-.page-content {
-	box-sizing: border-box;
-	position: relative;
-	overflow-y: auto;
-	padding-bottom: 160rpx;
-}
-
-
-.home_title {
-	position: relative;
-	height: 74rpx;
-}
-
-.home_title .headmask {
-	height: 74rpx;
-	width: 100%;
-
-}
-
-.home_title .headimg {
-	height: 152rpx;
-	width: 152rpx;
-	position: absolute;
-	top: 0;
-	left: 50%;
-	transform: translate(-50%);
-	border: 2rpx solid #00C7C6;
-	border-radius: 50%;
-	z-index: 10;
-	background: #FFFFFF;
-}
-
-.hide_title {
-	color: #000000;
-	font-size: 36rpx;
-	text-align: center;
-	margin-top: 120rpx;
-}
-
-.hide_title span {
-	font-size: 60rpx;
-	line-height: 60rpx;
-	color: #00C7C6;
-	font-weight: 500;
-}
-
-.textList {
-	height: 0;
-	overflow: hidden;
-	padding: 0 60rpx;
-	color: #484848;
-	line-height: 44rpx;
-}
-
-.textList .list {
-	display: flex;
-	margin-bottom: 16rpx;
-}
-
-.textList .list:first-child {
-	margin-top: 28rpx;
-}
-
-.textList .list:last-child {
-	margin-bottom: 10rpx;
-}
-
-.textList .list .icon {
-	height: 28rpx;
-	line-height: 28rpx;
-	width: 28rpx;
-	vertical-align: middle;
-	margin-right: 16rpx;
-
-}
-
-.textList .list .img {
-	display: inline-block;
-	/* width: 10%; */
-	flex: auto;
-}
-
-.textList .list .text {
-	flex: auto;
-	display: inline-block;
-	/* width: 90%; */
-}
-
 .swiper {
 	width: 100%;
-	padding: 0 32rpx;
+	padding: 0 32rpx 0 32rpx;
 	box-sizing: border-box;
-	height: 360rpx;
-	border-radius: 20rpx;
-	margin-top: 32rpx;
+	height: 532rpx;
 }
-
 .slide-image {
-	border-radius: 20rpx;
-	/* height: 360rpx; */
+	height: 532rpx !important;
 	width: 100%;
 }
-
-.home-function-box {
-	display: flex;
-	margin: 56rpx 32rpx;
-	justify-content: space-between;
-
-}
-
-.home-function-box span {
-	position: absolute;
-	top: 40rpx;
-	left: 36rpx;
-	color: #000000;
-	font-weight: 500;
-	font-size: 36rpx;
-}
-
-.select-nurse {
-	position: relative;
-	width: 328rpx;
-	height: 200rpx;
-	background: rgba(255, 255, 255, 1);
-	box-shadow: 0px 0px 7px 0px rgba(186, 186, 186, 0.5);
-	border-radius: 20rpx;
-	background-size: contain;
-	background-repeat: no-repeat;
-}
-
-.product-recommend {
-	position: relative;
-	width: 328rpx;
-	height: 200rpx;
-	background: rgba(255, 255, 255, 1);
-	box-shadow: 0px 0px 7px 0px rgba(186, 186, 186, 0.5);
-	border-radius: 20rpx;
-	background-size: contain;
-	background-repeat: no-repeat;
-}
-
-/* 门店 */
-.traffic {
-	padding: 0 32rpx;
-	box-sizing: border-box;
-	position: relative;
-}
-
-.traffic .title {
-	line-height: 48rpx;
-	font-size: 48rpx;
-	font-weight: 500;
-	color: #000000;
-	position: relative;
-	margin: 32rpx 0;
+.cont {
+	width: 100%;
+	background-color: #F2F2F6;
+	border-radius: 36rpx 36rpx 0 0;
+	flex-direction: column;
+	height: 100%;
 }
-
-.traffic .title .lookmore {
-	text-align: right;
-	font-size: 28rpx;
-	color: #484848;
-	position: absolute;
-	bottom: 0;
-	right: 0;
+.colum-logo-temp {
+	height: 58rpx;
 }
-
-.traffic .lookmore image {
-	height: 28rpx;
-	width: 28rpx;
-	vertical-align: middle;
+.colum-logo {
+	height: 64rpx;
+	margin: 0 32rpx 0 32rpx;
+	background-color: blue;
 }
-
-.traffic-list {
-	height: 200rpx;
-	box-shadow: 0px 0px 7px 0px rgba(186, 186, 186, 0.5);
-	border-radius: 20rpx;
-	padding-left: 40rpx;
-	position: relative;
-}
-
-.traffic-list .name {
-	margin: 0 0 16rpx;
-	padding-top: 56rpx;
-	font-size: 36rpx;
-	line-height: 36rpx;
-	color: #000000;
-	font-weight: 500;
+.colum-hot-temp {
+	height: 24rpx;
 }
-
-.traffic-list .address {
-	color: #BABABA;
-	line-height: 28rpx;
-	width: 60%;
+.colum-hot {
+	height: 208rpx;
+	margin: 0 32rpx 0 32rpx;
+	border-radius: 36rpx;
+	display: flex;
 }
-
-.traffic-list .weizhi_icon {
-	position: absolute;
-	top: 54rpx;
-	right: 88rpx;
+.hot-box-temp {
+	width: 24rpx;
 }
-
-.traffic-list .weizhi_icon image {
-	width: 96rpx;
-	height: 96rpx;
+.hot-box {
+	height: 208rpx;
+	width: 332rpx;
+	border-radius: 32rpx;
+	background-color: white;
+	box-shadow:0rpx 9rpx 18rpx 0rpx rgba(229,229,234,0.56);
 }
-
-/* 看点评 */
-.view-evaluate {
-	margin-top: 56rpx;
-	padding: 0 32rpx;
+.hot-title-temp {
+	height: 32rpx;
 }
-
-.view-evaluate .title {
-	line-height: 48rpx;
-	font-size: 48rpx;
-	font-weight: 500;
+.hot-title {
+	margin-left: 32rpx;
 	color: #000000;
-	position: relative;
-	margin-bottom: 72rpx;
-}
-
-.view-evaluate .title .lookmore {
-	text-align: right;
-	font-size: 28rpx;
-	color: #484848;
-	position: absolute;
-	bottom: 0;
-	right: 0;
-}
-
-.view-evaluate .lookmore image {
-	height: 28rpx;
-	width: 28rpx;
-	vertical-align: middle;
-}
-
-.view-evaluate .seemore {
-	text-align: center;
-	color: #484848;
-	line-height: 28rpx;
-	margin-bottom: 56rpx;
-}
-
-.view-evaluate .seemore image {
-	height: 28rpx;
-	width: 28rpx;
-	vertical-align: middle;
-}
-
-.view-evaluate .content {
-	padding: 0 40rpx;
-}
-
-.view-evaluate .content .cont {}
-
-.view-evaluate .evaluate_name {
 	font-size: 36rpx;
-	font-weight: 500;
-	color: #484848;
-	line-height: 36rpx;
+	font-weight: 900;
 }
-
-.view-evaluate .evaluate_date {
-	font-size: 24rpx;
-	color: #8C8C8C;
-	line-height: 24rpx;
-	margin: 8rpx 0 16rpx;
+.hot-cont-temp {
+	height: 16rpx;
 }
-
-.view-evaluate .evaluate_score {
-	font-size: 24rpx;
+.hot-cont {
+	margin-left: 32rpx;
 	font-weight: 500;
-	color: #484848;
-	line-height: 24rpx;
-	height: 24rpx;
-	position: relative;
-
-}
-
-.view-evaluate .evaluate_score>view {
-	position: absolute;
-	left: 60rpx;
-	top: 0;
-}
-
-.view-evaluate .evaluate_score .light {
-	z-index: 3;
-}
-
-.view-evaluate .evaluate_score .grey {
-	z-index: 2;
-}
-
-.view-evaluate .evaluate_score image {
-
-	margin-right: 4rpx;
-	width: 24rpx;
-	height: 24rpx;
-	vertical-align: bottom;
-}
-
-
-
-.view-evaluate .evaluate_txt {
-	font-size: 28rpx;
-	font-weight: 400;
-	color: #484848;
-	line-height: 42rpx;
-	margin: 24rpx 0;
-	height: 116rpx;
-	overflow: hidden;
-}
-.allarticle{
-	color: #00C7C6;
-}
-.view-evaluate .heightauto {
-	height: auto;
-}
-.view-evaluate .evaluate_imgs {
+	font-size: 24rpx;
+	color: #ff6106;
+} 
+.tips-box {
+	margin-left: 32rpx;
+	height: 72rpx;
+	width: 686rpx;
+	border-radius: 32rpx;
+	background-color: white;
+	box-shadow:0rpx 9rpx 18rpx 0rpx rgba(229,229,234,0.56);
 	display: flex;
-	justify-content: space-between;
-	margin-bottom: 40rpx;
-	flex-wrap: wrap;
-}
-
-.view-evaluate .evaluate_imgs:after {
-	width: 192rpx;
-	height: 0;
-	display: block;
-	content: '';
 }
-
-.view-evaluate .evaluate_imgs image {
-	width: 192rpx;
-	height: 192rpx;
-	/* background: #00C7C6; */
+.tips-icon {
+	margin-left: 6rpx;
+	line-height: 72rpx;
 }
-
-.openImg {
-	position: fixed;
-	top: 0;
-	left: 0;
-	height: 100%;
-	width: 750rpx;
-	z-index: 99;
-	background: rgba(0, 0, 0, 0.5);
-	display: flex;
-	align-items: center;
+.tips-cont {
+	margin-left: 20rpx;
+	font-size: 24rpx;
+	color: #000;
+	text-align: left;
+	font-weight: 500;
+	line-height: 72rpx;
 }
-
-.openImg swiper {
+.lang-img {
 	width: 100%;
-	height: 100%;
-}
-
-.openImg .slide-image {
-	border-radius: 0;
-	position: absolute;
-	top: 50%;
-	transform: translateY(-50%);
+	text-align: center;
+	height: 200rpx;
+	line-height: 200rpx;
+}
+.recommend {
+	width: 686rpx;
+	height: 290rpx;
+	border-radius: 32rpx;
+	background-color: rgb(161, 52, 52);
+	margin-left: 32rpx;
+}
+.viewright{ 
+  width: 8rpx; 
+  height: 372rpx; 
+} 
+.uploadWrap{
+	margin-top:32rpx;
+	margin-left: 32rpx;
+  height:400rpx; 
+  width:100%; 
+  display: flex; 
+  display: -webkit-box; 
+  flex-direction: column;
+} 
+.upload_Item{ 
+	width: 310rpx; 
+	height: 372rpx; 
+	margin-right: 24rpx;
+} 
+.upload_Item_img{ 
+  width: 310rpx; 
+  height: 206rpx;
+  border-radius: 30rpx 30rpx 0rpx 0rpx;
+}
+.mktinfoBox {
+  margin-top: -6rpx;
+  display: flex;
+  flex-direction: column;
+  width: 310rpx;
+  height: 166rpx;
+  border-radius: 0rpx 0rpx 30rpx 30rpx;
+  background:rgba(255,255,255,1);
+}
+.mktname {
+  font-size: 28rpx;
+  margin-left: 18rpx;
+  margin-right: 18rpx;
+  font-weight: 500;
+  color: #000000;
+  margin-top: 18rpx;
+}
+.mktadd {
+  margin-right: 18rpx;
+  margin-left: 18rpx;
+  margin-top: 2rpx;
+  font-size: 20rpx;
+  font-weight: Light;
+  color: #8C8C8C;
+  justify-content: space-between;
+}
+scroll-view-teacher {
+  height: 480rpx;
+}
+.mktaddactive {
+  margin-top: 2rpx;
+  font-size: 20rpx;
+  font-weight: 500;
+  color: #20BAA5;
+}
+.campus-box {
+	width: 686rpx;
+	height: 450rpx;
+	border-color: #999999;
+	border-style: solid;
+	border-width: 4rpx;
+	border-radius: 32rpx;
+	margin-left: 32rpx;
+}
+.campus_Item {
+	width: 686rpx; 
+	height: 162rpx; 
+	margin-left: 32rpx;
+	background-color: white;
+	border-radius: 32rpx 32rpx 0rpx  0rpx ;
+	box-shadow:0rpx 18rpx 36rpx 0rpx rgba(229,229,234,0.56);
+	margin-top: -15rpx;
+}
+.campus_Item_img {
+	width: 172rpx; 
+  height: 112rpx;
+	border-radius: 24rpx;
+	border-color: #ff6160;
+	border-style: solid;
+	border-width: 4rpx;
+}
+.mkt-img{ 
+	width: 172rpx; 
+	height: 121rpx; 
+	margin-right: 20rpx;
+} 
+.mkt-img-box {
+	padding-top: 32rpx;
+	height: 121rpx;
+}
+.mktWrap {
+	margin-left: 32rpx;
+  height:250rpx; 
+  width:100%; 
+  display: flex; 
+  display: -webkit-box; 
+  flex-direction: column;
 }

pages/packages/packages.js

@@ -9,13 +9,6 @@ Page({
 		_this.setData({
 			navH: app.globalData.navHeight
 		})
-		util.getData('/getPackageTypes').then(res => {
-			console.log(res)
-			_this.setData({
-				list: res
-			})
-		})
-
 
 	},
 	gotolist: function(e) {

pages/packages/packages.wxss

@@ -5,10 +5,11 @@ page {
 .packages{
 	
 }
-.pkgimg{
+.tttt{
 	width: 750rpx;
 	height: 336rpx;
-	position: relative;
+	background-color: violet;
+	margin-top:100rpx;
 }
 .pkgimg image{
 	bottom: 0;

project.config.json

@@ -1,59 +1,62 @@
 {
-	"description": "项目配置文件。",
-	"packOptions": {
-		"ignore": []
-	},
-	"setting": {
-		"urlCheck": true,
-		"es6": true,
-		"postcss": true,
-		"minified": true,
-		"newFeature": true,
-		"coverView": true,
-		"nodeModules": false,
-		"autoAudits": false,
-		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		},
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
-	},
-	"compileType": "miniprogram",
-	"appid": "wx8d586322aa9981c1",
-	"projectname": "tyOutlets",
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"plugin": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"currentL": -1,
-			"list": []
-		},
-		"gamePlugin": {
-			"current": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": -1,
-			"list": []
-		}
-	}
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "minified": true,
+    "newFeature": true,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": false,
+    "uploadWithSourceMap": true,
+    "useMultiFrameRuntime": false,
+    "useApiHook": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true
+  },
+  "compileType": "miniprogram",
+  "appid": "wxb1b4d24100ab2b6d",
+  "projectname": "tyOutlets",
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "libVersion": "2.13.1",
+  "condition": {
+    "search": {
+      "list": []
+    },
+    "conversation": {
+      "list": []
+    },
+    "plugin": {
+      "list": []
+    },
+    "game": {
+      "currentL": -1,
+      "list": []
+    },
+    "gamePlugin": {
+      "list": []
+    },
+    "miniprogram": {
+      "list": []
+    }
+  }
 }

utils/util.js

@@ -17,7 +17,6 @@ let app = getApp();
 
 //返回首页
 function goHome(back = false) {
-	// const URL = "/pages/supermama/supermama";
   const URL = "/pages/yuesuo/yuesuo"
 	if (back) {
 		wx.navigateTo({