From 3526914a0d165d2793aead7b0c36fe25f7a9e23c Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <aa123456>
Date: Mon, 23 Oct 2023 15:03:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                         |   5 +-
 manifest.json                     |  30 ++--
 pages.json                        |  22 +--
 pages/index/components/banner.vue | 161 +++++++++++++++++++
 pages/index/components/goods.vue  | 256 ++++++++++++++++++++++++++++++
 pages/index/components/search.vue | 237 +++++++++++++++++++++++++++
 pages/index/index - 副本.vue    | 132 +++++++++++++++
 pages/index/index.vue             | 155 ++++++++++++------
 static/01.png                     | Bin 4103 -> 0 bytes
 9 files changed, 912 insertions(+), 86 deletions(-)
 create mode 100644 pages/index/components/banner.vue
 create mode 100644 pages/index/components/goods.vue
 create mode 100644 pages/index/components/search.vue
 create mode 100644 pages/index/index - 副本.vue
 delete mode 100644 static/01.png

diff --git a/config.js b/config.js
index 6da5b30..b137fc0 100644
--- a/config.js
+++ b/config.js
@@ -1,12 +1,11 @@
 module.exports = {
 
   // 系统名称
-  name: "工会活动",
+  name: "萤火商城2.0",
 
   // 必填: 后端api地址, 斜杠/结尾, 参照下面格式
   // 例如: https://www.你的域名.com/index.php?s=/api/
-  //apiUrl: "https://www.你的域名.com/index.php?s=/api/",
-  apiUrl: "https://192.168.66.16:8089/index.php?s=/api/",
+  apiUrl: "http://192.168.66.16:8089/index.php?s=/api/",
 
   /**
    * 是否启用商城设置缓存
diff --git a/manifest.json b/manifest.json
index b8ed184..2d9d328 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name" : "szgh",
-    "appid" : "__UNI__2C2043C",
+    "name" : "萤火商城2.0",
+    "appid" : "",
     "description" : "萤火商城V2.0，是2021年全新推出的一款轻量级、高性能、前后端分离的电商系统",
     "versionName" : "2.0.3",
     "versionCode" : 203,
@@ -72,19 +72,19 @@
     "mp-weixin" : {
         "appid" : "",
         "setting" : {
-            // 是否检查安全域名和 TLS 版本
-            "urlCheck" : true,
-            // es6转es5
-            "es6" : false,
-            // 上传代码时自动压缩
-            "minified" : true,
-            // 调试器 wxml面板展示 shadow-root
-            "showShadowRootInWxmlPanel" : true,
-            // 上传代码时是否自动压缩样式文件
-            "minifyWXSS" : true,
-            // 上传代码时是否自动压缩wxml文件
-            // 因uniappp构建出来的wxml本身就是压缩好的, 如果再用微信开发工具压缩一次的话, 有可能会破坏到文件, 所以此处设为false
-            "minifyWXML" : false
+          // 是否检查安全域名和 TLS 版本
+          "urlCheck" : true,
+          // es6转es5
+          "es6" : false,
+          // 上传代码时自动压缩
+          "minified" : true,
+          // 调试器 wxml面板展示 shadow-root
+          "showShadowRootInWxmlPanel" : true,
+          // 上传代码时是否自动压缩样式文件
+          "minifyWXSS" : true,
+          // 上传代码时是否自动压缩wxml文件
+          // 因uniappp构建出来的wxml本身就是压缩好的, 如果再用微信开发工具压缩一次的话, 有可能会破坏到文件, 所以此处设为false
+          "minifyWXML" : false
         },
         "usingComponents" : true,
         "lazyCodeLoading" : "requiredComponents",
diff --git a/pages.json b/pages.json
index 4a5a4b1..52489df 100644
--- a/pages.json
+++ b/pages.json
@@ -28,7 +28,7 @@
   },
   "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
     {
-      "path": "pages/index/home",
+      "path": "pages/index/index",
       "style": {
         "enablePullDownRefresh": true,
 		"navigationStyle": "custom"
@@ -239,25 +239,7 @@
         "navigationBarTitleText": "申请售后"
       }
     }
-      ,{
-            "path" : "pages/index/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/cal/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+  ],
   "globalStyle": {
     // #ifdef H5
     // "navigationStyle": "custom",
diff --git a/pages/index/components/banner.vue b/pages/index/components/banner.vue
new file mode 100644
index 0000000..0f8c483
--- /dev/null
+++ b/pages/index/components/banner.vue
@@ -0,0 +1,161 @@
+<template>
+  <view class="diy-banner" style="height: 13rem;">
+    <!-- 图片轮播 -->
+    <swiper class="swiper-box" :autoplay="autoplay" duration="800" circular="true" interval="3000" @change="_bindChange">
+      <swiper-item v-for="(dataItem, index) in dataList" :key="index">
+        <image mode="widthFix" class="slide-image" :src="dataItem.imgUrl" @click="onLink(dataItem.link)" @load="_imagesHeight" />
+      </swiper-item>
+    </swiper>
+    <!-- 指示点 -->
+    <view class="indicator-dots rectangle">
+      <view class="dots-item" :class="{ active: imgCurrent == index }" style="{ backgroundColor:#e2534d }"
+        v-for="(dataItem, index) in dataList" :key="index"></view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import mixin from '@/components/page/mixin.js';
+
+  export default {
+    name: 'Banner',
+
+    /**
+     * 组件的属性列表
+     * 用于组件自定义设置
+     */
+    props: {
+      // itemIndex: String,
+      // itemStyle: Object,
+      // params: Object,
+      dataList: Array
+    },
+	
+	watch:{
+		dataList:function(e){
+			console.log("datalist",e)
+		}
+	},
+
+    mixins: [mixin],
+
+    /**
+     * 私有数据,组件的初始数据
+     * 可用于模版渲染
+     */
+    data() {
+      return {
+        windowWidth: 750,
+        indicatorDots: false, // 是否显示面板指示点
+        autoplay: true, // 是否自动切换
+        duration: 800, // 滑动动画时长
+        imgHeights: [], // 图片的高度
+        imgCurrent: 0 // 当前banne所在滑块指针
+      };
+    },
+
+    created() {
+      const app = this;
+      uni.getSystemInfo({
+        success({ windowWidth }) {
+          app.windowWidth = windowWidth > 750 ? 750 : windowWidth;
+        }
+      });
+    },
+
+    /**
+     * 组件的方法列表
+     * 更新属性和数据的方法与更新页面数据的方法类似
+     */
+    methods: {
+      /**
+       * 计算图片高度
+       */
+      _imagesHeight({ detail }) {
+		  console.log(detail)
+        const app = this;
+        // 获取图片真实宽度
+        const { width, height } = detail;
+        // 宽高比
+        const ratio = width / height;
+        // 计算的高度值
+        const viewHeight = app.windowWidth / ratio;
+        // 把每一张图片的高度记录到数组里
+        app.imgHeights.push(viewHeight);
+      },
+
+      /**
+       * 记录当前指针
+       */
+      _bindChange(e) {
+        this.imgCurrent = e.detail.current;
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .diy-banner {
+    position: relative;
+
+    // swiper组件
+    .swiper-box {
+      height: 100%;
+
+      .slide-image {
+        width: 100%;
+        height: 100%;
+        margin: 0 auto;
+        display: block;
+      }
+    }
+
+    /* 指示点 */
+    .indicator-dots {
+      width: 100%;
+      height: 28rpx;
+      padding: 0 20rpx;
+      position: absolute;
+      left: 0;
+      right: 0;
+      bottom: 20rpx;
+      opacity: 0.8;
+      display: flex;
+      justify-content: center;
+
+      .dots-item {
+        width: 16rpx;
+        height: 16rpx;
+        margin-right: 8rpx;
+        background-color: #fff;
+
+        &:last-child {
+          margin-right: 0;
+        }
+
+        &.active {
+          background-color: #313131 !important;
+        }
+      }
+
+      // 圆形
+      &.round .dots-item {
+        width: 16rpx;
+        height: 16rpx;
+        border-radius: 20rpx;
+      }
+
+      // 正方形
+      &.square .dots-item {
+        width: 16rpx;
+        height: 16rpx;
+      }
+
+      // 长方形
+      &.rectangle .dots-item {
+        width: 22rpx;
+        height: 14rpx;
+      }
+    }
+  }
+</style>
diff --git a/pages/index/components/goods.vue b/pages/index/components/goods.vue
new file mode 100644
index 0000000..10099fc
--- /dev/null
+++ b/pages/index/components/goods.vue
@@ -0,0 +1,256 @@
+<template>
+  <!-- 商品组 -->
+  <view class="diy-goods" :style="{ background: itemStyle.background }">
+    <view class="goods-list" :class="[`display__${itemStyle.display}`, `column__${itemStyle.column}`]">
+      <scroll-view :scroll-x="itemStyle.display === 'slide'">
+        <view class="goods-item" v-for="(dataItem, index) in dataList" :key="index" @click="onTargetGoods(dataItem.goods_id)">
+
+          <!-- 单列商品 -->
+          <block v-if="itemStyle.column === 1">
+            <view class="dis-flex">
+              <!-- 商品图片 -->
+              <view class="goods-item_left">
+                <image class="image" :src="dataItem.goods_image"></image>
+              </view>
+              <view class="goods-item_right">
+                <!-- 商品名称 -->
+                <view v-if="itemStyle.show.includes('goodsName')" class="goods-name">
+                  <text class="twoline-hide">{{ dataItem.goods_name }}</text>
+                </view>
+                <view class="goods-item_desc">
+                  <!-- 商品卖点 -->
+                  <view v-if="itemStyle.show.includes('sellingPoint')" class="desc-selling_point dis-flex">
+                    <text class="oneline-hide">{{ dataItem.selling_point }}</text>
+                  </view>
+                  <!-- 商品销量 -->
+                  <view v-if="itemStyle.show.includes('goodsSales')" class="desc-goods_sales dis-flex">
+                    <text>已售{{ dataItem.goods_sales }}件</text>
+                  </view>
+                  <!-- 商品价格 -->
+                  <view class="desc_footer">
+                    <text v-if="itemStyle.show.includes('goodsPrice')" class="price_x">¥{{ dataItem.goods_price_min }}</text>
+                    <text class="price_y col-9"
+                      v-if="itemStyle.show.includes('linePrice') && dataItem.line_price_min > 0">¥{{ dataItem.line_price_min }}</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </block>
+          <!-- 多列商品 -->
+          <block v-else>
+            <!-- 商品图片 -->
+            <view class="goods-image">
+              <image class="image" mode="aspectFill" :src="dataItem.goods_image"></image>
+            </view>
+            <view class="detail">
+              <!-- 商品标题 -->
+              <view v-if="itemStyle.show.includes('goodsName')" class="goods-name">
+                <text class="twoline-hide">{{ dataItem.goods_name }}</text>
+              </view>
+              <!-- 商品价格 -->
+              <view class="detail-price oneline-hide">
+                <text v-if="itemStyle.show.includes('goodsPrice')" class="goods-price f-30 col-m">￥{{ dataItem.goods_price_min }}</text>
+                <text v-if="itemStyle.show.includes('linePrice') && dataItem.line_price_min > 0"
+                  class="line-price col-9 f-24">￥{{ dataItem.line_price_min }}</text>
+              </view>
+            </view>
+          </block>
+
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: "Goods",
+    /**
+     * 组件的属性列表
+     * 用于组件自定义设置
+     */
+    props: {
+      itemIndex: String,
+      itemStyle: Object,
+      params: Object,
+      dataList: Array
+    },
+
+    /**
+     * 组件的方法列表
+     * 更新属性和数据的方法与更新页面数据的方法类似
+     */
+    methods: {
+
+      /**
+       * 跳转商品详情页
+       */
+      onTargetGoods(goodsId) {
+        this.$navTo(`pages/goods/detail`, { goodsId })
+      }
+
+    }
+
+  }
+</script>
+
+<style lang="scss" scoped>
+  .diy-goods {
+    .goods-list {
+      padding: 4rpx;
+      box-sizing: border-box;
+
+      .goods-item {
+        box-sizing: border-box;
+        padding: 6rpx;
+
+        .goods-image {
+          position: relative;
+          width: 100%;
+          height: 0;
+          padding-bottom: 100%;
+          overflow: hidden;
+          background: #fff;
+
+          &:after {
+            content: '';
+            display: block;
+            margin-top: 100%;
+          }
+
+          .image {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            top: 0;
+            left: 0;
+            -o-object-fit: cover;
+            object-fit: cover;
+          }
+        }
+
+        .detail {
+          padding: 8rpx;
+          background: #fff;
+
+          .goods-name {
+            min-height: 68rpx;
+            line-height: 1.3;
+            white-space: normal;
+            color: #484848;
+            font-size: 26rpx;
+          }
+
+          .detail-price {
+            .goods-price {
+              margin-right: 8rpx;
+            }
+
+            .line-price {
+              text-decoration: line-through;
+            }
+          }
+        }
+      }
+
+      &.display__slide {
+        white-space: nowrap;
+        font-size: 0;
+
+        .goods-item {
+          display: inline-block;
+        }
+      }
+
+      &.display__list {
+        .goods-item {
+          float: left;
+        }
+      }
+
+      &.column__2 {
+        .goods-item {
+          width: 50%;
+        }
+      }
+
+      &.column__3 {
+        .goods-item {
+          width: 33.33333%;
+        }
+      }
+
+      &.column__1 {
+        .goods-item {
+          width: 100%;
+          height: 280rpx;
+          margin-bottom: 12rpx;
+          padding: 20rpx;
+          box-sizing: border-box;
+          background: #fff;
+          line-height: 1.6;
+
+          &:last-child {
+            margin-bottom: 0;
+          }
+        }
+
+        .goods-item_left {
+          display: flex;
+          width: 40%;
+          background: #fff;
+          align-items: center;
+
+          .image {
+            display: block;
+            width: 240rpx;
+            height: 240rpx;
+          }
+        }
+
+        .goods-item_right {
+          position: relative;
+          width: 60%;
+
+          .goods-name {
+            margin-top: 20rpx;
+            min-height: 68rpx;
+            line-height: 1.3;
+            white-space: normal;
+            color: #484848;
+            font-size: 26rpx;
+          }
+        }
+
+        .goods-item_desc {
+          margin-top: 8rpx;
+        }
+
+        .desc-selling_point {
+          width: 400rpx;
+          font-size: 24rpx;
+          color: #e49a3d;
+        }
+
+        .desc-goods_sales {
+          color: #999;
+          font-size: 24rpx;
+        }
+
+        .desc_footer {
+          font-size: 24rpx;
+
+          .price_x {
+            margin-right: 16rpx;
+            color: #f03c3c;
+            font-size: 30rpx;
+          }
+
+          .price_y {
+            text-decoration: line-through;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/pages/index/components/search.vue b/pages/index/components/search.vue
new file mode 100644
index 0000000..169e58c
--- /dev/null
+++ b/pages/index/components/search.vue
@@ -0,0 +1,237 @@
+<template>
+  <view class="sovue">
+  <!-- <view class="container"> -->
+
+    <view class="search-wrapper">
+      <view class="search-input">
+        <view class="search-input-wrapper">
+          <view class="left">
+            <text class="search-icon iconfont icon-search"></text>
+          </view>
+          <view class="right">
+            <input v-model="searchValue" class="input" focus="true" placeholder="请输入搜索关键词" type="text"></input>
+          </view>
+        </view>
+      </view>
+      <view class="search-button">
+        <view class="button" @click="onSearch">搜索</view>
+      </view>
+    </view>
+    <view class="history" v-if="historySearch.length">
+      <view class="his-head">
+        <text class="title">最近搜索</text>
+        <text class="icon iconfont icon-delete" @click="clearSearch"></text>
+      </view>
+      <view class="his-list">
+        <view class="his-item" v-for="(val, index) in historySearch" :key="index">
+          <view class="history-button" @click="handleQuick(val)">{{ val }}</view>
+        </view>
+      </view>
+    </view>
+    <!-- </view> -->
+  </view>
+</template>
+
+<script>
+  const HISTORY_SEARCH = 'historySearch'
+
+  export default {
+    data() {
+      return {
+        historySearch: [],
+        searchValue: ''
+      }
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+      // 获取历史搜索
+      this.historySearch = this.getHistorySearch()
+    },
+
+    methods: {
+
+      /**
+       * 获取历史搜索
+       */
+      getHistorySearch() {
+        return uni.getStorageSync(HISTORY_SEARCH) || []
+      },
+
+      /**
+       * 搜索提交
+       */
+      onSearch() {
+        const { searchValue } = this
+        if (searchValue) {
+          // 记录历史搜索
+          this.setHistory(searchValue)
+          // 跳转到商品列表页
+          this.$navTo('pages/goods/list', { search: searchValue })
+        }
+      },
+
+      /**
+       * 记录历史搜索
+       */
+      setHistory(searchValue) {
+        const data = this.getHistorySearch()
+        const index = data.indexOf(searchValue)
+        index > -1 && data.splice(index, 1)
+        data.unshift(searchValue)
+        this.historySearch = data
+        this.onUpdateStorage()
+      },
+
+      /**
+       * 清空最近搜索记录
+       */
+      clearSearch() {
+        this.historySearch = []
+        this.onUpdateStorage()
+      },
+
+      /**
+       * 更新历史搜索缓存
+       * @param {Object} data
+       */
+      onUpdateStorage(data) {
+        uni.setStorageSync(HISTORY_SEARCH, this.historySearch)
+      },
+
+      /**
+       * 跳转到最近搜索
+       */
+      handleQuick(search) {
+        this.$navTo('pages/goods/list', { search })
+      }
+
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .container {
+    padding: 20rpx;
+    min-height: 100vh;
+    background: #f7f7f7;
+  }
+  
+  .sovue{
+	padding: 20rpx;
+	position: absolute;
+	top: 20rpx;
+	left: 4rpx;
+	width: 100%;
+  }
+
+  .search-wrapper {
+    display: flex;
+    height: 84rpx;
+  }
+
+  // 搜索输入框
+  .search-input {
+    width: 80%;
+    background: #fff;
+    border-radius: 10rpx 0 0 10rpx;
+    box-sizing: border-box;
+    overflow: hidden;
+
+    .search-input-wrapper {
+      display: flex;
+
+      .left {
+        display: flex;
+        width: 60rpx;
+        justify-content: center;
+        align-items: center;
+
+        .search-icon {
+          display: block;
+          color: #b4b4b4;
+          font-size: 28rpx;
+        }
+
+      }
+
+      .right {
+        flex: 1;
+
+        input {
+          font-size: 28rpx;
+          height: 84rpx;
+          display: flex;
+          align-items: center;
+
+          .input-placeholder {
+            color: #aba9a9;
+          }
+        }
+
+      }
+    }
+  }
+
+  // 搜索按钮
+  .search-button {
+    width: 20%;
+    box-sizing: border-box;
+
+    .button {
+      height: 84rpx;
+      font-size: 28rpx;
+      border-radius: 0 10rpx 10rpx 0;
+      background: #fa2209;
+      color: #fff;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+
+
+  // 最近搜索
+  .history {
+
+    .his-head {
+      font-size: 28rpx;
+      padding: 50rpx 0 0 0;
+      color: #777;
+
+      .icon {
+        float: right;
+      }
+
+    }
+
+    .his-list {
+      padding: 20rpx 0;
+      overflow: hidden;
+
+      .his-item {
+        width: 33.3%;
+        float: left;
+        padding: 10rpx;
+        box-sizing: border-box;
+
+        .history-button {
+          text-align: center;
+          padding: 14rpx;
+          line-height: 30rpx;
+          border-radius: 100rpx;
+          background: #fff;
+          font-size: 26rpx;
+          border: 1rpx solid #efefef;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+      }
+
+    }
+  }
+</style>
diff --git a/pages/index/index - 副本.vue b/pages/index/index - 副本.vue
new file mode 100644
index 0000000..b35568d
--- /dev/null
+++ b/pages/index/index - 副本.vue	
@@ -0,0 +1,132 @@
+<template>
+  <view class="container">
+    <!-- 店铺页面组件 -->
+    <Page :items="items" />
+  </view>
+</template>
+
+<script>
+  import { setCartTabBadge } from '@/core/app'
+  import * as Api from '@/api/page'
+  import Page from '@/components/page'
+
+  const App = getApp()
+
+  export default {
+    components: {
+      Page
+    },
+    data() {
+      return {
+        // 页面参数
+        options: {},
+        // 页面属性
+        page: {},
+        // 页面元素
+        items: []
+      }
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+      // 当前页面参数
+      this.options = options
+      // 加载页面数据
+      this.getPageData();
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+      // 更新购物车角标
+      setCartTabBadge()
+    },
+
+    methods: {
+
+      /**
+       * 加载页面数据
+       * @param {Object} callback
+       */
+      getPageData(callback) {
+        const app = this
+        const pageId = app.options.pageId || 0
+        Api.detail(pageId)
+          .then(result => {
+            // 设置页面数据
+            const { data: { pageData } } = result
+            app.page = pageData.page
+            app.items = pageData.items
+            // 设置顶部导航栏栏
+            app.setPageBar();
+          })
+          .finally(() => callback && callback())
+      },
+
+      /**
+       * 设置顶部导航栏
+       */
+      setPageBar() {
+        const {
+          page
+        } = this
+        // 设置页面标题
+        uni.setNavigationBarTitle({
+          title: page.params.title
+        });
+        // 设置navbar标题、颜色
+        uni.setNavigationBarColor({
+          frontColor: page.style.titleTextColor === 'white' ? '#ffffff' : '#000000',
+          backgroundColor: page.style.titleBackgroundColor
+        })
+      },
+
+    },
+
+    /**
+     * 下拉刷新
+     */
+    onPullDownRefresh() {
+      // 获取首页数据
+      this.getPageData(() => {
+        uni.stopPullDownRefresh()
+      })
+    },
+
+    /**
+     * 分享当前页面
+     */
+    onShareAppMessage() {
+      const app = this
+      const { page } = app
+      return {
+        title: page.params.share_title,
+        path: "/pages/index/index?" + app.$getShareUrlParams()
+      }
+    },
+
+    /**
+     * 分享到朋友圈
+     * 本接口为 Beta 版本，暂只在 Android 平台支持，详见分享到朋友圈 (Beta)
+     * https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/share-timeline.html
+     */
+    onShareTimeline() {
+      const app = this
+      const { page } = app
+      return {
+        title: page.params.share_title,
+        path: "/pages/index/index?" + app.$getShareUrlParams()
+      }
+    }
+
+  }
+</script>
+
+<style lang="scss" scoped>
+  .container {
+    background: #fff;
+  }
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b35568d..0568fbf 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,29 +1,62 @@
 <template>
   <view class="container">
-    <!-- 店铺页面组件 -->
-    <Page :items="items" />
+	  <!-- 搜索 -->
+	  <view class="sozone">
+	  	<Search/>
+	  </view>
+	  <!-- 轮播图 -->
+	  <view class="lbzone">
+		  <Banner :dataList="imglist"/>
+	  </view>
+	  <!-- 标签和导航区 -->
+	  <view class="linkzone">
+		  <view class="lkbox">
+			  <view class="lkimg"><image mode="widthFix" src="../../static/next.png"/></view>
+			  <view class="lktxt">公共数据专区</view>
+		  </view>
+		  <view class="lkbox">
+		  		<view class="lkimg"><image mode="widthFix" src="../../static/next.png"/></view>
+		  		<view class="lktxt">数据超市</view>
+		  </view>
+		  <view class="lkbox">
+		  		<view class="lkimg"><image mode="widthFix" src="../../static/next.png"/></view>
+		  		<view class="lktxt">文化资源数据</view>
+		  </view>
+		  <view class="lkbox">
+		  		<view class="lkimg"><image mode="widthFix" src="../../static/next.png"/></view>
+		  		<view class="lktxt">文化数字内容</view>
+		  </view>
+	  </view>
+	  <!-- 商品列表 -->
+	  <view class="glistzone">
+		  <Goods :itemStyle="item.style" :params="item.params" :dataList="item.data" />
+	  </view>
+	
   </view>
 </template>
 
 <script>
   import { setCartTabBadge } from '@/core/app'
   import * as Api from '@/api/page'
-  import Page from '@/components/page'
+  // import Page from '@/components/page'
+  import Banner from './components/banner'
+  import Search from './components/search'
+  import Goods from './components/goods'
 
   const App = getApp()
 
   export default {
     components: {
-      Page
+      Banner,
+	  Search,
+	  Goods
     },
     data() {
       return {
         // 页面参数
         options: {},
-        // 页面属性
-        page: {},
-        // 页面元素
-        items: []
+		// 图片列表
+		imglist:[]
       }
     },
 
@@ -33,8 +66,6 @@
     onLoad(options) {
       // 当前页面参数
       this.options = options
-      // 加载页面数据
-      this.getPageData();
     },
 
     /**
@@ -44,46 +75,25 @@
       // 更新购物车角标
       setCartTabBadge()
     },
+	mounted() {
+		this.getBannerList();
+	},
 
     methods: {
+		// 轮播图片
+		getBannerList(){
+			// for demo
+			for(let i=0;i<3;i++){
+				const obj = {
+					"imgUrl": "http://192.168.66.16:8089/assets/store/img/diy/banner/01.png",
+					"link": null
+				}
+				this.imglist.push(obj)
+			}
 
-      /**
-       * 加载页面数据
-       * @param {Object} callback
-       */
-      getPageData(callback) {
-        const app = this
-        const pageId = app.options.pageId || 0
-        Api.detail(pageId)
-          .then(result => {
-            // 设置页面数据
-            const { data: { pageData } } = result
-            app.page = pageData.page
-            app.items = pageData.items
-            // 设置顶部导航栏栏
-            app.setPageBar();
-          })
-          .finally(() => callback && callback())
-      },
-
-      /**
-       * 设置顶部导航栏
-       */
-      setPageBar() {
-        const {
-          page
-        } = this
-        // 设置页面标题
-        uni.setNavigationBarTitle({
-          title: page.params.title
-        });
-        // 设置navbar标题、颜色
-        uni.setNavigationBarColor({
-          frontColor: page.style.titleTextColor === 'white' ? '#ffffff' : '#000000',
-          backgroundColor: page.style.titleBackgroundColor
-        })
-      },
-
+			// this.imglist.push(simg)
+			
+		}
     },
 
     /**
@@ -127,6 +137,55 @@
 
 <style lang="scss" scoped>
   .container {
-    background: #fff;
+     background: #1C223B;
+	 position: relative;
+	 min-height: 100vh;
+	 
+	 // 搜索
+	.sozone{
+		position: relative;
+		z-index: 70;
+	}
+	.lbzone{
+		padding-bottom: 20rpx;
+		z-index: 80;;
+	}
+	.linkzone{
+		padding: 10rpx 10rpx 20rpx;
+		display: flex;
+		
+		.lkbox{
+			background-color: #fff;
+			margin-left: 30rpx;
+			width: 150rpx;
+			height: 150rpx;
+			border-radius: 20%;
+			color: #fff;
+			font-weight: 600;
+			
+			.lkimg{
+				width: 130rpx;
+				height: 130rpx;
+				margin: 10rpx auto;
+				// padding: 10rpx;
+				
+				// display: flex;
+				// text-align: center;
+				image{
+					width: 130rpx;
+				}
+			}
+			.lktxt{
+				// word-break: break-all;
+				white-space: nowrap;
+				margin-top: 22rpx;
+				text-align: center;
+				height: 56rpx;
+				line-height: 56rpx;
+			}
+		}
+	}
+
   }
+  
 </style>
diff --git a/static/01.png b/static/01.png
deleted file mode 100644
index dda085bf06d32bc035fa607d7dfb6f4727ef9574..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4103
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