From bb1d32a20cb770b0c84a72b6afef8bfef75a54da Mon Sep 17 00:00:00 2001
From: ld0104 <3037885725@qq.com>
Date: Thu, 20 Oct 2022 19:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=BD=AE=E6=92=AD=E5=9B=BE=EF=BC=8C?=
 =?UTF-8?q?=E5=B8=B8=E8=A7=81=E9=97=AE=E9=A2=98=EF=BC=8C=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E6=88=91=E4=BB=AC=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/public.js                                 |    2 +
 api/store.js                                  |   27 +-
 api/user.js                                   |   26 +
 pages/activity/activity/index.vue             |   22 +-
 pages/home/index.vue                          | 1867 +++++++++--------
 .../Evaluations/EvaluationDetail/index.vue    |   26 +-
 pages/shop/GoodsCollection/index.vue          |  738 ++++---
 pages/shop/brands/index.vue                   |   24 +-
 pages/user/AboutUs/index.vue                  |   21 +-
 pages/user/PersonalData/index.vue             |    3 +
 pages/user/Problem/index.vue                  |   84 +-
 pages/user/coupon/GetCoupon/index.vue         |   22 +-
 pages/user/signIn/Sign/index.vue              |    1 +
 13 files changed, 1582 insertions(+), 1281 deletions(-)

diff --git a/api/public.js b/api/public.js
index fe8d4b1..98a1139 100644
--- a/api/public.js
+++ b/api/public.js
@@ -17,6 +17,8 @@ export function getCanvas() {
   return request.get("/getCanvas?terminal=3", {}, { login: false });
 }
 
