diff --git a/manifest.json b/manifest.json
index eda2d30..fef0132 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,32 +1,32 @@
 {
-    "name": "yshopmall",
-    "appid": "__UNI__C7A519E",
-    "description": "",
-    "versionName": "1.0.0",
-    "versionCode": 1,
-    "transformPx": false,
+    "name" : "yshop商城演示版",
+    "appid" : "__UNI__C7A519E",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : 1,
+    "transformPx" : false,
     /* 5+App特有相关 */
-    "app-plus": {
-        "usingComponents": true,
-        "nvueCompiler": "uni-app",
-        "compilerVersion": 3,
-        "splashscreen": {
-            "alwaysShowBeforeRender": true,
-            "waiting": false,
-            "autoclose": true,
-            "delay": 0
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : false,
+            "autoclose" : true,
+            "delay" : 0
         },
         /* 模块配置 */
-        "modules": {
-            "OAuth": {},
-            "Payment": {},
-            "Share": {}
+        "modules" : {
+            "OAuth" : {},
+            "Payment" : {},
+            "Share" : {}
         },
         /* 应用发布信息 */
-        "distribute": {
+        "distribute" : {
             /* android打包配置 */
-            "android": {
-                "permissions": [
+            "android" : {
+                "permissions" : [
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
@@ -52,127 +52,127 @@
                 ]
             },
             /* ios打包配置 */
-            "ios": {},
+            "ios" : {},
             /* SDK配置 */
-            "sdkConfigs": {
-                "oauth": {
-                    "weixin": {
-                        "appid": "wx7c84ede33062d1e4",
-                        "appsecret": "c47ef66d3311194da44e60387d5c1abd",
-                        "UniversalLinks": "https://yixiang.co/app/"
+            "sdkConfigs" : {
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wx7c84ede33062d1e4",
+                        "appsecret" : "c47ef66d3311194da44e60387d5c1abd",
+                        "UniversalLinks" : "https://yixiang.co/app/"
                     }
                 },
-                "payment": {
-                    "weixin": {
-                        "appid": "wx7c84ede33062d1e4",
-                        "UniversalLinks": "https://yixiang.co/app/"
+                "payment" : {
+                    "weixin" : {
+                        "appid" : "wx7c84ede33062d1e4",
+                        "UniversalLinks" : "https://yixiang.co/app/"
                     }
                 },
-                "share": {
-                    "weixin": {
-                        "appid": "wx7c84ede33062d1e4",
-                        "UniversalLinks": "https://yixiang.co/app/"
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx7c84ede33062d1e4",
+                        "UniversalLinks" : "https://yixiang.co/app/"
                     }
                 },
-                "ad": {}
+                "ad" : {}
             },
-            "splashscreen": {
-                "ios": {
-                    "iphone": {
-                        "portrait-896h@3x": "unpackage/res/splash/1242+2688.png",
-                        "portrait-896h@2x": "unpackage/res/splash/828+1792.png",
-                        "iphonex": "unpackage/res/splash/1125+2436.png",
-                        "retina55": "unpackage/res/splash/1142+2208.png",
-                        "retina47": "unpackage/res/splash/750+1334.png",
-                        "retina40": "unpackage/res/splash/640+1136.png",
-                        "retina35": "unpackage/res/splash/640+960.png"
+            "splashscreen" : {
+                "ios" : {
+                    "iphone" : {
+                        "portrait-896h@3x" : "unpackage/res/splash/1242+2688.png",
+                        "portrait-896h@2x" : "unpackage/res/splash/828+1792.png",
+                        "iphonex" : "unpackage/res/splash/1125+2436.png",
+                        "retina55" : "unpackage/res/splash/1142+2208.png",
+                        "retina47" : "unpackage/res/splash/750+1334.png",
+                        "retina40" : "unpackage/res/splash/640+1136.png",
+                        "retina35" : "unpackage/res/splash/640+960.png"
                     }
                 },
-                "android": {
-                    "hdpi": "unpackage/res/splash/480+762.png",
-                    "xhdpi": "unpackage/res/splash/720+1242.png",
-                    "xxhdpi": "unpackage/res/splash/1080+1882.png"
+                "android" : {
+                    "hdpi" : "unpackage/res/splash/480+762.png",
+                    "xhdpi" : "unpackage/res/splash/720+1242.png",
+                    "xxhdpi" : "unpackage/res/splash/1080+1882.png"
                 }
             },
-            "icons": {
-                "android": {
-                    "hdpi": "unpackage/res/icons/72x72.png",
-                    "xhdpi": "unpackage/res/icons/96x96.png",
-                    "xxhdpi": "unpackage/res/icons/144x144.png",
-                    "xxxhdpi": "unpackage/res/icons/192x192.png"
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
-                "ios": {
-                    "appstore": "unpackage/res/icons/1024x1024.png",
-                    "ipad": {
-                        "app": "unpackage/res/icons/76x76.png",
-                        "app@2x": "unpackage/res/icons/152x152.png",
-                        "notification": "unpackage/res/icons/20x20.png",
-                        "notification@2x": "unpackage/res/icons/40x40.png",
-                        "proapp@2x": "unpackage/res/icons/167x167.png",
-                        "settings": "unpackage/res/icons/29x29.png",
-                        "settings@2x": "unpackage/res/icons/58x58.png",
-                        "spotlight": "unpackage/res/icons/40x40.png",
-                        "spotlight@2x": "unpackage/res/icons/80x80.png"
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
-                    "iphone": {
-                        "app@2x": "unpackage/res/icons/120x120.png",
-                        "app@3x": "unpackage/res/icons/180x180.png",
-                        "notification@2x": "unpackage/res/icons/40x40.png",
-                        "notification@3x": "unpackage/res/icons/60x60.png",
-                        "settings@2x": "unpackage/res/icons/58x58.png",
-                        "settings@3x": "unpackage/res/icons/87x87.png",
-                        "spotlight@2x": "unpackage/res/icons/80x80.png",
-                        "spotlight@3x": "unpackage/res/icons/120x120.png"
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             }
         }
     },
-    "quickapp": {},
-    "mp-weixin": {
-        "appid": "wx604d2ea4702620d2",
-        "setting": {
-            "urlCheck": false
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wx604d2ea4702620d2",
+        "setting" : {
+            "urlCheck" : false
         },
-        "usingComponents": true,
-        "permission": {
-            "scope.userLocation": {
-                "desc": "你的位置信息将用于小程序位置接口的效果展示"
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
             }
         },
-        "plugins": {
-            "live-player-plugin": {
+        "plugins" : {
+            "live-player-plugin" : {
                 // 注意填写该直播组件最新版本号，微信开发者工具调试时可获取最新版本号（复制时请去掉注释）
-                "version": "1.1.9",
+                "version" : "1.1.9",
                 // 必须填该直播组件appid，该示例值即为直播组件appid（复制时请去掉注释）
-                "provider": "wx2b03c6e691cd7370"
+                "provider" : "wx2b03c6e691cd7370"
             }
         }
     },
-    "mp-alipay": {
-        "usingComponents": true
+    "mp-alipay" : {
+        "usingComponents" : true
     },
-    "mp-baidu": {
-        "usingComponents": true
+    "mp-baidu" : {
+        "usingComponents" : true
     },
-    "mp-toutiao": {
-        "usingComponents": true
+    "mp-toutiao" : {
+        "usingComponents" : true
     },
-    "h5": {
-        "title": "yshop",
-        "devServer": {
-            "disableHostCheck": true
+    "h5" : {
+        "title" : "yshop",
+        "devServer" : {
+            "disableHostCheck" : true
         },
-        "router": {
-            "mode": "history"
+        "router" : {
+            "mode" : "history"
         },
-        "sdkConfigs": {
-            "maps": {
-                "qqmap": {
-                    "key": ""
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : ""
                 }
             }
         },
-        "domain": "h5.yixiang.co"
+        "domain" : "h5.yixiang.co"
     }
 }
diff --git a/pages/activity/GoodsGroup/index.vue b/pages/activity/GoodsGroup/index.vue
index 51a8326..4900543 100644
--- a/pages/activity/GoodsGroup/index.vue
+++ b/pages/activity/GoodsGroup/index.vue
@@ -4,7 +4,7 @@
       <scroll-view class="scroll-box" scroll-y enable-back-to-top scroll-with-animation @scrolltolower="loadMore">
         <view class="group-wrap">
           <view class="group-head x-bc">
-            <text class="group-head__title">爆款推荐</text>
+            <text class="group-head__title">爆款拼团</text>
             <text class="group-head__notice">省钱省心限时拼</text>
           </view>
           <view class="group-box">
@@ -129,7 +129,7 @@ export default {
 
 <style lang="scss">
 .group-wrap {
-  background: url('~@/static/images/group_list_bg.png') no-repeat;
+  background: url('~@/static/images/index-bg.png') no-repeat;
   background-size: 100% 374rpx;
 }
 .group-head {
diff --git a/pages/shop/GoodsFoot/index.vue b/pages/shop/GoodsFoot/index.vue
new file mode 100644
index 0000000..2b98172
--- /dev/null
+++ b/pages/shop/GoodsFoot/index.vue
@@ -0,0 +1,102 @@
+<template>
+  <view ref="container">
+    <view class="collectionGoods" v-if="collectProductList.length > 0">
+      <view
+        class="item acea-row row-between-wrapper"
+        v-for="(item, collectProductListIndex) in collectProductList"
+        :key="collectProductListIndex"
+        @click="goGoodsCon(item)"
+      >
+        <view class="pictrue">
+          <image :src="item.image" />
+        </view>
+        <view class="text acea-row row-column-between">
+          <view class="infor line1">{{ item.storeName }}</view>
+          <view class="acea-row row-between-wrapper">
+            <view class="money font-color-red">￥{{ item.price }}</view>
+            <view class="delete" @tap.stop="delCollection(collectProductListIndex)">删除</view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <Loading :loaded="loadend" :loading="loading"></Loading>
+    <view
+      class="noCommodity"
+      style="background-color:#fff;"
+      v-if="collectProductList.length < 1 && page > 1"
+    >
+      <view class="noPictrue">
+        <image src="@/static/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 {
+      page: 1,
+      limit: 20,
+      type:'foot',
+      collectProductList: [],
+      loadTitle: "",
+      loading: false,
+      loadend: false
+    };
+  },
+  mounted: function() {
+    this.get_user_collect_product();
+  },
+  onReachBottom() {
+    !this.loading && this.get_user_collect_product();
+  },
+  methods: {
+    goGoodsCon(item) {
+      this.$yrouter.push({
+        path: "/pages/shop/GoodsCon/index",
+        query: { id: item.pid }
+      });
+    },
+    get_user_collect_product: function() {
+      let that = this;
+      if (that.loading) return; //阻止下次请求（false可以进行请求）；
+      if (that.loadend) return; //阻止结束当前请求（false可以进行请求）；
+      that.loading = true;
+      getCollectUser(that.page, that.limit,that.type).then(res => {
+        that.loading = false;
+        //apply();js将一个数组插入另一个数组;
+        that.collectProductList.push.apply(that.collectProductList, res.data);
+        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;
+      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>
diff --git a/static/images/group_list_bg.png b/static/images/group_list_bg.png
deleted file mode 100644
index 57db83d..0000000
Binary files a/static/images/group_list_bg.png and /dev/null differ