+
+
 /**
  * 热门榜单
  * @returns {*}
diff --git a/api/store.js b/api/store.js
index a9d2c5d..8469f78 100644
--- a/api/store.js
+++ b/api/store.js
@@ -1,4 +1,13 @@
 import request from "@/utils/request";
+/**
+ * 获取各类轮播图
+ * 
+ */
+export function getBanner(type) {
+  return request.get("/menu/banner/"+type,{}, { login: false });
+}
+
+
 
 /*
  * 商品分类
@@ -209,15 +218,15 @@ export function getBrands() {
 		login: false
 	});
 }
-/**
- * 添加收藏
- *
- */
-export function getUserCollection(data) {
-	console.log(9999999966);
-	return request.post("/collectEvaluation/add", data, {
-		login: true
-	});
+/**
+ * 添加收藏
+ *
+ */
+export function getUserCollection(data) {
+	console.log(9999999966);
+	return request.post("/collectEvaluation/add", data, {
+		login: true
+	});
 }
 /**
  * 
diff --git a/api/user.js b/api/user.js
index 32f4512..1e9644a 100644
--- a/api/user.js
+++ b/api/user.js
@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { dataFormat } from '../utils'
 
 /**
  * 省市区
@@ -195,6 +196,17 @@ export function getCollectUser(page, limit, type) {
     type,
   })
 }
+/**
+ *
+ * 获取评测收藏
+ */
+export function getCollectEvaluation(page, limit, type) {
+  return request.get('/collectEvaluation/user', {
+    page: page,
+    limit: limit,
+    type,
+  })
+}
 
 /*
  * 删除收藏产品
@@ -442,3 +454,17 @@ export function setDetection() {
 export function getRechargeApi() {
   return request.get('recharge/index')
 }
+
+/**
+ * 常见问题
+ */
+export function getProblem() {
+  return request.get('/menu/problem',{})
+}
+/**
+ * 关于我们
+ */
+export function getAboutUs() {
+  return request.get('/menu/aboutUs',{})
+}
+
diff --git a/pages/activity/activity/index.vue b/pages/activity/activity/index.vue
index 819de7f..9ff1eb2 100644
--- a/pages/activity/activity/index.vue
+++ b/pages/activity/activity/index.vue
@@ -15,7 +15,7 @@
 		
 		<view class="banner-box">
 			<swiper class="swiper" circular @change="swiperChange" :autoplay="true">
-				<swiper-item v-for="(item, index) in banner" :key="index" class="swiper-item">
+				<swiper-item v-for="(item, index) in banner" :key="index" class="swiper-item" @click="goBannerDetail">
 					<image class="swiper-image " :src="item" mode="aspectFill" lazy-load>
 					</image>
 				</swiper-item>
@@ -88,6 +88,7 @@
 </template>
 
 <script>
+	import { getBanner} from '@/api/store';
 	import { getSeckillConfig, getSeckillList, getCombinationList, getBargainList } from '@/api/activity';
 	import CountDown from '@/components/CountDown';
 	export default {
@@ -96,10 +97,7 @@
 		},
 		data() {
 			return {
-				banner: [
-					'http://video-zsw.qiniu.lotus-wallet.com/Banner1.png',
-					'http://video-zsw.qiniu.lotus-wallet.com/Banner1.png'
-				],
+				banner: [],
 				swiperCurrent: 0,
 				activityType: 0,
 				tabType: 0,
@@ -132,8 +130,22 @@
 			this.seckillInfo();
 			this.getGrouponList();
 			this.getBargainList();
+			
+			
+		},
+		onLoad() {
+			getBanner(3).then(
+				res => {
+					console.log(res,777777777777777777);
+				// this.$set(this,'banner',res.data.banner)
+				})
 		},
 		methods: {
+			goBannerDetail(item){
+				if (item.uniapp_url) {
+					this.$yrouter.push(item.uniapp_url)
+				}
+			},
 			swiperChange(e) {
 				this.swiperCurrent = e.detail.current;
 			},
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 9b59de1..e431cf0 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,30 +1,32 @@
 <template>
-  <view class="index">
+	<view class="index">
 		<view class="head_box" :class="navStyle?'active':''">
-		  <cu-custom :isBack="true" bgColor="''">
-		    <block slot="backText">
+			<cu-custom :isBack="true" bgColor="''">
+				<block slot="backText">
 					<view class="acea-row row-middle">
 						<!-- <text class="icon"></text> -->
 						<image v-if="navStyle" class="icon" src="../../static/images/earth-white.png"></image>
 						<image v-else class="icon" src="../../static/images/earth.png"></image>
-						<image v-if="navStyle" class="title-image" src="../../static/images/yanjie-logo-white.png"></image>
+						<image v-if="navStyle" class="title-image" src="../../static/images/yanjie-logo-white.png">
+						</image>
 						<text class="nav-title shopro-selector-rect" v-else>{{ '中国·武汉' }}</text>
 					</view>
-		    </block>
+				</block>
 				<block slot="right">
 					<view class="icon-box acea-row row-middle">
-						<image v-if="navStyle" src="../../static/images/search-white.png" @click="goGoodSearch()"></image>
-						<image v-else src="../../static/images/search.png"  @click="goGoodSearch()"></image>
+						<image v-if="navStyle" src="../../static/images/search-white.png" @click="goGoodSearch()">
+						</image>
+						<image v-else src="../../static/images/search.png" @click="goGoodSearch()"></image>
 						<!-- <image v-if="navStyle" src="../../static/images/scan-white.png" mode=""></image>
 						<image v-else src="../../static/images/scan.png" mode=""></image> -->
 					</view>
 				</block>
-		  </cu-custom>
+			</cu-custom>
 		</view>
 		<Banner :detail="info.banner"></Banner>
 		<!-- <Banner :detail="homeData[2].componentContent.bannerData"></Banner> -->
 		<!-- <Banner :detail="homeData[2].componentContent.bannerData" @getbgcolor="getbgcolor"></Banner>  v-if="index < 5"-->
-		
+
 		<view class="content-box">
 			<view class="menus-box acea-row row-between">
 				<view class="item" v-for="(item, index) in info.menus" :key="index" @tap="goRoll(item)">
@@ -48,9 +50,10 @@
 				<view class="selections">
 					<scroll-view scroll-x="true" class="scroll">
 						<view class="item-box">
-							<view class="" v-for="(item,index) in info.evaluationList" :key="index" @click="goEvaluationDetail(item)">
+							<view class="" v-for="(item,index) in info.evaluationList" :key="index"
+								@click="goEvaluationDetail(item)">
 								<view class="item">
-								<!-- <view :class="'item ' + (index%2 == 0?'':'black')"> -->
+									<!-- <view :class="'item ' + (index%2 == 0?'':'black')"> -->
 									<image :src="item.homeImage" mode="aspectFill"></image>
 								</view>
 							</view>
@@ -58,21 +61,25 @@
 					</scroll-view>
 				</view>
 			</view>
-			
+
 			<view class="tab-box">
 				<view class="scroll-box">
 					<swiper :previous-margin="'32rpx'" :current="tabType" @change="changeCurrent">
-						<swiper-item :class="'title-box ' + (tabType?'':'on')" :style="tabType?'transform: translate(75%, 0px) translateZ(0px) !important;':'transform: translate(0%, 0px) translateZ(0px) !important;'" @click="changeTab(0)">
+						<swiper-item :class="'title-box ' + (tabType?'':'on')"
+							:style="tabType?'transform: translate(75%, 0px) translateZ(0px) !important;':'transform: translate(0%, 0px) translateZ(0px) !important;'"
+							@click="changeTab(0)">
 							<view class="tip">{{tabType?'':'PICK FOR YOU'}}</view>
 							<view class="title">推荐好物</view>
 						</swiper-item>
-						<swiper-item :class="'title-box ' + (tabType?'on':'')" :style="!tabType?'transform: translate(151%, 0px) translateZ(0px) !important;':'transform: translate(79%, 0px) translateZ(0px) !important;'" @click="changeTab(1)">
+						<swiper-item :class="'title-box ' + (tabType?'on':'')"
+							:style="!tabType?'transform: translate(151%, 0px) translateZ(0px) !important;':'transform: translate(79%, 0px) translateZ(0px) !important;'"
+							@click="changeTab(1)">
 							<view class="tip">{{tabType?'HOT LIST':''}}</view>
 							<view class="title">热门榜单</view>
 						</swiper-item>
 					</swiper>
 				</view>
-				
+
 				<view class="tab-line-box acea-row">
 					<view class="tab-line" @click="changeTab(0)">
 						<view :class="'active ' + (tabType?'':'on')"></view>
@@ -82,7 +89,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<view class="list-box">
 				<swiper :current="tabType" @change="changeListCurrent" :style="'height:'+swiperHeight+'px;'">
 					<swiper-item>
@@ -90,15 +97,16 @@
 						<!-- 为您推荐 推荐好物 benefit v-show="!tabType" -->
 						<!-- <PromotionGood :benefit="bastList" /> -->
 						<view class="goods-list acea-row row-between">
-						  <view class="goods-item" v-for="(item, promotionGoodIndex) in bastList" :key="promotionGoodIndex" @tap="goGoodsCon(item)">
-						      <view class="img-box">
-						        <image class="img"  :src="item.image" lazy-load mode="aspectFill"></image>
-						      </view>
-						      <view class="name more-t">{{ item.storeName }}</view>
-						      <view class="price-box">
-						          <view class="current">¥{{ item.price }}<text>¥{{item.otPrice}}</text></view>
-						      </view>
-						  </view>
+							<view class="goods-item" v-for="(item, promotionGoodIndex) in bastList"
+								:key="promotionGoodIndex" @tap="goGoodsCon(item)">
+								<view class="img-box">
+									<image class="img" :src="item.image" lazy-load mode="aspectFill"></image>
+								</view>
+								<view class="name more-t">{{ item.storeName }}</view>
+								<view class="price-box">
+									<view class="current">¥{{ item.price }}<text>¥{{item.otPrice}}</text></view>
+								</view>
+							</view>
 						</view>
 					</swiper-item>
 					<swiper-item>
@@ -106,10 +114,13 @@
 						<!-- <HotCommodity :detail="hotList" /> -->
 						<view class="hot-list">
 							<view class="classify-tab-box acea-row">
-								<view :class="'classify-item ' + (classifyType == index?'on':'')" v-for="(item,index) in hotList" :key="index" @click="changeClassify(index)">{{item.listName}}</view>
+								<view :class="'classify-item ' + (classifyType == index?'on':'')"
+									v-for="(item,index) in hotList" :key="index" @click="changeClassify(index)">
+									{{item.listName}}</view>
 							</view>
 							<view class="top-box">
-								<view class="top-item acea-row" v-for="(item,index) in topList" :key="index" @tap="goGoodsCon(item)">
+								<view class="top-item acea-row" v-for="(item,index) in topList" :key="index"
+									@tap="goGoodsCon(item)">
 									<view class="top-num-box">
 										<view class="">{{index+1}}</view>
 										<view class="tip">{{index===0?'ST':index===1?'ND':index===2?'RD':'TH'}}</view>
@@ -123,478 +134,495 @@
 								</view>
 							</view>
 							<view class="goods-list acea-row row-between" v-if="goodsList.length">
-								<view class="goods-item" v-for="(item, promotionGoodIndex) in goodsList" :key="promotionGoodIndex" @tap="goGoodsCon(item)">
-										<view class="img-box">
-											<image class="img"  :src="item.image" lazy-load mode="aspectFill"></image>
-										</view>
-										<view class="name more-t">{{ item.storeName }}</view>
-										<view class="price-box">
-												<view class="current">¥{{ item.price }}<text>¥{{item.otPrice}}</text></view>
-										</view>
+								<view class="goods-item" v-for="(item, promotionGoodIndex) in goodsList"
+									:key="promotionGoodIndex" @tap="goGoodsCon(item)">
+									<view class="img-box">
+										<image class="img" :src="item.image" lazy-load mode="aspectFill"></image>
+									</view>
+									<view class="name more-t">{{ item.storeName }}</view>
+									<view class="price-box">
+										<view class="current">¥{{ item.price }}<text>¥{{item.otPrice}}</text></view>
+									</view>
 								</view>
 							</view>
 						</view>
-						
+
 					</swiper-item>
 				</swiper>
 			</view>
-			
+
 		</view>
-    <!-- <view v-for="(item, index) in homeData" :key="index"> -->
-      <!-- <view class="head_box" v-if="item.type == 'header'" :style="{ background: bgcolor }" :class="{ active: bgcolor }">
+		<!-- <view v-for="(item, index) in homeData" :key="index"> -->
+		<!-- <view class="head_box" v-if="item.type == 'header'" :style="{ background: bgcolor }" :class="{ active: bgcolor }">
         <cu-custom :isBack="true" :bgColor="bgcolor">
           <block slot="backText">
             <text class="nav-title shopro-selector-rect">{{ item.componentContent.title }}</text>
           </block>
         </cu-custom>
       </view> -->
-      <!-- <view class="header header-search acea-row row-center-wrapper" v-if="item.type == 'search'" :style="{ background: bgcolor }">
+		<!-- <view class="header header-search acea-row row-center-wrapper" v-if="item.type == 'search'" :style="{ background: bgcolor }">
         <view @click="goGoodSearch()" class="search acea-row row-middle">
           <text class="iconfont icon-xiazai5"></text>
           搜索商品
         </view> -->
-        <!-- #ifndef H5 -->
-        <!-- <view class="qr" @click="startQr()" v-if="$deviceType !== 'weixin'">
+		<!-- #ifndef H5 -->
+		<!-- <view class="qr" @click="startQr()" v-if="$deviceType !== 'weixin'">
           <image :src="`${$VUE_APP_RESOURCES_URL}/images/qr.png`" />
         </view> -->
-        <!-- #endif -->
-      <!-- </view> -->
-      <!-- <Banner v-if="item.type == 'banner'"
+		<!-- #endif -->
+		<!-- </view> -->
+		<!-- <Banner v-if="item.type == 'banner'"
 	  :detail="item.componentContent.bannerData"
 	  @getbgcolor="getbgcolor"></Banner> -->
-      <!-- <uni-notice-bar
+		<!-- <uni-notice-bar
 	  v-if="item.type == 'noticeBar'"
 	  scrollable="true"
 	  @click="goRoll(item.componentContent.roll[0])"
 	  single="true" :speed="10"
 	  showIcon="true"
 	  :text="item.componentContent.roll[0].info"></uni-notice-bar> -->
-			<!-- 菜单 -->
-      <!-- <view class="content_box home_content_box"
+		<!-- 菜单 -->
+		<!-- <view class="content_box home_content_box"
 		v-if="item.type == 'menu' && item.componentContent.menus">
         <Menu :list="item.componentContent.menus"></Menu>
       </view> -->
-      <!-- 滚动新闻 -->
-      <!-- 广告 -->
-      <!-- <Adv v-if="item.type == 'adv' && item.componentContent.detail" :detail="item.componentContent.detail" /> -->
-      <!-- 热门榜单 -->
-      <!-- <HotCommodity v-if="item.type == 'hotCommodity'" :detail="likeInfo" /> -->
-      <!-- 超值拼团 -->
-      <!-- <Groupon v-if="item.type == 'groupon'" :detail="combinationList" /> -->
-      <!-- 首发新品->秒杀 -->
-      <!-- <FirstNewProduct v-if="item.type == 'firstNewProduct'" :detail="firstList" /> -->
-      <!-- 精品推荐 -->
-      <!-- <ProductsRecommended v-if="item.type == 'productsRecommended'" :detail="bastList" /> -->
-      <!-- 促销单品 -->
-      <!-- <PromoteProduct v-if="item.type == 'promoteProduct'" :detail="benefit" /> -->
-      <!-- 直播 -->
-      <!-- #ifdef MP-WEIXIN -->
-      <!-- <Live v-if="item.type == 'live'" :detail="live" /> -->
-      <!-- #endif -->
-      <!-- 为您推荐 -->
-      <!-- <PromotionGood v-if="item.type == 'promotionGood'" :benefit="benefit" /> -->
-      <!-- <Coupon-window :coupon-list="couponList" v-if="showCoupon" @checked="couponClose" @close="couponClose" /> -->
-    <!-- </view> -->
+		<!-- 滚动新闻 -->
+		<!-- 广告 -->
+		<!-- <Adv v-if="item.type == 'adv' && item.componentContent.detail" :detail="item.componentContent.detail" /> -->
+		<!-- 热门榜单 -->
+		<!-- <HotCommodity v-if="item.type == 'hotCommodity'" :detail="likeInfo" /> -->
+		<!-- 超值拼团 -->
+		<!-- <Groupon v-if="item.type == 'groupon'" :detail="combinationList" /> -->
+		<!-- 首发新品->秒杀 -->
+		<!-- <FirstNewProduct v-if="item.type == 'firstNewProduct'" :detail="firstList" /> -->
+		<!-- 精品推荐 -->
+		<!-- <ProductsRecommended v-if="item.type == 'productsRecommended'" :detail="bastList" /> -->
+		<!-- 促销单品 -->
+		<!-- <PromoteProduct v-if="item.type == 'promoteProduct'" :detail="benefit" /> -->
+		<!-- 直播 -->
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- <Live v-if="item.type == 'live'" :detail="live" /> -->
+		<!-- #endif -->
+		<!-- 为您推荐 -->
+		<!-- <PromotionGood v-if="item.type == 'promotionGood'" :benefit="benefit" /> -->
+		<!-- <Coupon-window :coupon-list="couponList" v-if="showCoupon" @checked="couponClose" @close="couponClose" /> -->
+		<!-- </view> -->
 		<Tabbar :pagePath="pagePath"></Tabbar>
 		<!-- #ifdef H5 -->
 		<view class="bottomSpace" style='line-height:100rpx'>正在使用H5方式浏览</view>
 		<!-- #endif -->
-  </view>
+	</view>
 </template>
 <script>
-import { mapState, mapMutations, mapActions } from 'vuex'
-// import GoodList from '@/components/GoodList'
-// import PromotionGood from '@/components/PromotionGood'
-// import CouponWindow from '@/components/CouponWindow'
-// import Menu from '@/components/Menu'
-// import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
-// import Adv from '@/components/sh-adv'
-// import Groupon from '@/components/sh-groupon.vue'
-
-import Banner from './components/Banner'
-// import HotCommodity from './components/HotCommodity'
-// import FirstNewProduct from './components/FirstNewProduct'
-// import ProductsRecommended from './components/ProductsRecommended'
-// import Live from './components/Live'
-import Tabbar from '@/components/Tabbar';
-
-import { getHomeData, getShare, getCanvas, getHotList } from '@/api/public'
-import cookie from '@/utils/store/cookie'
-import { isWeixin, handleUrlParam } from '@/utils/index'
-
-import { openShareAll } from '@/libs/wechat'
-
-const HAS_COUPON_WINDOW = 'has_coupon_window'
-
-export default {
-  name: 'Index',
-  components: {
-    // swiper,
-    // swiperSlide,
-    // UniNoticeBar,
-    // GoodList,
-    // PromotionGood,
-    // CouponWindow,
-    // Menu,
-    // Adv,
-    // Groupon,
-    Banner,
-    // HotCommodity,
-		Tabbar,
-    // FirstNewProduct,
-    // ProductsRecommended,
-    // Live,
-  },
-  props: {},
-  data: function() {
-    return {
-			pagePath: '',
-			navStyle: false,
-			tabType: 0,
-      homeData: [],
-      CustomBar: this.CustomBar,
-      StatusBar: this.StatusBar,
-      formatMenus: [],
-      categoryCurrent: 0,
-      menuNum: 4,
-      bgcolor: '',
-      bgColor: '',
-      swiperCurrent: 0, //轮播下标
-      webviewId: 0,
-      showCoupon: false,
-      logoUrl: '',
-      banner: [],
-      menus: [],
-      combinationList: [],
-      roll: [],
-      activity: [],
-      activityOne: {},
-      bastList: [],
-      firstList: [],
-      info: {
-        fastList: [],
-        bastBanner: [],
-
-        bastList: [],
-      },
-      likeInfo: [],
-      live: [],
-      lovely: [],
-      benefit: [],
-			hotList: [],
-			topList: [], // hotList 前五
-			goodsList: [], // hotList 除前五之外
-      couponList: [],
-      swiperOption: {
-        pagination: {
-          el: '.swiper-pagination',
-          clickable: true,
-        },
-        autoplay: {
-          disableOnInteraction: false,
-          delay: 2000,
-        },
-        loop: true,
-        speed: 1000,
-        observer: true,
-        observeParents: true,
-      },
-      swiperRoll: {
-        direction: 'vertical',
-        autoplay: {
-          disableOnInteraction: false,
-          delay: 2000,
-        },
-        loop: true,
-        speed: 1000,
-        observer: true,
-        observeParents: true,
-      },
-      swiperScroll: {
-        freeMode: true,
-        freeModeMomentum: false,
-        slidesPerView: 'auto',
-        observer: true,
-        observeParents: true,
-      },
-      swiperBoutique: {
-        pagination: {
-          el: '.swiper-pagination',
-          clickable: true,
-        },
-        autoplay: {
-          disableOnInteraction: false,
-          delay: 2000,
-        },
-        loop: true,
-        speed: 1000,
-        observer: true,
-        observeParents: true,
-      },
-      swiperProducts: {
-        freeMode: true,
-        freeModeMomentum: false,
-        slidesPerView: 'auto',
-        observer: true,
-        observeParents: true,
-      },
-      bgImage: '',
-			classifyType: 0, // 热门榜单分类
-			swiperHeight: 0,
-	  // indexTitle: false,
-    }
-  },
-  computed: {
-    singNew() {
-      return this.roll.length > 0 ? this.roll[0] : '你还没添加通知哦！'
-    },
-    customStyle() {
-      var bgImage = this.bgImage
-      // var style = `height:${this.CustomBar}px;padding-top:${0}px;background: ${this.bgcolor}`;
-      var style = `height:${this.CustomBar}px;padding-top:${this.StatusBar}px;background: ${this.bgcolor}`
-      if (this.bgImage) {
-        style = `${style}background-image:url(${bgImage});`
-      }
-      return style
-    },
-  },
-  onLoad() {
-		uni.hideTabBar();
-		let pages = getCurrentPages();
-		this.pagePath = '/' + pages[pages.length - 1].route;
-    this.getLocation()
-    uni.showLoading({
-      title: "加载中",
-    });
-  //   getCanvas()
-  //     .then(res => {
-		//   console.log('223',res)
-	 //  })
-  //     .catch(error => {
-		// if (!error) {
-		//   return
-		// }
-  //       this.homeData = JSON.parse(error.data.json)
-		// console.log('225',this.homeData)
-  //     })
-    getHomeData().then(res => {
-      this.logoUrl = res.data.logoUrl
-      // res.data.banner.forEach(item => (item.bgcolor = item.color || ''))
-	  // this.info = res.data.info
-	  // console.log('239', res.data)
-	  // console.log('239',this.info)
-      this.$set(this, 'info', res.data)
-      // this.$set(this, 'info', res.data.info)
-      this.$set(this, 'firstList', res.data.firstList)
-      this.$set(this, 'bastList', res.data.bastList)
-      this.$set(this, 'likeInfo', res.data.likeInfo)
-      this.$set(this, 'live', res.data.liveList)
-      this.$set(this, 'lovely', res.data.lovely)
-      this.$set(this, 'benefit', res.data.benefit)
-      this.$set(this, 'couponList', res.data.couponList)
-      this.$set(this, 'combinationList', res.data.combinationList)
-      uni.hideLoading()
-      this.setOpenShare();
-      // this.doColorThief()
-    }).then(() => {
-			let query = uni.createSelectorQuery();
-			query.select('.goods-list').boundingClientRect(rect => {
-				// console.log('rectrectrect239',rect)
-				this.swiperHeight = rect.height;
-			}).exec();
-		})
-		
-		getHotList().then(res => {
-			this.hotList = res.data;
-			this.goodsList = this.sortData(this.hotList[this.classifyType].productInfo, 4);
-		})
-  },
-	onPageScroll(e) {
-		if (e.scrollTop > 80) {
-			this.navStyle = true;
-		} else {
-			this.navStyle = false;
-		};
-	},
-  methods: {
-    ...mapActions(['getLocation']),
-    onShareTimeline: function() {
-      return {
-        title: this.miniHomeRemark,
-        imageUrl: this.miniHomeImg,
-        path: 'pages/home/index?spread=' + uni.getStorageSync('uid'),
-      }
-    },
-    onShareAppMessage: function() {
-      return {
-        title: this.miniHomeRemark,
-        imageUrl: this.miniHomeImg,
-        path: 'pages/home/index?spread=' + uni.getStorageSync('uid'),
-      }
-    },
-    goRoll(item) {
-      if (item.uniapp_url) {
-        this.$yrouter.push(item.uniapp_url)
-      }
-    },
-		changeCurrent(e) {
-			this.tabType = e.detail.current;
-		},
-		changeListCurrent(e) {
-			this.tabType = e.detail.current;
-			if(this.tabType == 1) {
-				let query = uni.createSelectorQuery();
-				query.select('.hot-list').boundingClientRect(rect => {
-					// console.log('rectrectrect239',rect)
-					if(this.swiperHeight >= rect.height) return;
-					if(this.swiperHeight != 0 && rect.height > this.swiperHeight) {
-						this.swiperHeight = rect.height;
-					}
-				}).exec();
-			}
+	import {
+		mapState,
+		mapMutations,
+		mapActions
+	} from 'vuex'
+	// import GoodList from '@/components/GoodList'
+	// import PromotionGood from '@/components/PromotionGood'
+	// import CouponWindow from '@/components/CouponWindow'
+	// import Menu from '@/components/Menu'
+	// import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
+	// import Adv from '@/components/sh-adv'
+	// import Groupon from '@/components/sh-groupon.vue'
+
+	import Banner from './components/Banner'
+	// import HotCommodity from './components/HotCommodity'
+	// import FirstNewProduct from './components/FirstNewProduct'
+	// import ProductsRecommended from './components/ProductsRecommended'
+	// import Live from './components/Live'
+	import Tabbar from '@/components/Tabbar';
+
+	import {
+		getHomeData,
+		getShare,
+		getCanvas,
+		getHotList
+	} from '@/api/public'
+	import cookie from '@/utils/store/cookie'
+	import {
+		isWeixin,
+		handleUrlParam
+	} from '@/utils/index'
+
+	import {
+		openShareAll
+	} from '@/libs/wechat'
+
+	const HAS_COUPON_WINDOW = 'has_coupon_window'
+
+	export default {
+		name: 'Index',
+		components: {
+			// swiper,
+			// swiperSlide,
+			// UniNoticeBar,
+			// GoodList,
+			// PromotionGood,
+			// CouponWindow,
+			// Menu,
+			// Adv,
+			// Groupon,
+			Banner,
+			// HotCommodity,
+			Tabbar,
+			// FirstNewProduct,
+			// ProductsRecommended,
+			// Live,
 		},
-		changeTab(i) {
-			if(this.tabType == i) return;
-			this.tabType = i;
-			if(i == 1) {
-				let query = uni.createSelectorQuery();
-				query.select('.hot-list').boundingClientRect(rect => {
-					if(this.swiperHeight >= rect.height) return;
-					if(this.swiperHeight != 0 && rect.height > this.swiperHeight) {
-						this.swiperHeight = rect.height;
-					}
-				}).exec();
+		props: {},
+		data: function() {
+			return {
+				pagePath: '',
+				navStyle: false,
+				tabType: 0,
+				homeData: [],
+				CustomBar: this.CustomBar,
+				StatusBar: this.StatusBar,
+				formatMenus: [],
+				categoryCurrent: 0,
+				menuNum: 4,
+				bgcolor: '',
+				bgColor: '',
+				swiperCurrent: 0, //轮播下标
+				webviewId: 0,
+				showCoupon: false,
+				logoUrl: '',
+				banner: [],
+				menus: [],
+				combinationList: [],
+				roll: [],
+				activity: [],
+				activityOne: {},
+				bastList: [],
+				firstList: [],
+				info: {
+					fastList: [],
+					bastBanner: [],
+
+					bastList: [],
+				},
+				likeInfo: [],
+				live: [],
+				lovely: [],
+				benefit: [],
+				hotList: [],
+				topList: [], // hotList 前五
+				goodsList: [], // hotList 除前五之外
+				couponList: [],
+				swiperOption: {
+					pagination: {
+						el: '.swiper-pagination',
+						clickable: true,
+					},
+					autoplay: {
+						disableOnInteraction: false,
+						delay: 2000,
+					},
+					loop: true,
+					speed: 1000,
+					observer: true,
+					observeParents: true,
+				},
+				swiperRoll: {
+					direction: 'vertical',
+					autoplay: {
+						disableOnInteraction: false,
+						delay: 2000,
+					},
+					loop: true,
+					speed: 1000,
+					observer: true,
+					observeParents: true,
+				},
+				swiperScroll: {
+					freeMode: true,
+					freeModeMomentum: false,
+					slidesPerView: 'auto',
+					observer: true,
+					observeParents: true,
+				},
+				swiperBoutique: {
+					pagination: {
+						el: '.swiper-pagination',
+						clickable: true,
+					},
+					autoplay: {
+						disableOnInteraction: false,
+						delay: 2000,
+					},
+					loop: true,
+					speed: 1000,
+					observer: true,
+					observeParents: true,
+				},
+				swiperProducts: {
+					freeMode: true,
+					freeModeMomentum: false,
+					slidesPerView: 'auto',
+					observer: true,
+					observeParents: true,
+				},
+				bgImage: '',
+				classifyType: 0, // 热门榜单分类
+				swiperHeight: 0,
+				// indexTitle: false,
 			}
 		},
-    goGoodSearch() {
-      // this.$yrouter.push('/pages/shop/GoodsEvaluate/index');
-      this.$yrouter.push('/pages/shop/GoodSearch/index')
-    },
-		goEvaluations() {
-			this.$yrouter.push('/pages/shop/Evaluations/index');
-		},
-		goEvaluationDetail(item) {
-			this.$yrouter.push({
-				path: '/pages/shop/Evaluations/EvaluationDetail/index',
-				query: {
-					id: item.id
-				},
-			})
+		computed: {
+			singNew() {
+				return this.roll.length > 0 ? this.roll[0] : '你还没添加通知哦！'
+			},
+			customStyle() {
+				var bgImage = this.bgImage
+				// var style = `height:${this.CustomBar}px;padding-top:${0}px;background: ${this.bgcolor}`;
+				var style = `height:${this.CustomBar}px;padding-top:${this.StatusBar}px;background: ${this.bgcolor}`
+				if (this.bgImage) {
+					style = `${style}background-image:url(${bgImage});`
+				}
+				return style
+			},
 		},
-    // goWxappUrl(item) {
-    //   this.$yrouter.push(item.uniapp_url)
-    // },
-    // goHotNewGoods(type) {
-    //   this.$yrouter.push({
-    //     path: '/pages/shop/HotNewGoods/index',
-    //     query: {
-    //       type,
-    //     },
-    //   })
-    // },
-    goGoodsCon(item) {
-      this.$yrouter.push({
-        path: '/pages/shop/GoodsCon/index',
-        query: {
-          id: item.id,
-        },
-      })
-    },
-    // goGoodsPromotion() {
-    //   this.$yrouter.push('/pages/shop/GoodsPromotion/index')
-    // },
-		changeClassify(i) {
-			if(this.classifyType == i) return;
-			this.classifyType = i;
-			this.goodsList = this.sortData(this.hotList[this.classifyType].productInfo, 4);
-			setTimeout(() => {
+		onLoad() {
+			uni.hideTabBar();
+			let pages = getCurrentPages();
+			this.pagePath = '/' + pages[pages.length - 1].route;
+			this.getLocation()
+			uni.showLoading({
+				title: "加载中",
+			});
+			//   getCanvas()
+			//     .then(res => {
+			//   console.log('223',res)
+			//  })
+			//     .catch(error => {
+			// if (!error) {
+			//   return
+			// }
+			//       this.homeData = JSON.parse(error.data.json)
+			// console.log('225',this.homeData)
+			//     })
+
+			getHomeData().then(res => {
+				this.logoUrl = res.data.logoUrl
+				// res.data.banner.forEach(item => (item.bgcolor = item.color || ''))
+				// this.info = res.data.info
+				// console.log('239', res.data)
+				// console.log('239',this.info)
+				this.$set(this, 'info', res.data)
+				// this.$set(this, 'info', res.data.info)
+				this.$set(this, 'firstList', res.data.firstList)
+				this.$set(this, 'bastList', res.data.bastList)
+				this.$set(this, 'likeInfo', res.data.likeInfo)
+				this.$set(this, 'live', res.data.liveList)
+				this.$set(this, 'lovely', res.data.lovely)
+				this.$set(this, 'benefit', res.data.benefit)
+				this.$set(this, 'couponList', res.data.couponList)
+				this.$set(this, 'combinationList', res.data.combinationList)
+				uni.hideLoading()
+				this.setOpenShare();
+				// this.doColorThief()
+			}).then(() => {
 				let query = uni.createSelectorQuery();
-				query.select('.hot-list').boundingClientRect(rect => {
-					// console.log('rectrectrect',rect)
-					if(this.swiperHeight >= rect.height) return;
+				query.select('.goods-list').boundingClientRect(rect => {
+					// console.log('rectrectrect239',rect)
 					this.swiperHeight = rect.height;
 				}).exec();
-			}, 160)
-			
+			})
+
+			getHotList().then(res => {
+				this.hotList = res.data;
+				this.goodsList = this.sortData(this.hotList[this.classifyType].productInfo, 4);
+			})
 		},
-		// 数据分层
-		sortData(oArr, length) {
-			let arr = [];
-			let minArr = [];
-			if(oArr.length > 5) {
-				this.topList = oArr.slice(0, 5);
-				arr = oArr.slice(5, oArr.length);
+		onPageScroll(e) {
+			if (e.scrollTop > 80) {
+				this.navStyle = true;
 			} else {
-				this.topList = oArr;
-			}
-			return arr;
+				this.navStyle = false;
+			};
 		},
-    setOpenShare: function() {
-      if (this.$deviceType == 'weixin') {
-        getShare().then(res => {
-          var data = res.data.data
-          var configAppMessage = {
-            desc: data.synopsis,
-            title: data.title,
-            link: location.href,
-            imgUrl: data.img,
-          }
-          openShareAll(configAppMessage)
-        })
-      }
-    },
-    startQr: function() {
-      uni.scanCode({
-        success: res => {
-			let option = handleUrlParam(res.result)
-			console.log(option)
-			switch (option.pageType) {
-				case 'good':
-				  // 跳转商品详情
-				  this.$yrouter.push({
-					path: '/pages/shop/GoodsCon/index',
+		methods: {
+			
+			...mapActions(['getLocation']),
+			onShareTimeline: function() {
+				return {
+					title: this.miniHomeRemark,
+					imageUrl: this.miniHomeImg,
+					path: 'pages/home/index?spread=' + uni.getStorageSync('uid'),
+				}
+			},
+			onShareAppMessage: function() {
+				return {
+					title: this.miniHomeRemark,
+					imageUrl: this.miniHomeImg,
+					path: 'pages/home/index?spread=' + uni.getStorageSync('uid'),
+				}
+			},
+			goRoll(item) {
+				if (item.uniapp_url) {
+					this.$yrouter.push(item.uniapp_url)
+				}
+			},
+			changeCurrent(e) {
+				this.tabType = e.detail.current;
+			},
+			changeListCurrent(e) {
+				this.tabType = e.detail.current;
+				if (this.tabType == 1) {
+					let query = uni.createSelectorQuery();
+					query.select('.hot-list').boundingClientRect(rect => {
+						// console.log('rectrectrect239',rect)
+						if (this.swiperHeight >= rect.height) return;
+						if (this.swiperHeight != 0 && rect.height > this.swiperHeight) {
+							this.swiperHeight = rect.height;
+						}
+					}).exec();
+				}
+			},
+			changeTab(i) {
+				if (this.tabType == i) return;
+				this.tabType = i;
+				if (i == 1) {
+					let query = uni.createSelectorQuery();
+					query.select('.hot-list').boundingClientRect(rect => {
+						if (this.swiperHeight >= rect.height) return;
+						if (this.swiperHeight != 0 && rect.height > this.swiperHeight) {
+							this.swiperHeight = rect.height;
+						}
+					}).exec();
+				}
+			},
+			goGoodSearch() {
+				// this.$yrouter.push('/pages/shop/GoodsEvaluate/index');
+				this.$yrouter.push('/pages/shop/GoodSearch/index')
+			},
+			goEvaluations() {
+				this.$yrouter.push('/pages/shop/Evaluations/index');
+			},
+			goEvaluationDetail(item) {
+				this.$yrouter.push({
+					path: '/pages/shop/Evaluations/EvaluationDetail/index',
 					query: {
-					  q: res.result,
+						id: item.id
 					},
-				  })
-				break
-				case 'group':
-				  // 跳转团购
-				  this.$yrouter.push({
-					path: '/pages/activity/GroupRule/index',
+				})
+			},
+			// goWxappUrl(item) {
+			//   this.$yrouter.push(item.uniapp_url)
+			// },
+			// goHotNewGoods(type) {
+			//   this.$yrouter.push({
+			//     path: '/pages/shop/HotNewGoods/index',
+			//     query: {
+			//       type,
+			//     },
+			//   })
+			// },
+			goGoodsCon(item) {
+				this.$yrouter.push({
+					path: '/pages/shop/GoodsCon/index',
 					query: {
-					  q: res.result,
+						id: item.id,
 					},
-				  })
-				break
-				case 'dargain':
-				  // 跳转砍价
-				  this.$yrouter.push({
-					path: '/pages/activity/DargainDetails/index',
-					query: {
-					  q: res.result,
+				})
+			},
+			// goGoodsPromotion() {
+			//   this.$yrouter.push('/pages/shop/GoodsPromotion/index')
+			// },
+			changeClassify(i) {
+				if (this.classifyType == i) return;
+				this.classifyType = i;
+				this.goodsList = this.sortData(this.hotList[this.classifyType].productInfo, 4);
+				setTimeout(() => {
+					let query = uni.createSelectorQuery();
+					query.select('.hot-list').boundingClientRect(rect => {
+						// console.log('rectrectrect',rect)
+						if (this.swiperHeight >= rect.height) return;
+						this.swiperHeight = rect.height;
+					}).exec();
+				}, 160)
+
+			},
+			// 数据分层
+			sortData(oArr, length) {
+				let arr = [];
+				let minArr = [];
+				if (oArr.length > 5) {
+					this.topList = oArr.slice(0, 5);
+					arr = oArr.slice(5, oArr.length);
+				} else {
+					this.topList = oArr;
+				}
+				return arr;
+			},
+			setOpenShare: function() {
+				if (this.$deviceType == 'weixin') {
+					getShare().then(res => {
+						var data = res.data.data
+						var configAppMessage = {
+							desc: data.synopsis,
+							title: data.title,
+							link: location.href,
+							imgUrl: data.img,
+						}
+						openShareAll(configAppMessage)
+					})
+				}
+			},
+			startQr: function() {
+				uni.scanCode({
+					success: res => {
+						let option = handleUrlParam(res.result)
+						console.log(option)
+						switch (option.pageType) {
+							case 'good':
+								// 跳转商品详情
+								this.$yrouter.push({
+									path: '/pages/shop/GoodsCon/index',
+									query: {
+										q: res.result,
+									},
+								})
+								break
+							case 'group':
+								// 跳转团购
+								this.$yrouter.push({
+									path: '/pages/activity/GroupRule/index',
+									query: {
+										q: res.result,
+									},
+								})
+								break
+							case 'dargain':
+								// 跳转砍价
+								this.$yrouter.push({
+									path: '/pages/activity/DargainDetails/index',
+									query: {
+										q: res.result,
+									},
+								})
+								break
+							default:
+								// 跳转分销
+								this.$yrouter.push({
+									path: '/pages/Loading/index',
+									query: {},
+								})
+								break
+						}
 					},
-				  })
-				break
-				default:
-				  // 跳转分销
-				  this.$yrouter.push({
-					path: '/pages/Loading/index',
-					query: {},
-				  })
-				break
-			}
-        },
-      })
-    },
-    // getbgcolor(e) {
-    //   this.bgcolor = e
-    // },
-  },
-  created: async function() {
-    // await this.doColorThief();
-  },
-}
+				})
+			},
+			// getbgcolor(e) {
+			//   this.bgcolor = e
+			// },
+		},
+		created: async function() {
+			// await this.doColorThief();
+		},
+	}
 </script>
 <style>
 	page {
@@ -603,501 +631,554 @@ export default {
 	}
 </style>
 <style scoped lang="less">
-// .content_box {
-//   background: #f6f6f6;
-// }
-
-// .index {
-//   background-color: #f6f6f6;
-// }
-
-// .swiper-item {
-//   height: 100%;
-// }
-
-// .fixed-header {
-//   position: fixed;
-//   z-index: 99;
-//   // #ifdef H5
-//   top: 88rpx;
-//   // #endif
-
-//   // #ifndef H5
-//   top: 0;
-//   // #endif
-//   left: 0;
-//   right: 0;
-//   background: #fff;
-//   box-shadow: 0 0 20rpx -10rpx #aaa;
-
-//   & + .fixed-header-box {
-//     height: 98rpx;
-//   }
-// }
-
-.head_box.active {
-	background-image: linear-gradient(33deg, #2EB5AE 0%, #1B8DCC 100%);
-}
-.head_box {
-	position: fixed;
-	top:0;
-	left:0;
-	right:0;
-	z-index: 99;
-  width: 750rpx;
-	
-  /deep/.cuIcon-back {
-    display: none;
-  }
-	
-	.icon {
-		display: inline-block;
-		width: 62rpx;
-		height: 62rpx;
-		// background-color: aquamarine;
-		margin-left: 22rpx;
-	}
-	.title-image {
-		width: 184rpx;
-		height: 46rpx;
-		// background-color: bisque;
-	}
-  .nav-title {
-    // font-size: 38rpx;
-    // font-family: PingFang SC;
-    // font-weight: 500;
-    // color: #fff;
-		
-		font-size: 26rpx;
-		color: #3A3A3C;
-		line-height: 38rpx;
-  }
-	// .right-icon {
-	// 	width: 62rpx;
-	// 	height: 62rpx;
+	// .content_box {
+	//   background: #f6f6f6;
 	// }
-	.icon-box {
-		// display: inline-block;
-		// width: 562rpx;
-		// width: 124rpx;
-		// height: 62rpx;
-		// background-color: aquamarine;
-		margin-right: 14rpx;
-		image {
-			width: 62rpx;
-			height: 62rpx;
-		}
+
+	// .index {
+	//   background-color: #f6f6f6;
+	// }
+
+	// .swiper-item {
+	//   height: 100%;
+	// }
+
+	// .fixed-header {
+	//   position: fixed;
+	//   z-index: 99;
+	//   // #ifdef H5
+	//   top: 88rpx;
+	//   // #endif
+
+	//   // #ifndef H5
+	//   top: 0;
+	//   // #endif
+	//   left: 0;
+	//   right: 0;
+	//   background: #fff;
+	//   box-shadow: 0 0 20rpx -10rpx #aaa;
+
+	//   & + .fixed-header-box {
+	//     height: 98rpx;
+	//   }
+	// }
+
+	.head_box.active {
+		background-image: linear-gradient(33deg, #2EB5AE 0%, #1B8DCC 100%);
 	}
-}
-
-.content-box {
-	position: relative;
-	background: #FFFFFF;
-}
-
-.menus-box {
-	position: relative;
-	top: -48rpx;
-	border-radius: 28rpx 28rpx 0rpx 0rpx;
-	background: #FFFFFF;
-	padding: 32rpx 32rpx 20rpx;
-	margin-bottom: -48rpx;
-	box-shadow: 0rpx -12rpx 12rpx 0rpx rgba(0, 0, 0, 0.1);
-	.item {
-		.img-box {
-			width: 108rpx;
-			height: 108rpx;
-			background: #F5F6F8;
-			box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
-			border-radius: 16rpx;
-			padding: 24rpx;
-			image {
-				width: 64rpx;
-				height: 64rpx;
-			}
+
+	.head_box {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 99;
+		width: 750rpx;
+
+		/deep/.cuIcon-back {
+			display: none;
 		}
-		.title {
-			padding-top: 16rpx;
-			font-size: 22rpx;
-			color: #2DB5AE;
-			line-height: 30rpx;
-			text-align: center;
+
+		.icon {
+			display: inline-block;
+			width: 62rpx;
+			height: 62rpx;
+			// background-color: aquamarine;
+			margin-left: 22rpx;
 		}
-	}
-}
-
-.selections-box {
-	padding-top: 24rpx;
-	.top {
-		padding: 0rpx 32rpx;
-		.tip {
-			font-size: 20rpx;
-			font-family: Futura;
-			color: #999999;
-			line-height: 22rpx;
+
+		.title-image {
+			width: 184rpx;
+			height: 46rpx;
+			// background-color: bisque;
 		}
-		.title {
-			font-size: 50rpx;
-			font-weight: 600;
+
+		.nav-title {
+			// font-size: 38rpx;
+			// font-family: PingFang SC;
+			// font-weight: 500;
+			// color: #fff;
+
+			font-size: 26rpx;
 			color: #3A3A3C;
-			line-height: 68rpx;
-		}
-		.more {
-			font-size: 20rpx;
-			font-weight: 300;
-			color: #2DB5AE;
-			line-height: 26rpx;
+			line-height: 38rpx;
 		}
-		.jiantou {
-			width: 0rpx;
-			height: 0rpx;
-			border-top: 8rpx solid transparent;
-			border-left: 10rpx solid #2DB5AE;
-			border-bottom: 8rpx solid transparent;
-			border-right: 10rpx solid transparent;
-			margin-left: 8rpx;
+
+		// .right-icon {
+		// 	width: 62rpx;
+		// 	height: 62rpx;
+		// }
+		.icon-box {
+			// display: inline-block;
+			// width: 562rpx;
+			// width: 124rpx;
+			// height: 62rpx;
+			// background-color: aquamarine;
+			margin-right: 14rpx;
+
+			image {
+				width: 62rpx;
+				height: 62rpx;
+			}
 		}
 	}
-	
-	.selections {
-		padding-top: 6rpx;
-		.scroll {
-			width: 100%;
-			overflow:hidden;
-			white-space:nowrap;
-		}
-		.item-box {
-			display: flex;
-			flex-wrap: nowrap;
-			// width: 2144rpx;
-			padding: 10rpx 0rpx 24rpx 32rpx;
-			.item {
-				width: 684rpx;
-				height: 240rpx;
-				// background: #F5F6F8;
-				box-shadow: 0px 10rpx 16rpx 0px rgba(0,0,0,0.15);
+
+	.content-box {
+		position: relative;
+		background: #FFFFFF;
+	}
+
+	.menus-box {
+		position: relative;
+		top: -48rpx;
+		border-radius: 28rpx 28rpx 0rpx 0rpx;
+		background: #FFFFFF;
+		padding: 32rpx 32rpx 20rpx;
+		margin-bottom: -48rpx;
+		box-shadow: 0rpx -12rpx 12rpx 0rpx rgba(0, 0, 0, 0.1);
+
+		.item {
+			.img-box {
+				width: 108rpx;
+				height: 108rpx;
+				background: #F5F6F8;
+				box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.15);
 				border-radius: 16rpx;
-				margin-right: 20rpx;
-				overflow: hidden;
+				padding: 24rpx;
+
 				image {
-					width: 100%;
-					height: 100%;
+					width: 64rpx;
+					height: 64rpx;
 				}
 			}
-			// .black {
-			// 	background: #4F4E53;
-			// }
-		}
-	}
-}
 
-.tab-box {
-	padding-bottom: 16rpx;
-	.scroll-box {
-		width: 382rpx;
-		height: 90rpx;
-		swiper {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.title-box {
-		width: 108rpx !important;
-		position: absolute;
-		width: 100%;
-		height: 100%;
-		.tip {
-			opacity: 0;
-			height: 22rpx;
-			font-size: 20rpx;
-			font-family: Futura;
-			font-weight: 500;
-			color: #999999;
-			line-height: 22rpx;
-		}
-		.title {
-			height: 68rpx;
-			font-size: 26rpx;
-			font-weight: 600;
-			color: #3A3A3C;
-			line-height: 38rpx;
-			padding-top: 22rpx;
-		}
-	}
-	.title-box.on {
-		width: 200rpx !important;
-		.title {
-			font-size: 50rpx;
-			line-height: 68rpx;
-			padding-top: 0rpx;
-			// transition: all .8s;
-			// -webkit-transition: all .8s;
-			// -moz-transition: all .8s;
-			// -o-transition: all .8s;
-			// transform:translateZ(0);
-			// backface-visibility: hidden;
-			// // 兼容写法
-			// -webkit-backface-visibility: hidden;
-		}
-		.tip {
-			opacity: 1;
-			transition: opacity 1s cubic-bezier(.18,.89,.17,.88);
-			-webkit-transition: opacity 1s cubic-bezier(.18,.89,.17,.88);
-			-moz-transition: opacity 1s cubic-bezier(.18,.89,.17,.88);
-			-o-transition: opacity 1s cubic-bezier(.18,.89,.17,.88);
+			.title {
+				padding-top: 16rpx;
+				font-size: 22rpx;
+				color: #2DB5AE;
+				line-height: 30rpx;
+				text-align: center;
+			}
 		}
 	}
-	.title-box:first-child {
-		// padding-left: 32rpx;
-	}
-	.title-box:last-child {
-		transform: translate(151%, 0px) translateZ(0px) !important;
-		padding-left: 24rpx;
-	}
-	
-	.tab-line-box {
-		padding-left: 32rpx;
-		.tab-line {
-			width: 92rpx;
-			height: 4rpx;
-			// opacity: 0.24;
-			background: #CCEDEB;
-			// border: 4rpx solid #CCEDEB;
-			margin-right: 12rpx;
-			position: relative;
-			.active {
-				width: 0rpx;
-				height: 4rpx;
-				// opacity: 1;
-				background: #2DB5AE;
-				// border: 4rpx solid #2DB5AE;
-				position: absolute;
-				top: 0;
-				left: 0;
-				transition: all .6s cubic-bezier(.18,.89,.17,.88);
-				-webkit-transition: all .6s cubic-bezier(.18,.89,.17,.88);
-				-moz-transition: all .6s cubic-bezier(.18,.89,.17,.88);
-				-o-transition: all .6s cubic-bezier(.18,.89,.17,.88);
+
+	.selections-box {
+		padding-top: 24rpx;
+
+		.top {
+			padding: 0rpx 32rpx;
+
+			.tip {
+				font-size: 20rpx;
+				font-family: Futura;
+				color: #999999;
+				line-height: 22rpx;
 			}
-			.active.on2 {
-				width: 92rpx;
-				transition: all .6s cubic-bezier(.18,.89,.17,.88);
-				-webkit-transition: all .6s cubic-bezier(.18,.89,.17,.88);
-				-moz-transition: all .6s cubic-bezier(.18,.89,.17,.88);
-				-o-transition: all .6s cubic-bezier(.18,.89,.17,.88);
+
+			.title {
+				font-size: 50rpx;
+				font-weight: 600;
+				color: #3A3A3C;
+				line-height: 68rpx;
+			}
+
+			.more {
+				font-size: 20rpx;
+				font-weight: 300;
+				color: #2DB5AE;
+				line-height: 26rpx;
+			}
+
+			.jiantou {
+				width: 0rpx;
+				height: 0rpx;
+				border-top: 8rpx solid transparent;
+				border-left: 10rpx solid #2DB5AE;
+				border-bottom: 8rpx solid transparent;
+				border-right: 10rpx solid transparent;
+				margin-left: 8rpx;
 			}
 		}
-		.tab-line:first-child {
-			.active {
-				// width: 92rpx;
-				left: 92rpx;
+
+		.selections {
+			padding-top: 6rpx;
+
+			.scroll {
+				width: 100%;
+				overflow: hidden;
+				white-space: nowrap;
 			}
-			.active.on {
-				width: 92rpx;
-				left: 0;
-				transition: all .6s cubic-bezier(.18,.89,.17,.88);
-				-webkit-transition: all .6s cubic-bezier(.18,.89,.17,.88);
-				-moz-transition: all .6s cubic-bezier(.18,.89,.17,.88);
-				-o-transition: all .6s cubic-bezier(.18,.89,.17,.88);
+
+			.item-box {
+				display: flex;
+				flex-wrap: nowrap;
+				// width: 2144rpx;
+				padding: 10rpx 0rpx 24rpx 32rpx;
+
+				.item {
+					width: 684rpx;
+					height: 240rpx;
+					// background: #F5F6F8;
+					box-shadow: 0px 10rpx 16rpx 0px rgba(0, 0, 0, 0.15);
+					border-radius: 16rpx;
+					margin-right: 20rpx;
+					overflow: hidden;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				// .black {
+				// 	background: #4F4E53;
+				// }
 			}
 		}
 	}
-}
 
-.list-box {
-	width: 100%;
-	swiper {
-		width: 100%;
-	}
-}
-
-.list-box .goods-list {
-	padding: 0rpx 32rpx 8rpx;
-	.goods-item {
-		width: 332rpx;
-		background: #F5F6F8;
-		box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.15);
-		border-radius: 16rpx;
-		margin-bottom: 20rpx;
-		.img-box {
-			width: 332rpx;
-			height: 316rpx;
-			border-radius: 16rpx 16rpx 0rpx 0rpx;
-			overflow: hidden;
-			.img {
+	.tab-box {
+		padding-bottom: 16rpx;
+
+		.scroll-box {
+			width: 382rpx;
+			height: 90rpx;
+
+			swiper {
 				width: 100%;
 				height: 100%;
-				background-color: #fff;
 			}
 		}
-		.name {
-		    font-size: 26rpx;
-		    font-family: PingFang SC;
-		    font-weight: 500;
-		    color: #3A3A3C;
-		    line-height: 38rpx;
-		    height: 76rpx;
-		    margin: 10rpx 16rpx;
-		}
-		.price-box {
-			padding: 0rpx 16rpx 26rpx;
+
+		.title-box {
+			width: 108rpx !important;
+			position: absolute;
 			width: 100%;
-			box-sizing: border-box;
-			text-align: center;
-			.current {
-				font-size: 30rpx;
+			height: 100%;
+
+			.tip {
+				opacity: 0;
+				height: 22rpx;
+				font-size: 20rpx;
 				font-family: Futura;
+				font-weight: 500;
+				color: #999999;
+				line-height: 22rpx;
+			}
+
+			.title {
+				height: 68rpx;
+				font-size: 26rpx;
 				font-weight: 600;
 				color: #3A3A3C;
-				line-height: 40rpx;
-				text {
-					padding-left: 10rpx;
-					font-size: 20rpx;
-					color: #999999;
-					line-height: 26rpx;
-					font-weight: 500;
-					text-decoration: line-through;
-				}
+				line-height: 38rpx;
+				padding-top: 22rpx;
 			}
 		}
-	}
-}
-
-.list-box .classify-tab-box {
-	padding: 4rpx 32rpx 22rpx;
-	.classify-item {
-	    width: 124rpx;
-	    height: 40rpx;
-	    border-radius: 16rpx;
-	    border: 2rpx solid #2EB5AE;
-	    font-size: 24rpx;
-	    font-weight: 500;
-	    color: #2DB5AE;
-	    line-height: 36rpx;
-	    text-align: center;
-	    margin-right: 20rpx;
-	}
-	.on {
-	    color: #FFFFFF;
-	    background: #2DB5AE;
-	}
-}
-
-.list-box .top-box {
-	padding: 0rpx 32rpx 12rpx;
-	.top-item {
-		width: 686rpx;
-		height: 174rpx;
-		background: #F5F6F8;
-		box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
-		border-radius: 16rpx;
-		margin-bottom: 20rpx;
-		.top-num-box {
-			width: 146rpx;
-			height: 174rpx;
-			padding: 24rpx 0rpx 24rpx 12rpx;
-			font-size: 80rpx;
-			font-family: Futura;
-			font-weight: 700;
-			color: #2DB5AE;
-			line-height: 106rpx;
-			text-align: center;
+
+		.title-box.on {
+			width: 200rpx !important;
+
+			.title {
+				font-size: 50rpx;
+				line-height: 68rpx;
+				padding-top: 0rpx;
+				// transition: all .8s;
+				// -webkit-transition: all .8s;
+				// -moz-transition: all .8s;
+				// -o-transition: all .8s;
+				// transform:translateZ(0);
+				// backface-visibility: hidden;
+				// // 兼容写法
+				// -webkit-backface-visibility: hidden;
+			}
+
 			.tip {
-				font-size: 32rpx;
-				line-height: 42rpx;
+				opacity: 1;
+				transition: opacity 1s cubic-bezier(.18, .89, .17, .88);
+				-webkit-transition: opacity 1s cubic-bezier(.18, .89, .17, .88);
+				-moz-transition: opacity 1s cubic-bezier(.18, .89, .17, .88);
+				-o-transition: opacity 1s cubic-bezier(.18, .89, .17, .88);
+			}
+		}
+
+		.title-box:first-child {
+			// padding-left: 32rpx;
+		}
+
+		.title-box:last-child {
+			transform: translate(151%, 0px) translateZ(0px) !important;
+			padding-left: 24rpx;
+		}
+
+		.tab-line-box {
+			padding-left: 32rpx;
+
+			.tab-line {
+				width: 92rpx;
+				height: 4rpx;
+				// opacity: 0.24;
+				background: #CCEDEB;
+				// border: 4rpx solid #CCEDEB;
+				margin-right: 12rpx;
 				position: relative;
-				top: -22rpx;
+
+				.active {
+					width: 0rpx;
+					height: 4rpx;
+					// opacity: 1;
+					background: #2DB5AE;
+					// border: 4rpx solid #2DB5AE;
+					position: absolute;
+					top: 0;
+					left: 0;
+					transition: all .6s cubic-bezier(.18, .89, .17, .88);
+					-webkit-transition: all .6s cubic-bezier(.18, .89, .17, .88);
+					-moz-transition: all .6s cubic-bezier(.18, .89, .17, .88);
+					-o-transition: all .6s cubic-bezier(.18, .89, .17, .88);
+				}
+
+				.active.on2 {
+					width: 92rpx;
+					transition: all .6s cubic-bezier(.18, .89, .17, .88);
+					-webkit-transition: all .6s cubic-bezier(.18, .89, .17, .88);
+					-moz-transition: all .6s cubic-bezier(.18, .89, .17, .88);
+					-o-transition: all .6s cubic-bezier(.18, .89, .17, .88);
+				}
+			}
+
+			.tab-line:first-child {
+				.active {
+					// width: 92rpx;
+					left: 92rpx;
+				}
+
+				.active.on {
+					width: 92rpx;
+					left: 0;
+					transition: all .6s cubic-bezier(.18, .89, .17, .88);
+					-webkit-transition: all .6s cubic-bezier(.18, .89, .17, .88);
+					-moz-transition: all .6s cubic-bezier(.18, .89, .17, .88);
+					-o-transition: all .6s cubic-bezier(.18, .89, .17, .88);
+				}
 			}
 		}
-		.img {
-			width: 168rpx;
-			height: 162rpx;
-			border-radius: 8rpx;
-			margin: 6rpx 0rpx;
+	}
+
+	.list-box {
+		width: 100%;
+
+		swiper {
+			width: 100%;
 		}
-		.info-box {
-			width: 370rpx;
-			height: 174rpx;
-			padding: 16rpx 18rpx 16rpx 10rpx;
-			.title {
-				height: 76rpx;
+	}
+
+	.list-box .goods-list {
+		padding: 0rpx 32rpx 8rpx;
+
+		.goods-item {
+			width: 332rpx;
+			background: #F5F6F8;
+			box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.15);
+			border-radius: 16rpx;
+			margin-bottom: 20rpx;
+
+			.img-box {
+				width: 332rpx;
+				height: 316rpx;
+				border-radius: 16rpx 16rpx 0rpx 0rpx;
+				overflow: hidden;
+
+				.img {
+					width: 100%;
+					height: 100%;
+					background-color: #fff;
+				}
+			}
+
+			.name {
 				font-size: 26rpx;
+				font-family: PingFang SC;
 				font-weight: 500;
 				color: #3A3A3C;
 				line-height: 38rpx;
+				height: 76rpx;
+				margin: 10rpx 16rpx;
 			}
+
 			.price-box {
-				font-size: 30rpx;
+				padding: 0rpx 16rpx 26rpx;
+				width: 100%;
+				box-sizing: border-box;
+				text-align: center;
+
+				.current {
+					font-size: 30rpx;
+					font-family: Futura;
+					font-weight: 600;
+					color: #3A3A3C;
+					line-height: 40rpx;
+
+					text {
+						padding-left: 10rpx;
+						font-size: 20rpx;
+						color: #999999;
+						line-height: 26rpx;
+						font-weight: 500;
+						text-decoration: line-through;
+					}
+				}
+			}
+		}
+	}
+
+	.list-box .classify-tab-box {
+		padding: 4rpx 32rpx 22rpx;
+
+		.classify-item {
+			width: 124rpx;
+			height: 40rpx;
+			border-radius: 16rpx;
+			border: 2rpx solid #2EB5AE;
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #2DB5AE;
+			line-height: 36rpx;
+			text-align: center;
+			margin-right: 20rpx;
+		}
+
+		.on {
+			color: #FFFFFF;
+			background: #2DB5AE;
+		}
+	}
+
+	.list-box .top-box {
+		padding: 0rpx 32rpx 12rpx;
+
+		.top-item {
+			width: 686rpx;
+			height: 174rpx;
+			background: #F5F6F8;
+			box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.15);
+			border-radius: 16rpx;
+			margin-bottom: 20rpx;
+
+			.top-num-box {
+				width: 146rpx;
+				height: 174rpx;
+				padding: 24rpx 0rpx 24rpx 12rpx;
+				font-size: 80rpx;
 				font-family: Futura;
-				font-weight: 600;
-				color: #3A3A3C;
-				line-height: 40rpx;
-				text {
-					font-size: 20rpx;
+				font-weight: 700;
+				color: #2DB5AE;
+				line-height: 106rpx;
+				text-align: center;
+
+				.tip {
+					font-size: 32rpx;
+					line-height: 42rpx;
+					position: relative;
+					top: -22rpx;
+				}
+			}
+
+			.img {
+				width: 168rpx;
+				height: 162rpx;
+				border-radius: 8rpx;
+				margin: 6rpx 0rpx;
+			}
+
+			.info-box {
+				width: 370rpx;
+				height: 174rpx;
+				padding: 16rpx 18rpx 16rpx 10rpx;
+
+				.title {
+					height: 76rpx;
+					font-size: 26rpx;
 					font-weight: 500;
+					color: #3A3A3C;
+					line-height: 38rpx;
+				}
+
+				.price-box {
+					font-size: 30rpx;
+					font-family: Futura;
+					font-weight: 600;
+					color: #3A3A3C;
+					line-height: 40rpx;
+
+					text {
+						font-size: 20rpx;
+						font-weight: 500;
+						color: #999999;
+						line-height: 26rpx;
+						text-decoration: line-through;
+						padding-left: 10rpx;
+					}
+				}
+
+				.original {
+					font-size: 20rpx;
 					color: #999999;
 					line-height: 26rpx;
-					text-decoration: line-through;
-					padding-left: 10rpx;
 				}
 			}
-			.original {
-				font-size: 20rpx;
-				color: #999999;
-				line-height: 26rpx;
-			}
 		}
 	}
-}
-// .menus-box {
-// 	position: relative;
-// 	top: ;
-// }
-
-// .cu-bar.fixed {
-//   position: fixed;
-//   width: 100%;
-//   top: 0;
-//   z-index: 1024;
-//   // box-shadow: 0 1upx 6upx rgba(0, 0, 0, 0.1);
-// }
-
-// .cu-bar {
-//   box-sizing: border-box;
-
-//   .index .header {
-//     height: 64rpx;
-//     // width: 100%;
-//     // padding: 0 30rpx;
-//     // box-sizing: border-box;
-//   }
-// }
-
-.header-search {
-  transition: all linear 0.3s;
-}
-
-.cu-bar .action {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-  height: 100%;
-  max-height: 100%;
-
-  &:first-child {
-    margin-left: 15px;
-    font-size: 15px;
-  }
-}
-
-// .home_content_box {
-//   // margin-top: -20rpx;
-// }
-
-.index{
-.uni-noticebar{
-  margin-bottom:0;
-}
-}
-</style>
+
+	// .menus-box {
+	// 	position: relative;
+	// 	top: ;
+	// }
+
+	// .cu-bar.fixed {
+	//   position: fixed;
+	//   width: 100%;
+	//   top: 0;
+	//   z-index: 1024;
+	//   // box-shadow: 0 1upx 6upx rgba(0, 0, 0, 0.1);
+	// }
+
+	// .cu-bar {
+	//   box-sizing: border-box;
+
+	//   .index .header {
+	//     height: 64rpx;
+	//     // width: 100%;
+	//     // padding: 0 30rpx;
+	//     // box-sizing: border-box;
+	//   }
+	// }
+
+	.header-search {
+		transition: all linear 0.3s;
+	}
+
+	.cu-bar .action {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		align-items: center;
+		height: 100%;
+		max-height: 100%;
+
+		&:first-child {
+			margin-left: 15px;
+			font-size: 15px;
+		}
+	}
+
+	// .home_content_box {
+	//   // margin-top: -20rpx;
+	// }
+
+	.index {
+		.uni-noticebar {
+			margin-bottom: 0;
+		}
+	}
+</style>
diff --git a/pages/shop/Evaluations/EvaluationDetail/index.vue b/pages/shop/Evaluations/EvaluationDetail/index.vue
index 345af24..35578ae 100644
--- a/pages/shop/Evaluations/EvaluationDetail/index.vue
+++ b/pages/shop/Evaluations/EvaluationDetail/index.vue
@@ -135,7 +135,6 @@
 		onLoad() {
 			this.id = this._route.query.id
 			this.getInfo(this.id);
-			this.getEvaluation(this.id)
 		},
 		onShareAppMessage() {
 			return {
@@ -156,21 +155,31 @@
 			// 		this.isCollection=!this.isCollection
 			// 		console.log('++++++++');
 			// 	})
+			// },
+			 //收藏评测
+			// setCollect: function() {
+			//   let that = this,
+			//     id = that.storeInfo.id,
+			//     category = 'collect'
+			//   if (that.storeInfo.userCollect) {
+			//     getCollectDel(id, category).then(function() {
+			//       that.storeInfo.userCollect = !that.storeInfo.userCollect
+			//     })
+			//   } else {
+			//     getCollectAdd(id, category).then(function() {
+			//       that.storeInfo.userCollect = !that.storeInfo.userCollect
+			//     })
+			//   }
 			// },
 			
 			
-			
-			// 是否已经收藏
-			getEvaluation(id){
-				// collectEvaluation/add
-			},
 			// 收藏
 			
 			getCollection(){
-				
 				var param={}
 				param.id=this.id
-				param.category= ""
+				param.category= "collect"
+				
 				getUserCollection(param).then(res=>{
 					console.log(res,'==========11');
 				})
@@ -437,6 +446,7 @@
 			height: 80rpx;
 		  padding: 0;
 		  background-color: #F1F1F1;
+		  width: 100rpx;
 		}
 		.contacButton::after {
 		  border: 0;
diff --git a/pages/shop/GoodsCollection/index.vue b/pages/shop/GoodsCollection/index.vue
index 722f41f..3c392c4 100644
--- a/pages/shop/GoodsCollection/index.vue
+++ b/pages/shop/GoodsCollection/index.vue
@@ -1,158 +1,206 @@
-<template>
-  <view ref="container">
-		<view class="header">
-			<cu-custom :isBack="true" :isCenter="true">
-				<block slot="backText">
-					<view class="backImg">
-						<image src="@/static/images/back-btn.png" mode=""></image>
-					</view>
-				</block>
-				<block slot="content">
-					<view class="tab-title">我的收藏</view>
-				</block>
-			</cu-custom>
-		</view>
-		
-		<view class="content-box" :style="'height:calc(100vh - '+CustomBar+'px);'">
-			<view class="content">
-				<view class="nav acea-row row-around" :style="'top:calc('+CustomBar+'px+2px)'">
-					<view class="item" @click="changeType(0)">
-						<view :class="'title ' + (navType == 0? 'active' : '')">甄选商品</view>
-					</view>
-					<view class="item" @click="changeType(1)">
-						<view :class="'title ' + (navType === 1 ? 'active' : '')">甄选评测</view>
-					</view>
-				</view>
-				
-				
-				<view class="collectionGoods" v-if="collectProductList.length > 0">
-				  <view class="item" v-for="(item, collectProductListIndex) in collectProductList" :key="collectProductListIndex" :data-index="collectProductListIndex" @touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:' + item.right + 'rpx'">
-						<view class="info-box acea-row row-between-wrapper" @click="goGoodsCon(item)">
-							<view class="pictrue">
-								<image :src="item.image" />
-							</view>
-							<view class="text">
-								<view class="infor line1">{{ item.storeName }}</view>
-								<view class="acea-row sku-box">
-									<view class="sku" v-if="item.productInfo.attrInfo">{{ item.productInfo.attrInfo.sku }}</view>
-								</view>
-								<view class="money" v-if="isIntegral == 1">{{ item.costPrice }}积分</view>
-								<view class="money" v-else>￥{{ item.price }}</view>
-							</view>
-						</view>
-				    <view class="delete" @tap.stop="delCollection(collectProductListIndex)" :style="item.right?'right: -122rpx;':''">删除</view>
-						
-				  </view>
-				</view>
-				
-				<Loading :loaded="loadend" :loading="loading"></Loading>
-				
-			</view>
-		</view>
-		
-    
-    <!-- <view class="noCommodity" style="background-color:#fff;" v-if="collectProductList.length < 1 && page > 1">
-      <view class="noPictrue">
-        <image :src="`${$VUE_APP_RESOURCES_URL}/images/noCollection.png`" class="image" />
-      </view>
-      <Recommend></Recommend>
-    </view> -->
-  </view>
-</template>
-<script>
-import Recommend from '@/components/Recommend'
-import { getCollectUser, getCollectDel } from '@/api/user'
-import Loading from '@/components/Loading'
-export default {
-  name: 'GoodsCollection',
-  components: {
-    Recommend,
-    Loading,
-  },
-  props: {},
-  data: function() {
-    return {
-			CustomBar: this.CustomBar,
-			navType: 0,
-      page: 1,
-      limit: 20,
-      type: 'collect',
-      collectProductList: [],
-      loadTitle: '',
-      loading: false,
-      loadend: false,
-			delBtnWidth: 154,
-			startX : 0
-    }
-  },
-  mounted: function() {
-    this.get_user_collect_product()
-  },
-  onReachBottom() {
-    !this.loading && this.get_user_collect_product()
-  },
-  methods: {
-		changeType(i) {
-			if(this.navType == i) return;
-			this.navType = i;
-		},
-		
-		drawStart(e) {
-			var touch = e.touches[0];
-			// let index = e.currentTarget.dataset.index;
-			for (var index in this.collectProductList) {
-					this.collectProductList[index].right = 0;
-			}
-			this.startX = touch.clientX;
-			// console.log(this.startX, "drawStart", index)
-		},
-		drawMove(e) {
-			let touch = e.touches[0];
-			// console.log(touch, "drawMove")
-			let index = e.currentTarget.dataset.index;
-			let item = this.collectProductList[index];
-			let disX = this.startX - touch.clientX;
-			
-			// console.log(index, "drawMove")
-			if (disX >= 20) {
-				if (disX > this.delBtnWidth) {
-						disX = this.delBtnWidth;
-				}
-				this.collectProductList[index].right = disX;
-			} else {
-				this.collectProductList[index].right = 0;
-			}
-		},
-		drawEnd(e) {
-			let index = e.currentTarget.dataset.index;
-			let item = this.collectProductList[index];
-			console.log(item.right, "drawEnd", index);
-			if (item.right >= 80) {
-					this.collectProductList[index].right = this.delBtnWidth;
-			} else {
-					this.collectProductList[index].right = 0;
-			}
-			console.log(this.collectProductList, "drawEnd", index);
-		},
-    goGoodsCon(item) {
-      if (item.isIntegral == 1) {
-        this.$yrouter.push({
-          path: '/pages/shop/GoodsCon/index',
-          query: { id: item.pid },
-        })
-      } else {
-        this.$yrouter.push({
-          path: '/pages/shop/GoodsCon/index',
-          query: { id: item.pid },
-        })
-      }
+<template>
+  <view ref="container">
+		<view class="header">
+			<cu-custom :isBack="true" :isCenter="true">
+				<block slot="backText">
+					<view class="backImg">
+						<image src="@/static/images/back-btn.png" mode=""></image>
+					</view>
+				</block>
+				<block slot="content">
+					<view class="tab-title">我的收藏</view>
+				</block>
+			</cu-custom>
+		</view>
+		
+		<view class="content-box" :style="'height:calc(100vh - '+CustomBar+'px);'">
+			<view class="content">
+				<view class="nav acea-row row-around" :style="'top:calc('+CustomBar+'px+2px)'">
+					<view class="item" @click="changeType(0)">
+						<view :class="'title ' + (navType == 0? 'active' : '')">甄选商品</view>
+					</view>
+					<view class="item" @click="changeType(1)">
+						<view :class="'title ' + (navType === 1 ? 'active' : '')">甄选评测</view>
+					</view>
+				</view>
+				
+				
+				<view class="collectionGoods" v-if="collectProductList.length > 0">
+				  <view class="item" v-for="(item, collectProductListIndex) in collectProductList" :key="collectProductListIndex" :data-index="collectProductListIndex" @touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:' + item.right + 'rpx'">
+						<view v-if="navType==0" class="info-box acea-row row-between-wrapper" @click="goGoodsCon(item)">
+							<view class="pictrue">
+								<image :src="item.image" />
+							</view>
+							<view class="text">
+								<view class="infor line1">{{ item.storeName }}</view>
+								<view class="acea-row sku-box">
+									<view class="sku" v-if="item.productInfo.attrInfo">{{ item.productInfo.attrInfo.sku }}</view>
+								</view>
+								<view class="money" v-if="isIntegral == 1">{{ item.costPrice }}积分</view>
+								<view class="money" v-else>￥{{ item.price }}</view>
+							</view>
+						</view>
+						<!-- 评测 -->
+						<view v-else class="review-box acea-row row-between" @click="goEvaluation(item)">
+							<view class="left acea-row row-column-between">
+								<view class="acea-row row-column-between">
+									<view class="title">
+										BEJjjjjSII
+									</view>
+									<view class="title1">
+										OISJFSJIJ
+									</view>
+									<view class="title2">
+										给你电话和
+									</view>
+								</view>
+								<view @tap.stop="goMore" class="more">
+									MORE
+								</view>
+							</view>
+							<view class="right">
+								<image src="../../../static/images/earth-white.png" mode=""></image>
+							</view>
+						</view>
+						
+				    <view class="delete" @tap.stop="delCollection(collectProductListIndex)" :style="item.right?'right: -122rpx;':''" :class="{'del-height':navType==1}">删除</view>
+						
+				  </view>
+				</view>
+				
+				
+				
+				
+				<Loading :loaded="loadend" :loading="loading"></Loading>
+				
+			</view>
+		</view>
+		
+    
+    <!-- <view class="noCommodity" style="background-color:#fff;" v-if="collectProductList.length < 1 && page > 1">
+      <view class="noPictrue">
+        <image :src="`${$VUE_APP_RESOURCES_URL}/images/noCollection.png`" class="image" />
+      </view>
+      <Recommend></Recommend>
+    </view> -->
+  </view>
+</template>
+<script>
+import Recommend from '@/components/Recommend'
+import { getCollectUser, getCollectDel } from '@/api/user'
+import {delUserCollection} from '@/api/store.js'
+import Loading from '@/components/Loading'
+export default {
+  name: 'GoodsCollection',
+  components: {
+    Recommend,
+    Loading,
+  },
+  props: {},
+  data: function() {
+    return {
+			CustomBar: this.CustomBar,
+			navType: 0,
+      page: 1,
+      limit: 20,
+      type: 'collect',
+      collectProductList: [],
+      loadTitle: '',
+      loading: false,
+      loadend: false,
+			delBtnWidth: 154,
+			startX : 0
+    }
+  },
+  mounted: function() {
+    this.get_user_collect_product(this.navType)
+  },
+  onReachBottom() {
+    !this.loading && this.get_user_collect_product(this.navType)
+  },
+  methods: {
+		changeType(i) {
+			if(this.navType == i) return;
+			this.navType = i;
+		},
+		
+		drawStart(e) {
+			console.log(155555);
+			var touch = e.touches[0];
+			// let index = e.currentTarget.dataset.index;
+			for (var index in this.collectProductList) {
+					this.collectProductList[index].right = 0;
+			}
+			this.startX = touch.clientX;
+			// console.log(this.startX, "drawStart", index)
+		},
+		drawMove(e) {
+			let touch = e.touches[0];
+			// console.log(touch, "drawMove")
+			let index = e.currentTarget.dataset.index;
+			let item = this.collectProductList[index];
+			let disX = this.startX - touch.clientX;
+			
+			// console.log(index, "drawMove")
+			if (disX >= 20) {
+				if (disX > this.delBtnWidth) {
+						disX = this.delBtnWidth;
+				}
+				this.collectProductList[index].right = disX;
+			} else {
+				this.collectProductList[index].right = 0;
+			}
+		},
+		drawEnd(e) {
+			let index = e.currentTarget.dataset.index;
+			let item = this.collectProductList[index];
+			console.log(item.right, "drawEnd", index);
+			if (item.right >= 80) {
+					this.collectProductList[index].right = this.delBtnWidth;
+			} else {
+					this.collectProductList[index].right = 0;
+			}
+			console.log(this.collectProductList, "drawEnd", index);
+		},
+    goGoodsCon(item) {
+      if (item.isIntegral == 1) {
+        this.$yrouter.push({
+          path: '/pages/shop/GoodsCon/index',
+          query: { id: item.pid },
+        })
+      } else {
+        this.$yrouter.push({
+          path: '/pages/shop/GoodsCon/index',
+          query: { id: item.pid },
+        })
+      }
     },
-    get_user_collect_product: function() {
+	
+	goEvaluation(item){
+		this.$yrouter.push({
+			// 跳转评测详情
+		  path: 'pages/shop/Evaluations/EvaluationDetail/index',
+		  query: { id: item.pid },
+		})
+	},
+	goMore(){
+		this.$yrouter.push({
+			// 跳转评测详情
+		  path: 'pages/shop/Evaluations/index',
+		})
+	},
+    get_user_collect_product: function(navType,clear) {
       let that = this
-      if (that.loading) return //阻止下次请求（false可以进行请求）；
-      if (that.loadend) return //阻止结束当前请求（false可以进行请求）；
+		// if(clear){
+		// 	that.collectProductList=[]
+		// 	that.page=1
+		// 	that.limit=20
+		// }
+      if (that.loading) return //阻止下次请求（false可以进行请求）；
+      if (that.loadend) return //阻止结束当前请求（false可以进行请求）；
       that.loading = true
-      getCollectUser(that.page, that.limit, that.type).then(res => {
+	  if(navType===0){
+		  getCollectUser(that.page, that.limit, that.type).then(res => {
         that.loading = false
         //apply();js将一个数组插入另一个数组;
 				var arr = [];
@@ -167,142 +215,254 @@ export default {
         that.loadend = res.data.length < that.limit //判断所有数据是否加载完成；
         that.page = that.page + 1
       })
+	  }else{
+		  // 获取评测收藏 collectEvaluation/user
+		  getCollectEvaluation(that.page, that.limit, that.type).then(res => {
+		    that.loading = false
+		    //apply();js将一个数组插入另一个数组;
+		  				var arr = [];
+		  				for(var i in res.data){
+		  					res.data[i].right = 0;
+		  					arr.push(res.data[i])
+		  				};
+		    that.collectProductList.push.apply(that.collectProductList, arr)
+		  				// this.collectProductList.forEach(val => {
+		  				// 	val.right = 0;
+		  				// })
+		    that.loadend = res.data.length < that.limit //判断所有数据是否加载完成；
+		    that.page = that.page + 1
+		  })
+	  }
+      
+    },
+    //删除收藏；
+    delCollection: function(index) {
+      let that = this,
+        id = that.collectProductList[index].pid,
+        category = that.collectProductList[index].category
+		
+		if(that.navType===0){
+			 getCollectDel(id, category).then(function() {
+        uni.showToast({
+          title: '删除成功',
+          icon: 'success',
+          duration: 2000,
+          complete: () => {
+            that.collectProductList.splice(index, 1)
+            that.$set(that, 'collectProductList', that.collectProductList)
+          },
+        })
+      })
+		}else{
+			// 取消评测收藏
+			delUserCollection(id, category).then(function() {
+			  uni.showToast({
+			    title: '删除成功',
+			    icon: 'success',
+			    duration: 2000,
+			    complete: () => {
+			      that.collectProductList.splice(index, 1)
+			      that.$set(that, 'collectProductList', that.collectProductList)
+			    },
+			  })
+			})
+		}
+     
     },
-    //删除收藏；
-    delCollection: function(index) {
-      let that = this,
-        id = that.collectProductList[index].pid,
-        category = that.collectProductList[index].category
-      getCollectDel(id, category).then(function() {
-        uni.showToast({
-          title: '删除成功',
-          icon: 'success',
-          duration: 2000,
-          complete: () => {
-            that.collectProductList.splice(index, 1)
-            that.$set(that, 'collectProductList', that.collectProductList)
-          },
-        })
-      })
-    },
-  },
-}
-</script>
-<style lang="less" scoped>
-	.header {
-		.tab-title {
-			font-size: 32rpx;
-			font-family: PingFang SC;
-			font-weight: 600;
-			color: #2DB5AE;
-			line-height: 42rpx;
-		}
-		.backImg {
-			width: 88rpx;
-			height: 62rpx;
-			padding-left: 26rpx;
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-	
-	.content-box {
-		padding-top: 4rpx;
-		width: 100vw;
-		position: relative;
-		.content {
-			width: 100%;
-			height: 100%;
-			overflow-y: scroll;
-			background: #FFFFFF;
-			border-radius: 28rpx 28rpx 0rpx 0rpx;
-			.nav {
-				width: 100vw;
-				background: #FFFFFF;
-				height: 92rpx;
-				padding: 34rpx 32rpx 16rpx;
-				position: fixed;
-				left: 0;
-				z-index: 5;
-				border-radius: 28rpx 28rpx 0rpx 0rpx;
-				.item {
-					width: 112rpx;
-					text-align: center;
-					position: relative;
-					.title {
-						font-size: 26rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #3A3A3C;
-						line-height: 38rpx;
-					}
-					.active {
-						color: #2DB5AE;
-						font-weight: 600;
-					}
-					.title::after {
-						display: block;
-						content: '';
-						width: 100%;
-						height: 4rpx;
-						background: #2DB5AE;
-						position: absolute;
-						bottom: 0;
-						left: 0;
-						opacity: 0;
-						transform:scaleX(0);
-						transition: all .2s cubic-bezier(.18,.89,.17,.88),opacity .15s ease;
-					}
-					.active::after {
-						opacity: 1;
-						transform: scaleX(1);
-					}
-				}
-			}
-		}
-	}
-	
-	.info-box {
-		width: 686rpx;
-		height: 202rpx;
+	
+  },
+}
+</script>
+<style lang="less" scoped>
+	.review-box{
+		padding: 30rpx 30rpx 20rpx 30rpx;
+		width: 687rpx;
+		height: 250rpx;
+		border-radius: 16rpx;
 		background: #F5F6F8;
-		box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
-		border-radius: 16rpx;
-		padding: 20rpx;
-		.sku-box {
-			margin: 18rpx 0rpx;
-			height: 46rpx;
-		}
-		.sku {
-			padding: 0rpx 16rpx;
-			height: 46rpx;
-			background: #E3E3E3;
-			border-radius: 8rpx;
-			font-size: 20rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #999999;
-			line-height: 46rpx;
-		}
-	}
-	.collectionGoods .item .delete {
-		position: absolute;
-		top: 0;
-		right: -186rpx;
-		width: 154rpx;
-		height: 202rpx;
-		background: #EC3A5B;
-		box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
-		border-radius: 16rpx;
-		font-size: 26rpx;
-		font-family: PingFang SC;
-		font-weight: 600;
-		color: #FFFFFF;
-		line-height: 202rpx;
-		text-align: center;
-		text-shadow: 0rpx 10rpx 16rpx rgba(0,0,0,0.15);
-	}
-	
-</style>
+		box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
+		.left{
+			max-width: 460rpx;
+			
+			.title{
+				font-size: 36rpx;
+				font-weight: 500;
+				text-transform: uppercase;
+			}
+			.title1{
+				margin: 10rpx 0 5rpx 0;
+				font-size: 24rpx;
+				text-transform: uppercase;
+			}
+			.title2{
+				font-size: 28rpx;
+				
+			
+			}
+			.more{
+				font-size: 24rpx;
+				position: relative;
+			}
+			.more::before{
+				position: absolute;
+				border-bottom: 1rpx solid black;
+				bottom: -8rpx;
+				left: -4rpx;
+				content: '';
+				width: 100rpx;
+				background-color: black;
+				height: 1rpx;
+			}
+			.more::after{
+				margin-left: 10rpx;
+				content: '';
+				display: inline-block;
+				width: 0;
+				height: 0;
+				border-top: 10rpx solid transparent;
+				border-left: 10rpx solid black;
+				border-bottom: 10rpx solid transparent;
+				border-right: 10rpx solid transparent;
+			}
+		}
+		.right{
+			image{
+				width: 200rpx;
+				height: 100%;
+			}
+			
+		}
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	.header {
+		.tab-title {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 600;
+			color: #2DB5AE;
+			line-height: 42rpx;
+		}
+		.backImg {
+			width: 88rpx;
+			height: 62rpx;
+			padding-left: 26rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	
+	.content-box {
+		padding-top: 4rpx;
+		width: 100vw;
+		position: relative;
+		.content {
+			width: 100%;
+			height: 100%;
+			overflow-y: scroll;
+			background: #FFFFFF;
+			border-radius: 28rpx 28rpx 0rpx 0rpx;
+			.nav {
+				width: 100vw;
+				background: #FFFFFF;
+				height: 92rpx;
+				padding: 34rpx 32rpx 16rpx;
+				position: fixed;
+				left: 0;
+				z-index: 5;
+				border-radius: 28rpx 28rpx 0rpx 0rpx;
+				.item {
+					width: 112rpx;
+					text-align: center;
+					position: relative;
+					.title {
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #3A3A3C;
+						line-height: 38rpx;
+					}
+					.active {
+						color: #2DB5AE;
+						font-weight: 600;
+					}
+					.title::after {
+						display: block;
+						content: '';
+						width: 100%;
+						height: 4rpx;
+						background: #2DB5AE;
+						position: absolute;
+						bottom: 0;
+						left: 0;
+						opacity: 0;
+						transform:scaleX(0);
+						transition: all .2s cubic-bezier(.18,.89,.17,.88),opacity .15s ease;
+					}
+					.active::after {
+						opacity: 1;
+						transform: scaleX(1);
+					}
+				}
+			}
+		}
+	}
+	
+	.info-box {
+		width: 686rpx;
+		height: 202rpx;
+		background: #F5F6F8;
+		box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
+		border-radius: 16rpx;
+		padding: 20rpx;
+		.sku-box {
+			margin: 18rpx 0rpx;
+			height: 46rpx;
+		}
+		.sku {
+			padding: 0rpx 16rpx;
+			height: 46rpx;
+			background: #E3E3E3;
+			border-radius: 8rpx;
+			font-size: 20rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+			line-height: 46rpx;
+		}
+	}
+	.collectionGoods .item .delete {
+		position: absolute;
+		top: 0;
+		right: -186rpx;
+		width: 154rpx;
+		height: 202rpx;
+		background: #EC3A5B;
+		box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0,0,0,0.15);
+		border-radius: 16rpx;
+		font-size: 26rpx;
+		font-family: PingFang SC;
+		font-weight: 600;
+		color: #FFFFFF;
+		line-height: 202rpx;
+		text-align: center;
+		text-shadow: 0rpx 10rpx 16rpx rgba(0,0,0,0.15);
+	}
+	.del-height{
+		height: 250rpx !important;
+		line-height: 250rpx !important;
+	}
+	
+</style>
diff --git a/pages/shop/brands/index.vue b/pages/shop/brands/index.vue
index 4d24a7b..86a1fcb 100644
--- a/pages/shop/brands/index.vue
+++ b/pages/shop/brands/index.vue
@@ -14,11 +14,12 @@
 		</view>
 		
 		<view class="banner-box">
-			<swiper class="swiper-wrapper" @change="handleChange" :autoplay="true">
+			<swiper class="swiper-wrapper" @change="handleChange(item)" :autoplay="true">
 			  <block v-for="(item, imgUrlsIndex) in imgUrls" :key="imgUrlsIndex">
-			    <swiper-item>
-						<view class="image">{{item}}</view>
+			    <swiper-item @click="goBannerDetail(item)">
+						<!-- <view class="image">{{item}}</view> -->
 			      <!-- <image class="image" :src="item" class="slide-image" mode="aspectFill"/> -->
+				  <image  class="image slide-image" :src="item.pic" mode="aspectFill"></image>
 			    </swiper-item>
 			  </block>
 			</swiper>
@@ -35,7 +36,7 @@
 			</view>
 			<view class="min-title acea-row row-between-wrapper">
 				<view class="">选品标准</view>
-				<image src="" mode=""></image>
+				<image src="../../../static/images/laba.png" mode="aspectFill"></image>
 			</view>
 			<view class="uni-notice-bar-box">
 				<uni-notice-bar color="#2DB5AE" backgroundColor="#F1F1F1" scrollable="true" single="true" :speed="60" text="热花今将机支物极十争才线来理始"></uni-notice-bar>
@@ -96,7 +97,7 @@
 
 <script>
 	import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
-	import { getBrands, getProducts } from '@/api/store';
+	import { getBrands, getProducts ,getBanner} from '@/api/store';
 	import Loading from '@/components/Loading';
 	export default {
 		components: {
@@ -106,7 +107,7 @@
 		data() {
 			return {
 				currents: 0,
-				imgUrls: 5,
+				imgUrls: [],
 				brandList: [],
 				where: {
 				  page: 1,
@@ -123,6 +124,11 @@
 		onLoad() {
 			this.getBrandList();
 			this.getNewProducts();
+			getBanner(1).then(
+					res => {
+						this.$set(this,'imgUrls',res.data.banner)
+					})
+			
 		},
 		onReachBottom() {
 			!this.loading && this.getNewProducts();
@@ -131,6 +137,11 @@
 			handleChange(e) {
 				this.currents = e.mp.detail.current;
 			},
+			goBannerDetail(item){
+				if (item.uniapp_url) {
+					this.$yrouter.push(item.uniapp_url)
+				}
+			},
 			goDetail(item) {
 				this.$yrouter.push({
 				  path: '/pages/shop/brands/brandDetail/index',
@@ -292,7 +303,6 @@
 			image {
 				width: 26rpx;
 				height: 26rpx;
-				background-color: #2DB5AE;
 			}
 		}
 		.uni-notice-bar-box {
diff --git a/pages/user/AboutUs/index.vue b/pages/user/AboutUs/index.vue
index 6485cce..d7e4c0b 100644
--- a/pages/user/AboutUs/index.vue
+++ b/pages/user/AboutUs/index.vue
@@ -12,24 +12,39 @@
 				</block>
 			</cu-custom>
 		</view>
-		<view class="">
-			<image class="img" src="../../../static/images/guanyu.jpg" mode="widthFix"></image>
+		<view class="" v-html="aboutUsDetail">
+			<!-- <image class="img" src="../../../static/images/guanyu.jpg" mode="widthFix"></image> -->
 		</view>
 	</view>
 </template>
 
 <script>
+	import {getAboutUs} from '@/api/user.js';
 	import Tabbar from '@/components/Tabbar';
 	export default {
 		
 		data() {
 			return {
-				
+				aboutUsDetail:{}
 			};
 			
 		},
+		mounted() {
+			this.getAbout()
+		},
 		
 		methods: {
+			getAbout(){
+				uni.showLoading({
+				  title: '加载中',
+				  mask: true,
+				})
+				getAboutUs().then(res=>{
+					 uni.hideLoading()
+					this.aboutUsDetail=res.data.routine_aboutUs.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"')
+					console.log(res,'=======');
+				})
+			}
 			
 		}
 	}
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index a59ef2e..5617403 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -115,6 +115,7 @@ export default {
       this.$yrouter.push("/pages/user/ChangePassword/index");
     },
     switchAccounts: function (index) {
+		console.log(index,'1111111111111111188');
       let that = this;
       this.userIndex = index;
       let userInfo = this.switchUserInfo[this.userIndex];
@@ -181,7 +182,9 @@ export default {
 		},
 
     submit: function () {
+		
       let userInfo = this.userInfo;
+	  console.log(userInfo,'==============');
 			let data = {
 				nickname: '',
 				avatar: ''
diff --git a/pages/user/Problem/index.vue b/pages/user/Problem/index.vue
index eb89509..3d04b07 100644
--- a/pages/user/Problem/index.vue
+++ b/pages/user/Problem/index.vue
@@ -15,100 +15,60 @@
 		<view class="problem-box" v-for="(item,index) in problemList" :key="index">
 			<view class="problem-item acea-row row-between row-middle" @click="tapSwitch(index)">
 				<view class="text-box line2">
-					Q{{index+1}}：{{item.title}}
+					{{item.problem}}
 				</view>
 				<image class="img" :src="`../../../static/images/picker-${number==index?'up':'down'}.png`" mode="">
 				</image>
 			</view>
-			
+
 			<view class="problem-list" v-if="index==number">
-				<view class="item" v-for="(c,i) in item.chlidren" :key="i">
-					{{c}}
+				<view class="item">
+					{{item.answer}}
 				</view>
 			</view>
 		</view>
-		<!-- <Tabbar :pagePath="pagePath"></Tabbar> -->
 
 	</view>
 </template>
 
 <script>
 	import Tabbar from '@/components/Tabbar';
+	import {
+		getProblem
+	} from '@/api/user.js'
 	export default {
 		components: {
 			Tabbar,
 		},
 		data() {
 			return {
-				number: 0,
-				// problemList:[
-				// 	{
-				// 		title:"可以在哪里买门票可以在哪里买门可以在哪里买门票可以在哪里买门可以在哪里买门票可以在哪里买门可以在哪里买门票可以在哪里买门",
-				// 		chlidren:[
-				// 			'问题一: 可以在哪里买门票可以在哪里买门可以在哪里买门票可以在哪里买门可以在哪里买门票可以在哪里买门可以在哪里买门票可以在哪里买门',
-				// 			'问题二',
-				// 			'问题三'
-				// 		]
-				// 	},
-				// 	{
-				// 		title:"可以在哪里买门票可以在哪里买门",
-				// 		chlidren:[
-				// 			'问题一',
-				// 			'问题二',
-				// 			'问题三'
-				// 		]
-				// 	},
-				// 	{
-				// 		title:"可以在哪里买门票可以在哪里买门",
-				// 		chlidren:[
-				// 			'问题一',
-				// 			'问题二',
-				// 			'问题三'
-				// 		]
-				// 	}
-				// ],
-				problemList: [{
-						title: "可以在哪里买门票可以在哪里买门可以在哪里买门票可以在哪里买门可以在哪里买门票可以在哪里买门可以在哪里买门票可以在哪里买门",
-						chlidren: '方案一: 可以在哪里买门票可以在哪里买门可;方案二: 以在哪里买门票可以在哪里买门可以在哪里买门;方案三: 票可以在哪里买门可以在哪里买门票可以在哪里买门',
-
-
-					},
-					{
-						title: "可以在哪里买门票可以在哪里买门",
-						chlidren: '方案一: 可以在哪里买门票可以在哪里买门可;方案二: 以在哪里买门票可以在哪里买门可以在哪里买门;方案三: 票可以在哪里买门可以在哪里买门票可以在哪里买门',
-					},
-					{
-						title: "可以在哪里买门票可以在哪里买门",
-						chlidren: '方案一: 可以在哪里买门票可以在哪里买门可;方案二: 以在哪里买门票可以在哪里买门可以在哪里买门;方案三: 票可以在哪里买门可以在哪里买门票可以在哪里买门',
-					}
-				]
-
-
+				number: -1,
+				problemList:[]
+			
 			};
-
 		},
 		onLoad() {
-
-			// uni.hideTabBar();
-			// let pages = getCurrentPages();
-			// this.pagePath = '/' + pages[pages.length - 1].route;
-			this.problemList.forEach(item => {
-				item.chlidren = item.chlidren.split(';')
-				console.log(item, '---------------');
-			})
-			console.log(this.problemList, '=============');
+			this.getMenu()
 		},
 
 		methods: {
-
+			getMenu() {
+				uni.showLoading({
+				  title: '加载中',
+				  mask: true,
+				})
+				getProblem().then(res => {
+					uni.hideLoading()
+					this.problemList=res.data.routine_problem
+					console.log(this.problemList, '======');
+				})
+			},
 			tapSwitch(index) {
-
 				if (this.number === index) {
 					this.number = -1
 					return
 				}
 				this.number = index
-
 			}
 		}
 	}
diff --git a/pages/user/coupon/GetCoupon/index.vue b/pages/user/coupon/GetCoupon/index.vue
index c0b4ebb..9fd5775 100644
--- a/pages/user/coupon/GetCoupon/index.vue
+++ b/pages/user/coupon/GetCoupon/index.vue
@@ -15,10 +15,10 @@
 		
 		<view class="banner-box">
 			<swiper class="swiper-wrapper" @change="handleChange" :autoplay="true">
-			  <block v-for="(item, imgUrlsIndex) in imgUrls" :key="imgUrlsIndex">
-			    <swiper-item>
-						<view class="image">{{item}}</view>
-			      <!-- <image class="image" :src="item" class="slide-image" mode="aspectFill"/> -->
+			  <block v-for="(item, imgUrlsIndex) in imgUrls" :key="imgUrlsIndex" >
+			    <swiper-item @click="goBannerDetail">
+					<!-- <view class="image">{{item}}</view> -->
+				  <image  class="image" :src="item.pic" mode="aspectFill"></image>
 			    </swiper-item>
 			  </block>
 			</swiper>
@@ -114,6 +114,7 @@
 </template>
 <script>
 import { getCoupon, getCouponReceive } from '@/api/user'
+import { getBanner} from '@/api/store';
 import Loading from '@/components/Loading'
 import DataFormatT from '@/components/DataFormatT'
 export default {
@@ -131,16 +132,27 @@ export default {
       couponsList: [],
       loading: false,
       loadend: false,
-			imgUrls: 5
+	imgUrls:[]	
     }
   },
   mounted: function() {
     this.getUseCoupons()
+	
+	getBanner(2).then(
+		res => {
+			this.$set(this,'imgUrls',res.data.banner)
+		})
   },
   onReachBottom() {
     !this.loading && this.getUseCoupons()
   },
   methods: {
+	  goBannerDetail(item){
+		  console.log('----------------------------');
+	  	if (item.uniapp_url) {
+	  		this.$yrouter.push(item.uniapp_url)
+	  	}
+	  },
 		handleChange(e) {
 			this.currents = e.mp.detail.current;
 		},
diff --git a/pages/user/signIn/Sign/index.vue b/pages/user/signIn/Sign/index.vue
index 7488ac3..43cf4cb 100644
--- a/pages/user/signIn/Sign/index.vue
+++ b/pages/user/signIn/Sign/index.vue
@@ -433,6 +433,7 @@
 					uni.hideLoading();
 					res.data.integral = parseInt(res.data.integral);
 					var sumSginDay = res.data.sumSignDay;
+					
 					that.userInfo = res.data;
 					that.signCount = String(res.data.sumSignDay);
 					// that.signCount = that.PrefixInteger(sumSginDay, 4);